From e053e6f59353aebc6bce5d3cd4a863c63925d3e9 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Tue, 11 Jun 2024 18:20:23 +0800
Subject: [PATCH] add

---
 config/app.js                       |  4 ++--
 pagesOrder/order/component/good.vue | 25 ++++++++++++++-----------
 pagesOrder/settle/settle.vue        |  6 +++---
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/config/app.js b/config/app.js
index f34cd13..ff2f711 100644
--- a/config/app.js
+++ b/config/app.js
@@ -2,8 +2,8 @@ let BASE_URL
 import store from "@/store/user.js"
 // 环境
 // let env = "dev"
-// let env = "prod"
-let env = "liu";
+let env = "prod"
+// let env = "liu";
 
 switch (env) {
 	case 'dev':
diff --git a/pagesOrder/order/component/good.vue b/pagesOrder/order/component/good.vue
index a81b19a..87150a8 100644
--- a/pagesOrder/order/component/good.vue
+++ b/pagesOrder/order/component/good.vue
@@ -64,24 +64,27 @@
 		</view>
 	</view>
 
-
-	<up-popup :show="showVerifyPop" @close="showVerifyPop=false" @open="showVerifyPop=true" mode="center">
-		<view style="width: 80vw;height: 20vh;position: relative;">
-			<view style="position: absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);">
-				<w-barcode :options="options"></w-barcode>
-				<view style="font-weight: bold;color: #333;font-size: 26;text-align: center;">
-					核销码 {{datas.verify_code}}
+	<view v-if='showVerifyPop'>
+		<up-popup :show="showVerifyPop" @close="showVerifyPop=false" @open="showVerifyPop=true" mode="center">
+			<view style="width: 80vw;height: 20vh;position: relative;">
+				<view style="position: absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);">
+					<w-barcode v-if='options.code' :options="options"></w-barcode>
+					<view style="font-weight: bold;color: #333;font-size: 26;text-align: center;">
+						核销码 {{datas.verify_code}}
+					</view>
 				</view>
-			</view>
 
-		</view>
-	</up-popup>
+			</view>
+		</up-popup>
+	</view>
+
 </template>
 
 <script setup>
 	import {
 		ref,
-		reactive
+		reactive,
+		nextTick
 	} from "vue"
 	// 订单状态（0：待发货；1：待收货；2：已完成；3：已完成)
 	const props = defineProps({
diff --git a/pagesOrder/settle/settle.vue b/pagesOrder/settle/settle.vue
index f13242b..919a7c6 100644
--- a/pagesOrder/settle/settle.vue
+++ b/pagesOrder/settle/settle.vue
@@ -22,11 +22,11 @@
 			<view class="address-btn item-center">
 				<view class='ship-type' style="">
 					<view class="ship-type-item" :class='{actShipItem:orderInfo.shipping_type==2 }'
-						@click='orderInfo.shipping_type=2' v-if='orderInfo.default_delivery==1'>
+						@click='orderInfo.shipping_type=2'>
 						自提
 					</view>
 					<view class="ship-type-item" @click='orderInfo.shipping_type=1'
-						:class='{actShipItem:orderInfo.shipping_type==1 }'>
+						:class='{actShipItem:orderInfo.shipping_type==1 }' v-if='orderInfo.default_delivery==1'>
 						配送
 					</view>
 				</view>
@@ -326,7 +326,7 @@
 			cartList.value = res.data.cart_list;
 			orderInfo.value = res.data.order;
 			if (orderInfo.value.default_delivery == 0) {
-				orderInfo.value.shipping_type = 1
+				orderInfo.value.shipping_type = 2
 			}
 		})
 	}