2023-2-25

功能完善

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/',

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="left-top-sign">注册</view> -->
-			<view class="welcome">欢迎回来！</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;

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
+					<input type="number" :value="phone" placeholder="请输入手机号码" maxlength="11" data-key="phone"
-						type="number"
+						@input="onKeyInput" />
-						:value="phone"
-						placeholder="请输入手机号码"
-						maxlength="11"
-						data-key="phone"
-						@input="onKeyInput"
-					/>
 				</view>
 				<view class="input-item">
 					<text class="tit">密码</text>
-					<input
+					<input type="mobile" value="" placeholder="6~12位大小写字母和数字组成" placeholder-class="input-empty"
-						type="mobile"
+						maxlength="12" password data-key="password" @input="inputChange" />
-						value=""
-						placeholder="8~24位不含特殊字符的数字、字母组合"
-						placeholder-class="input-empty"
-						maxlength="20"
-						password
-						data-key="password"
-						@input="inputChange"
-					/>
 				</view>
 				<view class="input-item">
-					<text class="tit">密码</text>
+					<text class="tit">确认密码</text>
-					<input
+					<input type="mobile" value="" placeholder="6~12位大小写字母和数字组成" placeholder-class="input-empty"
-						type="mobile"
+						maxlength="12" password data-key="confimpassword" @input="inputChange" />
-						value=""
-						placeholder="8~24位不含特殊字符的数字、字母组合"
-						placeholder-class="input-empty"
-						maxlength="20"
-						password
-						data-key="confimpassword"
-						@input="inputChange"
-					/>
 				</view>
 				<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,10 +40,10 @@
 			<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>
 
@@ -122,31 +102,36 @@ import Api from '@/common/api';
 			},
 			async toRegister() {
 				var _this = this
-				var phone=this.phone,password=this.password,confimpassword=this.confimpassword;
+				var reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,12}$/;
-				if (!/^1\d{10}$/.test(phone)){
+				var phone = this.phone;
+				var password = this.password;
+				var confimpassword = this.confimpassword;
+				if (!/^1[3456789]\d{9}$/.test(phone)) {
 					uni.showToast({
 						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个字符',
+						title: '密码格式错误',
 						icon: 'none'
 					})
-				}
+				} else if (!reg.test(confimpassword) || confimpassword.length < 6 || confimpassword.length > 12) {
-				else if(password!=confimpassword){
+					uni.showToast({
+						title: '确认密码格式错误',
+						icon: 'none'
+					})
+				} else if (password != confimpassword) {
 					uni.showToast({
 						title: '两次输入的密码不一致，请检查修改',
 						icon: 'none'
 					})
-				}
+				} else if (_this.confirm == '') {
-				else if(_this.confirm==''){
 					uni.showToast({
 						title: '验证码不能为空',
 						icon: 'none'
 					});
-				}
+				} else {
-				else{
 					var req = {};
 					req = {
 						phone: this.phone,
@@ -158,6 +143,8 @@ import Api from '@/common/api';
 					};
 
 					let data = await Api.apiCall('post', Api.member.resetPassword, req);
+					console.log("data>>>>",data)
+					if(data=="操作成功")
 					uni.showToast({
 						title: '重置成功',
 						success() {
@@ -206,8 +193,10 @@ import Api from '@/common/api';
 							_this.getConfirms = _this.verifTime
 						}, 1000)
 
-						let params = { phone: this.phone,
+						let params = {
-						type:2};
+							phone: this.phone,
+							type: 2
+						};
 						let data = await Api.apiCall('post', Api.index.sendCodes, params);
 					}
 				} else {
@@ -245,7 +234,9 @@ import Api from '@/common/api';
 								re.code = res.code;
 								console.log('re:', re);
 								ef.submit({
-												request:{s:['USERSELFBINDWEIXIN',['applet',re]]},
+									request: {
+										s: ['USERSELFBINDWEIXIN', ['applet', re]]
+									},
 									callback(data) {
 										console.log(data);
 										fns.unionid()
@@ -284,7 +275,11 @@ import Api from '@/common/api';
 										icon: 'loading'
 									})
 									ef.submit({
-												  	request:{s:['USERSELFBINDWEIXIN',['app',infoRes.userInfo]]},
+										request: {
+											s: ['USERSELFBINDWEIXIN', ['app', infoRes
+												.userInfo
+											]]
+										},
 										callback(data) {
 											console.log(data);
 											console.log(JSON.stringify(data));
@@ -321,20 +316,23 @@ import Api from '@/common/api';
 	page {
 		background: #fff;
 	}
+
 	.container {
-		padding-top: 55px;
+		padding-top: 105px;
 		position: relative;
 		width: 100vw;
-		height: 100vh;
+		height: 120vh;
 		overflow: hidden;
 		background: #fff;
 	}
+
 	.wrapper {
 		position: relative;
 		z-index: 90;
 		background: #fff;
-		padding-bottom: 40upx;
+		padding-bottom: 30upx;
 	}
+
 	.back-btn {
 		position: absolute;
 		left: 40upx;
@@ -344,28 +342,34 @@ import Api from '@/common/api';
 		font-size: 40upx;
 		color: $font-color-dark;
 	}
+
 	.left-top-sign {
 		font-size: 120upx;
 		color: $page-color-base;
 		position: relative;
 		left: -16upx;
 	}
+
 	.right-top-sign {
 		position: absolute;
 		top: 80upx;
 		right: -30upx;
 		z-index: 95;
-		&:before, &:after{
+
+		&:before,
+		&:after {
 			display: block;
-			content:"";
+			content: '';
 			width: 400upx;
 			height: 80upx;
 			background: #b4f3e2;
 		}
+
 		&:before {
 			transform: rotate(50deg);
 			border-radius: 0 50px 0 0;
 		}
+
 		&:after {
 			position: absolute;
 			right: -198upx;
@@ -375,6 +379,7 @@ import Api from '@/common/api';
 			/* background: pink; */
 		}
 	}
+
 	.left-bottom-sign {
 		position: absolute;
 		left: -270upx;
@@ -383,17 +388,20 @@ import Api from '@/common/api';
 		border-radius: 50%;
 		padding: 180upx;
 	}
+
 	.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 {
 		padding: 0 60upx;
 	}
+
 	.input-item {
 		display: flex;
 		flex-direction: column;
@@ -404,15 +412,18 @@ import Api from '@/common/api';
 		height: 120upx;
 		border-radius: 4px;
 		margin-bottom: 50upx;
+
 		&:last-child {
 			margin-bottom: 0;
 		}
+
 		.tit {
 			height: 50upx;
 			line-height: 56upx;
 			font-size: $font-sm+2upx;
 			color: $font-color-base;
 		}
+
 		input {
 			height: 60upx;
 			font-size: $font-base + 2upx;
@@ -430,31 +441,32 @@ import Api from '@/common/api';
 		background: $uni-color-primary;
 		color: #fff;
 		font-size: $font-lg;
+
 		&:after {
 			border-radius: 100px;
 		}
 	}
+
 	.forget-section {
 		font-size: $font-sm+2upx;
 		color: $font-color-spec;
 		text-align: center;
 		margin-top: 40upx;
 	}
+
 	.register-section {
 		position: absolute;
 		left: 0;
-		bottom: 50upx;
 		width: 100%;
 		font-size: $font-sm+2upx;
 		color: $font-color-base;
 		text-align: center;
+
 		text {
 			color: $font-color-spec;
 			margin-left: 10upx;
 		}
 	}
-
-
 </style>
 <style lang="stylus" ref="stylesheet/stylus">
 	.verificationBox