diff --git a/pages/clock/clock.vue b/pages/clock/clock.vue
index efa4f08..9431764 100644
--- a/pages/clock/clock.vue
+++ b/pages/clock/clock.vue
@@ -431,7 +431,13 @@
 			previewImage(url) {
 				console.log(url)
 				uni.previewImage({
-					urls: [url]
+					urls: [url],
+					longPressActions:{
+						itemList:['很抱歉，暂不支持保存图片到本地'],
+						success:function(res){
+							// console.log(res,'+++++')
+						}
+					}
 				});
 			},
 			// 获取打卡参数
diff --git a/pages/user/forget.vue b/pages/user/forget.vue
index e3cf0bf..75f0a5b 100644
--- a/pages/user/forget.vue
+++ b/pages/user/forget.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="page">
 		<z-nav-bar></z-nav-bar>
-        <!-- 公共组件-每个页面必须引入 -->
-        <public-module></public-module>
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
 		<view class="title">忘记密码</view>
 		<view class="input_box">
 			<text class="input_tit">手机号</text>
@@ -15,239 +15,298 @@
 		</view>
 		<view class="input_box">
 			<text class="input_tit">密码</text>
-			<input type="password" v-model="password" placeholder="请输入密码" />
-			</view>
+			<input type="password" maxlength="8" v-model="password" placeholder="请输入密码" @input="inputMethod(password)" />			
+		</view>
+		<view class="" style="font-size: 28rpx; color: #999;">
+			<p v-if="note != ''">{{note}}</p>
+			<p v-html="str2" style="margin-top: 10rpx;"></p>
+		</view>	
 		<view class="input_box">
 			<text class="input_tit">确认密码</text>
-			<input type="password" v-model="confirmPassword" placeholder="请确认密码" />
+			<input type="password" maxlength="8" v-model="confirmPassword" placeholder="请确认密码" />
 		</view>
 		<view class="btn_box"><button @click="onSubmit">提 交</button></view>
-	<music-play :playData="playData"></music-play>
+		<music-play :playData="playData"></music-play>
 	</view>
 </template>
 <script>
 	import musicPlay from '@/components/music.vue'
