Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pages/personal/personal.vue

pages/forgotPassword/forgotPassword.vue

@@ -20,7 +20,7 @@
 			</view>
 			<input class="righttext" style='left:23%' type="text" placeholder="请输入" maxlength="11" v-model="phonenumber"/>
 		</view>
-		<view class="item">
+		<!-- <view class="item">
 			<view class="lefttext">
 				验证码
 			</view>
@@ -28,7 +28,7 @@
 			<view class="obtaincode" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">
 				{{getCodeText}}
 			</view>
-		</view>
+		</view> -->
 		<view class="loginbtn" @tap='pwdlogin'>
 			登录
 		</view>