diff --git a/api/order.js b/api/order.js
index 193cb14..7e04004 100644
--- a/api/order.js
+++ b/api/order.js
@@ -74,4 +74,8 @@ export const refundReasonListApi = (data) => {
 // 订单退款申请
 export const applyRefundApi = (data) => {
 	return request.post('/order/order/apply_refund', data);
+}
+
+export const UserProductStorageLogApi = (data) => {
+	return request.get('/user_product_storage_log/UserProductStorageLog/lists', data);
 }
\ No newline at end of file
diff --git a/components/goodPopup.vue b/components/goodPopup.vue
index 3b8aff1..1744c24 100644
--- a/components/goodPopup.vue
+++ b/components/goodPopup.vue
@@ -63,14 +63,7 @@
 		computed,
 		nextTick,
 		ref,
-
 	} from "vue"
-	import {
-		toast
-	} from "../uni_modules/uview-plus";
-	import {
-		onShow
-	} from '@dcloudio/uni-app';
 
 	const foucs1 = ref(null)
 	const props = defineProps({
@@ -78,20 +71,17 @@
 			type: Boolean,
 			default: false
 		},
+		priceKey: {
+			type: Object,
+			default: () => ({})
+		}
+
 	})
 
 	const valChange = () => {
 		uni.vibrateShort();
 	}
 
-	let priceKey = ref({})
-	if (uni.getStorageSync('PRICE_KEY')) {
-		priceKey.value = JSON.parse(uni.getStorageSync('PRICE_KEY'));
-	} else {
-		priceKey.value = {};
-	}
-
-
 	const datas = ref({
 		cart_num: ''
 	});
@@ -121,7 +111,9 @@
 
 	const subtotal = computed(() => {
 		let num = +datas.value.cart_num || 1;
-		let sell = +datas.value[priceKey.value.off_activity == 1 ? priceKey.value.price : priceKey.value.op_price];
+		let sell = +datas.value[props.priceKey.off_activity == 1 ? props.priceKey.price : props
+			.priceKey
+			.op_price];
 		return Number(num * sell * 100 / 100).toFixed(2)
 	})
 
diff --git a/pageQuota/asset/index.vue b/pageQuota/asset/index.vue
index dbc874f..618b3cf 100644
--- a/pageQuota/asset/index.vue
+++ b/pageQuota/asset/index.vue
@@ -1,27 +1,33 @@
 <template>
-	<view class="m-card m-good" v-for="(item, index) in lists" :key="index">
-		<view class="shop-check" @click="item.check=!item.check">
-			<image v-if="!item.check" src="@/static/icon/n-check.png"></image>
-			<image v-else src="@/static/icon/check.png"></image>
+	<block v-if="lists.length">
+		<view class="m-card m-good" v-for="(item, index) in lists" :key="index">
+			<view class="shop-check" @click="item.check=!item.check">
+				<image v-if="!item.check" src="@/static/icon/n-check.png"></image>
+				<image v-else src="@/static/icon/check.png"></image>
+			</view>
+
+			<view class="image">
+				<up-image width="160rpx" height="160rpx" :src="item.image"></up-image>
+			</view>
+			<view class="body-content">
+				<view>
+					<view class="title">
+						<view> <text>{{item.store_name }}</text> x<text>{{item.nums }}</text> </view>
+						<view>¥{{item.price}}</view>
+					</view>
+				</view>
+				<view class="time">
+					<view style="float: right;">
+						<up-number-box :min="1" :max="item.nums" v-model="item.num"></up-number-box>
+					</view>
+				</view>
+			</view>
 		</view>
 
-		<view class="image">
-			<up-image width="160rpx" height="160rpx" :src="item.image"></up-image>
-		</view>
-		<view class="body-content">
-			<view>
-				<view class="title">
-					<view> <text>{{item.store_name }}</text> x<text>{{item.nums }}</text> </view>
-					<view>¥{{item.price}}</view>
-				</view>
-			</view>
-			<view class="time">
-				<view style="float: right;">
-					<up-number-box :min="1" :max="item.nums" v-model="item.num"></up-number-box>
-				</view>
-			</view>
-		</view>
-	</view>
+	</block>
+
+	<up-empty v-else mode="history" style="margin-top: 20vh;" text='没有更多内容了'>
+	</up-empty>
 	<view style="height: 200rpx;" />
 
 	<view class="bottom">
diff --git a/pageQuota/asset/lists.vue b/pageQuota/asset/lists.vue
new file mode 100644
index 0000000..a900e08
--- /dev/null
+++ b/pageQuota/asset/lists.vue
@@ -0,0 +1,137 @@
+<template>
+	<up-sticky bgColor="#fff" style="padding: 20rpx;">
+		<up-tabs :list="tabsLst" :itemStyle="{ width: '50vw', paddingBottom: '20rpx' }" lineColor='#50C758'
+			:current='currentTab' @change="tabsChange"></up-tabs>
+	</up-sticky>
+	<view class="content" v-if="lists.length">
+		<view class="card" v-for="(item,index) in lists" :key="item.id">
+			<view class="head">
+				<view class="">
+					{{item.system_store_name}}
+				</view>
+				<view v-if="currentTab==0" style="text-decoration: underline;text-underline-offset: 5rpx;"
+					@click="hdClick(item)">
+					提货码
+				</view>
+			</view>
+			<view class="card-li" v-if="currentTab==0">
+				<text class="lab">预约时间：</text>{{item.times}}
+			</view>
+			<view class="card-li" v-if="currentTab==1">
+				<text class="lab">提货时间：</text>{{item.update_time}}
+			</view>
+			<view class="card-li" style="display: flex;justify-content: space-between;">
+				<view class="">
+					<text class="lab">商品信息：</text>{{item.store_name}}
+				</view>
+				<view class="">
+					x{{item.nums}}
+				</view>
+			</view>
+		</view>
+	</view>
+
+	<up-empty v-else mode="history" style="margin-top: 20vh;" text='没有更多内容了'>
+	</up-empty>
+
+	<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>
+			<view style="font-weight: bold;color: #333;font-size: 26;text-align: center;margin-top: 20rpx;">
+				提货码 {{orderData.verify_code}}
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		reactive
+	} from "vue"
+	import {
+		UserProductStorageLogApi
+	} from "@/api/order.js"
+	import useUserStore from "@/store/user";
+
+	const userStore = useUserStore().userInfo;
+	const currentTab = ref(0)
+	const showVerifyPop = ref(false)
+	const orderData = reactive({})
+	const tabsLst = reactive([{
+			name: '已预约'
+		},
+		{
+			name: '已提货'
+		},
+
+	]);
+
+	const tabsChange = (e) => {
+		currentTab.value = e.index
+		getLists()
+	}
+
+
+	const lists = ref([{}])
+	const getLists = async () => {
+		let res = await UserProductStorageLogApi({
+			uid: userStore.id,
+			status: currentTab.value
+		})
+		lists.value = res.data.lists
+	}
+
+	const hdClick = (item) => {
+		orderData.verify_code = item.verify_code
+		orderData.verify_img = item.verify_img
+		showVerifyPop.value = true
+	}
+
+	getLists()
+</script>
+
+<style lang="scss">
+	.content {
+		padding: 20rpx;
+	}
+
+
+	.card {
+		background-color: white;
+		border-radius: 20rpx;
+		// padding: 20rpx;
+		margin-bottom: 20rpx;
+		padding-bottom: 20rpx;
+
+		.head {
+			background-color: #50C758;
+			border-radius: 20rpx 20rpx 0 0;
+			color: white;
+			padding: 20rpx;
+			font-size: 30rpx;
+			display: flex;
+			justify-content: space-between;
+		}
+
+		.card-li {
+			padding: 0 20rpx;
+			margin-top: 10rpx;
+
+			.lab {
+				color: #989898;
+			}
+		}
+	}
+
+	.mask {
+		position: fixed;
+		width: 100vw;
+		height: 100vh;
+		background-color: rgba(0, 0, 0, .5);
+		top: 0;
+		left: 0;
+		z-index: 99999 !important;
+	}
+</style>
\ No newline at end of file
diff --git a/pageQuota/vipUser/index.vue b/pageQuota/vipUser/index.vue
index 774a0bb..5b309d5 100644
--- a/pageQuota/vipUser/index.vue
+++ b/pageQuota/vipUser/index.vue
@@ -1,4 +1,5 @@
 <template>
