2.2提交

pages_goods/myRedemption/myRedemption.vue

@@ -1,7 +1,20 @@
 <template>
 	<view class="page">
 		<!-- <uni-nav-bar left-icon="left" title="我的兑换" fixed color="#8B2316" height="180rpx" :border="false" backgroundColor="#ffffff" @clickLeft="goBack" /> -->
-		<navBar :title="'我的兑换'"  />
+		<!-- <navBar :title="'我的兑换'"  /> -->
+		<view class="navbox">
+    <view class="status_bar"></view>
+    <uni-nav-bar
+      left-icon="left"
+      title="我的兑换"
+      @clickLeft="goBack"
+      color="#8B2316"
+      :border="false"
+      backgroundColor="#eeeeee"
+    >
+      
+    </uni-nav-bar>
+  </view>
 		<scroll-view 
 			scroll-y 
 			class="content"
@@ -13,10 +26,10 @@
 		>     
 		   <empty v-if="!orderList.length" />
 			<!-- <view v-if="!orderList.length" class="empty">暂无兑换记录</view> -->
-			<view v-for="item in orderList" :key="item.uuid" class="card">
-				<view class="row">
+			<view v-for="item in orderList" :key="item.uuid" class="card" @click="goDetail(item)">
+				<view class="row" style="align-items: flex-start;">
 					<text class="label">兑换物品：</text>
-					<text class="value">{{ item.goods_name }}</text>
+					<text class="value oneline">{{ item.goods_name }}</text>
 				</view>
 				<view class="row">
 					<text class="label">兑换时间：</text>
@@ -24,7 +37,7 @@
 				</view>
 				<view class="row">
 					<text class="label">状态：</text>
-					<text class="status" :class="statusClass(item.status)">{{ statusText(item.status) }}</text>
+					<text class="status" >{{ statusText(item.status) }}</text>
 				</view>
 			</view>
 			<view class="list-footer" v-if="isLoading">加载中...</view>
@@ -38,12 +51,39 @@ import goods_api from '@/api/goods_api'
 import { ref, onMounted } from 'vue'
 import navBar from '@/components/navBar/navBar.vue'
 import empty from '@/components/empty/empty.vue'
+import  navTo  from '@/utils/navTo.js'		
+import { onLoad,onBackPress} from '@dcloudio/uni-app'
 const orderList = ref([])
 const page = ref(1)
 const pageSize = ref(10)
 const isLoading = ref(false)
 const noMore = ref(false)
-const refresherTriggered = ref(false)
+const refresherTriggered = ref(false);
+const from = ref('')
+
+onLoad((options) => {
+	if(options.from){
+		from.value = options.from
+	}
+})
+const goBack = () => {
+	if(from.value){
+		plus.runtime.quit();
+	}else{
+		uni.navigateBack();
+	}
+}
+onBackPress(() => {
+	if(from.value){
+		plus.runtime.quit();
+		return true;
+	}
+});
+const goDetail=(item)=>{
+	navTo({	
+		url: `/pages_goods/exchange/exchangeDetail?id=${item.uuid}`
+	})
+}
 
 const fetchList = () => {
 	if (isLoading.value || noMore.value) return
@@ -82,9 +122,13 @@ const formatDate = (sec) => {
 }
 
 const statusText = (s) => {
-	if (s === 1 || s === 2) return '已支付'
-	if (s === 3) return '待支付'
-	return ''
+	if (s === 1 ) return '待支付'
+	if (s === 2 ) return '已支付'
+	if (s === 3) return '已取消'
+	if (s === 4) return '已发货'
+	if (s === 5) return '已收货'
+	if(s === 6) return '订单异常'
+	
 }
 
 const statusClass = (s) => {
@@ -97,17 +141,17 @@ onMounted(() => {
 	orderList.value = []
 	fetchList()
 })
-const goBack = () => uni.navigateBack()
+
 </script>
 
 <style scoped>
 .page { min-height: 100vh; background: #fff; }
 .content { position: absolute; top: calc(var(--status-bar-height) + 44px); bottom: 0; left: 0; right: 0; background: #fff; }
-.card { background: #fff; padding: 24rpx; border-bottom: 2rpx solid #f5f5f5; }
+.card { background: #fff; padding: 24rpx; border-bottom: 2rpx solid #eee; }
 .row { display: flex; align-items: center; padding: 10rpx 0; }
-.label { color: #333; font-size: 30rpx; width: 180rpx; }
+.label { color: #333; white-space: nowrap;font-size: 30rpx; width: 157rpx; }
 .value { color: #666; font-size: 30rpx; }
-.status { font-size: 30rpx; }
+.status { font-size: 30rpx; color: #666;}
 .status.paid { color: #666; }
 .status.unpaid { color: #666; }
 .list-footer { text-align: center; color: #999; padding: 24rpx 0; }