登录调整

src/api/index.js

@@ -3,12 +3,13 @@ const host = Setting.apiBaseURL
 
 export default {
   // 登录注册 
-  logins: `users/users/user/login`,
-  verification:`${host}users/users/user/captcha`,
+  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`,
@@ -29,70 +30,69 @@ export default {
 
   // 个人中心
   uploadUserAvatars: `${host}users/users/userAccount/updateUserAvatars`,
-  userInfo:`users/users/userInfo/getUserInfo`,
-  updateUser:`users/users/userInfo/updateUser`,
-  findPasswordByEmail:`users/users/userAccount/findPasswordByEmail`,
-  findPasswordByPhone:`users/users/userAccount/findPasswordByPhone`,
+  userInfo: `users/users/userInfo/getUserInfo`,
+  updateUser: `users/users/userInfo/updateUser`,
+  findPasswordByEmail: `users/users/userAccount/findPasswordByEmail`,
+  findPasswordByPhone: `users/users/userAccount/findPasswordByPhone`,
 
   // 用户管理
   saveUser: `users/users/data/user/save`,
   getDetailByAccount: `occupationlab/occupationlab/architecture/getDetailByAccount`,
   getUserList: `users/users/data/user/getUserList`,
   getUserTotalBySchoolId: `users/users/data/user/getUserTotalBySchoolId`,
-  checkAccount:`occupationlab/occupationlab/architecture/checkWorkNumOrAccount`,
-  getDetail:`users/users/data/user/getDetail`,
-  modifyUser:`users/users/data/user/modify`,
-  export_failure:`${host}users/users/data/user/export_failure`,
-  uploadFile:`${host}users/users/data/user/uploadFile`,
-  deleteUser:`users/users/data/user/delete`,
+  checkAccount: `occupationlab/occupationlab/architecture/checkWorkNumOrAccount`,
+  getDetail: `users/users/data/user/getDetail`,
+  modifyUser: `users/users/data/user/modify`,
+  export_failure: `${host}users/users/data/user/export_failure`,
+  uploadFile: `${host}users/users/data/user/uploadFile`,
+  deleteUser: `users/users/data/user/delete`,
   resetPwd: `users/users/userAccount/resetPwd`,
   sendPhoneOrEmailCode: `users/users/userAccount/sendPhoneOrEmailCode`,
   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`,
   userTemplate: `http://121.37.12.51/template/%E6%95%B0%E6%8D%AE%E5%B9%B3%E5%8F%B0%E7%94%A8%E6%88%B7%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx`,
 
   // 角色管理
-  batchRemove:`users/users/role/batchRemove`,
-  getRole:`users/users/role/obtainDetails`,
-  getName:`data/data/role/getName`,
-  listRole:`users/users/role/list`,
-  removeRole:`data/data/role/remove`,
-  saveOrUpdate:`users/users/role/saveOrUpdate`,
-  getPermissions:`users/users/user-role/getUserRolesPermissionMenu`,
+  batchRemove: `users/users/role/batchRemove`,
+  getRole: `users/users/role/obtainDetails`,
+  getName: `data/data/role/getName`,
+  listRole: `users/users/role/list`,
+  removeRole: `data/data/role/remove`,
+  saveOrUpdate: `users/users/role/saveOrUpdate`,
+  getPermissions: `users/users/user-role/getUserRolesPermissionMenu`,
 
   // 权限菜单管理
-  doAssign:`data/data/permission/doAssign`,
-  queryAllMenus:`users/users/permission/queryAllMenus`,
-  savePer:`users/users/user-role/rolePermissionService`,
-  toAssign:`data/data/permission/toAssign`,
+  doAssign: `data/data/permission/doAssign`,
+  queryAllMenus: `users/users/permission/queryAllMenus`,
+  savePer: `users/users/user-role/rolePermissionService`,
+  toAssign: `data/data/permission/toAssign`,
 
   // 表展示
-  getIdQueryTable:`data/data/table/getIdQueryTable`,
-  getTableByClassification:`data/data/table/getTableByClassification`,
-  getTableByCondition:`data/data/table/getTableByCondition`,
-  downloadData:`${host}data/data/download`,
-  previewData:`data/data/preview`,
-  visualPreview:`data/data/visualPreview`,
-  downloadRecord:`data/data/myDownload/downloadRecord`,
-  getDownloadRecord:`data/data/myDownload/getDownloadRecord`,
-  downloadAgain:`data/data/downloadAgain`,
-  isDownload:`data/data/product/isDownload`,
-  getTableTime:`data/data/tableTime/getTableTime`,
+  getIdQueryTable: `data/data/table/getIdQueryTable`,
+  getTableByClassification: `data/data/table/getTableByClassification`,
+  getTableByCondition: `data/data/table/getTableByCondition`,
+  downloadData: `${host}data/data/download`,
+  previewData: `data/data/preview`,
+  visualPreview: `data/data/visualPreview`,
+  downloadRecord: `data/data/myDownload/downloadRecord`,
+  getDownloadRecord: `data/data/myDownload/getDownloadRecord`,
+  downloadAgain: `data/data/downloadAgain`,
+  isDownload: `data/data/product/isDownload`,
+  getTableTime: `data/data/tableTime/getTableTime`,
   getLevel: `data/data/category/getLevel`,
   multipleTablePreview: `data/data/multipleTablePreview`,
 
   // 数据操作记录
-  queryAccumulate:`data/data/dataRecord/queryAccumulate`,
-  queryDatabaseInfo:`data/data/dataRecord/queryDatabaseInfo`,
-  queryDatabaseInfoByMonth:`data/data/dataRecord/queryDatabaseInfoByMonth`,
-  saveRecord:`data/data/dataRecord/saveRecord`,
-  databaseInfoExport:`${host}data/data/dataRecord/databaseInfoExport`,
-  databaseInfoByMonthExport:`${host}data/data/dataRecord/databaseInfoByMonthExport`,
-  onlineNumber:`data/data/dataRecord/onlineNumber`,
-  getProductInfoBySchoolId:`data/data/product/getProductInfoBySchoolId`,
+  queryAccumulate: `data/data/dataRecord/queryAccumulate`,
+  queryDatabaseInfo: `data/data/dataRecord/queryDatabaseInfo`,
+  queryDatabaseInfoByMonth: `data/data/dataRecord/queryDatabaseInfoByMonth`,
+  saveRecord: `data/data/dataRecord/saveRecord`,
+  databaseInfoExport: `${host}data/data/dataRecord/databaseInfoExport`,
+  databaseInfoByMonthExport: `${host}data/data/dataRecord/databaseInfoByMonthExport`,
+  onlineNumber: `data/data/dataRecord/onlineNumber`,
+  getProductInfoBySchoolId: `data/data/product/getProductInfoBySchoolId`,
 }