+	<!-- 门店及身份选择 -->
 	<view class="" v-if="!STORE_INFO.id">
 		<up-modal :show="showModa" title="登录门店" @confirm="confirmStore" confirmColor='#20B128'>
 			<view class="slot-content">
@@ -7,7 +8,7 @@
 						<up-input v-model="storePhone" placeholder="请输入门店手机号"></up-input>
 					</up-form-item>
 				</up-form>
-				<up-form labelPosition="left" label-width="100rpx">
+				<!-- <up-form labelPosition="left" label-width="100rpx">
 					<up-form-item label="身份" borderBottom>
 						<up-radio-group v-model="Role" placement="row">
 							<up-radio activeColor="#20b128" label="行业会员" :name="1"
@@ -15,10 +16,11 @@
 							<up-radio activeColor="#20b128" label="商户" :name="4"></up-radio>
 						</up-radio-group>
 					</up-form-item>
-				</up-form>
+				</up-form> -->
 			</view>
 		</up-modal>
 	</view>
+	<!-- 门店及身份选择结束 -->
 
 	<view v-else>
 		<up-sticky bgColor="#fff" style="padding: 20rpx;">
@@ -27,7 +29,8 @@
 			<up-tabs v-else :list="tabsLst2" :itemStyle="{ width: '50vw', paddingBottom: '20rpx' }" lineColor='#50C758'
 				:current='currentTab' @change="tabsChange1"></up-tabs>
 		</up-sticky>
-		<!-- tabs0 -->
+
+		<!-- 开通行业会员 -->
 		<block v-if='currentTab == 0'>
 			<view class="card card1">
 				<view class="card1-tit">
@@ -52,8 +55,8 @@
 					</up-form-item>
 					<up-form-item label="">
 						<view @click="showPop = true" style="width: 100%;">
-							<up-input style="pointer-events: none" v-model="formData.address" border="none"
-								prefixIcon="map" readonly placeholder="点击选择地址" :customStyle="{
+							<up-input style="pointer-events: none" v-model="formData.address" border="none" prefixIcon="map"
+								readonly placeholder="点击选择地址" :customStyle="{
 									background: '#F3F3F3', padding: '20rpx',
 									'border-radius': '30rpx'
 								}" :placeholderStyle="{ color: '#444444' }" :prefixIconStyle="{ 'margin-right': '40rpx' }"
@@ -107,7 +110,9 @@
 
 			</view>
 		</block>
+		<!-- 开通行业会员结束 -->
 
+		<!-- 追加经营资金 -->
 		<block v-if="currentTab == 1 && Role == 1">
 			<view class="card card1">
 				<view class="card1-tit">
@@ -126,12 +131,11 @@
 						<up-input v-model="formData2.real_name" disabled border="none" prefixIcon="account"
 							placeholder="系统自动获取" color='grey'
 							:customStyle="{ background: '#F3F3F3', padding: '20rpx', 'border-radius': '30rpx' }"
-							:placeholderStyle="{ color: 'grey' }"
-							:prefixIconStyle="{ 'margin-right': '40rpx' }"></up-input>
+							:placeholderStyle="{ color: 'grey' }" :prefixIconStyle="{ 'margin-right': '40rpx' }"></up-input>
 					</up-form-item>
 					<up-form-item label="">
-						<up-input style="pointer-events: none" v-model="formData2.address" border="none"
-							prefixIcon="map" readonly color='grey' placeholder="系统自动获取" :customStyle="{
+						<up-input style="pointer-events: none" v-model="formData2.address" border="none" prefixIcon="map"
+							readonly color='grey' placeholder="系统自动获取" :customStyle="{
 								background: '#F3F3F3', padding: '20rpx',
 								'border-radius': '30rpx'
 							}" :placeholderStyle="{ color: 'grey' }" :prefixIconStyle="{ 'margin-right': '40rpx' }"></up-input>
@@ -179,93 +183,90 @@
 			</view>
 
 		</block>
+		<!-- 追加经营资金结束 -->
 
+		<<<<<<< HEAD <!-- tabs2 -->
+			=======
+			<!-- 开通列表-会员 -->
+			>>>>>>> ae7660e239bd4c38b57ca2035f3e2b16b578f714
+			<block v-if="currentTab == 2 && Role == 1">
+				<view class="vip-card">
+					<text>当前已开通：</text>
+					<up-count-to :startVal="0" :endVal="count"></up-count-to>
+					<text>位行业会员 </text>
+				</view>
 
-		<!-- tabs2 -->
-		<block v-if="currentTab == 2 && Role == 1">
-			<view class="vip-card">
-				<text>当前已开通：</text>
-				<up-count-to :startVal="0" :endVal="count"></up-count-to>
-				<text>位{{ Role == 1 ? '行业会员' : '商户' }}</text>
-			</view>
-
-			<view class="table">
-				<uni-table stripe emptyText="暂无更多数据" width="100%">
-					<!-- 表头行 -->
-					<uni-tr>
-						<!-- <uni-th width="20" align="center">序号</uni-th> -->
-						<uni-th width="50" align="center">行业会员</uni-th>
-						<uni-th width="50" align="center">经营资金</uni-th>
-						<uni-th width="50" align="center">开通时间</uni-th>
-						<uni-th width="50" align="center">角色</uni-th>
-						<uni-th width="50" align="center">状态</uni-th>
-					</uni-tr>
-					<!-- 表格数据行 -->
-					<uni-tr v-for="(item, index) in lists" :key="item.order_id">
-						<!-- <uni-td align="center">{{index+1}}</uni-td> -->
-						<uni-td style="font-size: 20rpx;" align="center">
-							<view>
-								{{ item.real_name }}
-							</view>
-							<view style="color: #33B83A;" @click="popPhone = item.mobile, showModal = true">
-								查看号码
-							</view>
-						</uni-td>
-						<uni-td style="font-size: 20rpx;" align="center">{{ item.price }}</uni-td>
-						<uni-td style="font-size: 20rpx;" align="center">{{ item.create_time }}</uni-td>
-						<uni-td style="font-size: 20rpx;" align="center">{{ item.ship_name }}</uni-td>
-						<uni-td style="font-size: 20rpx;" align="center">
-							<view v-if="item.paid == 1">已开通</view>
-							<view v-else style="color:#33B83A ;">
-								<view @click="upadtaStatus(item)">
-									未开通,查询
+				<view class="table">
+					<uni-table stripe emptyText="暂无更多数据" width="100%">
+						<uni-tr>
+							<uni-th width="50" align="center">行业会员</uni-th>
+							<uni-th width="50" align="center">经营资金</uni-th>
+							<uni-th width="50" align="center">开通时间</uni-th>
+							<uni-th width="50" align="center">角色</uni-th>
+							<uni-th width="50" align="center">状态</uni-th>
+						</uni-tr>
+						<uni-tr v-for="(item, index) in lists" :key="item.order_id">
+							<uni-td style="font-size: 20rpx;" align="center">
+								<view>
+									{{ item.real_name }}
 								</view>
-								<view @click="rePay(item)">
-									重新支付
+								<view style="color: #33B83A;" @click="popPhone = item.mobile, showModal = true">
+									查看号码
 								</view>
-							</view>
-						</uni-td>
-					</uni-tr>
-				</uni-table>
-			</view>
-		</block>
+							</uni-td>
+							<uni-td style="font-size: 20rpx;" align="center">{{ item.price }}</uni-td>
+							<uni-td style="font-size: 20rpx;" align="center">{{ item.create_time }}</uni-td>
+							<uni-td style="font-size: 20rpx;" align="center">{{ item.ship_name }}</uni-td>
+							<uni-td style="font-size: 20rpx;" align="center">
+								<view v-if="item.paid == 1">已开通</view>
+								<view v-else style="color:#33B83A ;">
+									<view @click="upadtaStatus(item)">
+										未开通,查询
+									</view>
+									<view @click="rePay(item)">
+										重新支付
+									</view>
+								</view>
+							</uni-td>
+						</uni-tr>
+					</uni-table>
+				</view>
+			</block>
+			<!-- 开通列表-会员结束 -->
 
