提交入口逻辑调整

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

@@ -457,7 +457,7 @@ $(function () {
                 // 后台渠道为xdqd04(销售代下单)可以开发票，其他后台创建订单不可以开发票
                     var pay_again = ""
                     //发票
-                    if (r.data.order.applybill_status === 0 && r.data.order.is_can_invoice) {
+                    if (r.data.order.is_can_invoice) {
                         //已支付未申请发票
                             pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()' style='width: 100%!important;'>开发票</button>"
                             $(".invoice .invoicing").css("display", "");
@@ -475,11 +475,11 @@ $(function () {
                             });
 
                         
-                    } else {
+                    } 
                         //已支付已申请发票
                         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");
+                        // $(".invoice").css("display", "none");
                         }
 
                         switch (r.data.order.applybill_type) {
@@ -492,7 +492,7 @@ $(function () {
                                 $(".taxpayer_number").html(r.data.order.applybill_taxnum);
                                 break;
                         }
-                    }
+                    
                        $(".j-footer").show().html(pay_again)     
                 
             } else if (r.data.order.order_status == -2 || r.data.order.order_status == -3) {
@@ -767,15 +767,15 @@ $(".icon-fanhui").on("click", function () {
 
 //查看发票
 function checkinvoice(flag) {
-    if (flag === 2) {
-        weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
-            buttons: [{
-                label: '我知道了',
-                type: 'primary'
-            }]
-        });
-        return
-    }
+    // if (flag === 2) {
+    //     weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
+    //         buttons: [{
+    //             label: '我知道了',
+    //             type: 'primary'
+    //         }]
+    //     });
+    //     return
+    // }
     // window.location.href = "/jyapp/front/invoice/check_invoice.html?order_code=" + orderCode_
     window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode_
 }

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

@@ -222,10 +222,11 @@
                 if (source === ""){
                   var pay_again = ""
                   //发票
-                  if (r.data.applybill_status === 0 && r.data.is_can_invoice) {
+                  if (r.data.is_can_invoice) {
                       //已支付未申请发票
                       pay_again += "<button class=\"j-button-cancel\" style=\"width: 100%!important;height: 0.92rem!important;\"; onclick='invoiceAdd()'>开发票</button>"
-                  } else if ( r.data.invoice_show) {
+                  } 
+                   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>"
                   }
@@ -381,15 +382,15 @@
 
     //查看发票
     function checkinvoice(flag) {
-        if (flag === 2) {
-            weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
-                buttons: [{
-                    label: '我知道了',
-                    type: 'primary'
-                }]
-            });
-            return
-        }
+        // if (flag === 2) {
+        //     weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
+        //         buttons: [{
+        //             label: '我知道了',
+        //             type: 'primary'
+        //         }]
+        //     });
+        //     return
+        // }
         // window.location.href = "/jyapp/front/invoice/check_invoice.html?order_code=" + orderCode
         window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode
     }

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

@@ -465,10 +465,11 @@
                 if (source === ""&&filterObj.badge!="exchange") {
                     var pay_again = ""
                     //发票
-                    if (r.data.applybill_status === 0 && r.data.is_can_invoice) {
+                    if (r.data.is_can_invoice) {
                         //已支付未申请发票
                         pay_again += "<button class=\"j-button-cancel\" style=\"width: 100%!important;height: 0.92rem!important;\"; onclick='invoiceAdd()'>开发票</button>"
-                    } else if (r.data.invoice_show) {
+                    } 
+                     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>"
                     }
@@ -640,15 +641,15 @@
 
     //开发票
     function invoiceAdd() {
-        if (window.isTransferPay) {
-            weui.alert('请联系客服开票<br>客服热线：400-108-6670', {
-                buttons: [{
-                    label: '我知道了',
-                    type: 'primary'
-                }]
-            });
-            return
-        }
+        // if (window.isTransferPay) {
+        //     weui.alert('请联系客服开票<br>客服热线：400-108-6670', {
+        //         buttons: [{
+        //             label: '我知道了',
+        //             type: 'primary'
+        //         }]
+        //     });
+        //     return
+        // }
         // return weui.alert('因年底集中结算，发票功能暂停使用。给您带来的不便表示抱歉，我们会在恢复发票功能后第一时间通知！', {
         //     title: '温馨提示',
         //     buttons: [{
@@ -674,15 +675,15 @@
 
     //查看发票
     function checkinvoice(flag) {
-        if (flag === 2) {
-            weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
-                buttons: [{
-                    label: '我知道了',
-                    type: 'primary'
-                }]
-            });
-            return
-        }
+        // if (flag === 2) {
+        //     weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
+        //         buttons: [{
+        //             label: '我知道了',
+        //             type: 'primary'
+        //         }]
+        //     });
+        //     return
+        // }
         // window.location.href = "/jyapp/front/invoice/check_invoice.html?order_code=" + orderCode
         window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode
     }

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

@@ -226,10 +226,11 @@
                 if (source === "") {
                   var pay_again = ""
                   //发票
-                  if (r.data.applybill_status === 0 && r.data.is_can_invoice) {
+                  if (r.data.is_can_invoice) {
                       //已支付未申请发票
                       pay_again += "<button class=\"j-button-cancel\" style=\"width: 100%!important;height: 0.92rem!important;\"; onclick='invoiceAdd()'>开发票</button>"
-                  } else if ( r.data.invoice_show) {
+                  }
+                   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>"
                   }
@@ -386,15 +387,15 @@
 
     //查看发票
     function checkinvoice(flag) {
-        if (flag === 2) {
-            weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
-                buttons: [{
-                    label: '我知道了',
-                    type: 'primary'
-                }]
-            });
-            return
-        }
+        // if (flag === 2) {
+        //     weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
+        //         buttons: [{
+        //             label: '我知道了',
+        //             type: 'primary'
+        //         }]
+        //     });
+        //     return
+        // }
         // window.location.href = "/jyapp/front/invoice/check_invoice.html?order_code=" + orderCode
         window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode
     }

src/jfw/modules/app/src/web/templates/commonPay/areaPack/orderDetail.html

@@ -85,6 +85,10 @@
                         class="j-button-cancel invoke"
                         v-if="orderStateMap[orderInfo.state].bottomButtonShow.invoke"
                         @click="lookInvoke">${ invokeButtonText }</button>
+                        <button
+                        class="j-button-cancel invoke"
+                        v-if="orderStateMap[orderInfo.state].bottomButtonShow.lookInvoice"
+                        @click="lookInvoke('look')">查看发票</button>
                     <button
                         class="j-button-confirm buy-again"
                         v-if="orderStateMap[orderInfo.state].bottomButtonShow.buyAgain"

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

@@ -194,10 +194,11 @@
 
                 var pay_again = ""
                 //发票
-                if (r.data.applybill_status === 0  && r.data.is_can_invoice) {
+                if ( r.data.is_can_invoice) {
                     //已支付未申请发票
                     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.show_invoice) {
+                } 
+                 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>"
                 }
@@ -361,15 +362,15 @@
 
     //查看发票
     function checkinvoice(flag) {
-        if (flag === 2) {
-            weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
-                buttons: [{
-                    label: '我知道了',
-                    type: 'primary'
-                }]
-            });
-            return
-        }
+        // if (flag === 2) {
+        //     weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
+        //         buttons: [{
+        //             label: '我知道了',
+        //             type: 'primary'
+        //         }]
+        //     });
+        //     return
+        // }
         // window.location.href = "/jyapp/front/invoice/check_invoice.html?order_code=" + orderCode
         window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode
     }