-import md5 from '@/plugins/md5';
-var clear;
-export default {
-	data() {
-		return {
-			playData:{},
-			//手机号账号
-			phone: '',
-			// 密码
-			password: '',
-			//验证码
-			code: '',
-			//确认密码
-			confirmPassword: '',
-			//验证码
-			codeText: '获取验证码',
-			//验证码已发
-			readonly: false
-		};
-	},
-	//第一次加载
-	onLoad(e) {},
-	//页面显示
-	onShow() {},
-	components:{
-		musicPlay		
-					
-	},
-	//方法
-	methods: {
-		//获取验证码
-		getCode() {
-			if (this.readonly) {
-				uni.showToast({
-					title: '验证码已发送',
-					icon: 'none'
-				});
-				return;
-			}
-			if (!this.phone) {
-				uni.showToast({
-					title: '请输入手机号',
-					icon: 'none'
-				});
-				return;
-			}			
-			if (!this.$base.phoneRegular.test(this.phone)) {
-				uni.showToast({
-					title: '请输入正确的手机号',
-					icon: 'none'
-				});
-				return;
-			}
-			this.$http
-				// .post('api/common/v1/send_sms', {
-				.post('book/user/sms/sendcode', {	
-					phone: this.phone,
-					type: 3000
-				})
-				.then(res => {
-					this.getCodeState();
-				});
+	import md5 from '@/plugins/md5';
+	// 密码验证的正则
+	//1、密码为八位及以上并且字母数字特殊字符三项都包括
+	var strongRegex = new RegExp("^(?=.{8,})(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*\\W).*$", "g");
+	//2、密码为八位及以上并且字母、数字、特殊字符三项中有两项，强度是中等
+	var mediumRegex = new RegExp(
+		"^(?=.{8,})(((?=.*[A-Z])(?=.*[a-z]))|((?=.*[A-Z])(?=.*[0-9]))|((?=.*[a-z])(?=.*[0-9]))|((?=.*[a-z])(?=.*\\W))|((?=.*[0-9])(?=.*\\W))|((?=.*[A-Z])(?=.*\\W))).*$",
+		"g");
+	var enoughRegex = new RegExp("(?=.{8,}).*", "g");
+	var clear;
+	export default {
+		data() {
+			return {
+				playData: {},
+				//手机号账号
+				phone: '',
+				// 密码
+				password: '',
+				//验证码
+				code: '',
+				//确认密码
+				confirmPassword: '',
+				//验证码
+				codeText: '获取验证码',
+				//验证码已发
+				readonly: false,
+				passwordOk:false,
+				note: '',
+				str2: '',
+			};
 		},
-		//验证码按钮文字状态
-		getCodeState() {
-			const _this = this;
-			this.readonly = true;
-			this.codeText = '60S后重新获取';
-			var s = 60;
-			clear = setInterval(() => {
-				s--;
-				_this.codeText = s + 'S后重新获取';
-				if (s <= 0) {
-					clearInterval(clear);
-					_this.codeText = '获取验证码';
-					_this.readonly = false;
+		//第一次加载
+		onLoad(e) {},
+		//页面显示
+		onShow() {},
+		components: {
+			musicPlay
+
+		},
+		//方法
+		methods: {
+			// 密码验证
+			inputMethod(value) {
+				this.passwordOk = false
+				// console.log('输入的值为：', value)
+				if (strongRegex.test(value)) {
+					//console.log('强密码-----',value)
+					this.str2 = "<span style='color:#18bc37'>密码强度很不错哦！</span>"
+					// this.note = '请至少使用大小写字母、数字、符号两种类型组合的密码，长度至少为8位。'
+					this.note = ''
+					this.passwordOk = true
+				} else if (mediumRegex.test(value)) {
+					// console.log('中等密码-----',value)
+					this.note = '请至少使用大小写字母、数字、符号两种类型组合的密码，长度为8位。'
+					this.str2 = "<span style='color:#2979ff'>密码强度中等!</span>"
+					this.passwordOk = true
+				} else if (enoughRegex.test(value)) {					
+					// console.log('弱密码-----',value)
+					// this.str2 = "<span style='color:#f3a73f'>密码强度太弱!</span>"
+					this.note = '请至少使用大小写字母、数字、符号两种类型组合的密码，长度为8位。'
+				} 
+				else {
+					this.passwordOk = false
+					this.note = '请至少使用大小写字母、数字、符号两种类型组合的密码，长度为8位。'
+					this.str2 = ""
+					//console.log('密码-----',value)				
 				}
-			}, 1000);
-		},
-		onSubmit() {
-			if (!this.phone) {
-				uni.showToast({
-					title: '请输入手机号',
-					icon: 'none'
-				});
-				return;
-			}
-			if (!this.$base.phoneRegular.test(this.phone)) {
-				uni.showToast({
-					title: '请输入正确的手机号',
-					icon: 'none'
-				});
-				return;
-			}
-			if (!this.code) {
-				uni.showToast({
-					title: '请输入验证码',
-					icon: 'none'
-				});
-				return;
-			}
-			if (!this.password) {
-				uni.showToast({
-					title: '请输入密码',
-					icon: 'none'
-				});
-				return;
-			}
-			if (!this.confirmPassword) {
-				uni.showToast({
-					title: '请输入确认密码',
-					icon: 'none'
-				});
-				return;
-			}
-			if (this.confirmPassword != this.password) {
-				uni.showToast({
-					title: '两次密码不一致',
-					icon: 'none'
-				});
-				return;
-			}
-			if (!this.$base.passwordRegular.test(this.password)) {
-				uni.showToast({
-					title: '请输入不少于6位且包含数字和字母的密码',
-					icon: 'none'
-				});
-				return;
-			}
-			this.$http
-				// .post('api/common/v1/forget_password', {
-				.post('book/user/setPassword', {
-					phone: this.phone,
-					code:this.code,
-					// password: md5(this.password),
-					password: this.password
-				})
-				.then(res => {
-					uni.showModal({
-						title:"提示",
-						content:"密码修改成功！",
-						showCancel:false,
-						success: (res) => {
-							uni.navigateBack();
-						}
+			},
+			//获取验证码
+			getCode() {
+				if (this.readonly) {
+					uni.showToast({
+						title: '验证码已发送',
+						icon: 'none'
 					});
-				});
+					return;
+				}
+				if (!this.phone) {
+					uni.showToast({
+						title: '请输入手机号',
+						icon: 'none'
+					});
+					return;
+				}
+				if (!this.$base.phoneRegular.test(this.phone)) {
+					uni.showToast({
+						title: '请输入正确的手机号',
+						icon: 'none'
+					});
+					return;
+				}
+				this.$http
+					// .post('api/common/v1/send_sms', {
+					.post('book/user/sms/sendcode', {
+						phone: this.phone,
+						type: 3000
+					})
+					.then(res => {
+						this.getCodeState();
+					});
+			},
+			//验证码按钮文字状态
+			getCodeState() {
+				const _this = this;
+				this.readonly = true;
+				this.codeText = '60S后重新获取';
+				var s = 60;
+				clear = setInterval(() => {
+					s--;
+					_this.codeText = s + 'S后重新获取';
+					if (s <= 0) {
+						clearInterval(clear);
+						_this.codeText = '获取验证码';
+						_this.readonly = false;
+					}
+				}, 1000);
+			},
+			onSubmit() {
+				if(!this.passwordOk){
+					 console.log('不满足密码格式',this.note)
+					uni.showToast({
+						title:this.note,
+						icon: 'none'
+					})
+					return
+				}
+				if (!this.phone) {
+					uni.showToast({
+						title: '请输入手机号',
+						icon: 'none'
+					});
+					return;
+				}
+				if (!this.$base.phoneRegular.test(this.phone)) {
+					uni.showToast({
+						title: '请输入正确的手机号',
+						icon: 'none'
+					});
+					return;
+				}
+				if (!this.code) {
+					uni.showToast({
+						title: '请输入验证码',
+						icon: 'none'
+					});
+					return;
+				}
+				if (!this.password) {
+					uni.showToast({
+						title: '请输入密码',
+						icon: 'none'
+					});
+					return;
+				}
+				if (!this.confirmPassword) {
+					uni.showToast({
+						title: '请输入确认密码',
+						icon: 'none'
+					});
+					return;
+				}
+				if (this.confirmPassword != this.password) {
+					uni.showToast({
+						title: '两次密码不一致',
+						icon: 'none'
+					});
+					return;
+				}
+				if (!this.$base.passwordRegular.test(this.password)) {
+					uni.showToast({
+						title: '请输入不少于6位且包含数字和字母的密码',
+						icon: 'none'
+					});
+					return;
+				}
+				this.$http
+					// .post('api/common/v1/forget_password', {
+					.post('book/user/setPassword', {
+						phone: this.phone,
+						code: this.code,
+						// password: md5(this.password),
+						password: this.password
+					})
+					.then(res => {
+						uni.showModal({
+							title: "提示",
+							content: "密码修改成功！",
+							showCancel: false,
+							success: (res) => {
+								uni.navigateBack();
+							}
+						});
+					});
+			}
+		},
+		//页面隐藏
+		onHide() {},
+		//页面卸载
+		onUnload() {},
+		//页面下来刷新
+		onPullDownRefresh() {},
+		//页面上拉触底
+		onReachBottom() {},
+		//用户点击分享
+		onShareAppMessage(e) {
+			return this.wxShare();
 		}
-	},
-	//页面隐藏
-	onHide() {},
-	//页面卸载
-	onUnload() {},
-	//页面下来刷新
-	onPullDownRefresh() {},
-	//页面上拉触底
-	onReachBottom() {},
-	//用户点击分享
-	onShareAppMessage(e) {
-		return this.wxShare();
-	}
-};
+	};
 </script>
 <style lang="scss" scoped>
-@import '@/style/mixin.scss';
-.page {
-	background-color: #ffffff;
-	padding: 0 65rpx;
-	min-height: 100vh;
-	
-	.title {
-		padding: 60rpx 0 40rpx 0;
-		font-size: 60rpx;
-		color: #333333;
-	}
-	.input_box {
-		display: flex;
-		justify-content: space-between;
-		height: 100rpx;
-		padding-top: 30rpx;
-		border-bottom: 1rpx solid #eeeeee;
+	@import '@/style/mixin.scss';
+
+	.page {
+		background-color: #ffffff;
+		padding: 0 65rpx;
+		min-height: 100vh;
+
+		.title {
+			padding: 60rpx 0 40rpx 0;
+			font-size: 60rpx;
+			color: #333333;
+		}
+
+		.input_box {
+			display: flex;
+			justify-content: space-between;
+			height: 100rpx;
+			padding-top: 30rpx;
+			border-bottom: 1rpx solid #eeeeee;
 			align-items: center;
-		text{
-			font-size: 30rpx;
-			width: 180rpx;
+
+			text {
+				font-size: 30rpx;
+				width: 180rpx;
+			}
+
+			input {
+				flex: 1;
+				height: 70rpx;
+				line-height: 70rpx;
+				font-size: 30rpx;
+			}
+
+			button {
+				height: 78rpx;
+				line-height: 78rpx;
+				font-size: 30rpx;
+				color: $themeColor;
+
+				&:active {
+					background-color: transparent;
+				}
+			}
 		}
-		input {
-			flex: 1;
-			height: 70rpx;
-			line-height: 70rpx;
-			font-size: 30rpx;
+
+		.btn_box {
+			margin-top: 70rpx;
+
+			button {
+				font-size: 32rpx;
+				@include theme('btn_bg') color: #fff;
+				height: 80rpx;
+				line-height: 80rpx;
+				border-radius: 50rpx;
+			}
 		}
-		button {
-			height: 78rpx;
-			line-height: 78rpx;
-			font-size: 30rpx;
-			color: $themeColor;
-			&:active {
-				background-color: transparent;
+
+		.protocol {
+			font-size: 24rpx;
+			color: #999999;
+			text-align: center;
+			margin-top: 20rpx;
+
+			text {
+				color: $themeColor;
 			}
 		}
 	}
-	.btn_box {
-		margin-top: 70rpx;
-		button {
-			font-size: 32rpx;
-			@include theme('btn_bg')
-			color: #fff;
-			height: 80rpx;
-			line-height: 80rpx;
-			border-radius: 50rpx;
-		}
-	}
-	.protocol {
-		font-size: 24rpx;
-		color: #999999;
-		text-align: center;
-		margin-top: 20rpx;
-		text {
-			color: $themeColor;
-		}
-	}
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/user/login.vue b/pages/user/login.vue
index 1aebe44..f100b06 100644
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -64,7 +64,11 @@
 			
 			<view class="qie_huan" style="display: flex; justify-content: center;">
 				<view style="width: 30%;" @click="type = 1000" v-if="type == 2000">密码登录</view>
-				<view style="width: 30%;" @click="type = 2000" v-if="type == 1000">验证码登录</view>
+				<view style="width:50%; display: flex; justify-content:space-between;" v-if="type == 1000">
+					<text  @click="type = 2000">验证码登录</text>
+					<text v-if="type == 1000" @click="onPageJump('/pages/user/forget')">忘记密码？</text>
+					<!-- <text @click="resetPassWord()">忘记密码</text> -->
+				</view>
 			</view>
 
 			<z-popup v-model="HealthOpen" type="center" :hideOnBlur="false">
@@ -188,6 +192,13 @@
 		methods: {
 			...mapMutations(['setUserInfo']),
 			...mapMutations(['setHealthMes']),
+			// 修改密码
+			resetPassWord(){
+				console.log('重置密码')
+				uni.navigateTo({
+					url: "/pages/home/shop/goodsDetail"
+				})
+			},
 			// 显示协议
 			showXieyi(str){	
 				if(str == 'user'){
diff --git a/pages/user/persData.vue b/pages/user/persData.vue
index d73cf2b..675abdb 100644
--- a/pages/user/persData.vue
+++ b/pages/user/persData.vue
@@ -91,14 +91,14 @@
 		<u-popup :show="passwordShow" :round="10" @close="cancelPass">
 			<view class="tanchu">
 				<view class="dp_title">请修改密码</view>
-				<u--input v-model="userMes.password" placeholder="请输入新密码" :password="true" border="surround" clearable
+				<u--input maxlength="8"  v-model="userMes.password" placeholder="请输入新密码" :password="true" border="surround" clearable
 					@input="inputMethod(userMes.password)">
 				</u--input>
 				<view class="" style="font-size: 28rpx; color: #999;">
 					<p v-if="note != ''">{{note}}</p>
 					<p v-html="str2" style="margin-top: 10rpx;"></p>
 				</view>				
-				<u--input v-model="userMes.Repassword" placeholder="请再确认密码" :password="true" border="surround" clearable
+				<u--input maxlength="8"  v-model="userMes.Repassword" placeholder="请再确认密码" :password="true" border="surround" clearable
 					style="margin-top: 20rpx;"></u--input>
 				<u-button color="linear-gradient(to right, #72d386, #317e42)" text="确定" @click="chosePassword()"
 					style="margin-top: 50rpx;"></u-button>
@@ -207,24 +207,26 @@
 			// 密码验证
 			inputMethod(value) {
 				this.passwordOk = false
-				console.log('输入的值为：', value)
+			//	console.log('输入的值为：', value)
 				if (strongRegex.test(value)) {
 					//console.log('强密码-----',value)
 					this.str2 = "<span style='color:#18bc37'>密码强度很不错哦！</span>"
-					// this.note = '请至少使用大小写字母、数字、符号两种类型组合的密码，长度至少为8位。'
+					// this.note = '请至少使用大小写字母、数字、符号两种类型组合的密码，长度为8位。'
 					this.note = ''
 					this.passwordOk = true
 				} else if (mediumRegex.test(value)) {
 					//console.log('中等密码-----',value)
-					this.note = '请至少使用大小写字母、数字、符号两种类型组合的密码，长度至少为8位。'
+					this.note = '请至少使用大小写字母、数字、符号两种类型组合的密码，长度为8位。'
 					this.str2 = "<span style='color:#2979ff'>密码强度中等!</span>"
 					this.passwordOk = true
 				} else if (enoughRegex.test(value)) {
 					//console.log('弱密码-----',value)
 					this.str2 = "<span style='color:#f3a73f'>密码强度太弱!</span>"
-					this.note = '请至少使用大小写字母、数字、符号两种类型组合的密码，长度至少为8位。'
+					this.note = '请至少使用大小写字母、数字、符号两种类型组合的密码，长度为8位。'
 				} else {
-					this.note = '请至少使用大小写字母、数字、符号两种类型组合的密码，长度至少为8位。'
+					this.passwordOk = false
+					this.note = '请至少使用大小写字母、数字、符号两种类型组合的密码，长度为8位。'
+					this.str2 = ""
 					//console.log('密码-----',value)				
 }
 				},