fix: 外卖订单详情页更改&订单页面支持点击进入详情

mer_uniapp/pages/goods/order_details/index.vue

@@ -23,9 +23,9 @@
 				<view v-if="orderInfo.status!==9 && (shippingType ===1 || shippingType ===3) && orderInfo.refundStatus !== 3" class='nav'>
 					<view class='navCon acea-row row-between-wrapper'>
 						<view :class="orderInfo.status == 0 ?'on':''">待付款</view>
-						<view :class="orderInfo.status == 1 ? 'on':''">待发货</view>
-						<view :class="orderInfo.status == 4 ? 'on':''">待收货</view>
-						<view :class="orderInfo.status == 5 ? 'on':''">已收货</view>
+						<view :class="orderInfo.status == 1 ? 'on':''">待取餐</view>
+						<view :class="orderInfo.status == 4 ? 'on':''">配送中</view>
+						<view :class="orderInfo.status == 5 ? 'on':''">已送达</view>
 						<view :class="orderInfo.status == 6 ? 'on':''">已完成</view>
 					</view>
 					<!-- 订单状态（0：待支付，1：待发货,2：部分发货， 3：待核销，4：待收货,5：已收货,6：已完成，9：已取消） -->

mer_uniapp/pages/order/index.vue

@@ -22,7 +22,7 @@
 		<!-- 列表数据 -->
 		<view class="nbox-1">
 			<view class="nbox-2" v-for="(item,index) in list" :key="index">
-				<view class="container">
+				<view class="container" @click='goOrderDetails(item)'>
 					<text class="left-text">{{item.merName}}</text>
 					<view class="right-group">
 						<text v-if="item.status==1||item.status==2||item.status==3" style="color: #0FBA42;font-size: 23rpx;">制作中</text>
@@ -32,7 +32,7 @@
 					</view>
 				</view>
 
-				<view class="scroll-container" v-for='(ottm,indexs) in item.orderInfoList' :key="indexs">
+				<view class="scroll-container" v-for='(ottm,indexs) in item.orderInfoList' :key="indexs" @click='goOrderDetails(item)'>
 					<view class="item">
 						<img :src='ottm.image'>
 						<text>{{ottm.productName}} x{{ottm.payNum}}</text>
@@ -71,6 +71,9 @@
 
 <script>
 	import {
+		ProductTypeEnum,
+	} from "@/enums/productEnums";
+	import {
 
 		getOrderList
 	} from '@/api/order.js';
@@ -87,6 +90,7 @@
 				loadTitle: '',
 				page: 1,
 				list: [], //订单数据
+				ProductTypeEnum
 			}
 		},
 		//下拉刷新
@@ -111,6 +115,33 @@
 
 		},
 		methods: {
+			/**
+			 * 去订单详情
+			 */
+			goOrderDetails: function(item, status) {
+				if (item.groupBuyRecordStatus === 0) return this.$util.Tips({
+					title: '拼团中无法查看详情'
+				});
+				if (!item.orderNo) return this.$util.Tips({
+					title: '缺少订单号无法查看订单详情'
+				});
+				//虚拟商品
+				if (item.secondType === this.ProductTypeEnum?.CloudDrive || item.secondType === this.ProductTypeEnum
+					?.CardPassword) {
+					// #ifdef MP
+					uni.navigateTo({
+						url: '/pages/goods/virtual_order_details/index?orderNo=' + item.orderNo
+					})
+					// #endif
+				} else {
+					// #ifdef MP
+					uni.navigateTo({
+						url: '/pages/goods/order_details/index?orderNo=' + item.orderNo + `&orderType=${this.isShow}`
+					})
+					// #endif
+				}
+			
+			},
 			// 拨打电话
 			makePhoneCall(item) {
 				const phoneNumber = item.merPhone; // 替换为商家的电话号码