From f961a7e1d262afcc37b0743fcd9cec0f9fc1cbc2 Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期五, 26 七月 2024 11:37:06 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/Register/Register.vue | 62 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/src/pages/Register/Register.vue b/src/pages/Register/Register.vue
index 532fc67..63d83f8 100644
--- a/src/pages/Register/Register.vue
+++ b/src/pages/Register/Register.vue
@@ -5,8 +5,8 @@
class="Ttop flex flex-center flex-wrap"
style="flex-direction: column"
>
- <view ></view>
- <view ref="Rtop">
+ <view></view>
+ <view ref="Rtop">
<text class="login"></text>
<text
style="
@@ -16,7 +16,7 @@
font-family: cursive;
font-weight: bold;
"
- >涓浗鍖诲浜虹墿鐭ヨ瘑搴�</text
+ >涓浗鍘嗕唬鍖诲浜虹墿鐭ヨ瘑搴�</text
>
</view>
<view></view>
@@ -35,7 +35,6 @@
<!-- <view style="color: #244A7B;padding-bottom: .47rem;font-size: .3rem;font-weight: bold;">鐢ㄦ埛娉ㄥ唽</view> -->
<view class="LoginBg"></view>
<view
-
@click="BacktoLogin"
style="
cursor: pointer;
@@ -74,10 +73,10 @@
placeholder="蹇呴』涓庡瘑鐮佷竴鑷�"
></el-input>
</el-form-item>
- <el-form-item label="鎵嬫満鍙�" prop="cellphoneORmailbox">
+ <el-form-item label="鎵嬫満鍙�/閭" prop="cellphoneORmailbox">
<el-input
v-model="registerData.cellphoneORmailbox"
- placeholder="璇峰～鍐欐纭殑鎵嬫満"
+ placeholder="璇峰～鍐欐墜鏈哄彿/閭"
></el-input>
</el-form-item>
<el-form-item label="楠岃瘉鐮�" prop="verifyCode">
@@ -132,11 +131,18 @@
margin-bottom: 0.19rem;
"
>
+ <el-checkbox v-model="checked" style="margin-right: 0.06rem;"></el-checkbox>
鐢ㄦ埛娉ㄥ唽鍗充唬琛ㄥ悓鎰�
- <span class="cursor" @click="termOfServiceClick(1)"
+ <span
+ class="cursor"
+ style="color: #244a7b"
+ @click="termOfServiceClick(1)"
>銆婃湇鍔℃潯娆俱��</span
>
- 鍜�<span class="cursor" @click="termOfServiceClick(2)"
+ 鍜�<span
+ class="cursor"
+ style="color: #244a7b"
+ @click="termOfServiceClick(2)"
>銆婄敤鎴烽殣绉佷繚鎶ゅ拰涓汉淇℃伅鏉℃銆�</span
>
</view>
@@ -236,7 +242,7 @@
cellphoneORmailbox: [
{
required: true,
- message: "璇疯緭鍏ユ墜鏈�",
+ message: "璇疯緭鍏ユ墜鏈哄彿/閭",
trigger: "blur"
},
{
@@ -287,26 +293,31 @@
// 涔︾睄鏁版嵁
listData: [
{
- name: "涓尰浜虹墿鏁版嵁搴�",
+ name: "鍘嗕唬浜虹墿",
id: 1
},
{
- name: "涓栧尰鍖诲鏁版嵁搴�",
+ name: "瀹跺浼犳壙",
id: 2
},
{
- name: "涓尰瀛︽湳娴佹淳",
+ name: "瀛︽湳鍥捐氨",
+ id: 6
+ },
+ {
+ name: "瀛︽湳娴佹淳",
id: 3
},
{
- name: "涓尰鍦板煙鍖昏氨",
+ name: "鍦板煙鍥捐氨",
id: 4
},
- {
- name: "涓尰鍖讳簨鍒跺害",
- id: 5
- }
- ]
+ // {
+ // name: "涓尰鍖讳簨鍒跺害",
+ // id: 5
+ // }
+ ],
+ checked: false
};
},
onLoad() {
@@ -324,9 +335,9 @@
// 鏈嶅姟鏉℃
termOfServiceClick(number) {
if (number == 1) {
- window.open(`#/pages/userAgreement/userAgreement`);
+ window.open(`#/pages/userAgreement/userAgreement?type=1`);
} else if (number == 2) {
- window.open(`#/pages/userAgreement/userAgreement`);
+ window.open(`#/pages/userAgreement/userAgreement?type=2`);
}
},
// 宸叉湁璐﹀彿锛熻繑鍥炵櫥褰�
@@ -379,6 +390,13 @@
},
// 鐢ㄦ埛娉ㄥ唽
async Login(formName) {
+ if(!this.checked) {
+ this.$message({
+ message: '璇峰嬀閫夊悓鎰忔湇鍔℃潯娆俱�佺敤鎴烽殣绉佷繚鎶ゅ拰涓汉淇℃伅鏉℃',
+ type: 'warning'
+ });
+ return false;
+ }
let Obj = {
username: this.registerData.loginID,
password: encryptAES(this.registerData.pass),
@@ -810,12 +828,12 @@
}
::v-deep .el-form-item__label {
- min-width: 0.6rem;
+ min-width: 0.8rem;
padding: 0;
color: #244a7b;
font-size: 0.14rem;
font-weight: 500;
- margin-right: 0.29rem;
+ margin-right: 0.1rem;
display: flex;
align-items: center;
text-align: right;
--
Gitblit v1.9.1