Shannon_mu 3 rokov pred
rodič
commit
9736ac0885

+ 1 - 1
login/src/config/env.development.js

@@ -12,7 +12,7 @@ module.exports = {
   // baseApi: "http://10.0.0.62:8081", // 本地api请求地址
   // baseImgApi: "http://114.135.61.187:38082", // 图片api请求地址
 
-  baseUrl: "http://192.168.0.121:8082/login/login", // 项目地址
+  baseUrl: "http://192.168.0.121:8082/sc-login/", // 项目地址
   baseApi: "http://192.168.0.121:8082", // 本地api请求地址
   baseImgApi: "http://114.135.61.186:21020", // 图片api请求地址
 

+ 39 - 15
login/src/views/Login/index.vue

@@ -19,7 +19,8 @@
                                     type="text"
                                     placeholder="请输入账号"
                                     required="required"
-                                    v-model="accountNumberData.name"
+                                    v-model="accountNumberData.mobile"
+                                    maxlength="11"
                                     @focus="namefocus = true"
                                     @blur="onnamefocus"
                                     clearable
@@ -167,7 +168,7 @@ export default {
                 errMsg: ''
             },
             accountNumberData: {
-                name: 'admin',
+                mobile: '',
                 password: '',
                 smsCode: '2020', //手机校验码
                 time: 0,
@@ -345,27 +346,54 @@ export default {
         accountNumberSubmit() {
             let errorMsg = '';
             const params = { ...this.accountNumberData };
-            if (!params.name) {
-                errorMsg = '· 请输入账号';
-            }
-            if (!params.password) {
-                errorMsg = '· 请输入密码';
+            if (!codeRegExp.test(params.smsCode)) {
+                errorMsg = '· 您输入的手机验证码有误,请重新输入';
             }
             if (!params.smsCode) {
                 errorMsg = '· 请输入手机检验码';
             }
-            if (!codeRegExp.test(params.smsCode)) {
-                errorMsg = '· 您输入的手机验证码有误,请重新输入';
+
+            if (!params.password) {
+                errorMsg = '· 请输入密码';
+            }
+            if (!params.mobile) {
+                errorMsg = '· 请输入账号';
             }
             if (errorMsg) {
                 this.accountNumberData.errMsg = errorMsg;
                 return;
             }
             if (this.rememberName) {
-                localStorage.setItem('accountNumberName', params.name);
+                localStorage.setItem('accountNumberName', params.mobile);
             } else {
                 localStorage.removeItem('accountNumberName');
             }
+            this.$http.postForm('/user/mobileLogin', params).then(({ status, data, msg }) => {
+                if (status === 0 && data) {
+                    localStorage.setItem('SC_token', data.token.access_token);
+                    this.loginInfoArr = data.loginInfo;
+                    if (data.loginInfo.length > 1) {
+                        this.isSelectTenant = true;
+                    } else {
+                        console.log('this.loginInfoArr', this.loginInfoArr);
+                        this.$store.commit('setloginInfo', data.loginInfo[0]);
+                        this.jumpAnimate = true;
+                        window.sessionStorage.setItem('loginJson', JSON.stringify(this.loginInfoArr));
+                        window.sessionStorage.setItem('loginJsonActive', JSON.stringify(this.loginInfoArr[0]));
+                        setTimeout(() => {
+                            this.$router.push({
+                                path: '/nav'
+                            });
+                        }, 1500);
+                    }
+                } else {
+                    this.$message.error(msg);
+                    if (msg === '您输入的手机验证码已过期,请重新输入') {
+                        self.refreshCode();
+                        self.loginData.code = '';
+                    }
+                }
+            });
         },
         loginSubmit() {
             let errorMsg = '';
@@ -407,10 +435,6 @@ export default {
                         setTimeout(() => {
                             this.$router.push({
                                 path: '/nav'
-                                // query: {
-                                //     phone: this.loginInfoArr[0].phone,
-                                //     tenantId: this.loginInfoArr[0].tenantId
-                                // }
                             });
                         }, 1500);
                     }
@@ -439,7 +463,7 @@ export default {
         // sessionStorage.removeItem('tabs');
         sessionStorage.clear();
         const accountNumberName = localStorage.getItem('accountNumberName') || '';
-        this.accountNumberData.name = accountNumberName;
+        this.accountNumberData.mobile = accountNumberName;
         this.rememberName = !!accountNumberName;
     }
 };

+ 0 - 1
userCenter/src/views/system/tenants/popups/AddOrEdit.vue

@@ -285,7 +285,6 @@ export default {
             this.$refs.uploadtenantslogo.clearFiles();
         },
         uploadsuccess(response, file, fileList) {
-            debugger;
             if (0 === response.status) {
                 this.formData.logo = response.data;
             }