From 589cb5b25201307fe3698ded4c89c4ba40657e00 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Mon, 9 Sep 2024 18:48:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/news1/MerchantSettlement.vue | 1028 ++++++++++++++--------------
 1 file changed, 522 insertions(+), 506 deletions(-)

diff --git a/pages/news1/MerchantSettlement.vue b/pages/news1/MerchantSettlement.vue
index b3bc730..345cd1d 100644
--- a/pages/news1/MerchantSettlement.vue
+++ b/pages/news1/MerchantSettlement.vue
@@ -29,7 +29,8 @@
 						<u-input border placeholder="请输入" v-model="form.store_brand" />
 					</u-form-item>
 					<u-form-item label="*自有品牌/代理入驻" @click="bandShow = true">
-						<u-input border v-model="brand_name" placeholder="代理入驻" type="select" @click="bandShow = true" />
+						<u-input border v-model="brand_name" placeholder="代理入驻" type="select"
+							@click="bandShow = true" />
 						<u-action-sheet :list="bandList" :cancel-btn="false" v-model="bandShow"
 							@click="actionSheetCallback(2, $event)"></u-action-sheet>
 					</u-form-item>
@@ -56,7 +57,8 @@
 							@click="actionSheetCallback(5, $event)"></u-action-sheet>
 					</u-form-item>
 					<u-form-item label="*联系人手机号">
-						<u-input border placeholder="请输入手机号" type="numer" v-model="form.user_mobile" />
+						<u-input border placeholder="请输入手机号" type="numer" @blur="isPhone(form.user_mobile);"
+							v-model="form.user_mobile" />
 					</u-form-item>
 					<u-form-item label="*联系人微信号">
 						<u-input border placeholder="请输入微信号" v-model="form.user_wx" />
@@ -85,7 +87,8 @@
 							@click="actionSheetCallback(8, $event)"></u-action-sheet>
 					</u-form-item>
 					<u-form-item label="*是否有线下渠道" @click="yesnoShow = true">
-						<u-input border v-model="offline_name" placeholder="请选择" type="select" @click="yesnoShow = true" />
+						<u-input border v-model="offline_name" placeholder="请选择" type="select"
+							@click="yesnoShow = true" />
 						<u-action-sheet :list="yesNotList" :cancel-btn="false" v-model="yesnoShow"
 							@click="actionSheetCallback(9, $event)"></u-action-sheet>
 					</u-form-item>
@@ -136,562 +139,575 @@
 </template>
 
 <script>
