123

uni_modules/uni-login-page/pages/index/index.vue

@@ -56,7 +56,7 @@
 				currenPhoneArea: '+86',
 
 				formData: {
-					phone: '17777777777'
+					phone: '17769516081'
 				},
 				rules: {
 					// 对phone字段进行必填验证

uni_modules/uni-login-page/pages/index/pwd-login.vue

@@ -51,7 +51,7 @@
 				currenPhoneArea: '+86',
 				
 				formData: {
-					phone: '17777777777',
+					phone: '17769516081',
 					pwd:'123456'
 				},
 				rules: {

uni_modules/uni-login-page/pages/index/pwd-retrieve.vue

@@ -18,7 +18,7 @@
 							v-model="formData.pwd" placeholder="请输入新密码"></uni-easyinput>
 					</uni-forms-item>
 					<button class="send-btn-box" :disabled="!canSubmit" :type="canSubmit?'primary':'default'"
-						@click="submit">完成</button>
+						@click="checkCode(submit)">完成</button>
 				</uni-forms>
 			</view>
 		</view>
@@ -130,6 +130,54 @@ import mixin from '../../common/loginPage.mixin.js';
 					}
 				})
 			},
+			checkCode(callback){
+				uniCloud.callFunction({//联网验证登陆
+					"name": "user-center",
+					"data": {
+						"action": "loginBySms",
+						"params":{
+							"mobile":this.phoneNumber,
+							"code":this.formData.code
+						}
+					},
+					success:async (e) => {
+						uni.hideLoading()
+						console.log(e.result);
+						if(e.result.code === 0){
+							uni.setStorageSync('uni_id_uid', e.result.uid)
+							uni.setStorageSync('uni_id_token', e.result.token)
+							uni.setStorageSync('uni_id_token_expired', e.result.tokenExpired)
+							// uni.showToast({
+							// 	title: '登陆成功',
+							// 	icon: 'none'
+							// });
+							callback()
+						}else{
+							uni.showModal({
+								title: '错误',
+								content: e.result.msg,
+								showCancel: false,
+								confirmText: '知道了',
+							});
+						}
+					},
+					fail: (err) => {
+						console.log(err);
+						uni.showModal({
+							title: '错误',
+							content: JSON.stringify(err),
+							showCancel: false,
+							confirmText: '知道了',
+						});
+						if(err.errCode===30002){
+							
+						}
+					},
+					complete: () => {
+						uni.hideLoading()
+					}
+				})
+			},
 			/**
 			 * 完成并提交
 			 */
@@ -137,34 +185,20 @@ import mixin from '../../common/loginPage.mixin.js';
 				uniCloud.callFunction({
 					name:"user-center",
 					"data":{
-						"action":"login",
+						"action":"resetPwd",
 						"params":{
-							"username":this.formData.phone,
 							"password":this.formData.pwd
 						}
 					},
 					success:async (e) => {
 						uni.hideLoading()
 						console.log(e.result);
-						if(e.result.code === 0){
-							uni.setStorageSync('uni_id_uid', e.result.uid)
-							uni.setStorageSync('uni_id_token', e.result.token)
-							uni.setStorageSync('uni_id_token_expired', e.result.tokenExpired)
-							// console.log('66666=',e.result.uid,e.result.token,e.result.tokenExpired);
-							delete e.result.userInfo.token
-							this.setUserInfo(e.result.userInfo)
 						uni.showToast({
-								title: '登陆成功',
+							title: e.result.msg,
 							icon: 'none'
 						});
+						if(e.result.code === 0){
 							uni.navigateBack()
-						}else{
-							uni.showModal({
-								title: '错误',
-								content: e.result.msg,
-								showCancel: false,
-								confirmText: '知道了',
-							});
 						}
 					},
 					fail: (err) => {

uni_modules/uni-quick-login/uniCloud/cloudfunctions/user-center/index.js

@@ -32,6 +32,7 @@ exports.main = async (event, context) => {
 		'createCaptcha', 'verifyCaptcha','refreshCaptcha', 'inviteLogin',
 		'login_by_weixin','login_by_univerify','login_by_apple','loginBySms'
 	]
+	let payload;
 	console.log(event.action);
 	if (!noCheckAction.includes(event.action)) {
 		if (!event.uniIdToken) {
@@ -40,7 +41,7 @@ exports.main = async (event, context) => {
 				msg: '缺少token'
 			}
 		}
-		let payload = await uniID.checkToken(event.uniIdToken)
+		payload = await uniID.checkToken(event.uniIdToken)
 		if (payload.code && payload.code > 0) {
 			return payload
 		}
@@ -88,7 +89,10 @@ exports.main = async (event, context) => {
 			}
 			
 			if (!needCaptcha || passed) {
-				res = await uniID.login({...params,"queryField":['username','email','mobile']});
+				res = await uniID.login({
+					...params,
+					queryField: ['username', 'email', 'mobile']
+				});
 				await loginLog(res);
 				needCaptcha = await getNeedCaptcha();
 			}
@@ -124,7 +128,7 @@ exports.main = async (event, context) => {
 					msg: '请求过于频繁'
 				}
 			}
-			const templateId = '' // 替换为自己申请的模板id
+			const templateId = '11753' // 替换为自己申请的模板id
 			if (!templateId) {
 				return {
 					code: 500,
@@ -193,6 +197,9 @@ exports.main = async (event, context) => {
 		case 'refreshCaptcha':
 			res = await uniCaptcha.refresh(params)
 			break;
+		case 'resetPwd':
+			res = await uniID.resetPwd({...params,"uid":payload.uid})
+			break;
 		default:
 			res = {
 				code: 403,