登录调整

src/api/index.js

@@ -3,12 +3,13 @@ const host = Setting.apiBaseURL
 
 export default {
   // 登录注册 
-  logins: `users/users/user/login`,
+  logins: `users/users/user/login`,
   verification: `${host}users/users/user/captcha`,
   sendPhoneVerificationCode: `users/users/user/sendPhoneVerificationCode`,
   getToken: `users/users/user/getToken`,
   getOtherAccountByPhone: `users/users/user/getOtherAccountByPhone`,
   unbindAccounts: `users/users/user/unbindAccounts`,
+  logout: `users/users/user/logout`,
 
   // 加密货币
   market: `/topic/market`,
@@ -50,7 +51,6 @@ export default {
   unbindMobilePhone: `users/users/userAccount/unbindMobilePhone`,
   bindPhoneOrEmail: `users/users/userAccount/bindPhoneOrEmail`,
   examinePassword: `users/users/userAccount/examinePassword`,
-  isClient: `${host}users/users/user/isClient`,
   deleteProfile: `users/users/userInfo/deleteProfile`,
   checkEmailOrPhone: `occupationlab/occupationlab/architecture/checkEmailOrPhone`,
   accountIsDisabled: `users/users/user/accountIsDisabled`,

src/layouts/header/index.vue

@@ -29,16 +29,19 @@
       </div>
     </div>
 
-        <el-dialog title="修改密码" :visible.sync="passwordVisible" :close-on-click-modal="false" :append-to-body="true" @close="closePassword" width="30%">
+    <el-dialog title="修改密码" :visible.sync="passwordVisible" :close-on-click-modal="false" :append-to-body="true"
+      @close="closePassword" width="30%">
       <el-form ref="passwordForm" label-width="82px">
         <el-form-item label="原密码">
           <el-input type="password" v-model="passwordForm.password" placeholder="请输入原密码"></el-input>
         </el-form-item>
         <el-form-item label="新密码">
-                    <el-input type="password" v-model="passwordForm.newPassword" placeholder="请输入新密码" @keyup.enter.native="editPassword"></el-input>
+          <el-input type="password" v-model="passwordForm.newPassword" placeholder="请输入新密码"
+            @keyup.enter.native="editPassword"></el-input>
         </el-form-item>
         <el-form-item label="确认新密码">
-                    <el-input type="password" v-model="passwordForm.reNewPassword" placeholder="请确认新密码" @keyup.enter.native="editPassword"></el-input>
+          <el-input type="password" v-model="passwordForm.reNewPassword" placeholder="请确认新密码"
+            @keyup.enter.native="editPassword"></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -114,10 +117,6 @@ export default {
           avatar: userInfo.userAvatars,
           userName: userInfo.userName
         })
-        // 如果没有用户名，说明是客户，那就从客户接口里去取
-        userInfo.userName || this.$get(this.api.isClient).then(res => {
-          res.customerName && this.setInfo({userName: res.customerName})
-        }).catch(res => {})
       }).catch(err => { })
     },
     hideSetting () {
@@ -195,6 +194,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 $height: 64px;
+
 .header {
   z-index: 10;
   position: fixed;
@@ -204,6 +204,7 @@ $height: 64px;
   height: $height;
   background-color: #fff;
   box-shadow: 0px 0px 6px 0px rgba(178, 178, 178, 0.32);
+
   .inner {
     display: flex;
     justify-content: space-between;
@@ -212,6 +213,7 @@ $height: 64px;
     padding: 0 80px 0 10px;
     margin: 0 auto;
   }
+
   .logo {
     position: absolute;
     top: 0;
@@ -236,6 +238,7 @@ $height: 64px;
     padding: 7px 20px;
     margin: 0 auto;
     background-color: #fff;
+
     input {
       width: 195px;
       margin-left: 10px;
@@ -243,26 +246,41 @@ $height: 64px;
       color: #333;
       background-color: transparent;
       border: 0;
-            &::-webkit-input-placeholder{color: #999}
+
-            &::-moz-placeholder{color: #999}
+      &::-webkit-input-placeholder {
-            &:-moz-placeholder{color: #999}
+        color: #999
+      }
+
+      &::-moz-placeholder {
+        color: #999
+      }
+
+      &:-moz-placeholder {
+        color: #999
+      }
+
       &:focus {
         outline: none;
       }
     }
+
     .remove {
       cursor: pointer;
     }
+
     .search-icon {
       width: 18px;
     }
   }
+
   .action {
     display: inline-flex;
     align-items: center;
+
     .icon {
       cursor: pointer;
     }
+
     .user-wrap {
       display: inline-flex;
       align-items: center;
@@ -271,6 +289,7 @@ $height: 64px;
         display: inline-flex;
         align-items: center;
         cursor: pointer;
+
         .username {
           margin-left: 10px;
           color: #000;
@@ -279,13 +298,16 @@ $height: 64px;
       }
     }
   }
+
   .login {
     display: inline-flex;
     align-items: center;
     cursor: pointer;
+
     &:hover {
       opacity: .9;
     }
+
     span {
       margin-left: 5px;
       color: #666;

src/pages/account/login/index.vue

@@ -9,17 +9,10 @@
         </ul>
         <el-form :model="form" :rules="rules" ref="form" style="margin-top: 20px">
           <!-- 学号工号 -->
-          <div v-show="!form.distinguish">
+          <div v-show="!form.distinguish && !verCodeLogin" class="items">
-            <el-form-item class="school-select" prop="schoolId">
-              <label class="label school"></label>
-              <el-select v-model="form.schoolId" clearable filterable placeholder="请选择学校">
-                <el-option v-for="(item, i) in schoolList" :key="i" :label="item.schoolName"
-                  :value="item.schoolId"></el-option>
-              </el-select>
-            </el-form-item>
             <el-form-item class="flex-1" prop="workNumber">
               <label class="label account"></label>
-              <el-input v-model.trim="form.workNumber" :placeholder="'请输入学号/工号'"
+              <el-input v-model.trim="form.workNumber" placeholder="请输入学号/工号/手机号/邮箱"
                 @keyup.enter.native="submit"></el-input>
             </el-form-item>
           </div>
@@ -28,7 +21,7 @@
             <label class="label account"></label>
             <el-input v-model.trim="form.account" placeholder="请输入账号" @keyup.enter.native="submit"></el-input>
           </el-form-item>
-          <template v-if="form.distinguish === 2">
+          <template v-if="verCodeLogin">
             <el-form-item prop="account">
               <label class="label account"></label>
               <el-input v-model.trim="form.account" placeholder="请输入手机号/邮箱" @keyup.enter.native="submit"></el-input>
@@ -44,7 +37,7 @@
               </div>
             </el-form-item>
           </template>
-          <template v-if="form.distinguish !== 2">
+          <template v-else>
             <el-form-item prop="password">
               <label class="password label"></label>
               <el-input type="password" placeholder="请输入密码" v-model.trim="form.password" @keyup.enter.native="submit">
@@ -57,8 +50,9 @@
               <img @click="getVerImg" :src="verificationIMG" class="ver-img" alt="">
             </el-form-item>
           </template>
-          <div v-show="!form.distinguish" class="default-check">
+          <div class="bottom">
-            <el-checkbox v-model="setDefault">设置为默认学校</el-checkbox>
+            <el-link :underline="false" type="primary" @click="switchType">{{ verCodeLogin ? '密码' : '验证码' }}登录</el-link>
+            <el-link :underline="false" type="primary" @click="toAccount">没有账号，点击申请</el-link>
           </div>
           <el-button class="submit" type="primary" @click="submit">登录</el-button>
         </el-form>
@@ -75,7 +69,8 @@
           <div class="ver-code">
             <el-input v-model="phoneCode" placeholder="请输入验证码" maxlength="6"></el-input>
             <el-button style="top: 1px" type="text" @click="sendPhoneCode(1)"
-              :disabled="binding === '' || phoneDisabled">{{ phoneBtnText }}</el-button>
+              :disabled="binding === '' || phoneDisabled">{{
+                phoneBtnText }}</el-button>
           </div>
         </el-form-item>
       </el-form>
@@ -135,36 +130,30 @@ export default {
       tabList: [
         {
           id: 0,
-          label: '学号/工号登录'
+          label: '学生/老师登录'
         }, {
           id: 1,
           label: '学校管理员登录'
-        }, {
-          id: 2,
-          label: '手机号/邮箱'
         }
       ],
-      setDefault: !!util.local.get(schoolIdKey), // 本地缓存里有学校id，则默认勾选
       verificationIMG: '',
       schoolList: [],
       form: {
-        schoolId: '',
         workNumber: '',
-        account: '',
+        account: '', // 手机号验证码模式用这个字段
         password: '',
         code: '', // 验证码
         random: '', // 随机数
-        distinguish: 0, // 区分手机号账号登录,1为账号登录,2为手机号或邮箱登录
+        platform: Setting.platformId,
-        type: 2, // 平台端区分：0->教师端 1->学生端 2->无端
+        distinguish: 0,
-        platform: Setting.platformId
       },
       rules: {
-        schoolId: [{ required: true, message: "请选择学校", trigger: "change" }],
+        workNumber: [{ required: true, message: "请输入学号/工号/手机号/邮箱", trigger: "blur" }],
-        workNumber: [{ required: true, message: "请输入学生学号", trigger: "blur" }],
         account: [{ required: false, message: "请输入账号", trigger: "blur" }],
         password: [{ required: true, message: "请输入密码", trigger: "blur" }],
         code: [{ required: true, message: "请输入验证码", trigger: "blur" }]
       },
+      verCodeLogin: false,
       phoneDisabledLogin: false,
       phoneTimerLogin: null,
       phoneBtnTextLogin: '发送验证码',
@@ -187,7 +176,6 @@ export default {
   },
   components: { vHead, vFooter },
   mounted () {
-    this.getSchool()
     this.getVerImg()
   },
   methods: {
@@ -197,21 +185,17 @@ export default {
     ...mapActions('user', [
       'login', 'setCustomer'
     ]),
-    // 赋值学校列表及id
+    // 重置验证规则
-    setSchool (list) {
+    handleRule () {
-      this.schoolList = list
+      const type = this.form.distinguish
-      // 取本地缓存里的学校id
+      const rules = this.rules
-      const schoolId = util.local.get(schoolIdKey)
+      rules.workNumber[0].required = !type && !this.verCodeLogin
-      if (schoolId) this.form.schoolId = schoolId
+      rules.account[0].required = (!type && this.verCodeLogin) || type
-    },
+      this.rules.account[0].message = type ?
-    // 获取学校列表
+        '请输入账号' :
-    getSchool () {
+        this.verCodeLogin ?
-      this.$get(this.api.querySchool, {
+          '请输入手机号/邮箱' :
-        provinceId: '',
+          '请输入学号/工号/手机号/邮箱'
-        cityId: ''
-      }).then(({ list }) => {
-        this.setSchool(list)
-      }).catch(res => { })
     },
     // 切换标签
     typeClick (tab) {
@@ -230,14 +214,7 @@ export default {
         platform: form.platform
       }
       this.$refs.form.clearValidate()
-      // 切换了登录方式后，校验规则要变化
+      this.handleRule()
-      const rules = this.rules
-      rules.schoolId[0].required = id === 0
-      rules.workNumber[0].required = id === 0
-      rules.account[0].required = !!id
-      this.rules.account[0].message = id === 1 ?
-        '请输入账号' :
-        '请输入手机号/邮箱'
     },
     // 选择用户回调
     chooseUser (user) {
@@ -275,11 +252,7 @@ export default {
       this.$refs.form.validate(valid => {
         if (valid) {
           const form = JSON.parse(JSON.stringify(this.form))
-          const { distinguish } = form
+          if (this.verCodeLogin) form.distinguish = 2
-          if (!form.distinguish && this.setDefault) util.local.set(schoolIdKey, form.schoolId) // 选的是学号工号登录，并且勾选了默认，则存入缓存
-          if (util.local.get(schoolIdKey) && !this.setDefault) util.local.remove(schoolIdKey) // 本地缓存了学校id，并且没有勾选默认，则删除缓存
-          if (distinguish) form.schoolId = ''
-          if (!distinguish) form.distinguish = 1
           this.$post(this.api.logins, form).then(({ status, data, message }) => {
             // 未绑定手机号，则弹框去绑定
             if (status == 30001) {
@@ -287,15 +260,11 @@ export default {
               this.getVerImg()
               form.code = ''
             } else if (status == 200) {
+              const accounts = data.userAccounts
               // 如果返回的是数组，则弹框给用户选择登录哪个用户，否则，直接登录
-              if (data instanceof Array) {
+              if (accounts instanceof Array) {
-                // 如果只查询到一个用户，则直接登录，否则，弹框让用户选择
+                this.users = accounts
-                if (data.length === 1) {
-                  this.chooseUser(data[0])
-                } else {
-                  this.users = data
                 this.userVisible = true
-                }
               } else {
                 this.token = data.token
                 this.setLogin()
@@ -329,6 +298,17 @@ export default {
       return true
     },
 
+    // 账号申请
+    switchType () {
+      this.verCodeLogin = !this.verCodeLogin
+      this.$refs.form.clearValidate()
+      this.handleRule()
+    },
+    // 账号申请
+    toAccount () {
+      this.accountVisible = true
+    },
+
     // 验证码倒计时
     phoneCountdownLogin () {
       let count = 60
@@ -502,7 +482,7 @@ export default {
 
   .tab {
     display: flex;
-    justify-content: space-between;
+    justify-content: space-around;
     align-items: center;
     margin-bottom: 24px;
     border-bottom: 2px solid #e1e6f2;
@@ -560,10 +540,12 @@ export default {
     border-radius: 4px !important;
   }
 
-  .default-check {
+  .bottom {
-    text-align: right;
+    display: flex;
+    justify-content: space-between;
   }
 
+
   .el-select {
     width: 100%;
   }

src/setting.js

@@ -11,8 +11,8 @@ const url = location.host
 const dev = process.env.NODE_ENV === 'development' // 本地
 let host = `${location.origin}/`
 if (dev) {
-  host = 'https://www.dataforward.cn/'
+  // host = 'https://www.dataforward.cn/'
-  // host = 'http://192.168.31.217:9000/'
+  host = 'http://192.168.31.51:9000/'
 }
 
 const Setting = {

src/store/modules/user.js

@@ -9,7 +9,7 @@
 
 import Setting from '@/setting'
 import util from '@/libs/util'
-import {post,get,del,put} from '@/plugins/requests/index.js'
+import { post, get } from '@/plugins/requests/index.js'
 import api from '@/api'
 
 /**
@@ -60,13 +60,6 @@ export default {
           if (res.status == 200) {
             util.local.set(Setting.tokenKey, res.data.token, 43200000)
             util.successMsg('登录成功')
-                        get(api.isClient).then(res => {
-                            commit('SET_CUSTOMER',res.customer)
-                            const userName = res.customerName
-                            userName && commit('SET_INFO', {
-                                userName
-                            })
-                        }).catch(res => {})
             post(api.getSchoolIdByToken).then(res => {
               commit('SET_INFO', res)
             }).catch(res => { })
@@ -88,10 +81,14 @@ export default {
     },
     logout ({ commit, state, dispatch }) {
       return new Promise((resolve, reject) => {
+        post(api.logout).then(() => {
           util.local.remove(Setting.storeKey)
           util.local.remove(Setting.tokenKey)
           location.reload()
           resolve()
+        }).catch(error => {
+          reject(error)
+        })
       })
     },
     setAvatar ({ state, commit }, avatar) {