Răsfoiți Sursa

fix: 大会员订单详情添加购买数量(三端)

Signed-off-by: tangshizhe <48740614+tangshizhe@users.noreply.github.com>
tangshizhe 1 an în urmă
părinte
comite
f1139d1231

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

@@ -365,14 +365,13 @@
                     $("#order_detail").hide();
                     $("#order_detail").hide();
                 }
                 }
                 //购买数量
                 //购买数量
-                if(r.data.isNewOrder == '1') { // 新订单显示购买数量
-                  if(r.data.buy_count) {
-                    $('.membernum').show();
-                    $('.buy_num_value').text(r.data.buy_count+'个')
-                    $(".free_p").hide();
-                    $(".pay_p").hide();
-                  }
+                if(r.data.isNewOrder == '1' && r.data.buy_count) { // 新订单显示购买数量
+                  $('.membernum').show();
+                  $('.buy_num_value').text(r.data.buy_count+'个')
+                  $(".free_p").hide();
+                  $(".pay_p").hide();
                 } else {
                 } else {
+                  $('.membernum').hide();
                   if (filterObj.free_sub_num) {
                   if (filterObj.free_sub_num) {
                     $(".free_num").text(filterObj.free_sub_num + "个");
                     $(".free_num").text(filterObj.free_sub_num + "个");
                   } else {
                   } else {

+ 16 - 8
src/web/templates/pc/member_orderDetail.html

@@ -151,12 +151,12 @@
                 <div class="clearfix list_tbody">
                 <div class="clearfix list_tbody">
                     <div class="filter_data">
                     <div class="filter_data">
                         <p><span class="cp_text">产品类型:</span><span class="name">大会员</span></p>
                         <p><span class="cp_text">产品类型:</span><span class="name">大会员</span></p>
-                        <p class="num_text" style="display:none;"><span>购买数量:</span><span class="buy_num"></span></p>
                         <p><span class="dq_text">会员套餐:</span><span class="level"></span></p>
                         <p><span class="dq_text">会员套餐:</span><span class="level"></span></p>
                         <p><span class="hy_text">订阅周期:</span><span class="cycle"></span></p>
                         <p><span class="hy_text">订阅周期:</span><span class="cycle"></span></p>
                         <p><span class="zq_text">有效周期:</span><span class="real_cycle"></span></p>
                         <p><span class="zq_text">有效周期:</span><span class="real_cycle"></span></p>
                         <p class="pay_p"><span >付费账号:</span><span class="pay_num"></span></p>
                         <p class="pay_p"><span >付费账号:</span><span class="pay_num"></span></p>
                         <p class="free_p"><span >免费账号:</span><span class="free_num"></span></p>
                         <p class="free_p"><span >免费账号:</span><span class="free_num"></span></p>
+                        <p class="num_text" style="display:none;"><span>购买数量:</span><span class="buy_num"></span></p>
                         <p class="service_p" style="display:none;"><span >服务列表:</span><span class="servicename" style="display: flex;flex-direction: column;"></span></p>
                         <p class="service_p" style="display:none;"><span >服务列表:</span><span class="servicename" style="display: flex;flex-direction: column;"></span></p>
                     </div>
                     </div>
                 </div>
                 </div>
@@ -220,15 +220,23 @@
                     level_map.set(5, "自定义");
                     level_map.set(5, "自定义");
                     level_map.set(6, "商机版2.0");
                     level_map.set(6, "商机版2.0");
                     level_map.set(7, "专家版2.0");
                     level_map.set(7, "专家版2.0");
-                    if (filterObj.free_sub_num){
-                      $(".free_num").text(filterObj.free_sub_num+"个");
-                    }else{
+                    if(r.data.isNewOrder == '1' && r.data.buy_count) {
+                      $('.num_text').show()
+                      $('.buy_num').text(r.data.buy_count+"个");
                       $(".free_p").hide();
                       $(".free_p").hide();
-                    }
-                    if (filterObj.pay_sub_num){
-                      $(".pay_num").text(filterObj.pay_sub_num+"个");
-                    }else{
                       $(".pay_p").hide();
                       $(".pay_p").hide();
+                    } else {
+                      $('.num_text').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 (r.data.create_time) {
                     if (r.data.create_time) {

+ 21 - 21
src/web/templates/weixin/member/memberdetail.html

@@ -159,10 +159,6 @@
                             <span>会员套餐:</span>
                             <span>会员套餐:</span>
                             <span class="item-list-parents level_value value"></span>
                             <span class="item-list-parents level_value value"></span>
                         </p>
                         </p>
-                        <p class="l-item line_num membernum">
-                          <span>购买数量:</span>
-                          <span class="item-list-parents buy_num_value value"></span>
-                        </p>
                         <p class="l-item line_cycle s_cycle">
                         <p class="l-item line_cycle s_cycle">
                             <span>订阅周期:</span>
                             <span>订阅周期:</span>
                             <span class="item-list-parents cycle_value value"></span>
                             <span class="item-list-parents cycle_value value"></span>
@@ -179,6 +175,10 @@
                             <span>免费账号:</span>
                             <span>免费账号:</span>
                             <span class="item-list-parents free_num value"></span>
                             <span class="item-list-parents free_num value"></span>
                         </p>
                         </p>
+                        <p class="l-item line_num membernum">
+                          <span>购买数量:</span>
+                          <span class="item-list-parents buy_num_value value"></span>
+                        </p>
                         <p class="l-item service_p" style="display:none;border: 0;">
                         <p class="l-item service_p" style="display:none;border: 0;">
                           <span>服务列表:</span>
                           <span>服务列表:</span>
                           <!-- <span class="item-list-parents servicename value"></span> -->
                           <!-- <span class="item-list-parents servicename value"></span> -->
@@ -329,15 +329,6 @@
               //level="自定义-"+r.data.combo;
               //level="自定义-"+r.data.combo;
             //}
             //}
             $(".level_value").text(level);
             $(".level_value").text(level);
-            //购买数量
-            if(r.data.buy_subject=='2'){
-              $('.membernum').show();
-              $('.buy_num_value').text(r.data.buy_count+'人')
-
-            }else{
-              $('.membernum').hide();
-
-            }
             var cycle = r.data.cycle;
             var cycle = r.data.cycle;
             if (filterObj.level === 4) {
             if (filterObj.level === 4) {
                 cycle += "天"
                 cycle += "天"
@@ -356,15 +347,24 @@
             //
             //
             $(".date_value").text(member_endtime);
             $(".date_value").text(member_endtime);
             //
             //
-            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 + "个");
+            //购买数量
+            if(r.data.isNewOrder == '1' && r.data.buy_count) {
+              $('.membernum').show();
+              $('.buy_num_value').text(r.data.buy_count+'个')
+              $(".free_p").hide();
+              $(".pay_p").hide();
             } else {
             } else {
-                $(".pay_p").hide();
+              $('.membernum').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 (r.data.order_status == 1) {
             if (r.data.order_status == 1) {