src/layouts/header/index.vue

@@ -11,7 +11,7 @@
         <el-dropdown class="user-wrap" @command="userCommand">
           <div class="user">
             <el-avatar :size="40" :src="avatar"></el-avatar>
-                        <span class="username">{{userName}}</span>
+            <span class="username">{{ userName }}</span>
           </div>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="person" v-if="!isCustomer">个人资料</el-dropdown-item>
@@ -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">
@@ -54,7 +57,7 @@ import { mapState, mapMutations, mapActions } from 'vuex'
 import Setting from '@/setting'
 import util from '@/libs/util'
 export default {
-  data() {
+  data () {
     return {
       token: util.local.get(Setting.tokenKey),
       isLogin: this.$route.path == '/login',
@@ -79,7 +82,7 @@ export default {
       'routes'
     ])
   },
-  mounted() {
+  mounted () {
     // 如果是客户,则存到store里去,因为客户是没有用户信息的,上面要根据这个值来判断显示与否
     if (this.customer) {
       let customer = atob(decodeURI(this.customer)) == 'false' ? false : true
@@ -104,7 +107,7 @@ export default {
       'setInfo', 'logout', 'setManager', 'setCustomer'
     ]),
     // 获取个人信息
-    getUserInfo() {
+    getUserInfo () {
       this.$get(this.api.userInfo).then(res => {
         let userInfo = res.userInfo ? res.userInfo : {}
         let userAccount = res.userAccount
@@ -114,16 +117,12 @@ 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() {
+    hideSetting () {
       this.showSetting = false
     },
-    toIndex() {
+    toIndex () {
       // 如果是在首页，直接刷新页面，否则，跳转到首页，并且重置进入后台的图标
       if (this.$route.path === '/index/list') {
         location.reload()
@@ -132,11 +131,11 @@ export default {
         this.showSetting = true
       }
     },
-    toLogin() {
+    toLogin () {
       window.open(this.$router.resolve('/login').href)
     },
     // 跳转到管理员后台
-    toManager() {
+    toManager () {
       let routes = this.routes
       if (routes.length) {
         let route = this.$router.resolve({
@@ -154,7 +153,7 @@ export default {
         util.warningMsg('该角色未开放模块，请联系管理员')
       }
     },
-    userCommand(command) {
+    userCommand (command) {
       if (command == 'person') {
         this.$router.push('/setting/person').catch(err => { })
       } else if (command == 'resetPw') {
@@ -165,10 +164,10 @@ export default {
         this.logout()
       }
     },
-    showPassword() {
+    showPassword () {
       this.passwordVisible = true
     },
-    editPassword() {
+    editPassword () {
       if (!this.passwordForm.password) return util.warningMsg('请输入原密码')
       if (!this.passwordForm.newPassword) return util.warningMsg('请输入新密码')
       if (!this.passwordForm.reNewPassword) return util.warningMsg('请确认新密码')
@@ -183,7 +182,7 @@ export default {
         this.passwordVisible = false
       }).catch(err => { })
     },
-    closePassword() {
+    closePassword () {
       this.passwordForm = {
         password: '',
         newPassword: '',
@@ -195,7 +194,8 @@ export default {
 </script>
 <style lang="scss" scoped>
 $height: 64px;
-.header{
+
+.header {
   z-index: 10;
   position: fixed;
   top: 0;
@@ -204,7 +204,8 @@ $height: 64px;
   height: $height;
   background-color: #fff;
   box-shadow: 0px 0px 6px 0px rgba(178, 178, 178, 0.32);
-    .inner{
+
+  .inner {
     display: flex;
     justify-content: space-between;
     align-items: center;
@@ -212,7 +213,8 @@ $height: 64px;
     padding: 0 80px 0 10px;
     margin: 0 auto;
   }
-    .logo{
+
+  .logo {
     position: absolute;
     top: 0;
     left: 80px;
@@ -222,7 +224,7 @@ $height: 64px;
     cursor: pointer;
   }
 
-    .search{
+  .search {
     z-index: 2;
     position: absolute;
     top: 0;
@@ -236,42 +238,59 @@ $height: 64px;
     padding: 7px 20px;
     margin: 0 auto;
     background-color: #fff;
-        input{
+
+    input {
       width: 195px;
       margin-left: 10px;
       font-size: 14px;
       color: #333;
       background-color: transparent;
       border: 0;
-            &::-webkit-input-placeholder{color: #999}
-            &::-moz-placeholder{color: #999}
-            &:-moz-placeholder{color: #999}
-            &:focus{
+
+      &::-webkit-input-placeholder {
+        color: #999
+      }
+
+      &::-moz-placeholder {
+        color: #999
+      }
+
+      &:-moz-placeholder {
+        color: #999
+      }
+
+      &:focus {
         outline: none;
       }
     }
-        .remove{
+
+    .remove {
       cursor: pointer;
     }
-        .search-icon{
+
+    .search-icon {
       width: 18px;
     }
   }
-    .action{
+
+  .action {
     display: inline-flex;
     align-items: center;
-        .icon{
+
+    .icon {
       cursor: pointer;
     }
+
     .user-wrap {
       display: inline-flex;
       align-items: center;
 
-            .user{
+      .user {
         display: inline-flex;
         align-items: center;
         cursor: pointer;
-                .username{
+
+        .username {
           margin-left: 10px;
           color: #000;
           font-size: 16px;
@@ -279,14 +298,17 @@ $height: 64px;
       }
     }
   }
-    .login{
+
+  .login {
     display: inline-flex;
     align-items: center;
     cursor: pointer;
-        &:hover{
+
+    &:hover {
       opacity: .9;
     }
-        span{
+
+    span {
       margin-left: 5px;
       color: #666;
       font-size: 14px;

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">
-            <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>
+          <div v-show="!form.distinguish && !verCodeLogin" class="items">
             <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">
-            <el-checkbox v-model="setDefault">设置为默认学校</el-checkbox>
+          <div class="bottom">
+            <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为手机号或邮箱登录
-        type: 2, // 平台端区分：0->教师端 1->学生端 2->无端
-        platform: Setting.platformId
+        platform: Setting.platformId,
+        distinguish: 0,
       },
       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) {
-      this.schoolList = list
-      // 取本地缓存里的学校id
-      const schoolId = util.local.get(schoolIdKey)
-      if (schoolId) this.form.schoolId = schoolId
-    },
-    // 获取学校列表
-    getSchool () {
-      this.$get(this.api.querySchool, {
-        provinceId: '',
-        cityId: ''
-      }).then(({ list }) => {
-        this.setSchool(list)
-      }).catch(res => { })
+    // 重置验证规则
+    handleRule () {
+      const type = this.form.distinguish
+      const rules = this.rules
+      rules.workNumber[0].required = !type && !this.verCodeLogin
+      rules.account[0].required = (!type && this.verCodeLogin) || type
+      this.rules.account[0].message = type ?
+        '请输入账号' :
+        this.verCodeLogin ?
+          '请输入手机号/邮箱' :
+          '请输入学号/工号/手机号/邮箱'
     },
     // 切换标签
     typeClick (tab) {
@@ -230,14 +214,7 @@ export default {
         platform: form.platform
       }
       this.$refs.form.clearValidate()
-      // 切换了登录方式后，校验规则要变化
-      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 ?
-        '请输入账号' :
-        '请输入手机号/邮箱'
+      this.handleRule()
     },
     // 选择用户回调
     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 (!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
+          if (this.verCodeLogin) form.distinguish = 2
           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 (data.length === 1) {
-                  this.chooseUser(data[0])
-                } else {
-                  this.users = data
+              if (accounts instanceof Array) {
+                this.users = accounts
                 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 {
-    text-align: right;
+  .bottom {
+    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 = 'http://192.168.31.217:9000/'
+  // host = 'https://www.dataforward.cn/'
+  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'
 
 /**
@@ -27,9 +27,9 @@ export default {
   },
   mutations: {
     SET_INFO: (state, info) => {
-            if(info.avatar) state.avatar = info.avatar
-            if(info.schoolId) state.schoolId = info.schoolId
-            if(info.userName) state.userName = info.userName
+      if (info.avatar) state.avatar = info.avatar
+      if (info.schoolId) state.schoolId = info.schoolId
+      if (info.userName) state.userName = info.userName
     },
     SET_AVATAR: (state, avatar) => {
       state.avatar = avatar
@@ -45,10 +45,10 @@ export default {
     },
   },
   actions: {
-        login({ state,commit }, userInfo) {
+    login ({ state, commit }, userInfo) {
       const { account, password, code, random, distinguish } = userInfo
       return new Promise((resolve, reject) => {
-                post(api.logins,{
+        post(api.logins, {
           account,
           password,
           code,
@@ -57,27 +57,20 @@ export default {
           type: 2, // 平台端区分：0->教师端 1->学生端 2->无端
           platform: Setting.platformId, // 所属平台id(1.职站 2.数据平台 3.中台)
         }).then(res => {
-                    if(res.status == 200){
-                        util.local.set(Setting.tokenKey,res.data.token,43200000)
+          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 => {})
+              commit('SET_INFO', res)
+            }).catch(res => { })
             setTimeout(() => {
               // 登录次数+1
-                            post(api.saveRecord,{
+              post(api.saveRecord, {
                 type: 3,
-                            }).then(res => {}).catch(res => {})
-                        },3000)
+              }).then(res => { }).catch(res => { })
+            }, 3000)
             resolve()
-                    }else{
+          } else {
             util.errorMsg(res.message)
             reject(res)
           }
@@ -86,25 +79,29 @@ export default {
         })
       })
     },
-        logout({ commit, state, dispatch }) {
+    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) {
-            commit('SET_AVATAR',avatar)
+    setAvatar ({ state, commit }, avatar) {
+      commit('SET_AVATAR', avatar)
     },
-        setInfo({ state,commit },info) {
-            commit('SET_INFO',info)
+    setInfo ({ state, commit }, info) {
+      commit('SET_INFO', info)
     },
-        setManager({ state,commit },isManager) {
-            commit('SET_MANAGER',isManager)
+    setManager ({ state, commit }, isManager) {
+      commit('SET_MANAGER', isManager)
     },
-        setCustomer({ state,commit },isCustomer) {
-            commit('SET_CUSTOMER',isCustomer)
+    setCustomer ({ state, commit }, isCustomer) {
+      commit('SET_CUSTOMER', isCustomer)
     },
   }
 }