Explorar o código

feat: 大会员子账号显示购买数量,老数据不变

Signed-off-by: tangshizhe <48740614+tangshizhe@users.noreply.github.com>
tangshizhe hai 1 ano
pai
achega
96299e48c7

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

@@ -78,14 +78,22 @@
                             <span>有效周期:</span>
                             <span class="item-list-parents date_value value"></span>
                         </p>
-                        <p class="l-item">
-                            <span class=" label">付费子账号<br/>数量:</span>
-                            <span class="item-list-parents pay_num value"></span>
-                        </p>
-                        <p class="l-item">
-                            <span class=" label">免费子账号<br/>数量:</span>
-                            <span class="item-list-parents free_num value"></span>
-                        </p>
+                        <div class="has_buy_count" style="display: none;">
+                          <p class="l-item">
+                              <span class=" label">购买数量:</span>
+                              <span class="item-list-parents buy_num value"></span>
+                          </p>
+                        </div>
+                        <div class="has_no_count" style="display: none;">
+                          <p class="l-item">
+                              <span class=" label">付费子账号<br/>数量:</span>
+                              <span class="item-list-parents pay_num value"></span>
+                          </p>
+                          <p class="l-item">
+                              <span class=" label">免费子账号<br/>数量:</span>
+                              <span class="item-list-parents free_num value"></span>
+                          </p>
+                        </div>
                     </div>
                 </div>
                 <div class="bottom">
@@ -197,8 +205,14 @@
             var level_value = filterObj.areaCount?r.data.combo:level_map.get(filterObj.level).get("level");
             $(".level_value").text(level_value);
             //
-            $(".pay_num").text(filterObj.pay_sub_num + "个");
-            $(".free_num").text(filterObj.free_sub_num + "个");
+            if(r.data.buy_count) {
+              $('.has_buy_count').show()
+              $('.buy_num').text(r.data.buy_count + '个')
+            } else {
+              $('.has_no_count').show()
+              $(".pay_num").text(filterObj.pay_sub_num + "个");
+              $(".free_num").text(filterObj.free_sub_num + "个");
+            }
             //
             $(".date_value").text(member_endtime);
             //

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

