natasha пре 3 недеља
родитељ
комит
590cabd875
1 измењених фајлова са 39 додато и 32 уклоњено
  1. 39 32
      src/views/bookStore/Subscribe.vue

+ 39 - 32
src/views/bookStore/Subscribe.vue

@@ -191,7 +191,7 @@
                       ><svg-icon icon-class="icon-mark"></svg-icon
                       ><svg-icon icon-class="icon-mark"></svg-icon
                     ></el-button>
                     ></el-button>
                   </el-tooltip>
                   </el-tooltip>
-                  <el-tooltip
+                  <!-- <el-tooltip
                     placement="right"
                     placement="right"
                     style="height: 32px"
                     style="height: 32px"
                     v-if="studyTips"
                     v-if="studyTips"
@@ -200,7 +200,7 @@
                     <el-button class="tooltip-btn"
                     <el-button class="tooltip-btn"
                       ><svg-icon icon-class="icon-mark"></svg-icon
                       ><svg-icon icon-class="icon-mark"></svg-icon
                     ></el-button>
                     ></el-button>
-                  </el-tooltip>
+                  </el-tooltip> -->
                 </ul>
                 </ul>
                 <div
                 <div
                   v-if="
                   v-if="
@@ -999,7 +999,7 @@ export default {
       this.handleCoverSrc();
       this.handleCoverSrc();
       this.handleOrderYearStartNO();
       this.handleOrderYearStartNO();
       await this.handleIssueLength();
       await this.handleIssueLength();
-      this.handleBeginDate();
+      // this.handleBeginDate();
     },
     },
     changeOrderNumber(item, flag) {
     changeOrderNumber(item, flag) {
       if (flag && item.value !== -2) return false;
       if (flag && item.value !== -2) return false;
@@ -1210,38 +1210,45 @@ export default {
       }
       }
     },
     },
     // 计算学段的下一学段与起始日期
     // 计算学段的下一学段与起始日期
-    handleBeginDate() {
-      let MethodName =
-        "/ShopServer/Client/ReservationQuery/ComputeNextStudyPhaseAndBeginDate";
-      let data = {
-        study_phase: this.bookType === "baozhi" ? this.studyType : 1,
-      };
-      getLogin(MethodName, data)
-        .then((res) => {
-          this.studyTips =
-            res.begin_date + "自动升学为" + res.next_study_phase_name + "内容";
-        })
-        .catch(() => {});
-    },
+    handleBeginDate() {},
     // 计算年订阅起始期数
     // 计算年订阅起始期数
     handleOrderYearStartNO() {
     handleOrderYearStartNO() {
-      let MethodName =
-        "/ShopServer/Client/ReservationQuery/GetYearReservationStartNO";
-      let data = {
-        goods_type: this.bookType === "baozhi" ? 2 : 4,
+      let MethodNames =
+        "/ShopServer/Client/ReservationQuery/ComputeNextStudyPhaseAndBeginDate";
+      let datas = {
         study_phase: this.bookType === "baozhi" ? this.studyType : 1,
         study_phase: this.bookType === "baozhi" ? this.studyType : 1,
       };
       };
-      getLogin(MethodName, data)
-        .then((res) => {
-          if (res.status === 1 && res.issue_no_start) {
-            this.orderList[5].label =
-              "年订阅(当月起订," + res.issue_no_start + "期起)";
-            this.orderList[6].label =
-              "年订阅(当月起订," + res.issue_no_start + "期起)(自动升学)";
-          } else {
-            this.orderList[5].label = "年订阅(当月起订)";
-            this.orderList[5].label = "年订阅(当月起订)(自动升学)";
-          }
+      getLogin(MethodNames, datas)
+        .then((ress) => {
+          this.studyTips =
+            ress.begin_date +
+            "自动升学为" +
+            ress.next_study_phase_name +
+            "内容";
+          let MethodName =
+            "/ShopServer/Client/ReservationQuery/GetYearReservationStartNO";
+          let data = {
+            goods_type: this.bookType === "baozhi" ? 2 : 4,
+            study_phase: this.bookType === "baozhi" ? this.studyType : 1,
+          };
+          getLogin(MethodName, data)
+            .then((res) => {
+              if (res.status === 1 && res.issue_no_start) {
+                this.orderList[5].label =
+                  "年订阅(当月起订," + res.issue_no_start + "期起)";
+                this.orderList[6].label =
+                  "年订阅(当月起订," +
+                  res.issue_no_start +
+                  "期起)(" +
+                  this.studyTips +
+                  ")";
+              } else {
+                this.orderList[5].label = "年订阅(当月起订)";
+                this.orderList[5].label =
+                  "年订阅(当月起订)(" + this.studyTips + ")";
+              }
+            })
+            .catch(() => {});
         })
         })
         .catch(() => {});
         .catch(() => {});
     },
     },
@@ -1297,7 +1304,7 @@ export default {
       this.handleOrder();
       this.handleOrder();
     }
     }
     this.getTotalSales();
     this.getTotalSales();
-    this.handleBeginDate();
+    // this.handleBeginDate();
   },
   },
   //生命周期 - 挂载完成(可以访问DOM元素)
   //生命周期 - 挂载完成(可以访问DOM元素)
   mounted() {
   mounted() {