ad

add
2024-06-24 14:07:32 +08:00 · 2024-06-24 09:28:16 +08:00 · 2024-06-23 20:16:21 +08:00 · 2024-06-22 21:11:18 +08:00 · 2024-06-22 20:26:36 +08:00 · 2024-06-22 19:58:02 +08:00
21 changed files with 1673 additions and 135 deletions
--- a/api/user.js
+++ b/api/user.js
@ -120,4 +120,21 @@ export const getStoreByPhone = (data) => {

 export const getStoreInfo = (data) => {
 	return request.get('/config', data);
+}
+
+export const getUserLabel = (data) => {
+	return request.get('/user_label/UserLabel/lists', data);
+}
+
+export const getUserShip = (data) => {
+	return request.get('/user_ship/UserShip/lists', data);
+}
+
+export const getCreateLists = (data) => {
+	return request.get('/store/store/create_lists', data);
+}
+
+
+export const getloginSms = (data) => {
+	return request.post('/user/user/login_sms', data);
 }
--- a/components/goodPopup.vue
+++ b/components/goodPopup.vue
@ -2,31 +2,31 @@
 	<up-popup :show="show" closeable round="10" @close="close" :safeAreaInsetBottom="false">
 		<view class="good-popup">
 			<view class="head-title">
-				{{datas.is_bulk ? '称重商品' : '计件商品'}}
+				{{ datas.is_bulk ? '称重商品' : '计件商品' }}
 			</view>
 			<view class="row">
 				<view>商品名称</view>
-				<view>{{datas.name || datas.goods_name || datas.store_name}}</view>
+				<view>{{ datas.name || datas.goods_name || datas.store_name }}</view>
 			</view>
 			<view class="row">
 				<view>商品单位</view>
-				<view>{{datas.unit_name}}</view>
+				<view>{{ datas.unit_name }}</view>
 			</view>
 			<view class="row">
 				<view>商品价格</view>
-				<view>¥ {{datas.price}} / {{datas.unit_name }}</view>
+				<view>¥ {{ datas.price || datas.sell }} / {{ datas.unit_name }}</view>
 			</view>
-			<view class="row" v-if="datas.batch>0">
+			<view class="row" v-if="datas.batch > 0">
 				<view>起批量</view>
-				<view>{{datas.batch}}{{datas.unit_name }}起批 </view>
+				<view>{{ datas.batch }}{{ datas.unit_name }}起批 </view>
 			</view>

 			<view class="row">
 				<view>小计</view>
-				<view style="color: #F55726;" v-if="+datas.cart_num<+datas.batch">
-					{{`${datas.batch}${datas.unit_name}起批`}}
+				<view style="color: #F55726;" v-if="+datas.cart_num < +datas.batch">
+					{{ `${datas.batch}${datas.unit_name}起批` }}
 				</view>
-				<view style="color: #F55726;" v-else>¥ {{subtotal}}</view>
+				<view style="color: #F55726;" v-else>¥ {{ subtotal }}</view>
 			</view>
 			<view v-if="datas.is_bulk" class="row">
 				<view>购买重量<text style="color: #F55726;">*</text></view>
@ -38,10 +38,10 @@
 			<view v-else class="row">
 				<view>购买数量<text style="color: #F55726;">*</text></view>
 				<view style="flex: 1;">
-					<up-input v-model="datas.cart_num" :cursorSpacing='120' type="digit" border="none"
+					<up-input ref='foucs1' v-model="datas.cart_num" :cursorSpacing='120' type="digit" border="none"
 						placeholder="请输入购买数量" inputAlign="right">
 						<template #suffix>
-							<span style="color: #20b128;">{{datas.unit_name}}</span>
+							<span style="color: #20b128;">{{ datas.unit_name }}</span>
 						</template>
 					</up-input>
 				</view>
@ -61,12 +61,18 @@
 <script setup>
 	import {
 		computed,
-		ref
+		nextTick,
+		ref,
+
 	} from "vue"
 	import {
 		toast
 	} from "../uni_modules/uview-plus";
+	import {
+		onShow
+	} from '@dcloudio/uni-app';

+	const foucs1 = ref(null)
 	const props = defineProps({
 		show: {
 			type: Boolean,
@ -106,8 +112,11 @@
 		return Number(num * sell * 100 / 100).toFixed(2)
 	})

+
+
 	defineExpose({
-		setData
+		setData,
+		// founcsFn
 	})
 </script>

--- a/pageQuota/vipUser/index.vue
+++ b/pageQuota/vipUser/index.vue
@ -1,26 +1,31 @@
 <template>
 	<view class="" v-if="!STORE_INFO.id">
-		<up-modal :show="showModa" title="选择门店" @confirm="confirmStore" confirmColor='#20B128'>
+		<up-modal :show="showModa" title="门店信息" @confirm="confirmStore" confirmColor='#20B128'>
 			<view class="slot-content">
-				<up-input v-model="storePhone" border="none" prefixIcon="phone" placeholder="请输入门店手机号"
-					:customStyle="{background:'#F3F3F3',padding:'20rpx','border-radius':'30rpx'}"
-					:placeholderStyle="{color:'#444444'}" :prefixIconStyle="{'margin-right':'40rpx'}"></up-input>
+
+				<up-form labelPosition="left" label-width="100rpx">
+					<up-form-item label="手机号" borderBottom>
+						<up-input v-model="storePhone" placeholder="请输入门店手机号"></up-input>
+					</up-form-item>
+					<up-form-item label="角色" borderBottom>
+						<uni-data-select v-model="Role" :localdata="range" :clear='false'></uni-data-select>
+					</up-form-item>
+				</up-form>
 			</view>
 		</up-modal>
 	</view>

 	<view v-else>
 		<view class="tabs">
-			<text @click="currentTab=1" :class="{actText:currentTab==1}">开通行业会员</text>
+			<text @click="currentTab=1" :class="{actText:currentTab==1}">开通{{Role==1?'行业会员':'商户'}} </text>
 			<text @click="currentTab=2,getCount(),getLists()" :class="{actText:currentTab==2}"> 已开通列表</text>
 			<view class="lines" :class="{actLine:currentTab==2}" />
 		</view>
-
 		<!-- tabs1 -->
 		<block v-if='currentTab==1'>
 			<view class="card card1">
 				<view class="card1-tit">
-					行业会员开通报备
+					{{Role==1?'行业会员':'商户'}}开通报备
 				</view>
 				<up-form labelPosition="left" :model="formData" :borderBottom='false'>
 					<up-form-item label="" prop="userInfo.name">
@ -30,7 +35,7 @@
 							:prefixIconStyle="{'margin-right':'40rpx'}"></up-input>
 					</up-form-item>
 					<up-form-item label="" prop="userInfo.name">
-						<up-input v-model="formData.mobile" border="none" prefixIcon="account" placeholder="请输入电话号码"
+						<up-input v-model="formData.mobile" border="none" prefixIcon="phone" placeholder="请输入电话号码"
 							:customStyle="{background:'#F3F3F3',padding:'20rpx','border-radius':'30rpx'}"
 							:placeholderStyle="{color:'#444444'}"
 							:prefixIconStyle="{'margin-right':'40rpx'}"></up-input>
@ -38,12 +43,24 @@
 					<up-form-item label="" prop="userInfo.name">
 						<view @click="showPop=true" style="width: 100%;">
 							<up-input style="pointer-events: none" v-model="formData.address" border="none"
-								prefixIcon="account" readonly placeholder="请选择地址" :customStyle="{background:'#F3F3F3',padding:'20rpx',
+								prefixIcon="map" readonly placeholder="点击选择地址" :customStyle="{background:'#F3F3F3',padding:'20rpx',
 								'border-radius':'30rpx'
 								 }" :placeholderStyle="{color:'#444444'}" :prefixIconStyle="{'margin-right':'40rpx'}"
 								suffixIcon='arrow-down'></up-input>
 						</view>
 					</up-form-item>
+
+					<up-form-item label="" prop="userInfo.name" v-if='Role==1'>
+						<view @click="showPop1=true" style="width: 100%;">
+							<up-input style="pointer-events: none" v-model="formData.label_name" border="none"
+								prefixIcon="man-add" readonly placeholder="点击选择用户身份" :customStyle="{background:'#F3F3F3',padding:'20rpx',
+								'border-radius':'30rpx'
+								 }" :placeholderStyle="{color:'#444444'}" :prefixIconStyle="{'margin-right':'40rpx'}"
+								suffixIcon='arrow-down'></up-input>
+						</view>
+					</up-form-item>
+
+
 				</up-form>
 				<view class="store-info">
 					报备人:{{STORE_INFO.name}}
