Merge branch 'dev/v4.9.21_wmh' of qmx/jy into feature/v4.9.21

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_order_detail.js

@@ -455,12 +455,11 @@ $(function () {
                 }
 
                 // 后台渠道为xdqd04(销售代下单)可以开发票，其他后台创建订单不可以开发票
-                if (r.data.order.is_backstage_order!==1 || r.data.order.order_channel === 'xdqd04'){
                     var pay_again = ""
                     //发票
                     if (r.data.order.applybill_status === 0) {
                         //已支付未申请发票
-                        if(r.data.order.source !== 1){
+                        if(r.data.order.invoice_price && r.data.order.is_backstage_order!==1 || r.data.order.order_channel === 'xdqd04'){
                             pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()' style='width: 100%!important;'>开发票</button>"
                             $(".invoice .invoicing").css("display", "");
                             $(".invoicing").on("click", function () {
@@ -479,7 +478,7 @@ $(function () {
                         }
                     } else {
                         //已支付已申请发票
-                        if(r.data.order.source !== 1){
+                        if(r.data.order.invoice_show){
                         pay_again += "<button class=\"j-button-cancel\" onclick= 'checkinvoice(" + r.data.order.applybill_status + ")' style='width: 100%!important;'>查看发票</button >"
                         $(".invoice").css("display", "none");
                         }
@@ -495,10 +494,8 @@ $(function () {
                                 break;
                         }
                     }
-                    if(r.data.order.source !== 1){
-                       $(".j-footer").show().html(pay_again)
-                    }
-                }
+                       $(".j-footer").show().html(pay_again)     
+                
             } else if (r.data.order.order_status == -2 || r.data.order.order_status == -3) {
                 $("#card-header-bg").addClass("bg cancel-bg")
                 $("#pageTitle").addClass("status")
@@ -780,7 +777,8 @@ function checkinvoice(flag) {
         });
         return
     }
-    window.location.href = "/jyapp/front/invoice/check_invoice.html?order_code=" + orderCode_
+    // window.location.href = "/jyapp/front/invoice/check_invoice.html?order_code=" + orderCode_
+    window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode_
 }
 
 //开发票
@@ -795,11 +793,13 @@ function invoiceAdd() {
     var orderCode_ = decodeURIComponent(getParam("orderCode"));
     $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode_}, function (data) {
         if (data.status == 1) {
-            window.location.href = "/jyapp/front/invoice/showpage?order_code=" + orderCode_;
+            // window.location.href = "/jyapp/front/invoice/showpage?order_code=" + orderCode_;
+            window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode_;
         } else {
-            window.location.href = "/jyapp/front/cantInvoice";
+            // window.location.href = "/jyapp/front/cantInvoice";
+            window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode_;
         }
-        ;
+        
     })
 }
 

src/jfw/modules/app/src/web/templates/big-member/page_orderdetail_aiForecastPack.html

@@ -222,10 +222,10 @@
                 if (source === ""){
                   var pay_again = ""
                   //发票
-                  if (r.data.applybill_status === 0 && r.data.source !== 1) {
+                  if (r.data.applybill_status === 0 && r.data.invoice_price) {
                       //已支付未申请发票
                       pay_again += "<button class=\"j-button-cancel\" style=\"width: 100%!important;height: 0.92rem!important;\"; onclick='invoiceAdd()'>开发票</button>"
-                  } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.source !== 1) {
+                  } else if ( r.data.invoice_show) {
                       //已支付已申请发票
                       pay_again += "<button class=\"j-button-cancel\" style=\"width: 100%!important;height: 0.92rem!important;\" onclick='checkinvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                   }
@@ -364,9 +364,11 @@
         // });
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (data) {
             if (data.status == 1) {
-                window.location.href = "/jyapp/front/invoice/showpage?order_code=" + orderCode;
+                // window.location.href = "/jyapp/front/invoice/showpage?order_code=" + orderCode;
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode;
             } else {
-                window.location.href = "/jyapp/front/cantInvoice";
+                // window.location.href = "/jyapp/front/cantInvoice";
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode;
             }
             ;
         })
@@ -388,7 +390,8 @@
             });
             return
         }
-        window.location.href = "/jyapp/front/invoice/check_invoice.html?order_code=" + orderCode
+        // window.location.href = "/jyapp/front/invoice/check_invoice.html?order_code=" + orderCode
+        window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode
     }
 
     function formatTime(t) {

src/jfw/modules/app/src/web/templates/big-member/page_orderdetail_member.html

@@ -465,10 +465,10 @@
                 if (source === ""&&filterObj.badge!="exchange") {
                     var pay_again = ""
                     //发票
-                    if (r.data.applybill_status === 0 && r.data.source !== 1) {
+                    if (r.data.applybill_status === 0 && r.data.invoice_price) {
                         //已支付未申请发票
                         pay_again += "<button class=\"j-button-cancel\" style=\"width: 100%!important;height: 0.92rem!important;\"; onclick='invoiceAdd()'>开发票</button>"
-                    } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.source !== 1) {
+                    } else if (r.data.invoice_show) {
                         //已支付已申请发票
                         pay_again += "<button class=\"j-button-cancel\" style=\"width: 100%!important;height: 0.92rem!important;\" onclick='checkinvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                     }
@@ -658,9 +658,11 @@
         // });
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (data) {
             if (data.status == 1) {
-                window.location.href = "/jyapp/front/invoice/showpage?order_code=" + orderCode;
+                // window.location.href = "/jyapp/front/invoice/showpage?order_code=" + orderCode;
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode;
             } else {
-                window.location.href = "/jyapp/front/cantInvoice";
+                // window.location.href = "/jyapp/front/cantInvoice";
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode;
             }
         })
     }
@@ -681,7 +683,8 @@
             });
             return
         }