src/jfw/modules/app/src/web/templates/commonPay/buyerPortraitPack/orderDetail.html

@@ -85,6 +85,10 @@
                         class="j-button-cancel invoke"
                         v-if="orderStateMap[orderInfo.state].bottomButtonShow.invoke"
                         @click="lookInvoke">${ invokeButtonText }</button>
+                        <button
+                        class="j-button-cancel invoke"
+                        v-if="orderStateMap[orderInfo.state].bottomButtonShow.lookInvoice"
+                        @click="lookInvoke('look')">查看发票</button>    
                     <button
                         class="j-button-confirm buy-again"
                         v-if="orderStateMap[orderInfo.state].bottomButtonShow.buyAgain"

src/jfw/modules/app/src/web/templates/commonPay/dataFile/orderDetail.html

@@ -85,6 +85,10 @@
                         class="j-button-cancel invoke"
                         v-if="orderStateMap[orderInfo.state].bottomButtonShow.invoke"
                         @click="lookInvoke">${ invokeButtonText }</button>
+                    <button
+                        class="j-button-cancel invoke"
+                        v-if="orderStateMap[orderInfo.state].bottomButtonShow.lookInvoice"
+                        @click="lookInvoke('look')">查看发票</button>
                     <button
                         class="j-button-confirm buy-again"
                         v-if="orderStateMap[orderInfo.state].bottomButtonShow.buyAgain"

src/jfw/modules/app/src/web/templates/commonPay/dataPack/orderDetail.html

@@ -85,6 +85,10 @@
                         class="j-button-cancel invoke"
                         v-if="orderStateMap[orderInfo.state].bottomButtonShow.invoke"
                         @click="lookInvoke">${ invokeButtonText }</button>
+                    <button
+                        class="j-button-cancel invoke"
+                        v-if="orderStateMap[orderInfo.state].bottomButtonShow.lookInvoice"
+                        @click="lookInvoke('look')">查看发票</button>    
                     <button
                         class="j-button-confirm buy-again"
                         v-if="orderStateMap[orderInfo.state].bottomButtonShow.buyAgain"

src/jfw/modules/app/src/web/templates/commonPay/filePack/orderDetail.html

@@ -85,6 +85,10 @@
                         class="j-button-cancel invoke"
                         v-if="orderStateMap[orderInfo.state].bottomButtonShow.invoke"
                         @click="lookInvoke">${ invokeButtonText }</button>
+                    <button
+                        class="j-button-cancel invoke"
+                        v-if="orderStateMap[orderInfo.state].bottomButtonShow.lookInvoice"
+                        @click="lookInvoke('look')">查看发票</button>    
                     <button
                         class="j-button-confirm buy-again"
                         v-if="orderStateMap[orderInfo.state].bottomButtonShow.buyAgain"

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

