From 8bedb5a0c09876046b397a94a9b12bb6e805d284 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期三, 19 六月 2024 17:13:23 +0800
Subject: [PATCH] Merge branch 'jlhg' of http://39.96.92.240:10000/r/~fyy/unattended-app into jlhg
---
pages/register/register.vue | 77 +++++++++++++++++++++++++-------------
1 files changed, 50 insertions(+), 27 deletions(-)
diff --git a/pages/register/register.vue b/pages/register/register.vue
index f298b23..9212e1e 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -102,6 +102,7 @@
placeholder="璇疯緭鍏ュ唴瀹�"
password
clearable></u--input>
+ <span> 瀵嗙爜搴旂敱8-16浣嶆暟瀛椼�佸瓧姣嶃�佺鍙风粍鎴愩�傝涓嶈浣跨敤瀹规槗琚寽鍒扮殑瀵嗙爜</span>
</u-form-item>
<u-form-item prop="confirmPassword"
label="纭瀵嗙爜"
@@ -212,7 +213,6 @@
labelWidth="24%"
borderBottom
v-if="radiovalue1 == '鍙告満'"
- required
@click="beforeRead">
<u-upload :fileList="fileList4"
deletable
@@ -236,23 +236,9 @@
v-if="radiovalue1 == '鍙告満'">
<uni-datetime-picker v-model="registerFormModel.expirationTimeTradequalification" type="datetime" :start="minDate" />
</u-form-item>
- <u-form-item label="鏄惁闈炵叅杞﹁締"
- v-if="radiovalue1 == '鍙告満'"
- labelWidth="30%"
- borderBottom
- prop="isNonCoal">
- <u-checkbox-group v-model="registerFormModel.isNonCoal"
- placement="row"
- size="40"
- @change="isNonCoalChange">
- <u-checkbox name="鏄�"
- label-size="30">
- </u-checkbox>
- </u-checkbox-group>
- </u-form-item>
<u-form-item labelWidth="20%"
v-if="radiovalue1 == '鍙告満'"
- label="杞﹁締绫诲瀷"
+ label="鐜繚绫诲瀷"
borderBottom
prop="countryNumberCar">
<u-radio-group v-model="registerFormModel.countryNumberCar"
@@ -301,6 +287,47 @@
}
},
data() {
+ const checkPassword = (rule, value, callback) => {
+ let passL = 8;
+ if(!value) { //涓嶅繀濉�
+ return callback()
+ }
+ if(value && value.length < passL) {
+ return callback(`瀵嗙爜涓嶈兘灏戜簬${passL}浣峘)
+ }
+ if(value && value.length > 16) {
+ return callback('瀵嗙爜涓嶈兘澶т簬16浣�')
+ }
+ //鏍￠獙鏄暟瀛�
+ const regex1 = /^\d+$/
+ // 鏍￠獙瀛楁瘝
+ const regex2 = /^[A-Za-z]+$/
+ // 鏍￠獙绗﹀彿
+ const regex3 =
+ /^[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]路~锛丂#锟�%鈥︹��&*锛堬級鈥斺�擻-+={}|銆娿�嬶紵锛氣�溾�濄�愩�戙�侊紱鈥�'锛屻�傘�乚+$/
+ if(regex1.test(value)) {
+ return callback('瀵嗙爜寮哄害杩囦綆')
+ }else if(regex2.test(value)) {
+ return callback('瀵嗙爜寮哄害杩囦綆')
+ }else if(regex3.test(value)) {
+ return callback('瀵嗙爜寮哄害杩囦綆')
+ }else if(/^[A-Za-z\d]+$/.test(value)) {
+ return callback('瀵嗙爜寮哄害杩囦綆')
+ }else if(
+ /^[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]路~锛丂#锟�%鈥︹��&*锛堬級鈥斺�擻-+={}|銆娿�嬶紵锛氣�溾�濄�愩�戙�侊紱鈥�'锛屻�傘�乗d]+$/.test(
+ value
+ )
+ ) {
+ return callback('瀵嗙爜寮哄害杩囦綆')
+ }else if(
+ /^[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]路~锛丂#锟�%鈥︹��&*锛堬級鈥斺�擻-+={}|銆娿�嬶紵锛氣�溾�濄�愩�戙�侊紱鈥�'锛屻�傘�丄-Za-z]+$/.test(
+ value
+ )
+ ) {
+ return callback('瀵嗙爜寮哄害杩囦綆')
+ }
+ return callback()
+ }
return {
minDate: this.getToday(),
// 杞︾墝鍙烽敭鐩樻帶鍒�
@@ -321,10 +348,8 @@
confirmPassword: '',
tradeQualificationImg: '',
driverImg: '',
- isNonCoal: [],
- isCoalCar: 1, //鏄惁涓虹叅鐐溅杈�(鍙告満浣跨敤瀛楁) 1 鏄� 2 涓嶆槸
- countryNumberCar: 0, //杞﹁締绫诲瀷;鍥戒簲 1锛屽浗鍏� 2
- carType:0
+ countryNumberCar: 2, //鐜繚绫诲瀷;鍥戒簲 1锛屽浗鍏� 2
+ carType:0,
},
fileList1: [],
fileList2: [],
@@ -391,10 +416,11 @@
trigger: ['blur', 'change']
},
{
- min: 6,
- max: 12,
- message: '闀垮害鍦�6-12涓瓧绗︿箣闂�'
- }
+ min: 8,
+ max: 16,
+ message: '闀垮害鍦�8-16涓瓧绗︿箣闂�'
+ },
+ {validator: checkPassword, trigger: 'change'}
],
confirmPassword: [{
required: true,
@@ -712,9 +738,6 @@
this.$nextTick(() => {
this.editRoleModelShow = false;
});
- },
- isNonCoalChange() {
- this.registerFormModel.isCoalCar = this.registerFormModel.isNonCoal.length !== 0 ? 1 : 2
}
}
};
--
Gitblit v1.9.1