fix

src/api/login.js

@@ -11,7 +11,10 @@ export function login(username, password, code, uuid, phonenumber, smsCode) {
   return request({
     url: '/login',
     method: 'post',
-    data: data
+    data: data,
+    headers: {
+      isToken: false
+    },
   })
 }
 

src/components/tableList.vue

@@ -1413,11 +1413,14 @@
         v-if="navText.gftsStatus"
       >
         <template slot-scope="scope">
-          {{
-            scope.row.officialStatus === 1
+          <el-popover width="300" trigger="hover">
+            <p>官方信息推送结果：{{ scope.row.officialStatusMsg || "无" }}</p>
+            <el-button type="text" slot="reference">{{
+               scope.row.officialStatus === 1
               ? `是(${scope.row.officialStatusNum})`
               : "否"
-          }}
+            }}</el-button>
+          </el-popover>
         </template>
       </el-table-column>
       <el-table-column
@@ -1429,7 +1432,6 @@
         <template slot-scope="scope">
           <el-popover width="300" trigger="hover">
             <p>学时推送结果：{{ scope.row.periodPlushMsg || "无" }}</p>
-            <p>官方信息推送结果：{{ scope.row.officialStatusMsg || "无" }}</p>
             <el-button type="text" slot="reference">{{
               scope.row.periodPlush ? "已上报" : "未上报"
             }}</el-button>

src/views/Marketing/goods/commodityManageMent/index.vue

@@ -39,7 +39,8 @@
       </template>
       <template slot="btn" slot-scope="props">
         <el-button
-          v-if="false&&
+          v-if="
+            false &&
             props.scope.row.goodsType == 1 &&
             props.scope.row.courseNum &&
             props.scope.row.courseNum > 0 &&
@@ -301,6 +302,7 @@ export default {
           label: "科目",
           prop: "subjectNames",
           hidden: true,
+          width: "250px",
         },
         {
           label: "专业",
@@ -843,4 +845,3 @@ export default {
   }
 }
 </style>
-

src/views/Marketing/order/offlineOrder/batchRecord/firstStep/index.vue

@@ -108,6 +108,15 @@
                 ></span
               >
             </div>
+            <div v-else-if="item.scope === 'sex'">
+              {{
+                scope.row[item.prop] == 1
+                  ? "男"
+                  : scope.row[item.prop] == 2
+                  ? "女"
+                  : ""
+              }}
+            </div>
             <div v-else-if="item.scope === 'set'">
               <el-button type="text" @click="delStudent(scope.$index)"
                 >删除</el-button
@@ -176,14 +185,23 @@ export default {
           label: "学员身份证",
           prop: "idCard",
         },
+        {
+          label: "科目",
+          prop: "subjectIds",
+          scope: "sujectList",
+        },
         {
           label: "所在公司",
           prop: "companyName",
         },
         {
-          label: "科目",
-          prop: "subjectIds",
-          scope: "sujectList",
+          label: "性别",
+          prop: "sex",
+          scope: "sex",
+        },
+        {
+          label: "学历",
+          prop: "eduLevel",
         },
         {
           label: "操作",
@@ -247,7 +265,7 @@ export default {
       for (let i = 0; i < this.newBusinessLevel.length; i++) {
         if (this.newBusinessLevel[i].id === this.topData.businessId) {
           this.topData.projectId = this.newBusinessLevel[i].projectId;
-          this.topData.templateStatus = this.newBusinessLevel[i].templateStatus
+          this.topData.templateStatus = this.newBusinessLevel[i].templateStatus;
           break;
         }
       }
@@ -263,29 +281,41 @@ export default {
     uploadList(arr) {
       let ays = JSON.parse(JSON.stringify(arr));
       ays.forEach((item) => {
-        if(item.subjectIds){
+        if (item.sex) {
+          if (item.sex == "男") {
+            item.sex = 1;
+          }
+          if (item.sex == "女") {
+            item.sex = 2;
+          }
+        }
+        if (item.subjectIds) {
           item.subjectIds = item.subjectIds.split(",").map(Number);
-        }else{
-          item.subjectIds = []
+        } else {
+          item.subjectIds = [];
         }
       });
-      if(this.tableData && this.tableData.length > 0){
-        const data = new Set()
+      if (this.tableData && this.tableData.length > 0) {
+        const data = new Set();
         this.tableData.forEach((item) => {
           ays.forEach((as) => {
-            if(item.telphone == as.telphone && as.companyName && as.companyName != ''){
-              item.companyName = as.companyName
-            }else{
-              data.add(as)
+            if (
+              item.telphone == as.telphone &&
+              as.companyName &&
+              as.companyName != ""
+            ) {
+              item.companyName = as.companyName;
+            } else {
+              data.add(as);
             }
-          })
-        })
-        if(data && data.size > 0){
+          });
+        });
+        if (data && data.size > 0) {
           let newObjs = this.tableData.concat(Array.from(data));
           this.tableData = this.$methodsTools.uniqueFunc(newObjs, "userId");
         }
-      }else{
-        this.tableData = ays
+      } else {
+        this.tableData = ays;
       }
     },
     /**

src/views/resource/videoManagement/festival/add/index.vue

@@ -636,6 +636,7 @@ export default {
       var self = this;
       const valueUrl = val.replace(/\s/g, "");
       if (valueUrl && valueUrl.length > 30) {
+        this.disabledBtn = true;
         this.$api
           .inquirepolyvvideo(valueUrl)
           .then((res) => {
@@ -648,6 +649,9 @@ export default {
           })
           .catch((err) => {
             self.disabloutime = false;
+          })
+          .finally(() => {
+            this.disabledBtn = false;
           });
       }
     },
@@ -1138,7 +1142,7 @@ export default {
     },
   },
   destroyed() {
-    this.closePlayer()
+    this.closePlayer();
   },
 };
 </script>

src/views/resource/videoManagement/festival/edit/index.vue

@@ -622,6 +622,7 @@ export default {
       this.clearTimes(val);
       const valueUrl = val.replace(/\s/g, "");
       if (valueUrl && valueUrl.length > 30) {
+        this.disabledBtn = true;
         this.$api
           .inquirepolyvvideo(valueUrl)
           .then((res) => {
@@ -634,6 +635,9 @@ export default {
           })
           .catch((err) => {
             self.disabloutime = false;
+          })
+          .finally(() => {
+            this.disabledBtn = false;
           });
       }
     },
@@ -1208,7 +1212,7 @@ export default {
     },
   },
   destroyed() {
-    this.closePlayer()
+    this.closePlayer();
   },
 };
 </script>
@@ -1351,4 +1355,4 @@ export default {
   color: #67c23a;
   cursor: pointer;
 }
-</style>
+</style>