Merge remote-tracking branch 'origin/dev3.4' into dev3.4

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

@@ -75,7 +75,7 @@
                         </p>
                         <p class="l-item">
                             <span>功能类型：</span>
-                            <span class="item-list-parents  value">中标企业预测包</span>
+                            <span class="item-list-parents  value">AI中标预测包</span>
                         </p>
                         <p class="l-item">
                             <span>购买数量：</span>
@@ -113,7 +113,7 @@
                         </p>
                         <p class="l-item">
                             <span class="label">产品类型：</span>
-                            <span class="productType value">大会员-AI中标预测包</span>
+                            <span class="productType value">大会员</span>
                         </p>
                         <p class="l-item paymoney" style="display: none">
                             <span class="label" id="price">实付金额：</span>
@@ -153,7 +153,7 @@
                 level_map.set(2, smart);
                 var member_endtime = "-";
                 //$(".o-name").text("大会员-AI中标预测包" )
-                $(".o-name").text("大会员")
+                $(".o-name").text("大会员AI中标预测包")
                 $(".order-img > img").attr("src", "/jyapp/big-member/image/aipack.png")
                 member_endtime = filterObj.effective_date + " 到期";
                 if (r.data.order_status == -1) {
@@ -206,7 +206,10 @@
                     $(".payWay").text("支付宝支付");
                     $(".line_payway").css("display", "");
                 } else if (r.data.pay_way === "transferAccounts") {//试用用户
-                    $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg(\"" + filterObj.transferV + "\")'>&nbsp;查看凭证</span>");
+                    $(".payWay").html("公对公转账");
+                    if (filterObj.transferV) {
+                      $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg(\"" + filterObj.transferV + "\")'>&nbsp;查看凭证</span>");
+                    }
                     $(".line_payway").css("display", "");
 
                     $(".l-item.paymoney").css("display", "");

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

@@ -120,7 +120,7 @@
                         </p>
                         <p class="l-item">
                             <span class="label">产品类型：</span>
-                            <span class="productType value">大会员-子账号</span>
+                            <span class="productType value">大会员</span>
                         </p>
                         <p class="l-item paymoney" style="display: none">
                             <span class="label" id="price">实付金额：</span>
@@ -162,7 +162,7 @@
                 niche.set("img", "/jyapp/big-member/image/zizhanghao2.png");
                 niche.set("level", "商机版");
                 var custom = new Map();
-                custom.set("img", "/jyapp/big-member/image/dahuiyuan1.png");
+                custom.set("img", "/jyapp/big-member/image/zizhanghao1.png");
                 custom.set("level", "自定义");
                 level_map.set(1, expert);
                 level_map.set(2, smart);
@@ -236,7 +236,7 @@
                     $(".line_payway").css("display", "");
 
                     $(".l-item.paymoney").css("display", "");
-                    $(".paymoney .price").text("￥ " + formatMoney(r.data.pay_money / 100) + "元");
+                    $(".paymoney .price").text("￥ " + formatMoney(r.data.pay_money / 100));
                     //return
                 } else {//试用用户
                     $(".invoice").css("display", "none");

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

@@ -69,6 +69,18 @@
             line-height: 24px;
             font-weight: normal !important;
         }
+        
+        
+        .media-info .buchongbao:before {
+            content: '';
+            display: inline-block;
+            width: 2px;
+            height: 2px;
+            background-color: #5F5E64;
+            vertical-align: middle;
+            margin-right: 7px;
+            border-radius: 4px;
+        }
     </style>
 </head>
 <body>
@@ -1825,7 +1837,7 @@
                     orderStatusHtml = "已完成";
                     orderStatusHtmls = "finish";
 
