Ver código fonte

修改登录验证/学历提升详情

yangzj 2 anos atrás
pai
commit
b2257c905f

+ 4 - 4
src/components/BannerBreadcrumb/index.vue

@@ -3,7 +3,7 @@
  * @Author: 空白格
  * @Date: 2022-08-11 13:44:08
  * @LastEditors: 空白格
- * @LastEditTime: 2022-08-26 11:42:04
+ * @LastEditTime: 2022-08-26 13:06:42
  * @FilePath: \veterans_client_web\src\components\BannerBreadcrumb\index.vue
  * @Copyright: Copyright (c) 2016~2022 by 空白格, All Rights Reserved.
 -->
@@ -79,9 +79,9 @@ export default {
         newPathList = [];
       if (path) {
         pathList = path.split("/").filter((item) => item && item.trim());
-        newPathList.push(pathList[0])
-        for(let i = 1; i < pathList.length; i++) {
-          newPathList.push(newPathList[i-1] + '/' + pathList[i])
+        newPathList.push(pathList[0]);
+        for (let i = 1; i < pathList.length; i++) {
+          newPathList.push(newPathList[i - 1] + "/" + pathList[i]);
         }
         newPathList.forEach((item) => {
           routerOptions.forEach((jitem) => {

+ 9 - 0
src/router/index.js

@@ -147,6 +147,15 @@ const routes = [
           title: '学历提升'
         }
       },
+      {
+        path: 'educationpromote/details',
+        name: 'EducationPromoteDetailsIndex',
+        component: () =>
+          import('@/views/EducationPromote/EducationPromoteDetails/EducationPromoteDetailsIndex.vue'),
+        meta: {
+          title: '学历提升详情'
+        }
+      },
       {
         path: 'adaptivetraining',
         name: 'AdaptiveTrainingIndex',

+ 12 - 0
src/views/EducationPromote/EducationPromoteDetails/EducationPromoteDetailsIndex.vue

@@ -0,0 +1,12 @@
+<!--
+ * @Description: 学历提升 => 详情
+ * @Author: 空白格
+ * @Date: 2022-08-26 16:40:31
+ * @LastEditors: 空白格
+ * @LastEditTime: 2022-08-26 16:40:31
+ * @FilePath: \veterans_client_web\src\views\EducationPromote\EducationPromoteDetails\EducationPromoteDetailsIndex.vue
+ * @Copyright: Copyright (c) 2016~2022 by 空白格, All Rights Reserved.
+-->
+<template>
+  <div>详情</div>
+</template>

+ 8 - 8
src/views/Home/HomeIndex.vue

@@ -3,7 +3,7 @@
  * @Author: 空白格
  * @Date: 2022-08-10 11:26:40
  * @LastEditors: 空白格
- * @LastEditTime: 2022-08-25 13:34:15
+ * @LastEditTime: 2022-08-26 14:11:09
  * @FilePath: \veterans_client_web\src\views\Home\HomeIndex.vue
  * @Copyright: Copyright (c) 2016~2022 by 空白格, All Rights Reserved.
 -->
@@ -828,12 +828,12 @@ export default {
     position: fixed;
     top: 50%;
     right: 0;
-    margin-top: -183px;
+    margin-top: -138px;
     z-index: 1000;
     &-fixed {
       &-item {
-        width: 80px;
-        height: 80px;
+        width: 70px;
+        height: 70px;
         display: flex;
         justify-content: center;
         align-items: center;
@@ -848,15 +848,15 @@ export default {
           background: #73aa8d;
         }
         .image {
-          width: 35px;
-          height: 35px;
+          width: 30px;
+          height: 30px;
         }
       }
       &-item-last {
         height: 40px;
         .image {
-          width: 20px;
-          height: 20px;
+          width: 15px;
+          height: 15px;
         }
       }
     }

+ 11 - 18
src/views/Login/LoginIndex.vue

@@ -3,7 +3,7 @@
  * @Author: 空白格
  * @Date: 2022-08-10 11:45:16
  * @LastEditors: 空白格
- * @LastEditTime: 2022-08-23 15:06:09
+ * @LastEditTime: 2022-08-26 16:37:34
  * @FilePath: \veterans_client_web\src\views\Login\LoginIndex.vue
  * @Copyright: Copyright (c) 2016~2022 by 空白格, All Rights Reserved.
 -->
@@ -83,7 +83,6 @@
 </template>
 
 <script>
-import { veteEducCheck } from "@/api/Login";
 export default {
   name: "LoginIndex",
   data() {
@@ -154,7 +153,7 @@ export default {
                 .dispatch("GetUserInfo")
                 .then((res) => {
                   if (res.code === 200) {
-                    this.validateEducCheck();
+                    this.validateEducCheck(res.data);
                   } else {
                     this.subLoading = false;
                   }
@@ -163,7 +162,7 @@ export default {
                   this.subLoading = false;
                 });
             } else {
-              this.$message.error(res.msg || '登录失败!')
+              this.$message.error(res.msg || "登录失败!");
             }
           })
           .catch(() => {
@@ -176,21 +175,15 @@ export default {
      * @date 2022-08-17
      * @returns {any}
      */
-    validateEducCheck() {
-      veteEducCheck()
-        .then((res) => {
-          if (res.data != 9) {
-            this.jumpPage();
-          } else {
-            this.$router.push({
-              path: "/applyeducationauth",
-            });
-          }
-          this.subLoading = false;
-        })
-        .catch(() => {
-          this.subLoading = false;
+    validateEducCheck(data) {
+      if (data.auditStatus === 1 || data.auditStatus === 3) {
+        this.$router.push({
+          path: "/applyeducationauth",
         });
+      } else {
+        this.jumpPage();
+      }
+      this.subLoading = false;
     },
     /**
      * 跳转指定页面