-        window.location.href = "/jyapp/front/invoice/check_invoice.html?order_code=" + orderCode
+        // window.location.href = "/jyapp/front/invoice/check_invoice.html?order_code=" + orderCode
+        window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode
     }
 
     function formatTime(t) {

src/jfw/modules/app/src/web/templates/big-member/page_orderdetail_subAccount.html

@@ -226,10 +226,10 @@
                 if (source === "") {
                   var pay_again = ""
                   //发票
-                  if (r.data.applybill_status === 0 && r.data.source !== 1) {
+                  if (r.data.applybill_status === 0 && r.data.invoice_price) {
                       //已支付未申请发票
                       pay_again += "<button class=\"j-button-cancel\" style=\"width: 100%!important;height: 0.92rem!important;\"; onclick='invoiceAdd()'>开发票</button>"
-                  } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2)  && r.data.source !== 1) {
+                  } else if ( r.data.invoice_show) {
                       //已支付已申请发票
                       pay_again += "<button class=\"j-button-cancel\" style=\"width: 100%!important;height: 0.92rem!important;\" onclick='checkinvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                   }
@@ -369,9 +369,11 @@
         // });
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (data) {
             if (data.status == 1) {
-                window.location.href = "/jyapp/front/invoice/showpage?order_code=" + orderCode;
+                // window.location.href = "/jyapp/front/invoice/showpage?order_code=" + orderCode;
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode;
             } else {
-                window.location.href = "/jyapp/front/cantInvoice";
+                // window.location.href = "/jyapp/front/cantInvoice";
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode;
             }
             ;
         })
@@ -393,7 +395,8 @@
             });
             return
         }
-        window.location.href = "/jyapp/front/invoice/check_invoice.html?order_code=" + orderCode
+        // window.location.href = "/jyapp/front/invoice/check_invoice.html?order_code=" + orderCode
+        window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode
     }
 
     function formatTime(t) {

src/jfw/modules/app/src/web/templates/commonPay/bidfile/bidfileDetail.html

@@ -194,10 +194,10 @@
 
                 var pay_again = ""
                 //发票
-                if (r.data.applybill_status === 0  && r.data.source !== 1) {
+                if (r.data.applybill_status === 0  && r.data.source.invoice_price) {
                     //已支付未申请发票
                     pay_again += "<button class=\"j-button-cancel\" style=\"width: 100%!important;height: 0.92rem!important;\"; onclick='invoiceAdd()'>开发票</button>"
-                } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.source !== 1) {
+                } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.show_invoice) {
                     //已支付已申请发票
                     pay_again += "<button class=\"j-button-cancel\" style=\"width: 100%!important;height: 0.92rem!important;\" onclick='checkinvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                 }
@@ -343,9 +343,12 @@
         // });
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (data) {
             if (data.status == 1) {
-                window.location.href = "/jyapp/front/invoice/showpage?order_code=" + orderCode;
+                // window.location.href = "/jyapp/front/invoice/showpage?order_code=" + orderCode;
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode;
             } else {
-                window.location.href = "/jyapp/front/cantInvoice";
+                // window.location.href = "/jyapp/front/cantInvoice";
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode;
+                
             }
             ;
         })
