登录修改

src/api/index.js

@@ -1,18 +1,17 @@
 import Setting from "@/setting";
 
 const host = Setting.apiBaseURL;
-const host1 = `http://192.168.31.137:9000/`
 const uploadURL = "http://39.108.250.202:9000/";
 
 export default {
-    logins: `${host1}users/users/user/login`,
+    logins: `users/users/user/login`,
-    verification: `${host1}users/users/user/captcha`,// 验证码图片
+    verification: `${host}users/users/user/captcha`,// 验证码图片
     logoDetail: `occupationlab/sys/logo/detail`, //查看系统设置信息
-    isClient: `${host1}users/users/user/isClient`,
+    isClient: `${host}users/users/user/isClient`,
-    sendPhoneVerificationCode: `${host1}users/users/user/sendPhoneVerificationCode`,
+    sendPhoneVerificationCode: `users/users/user/sendPhoneVerificationCode`,
-    getToken: `${host1}users/users/user/getToken`,
+    getToken: `users/users/user/getToken`,
-    getOtherAccountByPhone: `${host1}users/users/user/getOtherAccountByPhone`,
+    getOtherAccountByPhone: `users/users/user/getOtherAccountByPhone`,
-    unbindAccounts: `${host1}users/users/user/getOtherAccountunbindAccountsByPhone`,
+    unbindAccounts: `users/users/user/unbindAccounts`,
 
     platformLogList: `nakadai/log/platformLogList`,
     logNotification: `nakadai/log/logNotification`,
@@ -83,7 +82,7 @@ export default {
 
     queryProvince: `nakadai/nakadai/province/queryProvince`, //查询省份
     queryCity: `nakadai/nakadai/city/queryCity`, //查询城市
-    querySchool: `${host1}nakadai/nakadai/school/querySchool`, //根据学校名称查询学校信息
+    querySchool: `nakadai/nakadai/school/querySchool`, //根据学校名称查询学校信息
     queryCourseDiscipline: `nakadai/nakadai/subject/courseDiscipline`, //查询课程学科
     queryCourseProfessionalClass: `nakadai/nakadai/subject/courseProfessionalClass`, //查询专业类
     queryCourseProfessional: `nakadai/nakadai/subject/courseProfessional`, //查询专业

src/pages/account/login/index.vue

@@ -88,7 +88,7 @@
                 <el-form-item label="验证码">
                     <div style="display: flex;">
                         <el-input v-model="phoneCode" placeholder="请输入验证码" maxlength="6"></el-input>
-                        <el-button style="margin-left: 10px" type="text" @click="sendPhoneCode(1)" :disabled="phoneDisabled">{{ phoneBtnText }}
+                        <el-button style="margin-left: 10px" type="text" @click="sendPhoneCode(1)" :disabled="binding === '' || phoneDisabled">{{ phoneBtnText }}
                         </el-button>
                     </div>
                 </el-form-item>
@@ -113,8 +113,8 @@
         <el-dialog title="请选择您要登录的用户" :visible.sync="userVisible" :close-on-click-modal="false" custom-class="user-dia" width="500px">
             <p class="tips">该手机号已绑定以下用户信息</p>
             <ul class="users">
-              <li v-for="(user, i) in users" :key="i" @click="chooseUser(user)">
+              <li :class="{isEnable: !user.isEnable}" v-for="(user, i) in users" :key="i" @click="chooseUser(user)">
-                <span>{{ user.schoolName }}，{{ user.userName }}，{{ user.workNumber }}</span>
+                <span>{{ user.schoolName }}，{{ user.userName }}，{{ user.workNumber }}{{ user.isEnable ? '' : '（已禁用）'}}</span>
                 <i class="el-icon-right"></i>
               </li>
             </ul>
@@ -182,7 +182,7 @@ export default {
             userVisible: false,
             users: [],
             accountIds: [],
-            binding: true
+            binding: ''
         };
     },
     components: {
@@ -206,16 +206,27 @@ export default {
         ...mapActions("user", [
             "setInfo"
         ]),
+        // 赋值学校列表及id
+        setSchool(list) {
+          this.schoolList = list
+          // 取本地缓存里的学校id
+          const schoolId = util.local.get('schoolId')
+          if (schoolId) this.form.schoolId = schoolId
+        },
+        // 获取学校列表
         getSchool() {
-          this.$get(this.api.querySchool, {
+          const schoolList = util.local.get('schoolList')
-            provinceId: '',
+          if (schoolList && schoolList.length) {
-            cityId: ''
+            this.setSchool(schoolList)
-          }).then(res => {
+          } else {
-            this.schoolList = res.list
+            this.$get(this.api.querySchool, {
-            // 取本地缓存里的学校id
+              provinceId: '',
-            const schoolId = util.local.get('schoolId')
+              cityId: ''
-            if (schoolId) this.form.schoolId = schoolId
+            }).then(({ list }) => {
-          }).catch(res => {})
+              this.setSchool(list)
+              util.local.set('schoolList', list)
+            }).catch(res => {})
+          }
         },
         getVerImg() { // 获取验证码图片
           this.form.random = Math.floor(Math.random() * 999999999);
@@ -259,7 +270,7 @@ export default {
         },
         // 选择用户回调
         chooseUser(user) {
-          this.$post(`${this.api.getToken}?id=${user.id}`).then(({ data }) => {
+          user.isEnable && this.$post(`${this.api.getToken}?id=${user.id}`).then(({ data }) => {
             this.queryClient(data.token)
           }).catch(res => {})
         },
@@ -373,7 +384,7 @@ export default {
         sendPhoneCodeLogin() {
           const phone = this.form.account
           if (!this.verifyPhone(phone)) return false
-          this.$post(`${this.api.sendPhoneVerificationCode}?phoneOrEmail=${phone}&loginOrBind=0`).then(({ message }) => {
+          this.$post(`${this.api.sendPhoneVerificationCode}?phoneOrEmail=${phone}&loginOrBind=0&platform=${Setting.platformId}`).then(({ message }) => {
             util.successMsg(message)
             this.phoneCountdownLogin()
           }).catch(res => {})
@@ -393,14 +404,14 @@ export default {
                 confirmButtonText: '是',
                 cancelButtonText: '否'
               }).then(() => {
-                debugger
                 this.binding = true
                 this.sendPhoneCode(1)
               }).catch(() => {
-                debugger
                 this.binding = false
                 this.sendPhoneCode(0)
               })
+            } else {
+              this.binding = true
             }
           }).catch(res => {})
         },
@@ -441,7 +452,8 @@ export default {
               }
             }).catch(res => {})
           } else {
-            this.$post(`${this.api.sendPhoneVerificationCode}?phoneOrEmail=${phone}&loginOrBind=1`).then(({ message }) => {
+            this.$post(`${this.api.sendPhoneVerificationCode}?phoneOrEmail=${phone}&loginOrBind=1&platform=${Setting.platformId}`).then(({ message }) => {
+              util.successMsg(message)
               this.phoneCountdown()
             }).catch(res => {})
           }
@@ -458,8 +470,8 @@ export default {
             schoolId,
             type,
             workNumber,
-          }).then(({ token }) => {
+          }).then(({ data }) => {
-            this.token = token
+            this.token = data.token
             this.setLogin()
           }).catch(res => {})
         },
@@ -669,6 +681,11 @@ export default {
       font-size: 14px;
       background-color: #ebeef5;
       cursor: pointer;
+      &.isEnable {
+        color: #c0c4cc;
+        background-color: #f5f7fa;
+        cursor: not-allowed;
+      }
       &:last-child {
         margin-bottom: 0;
       }

src/setting.js

@@ -30,9 +30,9 @@ if (isHh) {
 } else if (isDev) {
     // 本地
     systemPath = `http://192.168.31.125:8093`
-    // host = "http://39.108.250.202:9000/"; // 中台测试服
+    host = "http://39.108.250.202:9000/"; // 中台测试服
     // host = "http://192.168.31.151:9000/"; // 榕
-    host = "http://192.168.31.137:9000"; // 赓
+    // host = "http://192.168.31.137:9000/"; // 赓
 }
 
 const Setting = {