From d4211fd96865e58217d63efaf4d8f6609fb24ae6 Mon Sep 17 00:00:00 2001
From: mh-two-thousand-and-two <17391232786@163.com>
Date: 星期二, 16 四月 2024 17:43:33 +0800
Subject: [PATCH] 更新数据

---
 src/pages/Register/Register.vue |  155 +++++++++++++++++++++++----------------------------
 1 files changed, 70 insertions(+), 85 deletions(-)

diff --git a/src/pages/Register/Register.vue b/src/pages/Register/Register.vue
index f7cd1fb..32492c2 100644
--- a/src/pages/Register/Register.vue
+++ b/src/pages/Register/Register.vue
@@ -62,15 +62,18 @@
 		<view class="fff"></view>
 		<!-- 搴曢儴鑺辩殑鑳屾櫙鍥惧彸渚� -->
 		<view class="rrr"></view>
-
 		<Footer1 />
 	</view>
 </template>
 
 <script>
 	import {
-		getaddLogin,getverifyCode
+		getaddLogin,
+		getverifyCode
 	} from '@/api/index.js'
+	import {
+		encryptAES
+	} from '@/utils/Crypto.js'
 	import {
 		nextTick
 	} from "vue";
@@ -115,10 +118,16 @@
 				// 娉ㄥ唽鐢ㄦ埛璐﹀彿鐨勬牎楠�
 				rules: {
 					loginID: [{
-						required: true,
-						message: '璇疯緭鍏ョ櫥褰曡处鍙�',
-						trigger: 'blur'
-					}],
+							required: true,
+							message: '璇疯緭鍏ョ櫥褰曡处鍙�',
+							trigger: 'blur'
+						},
+						{
+							pattern: /^[a-zA-Z0-9]{3,15}$/,
+							message: '璇疯緭鍏�3-15涓瓧绗︾殑瀛楁瘝鎴栨暟瀛�',
+							trigger: 'blur'
+						} // 鑷畾涔夋牎楠岃鍒欙紝浣跨敤姝e垯琛ㄨ揪寮�
+					],
 					pass: [{
 							required: true,
 							message: '璇疯緭鍏ュ瘑鐮�',
@@ -126,7 +135,7 @@
 						},
 						{
 							min: 6,
-							max: 12,
+							max: 10,
 							message: '瀵嗙爜闀垮害鍦� 6 鍒� 12 涓瓧绗�',
 							trigger: 'blur'
 						},
@@ -150,16 +159,10 @@
 						}
 					],
 					verifyCode: [{
-							required: true,
-							message: '璇疯緭鍏ラ獙璇佺爜',
-							trigger: 'blur'
-						},
-						{
-							validator: (rule, value, callback) => this.validateVerificationCode(rule, value,
-								callback),
-							trigger: 'blur'
-						}
-					]
+						required: true,
+						message: '璇疯緭鍏ラ獙璇佺爜',
+						trigger: 'blur'
+					}]
 				},
 				// 鐧诲綍娉ㄥ唽妗�
 				loginTrue: true,
@@ -231,13 +234,12 @@
 				// console.log(number);
 				if (number == 1) {
 					console.log('鏈嶅姟鏉℃');
-					uni.navigateTo({
-						url:'/pages/userAgreement/userAgreement'
-					})
+					window.open(`#/pages/userAgreement/userAgreement`)
+					// uni.navigateTo({
+					// 	url: '/pages/userAgreement/userAgreement'
+					// })
 				} else if (number == 2) {
-					uni.navigateTo({
-						url:'/pages/userAgreement/userAgreement'
-					})
+					window.open(`#/pages/userAgreement/userAgreement`)
 					console.log('鐢ㄦ埛闅愮淇濇姢鍜屼釜浜轰俊鎭潯娆�');
 				}
 			},
@@ -252,50 +254,25 @@
 				let Obj = {
 					communicateParam: this.registerData.cellphoneORmailbox,
 				}
+				console.log(Obj);
 				let code = await getverifyCode(Obj)
-				console.log(code);
-				console.log('鑾峰彇楠岃瘉鐮�');
-			},
-			// 鍒楄〃椤硅烦杞�
-			listDataClick(item) {
-				console.log(item);
-				// 鍦ㄥ綋鍓嶉〉闈㈣缃叏灞�鍙橀噺
-				// uni.setStorageSync('globalData', { id: 123, name: 'example' });
-				if (item.id == 1) {
-					uni.navigateTo({
-						url: '/pages/repository/repository?id=' + item.id
-					})
-				} else if (item.id == 2) {
-					console.log(item.name);
-					// uni.navigateTo({
-					// 	url:'/pages/repository/repository?id='+item.id
-					// })
-				} else if (item.id == 3) {
-					uni.navigateTo({
-						url: '/pages/dataDisplay/dataDisplay?id=' + item.id
-					})
-				} else if (item.id == 4) {
-					uni.navigateTo({
-						url: '/pages/territory/territory?id=' + item.id
-					})
-				} else if (item.id == 5) {
-					uni.navigateTo({
-						url: '/pages/TcmSystem/TcmSystem?id=' + item.id
-					})
-				}
+				console.log(code, '鑾峰彇楠岃瘉鐮�');
+				// console.log('鑾峰彇楠岃瘉鐮�');
 			},
 			// 楠岃瘉鐮佹牎楠�
 			validateVerificationCode(rule, value, callback) {
 				if (value !== '123456') {
-					callback(new Error('楠岃瘉鐮侀敊璇�'));
+					// callback(new Error('楠岃瘉鐮侀敊璇�'));
+					callback()
 				} else {
 					callback();
 				}
 			},
 			// 鎵嬫満鍙�/鎴栬�呴偖绠�
 			validateContact(rule, value, callback) {
-				const regPhone = /^1[3456789]\d{9}$/;
-				const regEmail = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/;
+				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 {
@@ -311,41 +288,49 @@
 			},
 			// 鐢ㄦ埛娉ㄥ唽
 			async Login(formName) {
+				console.log(formName);
 				let Obj = {
-					// username: this.registerData.loginID,
-					// password: this.registerData.pass,
+					username: this.registerData.loginID,
+					password: encryptAES(this.registerData.pass),
 					communicateParam: this.registerData.cellphoneORmailbox,
-					// verifyCode: this.registerData.verifyCode,
-					// "username": "bbbcccccc",
-					// "password": "EmgTXx6Iz/QrbL5nrP0h2g==",
-					// "communicateParam": "eacpjls@foxmails.com",
-					// "verifyCode": "LE5GVP"
-
+					verifyCode: this.registerData.verifyCode,
 				}
-				// uni.request({
-				// 	url: 'http://icmm.test.xyinde.com/api/account/register',
-				// 	method: 'POST',
-				// 	data: Obj,
-				// 	success: (res) => {
-				// 		console.log(res.data);
-				// 		// this.text = 'request success';
-				// 	}
-				// })
+				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'
+								});
+								uni.navigateTo({
+									url: '/pages/Login/Login'
+								})
+							}else{
+								uni.showToast({
+									title: res.errorText,
+									icon: 'error'
+								});
+							}
+						})
+						// 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);
-				// this.$refs[formName].validate((valid) => {
-				// 	if (valid) {
-				// 		alert('submit!鎴愬姛');
-				// 		uni.navigateTo({
-				// 			url: '/pages/Login/Login'
-				// 		})
-				// 	} else {
-				// 		console.log('error submit!!澶辫触');
-				// 		return false;
-				// 	}
-				// });
+
 			},
 		}
 	}

--
Gitblit v1.9.1