+			<<<<<<< HEAD=======<!-- 开通列表-商户 -->
+				>>>>>>> ae7660e239bd4c38b57ca2035f3e2b16b578f714
+				<block v-if="currentTab == 1 && Role == 4">
+					<view class="vip-card">
+						<text>当前已开通：</text>
+						<up-count-to :startVal="0" :endVal="count"></up-count-to>
+						<text>位商户</text>
+					</view>
 
+					<view class="table">
+						<uni-table stripe emptyText="暂无更多数据" width="100%">
+							<uni-tr>
+								<uni-th width="50" align="center">商户</uni-th>
+								<uni-th width="50" align="center">查看号码</uni-th>
+								<uni-th width="50" align="center">开通时间</uni-th>
+								<uni-th width="50" align="center">状态</uni-th>
+							</uni-tr>
+							<!-- 表格数据行 -->
+							<uni-tr v-for="(item, index) in lists" :key="item.order_id">
+								<uni-td style="font-size: 20rpx;" align="center">{{ item.nickname }}</uni-td>
+								<uni-td style="font-size: 20rpx;" align="center">{{ item.mobile }}</uni-td>
+								<uni-td style="font-size: 20rpx;" align="center">{{ item.create_time }}</uni-td>
+								<uni-td style="font-size: 20rpx;" align="center">
+									<view>已开通</view>
+								</uni-td>
+							</uni-tr>
+						</uni-table>
+					</view>
+				</block>
+				<!-- 开通列表-商户结束 -->
 
-		<block v-if="currentTab == 1 && Role == 4">
-			<view class="vip-card">
-				<text>当前已开通：</text>
-				<up-count-to :startVal="0" :endVal="count"></up-count-to>
-				<text>位{{ Role == 1 ? '行业会员' : '商户' }}</text>
-			</view>
-
-			<view class="table">
-				<uni-table stripe emptyText="暂无更多数据" width="100%">
-					<!-- 表头行 -->
-					<uni-tr>
-						<!-- <uni-th width="20" align="center">序号</uni-th> -->
-						<uni-th width="50" align="center">商户</uni-th>
-						<uni-th width="50" align="center">查看号码</uni-th>
-						<uni-th width="50" align="center">开通时间</uni-th>
-						<uni-th width="50" align="center">状态</uni-th>
-					</uni-tr>
-					<!-- 表格数据行 -->
-					<uni-tr v-for="(item, index) in lists" :key="item.order_id">
-						<!-- <uni-td align="center">{{index+1}}</uni-td> -->
-						<uni-td style="font-size: 20rpx;" align="center">{{ item.nickname }}</uni-td>
-						<uni-td style="font-size: 20rpx;" align="center">{{ item.mobile }}</uni-td>
-						<uni-td style="font-size: 20rpx;" align="center">{{ item.create_time }}</uni-td>
-						<uni-td style="font-size: 20rpx;" align="center">
-							<view>已开通</view>
-
-						</uni-td>
-					</uni-tr>
-				</uni-table>
-			</view>
-		</block>
 	</view>
 	<view style="height: 50rpx;" />
-
 	<!-- 地址选择器 -->
 	<up-popup :show="showPop" @close="showPop = false" @open="showPop = true" :round="10">
 		<view style="padding: 20rpx;">
@@ -273,8 +274,8 @@
 				:activeStyle="{ color: '#20B128' }"></up-tabs>
 			<up-line style="margin-top:20rpx "></up-line>
 			<view class="address-content" v-if='currentAddressIndex == 0'>
-				<view class="address-li" :class='{ act: item.city_code == formData.city }'
-					v-for="item in addressList.city" :key="item.city_code" @click="addressLiClick(0, item)">
+				<view class="address-li" :class='{ act: item.city_code == formData.city }' v-for="item in addressList.city"
+					:key="item.city_code" @click="addressLiClick(0, item)">
 					<text>{{ item.city_name }}</text>
 					<up-icon name="arrow-right" :color="item.city_code == formData.city ? '#20B128' : '#777777'" />
 				</view>
@@ -297,21 +298,22 @@
 				<view class="address-li" v-for="item in addressList.village" @click="addressLiClick(3, item)"
 					:key="item.village_code" :class='{ act: item.village_code == formData.village }'>
 					<text>{{ item.village_name }}</text>
-					<up-icon name="arrow-right"
-						:color="item.village_code == formData.village ? '#20B128' : '#777777'" />
+					<up-icon name="arrow-right" :color="item.village_code == formData.village ? '#20B128' : '#777777'" />
 				</view>
 			</view>
 			<view class="address-content" v-else-if='currentAddressIndex == 4'>
-				<view class="address-li" :class='{ act: item.id == formData.brigade }'
-					v-for="item in addressList.brigade" :key="item.id" @click="addressLiClick(4, item)">
+				<view class="address-li" :class='{ act: item.id == formData.brigade }' v-for="item in addressList.brigade"
+					:key="item.id" @click="addressLiClick(4, item)">
 					<text>{{ item.brigade_name }}</text>
 					<up-icon name="arrow-right" :color="item.id == formData.brigade ? '#20B128' : '#777777'" />
 				</view>
 			</view>
 		</view>
 	</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>
+	<!-- 会员号码查看modal -->
 	<up-modal :show="showModal" title="电话号码" content='15884967539' :closeOnClickOverlay="true" :zoom="true"
 		confirmColor='#33B83A' @confirm='showModal = false' @close="showModal = false">
 		<view class="slot-content">
@@ -320,468 +322,490 @@
 	</up-modal>
 </template>
 <script setup>
-	import {
-		reactive,
-		ref
-	} from 'vue';
-	import useUserStore from "@/store/user";
-	import {
-		provinceListApi,
-		cityListApi,
-		areaListApi,
-		streetListApi,
-		villageListApi,
-		brigadeListApi
-	} from "@/api/address.js"
-	import {
-		vipRechargeApi,
-		getRechargeListApi,
-		isUserShipApi,
-		rechargeCountApi,
-		reVipRechargeApi,
-		rechargeListsApi,
-		updataOrderApi,
-		getStoreByPhone,
-		getUserLabel,
-		getUserShip,
-		getCreateLists,
-		getReportingSms,
-		getVipInfoByPhone
-	} from "@/api/user.js"
-	import Push from "@/utils/push.js"
-	import {
-		onPullDownRefresh,
-		onLoad,
-		onReachBottom
-	} from "@dcloudio/uni-app"
-	import {
-		config
-	} from "@/config/app.js"
+import {
+	reactive,
+	ref
+} from 'vue';
+import useUserStore from "@/store/user";
+import {
+	provinceListApi,
+	cityListApi,
+	areaListApi,
+	streetListApi,
+	villageListApi,
+	brigadeListApi
+} from "@/api/address.js"
+import {
+	vipRechargeApi,
+	getRechargeListApi,
+	isUserShipApi,
+	rechargeCountApi,
+	reVipRechargeApi,
+	rechargeListsApi,
+	updataOrderApi,
+	getStoreByPhone,
+	getUserLabel,
+	getUserShip,
+	getCreateLists,
+	getReportingSms,
+	getVipInfoByPhone
+} from "@/api/user.js"
+import Push from "@/utils/push.js"
+import {
+	onPullDownRefresh,
+	onLoad,
+	onReachBottom
+} from "@dcloudio/uni-app"
+import {
+	config
+} from "@/config/app.js"
 
-	const showModal = ref(false)
-	const showPop1 = ref(false)
-	const Role = ref(1)
-	const popPhone = ref('')
-	// const range = ref({})
-	const columns = ref([])
-	const showModa = ref(true)
-	const storePhone = ref('')
-	const tabsLst = reactive([{
-			name: '开通行业会员'
-		},
-		{
-			name: '追加经营资金'
-		},
-		{
-			name: '已开通列表'
-		},
-	]);
+const currentTab = ref(0)
+const showModal = ref(false)
+const showPop1 = ref(false)
+const Role = ref(1)
+const popPhone = ref('')
+const columns = ref([])
+const showModa = ref(true)
+const tabsLst = reactive([{
+	name: '开通行业会员'
+},
+{
+	name: '追加经营资金'
+},
+{
+	name: '已开通列表'
+},
+]);
+const tabsLst2 = reactive([{
+	name: '开通商户'
+},
+{
+	name: '已开通列表'
+},
+]);
+const vipList = reactive([1, 2, 3, 4, 5, 6, 7, 8])
 