@ -54,7 +71,7 @@
 					shape="circle" color="#50C758"></up-button> -->
 				<view
 					style='width: 710rpx;height: 100rpx;text-align: center;line-height: 100rpx;text-align: center;color: white;background-color: #33B83A;border-radius: 50rpx;font-size:40rpx ;'>
-					完成并收款
+					{{Role==1?'完成并收款':'完成'}}
 				</view>

 			</view>
@ -65,7 +82,7 @@
 			<view class="vip-card">
 				<text>当前已开通：</text>
 				<up-count-to :startVal="0" :endVal="count"></up-count-to>
-				<text>位行业会员</text>
+				<text>位{{Role==1?'行业会员':'商户'}}</text>
 			</view>

 			<view class="table">
@ -73,19 +90,23 @@
 					<!-- 表头行 -->
 					<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" v-if='Role==1'>行业会员</uni-th>
+						<uni-th width="50" align="center" v-if='Role==1'>经营资金</uni-th>
+						<uni-th width="50" align="center" v-if='Role==4'>开通时间</uni-th>
+						<uni-th width="50" align="center" v-if='Role==4'>商户</uni-th>
+						<uni-th width="50" align="center" v-if='Role==1'>角色</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.real_name}}</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" v-if='Role==1'>{{item.real_name}}</uni-td>
+						<uni-td style="font-size: 20rpx;" align="center" v-if='Role==1'>{{item.price}}</uni-td>
+						<uni-td style="font-size: 20rpx;" align="center" v-if='Role==4'>{{item.create_time}}</uni-td>
+						<uni-td style="font-size: 20rpx;" align="center" v-if='Role==4'>{{item.nickname}}</uni-td>
+						<uni-td style="font-size: 20rpx;" align="center" v-if='Role==1'>{{item.label_name}}</uni-td>
 						<uni-td style="font-size: 20rpx;" align="center">
-							<view v-if="item.paid ==1">已开通</view>
+							<view v-if="item.paid ==1 ||Role==4">已开通</view>
 							<view v-else @click="upadtaStatus(item)" style="color:#33B83A ;">未开通,查询</view>
 						</uni-td>
 					</uni-tr>
@ -139,6 +160,9 @@
 			</view>
 		</view>
 	</up-popup>
+	<up-picker :show="showPop1" :columns="columns" @confirm='conformRole' @cancel='showPop1=false'
+		@close="showPop1=false" @open="showPop1=true" keyName='label_name' confirmColor='#33B83A'></up-picker>
+
 </template>
 <script setup>
 	import {
@ -158,13 +182,21 @@
 		rechargeCountApi,
 		rechargeListsApi,
 		updataOrderApi,
-		getStoreByPhone
+		getStoreByPhone,
+		getUserLabel,
+		getUserShip,
+		getCreateLists
 	} from "@/api/user.js"

 	import {
-		onPullDownRefresh
+		onPullDownRefresh,
+		onLoad
 	} from "@dcloudio/uni-app"

+	const showPop1 = ref(false)
+	const Role = ref('')
+	const range = ref({})
+	const columns = ref([])
 	const showModa = ref(true)
 	const storePhone = ref('')
 	const confirmStore = () => {
@ -174,11 +206,11 @@
 			for (let key in res.data) {
 				STORE_INFO[key] = res.data[key]
 			}
+			setPhoneOneDay()
 		}).catch(err => {
 			uni.$u.toast('未查到店铺信息，请检查手机号码')
 		})

-
 	}

 	//  用户选择的门店信息
@ -187,6 +219,30 @@
 	})


+	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')) {
+			let data = JSON.parse(uni.getStorageSync('VIP_PHONE'))
+			if (new Date() > data.time) {
+				uni.removeStorageSync('VIP_PHONE');
+			} else {
+				storePhone.value = data.phone
+			}
+		}
+	}
+
+
+
 	const currentTab = ref(1)
 	const formData = reactive({
 		store_id: STORE_INFO.id,
@ -199,9 +255,17 @@
 		brigade: "",
 		real_name: "",
 		auth_code: "",
-		address: ""
+		address: "",
+		label_name: "",
+		label_id: "",
+		user_ship: ''
 	})

+	const conformRole = (e) => {
+		formData.label_name = e.value[0].label_name
+		formData.label_id = e.value[0].label_id
+		showPop1.value = false
+	}

 	// 地址选择
 	const showPop = ref(false)
@ -306,29 +370,66 @@
 		if (!formData.real_name) return uni.$u.toast('请填写真实姓名');
 		if (!formData.mobile) return uni.$u.toast('请填写电话号码');
 		formData.store_id = STORE_INFO.id