@@ -196,10 +196,11 @@
 
                     var pay_again = ""
                     //发票
-                    if (r.data.applybill_status === 0  && r.data.is_can_invoice) {
+                    if (r.data.is_can_invoice) {
                         //已支付未申请发票
                         pay_again += "<button class=\"j-button-cancel\" style=\"width: 100%!important;height: 0.92rem!important;\"; onclick='invoiceAdd()'>开发票</button>"
-                    } else if (r.data.invoice_show) {
+                    } 
+                    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>"
                     }
@@ -378,15 +379,15 @@
 
     //查看发票
     function checkinvoice(flag) {
-        if (flag === 2) {
-            weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
-                buttons: [{
-                    label: '我知道了',
-                    type: 'primary'
-                }]
-            });
-            return
-        }
+        // if (flag === 2) {
+        //     weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
+        //         buttons: [{
+        //             label: '我知道了',
+        //             type: 'primary'
+        //         }]
+        //     });
+        //     return
+        // }
         // window.location.href = "/jyapp/front/invoice/check_invoice.html?order_code=" + orderCode
         window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode
     }

src/jfw/modules/app/src/web/templates/commonPay/myOrder.html

@@ -96,6 +96,10 @@
                                                     class="order-action-button click-active invoke"
                                                     v-if="item.buttonConf.invokeButtonShow"
                                                     @click="clickInvoke(item)">${ item.buttonConf.invokeButtonText }</button>
+                                            <button
+                                                    class="order-action-button click-active invoke"
+                                                    v-if="item.buttonConf.lookInvoiceButtonShow"
+                                                    @click="clickInvoke(item,'look')">${ item.buttonConf.lookInvoiceButtonText }</button>
                                             <button
                                                     class="order-action-button click-active main-color pay"
                                                     v-if="item.buttonConf.payConfirmShow"

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

@@ -686,15 +686,15 @@
 
     //查看发票
     function checkinvoice(flag) {
-        if (flag === 2) {
-            weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
-                buttons: [{
-                    label: '我知道了',
-                    type: 'primary'
-                }]
-            });
-            return
-        }
+        // if (flag === 2) {
+        //     weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
+        //         buttons: [{
+        //             label: '我知道了',
+        //             type: 'primary'
+        //         }]
+        //     });
+        //     return
+        // }
         // 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}}
     }
@@ -741,9 +741,10 @@
                                 $(".order-main").before(finish_html)
 
                                 var html = '<div class="j-button-group">'