-	const tabsLst2 = reactive([{
-			name: '开通商户'
-		},
-		{
-			name: '已开通列表'
-		},
-	]);
-
-
-
-	const tabsChange = (e) => {
-		currentTab.value = e.index
-		if (e.index == 2) {
-			getCount()
-			getLists()
-		}
-		// getLists()
-	}
-	const tabsChange1 = (e) => {
-		currentTab.value = (e.index)
+const tabsChange = (e) => {
+	currentTab.value = e.index
+	if (e.index == 2) {
+		getCount()
 		getLists()
 	}
+}
 
-	const confirmStore = () => {
-		getStoreByPhone({
-			phone: storePhone.value
-		}).then(res => {
-			for (let key in res.data) {
-				STORE_INFO[key] = res.data[key]
-			}
-			setPhoneOneDay()
-		}).catch(err => {
-			uni.$u.toast('未查到店铺信息，请检查手机号码')
-		})
-	}
-	//  用户选择的门店信息
-	let STORE_INFO = reactive({
-		id: ""
+const tabsChange1 = (e) => {
+	currentTab.value = (e.index)
+	getLists()
+}
+
+//  用户选择的门店信息
+const storePhone = ref('')
+let STORE_INFO = reactive({
+	id: "",
+})
+const confirmStore = () => {
+	getStoreByPhone({
+		phone: storePhone.value
+	}).then(res => {
+		for (let key in res.data) {
+			STORE_INFO[key] = res.data[key]
+		}
+		setPhoneOneDay()
+	}).catch(err => {
+		uni.$u.toast('未查到店铺信息，请检查手机号码')
 	})
+}
 
-
-	// 门店手机号保留一天
-	const setPhoneOneDay = () => {
-		if (uni.getStorageSync('VIP_PHONE')) return;
-		const currentDate = new Date();
-		const nextDay = new Date(currentDate);
-		nextDay.setDate(currentDate.getDate() + 1);
-		uni.setStorageSync('VIP_PHONE', JSON.stringify({
-			time: nextDay,
-			phone: storePhone.value
-		}));
+// 门店手机号保留一天
+const setPhoneOneDay = () => {
+	if (uni.getStorageSync('VIP_PHONE')) return;
+	const currentDate = new Date();
+	const nextDay = new Date(currentDate);
+	nextDay.setDate(currentDate.getDate() + 1);
+	uni.setStorageSync('VIP_PHONE', JSON.stringify({
+		time: nextDay,
+		phone: storePhone.value
+	}));
+}
+const getPhoneOneDay = () => {
+	if (!uni.getStorageSync('VIP_PHONE')) return;
+	let data = JSON.parse(uni.getStorageSync('VIP_PHONE'))
+	if (new Date() > data.time) {
+		uni.removeStorageSync('VIP_PHONE');
+	} else {
+		storePhone.value = data.phone
 	}
-	const getPhoneOneDay = () => {
-		if (uni.getStorageSync('VIP_PHONE')) {
-			let data = JSON.parse(uni.getStorageSync('VIP_PHONE'))
-			if (new Date() > data.time) {
-				uni.removeStorageSync('VIP_PHONE');
-			} else {
-				storePhone.value = data.phone
-			}
-		}
-	}
-	// 手机保留一天结束
+}
+// 手机保留一天结束
 
-	// 验证码
-	const vipList = reactive([1, 2, 3, 5, 6, 7, 8])
-	const cutDown = ref(0)
-	const flag = ref(true)
-	const code = ref('')
-	const checkPhone = (phone) => {
-		const regex = /^1[3-9]\d{9}$/;
-		return regex.test(phone) ? true : false
-	}
+// 验证码
+const cutDown = ref(0)
+const flag = ref(true)
+const code = ref('')
+const checkPhone = (phone) => {
+	const regex = /^1[3-9]\d{9}$/;
+	return regex.test(phone) ? true : false
+}
 
-	const getCode = async () => {
-		if (!checkPhone(formData.mobile)) return uni.$u.toast('请输入正确的手机号')
-		await getReportingSms({
-			account: formData.mobile
-		})
-		flag.value = false
-		cutDown.value = 60
-		let timer = setInterval(() => {
-			cutDown.value--
-			if (cutDown.value <= 0) {
-				cutDown.value = 0;
-				clearInterval(timer);
-			}
-		}, 1000)
-	}
-	// 验证码结束
-
-
-	const currentTab = ref(0)
-	const formData = reactive({
-		store_id: STORE_INFO.id,
-		mobile: "",
-		province: 510000,
-		city: '',
-		area: "",
-		street: "",
-		village: "",
-		real_name: "",
-		auth_code: "",
-		address: "",
-		label_name: "",
-		label_id: "",
-		label_limit: "",
-		user_ship: '',
-		code: '',
-		brigade: "",
-		price: "",
-		// store_id: STORE_INFO.id,
-		// mobile: "19130550023",
-		// province: 510000,
-		// city: '510500',
-		// area: "510503",
-		// street: "510503102",
-		// village: "510503102201",
-		// real_name: "赵明军",
-		// auth_code: "131197337173621549",
-		// address: "",
-		// label_name: "",
-		// label_id: "4",
-		// user_ship: '1',
-		// price: 0.02,
-		// code: '12'
+const getCode = async () => {
+	if (!checkPhone(formData.mobile)) return uni.$u.toast('请输入正确的手机号')
+	await getReportingSms({
+		account: formData.mobile
 	})
+	flag.value = false
+	cutDown.value = 60
+	let timer = setInterval(() => {
+		cutDown.value--
+		if (cutDown.value <= 0) {
+			cutDown.value = 0;
+			clearInterval(timer);
+		}
+	}, 1000)
+}
+// 验证码结束
+const formData = reactive({
+	store_id: STORE_INFO.id,
+	mobile: "",
+	province: 510000,
+	city: '',
+	area: "",
+	street: "",
+	village: "",
+	real_name: "",
+	auth_code: "",
+	address: "",
+	label_name: "",
+	label_id: "",
+	label_limit: "",
+	user_ship: '',
+	code: '',
+	brigade: "",
+	price: "",
+})
 
 
-	const formData2 = reactive({
-		store_id: STORE_INFO.id,
-		mobile: "",
-		province: 510000,
-		city: '',
-		area: "",
-		street: "",
-		village: "",
-		real_name: "",
-		auth_code: "",
-		address: "",
-		label_name: "",
-		label_id: "",
-		label_limit: "",
-		user_ship: '',
-		brigade: "",
-		price: "",
+const formData2 = reactive({
+	store_id: STORE_INFO.id,
+	mobile: "",
+	province: 510000,
+	city: '',
+	area: "",
+	street: "",
+	village: "",
+	real_name: "",
+	auth_code: "",
+	address: "",
+	label_name: "",
+	label_id: "",
+	label_limit: "",
+	user_ship: '',
+	brigade: "",
+	price: "",
+})
+
+
+const getFormData2 = (data) => {
+	formData2.city = data.address_info?.city
+	formData2.area = data.address_info?.area
+	formData2.province = data.address_info?.province
+	formData2.street = data.address_info?.street
+	formData2.village = data.address_info?.village
+	formData2.real_name = data.real_name
+	formData2.address = data.address_info?.address_like
+	formData2.label_id = data.user_ship
+	formData2.user_ship = data.user_ship
+	formData2.brigade = data.address_info?.brigade
+	columns.value[0].forEach(item => {
+		if (item.id == formData2.label_id) {
+			formData2.label_name = item.title
+			formData2.label_limit = item.limit
+		}
 	})
+}
 
 
-	const getFormData2 = (data) => {
-		formData2.city = data.address_info?.city
-		formData2.area = data.address_info?.area
-		formData2.province = data.address_info?.province
-		formData2.street = data.address_info?.street
-		formData2.village = data.address_info?.village
-		formData2.real_name = data.real_name
-		formData2.address = data.address_info?.address_like
-		formData2.label_id = data.user_ship
-		formData2.user_ship = data.user_ship
-		formData2.brigade = data.address_info?.brigade
-		columns.value[0].forEach(item => {
-			if (item.id == formData2.label_id) {
-				formData2.label_name = item.title
-				formData2.label_limit = item.limit
-			}
-		})
-	}
-
-
-	const phoneChnge = async (type) => {
-		// typewhite 1 行业会员 2 经营资金
-		if (type == 1) {
-			if (!checkPhone(formData.mobile)) return
-			try {
-				let {
-					data
-				} = await getVipInfoByPhone({
-					mobile: formData.mobile
-				})
-				formData2.mobile = formData.mobile
-				if (data.user_ship == 4 || data.user_ship == 0) return;
-				if (Role.value == 1) {
-					uni.$u.toast('该用户已是会员请使用追加经营资金进行收款')
-					currentTab.value = 1
-					return getFormData2(data)
-				} else {
-					return uni.$u.toast('该用户已是会员，无法进行商户报备')
-				}
-
-			} catch (error) {}
-		} else {
-			if (formData2.mobile.length == 0) resetFormData();
-			if (!checkPhone(formData2.mobile)) return
-			uni.showLoading({
-				title: '查询用户中'
-			})
-			try {
-				let {
-					data
-				} = await getVipInfoByPhone({
-					mobile: formData2.mobile
-				})
-				if (!vipList.includes(data.user_ship)) {
-					uni.hideLoading()
-					return uni.$u.toast('查询失败');
-				}
-				if (formData.mobile) {
-					formData2.mobile = formData.mobile
-				}
-				uni.hideLoading()
-				return getFormData2(data)
-
-			} catch (error) {
-				uni.hideLoading()
-				uni.$u.toast('查询失败');
-			}
-		}
-	}
-
-
-	const resetFormData = () => {
-		for (let key in formData) {
-			(key != 'price') && (formData[key] = '')
-		}
-		for (let key in formData2) {
-			formData2[key] = ''
-		}
-		tabsList.forEach(item => {
-			item.name = '请选择'
-		})
-		formData.province = 510000
-		formData2.province = 510000
-		cutDown.value = 0
-		currentAddressIndex.value = 0
-	}
-
-	const conformRole = (e) => {
-		formData.label_name = e.value[0].title
-		formData.label_id = e.value[0].id
-		showPop1.value = false
-	}
-
-
-	// 地址选择
-	const showPop = ref(false)
-	const currentAddressIndex = ref(0)
-	const currentAddressList = () => {
-		if (!formData.city) return [0, 'city'];
-		else if (formData.area) return [1, 'area'];
-		else if (formData.street) return [2, 'street'];
-		else if (formData.village) return [3, 'village'];
-		else if (formData.brigade) return [4, 'brigade'];
-	}
-
-	const addressTbasChange = (e) => {
-		currentAddressIndex.value = e.index
-	}
-
-	const addressList = reactive({
-		city: [],
-		area: [],
-		street: [],
-		village: [],
-		brigade: []
-	})
-	const addressLiClick = async (i, item) => {
-		if (i == 0) {
-			formData.city = item.city_code
-			tabsList[0].name = item.city_name
-			let res = await areaListApi({
-				city_code: formData.city
-			})
-			addressList.area = res.data
-		}
-		if (i == 1) {
-			formData.area = item.area_code
-			tabsList[1].name = item.area_name
-			let res = await streetListApi({
-				area_code: formData.area
-			})
-			addressList.street = res.data
-		}
-
-		if (i == 2) {
-			formData.street = item.street_code
-			tabsList[2].name = item.street_name
-			let res = await villageListApi({
-				street_code: formData.street
-			})
-			addressList.village = res.data
-		}
-		if (i == 3) {
-			formData.village = item.village_code
-			tabsList[3].name = item.village_name
-			let res = await brigadeListApi({
-				village_code: formData.village
-			})
-			addressList.brigade = res.data
-		}
-		if (i == 4) {
-			formData.brigade = item.id
-			tabsList[4].name = item.brigade_name
-
-			formData.address = tabsList[0].name + tabsList[1].name + tabsList[2].name + tabsList[3].name +
-				tabsList[4].name
-			return showPop.value = false
-		}
-		formData.address = tabsList[0].name + tabsList[1].name + tabsList[2].name + tabsList[3].name + tabsList[4]
-			.name
-		return currentAddressIndex.value++
-	}
-	const getCityList = async () => {
-		let res = await cityListApi({
-			province_code: formData.province
-		})
-		addressList.city = res.data
-	}
-	const tabsList = reactive(
-		[{
-				name: "请选择"
-			},
-			{
-				name: '请选择',
-				disabled: false
-			},
-			{
-				name: '请选择',
-				disabled: false
-			},
-			{
-				name: '请选择',
-				disabled: false
-			},
-			{
-				name: '请选择',
-				disabled: false
-			},
-		]);
-
-	let timerInvol = null
-	let paySuccess;
-	// 开起一个scoket监听用户知否支付成功
-	const userInfo = useUserStore().userInfo;
-	const connection = new Push({
-		url: config.WSS_URL, // websocket地址
-		app_key: '2ce3ce22329517213caa7dad261f5695',
-	});
-	const user_channel = connection.subscribe(`wechat_mmp_${userInfo.id}`);
-	user_channel.on('message', function(data) {
+const phoneChnge = async (type) => {
+	// typewhite 1 行业会员 2 经营资金
+	if (type == 1) {
+		if (!checkPhone(formData.mobile)) return
 		try {
-			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) => {
-		if (Role.value == 4) {
-			if (!formData.real_name) return uni.$u.toast('请填写真实姓名');
-			if (!formData.mobile) return uni.$u.toast('请填写电话号码');
-			if (!formData.code) return uni.$u.toast('请输入短信验证码');
-			if (!formData.address) return uni.$u.toast('请选择地址');
-			delete formData.recharge_type
-			delete formData.auth_code
-			formData.user_ship = 4
-			formData.store_id = STORE_INFO.id
-			vipRechargeApi(formData).then(res => {
-				resetFormData()
-				getLists()
-				currentTab.value = 1
+			let {
+				data
+			} = await getVipInfoByPhone({
+				mobile: formData.mobile
 			})
-			return
+			formData2.mobile = formData.mobile
+			if (data.user_ship == 0) return;
+			if (Role.value == 1) {
+				uni.$u.toast('该用户已是会员请使用追加经营资金进行收款')
+				currentTab.value = 1
+				return getFormData2(data)
+			} else {
+				return uni.$u.toast('该用户已是会员，无法进行商户报备')
+			}
+
+		} catch (error) { }
+	} else {
+		if (formData2.mobile.length == 0) resetFormData();
+		if (!checkPhone(formData2.mobile)) return
+		uni.showLoading({
+			title: '查询用户中'
+		})
+		try {
+			let {
+				data
+			} = await getVipInfoByPhone({
+				mobile: formData2.mobile
+			})
+			if (!vipList.includes(data.user_ship)) {
+				uni.hideLoading()
+				return uni.$u.toast('查询失败');
+			}
+			if (formData.mobile) {
+				formData2.mobile = formData.mobile
+			}
+			uni.hideLoading()
+			return getFormData2(data)
+
+		} catch (error) {
+			uni.hideLoading()
+			uni.$u.toast('查询失败');
 		}
-		if (type == 2) {
-			if (!formData2.mobile) 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'
-			// formData2.user_ship = formData2.label_id
-			// vipRechargeApi(formData2).then(res => {
+	}
+}
+
+
+const resetFormData = () => {
+	for (let key in formData) {
+		(key != 'price') && (formData[key] = '')
+	}
+	for (let key in formData2) {
+		formData2[key] = ''
+	}
+	tabsList.forEach(item => {
+		item.name = '请选择'
+	})
+	formData.province = 510000
+	formData2.province = 510000
+	cutDown.value = 0
+	currentAddressIndex.value = 0
+}
+
+const conformRole = (e) => {
+	formData.label_name = e.value[0].title
+	formData.label_id = e.value[0].id
+	showPop1.value = false
+}
+
+// 地址选择
+const showPop = ref(false)
+const currentAddressIndex = ref(0)
+const currentAddressList = () => {
+	if (!formData.city) return [0, 'city'];
+	else if (formData.area) return [1, 'area'];
+	else if (formData.street) return [2, 'street'];
+	else if (formData.village) return [3, 'village'];
+	else if (formData.brigade) return [4, 'brigade'];
+}
+
+const addressTbasChange = (e) => {
+	currentAddressIndex.value = e.index
+}
+
+const addressList = reactive({
+	city: [],
+	area: [],
+	street: [],
+	village: [],
+	brigade: []
+})
+const addressLiClick = async (i, item) => {
+	if (i == 0) {
+		formData.city = item.city_code
+		tabsList[0].name = item.city_name
+		let res = await areaListApi({
+			city_code: formData.city
+		})
+		addressList.area = res.data
+	}
+	if (i == 1) {
+		formData.area = item.area_code
+		tabsList[1].name = item.area_name
+		let res = await streetListApi({
+			area_code: formData.area
+		})
+		addressList.street = res.data
+	}
+
+	if (i == 2) {
+		formData.street = item.street_code
+		tabsList[2].name = item.street_name
+		let res = await villageListApi({
+			street_code: formData.street
+		})
+		addressList.village = res.data
+	}
+	if (i == 3) {
+		formData.village = item.village_code
+		tabsList[3].name = item.village_name
+		let res = await brigadeListApi({
+			village_code: formData.village
+		})
+		addressList.brigade = res.data
+	}
+	if (i == 4) {
+		formData.brigade = item.id
+		tabsList[4].name = item.brigade_name
+
+		formData.address = tabsList[0].name + tabsList[1].name + tabsList[2].name + tabsList[3].name +
+			tabsList[4].name
+		return showPop.value = false
+	}
+	formData.address = tabsList[0].name + tabsList[1].name + tabsList[2].name + tabsList[3].name + tabsList[4]
+		.name
+	return currentAddressIndex.value++
+}
+const getCityList = async () => {
+	let res = await cityListApi({
+		province_code: formData.province
+	})
+	addressList.city = res.data
+}
+const tabsList = reactive(
+	[{
+		name: "请选择"
+	},
+	{
+		name: '请选择',
+		disabled: false
+	},
+	{
+		name: '请选择',
+		disabled: false
+	},
+	{
+		name: '请选择',
+		disabled: false
+	},
+	{
+		name: '请选择',
+		disabled: false
+	},
+	]);
+
+let timerInvol = null
+let paySuccess;
+// 开起一个scoket监听用户知否支付成功
+const userInfo = useUserStore().userInfo;
+const connection = new Push({
+	url: config.WSS_URL, // websocket地址
+	app_key: '2ce3ce22329517213caa7dad261f5695',
+});
+const user_channel = connection.subscribe(`wechat_mmp_${userInfo.id}`);
+user_channel.on('message', function (data) {
+	try {
+		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) => {
+	if (Role.value == 4) {
+		if (!formData.real_name) return uni.$u.toast('请填写真实姓名');
+		if (!formData.mobile) return uni.$u.toast('请填写电话号码');
+		if (!formData.code) return uni.$u.toast('请输入短信验证码');
+		if (!formData.address) return uni.$u.toast('请选择地址');
+		delete formData.recharge_type
+		delete formData.auth_code
+		formData.user_ship = 4
+		formData.store_id = STORE_INFO.id
+		vipRechargeApi(formData).then(res => {
+			resetFormData()
+			getLists()
+			currentTab.value = 1
+		})
+		return
+	}
+	if (type == 2) {
+		if (!formData2.mobile) 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'
+		// formData2.user_ship = formData2.label_id
+		// vipRechargeApi(formData2).then(res => {
+		// 	uni.showLoading({
+		// 		title: '支付中...'
+		// 	});
+		// 	timerInvol = setTimeout(() => {
+		// 		uni.hideLoading();
+		// 		uni.$u.toast('支付超时');
+		// 		console.log("支付超时")
+		// 	}, 10000)
+		// })
+		// return
+		uni.scanCode({
+			success: function (res) {
+				if (String(res.result.length) != 18) return uni.$u.toast('二维码未扫描完整');
+				uni.showLoading({
+					title: '支付中...'
+				});
+				formData2.auth_code = res.result
+				formData2.recharge_type = 'INDUSTRYMEMBERS'
+				formData2.user_ship = formData2.label_id
+				vipRechargeApi({
+					...formData2,
+					type: 2
+				}).then(res => {
+					paySuccess = false;
+					timerInvol = setTimeout(() => {
+						uni.hideLoading();
+						if (!paySuccess) {
+							uni.$u.toast('支付超时');
+						}
+					}, 30000)
+				})
+			}
+		});
+	} else {
+		if (!formData.real_name) return uni.$u.toast('请填写真实姓名');
+		if (!formData.mobile) return uni.$u.toast('请填写电话号码');
+		if (!formData.code) return uni.$u.toast('请输入短信验证码');
+		if (!formData.address) return uni.$u.toast('请选择地址');
+		if (!formData.label_id) return uni.$u.toast('请选择用户身份');
+		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
+			// vipRechargeApi(formData).then(res => {
 			// 	uni.showLoading({
 			// 		title: '支付中...'
 			// 	});
@@ -792,19 +816,20 @@
 			// 	}, 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) {
+				success: function (res) {
 					if (String(res.result.length) != 18) return uni.$u.toast('二维码未扫描完整');
 					uni.showLoading({
 						title: '支付中...'
 					});
-					formData2.auth_code = res.result
-					formData2.recharge_type = 'INDUSTRYMEMBERS'
-					formData2.user_ship = formData2.label_id
-					vipRechargeApi({
-						...formData2,
-						type: 2
-					}).then(res => {
+					formData.auth_code = res.result
+					vipRechargeApi(formData).then(res => {
 						paySuccess = false;
 						timerInvol = setTimeout(() => {
 							uni.hideLoading();
@@ -815,392 +840,345 @@
 					})
 				}
 			});
-		} else {
-			if (!formData.real_name) return uni.$u.toast('请填写真实姓名');
-			if (!formData.mobile) return uni.$u.toast('请填写电话号码');
-			if (!formData.code) return uni.$u.toast('请输入短信验证码');
-			if (!formData.address) return uni.$u.toast('请选择地址');
-			if (!formData.label_id) return uni.$u.toast('请选择用户身份');
-			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
-				// vipRechargeApi(formData).then(res => {
-				// 	uni.showLoading({
-				// 		title: '支付中...'
-				// 	});
-				// 	timerInvol = setTimeout(() => {
-				// 		uni.hideLoading();
-				// 		uni.$u.toast('支付超时');
-				// 		console.log("支付超时")
-				// 	}, 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('二维码未扫描完整');
-						uni.showLoading({
-							title: '支付中...'
-						});
-						formData.auth_code = res.result
-						vipRechargeApi(formData).then(res => {
-							paySuccess = false;
-							timerInvol = setTimeout(() => {
-								uni.hideLoading();
-								if (!paySuccess) {
-									uni.$u.toast('支付超时');
-								}
-							}, 30000)
-						})
-					}
-				});
-			}
 		}
 	}
+}
 
-	const rePay = (item) => {
-		uni.scanCode({
-			success: function(res) {
-				if (String(res.result.length) != 18) return uni.$u.toast('二维码未扫描完整');
-				uni.showLoading({
-					title: '等待用户支付'
-				});
-				reVipRechargeApi({
-					id: item.id,
-					auth_code: res.result
-				}).then(res => {
-					timerInvol = setTimeout(() => {
-						uni.hideLoading();
-						if (!paySuccess) {
-							uni.$u.toast('支付超时');
-						}
-					}, 30000)
-				})
-			}
-		});
-	}
+const rePay = (item) => {
+	uni.scanCode({
+		success: function (res) {
+			if (String(res.result.length) != 18) return uni.$u.toast('二维码未扫描完整');
+			uni.showLoading({
+				title: '等待用户支付'
+			});
+			reVipRechargeApi({
+				id: item.id,
+				auth_code: res.result
+			}).then(res => {
+				timerInvol = setTimeout(() => {
+					uni.hideLoading();
+					if (!paySuccess) {
+						uni.$u.toast('支付超时');
+					}
+				}, 30000)
+			})
+		}
+	});
+}
 
-	const tofixedPrice = (type = 1) => {
-		if (type == 2) return formData2.price = (+formData2.price).toFixed(2)
-	}
+const tofixedPrice = (type = 1) => {
+	if (type == 2) return formData2.price = (+formData2.price).toFixed(2)
+}
 
-	// 支付成功后清除formData并且切换tabs2
-	const paySuccessToTabs2 = () => {
-		uni.hideLoading()
-		uni.showToast({
-			title: '支付成功',
-			duration: 2000,
-			success() {
-				currentTab.value = 2
-				resetFormData()
-				setTimeout(() => {
-					getLists()
-					getCount()
-				}, 500); // 延迟1秒执行
-			}
-		});
-	}
+// 支付成功后清除formData并且切换tabs2
+const paySuccessToTabs2 = () => {
+	uni.hideLoading()
+	uni.showToast({
+		title: '支付成功',
+		duration: 2000,
+		success() {
+			currentTab.value = 2
+			resetFormData()
+			setTimeout(() => {
+				getLists()
+				getCount()
+			}, 500); // 延迟1秒执行
+		}
+	});
+}
 
-	// 邀请用户数
-	let where = {
-		page_no: 1,
-		page_size: 25,
-		loadingOver: false
-	}
+// 邀请用户数
+let where = {
+	page_no: 1,
+	page_size: 25,
+	loadingOver: false
+}
 
-	const count = ref(0)
-	const getCount = async () => {
-		if (Role.value == 4) return;
-		let res = await rechargeCountApi({
-			store_id: STORE_INFO.id
+const count = ref(0)
+const getCount = async () => {
+	if (Role.value == 4) return;
+	let res = await rechargeCountApi({
+		store_id: STORE_INFO.id
+	})
+	count.value = res.data.count
+}
+
+// 邀请列表
+const lists = ref([])
+const getLists = async () => {
+	where.loadingOver = false
+	where.page_no = 1
+	where.page_size = 25
+	if (Role.value == 1) {
+		let res = await rechargeListsApi({
+			store_id: STORE_INFO.id,
+			recharge_type: "INDUSTRYMEMBERS",
+			page_no: 1,
+			page_size: 25
 		})
+		lists.value = res.data.lists
+	} else {
+		let res = await getCreateLists({
+			store_id: STORE_INFO.id,
+		})
+		lists.value = res.data.lists
 		count.value = res.data.count
 	}
 
-	// 邀请列表
-	const lists = ref([])
-	const getLists = async () => {
-		where.loadingOver = false
-		where.page_no = 1
-		where.page_size = 25
-		if (Role.value == 1) {
-			let res = await rechargeListsApi({
-				store_id: STORE_INFO.id,
-				recharge_type: "INDUSTRYMEMBERS",
-				page_no: 1,
-				page_size: 25
-			})
-			lists.value = res.data.lists
-		} else {
-			let res = await getCreateLists({
-				store_id: STORE_INFO.id,
-			})
-			lists.value = res.data.lists
-			count.value = res.data.count
-		}
-
-	}
+}
 
 
-	const upadtaStatus = (item) => {
-		updataOrderApi({
-			order_no: item.order_id,
-			recharge: 1
-		}).then(res => {
-			getCount()
-			getLists()
-
-		})
-	}
-
-	onLoad(() => {
-		getUserShip().then(res => {
-			columns.value = [res.data.lists]
-		})
-		getPhoneOneDay()
-		getCityList()
-		getRechargeList()
-	})
-
-	onPullDownRefresh(() => {
+const upadtaStatus = (item) => {
+	updataOrderApi({
+		order_no: item.order_id,
+		recharge: 1
+	}).then(res => {
 		getCount()
 		getLists()
-		setTimeout(() => {
-			uni.stopPullDownRefresh()
-		}, 1000)
+
 	})
+}
+
+onLoad(() => {
+	getUserShip().then(res => {
+		columns.value = [res.data.lists]
+	})
+	getPhoneOneDay()
+	getCityList()
+	getRechargeList()
+})
+
+onPullDownRefresh(() => {
+	getCount()
+	getLists()
+	setTimeout(() => {
+		uni.stopPullDownRefresh()
+	}, 1000)
+})
 
 
-	onReachBottom(async () => {
-		if (where.loadingOver) return;
-		where.page_no++;
-		if (Role.value == 1) {
-			let res = await rechargeListsApi({
-				store_id: STORE_INFO.id,
-				recharge_type: "INDUSTRYMEMBERS",
-				...where
-			})
-			if (res.data.lists.length <= 0) {
-				return where.loadingOver = true
-			}
-			lists.value.push(...res.data.lists)
-		} else {
-			let res = await getCreateLists({
-				store_id: STORE_INFO.id,
-				...where
-			})
-			if (res.data.lists.length <= 0) {
-				return where.loadingOver = true
-			}
-			lists.value.push(...res.data.lists)
+onReachBottom(async () => {
+	if (where.loadingOver) return;
+	where.page_no++;
+	if (Role.value == 1) {
+		let res = await rechargeListsApi({
+			store_id: STORE_INFO.id,
+			recharge_type: "INDUSTRYMEMBERS",
+			...where
+		})
+		if (res.data.lists.length <= 0) {
+			return where.loadingOver = true
 		}
-	})
+		lists.value.push(...res.data.lists)
+	} else {
+		let res = await getCreateLists({
+			store_id: STORE_INFO.id,
+			...where
+		})
+		if (res.data.lists.length <= 0) {
+			return where.loadingOver = true
+		}
+		lists.value.push(...res.data.lists)
+	}
+})
 </script>
 
 <style lang='scss'>
-	.tabs {
-		background-color: #fff;
-		width: 100vw;
-		box-sizing: border-box;
-		padding: 30rpx 0;
-		justify-content: space-around;
-		position: relative;
-		display: flex;
-		font-size: 32rpx;
-		color: #444444;
+.tabs {
+	background-color: #fff;
+	width: 100vw;
+	box-sizing: border-box;
+	padding: 30rpx 0;
+	justify-content: space-around;
+	position: relative;
+	display: flex;
+	font-size: 32rpx;
+	color: #444444;
 
-		.actText {
-			color: #20B128;
-		}
-
-
-		.lines {
-			position: absolute;
-			width: 70rpx;
-			height: 7rpx;
-			border-radius: 8rpx;
-			background-color: #33B83A;
-			bottom: 15rpx;
-			transition: 300ms;
-			left: calc(25vw - 35rpx);
-		}
-
-		.actLine {
-			left: calc(75vw - 35rpx);
-		}
-	}
-
-	.card {
-		width: 710rpx;
-		margin: 20rpx auto;
-		background-color: #fff;
-		box-sizing: border-box;
-		border-radius: 10rpx;
-	}
-
-	.card1 {
-		padding: 30rpx;
-
-		.card1-tit {
-			font-size: 32rpx;
-			color: #444444;
-			text-align: center;
-			margin-bottom: 20rpx;
-		}
-
-		.store-info {
-			font-size: 28rpx;
-			color: #20B128;
-			text-align: center;
-			margin-top: 20rpx;
-		}
-	}
-
-	.submit-btn {
-		/* height: 200rpx; */
-		position: fixed;
-		bottom: 50rpx;
-		width: 710rpx;
-		left: 50%;
-		transform: translateX(-50%);
-
-	}
-
-
-	.vip-card {
-		width: 690rpx;
-		height: 270rpx;
-		background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/4a92b202406162207212332.png');
-		background-size: 100% 100%;
-		margin: 20rpx auto;
-		display: flex;
-		align-items: center;
-		font-size: 30rpx;
-		box-sizing: border-box;
-		padding: 0 30rpx;
-		color: #444444;
-		justify-content: space-around;
-
-		.num {
-			font-size: 72rpx;
-			color: #7B5232;
-
-		}
-	}
-
-	.table {
-		width: 710rpx;
-		box-sizing: border-box;
-		font-size: 30rpx;
-		margin: 0 auto;
-	}
-
-
-	.address-content {
-		padding: 20rpx;
-		height: 60vh;
-		overflow-y: auto;
-
-		.address-li {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			font-size: 32rpx;
-			color: #777777;
-			margin: 30rpx 0;
-		}
-
-		.act {
-			color: #20B128;
-		}
-	}
-
-	.uni-table-th {
-		padding: 10rpx 0 !important;
-	}
-
-	.uni-table-td {
-		padding: 10rpx 0 !important;
-	}
-
-	.slot-content {
-		/* padding-bottom: 50rpx; */
-	}
-
-	.code-btn {
-		display: flex;
-		align-items: center;
-	}
-
-	.btn-text {
+	.actText {
 		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;
+	.lines {
 		position: absolute;
-		top: 50%;
-		transform: translateY(-50%);
-		border-radius: 12rpx;
-		left: 0;
+		width: 70rpx;
+		height: 7rpx;
+		border-radius: 8rpx;
+		background-color: #33B83A;
+		bottom: 15rpx;
+		transition: 300ms;
+		left: calc(25vw - 35rpx);
 	}
 
-	.gift-pack {
+	.actLine {
+		left: calc(75vw - 35rpx);
+	}
+}
+
+.card {
+	width: 710rpx;
+	margin: 20rpx auto;
+	background-color: #fff;
+	box-sizing: border-box;
+	border-radius: 10rpx;
+}
+
+.card1 {
+	padding: 30rpx;
+
+	.card1-tit {
+		font-size: 32rpx;
+		color: #444444;
+		text-align: center;
+		margin-bottom: 20rpx;
+	}
+
+	.store-info {
+		font-size: 28rpx;
+		color: #20B128;
+		text-align: center;
+		margin-top: 20rpx;
+	}
+}
+
+.submit-btn {
+	/* height: 200rpx; */
+	position: fixed;
+	bottom: 50rpx;
+	width: 710rpx;
+	left: 50%;
+	transform: translateX(-50%);
+
+}
+
+
+.vip-card {
+	width: 690rpx;
+	height: 270rpx;
+	background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/4a92b202406162207212332.png');
+	background-size: 100% 100%;
+	margin: 20rpx auto;
+	display: flex;
+	align-items: center;
+	font-size: 30rpx;
+	box-sizing: border-box;
+	padding: 0 30rpx;
+	color: #444444;
+	justify-content: space-around;
+
+	.num {
+		font-size: 72rpx;
+		color: #7B5232;
+
+	}
+}
+
+.table {
+	width: 710rpx;
+	box-sizing: border-box;
+	font-size: 30rpx;
+	margin: 0 auto;
+}
+
+
+.address-content {
+	padding: 20rpx;
+	height: 60vh;
+	overflow-y: auto;
+
+	.address-li {
 		display: flex;
 		justify-content: space-between;
-		flex-wrap: wrap;
+		align-items: center;
+		font-size: 32rpx;
+		color: #777777;
+		margin: 30rpx 0;
+	}
 
-		.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;
+	.act {
+		color: #20B128;
+	}
+}
 
-			.gift-pack-li-top {
-				margin-bottom: 10rpx;
-				color: #20B128;
-			}
+.uni-table-th {
+	padding: 10rpx 0 !important;
+}
 
-			.act-gift-top {
-				color: white;
-			}
+.uni-table-td {
+	padding: 10rpx 0 !important;
+}
+
+.slot-content {
+	/* padding-bottom: 50rpx; */
+}
+
+.code-btn {
+	display: flex;
+	align-items: center;
+}
+
+.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 {
-			background-color: #38BE41;
+		.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 cc70251..cec1e78 100644
--- a/pages.json
+++ b/pages.json
@@ -245,10 +245,17 @@
 				{
 					"path": "asset/index",
 					"style": {
-						"navigationBarTitleText": "会员资产",
+						"navigationBarTitleText": "用户资产",
 						"enablePullDownRefresh": true
 					}
 				},
+				{
+					"path": "asset/lists",
+					"style": {
+						"navigationBarTitleText": "预约记录",
+						"enablePullDownRefresh": false
+					}
+				},
 				{
 					"path": "Gifts/index",
 					"style": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e0ccf7d..c1d8a34 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -168,15 +168,15 @@
 								<view class="shop-content-li-r" style="color:#FC452F ;">￥<text
 										style="font-size: 30rpx;">{{item[priceKey.price]}}</text>/{{ item.unit_name }}
 								</view>
-								<view class="tag">
+								<view class="tag" v-if="item.tag">
 									<view class="icon" />
-									赠10%品牌礼品券
+									{{item.tag}}
 								</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>
@@ -231,7 +231,8 @@
 			</view>
 		</view>
 
-		<goodPopup ref="goodRef" :show="showGoodPopup" @close="showGoodPopup = false" @change="changeGood" />
+		<goodPopup ref="goodRef" :priceKey='priceKey' :show="showGoodPopup" @close="showGoodPopup = false"
+			@change="changeGood" />
 
 		<u-overlay :show="showOverlay" @click="showOverlay = false">
 			<view class="warp">
@@ -293,7 +294,7 @@
 	} from "@/api/multipleShop.js";
 
 	import useUserStore from "@/store/user";
-	const vipList = reactive([1, 2, 3, 5, 6, 7, 8])
+	const vipList = reactive([1, 2, 3, 4, 5, 6, 7, 8])
 	const userStore = useUserStore();
 	const STORE_INFO = reactive({
 		id: '',
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 2501d48..40a67c3 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" v-if="config.ENV !='prod'">
 						<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>
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 931788f..7024639 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -24,7 +24,7 @@
 <template>
 	<view style="flex-grow: 1;overflow-y: auto;">
 		<view class="user-info"
-			:style="{backgroundImage: [0,4].includes(userInfo.user_ship)?'url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e3a7b202404261113002322.webp)':'url(https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/aace1202407021022357574.png)' }">
+			:style="{backgroundImage: [0].includes(userInfo.user_ship)?'url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e3a7b202404261113002322.webp)':'url(https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/aace1202407021022357574.png)' }">
 			<view class="u-card">
 				<view style="display: flex;" @click="updataInfp">
 					<up-image :src="userInfo.avatar" mode="aspectFill" width="112rpx" height="112rpx"
@@ -36,7 +36,7 @@
 							<view style="margin:0 20rpx;">
 								{{userInfo.id}}
 							</view>
-							<view v-if="![0,4].includes(userInfo.user_ship)"
+							<view v-if="![0].includes(userInfo.user_ship)"
 								style="display: flex;align-items: center;background-color: #F6EECD;padding: 4rpx 10rpx;border-radius: 20rpx;">
 								<view style="margin-right: 10rpx;">
 									<up-icon
@@ -116,8 +116,9 @@
 
 		<view class="card">
 			<up-cell-group>
-				<!-- 	<up-cell v-if="userInfo.user_ship==1" title="赠品区" :isLink="true" url="/pageQuota/Gifts/index"></up-cell>
-				<up-cell title="我的资产" :isLink="true" url="/pageQuota/asset/index"></up-cell> -->
+				<!-- 	<up-cell v-if="userInfo.user_ship==1" title="赠品区" :isLink="true" url="/pageQuota/Gifts/index"></up-cell> -->
+				<!-- <up-cell title="我的资产" :isLink="true" url="/pageQuota/asset/index"></up-cell>
+				<up-cell title="预约记录" :isLink="true" url="/pageQuota/asset/lists"></up-cell> -->
 				<up-cell title="我的地址" :isLink="true" url="/pagesOrder/addressList/addressList"></up-cell>
 				<up-cell title="支付密码" :isLink="true" url="/pagesOrder/setPayPassword/index"></up-cell>
 			</up-cell-group>
@@ -226,7 +227,6 @@
 	const showPop = ref(false)
 
 	const updataInfp = () => {
-		console.log(5454)
 		showPop.value = true
 	}
 
@@ -291,7 +291,7 @@
 			userInfo.value = res.data;
 			formData.avatar = res.data.avatar
 			formData.nick_name = res.data.nickname
-			if (![0, 4].includes(res.data.user_ship)) {
+			if (![0].includes(res.data.user_ship)) {
 				uni.setNavigationBarColor({
 					frontColor: "#000000",
 					backgroundColor: "#EAFFE1"
diff --git a/pagesOrder/settle/settle.vue b/pagesOrder/settle/settle.vue
index b02dac6..8ab6b1b 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.activity_price, 0) }}<text>.{{ c_price(orderInfo.activity_price, 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 ">