From b48a75b000ed7762fb5aa0018d091b243c780783 Mon Sep 17 00:00:00 2001
From: myTest383 <address>
Date: Thu, 17 Oct 2024 10:03:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=99=BB=E5=BD=95=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/login.vue | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index afce4c0..8519dbd 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -76,7 +76,7 @@
 
           <span style="width: 100%;margin-top: 15px;">密码</span>
 
-          <el-input class="input" style="flex: 1; margin-right: 10px;margin-top: 5px;" maxlength="6" placeholder="请输入密码"
+          <el-input class="input" style="flex: 1; margin-right: 10px;margin-top: 5px;" placeholder="8至16位大小写字母和数字的组合"
             v-model="registerInfo.password" show-password />
 
           <span style="width: 100%;margin-top: 15px;">验证码</span>
@@ -123,9 +123,9 @@
                 <img src="../../assets/images/company_icon.png" style="width: 25px; height: 25px;
                 margin-left: 10px;margin-right: 10px;" />
                 <span style="flex: 1;margin-right: 10px;">{{item.orgName}}</span>
-                <img v-show="item.type=='1'" src="../../assets/images/overdue.png" style=" height: 100%;" />
+                <img v-show="item.type=='3'" src="../../assets/images/overdue.png" style=" height: 100%;" />
                 <img v-show="item.type=='2'" src="../../assets/images/experience.png" style=" height: 100%;" />
-                <img v-show="item.type=='3'" src="../../assets/images/formal.png" style=" height: 100%;" />
+                <img v-show="item.type=='1'" src="../../assets/images/formal.png" style=" height: 100%;" />
 
               </div>
 
@@ -221,6 +221,7 @@
         registerInfo: {
           mobile: '',
           userSid: "",
+          password: "",
           sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa33', //  wms 资源sid
         },
         loginForm: {
@@ -454,6 +455,16 @@
       },
       registerStep1() {
 
+        var passwordreg = /^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9]).{8,16}$/
+
+        if (!passwordreg.test(this.registerInfo.password)) {
+          this.$message({
+            message: '密码格式错误，必须为8至16位大小写字母和数字的组合',
+            type: 'warning'
+          })
+          return
+        }
+
         if (!this.check) {
           this.$message({
             message: '请阅读并同意《宇信通服务协议》与《隐私协议》',
@@ -554,7 +565,8 @@
 
         var params = {
           userSid: this.registerInfo.userSid,
-          orgSid: item.orgSid
+          orgSid: item.orgSid,
+          sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa33', //  wms 资源sid
         }
 
         selOrganization(params).then((response) => {