From a8d038b0111c28b17e038ed375af781a0482ec44 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 8 Oct 2024 22:48:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E9=A1=B5=E9=9D=A2=E9=80=BB=E8=BE=91=E5=92=8C=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改环境配置，确定使用生产环境
- 优化订单商品组件，调整导航逻辑
- 移除待确认和核销弹窗
- 更新订单详情页，增加商家判断逻辑
---
 config/app.js                           |  4 ++--
 pagesOrder/delivery/component/goods.vue | 11 +----------
 pagesOrder/delivery/index.vue           |  2 --
 pagesOrder/detail/detail.vue            |  7 +++++--
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/config/app.js b/config/app.js
index 4aa7bcc..313fd1e 100644
--- a/config/app.js
+++ b/config/app.js
@@ -3,9 +3,9 @@ let WSS_URL
 import store from "@/store/user.js"
 // 环境
 // let env = "dev"
-// let env = "prod"
+let env = "prod"
 // let env = "release";
-let env = "local";
+// let env = "local";
 
 switch (env) {
 	case 'dev':
diff --git a/pagesOrder/delivery/component/goods.vue b/pagesOrder/delivery/component/goods.vue
index 29d7c4c..7f19811 100644
--- a/pagesOrder/delivery/component/goods.vue
+++ b/pagesOrder/delivery/component/goods.vue
@@ -87,18 +87,9 @@
 	})
 
 	const navTo = () => {
-		if (props.datas.status == -1) {
 			uni.navigateTo({
-				url: "/pages/afterSales/afterSalesOrderDetail",
-				success(res) {
-					res.eventChannel.emit('afterSalesDetail', props.datas)
-				}
+				url: `/pagesOrder/detail/detail?is_mer=1&id=${props.datas.id}`
 			})
-		} else {
-			uni.navigateTo({
-				url: `/pagesOrder/detail/detail?type=${props.datas.paid}&id=${props.datas.id}`
-			})
-		}
 	}
 
 	const emit = defineEmits(['cancleOrder', 'rePay', 'takeOrder', 'purchaseAgain']);
diff --git a/pagesOrder/delivery/index.vue b/pagesOrder/delivery/index.vue
index fcfad0e..6c845e8 100644
--- a/pagesOrder/delivery/index.vue
+++ b/pagesOrder/delivery/index.vue
@@ -41,8 +41,6 @@
 			</swiper-item>
 		</swiper>
 	</view>
-	<orderCanclePopup :show="showCancel" @close="showCancel=false" @change="submitCancel" />
-	<modal :show="showTake" title="确认收货" content="请确认您已收到货" @close="showTake=false" @change="confirmReceipt" />
 </template>
 
 <script setup>
diff --git a/pagesOrder/detail/detail.vue b/pagesOrder/detail/detail.vue
index d0061d5..70b2e64 100644
--- a/pagesOrder/detail/detail.vue
+++ b/pagesOrder/detail/detail.vue
@@ -104,7 +104,7 @@
 			</view>
 		</view>
 
-		<view class="qr_code" v-if="datas.paid == 1 && datas.status == 1">
+		<view class="qr_code" v-if="datas.paid == 1 && datas.status == 1 &&is_mer!=1">
 			<up-image :src="datas.verify_base64" width="404rpx" height="60rpx"></up-image>
 			<view style="font-weight: bold;color: #333;font-size: 26;margin-top: 20rpx;">
 				核销码 {{datas.verify_code}}
@@ -190,7 +190,7 @@
 			</block>
 			<block v-else>
 				<view></view>
-				<view style="width: 450rpx;">
+				<view style="width: 450rpx;" v-if="is_mer!=1">
 					<!-- 	<up-button v-if="datas.status==0||datas.status==1" color="#20B128" shape="circle"
 						@click="showTake=true">确认收货</up-button> -->
 					<up-button color="#20B128" plain shape="circle" @click="purchaseAgain">再次购买</up-button>
@@ -263,9 +263,11 @@
 
 	const store_info = ref({})
 	const datas = ref({})
+	const is_mer = ref(0)
 	const getDetails = () => {
 		orderDetailApi({
 			order_id: datas.value.id,
+			is_mer:is_mer.value
 			// ...location
 		}).then(res => {
 			datas.value = res.data;
@@ -516,6 +518,7 @@
 		});
 		if (option.id) {
 			datas.value.id = option.id;
+			is_mer.value = option.is_mer;
 			getLocation()
 		}
 	})