Merge branch 'dev/v4.9.21_tsz' of qmx/jy into release/v4.9.21

src/web/templates/areaPack/pc/page_order.html

@@ -305,14 +305,7 @@
 
 
             $(".openinvoice").on("click", function () {
-                // return false // 待可开发票时删除
-                $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (r) {
-                    if (r.status != 1) {
-                        window.open("/front/order/invoicetimeOut", '_self');
-                    } else {
-                        window.open("/front/order/invoice/" + orderCode, '_self');
-                    }
-                })
+              window.open("/front/order/invoice/" + orderCode, '_self');
             })
         })
 

src/web/templates/frontRouter/pc/dataFile/sess/orderDetail.html

@@ -229,14 +229,7 @@
 
 
             $(".openinvoice").on("click", function () {
-              // return false // 待可开发票时删除
-                $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (r) {
-                    if (r.status != 1) {
-                        window.open("/front/order/invoicetimeOut", '_self');
-                    } else {
-                        window.open("/front/order/invoice/" + orderCode, '_self');
-                    }
-                })
+              window.open("/front/order/invoice/" + orderCode, '_self');
             })
         })
 

src/web/templates/order/pc/bidfile/bidfileDetail.html

@@ -221,14 +221,7 @@
 
 
             $(".openinvoice").on("click", function () {
-              // return false // 待可开发票时删除
-                $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (r) {
-                    if (r.status != 1) {
-                        window.open("/front/order/invoicetimeOut", '_self');
-                    } else {
-                        window.open("/front/order/invoice/" + orderCode, '_self');
-                    }
-                })
+              window.open("/front/order/invoice/" + orderCode, '_self');
             })
 
             $(".payOrder").on("click", function () {

src/web/templates/order/pc/buyerPortraitPack/detail.html

@@ -232,14 +232,7 @@
 
 
             $(".openinvoice").on("click", function () {
-                //return false // 待可开发票时删除
-                $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (r) {
-                    if (r.status != 1) {
-                        window.open("/front/order/invoicetimeOut", '_self');
-                    } else {
-                        window.open("/front/order/invoice/" + orderCode, '_self');
-                    }
-                })
+              window.open("/front/order/invoice/" + orderCode, '_self');
             })
         })
 

src/web/templates/order/pc/datareport/detail.html

@@ -196,15 +196,7 @@
 
 
             $(".openinvoice").on("click", function () {
-              // return false // 待可开发票时删除
-                $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (r) {
-                    var hash = escape("超级订阅");
-                    if (r.status != 1) {
-                        window.open("/front/order/invoicetimeOut", '_self');
-                    } else {
-                        window.open("/front/order/invoice/" + orderCode, '_self');
-                    }
-                })
+              window.open("/front/order/invoice/" + orderCode, '_self');
             })
             $(".payOrder").on("click", function () {
                 location.href = "/front/datareport/orderPay/" + orderCode;

src/web/templates/order/pc/filePack/detail.html

@@ -232,14 +232,7 @@
 
 
             $(".openinvoice").on("click", function () {
-                //return false // 待可开发票时删除
-                $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (r) {
-                    if (r.status != 1) {
-                        window.open("/front/order/invoicetimeOut", '_self');
-                    } else {
-                        window.open("/front/order/invoice/" + orderCode, '_self');
-                    }
-                })
+              window.open("/front/order/invoice/" + orderCode, '_self');
             })
         })
 

src/web/templates/order/pc/integral/integralDetail.html

