Merge branch 'release' into dev4.5.6

src/web/staticres/common-module/order-list/js/order-detail.js

@@ -74,7 +74,7 @@ var vm = new Vue({
       productTypeList: assetsConf.productionTypeList,
       prodConf: {
         // 支持再次购买的产品product_type
-        canBuyAgain: assetsConf.cabBuyAgainProductions,
+        canBuyAgain: assetsConf.canBuyAgainProductions,
         // 支持开发票的产品product_type
         canInvoke: assetsConf.canInvokeProductions
       },

src/web/staticres/common-module/order-list/js/order-list-config.js

@@ -19,7 +19,7 @@ var assetsConf = {
     '数据流量包',
   ],
   // 支持再次购买的产品集合
-  cabBuyAgainProductions: [
+  canBuyAgainProductions: [
     '历史数据',
     '数据流量包',
   ],

src/web/staticres/common-module/order-list/js/order-list.js

@@ -8,7 +8,7 @@ var vm = new Vue({
     productTypeList: assetsConf.productionTypeList,
     prodConf: {
       // 支持再次购买的产品product_type
-      canBuyAgain: assetsConf.cabBuyAgainProductions,
+      canBuyAgain: assetsConf.canBuyAgainProductions,
       // 支持开发票的产品product_type
       canInvoke: assetsConf.canInvokeProductions,
       // 销售渠道产品product_type
@@ -279,7 +279,7 @@ var vm = new Vue({
     },
     onRefresh: function () {
       // 重置数据
-      this.tabState.pageNum = 0
+      this.tabState.pageNum = 1
       // 解除加载完成状态
       this.tabState.finished = false
       // 重新加载数据
@@ -745,8 +745,9 @@ var vm = new Vue({
           }
 
           // 不支持取消订单
-          if (courseStatus === 2 || courseStatus === 4) {
+          if (order.course_status === 2 || order.course_status === 4) {
             state.cancelOrderShow = false
+            state.payConfirmShow = false
           }
         }
 

src/web/templates/pc/myOrder.html

@@ -1249,7 +1249,7 @@
               break
             }
             case '大会员': {
-              href = '/front/entniche/orderPay/' + item.order_code
+              href = '/front/member/orderPay/' + item.order_code
               break
             }
             case '大会员-AI中标预测包': {