zhanghui пре 2 година
родитељ
комит
732e968e55

+ 5 - 3
pages/forgetPassword/forgetPassword.vue

@@ -42,7 +42,8 @@
 					username:'',
 					code:'',
 					newPassword:'',
-					againPassword:''
+					againPassword:'',
+					re:'^((13[0-9])|(14[5,7])|(15[0-3,5-9])|166|(17[0,3,5-9])|(18[0-9])|(19[1,5,8,9]))\\d{8}$', //手机号正则表达式
 				},
 				rules: {
 					'username': {
@@ -50,7 +51,8 @@
 						required: true,
 						min:11,
 						max: 11,
-						message: '请输入电话号码',
+						pattern:'^((13[0-9])|(14[5,7])|(15[0-3,5-9])|166|(17[0,3,5-9])|(18[0-9])|(19[1,5,8,9]))\\d{8}$',
+						message: '请输入正确的电话号码',
 						trigger: ['blur', 'change']
 					},
 					'code': {
@@ -103,7 +105,7 @@
 						url:'/pages/login/login'
 					})
 				})
-			}
+			},
 			back(){
 				uni.navigateBack({
 					delta: 1

+ 4 - 3
pages/index/index.vue

@@ -144,14 +144,14 @@
 					<image class="dataNull" src="/static/index/dataNull.png"></image>
 				</view>
 				<view class="flex-row justify-center dataNullText">
-					<text>暂无服务项目,请刷新页面</text>
+					<text>暂无服务项目,请点击下一位刷新页面</text>
 				</view>
 			</view>
 		</view>
 
 		<uni-popup ref="avatarPopup" type="center">
-			<view class="avatarView ">
-				<view class="flex-row justify-center">
+			<view class="avatarView "v-if="currService">
+				<view class="flex-row justify-center" >
 					<image class="avatarOpen" mode="widthFix" :src="currService.avatar || '/static/ud4.png'"></image>
 				</view>
 				<view class="flex-row justify-center" :style="{'marginTop':'20rpx'}">
@@ -487,6 +487,7 @@
 					preference:this.content
 				}).then(res=>{
 					this.previousServiceOrderId=''
+					this.content=''
 					uni.showToast({
 						icon: 'success',
 						duration: 2000,

+ 2 - 1
pages/login/login.vue

@@ -65,7 +65,8 @@
 						required: true,
 						min: 11,
 						max: 11,
-						message: '请输入11位手机号',
+						pattern:'^((13[0-9])|(14[5,7])|(15[0-3,5-9])|166|(17[0,3,5-9])|(18[0-9])|(19[1,5,8,9]))\\d{8}$',
+						message: '请输入正确的电话号码',
 						trigger: ['blur', 'change']
 					},
 					'password': {

+ 4 - 1
pages/performanceList/performanceList.vue

@@ -41,9 +41,12 @@
 			}
 		},
 		onLoad(e) {
-			this.tabIndex = e.index
+			this.tabIndex = e.index*1
+
 			let sysInfo = uni.getSystemInfoSync()
 			this.windowHeight = sysInfo.windowHeight - 74 - 70 + 'px' //除标题栏栏外的屏幕可用高度
+			console.log('this.$refs++++++++++',this.$refs)
+			this.$refs.MescrollItem[this.tabIndex].downCallback()
 		},
 		methods: {
 			back() {

+ 2 - 1
pages/updatePassword/updatePassword.vue

@@ -40,7 +40,8 @@
 						required: true,
 						min:11,
 						max: 11,
-						message: '请输入电话号码',
+						pattern:'^((13[0-9])|(14[5,7])|(15[0-3,5-9])|166|(17[0,3,5-9])|(18[0-9])|(19[1,5,8,9]))\\d{8}$',
+						message: '请输入正确的电话号码',
 						trigger: ['blur', 'change']
 					},
 					'oldPassword': {