@@ -367,7 +370,8 @@
             });
             return
         }
-        window.location.href = "/jyapp/front/invoice/check_invoice.html?order_code=" + orderCode
+        // window.location.href = "/jyapp/front/invoice/check_invoice.html?order_code=" + orderCode
+        window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode
     }
 
     function formatTime(t) {

src/jfw/modules/app/src/web/templates/commonPay/integral/integralDetail.html

@@ -196,10 +196,10 @@
 
                     var pay_again = ""
                     //发票
-                    if (r.data.applybill_status === 0  && r.data.source !== 1) {
+                    if (r.data.applybill_status === 0  && r.data.invoice_price) {
                         //已支付未申请发票
                         pay_again += "<button class=\"j-button-cancel\" style=\"width: 100%!important;height: 0.92rem!important;\"; onclick='invoiceAdd()'>开发票</button>"
-                    } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2)  && r.data.source !== 1) {
+                    } else if (r.data.invoice_show) {
                         //已支付已申请发票
                         pay_again += "<button class=\"j-button-cancel\" style=\"width: 100%!important;height: 0.92rem!important;\" onclick='checkinvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                     }
@@ -361,9 +361,11 @@
         // });
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (data) {
             if (data.status == 1) {
-                window.location.href = "/jyapp/front/invoice/showpage?order_code=" + orderCode;
+                // window.location.href = "/jyapp/front/invoice/showpage?order_code=" + orderCode;
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode;
             } else {
-                window.location.href = "/jyapp/front/cantInvoice";
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode;
+                // window.location.href = "/jyapp/front/cantInvoice";
             }
             ;
         })
@@ -385,7 +387,8 @@
             });
             return
         }
-        window.location.href = "/jyapp/front/invoice/check_invoice.html?order_code=" + orderCode
+        // window.location.href = "/jyapp/front/invoice/check_invoice.html?order_code=" + orderCode
+        window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode
     }
 
     function formatTime(t) {

src/jfw/modules/app/src/web/templates/dataExport/dataExport_toOrderDetail.html

@@ -695,7 +695,8 @@
             });
             return
         }
