From 66d86ac0b97feaf963d9f6e19a0af0453b5c8cbe Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Sat, 25 Feb 2023 17:06:13 +0800
Subject: [PATCH] =?UTF-8?q?2023-2-25=20=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mallplusui-uniapp-app/common/api.js          |   3 +-
 mallplusui-uniapp-app/pages/public/reg.vue   |  12 +-
 mallplusui-uniapp-app/pagesU/user/forget.vue | 462 ++++++++++---------
 3 files changed, 245 insertions(+), 232 deletions(-)

diff --git a/mallplusui-uniapp-app/common/api.js b/mallplusui-uniapp-app/common/api.js
index eca0a3d..5b430f9 100644
--- a/mallplusui-uniapp-app/common/api.js
+++ b/mallplusui-uniapp-app/common/api.js
@@ -1,7 +1,8 @@
 import store from '../store/index';
 export default {
 	// qq 237524947 wx15d4269d3210863d
-	BASEURI: 'http://mall.yyundong.com/portalapi/api/',
+	BASEURI: 'http://2xpk7t.natappfree.cc/api/',
+	// BASEURI: 'http://mall.yyundong.com/portalapi/api/',
 	// BASEURI: 'http://www.yyundong.com:8083/api/',
 	ADMINURI: 'http://mall.yyundong.com/adminapi/',
 	ESURI: 'http://www.yyundong.com:8081/',
diff --git a/mallplusui-uniapp-app/pages/public/reg.vue b/mallplusui-uniapp-app/pages/public/reg.vue
index 065175b..f4c0739 100644
--- a/mallplusui-uniapp-app/pages/public/reg.vue
+++ b/mallplusui-uniapp-app/pages/public/reg.vue
@@ -5,8 +5,8 @@
 		<view class="right-top-sign"></view>
 		<!-- 设置白色背景防止软键盘把下部绝对定位元素顶上来盖住输入框等 -->
 		<view class="wrapper">
-			<view class="left-top-sign">注册</view>
-			<view class="welcome">欢迎回来！</view>
+			<!-- <view class="left-top-sign">注册</view> -->
+			<view class="welcome">注册</view>
 			<view class="input-content">
 				<view class="input-item">
 					<text class="tit">手机号码</text>
@@ -196,7 +196,7 @@
 	}
 
 	.container {
-		padding-top: 115px;
+		padding-top: 105px;
 		position: relative;
 		width: 100vw;
 		height: 120vh;
@@ -270,7 +270,7 @@
 	.welcome {
 		position: relative;
 		left: 50upx;
-		top: -90upx;
+		top: -20upx;
 		font-size: 46upx;
 		color: #555;
 		text-shadow: 1px 0px 1px rgba(0, 0, 0, 0.3);
@@ -329,11 +329,11 @@
 		font-size: $font-sm + 2upx;
 		color: $font-color-spec;
 		text-align: center;
-		margin-top: 40upx;
+		margin-top: 20upx;
 	}
 
 	.register-section {
-		margin-top: 40upx;
+		margin-top: 20upx;
 		width: 100%;
 		font-size: $font-sm + 2upx;
 		color: $font-color-base;
diff --git a/mallplusui-uniapp-app/pagesU/user/forget.vue b/mallplusui-uniapp-app/pagesU/user/forget.vue
index 230f511..5d8e8a6 100644
--- a/mallplusui-uniapp-app/pagesU/user/forget.vue
+++ b/mallplusui-uniapp-app/pagesU/user/forget.vue
@@ -5,54 +5,34 @@
 		<view class="right-top-sign"></view>
 		<!-- 设置白色背景防止软键盘把下部绝对定位元素顶上来盖住输入框等 -->
 		<view class="wrapper">
-			<view class="left-top-sign">LOGIN</view>
+			<!-- <view class="left-top-sign">LOGIN</view> -->
 			<view class="welcome">
 				忘记密码！
 			</view>
 			<view class="input-content">
 				<view class="input-item">
 					<text class="tit">手机号码</text>
-					<input
-						type="number"
-						:value="phone"
-						placeholder="请输入手机号码"
-						maxlength="11"
-						data-key="phone"
-						@input="onKeyInput"
-					/>
+					<input type="number" :value="phone" placeholder="请输入手机号码" maxlength="11" data-key="phone"
+						@input="onKeyInput" />
 				</view>
 				<view class="input-item">
 					<text class="tit">密码</text>
-					<input
-						type="mobile"
-						value=""
-						placeholder="8~24位不含特殊字符的数字、字母组合"
-						placeholder-class="input-empty"
-						maxlength="20"
-						password
-						data-key="password"
-						@input="inputChange"
-					/>
+					<input type="mobile" value="" placeholder="6~12位大小写字母和数字组成" placeholder-class="input-empty"
+						maxlength="12" password data-key="password" @input="inputChange" />
 				</view>
 				<view class="input-item">
-					<text class="tit">密码</text>
-					<input
-						type="mobile"
-						value=""
-						placeholder="8~24位不含特殊字符的数字、字母组合"
-						placeholder-class="input-empty"
-						maxlength="20"
-						password
-						data-key="confimpassword"
-						@input="inputChange"
-					/>
+					<text class="tit">确认密码</text>
+					<input type="mobile" value="" placeholder="6~12位大小写字母和数字组成" placeholder-class="input-empty"
+						maxlength="12" password data-key="confimpassword" @input="inputChange" />
 				</view>
-				<view class="verificationBox" >
+				<view class="verificationBox">
 					<view class="verificationCon">
 						<text class="verificationLeft">验证码</text>
-						<input type="text" value="" @input="onKeyverification" placeholder="请输入验证码"  placeholder-style="font-size:26upx;color:#444444" class="verificationInput" />
+						<input type="text" value="" @input="onKeyverification" placeholder="请输入验证码"
+							placeholder-style="font-size:26upx;color:#444444" class="verificationInput" />
 					</view>
-					<button type="primary" :disabled="getverifSwitch" class="button" @click="getverification">{{getConfirms}}</button>
+					<button type="primary" :disabled="getverifSwitch" class="button"
+						@click="getverification">{{getConfirms}}</button>
 				</view>
 
 
@@ -60,115 +40,122 @@
 			<button class="confirm-btn" @click="toRegister" :disabled="logining">重置密码</button>
 
 		</view>
-		<view class="register-section">
+		<!-- <view class="register-section">
 			已有账号?
 			<text @click="toLogin">返回登录</text>
-		</view>
+		</view> -->
 	</view>
 </template>
 
 <script>
-import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
-import Api from '@/common/api';
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+	import Api from '@/common/api';
 	import {
-        mapMutations
-    } from 'vuex';
+		mapMutations
+	} from 'vuex';
 	import eonfox from '@/components/eonfox/eonfox.js';
 	import fns from '@/components/eonfox/fns.js';
 	var ef = new eonfox();
-	export default{
-		data(){
+	export default {
+		data() {
 			return {
 				phone: '',
 				password: '',
-				confimpassword:'',//第二次输入密码
+				confimpassword: '', //第二次输入密码
 				logining: false,
-				verifTime:0,//验证码时长
+				verifTime: 0, //验证码时长
 				getConfirms: '获取验证码',
-				confirm:'',
-				getverifSwitch:false,
-				oauthid:''
+				confirm: '',
+				getverifSwitch: false,
+				oauthid: ''
 			}
 		},
-		onLoad(){
+		onLoad() {
 			this.getStroges();
 		},
 		methods: {
 			...mapMutations(['login']),
-			getStroges(){
+			getStroges() {
 				try {
-				    const value = uni.getStorageSync('oauth_id');
-				    if (value) {
-				        console.log(value);
+					const value = uni.getStorageSync('oauth_id');
+				 if (value) {
+						console.log(value);
 						this.oauthid = value
-				    }
+					}
 				} catch (e) {
-				    console.log(e)
+					console.log(e)
 				}
 			},
-			inputChange(e){
+			inputChange(e) {
 				const key = e.currentTarget.dataset.key;
 				this[key] = e.detail.value;
 			},
-			navBack(){
+			navBack() {
 				uni.switchTab({
-				    url: '/pages/index/index'
+					url: '/pages/index/index'
 				});
 			},
-			toLogin(){
+			toLogin() {
 				uni.redirectTo({
-					url:'/pages/public/login'
+					url: '/pages/public/login'
 				})
 			},
-			async toRegister(){
-				var _this=this
-				var phone=this.phone,password=this.password,confimpassword=this.confimpassword;
-				if (!/^1\d{10}$/.test(phone)){
+			async toRegister() {
+				var _this = this
+				var reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,12}$/;
+				var phone = this.phone;
+				var password = this.password;
+				var confimpassword = this.confimpassword;
+				if (!/^1[3456789]\d{9}$/.test(phone)) {
 					uni.showToast({
-						title:'手机号有误',
-						icon:'none'
+						title: '手机号有误',
+						icon: 'none'
 					})
-				}else if (password.length < 8 ||password.length > 24||confimpassword.length < 8 ||confimpassword.length > 24) {
+				} else if (!reg.test(password) || password.length < 6 || password.length > 12) {
 					uni.showToast({
-						title:'密码长度为8~24个字符',
-						icon:'none'
+						title: '密码格式错误',
+						icon: 'none'
 					})
-				}
-				else if(password!=confimpassword){
+				} else if (!reg.test(confimpassword) || confimpassword.length < 6 || confimpassword.length > 12) {
 					uni.showToast({
-						title:'两次输入的密码不一致，请检查修改',
-						icon:'none'
+						title: '确认密码格式错误',
+						icon: 'none'
 					})
-				}
-				else if(_this.confirm==''){
+				} else if (password != confimpassword) {
+					uni.showToast({
+						title: '两次输入的密码不一致，请检查修改',
+						icon: 'none'
+					})
+				} else if (_this.confirm == '') {
 					uni.showToast({
 						title: '验证码不能为空',
 						icon: 'none'
 					});
-				}
-				else{
-					var req={};
+				} else {
+					var req = {};
 					req = {
-					phone: this.phone,
-					 password:this.password,
-					 confimpassword:this.confimpassword,
+						phone: this.phone,
+						password: this.password,
+						confimpassword: this.confimpassword,
 
 					 authCode: this.confirm,
 
-					  };
+					};
 
-                      let data = await Api.apiCall('post', Api.member.resetPassword, req);
+					let data = await Api.apiCall('post', Api.member.resetPassword, req);
+					console.log("data>>>>",data)
+					if(data=="操作成功")
 					uni.showToast({
-                    									title: '重置成功',
-                    									success() {
-                    										_this.bind()
-                    										setTimeout(function(){
-                    										uni.reLaunch({
-                    											url:'/pages/public/login'
-                    											});
-                    										},1000)
-                    									}
-                    								});
+						title: '重置成功',
+						success() {
+							_this.bind()
+							setTimeout(function() {
+								uni.reLaunch({
+									url: '/pages/public/login'
+								});
+							}, 1000)
+						}
+					});
 				}
 
 			},
@@ -177,11 +164,11 @@ import Api from '@/common/api';
 				this[key] = e.detail.value;
 			},
 
-			async getverification(){
+			async getverification() {
 
 				let _this = this;
 				// 验证是否已进行验证码操作
-				if(this.verifTime==0){
+				if (this.verifTime == 0) {
 					if (!/^1[1234567890]\d{9}$/.test(this.phone)) {
 						uni.showToast({
 							title: '电话号码有误，请重新输入',
@@ -190,27 +177,29 @@ import Api from '@/common/api';
 						this.phone = '';
 						return;
 					} else {
-						_this.getverifSwitch=true
-						this.verifTime=60;
-						_this.getConfirms=this.verifTime
+						_this.getverifSwitch = true
+						this.verifTime = 60;
+						_this.getConfirms = this.verifTime
 						//倒计时
-						var timeInterval=setInterval(function(){
-							_this.verifTime -- ;
-							if(_this.verifTime<=0){
+						var timeInterval = setInterval(function() {
+							_this.verifTime--;
+							if (_this.verifTime <= 0) {
 								//倒计时结束清除定时器
 								clearInterval(timeInterval)
-								_this.getConfirms='重新发送'
-								_this.getverifSwitch=false
+								_this.getConfirms = '重新发送'
+								_this.getverifSwitch = false
 								return;
 							}
-							_this.getConfirms=_this.verifTime
-						},1000)
+							_this.getConfirms = _this.verifTime
+						}, 1000)
 
-						let params = { phone: this.phone,
-						type:2};
-                        			let data = await Api.apiCall('post', Api.index.sendCodes, params);
+						let params = {
+							phone: this.phone,
+							type: 2
+						};
+						let data = await Api.apiCall('post', Api.index.sendCodes, params);
 					}
-				}else{
+				} else {
 					uni.showToast({
 						title: "请勿重复操作",
 						icon: 'none'
@@ -222,95 +211,101 @@ import Api from '@/common/api';
 				this.confirm = event.target.value;
 			},
 			//绑定
-			bind(){
-				var _this=this
+			bind() {
+				var _this = this
 				console.log('oauth');
 				uni.getStorage({
-					key:'oauth',
+					key: 'oauth',
 					success(re) {
-						if(re.data){
+						if (re.data) {
 							_this.bind_()
 						}
 					}
 				})
 			},
-			bind_(){
+			bind_() {
 				console.log('bind');
-				var _this=this
-							// #ifdef MP-WEIXIN
-							wx.login({
-								success(res) {
-									wx.getUserInfo({
-										success(re) {
-											re.code=res.code;
-											console.log('re:',re);
-											ef.submit({
-												request:{s:['USERSELFBINDWEIXIN',['applet',re]]},
-												callback(data){
-													console.log(data);
-													fns.unionid()
-													return
-												},
-												error(err){
-													fns.err('err',err)
-												}
-											})
-										}
-									})
-								}
-							})
-							// #endif
-							// #ifdef APP-PLUS
+				var _this = this
+				// #ifdef MP-WEIXIN
+				wx.login({
+					success(res) {
+						wx.getUserInfo({
+							success(re) {
+								re.code = res.code;
+								console.log('re:', re);
+								ef.submit({
+									request: {
+										s: ['USERSELFBINDWEIXIN', ['applet', re]]
+									},
+									callback(data) {
+										console.log(data);
+										fns.unionid()
+										return
+									},
+									error(err) {
+										fns.err('err', err)
+									}
+								})
+							}
+						})
+					}
+				})
+				// #endif
+				// #ifdef APP-PLUS
+				uni.showToast({
+					title: '正在绑定',
+					icon: 'loading'
+				})
+				console.log('oauto star');
+				uni.login({
+					provider: 'weixin',
+					success: function(loginRes) {
+						console.log('loginres:', typeof loginRes);
+						if (loginRes.errMsg == 'login:ok') {
+							// 获取用户信息
 							uni.showToast({
-								title:'正在绑定',
-								icon:'loading'
+								title: '获取信息',
+								icon: 'loading'
 							})
-							console.log('oauto star');
-							uni.login({
-							  provider: 'weixin',
-							  success: function (loginRes) {
-								  console.log('loginres:',typeof loginRes);
-								  if (loginRes.errMsg=='login:ok') {
-											// 获取用户信息
-											uni.showToast({
-												title:'获取信息',
-												icon:'loading'
-											})
-											uni.getUserInfo({
-											  provider: 'weixin',
-											  success: function (infoRes) {
-												  uni.showToast({
-												  	title:'获取成功',
-												  	icon:'loading'
-												  })
-												  ef.submit({
-												  	request:{s:['USERSELFBINDWEIXIN',['app',infoRes.userInfo]]},
-												  	callback(data){
-												  		console.log(data);
-														console.log(JSON.stringify(data));
-														fns.unionid()
-												  	},
-												  	error(err){
-														console.log(err);
-												  	}
-												  })
-
-												},
-											  fail(err){
-												  console.log(err);
-											  }
-											});
-								  }else{
-									 console.log(err);
-								  }
-
-							  },
-							  fail(err) {
-							  	console.log(err);
-							  }
+							uni.getUserInfo({
+								provider: 'weixin',
+								success: function(infoRes) {
+									uni.showToast({
+										title: '获取成功',
+										icon: 'loading'
+									})
+									ef.submit({
+										request: {
+											s: ['USERSELFBINDWEIXIN', ['app', infoRes
+												.userInfo
+											]]
+										},
+										callback(data) {
+											console.log(data);
+											console.log(JSON.stringify(data));
+											fns.unionid()
+										},
+										error(err) {
+											console.log(err);
+										}
+									})
 
+								},
+								fail(err) {
+									console.log(err);
+								}
 							});
-							// #endif
+						} else {
+							console.log(err);
+						}
+
+					},
+					fail(err) {
+						console.log(err);
+					}
+
+				});
+				// #endif
 			}
 		},
 
@@ -318,25 +313,28 @@ import Api from '@/common/api';
 </script>
 
 <style lang='scss'>
-	page{
+	page {
 		background: #fff;
 	}
-	.container{
-		padding-top: 55px;
-		position:relative;
+
+	.container {
+		padding-top: 105px;
+		position: relative;
 		width: 100vw;
-		height: 100vh;
+		height: 120vh;
 		overflow: hidden;
 		background: #fff;
 	}
-	.wrapper{
-		position:relative;
+
+	.wrapper {
+		position: relative;
 		z-index: 90;
 		background: #fff;
-		padding-bottom: 40upx;
+		padding-bottom: 30upx;
 	}
-	.back-btn{
-		position:absolute;
+
+	.back-btn {
+		position: absolute;
 		left: 40upx;
 		z-index: 9999;
 		padding-top: var(--status-bar-height);
@@ -344,29 +342,35 @@ import Api from '@/common/api';
 		font-size: 40upx;
 		color: $font-color-dark;
 	}
-	.left-top-sign{
+
+	.left-top-sign {
 		font-size: 120upx;
 		color: $page-color-base;
-		position:relative;
+		position: relative;
 		left: -16upx;
 	}
-	.right-top-sign{
-		position:absolute;
+
+	.right-top-sign {
+		position: absolute;
 		top: 80upx;
 		right: -30upx;
 		z-index: 95;
-		&:before, &:after{
-			display:block;
-			content:"";
+
+		&:before,
+		&:after {
+			display: block;
+			content: '';
 			width: 400upx;
 			height: 80upx;
 			background: #b4f3e2;
 		}
-		&:before{
+
+		&:before {
 			transform: rotate(50deg);
 			border-radius: 0 50px 0 0;
 		}
-		&:after{
+
+		&:after {
 			position: absolute;
 			right: -198upx;
 			top: 0;
@@ -375,45 +379,52 @@ import Api from '@/common/api';
 			/* background: pink; */
 		}
 	}
-	.left-bottom-sign{
-		position:absolute;
+
+	.left-bottom-sign {
+		position: absolute;
 		left: -270upx;
 		bottom: -320upx;
 		border: 100upx solid #d0d1fd;
 		border-radius: 50%;
 		padding: 180upx;
 	}
-	.welcome{
-		position:relative;
+
+	.welcome {
+		position: relative;
 		left: 50upx;
-		top: -90upx;
+		top: -20upx;
 		font-size: 46upx;
 		color: #555;
-		text-shadow: 1px 0px 1px rgba(0,0,0,.3);
+		text-shadow: 1px 0px 1px rgba(0, 0, 0, 0.3);
 	}
-	.input-content{
+
+	.input-content {
 		padding: 0 60upx;
 	}
-	.input-item{
-		display:flex;
+
+	.input-item {
+		display: flex;
 		flex-direction: column;
-		align-items:flex-start;
+		align-items: flex-start;
 		justify-content: center;
 		padding: 0 30upx;
-		background:$page-color-light;
+		background: $page-color-light;
 		height: 120upx;
 		border-radius: 4px;
 		margin-bottom: 50upx;
-		&:last-child{
+
+		&:last-child {
 			margin-bottom: 0;
 		}
-		.tit{
+
+		.tit {
 			height: 50upx;
 			line-height: 56upx;
 			font-size: $font-sm+2upx;
 			color: $font-color-base;
 		}
-		input{
+
+		input {
 			height: 60upx;
 			font-size: $font-base + 2upx;
 			color: $font-color-dark;
@@ -421,7 +432,7 @@ import Api from '@/common/api';
 		}
 	}
 
-	.confirm-btn{
+	.confirm-btn {
 		width: 630upx;
 		height: 76upx;
 		line-height: 76upx;
@@ -430,31 +441,32 @@ import Api from '@/common/api';
 		background: $uni-color-primary;
 		color: #fff;
 		font-size: $font-lg;
-		&:after{
+
+		&:after {
 			border-radius: 100px;
 		}
 	}
-	.forget-section{
+
+	.forget-section {
 		font-size: $font-sm+2upx;
 		color: $font-color-spec;
 		text-align: center;
 		margin-top: 40upx;
 	}
-	.register-section{
-		position:absolute;
+
+	.register-section {
+		position: absolute;
 		left: 0;
-		bottom: 50upx;
 		width: 100%;
 		font-size: $font-sm+2upx;
 		color: $font-color-base;
 		text-align: center;
-		text{
+
+		text {
 			color: $font-color-spec;
 			margin-left: 10upx;
 		}
 	}
-
-
 </style>
 <style lang="stylus" ref="stylesheet/stylus">
 	.verificationBox