From 79f19dbb119759ab6abb2e668dd844d2b711dd77 Mon Sep 17 00:00:00 2001
From: linju <linju@dcloud.io>
Date: Mon, 16 May 2022 16:28:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=A4=9A=E4=B8=AAdb=5Finit?=
 =?UTF-8?q?=E7=9A=84=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog.md                                  | 21 +------
 package.json                                  |  2 +-
 .../ucenter/login-page/register/register.vue  | 60 +++++++++----------
 3 files changed, 34 insertions(+), 49 deletions(-)

diff --git a/changelog.md b/changelog.md
index 536e4c0d..83c363c4 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,21 +1,6 @@
-## 1.2.8（2022-09-01）
-+ 修复 iOS端，一键登录功能卡在showLoading的问题
-## 1.2.7（2022-08-10）
-- 修复微信小程序绑定手机号失败的问题
-## 1.2.6（2022-06-29）
-- 支持 ios 安全区
-## 1.2.5（2022-05-29）
-升级预置的`uni_modules`->`uni-captcha`版本为：0.6.0。[详情](https://ext.dcloud.net.cn/plugin?name=uni-captcha)
-## 1.2.4（2022-05-20）
-- 修改`uni-starter.config.js`->`debug`的默认值为`false`
-## 1.2.3（2022-05-20）
-- 默认关闭`manifest.json`中的扩展配置
-- `uni-starter.config.js` 新增debug,用于配置是否开启调试模式
-## 1.2.2（2022-05-19）
-- 优化登陆体验，账号密码登陆错误超过2次，再显示图形验证码进行人机校验。
-## 1.2.1（2022-05-18）
-- 修复在某些情况下，微信小程序端验证码显示错误的问题
-## 1.2.0（2022-05-16）
+## 1.1.36（2022-05-16）
+解决多个db_init的冲突
+## 1.1.35（2022-05-16）
 - 短信验证码登陆、绑定手机号码新增防刷逻辑。当短信验证码输入错误2次以上，弹出图形验证码进行人机校验。
 - uni-id-cf，新增防刷机制。更改loginLog为uniIdLog 记录各类uni-id操作，并新增action字段记录操作的行为名称
 - 注册账号新增需要输入图形验证码
diff --git a/package.json b/package.json
index b9373d94..25fb1a1e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"id": "uni-starter",
 	"displayName": "uni-starter",
-	"version": "1.2.8",
+	"version": "1.1.36",
 	"description": "云端一体应用快速开发基本项目模版",
 	"keywords": [
         "login",
diff --git a/pages/ucenter/login-page/register/register.vue b/pages/ucenter/login-page/register/register.vue
index 056367a1..afa3616a 100644
--- a/pages/ucenter/login-page/register/register.vue
+++ b/pages/ucenter/login-page/register/register.vue
@@ -12,10 +12,10 @@
 			</uni-forms-item>
 			<uni-forms-item name="pwd2" v-model="formData.pwd2" required>
 				<uni-easyinput :inputBorder="false" class="easyinput" :placeholder="$t('register.passwordAgain')" type="password" v-model="formData.pwd2" trim="both" />
-			</uni-forms-item>
-			<uni-forms-item name="captcha" required>
-				<uni-captcha scene="register" v-model="formData.captcha"></uni-captcha>
-			</uni-forms-item>
+			</uni-forms-item>
+			<uni-forms-item name="captcha" required>
+				<uni-captcha scene="register" v-model="formData.captcha"></uni-captcha>
+			</uni-forms-item>
 			<uni-agreements @setAgree="agree = $event"></uni-agreements>
 			<button class="send-btn" :disabled="!canSubmit" :type="canSubmit?'primary':'default'" @click="submit">{{$t('register.registerAndLogin')}}</button>
 		</uni-forms>
@@ -33,18 +33,18 @@ import mixin from '../common/login-page.mixin.js';
 					"username": "",
 					"nickname": "",
 					"password":"",
-					"pwd2":"",
-					"captcha":""
+					"pwd2":"",
+					"captcha":false
 				},
 				rules,
-				agree:false,
+				agree:false,
+			}
+		},
+		computed:{
+			canSubmit(){
+				return this.formData.username.length && this.formData.password.length && this.formData.captcha.length == 4 && this.agree
 			}
-		},
-		computed:{
-			canSubmit(){
-				return this.formData.username.length && this.formData.password.length && this.formData.captcha.length == 4 && this.agree
-			}
-		},
+		},
 		onReady() {
 			this.$refs.form.setRules(this.rules)
 		},
@@ -52,7 +52,7 @@ import mixin from '../common/login-page.mixin.js';
 			uni.setNavigationBarTitle({
 				title: this.$t('register.navigationBarTitle')
 			})
-		},
+		},
 		methods: {
 			/**
 			 * 触发表单提交
@@ -77,23 +77,23 @@ import mixin from '../common/login-page.mixin.js';
 					})
 			},
 			submitForm(params) {
-				uniCloud.callFunction({
-					name:'uni-id-cf',
-					data:{
-						action:'register',
-						params,
-					},
-					success: ({result}) => {
-						console.log(result);
-						if(result.code === 0){
-							this.loginSuccess(result)
+				uniCloud.callFunction({
+					name:'uni-id-cf',
+					data:{
+						action:'register',
+						params,
+					},
+					success: ({result}) => {
+						console.log(result);
+						if(result.code === 0){
+							this.loginSuccess(result)
 						}else{
 							uni.showModal({
 								content: result.msg,
 								showCancel: false
 							});
-						}
-					}
+						}
+					}
 				})
 			}
 		}
@@ -104,11 +104,11 @@ import mixin from '../common/login-page.mixin.js';
 	@import url("../common/login-page.css");
 	.uni-container {
 		padding: 15px;
-	}
+	}
 	.send-btn{
 		margin-top: 15px;
-	}
-	.uni-container ::v-deep .uni-forms-item__label{
-		width: 15px !important;
+	}
+	.uni-container ::v-deep .uni-forms-item__label{
+		width: 15px !important;
 	}
 </style>
-- 
GitLab