Merge remote-tracking branch 'origin/master'

src/store/modules/user.js

@@ -1,5 +1,5 @@
 import { login, logout, getInfo, socialLogin, smsLogin,smsRegister,smsResetPassword } from '@/api/login'
-import { setToken, removeToken } from '@/utils/auth'
+import { setToken, removeToken,removeTenantId } from '@/utils/auth'
 import { changeTenant } from '@/api/system/tenant'
 
 const user = {
@@ -201,6 +201,7 @@ const user = {
           commit('SET_ROLES', [])
           commit('SET_PERMISSIONS', [])
           removeToken()
+          removeTenantId()
           resolve()
         }).catch(error => {
           reject(error)

src/views/login.vue

@@ -165,7 +165,16 @@ export default {
               if (/^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/.test(value) === false) {
                 callback(new Error("手机号格式错误"));
               } else {
-                callback();
+                removeTenantId()
+                getTenantIdByName(value).then(res => {
+                  const tenantId = res.data;
+                  if (tenantId && tenantId >= 0) {
+                    setTenantId(tenantId)
+                    callback();
+                  } else {
+                    callback('该手机号未创建账号,请重新输入');
+                  }
+                });
               }
             }, trigger: "blur"
           }

src/views/password/forget.vue

@@ -43,6 +43,8 @@
 
 <script>
 import { sendSmsCode } from "@/api/login";
+import {setTenantId, removeTenantId} from "@/utils/auth";
+import {getTenantIdByName} from "@/api/system/tenant";
 export default {
   data() {
     return {
@@ -59,7 +61,16 @@ export default {
               if (/^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/.test(value) === false) {
                 callback(new Error("手机号格式错误"));
               } else {
-                callback();
+                removeTenantId()
+                getTenantIdByName(value).then(res => {
+                  const tenantId = res.data;
+                  if (tenantId && tenantId >= 0) {
+                    setTenantId(tenantId)
+                    callback();
+                  } else {
+                    callback('该手机号未创建账号,请重新输入');
+                  }
+                });
               }
             }, trigger: "blur"
           }

src/views/password/reset.vue

@@ -13,7 +13,7 @@
                  <el-input type="password" show-password v-model="ruleForm.pass" placeholder="密码">
                  </el-input>
                </el-form-item>
-               <el-form-item prop="checkPass">
+               <el-form-item prop="checkPass" style="margin-top: 35px;">
                 <el-input type="password" show-password v-model="ruleForm.checkPass" placeholder="确认密码">
                 </el-input>
                </el-form-item>
@@ -22,7 +22,7 @@
                  @click="submitForm('ruleForm')">
                   确定
                  </el-button>
-                 <el-button style="margin-left: 0;margin-top: 10px;width: 100%;" type="text" @click="backLogin()">返回登录</el-button>
+                 <!-- <el-button style="margin-left: 0;margin-top: 10px;width: 100%;" type="text" @click="backLogin()">返回登录</el-button> -->
                </el-form-item>
             </el-form>
             <div class="success-box" v-else>