-        window.location.href = "/jyapp/front/invoice/check_invoice.html?order_code=" +{{.T.o.order_code}}
+        // window.location.href = "/jyapp/front/invoice/check_invoice.html?order_code=" +{{.T.o.order_code}}
+        window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" +{{.T.o.order_code}}
     }
 
     function invoiceAdd() {
@@ -708,9 +709,11 @@
         // });
         $.post("/subscribepay/orderListDetails/isOver", {"order_code":{{.T.o.order_code}}}, function (data) {
             if (data.status == 1) {
-                window.location.href = "/jyapp/front/invoice/showpage?order_code=" +{{.T.o.order_code}}
+                // window.location.href = "/jyapp/front/invoice/showpage?order_code=" +{{.T.o.order_code}}
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" +{{.T.o.order_code}}
             } else {
-                window.location.href = "/jyapp/front/cantInvoice";
+                // window.location.href = "/jyapp/front/cantInvoice";
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" +{{.T.o.order_code}}
             }
             ;
         })
@@ -738,9 +741,9 @@
                                 $(".order-main").before(finish_html)
 
                                 var html = '<div class="j-button-group">'
-                                if (r.data.applybill_status === 0 && r.data.source !== 1) {
+                                if (r.data.applybill_status === 0 && r.data.invoice_price) {
                                     html += '<button class="j-button-cancel" onclick="invoiceAdd()">开发票</button><button class="j-button-confirm" id="buytwo" onclick="payAgain()">再次购买</button>'
-                                } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.source !== 1) {
+                                } else if ( r.data.invoice_show) {
                                     html += '<button class="j-button-cancel" onclick= checkinvoice(' + r.data.applybill_status+ ')>查看发票</button><button class="j-button-confirm" id="buytwo" onclick="payAgain()">再次购买</button>'
                                 }
                             } else {

src/jfw/modules/app/src/web/templates/entniche/entniche_order_detail.html

@@ -467,9 +467,9 @@
                     $("#card-header-bg").addClass("bg finish-bg")
                     $("#pageTitle").addClass("status")
                     $(".order_status").text("已完成");
-                    if (data.applybill_status === 0 && data.source !== 1) {
+                    if (data.applybill_status === 0 && data.invoice_price) {
                         pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()'>开发票</button></div>"
-                    } else if ((data.applybill_status === 1 || data.applybill_status === 2) && data.source !== 1) {
+                    } else if (data.invoice_show) {
                         pay_again += "<button class=\"j-button-cancel\" onclick= 'checkinvoice(" + data.applybill_status + ")'>查看发票</button></div>"
                     }
                     $(".j-footer").html(pay_again)
@@ -565,7 +565,8 @@
             return
         }
         orderCode = decodeURIComponent(getParam("order_code"))
-        window.location.href = "/jyapp/front/invoice/check_invoice.html?order_code=" + orderCode
+        // window.location.href = "/jyapp/front/invoice/check_invoice.html?order_code=" + orderCode
+        window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode
     }
 
     //开发票
@@ -580,9 +581,11 @@
         orderCode = decodeURIComponent(getParam("order_code"))
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (data) {
             if (data.status == 1) {
-                window.location.href = "/jyapp/front/invoice/showpage?order_code=" + orderCode;
+                // window.location.href = "/jyapp/front/invoice/showpage?order_code=" + orderCode;
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode;
             } else {
-                window.location.href = "/jyapp/front/cantInvoice";
+                // window.location.href = "/jyapp/front/cantInvoice";
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode;
             }
             ;
         })

src/jfw/modules/app/src/web/templates/invoice/cantInvoice.html

@@ -152,7 +152,8 @@
         }
         checkInvoice.init()
         function replaceInvoice(){
-            window.location.href = "/jyapp/front/invoice/showpage?order_code="+order_code+"&c=1"
+            // window.location.href = "/jyapp/front/invoice/showpage?order_code="+order_code+"&c=1"
+            window.location.href = "/jy_mobile/invoice/Invoicing?order_code="+order_code+"&type=Replace"
         }
 
     </script>

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

