From 8d393fe44e9da7b57be3eb48dd09f91f9264c3c6 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期一, 05 八月 2024 18:16:12 +0800
Subject: [PATCH] fix:司机去除操作指引
---
pages/register/register.vue | 342 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 212 insertions(+), 130 deletions(-)
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 9212e1e..6f6de1f 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -82,7 +82,7 @@
label="韬唤璇佽繃鏈熸椂闂�"
labelWidth="20%"
borderBottom>
- <uni-datetime-picker v-model="registerFormModel.expirationTimeIdcard" type="datetime" :start="minDate" />
+ <uni-datetime-picker v-model="registerFormModel.expirationTimeIdcard" type="date" :start="minDate" />
</u-form-item>
<u-form-item prop="phone"
label="鎵嬫満鍙�"
@@ -102,8 +102,22 @@
placeholder="璇疯緭鍏ュ唴瀹�"
password
clearable></u--input>
- <span> 瀵嗙爜搴旂敱8-16浣嶆暟瀛椼�佸瓧姣嶃�佺鍙风粍鎴愩�傝涓嶈浣跨敤瀹规槗琚寽鍒扮殑瀵嗙爜</span>
</u-form-item>
+ <view class="intensity">
+ <view class="psdText">瀵嗙爜寮哄害</view>
+ <view
+ class="line"
+ :class="[level.includes('low') ? 'low' : '']"></view>
+ <view
+ class="line"
+ :class="[level.includes('middle') ? 'middle' : '']"></view>
+ <view
+ class="line"
+ :class="[level.includes('high') ? 'high' : '']"></view>
+ <div class="warningtext">
+ 瀵嗙爜搴旂敱8-16浣嶆暟瀛椼�佸瓧姣嶃�佺鍙风粍鎴愩�傝涓嶈浣跨敤瀹规槗琚寽鍒扮殑瀵嗙爜
+ </div>
+ </view>
<u-form-item prop="confirmPassword"
label="纭瀵嗙爜"
labelWidth="20%"
@@ -129,6 +143,7 @@
label="杞﹁締绫诲瀷"
borderBottom
ref="roleRef"
+ prop='carType'
v-if="radiovalue1 == '鍙告満'">
<niceui-data-select-input v-model="registerFormModel.carType"
:localdata="radiolist2"
@@ -180,7 +195,7 @@
labelWidth="20%"
borderBottom
v-if="radiovalue1 == '鍙告満'">
- <uni-datetime-picker v-model="registerFormModel.expirationTimeDriving" type="datetime" :start="minDate" />
+ <uni-datetime-picker v-model="registerFormModel.expirationTimeDriving" type="date" :start="minDate" />
</u-form-item>
<u-form-item prop="driverImg"
label="椹鹃┒璇�"
@@ -206,7 +221,7 @@
labelWidth="20%"
borderBottom
v-if="radiovalue1 == '鍙告満'">
- <uni-datetime-picker v-model="registerFormModel.expirationTimeDriver" type="datetime" :start="minDate" />
+ <uni-datetime-picker v-model="registerFormModel.expirationTimeDriver" type="date" :start="minDate" />
</u-form-item>
<u-form-item prop="tradeQualificationImg"
label="浠庝笟璧勬牸璇�"
@@ -234,7 +249,7 @@
labelWidth="20%"
borderBottom
v-if="radiovalue1 == '鍙告満'">
- <uni-datetime-picker v-model="registerFormModel.expirationTimeTradequalification" type="datetime" :start="minDate" />
+ <uni-datetime-picker v-model="registerFormModel.expirationTimeTradequalification" type="date" :start="minDate" />
</u-form-item>
<u-form-item labelWidth="20%"
v-if="radiovalue1 == '鍙告満'"
@@ -287,48 +302,83 @@
}
},
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()
- }
+ const validatePass = (rule, value, callback) => {
+ if (this.registerFormModel.confirmPassword !== "") {
+ if (value !== this.registerFormModel.password) {
+ callback(new Error("涓ゆ杈撳叆瀵嗙爜涓嶄竴鑷�!"));
+ } else {
+ callback();
+ }
+ } else {
+ callback();
+ }
+ };
+ const checkPassword = (rule, value, callback) => {
+ // let roles = this.$store.getters.roles;//褰撳墠鐢ㄦ埛瑙掕壊id
+ // let passL = 8;
+ // if (roles.concat(1)){
+ // passL = 10
+ // }
+ let passL = 8;
+ this.level = []
+ if(!value) {
+ return callback('瀵嗙爜涓嶈兘涓虹┖')
+ }
+ if(value.length < passL) {
+ return callback(`瀵嗙爜涓嶈兘灏戜簬${passL}浣峘)
+ }
+ if(value.length > 16) {
+ return callback('瀵嗙爜涓嶈兘澶т簬16浣�')
+ }
+ //鏍￠獙鏄暟瀛�
+ const regex1 = /^\d+$/
+ // 鏍￠獙瀛楁瘝
+ const regex2 = /^[A-Za-z]+$/
+ // 鏍￠獙绗﹀彿
+ const regex3 =
+ /^[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]路~锛丂#锟�%鈥︹��&*锛堬級鈥斺�擻-+={}|銆娿�嬶紵锛氣�溾�濄�愩�戙�侊紱鈥�'锛屻�傘�乚+$/;
+ if(regex1.test(value)) {
+ this.level.push('low')
+ return callback('瀵嗙爜寮哄害杩囦綆')
+ }else if(regex2.test(value)) {
+ this.level.push('low')
+ return callback('瀵嗙爜寮哄害杩囦綆')
+ }else if(regex3.test(value)) {
+ this.level.push('low')
+ return callback('瀵嗙爜寮哄害杩囦綆')
+ }else if(/^[A-Za-z\d]+$/.test(value)) {
+ this.level.push('low')
+ this.level.push('middle')
+ return callback('瀵嗙爜寮哄害杩囦綆')
+ }else if(
+ /^[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]路~锛丂#锟�%鈥︹��&*锛堬級鈥斺�擻-+={}|銆娿�嬶紵锛氣�溾�濄�愩�戙�侊紱鈥�'锛屻�傘�乗d]+$/.test(
+ value
+ )
+ ) {
+ this.level.push('low')
+ this.level.push('middle')
+ return callback('瀵嗙爜寮哄害杩囦綆')
+ }else if(
+ /^[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]路~锛丂#锟�%鈥︹��&*锛堬級鈥斺�擻-+={}|銆娿�嬶紵锛氣�溾�濄�愩�戙�侊紱鈥�'锛屻�傘�丄-Za-z]+$/.test(
+ value
+ )
+ ) {
+ this.level.push('low')
+ this.level.push('middle')
+ return callback('瀵嗙爜寮哄害杩囦綆')
+ } else if (
+ /^[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]路~锛丂#锟�%鈥︹��&*锛堬級鈥斺�擻-+={}|銆娿�嬶紵锛氣�溾�濄�愩�戙�侊紱鈥�'锛屻�傘�丄-Za-z\d]+$/.test(
+ value
+ )
+ ) {
+ this.level.push('low')
+ this.level.push('middle')
+ this.level.push('high')
+ }
+ return callback()
+ };
return {
+ level:[], //瀵嗙爜寮哄害鏁扮粍
minDate: this.getToday(),
// 杞︾墝鍙烽敭鐩樻帶鍒�
carNumShow: false,
@@ -349,7 +399,7 @@
tradeQualificationImg: '',
driverImg: '',
countryNumberCar: 2, //鐜繚绫诲瀷;鍥戒簲 1锛屽浗鍏� 2
- carType:0,
+ carType:null,
},
fileList1: [],
fileList2: [],
@@ -373,12 +423,22 @@
expirationTimeTradequalification: {
required: false,
},
- name: {
+ name: [{
type: 'string',
required: true,
message: '璇峰～鍐欏鍚�',
trigger: ['blur', 'change']
- },
+ },{
+ pattern: /^[\u4e00-\u9fa5]{1,6}$/, //闄愬埗闀垮害鏈�澶氫负 6 浣�
+ message: '濮撳悕鍙兘鏄腑鏂�',
+ trigger: ['blur', 'change']
+ }],
+ carType:[{
+ type: 'number',
+ required: true,
+ message: '璇烽�夋嫨杞﹁締绫诲瀷',
+ trigger: ['blur', 'change']
+ }],
idCard: [{
type: 'string',
required: true,
@@ -411,28 +471,19 @@
}
],
password: [{
- required: true,
- message: '璇疯缃垵濮嬪瘑鐮�',
- trigger: ['blur', 'change']
- },
- {
- min: 8,
- max: 16,
- message: '闀垮害鍦�8-16涓瓧绗︿箣闂�'
- },
- {validator: checkPassword, trigger: 'change'}
- ],
+ required: true,
+ message: '璇疯缃垵濮嬪瘑鐮�',
+ trigger: ['blur', 'change']
+ },
+ {
+ validator: checkPassword,
+ trigger: 'change'
+ }],
confirmPassword: [{
- required: true,
- message: '璇疯缃垵濮嬪瘑鐮�',
- trigger: ['blur', 'change']
- },
- {
- min: 6,
- max: 12,
- message: '闀垮害鍦�6-12涓瓧绗︿箣闂�'
- }
- ],
+ required: true,
+ validator: validatePass,
+ trigger: "blur"
+ }],
carNo: [{
type: 'string',
required: true,
@@ -561,11 +612,7 @@
let year = now.getFullYear();
let month = this.padStart(now.getMonth() + 1); // 鏈堜唤鏄粠0寮�濮嬬殑
let day = this.padStart(now.getDate());
- let hour = this.padStart(now.getHours());
- let minute = this.padStart(now.getMinutes());
- let second = this.padStart(now.getSeconds());
- console.log(`${year}-${month}-${day} ${hour}:${minute}:${second}`)
- return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
+ return `${year}-${month}-${day}`;
},
padStart(value) {
return value.toString().padStart(2, '0');
@@ -575,60 +622,56 @@
this.registerFormModel.carType = this.radiolist2.find(v => v.value === e).value
},
registerClick() {
- if (this.registerFormModel.password == this.registerFormModel.confirmPassword) {
- if(this.registerFormModel.carType==3&&!this.registerFormModel.tradeQualificationImg||this.registerFormModel.carType==4&&!this.registerFormModel.tradeQualificationImg){
- uni.showToast({
- title: '璇蜂笂浼犱粠涓氳祫鏍艰瘉锛�',
- icon: 'error',
- duration: 2000
- });
- }else{
- this.$refs.regesterFormRef
- .validate()
- .then(res => {
- this.registerClickloading = true;
- this.registerFormModel.username = this.registerFormModel.phone;
- this.registerFormModel.idCardImg = this.registerFormModel.cardImg1+","+this.registerFormModel.cardImg2;
- if(this.registerFormModel.expirationTimeDriver){
- this.registerFormModel.expirationTimeDriver=this.registerFormModel.expirationTimeDriver.slice(0,16)
- }
- if(this.registerFormModel.expirationTimeDriving){
- this.registerFormModel.expirationTimeDriving=this.registerFormModel.expirationTimeDriving.slice(0,16)
- }
- if(this.registerFormModel.expirationTimeIdcard){
- this.registerFormModel.expirationTimeIdcard=this.registerFormModel.expirationTimeIdcard.slice(0,16)
- }
- if(this.registerFormModel.expirationTimeTradequalification){
- this.registerFormModel.expirationTimeTradequalification=this.registerFormModel.expirationTimeTradequalification.slice(0,16)
- }
- this.$reqPost('registerDriver', this.registerFormModel, 'json')
- .then(res => {
- this.registerClickloading = false;
- if (res.code == 0) {
- uni.showToast({
- title: '娉ㄥ唽鎴愬姛,鍗冲皢杩斿洖鐧诲綍椤�',
- icon: 'none',
- duration: 1000
- });
- setTimeout(() => {
- uni.redirectTo({ url: '/pages/login/login' });
- }, 1000);
- } else {
- this.$u.toast(res.msg ? res.msg : '娣诲姞澶辫触');
- }
- })
- .catch(err => {
- console.log('閿欒', err);
- });
- })
- .catch(err => {
- console.log('err', err);
- this.$u.toast('璇疯鑼冭緭鍏ュ唴瀹�');
- });
- }
- } else {
- this.$u.toast('涓ゆ瀵嗙爜涓嶄竴鑷�');
- }
+ if(this.registerFormModel.carType==3&&!this.registerFormModel.tradeQualificationImg||this.registerFormModel.carType==4&&!this.registerFormModel.tradeQualificationImg){
+ uni.showToast({
+ title: '璇蜂笂浼犱粠涓氳祫鏍艰瘉锛�',
+ icon: 'error',
+ duration: 2000
+ });
+ }else{
+ this.$refs.regesterFormRef
+ .validate()
+ .then(res => {
+ this.registerClickloading = true;
+ this.registerFormModel.username = this.registerFormModel.phone;
+ this.registerFormModel.idCardImg = this.registerFormModel.cardImg1+","+this.registerFormModel.cardImg2;
+ if(this.registerFormModel.expirationTimeDriver){
+ this.registerFormModel.expirationTimeDriver=this.registerFormModel.expirationTimeDriver.slice(0,16)
+ }
+ if(this.registerFormModel.expirationTimeDriving){
+ this.registerFormModel.expirationTimeDriving=this.registerFormModel.expirationTimeDriving.slice(0,16)
+ }
+ if(this.registerFormModel.expirationTimeIdcard){
+ this.registerFormModel.expirationTimeIdcard=this.registerFormModel.expirationTimeIdcard.slice(0,16)
+ }
+ if(this.registerFormModel.expirationTimeTradequalification){
+ this.registerFormModel.expirationTimeTradequalification=this.registerFormModel.expirationTimeTradequalification.slice(0,16)
+ }
+ this.$reqPost('registerDriver', this.registerFormModel, 'json')
+ .then(res => {
+ this.registerClickloading = false;
+ if (res.code == 0) {
+ uni.showToast({
+ title: '娉ㄥ唽鎴愬姛,鍗冲皢杩斿洖鐧诲綍椤�',
+ icon: 'none',
+ duration: 1000
+ });
+ setTimeout(() => {
+ uni.redirectTo({ url: '/pages/login/login' });
+ }, 1000);
+ } else {
+ this.$u.toast(res.msg ? res.msg : '娣诲姞澶辫触');
+ }
+ })
+ .catch(err => {
+ console.log('閿欒', err);
+ });
+ })
+ .catch(err => {
+ console.log('err', err);
+ this.$u.toast('璇疯鑼冭緭鍏ュ唴瀹�');
+ });
+ }
},
// 鍗曢�夋浜嬩欢
groupChange(e) {},
@@ -776,4 +819,43 @@
}
}
}
-</style>
\ No newline at end of file
+ .intensity {
+ width: 100%;
+ margin-top: 10rpx;
+ .psdText {
+ font-size: 14px;
+ margin-right: 10px;
+ }
+
+ .line {
+ display: inline-block;
+ width: 70rpx;
+ height: 8rpx;
+ background: #d8d8d8;
+ border-radius: 6rpx;
+ margin-right: 16rpx;
+
+ &.low {
+ background: #f4664a;
+ }
+
+ &.middle {
+ background: #ffb700;
+ }
+
+ &.high {
+ background: #2cbb79;
+ }
+ }
+
+ .level {
+ margin: 0 32rpx 0 16rpx;
+ }
+
+ .warningtext {
+ color: #5a5a5a;
+ font-size: 24rpx;
+ margin-top: 10rpx;
+ }
+ }
+</style>
--
Gitblit v1.9.1