-		uni.scanCode({
-			success: function(res) {
-				formData.auth_code = res.result
-				vipRechargeApi(formData).then(res => {
-					uni.$u.toast('操作成功');
-					currentTab.value = 2
-					formData.real_name = ''
-					formData.mobile = ''
-					formData.address = ''
-					tabsList.forEach(item => {
-						item.name = '请选择'
-					})
+		if (Role.value == 1) {
+			uni.scanCode({
+				success: function(res) {
+					formData.auth_code = res.result
+					formData.recharge_type = 'INDUSTRYMEMBERS'
+					formData.user_ship = 1
+					vipRechargeApi(formData).then(res => {
+						uni.$u.toast('操作成功');
+						currentTab.value = 2
+						formData.real_name = ''
+						formData.mobile = ''
+						formData.address = ''
+						formData.label_name = ''
+						formData.city = ''
+						formData.area = ''
+						formData.street = ''
+						formData.village = ''
+						formData.brigade = ''
+						currentAddressIndex.value = 0

+						tabsList.forEach(item => {
+							item.name = '请选择'
+						})
+
+					})
+					getCount()
+					getLists()
+				}
+			});
+		} else {
+			delete formData.recharge_type
+			delete formData.auth_code
+			formData.user_ship = 4
+			vipRechargeApi(formData).then(res => {
+				uni.$u.toast('操作成功');
+				currentTab.value = 2
+				formData.real_name = ''
+				formData.mobile = ''
+				formData.address = ''
+				formData.label_name = ''
+				formData.city = ''
+				formData.area = ''
+				formData.street = ''
+				formData.village = ''
+				formData.brigade = ''
+				currentAddressIndex.value = 0
+				tabsList.forEach(item => {
+					item.name = '请选择'
 				})
-				getCount()
 				getLists()
-			}
-		});
+				getCount()
+			})
+		}
+
 	}

 	// 邀请用户数
 	const count = ref(0)
 	const getCount = async () => {
+		if (Role.value == 4) return;
 		let res = await rechargeCountApi({
 			store_id: STORE_INFO.id
 		})
@ -338,11 +439,21 @@
 	// 邀请列表
 	const lists = ref([])
 	const getLists = async () => {
-		let res = await rechargeListsApi({
-			store_id: STORE_INFO.id,
-			recharge_type: "INDUSTRYMEMBERS"
-		})
-		lists.value = res.data.lists
+		if (Role.value == 1) {
+			let res = await rechargeListsApi({
+				store_id: STORE_INFO.id,
+				recharge_type: "INDUSTRYMEMBERS"
+			})
+			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
+
+		}
+
 	}

 	getCount()
@ -354,10 +465,24 @@
 			order_no: item.order_id,
 			recharge: 1
 		})
-
-
 	}

+	onLoad(() => {
+		getUserShip().then(res => {
+			console.log(res)
+
+			range.value = res.data.lists.map(item => {
+				return {
+					value: item.id,
+					text: item.title
+				}
+			})
+		})
+		getUserLabel().then(res => {
+			columns.value = [res.data.lists]
+		})
+		getPhoneOneDay()
+	})

 	onPullDownRefresh(() => {
 		getCount()
@ -493,4 +618,8 @@
 	.uni-table-td {
 		padding: 10rpx 0 !important;
 	}
+
+	.slot-content {
+		padding-bottom: 50rpx;
+	}
 </style>
--- a/pages.json
+++ b/pages.json
@ -31,7 +31,7 @@
 		}, {
 			"path": "pages/login/test",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "账号登录",
 				"enablePullDownRefresh": false
 				// "navigationStyle": "custom"
 			}
--- a/pages/cart/cart.vue
+++ b/pages/cart/cart.vue
@ -206,14 +206,22 @@

 	// 购物车相关
 	const addCart = (id, cart_num) => { //加入购物车
-		cartCreateApi({
-			cart_num: +cart_num,
-			product_id: id,
-			store_id: 1
-			// store_id:
-		}).then(res => {
-			getcartList();
-		})
+        if (uni.getStorageSync('STORE_INFO').length) {
+        	let data = JSON.parse(uni.getStorageSync('STORE_INFO'))
+            let STORE_INFO = {};
+        	for (let key in data) {
+        		STORE_INFO[key] = data[key]
+        	}
+            cartCreateApi({
+            	cart_num: +cart_num,
+            	product_id: id,
+            	store_id: STORE_INFO.id
+            	// store_id:
+            }).then(res => {
+            	getcartList();
+            })
+        }
+		
 	}
 	const isAdmin = ref(false); //是否管理

@ -245,6 +253,10 @@
 			} else {
 				checkAll.value = 0
 			}
+            res.data.lists = res.data.lists.map(item => {
+            	if(!item.price) item.price = item.sell; // 兼容旧数据，新数据已经添加了price字段
+            	return item;
+            })
 			cartList.value = res.data.lists;
 			cartInfo.value = {
 				total_price: res.data?.extend.total_price || '0.00',
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -23,16 +23,20 @@
 			<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"
-							style="max-width: 400rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{(shareInfo.real_name||( userStore.userInfo.real_name|| userStore.userInfo.nickname)) + '的供销个人门店' }}</text>
+						<text v-if="userStore.userInfo.user_ship == 1 || shareInfo.store_id"
+							style="max-width: 400rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{
+								(shareInfo.real_name || (
+									userStore.userInfo.real_name || userStore.userInfo.nickname)) + '的供销个人门店' }}</text>
 						<text v-else
-							style="max-width: 400rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{STORE_INFO.store_name}}</text>
+							style="max-width: 400rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{
+								STORE_INFO.store_name }}</text>
 						<up-icon name="arrow-right"></up-icon>
 					</view>
 				</view>
 			</template>
 		</up-navbar>
-		<view class="share-btn" :style="{height:btns.height + 'px',top:btns.top + 'px',left:(btns.left - 40) + 'px'}">
+		<view class="share-btn"
+			:style="{ height: btns.height + 'px', top: btns.top + 'px', left: (btns.left - 40) + 'px' }">
 			<up-button icon="share-square" openType="share" plain size="large" loadingSize="100" />
 		</view>

@ -48,40 +52,41 @@
 			<view class="nav-item" @click="navTo('/pagesOrder/order/order?type=0')">
 				<image src="@/static/tab/da.png"></image>
 				<text>我的订单</text>
+				<view class="badge" v-if="userStore.userInfo.no_writeoff">{{ userStore.userInfo.no_writeoff }}</view>
 			</view>
 			<view class="nav-item" @click="navTo('/pages/my/my')">
 				<image src="@/static/tab/ca.png"></image>
 				<text>个人中心</text>
 			</view>
 		</view>
-		<view class='headScoll' ref='headscroll' :style="{height:isScroll?'0':'200rpx'}">
+		<view class='headScoll' ref='headscroll' :style="{ height: isScroll ? '0' : '200rpx' }">
 			<scroll-view class="head-view" scroll-x @scrolltolower="getgoodClassList(0)">
 				<view class="list">
-					<view class="item" :class="{'item-active': topActive===item.id}"
+					<view class="item" :class="{ 'item-active': topActive === item.id }"
 						v-for="(item, index) in goodClassList" :key="index" @click="changeOne(item, index)">
 						<view class="c-img"><up-image height="100rpx" width="100rpx" :src="item.pic"></up-image></view>
-						<view class="c-text u-line-1">{{item.name}}</view>
+						<view class="c-text u-line-1">{{ item.name }}</view>
 					</view>
 					<view class="item" style="width: 80rpx;height: 20rpx;">
 					</view>
 				</view>
 			</scroll-view>
-			<view class="r-btn" @click="show=1">
+			<view class="r-btn" @click="show = 1">
 				<view>全</view>
 				<view>部</view>
 				<up-icon name="list"></up-icon>
 			</view>
 		</view>
-		<viewPopup nav v-if="show===1" @close="show=0">
+		<viewPopup nav v-if="show === 1" @close="show = 0">
 			<view class="cateOne">
 				<view class="head-title">全部分类</view>
 				<scroll-view scroll-y style="height: 600rpx;">
 					<view class="list">
