解决冲突

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

@@ -10,13 +10,12 @@
           content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <script src="/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
-    <link rel="stylesheet" type="text/css" href="https://cdn.bootcss.com/weui/1.1.2/style/weui.css"/>
     <link rel="stylesheet" type="text/css"
           href="{{Msg "seo" "cdn"}}/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" type="text/css"
           href="{{Msg "seo" "cdn"}}/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/vip_order_detail.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="/css/wxbutton.css?v={{Msg "seo" "version"}}">
     {{include "/common/weixin.html"}}
@@ -108,11 +107,11 @@
                             <span>付费账号：</span>
                             <span class="item-list-parents pay_num value"></span>
                         </p>
-                         <p class="l-item free_p">
+                        <p class="l-item free_p">
                             <span>免费账号：</span>
                             <span class="item-list-parents free_num value"></span>
                         </p>
-                         <p class="l-item service_p" style="display:none;">
+                        <p class="l-item service_p" style="display:none;">
                             <span>服务列表：</span>
                             <span class="item-list-parents servicename value"></span>
                         </p>
@@ -177,14 +176,14 @@
                 var filterObj = JSON.parse(r.data.filter);
                 var buchongbaoHtml = '';
                 var supplys = filterObj.supplys;
-                if (supplys){
-                  for (var i=0;i<supplys.length;i++){
-                    buchongbaoHtml +='<p class="item-ifo ellipsis buchongbao">'+supplys[i]["name"]+ '</p>'
-                  }
+                if (supplys) {
+                    for (var i = 0; i < supplys.length; i++) {
+                        buchongbaoHtml += '<p class="item-ifo ellipsis buchongbao">' + supplys[i]["name"] + '</p>'
+                    }
                 }
-                if (buchongbaoHtml!=""){
-                  $(".servicename").html(buchongbaoHtml);
-                  $(".service_p").show();
+                if (buchongbaoHtml != "") {
+                    $(".servicename").html(buchongbaoHtml);
+                    $(".service_p").show();
                 }
                 var level_map = new Map();
                 var expert = new Map();
@@ -221,36 +220,36 @@
                 if (r.data.create_time) {
                     $(".prepayTime").text(r.data.create_time.replace("-", ".").replace("-", "."));
                 }
-                 //价格
-                var priceText="￥ " + formatMoney((r.data.order_money / 100))
-                if (r.data.order_status==1){
-                  priceText="￥ " + formatMoney((r.data.pay_money / 100));
+                //价格
+                var priceText = "￥ " + formatMoney((r.data.order_money / 100))
+                if (r.data.order_status == 1) {
+                    priceText = "￥ " + formatMoney((r.data.pay_money / 100));
                 }
                 $(".price").text(priceText);
             }
             //
             $(".level_value").text(level_map.get(filterObj.level).get("level"));
             //
-            var cycle=r.data.cycle;
-            if (filterObj.level==4){
-              cycle+="天"
-              $(".vip_type").text("-试用版");
-            }else{
-              cycle+="年"
+            var cycle = r.data.cycle;
+            if (filterObj.level == 4) {
+                cycle += "天"
+                $(".vip_type").text("-试用版");
+            } else {
+                cycle += "年"
             }
             $(".cycle_value").text(cycle);
             //
             $(".date_value").text(member_endtime);
             //
-            if (filterObj.free_sub_num){
-              $(".free_num").text(filterObj.free_sub_num+"个");
-            }else{
-              $(".free_p").hide();
+            if (filterObj.free_sub_num) {
+                $(".free_num").text(filterObj.free_sub_num + "个");
+            } else {
+                $(".free_p").hide();
             }
-            if (filterObj.pay_sub_num){
-              $(".pay_num").text(filterObj.pay_sub_num+"个");
-            }else{
-              $(".pay_p").hide();
+            if (filterObj.pay_sub_num) {
+                $(".pay_num").text(filterObj.pay_sub_num + "个");
+            } else {
+                $(".pay_p").hide();
             }
             //
             if (r.data.order_status == 1) {
@@ -263,15 +262,15 @@
 
                 var pay_again = ""
                 //发票
-                if (filterObj.level!=5){
-                  if (r.data.applybill_status == 0) {
-                      //已支付未申请发票
-                      pay_again += "<button class=\"j-button-cancel\" onclick='invoiceAdd()'>开发票</button>"
-                  } else {
-                      //已支付已申请发票
-                      pay_again += "<button class=\"j-button-cancel\" onclick='checkInvoice()'>查看发票</button>"
-                  }
-                  $('.j-footer').show().html(pay_again);
+                if (filterObj.level != 5) {
+                    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) {
+                        //已支付已申请发票
+                        pay_again += "<button class=\"j-button-cancel\" onclick='checkInvoice(" + r.data.applybill_status + ")'>查看发票</button>"
+                    }
+                    $('.j-footer').show().html(pay_again);
                 }
                 //支付方式
                 if (r.data.pay_way.indexOf("wx") > -1) {
@@ -296,7 +295,7 @@
                     return
                 }
                 $(".l-item.paymoney").css("display", "");
-                $(".price").text("￥ " + formatMoney(r.data.pay_money / 100) );
+                $(".price").text("￥ " + formatMoney(r.data.pay_money / 100));
                 if (r.data.pay_time) {
                     $(".line_paytime").css("display", "");
                     $(".payTime").text(r.data.pay_time.replace("-", ".").replace("-", "."));
@@ -419,7 +418,16 @@
     }
 
     //查看发票
-    function checkInvoice() {
+    function checkInvoice(flag) {
+        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
     }