From a0d5fef974494e646b6e606f865b651f862667cc Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Tue, 25 Jun 2024 18:07:52 +0800
Subject: [PATCH] add

---
 pageQuota/vipUser/index.vue |  9 ++++++---
 pages/index/index.vue       | 19 +++++++++++++++----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/pageQuota/vipUser/index.vue b/pageQuota/vipUser/index.vue
index fae1506..72169b2 100644
--- a/pageQuota/vipUser/index.vue
+++ b/pageQuota/vipUser/index.vue
@@ -289,20 +289,19 @@
 	const currentTab = ref(1)
 	const formData = reactive({
 		store_id: STORE_INFO.id,
-		mobile: "19130550023",
+		mobile: "",
 		province: 510000,
 		city: '',
 		area: "",
 		street: "",
 		village: "",
-		brigade: "",
 		real_name: "赵明军",
 		auth_code: "",
 		address: "",
 		label_name: "",
 		label_id: "",
 		user_ship: '',
-		code: '8888'
+		code: ''
 	})
 
 	const conformRole = (e) => {
@@ -438,6 +437,9 @@
 		if (Role.value == 1) {
 			uni.scanCode({
 				success: function(res) {
+
+					if (res.result.length != 14) return uni.$u.toast('二维码未扫描完整');
+
 					formData.auth_code = res.result
 					formData.recharge_type = 'INDUSTRYMEMBERS'
 					formData.user_ship = 1
@@ -480,6 +482,7 @@
 	const rePay = (item) => {
 		uni.scanCode({
 			success: function(res) {
+				if (res.result.length != 14) return uni.$u.toast('二维码未扫描完整');
 				uni.showLoading({
 					title: '支付中...'
 				});
diff --git a/pages/index/index.vue b/pages/index/index.vue
index cfe0d9e..27a6dfa 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -39,7 +39,6 @@
 			:style="{ height: btns.height + 'px', top: btns.top + 'px', left: (btns.left - 40) + 'px' }">
 			<up-button icon="share-square" openType="share" plain size="large" loadingSize="100" />
 		</view>
-
 		<view class="navbar">
 			<view style="width: 400rpx;">
 				<up-search placeholder="请输入商品" @search="searchKeyword" @clear="searchKeyword" v-model="keyword"
@@ -159,10 +158,10 @@
 							<view class="goods-name" style="font-size: 28rpx;color: #060606;">
 								{{ item.store_name }}
 							</view>
-							<view class="shop-content-li">
+							<view class="shop-content-li" v-if="priceKey.off_activity==1">
 								<view class="shop-content-li-l" style="color: #FC452F;">活动价</view>
 								<view class="shop-content-li-r" style="color:#FC452F ;">￥<text
-										style="font-size: 30rpx;">79.8</text>/份
+										style="font-size: 30rpx;">{{item[priceKey.price]}}</text>/{{ item.unit_name }}
 								</view>
 								<view class="tag">
 									10%品牌礼品
@@ -170,7 +169,7 @@
 							</view>
 							<view class="shop-content-li" style="color: #999999;">
 								<view class="shop-content-li-l">原&nbsp;&nbsp;&nbsp;价</view>
-								<view class="shop-content-li-r">￥32.52</view>
+								<view class="shop-content-li-r">￥{{item[priceKey.op_price]}}</view>
 							</view>
 							<view class="shop-content-li">
 								<view class="shop-content-li-l">规&nbsp;&nbsp;&nbsp;格</view>
@@ -290,6 +289,14 @@
 		store_name: ""
 	})
 
+
+
+	const priceKey = reactive({
+		off_activity: "",
+		op_price: "",
+		price: ""
+	})
+
 	const getStoreInfoFn = () => {
 		if (uni.getStorageSync('STORE_INFO').length) {
 			let data = JSON.parse(uni.getStorageSync('STORE_INFO'))
@@ -445,6 +452,10 @@
 			class: class_id,
 			cate_id: class_id,
 		}).then(res => {
+			for (let key in res.data.extend) {
+				priceKey[key] = res.data.extend[key]
+			}
+			console.log(priceKey)
 			if (loadmore) goodList.value.push(...res.data.lists);
 			else goodList.value = res.data.lists;
 		})