From eb885777f0bce88363e3a43e83e4ec0631e69b73 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Wed, 3 Jul 2024 16:50:12 +0800
Subject: [PATCH 1/8] add

---
 config/app.js         |  4 ++--
 pages/index/index.vue | 11 +++++------
 pages/login/login.vue |  4 ++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/config/app.js b/config/app.js
index f1f7802..0d6283a 100644
--- a/config/app.js
+++ b/config/app.js
@@ -2,8 +2,8 @@ let BASE_URL
 let WSS_URL
 import store from "@/store/user.js"
 // 环境
-// let env = "dev"
-let env = "prod"
+let env = "dev"
+// let env = "prod"
 // let env = "release";
 // let env = "local";
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8f6a320..2ac93bd 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -23,9 +23,9 @@
 			<template #left>
 				<view class="store-info">
 					<view style="display: flex;font-size: 30rpx;font-weight: bold;">
-						<text v-if="userStore.userInfo.user_ship == 1 || shareInfo.store_id"
+						<text v-if=" vipList.includes(userStore.userInfo.user_ship)   || shareInfo.store_id"
 							style="max-width: 400rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
-							<text v-if="userStore.userInfo.user_ship == 1">
+							<text v-if="vipList.includes(userStore.userInfo.user_ship)">
 								{{ (userStore.userInfo.real_name || userStore.userInfo.nickname) + '的供销个人门店' }}</text>
 							<text v-else>
 								{{(shareInfo.real_name || (userStore.userInfo.real_name || userStore.userInfo.nickname)) + '的供销个人门店' }}</text>
@@ -293,14 +293,12 @@
 	} from "@/api/multipleShop.js";
 
 	import useUserStore from "@/store/user";
+	const vipList = reactive([1, 2, 3, 5, 6, 7, 8])
 	const userStore = useUserStore();
 	const STORE_INFO = reactive({
 		id: '',
 		store_name: ""
 	})
