add

api/user.js

@@ -158,3 +158,11 @@ 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>

pageQuota/vipUser/index.vue

@@ -10,8 +10,7 @@
 				<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"
+							<up-radio activeColor="#20b128" label="行业会员" :name="1" style="margin-right: 10rpx;"></up-radio>
-								style="margin-right: 10rpx;"></up-radio>
 							<up-radio activeColor="#20b128" label="商户" :name="4"></up-radio>
 						</up-radio-group>
 					</up-form-item>
@@ -22,8 +21,8 @@
 
 	<view v-else>
 		<up-sticky bgColor="#fff" style="padding: 20rpx;">
-			<up-tabs v-if="Role==1" :list="tabsLst" :itemStyle="{width:'33vw',paddingBottom:'20rpx'}"
+			<up-tabs v-if="Role == 1" :list="tabsLst" :itemStyle="{ width: '33vw', paddingBottom: '20rpx' }" lineColor='#50C758'
-				lineColor='#50C758' :current='currentTab' @change="tabsChange"></up-tabs>
+				:current='currentTab' @change="tabsChange"></up-tabs>
 			<up-tabs v-else :list="tabsLst2" :itemStyle="{ width: '50vw', paddingBottom: '20rpx' }" lineColor='#50C758'
 				:current='currentTab' @change="tabsChange1"></up-tabs>
 		</up-sticky>
@@ -31,8 +30,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="">
@@ -50,8 +51,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"
+							<up-input style="pointer-events: none" v-model="formData.address" border="none" prefixIcon="map"
-								prefixIcon="map" readonly placeholder="点击选择地址" :customStyle="{
+								readonly placeholder="点击选择地址" :customStyle="{
 									background: '#F3F3F3', padding: '20rpx',
 									'border-radius': '30rpx'
 								}" :placeholderStyle="{ color: '#444444' }" :prefixIconStyle="{ 'margin-right': '40rpx' }"
@@ -82,23 +83,20 @@
 						</view>
 					</up-form-item>
 				</up-form>
-				<view class="store-info">
+				<view class="link" @click="navgo('/pageQuota/vipUser/activePage')">
-					报备人:{{ STORE_INFO.name }}
+					点击查看礼品包内容
 				</view>
-
+				<view class="gift-pack">
-				<view class="store-info" v-if="Role==1">
+					<view class="gift-pack-li" :class="index == giftIndex && 'act-gift'" v-for="(item, index) in rechargeList"
-					<view class="" style="width: 300rpx;margin: 0 auto;border-bottom: 1px solid #F3F3F3;">
+						:key="index" @click="choseGift(index)">
-						<up-input inputAlign='center' type='digit' placeholder="请输入金额" @focus="formData.price=''"
+						<view class="gift-pack-li-top" :class="index == giftIndex && 'act-gift-top'">
-							color='#FF6B00' :placeholderStyle="{fontSize:'28rpx'}" fontSize='20px' border="none"
+							<text style="font-size: 40rpx;">{{ item.money }}</text><text>元采购包</text>
-							v-model="formData.price" @blur='tofixedPrice'></up-input>
+						</view>
+						<view class="">
+							送{{ item.send }}{{ item.send_string }}
 						</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
@@ -127,12 +125,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' }"
+							:placeholderStyle="{ color: 'grey' }" :prefixIconStyle="{ 'margin-right': '40rpx' }"></up-input>
-							: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"
+						<up-input style="pointer-events: none" v-model="formData2.address" border="none" prefixIcon="map"
-							prefixIcon="map" readonly color='grey' placeholder="系统自动获取" :customStyle="{
+							readonly color='grey' placeholder="系统自动获取" :customStyle="{
 								background: '#F3F3F3', padding: '20rpx',
 								'border-radius': '30rpx'
 							}" :placeholderStyle="{ color: 'grey' }" :prefixIconStyle="{ 'margin-right': '40rpx' }"></up-input>
@@ -152,17 +149,17 @@
 				<view class="store-info">
 					<view class="" style="width: 300rpx;margin: 0 auto;border-bottom: 1px solid #F3F3F3;">
 						<up-input inputAlign='center' placeholder="请输入金额" @focus="formData2.price = ''" color='#FF6B00'
