diff --git a/src/components/upload/config.js b/src/components/upload/config.js
index 1216d71..a30b89b 100644
--- a/src/components/upload/config.js
+++ b/src/components/upload/config.js
@@ -2,11 +2,22 @@
  * 阿里云oss配置
  * */
 
+import router from '@/router/index'
+import { Message } from 'element-ui'
 export default async function () {
   try {
     let RE = localStorage.getItem('osc')
-    if (RE) RE = JSON.parse(RE)
-    return RE ? {
+    if (RE) {
+      RE = JSON.parse(RE)
+    } else {
+      sessionStorage.removeItem('token')
+      Message.error('登录过期，请重新登录！')
+      setTimeout(() => {
+        router.replace('/login')
+      }, 1500)
+      return false
+    }
+    return {
       // oss账号信息
       config: {
         region: 'oss-cn-shenzhen',
@@ -16,6 +27,6 @@ export default async function () {
       },
       // 上传成功url前置部分（成功回调没有返回url）
       preUrl: 'https://huoran.oss-cn-shenzhen.aliyuncs.com/'
-    } : {}
+    }
   } catch (e) { }
 }
\ No newline at end of file
diff --git a/src/setting.js b/src/setting.js
index 020b3fb..9f0b523 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -3,8 +3,7 @@
  * */
 const url = location.host;
 const isDev = process.env.NODE_ENV === 'development' // 开发环境
-// const isPro = url.includes('huorantech.cn') //正式服
-const isPro = url.includes('47.97.49.1') //正式服
+const isPro = url.includes('huorantech.cn') //正式服
 
 let jumpPath = `${location.origin}/panfen/`
 let sandPath = `http://121.37.12.51/sandbox` // 沙盘地址
diff --git a/src/views/devLogin.vue b/src/views/devLogin.vue
index 3ab7411..3c23394 100644
--- a/src/views/devLogin.vue
+++ b/src/views/devLogin.vue
@@ -5,80 +5,81 @@
       <div class="box">
         <h1>欢迎使用开发者平台</h1>
         <div class="form">
-            <ul class="tab">
-              <li v-for="(item, i) in tabList" :key="i" :class="{active: activeIndex == item.id}" @click="handleSelect(item.id)">{{item.label}}</li>
-            </ul>
-            <el-form v-show="activeIndex==='1'" :model="param" :rules="rules" ref="login" label-width="0px">
-                <el-form-item prop="account">
-                    <el-input @blur="blur" v-model="param.account" placeholder="请输入账号"></el-input>
-                </el-form-item>
-                <el-form-item prop="password">
-                    <el-input
-                        type="password"
-                        placeholder="请输入密码"
-                        v-model="param.password"
-                    >
-                    </el-input>
-                </el-form-item>
-                <el-form-item prop="code" v-if="showVerify">
-                    <el-input
-                        placeholder="请输入验证码"
-                        v-model="param.code"
-                        @keyup.enter.native="submitForm()"
-                    >
-                    </el-input>
-                    <img @click="blur" :src="verificationIMG" class="verification" alt="">
-                </el-form-item>
-                <div class="login-btn">
-                    <el-button type="primary" @click="submitForm()">马上登录</el-button>
-                </div>
-            </el-form>
-
-            <el-form v-show="activeIndex==='2'" :model="phoneOrEmail" :rules="phoneOrEmailrules" ref="phoneOrEmail" label-width="0px">
-                <el-form-item prop="account">
-                    <el-input @blur="phoneBlur" v-model="phoneOrEmail.account" placeholder="请输入电话/邮箱"></el-input>
-                </el-form-item>
-                <el-form-item prop="password">
-                    <el-input
-                        type="password"
-                        placeholder="请输入密码"
-                        v-model="phoneOrEmail.password"
-                    >
-                    </el-input>
-                </el-form-item>
-                <el-form-item prop="code" v-if="showPhoneVerify">
-                    <el-input
-                        placeholder="请输入验证码"
-                        v-model="phoneOrEmail.code"
-                        @keyup.enter.native="submitForm('phone')"
-                    >
-                    </el-input>
-                    <img @click="phoneBlur" :src="PhoneVerificationIMG" class="verification" alt="">
-                </el-form-item>
-                <div class="login-btn">
-                    <el-button type="primary" @click="submitForm('phone')">马上登录</el-button>
-                </div>
-            </el-form>
+          <ul class="tab">
+            <li v-for="(item, i) in tabList" :key="i" :class="{ active: activeIndex == item.id }"
+              @click="handleSelect(item.id)">{{ item.label }}</li>
+          </ul>
+          <el-form v-show="activeIndex === '1'" :model="param" :rules="rules" ref="login" label-width="0px">
+            <el-form-item prop="account">
+              <el-input @blur="blur" v-model="param.account" placeholder="请输入账号"></el-input>
+            </el-form-item>
+            <el-form-item prop="password">
+              <el-input type="password" placeholder="请输入密码" v-model="param.password">
+              </el-input>
+            </el-form-item>
+            <el-form-item prop="code" v-if="showVerify">
+              <el-input placeholder="请输入验证码" v-model="param.code" @keyup.enter.native="submitForm()">
+              </el-input>
+              <img @click="blur" :src="verificationIMG" class="verification" alt="">
+            </el-form-item>
+            <div class="login-btn">
+              <el-button type="primary" @click="submitForm()">马上登录</el-button>
+            </div>
+          </el-form>
+
+          <el-form v-show="activeIndex === '2'" :model="phoneOrEmail" :rules="phoneOrEmailrules" ref="phoneOrEmail"
+            label-width="0px">
+            <el-form-item prop="account">
+              <el-input @blur="phoneBlur" v-model="phoneOrEmail.account" placeholder="请输入电话/邮箱"></el-input>
+            </el-form-item>
+            <el-form-item prop="password">
+              <el-input type="password" placeholder="请输入密码" v-model="phoneOrEmail.password">
+              </el-input>
+            </el-form-item>
+            <el-form-item prop="code" v-if="showPhoneVerify">
+              <el-input placeholder="请输入验证码" v-model="phoneOrEmail.code" @keyup.enter.native="submitForm('phone')">
+              </el-input>
+              <img @click="phoneBlur" :src="PhoneVerificationIMG" class="verification" alt="">
+            </el-form-item>
+            <div class="login-btn">
+              <el-button type="primary" @click="submitForm('phone')">马上登录</el-button>
+            </div>
+          </el-form>
         </div>
       </div>
     </div>
     <el-dialog title="绑定手机号" :visible.sync="phoneVisible" :close-on-click-modal="false" width="576px">
-        <p class="tips">依据国家政策法规，需绑定手机号进行网络实名才可登录使用本平台</p>
-        <el-form ref="form" label-width="60px">
-            <el-form-item label="手机号">
-                <el-input placeholder="请输入手机号" v-model="phone" maxlength="11"></el-input>
-            </el-form-item>
-            <el-form-item label="验证码">
-                <div style="display:flex;">
-                    <el-input v-model="phoneCode" placeholder="请输入验证码" maxlength="6"></el-input>
-                    <el-button style="margin-left:10px" @click="sendPhoneCode" :disabled="phoneDisabled">{{phoneBtnText}}</el-button>
-                </div>
-            </el-form-item>
-        </el-form>
-        <span slot="footer" class="dialog-footer">
-            <el-button @click="phoneVisible = false">取 消</el-button>
-            <el-button type="primary" @click="phoneSubmit">确 定</el-button>
-        </span>
+      <p class="tips">依据国家政策法规，需绑定手机号进行网络实名才可登录使用本平台</p>
+      <el-form ref="form" label-width="60px">
+        <el-form-item label="手机号">
+          <el-input placeholder="请输入手机号" v-model="phone" maxlength="11"></el-input>
+        </el-form-item>
+        <el-form-item label="验证码">
+          <div style="display:flex;">
+            <el-input v-model="phoneCode" placeholder="请输入验证码" maxlength="6"></el-input>
+            <el-button style="margin-left:10px" @click="sendPhoneCode" :disabled="phoneDisabled">{{ phoneBtnText
+              }}</el-button>
+          </div>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="phoneVisible = false">取 消</el-button>
+        <el-button type="primary" @click="phoneSubmit">确 定</el-button>
+      </span>
+    </el-dialog>
+
+    <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 :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>
+          <i class="el-icon-right"></i>
+        </li>
+      </ul>
     </el-dialog>
     <v-footer class="footer" ref="footer"></v-footer>
   </div>
@@ -87,217 +88,272 @@
 <script>
 import vFooter from '../components/Footer'
 import Setting from '@/setting'
+import addRoutes from '@/libs/route/addRoutes'
+import CryptoJS from 'crypto-js'
+import JSEncrypt from 'jsencrypt'
 export default {
-    data: function() {
-        var regPhoneOrEmail = (rule, value, callback) => {// 验证手机或邮箱
-            let emailReg = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
-            let phoneReg = /^(?:(?:\+|00)86)?1[3-9]\d{9}$/
-            if (value === '') {
-                callback(new Error('请输入手机或邮箱！'));
-            } else if (!emailReg.test(value)&&!phoneReg.test(value)) {
-                callback(new Error('输入的手机/邮箱格式不正确!'));
-            } else {
-                callback();
-            }
-        };
-        return {
-            tabList: [
-              {
-                id: '1',
-                label: '账号登录'
-              }, {
-                id: '2',
-                label: '手机号/邮箱登录'
-              }
-            ],
-            activeIndex:"1",
-
-            showVerify: true,// 账号-验证码展示
-            verificationIMG:'',// 账号验证码拼接链接
-
-            // 账号
-            param: {
-                account: '',
-                password: '',
-                code:'',
-                platform:3,
-                random:'',
-                distinguish:1,
-                type: 2
-            },
-            rules: {
-                account: [{ required: true, message: '请输入账号', trigger: 'blur' }],
-                password: [{ required: true, message: '请输入密码', trigger: 'blur' }],
-                code: [{ required: true, message: '请输入验证码', trigger: 'blur' }],
-            },
-
-            // 手机+邮箱
-            showPhoneVerify:true,// 邮箱-验证码展示
-            PhoneVerificationIMG:'',// 电话或邮箱验证码拼接链接
-            phoneOrEmail: {
-                account: '',
-                password: '',
-                code:'',
-                platform:3,
-                random:'',
-                distinguish:2,
-                type: 2
-            },
-            phoneOrEmailrules:{
-                account: [{ validator: regPhoneOrEmail, trigger: 'blur' }],
-                password: [{ required: true, message: '请输入密码', trigger: 'blur' }],
-                code: [{ required: true, message: '请输入验证码', trigger: 'blur' }],
-            },
-
-            phoneVisible:false,
-            phone:'',
-            phoneCode:'',
-            phoneDisabled:false,
-            phoneBtnText: '发送验证码',
-            phoneTimer:'',
-            phoneOpener:''
-
-        };
+  data: function () {
+    var regPhoneOrEmail = (rule, value, callback) => {// 验证手机或邮箱
+      let emailReg = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+      let phoneReg = /^(?:(?:\+|00)86)?1[3-9]\d{9}$/
+      if (value === '') {
+        callback(new Error('请输入手机或邮箱！'));
+      } else if (!emailReg.test(value) && !phoneReg.test(value)) {
+        callback(new Error('输入的手机/邮箱格式不正确!'));
+      } else {
+        callback();
+      }
+    };
+    return {
+      tabList: [
+        {
+          id: '1',
+          label: '账号登录'
+        }, {
+          id: '2',
+          label: '手机号/邮箱登录'
+        }
+      ],
+      activeIndex: "1",
+
+      showVerify: true,// 账号-验证码展示
+      verificationIMG: '',// 账号验证码拼接链接
+
+      // 账号
+      param: {
+        account: '',
+        password: '',
+        code: '',
+        platform: 3,
+        random: '',
+        distinguish: 1,
+        type: 2
+      },
+      rules: {
+        account: [{ required: true, message: '请输入账号', trigger: 'blur' }],
+        password: [{ required: true, message: '请输入密码', trigger: 'blur' }],
+        code: [{ required: true, message: '请输入验证码', trigger: 'blur' }],
+      },
+
+      // 手机+邮箱
+      showPhoneVerify: true,// 邮箱-验证码展示
+      PhoneVerificationIMG: '',// 电话或邮箱验证码拼接链接
+      phoneOrEmail: {
+        account: '',
+        password: '',
+        code: '',
+        platform: 3,
+        random: '',
+        distinguish: 2,
+        type: 2
+      },
+      phoneOrEmailrules: {
+        account: [{ validator: regPhoneOrEmail, trigger: 'blur' }],
+        password: [{ required: true, message: '请输入密码', trigger: 'blur' }],
+        code: [{ required: true, message: '请输入验证码', trigger: 'blur' }],
+      },
+
+      phoneVisible: false,
+      phone: '',
+      phoneCode: '',
+      phoneDisabled: false,
+      phoneBtnText: '发送验证码',
+      phoneTimer: '',
+      phoneOpener: '',
+
+      userVisible: false,
+      users: [],
+    };
+  },
+  components: {
+    vFooter
+  },
+  watch: {
+    verificationIMG: function (val) {// 监听账号--展示验证码框
+      if (val) {
+        this.showVerify = true
+      } else {
+        this.showVerify = false
+      }
     },
-    components: {
-        vFooter
+    PhoneVerificationIMG: function (val) {// 监听账号--展示验证码框
+      if (val) {
+        this.showPhoneVerify = true
+      } else {
+        this.showPhoneVerify = false
+      }
     },
-    watch:{
-        verificationIMG:function(val){// 监听账号--展示验证码框
-            if(val){
-                this.showVerify = true
-            }else{
-                this.showVerify = false
+  },
+  created () {
+    if (this.param.account) {
+      this.showVerify = true
+    }
+    this.blur()
+  },
+  methods: {
+    submitForm (val) {
+      let ref = val === 'phone' ? 'phoneOrEmail' : 'login'
+      let param = val === 'phone' ? this.phoneOrEmail : this.param
+      this.$refs[ref].validate(valid => {
+        if (valid) {
+          this.$post(this.api.logins, param).then(({ status, data, message }) => {
+            localStorage.removeItem('examPath')
+            localStorage.removeItem('reviewPath')
+            this.getOss()
+            if (status == 200) {
+              const accounts = data.userAccounts
+              // 如果返回的是数组，则弹框给用户选择登录哪个用户，否则，直接登录
+              if (accounts instanceof Array) {
+                this.users = accounts
+                this.userVisible = true
+              } else {
+                sessionStorage.setItem('token', data.token)
+                this.setLogin()
+              }
+            } else {
+              param.code = ''
+              this.$message.error(message)
             }
-        },
-        PhoneVerificationIMG:function(val){// 监听账号--展示验证码框
-            if(val){
-                this.showPhoneVerify = true
-            }else{
-                this.showPhoneVerify = false
+          }).catch(err => {
+            if (err.status === 30001) {
+              this.phoneVisible = true
+            } else if (err.status == 10004 || err.status == 10005) {
+              param.code = ''
+              this.blur()
             }
-        },
+          });
+        } else {
+          this.$message.error('请输入账号/密码/验证码');
+          return false;
+        }
+      });
+    },
+    // 获取oss信息
+    async getOss () {
+      const A = (key, encryptedData) => {
+        const keyHex = CryptoJS.enc.Base64.parse(key)
+        const decrypted = CryptoJS.AES.decrypt(encryptedData, keyHex, {
+          mode: CryptoJS.mode.ECB,
+          padding: CryptoJS.pad.Pkcs7
+        })
+        return decrypted.toString(CryptoJS.enc.Utf8)
+      }
+
+      const R = (encryptedKey, privateKey) => {
+        const decrypt = new JSEncrypt()
+        decrypt.setPrivateKey(privateKey)
+        const decryptedKey = decrypt.decrypt(encryptedKey)
+        return decryptedKey
+      }
+
+      const res = await this.$get(this.api.encrypt)
+      const RE = A(R(res.encryptedKey, res.privateKey), res.encryptedData).split('/')
+      localStorage.setItem('osc', JSON.stringify(RE))
     },
-    created(){
-        if(this.param.account){
-            this.showVerify = true
+    // 选择用户回调
+    chooseUser (user) {
+      user.isEnable && this.$post(`${this.api.getToken}?id=${user.id}`).then(({ data }) => {
+        sessionStorage.setItem('token', data.token)
+        this.token = data.token
+        this.setLogin()
+      }).catch(res => { })
+    },
+    // 处理登录成功
+    async setLogin () {
+      try {
+        const res = await this.$get(`${this.api.getUserRolesPermissionMenu}?platformId=${Setting.platformId}`)
+        const list = res.permissionMenu
+        addRoutes(res.permissionMenu[0].children)
+        this.$store.commit('setDataPer', res.dataPermissionList)
+        this.$message.success('登录成功！')
+        this.$router.push({
+          path: list[0].children[0].path
+        });
+        localStorage.setItem('ms_username', this.param.username);
+      } catch (e) {
+        if (e.status === 500) {
+          sessionStorage.clear()
         }
-        this.blur()
+      }
     },
-    methods: {
-        submitForm(val) {
-            let ref = val==='phone'?'phoneOrEmail':'login'
-            let param = val==='phone'?this.phoneOrEmail:this.param
-            this.$refs[ref].validate(valid => {
-                if (valid) {
-                    this.$post(this.api.logins,param).then(res => {
-                      const { message } = res
-                        sessionStorage.setItem('token',res.data.token)
-                        this.$get(`${this.api.getUserRolesPermissionMenu}?platformId=${Setting.platformId}`).then(res => {
-                          const list = res.permissionMenu
-                          this.$store.commit('setDataPer', res.dataPermissionList)
-                          this.$message.success(message);
-                          this.$router.push({
-                            path: list[0].children[0].path
-                          });
-                          localStorage.setItem('ms_username', this.param.username);
-                        }).catch(err => {
-                          if (err.status === 500) {
-                            sessionStorage.clear()
-                          }
-                        })
-                    }).catch(err => {
-                        if(err.status===30001){
-                            this.phoneVisible = true
-                        }else if(err.status == 10004){
-                            this.blur()
-                        }
-                    });
-                } else {
-                    this.$message.error('请输入账号/密码/验证码');
-                    return false;
-                }
-            });
-            
-        },
-        blur(){
-            this.param.random = Math.floor(Math.random()*999999999)
-            this.verificationIMG = this.api.verification+'?random='+`${this.param.random}`
-        },
-        phoneBlur(){
-            this.phoneOrEmail.random = Math.floor(Math.random()*999999999)
-            this.PhoneVerificationIMG = this.api.verification+'?random='+`${this.phoneOrEmail.random}`
-        },
-        handleSelect(val){
-            this.activeIndex = val
-            this.param.account = "";
-            this.param.password = "";
-            this.param.code = "";
-            this.phoneOrEmail.account = "";
-            this.phoneOrEmail.password = "";
-            this.phoneOrEmail.code = "";
-            this.$refs.phoneOrEmail.clearValidate()
-            // this.blur()
-            this.phoneBlur()
-        },
-        sendPhoneCode(){
-            if(!this.phone) return this.$message.warning('请输入手机号')
-            if(!/^1[3456789]\d{9}$/.test(this.phone)) return this.$message.warning('请输入正确的手机号')
-            let data = {
-                phone: this.phone,
-                types: 2
-            }
-            this.$post(this.api.sendPhoneOrEmailCode,data).then(res => {
-                this.phoneCountdown()// 倒计时
-                if(res.message.opener){
-                    this.phoneOpener = res.message.opener
-                }else{
-                    this.$message(res.message)
-                }
-                
-            }).catch(res => {})
-        },
-        phoneSubmit(){
-            if(!this.phone) return this.$message.warning('请输入手机号')
-            if(!/^1[3456789]\d{9}$/.test(this.phone)) return this.$message.warning('请输入正确的手机号')
-            if(!this.phoneCode) return this.$message.warning('请输入验证码')
-            let data = {
-                phone: this.phone,
-                types: 2,
-                code: this.phoneCode,
-                opener: this.phoneOpener,
-                platform: 3,
-                account: this.param.account
-            }
-            this.$post(this.api.bindPhoneOrEmail,data).then(res => {
-                sessionStorage.setItem('token',res.token)
-                this.$router.push({
-                    path:'/customer'
-                });
-                localStorage.setItem('ms_username', this.param.username);
-                this.$message.success('绑定成功')
-                // this.form.phone = this.phone
-                // this.phoneVisible = false
-            }).catch(res => {})
-        },
-        phoneCountdown(){
-            let count = 60
-            if(!this.phoneTimer){
-                this.phoneDisabled = true
-                this.phoneTimer = setInterval(() => {
-                    if(count > 0){
-                        count--
-                        this.phoneBtnText = `${count}秒后重试`
-                    }else{
-                        this.phoneDisabled = false
-                        clearInterval(this.phoneTimer)
-                        this.phoneTimer = null
-                        this.phoneBtnText = `发送验证码`
-                    }
-                },1000)
-            }
-        },
+    blur () {
+      this.param.random = Math.floor(Math.random() * 999999999)
+      this.verificationIMG = this.api.verification + '?random=' + `${this.param.random}`
+    },
+    phoneBlur () {
+      this.phoneOrEmail.random = Math.floor(Math.random() * 999999999)
+      this.PhoneVerificationIMG = this.api.verification + '?random=' + `${this.phoneOrEmail.random}`
     },
+    handleSelect (val) {
+      this.activeIndex = val
+      this.param.account = "";
+      this.param.password = "";
+      this.param.code = "";
+      this.phoneOrEmail.account = "";
+      this.phoneOrEmail.password = "";
+      this.phoneOrEmail.code = "";
+      this.$refs.phoneOrEmail.clearValidate()
+      // this.blur()
+      this.phoneBlur()
+    },
+    sendPhoneCode () {
+      if (!this.phone) return this.$message.warning('请输入手机号')
+      if (!/^1[3456789]\d{9}$/.test(this.phone)) return this.$message.warning('请输入正确的手机号')
+      let data = {
+        phone: this.phone,
+        types: 2
+      }
+      this.$post(this.api.sendPhoneOrEmailCode, data).then(res => {
+        this.phoneCountdown()// 倒计时
+        if (res.message.opener) {
+          this.phoneOpener = res.message.opener
+        } else {
+          this.$message(res.message)
+        }
+
+      }).catch(res => { })
+    },
+    phoneSubmit () {
+      if (!this.phone) return this.$message.warning('请输入手机号')
+      if (!/^1[3456789]\d{9}$/.test(this.phone)) return this.$message.warning('请输入正确的手机号')
+      if (!this.phoneCode) return this.$message.warning('请输入验证码')
+      let data = {
+        phone: this.phone,
+        types: 2,
+        code: this.phoneCode,
+        opener: this.phoneOpener,
+        platform: 3,
+        account: this.param.account
+      }
+      this.$post(this.api.bindPhoneOrEmail, data).then(res => {
+        sessionStorage.setItem('token', res.token)
+        this.$router.push({
+          path: '/customer'
+        });
+        localStorage.setItem('ms_username', this.param.username);
+        this.$message.success('绑定成功')
+        // this.form.phone = this.phone
+        // this.phoneVisible = false
+      }).catch(res => { })
+    },
+    phoneCountdown () {
+      let count = 60
+      if (!this.phoneTimer) {
+        this.phoneDisabled = true
+        this.phoneTimer = setInterval(() => {
+          if (count > 0) {
+            count--
+            this.phoneBtnText = `${count}秒后重试`
+          } else {
+            this.phoneDisabled = false
+            clearInterval(this.phoneTimer)
+            this.phoneTimer = null
+            this.phoneBtnText = `发送验证码`
+          }
+        }, 1000)
+      }
+    },
+  },
 };
 </script>
 
@@ -305,24 +361,28 @@ export default {
 .wrap {
   min-height: 100%;
 }
+
 .logo {
   z-index: 2;
   position: absolute;
   top: 50px;
   left: 50px;
 }
+
 .login {
   position: relative;
   height: 100%;
   background-image: url(../assets/img/devLogin.jpg);
   background-size: 100%;
 }
+
 .box {
   width: 448px;
   position: absolute;
   right: 20%;
   top: 50%;
   transform: translateY(-50%);
+
   h1 {
     margin-bottom: 20px;
     font-size: 34px;
@@ -330,76 +390,129 @@ export default {
     text-align: center;
   }
 }
+
 /deep/ .form {
-    padding: 20px 60px 0;
-    background-color: rgba(255, 255, 255, .3);
-    border-radius: 4px;
-    box-sizing: border-box;
-    border: 4px solid rgba(255, 255, 255, .2);
-    .el-input__inner {
-        height: 50px;
-        line-height: 50px;
-        border: 1px solid rgba(220, 220, 220, 1);
-        border-radius: 2px;
-    }
-    .el-form-item {
-      margin-bottom: 25px;
-    }
-    .verification{
-        position: absolute;
-        top: 1px;
-        right: 1px;
-        width: 160px;
-        height: 47px;
-        cursor: pointer;
-    }
+  padding: 20px 60px 0;
+  background-color: rgba(255, 255, 255, .3);
+  border-radius: 4px;
+  box-sizing: border-box;
+  border: 4px solid rgba(255, 255, 255, .2);
+
+  .el-input__inner {
+    height: 50px;
+    line-height: 50px;
+    border: 1px solid rgba(220, 220, 220, 1);
+    border-radius: 2px;
+  }
+
+  .el-form-item {
+    margin-bottom: 25px;
+  }
+
+  .verification {
+    position: absolute;
+    top: 1px;
+    right: 1px;
+    width: 160px;
+    height: 47px;
+    cursor: pointer;
+  }
 }
-.tab{
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    margin-bottom: 24px;
-    li{
-        padding: 18px 5px;
-        margin: 0 20px;
-        font-size: 16px;
-        font-weight: 600;
-        color: #fff;
-        cursor: pointer;
-        border-bottom: 2px solid transparent;
-        &:last-child{
-            margin-right: 0;
-        }
-        &.active{
-            color: #fff;
-            border-bottom-color: #ccc;
-        }
+
+.tab {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 24px;
+
+  li {
+    padding: 18px 5px;
+    margin: 0 20px;
+    font-size: 16px;
+    font-weight: 600;
+    color: #fff;
+    cursor: pointer;
+    border-bottom: 2px solid transparent;
+
+    &:last-child {
+      margin-right: 0;
     }
+
+    &.active {
+      color: #fff;
+      border-bottom-color: #ccc;
+    }
+  }
 }
-.title{
-    font-size: 16px;
-    text-align: center;
-    font-weight: bold;
+
+.title {
+  font-size: 16px;
+  text-align: center;
+  font-weight: bold;
 }
+
 .login-btn {
-    text-align: center;
+  text-align: center;
 }
+
 .login-btn button {
-    width: 100%;
-    height: 48px;
-    margin-bottom: 50px;
-    font-weight: bold;
-    background: #1dabff;
-    border-radius: 4px;
-    border: 0;
+  width: 100%;
+  height: 48px;
+  margin-bottom: 50px;
+  font-weight: bold;
+  background: #1dabff;
+  border-radius: 4px;
+  border: 0;
 }
-.forget{
-    margin-bottom: 28px;
-    text-align: right;
-    color: #999;
-    font-weight:bold;
-    &:hover{
-        color: #0092FF;
+
+.forget {
+  margin-bottom: 28px;
+  text-align: right;
+  color: #999;
+  font-weight: bold;
+
+  &:hover {
+    color: #0092FF;
+  }
+}
+
+/deep/.user-dia {
+  .tips {
+    margin-bottom: 20px;
+    text-align: center;
+    color: #666;
+  }
+
+  .users {
+    li {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 0 15px;
+      margin-bottom: 10px;
+      line-height: 40px;
+      font-size: 14px;
+      background-color: #ebeef5;
+      cursor: pointer;
+
+      &.isEnable {
+        color: #c0c4cc;
+        background-color: #f5f7fa;
+        cursor: not-allowed;
+      }
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+
+      &:hover {
+        background-color: #d3e0ff;
+      }
+
+      i {
+        font-size: 16px;
+      }
     }
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/match/list/index.vue b/src/views/match/list/index.vue
index a9a998a..eec582f 100644
--- a/src/views/match/list/index.vue
+++ b/src/views/match/list/index.vue
@@ -151,7 +151,7 @@
 </template>
 
 <script>
-import util from "@/libs/util";
+import Util from '@/libs/util'
 import Bus from '@/libs/bus'
 import qs from 'qs'
 export default {
@@ -283,13 +283,14 @@ export default {
         }]
       },
       loading: false,
+      now: '',
     };
   },
   watch: {
     "form.month": function (val) {
       if (val) {
         let unit = 24 * 60 * 60 * 1000;
-        this.date = [util.formatDate("yyyy-MM-dd", new Date(new Date().getTime() - unit * 30 * val)), util.formatDate("yyyy-MM-dd", new Date(new Date().getTime() + unit))];
+        this.date = [Util.formatDate("yyyy-MM-dd", new Date(new Date().getTime() - unit * 30 * val)), Util.formatDate("yyyy-MM-dd", new Date(new Date().getTime() + unit))];
       } else {
         this.date = [];
       }
@@ -340,39 +341,25 @@ export default {
     })
   },
   methods: {
-    getData () {
+    async getData () {
       this.loading = true
-      const { form } = this
-      this.$post(this.api.CompetitionPageConditionQueryByNakadai, {
-        pageNum: this.page,
-        pageSize: this.pageSize,
-        ...form
-      }).then(({ data }) => {
-        const list = data.records
-        // 定时处理是否要显示修改结束时间按钮
+      try {
+        const { form } = this
+        const { data } = await this.$post(this.api.CompetitionPageConditionQueryByNakadai, {
+          pageNum: this.page,
+          pageSize: this.pageSize,
+          ...form
+        })
+        this.matchData = data.records
+
+        this.now = await Util.getNow()
+        clearInterval(this.timer)
+        this.handleBeganStage()
         this.timer = setInterval(() => {
-          const now = new Date()
-          list.map(e => {
-            if (!e.playingStages) {
-              this.$set(e, 'playingStages', [])
-            } else {
-              e.playingStages = []
-            }
-            // 如果当前时间在竞赛开始结束时间之间
-            if (now >= new Date(e.playStartTime) && now <= new Date(e.playEndTime)) {
-              // 遍历赛事阶段
-              if (e.competitionStageList) {
-                for (const n of e.competitionStageList) {
-                  // 判断是否有开始了的阶段
-                  if (now >= new Date(n.startTime) && now <= new Date(n.endTime)) {
-                    e.playingStages.push(n)
-                  }
-                }
-              }
-            }
-          })
+          this.now = new Date(this.now.setSeconds(this.now.getSeconds() + 1))
+          this.handleBeganStage()
         }, 1000)
-        this.matchData = list
+
         this.total = data.total
         this.$refs.table.clearSelection()
         this.loading = false
@@ -380,8 +367,30 @@ export default {
           this.page--
           this.getData()
         }
-      }).catch(res => {
+      } catch (e) {
         this.loading = false
+      }
+    },
+    // 定时处理是否要显示修改结束时间按钮
+    async handleBeganStage () {
+      this.matchData.map(e => {
+        if (!e.playingStages) {
+          this.$set(e, 'playingStages', [])
+        } else {
+          e.playingStages = []
+        }
+        // 如果当前时间在竞赛开始结束时间之间
+        if (this.now >= new Date(e.playStartTime) && this.now <= new Date(e.playEndTime)) {
+          // 遍历赛事阶段
+          if (e.competitionStageList) {
+            for (const n of e.competitionStageList) {
+              // 判断是否有开始了的阶段
+              if (this.now >= new Date(n.startTime) && this.now <= new Date(n.endTime)) {
+                e.playingStages.push(n)
+              }
+            }
+          }
+        }
       })
     },
     initData () {
@@ -402,7 +411,7 @@ export default {
         type: "warning"
       }).then(async () => {
         await this.$post(`${this.api.copyCompetition}?competitionId=${row.id}`)
-        util.successMsg('复制成功')
+        Util.successMsg('复制成功')
         this.initData()
       }).catch(() => { })
     },
@@ -425,7 +434,7 @@ export default {
         competitionContents: data
       }).then(async res => {
         await this.$post(`${this.api.refreshPageNotification}?content=1`)
-        util.successMsg('修改成功')
+        Util.successMsg('修改成功')
         this.modifyVisible = false
         this.getData()
       }).catch(err => { })
@@ -450,7 +459,7 @@ export default {
       })
         .then(() => {
           this.$post(`${this.api.batchDeleteCompetition}?competitionIds=${row.id}`).then(res => {
-            util.successMsg("删除成功");
+            Util.successMsg("删除成功");
             this.getData();
           }).catch(res => {
           });
@@ -495,7 +504,7 @@ export default {
         isOpen: val,
         type: 0 // 禁用平台来源(0中台，1职站)
       }).then(res => {
-        util.successMsg(val == 1 ? '禁用成功' : '启用成功')
+        Util.successMsg(val == 1 ? '禁用成功' : '启用成功')
       }).catch(err => { })
 
       await this.$post(`${this.api.refreshPageNotification}?content=1`)