暂存

src/components/goodsItem/IndexSkuDialog.vue

@@ -134,6 +134,7 @@ export default {
         return
       }
       this.selectGoodIndex = index
+      this.checkedAttrs = []
     },
     cancel() {
       this.$emit("update:skuModal", false);

src/pages/bank-exam-all-explain/index.vue

@@ -628,7 +628,7 @@
                                   </div>
                                   <div
                                     class="explain-list__body"
-                                    v-html="question.analysisContent"
+                                    v-html="json.analysisContent"
                                   ></div>
                                 </div>
                               </div>

src/pages/bank-exam-continue/index.vue

@@ -742,7 +742,7 @@
                                   </div>
                                   <div
                                     class="explain-list__body"
-                                    v-html="question.analysisContent"
+                                    v-html="json.analysisContent"
                                   ></div>
                                 </div>
                               </div>

src/pages/bank-exam-explain/index.vue

@@ -622,7 +622,7 @@
                                   </div>
                                   <div
                                     class="explain-list__body"
-                                    v-html="question.analysisContent"
+                                    v-html="json.analysisContent"
                                   ></div>
                                 </div>
                               </div>

src/pages/bank-exam-wrong-explain/index.vue

@@ -628,7 +628,7 @@
                                   </div>
                                   <div
                                     class="explain-list__body"
-                                    v-html="question.analysisContent"
+                                    v-html="json.analysisContent"
                                   ></div>
                                 </div>
                               </div>

src/pages/bank-exam/index.vue

@@ -856,7 +856,7 @@
                                   </div>
                                   <div
                                     class="explain-list__body"
-                                    v-html="question.analysisContent"
+                                    v-html="json.analysisContent"
                                   ></div>
                                 </div>
                               </div>

src/pages/course-detail/index.vue

@@ -1264,7 +1264,7 @@ export default {
                 this.$router.go(0);
               })
               .catch(() => {});
-          }, 900000);
+          }, 300000);
         }
       } else {
         clearTimeout(this.takeSetInt);
@@ -3629,7 +3629,7 @@ export default {
                     this.confirmStatus = false;
                   });
               }
-            }, 900000);
+            }, 300000);
           }
         });
 

src/pages/course-exam/index.vue

@@ -841,7 +841,7 @@
                                   </div>
                                   <div
                                     class="explain-list__body"
-                                    v-html="question.analysisContent"
+                                    v-html="json.analysisContent"
                                   ></div>
                                 </div>
                               </div>

src/pages/person-center/my-classhour/index/index.vue

@@ -53,7 +53,7 @@
                           item.projectName == '建造师'
                       "
                     >
-                      机构已审核通过，需等待注册中心复审后即可获得继续教育学时。审核时间约15个工作日，届时请前往官网申请证书延期。
+                      机构已审核通过，需等待信息中心复审后即可获得继续教育学时。审核时间约15个工作日，届时请前往官网申请证书延期。
                       <div class="copy-btn">
                         <a @click="copy">复制官网链接</a>
                       </div>

src/pages/person-center/my-course/courseData.vue

@@ -134,7 +134,7 @@
                     <template v-else-if="activeItem.periodStatus == 1">
                       <template v-if="activeItem.periodPlush > 0"
                         ><div class="note note--green">
-                          学时已上报注册中心
+                          学时已上报信息中心
                         </div></template
                       >
                       <template v-else
@@ -560,7 +560,7 @@
                         <template v-else-if="item.periodStatus == 1">
                           <template v-if="item.periodPlush > 0"
                             ><div class="note note--green">
-                              学时已上报注册中心
+                              学时已上报信息中心
                             </div></template
                           >
                           <template v-else

src/pages/person-center/my-course/index copy.vue

@@ -134,7 +134,7 @@
                     <template v-else-if="item.periodStatus == 1">
                       <template v-if="item.periodPlush > 0"
                         ><div class="note note--green">
-                          学时已上报注册中心
+                          学时已上报信息中心
                         </div></template
                       >
                       <template v-else

