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 | 155 ++++++++++++++++++++++++---------------------------
1 files changed, 72 insertions(+), 83 deletions(-)
diff --git a/src/pages/Register/Register.vue b/src/pages/Register/Register.vue
index e6907b1..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 class=""></view>
- <view class="" 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>
@@ -32,10 +32,9 @@
align-items: center;
"
>
- <!-- <view class="" style="color: #244A7B;padding-bottom: .47rem;font-size: .3rem;font-weight: bold;">鐢ㄦ埛娉ㄥ唽</view> -->
+ <!-- <view style="color: #244A7B;padding-bottom: .47rem;font-size: .3rem;font-weight: bold;">鐢ㄦ埛娉ㄥ唽</view> -->
<view class="LoginBg"></view>
<view
- class=""
@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>
@@ -159,7 +165,7 @@
import Footer1 from "@/components/footer/footer.vue";
export default {
components: {
- Footer1,
+ Footer1
},
data() {
// 瀵嗙爜
@@ -202,55 +208,55 @@
{
required: true,
message: "璇疯緭鍏ョ櫥褰曡处鍙�",
- trigger: "blur",
+ trigger: "blur"
},
{
pattern: /^[a-zA-Z0-9]{3,15}$/,
message: "璇疯緭鍏�3-15涓瓧绗︾殑瀛楁瘝鎴栨暟瀛�",
- trigger: "blur",
- }, // 鑷畾涔夋牎楠岃鍒欙紝浣跨敤姝ｅ垯琛ㄨ揪寮�
+ trigger: "blur"
+ } // 鑷畾涔夋牎楠岃鍒欙紝浣跨敤姝ｅ垯琛ㄨ揪寮�
],
pass: [
{
required: true,
message: "璇疯緭鍏ュ瘑鐮�",
- trigger: "blur",
+ trigger: "blur"
},
{
min: 6,
max: 10,
message: "瀵嗙爜闀垮害鍦� 6 鍒� 12 涓瓧绗�",
- trigger: "blur",
+ trigger: "blur"
},
{
validator: validatePass,
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
checkPass: [
{
validator: validatePass2,
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
cellphoneORmailbox: [
{
required: true,
- message: "璇疯緭鍏ユ墜鏈�",
- trigger: "blur",
+ message: "璇疯緭鍏ユ墜鏈哄彿/閭",
+ trigger: "blur"
},
{
validator: this.validateContact,
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
verifyCode: [
{
required: true,
message: "璇疯緭鍏ラ獙璇佺爜",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
// 鐧诲綍娉ㄥ唽妗�
loginTrue: true,
@@ -262,51 +268,56 @@
pass: "",
checkPass: "",
cellphoneORmailbox: null,
- verifyCode: "",
+ verifyCode: ""
},
// 鐧诲綍鐢ㄦ埛璐﹀彿
loginData: {
// 璐﹀彿
loginID: "",
- pass: "",
+ pass: ""
},
// 閲嶇疆瀵嗙爜
resetDataPass: {
cellphoneORmailbox: null,
verifyCode: "",
newPass: "",
- checkPass: "",
+ checkPass: ""
},
// 淇敼瀵嗙爜
amendDataPass: {
loginID: "",
originalPass: "",
newPass: "",
- checkPass: "",
+ checkPass: ""
},
// 涔︾睄鏁版嵁
listData: [
{
- name: "涓尰浜虹墿鏁版嵁搴�",
- id: 1,
+ name: "鍘嗕唬浜虹墿",
+ id: 1
},
{
- name: "涓栧尰鍖诲鏁版嵁搴�",
- id: 2,
+ name: "瀹跺浼犳壙",
+ id: 2
},
{
- name: "涓尰瀛︽湳娴佹淳",
- id: 3,
+ name: "瀛︽湳鍥捐氨",
+ id: 6
},
{
- name: "涓尰鍦板煙鍖昏氨",
- id: 4,
+ name: "瀛︽湳娴佹淳",
+ id: 3
},
{
- name: "涓尰鍖讳簨鍒跺害",
- id: 5,
+ name: "鍦板煙鍥捐氨",
+ id: 4
},
+ // {
+ // name: "涓尰鍖讳簨鍒跺害",
+ // id: 5
+ // }
],
+ checked: false
};
},
onLoad() {
@@ -314,7 +325,7 @@
success: function (info) {
// console.log('灞忓箷鐨勫搴︼細' + info.windowWidth);
// console.log('灞忓箷鐨勯珮搴︼細' + info.windowHeight);
- },
+ }
});
},
mounted() {
@@ -323,31 +334,24 @@
methods: {
// 鏈嶅姟鏉℃
termOfServiceClick(number) {
- // console.log(number);
if (number == 1) {
- console.log("鏈嶅姟鏉℃");
- window.open(`#/pages/userAgreement/userAgreement`);
- // uni.navigateTo({
- // url: '/pages/userAgreement/userAgreement'
- // })
+ window.open(`#/pages/userAgreement/userAgreement?type=1`);
} else if (number == 2) {
- window.open(`#/pages/userAgreement/userAgreement`);
- console.log("鐢ㄦ埛闅愮淇濇姢鍜屼釜浜轰俊鎭潯娆�");
+ window.open(`#/pages/userAgreement/userAgreement?type=2`);
}
},
// 宸叉湁璐﹀彿锛熻繑鍥炵櫥褰�
BacktoLogin() {
uni.redirectTo({
- url: "/pages/Login/Login",
+ url: "/pages/Login/Login"
});
},
// 鑾峰彇楠岃瘉鐮�
async verifyCodeClick() {
- console.log(this.registerData.cellphoneORmailbo, "registerData");
if (!this.registerData.cellphoneORmailbox) {
this.$message({
message: "璇疯緭鍏ユ墜鏈猴紒",
- type: "warning",
+ type: "warning"
});
return false;
@@ -356,7 +360,7 @@
return;
}
let Obj = {
- communicateParam: this.registerData.cellphoneORmailbox,
+ communicateParam: this.registerData.cellphoneORmailbox
};
this.countdown = 60;
const intervalId = setInterval(() => {
@@ -367,13 +371,11 @@
}
}, 1000);
let code = await getverifyCode(Obj);
-
},
// 鎵嬫満鍙�/鎴栬�呴偖绠�
validateContact(rule, value, callback) {
const regPhone = /^1[0-9]{10}$/;
const regEmail = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/;
- console.log(value, regPhone.test(value), regEmail.test(value));
if (regPhone.test(value) || regEmail.test(value)) {
callback(); // 鏍￠獙閫氳繃
} else {
@@ -384,55 +386,42 @@
this.$nextTick(() => {
var width = this.$refs.Rtop.$el.clientWidth;
this.Rtop1 = width + 50;
- console.log("Element width:", width);
});
},
// 鐢ㄦ埛娉ㄥ唽
async Login(formName) {
- console.log(formName);
+ if(!this.checked) {
+ this.$message({
+ message: '璇峰嬀閫夊悓鎰忔湇鍔℃潯娆俱�佺敤鎴烽殣绉佷繚鎶ゅ拰涓汉淇℃伅鏉℃',
+ type: 'warning'
+ });
+ return false;
+ }
let Obj = {
username: this.registerData.loginID,
password: encryptAES(this.registerData.pass),
communicateParam: this.registerData.cellphoneORmailbox,
- verifyCode: this.registerData.verifyCode,
+ verifyCode: this.registerData.verifyCode
};
this.$refs[formName].validate(async (valid) => {
if (valid) {
- // alert('submit!');
- console.log("sdfds");
await getaddLogin(Obj).then((res) => {
- console.log(res, "娉ㄥ唽鎴愬姛");
if (res.success == true) {
- uni.showToast({
- title: res.errorText,
- icon: "success",
- });
+ this.$message.success("娉ㄥ唽鎴愬姛");
uni.navigateTo({
- url: "/pages/Login/Login",
+ url: "/pages/Login/Login"
});
} else {
- uni.showToast({
- title: res.errorText,
- icon: "error",
- });
+ this.$message.error(res.errorText);
}
});
- // encryptAES
- // uni.navigateTo({
- // url: '/pages/Login/Login'
- // })
} else {
console.log("error submit!!");
return false;
}
});
-
- // console.log(Obj, '鐢ㄦ埛鐧诲綍鐨勭櫥褰曟寜閽�');
-
- // let res = await getaddLogin(Obj)
- // console.log('sdfdsfs', res);
- },
- },
+ }
+ }
};
</script>
<style scoped>
@@ -839,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