@@ -235,12 +235,17 @@ var vm = new Vue({
 
       var filterInfo = JSON.parse(order.filter)
       // 开发票按钮展示逻辑
-      if ((order.pay_money <= 0)||(filterInfo.canInvoice!=undefined &&!filterInfo.canInvoice)) {
+      if (this.invokeButtonText === '开发票' && (order.pay_money <= 0)||(filterInfo.canInvoice!=undefined &&!filterInfo.canInvoice)) {
         this.orderStateMap[1].bottomButtonShow.invoke = false
       }
-      if(order.source === 1){ // 线下发票隐藏按钮
+      // if(order.source === 1){ // 线下发票隐藏按钮 p537放开此限制
+      //   this.orderStateMap[this.orderInfo.state].bottomButtonShow.invoke = false
+      // }
+      if(this.invokeButtonText === '开发票' && !order.invoice_price){
         this.orderStateMap[this.orderInfo.state].bottomButtonShow.invoke = false
 
+      }else if (this.invokeButtonText === '查看发票' && !order.invoice_show) {
+        this.orderStateMap[this.orderInfo.state].bottomButtonShow.invoke = false
       }
       this.orderInfo.productInfoList = this.getProductInfoList(info)
       this.orderInfo.orderInfoList = this.getOrderInfoListList(info)
@@ -423,7 +428,9 @@ var vm = new Vue({
             }
           } else {
             // 不能开发票跳转
-            var href = assetsConf.invokeLink.cantInvoke[platform]
+            // var href = assetsConf.invokeLink.cantInvoke[platform]
+            // p537 调整为取消此不能开发票限制 
+            var href = assetsConf.invokeLink.invoke[platform]
             if (href) {
               _this.goToLink(`${href}?order_code=${orderCode}`)
             }

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

@@ -73,16 +73,20 @@ var assetsConf = {
   // 开发票
   invokeLink: {
     invoke: { // 开发票
-      wx: '/front/invoice/showpage',
-      app: '/jyapp/front/invoice/showpage'
+      // wx: '/front/invoice/showpage',
+      // app: '/jyapp/front/invoice/showpage'
+      wx: '/jy_mobile/invoice/Invoicing',
+      app: '/jy_mobile/invoice/Invoicing'
     },
     cantInvoke: {  // 开发票超时(不能开发票)
       wx: '/front/invoice/cantInvoice',
       app: '/jyapp/front/cantInvoice'
     },
     lookInvoice: {
-      wx: '/front/invoice/check_invoice.html',
-      app: '/jyapp/front/invoice/check_invoice.html'
+      // wx: '/front/invoice/check_invoice.html',
+      // app: '/jyapp/front/invoice/check_invoice.html'
+      wx: '/jy_mobile/invoice/viewInvoice',
+      app: '/jy_mobile/invoice/viewInvoice'
     }
   },
   // 数据导出(历史数据)

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

@@ -841,19 +841,32 @@ var vm = new Vue({
         if (canBuyAgain.indexOf(productType) !== -1 && order.pay_money > 0) {
           state.bugAgainShow = true
           state.bugAgainText = '再次购买'
+        }
+          // 已完成订单 开发票判断  0未申请  1/2已申请
+        if (order.applybill_status === 1 || order.applybill_status === 2) {
+          // 查看发票
+          state.invokeButtonText = '查看发票'
         }
         // 判断开发票
         // 后台渠道为xdqd04(销售代下单)可以开发票，其他后台创建订单不可以开发票
         var backstageOrderCanInvoke = order.is_backstage_order === 0 || order.order_channel === 'xdqd04'
-        if (canInvoke.indexOf(productType) !== -1 && order.billingMode === 1 && backstageOrderCanInvoke) {
+        if (state.invokeButtonText  === '开发票' && canInvoke.indexOf(productType) !== -1 && order.billingMode === 1 && backstageOrderCanInvoke) {
           state.invokeButtonShow = true
         }
+      // if(order.source === 1){ // 线下发票隐藏按钮
+      //   state.invokeButtonShow = false
+      // }
+      if (state.invokeButtonText  === '开发票' && !order.invoice_price) {
+        state.invokeButtonShow = false
 
-        // 已完成订单 开发票判断  0未申请  1/2已申请
-        if (order.applybill_status === 1 || order.applybill_status === 2) {
-          // 查看发票
-          state.invokeButtonText = '查看发票'
-        }
+      } 
+       if (state.invokeButtonText  === '查看发票') {
+        if (order.invoice_show) {
+          state.invokeButtonShow = true
+        }else{
+          state.invokeButtonShow = false
+        }  
+      }
 
       } else if (orderStatus === -2 || orderStatus === -3) {
         // 已取消或者已删除订单
@@ -868,9 +881,6 @@ var vm = new Vue({
       if (cbConf) {
         Object.assign(state, cbConf)
       }
-      if(order.source === 1){ // 线下发票隐藏按钮
-        state.invokeButtonShow = false
-      }
       return state
 
     },
@@ -1060,7 +1070,9 @@ var vm = new Vue({
             }
           } else {
             // 不能开发票跳转
-            var href = assetsConf.invokeLink.cantInvoke[platform]
+            // var href = assetsConf.invokeLink.cantInvoke[platform]
+            // p537 调整为取消此不能开发票限制 
+            var href = assetsConf.invokeLink.invoke[platform]
             if (href) {
               _this.goToLinkAndSaveState(`${href}?order_code=${orderCode}`)
             }

src/web/templates/weixin/commonPay/bidfile/bidfiledetail.html

@@ -184,10 +184,10 @@
 
                 var pay_again = ""
                 //发票
-                if (r.data.applybill_status === 0) {
+                if (r.data.applybill_status === 0 &&  r.data.invoice_price) {
                     //已支付未申请发票
                     pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()'>开发票</button>"
-                } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.source !== 1) {
+                } else if ( r.data.invoice_show) {
                     //已支付已申请发票
                     pay_again += "<button class=\"j-button-cancel\" onclick='checkInvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                 }
@@ -332,9 +332,11 @@
         // });
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (data) {
             if (data.status === 1) {
-                window.location.href = "/front/invoice/showpage?order_code=" + orderCode;
+                // window.location.href = "/front/invoice/showpage?order_code=" + orderCode;
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode;
             } else {
-                window.location.href = "/front/invoice/cantInvoice";
+                // window.location.href = "/front/invoice/cantInvoice";
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode;
             }
         })
     }
@@ -356,7 +358,8 @@
             });
             return
         }
-        window.location.href = "/front/invoice/check_invoice.html?order_code=" + orderCode
+        // window.location.href = "/front/invoice/check_invoice.html?order_code=" + orderCode
+        window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode
     }
 
     function formatTime(t) {

src/web/templates/weixin/commonPay/integral/integralDetail.html

@@ -190,10 +190,10 @@
     
                     var pay_again = ""
                     //发票
-                    if (r.data.applybill_status === 0) {
+                    if (r.data.applybill_status === 0 && res.data.invoice_price) {
                         //已支付未申请发票
                         pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()'>开发票</button>"
-                    } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.source !== 1) {
+                    } else if (r.data.invoice_show) {
                         //已支付已申请发票
                         pay_again += "<button class=\"j-button-cancel\" onclick='checkInvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                     }
@@ -350,9 +350,11 @@
         // });
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (data) {
             if (data.status === 1) {
-                window.location.href = "/front/invoice/showpage?order_code=" + orderCode;
+                // window.location.href = "/front/invoice/showpage?order_code=" + orderCode;
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode;
             } else {
-                window.location.href = "/front/invoice/cantInvoice";
+                // window.location.href = "/front/invoice/cantInvoice";
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode;
             }
         })
     }
@@ -374,7 +376,8 @@
             });
             return
         }
-        window.location.href = "/front/invoice/check_invoice.html?order_code=" + orderCode
+        // window.location.href = "/front/invoice/check_invoice.html?order_code=" + orderCode
+        window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode
     }
 
     function formatTime(t) {

src/web/templates/weixin/commonPay/medical/orderDetail.html

@@ -995,9 +995,11 @@
         // });
         $.post("/subscribepay/orderListDetails/isOver", { "order_code": orderCode }, function (data) {
             if (data.status == 1) {
-                window.location.href = "/front/invoice/showpage?order_code=" + orderCode;
+                // window.location.href = "/front/invoice/showpage?order_code=" + orderCode;
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode;
             } else {
-                window.location.href = "/front/invoice/cantInvoice";
+                // window.location.href = "/front/invoice/cantInvoice";
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode;
             }
             ;
         })
@@ -1021,7 +1023,8 @@
             return
         }
         orderCode = getParam("orderCode")
-        window.location.href = "/front/invoice/check_invoice.html?order_code=" + orderCode
+        // window.location.href = "/front/invoice/check_invoice.html?order_code=" + orderCode
+        window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode
     }
 
     /******* 获取url参数（正则）********/

src/web/templates/weixin/dataExport/dataExport_toOrderDetail.html

@@ -550,9 +550,9 @@
                                 $(".order-main").before(finish_html)
 
                                 var html = '<div class="j-button-group">'
-                                if (r.data.applybill_status === 0) {
+                                if (r.data.applybill_status === 0 && r.data.invoice_price) {
                                     html += '<button class="j-button-cancel" onclick="invoiceAdd(\'' + r.data.order_code + '\')">开发票</button><button class="j-button-confirm" id="buytwo" onclick="payAgain(\'' + r.data.order_code + '\')">再次购买</button>'
-                                } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.source !== 1) {
+                                } else if ( r.data.invoice_show) {
                                     html += '<button class="j-button-cancel" onclick= checkinvoice(\'' + r.data.order_code + '\',' + r.data.applybill_status + ')>查看发票</button><button class="j-button-confirm" id="buytwo" onclick="payAgain(\'' + r.data.order_code + '\')">再次购买</button>'
                                 }
                             } else {
@@ -643,7 +643,8 @@
             });
             return
         }