-
-
-
 	const priceKey = reactive({
 		off_activity: "",
 		op_price: "",
@@ -330,7 +328,7 @@
 	// 分享给好友
 	onShareAppMessage(() => {
 		let shareStr = '?id=' + STORE_INFO.id;
-		if (userStore.userInfo.user_ship == 1) {
+		if (vipList.includes(userStore.userInfo.user_ship)) {
 			shareStr = shareStr + '&spread_uid=' + userStore.userInfo.id + '&real_name=' + (userStore.userInfo
 				.real_name || userStore.userInfo.nickname)
 		}
@@ -705,6 +703,7 @@
 	getShareInfo()
 
 	onLoad(async (opt) => {
+		console.log('opt', opt)
 		if (opt.id) {
 			where.value.store_id = (opt.id == 'undefined' ? STORE_INFO.id : opt.id);
 		} else {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 42304f4..0471e5a 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -16,10 +16,10 @@
 						<up-button @click="weixinLogin" color="#20B128" size="large"><up-icon color="#fff"
 								size="28"></up-icon>手机号快捷登录</up-button>
 					</view>
-					<!-- 	<view class="btn">
+					<view class="btn">
 						<up-button @click="navgo('/pages/login/test')" color="#20B128" size="large"><up-icon
 								name="account-fill" color="#fff" size="28"></up-icon>真-手机号快捷登录</up-button>
-					</view> -->
+					</view>
 					<!-- <view class="btn">
             <up-button @click="officialCode" color="#20B128" size="large"><up-icon name="weixin-fill" color="#fff"
                 size="28"></up-icon>公众号授权</up-button>

From e21a81ebd2ce83c18115c90601767714817c9908 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Wed, 3 Jul 2024 17:37:41 +0800
Subject: [PATCH 2/8] add

---
 api/user.js                 | 4 ++++
 pageQuota/vipUser/index.vue | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/api/user.js b/api/user.js
index bd5b2fc..c84bb05 100644
--- a/api/user.js
+++ b/api/user.js
@@ -157,4 +157,8 @@ export const getVipInfoByPhone = (data) => {
 
 export const checkInventoryApi = (data) => {
 	return request.post('/order/order/checkInventory', data);
+}
+
+export const isUserShipApi = (data) => {
+	return request.post('/user_ship/UserShip/is_user_ship', data);
 }
\ No newline at end of file
diff --git a/pageQuota/vipUser/index.vue b/pageQuota/vipUser/index.vue
index 66f3f2c..a756253 100644
--- a/pageQuota/vipUser/index.vue
+++ b/pageQuota/vipUser/index.vue
@@ -337,6 +337,7 @@
 	} from "@/api/address.js"
 	import {
 		vipRechargeApi,
+		isUserShipApi,
 		rechargeCountApi,
 		reVipRechargeApi,
 		rechargeListsApi,
@@ -817,6 +818,12 @@
 				// 	}, 10000)
 				// })
 				// return
+				formData.user_ship = formData.label_id
+				await isUserShipApi({
+					user_ship: formData.user_ship,
+					village: formData.village,
+					brigade: formData.brigade
+				})
 				uni.scanCode({
 					success: function(res) {
 						if (String(res.result.length) != 18) return uni.$u.toast('二维码未扫描完整');
@@ -825,7 +832,6 @@
 						});
 						formData.auth_code = res.result
 						formData.recharge_type = 'INDUSTRYMEMBERS'
-						formData.user_ship = formData.label_id
 						vipRechargeApi(formData).then(res => {
 							timerInvol = setTimeout(() => {
 								uni.hideLoading();

From a14cf624da6cd609cb26e64dbcce0d751bd0f7dd Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Thu, 4 Jul 2024 11:26:44 +0800
Subject: [PATCH 3/8] add

---
 pageQuota/vipUser/index.vue | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pageQuota/vipUser/index.vue b/pageQuota/vipUser/index.vue
index a756253..c51ff00 100644
--- a/pageQuota/vipUser/index.vue
+++ b/pageQuota/vipUser/index.vue
@@ -32,7 +32,7 @@
 			<view class="card card1">
 				<view class="card1-tit">
 					行业会员开通报备
-					<!-- <up-input v-model='formData.auth_code'> </up-input> -->
+					<up-input v-model='formData.auth_code'> </up-input>
 				</view>
 				<up-form labelPosition="left" :model="formData" :borderBottom='false'>
 					<up-form-item label="">
@@ -818,18 +818,19 @@
 				// 	}, 10000)
 				// })
 				// return
-				formData.user_ship = formData.label_id
-				await isUserShipApi({
-					user_ship: formData.user_ship,
-					village: formData.village,
-					brigade: formData.brigade
-				})
+				// formData.user_ship = formData.label_id
+				// await isUserShipApi({
+				// 	user_ship: formData.user_ship,
+				// 	village: formData.village,
+				// 	brigade: formData.brigade
+				// })
 				uni.scanCode({
 					success: function(res) {
 						if (String(res.result.length) != 18) return uni.$u.toast('二维码未扫描完整');
 						uni.showLoading({
 							title: '支付中...'
 						});
+						formData.user_ship = formData.label_id
 						formData.auth_code = res.result
 						formData.recharge_type = 'INDUSTRYMEMBERS'
 						vipRechargeApi(formData).then(res => {

From 6a1bdddf37dd6eaebcda97b66d1e30e26cfc829e Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Thu, 4 Jul 2024 18:00:16 +0800
Subject: [PATCH 4/8] add

---
 pages/login/login.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/login/login.vue b/pages/login/login.vue
index 0471e5a..c666fa7 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -211,7 +211,7 @@
 			}).then(res => {
 				//手机号获取成功 可以本地缓存用户信息以及token
 				userStore.setUserInfo(res.data);
-				userStore.setToken(res.data.token);
+				res.data.token && userStore.setToken(res.data.token);
 				//身份授权成功 核销人员
 				if (res.is_staff == 1) {
 					userStore.setUserInfo(res.data);

From 001fdd05d8c8963d89a1c1988c4f6c85d5e8cd98 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Fri, 5 Jul 2024 12:00:21 +0800
Subject: [PATCH 5/8] add

---
 pageQuota/vipUser/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pageQuota/vipUser/index.vue b/pageQuota/vipUser/index.vue
index c51ff00..38645ee 100644
--- a/pageQuota/vipUser/index.vue
+++ b/pageQuota/vipUser/index.vue
@@ -761,7 +761,7 @@
 		}
 		if (type == 2) {
 			if (!formData2.mobile) return uni.$u.toast('请填写电话号码');
-			if (formData2.price < formData2.label_limit) return uni.$u.toast(
+			if (Number(formData2.price) < Number(formData2.label_limit)) return uni.$u.toast(
 				`${formData2.label_name}角色最低金额不能低于${formData2.label_limit}元`);
 			formData2.store_id = STORE_INFO.id
 			// formData2.recharge_type = 'INDUSTRYMEMBERS'
@@ -801,7 +801,7 @@
 			if (!formData.code) return uni.$u.toast('请输入短信验证码');
 			if (!formData.address) return uni.$u.toast('请选择地址');
 			if (!formData.label_id) return uni.$u.toast('请选择用户身份');
-			if (formData.price < formData.label_limit) return uni.$u.toast(
+			if (Number(formData.price) < Number(formData.label_limit)) return uni.$u.toast(
 				`${formData.label_name}角色最低金额不能低于${formData.label_limit}元`);
 			formData.store_id = STORE_INFO.id
 			if (Role.value == 1) {

From f15573e557b713df45a573acc7008a869ce92201 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Fri, 5 Jul 2024 18:18:02 +0800
Subject: [PATCH 6/8] add

---
 api/user.js                       |   4 +
 pageQuota/balanceDetail/index.vue |   2 +-
 pageQuota/vipUser/activePage.vue  |  11 ++
 pageQuota/vipUser/index.vue       | 185 +++++++++++++++++++++---------
 pages.json                        |   7 ++
 pages/index/index.vue             |   8 +-
 6 files changed, 158 insertions(+), 59 deletions(-)
 create mode 100644 pageQuota/vipUser/activePage.vue

diff --git a/api/user.js b/api/user.js
index c84bb05..6af8132 100644
--- a/api/user.js
+++ b/api/user.js
@@ -161,4 +161,8 @@ export const checkInventoryApi = (data) => {
 
 export const isUserShipApi = (data) => {
 	return request.post('/user_ship/UserShip/is_user_ship', data);
+}
+
+export const getRechargeListApi = (data) => {
+	return request.get('/user/UserRecharge/recharge_list', data);
 }
\ No newline at end of file
diff --git a/pageQuota/balanceDetail/index.vue b/pageQuota/balanceDetail/index.vue
index d94418a..fc1d53b 100644
--- a/pageQuota/balanceDetail/index.vue
+++ b/pageQuota/balanceDetail/index.vue
@@ -32,7 +32,7 @@
 		<view class="content" v-if='type==4'>
 			<view class="li" v-for="(item,index) in lists" :key="index">
 				<view class="li-top">
-					<text>{{item.order_sn}}</text>
+					<text>{{item.title}}</text>
 					<text style="font-weight: bold;" :style="{color:!item.status?'#50C758':'red'
 					}">{{ !item.status?'+':'-' }}{{item.number}}</text>
 				</view>
diff --git a/pageQuota/vipUser/activePage.vue b/pageQuota/vipUser/activePage.vue
new file mode 100644
index 0000000..d3f000f
--- /dev/null
+++ b/pageQuota/vipUser/activePage.vue
@@ -0,0 +1,11 @@
+<template>
+	<image style="width: 100vw" mode='widthFix'
+		src="https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/8d49820240705171635925.png">
+	</image>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pageQuota/vipUser/index.vue b/pageQuota/vipUser/index.vue
index 38645ee..d83a407 100644
--- a/pageQuota/vipUser/index.vue
+++ b/pageQuota/vipUser/index.vue
@@ -31,8 +31,10 @@
 		<block v-if='currentTab == 0'>
 			<view class="card card1">
 				<view class="card1-tit">
-					行业会员开通报备
-					<up-input v-model='formData.auth_code'> </up-input>
+					购买采购包
+				</view>
+				<view class="store-info">
+					报备人：{{ STORE_INFO.name }}
 				</view>
 				<up-form labelPosition="left" :model="formData" :borderBottom='false'>
 					<up-form-item label="">
@@ -82,23 +84,20 @@
 						</view>
 					</up-form-item>
 				</up-form>
-				<view class="store-info">
-					报备人:{{ STORE_INFO.name }}
+				<view class="link" @click="navgo('/pageQuota/vipUser/activePage')">
+					点击查看礼品包内容
 				</view>
-
-				<view class="store-info" v-if="Role==1">
-					<view class="" style="width: 300rpx;margin: 0 auto;border-bottom: 1px solid #F3F3F3;">
-						<up-input inputAlign='center' type='digit' placeholder="请输入金额" @focus="formData.price=''"
-							color='#FF6B00' :placeholderStyle="{fontSize:'28rpx'}" fontSize='20px' border="none"
-							v-model="formData.price" @blur='tofixedPrice'></up-input>
+				<view class="gift-pack">
+					<view class="gift-pack-li" :class="index==giftIndex&&'act-gift'"
+						v-for="(item,index) in rechargeList" :key="index" @click="choseGift(index)">
+						<view class="gift-pack-li-top" :class="index==giftIndex &&'act-gift-top'">
+							<text style="font-size: 40rpx;">{{item.money}}</text><text>元采购包</text>
+						</view>
+						<view class="">
+							送{{item.send}}{{item.send_string}}
+						</view>
 					</view>
-					<view style="color: red;margin-top: 20rpx;font-size: 24rpx;"
-						v-if="formData.label_limit&&formData.price<formData.label_limit">
-						{{formData.label_name}}角色最低金额不能低于{{formData.label_limit}}元且最高金额不能超过10000.00元
-					</view>
-
 				</view>
-
 			</view>
 			<view class="submit-btn" @click="submit">
 				<view
@@ -160,9 +159,9 @@
 						<view class="">
 							{{formData2.label_name}}会员最低金额不能低于{{formData2.label_limit}}元
 						</view>
-						<view class="">
+						<!-- <view class="">
 							最高金额不能超过10000.00元
-						</view>
+						</view> -->
 						<view class="">
 							可单次多笔累计操作
 						</view>
@@ -180,6 +179,8 @@
 			</view>
 
 		</block>
+
+
 		<!-- tabs2 -->
 		<block v-if="currentTab == 2 &&Role==1">
 			<view class="vip-card">
@@ -311,8 +312,6 @@
 	</up-popup>
 	<up-picker :show="showPop1" :columns="columns" @confirm='conformRole' @cancel='showPop1 = false'
 		@close="showPop1 = false" @open="showPop1 = true" keyName='title' confirmColor='#33B83A'></up-picker>
-
-
 	<up-modal :show="showModal" title="电话号码" content='15884967539' :closeOnClickOverlay="true" :zoom="true"
 		confirmColor='#33B83A' @confirm='showModal=false' @close="showModal=false">
 		<view class="slot-content">
@@ -337,6 +336,7 @@
 	} from "@/api/address.js"
 	import {
 		vipRechargeApi,
+		getRechargeListApi,
 		isUserShipApi,
 		rechargeCountApi,
 		reVipRechargeApi,
@@ -443,6 +443,7 @@
 	// 手机保留一天结束
 
 	// 验证码
+	const vipList = reactive([1, 2, 3, 5, 6, 7, 8])
 	const cutDown = ref(0)
 	const flag = ref(true)
 	const code = ref('')
@@ -579,10 +580,10 @@
 				} = await getVipInfoByPhone({
 					mobile: formData2.mobile
 				})
-				// if (data.user_ship != 4) {
-				// 	uni.hideLoading()
-				// 	return uni.$u.toast('查询失败');
-				// }
+				if (!vipList.includes(data.user_ship)) {
+					uni.hideLoading()
+					return uni.$u.toast('查询失败');
+				}
 				if (formData.mobile) {
 					formData2.mobile = formData.mobile
 				}
@@ -597,14 +598,9 @@
 	}
 
 
-	const tofixedPrice = (type = 1) => {
-		if (type == 2) return formData2.price = (+formData2.price).toFixed(2)
-		formData.price = (+formData.price).toFixed(2)
-	}
-
 	const resetFormData = () => {
 		for (let key in formData) {
-			formData[key] = ''
+			(key != 'price') && (formData[key] = '')
 		}
 		for (let key in formData2) {
 			formData2[key] = ''
@@ -621,8 +617,6 @@
 	const conformRole = (e) => {
 		formData.label_name = e.value[0].title
 		formData.label_id = e.value[0].id
-		formData.price = (+e.value[0].limit).toFixed(2)
-		formData.label_limit = e.value[0].limit
 		showPop1.value = false
 	}
 
@@ -724,6 +718,7 @@
 		]);
 
 	let timerInvol = null
+	let paySuccess;
 	// 开起一个scoket监听用户知否支付成功
 	const userInfo = useUserStore().userInfo;
 	const connection = new Push({
@@ -733,13 +728,34 @@
 	const user_channel = connection.subscribe(`wechat_mmp_${userInfo.id}`);
 	user_channel.on('message', function(data) {
 		try {
-			uni.hideLoading({});
+			paySuccess = true
+			uni.hideLoading();
 			clearTimeout(timerInvol);
 			paySuccessToTabs2()
 		} catch (error) {}
 	});
 	// 结束
 
+	const navgo = (url) => {
+		uni.navigateTo({
+			url
+		})
+	}
+
+	// 选择采购包
+	const giftIndex = ref(0)
+	const rechargeList = ref([])
+	const getRechargeList = async () => {
+		let res = await getRechargeListApi()
+		rechargeList.value = res.data
+		formData.price = rechargeList.value[0].money
+	}
+
+	const choseGift = (index) => {
+		giftIndex.value = index
+		formData.price = rechargeList.value[index].money
+	}
+
 
 	// 提交
 	const submit = async (type = 1) => {
@@ -787,10 +803,12 @@
 					formData2.recharge_type = 'INDUSTRYMEMBERS'
 					formData2.user_ship = formData2.label_id
 					vipRechargeApi(formData2).then(res => {
+						paySuccess = false;
 						timerInvol = setTimeout(() => {
 							uni.hideLoading();
-							if (currentTab.value == 2) return;
-							uni.$u.toast('支付超时');
+							if (!paySuccess) {
+								uni.$u.toast('支付超时');
+							}
 						}, 30000)
 					})
 				}
@@ -801,9 +819,9 @@
 			if (!formData.code) return uni.$u.toast('请输入短信验证码');
 			if (!formData.address) return uni.$u.toast('请选择地址');
 			if (!formData.label_id) return uni.$u.toast('请选择用户身份');
-			if (Number(formData.price) < Number(formData.label_limit)) return uni.$u.toast(
-				`${formData.label_name}角色最低金额不能低于${formData.label_limit}元`);
 			formData.store_id = STORE_INFO.id
+			formData.user_ship = formData.label_id
+			formData.recharge_type = 'INDUSTRYMEMBERS'
 			if (Role.value == 1) {
 				// formData.recharge_type = 'INDUSTRYMEMBERS'
 				// formData.user_ship = formData.label_id
@@ -830,14 +848,14 @@
 						uni.showLoading({
 							title: '支付中...'
 						});
-						formData.user_ship = formData.label_id
 						formData.auth_code = res.result
-						formData.recharge_type = 'INDUSTRYMEMBERS'
 						vipRechargeApi(formData).then(res => {
+							paySuccess = false;
 							timerInvol = setTimeout(() => {
 								uni.hideLoading();
-								if (currentTab.value == 2) return;
-								uni.$u.toast('支付超时');
+								if (!paySuccess) {
+									uni.$u.toast('支付超时');
+								}
 							}, 30000)
 						})
 					}
@@ -859,13 +877,19 @@
 				}).then(res => {
 					timerInvol = setTimeout(() => {
 						uni.hideLoading();
-						uni.$u.toast('支付超时');
+						if (!paySuccess) {
+							uni.$u.toast('支付超时');
+						}
 					}, 30000)
 				})
 			}
 		});
 	}
 
+	const tofixedPrice = (type = 1) => {
+		if (type == 2) return formData2.price = (+formData2.price).toFixed(2)
+	}
+
 	// 支付成功后清除formData并且切换tabs2
 	const paySuccessToTabs2 = () => {
 		uni.hideLoading()
@@ -936,19 +960,12 @@
 	}
 
 	onLoad(() => {
-		// getUserShip().then(res => {
-		// 	range.value = res.data.lists.map(item => {
-		// 		return {
-		// 			value: item.id,
-		// 			text: item.title
-		// 		}
-		// 	})f
-		// })
 		getUserShip().then(res => {
 			columns.value = [res.data.lists]
 		})
 		getPhoneOneDay()
 		getCityList()
+		getRechargeList()
 	})
 
 	onPullDownRefresh(() => {
@@ -1028,20 +1045,20 @@
 	}
 
 	.card1 {
-		padding: 52rpx 30rpx;
+		padding: 30rpx;
 
 		.card1-tit {
 			font-size: 32rpx;
 			color: #444444;
 			text-align: center;
-			margin-bottom: 90rpx;
+			margin-bottom: 20rpx;
 		}
 
 		.store-info {
 			font-size: 28rpx;
 			color: #20B128;
 			text-align: center;
-			margin-top: 30rpx;
+			margin-top: 20rpx;
 		}
 	}
 
@@ -1087,7 +1104,7 @@
 
 	.address-content {
 		padding: 20rpx;
-		height: 50vh;
+		height: 60vh;
 		overflow-y: auto;
 
 		.address-li {
@@ -1123,5 +1140,65 @@
 
 	.btn-text {
 		color: #20B128;
+	}
+
+	.link {
+		padding-left: 20rpx;
+		color: #2F6BF2;
+		font-size: 28rpx;
+		margin-bottom: 30rpx;
+		position: relative;
+		text-decoration: underline;
+		text-underline-offset: 10rpx;
+		cursor: pointer;
+	}
+
+	.link::after {
+		content: '';
+		width: 12rpx;
+		height: 12rpx;
+		background-color: #2F6BF2;
+		position: absolute;
+		top: 50%;
+		transform: translateY(-50%);
+		border-radius: 12rpx;
+		left: 0;
+	}
+
+	.gift-pack {
+		display: flex;
+		justify-content: space-between;
+		flex-wrap: wrap;
+
+		.gift-pack-li {
+			padding: 20rpx 40rpx;
+			border: #20B128 1px solid;
+			border-radius: 24rpx 24rpx 24rpx 24rpx;
+			background-color: #F6F6F6;
+			margin-bottom: 20rpx;
+			font-size: 26rpx;
+			color: #777777;
+			width: 310rpx;
+			box-sizing: border-box;
+			text-align: center;
+
+			.gift-pack-li-top {
+				margin-bottom: 10rpx;
+				color: #20B128;
+			}
+
+			.act-gift-top {
+				color: white;
+			}
+		}
+
+		.act-gift {
+			background-color: #38BE41;
+			color: white;
+		}
+
+
+
+
 	}
 </style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 3ced8f0..cc70251 100644
--- a/pages.json
+++ b/pages.json
@@ -235,6 +235,13 @@
 						"enablePullDownRefresh": true
 					}
 				},
+				{
+					"path": "vipUser/activePage",
+					"style": {
+						"navigationBarTitleText": "采购礼包",
+						"enablePullDownRefresh": false
+					}
+				},
 				{
 					"path": "asset/index",
 					"style": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2ac93bd..e0ccf7d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -162,8 +162,8 @@
 								{{ item.store_name }}
 							</view>
 							<view class="shop-content-li" v-if="priceKey.off_activity==1">
-								<view class="shop-content-li-l" style="color: #FC452F;">
-									活动价
+								<view class="shop-content-li-l">
+									售价
 								</view>
 								<view class="shop-content-li-r" style="color:#FC452F ;">￥<text
 										style="font-size: 30rpx;">{{item[priceKey.price]}}</text>/{{ item.unit_name }}
@@ -173,10 +173,10 @@
 									赠10%品牌礼品券
 								</view>
 							</view>
-							<view class="shop-content-li" style="color: #999999;" v-if="priceKey.off_activity==1">
+							<!-- <view class="shop-content-li" style="color: #999999;" v-if="priceKey.off_activity==1">
 								<view class="shop-content-li-l">原价</view>
 								<view class="shop-content-li-r line-through">￥{{item[priceKey.op_price]}}</view>
-							</view>
+							</view> -->
 
 							<view class="shop-content-li" v-else>
 								<view class="shop-content-li-l">售价</view>

From 8863dba81d8ed68d992e4c97a27147da431a4965 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Fri, 5 Jul 2024 19:37:27 +0800
Subject: [PATCH 7/8] add

---
 config/app.js         | 4 ++--
 pages/login/login.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/app.js b/config/app.js
index 0d6283a..f1f7802 100644
--- a/config/app.js
+++ b/config/app.js
@@ -2,8 +2,8 @@ let BASE_URL
 let WSS_URL
 import store from "@/store/user.js"
 // 环境
-let env = "dev"
-// let env = "prod"
+// let env = "dev"
+let env = "prod"
 // let env = "release";
 // let env = "local";
 
diff --git a/pages/login/login.vue b/pages/login/login.vue
index c666fa7..de2659b 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -16,10 +16,10 @@
 						<up-button @click="weixinLogin" color="#20B128" size="large"><up-icon color="#fff"
 								size="28"></up-icon>手机号快捷登录</up-button>
 					</view>
-					<view class="btn">
+					<!-- <view class="btn">
 						<up-button @click="navgo('/pages/login/test')" color="#20B128" size="large"><up-icon
 								name="account-fill" color="#fff" size="28"></up-icon>真-手机号快捷登录</up-button>
-					</view>
+					</view> -->
 					<!-- <view class="btn">
             <up-button @click="officialCode" color="#20B128" size="large"><up-icon name="weixin-fill" color="#fff"
                 size="28"></up-icon>公众号授权</up-button>

From c03a38e1bc8e94de2d8c5e1a11aab70298bdb885 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Sat, 6 Jul 2024 13:48:13 +0800
Subject: [PATCH 8/8] add

---
 pagesOrder/settle/settle.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pagesOrder/settle/settle.vue b/pagesOrder/settle/settle.vue
index 3a6489d..b02dac6 100644
--- a/pagesOrder/settle/settle.vue
+++ b/pagesOrder/settle/settle.vue
@@ -37,7 +37,7 @@
 				style='display: flex;justify-content: space-between;width: 690rpx;align-items: center;'>
 				<view class="top" style="align-items: flex-start;">
 					<view style="color: #333;width: 200rpx;">
-						<view style="margin: 0 10rpx;color:#20B128;">推荐自提点</view>
+						<view style="margin: 0 10rpx;color:#20B128;width: 150rpx;">推荐自提点</view>
 						<view class="isreser"> {{reservation?"次日可提":"当日可提" }}
 						</view>
 					</view>