-						<view class="item" :class="{'item-active': topActive===item.id}"
+						<view class="item" :class="{ 'item-active': topActive === item.id }"
 							v-for="(item, index) in goodClassList" :key="index" @click="changeOne(item, index)">
 							<view class="c-img"><up-image height="100rpx" width="100rpx" :src="item.pic"></up-image>
 							</view>
-							<view class="c-text u-line-1">{{item.name}}</view>
+							<view class="c-text u-line-1">{{ item.name }}</view>
 						</view>
 					</view>
 				</scroll-view>
@ -89,8 +94,8 @@
 		</viewPopup>
 		<view class="scroll-box">
 			<scroll-view class="left" scroll-y @scrolltolower="getgoodClassList(topActive)">
-				<view class="item u-line-1" :class="{'item-active': leftActive===item.id}"
-					v-for="(item, index) in goodClassTow" :key="index" @click="changeTwo(item, index)">{{item.name}}
+				<view class="item u-line-1" :class="{ 'item-active': leftActive === item.id }"
+					v-for="(item, index) in goodClassTow" :key="index" @click="changeTwo(item, index)">{{ item.name }}
 				</view>
 				<view style="width: 100%;height: 450rpx;"></view>
 			</scroll-view>
@ -98,33 +103,36 @@
 				<view class="classify">
 					<scroll-view style="height: 90rpx;" scroll-x @scrolltolower="getgoodClassList(leftActive)">
 						<view class="classify-list">
-							<view class="classify-list-item u-line-1" :class="{'item-active': rightActive===item.id}"
+							<view class="classify-list-item u-line-1"
+								:class="{ 'item-active': rightActive === item.id }"
 								v-for="(item, index) in goodClassThree" :key="index" @click="changeThree(item, index)">
-								{{item.name}}
+								{{ item.name }}
 							</view>
 							<view style="width: 70rpx;flex-shrink: 0;"></view>
 						</view>
 					</scroll-view>
-					<view class="done" @click="show=2">
+					<view class="done" @click="show = 2">
 						<up-icon name="arrow-down"></up-icon>
 					</view>
 					<view class="order-by">
-						<view class="item" :class="{'order-active': where.order==''}" @click="changeOrder('')">综合</view>
-						<view class="item" :class="{'order-active': where.order=='desc'||where.order=='asc'}"
-							@click="changeOrder(where.order=='asc'?'desc':'asc')">价格</view>
-						<view class="item" :class="{'order-active': where.order=='sales'}"
-							@click="changeOrder('sales')">销量</view>
+						<view class="item" :class="{ 'order-active': where.order == '' }" @click="changeOrder('')">综合
+						</view>
+						<view class="item" :class="{ 'order-active': where.order == 'desc' || where.order == 'asc' }"
+							@click="changeOrder(where.order == 'asc' ? 'desc' : 'asc')">价格</view>
+						<view class="item" :class="{ 'order-active': where.order == 'sales' }"
+							@click="changeOrder('sales')">销量
+						</view>
 					</view>
 				</view>
-				<viewPopup v-if="show===2" @close="show=0">
+				<viewPopup v-if="show === 2" @close="show = 0">
 					<view class="cateOne">
 						<scroll-view scroll-y style="height: 230rpx;" @scrolltolower="getgoodClassList(leftActive)">
 							<view class="classify-list">
 								<view class="classify-list-item u-line-1"
-									:class="{'item-active': rightActive===item.id}"
+									:class="{ 'item-active': rightActive === item.id }"
 									v-for="(item, index) in goodClassThree" :key="index"
 									@click="changeThree(item, index)">
-									{{item.name}}
+									{{ item.name }}
 								</view>
 							</view>
 						</scroll-view>
@ -135,26 +143,32 @@
 					<view class="shop-item" v-for="(item, index) in goodList" :key="item.id"
 						@click="openGoodPopup(item)">
 						<view class="shop-img"
-							:style="{backgroundImage: `url(${item.image}?x-oss-process=image/format,webp)`}">
+							:style="{ backgroundImage: `url(${item.image}?x-oss-process=image/format,webp)` }">
 						</view>
 						<view class="shop-content">
 							<view class="title">
-								<view class="name u-line-2">{{item.store_name}}</view>
+								<view class="name u-line-2">{{ item.store_name }}</view>
 								<view class="tip u-line-1">
-									<text>{{item.spec}}</text>
+									<text>{{ item.spec }}</text>
 								</view>
 							</view>
-							<view style="display: flex;" v-if='item.batch>0'>
-								<view>{{item.batch}}{{item.unit_name }}起卖</view>
+							<view style="display: flex;" v-if='item.batch > 0'>
+								<view style="color: red;">起批量: {{ item.batch }}{{ item.unit_name }}起卖</view>
 							</view>
-							<view style="display: flex;align-items: center;" v-if='userStore?.userInfo?.user_ship==1'>
+							<!-- <view style="display: flex;align-items: center;" v-if='userStore?.userInfo?.user_ship == 1'>
 								<text class='price' style="font-size: 24rpx;">会员价￥</text>
-								<text class="price" style="margin-right: 10rpx;">{{item.vip_price}}
+								<text class="price" style="margin-right: 10rpx;">{{ item.vip_price }}
 								</text>
-								<text class='price' style="font-size: 24rpx;">/{{item.unit_name}}</text>
-							</view>
+								<text class='price' style="font-size: 24rpx;">/{{ item.unit_name }}</text>
+							</view> -->
 							<view class="price-btn">
-								<view class="price" style="font-size: 24rpx;">￥{{item.price}}/{{item.unit_name}}</view>
+								<!-- <view class="price" style="font-size: 24rpx;"
+									v-if='userStore?.userInfo?.user_ship == 1'>
+									￥{{ item.price }}/{{ item.unit_name }}
+								</view> -->
+								<view class="price">
+									￥{{ item.price }}/{{ item.unit_name }}
+								</view>
 								<view class="btn">
 									<u--icon name="plus-circle-fill" size="20" color="#20b128"></u--icon>
 								</view>
@ -169,7 +183,12 @@
 			<view class="price-info">
 				<view class="row">
 					<view>合计</view>
-					<view class="price">¥<text style="font-size: 36rpx;">{{cartInfo.total_price}}</text></view>
+					<view class="price" v-if='cartInfo.pay_price<=0||userStore?.userInfo?.user_ship !=4'>¥<text
+							style="font-size: 36rpx;">{{ cartInfo.total_price }}</text></view>
+					<view class="price" v-else>¥<text style="font-size: 30rpx;">{{ cartInfo.total_price }}</text></view>
+					<view class="price" v-if="cartInfo.pay_price>0 &&userStore?.userInfo?.user_ship == 4"><text
+							style="font-size: 36rpx;">优惠后
+							{{ cartInfo.pay_price }}</text></view>
 				</view>
 				<!-- <view class="row">
          <view style="color: #777;">原价 ¥50.00</view>
@ -177,16 +196,16 @@
        </view> -->
 			</view>
 			<view class="btn">
-				<up-button color="#20b128" :disabled="cartInfo.total_price<500" @click="settleAccounts">
-					{{cartInfo.total_price<500?"¥500起订":"结算" }} </up-button>
+				<up-button color="#20b128" :disabled="cartInfo.total_price < 500" @click="settleAccounts">
+					{{ cartInfo.total_price < 500 ? "¥500起订" : "结算" }} </up-button>
 			</view>
 			<view class="cart" @click="navTo('/pages/cart/cart')">
 				<image src="@/static/icon/cart.png"></image>