-        window.location.href = "/front/invoice/check_invoice.html?order_code=" + order_code
+        // window.location.href = "/front/invoice/check_invoice.html?order_code=" + order_code
+        window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + order_code
     }
 
     function invoiceAdd(order_code) {
@@ -656,9 +657,11 @@
         // });
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": order_code}, function (data) {
             if (data.status == 1) {
-                window.location.href = "/front/invoice/showpage?order_code=" + order_code;
+                // window.location.href = "/front/invoice/showpage?order_code=" + order_code;
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + order_code;
             } else {
-                window.location.href = "/front/invoice/cantInvoice";
+                // window.location.href = "/front/invoice/cantInvoice";
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + order_code;
             }
             ;
         })

src/web/templates/weixin/invoice/cantInvocie.html

@@ -152,7 +152,8 @@
         }
         checkInvoice.init()
         function replaceInvoice(){
-            window.location.href = "/front/invoice/showpage?order_code="+order_code+"&c=1"
+            // window.location.href = "/front/invoice/showpage?order_code="+order_code+"&c=1"
+            window.location.href = "/jy_mobile/invoice/Invoicing?order_code="+order_code+"&type=Replace"
         }
         function isWeixinBrower () {
             if(navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1){

src/web/templates/weixin/member/aiForecastPackdetail.html

@@ -221,10 +221,10 @@
                     if (source===""){
                       var pay_again = ""
                       //发票
-                      if (r.data.applybill_status === 0) {
+                      if (r.data.applybill_status === 0 && r.data.invoice_price) {
                           //已支付未申请发票
                           pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()'>开发票</button>"
-                      } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.source !== 1) {
+                      } else if (r.data.invoice_show) {
                           //已支付已申请发票
                           pay_again += "<button class=\"j-button-cancel\" onclick='checkInvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                       }
@@ -366,9 +366,11 @@
         // });
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (data) {
             if (data.status === 1) {
-                window.location.href = "/front/invoice/showpage?order_code=" + orderCode;
+                // window.location.href = "/front/invoice/showpage?order_code=" + orderCode;
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode;
             } else {
-                window.location.href = "/front/invoice/cantInvoice";
+                // window.location.href = "/front/invoice/cantInvoice";
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode;
             }
         })
     }
@@ -390,7 +392,8 @@
             });
             return
         }
