From 20013124b9720ba74e1b762a9cdab25230e7d430 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 22 Jul 2024 17:59:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E9=97=A8=E5=BA=97?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E4=BF=9D=E7=95=99=E4=B8=80=E5=A4=A9?=
 =?UTF-8?q?=E5=92=8C=E6=A0=B8=E9=94=80=E7=A0=81=E6=98=BE=E7=A4=BA=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BD=8D=E7=BD=AE=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageQuota/vipUser/index.vue  |  2 +-
 pagesOrder/detail/detail.vue |  2 +-
 pagesOrder/order/order.vue   |  2 +-
 pagesOrder/settle/settle.vue | 27 ++++++++++++++++-----------
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/pageQuota/vipUser/index.vue b/pageQuota/vipUser/index.vue
index 18d87d9..6705cbf 100644
--- a/pageQuota/vipUser/index.vue
+++ b/pageQuota/vipUser/index.vue
@@ -422,7 +422,7 @@
 
 	// 门店手机号保留一天
 	const setPhoneOneDay = () => {
-		if (uni.getStorageSync('VIP_PHONE')) return;
+		// if (uni.getStorageSync('VIP_PHONE')) return;
 		const currentDate = new Date();
 		const nextDay = new Date(currentDate);
 		nextDay.setDate(currentDate.getDate() + 1);
diff --git a/pagesOrder/detail/detail.vue b/pagesOrder/detail/detail.vue
index 03d12e5..d48143b 100644
--- a/pagesOrder/detail/detail.vue
+++ b/pagesOrder/detail/detail.vue
@@ -105,7 +105,7 @@
 		</view>
 
 		<view class="qr_code" v-if="datas.paid == 1 && datas.status == 1">
-			<up-image :src="datas.verify_img" width="404rpx" height="60rpx"></up-image>
+			<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}}
 			</view>
diff --git a/pagesOrder/order/order.vue b/pagesOrder/order/order.vue
index 5bac574..437103f 100644
--- a/pagesOrder/order/order.vue
+++ b/pagesOrder/order/order.vue
@@ -107,7 +107,7 @@
 	<view class="mask" v-if='showVerifyPop' @click="showVerifyPop=false">
 		<view
 			style="position: absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);background-color: white;padding: 20rpx;">
-			<up-image :src="orderData.verify_img" width="710rpx" height="105rpx"></up-image>
+			<up-image :src="orderData.verify_base64" width="710rpx" height="105rpx"></up-image>
 			<view style="font-weight: bold;color: #333;font-size: 26;text-align: center;margin-top: 20rpx;">
 				核销码 {{orderData.verify_code}}
 			</view>
diff --git a/pagesOrder/settle/settle.vue b/pagesOrder/settle/settle.vue
index 451f4fc..315e0b0 100644
--- a/pagesOrder/settle/settle.vue
+++ b/pagesOrder/settle/settle.vue
@@ -98,7 +98,7 @@
 			<view class="row" v-if="[4,5,6].includes(userInfo.user_ship)" style="color: red;">
 				<view>优惠减免</view>
 				<view>
-					<text>-¥</text>{{ c_price(orderInfo.frozen_money, 0) }}<text>.{{ c_price(orderInfo.frozen_money, 1) }}</text>
+					<text>¥</text>{{ c_price(orderInfo.frozen_money, 0) }}<text>.{{ c_price(orderInfo.frozen_money, 1) }}</text>
 				</view>
 			</view>
 			<view class="row" v-if="userInfo.user_ship==1 ">
@@ -562,20 +562,23 @@
 	}
 
 	onLoad(options => {
-		if (uni.getStorageSync('location')) {
-			try {
-				location = JSON.parse(uni.getStorageSync('location'))
-				checkOrder();
-			} catch (e) {
-				getLocation()
-			}
-
-		} else {
+		// if (uni.getStorageSync('location')) {
+		// 	try {
+		// 		location = JSON.parse(uni.getStorageSync('location'))
+		// 		checkOrder();
+		// 	} catch (e) {
+		// 		getLocation()
+		// 	}
+		// } else {
 			getLocation()
-		}
+		// }
 	})
 
 	const getLocation = () => {
+		// #ifdef H5
+		userLocationfalse()
+		// #endif
+		// #ifdef MP-WEIXIN
 		uni.getSetting({
 			success(res) {
 				if (res.authSetting["scope.userLocation"] == false) {
@@ -585,6 +588,8 @@
 				}
 			}
 		})
+		// #endif
+
 	}
 	const LocationShowOpen = () => {
 		LocationShow.value = true;