-				<view class="badge">{{cartInfo.count}}</view>
+				<view class="badge">{{ cartInfo.count }}</view>
 			</view>
 		</view>

-		<goodPopup ref="goodRef" :show="showGoodPopup" @close="showGoodPopup=false" @change="changeGood" />
+		<goodPopup ref="goodRef" :show="showGoodPopup" @close="showGoodPopup = false" @change="changeGood" />
 	</view>
 </template>

@ -228,8 +247,8 @@
 	import useUserStore from "@/store/user";
 	const userStore = useUserStore();
 	const STORE_INFO = reactive({
-		id: 4,
-		store_name: "农(特)产品直营店"
+		id: '',
+		store_name: ""
 	})

 	const getStoreInfoFn = () => {
@ -351,7 +370,7 @@
 		name: '',
 		order: '',
 		store_name: '',
-		store_id: STORE_INFO.id
+		store_id: ''
 	})

 	const loading = ref(true);
@ -367,6 +386,7 @@
 		if (class_all) class_id = ""; //只能带其中一个
 		if (loadmore) where.value.page_no++;
 		else where.value.page_no = 1;
+		console.log('where------------', where.value)
 		goodListApi({
 			...where.value,
 			class_all: class_all,
@ -375,11 +395,6 @@
 		}).then(res => {
 			if (loadmore) goodList.value.push(...res.data.lists);
 			else goodList.value = res.data.lists;
-			// 补充店铺信息
-			// if (!STORE_INFO.store_name || !STORE_INFO.detailed_address) {
-			// 	STORE_INFO.store_name = res.data.store.name;
-			// 	STORE_INFO.value.detailed_address = res.data.store.detailed_address;
-			// }
 		})
 	}

@ -504,7 +519,6 @@
 		goodData.value = item;
 		goodRef.value.setData(item);
 		showGoodPopup.value = true;
