diff --git a/src/api/index.js b/src/api/index.js
index 2d5d2f3..a1c3eac 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -8,7 +8,6 @@ export default {
   logins: `users/users/user/login`,
   verification: `${host}users/users/user/captcha`,// 验证码图片
   logoDetail: `occupationlab/occupationlab/sys/logo/detail`, //查看系统设置信息
-  isClient: `${host}users/users/user/isClient`,
   sendPhoneVerificationCode: `users/users/user/sendPhoneVerificationCode`,
   sendPhoneOrEmailCode: `users/users/userAccount/sendPhoneOrEmailCode`,
   queryUserInfoByPhone: `nakadai/nakadai/partner-team/queryUserInfoByPhone`,
@@ -24,6 +23,9 @@ export default {
   getUserInfo: `users/users/userInfo/getUserInfo`,
   getCurrentTime: `competition/competition/management/getCurrentTime`,
   heartbeatDetection: `nakadai/message/heartbeatDetection`,
+  forgotPreVerification: `users/users/user/forgotPreVerification`,
+  forgotPassword: `users/users/user/forgotPassword`,
+  logout: `users/users/user/logout`,
 
   // 阿里云文件/视频管理
   getPlayAuth: `nakadai/nakadai/oss/getPlayAuth`, // 获取播放凭证
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 2456795..b7f70f3 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -195,20 +195,14 @@ export default {
       this.$router.push(`/station/preview?courseId=${item.cid}&commentId=${item.commentId}&notifyId=${item.notifyId}`)
     },
     // 获取用户信息
-    getUserInfo () {
-      this.$get(this.api.queryUserInfoDetails).then(res => {
-        this.isIndex || this.initSocket(res.result.userAccount)
-        const { userAvatars, userName, userId } = res.result.hrUserInfo || {}
-        userAvatars && this.setAvatar(userAvatars);
-        this.setUserId(userId)
-        this.setUserName(userName);
-        this.setAccount(res.result.userAccount.account);
-        if (!userName && !this.customerName) {
-          this.$get(this.api.isClient).then(res => {
-            res.customerName && this.SET_CUSTOMERNAME(res.customerName)
-          }).catch(res => { })
-        }
-      }).catch(err => { })
+    async getUserInfo () {
+      const res = await this.$get(this.api.queryUserInfoDetails)
+      this.isIndex || this.initSocket(res.result.userAccount)
+      const { userAvatars, userName, userId } = res.result.hrUserInfo || {}
+      userAvatars && this.setAvatar(userAvatars)
+      this.setUserId(userId)
+      this.setUserName(userName)
+      this.setAccount(res.result.userAccount.account)
     },
     // 用户名下拉回调
     menuChange (e) {
diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue
index 7ac0532..ae48c33 100644
--- a/src/pages/account/login/index.vue
+++ b/src/pages/account/login/index.vue
@@ -4,60 +4,46 @@
       <div class="form">
         <h6 class="title">欢迎使用请登录</h6>
         <ul class="tab">
-          <li v-for="(item, index) in tabList" :key="index" :class="{ active: form.distinguish == item.id }"
+          <li v-for="(item, i) in tabList" :key="i" :class="{ active: form.distinguish == item.id }"
             @click="typeClick(item)">{{ item.label }}</li>
         </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>
+          <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="请输入学号/工号/手机号/邮箱"
+                @keyup.enter.native="submit"></el-input>
             </el-form-item>
-            <div class="items">
-              <el-form-item prop="type" style="width: 35%;margin-right: 15px">
-                <label class="label workNumber"></label>
-                <el-select v-model="form.type" placeholder="请选择类型" @change="typeChange">
-                  <el-option label="学生学号" :value="1"></el-option>
-                  <el-option label="老师工号" :value="0"></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="'请输入' + (form.type ? '学生学号' : '老师工号')"
-                  @keyup.enter.native="submit"></el-input>
-              </el-form-item>
-            </div>
           </div>
-          <!-- 手机号登录 -->
+          <!-- 手机号邮箱登录 -->
           <el-form-item v-show="form.distinguish === 1" prop="account">
             <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>
+              <el-input v-model.trim="form.account" placeholder="请输入手机号/邮箱" @input="val => checkAccountByPhone(val, 0)"
+                @keyup.enter.native="submit"></el-input>
             </el-form-item>
             <el-form-item prop="code">
               <label class="label code"></label>
               <div class="ver-code">
-                <el-input v-model="form.code" placeholder="请输入验证码" maxlength="6"
+                <el-input v-model="form.code" placeholder="请输入验证码" maxlength="6" :disabled="verFormEnable"
                   @keyup.enter.native="submit"></el-input>
-                <el-button type="text" @click="sendPhoneCodeLogin" :disabled="phoneDisabledLogin">{{ phoneBtnTextLogin
-                  }}
+                <el-button type="text" @click="sendPhoneCodeLogin" :disabled="phoneDisabledLogin || verFormEnable">{{
+                  phoneBtnTextLogin
+                }}
                 </el-button>
               </div>
             </el-form-item>
           </template>
-          <template v-if="form.distinguish !== 2">
-            <el-form-item prop="password">
+          <template v-else>
+            <el-form-item class="relative" prop="password">
               <label class="password label"></label>
-              <el-input type="password" placeholder="请输入密码" v-model.trim="form.password" @keyup.enter.native="submit">
-              </el-input>
+              <el-input type="password" placeholder="请输入密码" v-model.trim="form.password" @keyup.enter.native="submit" />
+              <el-link class="resetPw" :underline="false" type="primary" @click="showResetPw">忘记密码</el-link>
             </el-form-item>
             <el-form-item prop="code">
               <label class="label code"></label>
@@ -67,8 +53,8 @@
             </el-form-item>
           </template>
           <div class="bottom">
-            <el-link v-if="toMatch" :underline="false" type="primary" @click="toAccount">暂无账号？点击申请</el-link>
-            <el-checkbox v-show="!form.distinguish" 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>
@@ -116,7 +102,10 @@
       <p class="tips">该手机号已绑定以下用户信息</p>
       <ul class="users">
         <li :class="{ isEnable: !user.isEnable }" v-for="(user, i) in users" :key="i" @click="chooseUser(user)">
-          <span>{{ user.schoolName }}，{{ user.userName }}，{{ user.workNumber }}{{ user.isEnable ? '' : '（已禁用）' }}</span>
+          <span>{{ user.typeName }}，{{ user.schoolName }}，{{ user.userName }}，{{ user.workNumber }}{{
+            user.isEnable
+              ? ''
+              : '（已禁用）' }}</span>
           <i class="el-icon-right"></i>
         </li>
       </ul>
@@ -148,6 +137,35 @@
       </div>
     </el-dialog>
 
+    <el-dialog title="重设密码" :visible.sync="resetPwVisible" :close-on-click-modal="false" width="500px">
+      <el-form class="dia-form" ref="pwForm" label-width="110px" :model="pwForm" :rules="pwRules">
+        <el-form-item prop="phoneOrEmail" label="手机号/邮箱">
+          <el-input placeholder="请输入手机号/邮箱" v-model.trim="pwForm.phoneOrEmail"
+            @input="val => checkAccountByPhone(val, 1)"></el-input>
+        </el-form-item>
+        <el-form-item prop="code" label="验证码">
+          <div class="ver-code">
+            <el-input v-model="pwForm.code" placeholder="请输入验证码" maxlength="6" :disabled="formEnable"></el-input>
+            <el-button style="top: 1px" type="text" @click="sendCodePw" :disabled="phoneDisabled || formEnable">{{
+              phoneBtnText }}
+            </el-button>
+          </div>
+        </el-form-item>
+        <el-form-item prop="newPassword" label="登录密码">
+          <el-input placeholder="请输入登录密码" type="password" maxlength="6" v-model="pwForm.newPassword"
+            :disabled="formEnable"></el-input>
+        </el-form-item>
+        <el-form-item prop="newPasswordTwo" label="确认登录密码">
+          <el-input placeholder="请再次输入登录密码" type="password" maxlength="6" v-model="pwForm.newPasswordTwo"
+            :disabled="formEnable"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button v-if="!formEnable" size="small" type="primary" @click="pwSubmit">确定</el-button>
+        <el-button size="small" @click="resetPwVisible = false">取消</el-button>
+      </span>
+    </el-dialog>
+
     <el-dialog title="账号申请" :visible.sync="accountVisible" :close-on-click-modal="false" width="500px"
       @close="accountClose">
       <el-form class="dia-form" ref="accountForm" label-width="110px" :model="accountForm" :rules="accountRules">
@@ -197,7 +215,7 @@
 <script>
 import vFooter from "@/layouts/footer";
 import { mapState, mapMutations, mapActions } from "vuex";
-import util from "@/libs/util";
+import Util from '@/libs/util'
 import Setting from "@/setting";
 import axios from "axios"
 import { Loading } from 'element-ui'
@@ -221,8 +239,7 @@ export default {
       if (val === '') {
         callback(new Error('请输入手机号'))
       } else {
-        const pattern = /^1[3456789]\d{9}$/
-        if (pattern.test(val)) {
+        if (this.phoneReg.test(val)) {
           callback()
         } else {
           callback(new Error('请输入正确手机号格式'))
@@ -233,36 +250,33 @@ export default {
       tabList: [
         {
           id: 0,
-          label: '学号/工号登录'
+          label: '学生/老师登录'
         }, {
           id: 1,
           label: '学校管理员登录'
-        }, {
-          id: 2,
-          label: '手机号/邮箱'
         }
       ],
-      setDefault: !!util.local.get('schoolId'), // 本地缓存里有学校id，则默认勾选
+      phoneReg: /^1[3456789]\d{9}$/,
+      mailReg: /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/,
       verificationIMG: '',
       schoolList: [],
       form: {
-        schoolId: '',
         workNumber: '',
-        account: '',
+        account: '', // 手机号验证码模式用这个字段
         password: '',
         code: '', // 验证码
         random: '', // 随机数
-        distinguish: 0, // 区分手机号账号登录,1为账号登录,2为手机号或邮箱登录
-        type: 1, // 平台端区分：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" }]
       },
+      verFormEnable: true,
+      verCodeLogin: false,
       phoneDisabledLogin: false,
       phoneTimerLogin: null,
       phoneBtnTextLogin: '发送验证码',
@@ -306,7 +320,22 @@ export default {
         rePassword: [{ required: true, message: "请再次输入密码", trigger: "blur" }],
         code: [{ required: true, message: "请输入验证码", trigger: "blur" }]
       },
-      buyVisible: false
+      buyVisible: false,
+
+
+      resetPwVisible: false,
+      pwForm: {
+        code: '',
+        newPassword: '',
+        newPasswordTwo: '',
+        phoneOrEmail: '',
+      },
+      pwRules: {
+        phoneOrEmail: [{ required: true, message: "请输入手机号/邮箱", trigger: "blur" }],
+        password: [{ required: true, message: "请输入密码", trigger: "blur" }],
+        rePassword: [{ required: true, message: "请再次输入密码", trigger: "blur" }],
+        code: [{ required: true, message: "请输入验证码", trigger: "blur" }]
+      },
     };
   },
   computed: {
@@ -323,7 +352,6 @@ export default {
   mounted () {
     localStorage.removeItem('opened')
     this.getVerImg()
-    this.getSchool()
     // 页面离开的时候销毁手机和邮箱验证码定时器
     this.$once("hook:beforeDestroy", function () {
       clearInterval(this.phoneTimer)
@@ -342,57 +370,39 @@ export default {
     ...mapMutations('match', [
       'SET_SOURCE'
     ]),
-    // 赋值学校列表及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, {
-        provinceId: '',
-        cityId: ''
-      }).then(({ list }) => {
-        this.setSchool(list)
-      }).catch(res => { })
-    },
     getVerImg () { // 获取验证码图片
       this.form.random = Math.floor(Math.random() * 999999999);
       this.verificationIMG = this.api.verification + "?random=" + `${this.form.random}`;
     },
+    // 重置验证规则
+    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) {
       const { id } = tab
       const form = this.form
       // 切换了后，全部字段重置
       this.form = {
-        schoolId: form.schoolId,
         workNumber: '',
         account: '',
         password: '',
         code: '',
         random: form.random,
         distinguish: id,
-        type: 1,
         platform: form.platform
       }
+      if (id) this.verCodeLogin = false
       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 ?
-        '请输入账号' :
-        '请输入手机号/邮箱'
-    },
-    // 学号工号切换
-    typeChange (id) {
-      this.rules.workNumber[0].message = id === 1 ?
-        '请输入学生学号' :
-        '请输入老师工号'
+      this.handleRule()
     },
     // 刷新官网
     reloadIndex () {
@@ -402,33 +412,17 @@ export default {
     },
     // 选择用户回调
     chooseUser (user) {
-      user.isEnable && this.$post(`${this.api.getToken}?id=${user.id}`).then(({ data }) => {
-        this.queryClient(data.token)
-      }).catch(res => { })
-    },
-    // 查询是否是客户，如果是客户，则弹出选择端的页面去选择跳转到哪个端
-    queryClient (token) {
-      this.token = token
-      axios.get(this.api.isClient, {
-        headers: {
-          token
-        }
-      }).then(({ data }) => {
-        // 如果是客户
-        if (data.customer) {
-          this.SET_CUSTOMERNAME(data.customerName)
-          this.selectVisible = true
-        } else {
-          this.form.type ? this.setLogin() : this.toMang()
-        }
+      user.isEnable && this.$post(`${this.api.getToken}?id=${user.id}&platform=${Setting.platformId}`).then(({ data }) => {
+        this.token = data.token
+        user.typeName === '学生端' ? this.setLogin() : this.toMang()
       }).catch(res => { })
     },
     // 处理登录成功
     setLogin () {
-      util.local.set(Setting.tokenKey, this.token, Setting.tokenExpires)
-      util.cookies.remove('serverLogin')
+      Util.local.set(Setting.tokenKey, this.token, Setting.tokenExpires)
+      Util.cookies.remove('serverLogin')
       this.reloadIndex()
-      util.successMsg('登录成功')
+      Util.successMsg('登录成功')
       const { toMatch } = this
       this.SET_SOURCE('')
       this.$router.replace(this.courseId ?
@@ -442,11 +436,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('schoolId', form.schoolId) // 选的是学号工号登录，并且勾选了默认，则存入缓存
-          if (util.local.get('schoolId') && !this.setDefault) util.local.remove('schoolId') // 本地缓存了学校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) {
@@ -457,19 +447,22 @@ export default {
               const accounts = data.userAccounts
               // 如果返回的是数组，则弹框给用户选择登录哪个用户，否则，直接登录
               if (accounts instanceof Array) {
-                // 如果只查询到一个用户，则直接登录，否则，弹框让用户选择
-                if (accounts.length === 1) {
-                  this.chooseUser(accounts[0])
+                this.users = accounts
+                this.userVisible = true
+              } else {
+                this.token = data.token
+                // 如果是客户，则需要选择登录的端
+                if (data.customer) {
+                  Util.cookies.set('customerName', data.customerName)
+                  this.SET_CUSTOMERNAME(data.customerName)
+                  this.selectVisible = true
                 } else {
-                  this.users = accounts
-                  this.userVisible = true
+                  !data.customer || data.typeName === '学生端' ? this.setLogin() : this.toMang()
                 }
-              } else {
-                this.queryClient(data.token)
               }
             } else {
               form.code = ''
-              util.errorMsg(message)
+              Util.errorMsg(message)
             }
           }).catch(res => {
             form.code = ''
@@ -481,43 +474,17 @@ export default {
     // 跳转到教师端
     toMang () {
       const { token } = this
-      util.local.set('oc_server_token', token, Setting.tokenExpires)
+      Util.local.set('oc_server_token', token, Setting.tokenExpires)
       // 从学生端登录到教师端的标识，教师端需要使用
-      util.cookies.set('serverLogin', true, {
+      Util.cookies.set('serverLogin', true, {
         expires: new Date(Date.now() + 15 * 60 * 1000) // 15分钟后过期
       })
-      axios.get(this.api.isClient, {
-        headers: {
-          token
-        }
-      }).then(({ data }) => {
-        // 如果是客户
-        if (data.customerName) {
-          util.cookies.set('customerName', data.customerName)
-        } else {
-          // 查询姓名
-          axios.get(Setting.apiBaseURL + this.api.queryUserInfoDetails, {
-            headers: {
-              token: this.token
-            }
-          }).then(({ data }) => {
-            this.SET_CUSTOMERNAME(data.result.hrUserInfo.userName)
-            util.cookies.set('customerName', data.result.hrUserInfo.userName)
-          }).catch(err => { })
-        }
+      this.reloadIndex()
 
-        this.reloadIndex()
-        // if (this.courseId) {
-        //   this.$router.replace(`/preCourse/details?id=${this.courseId}`)
-        // } else if (this.toMatch) {
-        //   this.$router.replace(`/touristMatch`)
-        // } else {
-        // 跳转到教师端的重定向页面
-        location.href = Setting.isDev ?
-          `http://${location.hostname}:8081/#/redirect?auth=${btoa(this.token)}` :
-          `${location.origin}/admin/#/redirect?auth=${window.btoa(this.token)}`
-        // }
-      }).catch(res => { })
+      // 跳转到教师端的重定向页面
+      location.href = Setting.isDev ?
+        `http://${location.hostname}:8081/#/redirect?auth=${btoa(this.token)}` :
+        `${location.origin}/admin/#/redirect?auth=${window.btoa(this.token)}`
     },
     // 选择端
     selectRole (val) {
@@ -534,13 +501,65 @@ export default {
         this.$message.error("请输入手机号")
         return false
       }
-      if (!/^1[3456789]\d{9}$/.test(phone) && !/^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/.test(phone)) {
+      if (!this.phoneReg.test(phone) && !this.mailReg.test(phone)) {
         this.$message.error("请输入正确的手机号/邮箱")
         return false
       }
       return true
     },
 
+    // 忘记密码
+    showResetPw () {
+      this.pwForm = {
+        code: '',
+        newPassword: '',
+        newPasswordTwo: '',
+        phoneOrEmail: '',
+      }
+      this.formEnable = true
+      this.resetPwVisible = true
+    },
+
+    // 重设密码发送验证码
+    async sendCodePw () {
+      const { phoneOrEmail } = this.pwForm
+      if (!this.verifyPhone(phoneOrEmail)) return false
+      const { message } = await this.$post(`${this.api.sendPhoneVerificationCode}?phoneOrEmail=${phoneOrEmail}&loginOrBind=1&platform=${Setting.platformId}`)
+      Util.successMsg(message)
+      this.phoneCountdown()
+    },
+    // 重设密码提交
+    pwSubmit () {
+      this.$refs.pwForm.validate(valid => {
+        if (valid) {
+          const form = this.pwForm
+          if (form.password !== form.rePassword) return Util.errorMsg('两次输入的密码不一致，请重新输入！')
+          form.platform = Setting.platformId
+          this.$post(this.api.forgotPassword, form).then(res => {
+            this.resetPwVisible = false
+            Util.successMsg('密码重置成功！请重新登录。')
+          }).catch(res => { })
+        }
+      })
+    },
+
+    // 手机号输入完回调。有账号才能继续操作
+    async checkAccountByPhone (val, isResetPw) {
+      if (!this.phoneReg.test(val) && !this.mailReg.test(val)) return false
+
+      try {
+        await this.$get(`${this.api.forgotPreVerification}?phoneOrEmail=${val}&platform=${Setting.platformId}`)
+        this[isResetPw ? 'formEnable' : 'verFormEnable'] = false
+      } catch (e) {
+        this.formEnable = true
+      }
+    },
+    // 账号申请
+    switchType () {
+      this.verCodeLogin = !this.verCodeLogin
+      this.$refs.form.clearValidate()
+      this.handleRule()
+    },
     // 账号申请
     toAccount () {
       this.accountVisible = true
@@ -566,15 +585,16 @@ export default {
         }
       }).catch(res => { })
     },
+
     // 发送验证码
     sendCode () {
       const { phone } = this.accountForm
       // 校验用户手机号是否存在
       phone && this.$get(`${this.api.checkPhoneOrEmailExist}?phone=${phone}&type=1&email=`).then(res => {
-        if (res) return util.errorMsg('手机号已存在，请更换手机号！')
+        if (res) return Util.errorMsg('手机号已存在，请更换手机号！')
         if (!this.verifyPhone(phone)) return false
         this.$post(`${this.api.sendPhoneVerificationCode}?phoneOrEmail=${phone}&loginOrBind=1&platform=${Setting.platformId}`).then(({ message }) => {
-          util.successMsg(message)
+          Util.successMsg(message)
           this.phoneCountdown()
         }).catch(res => { })
       }).catch(res => { })
@@ -584,12 +604,12 @@ export default {
       this.$refs.accountForm.validate(valid => {
         if (valid) {
           const form = this.accountForm
-          if (form.password !== form.rePassword) return util.errorMsg('两次输入的密码不一致，请重新输入！')
+          if (form.password !== form.rePassword) return Util.errorMsg('两次输入的密码不一致，请重新输入！')
           // 平台id-端id-schoolId-workNumber组成账号
           form.account = `${Setting.platformId}-1-${form.schoolId}-${form.workNumber}`
           this.$post(this.api.studentAccountApplication, form).then(res => {
             this.accountVisible = false
-            util.successMsg('账号申请已提交，需管理员审核，请10分钟后再登录')
+            Util.successMsg('账号申请已提交，需管理员审核，请10分钟后再登录')
           }).catch(res => { })
         }
       })
@@ -632,7 +652,7 @@ export default {
       const phone = this.form.account
       if (!this.verifyPhone(phone)) return false
       this.$post(`${this.api.sendPhoneVerificationCode}?phoneOrEmail=${phone}&loginOrBind=0&platform=${Setting.platformId}`).then(({ message }) => {
-        util.successMsg(message)
+        Util.successMsg(message)
         this.phoneCountdownLogin()
       }).catch(res => { })
     },
@@ -698,12 +718,12 @@ export default {
             this.phoneCountdown()
             this.phoneOpener = message.opener
           } else {
-            util.errorMsg(message)
+            Util.errorMsg(message)
           }
         }).catch(res => { })
       } else {
         this.$post(`${this.api.sendPhoneVerificationCode}?phoneOrEmail=${phone}&loginOrBind=1&platform=${Setting.platformId}`).then(({ message }) => {
-          util.successMsg(message)
+          Util.successMsg(message)
           this.phoneCountdown()
         }).catch(res => { })
       }
@@ -729,7 +749,7 @@ export default {
     phoneSubmit () {
       const { phone, phoneCode } = this
       if (!this.verifyPhone(phone)) return false
-      if (!phoneCode) return util.warningMsg('请输入验证码')
+      if (!phoneCode) return Util.warningMsg('请输入验证码')
       const { workNumber, schoolId } = this.form
       if (this.binding) {
         this.$post(this.api.bindPhoneOrEmail, {
@@ -781,13 +801,14 @@ export default {
 
   .tab {
     display: flex;
-    justify-content: space-between;
+    justify-content: space-around;
     align-items: center;
     margin-bottom: 24px;
     border-bottom: 2px solid #e1e6f2;
 
     li {
       padding: 18px 0;
+      // margin: 0 20px -1px 0;
       margin-bottom: -1px;
       font-size: 16px;
       color: #555;
@@ -839,6 +860,12 @@ export default {
     border-radius: 4px !important;
   }
 
+  .resetPw {
+    position: absolute;
+    top: 10px;
+    right: 10px;
+  }
+
   .bottom {
     display: flex;
     justify-content: space-between;
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 3862228..61cb249 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,117 +1,121 @@
 import Setting from "@/setting";
 import util from "@/libs/util";
-import { post, get, del, put } from "@/plugins/requests/index.js";
+import { post } from "@/plugins/requests/index.js";
 import api from "@/api";
 /**
  * 用户信息
  * */
 export default {
-    namespaced: true,
-    state: {
-        activeTab: "/station/list", // 当前激活菜单
-        title: '',
-        logoUrl: '',
-        avatar: "https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png",
-        userId: '',
-        studentId: '',
-				account: '',
-        userName: '',
-        customerName: '',
-        schoolId: '',
-        roleId: '',
-        dataTime: '',
-        logView: false // 是否查询过日志状态，如果有，则不再调接口
-    },
-    mutations: {
-        SET_INFO: (state, info) => {
-            if (info.avatar) state.avatar = info.avatar;
-            state.userId = info.userId;
-            state.studentId = info.studentId;
-            state.schoolId = info.schoolId;
-            state.userName = info.userName;
-            state.roleId = info.roleId;
-            state.dataTime = info.dataTime;
-        },
-        SET_TITLE: (state, title) => {
-            state.title = title;
-        },
-        SET_LOGO_URL: (state, logoUrl) => {
-            state.logoUrl = logoUrl;
-        },
-        SET_AVATAR: (state, avatar) => {
-            state.avatar = avatar;
-        },
-        SET_USERNAME: (state, userName) => {
-            state.userName = userName;
-        },
-        SET_CUSTOMERNAME: (state, customerName) => {
-            state.customerName = customerName;
-        },
-        SET_ACTIVE_TAB: (state, activeTab) => {
-            state.activeTab = activeTab;
-        },
-        SET_LOG: (state) => {
-            state.logView = true
-        },
-        setUserId: (state, userId) => {
-            state.userId = userId
-        },
-        setAccount: (state, account) => {
-            state.account = account
-        },
-    },
-    actions: {
-        login({ state, commit }, userInfo) {
-            return new Promise((resolve, reject) => {
-                post(api.logins, userInfo).then(res => {
-                    if (res.status == 200) {
-                        let { data } = res;
-                        // 生成路由权限
-                        // 每个系统都是用这套角色权限代码的,后端也是基本一样,除了个别字段可能会不一样
-                        // 总体来说就两个步骤: 1是生成能够访问的路由的数组集合,2是生成能看到的按钮的数组集合
-                        //res.message.listValue && Setting.dynamicRoute && addRoutes(res.message.listValue)
-                        util.local.set(Setting.tokenKey, data.token, Setting.tokenExpires);
-                        util.successMsg("登录成功");
-                        // console.log(data, "登录保存的数据");
-                        commit("SET_INFO", data);
-                        resolve();
-                    } else {
-                        util.errorMsg(res.message);
-                        reject(res);
-                    }
-                }).catch(error => {
-                    reject(error);
-                });
-            });
-        },
-        logout({ commit, state, dispatch }) {
-            return new Promise((resolve, reject) => {
-              util.local.remove(Setting.storeKey)
-              util.local.remove(Setting.tokenKey)
-              util.local.remove('oc_server_token')
-              util.local.remove('oc_server_store')
-              util.cookies.remove('customerName')
-              location.reload()
-              resolve()
-            });
-        },
-        setInfo({ state, commit }, info) {
-            commit("SET_INFO", info);
-        },
-        setTitle({ state, commit }, title) {
-            commit("SET_TITLE", title);
-        },
-        setLogoUrl({ state, commit }, logoUrl) {
-            commit("SET_LOGO_URL", logoUrl);
-        },
-        setAvatar({ state, commit }, avatar) {
-            commit("SET_AVATAR", avatar);
-        },
-        setUserName({ state, commit }, userName) {
-            commit("SET_USERNAME", userName);
-        },
-        setActiveTab({ state, commit }, activeTab) {
-            commit("SET_ACTIVE_TAB", activeTab);
-        }
+  namespaced: true,
+  state: {
+    activeTab: "/station/list", // 当前激活菜单
+    title: '',
+    logoUrl: '',
+    avatar: "https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png",
+    userId: '',
+    studentId: '',
+    account: '',
+    userName: '',
+    customerName: '',
+    schoolId: '',
+    roleId: '',
+    dataTime: '',
+    logView: false // 是否查询过日志状态，如果有，则不再调接口
+  },
+  mutations: {
+    SET_INFO: (state, info) => {
+      if (info.avatar) state.avatar = info.avatar;
+      state.userId = info.userId;
+      state.studentId = info.studentId;
+      state.schoolId = info.schoolId;
+      state.userName = info.userName;
+      state.roleId = info.roleId;
+      state.dataTime = info.dataTime;
+    },
+    SET_TITLE: (state, title) => {
+      state.title = title;
+    },
+    SET_LOGO_URL: (state, logoUrl) => {
+      state.logoUrl = logoUrl;
+    },
+    SET_AVATAR: (state, avatar) => {
+      state.avatar = avatar;
+    },
+    SET_USERNAME: (state, userName) => {
+      state.userName = userName;
+    },
+    SET_CUSTOMERNAME: (state, customerName) => {
+      state.customerName = customerName;
+    },
+    SET_ACTIVE_TAB: (state, activeTab) => {
+      state.activeTab = activeTab;
+    },
+    SET_LOG: (state) => {
+      state.logView = true
+    },
+    setUserId: (state, userId) => {
+      state.userId = userId
+    },
+    setAccount: (state, account) => {
+      state.account = account
+    },
+  },
+  actions: {
+    login ({ state, commit }, userInfo) {
+      return new Promise((resolve, reject) => {
+        post(api.logins, userInfo).then(res => {
+          if (res.status == 200) {
+            let { data } = res;
+            // 生成路由权限
+            // 每个系统都是用这套角色权限代码的,后端也是基本一样,除了个别字段可能会不一样
+            // 总体来说就两个步骤: 1是生成能够访问的路由的数组集合,2是生成能看到的按钮的数组集合
+            //res.message.listValue && Setting.dynamicRoute && addRoutes(res.message.listValue)
+            util.local.set(Setting.tokenKey, data.token, Setting.tokenExpires);
+            util.successMsg("登录成功");
+            // console.log(data, "登录保存的数据");
+            commit("SET_INFO", data);
+            resolve();
+          } else {
+            util.errorMsg(res.message);
+            reject(res);
+          }
+        }).catch(error => {
+          reject(error);
+        });
+      });
+    },
+    logout ({ commit, state, dispatch }) {
+      return new Promise((resolve, reject) => {
+        post(api.logout).then(() => {
+          util.local.remove(Setting.storeKey)
+          util.local.remove(Setting.tokenKey)
+          util.local.remove('oc_server_token')
+          util.local.remove('oc_server_store')
+          util.cookies.remove('customerName')
+          location.reload()
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
+      });
+    },
+    setInfo ({ state, commit }, info) {
+      commit("SET_INFO", info);
+    },
+    setTitle ({ state, commit }, title) {
+      commit("SET_TITLE", title);
+    },
+    setLogoUrl ({ state, commit }, logoUrl) {
+      commit("SET_LOGO_URL", logoUrl);
+    },
+    setAvatar ({ state, commit }, avatar) {
+      commit("SET_AVATAR", avatar);
+    },
+    setUserName ({ state, commit }, userName) {
+      commit("SET_USERNAME", userName);
+    },
+    setActiveTab ({ state, commit }, activeTab) {
+      commit("SET_ACTIVE_TAB", activeTab);
     }
+  }
 };
\ No newline at end of file