-import * as help from '@/api/help'
-export default {
-	data() {
-		return {
-			brand_name: '',
-			authorize_name: '',
-			rate_name: '',
-			shop_name: '',
-			offline_name: '',
-			factory_name: '',
-			send_name: '',
-			form: {
-				store_name: '',
-				store_cat: '',
-				store_address: '',
-				store_brand: '',
-				store_settle_type: '',
-				authorize: '',
-				has_tax: '',
-				user_name: '',
-				user_position: '',
-				user_mobile: '',
-				user_wx: '',
-				user_email: '',
-				store_model: '',
-				send_type: '',
-				has_factory: '',
-				has_offline: '',
-				has_online_shop: ''
-			},
-			categoryShow: false,
-			categoryList: [{
-				text: '3C数码',
-				id: 1
-			}, {
-				text: '家用电蒸',
-				id: 2
-			}, {
-				text: '家居家装',
-				id: 3
-			}, {
-				text: '家居生活',
-				id: 4
-			}, {
-				text: '美容个护',
-				id: 5
-			}, {
-				text: '服饰箱包',
-				id: 6
-			}, {
-				text: '母婴玩具',
-				id: 7
-			}, {
-				text: '运动广外',
-				id: 8
-			}, {
-				text: '食品饮料',
-				id: 9
-			}, {
-				text: '水果生鲜',
-				id: 10
-			}, {
-				text: '汽车用品',
-				id: 11
-			}, {
-				text: '虚拟商品',
-				id: 11
-			}],
-			bandShow: false,
-			bandList: [{
-				text: '自有品牌',
-				id: 1
-			}, {
-				text: '代理入驻',
-				id: 2
-			}],
-			levelShow: false,
-			leveList: [{
-				text: '一级授权',
-				id: 1
-			}, {
-				text: '二级授权',
-				id: 2
-			}],
-			modeShow: false,
-			modeList: [{
-				text: '自有仓库',
-				id: 1
-			}, {
-				text: '上游代发',
-				id: 2
-			}, {
-				text: '以上皆有',
-				id: 3
-			}],
-
-			contactShow: false,
-			contactsList: [{
-				text: '老板',
-				id: 1
-			}, {
-				text: '市场经理',
-				id: 2
-			}, {
-				text: '商务',
-				id: 3
-			}],
-			yesnoShow: false,
-			sendShow: false,
-			factoryShow: false,
-			taxShow: false,
-			taxList: [{
-				text: '不含',
-				id: 0
-			}, {
-				text: '含',
-				id: 1
-			}],
-			storeShow: false,
-			yesNotList: [{
-				text: '无',
-				id: 0
-			}, {
-				text: '有',
-				id: 1
-			}],
-			sendList: [{
-				text: '不发货',
-				id: 0
-			}, {
-				text: '发货',
-				id: 1
-			}],
-			addrshow: false,
-			btnList: [],
-			active: 0,
-			popShow: false,
+	import * as help from '@/api/help'
+	export default {
+		data() {
+			return {
+				brand_name: '',
+				authorize_name: '',
+				rate_name: '',
+				shop_name: '',
+				offline_name: '',
+				factory_name: '',
+				send_name: '',
+				form: {
+					store_name: '',
+					store_cat: '',
+					store_address: '',
+					store_brand: '',
+					store_settle_type: '',
+					authorize: '',
+					has_tax: '',
+					user_name: '',
+					user_position: '',
+					user_mobile: '',
+					user_wx: '',
+					user_email: '',
+					store_model: '',
+					send_type: '',
+					has_factory: '',
+					has_offline: '',
+					has_online_shop: ''
+				},
+				categoryShow: false,
+				categoryList: [{
+					text: '3C数码',
+					id: 1
+				}, {
+					text: '家用电蒸',
+					id: 2
+				}, {
+					text: '家居家装',
+					id: 3
+				}, {
+					text: '家居生活',
+					id: 4
+				}, {
+					text: '美容个护',
+					id: 5
+				}, {
+					text: '服饰箱包',
+					id: 6
+				}, {
+					text: '母婴玩具',
+					id: 7
+				}, {
+					text: '运动广外',
+					id: 8
+				}, {
+					text: '食品饮料',
+					id: 9
+				}, {
+					text: '水果生鲜',
+					id: 10
+				}, {
+					text: '汽车用品',
+					id: 11
+				}, {
+					text: '虚拟商品',
+					id: 11
+				}],
+				bandShow: false,
+				bandList: [{
+					text: '自有品牌',
+					id: 1
+				}, {
+					text: '代理入驻',
+					id: 2
+				}],
+				levelShow: false,
+				leveList: [{
+					text: '一级授权',
+					id: 1
+				}, {
+					text: '二级授权',
+					id: 2
+				}],
+				modeShow: false,
+				modeList: [{
+					text: '自有仓库',
+					id: 1
+				}, {
+					text: '上游代发',
+					id: 2
+				}, {
+					text: '以上皆有',
+					id: 3
+				}],
+
+				contactShow: false,
+				contactsList: [{
+					text: '老板',
+					id: 1
+				}, {
+					text: '市场经理',
+					id: 2
+				}, {
+					text: '商务',
+					id: 3
+				}],
+				yesnoShow: false,
+				sendShow: false,
+				factoryShow: false,
+				taxShow: false,
+				taxList: [{
+					text: '不含',
+					id: 0
+				}, {
+					text: '含',
+					id: 1
+				}],
+				storeShow: false,
+				yesNotList: [{
+					text: '无',
+					id: 0
+				}, {
+					text: '有',
+					id: 1
+				}],
+				sendList: [{
+					text: '不发货',
+					id: 0
+				}, {
+					text: '发货',
+					id: 1
+				}],
+				addrshow: false,
+				btnList: [],
+				active: 0,
+				popShow: false,
 
-		}
-	},
-	onLoad() {
-		this.getStoreList()
-	},
-	methods: {
-		actionSheetCallback(type, index) {
-			// console.log(type, index)
-			if (type == 1) { //类目  
-				this.form.store_cat = this.categoryList[index].text
-			}
-			if (type == 2) { //自有品牌/代理入驻
-				this.brand_name = this.bandList[index].text
-				this.form.store_settle_type = this.bandList[index].id
-			}
-			if (type == 3) { //一级/二级授权
-				this.authorize_name = this.leveList[index].text
-				this.form.authorize = this.leveList[index].id
-			}
-			if (type == 4) { //是否含税
-				this.rate_name = this.taxList[index].text
-				this.form.has_tax = this.taxList[index].id
-			}
-			if (type == 5) { //职务
-				this.form.user_position = this.contactsList[index].text
-			}
-			if (type == 6) { //模式
-				this.form.store_model = this.modeList[index].text
-			}
-			if (type == 7) { //是否周末发货
-				this.send_name = this.sendList[index].text
-				this.form.send_type = this.sendList[index].id
-			}
-			if (type == 8) { //是否有工厂
-				this.factory_name = this.yesNotList[index].text
-				this.form.has_factory = this.yesNotList[index].id
 			}
-			if (type == 9) { //是否有线下渠道
-				this.offline_name = this.yesNotList[index].text
-				this.form.has_offline = this.yesNotList[index].id
-			}
-			if (type == 10) { //是否有电商店铺
-				this.shop_name = this.yesNotList[index].text
-				this.form.has_online_shop = this.yesNotList[index].id
-			}
-		},
-		getShop(index) {
-			this.btnList[index].active = !this.btnList[index].active
-			// this.active = index;
 		},
-		getAddress(e) {
-			this.form.store_address = e.province.name + e.city.name + e.area.name;
+		onLoad() {
+			this.getStoreList()
 		},
-		getStoreList() {
-			let that = this;
-			help.getStoreType()
-				.then(res => {
-					let arr = []
-					res.data.map(item => {
-						arr.push({
-							name: item,
-							active: false
+		methods: {
+			isPhone(phone) {
+				if (null == phone || "" == phone || undefined == phone) {
+					this.onShowToast('请输入手机号！')
+					return
+				} else {
+					var RegCellPhone = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
+					var falg = phone.search(RegCellPhone);
+					if (falg == -1) {
+						this.form.user_mobile = ''
+						this.onShowToast('手机号格式不正确！')
+						return
+					}
+				}
+			},
+			actionSheetCallback(type, index) {
+				// console.log(type, index)
+				if (type == 1) { //类目  
+					this.form.store_cat = this.categoryList[index].text
+				}
+				if (type == 2) { //自有品牌/代理入驻
+					this.brand_name = this.bandList[index].text
+					this.form.store_settle_type = this.bandList[index].id
+				}
+				if (type == 3) { //一级/二级授权
+					this.authorize_name = this.leveList[index].text
+					this.form.authorize = this.leveList[index].id
+				}
+				if (type == 4) { //是否含税
+					this.rate_name = this.taxList[index].text
+					this.form.has_tax = this.taxList[index].id
+				}
+				if (type == 5) { //职务
+					this.form.user_position = this.contactsList[index].text
+				}
+				if (type == 6) { //模式
+					this.form.store_model = this.modeList[index].text
+				}
+				if (type == 7) { //是否周末发货
+					this.send_name = this.sendList[index].text
+					this.form.send_type = this.sendList[index].id
+				}
+				if (type == 8) { //是否有工厂
+					this.factory_name = this.yesNotList[index].text
+					this.form.has_factory = this.yesNotList[index].id
+				}
+				if (type == 9) { //是否有线下渠道
+					this.offline_name = this.yesNotList[index].text
+					this.form.has_offline = this.yesNotList[index].id
+				}
+				if (type == 10) { //是否有电商店铺
+					this.shop_name = this.yesNotList[index].text
+					this.form.has_online_shop = this.yesNotList[index].id
+				}
+			},
+			getShop(index) {
+				this.btnList[index].active = !this.btnList[index].active
+				// this.active = index;
+			},
+			getAddress(e) {
+				this.form.store_address = e.province.name + e.city.name + e.area.name;
+			},
+			getStoreList() {
+				let that = this;
+				help.getStoreType()
+					.then(res => {
+						let arr = []
+						res.data.map(item => {
+							arr.push({
+								name: item,
+								active: false
+							})
 						})
+						that.btnList = arr
 					})
-					that.btnList = arr
+					.finally()
+			},
+			onShowToast(t) {
+				uni.showToast({
+					title: t,
+					icon: 'none',
+					duration: 2000
 				})
-				.finally()
-		},
-		onShowToast(t) {
-			uni.showToast({
-				title: t,
-				icon: 'none',
-				duration: 2000
-			})
-		},
-		sureSubmit() {
-			let tip_title = null
-			if (!this.form.store_name) {
-				this.onShowToast('请输入主体公司名称！')
-				return
-			}
-			if (!this.form.store_cat) {
-				tip_title = '请选择主营类目体类目！'
-				this.onShowToast(tip_title)
-				return
-			}
-			if (!this.form.store_address) {
-				tip_title = '请选择公司地址！'
-				this.onShowToast(tip_title)
-				return
-			}
-			if (!this.form.store_brand) {
-				tip_title = '请输入合作品牌！'
-				this.onShowToast(tip_title)
-				return
-			}
-			if (!this.brand_name) {
-				tip_title = '请选择代理入驻！'
-				this.onShowToast(tip_title)
-				return
-			}
-			if (!this.authorize_name) {
-				tip_title = '请选择一二级授权！'
-			}
-			if (!this.rate_name) {
-				tip_title = '请选择可否含税！'
-				this.onShowToast(tip_title)
-				return
-			}
-			if (!this.form.user_name) {
-				tip_title = '请输入联系人姓名！'
-				this.onShowToast(tip_title)
-				return
-			}
-			if (!this.form.user_position) {
-				tip_title = '请选择联系人职位！'
-				this.onShowToast(tip_title)
-				return
-			}
-			if (!this.form.user_mobile) {
-				tip_title = '请输入联系人手机号！'
-				this.onShowToast(tip_title)
-				return
-			}
-			if (this.form.user_mobile && (!/^\+?\d[\d -]{8,12}\d/.test(this.form.user_mobile))) {
-				tip_title = '手机号格式不正确！'
-				this.onShowToast(tip_title)
-				return
-			}
-			if (!this.form.user_wx) {
-				tip_title = '请输入联系人微信！'
-				this.onShowToast(tip_title)
-				return
-			}
-			if (!this.form.user_email) {
-				tip_title = '请输入联系人邮箱！'
-				this.onShowToast(tip_title)
-				return
-			}
-			if (!this.form.store_model) {
-				tip_title = '请选择仓库模式！'
-				this.onShowToast(tip_title)
-				return
-			}
-			if (!this.send_name) {
-				tip_title = '请选择周末是否发货！'
-				this.onShowToast(tip_title)
-				return
-			}
-			if (!this.factory_name) {
-				tip_title = '请选择是否自有工厂！'
-				this.onShowToast(tip_title)
-				return
-			}
-			if (!this.offline_name) {
-				tip_title = '请选择是否有线下渠道'
-				this.onShowToast(tip_title)
-				return
-			}
-			if (!this.shop_name) {
-				tip_title = '请选择是否有电商店铺！'
-				this.onShowToast(tip_title)
-				return
-			}
-			let plat_form = []
-			this.btnList.map(item => {
-				if (item.active) {
-					plat_form.push(item.name)
-				}
-			})
-			this.form.store_type = plat_form
-			if (plat_form.length == 0 && this.form.has_online_shop == 1) {
-				tip_title = '请选择电商平台！'
-				this.onShowToast(tip_title)
-				return
-			}
-			help.joinStore(this.form)
-				.then(res => {
-					if (res.status) {
-						this.popShow = true
-						this.form = this.$options.data().form
-						this.send_name = ''
-						this.factory_name = ''
-						this.offline_name = ''
-						this.shop_name = ''
-						this.btnList.map(item => {
-							item.active = false
-						})
-					} else {
-						uni.showToast({
-							title: '入驻失败',
-							icon: 'none',
-							duration: 2000
-						})
+			},
+			sureSubmit() {
+				let tip_title = null
+				if (!this.form.store_name) {
+					this.onShowToast('请输入主体公司名称！')
+					return
+				}
+				if (!this.form.store_cat) {
+					tip_title = '请选择主营类目体类目！'
+					this.onShowToast(tip_title)
+					return
+				}
+				if (!this.form.store_address) {
+					tip_title = '请选择公司地址！'
+					this.onShowToast(tip_title)
+					return
+				}
+				if (!this.form.store_brand) {
+					tip_title = '请输入合作品牌！'
+					this.onShowToast(tip_title)
+					return
+				}
+				if (!this.brand_name) {
+					tip_title = '请选择代理入驻！'
+					this.onShowToast(tip_title)
+					return
+				}
+				if (!this.authorize_name) {
+					tip_title = '请选择一二级授权！'
+				}
+				if (!this.rate_name) {
+					tip_title = '请选择可否含税！'
+					this.onShowToast(tip_title)
+					return
+				}
+				if (!this.form.user_name) {
+					tip_title = '请输入联系人姓名！'
+					this.onShowToast(tip_title)
+					return
+				}
+				if (!this.form.user_position) {
+					tip_title = '请选择联系人职位！'
+					this.onShowToast(tip_title)
+					return
+				}
+				if (!this.form.user_mobile) {
+					tip_title = '请输入联系人手机号！'
+					this.onShowToast(tip_title)
+					return
+				}
+				if (this.form.user_mobile && (!/^\+?\d[\d -]{8,12}\d/.test(this.form.user_mobile))) {
+					tip_title = '手机号格式不正确！'
+					this.onShowToast(tip_title)
+					return
+				}
+				if (!this.form.user_wx) {
+					tip_title = '请输入联系人微信！'
+					this.onShowToast(tip_title)
+					return
+				}
+				if (!this.form.user_email) {
+					tip_title = '请输入联系人邮箱！'
+					this.onShowToast(tip_title)
+					return
+				}
+				if (!this.form.store_model) {
+					tip_title = '请选择仓库模式！'
+					this.onShowToast(tip_title)
+					return
+				}
+				if (!this.send_name) {
+					tip_title = '请选择周末是否发货！'
+					this.onShowToast(tip_title)
+					return
+				}
+				if (!this.factory_name) {
+					tip_title = '请选择是否自有工厂！'
+					this.onShowToast(tip_title)
+					return
+				}
+				if (!this.offline_name) {
+					tip_title = '请选择是否有线下渠道'
+					this.onShowToast(tip_title)
+					return
+				}
+				if (!this.shop_name) {
+					tip_title = '请选择是否有电商店铺！'
+					this.onShowToast(tip_title)
+					return
+				}
+				let plat_form = []
+				this.btnList.map(item => {
+					if (item.active) {
+						plat_form.push(item.name)
 					}
 				})
-				.finally(() => {
-				})
-		},
+				this.form.store_type = plat_form
+				if (plat_form.length == 0 && this.form.has_online_shop == 1) {
+					tip_title = '请选择电商平台！'
+					this.onShowToast(tip_title)
+					return
+				}
+				help.joinStore(this.form)
+					.then(res => {
+						if (res.status) {
+							this.popShow = true
+							this.form = this.$options.data().form
+							this.send_name = ''
+							this.factory_name = ''
+							this.offline_name = ''
+							this.shop_name = ''
+							this.btnList.map(item => {
+								item.active = false
+							})
+						} else {
+							uni.showToast({
+								title: '入驻失败',
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					})
+					.finally(() => {})
+			},
+		}
 	}
-}
 </script>
 
 <style lang="scss" scoped>
-page {
-	min-height: 100%;
-}
-
-.settlement {
-	height: 100%;
-	padding-bottom: 134upx;
-
-	.topContent {
-		height: 232upx;
-		background: linear-gradient(180deg, #FE7E71 0%, #FF4434 100%);
-		font-size: 32upx;
-		font-family: PingFang SC, PingFang SC;
-		font-weight: bold;
-		color: #FFFFFF;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-
-		.topFont {
-			margin: 50upx 0 22upx;
-		}
+	page {
+		min-height: 100%;
 	}
 
-	.formContent {
-		.formSection {
-			padding: 0 38upx 0 30upx;
-			background: #fff;
-			margin-bottom: 16upx;
+	.settlement {
+		height: 100%;
+		padding-bottom: 134upx;
 
-		}
-	}
+		.topContent {
+			height: 232upx;
+			background: linear-gradient(180deg, #FE7E71 0%, #FF4434 100%);
+			font-size: 32upx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: bold;
+			color: #FFFFFF;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
 
-	::v-deep .u-form-item--left {
-		width: auto !important;
-	}
+			.topFont {
+				margin: 50upx 0 22upx;
+			}
+		}
 
-	::v-deep .u-form-item--left__content__label {
-		font-size: 26upx;
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 500;
-		color: #FF4C3C;
-		width: 236upx;
-	}
+		.formContent {
+			.formSection {
+				padding: 0 38upx 0 30upx;
+				background: #fff;
+				margin-bottom: 16upx;
 
-	::v-deep .u-border-bottom:after {
-		border: none;
-	}
+			}
+		}
 
-	.shop {
-		margin-top: 12upx;
-		background-color: #fff;
-		padding: 34upx 50upx 70upx 50upx;
+		::v-deep .u-form-item--left {
+			width: auto !important;
+		}
 
-		.shopTitle {
+		::v-deep .u-form-item--left__content__label {
 			font-size: 26upx;
 			font-family: PingFang SC, PingFang SC;
 			font-weight: 500;
-			color: #4C4C4C;
-			margin-bottom: 24upx;
+			color: #FF4C3C;
+			width: 236upx;
 		}
 
-		.shopItem {
-			display: flex;
-			flex-wrap: wrap;
-			justify-content: space-between;
-			align-items: center;
+		::v-deep .u-border-bottom:after {
+			border: none;
+		}
+
+		.shop {
+			margin-top: 12upx;
+			background-color: #fff;
+			padding: 34upx 50upx 70upx 50upx;
 
-			.shopText {
-				width: 240upx;
-				height: 72upx;
-				background: #FFFFFF;
-				border-radius: 3px 3px 3px 3px;
-				border: 1px solid #D6D6D6;
-				position: relative;
+			.shopTitle {
+				font-size: 26upx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 500;
+				color: #4C4C4C;
 				margin-bottom: 24upx;
+			}
+
+			.shopItem {
 				display: flex;
-				justify-content: center;
+				flex-wrap: wrap;
+				justify-content: space-between;
 				align-items: center;
 
-				text {
-					font-size: 26upx;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					color: #B6B6B6;
+				.shopText {
+					width: 240upx;
+					height: 72upx;
+					background: #FFFFFF;
+					border-radius: 3px 3px 3px 3px;
+					border: 1px solid #D6D6D6;
+					position: relative;
+					margin-bottom: 24upx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+
+					text {
+						font-size: 26upx;
+						font-family: PingFang SC, PingFang SC;
+						font-weight: 500;
+						color: #B6B6B6;
 
-				}
+					}
 
-				image {
-					position: absolute;
-					z-index: 9;
-					right: -8upx;
-					bottom: -8upx;
-					height: 0;
-					width: 50upx;
-					height: auto;
+					image {
+						position: absolute;
+						z-index: 9;
+						right: -8upx;
+						bottom: -8upx;
+						height: 0;
+						width: 50upx;
+						height: auto;
+					}
 				}
-			}
 
-			.active {
-				text {
+				.active {
+					text {
 
-					color: #FF4F40;
+						color: #FF4F40;
 
-				}
+					}
 
-				border: 1px solid #FF4F40;
+					border: 1px solid #FF4F40;
 
+				}
 			}
 		}
-	}
 
-	.subBox {
-		width: 100%;
-		position: fixed;
-		z-index: 66;
-		padding-bottom: 30upx;
-		bottom: 0;
-		background: #fff;
+		.subBox {
+			width: 100%;
+			position: fixed;
+			z-index: 66;
+			padding-bottom: 30upx;
+			bottom: 0;
+			background: #fff;
+		}
+
+		.submitBtn {
+			width: 694rpx;
+			margin-left: 28rpx;
+			height: 104upx;
+			background: linear-gradient(180deg, #FE7E71 0%, #FF4434 100%);
+			border-radius: 52px;
+			opacity: 1;
+			font-size: 32upx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 500;
+			color: #FFFFFF;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
 	}
 
-	.submitBtn {
-		width: 694rpx;
-		margin-left: 28rpx;
-		height: 104upx;
-		background: linear-gradient(180deg, #FE7E71 0%, #FF4434 100%);
-		border-radius: 52px;
+	.popcontent {
+		width: 520upx;
+		height: 486upx;
+		background: linear-gradient(180deg, #FFE4E4 0%, #FFFFFF 100%);
+		border-radius: 6px 6px 6px 6px;
 		opacity: 1;
-		font-size: 32upx;
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 500;
-		color: #FFFFFF;
+
 		display: flex;
+		flex-direction: column;
+		padding: 0 40upx;
 		align-items: center;
-		justify-content: center;
-	}
-}
-
-.popcontent {
-	width: 520upx;
-	height: 486upx;
-	background: linear-gradient(180deg, #FFE4E4 0%, #FFFFFF 100%);
-	border-radius: 6px 6px 6px 6px;
-	opacity: 1;
-
-	display: flex;
-	flex-direction: column;
-	padding: 0 40upx;
-	align-items: center;
-
-	.poptitle {
-		font-size: 32upx;
-		font-family: PingFang SC, PingFang SC;
-		font-weight: bold;
-		margin-top: 118upx;
-		color: #000000;
+
+		.poptitle {
+			font-size: 32upx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: bold;
+			margin-top: 118upx;
+			color: #000000;
+
+		}
+
+		.poptext {
+			font-size: 28upx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 400;
+			color: #727272;
+			margin-top: 32upx;
+			line-height: 36upx;
+
+		}
+
+		.knowBtn {
+			width: 400upx;
+			height: 72upx;
+			line-height: 72upx;
+			text-align: center;
+			background: #F55349;
+			border-radius: 72upx;
+			font-size: 28upx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 400;
+			color: #FFFFFF;
+			margin-top: 58upx;
+		}
 
 	}
 
-	.poptext {
-		font-size: 28upx;
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 400;
-		color: #727272;
-		margin-top: 32upx;
-		line-height: 36upx;
+	.selfMask {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 999;
+		background: rgba(60, 60, 60, 0.52);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
 
+	.self_popup {
+		position: relative;
+		padding-top: 56rpx;
 	}
 
-	.knowBtn {
-		width: 400upx;
-		height: 72upx;
-		line-height: 72upx;
-		text-align: center;
-		background: #F55349;
-		border-radius: 72upx;
-		font-size: 28upx;
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 400;
-		color: #FFFFFF;
-		margin-top: 58upx;
+	.popimg {
+		position: absolute;
+		width: 112upx;
+		left: 50%;
+		height: 128upx;
+		margin-left: -56upx;
+		top: 0;
+		z-index: 2;
 	}
 
-}
-
-.selfMask {
-	width: 100%;
-	height: 100%;
-	position: fixed;
-	top: 0;
-	left: 0;
-	z-index: 999;
-	background: rgba(60, 60, 60, 0.52);
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-
-.self_popup {
-	position: relative;
-	padding-top: 56rpx;
-}
-
-.popimg {
-	position: absolute;
-	width: 112upx;
-	left: 50%;
-	height: 128upx;
-	margin-left: -56upx;
-	top: 0;
-	z-index: 2;
-}
-
-::v-deep .u-mode-center-box {
-	background: transparent;
-}
+	::v-deep .u-mode-center-box {
+		background: transparent;
+	}
 </style>

From 771f7376184bd792e56a90be163cf3cb35fe3058 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Fri, 13 Sep 2024 20:47:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/search/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pages/search/index.vue b/pages/search/index.vue
index 6645cb7..259baec 100644
--- a/pages/search/index.vue
+++ b/pages/search/index.vue
@@ -95,7 +95,8 @@
 			if (uni.getStorageSync('searchList')) {
 				this.searchList = uni.getStorageSync('searchList')
 				this.searchList = Array.from(new Set(this.searchList));
-				this.searchList=this.searchList.length>0?this.searchList.slice(0,6):[]
+				// this.searchList=this.searchList.length>0?this.searchList.slice(0,6):[],
+				this.searchList=this.searchList.length>0?this.searchList:[]
 			}
 
 		},