-
 		//统计商品的访问记录
 		productLogApi({
 			product_id: item.product_id,
@ -542,6 +556,7 @@
 	// 购物车相关
 	const cartInfo = ref({
 		total_price: '0.00',
+		pay_price: 0,
 		count: 0
 	})
 	const getCartList = (res) => {
@ -551,6 +566,7 @@
 		}).then(res => {
 			cartInfo.value = {
 				total_price: res.data?.extend?.total_price || '0.00',
+				pay_price: res.data?.extend?.pay_price || '0.00',
 				count: res.data?.count || 0
 			}
 			cartStore.setCartList(res.data?.lists.map(item => item.id))
@ -581,12 +597,17 @@
 	getShareInfo()

 	onLoad(async (opt) => {
-		where.value.store_id = opt.id || STORE_INFO.id;
-		// 店铺id
 		if (opt.id) {
+			where.value.store_id = (opt.id == 'undefined' ? STORE_INFO.id : opt.id);
+		} else {
+			where.value.store_id = STORE_INFO.id
+		}
+		// 店铺id
+		if (opt.id && opt.id != 'undefined') {
+			console.log(opt.id, opt.id != 'undefined', "进来了这里")
 			where.value.store_id = opt.id;
 			const info = await shopDetailApi({
-				store_id: opt.id
+				store_id: where.value.store_id
 			});
 			// 分享参数至当前用户参数
 			if (opt.spread_uid) {
@ -663,11 +684,24 @@
 			flex-direction: column;
 			align-items: center;
 			justify-content: center;
+			position: relative;

 			image {
 				height: 40rpx;
 				width: 40rpx;
 			}
+
+			.badge {
+				position: absolute;
+				top: -10rpx;
+				right: 0;
+				background-color: #FF0000;
+				color: #FFFFFF;
+				padding: 0 8rpx;
+				border-radius: 50rpx;
+				font-size: 18rpx;
+			}
+
 		}
 	}

--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@ -9,16 +9,16 @@
 		<view class="login-box">
 			<image class="logo" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/35adb202404271727457954.png">
 			</image>
-			<view class="tips">欢迎登录惠农批发</view>
+			<view class="tips">欢迎登录泸优采</view>
 			<block v-if="showWeixin">
 				<up-transition :show="showWeixin">
 					<view class="btn">
 						<up-button @click="weixinLogin" color="#20B128" size="large"><up-icon name="weixin-fill"
 								color="#fff" size="28"></up-icon>微信快捷登录</up-button>
 					</view>
-					<view class="btn" v-if="config.ENV=='dev'">
+					<view class="btn">
 						<up-button @click="navgo('/pages/login/test')" color="#20B128" size="large"><up-icon
-								name="weixin-fill" color="#fff" size="28"></up-icon>账号登录</up-button>
+								name="account-fill" color="#fff" size="28"></up-icon>手机号快捷登录</up-button>
 					</view>
 					<!-- <view class="btn">
            <up-button @click="officialCode" color="#20B128" size="large"><up-icon name="weixin-fill" color="#fff"
--- a/pages/login/test.vue
+++ b/pages/login/test.vue
@ -1,8 +1,36 @@
 <template>
-	<view class="" style="padding: 100rpx;">
-		<up-input :customStyle="{height: '100%'}" v-model="zh" placeholderClass="place" placeholder="请输入手机号" />
-		<up-button @click="submit" color="#20B128" size="large"><up-icon name="weixin-fill" color="#fff"
-				size="28"></up-icon>账号登录</up-button>
+	<view class="content">
+		<view style="text-align: center;">
+			<image class="logo" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/35adb202404271727457954.png">
+			</image>
+			<view class="tips">欢迎登录泸优采</view>
+		</view>
+
+		<view class='card'>
+			<view style="display: flex;align-items: center;">
+				<text>手机号：</text>
+				<up-input v-model="formData.account" placeholder="请输入手机号"></up-input>
+			</view>
+			<view style="margin: 30rpx 0;">
+			</view>
+			<view style="display: flex;justify-content: space-between;align-items: center;">
+				<text style="margin-right: 20rpx;">验证码:</text>
+				<up-input v-model="formData.code" placeholder="请输入验证码" type='number'></up-input>
+				<view class="code-btn">
+					<view style="margin: 0 20rpx;">
+						<up-line color="grey" direction="col" length="30rpx"></up-line>
+					</view>
+					<text class='btn-text' style="color: grey;" v-if='cutDown'>重新获取({{cutDown}})</text>
+					<text @click="getCode" class='btn-text' v-else> {{flag?'获取验证码':'重新获取' }} </text>
+				</view>
+			</view>
+		</view>
+		<view class="submit-btn">
+			<up-button @click="submit" color="#20B128" size="large">
+				登录</up-button>
+
+		</view>
+
 	</view>
 </template>

@ -10,27 +38,60 @@
 	import {
 		userLoginApi,
 		userInfoApi,
-		getStoreInfo
+		getStoreInfo,
+		getloginSms
 	} from "@/api/user.js";
 	import {
-		ref
+		ref,
+		reactive
 	} from "vue"
 	import useUserStore from "@/store/user";
 	const userStore = useUserStore();
+
+
+
+
+	const formData = reactive({
+		account: "",
+		code: "",
+		terminal: 1,
+		scene: 2
+	})
+
+
+	// 获取验证码
+	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.account)) return uni.$u.toast('请输入正确的手机号')
+		await getloginSms({
+			account: formData.account
+		})
+		flag.value = false
+		cutDown.value = 60
+		let timer = setInterval(() => {
+			cutDown.value--
+			if (cutDown.value <= 0) clearInterval(timer)
+		}, 1000)
+	}
+	// 获取验证码结束
+
+
 	const zh = ref("")

 	const submit = () => {
 		userLoginApi({
-			account: zh.value,
-			"password": "123456",
-			"terminal": 2,
-			"scene": 1
+			...formData
 		}).then(res => {
-
 			getStoreInfo().then(res => {
 				uni.setStorageSync("STORE_INFO", JSON.stringify(res.data))
 			})
-
 			uni.setStorageSync('token', res.data.token);
 			userStore.setToken(res.data.token);
 			console.log(res.data.token)
@ -48,5 +109,46 @@
 	}
 </script>

-<style>
+<style lang='scss'>
+	.content {
+		background-color: white;
+		height: 100vh;
+		box-sizing: border-box;
+		padding-top: 15vh;
+
+		.logo {
+			height: 152rpx;
+			width: 152rpx;
+		}
+
+		.tips {
+			color: #444444;
+			font-size: 28rpx;
+			margin: 30rpx 0;
+		}
+	}
+
+	.card {
+		padding: 50rpx;
+		background-color: white;
+		margin-bottom: 30rpx;
+		padding-bottom: 30rpx;
+	}
+
+	.submit-btn {
+		position: absolute;
+		bottom: 100rpx;
+		width: 710rpx;
+		left: 50%;
+		transform: translateX(-50%);
+	}
+
+	.code-btn {
+		display: flex;
+		align-items: center;
+	}
+
+	.btn-text {
+		color: #20B128;
+	}
 </style>
--- a/pagesOrder/detail/detail.vue
+++ b/pagesOrder/detail/detail.vue
@ -9,8 +9,7 @@
 				@click="callPhone(shopInfo.phone)">
 				<view class="top" style="align-items: flex-start;">
 					<view style="color: #333;display: flex;align-items: center;flex-shrink: 0;">
-						<up-icon name="map"></up-icon>
-						<text style="margin: 0 10rpx;">自提点</text>
+						<text style="margin: 0 10rpx;color:#20B128">推荐自提点</text>
 					</view>
 					<view v-if="shopInfo.id">
 						<view style="color: #333;">
--- a/uni_modules/uni-data-select/changelog.md
+++ b/uni_modules/uni-data-select/changelog.md
@ -0,0 +1,39 @@
+## 1.0.8（2024-03-28）
+- 修复 在vue2下:style动态绑定导致编译失败的bug
+## 1.0.7（2024-01-20）
+- 修复 长文本回显超过容器的bug，超过容器部分显示省略号
+## 1.0.6（2023-04-12）
+- 修复 微信小程序点击时会改变背景颜色的 bug
+## 1.0.5（2023-02-03）
+- 修复 禁用时会显示清空按钮
+## 1.0.4（2023-02-02）
+- 优化 查询条件短期内多次变更只查询最后一次变更后的结果
+- 调整 内部缓存键名调整为 uni-data-select-lastSelectedValue
+## 1.0.3（2023-01-16）
+- 修复 不关联服务空间报错的问题
+## 1.0.2（2023-01-14）
+- 新增  属性 `format` 可用于格式化显示选项内容
+## 1.0.1（2022-12-06）
+- 修复  当where变化时，数据不会自动更新的问题
+## 0.1.9（2022-09-05）
+- 修复 微信小程序下拉框出现后选择会点击到蒙板后面的输入框
+## 0.1.8（2022-08-29）
+- 修复 点击的位置不准确
+## 0.1.7（2022-08-12）
+- 新增 支持 disabled 属性
+## 0.1.6（2022-07-06）
+- 修复 pc端宽度异常的bug
+## 0.1.5
+- 修复 pc端宽度异常的bug
+## 0.1.4（2022-07-05）
+- 优化 显示样式
+## 0.1.3（2022-06-02）
+- 修复 localdata 赋值不生效的 bug
+- 新增 支持  uni.scss 修改颜色
+- 新增 支持选项禁用（数据选项设置 disabled: true 即禁用）
+## 0.1.2（2022-05-08）
+- 修复 当 value 为 0 时选择不生效的 bug
+## 0.1.1（2022-05-07）
+- 新增 记住上次的选项（仅 collection 存在时有效）
+## 0.1.0（2022-04-22）
+- 初始化
--- a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
+++ b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
@ -0,0 +1,562 @@
+<template>
+	<view class="uni-stat__select">
+		<span v-if="label" class="uni-label-text hide-on-phone">{{label + '：'}}</span>
+		<view class="uni-stat-box" :class="{'uni-stat__actived': current}">
+			<view class="uni-select" :class="{'uni-select--disabled':disabled}">
+				<view class="uni-select__input-box" @click="toggleSelector">
+					<view v-if="current" class="uni-select__input-text">{{textShow}}</view>
+					<view v-else class="uni-select__input-text uni-select__input-placeholder">{{typePlaceholder}}</view>
+					<view v-if="current && clear && !disabled" @click.stop="clearVal">
+						<uni-icons type="clear" color="#c0c4cc" size="24" />
+					</view>
+					<view v-else>
+						<uni-icons :type="showSelector? 'top' : 'bottom'" size="14" color="#999" />
+					</view>
+				</view>
+				<view class="uni-select--mask" v-if="showSelector" @click="toggleSelector" />
+				<view class="uni-select__selector" :style="getOffsetByPlacement" v-if="showSelector">
+					<view :class="placement=='bottom'?'uni-popper__arrow_bottom':'uni-popper__arrow_top'"></view>
+					<scroll-view scroll-y="true" class="uni-select__selector-scroll">
+						<view class="uni-select__selector-empty" v-if="mixinDatacomResData.length === 0">
+							<text>{{emptyTips}}</text>
+						</view>
+						<view v-else class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData" :key="index"
+							@click="change(item)">
+							<text :class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</text>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * DataChecklist 数据选择器
+	 * @description 通过数据渲染的下拉框组件
+	 * @tutorial https://uniapp.dcloud.io/component/uniui/uni-data-select
+	 * @property {String} value 默认值
+	 * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
+	 * @property {Boolean} clear 是否可以清空已选项
+	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
+	 * @property {String} label 左侧标题
+	 * @property {String} placeholder 输入框的提示文字
+	 * @property {Boolean} disabled 是否禁用
+	 * @property {String} placement 弹出位置
+	 * 	@value top   		顶部弹出
+	 * 	@value bottom		底部弹出（default)
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: "uni-data-select",
+		mixins: [uniCloud.mixinDatacom || {}],
+		props: {
+			localdata: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			label: {
+				type: String,
+				default: ''
+			},
+			placeholder: {
+				type: String,
+				default: '请选择'
+			},
+			emptyTips: {
+				type: String,
+				default: '无选项'
+			},
+			clear: {
+				type: Boolean,
+				default: true
+			},
+			defItem: {
+				type: Number,
+				default: 0
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// 格式化输出 用法 field="_id as value, version as text, uni_platform as label" format="{label} - {text}"
+			format: {
+				type: String,
+				default: ''
+			},
+			placement: {
+				type: String,
+				default: 'bottom'
+			}
+		},
+		data() {
+			return {
+				showSelector: false,
+				current: '',
+				mixinDatacomResData: [],
+				apps: [],
+				channels: [],
+				cacheKey: "uni-data-select-lastSelectedValue",
+			};
+		},
+		created() {
+			this.debounceGet = this.debounce(() => {
+				this.query();
+			}, 300);
+			if (this.collection && !this.localdata.length) {
+				this.debounceGet();
+			}
+		},
+		computed: {
+			typePlaceholder() {
+				const text = {
+					'opendb-stat-app-versions': '版本',
+					'opendb-app-channels': '渠道',
+					'opendb-app-list': '应用'
+				}
+				const common = this.placeholder
+				const placeholder = text[this.collection]
+				return placeholder ?
+					common + placeholder :
+					common
+			},
+			valueCom() {
+				// #ifdef VUE3
+				return this.modelValue;
+				// #endif
+				// #ifndef VUE3
+				return this.value;
+				// #endif
+			},
+			textShow() {
+				// 长文本显示
+				let text = this.current;
+				if (text.length > 10) {
+					return text.slice(0, 25) + '...';
+				}
+				return text;
+			},
+			getOffsetByPlacement() {
+				switch (this.placement) {
+					case 'top':
+						return "bottom:calc(100% + 12px);";
+					case 'bottom':
+						return "top:calc(100% + 12px);";
+				}
+			}
+		},
+
+		watch: {
+			localdata: {
+				immediate: true,
+				handler(val, old) {
+					if (Array.isArray(val) && old !== val) {
+						this.mixinDatacomResData = val
+					}
+				}
+			},
+			valueCom(val, old) {
+				this.initDefVal()
+			},
+			mixinDatacomResData: {
+				immediate: true,
+				handler(val) {
+					if (val.length) {
+						this.initDefVal()
+					}
+				}
+			},
+
+		},
+		methods: {
+			debounce(fn, time = 100) {
+				let timer = null
+				return function(...args) {
+					if (timer) clearTimeout(timer)
+					timer = setTimeout(() => {
+						fn.apply(this, args)
+					}, time)
+				}
+			},
+			// 执行数据库查询
+			query() {
+				this.mixinDatacomEasyGet();
+			},
+			// 监听查询条件变更事件
+			onMixinDatacomPropsChange() {
+				if (this.collection) {
+					this.debounceGet();
+				}
+			},
+			initDefVal() {
+				let defValue = ''
+				if ((this.valueCom || this.valueCom === 0) && !this.isDisabled(this.valueCom)) {
+					defValue = this.valueCom
+				} else {
+					let strogeValue
+					if (this.collection) {
+						strogeValue = this.getCache()
+					}
+					if (strogeValue || strogeValue === 0) {
+						defValue = strogeValue
+					} else {
+						let defItem = ''
+						if (this.defItem > 0 && this.defItem <= this.mixinDatacomResData.length) {
+							defItem = this.mixinDatacomResData[this.defItem - 1].value
+						}
+						defValue = defItem
+					}
+					if (defValue || defValue === 0) {
+						this.emit(defValue)
+					}
+				}
+				const def = this.mixinDatacomResData.find(item => item.value === defValue)
+				this.current = def ? this.formatItemName(def) : ''
+			},
+
+			/**
+			 * @param {[String, Number]} value
+			 * 判断用户给的 value 是否同时为禁用状态
+			 */
+			isDisabled(value) {
+				let isDisabled = false;
+
+				this.mixinDatacomResData.forEach(item => {
+					if (item.value === value) {
+						isDisabled = item.disable
+					}
+				})
+
+				return isDisabled;
+			},
+
+			clearVal() {
+				this.emit('')
+				if (this.collection) {
+					this.removeCache()
+				}
+			},
+			change(item) {
+				if (!item.disable) {
+					this.showSelector = false
+					this.current = this.formatItemName(item)
+					this.emit(item.value)
+				}
+			},
+			emit(val) {
+				this.$emit('input', val)
+				this.$emit('update:modelValue', val)
+				this.$emit('change', val)
+				if (this.collection) {
+					this.setCache(val);
+				}
+			},
+			toggleSelector() {
+				if (this.disabled) {
+					return
+				}
+
+				this.showSelector = !this.showSelector
+			},
+			formatItemName(item) {
+				let {
+					text,
+					value,
+					channel_code
+				} = item
+				channel_code = channel_code ? `(${channel_code})` : ''
+
+				if (this.format) {
+					// 格式化输出
+					let str = "";
+					str = this.format;
+					for (let key in item) {
+						str = str.replace(new RegExp(`{${key}}`, "g"), item[key]);
+					}
+					return str;
+				} else {
+					return this.collection.indexOf('app-list') > 0 ?
+						`${text}(${value})` :
+						(
+							text ?
+							text :
+							`未命名${channel_code}`
+						)
+				}
+			},
+			// 获取当前加载的数据
+			getLoadData() {
+				return this.mixinDatacomResData;
+			},
+			// 获取当前缓存key
+			getCurrentCacheKey() {
+				return this.collection;
+			},
+			// 获取缓存
+			getCache(name = this.getCurrentCacheKey()) {
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				return cacheData[name];
+			},
+			// 设置缓存
+			setCache(value, name = this.getCurrentCacheKey()) {
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				cacheData[name] = value;
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+			// 删除缓存
+			removeCache(name = this.getCurrentCacheKey()) {
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				delete cacheData[name];
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-base-color: #6a6a6a !default;
+	$uni-main-color: #333 !default;
+	$uni-secondary-color: #909399 !default;
+	$uni-border-3: #e5e5e5;
+
+	/* #ifndef APP-NVUE */
+	@media screen and (max-width: 500px) {
+		.hide-on-phone {
+			display: none;
+		}
+	}
+
+	/* #endif */
+	.uni-stat__select {
+		display: flex;
+		align-items: center;
+		// padding: 15px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+		width: 100%;
+		flex: 1;
+		box-sizing: border-box;
+	}
+
+	.uni-stat-box {
+		width: 100%;
+		flex: 1;
+	}
+
+	.uni-stat__actived {
+		width: 100%;
+		flex: 1;
+		// outline: 1px solid #2979ff;
+	}
+
+	.uni-label-text {
+		font-size: 14px;
+		font-weight: bold;
+		color: $uni-base-color;
+		margin: auto 0;
+		margin-right: 5px;
+	}
+
+	.uni-select {
+		font-size: 14px;
+		border: 1px solid $uni-border-3;
+		box-sizing: border-box;
+		border-radius: 4px;
+		padding: 0 5px;
+		padding-left: 10px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		user-select: none;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		border-bottom: solid 1px $uni-border-3;
+		width: 100%;
+		flex: 1;
+		height: 35px;
+
+		&--disabled {
+			background-color: #f5f7fa;
+			cursor: not-allowed;
+		}
+	}
+
+	.uni-select__label {
+		font-size: 16px;
+		// line-height: 22px;
+		height: 35px;
+		padding-right: 10px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__input-box {
+		height: 35px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.uni-select__input {
+		flex: 1;
+		font-size: 14px;
+		height: 22px;
+		line-height: 22px;
+	}
+
+	.uni-select__input-plac {
+		font-size: 14px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__selector {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+		position: absolute;
+		left: 0;
+		width: 100%;
+		background-color: #FFFFFF;
+		border: 1px solid #EBEEF5;
+		border-radius: 6px;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		z-index: 3;
+		padding: 4px 0;
+	}
+
+	.uni-select__selector-scroll {
+		/* #ifndef APP-NVUE */
+		max-height: 200px;
+		box-sizing: border-box;
+		/* #endif */
+	}
+
+	/* #ifdef H5 */
+	@media (min-width: 768px) {
+		.uni-select__selector-scroll {
+			max-height: 600px;
+		}
+	}
+
+	/* #endif */
+
+	.uni-select__selector-empty,
+	.uni-select__selector-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		line-height: 35px;
+		font-size: 14px;
+		text-align: center;
+		/* border-bottom: solid 1px $uni-border-3; */
+		padding: 0px 10px;
+	}
+
+	.uni-select__selector-item:hover {
+		background-color: #f9f9f9;
+	}
+
+	.uni-select__selector-empty:last-child,
+	.uni-select__selector-item:last-child {
+		/* #ifndef APP-NVUE */
+		border-bottom: none;
+		/* #endif */
+	}
+
+	.uni-select__selector__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+
+	/* picker 弹出层通用的指示小三角 */
+	.uni-popper__arrow_bottom,
+	.uni-popper__arrow_bottom::after,
+	.uni-popper__arrow_top,
+	.uni-popper__arrow_top::after,
+	{
+	position: absolute;
+	display: block;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
+	border-width: 6px;
+	}
+
+	.uni-popper__arrow_bottom {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow_bottom::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
+	}
+
+	.uni-popper__arrow_top {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		bottom: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-bottom-width: 0;
+		border-top-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow_top::after {
+		content: " ";
+		bottom: 1px;
+		margin-left: -6px;
+		border-bottom-width: 0;
+		border-top-color: #fff;
+	}
+
+
+	.uni-select__input-text {
+		// width: 280px;
+		width: 100%;
+		color: $uni-main-color;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+		overflow: hidden;
+	}
+
+	.uni-select__input-placeholder {
+		color: $uni-base-color;
+		font-size: 12px;
+	}
+
+	.uni-select--mask {
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		right: 0;
+		left: 0;
+		z-index: 2;
+	}
+</style>
--- a/uni_modules/uni-data-select/package.json
+++ b/uni_modules/uni-data-select/package.json
@ -0,0 +1,86 @@
+{
+  "id": "uni-data-select",
+  "displayName": "uni-data-select 下拉框选择器",
+  "version": "1.0.8",
+  "description": "通过数据驱动的下拉框选择器",
+  "keywords": [
+    "uni-ui",
+    "select",
+    "uni-data-select",
+    "下拉框",
+    "下拉选"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.1"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-load-more"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "n"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+        "QQ": "u",
+        "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
--- a/uni_modules/uni-data-select/readme.md
+++ b/uni_modules/uni-data-select/readme.md
@ -0,0 +1,8 @@
+## DataSelect 下拉框选择器
+> **组件名：uni-data-select**
+> 代码块： `uDataSelect`
+
+当选项过多时，使用下拉菜单展示并选择内容
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-select)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
--- a/uni_modules/uni-load-more/changelog.md
+++ b/uni_modules/uni-load-more/changelog.md
@ -0,0 +1,19 @@
+## 1.3.3（2022-01-20）
+- 新增 showText属性 ，是否显示文本
+## 1.3.2（2022-01-19）
+- 修复 nvue 平台下不显示文本的bug
+## 1.3.1（2022-01-19）
+- 修复 微信小程序平台样式选择器报警告的问题
+## 1.3.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-load-more](https://uniapp.dcloud.io/component/uniui/uni-load-more)
+## 1.2.1（2021-08-24）
+- 新增 支持国际化
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.8（2021-05-12）
+- 新增 组件示例地址
+## 1.1.7（2021-03-30）
+- 修复 uni-load-more 在首页使用时，h5 平台报 'uni is not defined' 的 bug
+## 1.1.6（2021-02-05）
+- 调整为uni_modules目录规范
--- a/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json
@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "Pull up to show more",
+	"uni-load-more.contentrefresh": "loading...",
+	"uni-load-more.contentnomore": "No more data"
+}
--- a/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js
@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
--- a/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json
@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "上拉显示更多",
+	"uni-load-more.contentrefresh": "正在加载...",
+	"uni-load-more.contentnomore": "没有更多数据了"
+}
--- a/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json
@ -0,0 +1,5 @@
+{
+	"uni-load-more.contentdown": "上拉顯示更多",
+	"uni-load-more.contentrefresh": "正在加載...",
+	"uni-load-more.contentnomore": "沒有更多數據了"
+}
--- a/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
+++ b/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
--- a/uni_modules/uni-load-more/package.json
+++ b/uni_modules/uni-load-more/package.json
@ -0,0 +1,86 @@
+{
+  "id": "uni-load-more",
+  "displayName": "uni-load-more 加载更多",
+  "version": "1.3.3",
+  "description": "LoadMore 组件，常用在列表里面，做滚动加载使用。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "加载更多",
+    "load-more"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
--- a/uni_modules/uni-load-more/readme.md
+++ b/uni_modules/uni-load-more/readme.md
@ -0,0 +1,14 @@
+
+
+### LoadMore 加载更多
+> **组件名：uni-load-more**
+> 代码块： `uLoadMore`
+
+
+用于列表中，做滚动加载使用，展示 loading 的各种状态。
+
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-load-more)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
Author	SHA1	Message	Date
zmj	57fa7980cf	ad	2024-06-24 14:07:32 +08:00
zmj	242cc21a92	add	2024-06-24 09:28:16 +08:00
zmj	8bec0329ed	add	2024-06-23 20:16:21 +08:00
zmj	dc37c653b4	add	2024-06-22 21:11:18 +08:00
zmj	a75f9284f8	add	2024-06-22 20:26:36 +08:00
zmj	0a8c7b0504	add	2024-06-22 19:58:02 +08:00
zmj	4b1c909d5e	add	2024-06-22 19:48:52 +08:00
weipengfei	fbe0e064a4	1	2024-06-22 19:48:14 +08:00
zmj	e5406af13b	add	2024-06-22 19:21:24 +08:00
weipengfei	710cf5abc7	Merge branch 'master' of https://gitea.lihaink.cn/weipengfei/purchase-let	2024-06-22 19:19:11 +08:00
weipengfei	f852b67681	更新	2024-06-22 19:14:59 +08:00
zmj	7c4e9b5c51	add	2024-06-22 18:52:03 +08:00
zmj	6b2ebb94ab	add	2024-06-22 11:31:01 +08:00
weipengfei	bbff5152a9	更新	2024-06-22 11:21:03 +08:00