-                    if (applybill_status === 0) {
+                    if (filterObj.level !== 5 && applybill_status === 0) {
                         lastHtml = '<div class="card-footer">'
                             + '<a onclick="invoiceAdd(this)" class="btn  gray-btn">开发票</a>'
                             + '</div>'
@@ -1864,6 +1876,71 @@
                     + '</div>'
                     + lastHtml
                     + '</div>'
+            }  else if (obj.product_type === "大会员-补充包") {
+                if (typ === 1 || $(".tab-link.active").index() === 1) {	//待付款订单列表页
+                    if (obj.order_status === -2) {
+                        continue;
+                    }
+                }
+                count++;
+                var buchongbaoHtml = '';
+                var id = obj.id;
+                //订单编号
+                var orderCode = obj.order_code;
+                //创建时间
+                var createTime = obj.create_time;
+                createTime = createTime.replace(/-/g, ".")
+                var filterObj = JSON.parse(obj.filter);
+                var supplys = filterObj.supplys;
+                for (var i = 0; i < supplys.length; i++) {
+                    var serviceUnit = '个'
+                    if (i > 3) {
+                        buchongbaoHtml += '<p class="item-ifo ellipsis">...</p>';
+                        break;
+                    }
+                    if (supplys[i]["id"] == "15" || supplys[i]["id"] == "6") {
+                        serviceUnit = "次"
+                    }
+                    buchongbaoHtml += '<p class="item-ifo ellipsis buchongbao">' + supplys[i]["name"] + '(' + supplys[i]["count"] + serviceUnit + ')' + '</p>'
+                }
+                var imgurl = "/jyapp/big-member/image/buchongbao.png";
+                var member_endtime = "-";
+                if (obj.vip_endtime != null && obj.order_status == 1) {
+                    member_endtime = formatTime(obj.vip_endtime).replace(/\./g, "/") + " 到期";
+                }
+                var orderStatus = obj.order_status;
+                var orderMoney = obj.order_money;
+                var applybill_status = obj.applybill_status;
+                var pushTime = new Date(pushTimeStamp * 1000)
+                var lastHtml = "";
+                var orderUrl = "/front/wxMyOrder/memberDetail/" + orderCode;
+                var orderStatusHtml = "已完成";
+                var orderStatusHtmls = "finish";
+
+                listhtml += '<div class="card">'
+                    + '<div class="card-header">'
+                    + '<span class="time">' + createTime + '</span>'
+                    + '<span class="status ' + orderStatusHtmls + '">' + orderStatusHtml
+                    + '<a class="shanchu iconfont  icon-shanchu" title="删除订单" onclick="deleteOrder(' + id + ',this)"></a>'
+                    + '</span>'
+                    + '</div>'
+                    + '<div class="card-content">'
+                    + '<a onclick="setSessionStorage()" href="' + orderUrl + '" eid="' + orderCode + '" class="media" datareportOrder="true">'
+                    + '<div class="media-img">'
+                    + '<img src="' + imgurl + '">'
+                    + '</div>'
+                    + '<div class="media-info">'
+                    + '<p class="item-ifo ellipsis">服务列表：</p>'
+                    + buchongbaoHtml
+                    + '<p class="item-ifo ellipsis">有效日期：' + member_endtime + '到期</p>'
+                    + '</div>'
+                    + '</a>'
+                    + '<div class="price">'
+                    + '<strong class="current">￥' + formatMoney(orderMoney) + '</strong>'
+                    + '</div>'
+                    + '</div>'
+                    + lastHtml
+                    + '</div>'
             } else if (obj.product_type === "招标文件解读") {
                 if (typ === 1 || $(".tab-link.active").index() === 1) {	//待付款订单列表页
                     if (obj.order_status === -2) {

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

@@ -78,7 +78,7 @@
                     <div class="title">购买信息</div>
                     <div class="list">
                         <p class="l-item line_level">
-                            <span>会员等级：</span>
+                            <span>会员套餐：</span>
                             <span class="item-list-parents level_value value"></span>
                         </p>
                         <p class="l-item line_cycle">
@@ -121,7 +121,7 @@
                         </p>
                         <p class="l-item">
                             <span class="label">产品类型：</span>
-                            <span class="productType value">大会员-AI中标预测包</span>
+                            <span class="productType value">大会员</span>
                         </p>
                         <p class="l-item paymoney" style="display: none">
                             <span class="label" id="price">实付金额：</span>
@@ -155,7 +155,7 @@
                 smart.set("level", "智慧版");
                 level_map.set(1, expert);
                 level_map.set(2, smart);
-                $(".o-name").text("大会员-AI预测包");
+                $(".o-name").text("大会员AI中标预测包");
                 $(".order-img > img").attr("src", "/order/image/aiPack.png")
                 var member_endtime = filterObj.effective_date + " 到期";
                 if (r.data.order_status == -1) {
@@ -207,7 +207,10 @@
                     $(".payWay").text("支付宝支付");
                     $(".line_payway").css("display", "");
                 } else if (r.data.pay_way === "transferAccounts") {//试用用户
-                    $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg(\"" + filterObj.transferV + "\")'>&nbsp;查看凭证</span>");
+                    $(".payWay").html("公对公转账");
+                    if (filterObj.transferV) {
+                      $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg(\"" + filterObj.transferV + "\")'>&nbsp;查看凭证</span>");
+                    }
                     $(".line_payway").css("display", "");
 
                     $(".l-item.paymoney").css("display", "");

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

@@ -91,11 +91,11 @@
                 <div class="middle">
                     <div class="title">购买信息</div>
                     <div class="list">
-                        <p class="l-item line_level">
+                        <p class="l-item line_level membername">
                             <span>会员套餐：</span>
                             <span class="item-list-parents level_value value"></span>
                         </p>
-                        <p class="l-item line_cycle">
+                        <p class="l-item line_cycle s_cycle">
                             <span>订阅周期：</span>
                             <span class="item-list-parents cycle_value value"></span>
                         </p>
@@ -208,6 +208,13 @@
                 level_map.set(5, custom);
                 var member_endtime = "-";
                 $(".o-name").text("大会员")
+                if (r.data.product_type == "大会员-补充包") {
+                    $(".membername").hide();
+                    $(".s_cycle").hide();
+                    $(".o-name").text("大会员补充包")
+                } else if (r.data.product_type == "大会员-子账号") {
+                    $(".o-name").text("大会员子账号")
+                }
                 $(".order-img > img").attr("src", level_map.get(filterObj.level).get("img"))
                 if (r.data.vip_endtime != null) {
                     member_endtime = formatTime(r.data.vip_endtime) + " 到期";
@@ -257,20 +264,20 @@
                 $("#pageTitle").addClass("status")
                 $("#pageTitle").text("已完成");
 
-                //有效周期
-                $(".line_cycle").css("display", "");
 
                 var 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);
+                  //有效周期
+                  $(".line_cycle").css("display", "");
+                  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) {

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

@@ -54,6 +54,13 @@
     .bill-origin-price .price-num {
         text-decoration: line-through;
     }
+    
+    
+    .j-body .order-main .list .l-item .label {
+        flex-shrink: 0;
+        width: 1.32rem !important;
+        color: #5F5E64;
+    }
 </style>
 <body>
 <div class="j-container" id="order_detail">
@@ -78,7 +85,7 @@
                     <div class="title">购买信息</div>
                     <div class="list">
                         <p class="l-item line_level">
-                            <span>会员等级：</span>
+                            <span>会员套餐：</span>
                             <span class="item-list-parents level_value value"></span>
                         </p>
                         <p class="l-item line_date">
@@ -86,11 +93,11 @@
                             <span class="item-list-parents date_value value"></span>
                         </p>
                         <p class="l-item line_cycle">
-                            <span>付费账号：</span>
+                            <span class=" label">付费子账号数量：</span>
                             <span class="item-list-parents pay_num value"></span>
                         </p>
                         <p class="l-item line_cycle">
-                            <span>免费账号：</span>
+                            <span class=" label">免费子账号数量：</span>
                             <span class="item-list-parents free_num value"></span>
                         </p>
                     </div>
@@ -121,7 +128,7 @@
                         </p>
                         <p class="l-item">
                             <span class="label">产品类型：</span>
-                            <span class="productType value">大会员-子账号</span>
+                            <span class="productType value">大会员</span>
                         </p>
                         <p class="l-item paymoney" style="display: none">
                             <span class="label" id="price">实付金额：</span>
@@ -158,11 +165,15 @@
                 var niche = new Map();
                 niche.set("img", "/order/image/zizhanghao2.png");
                 niche.set("level", "商机版");
+                var custom = new Map();
+                custom.set("img", "/jyapp/big-member/image/zizhanghao1.png");
+                custom.set("level", "自定义");
                 level_map.set(1, expert);
                 level_map.set(2, smart);
                 level_map.set(3, niche);
+                level_map.set(5, custom);
                 var member_endtime = "-";
-                $(".o-name").text("大会员-子账号");
+                $(".o-name").text("大会员子账号");
                 $(".order-img > img").attr("src", level_map.get(filterObj.level).get("img"))
                 if (r.data.vip_endtime != null) {
                     member_endtime = formatTime(r.data.vip_endtime) + " 到期";
@@ -201,15 +212,16 @@
 
                 var pay_again = ""
                 //发票
-                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>"
+                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);
                 }
-                $('.j-footer').show().html(pay_again);
-
                 //支付方式
                 if (r.data.pay_way.indexOf("wx") > -1) {
                     $(".line_payway").css("display", "");
@@ -218,12 +230,15 @@
                     $(".payWay").text("支付宝支付");
                     $(".line_payway").css("display", "");
                 } else if (r.data.pay_way === "transferAccounts") {//试用用户
-                    $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg(\"" + filterObj.transferV + "\")'>&nbsp;查看凭证</span>");
+                    $(".payWay").html("公对公转账");
+                    if (filterObj.transferV) {
+                      $(".payWay").html("公对公转账<span style='color: #2ABED1' onclick='showImg(\"" + filterObj.transferV + "\")'>&nbsp;查看凭证</span>");
+                    }
                     $(".line_payway").css("display", "");
 
                     $(".l-item.paymoney").css("display", "");
-                    $(".paymoney .price").text("￥ " + formatMoney(r.data.pay_money / 100) + "元");
-                    return
+                    $(".paymoney .price").text("￥ " + formatMoney(r.data.pay_money / 100));
+                   // return
                 } else {//试用用户
                     $(".invoice").css("display", "none");
                     return