-							:placeholderStyle="{fontSize:'28rpx'}" fontSize='20px' border="none"
+							:placeholderStyle="{ fontSize: '28rpx' }" fontSize='20px' border="none" v-model="formData2.price"
-							v-model="formData2.price" type='digit' @blur='tofixedPrice(2)'></up-input>
+							type='digit' @blur='tofixedPrice(2)'></up-input>
 					</view>
 					<view style="color: red;margin-top: 20rpx;font-size: 24rpx;"
 						v-if="formData2.label_limit && formData2.price < formData2.label_limit">
 						<view class="">
 							{{ formData2.label_name }}会员最低金额不能低于{{ formData2.label_limit }}元
 						</view>
-						<view class="">
+						<!-- <view class="">
 							最高金额不能超过10000.00元
-						</view>
+						</view> -->
 						<view class="">
 							可单次多笔累计操作
 						</view>
@@ -180,6 +177,8 @@
 			</view>
 
 		</block>
+
+
 		<!-- tabs2 -->
 		<block v-if="currentTab == 2 && Role == 1">
 			<view class="vip-card">
@@ -272,8 +271,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 }'
+				<view class="address-li" :class='{ act: item.city_code == formData.city }' v-for="item in addressList.city"
-					v-for="item in addressList.city" :key="item.city_code" @click="addressLiClick(0, item)">
+					: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>
@@ -296,13 +295,12 @@
 				<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"
+					<up-icon name="arrow-right" :color="item.village_code == formData.village ? '#20B128' : '#777777'" />
-						: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 }'
+				<view class="address-li" :class='{ act: item.id == formData.brigade }' v-for="item in addressList.brigade"
-					v-for="item in addressList.brigade" :key="item.id" @click="addressLiClick(4, item)">
+					: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>
@@ -311,15 +309,12 @@
 	</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">
 			{{ popPhone }}
 		</view>
 	</up-modal>
-
 </template>
 <script setup>
 import {
@@ -337,6 +332,8 @@
 } from "@/api/address.js"
 import {
 	vipRechargeApi,
+	getRechargeListApi,
+	isUserShipApi,
 	rechargeCountApi,
 	reVipRechargeApi,
 	rechargeListsApi,
@@ -442,6 +439,7 @@
 // 手机保留一天结束
 
 // 验证码
+const vipList = reactive([1, 2, 3, 5, 6, 7, 8])
 const cutDown = ref(0)
 const flag = ref(true)
 const code = ref('')
@@ -578,10 +576,10 @@
 			} = await getVipInfoByPhone({
 				mobile: formData2.mobile
 			})
-				// if (data.user_ship != 4) {
+			if (!vipList.includes(data.user_ship)) {
-				// 	uni.hideLoading()
+				uni.hideLoading()
-				// 	return uni.$u.toast('查询失败');
+				return uni.$u.toast('查询失败');
-				// }
+			}
 			if (formData.mobile) {
 				formData2.mobile = formData.mobile
 			}
@@ -596,14 +594,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] = ''
@@ -620,8 +613,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
 }
 
@@ -723,6 +714,7 @@
 	]);
 
 let timerInvol = null
+let paySuccess;
 // 开起一个scoket监听用户知否支付成功
 const userInfo = useUserStore().userInfo;
 const connection = new Push({
@@ -732,13 +724,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) => {
@@ -786,10 +799,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;
+						if (!paySuccess) {
 							uni.$u.toast('支付超时');
+						}
 					}, 30000)
 				})
 			}
@@ -800,13 +815,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
@@ -821,6 +832,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('二维码未扫描完整');
@@ -828,13 +845,13 @@
 						title: '支付中...'
 					});
 					formData.auth_code = res.result
-						formData.recharge_type = 'INDUSTRYMEMBERS'
-						formData.user_ship = formData.label_id
 					vipRechargeApi(formData).then(res => {
+						paySuccess = false;
 						timerInvol = setTimeout(() => {
 							uni.hideLoading();
-								if (currentTab.value == 2) return;
+							if (!paySuccess) {
 								uni.$u.toast('支付超时');
+							}
 						}, 30000)
 					})
 				}
@@ -856,13 +873,19 @@
 			}).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)
+}
+
 // 支付成功后清除formData并且切换tabs2
 const paySuccessToTabs2 = () => {
 	uni.hideLoading()
@@ -933,19 +956,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(() => {
@@ -1025,20 +1041,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;
 	}
 }
 
@@ -1084,7 +1100,7 @@
 
 .address-content {
 	padding: 20rpx;
-		height: 50vh;
+	height: 60vh;
 	overflow-y: auto;
 
 	.address-li {
@@ -1120,5 +1136,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>

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>