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

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

@@ -457,24 +457,30 @@ $(function () {
                     //发票
                     if (r.data.order.applybill_status === 0) {
                         //已支付未申请发票
-                        pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()' style='width: 100%!important;'>开发票</button>"
-                        $(".invoice .invoicing").css("display", "");
-                        $(".invoicing").on("click", function () {
-                            var nowTimestamp = (new Date()).valueOf();
-                            $.post("/subscribepay/orderListDetails/emailOperation?v=" + nowTimestamp, {}, function (r) {
-                                if (r.success) {
-                                    //没有绑定邮箱
-                                    weuiDialog();
-                                } else {
-                                    //绑定了邮箱
-                                    window.location.href = "/jyapp/front/myOrder/getOrderCode/" + orderCode;
-                                }
-                            })
-                        });
+                        if(r.data.order.source !== 1){
+                            pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()' style='width: 100%!important;'>开发票</button>"
+                            $(".invoice .invoicing").css("display", "");
+                            $(".invoicing").on("click", function () {
+                                var nowTimestamp = (new Date()).valueOf();
+                                $.post("/subscribepay/orderListDetails/emailOperation?v=" + nowTimestamp, {}, function (r) {
+                                    if (r.success) {
+                                        //没有绑定邮箱
+                                        weuiDialog();
+                                    } else {
+                                        //绑定了邮箱
+                                        window.location.href = "/jyapp/front/myOrder/getOrderCode/" + orderCode;
+                                    }
+                                })
+                            });
+
+                        }
                     } else {
                         //已支付已申请发票
+                        if(r.data.order.source !== 1){
                         pay_again += "<button class=\"j-button-cancel\" onclick= 'checkinvoice(" + r.data.order.applybill_status + ")' style='width: 100%!important;'>查看发票</button >"
                         $(".invoice").css("display", "none");
+                        }
+
                         switch (r.data.order.applybill_type) {
                             case 0:
                                 $(".person").css("display", "");

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) {
+                  if (r.data.applybill_status === 0 && r.data.source !== 1) {
                       //已支付未申请发票
                       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) {
+                  } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.source !== 1) {
                       //已支付已申请发票
                       pay_again += "<button class=\"j-button-cancel\" style=\"width: 100%!important;height: 0.92rem!important;\" onclick='checkinvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                   }

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

@@ -312,10 +312,10 @@
                 if (source === ""&&filterObj.badge!="exchange") {
                     var pay_again = ""
                     //发票
-                    if (r.data.applybill_status === 0) {
+                    if (r.data.applybill_status === 0 && r.data.source !== 1) {
                         //已支付未申请发票
                         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) {
+                    } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.source !== 1) {
                         //已支付已申请发票
                         pay_again += "<button class=\"j-button-cancel\" style=\"width: 100%!important;height: 0.92rem!important;\" onclick='checkinvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                     }

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

@@ -212,10 +212,10 @@
                 if (source === "") {
                   var pay_again = ""
                   //发票
-                  if (r.data.applybill_status === 0) {
+                  if (r.data.applybill_status === 0 && r.data.source !== 1) {
                       //已支付未申请发票
                       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) {
+                  } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2)  && r.data.source !== 1) {
                       //已支付已申请发票
                       pay_again += "<button class=\"j-button-cancel\" style=\"width: 100%!important;height: 0.92rem!important;\" onclick='checkinvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                   }

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

@@ -194,10 +194,10 @@
 
                 var pay_again = ""
                 //发票
-                if (r.data.applybill_status === 0) {
+                if (r.data.applybill_status === 0  && r.data.source !== 1) {
                     //已支付未申请发票
                     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) {
+                } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.source !== 1) {
                     //已支付已申请发票
                     pay_again += "<button class=\"j-button-cancel\" style=\"width: 100%!important;height: 0.92rem!important;\" onclick='checkinvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                 }

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

@@ -196,10 +196,10 @@
 
                     var pay_again = ""
                     //发票
-                    if (r.data.applybill_status === 0) {
+                    if (r.data.applybill_status === 0  && r.data.source !== 1) {
                         //已支付未申请发票
                         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) {
+                    } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2)  && r.data.source !== 1) {
                         //已支付已申请发票
                         pay_again += "<button class=\"j-button-cancel\" style=\"width: 100%!important;height: 0.92rem!important;\" onclick='checkinvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                     }

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

@@ -723,9 +723,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.source !== 1) {
                                     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) {
+                                } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.source !== 1) {
                                     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) {
+                    if (data.applybill_status === 0 && data.source !== 1) {
                         pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()'>开发票</button></div>"
-                    } else if (data.applybill_status === 1 || data.applybill_status === 2) {
+                    } else if ((data.applybill_status === 1 || data.applybill_status === 2) && data.source !== 1) {
                         pay_again += "<button class=\"j-button-cancel\" onclick= 'checkinvoice(" + data.applybill_status + ")'>查看发票</button></div>"
                     }
                     $(".j-footer").html(pay_again)

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

@@ -238,7 +238,10 @@ var vm = new Vue({
       if ((order.pay_money <= 0)||(filterInfo.canInvoice!=undefined &&!filterInfo.canInvoice)) {
         this.orderStateMap[1].bottomButtonShow.invoke = false
       }
+      if(order.source === 1){ // 线下发票隐藏按钮
+        this.orderStateMap[this.orderInfo.state].bottomButtonShow.invoke = false
 
+      }
       this.orderInfo.productInfoList = this.getProductInfoList(info)
       this.orderInfo.orderInfoList = this.getOrderInfoListList(info)
       // this.getOrderBottomButton(info.order)

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

@@ -868,7 +868,11 @@ var vm = new Vue({
       if (cbConf) {
         Object.assign(state, cbConf)
       }
+      if(order.source === 1){ // 线下发票隐藏按钮
+        state.invokeButtonShow = false
+      }
       return state
+
     },
     // 底部按钮状态不同产品的定制
     buttonConfProductCustom: function (order) {

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

@@ -225,7 +225,7 @@
                             //发票
                             if (r.data.order.applybill_status === 0) {
                                 $(".openinvoice").css("display", "");
-                            } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                            } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.source !== 1) {
                                 $(".lookinvoice").css("display", "").on("click", function () {
                                     checkinvoice(r.data.applybill_status, orderCode)//查看发票
                                 })

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

@@ -191,9 +191,9 @@
                             $(".pay_num_p").css("display", "");
                             if (r.data.transaction_id) $(".pay_num").text(r.data.transaction_id);
                             //发票
-                            if (r.data.order.applybill_status === 0 && r.data.order.billingMode === 1 && r.data.order.is_backstage_order === 0) {
+                            if (r.data.order.applybill_status === 0 && r.data.order.billingMode === 1 && r.data.order.is_backstage_order === 0 && r.data.order.source !== 1) {
                                 $(".openinvoice").css("display", "");
-                            } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                            } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.order.source !== 1 ) {
                                 $(".lookinvoice").css("display", "").on("click", function () {
                                     checkinvoice(r.data.applybill_status, orderCode)//查看发票
                                 })

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

@@ -180,9 +180,9 @@
                             $(".pay_num_p").show();
                         }
                         //发票
-                        if (r.data.applybill_status === 0) {
+                        if (r.data.applybill_status === 0 && r.data.source !== 1) {
                             $(".openinvoice").css("display", "");
-                        } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                        } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.source !== 1) {
                             $(".lookinvoice").css("display", "").on("click", function () {
                                 checkinvoice(r.data.applybill_status, orderCode)
                             })

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

@@ -194,7 +194,7 @@
                             //发票
                             if (r.data.order.applybill_status === 0) {
                                 $(".openinvoice").css("display", "");
-                            } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                            } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.source !== 1) {
                                 $(".lookinvoice").css("display", "").on("click", function () {
                                     checkinvoice(r.data.applybill_status, orderCode)//查看发票
                                 })

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

@@ -170,7 +170,7 @@
                         //发票
                         if (r.data.orderInfo.applybillStatus === 0) {
                             $(".openinvoice").css("display", "");
-                        } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                        } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.source !== 1) {
                             $(".lookinvoice").css("display", "").on("click", function () {
                                 checkinvoice(r.data.applybill_status, orderCode)
                             })

src/web/templates/pc/myOrder.html

@@ -542,10 +542,9 @@
                       <p><a data-jy-track="click-hover" @click="goCancel(item)">取消订单</a></p>
                     </div>
                     <div v-if="item.order_status === 1 && (item.filter.source || '') === '' && item.filter.badge!='exchange'">
-                      <p><a v-if="item.applybill_status === 0" data-jy-track="click-hover"
+                      <p><a v-if="item.applybill_status === 0 && item.source !== 1" data-jy-track="click-hover"
                           @click="goInvoice(item)">开发票</a></p>
-                      <p><a v-if="item.applybill_status === 1 || item.applybill_status === 2"
-                          data-jy-track="click-hover" @click="goInvoice(item)">发票信息</a></p>
+                      <p><a v-if="(item.applybill_status === 1 || item.applybill_status === 2) && item.source !== 1" data-jy-track="click-hover" @click="goInvoice(item)">发票信息</a></p>
                     </div>
                   </div>
                   <div class="handleBox" v-else-if="item.product_type === '大会员-AI中标预测包'
@@ -562,9 +561,9 @@
                     </div>
                     <div v-if="item.order_status === 1 && (item.filter.source || '') === ''&& item.filter.badge!='exchange'">
                       <!--                                        <div v-if="(item.filter.canInvoice !=undefined  && !item.filter.canInvoice)">-->
-                      <p><a v-if="item.applybill_status === 0" data-jy-track="click-hover"
+                      <p><a v-if="item.applybill_status === 0 && item.source !== 1" data-jy-track="click-hover"
                           @click="goInvoice(item)">开发票</a></p>
-                      <p><a v-if="item.applybill_status === 1 || item.applybill_status === 2"
+                      <p><a v-if="(item.applybill_status === 1 || item.applybill_status === 2) && item.source !== 1"
                           data-jy-track="click-hover" @click="goInvoice(item)">发票信息</a></p>
                       <!--                                        </div>-->
                     </div>
@@ -581,10 +580,10 @@
                     </p>
                     <!--已完成 && && item.filter.badge!='exchange' P307 权益码兑换 不开发票-->
                     <p v-if="item.order_status === 1 && item.filter.badge!='exchange'"><a
-                        v-if="item.applybill_status === 0 && item.billingMode === 1 && (item.is_backstage_order === 0 || item.order_channel === 'xdqd04')"
+                        v-if="item.applybill_status === 0 && item.billingMode === 1 && (item.is_backstage_order === 0 || item.order_channel === 'xdqd04') && item.source !== 1"
                         data-jy-track="click-hover" @click="goInvoice(item)">开发票</a></p>
                     <p v-if="item.order_status === 1"><a
-                        v-if="item.applybill_status === 1 || item.applybill_status === 2" data-jy-track="click-hover"
+                        v-if="(item.applybill_status === 1 || item.applybill_status === 2) && item.source !== 1" data-jy-track="click-hover"
                         @click="goInvoice(item)">发票信息</a></p>
                     <!--已取消-->
                     <!--历史数据 再次购买-->

src/web/templates/pc/orderDetail.html

@@ -487,6 +487,12 @@
         var orderStatus = {{ .T.o.order_status }};
         var invoiceStatus = {{ .T.o.applybill_status }}
         var orderCode = {{.T.o.order_code}}
+        try{
+        var source_ ={{.T.o.source}}
+        }catch(e){
+
+        } 
+        
         if (orderStatus === 0) {
             $("#status_wait_pay").show();
             $(".payOrder").show();
@@ -495,7 +501,7 @@
             $("#status_success").show();
             if (invoiceStatus === 0) {
                 $(".openinvoice").show();
-            } else if (invoiceStatus === 1 || invoiceStatus === 2) {
+            } else if ((invoiceStatus === 1 || invoiceStatus === 2) && source_ !== 1) {
                 $(".lookinvoice").show().on("click", function () {
                     checkinvoice({{.T.o.applybill_status}}, orderCode)
                 });

src/web/templates/pc/subAccount_orderDetail.html

@@ -208,9 +208,9 @@
                         if (source===""){
                           //发票
                             if (r.data.is_backstage_order!==1){
-                                if (r.data.applybill_status === 0) {
+                                if (r.data.applybill_status === 0 && r.data.source !== 1) {
                                     $(".openinvoice").css("display", "");
-                                } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                                } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.source !== 1) {
                                     $(".lookinvoice").css("display", "").on("click", function () {
                                         checkinvoice(r.data.applybill_status, orderCode)//查看发票
                                     })

src/web/templates/pc/vip_orderDetail.html

@@ -304,9 +304,9 @@
                             //发票
                             // 后台渠道为xdqd04(销售代下单)可以开发票，其他后台创建订单不可以开发票
                             if (r.data.order.is_backstage_order!==1 || r.data.order.order_channel === 'xdqd04'){
-                                if (r.data.order.applybill_status === 0) {
+                                if (r.data.order.applybill_status === 0 && r.data.order.source !== 1) {
                                     $(".openinvoice").css("display", "");
-                                } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                                } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.source !== 1) {
                                     $(".lookinvoice").css("display", "").on("click", function () {
                                         checkinvoice(r.data.applybill_status, orderCode)//查看发票
                                     })

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

@@ -187,7 +187,7 @@
                 if (r.data.applybill_status === 0) {
                     //已支付未申请发票
                     pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()'>开发票</button>"
-                } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.source !== 1) {
                     //已支付已申请发票
                     pay_again += "<button class=\"j-button-cancel\" onclick='checkInvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                 }

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

@@ -193,7 +193,7 @@
                     if (r.data.applybill_status === 0) {
                         //已支付未申请发票
                         pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()'>开发票</button>"
-                    } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                    } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.source !== 1) {
                         //已支付已申请发票
                         pay_again += "<button class=\"j-button-cancel\" onclick='checkInvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                     }

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

@@ -536,7 +536,7 @@
                                 var html = '<div class="j-button-group">'
                                 if (r.data.applybill_status === 0) {
                                     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) {
+                                } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.source !== 1) {
                                     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 {

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

@@ -224,7 +224,7 @@
                       if (r.data.applybill_status === 0) {
                           //已支付未申请发票
                           pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()'>开发票</button>"
-                      } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                      } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.source !== 1) {
                           //已支付已申请发票
                           pay_again += "<button class=\"j-button-cancel\" onclick='checkInvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                       }

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

@@ -299,7 +299,7 @@
                   if (r.data.applybill_status === 0) {
                       //已支付未申请发票
                       pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()'>开发票</button>"
-                  } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                  } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.source !== 1) {
                       //已支付已申请发票
                       pay_again += "<button class=\"j-button-cancel\" onclick='checkInvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                   }

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

@@ -220,7 +220,7 @@
                   if (r.data.applybill_status === 0) {
                       //已支付未申请发票
                       pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()'>开发票</button>"
-                  } else if (r.data.applybill_status === 1 || r.data.applybill_status === 2) {
+                  } else if ((r.data.applybill_status === 1 || r.data.applybill_status === 2) && r.data.source !== 1) {
                       //已支付已申请发票
                       pay_again += "<button class=\"j-button-cancel\" onclick='checkInvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                   }

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

@@ -747,7 +747,7 @@
                         if (r.data.order.applybill_status === 0) {
                             //已支付未申请发票
                             pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()'>开发票</button>"
-                        } else if (r.data.order.applybill_status === 1 || r.data.order.applybill_status === 2) {
+                        } else if ((r.data.order.applybill_status === 1 || r.data.order.applybill_status === 2) && r.data.order.source !== 1) {
                             //已支付已申请发票
                             pay_again += "<button class=\"j-button-cancel\" onclick='checkInvoice(" + r.data.order.applybill_status + ")'>查看发票</button>"
                         }