Эх сурвалжийг харах

Merge branch 'feature/v4.9.21' into dev/v4.9.21_rjj

renjiaojiao 1 жил өмнө
parent
commit
007e8b9835

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

@@ -473,9 +473,9 @@
                         //已支付已申请发票
                         pay_again += "<button class=\"j-button-cancel\" style=\"width: 100%!important;height: 0.92rem!important;\" onclick='checkinvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                     }
-                    if(r.data.source !== 1){
+                  
                       $('.j-footer').show().html(pay_again);
-                    }
+                    
                 }
                 //支付方式
                 if (r.data.billingMode===1){

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

@@ -1010,9 +1010,9 @@ var vm = new Vue({
           // 继续往下走
         } else {
           // 线上课程私有页面
-          if (applybill_status === 0) {
+          if (type !== 'look') {
             return _this.goToLink('/jyxsapp/invoice?code=' + orderCode)
-          } else if (applybill_status === 1 || applybill_status === 2) {
+          } else  {
             return _this.goToLinkAndSaveState('/jyxsapp/invoiceDetail?code=' + orderCode + '&id=' + order.id)
           }
         }

+ 1 - 0
src/web/staticres/electronic_invoice/css/check_invoice.css

@@ -82,6 +82,7 @@
   height: 40px;
   min-width: 1200px;
   max-width: 100%;
+  transition: left 0.5s ease-in-out;
 }
 #check_invoice .invoice_status .invoice_status_item{
   flex: none;