@@ -243,14 +243,7 @@
 
 
             $(".openinvoice").on("click", function () {
-              // return false // 待可开发票时删除
-                $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (r) {
-                    if (r.status != 1) {
-                        window.open("/front/order/invoicetimeOut", '_self');
-                    } else {
-                        window.open("/front/order/invoice/" + orderCode, '_self');
-                    }
-                })
+              window.open("/front/order/invoice/" + orderCode, '_self');
             })
 
             $(".payOrder").on("click", function () {

src/web/templates/pc/aiPack_orderDetail.html

@@ -266,14 +266,7 @@
 
 
             $(".openinvoice").on("click", function () {
-              // return false // 待可开发票时删除
-                $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (r) {
-                    if (r.status != 1) {
-                        window.open("/front/order/invoicetimeOut", '_self');
-                    } else {
-                        window.open("/front/order/invoice/" + orderCode, '_self');
-                    }
-                })
+              window.open("/front/order/invoice/" + orderCode, '_self');
             })
 
             $(".payOrder").on("click", function () {

src/web/templates/pc/dataPack/packDetail.html

@@ -271,14 +271,7 @@
             }
 
             $(".openinvoice").on("click", function () {
-              // return false // 待可开发票时删除
-                $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (r) {
-                    if (r.status != 1) {
-                        window.open("/front/order/invoicetimeOut", '_self');
-                    } else {
-                        window.open("/front/order/invoice/" + orderCode, '_self');
-                    }
-                })
+              window.open("/front/order/invoice/" + orderCode, '_self');
             })
             function diffCountdown (endTime) {
               timerId = setInterval(function() {

src/web/templates/pc/entniche_orderDetail.html

@@ -178,15 +178,7 @@
 
 
             $(".openinvoice").on("click", function () {
-              // return false // 待可开发票时删除
-                $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (r) {
-                    var hash = escape("超级订阅");
-                    if (r.status != 1) {
-                        window.open("/front/order/invoicetimeOut", '_self');
-                    } else {
-                        window.open("/front/order/invoice/" + orderCode, '_self');
-                    }
-                })
+              window.open("/front/order/invoice/" + orderCode, '_self');
             })
 
             $(".payOrder").on("click", function () {

src/web/templates/pc/medaratus_orderDetail.html

@@ -499,14 +499,7 @@
             }
 
             $(".openinvoice").on("click", function () {
-                // return false
-                $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (r) {
-                    if (r.status != 1) {
-                        window.open("/front/order/invoicetimeOut", '_self');
-                    } else {
-                        window.open("/front/order/invoice/" + orderCode, '_self');
-                    }
-                })
+              window.open("/front/order/invoice/" + orderCode, '_self');
             })
             $(".payOrder").on("click", function () {
                 location.href = "/front/subvip/orderPay/" + orderCode;

src/web/templates/pc/orderDetail.html

@@ -544,14 +544,7 @@
         })
 
         $(".openinvoice").on("click", function () {
-          // return false // 待可开发票时删除
-            $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (r) {
-                if (r.status != 1) {
-                    window.open("/front/order/invoicetimeOut", '_self');
-                } else {
-                    window.open("/front/order/invoice/" + orderCode, '_self');
-                }
-            })
+          window.open("/front/order/invoice/" + orderCode, '_self');
         })
     })
 

src/web/templates/pc/subAccount_orderDetail.html

@@ -257,14 +257,7 @@
 
 
             $(".openinvoice").on("click", function () {
-              // return false // 待可开发票时删除
-                $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (r) {
-                    if (r.status != 1) {
-                        window.open("/front/order/invoicetimeOut", '_self');
-                    } else {
-                        window.open("/front/order/invoice/" + orderCode, '_self');
-                    }
-                })
+              window.open("/front/order/invoice/" + orderCode, '_self');
             })
 
             $(".payOrder").on("click", function () {

src/web/templates/pc/vip_orderDetail.html

@@ -512,14 +512,7 @@
             }
 
             $(".openinvoice").on("click", function () {
-                // return false
-                $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (r) {
-                    if (r.status != 1) {
-                        window.open("/front/order/invoicetimeOut", '_self');
-                    } else {
-                        window.open("/front/order/invoice/" + orderCode, '_self');
-                    }
-                })
+              window.open("/front/order/invoice/" + orderCode, '_self');
             })
             $(".payOrder").on("click", function () {
                 location.href = "/front/subvip/orderPay/" + orderCode;