订阅 一年

src/views/bookShelf/bookItem.vue

@@ -172,7 +172,7 @@
                 :loading="createOrderLoading"
                 >立即购买</a
               >
-              <a class="upgrade" @click="handleChangeWay('dui')">使用兑换码</a>
+              <!-- <a class="upgrade" @click="handleChangeWay('dui')">使用兑换码</a> -->
               <a
                 class="upgrade"
                 v-if="bookType === 'baozhi' || bookType === 'huakan'"

src/views/bookShelf/bookPeruseItem.vue

@@ -103,7 +103,7 @@
                 :loading="createOrderLoading"
                 >立即购买</a
               >
-              <a class="upgrade" @click="handleChangeWay('dui')">使用兑换码</a>
+              <!-- <a class="upgrade" @click="handleChangeWay('dui')">使用兑换码</a> -->
               <a class="upgrade" @click="linkSubscribe">多期订阅</a>
             </template>
           </div>

src/views/bookShelf/components/Payment.vue

@@ -70,11 +70,11 @@ export default {
     //这里存放数据
     return {
       payList: [
-        {
-          img: require("../../../assets/duihuanma.png"),
-          label: "兑换码",
-          type: "dui",
-        },
+        // {
+        //   img: require("../../../assets/duihuanma.png"),
+        //   label: "兑换码",
+        //   type: "dui",
+        // },
         {
           img: require("../../../assets/weixin.png"),
           label: "微信支付",

src/views/bookStore/Subscribe.vue

@@ -186,7 +186,7 @@
                 </ul>
                 <div
                   v-if="
-                    orderTotalNumber === -1 &&
+                    orderTotalNumber === 1000 &&
                     info.issue_no_school_year_list.length > 0
                   "
                   class="custom-box"
@@ -239,43 +239,49 @@
                     </li>
                   </ul>
                 </div>
-                <b v-if="orderTotalNumber !== -1"
-                  >{{ info.issue_no_begin }} - {{ info.issue_no_end }}</b
-                >
-                <b v-else>已选 {{ customOrderNumberList.length }} 期</b>
-                <el-tooltip placement="bottom" style="height: 32px">
-                  <div slot="content">
-                    <el-table
-                      class="order-table"
-                      :data="orderTable"
-                      max-height="200px"
-                      style="width: 317px"
-                    >
-                      <el-table-column label="#" type="index" width="30">
-                      </el-table-column>
-                      <el-table-column
-                        property="issue_no"
-                        label="期"
-                        width="112"
-                      >
-                      </el-table-column>
-                      <el-table-column
-                        property="shelve_date"
-                        label="发行日期"
-                        width="100"
+                <template v-if="orderTotalNumber !== -1">
+                  <b v-if="orderTotalNumber !== 1000"
+                    >{{ info.issue_no_begin }} - {{ info.issue_no_end }}</b
+                  >
+                  <b v-else>已选 {{ customOrderNumberList.length }} 期</b>
+                  <el-tooltip placement="bottom" style="height: 32px">
+                    <div slot="content">
+                      <el-table
+                        class="order-table"
+                        :data="orderTable"
+                        max-height="200px"
+                        style="width: 317px"
                       >
-                      </el-table-column>
-                      <el-table-column property="price" label="价格" width="75">
-                        <template slot-scope="scope">
-                          {{ scope.row.price | cutMoneyFiter }}
-                        </template>
-                      </el-table-column>
-                    </el-table>
-                  </div>
-                  <el-button class="tooltip-btn"
-                    ><svg-icon icon-class="icon-mark"></svg-icon
-                  ></el-button>
-                </el-tooltip>
+                        <el-table-column label="#" type="index" width="30">
+                        </el-table-column>
+                        <el-table-column
+                          property="issue_no"
+                          label="期"
+                          width="112"
+                        >
+                        </el-table-column>
+                        <el-table-column
+                          property="shelve_date"
+                          label="发行日期"
+                          width="100"
+                        >
+                        </el-table-column>
+                        <el-table-column
+                          property="price"
+                          label="价格"
+                          width="75"
+                        >
+                          <template slot-scope="scope">
+                            {{ scope.row.price | cutMoneyFiter }}
+                          </template>
+                        </el-table-column>
+                      </el-table>
+                    </div>
+                    <el-button class="tooltip-btn"
+                      ><svg-icon icon-class="icon-mark"></svg-icon
+                    ></el-button>
+                  </el-tooltip>
+                </template>
               </div>
             </div>
             <div class="info-item order-item" v-if="bookType === 'jingdu'">
@@ -444,9 +450,13 @@ export default {
           value: 40,
         },
         {
-          label: "自定义",
+          label: "一年（365天）",
           value: -1,
         },
+        {
+          label: "自定义",
+          value: 1000,
+        },
       ],
       orderTable: [
         {
@@ -659,49 +669,52 @@ export default {
       if (flag) {
       }
       if (this.bookType === "baozhi") {
-        let MethodName =
-          "/ShopServer/Client/ReservationQuery/GetReservationInfo_Issue";
-        let data = {
-          goods_type: 2,
-          study_phase: this.studyType,
-          period_count:
-            this.orderTotalNumber !== -1
-              ? this.orderTotalNumber
-              : this.customOrderNumberList.length,
-          is_custom_select_issue_no:
-            this.orderTotalNumber !== -1 ? "false" : "true",
-        };
-        getLogin(MethodName, data)
-          .then((res) => {
-            this.loading = false;
-            if (res.status === 1) {
-              this.info = res;
-              this.orderTable = res.issue_no_list;
-              res.issue_no_school_year_list.forEach((item) => {
-                item.issue_no_list.forEach((items, indexs) => {
-                  const regex = /[\u4e00-\u9fa5]/g;
-                  if (regex.test(items.issue_no)) {
-                    items.width = Math.ceil(items.issue_no.length / 3);
-                    items.number = item.issue_no_list[indexs - 1]
-                      ? item.issue_no_list[indexs - 1].number +
-                        Math.ceil(items.issue_no.length / 3)
-                      : Math.ceil(items.issue_no.length / 3);
-                  } else {
-                    items.width = 1;
-                    items.number = item.issue_no_list[indexs - 1]
-                      ? item.issue_no_list[indexs - 1].number + 1
-                      : 1;
-                  }
+        if (this.orderTotalNumber !== -1) {
+          let MethodName =
+            "/ShopServer/Client/ReservationQuery/GetReservationInfo_Issue";
+          let data = {
+            goods_type: 2,
+            study_phase: this.studyType,
+            period_count:
+              this.orderTotalNumber !== 1000
+                ? this.orderTotalNumber
+                : this.customOrderNumberList.length,
+            is_custom_select_issue_no:
+              this.orderTotalNumber !== 1000 ? "false" : "true",
+          };
+          getLogin(MethodName, data)
+            .then((res) => {
+              this.loading = false;
+              if (res.status === 1) {
+                this.info = res;
+                this.orderTable = res.issue_no_list;
+                res.issue_no_school_year_list.forEach((item) => {
+                  item.issue_no_list.forEach((items, indexs) => {
+                    const regex = /[\u4e00-\u9fa5]/g;
+                    if (regex.test(items.issue_no)) {
+                      items.width = Math.ceil(items.issue_no.length / 3);
+                      items.number = item.issue_no_list[indexs - 1]
+                        ? item.issue_no_list[indexs - 1].number +
+                          Math.ceil(items.issue_no.length / 3)
+                        : Math.ceil(items.issue_no.length / 3);
+                    } else {
+                      items.width = 1;
+                      items.number = item.issue_no_list[indexs - 1]
+                        ? item.issue_no_list[indexs - 1].number + 1
+                        : 1;
+                    }
+                  });
                 });
-              });
-            }
-          })
-          .catch(() => {
-            this.loading = false;
-          });
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        }
+
         if (
           this.totalLength >=
-          (this.orderTotalNumber !== -1
+          (this.orderTotalNumber !== 1000
             ? this.orderTotalNumber
             : this.customOrderNumberList.length)
         ) {
@@ -711,6 +724,49 @@ export default {
         }
       } else if (this.bookType === "huakan") {
         this.loading = false;
+        if (this.orderTotalNumber !== -1) {
+          let MethodName =
+            "/ShopServer/Client/ReservationQuery/GetReservationInfo_Issue";
+          let data = {
+            goods_type: 4,
+            study_phase: 1,
+            period_count:
+              this.orderTotalNumber !== 1000
+                ? this.orderTotalNumber
+                : this.customOrderNumberList.length,
+            is_custom_select_issue_no:
+              this.orderTotalNumber !== 1000 ? "false" : "true",
+          };
+          getLogin(MethodName, data)
+            .then((res) => {
+              this.loading = false;
+              if (res.status === 1) {
+                this.info = res;
+                this.orderTable = res.issue_no_list;
+                res.issue_no_school_year_list.forEach((item) => {
+                  item.issue_no_list.forEach((items, indexs) => {
+                    const regex = /[\u4e00-\u9fa5]/g;
+                    if (regex.test(items.issue_no)) {
+                      items.width = Math.ceil(items.issue_no.length / 3);
+                      items.number = item.issue_no_list[indexs - 1]
+                        ? item.issue_no_list[indexs - 1].number +
+                          Math.ceil(items.issue_no.length / 3)
+                        : Math.ceil(items.issue_no.length / 3);
+                    } else {
+                      items.width = 1;
+                      items.number = item.issue_no_list[indexs - 1]
+                        ? item.issue_no_list[indexs - 1].number + 1
+                        : 1;
+                    }
+                  });
+                });
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        }
+
         // this.info = {
         //   issue_no_end: "928",
         //   issue_no_school_year_list: [],
@@ -741,49 +797,10 @@ export default {
         //     },
         //   ],
         // };
-        let MethodName =
-          "/ShopServer/Client/ReservationQuery/GetReservationInfo_Issue";
-        let data = {
-          goods_type: 4,
-          study_phase: 1,
-          period_count:
-            this.orderTotalNumber !== -1
-              ? this.orderTotalNumber
-              : this.customOrderNumberList.length,
-          is_custom_select_issue_no:
-            this.orderTotalNumber !== -1 ? "false" : "true",
-        };
-        getLogin(MethodName, data)
-          .then((res) => {
-            this.loading = false;
-            if (res.status === 1) {
-              this.info = res;
-              this.orderTable = res.issue_no_list;
-              res.issue_no_school_year_list.forEach((item) => {
-                item.issue_no_list.forEach((items, indexs) => {
-                  const regex = /[\u4e00-\u9fa5]/g;
-                  if (regex.test(items.issue_no)) {
-                    items.width = Math.ceil(items.issue_no.length / 3);
-                    items.number = item.issue_no_list[indexs - 1]
-                      ? item.issue_no_list[indexs - 1].number +
-                        Math.ceil(items.issue_no.length / 3)
-                      : Math.ceil(items.issue_no.length / 3);
-                  } else {
-                    items.width = 1;
-                    items.number = item.issue_no_list[indexs - 1]
-                      ? item.issue_no_list[indexs - 1].number + 1
-                      : 1;
-                  }
-                });
-              });
-            }
-          })
-          .catch(() => {
-            this.loading = false;
-          });
+
         if (
           this.totalLength >=
-          (this.orderTotalNumber !== -1
+          (this.orderTotalNumber !== 1000
             ? this.orderTotalNumber
             : this.customOrderNumberList.length)
         ) {
@@ -832,11 +849,11 @@ export default {
         goods_type: this.bookType === "huakan" ? 4 : 2,
         study_phase: this.studyType,
         period_count:
-          this.orderTotalNumber !== -1
+          this.orderTotalNumber !== 1000
             ? this.orderTotalNumber
             : this.customOrderNumberList.length,
         is_custom_select_issue_no:
-          this.orderTotalNumber !== -1 ? "false" : "true",
+          this.orderTotalNumber !== 1000 ? "false" : "true",
         issue_no_list: this.customOrderNumberList,
       };
       getLogin(MethodName, data)
@@ -920,11 +937,11 @@ export default {
           this.bookType === "jingdu" ? 3 : this.bookType === "huakan" ? 4 : 2,
         goods_study_phase: this.bookType === "huakan" ? 1 : this.studyType,
         period_count:
-          this.orderTotalNumber !== -1
+          this.orderTotalNumber !== 1000
             ? this.orderTotalNumber
             : this.customOrderNumberList.length,
         is_custom_select_issue_no:
-          this.orderTotalNumber !== -1 ? "false" : "true",
+          this.orderTotalNumber !== 1000 ? "false" : "true",
         issue_no_list: this.customOrderNumberList,
         pay_type:
           this.payWay === "wei"
@@ -991,7 +1008,7 @@ export default {
         goods_type: this.bookType === "baozhi" ? 2 : 4,
         study_phase: this.bookType === "baozhi" ? this.studyType : 1,
         period_count:
-          this.orderTotalNumber !== -1
+          this.orderTotalNumber !== 1000
             ? this.orderTotalNumber
             : this.customOrderNumberList.length,
         is_custom_select_issue_no: "true",
@@ -1186,7 +1203,7 @@ export default {
           display: flex;
           flex-flow: wrap;
           border-bottom: 1px solid #ebebeb;
-          width: 592px;
+          width: 600px;
           margin-top: 48px;
           .info-item {
             width: 50%;
@@ -1373,7 +1390,7 @@ export default {
 }
 .sales-box {
   display: flex;
-  width: 592px;
+  width: 600px;
   padding: 16px;
   border-radius: 4px;
   background: #f5f5f5;