@@ -2580,22 +2580,33 @@ var vm = new Vue({
         split: ':',
         text: '-'
       }
-      var payCount = {
-        label: '付费账号',
-        split: ':',
-        text: filterInfo.pay_sub_num + ' 个'
-      }
-      var freeCount = {
-        label: '免费账号',
-        split: ':',
-        text: filterInfo.free_sub_num + ' 个'
+      if(order.buy_count) {
+        var buyCount = {
+          label: '购买数量',
+          split: ':',
+          text: order.buy_count + '个'
+        }
+      } else {
+        var payCount = {
+          label: '付费账号',
+          split: ':',
+          text: filterInfo.pay_sub_num + ' 个'
+        }
+        var freeCount = {
+          label: '免费账号',
+          split: ':',
+          text: filterInfo.free_sub_num + ' 个'
+        }
       }
 
       if (order.vip_endtime && order.order_status == 1) {
         date.text = new Date(order.vip_endtime.replace(/(\.|-)/g, '/')).pattern('yyyy/MM/dd') + '到期'
       }
-
-      return [levelInfo, date, payCount, freeCount]
+      if(order.buy_count) {
+        return [levelInfo, date, buyCount]
+      } else {
+        return [levelInfo, date, payCount, freeCount]
+      }
     },
     // 招标文件解读订单卡片信息整理
     getZBFileAnalysisInfo: function (order) {

+ 7 - 3
src/web/templates/pc/myOrder.html

@@ -415,9 +415,13 @@
                   <div class="fl shop_main" v-if="item.product_type === '大会员-子账号'">
                     <p style="line-height: 24px;">会员套餐:@#item.memberChildInfo.level#@</p>
                     <p style="line-height: 24px;">有效日期:@#item.memberChildInfo.endTime#@到期</p>
-                    <!-- <p style="line-height: 24px;">付费账号:@#item.memberChildInfo.fee#@个</p>
-                    <p style="line-height: 24px;">免费账号:@#item.memberChildInfo.free#@个</p> -->
-                    <p style="line-height: 24px;">购买数量:@#item.memberChildInfo.free#@个</p>
+                    <div v-if="item.buy_count">
+                      <p style="line-height: 24px;">购买数量:@#item.buy_count#@个</p>
+                    </div>
+                    <div v-else>
+                      <p style="line-height: 24px;">付费账号:@#item.memberChildInfo.fee#@个</p>
+                      <p style="line-height: 24px;">免费账号:@#item.memberChildInfo.free#@个</p>
+                    </div>
                   </div>
                   <div class="fl shop_main" v-if="item.product_type === '招标文件解读'">
                     <p style="line-height: 24px;">产品类型:@#item.product_type#@</p>

+ 13 - 2
src/web/templates/pc/subAccount_orderDetail.html

@@ -94,8 +94,13 @@
                         <p><span class="cp_text">产品类型:</span><span class="name">大会员子账号</span></p>
                         <p><span class="dq_text">会员套餐:</span><span class="level"></span></p>
                         <p><span class="zq_text">有效周期:</span><span class="real_cycle"></span></p>
-                        <!-- <p><span class="zq_text">付费子账号数量:</span><span class="pay_num"></span></p>
-                        <p><span class="zq_text">免费子账号数量:</span><span class="free_num"></span></p> -->
+                        <div class="has_buy_count" style="display: none;">
+                          <p><span class="buy_text">购买数量:</span><span class="buy_count"></span></p>
+                        </div>
+                        <div class="has_no_count" style="display: none;">
+                          <p><span class="zq_text">付费子账号数量:</span><span class="pay_num"></span></p>
+                          <p><span class="zq_text">免费子账号数量:</span><span class="free_num"></span></p>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -171,6 +176,12 @@
                     $(".real_cycle").text(member_endtime);
                     $(".free_num").text(filterObj.free_sub_num+"个");
                     $(".pay_num").text(filterObj.pay_sub_num+"个");
+                    if(r.data.buy_count) {
+                      $('.has_buy_count').show()
+                      $('.buy_count').text(r.data.buy_count)
+                    } else {
+                      $('.has_no_count').show()
+                    }
 
                     if (r.data.order_status === 1) {
                         $("#status_success").removeClass("hide");

+ 24 - 10
src/web/templates/weixin/member/subAccountDetail.html

@@ -85,14 +85,22 @@
                             <span>有效周期:</span>
                             <span class="item-list-parents date_value value"></span>
                         </p>
-                        <p class="l-item line_cycle">
-                            <span class=" label">付费子账号<br/>数量:</span>
-                            <span class="item-list-parents pay_num value"></span>
-                        </p>
-                        <p class="l-item line_cycle">
-                            <span class=" label">免费子账号<br/>数量:</span>
-                            <span class="item-list-parents free_num value"></span>
-                        </p>
+                        <div class="has_buy_count" style="display: none;">
+                          <p class="l-item">
+                              <span class=" label">购买数量:</span>
+                              <span class="item-list-parents buy_num value"></span>
+                          </p>
+                        </div>
+                        <div class="has_no_count" style="display: none;">
+                          <p class="l-item line_cycle">
+                              <span class=" label">付费子账号<br/>数量:</span>
+                              <span class="item-list-parents pay_num value"></span>
+                          </p>
+                          <p class="l-item line_cycle">
+                              <span class=" label">免费子账号<br/>数量:</span>
+                              <span class="item-list-parents free_num value"></span>
+                          </p>
+                        </div>
                     </div>
                 </div>
                 <div class="bottom">
@@ -204,8 +212,14 @@
             $(".cycle_value").text(r.data.cycle + " 年");
             //
             $(".date_value").text(member_endtime+ " 到期");
-            $(".pay_num").text(filterObj.pay_sub_num + "个");
-            $(".free_num").text(filterObj.free_sub_num + "个");
+            if(r.data.buy_count) {
+              $('.has_buy_count').show()
+              $('.buy_num').text(r.data.buy_count + '个')
+            } else {
+              $('.has_no_count').show()
+              $(".pay_num").text(filterObj.pay_sub_num + "个");
+              $(".free_num").text(filterObj.free_sub_num + "个");
+            }
             //
             if (r.data.order_status == 1) {
                 $("#card-header-bg").addClass("bg finish-bg");