From 41d50b20c975faeaa9e5277bdcff13b5acecb575 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 13 十二月 2023 16:57:37 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop

---
 src/views/user/Login.vue |   36 +++++++++++++++++++++++++++++-------
 1 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index b2a732b..22d89e3 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -49,6 +49,10 @@
         </a-button>
       </a-form-item>
 
+      <a-form-model-item style="color: red">
+        瀵嗙骇锛氬唴閮�&nbsp;&nbsp;&nbsp;&nbsp;璀﹀憡锛氭湰绯荤粺绂佹瀛樺偍銆佸鐞嗐�佷紶杈撴秹瀵嗕俊鎭�
+      </a-form-model-item>
+
     </a-form-model>
 
     <!--<two-step-captcha v-if="requiredTwoStepCaptcha" :visible="stepCaptchaVisible" @success="stepCaptchaSuccess" @cancel="stepCaptchaCancel"></two-step-captcha>-->
@@ -57,6 +61,7 @@
       @success="loginSelectOk"
     ></login-select-tenant>
     <!--<third-login ref="thirdLogin"></third-login>-->
+    <user-password ref="userPassword"/>
   </div>
 </template>
 
@@ -73,9 +78,11 @@
 import LoginPhone from './LoginPhone'
 import store from '@/store'
 import { getAction } from '../../api/manage'
+import UserPassword from '../../components/tools/UserPassword'
 
 export default {
   components: {
+    UserPassword,
     LoginSelectTenant,
     TwoStepCaptcha,
     // ThirdLogin,
@@ -138,7 +145,10 @@
     },
     // 鐧诲綍鍚庡彴鎴愬姛
     requestSuccess(loginResult) {
-      this.$router.push({ path: "/isps/userAnnouncement" }).catch(() => {
+      // this.$router.push({ path: "/isps/userAnnouncement" }).catch(() => {
+      //   console.log('鐧诲綍璺宠浆棣栭〉鍑洪敊,杩欎釜閿欒浠庡摢閲屾潵鐨�')
+      // })
+      this.$router.push({ path: "/dashboard/analysis" }).catch(() => {
         console.log('鐧诲綍璺宠浆棣栭〉鍑洪敊,杩欎釜閿欒浠庡摢閲屾潵鐨�')
       })
       this.$notification.success({
@@ -162,13 +172,25 @@
       // this.$refs.loginSelect.show(loginResult)
     },
     //鐧诲綍鍚庡彴澶辫触
-    requestFailed(err) {
+    requestFailed(err,username) {
       let description = ((err.response || {}).data || {}).message || err.message || "璇锋眰鍑虹幇閿欒锛岃绋嶅悗鍐嶈瘯"
-      this.$notification['error']({
-        message: '鐧诲綍澶辫触',
-        description: description,
-        duration: 4,
-      });
+      if(err.code!==5001&&err.code!==5002){
+        this.$notification['error']({
+          message: '鐧诲綍澶辫触',
+          description: description,
+          duration: 4,
+        });
+      }else{
+        this.$notification['warning']({
+          message: '鎻愮ず',
+          description: description,
+          duration:1,
+          onClose:()=>{
+            console.log('err',err)
+            this.$refs.userPassword.show(username)
+          }
+        });
+      }
       //璐︽埛瀵嗙爜鐧诲綍閿欒鍚庢洿鏂伴獙璇佺爜
       // if (this.customActiveKey === 'tab1' && description.indexOf('瀵嗙爜閿欒') > 0) {
       //   this.$refs.alogin.handleChangeCheckCode()

--
Gitblit v1.9.3