src/pages/person-center/my-course/index.vue

@@ -1771,10 +1771,10 @@ export default {
             })
             .then(res => {
               if (res.data > 0) {
-                resolve(true);
-              } else {
                 this.$message.warning("请先学习必修商品");
                 resolve(false);
+              } else {
+                resolve(true);
               }
             });
         }

src/pages/person-center/my-invoice/add/index.vue

@@ -75,6 +75,9 @@
           <el-form-item label="发票抬头：" required prop="invoiceTitle">
             <el-input v-model="form.invoiceTitle"></el-input>
           </el-form-item>
+          <el-form-item label="邮箱号：" required prop="email">
+            <el-input v-model="form.email"></el-input>
+          </el-form-item>
 
           <template v-if="form.subject == 2">
             <el-form-item
@@ -205,6 +208,26 @@ export default {
             trigger: ["change", "blur"],
           },
         ],
+        email: [
+          {
+            required: true,
+            message: "请输入邮箱号",
+            // 可以单个或者同时写两个触发验证方式
+            trigger: ["change", "blur"],
+          },
+          {
+            validator: (rule, value, callback) => {
+              var reg = /^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}$/;
+              if (reg.test(value)) {
+                return callback();
+              } else {
+                return callback(new Error("邮箱号格式不正确"));
+              }
+            },
+            // 触发器可以同时用blur和change
+            trigger: ["change", "blur"],
+          },
+        ],
         taxRegistryNumber: [
           {
             required: true,
@@ -385,7 +408,7 @@ export default {
               this.$nextTick(() => {
                 const confirmText = [
                   "您本次的发票申请已经提交成功！",
-                  "机构将在3-7个工作日内进行处理，处理结果会在【发票记录】显示，请留意进度。",
+                  "请稍后留意邮箱。",
                 ];
                 const newDatas = [];
                 const h = this.$createElement;

src/pages/person-center/my-invoice/index/index.vue

@@ -82,6 +82,8 @@
             {{
               scope.row.invoiceStatus == 1
                 ? "未开票"
+                : scope.row.invoiceStatus == 3
+                ? "开票中"
                 : scope.row.invoiceStatus == 2
                 ? "已开票"
                 : scope.row.invoiceStatus == -1
@@ -102,9 +104,9 @@
             <el-button
               v-if="
                 scope.row.periodStatus == 3 &&
-                (scope.row.invoiceStatus == 2 ||
-                  scope.row.invoiceStatus == -1) &&
-                scope.row.invoiceImg
+                  (scope.row.invoiceStatus == 2 ||
+                    scope.row.invoiceStatus == -1) &&
+                  scope.row.invoiceImg
               "
               @click.native.prevent="download(scope.row)"
               type="text"
@@ -226,14 +228,17 @@
               <span class="text refuse" v-if="invoiceDetail.invoiceStatus == -1"
                 >已退票</span
               >
+              <span class="text refuse" v-if="invoiceDetail.invoiceStatus == 3"
+                >开票中</span
+              >
             </el-descriptions-item>
             <el-descriptions-item
               label="发票预览"
               v-if="
                 invoiceDetail.periodStatus == 3 &&
-                (invoiceDetail.invoiceStatus == 2 ||
-                  invoiceDetail.invoiceStatus == -1) &&
-                invoiceDetail.invoiceImg
+                  (invoiceDetail.invoiceStatus == 2 ||
+                    invoiceDetail.invoiceStatus == -1) &&
+                  invoiceDetail.invoiceImg
               "
             >
               <div class="preview-wrap">
@@ -241,7 +246,7 @@
                   class="preview"
                   :src="$tools.splitImgHost(invoiceDetail.invoiceImg)"
                   :preview-src-list="[
-                    $tools.splitImgHost(invoiceDetail.invoiceImg),
+                    $tools.splitImgHost(invoiceDetail.invoiceImg)
                   ]"
                 ></el-image>
               </div>
@@ -254,10 +259,10 @@
               label="机构发票邮寄状态"
               v-if="
                 invoiceDetail.periodStatus == 3 &&
-                (invoiceDetail.invoiceStatus == 2 ||
-                  invoiceDetail.invoiceStatus == -1) &&
-                invoiceDetail.type == 2 &&
-                invoiceDetail.subject == 2
+                  (invoiceDetail.invoiceStatus == 2 ||
+                    invoiceDetail.invoiceStatus == -1) &&
+                  invoiceDetail.type == 2 &&
+                  invoiceDetail.subject == 2
               "
             >
               <span class="text" v-if="invoiceDetail.sendInvoice == 1">是</span>
@@ -268,11 +273,11 @@
               label="发票邮寄快递单号：(点击可复制)"
               v-if="
                 invoiceDetail.periodStatus == 3 &&
-                (invoiceDetail.invoiceStatus == 2 ||
-                  invoiceDetail.invoiceStatus == -1) &&
-                invoiceDetail.sendInvoice == 1 &&
-                invoiceDetail.type == 2 &&
-                invoiceDetail.subject == 2
+                  (invoiceDetail.invoiceStatus == 2 ||
+                    invoiceDetail.invoiceStatus == -1) &&
+                  invoiceDetail.sendInvoice == 1 &&
+                  invoiceDetail.type == 2 &&
+                  invoiceDetail.subject == 2
               "
             >
               {{ invoiceDetail.trackingNum }}
@@ -302,15 +307,15 @@ export default {
   data() {
     return {
       invoiceDetail: {
-        amount: 0,
+        amount: 0
       },
       invoiceDetailModal: false,
       tableData: [],
       params: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 10
       },
-      total: 0,
+      total: 0
     };
   },
   mounted() {
@@ -322,7 +327,7 @@ export default {
         "撤销申请后，",
         "本次的发票申请内容将不存在。",
         "请慎重考虑。",
-        "您确定要取消本次发票申请吗？",
+        "您确定要取消本次发票申请吗？"
       ];
       const newDatas = [];
       const h = this.$createElement;
@@ -335,27 +340,27 @@ export default {
         closeOnClickModal: false,
         closeOnPressEscape: false,
         distinguishCancelAndClose: false,
-        showClose: false,
+        showClose: false
       })
-        .then((_) => {
+        .then(_ => {
           let invoiceDetail = JSON.parse(JSON.stringify(this.invoiceDetail));
           invoiceDetail.status = -1;
-          this.$request.orderInvoiceCancel(invoiceDetail).then((res) => {
+          this.$request.orderInvoiceCancel(invoiceDetail).then(res => {
             this.orderInvoiceList();
             this.invoiceDetailModal = false;
             this.$message({
               type: "success",
-              message: "撤销成功",
+              message: "撤销成功"
             });
           });
         })
-        .catch((_) => {
+        .catch(_ => {
           console.log(_);
         });
     },
     apply() {
       this.$router.push({
-        path: "/person-center/my-invoice/add",
+        path: "/person-center/my-invoice/add"
       });
     },
 
@@ -367,14 +372,14 @@ export default {
     orderInvoiceList() {
       this.$request
         .orderInvoiceList(this.params)
-        .then((res) => {
+        .then(res => {
           this.tableData = res.rows;
           this.total = res.total;
         })
-        .catch((err) => {
+        .catch(err => {
           this.$message({
             type: "error",
-            message: err.msg,
+            message: err.msg
           });
         });
     },
@@ -398,7 +403,7 @@ export default {
       var image = new Image();
       // 解决跨域 Canvas 污染问题,
       image.setAttribute("crossorigin", "anonymous");
-      image.onload = function () {
+      image.onload = function() {
         var canvas = document.createElement("canvas");
         canvas.width = image.width;
         canvas.height = image.height;
@@ -412,8 +417,8 @@ export default {
         a.dispatchEvent(event); // 触发a的单击事件
       };
       image.src = url + "?time=" + Date.now(); //注意，这里是灵魂，否则依旧会产生跨域问题
-    },
-  },
+    }
+  }
 };
 </script>