增加关注度和认证状态校验

src/api/index.js

@@ -0,0 +1,22 @@
+/**
+ * @Description: 公用接口
+ * @Author: 空白格
+ * @Date: 2022-08-29 15:42:50
+ * @LastEditors: 空白格
+ * @LastEditTime: 2022-08-29 15:44:41
+ * @FilePath: \veterans_client_web\src\api\index.js
+ * @Copyright: Copyright (c) 2016~2022 by 空白格, All Rights Reserved.
+ */
+import request from '@/utils/request'
+/**
+ * 页面点击统计
+ * @param {*} data
+ * @returns
+ */
+export function addPageHits(data) {
+  return request({
+    url: '/app/sys/analysis',
+    method: 'post',
+    data
+  })
+}

src/utils/index.js

@@ -0,0 +1,71 @@
+/**
+ * @Description: 公共js
+ * @Author: 空白格
+ * @Date: 2022-08-29 16:05:17
+ * @LastEditors: 空白格
+ * @LastEditTime: 2022-08-29 16:54:15
+ * @FilePath: \veterans_client_web\src\utils\index.js
+ * @Copyright: Copyright (c) 2016~2022 by 空白格, All Rights Reserved.
+ */
+import { addPageHits } from '@/api'
+import store from '@/store'
+import router from '@/router'
+import { MessageBox } from 'element-ui'
+/**
+ * 跳转页面需要验证状态
+ * @param { String } path  需要跳转路径
+ * @param { Object } query  跳转携带参数
+ * @param { Boolean } isHits 是否进行浏览量统计
+ * @param { Object } params 浏览量统计参数
+ * @param { Boolean } isAudit 是否验证用户审核状态
+ */
+export function jumpPageAuth(path, query, isHits = true, params, isAudit = true) {
+  const { auditStatus } = store.state.user.userInfo
+  if (isAudit) {
+    if (store.state.user.isLogin) {
+      if (auditStatus === 1 || auditStatus === 3 || auditStatus === 9) {
+        let msg =
+          auditStatus === 1 ? '未通过' : auditStatus === 3 ? '已撤销' : '未提交'
+        MessageBox.confirm(`您的认证${msg},是否跳转认证页面进行认证`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          router.push({ path: '/applyeducationauth' })
+        })
+      } else if (auditStatus === 0) {
+        MessageBox.alert('您的认证正在审核中,请等待验证通过才可以访问!')
+      } else if (auditStatus === 2) {
+        if (isHits) {
+          addPageHits(params).then((res) => {
+            if (res.code === 200) {
+              router.push({ path, query })
+            }
+          })
+        } else {
+          router.push({ path, query })
+        }
+      }
+    } else {
+      MessageBox.confirm(`您还未进行登录, 是否跳转登录页面登录?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          router.push({ path: '/login' })
+        })
+        .catch(() => {})
+    }
+  } else {
+    if (isHits) {
+      addPageHits(params).then((res) => {
+        if (res.code === 200) {
+          router.push({ path, query })
+        }
+      })
+    } else {
+      router.push({ path, query })
+    }
+  }
+}

src/views/AdaptiveTraining/AdaptiveTrainingIndex.vue

@@ -3,7 +3,7 @@
  * @Author: 空白格
  * @Date: 2022-08-12 15:23:44
  * @LastEditors: 空白格
- * @LastEditTime: 2022-08-29 14:03:52
+ * @LastEditTime: 2022-08-29 17:04:09
  * @FilePath: \veterans_client_web\src\views\AdaptiveTraining\AdaptiveTrainingIndex.vue
  * @Copyright: Copyright (c) 2016~2022 by 空白格, All Rights Reserved.
 -->
@@ -60,7 +60,11 @@
             v-for="(item, index) in onlineObj.list"
             :key="index"
             @click="
-              jumpPage('/adaptivetraining/onlinecoursedetails', { id: item.id })
+              jumpPage(
+                '/adaptivetraining/onlinecoursedetails',
+                { id: item.id },
+                item
+              )
             "
           >
             <div class="atcl-item-left">
@@ -112,9 +116,14 @@
             v-for="(item, index) in offlineObj.list"
             :key="index"
             @click="
-              jumpPage('/adaptivetraining/offlinecoursedetails', {
-                id: item.id,
-              })
+              jumpPage(
+                '/adaptivetraining/offlinecoursedetails',
+                {
+                  id: item.id,
+                },
+                item,
+                2
+              )
             "
           >
             <div class="atcl-item-offline">
@@ -139,6 +148,7 @@ import {
 } from "@/api/AdaptiveTraining";
 import { mapState } from "vuex";
 import { parseTime } from "@/utils/utils";
+import { jumpPageAuth } from "@/utils";
 export default {
   name: "AdaptiveTrainingIndex",
   data() {
@@ -179,6 +189,7 @@ export default {
   computed: {
     ...mapState({
       isLogin: (state) => state.user.isLogin,
+      userInfo: (state) => state.user.userInfo,
     }),
   },
   mounted() {
@@ -257,11 +268,22 @@ export default {
      * @param {any} query
      * @returns {any}
      */
-    jumpPage(path, query) {
-      this.$router.push({
-        path,
-        query,
-      });
+    jumpPage(path, query, item, type) {
+      const params = {
+        platform: "4", // 平台:1-H5 2-APP 3-小程序 4-PC端
+        pages: location.href, //页面路径
+        btnName: "查看课程详情", //按钮名称
+        btnEvent: "1", //按钮事件: 1-点击 2-长按 3-滑动
+        ipAddress: "", //IP地址
+        typeName: "适应性培训关注度", //类型名称 例：学校关注度 、适应性考试等
+        typeCode: "SYXPXGZD", // 类型编码 例：类型名称首字母缩写(XXGZD)
+        categoryName: item.adaptName, //类别名称 例：XX学校，SS考试
+      };
+      if (type === 2) {
+        jumpPageAuth(path, query, true, params, false);
+      } else {
+        jumpPageAuth(path, query, true, params);
+      }
     },
   },
 };

src/views/CooperativeColleges/CooperativeCollegesIndex.vue

@@ -3,7 +3,7 @@
  * @Author: 空白格
  * @Date: 2022-08-11 17:17:33
  * @LastEditors: 空白格
- * @LastEditTime: 2022-08-16 11:59:58
+ * @LastEditTime: 2022-08-29 15:50:42
  * @FilePath: \veterans_client_web\src\views\CooperativeColleges\CooperativeCollegesIndex.vue
  * @Copyright: Copyright (c) 2016~2022 by 空白格, All Rights Reserved.
 -->
@@ -73,6 +73,7 @@
 import BannerBreadcrumb from "@/components/BannerBreadcrumb";
 import { getDictData } from "@/api/Dict";
 import { getSchoolList } from "@/api/CooperativeColleges";
+import { addPageHits } from "@/api";
 export default {
   name: "CooperativeCollegesIndex",
   components: {
@@ -126,8 +127,8 @@ export default {
      * @returns {any}
      */
     currentChange(page) {
-      this.queryParams.pageNum = page
-      this.getList()
+      this.queryParams.pageNum = page;
+      this.getList();
     },
     /**
      * 跳转指定页面
@@ -136,13 +137,27 @@ export default {
      * @returns {any}
      */
     jumpPage(school) {
-      this.$router.push({
-        path: '/collegesdetails',
-        query: {
-          schoolId: school.id
+      const query = {
+        platform: "4", // 平台:1-H5 2-APP 3-小程序 4-PC端
+        pages: location.href, //页面路径
+        btnName: "查看学院详情", //按钮名称
+        btnEvent: "1", //按钮事件: 1-点击 2-长按 3-滑动
+        ipAddress: "", //IP地址
+        typeName: "学校关注度", //类型名称 例：学校关注度 、适应性考试等
+        typeCode: "XXGZD", // 类型编码 例：类型名称首字母缩写(XXGZD)
+        categoryName: school.schoolName, //类别名称 例：XX学校，SS考试
+      };
+      addPageHits(query).then((res) => {
+        if (res.code === 200) {
+          this.$router.push({
+            path: "/collegesdetails",
+            query: {
+              schoolId: school.id,
+            },
+          });
         }
-      })
-    }
+      });
+    },
   },
   filters: {
     filtersDict(val, list) {

src/views/EducationPromote/EducationPromoteIndex.vue

@@ -3,7 +3,7 @@
  * @Author: 空白格
  * @Date: 2022-08-12 13:47:26
  * @LastEditors: 空白格
- * @LastEditTime: 2022-08-29 14:15:17
+ * @LastEditTime: 2022-08-29 17:08:39
  * @FilePath: \veterans_client_web\src\views\EducationPromote\EducationPromoteIndex.vue
  * @Copyright: Copyright (c) 2016~2022 by 空白格, All Rights Reserved.
 -->
@@ -63,9 +63,14 @@
                 <div
                   class="epah-left-btn"
                   @click="
-                    jumpPage('/collegesdetails', {
-                      schoolId: queryParams.schoolId,
-                    })
+                    jumpPage(
+                      '/collegesdetails',
+                      {
+                        schoolId: queryParams.schoolId,
+                      },
+                      currentSchool,
+                      1
+                    )
                   "
                 >
                   学院详情
@@ -106,10 +111,14 @@
               <div
                 class="epal-item"
                 @click="
-                  jumpPage('/educationpromote/professionalintroduction', {
-                    id: item.id,
-                    schoolName: item.schoolName
-                  })
+                  jumpPage(
+                    '/educationpromote/professionalintroduction',
+                    {
+                      id: item.id,
+                      schoolName: item.schoolName,
+                    },
+                    item
+                  )
                 "
               >
                 <div class="epal-item-image">
@@ -143,6 +152,7 @@
 <script>
 import BannerBreadcrumb from "@/components/BannerBreadcrumb";
 import { getSchoolListData, getActivityBySchool } from "@/api/EducationPromote";
+import { jumpPageAuth } from "@/utils";
 export default {
   name: "EducationPromoteIndex",
   components: {
@@ -224,8 +234,32 @@ export default {
      * @param {any} path
      * @returns {any}
      */
-    jumpPage(path, query) {
-      if (path) {
+    jumpPage(path, query, item, type) {
+      if (type === 1) {
+        const params = {
+          platform: "4", // 平台:1-H5 2-APP 3-小程序 4-PC端
+          pages: location.href, //页面路径
+          btnName: "查看学院详情", //按钮名称
+          btnEvent: "1", //按钮事件: 1-点击 2-长按 3-滑动
+          ipAddress: "", //IP地址
+          typeName: "学校关注度", //类型名称 例：学校关注度 、适应性考试等
+          typeCode: "XXGZD", // 类型编码 例：类型名称首字母缩写(XXGZD)
+          categoryName: item.school_name, //类别名称 例：XX学校，SS考试
+        };
+        jumpPageAuth(path, query, true, params, false);
+      } else if (item) {
+        const params = {
+          platform: "4", // 平台:1-H5 2-APP 3-小程序 4-PC端
+          pages: location.href, //页面路径
+          btnName: "查看专业详情", //按钮名称
+          btnEvent: "1", //按钮事件: 1-点击 2-长按 3-滑动
+          ipAddress: "", //IP地址
+          typeName: "学历提升关注度", //类型名称 例：学校关注度 、适应性考试等
+          typeCode: "XLTSGZD", // 类型编码 例：类型名称首字母缩写(XXGZD)
+          categoryName: item.name, //类别名称 例：XX学校，SS考试
+        };
+        jumpPageAuth(path, query, true, params);
+      } else {
         this.$router.push({ path, query });
       }
     },

src/views/Login/LoginIndex.vue

@@ -3,7 +3,7 @@
  * @Author: 空白格
  * @Date: 2022-08-10 11:45:16
  * @LastEditors: 空白格
- * @LastEditTime: 2022-08-26 16:37:34
+ * @LastEditTime: 2022-08-29 15:23:42
  * @FilePath: \veterans_client_web\src\views\Login\LoginIndex.vue
  * @Copyright: Copyright (c) 2016~2022 by 空白格, All Rights Reserved.
 -->
@@ -176,7 +176,7 @@ export default {
      * @returns {any}
      */
     validateEducCheck(data) {
-      if (data.auditStatus === 1 || data.auditStatus === 3) {
+      if (data.auditStatus === 1 || data.auditStatus === 3 || data.auditStatus === 9) {
         this.$router.push({
           path: "/applyeducationauth",
         });

src/views/PersonalCenter/ApplyEducationAuth/ApplyEducationAuthIndex.vue

@@ -2,8 +2,8 @@
  * @Description: 退役军人认证页面
  * @Author: 空白格
  * @Date: 2022-08-17 11:30:23
- * @LastEditors: gcz
- * @LastEditTime: 2022-08-22 11:19:58
+ * @LastEditors: 空白格
+ * @LastEditTime: 2022-08-29 16:32:14
  * @FilePath: \veterans_client_web\src\views\PersonalCenter\ApplyEducationAuth\ApplyEducationAuthIndex.vue
  * @Copyright: Copyright (c) 2016~2022 by 空白格, All Rights Reserved.
 -->
@@ -59,13 +59,16 @@
             ></el-input>
           </el-form-item>
           <el-form-item label="户籍类别" prop="houseTypeId">
-            <el-radio-group v-model="form.houseTypeId" @change="houseTypeChange">
+            <el-radio-group
+              v-model="form.houseTypeId"
+              @change="houseTypeChange"
+            >
               <el-radio
                 v-for="(item, index) in houseTypeList"
                 :label="item.text"
                 :key="index"
               >
-              {{item.label}}
+                {{ item.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
@@ -82,7 +85,11 @@
             </el-cascader>
           </el-form-item>
           <el-form-item label="文化程度" prop="degrEduc">
-            <el-select @change="degrEducChange" v-model="form.degrEduc" placeholder="请选择您的文化程度">
+            <el-select
+              @change="degrEducChange"
+              v-model="form.degrEduc"
+              placeholder="请选择您的文化程度"
+            >
               <el-option
                 v-for="item in degrEducList"
                 :key="item.index"
@@ -112,7 +119,7 @@
                 :label="item.value"
                 :key="index"
               >
-              {{item.label}}
+                {{ item.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
@@ -158,10 +165,11 @@
               <div class="text">上传照片</div>
             </el-upload>
           </el-form-item>
-          <el-form-item label="" >
-            <el-button class="submit-btn" @click="submit" type="primary">提交</el-button>
+          <el-form-item label="">
+            <el-button class="submit-btn" @click="submit" type="primary"
+              >提交</el-button
+            >
           </el-form-item>
-          
         </el-form>
       </div>
     </div>
@@ -172,8 +180,13 @@
       custom-class="success-dialog"
       :show-close="false"
       :close-on-click-modal="false"
-      >
-      <img class="img" src="@/assets/images/success-icon.png" alt="" srcset="">
+    >
+      <img
+        class="img"
+        src="@/assets/images/success-icon.png"
+        alt=""
+        srcset=""
+      />
       <div class="text">提交成功，等待审核</div>
       <span class="btn" @click="confirmSuccess">确 定</span>
     </el-dialog>
@@ -183,9 +196,14 @@
 import BannerBreadcrumb from "@/components/BannerBreadcrumb";
 import { getDictData } from "@/api/Dict";
 import { getIdInfo } from "@/api/PersonalCenter";
-import { veteEduc,getVeteEducData } from "@/api/ApplyEducationAuth";
+import { veteEduc, getVeteEducData } from "@/api/ApplyEducationAuth";
 // https://github.com/Plortinus/element-china-area-data
-import { regionDataPlus,regionData, CodeToText,TextToCode  } from "element-china-area-data";
+import {
+  regionDataPlus,
+  regionData,
+  CodeToText,
+  TextToCode,
+} from "element-china-area-data";
 import { mapState } from "vuex";
 export default {
   name: "ApplyEducationAuthIndex",
@@ -196,11 +214,11 @@ export default {
     return {
       dialogVisible: false,
       // 上传地址
-      action: process.env.VUE_APP_BASE_API+'/file/upload/single/minio',
+      action: process.env.VUE_APP_BASE_API + "/file/upload/single/minio",
       // action: process.env.VUE_APP_UPLOAD_URL,
       // action:'http://api.veterans.hongweisoft.com/file/upload/single/minio',
       addressOptions: regionData,
-      fileList:[],
+      fileList: [],
       form: {
         veteName: "",
         veteIdCard: "",
@@ -215,8 +233,8 @@ export default {
         politOutlook: "",
         politOutlookId: "",
         veteHousehRegi: "",
-        veteHousehRegiCode: ['520000'],
-        veteHousehArea: ['520000'],
+        veteHousehRegiCode: ["520000"],
+        veteHousehArea: ["520000"],
         veteResiAddress: "",
         veteDateBirth: "",
         veteStatus: "1",
@@ -379,9 +397,7 @@ export default {
     this.getEmploymentStatus();
     this.getVeteEducData();
   },
-  mounted(){
-    
-  },
+  mounted() {},
   methods: {
     /**
      * 获取已经提交的数据
@@ -421,26 +437,30 @@ export default {
               data.veteEduc.cityId &&
               data.veteEduc.areaId
             ) {
-              this.form.veteHousehArea =
-                [
-                  data.veteEduc.provinceId.toString(),
-                  data.veteEduc.cityId.toString(),
-                  data.veteEduc.areaId.toString()
-                ];
+              this.form.veteHousehArea = [
+                data.veteEduc.provinceId.toString(),
+                data.veteEduc.cityId.toString(),
+                data.veteEduc.areaId.toString(),
+              ];
               // console.log('data.veteEduc.provinceId',data.veteEduc.provinceId);
               // console.log('data.veteEduc.provinceId',data.veteEduc.cityId);
               // console.log('data.veteEduc.provinceId',data.veteEduc.areaId);
               // console.log('this.form',JSON.parse(JSON.stringify(this.form)));
             }
             // console.log('veteHousehArea',this.form.veteHousehArea);
-            if(data.veteEduc.veteHousehRegi){
-              let veteHousehRegiArr = data.veteEduc.veteHousehRegi.split('-');
-             this.form.veteHousehRegiCode=[
-              TextToCode[veteHousehRegiArr[0]]?.code,
-              TextToCode[veteHousehRegiArr[0]][veteHousehRegiArr[1]]?.code,
-              TextToCode[veteHousehRegiArr[0]][veteHousehRegiArr[1]][veteHousehRegiArr[2]]?.code||''
-             ]    
-             console.log('this.form.veteHousehRegiCode',this.form.veteHousehRegiCode);  
+            if (data.veteEduc.veteHousehRegi) {
+              let veteHousehRegiArr = data.veteEduc.veteHousehRegi.split("-");
+              this.form.veteHousehRegiCode = [
+                TextToCode[veteHousehRegiArr[0]]?.code,
+                TextToCode[veteHousehRegiArr[0]][veteHousehRegiArr[1]]?.code,
+                TextToCode[veteHousehRegiArr[0]][veteHousehRegiArr[1]][
+                  veteHousehRegiArr[2]
+                ]?.code || "",
+              ];
+              console.log(
+                "this.form.veteHousehRegiCode",
+                this.form.veteHousehRegiCode
+              );
             }
             // 薪资范围
             this.form.salaryRange = data.veteEduc.salaryRange;
@@ -534,7 +554,7 @@ export default {
           this.employmentStatusList = res.data.map((item) => {
             return {
               ...item,
-              value:  Number( item.text ),
+              value: Number(item.text),
             };
           });
         }
@@ -550,41 +570,49 @@ export default {
       });
     },
     idNumberChange(val) {
-				const reg = /^\d{6}((?:19|20)((?:\d{2}(?:0[13578]|1[02])(?:0[1-9]|[12]\d|3[01]))|(?:\d{2}(?:0[13456789]|1[012])(?:0[1-9]|[12]\d|30))|(?:\d{2}02(?:0[1-9]|1\d|2[0-8]))|(?:(?:0[48]|[2468][048]|[13579][26])0229)))\d{2}(\d)[xX\d]$/
-				if (!reg.test(val)) {
-					return
-				}
-				// 根据身份证得出性别
-				this.form.veteSex = (parseInt(val.substr(16, 1)) % 2 === 1 ? '男' : '女');
-				// 设置出生日期
-				this.form.veteDateBirth = val.substring(6, 10) + "-" + val.substring(10, 12) + "-" + val.substring(12,14) + ' 00:00:00';
-				// 根据身份证号获取基本信息
-				getIdInfo({
-					id: this.form.veteIdCard
-				}).then(res => {
-					if (res.code === 200) {
-						if (res.data) {
-							this.form.nation = res.data.nation;
-							this.form.veteName = res.data.veteName;
-							this.form.vetePhone = res.data.vetePhone;
-							this.form.veteResiAddress = res.data.veteResiAddress;
-						}
-					} else {
-						uni.showToast({
-							icon: 'none',
-							title: res.msg
-						})
-					}
-				})
-			},
-      addrChange(value) {
-        this.form.provinceId =value[0];
-        this.form.cityId = value[1];
-        this.form.areaId = value[2];
-        this.form.provinceName = CodeToText[value[0]];
-        this.form.cityName = CodeToText[value[1]];
-        this.form.areaName = CodeToText[value[2]];
-        this.form.veteResiAddress = CodeToText[value[0]] + CodeToText[value[1]] + CodeToText[value[2]];
+      const reg =
+        /^\d{6}((?:19|20)((?:\d{2}(?:0[13578]|1[02])(?:0[1-9]|[12]\d|3[01]))|(?:\d{2}(?:0[13456789]|1[012])(?:0[1-9]|[12]\d|30))|(?:\d{2}02(?:0[1-9]|1\d|2[0-8]))|(?:(?:0[48]|[2468][048]|[13579][26])0229)))\d{2}(\d)[xX\d]$/;
+      if (!reg.test(val)) {
+        return;
+      }
+      // 根据身份证得出性别
+      this.form.veteSex = parseInt(val.substr(16, 1)) % 2 === 1 ? "男" : "女";
+      // 设置出生日期
+      this.form.veteDateBirth =
+        val.substring(6, 10) +
+        "-" +
+        val.substring(10, 12) +
+        "-" +
+        val.substring(12, 14) +
+        " 00:00:00";
+      // 根据身份证号获取基本信息
+      getIdInfo({
+        id: this.form.veteIdCard,
+      }).then((res) => {
+        if (res.code === 200) {
+          if (res.data) {
+            this.form.nation = res.data.nation;
+            this.form.veteName = res.data.veteName;
+            this.form.vetePhone = res.data.vetePhone;
+            this.form.veteResiAddress = res.data.veteResiAddress;
+          }
+        } else {
+          uni.showToast({
+            icon: "none",
+            title: res.msg,
+          });
+        }
+      });
+    },
+    addrChange(value) {
+      this.form.provinceId = value[0];
+      this.form.cityId = value[1];
+      this.form.areaId = value[2];
+      this.form.provinceName = CodeToText[value[0]];
+      this.form.cityName = CodeToText[value[1]];
+      this.form.areaName = CodeToText[value[2]];
+      this.form.veteResiAddress =
+        CodeToText[value[0]] + CodeToText[value[1]] + CodeToText[value[2]];
       // console.log(
       //   CodeToText[value[0]] + CodeToText[value[1]] + CodeToText[value[2]],
       //   "选中地址"
@@ -594,7 +622,9 @@ export default {
       // console.log("this.form.veteHousehArea", this.form.veteHousehArea);
     },
     regiAddrChange(value) {
-      this.form.veteHousehRegi = `${CodeToText[value[0]]}-${CodeToText[value[1]]}-${CodeToText[value[2]]}`;
+      this.form.veteHousehRegi = `${CodeToText[value[0]]}-${
+        CodeToText[value[1]]
+      }-${CodeToText[value[2]]}`;
       console.log(
         CodeToText[value[0]] + CodeToText[value[1]] + CodeToText[value[2]],
         "选中地址"
@@ -602,126 +632,129 @@ export default {
       console.log("addrChange", value);
       console.log("this.form.veteHousehArea", this.form.veteHousehArea);
     },
-     submit() {
-      console.log('this.form',JSON.parse(JSON.stringify(this.form)));
+    submit() {
+      console.log("this.form", JSON.parse(JSON.stringify(this.form)));
       this.form.vetePhone = this.userInfo.mobile;
-        this.$refs['form'].validate((valid) => {
-          if (valid) {
-						if (this.form.files.length < 1) {
-							this.$message({
-								message: '近期1寸免冠照片',
-								type: 'error'
-							});
-						} else {
-							let params = {
-								veteEduc: {}
-							};
-							params.files = this.form.files
-							for (let key in this.form) {
-								if (key !== 'files') {
-									params.veteEduc[key] = this.form[key];
-								}
-							};
-							params.veteEduc.veteSex = params.veteEduc.veteSex === '男' ? 0 : 1;
-							  veteEduc(params).then(res => {
-								if (res.code === 200) {
-                  this.dialogVisible = true;
-									// this.$message({
-									// 	message: '提交成功，等待审核！',
-                  //   type: 'success',
-									// 	duration: 2000,
-									// 	success: () => {
-									// 		this.$u.route(
-									// 			'/pages/applyEducationCode/applyEducationSuccess'
-									// 		)
-									// 	}
-									// });
-								} else {
-									this.$message({
-										message: res.msg,
-										type: 'error'
-									});
-								}
-							})
-						}
-					}
-        });
-      },
-      houseTypeChange(e){
-        for (let index = 0; index < this.houseTypeList.length; index++) {
-          const item =  this.houseTypeList[index];
-          if(item.text == e){
-            console.log('this.form',this.form);
-            this.form.houseType = this.houseTypeList[index].label;
-            break;
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.files.length < 1) {
+            this.$message({
+              message: "近期1寸免冠照片",
+              type: "error",
+            });
+          } else {
+            let params = {
+              veteEduc: {},
+            };
+            params.files = this.form.files;
+            for (let key in this.form) {
+              if (key !== "files") {
+                params.veteEduc[key] = this.form[key];
+              }
+            }
+            params.veteEduc.veteSex = params.veteEduc.veteSex === "男" ? 0 : 1;
+            veteEduc(params).then((res) => {
+              if (res.code === 200) {
+                this.dialogVisible = true;
+                // this.$message({
+                // 	message: '提交成功，等待审核！',
+                //   type: 'success',
+                // 	duration: 2000,
+                // 	success: () => {
+                // 		this.$u.route(
+                // 			'/pages/applyEducationCode/applyEducationSuccess'
+                // 		)
+                // 	}
+                // });
+                this.$store.dispatch("GetUserInfo").then((res) => {
+                  console.log("获取用户信息:", res);
+                });
+              } else {
+                this.$message({
+                  message: res.msg,
+                  type: "error",
+                });
+              }
+            });
           }
         }
-      },
-      // jobStatusChange(e){
-      //   for (let index = 0; index < this.employmentStatusList.length; index++) {
-      //     const item =  this.employmentStatusList[index];
-      //     if(item.text == e){
-      //       console.log('this.form',this.form);
-      //       this.form.jobStatus = this.employmentStatusList[index].label;
-      //       break;
-      //     }
-      //   }
-      // },
-      degrEducChange(e){
-        for (let index = 0; index < this.degrEducList.length; index++) {
-          const item =  this.degrEducList[index];
-          if(item.text == e){
-            this.form.degrEduc = this.degrEducList[index].label;
-             this.form.degrEducId = this.degrEducList[index].value;
-            break;
-          }
+      });
+    },
+    houseTypeChange(e) {
+      for (let index = 0; index < this.houseTypeList.length; index++) {
+        const item = this.houseTypeList[index];
+        if (item.text == e) {
+          console.log("this.form", this.form);
+          this.form.houseType = this.houseTypeList[index].label;
+          break;
         }
-      },
-      politOutlookChange(e){
-        for (let index = 0; index < this.politOutlookList.length; index++) {
-          const item =  this.politOutlookList[index];
-          if(item.text == e){
-            this.form.politOutlook = this.politOutlookList[index].label;
-             this.form.politOutlookId = this.politOutlookList[index].value;
-            break;
-          }
+      }
+    },
+    // jobStatusChange(e){
+    //   for (let index = 0; index < this.employmentStatusList.length; index++) {
+    //     const item =  this.employmentStatusList[index];
+    //     if(item.text == e){
+    //       console.log('this.form',this.form);
+    //       this.form.jobStatus = this.employmentStatusList[index].label;
+    //       break;
+    //     }
+    //   }
+    // },
+    degrEducChange(e) {
+      for (let index = 0; index < this.degrEducList.length; index++) {
+        const item = this.degrEducList[index];
+        if (item.text == e) {
+          this.form.degrEduc = this.degrEducList[index].label;
+          this.form.degrEducId = this.degrEducList[index].value;
+          break;
         }
-      },
-      salaryRangeChange(e){
-        for (let index = 0; index < this.salaryRangeList.length; index++) {
-          const item =  this.salaryRangeList[index];
-          if(item.text == e){
-            this.form.salaryRangeName = this.salaryRangeList[index].label;
-             this.form.salaryRange = this.salaryRangeList[index].value;
-            break;
-          }
+      }
+    },
+    politOutlookChange(e) {
+      for (let index = 0; index < this.politOutlookList.length; index++) {
+        const item = this.politOutlookList[index];
+        if (item.text == e) {
+          this.form.politOutlook = this.politOutlookList[index].label;
+          this.form.politOutlookId = this.politOutlookList[index].value;
+          break;
+        }
+      }
+    },
+    salaryRangeChange(e) {
+      for (let index = 0; index < this.salaryRangeList.length; index++) {
+        const item = this.salaryRangeList[index];
+        if (item.text == e) {
+          this.form.salaryRangeName = this.salaryRangeList[index].label;
+          this.form.salaryRange = this.salaryRangeList[index].value;
+          break;
         }
-      },
-      confirmSuccess(){
-        this.dialogVisible = false;
-        this.$router.push('/')
-      },
-      resetForm() {
-        this.$refs['form'].resetFields();
       }
+    },
+    confirmSuccess() {
+      this.dialogVisible = false;
+      this.$router.push("/");
+    },
+    resetForm() {
+      this.$refs["form"].resetFields();
+    },
   },
 };
 </script>
 <style lang="scss" scoped>
-:deep(.success-dialog){
+:deep(.success-dialog) {
   border-radius: 32px;
   text-align: center;
-  .img{
+  .img {
     width: 134px;
   }
-  .text{
+  .text {
     font-weight: 400;
     font-size: 28px;
     color: #000;
     letter-spacing: 0.13px;
     margin: 27px auto 140px;
   }
-  .btn{
+  .btn {
     width: 281px;
     display: inline-block;
     height: 58px;
@@ -734,7 +767,7 @@ export default {
     margin-bottom: 45px;
   }
 }
-:deep(.banner-breadcrumb-breadcrumb){
+:deep(.banner-breadcrumb-breadcrumb) {
   margin-bottom: 14px;
 }
 .title {
@@ -764,7 +797,7 @@ export default {
     bottom: 0;
     right: 0;
   }
-.el-upload:hover {
+  .el-upload:hover {
     border-color: #409eff;
   }
   .uploader-icon {
@@ -781,14 +814,13 @@ export default {
     display: block;
   }
 }
-.app-main-box{
+.app-main-box {
   margin-top: 0;
 }
-.el-form{
+.el-form {
   width: 50%;
 }
-.submit-btn{
+.submit-btn {
   width: 265px;
 }
-
 </style>

src/views/PersonalCenter/Resume/ResumeEdit.vue

@@ -1,11 +1,11 @@
 <!--
- * @Description: 
+ * @Description:
  * @Author: gcz
  * @Date: 2022-08-25 09:38:41
- * @LastEditors: gcz
- * @LastEditTime: 2022-08-26 16:08:25
+ * @LastEditors: 空白格
+ * @LastEditTime: 2022-08-29 17:13:07
  * @FilePath: \veterans_client_web\src\views\PersonalCenter\Resume\ResumeEdit.vue
- * @Copyright: Copyright (c) 2016~2022 by gcz, All Rights Reserved. 
+ * @Copyright: Copyright (c) 2016~2022 by gcz, All Rights Reserved.
 -->
 <template>
   <div class="app-main">
@@ -39,9 +39,14 @@
                 active-color="#709078"
                 :active-value="1"
                 :inactive-value="0"
-                inactive-text="未入职">
+                inactive-text="未入职"
+              >
               </el-switch>
-              <span v-if="jobStatus==1&&memberinfo.company" style="margin-left:10px">({{memberinfo.company}})</span>
+              <span
+                v-if="jobStatus == 1 && memberinfo.company"
+                style="margin-left: 10px"
+                >({{ memberinfo.company }})</span
+              >
             </div>
           </el-col>
           <el-col :span="8">
@@ -75,12 +80,12 @@
           <div class="form-title">求职意向</div>
           <el-row :gutter="24">
             <el-col :span="12">
-              <el-form-item
-                label="最低工资"
-                prop="expectedLowestSalary"
-              >
+              <el-form-item label="最低工资" prop="expectedLowestSalary">
                 <el-col :span="8">
-                  <el-select v-model="form.expectedLowestSalary" placeholder="请选择">
+                  <el-select
+                    v-model="form.expectedLowestSalary"
+                    placeholder="请选择"
+                  >
                     <el-option
                       v-for="item of 50"
                       :disabled="item >= form.expectedHighestSalary"
@@ -103,7 +108,10 @@
                   </div>
                 </el-col>
                 <el-col :span="8">
-                  <el-select v-model="form.expectedHighestSalary" placeholder="请选择">
+                  <el-select
+                    v-model="form.expectedHighestSalary"
+                    placeholder="请选择"
+                  >
                     <el-option
                       v-for="item of 50"
                       :disabled="item <= form.expectedLowestSalary"
@@ -164,7 +172,8 @@
             type="textarea"
             :rows="5"
             placeholder="请输入自我评价"
-            v-model="selfAssessment">
+            v-model="selfAssessment"
+          >
           </el-input>
           <div class="btn-wrap">
             <span class="btn" @click="saveSelfAssessment">保存</span>
@@ -177,8 +186,18 @@
 
 <script>
 import BannerBreadcrumb from "@/components/BannerBreadcrumb";
-import { getPersonInfoData ,saveJobIntention,saveSelfAssessment ,updateJobStatus} from "@/api/PersonalCenter";
-import { regionDataPlus,regionData, CodeToText,TextToCode  } from "element-china-area-data";
+import {
+  getPersonInfoData,
+  saveJobIntention,
+  saveSelfAssessment,
+  updateJobStatus,
+} from "@/api/PersonalCenter";
+import {
+  regionDataPlus,
+  regionData,
+  CodeToText,
+  TextToCode,
+} from "element-china-area-data";
 export default {
   name: "Resume",
   components: {
@@ -188,15 +207,15 @@ export default {
     return {
       addressOptions: regionDataPlus,
       memberinfo: {},
-      jobStatus:null,
+      jobStatus: null,
       form: {
-        intentionArea:[],
-        expectedPost:'',
-        expectedIndustry:'',
-        expectedLowestSalary:null,
-        expectedHighestSalary:null,
+        intentionArea: [],
+        expectedPost: "",
+        expectedIndustry: "",
+        expectedLowestSalary: 0,
+        expectedHighestSalary: 0,
       },
-      selfAssessment:''
+      selfAssessment: "",
     };
   },
   created() {
@@ -218,21 +237,16 @@ export default {
           // this.form.cityName = res?.data?.cityName;
           // this.form.areaId = res?.data?.areaId;
           // this.form.areaName  = res?.data?.areaName ;
-          this.form.expectedPost = res?.data?.expectedPost||'';
-          this.form.expectedIndustry = res?.data?.expectedIndustry||'';
-          this.form.expectedLowestSalary = Number( res?.data?.expectedLowestSalary );
-          this.form.expectedHighestSalary = Number( res?.data?.expectedHighestSalary );
-
+          this.form.expectedPost = res?.data?.expectedPost || "";
+          this.form.expectedIndustry = res?.data?.expectedIndustry || "";
+          this.form.expectedLowestSalary = res.data.expectedLowestSalary ? Number(res.data.expectedLowestSalary) : 0
+          this.form.expectedHighestSalary = res.data.expectedHighestSalary ? Number(res.data.expectedHighestSalary) : 0
           this.form.intentionArea = [];
-          this.form.intentionArea.push(res?.data?.provinceId.toString())
-          this.form.intentionArea.push(res?.data?.cityId.toString())
-          this.form.intentionArea.push(res?.data?.areaId.toString())
-
+          res.data.provinceId ? this.form.intentionArea.push(res?.data?.provinceId.toString()) : ''
+          res.data.cityId ? this.form.intentionArea.push(res?.data?.cityId.toString()) : ''
+          res.data.areaId ? this.form.intentionArea.push(res?.data?.areaId.toString()) : ''
           this.jobStatus = res?.data?.jobStatus;
-          console.log('this.jobStatus',this.jobStatus);
-
-          this.selfAssessment = res?.data?.selfAssessment||'';
-          console.log("this.form", this.form);
+          this.selfAssessment = res?.data?.selfAssessment || "";
         }
       });
     },
@@ -247,37 +261,39 @@ export default {
       return parseInt(age);
     },
     addrChange(value) {
-        this.form.provinceId =value[0];
-        this.form.cityId = value[1];
-        this.form.areaId = value[2];
-        this.form.provinceName = CodeToText[value[0]];
-        this.form.cityName = CodeToText[value[1]];
-        this.form.areaName = CodeToText[value[2]];
+      this.form.provinceId = value[0];
+      this.form.cityId = value[1];
+      this.form.areaId = value[2];
+      this.form.provinceName = CodeToText[value[0]];
+      this.form.cityName = CodeToText[value[1]];
+      this.form.areaName = CodeToText[value[2]];
       console.log("this.provinceName", this.provinceName);
       console.log("addrChange", value);
     },
-    saveJobIntention(){
-      saveJobIntention(this.form).then(res=>{
-        this.$message.success(res.msg)
+    saveJobIntention() {
+      saveJobIntention(this.form).then((res) => {
+        this.$message.success(res.msg);
         // console.log('saveJobIntention',res);
-      })
+      });
     },
-    saveSelfAssessment(){
-      saveSelfAssessment({selfAssessment:this.selfAssessment}).then(res=>{
-        this.$message.success(res.msg)
-      })
+    saveSelfAssessment() {
+      saveSelfAssessment({ selfAssessment: this.selfAssessment }).then(
+        (res) => {
+          this.$message.success(res.msg);
+        }
+      );
+    },
+    updateJobStatus() {
+      console.log("updateJobStatusupdateJobStatus");
+      updateJobStatus({ jobStatus: this.jobStatus }).then((res) => {
+        this.$message.success(res.msg);
+      });
     },
-    updateJobStatus(){
-      console.log('updateJobStatusupdateJobStatus');
-      updateJobStatus({jobStatus:this.jobStatus}).then(res=>{
-        this.$message.success(res.msg)
-      })
-    }
   },
 };
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .c-yellow {
   color: #ff6901;
 }
@@ -336,8 +352,8 @@ export default {
       margin-bottom: 14px;
       position: relative;
       padding-left: 10px;
-      &::before{
-        content:'';
+      &::before {
+        content: "";
         width: 5px;
         height: 5px;
         border-radius: 50%;
@@ -369,30 +385,30 @@ export default {
     margin-bottom: 14px;
   }
 }
-.btn-wrap{
-    text-align: right;
-    .btn{
-      display: inline-block;
-      padding: 0 20px;
-      cursor: pointer;
-      height: 30px;
-      line-height: 30px;
-      background: #709078;
-      color: #fff;
-      font-size: 16px;
-      border-radius: 5px;
-      margin-left: 10px;
-    }
+.btn-wrap {
+  text-align: right;
+  .btn {
+    display: inline-block;
+    padding: 0 20px;
+    cursor: pointer;
+    height: 30px;
+    line-height: 30px;
+    background: #709078;
+    color: #fff;
+    font-size: 16px;
+    border-radius: 5px;
+    margin-left: 10px;
   }
-.resumm-item.self-assessment{
+}
+.resumm-item.self-assessment {
   padding-top: 24px;
   margin-bottom: 0;
-  .textarea{
+  .textarea {
     margin-bottom: 24px;
   }
 }
-:deep(.el-switch){
-  .el-switch__label.is-active{
+:deep(.el-switch) {
+  .el-switch__label.is-active {
     color: #ff6901;
   }
 }

src/views/SkillTraining/SkillPackage/SelectedCourses/SelectedCoursesIndex.vue

@@ -3,7 +3,7 @@
  * @Author: 空白格
  * @Date: 2022-08-26 10:48:52
  * @LastEditors: 空白格
- * @LastEditTime: 2022-08-29 14:19:07
+ * @LastEditTime: 2022-08-29 16:59:59
  * @FilePath: \veterans_client_web\src\views\SkillTraining\SkillPackage\SelectedCourses\SelectedCoursesIndex.vue
  * @Copyright: Copyright (c) 2016~2022 by 空白格, All Rights Reserved.
 -->
@@ -63,6 +63,7 @@
 <script>
 import banner from "@/components/BannerBreadcrumb/index.vue";
 import { listlDetail } from "@/api/SkillTraining/index";
+import { jumpPageAuth } from "@/utils";
 export default {
   name: "DeliverIndex",
   components: { banner },
@@ -112,12 +113,7 @@ export default {
      * @returns {any}
      */
     skillClick(item) {
-      this.$router.push({
-        path: "/skilltraining/coursevideo",
-        query: {
-          id: item.id,
-        },
-      });
+      jumpPageAuth("/skilltraining/coursevideo", { id: item.id }, false)
     },
   },
 };

src/views/SkillTraining/SkillPackage/SkillPackageIndex.vue

@@ -3,7 +3,7 @@
  * @Author: 空白格
  * @Date: 2022-08-26 10:41:50
  * @LastEditors: 空白格
- * @LastEditTime: 2022-08-29 14:44:17
+ * @LastEditTime: 2022-08-29 16:58:38
  * @FilePath: \veterans_client_web\src\views\SkillTraining\SkillPackage\SkillPackageIndex.vue
  * @Copyright: Copyright (c) 2016~2022 by 空白格, All Rights Reserved.
 -->
@@ -50,7 +50,7 @@
             <h3>精选课程</h3>
             <span @click="more">更多></span>
           </div>
-          <div class="swpier-box">
+          <div class="swpier-box" v-if="skillDetail.courseList.length">
             <swiper :options="swiperOption">
               <swiper-slide
                 v-for="(img, index) in skillDetail.courseList"
@@ -67,6 +67,7 @@
             <div class="swiper-button-prev" slot="button-prev"></div>
             <div class="swiper-button-next" slot="button-next"></div>
           </div>
+          <el-empty description="课程数据为空" v-else></el-empty>
         </div>
       </div>
     </div>
@@ -83,6 +84,7 @@
 
 <script>
 import { getSkillDetail } from "@/api/SkillTraining/index";
+import { jumpPageAuth } from "@/utils";
 export default {
   name: "SkillPackageIndex",
   data() {
@@ -143,12 +145,13 @@ export default {
      * @returns {any}
      */
     skillClick(item) {
-      this.$router.push({
-        path: "/skilltraining/coursevideo",
-        query: {
+      jumpPageAuth(
+        "/skilltraining/coursevideo",
+        {
           id: item.id,
         },
-      });
+        false
+      );
     },
   },
 };

src/views/SkillTraining/SkillTrainingIndex.vue

@@ -3,7 +3,7 @@
  * @Author: 空白格
  * @Date: 2022-08-11 17:53:41
  * @LastEditors: 空白格
- * @LastEditTime: 2022-08-29 14:13:24
+ * @LastEditTime: 2022-08-29 16:55:15
  * @FilePath: \veterans_client_web\src\views\SkillTraining\SkillTrainingIndex.vue
  * @Copyright: Copyright (c) 2016~2022 by 空白格, All Rights Reserved.
 -->
@@ -31,10 +31,14 @@
               <div
                 class="stcp-list-item"
                 @click="
-                  jumpPage('/skilltraining/skillpackage', {
-                    id: item.id,
-                    schoolName: item.schoolName,
-                  })
+                  jumpPage(
+                    '/skilltraining/skillpackage',
+                    {
+                      id: item.id,
+                      schoolName: item.schoolName,
+                    },
+                    item
+                  )
                 "
               >
                 <div class="stcp-list-item-image">
@@ -69,6 +73,7 @@
 <script>
 import { mapState } from "vuex";
 import BannerBreadcrumb from "@/components/BannerBreadcrumb";
+import { jumpPageAuth } from "@/utils";
 import {
   getClassNoticeData,
   signUpClass,
@@ -157,11 +162,25 @@ export default {
      * @param {any} query
      * @returns {any}
      */
-    jumpPage(path, query) {
-      this.$router.push({
-        path,
-        query,
-      });
+    jumpPage(path, query, item) {
+      const params = {
+        platform: "4", // 平台:1-H5 2-APP 3-小程序 4-PC端
+        pages: location.href, // 页面路径
+        btnName: "查看技能包详情", // 按钮名称
+        btnEvent: "1", //按钮事件: 1-点击 2-长按 3-滑动
+        ipAddress: "", //IP地址
+        typeName: "技能培训关注度", //类型名称 例：学校关注度 、适应性考试等
+        typeCode: "JNPXGZD", // 类型编码 例：类型名称首字母缩写(XXGZD)
+        categoryName: item.name, //类别名称 例：XX学校，SS考试
+      };
+      if (item) {
+        jumpPageAuth(path, query, true, params, false);
+      } else {
+        this.$router.push({
+          path,
+          query,
+        });
+      }
     },
     /**
      * 分页切换