bug fixes

client/src/components/beforeEnter/Before.js

@@ -45,8 +45,8 @@ export default class Before {
     if (window.G.UserInfo) return true
     return Promise.all([cAction.Other.getInfo(), cAction.Other.getUser()])
       .then(([p1, p2]) => {
-        const res = { student_info: p1, data: p2.data }
-        if (res.data.id) {
+        const res = { student_info: p1, ...p2.data }
+        if (res.id) {
           window.G.UserInfo = res
           return true
         } else {

client/src/modules/login-module/assets/languages/zh-CN.json

@@ -21,7 +21,7 @@
       "sendCode": "发送验证码",
       "codeSuccess": "验证码已成功发送，请耐心等待。每天最高发送5次",
       "codeStr": "验证码已发送至：",
-      "iphoneCode": "手机验证码",
+      "iphoneCode": "验证码",
       "mailCode": "邮箱验证码",
       "input4Code": "请输入4位验证码",
       "afterMiniutes": "s后重发",

client/src/modules/login-module/src/ForgetLogin.vue

@@ -5,7 +5,7 @@
       <el-row>
         <el-col :xs="24" :sm="3" :md="5" :lg="6" :xl="6"><el-form-item></el-form-item></el-col>
         <el-col :xs="24" :sm="18" :md="14" :lg="12" :xl="12">
-          <el-form-item prop="account" :label="$t('LoginModule.ForgetLogin.newPwd')">
+          <el-form-item prop="account" :label="$t('LoginModule.NormalLogin.account')">
             <el-input v-model="accountSet.account" type="text" :placeholder="$t('LoginModule.ForgetLogin.inputStr')"></el-input>
           </el-form-item>
           <el-form-item prop="code" :label="(accountSet.type ? $t('LoginModule.ForgetLogin.mailCode') : $t('LoginModule.ForgetLogin.iphoneCode'))">

client/src/pages/examination/myExamination.vue

@@ -151,7 +151,7 @@ export default {
     top: 0;
     left: 0;
     background:rgba(0,0,0,0.3);
-    z-index: 999999;
+    z-index: 999;
     .scroll{
       position:absolute;
       top: 50%;

client/src/pages/other/message.vue

@@ -24,6 +24,7 @@
         layout="total, prev, pager, next, jumper"
         :total="page.total"
         @current-change="handleCurrentChange"
+        :hide-on-single-page="true"
       ></el-pagination>
     </div>
   </div>
@@ -58,11 +59,9 @@ export default {
       }
     },
     getData (obj) {
-      // const json = {
-      //   read_time: 0
-      // }
       cAction.Other.getMyMsg(obj).then(json => {
         this.msgList = json.list
+        this.page.total = json.count
         this.$store.commit('myMsg', json.countNum)
       }).catch(e => { this.$message.error(e.message) }).finally(() => { })
     },