add

api/user.js

@@ -157,4 +157,12 @@ 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);
+}
+
+export const getRechargeListApi = (data) => {
+	return request.get('/user/UserRecharge/recharge_list', data);
 }

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>

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>

pages.json

@@ -235,6 +235,13 @@
 						"enablePullDownRefresh": true
 					}
 				},
+				{
+					"path": "vipUser/activePage",
+					"style": {
+						"navigationBarTitleText": "采购礼包",
+						"enablePullDownRefresh": false
+					}
+				},
 				{
 					"path": "asset/index",
 					"style": {

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>
@@ -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>
@@ -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 {

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);

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>