-        window.location.href = "/front/invoice/check_invoice.html?order_code=" + orderCode
+        // window.location.href = "/front/invoice/check_invoice.html?order_code=" + orderCode
+        window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode
     }
 
     function formatTime(t) {

src/web/templates/weixin/member/memberdetail.html

@@ -395,16 +395,16 @@
                   var pay_again = ""
                   //有效周期
                   $(".line_cycle").css("display", "");
-                  if (r.data.applybill_status === 0) {
+                  if (r.data.applybill_status === 0 && r.data.invoice_price) {
                       //已支付未申请发票
                       pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()'>开发票</button>"
-                  } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.source !== 1) {
+                  } else if ( r.data.invoice_show) {
                       //已支付已申请发票
                       pay_again += "<button class=\"j-button-cancel\" onclick='checkInvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                   }
-                  if(r.data.source !== 1){
+                 
                      $('.j-footer').show().html(pay_again);
-                  }
+                  
 
                 }else{
                   var buchongbaoHtml = '';
@@ -616,9 +616,11 @@
         }
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (data) {
             if (data.status === 1) {
-                window.location.href = "/front/invoice/showpage?order_code=" + orderCode;
+                // window.location.href = "/front/invoice/showpage?order_code=" + orderCode;
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode;
             } else {
-                window.location.href = "/front/invoice/cantInvoice";
+                // window.location.href = "/front/invoice/cantInvoice";
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode;
             }
         })
     }
