最终版！！

teamwork/pages/discover/discover-detail.vue

@@ -16,8 +16,7 @@
 		</view>
 		<view class="school-activity-icon-wrapper">
 			<image class="school-activity-icon"
-				:style="'background: url('+this.picture+') no-repeat center/cover #eeeeee;'"
-				@click.stop="showPic(this.picture)"></image>
+				:style="'background: url('+this.picture+') no-repeat center/cover #eeeeee;'"></image>
 		</view>
 		<view class="activity-production">
 			<image class="activity-production-icon" src="/static/discover/production.png"></image>

teamwork/pages/login/find.vue

@@ -70,9 +70,8 @@
 								if (value === '') {
 									callback(new Error('手机号不能为空'))
 								} else {
-									const reg = /^1[3|4|5|7|8][0-9]\d{8}$/
-									const reg2 = /^([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,6})$/
-									if ((reg.test(value) || reg2.test(value))) {
+									const reg = /^(13[0-9]|14[0-9]|15[0-9]|166|17[0-9]|18[0-9]|19[8|9])\d{8}$/
+									if (reg.test(value)) {
 										this.yzmshow = true
 										callback()
 									} else {
@@ -114,10 +113,8 @@
 						rules: [{
 							required: true,
 							errorMessage: '请确认密码'
-
 						}, {
 							validateFunction: function(rule, value, data, callback) {
-								// console.log(data.newPassword);
 								if (value.length > 20 || value.length < 8) {
 									callback('密码长度在8-20位！')
 								} else if (value != data.newPassword) {
@@ -148,7 +145,7 @@
 						name: 'fe-retrievePassword',
 						data: {
 							phone: this.formData.phone,
-							password: this.formData.password,
+							password: this.formData.newPassword,
 							code: this.formData.captcha
 						}
 					})