Merge branch 'master' into h5

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,8 +139,8 @@
 </template>
 
 <script>
-import * as help from '@/api/help'
-export default {
+	import * as help from '@/api/help'
+	export default {
 		data() {
 			return {
 				brand_name: '',
@@ -280,6 +283,20 @@ export default {
 			this.getStoreList()
 		},
 		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) { //类目  
@@ -470,19 +487,18 @@ export default {
 							})
 						}
 					})
-				.finally(() => {
-				})
+					.finally(() => {})
 			},
 		}
-}
+	}
 </script>
 
 <style lang="scss" scoped>
-page {
+	page {
 		min-height: 100%;
-}
+	}
 
-.settlement {
+	.settlement {
 		height: 100%;
 		padding-bottom: 134upx;
 
@@ -614,9 +630,9 @@ page {
 			align-items: center;
 			justify-content: center;
 		}
-}
+	}
 
-.popcontent {
+	.popcontent {
 		width: 520upx;
 		height: 486upx;
 		background: linear-gradient(180deg, #FFE4E4 0%, #FFFFFF 100%);
@@ -661,9 +677,9 @@ page {
 			margin-top: 58upx;
 		}
 
-}
+	}
 
-.selfMask {
+	.selfMask {
 		width: 100%;
 		height: 100%;
 		position: fixed;
@@ -674,14 +690,14 @@ page {
 		display: flex;
 		justify-content: center;
 		align-items: center;
-}
+	}
 
-.self_popup {
+	.self_popup {
 		position: relative;
 		padding-top: 56rpx;
-}
+	}
 
-.popimg {
+	.popimg {
 		position: absolute;
 		width: 112upx;
 		left: 50%;
@@ -689,9 +705,9 @@ page {
 		margin-left: -56upx;
 		top: 0;
 		z-index: 2;
-}
+	}
 
-::v-deep .u-mode-center-box {
+	::v-deep .u-mode-center-box {
 		background: transparent;
-}
+	}
 </style>

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:[]
 			}
 
 		},