Merge branch 'master' of http://47.100.3.209:3000/gongdecai/wangluohuoyun-app

pages/public/login.vue

@@ -21,7 +21,7 @@
 			<view style='margin-top:20px;border-bottom:1px solid #E8E9ED;position:relative;height:40px'>
 				<view style='position:relative;'>
 					<input placeholder-style="color:#AFB3BF" class='password' v-model='password' v-if="isShowPassword=='password'" placeholder="请输入密码" type="password">
-					<input placeholder-style="color:#AFB3BF" class='password' v-model='password' v-else type="text" placeholder="请输入密码">
+					<input maxlength='16' placeholder-style="color:#AFB3BF" class='password' v-model='password' v-else type="text" placeholder="请输入密码">
 					<!-- <u-icon name="eye-off" color="rgb(192, 196, 204)" size="24" @click="passWordStatus(2)" v-else>
 						</u-icon> -->
 						<image class='yanjingicon' style='width:22px;height:22px;' @click="passWordStatus(1)" v-if="isShowPassword=='password'" src="../../static/yioncang.png" mode=""></image>

pages/public/register.vue

@@ -250,7 +250,7 @@
 				}
 				if (this.password.length < 6) {
 					uni.showToast({
-						title: '密码请输入6-16字符格式',
+						title: '密码输入错误',
 						icon: 'none',
 						duration: 2000
 					})