-                                if (r.data.applybill_status === 0 && r.data.is_can_invoice) {
+                                if (r.data.is_can_invoice) {
                                     html += '<button class="j-button-cancel" onclick="invoiceAdd()">开发票</button><button class="j-button-confirm" id="buytwo" onclick="payAgain()">再次购买</button>'
-                                } else if ( r.data.invoice_show) {
+                                } 
+                                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,10 @@
                     $("#card-header-bg").addClass("bg finish-bg")
                     $("#pageTitle").addClass("status")
                     $(".order_status").text("已完成");
-                    if (data.applybill_status === 0 && data.is_can_invoice) {
+                    if (data.is_can_invoice) {
                         pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()'>开发票</button></div>"
-                    } else if (data.invoice_show) {
+                    } 
+                    if (data.invoice_show) {
                         pay_again += "<button class=\"j-button-cancel\" onclick= 'checkinvoice(" + data.applybill_status + ")'>查看发票</button></div>"
                     }
                     $(".j-footer").html(pay_again)
@@ -555,15 +556,15 @@
 
     //查看发票
     function checkinvoice(flag) {
-        if (flag === 2) {
-            weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
-                buttons: [{
-                    label: '我知道了',
-                    type: 'primary'
-                }]
-            });
-            return
-        }
+        // if (flag === 2) {
+        //     weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
+        //         buttons: [{
+        //             label: '我知道了',
+        //             type: 'primary'
+        //         }]
+        //     });
+        //     return
+        // }
         orderCode = decodeURIComponent(getParam("order_code"))
         // window.location.href = "/jyapp/front/invoice/check_invoice.html?order_code=" + orderCode
         window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode

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

@@ -23,7 +23,8 @@ var vm = new Vue({
           bottomButtonShow: {
             pay: false,
             invoke: false,
-            buyAgain: false
+            buyAgain: false,
+            lookInvoice: false
           }
         },
         0: {
@@ -34,7 +35,8 @@ var vm = new Vue({
           bottomButtonShow: {
             pay: true,
             invoke: false,
-            buyAgain: false
+            buyAgain: false,
+            lookInvoice: false
           }
         },
         1: {
@@ -46,7 +48,8 @@ var vm = new Vue({
             pay: false,
             invoke: true,
             buyAgain: false,
-            renew: false
+            renew: false,
+            lookInvoice: true
           }
         },
         '-2': {
@@ -57,7 +60,8 @@ var vm = new Vue({
           bottomButtonShow: {
             pay: false,
             invoke: false,
-            buyAgain: false
+            buyAgain: false,
+            lookInvoice: false
           }
         },
         '-3': {
@@ -68,7 +72,8 @@ var vm = new Vue({
           bottomButtonShow: {
             pay: false,
             invoke: false,
-            buyAgain: false
+            buyAgain: false,
+            lookInvoice: false
           }
         }
       },
@@ -112,7 +117,7 @@ var vm = new Vue({
   },
   computed: {
     invokeButtonText: function () {
-      return this.orderInfo.applybillStatus === 0 ? '开发票' : '查看发票'
+      return  '开发票' 
     },
     buttonGroupShow: function () {
     	if(this.orderInfo.payMoney>0){
@@ -120,7 +125,8 @@ var vm = new Vue({
 	      var payShow = this.orderStateMap[state].bottomButtonShow.pay
 	      var invokeShow = this.orderStateMap[state].bottomButtonShow.invoke
 	      var buyAgainShow = this.orderStateMap[state].bottomButtonShow.buyAgain
-	      return payShow || invokeShow || buyAgainShow
+        var lookInvoice = this.orderStateMap[state].bottomButtonShow.lookInvoice
+	      return payShow || invokeShow || buyAgainShow || lookInvoice
 	    }
     }
   },
@@ -233,7 +239,7 @@ var vm = new Vue({
         this.orderStateMap[1].bottomButtonShow.buyAgain = true
       }
 
-      var filterInfo = JSON.parse(order.filter)
+      // var filterInfo = JSON.parse(order.filter)
       // 开发票按钮展示逻辑
       // if (this.invokeButtonText === '开发票' && (order.pay_money <= 0)||(filterInfo.canInvoice!=undefined &&!filterInfo.canInvoice)) {
       //   this.orderStateMap[1].bottomButtonShow.invoke = false
@@ -241,11 +247,17 @@ var vm = new Vue({
       // if(order.source === 1){ // 线下发票隐藏按钮 p537放开此限制
       //   this.orderStateMap[this.orderInfo.state].bottomButtonShow.invoke = false
       // }
-      if(this.invokeButtonText === '开发票' && !order.is_can_invoice){
-        this.orderStateMap[this.orderInfo.state].bottomButtonShow.invoke = false
-
-      }else if (this.invokeButtonText === '查看发票' && !order.invoice_show) {
+      // 开发票
+      if(!order.is_can_invoice){
         this.orderStateMap[this.orderInfo.state].bottomButtonShow.invoke = false
+      } else {
+        this.orderStateMap[this.orderInfo.state].bottomButtonShow.invoke = true
+      }
+      // 查看发票
+      if ( !order.invoice_show) {
+        this.orderStateMap[this.orderInfo.state].bottomButtonShow.lookInvoice = false
+      } else {
+        this.orderStateMap[this.orderInfo.state].bottomButtonShow.lookInvoice = true
       }
       this.orderInfo.productInfoList = this.getProductInfoList(info)
       this.orderInfo.orderInfoList = this.getOrderInfoListList(info)
@@ -377,7 +389,7 @@ var vm = new Vue({
       return infoList
     },
     // 开发票逻辑，和订单详情相同
-    lookInvoke: function () {
+    lookInvoke: function (type) {
       var _this = this
       var platform = this.platform
       var order = this.reqOrder
@@ -386,21 +398,21 @@ var vm = new Vue({
       var applybill_status = order.applybill_status
 
       // 已开发票情况(查看发票)
-      if (applybill_status === 1) {
-        var href = assetsConf.invokeLink.lookInvoice[platform]
-        if (href) {
-          _this.goToLink(`${href}?order_code=${orderCode}`)
-        }
-        return
-      } else if (applybill_status === 2) {
-        return this.showDialog({
-          title: '',
-          message: '您已开具发票<br>如有问题请联系客服<br>400-108-6670',
-          className: 'j-confirm-dialog text-center',
-          showCancelButton: false,
-          confirmButtonText: '我知道了'
-        })
-      }
+      // if (applybill_status === 1) {
+      //   var href = assetsConf.invokeLink.lookInvoice[platform]
+      //   if (href) {
+      //     _this.goToLink(`${href}?order_code=${orderCode}`)
+      //   }
+      //   return
+      // } else if (applybill_status === 2) {
+      //   return this.showDialog({
+      //     title: '',
+      //     message: '您已开具发票<br>如有问题请联系客服<br>400-108-6670',
+      //     className: 'j-confirm-dialog text-center',
+      //     showCancelButton: false,
+      //     confirmButtonText: '我知道了'
+      //   })
+      // }
 
       // 临时需求 未开发票提示当前时期不能开具发票
       // return this.showDialog({
@@ -410,36 +422,47 @@ var vm = new Vue({
       //   showCancelButton: false,
       //   confirmButtonText: '我知道了'
       // })
-
-      var loading = this.showLoading()
-      $.ajax({
-        type: 'POST',
-        url: '/subscribepay/orderListDetails/isOver',
-        data: {
-          order_code: orderCode
-        },
-        success: function (res) {
-          loading && loading.clear()
-          if (res.status === 1) {
-            // 开发票跳转
-            var href = assetsConf.invokeLink.invoke[platform]
-            if (href) {
-              _this.goToLink(`${href}?order_code=${orderCode}`)
-            }
-          } else {
-            // 不能开发票跳转
-            // var href = assetsConf.invokeLink.cantInvoke[platform]
-            // p537 调整为取消此不能开发票限制 
-            var href = assetsConf.invokeLink.invoke[platform]
-            if (href) {
-              _this.goToLink(`${href}?order_code=${orderCode}`)
-            }
-          }
-        },
-        error: function (err) {
-          loading && loading.clear()
+     
+      // var loading = this.showLoading()
+      // $.ajax({
+      //   type: 'POST',
+      //   url: '/subscribepay/orderListDetails/isOver',
+      //   data: {
+      //     order_code: orderCode
+      //   },
+      //   success: function (res) {
+      //     loading && loading.clear()
+      //     if (res.status === 1) {
+      //       // 开发票跳转
+      //       var href = assetsConf.invokeLink.invoke[platform]
+      //       if (href) {
+      //         _this.goToLink(`${href}?order_code=${orderCode}`)
+      //       }
+      //     } else {
+      //       // 不能开发票跳转
+      //       // var href = assetsConf.invokeLink.cantInvoke[platform]
+      //       // p537 调整为取消此不能开发票限制 
+      //       var href = assetsConf.invokeLink.invoke[platform]
+      //       if (href) {
+      //         _this.goToLink(`${href}?order_code=${orderCode}`)
+      //       }
+      //     }
+      //   },
+      //   error: function (err) {
+      //     loading && loading.clear()
+      //   }
+      // })
+      if ( type === 'look' ){
+        var href = assetsConf.invokeLink.lookInvoice[platform]
+        if (href) {
+          _this.goToLink(`${href}?order_code=${orderCode}`)
         }
-      })
+      } else {
+        var href = assetsConf.invokeLink.invoke[platform]
+        if (href) {
+          _this.goToLink(`${href}?order_code=${orderCode}`)
+        }
+      }
     },
     onConfirmPay: function () {
       var link = this.getPublicLinkOfKey(this.reqOrder.product_type, 'pay')

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

@@ -805,8 +805,10 @@ var vm = new Vue({
         cancelOrderShow: false, // 取消订单按钮是否显示
         payConfirmShow: false, // 去支付按钮是否显示
         payConfirmText: '去支付', // 去支付按钮文字
-        invokeButtonShow: false, // 开发票(查看发票)按钮是否显示
-        invokeButtonText: '开发票', // 开发票(查看发票)按钮是否显示
+        invokeButtonShow: false, // 开发票按钮是否显示
+        invokeButtonText: '开发票', // 开发票按钮是否显示
+        lookInvoiceButtonShow: false,
+        lookInvoiceButtonText:'查看发票',
         bugAgainShow: false, // 再次购买(购买/续费/升级)按钮是否显示
         bugAgainText: '再次购买', // 再次购买(购买/续费/升级)按钮是否显示
       }
@@ -843,10 +845,10 @@ var vm = new Vue({
           state.bugAgainText = '再次购买'
         }
           // 已完成订单 开发票判断  0未申请  1/2已申请
-        if (order.applybill_status === 1 || order.applybill_status === 2) {
-          // 查看发票
-          state.invokeButtonText = '查看发票'
-        }
+        // if (order.applybill_status === 1 || order.applybill_status === 2) {
+        //   // 查看发票
+        //   state.invokeButtonText = '查看发票'
+        // }
         // 判断开发票
         // 后台渠道为xdqd04(销售代下单)可以开发票，其他后台创建订单不可以开发票
         // var backstageOrderCanInvoke = order.is_backstage_order === 0 || order.order_channel === 'xdqd04'
@@ -856,20 +858,18 @@ var vm = new Vue({
       // if(order.source === 1){ // 线下发票隐藏按钮
       //   state.invokeButtonShow = false
       // }
-      if (state.invokeButtonText  === '开发票') {
+
         if (order.is_can_invoice) {
           state.invokeButtonShow = true
          } else {
           state.invokeButtonShow = false
         }
-      } 
-       if (state.invokeButtonText  === '查看发票') {
         if (order.invoice_show) {
-          state.invokeButtonShow = true
+          state.lookInvoiceButtonShow = true
         }else{
-          state.invokeButtonShow = false
+          state.lookInvoiceButtonShow = false
         }  
-      }
+      
 
       } else if (orderStatus === -2 || orderStatus === -3) {
         // 已取消或者已删除订单
@@ -994,7 +994,7 @@ var vm = new Vue({
       return state
     },
     // 开发票和查看发票
-    clickInvoke: function (order) {
+    clickInvoke: function (order,type) {
       var _this = this
       var platform = this.platform
       var orderCode = order.order_code
@@ -1019,7 +1019,7 @@ var vm = new Vue({
       }
 
       // 大会员公对公转账发票提示
-      if (productType === '大会员' && order.pay_way === 'transferAccounts' && applybill_status == 0) {
+      if (productType === '大会员' && order.pay_way === 'transferAccounts' && type !== 'look') {
         return this.showDialog({
           title: '',
           message: '请联系客服开票<br>客服热线：400-108-6670',
@@ -1031,21 +1031,21 @@ var vm = new Vue({
 
 
       // 已开发票情况(查看发票)
-      if (applybill_status === 1) {
-        var href = assetsConf.invokeLink.lookInvoice[platform]
-        if (href) {
-          _this.goToLinkAndSaveState(`${href}?order_code=${orderCode}`)
-        }
-        return
-      } else if (applybill_status === 2) {
-        return this.showDialog({
-          title: '',
-          message: '您已开具发票<br>如有问题请联系客服<br>400-108-6670',
-          className: 'j-confirm-dialog text-center',
-          showCancelButton: false,
-          confirmButtonText: '我知道了'
-        })
-      }
+      // if (applybill_status === 1) {
+      //   var href = assetsConf.invokeLink.lookInvoice[platform]
+      //   if (href) {
+      //     _this.goToLinkAndSaveState(`${href}?order_code=${orderCode}`)
+      //   }
+      //   return
+      // } else if (applybill_status === 2) {
+      //   return this.showDialog({
+      //     title: '',
+      //     message: '您已开具发票<br>如有问题请联系客服<br>400-108-6670',
+      //     className: 'j-confirm-dialog text-center',
+      //     showCancelButton: false,
+      //     confirmButtonText: '我知道了'
+      //   })
+      // }
 
       // 临时需求 未开发票提示当前时期不能开具发票
       // return this.showDialog({
@@ -1056,35 +1056,47 @@ var vm = new Vue({
       //   confirmButtonText: '我知道了'
       // })
 
-      var loading = this.showLoading()
-      $.ajax({
-        type: 'POST',
-        url: '/subscribepay/orderListDetails/isOver',
-        data: {
-          order_code: orderCode
-        },
-        success: function (res) {
-          loading && loading.clear()
-          if (res.status === 1) {
-            // 开发票跳转
-            var href = assetsConf.invokeLink.invoke[platform]
-            if (href) {
-              _this.goToLink(`${href}?order_code=${orderCode}`)
-            }
-          } else {
-            // 不能开发票跳转
-            // var href = assetsConf.invokeLink.cantInvoke[platform]
-            // p537 调整为取消此不能开发票限制 
-            var href = assetsConf.invokeLink.invoke[platform]
-            if (href) {
-              _this.goToLinkAndSaveState(`${href}?order_code=${orderCode}`)
-            }
-          }
-        },
-        error: function (err) {
-          loading && loading.clear()
+      // var loading = this.showLoading()
+      // $.ajax({
+      //   type: 'POST',
+      //   url: '/subscribepay/orderListDetails/isOver',
+      //   data: {
+      //     order_code: orderCode
+      //   },
+      //   success: function (res) {
+      //     loading && loading.clear()
+      //     if (res.status === 1) {
+      //       // 开发票跳转
+      //       var href = assetsConf.invokeLink.invoke[platform]
+      //       if (href) {
+      //         _this.goToLink(`${href}?order_code=${orderCode}`)
+      //       }
+      //     } else {
+      //       // 不能开发票跳转
+      //       // var href = assetsConf.invokeLink.cantInvoke[platform]
+      //       // p537 调整为取消此不能开发票限制 
+      //       var href = assetsConf.invokeLink.invoke[platform]
+      //       if (href) {
+      //         _this.goToLinkAndSaveState(`${href}?order_code=${orderCode}`)
+      //       }
+      //     }
+      //   },
+      //   error: function (err) {
+      //     loading && loading.clear()
+      //   }
+      // })
+      if (type === 'look') {
+        var href = assetsConf.invokeLink.lookInvoice[platform]
+        if (href) {
+          _this.goToLinkAndSaveState(`${href}?order_code=${orderCode}`)
         }
-      })
+      } else {           // 开发票跳转
+        var href = assetsConf.invokeLink.invoke[platform]
+        if (href) {
+          _this.goToLink(`${href}?order_code=${orderCode}`)
+         }
+
+      }
     },
     // 去支付
     clickPayConfirm: function (order) {

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

@@ -88,6 +88,10 @@
                         class="j-button-cancel invoke"
                         v-if="orderStateMap[orderInfo.state].bottomButtonShow.invoke"
                         @click="lookInvoke">${ invokeButtonText }</button>
+                    <button
+                        class="j-button-cancel invoke"
+                        v-if="orderStateMap[orderInfo.state].bottomButtonShow.lookInvoice"
+                        @click="lookInvoke('look')">查看发票</button>    
                     <button
                         class="j-button-confirm buy-again"
                         v-if="orderStateMap[orderInfo.state].bottomButtonShow.buyAgain"

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

@@ -184,10 +184,11 @@
 
                 var pay_again = ""
                 //发票
-                if (r.data.applybill_status === 0 &&  r.data.is_can_invoice) {
+                if (r.data.is_can_invoice) {
                     //已支付未申请发票
                     pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()'>开发票</button>"
-                } else if ( r.data.invoice_show) {
+                } 
+                if ( r.data.invoice_show) {
                     //已支付已申请发票
                     pay_again += "<button class=\"j-button-cancel\" onclick='checkInvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                 }
@@ -349,15 +350,15 @@
 
     //查看发票
     function checkInvoice(flag) {
-        if (flag === 2) {
-            weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
-                buttons: [{
-                    label: '我知道了',
-                    type: 'primary'
-                }]
-            });
-            return
-        }
+        // if (flag === 2) {
+        //     weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
+        //         buttons: [{
+        //             label: '我知道了',
+        //             type: 'primary'
+        //         }]
+        //     });
+        //     return
+        // }
         // window.location.href = "/front/invoice/check_invoice.html?order_code=" + orderCode
         window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode
     }

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

@@ -88,6 +88,10 @@
                         class="j-button-cancel invoke"
                         v-if="orderStateMap[orderInfo.state].bottomButtonShow.invoke"
                         @click="lookInvoke">${ invokeButtonText }</button>
+                    <button
+                        class="j-button-cancel invoke"
+                        v-if="orderStateMap[orderInfo.state].bottomButtonShow.lookInvoice"
+                        @click="lookInvoke('look')">查看发票</button>    
                     <button
                         class="j-button-confirm buy-again"
                         v-if="orderStateMap[orderInfo.state].bottomButtonShow.buyAgain"

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

@@ -88,6 +88,10 @@
                         class="j-button-cancel invoke"
                         v-if="orderStateMap[orderInfo.state].bottomButtonShow.invoke"
                         @click="lookInvoke">${ invokeButtonText }</button>
+                    <button
+                        class="j-button-cancel invoke"
+                        v-if="orderStateMap[orderInfo.state].bottomButtonShow.lookInvoice"
+                        @click="lookInvoke('look')">查看发票</button>    
                     <button
                         class="j-button-confirm buy-again"
                         v-if="orderStateMap[orderInfo.state].bottomButtonShow.buyAgain"

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

@@ -88,6 +88,10 @@
                         class="j-button-cancel invoke"
                         v-if="orderStateMap[orderInfo.state].bottomButtonShow.invoke"
                         @click="lookInvoke">${ invokeButtonText }</button>
+                    <button
+                        class="j-button-cancel invoke"
+                        v-if="orderStateMap[orderInfo.state].bottomButtonShow.lookInvoice"
+                        @click="lookInvoke('look')">查看发票</button> 
                     <button
                         class="j-button-confirm buy-again"
                         v-if="orderStateMap[orderInfo.state].bottomButtonShow.buyAgain"

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

@@ -88,6 +88,10 @@
                         class="j-button-cancel invoke"
                         v-if="orderStateMap[orderInfo.state].bottomButtonShow.invoke"
                         @click="lookInvoke">${ invokeButtonText }</button>
+                    <button
+                        class="j-button-cancel invoke"
+                        v-if="orderStateMap[orderInfo.state].bottomButtonShow.lookInvoice"
+                        @click="lookInvoke('look')">查看发票</button>    
                     <button
                         class="j-button-confirm buy-again"
                         v-if="orderStateMap[orderInfo.state].bottomButtonShow.buyAgain"

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

@@ -190,10 +190,11 @@
     
                     var pay_again = ""
                     //发票
-                    if (r.data.applybill_status === 0 && res.data.is_can_invoice) {
+                    if (res.data.is_can_invoice) {
                         //已支付未申请发票
                         pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()'>开发票</button>"
-                    } else if (r.data.invoice_show) {
+                    } 
+                    if (r.data.invoice_show) {
                         //已支付已申请发票
                         pay_again += "<button class=\"j-button-cancel\" onclick='checkInvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                     }
@@ -367,15 +368,15 @@
 
     //查看发票
     function checkInvoice(flag) {
-        if (flag === 2) {
-            weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
-                buttons: [{
-                    label: '我知道了',
-                    type: 'primary'
-                }]
-            });
-            return
-        }
+        // if (flag === 2) {
+        //     weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
+        //         buttons: [{
+        //             label: '我知道了',
+        //             type: 'primary'
+        //         }]
+        //     });
+        //     return
+        // }
         // window.location.href = "/front/invoice/check_invoice.html?order_code=" + orderCode
         window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode
     }

src/web/templates/weixin/commonPay/myOrder.html

@@ -108,6 +108,10 @@
                                             class="order-action-button click-active invoke"
                                             v-if="item.buttonConf.invokeButtonShow"
                                             @click="clickInvoke(item)">${ item.buttonConf.invokeButtonText }</button>
+                                    <button
+                                            class="order-action-button click-active invoke"
+                                            v-if="item.buttonConf.lookInvoiceButtonShow"
+                                            @click="clickInvoke(item,'look')">${ item.buttonConf.lookInvoiceButtonText }</button>
                                     <button
                                             class="order-action-button click-active main-color pay"
                                             v-if="item.buttonConf.payConfirmShow"

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

@@ -550,9 +550,10 @@
                                 $(".order-main").before(finish_html)
 
                                 var html = '<div class="j-button-group">'
-                                if (r.data.applybill_status === 0 && r.data.is_can_invoice) {
+                                if ( r.data.is_can_invoice) {
                                     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.invoice_show) {
+                                } 
+                                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 {
@@ -634,15 +635,15 @@
 
     //查看发票
     function checkinvoice(order_code, flag) {
-        if (flag === 2) {
-            weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
-                buttons: [{
-                    label: '我知道了',
-                    type: 'primary'
-                }]
-            });
-            return
-        }
+        // if (flag === 2) {
+        //     weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
+        //         buttons: [{
+        //             label: '我知道了',
+        //             type: 'primary'
+        //         }]
+        //     });
+        //     return
+        // }
         // window.location.href = "/front/invoice/check_invoice.html?order_code=" + order_code
         window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + order_code
     }

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

@@ -221,10 +221,11 @@
                     if (source===""){
                       var pay_again = ""
                       //发票
-                      if (r.data.applybill_status === 0 && r.data.is_can_invoice) {
+                      if ( r.data.is_can_invoice) {
                           //已支付未申请发票
                           pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()'>开发票</button>"
-                      } else if (r.data.invoice_show) {
+                      } 
+                       if (r.data.invoice_show) {
                           //已支付已申请发票
                           pay_again += "<button class=\"j-button-cancel\" onclick='checkInvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                       }
@@ -383,15 +384,15 @@
 
     //查看发票
     function checkInvoice(flag) {
-        if (flag === 2) {
-            weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
-                buttons: [{
-                    label: '我知道了',
-                    type: 'primary'
-                }]
-            });
-            return
-        }
+        // if (flag === 2) {
+        //     weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
+        //         buttons: [{
+        //             label: '我知道了',
+        //             type: 'primary'
+        //         }]
+        //     });
+        //     return
+        // }
         // window.location.href = "/front/invoice/check_invoice.html?order_code=" + orderCode
         window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode
     }

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

@@ -395,10 +395,11 @@
                   var pay_again = ""
                   //有效周期
                   $(".line_cycle").css("display", "");
-                  if (r.data.applybill_status === 0 && r.data.is_can_invoice) {
+                  if (r.data.is_can_invoice) {
                       //已支付未申请发票
                       pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()'>开发票</button>"
-                  } else if ( r.data.invoice_show) {
+                  } 
+                   if ( r.data.invoice_show) {
                       //已支付已申请发票
                       pay_again += "<button class=\"j-button-cancel\" onclick='checkInvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                   }
@@ -633,15 +634,15 @@
 
     //查看发票
     function checkInvoice(flag) {
-        if (flag === 2) {
-            weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
-                buttons: [{
-                    label: '我知道了',
-                    type: 'primary'
-                }]
-            });
-            return
-        }
+        // if (flag === 2) {
+        //     weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
+        //         buttons: [{
+        //             label: '我知道了',
+        //             type: 'primary'
+        //         }]
+        //     });
+        //     return
+        // }
         // window.location.href = "/front/invoice/check_invoice.html?order_code=" + orderCode
         window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode
     }

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

@@ -231,7 +231,7 @@
                 var pay_again = ""
                 //发票
                 if (source === "") {
-                  if (r.data.applybill_status === 0 && r.data.is_can_invoice) {
+                  if ( r.data.is_can_invoice) {
                       //已支付未申请发票
                       pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()'>开发票</button>"
                   } else if (r.data.invoice_show) {
@@ -391,15 +391,15 @@
 
     //查看发票
     function checkInvoice(flag) {
-        if (flag === 2) {
-            weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
-                buttons: [{
-                    label: '我知道了',
-                    type: 'primary'
-                }]
-            });
-            return
-        }
+        // if (flag === 2) {
+        //     weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
+        //         buttons: [{
+        //             label: '我知道了',
+        //             type: 'primary'
+        //         }]
+        //     });
+        //     return
+        // }
         // window.location.href = "/front/invoice/check_invoice.html?order_code=" + orderCode
         window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode
     }

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

@@ -747,10 +747,11 @@
                     //发票
                     // 后台渠道为xdqd04(销售代下单)可以开发票，其他后台创建订单不可以开发票
                         var pay_again = ""
-                        if ( r.data.order.applybill_status === 0 && r.data.order.is_can_invoice) {
+                        if (  r.data.order.is_can_invoice) {
                             //已支付未申请发票
                             pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()'>开发票</button>"
-                        } else if ( r.data.order.invoice_show) {
+                        } 
+                        if ( r.data.order.invoice_show) {
                             //已支付已申请发票
                             pay_again += "<button class=\"j-button-cancel\" onclick='checkInvoice(" + r.data.order.applybill_status + ")'>查看发票</button>"
                         }
@@ -994,15 +995,15 @@
 
     //查看发票
     function checkInvoice(flag) {
-        if (flag === 2) {
-            weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
-                buttons: [{
-                    label: '我知道了',
-                    type: 'primary'
-                }]
-            });
-            return
-        }
+        // if (flag === 2) {
+        //     weui.alert('您已开具发票<br>如有问题请联系客服<br>400-108-6670', {
+        //         buttons: [{
+        //             label: '我知道了',
+        //             type: 'primary'
+        //         }]
+        //     });
+        //     return
+        // }
         orderCode = getParam("orderCode")
         // window.location.href = "/front/invoice/check_invoice.html?order_code=" + orderCode
         window.location.href = "/jy_mobile/invoice/viewInvoice?order_code=" + orderCode