fix

src/components/dataReview/index.vue

@@ -212,16 +212,16 @@ export default {
       //获取初始数据
       try {
         await this.getInitData();
-        console.log('1')
+        console.log("1");
         //获取历史数据
         await this.getHistoricalRecord();
-        console.log('2')
+        console.log("2");
         this.isShow = true;
         //回填数据
         this.backFillData();
-        console.log('3')
+        console.log("3");
       } catch (error) {
-        console.log('4')
+        console.log("4");
         console.log("抛出：", error);
       }
     },
@@ -351,7 +351,10 @@ export default {
                 showClose: false
               })
                 .then(_ => {
-                  this.historyData = JSON.parse(res.data.keyValue); //历史数据
+                  this.historyData = Object.assign(
+                    { id: res.data.id },
+                    JSON.parse(res.data.keyValue)
+                  ); //历史数据
                   resolve();
                 })
                 .catch(_ => {

src/components/goodsItem/IndexSkuDialog.vue

@@ -16,7 +16,7 @@
             :key="index"
             class="check_items"
           >
-            <div class="grades" v-if="specList.length > 1">{{ item.name }}</div>
+            <div class="grades" v-if="specList.length >= 1">{{ item.name }}</div>
             <div class="mains" v-if="index == 0 && specList.length > 1">
               <div class="grade_names">
                 <div

src/components/videoCy/index.vue

@@ -238,7 +238,7 @@ export default {
     //施工继教
     ShiPhotoList(totalVideoTime) {
       //施工继教带年份的订单拍照设置
-      let time1 = 2761; //拍照间隔多久一张 46分钟
+      let time1 = 50 * 60; //拍照间隔多久一张 50分钟
       let num = Math.trunc(totalVideoTime / time1) + 1; //拍照数量
       let photoList = [];
       for (let i = 0; i < num; i++) {

src/pages/payment/index.vue

@@ -232,6 +232,8 @@ export default {
             this.checkGoodsList[i].educationName == "继续教育" &&
             this.checkGoodsList[i].projectName == "施工现场专业人员" &&
             this.checkGoodsList[i].businessName == "七大员" &&
+            this.checkGoodsList[i].sevenYear != "2021" &&
+            this.checkGoodsList[i].sevenYear != "2022" &&
             (!this.$store.state.userInfo.realname ||
               !this.$store.state.userInfo.idCard ||
               !this.$store.state.userInfo.companyName ||