@@ -640,7 +642,8 @@
             });
             return
         }
-        window.location.href = "/front/invoice/check_invoice.html?order_code=" + orderCode
+        // window.location.href = "/front/invoice/check_invoice.html?order_code=" + orderCode
+        window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode
     }
 
     function formatTime(t) {

src/web/templates/weixin/member/subAccountDetail.html

@@ -231,10 +231,10 @@
                 var pay_again = ""
                 //发票
                 if (source === "") {
-                  if (r.data.applybill_status === 0) {
+                  if (r.data.applybill_status === 0 && r.data.invoice_price) {
                       //已支付未申请发票
                       pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()'>开发票</button>"
-                  } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.source !== 1) {
+                  } else if (r.data.invoice_show) {
                       //已支付已申请发票
                       pay_again += "<button class=\"j-button-cancel\" onclick='checkInvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                   }
@@ -374,9 +374,11 @@
         // });
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (data) {
             if (data.status === 1) {
-                window.location.href = "/front/invoice/showpage?order_code=" + orderCode;
+                // window.location.href = "/front/invoice/showpage?order_code=" + orderCode;
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode;
             } else {
-                window.location.href = "/front/invoice/cantInvoice";
+                // window.location.href = "/front/invoice/cantInvoice";
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode;
             }
         })
     }
@@ -398,7 +400,8 @@
             });
             return
         }
-        window.location.href = "/front/invoice/check_invoice.html?order_code=" + orderCode
+        // window.location.href = "/front/invoice/check_invoice.html?order_code=" + orderCode
+        window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode
     }
 
     function formatTime(t) {

src/web/templates/weixin/vipsubscribe/vip_order_detail.html

@@ -746,20 +746,19 @@
 
                     //发票
                     // 后台渠道为xdqd04(销售代下单)可以开发票，其他后台创建订单不可以开发票
-                    if (r.data.order.is_backstage_order!==1 || r.data.order.order_channel === 'xdqd04'){
                         var pay_again = ""
-                        if (r.data.order.applybill_status === 0) {
+                        if ((r.data.order.is_backstage_order!==1 || r.data.order.order_channel === 'xdqd04') && r.data.order.applybill_status === 0 && r.data.order.invoice_price) {
                             //已支付未申请发票
                             pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()'>开发票</button>"
-                        } else if ((r.data.order.applybill_status === 1 || r.data.order.applybill_status === 2) && r.data.order.source !== 1) {
+                        } else if ( r.data.order.invoice_show) {
                             //已支付已申请发票
                             pay_again += "<button class=\"j-button-cancel\" onclick='checkInvoice(" + r.data.order.applybill_status + ")'>查看发票</button>"
                         }
-                        if(r.data.order.source !== 1){
+                        
                           $('.j-footer').show().html(pay_again)
-                         }
+                         
 
-                    }
+                    
                     if (r.data.order.billingMode==0){
                        $(".j-footer").hide();//隐藏开发票
                     }
@@ -977,9 +976,11 @@
         // });
         $.post("/subscribepay/orderListDetails/isOver", {"order_code": orderCode}, function (data) {
             if (data.status == 1) {
-                window.location.href = "/front/invoice/showpage?order_code=" + orderCode;
+                // window.location.href = "/front/invoice/showpage?order_code=" + orderCode;
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode;
             } else {
-                window.location.href = "/front/invoice/cantInvoice";
+                // window.location.href = "/front/invoice/cantInvoice";
+                window.location.href = "/jy_mobile/invoice/Invoicing?order_code=" + orderCode;
             }
             ;
         })
@@ -1003,7 +1004,8 @@
             return
         }
         orderCode = getParam("orderCode")
-        window.location.href = "/front/invoice/check_invoice.html?order_code=" + orderCode
+        // window.location.href = "/front/invoice/check_invoice.html?order_code=" + orderCode
+        window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode
     }
 
     /******* 获取url参数（正则）********/