feat:超级订阅升级，订单列表和详情页均不展示订阅周期和延长周期

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_order_detail.js

@@ -95,7 +95,7 @@ $(function () {
                       $(".discount-container-seller .highlight-text").text('销售赠' + sellerGiveTime);
                       $(".discount-container-seller").removeClass("hide");
                     }
-                    
+
                     if (filterObj.original_price!=undefined){
 	                    var originPrice = formatMoney(parseFloat(filterObj.original_price) / 100)
 	                    $(".price-num").text(originPrice);
@@ -301,6 +301,9 @@ $(function () {
                 }
                 $(".dyzq").text("延长周期：");
                 vipType = 2//支付页面标题展示使用
+
+              // 超级订阅升级，延长周期或订阅周期都不展示 P504版本增加
+              $('.subscribe_cycle').hide()
             } else {
                 if (filterObj.cycleunit == 1) {
                     $(".cyclecount").text(filterObj.cyclecount + "年")
@@ -317,7 +320,7 @@ $(function () {
             }
 
             //升级续费
-            var effectiveBool = true; 
+            var effectiveBool = true;
             var fnewBuyset = filterObj.newBuyset;
             if (!$.isEmptyObject(fnewBuyset)) {
                 //续费升级逻辑修改后判断是否不延期
@@ -395,7 +398,7 @@ $(function () {
                   }
                 }
                 $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.pay_money || r.data.order.order_money) / 100) + "元");
-				//P307 权益码兑换 支付金额 0 
+				//P307 权益码兑换 支付金额 0
                 if(filterObj.badge=="exchange"){
                   $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.pay_money) / 100) + "元");
                 }
@@ -493,8 +496,8 @@ $(function () {
                         }
                     }
                     if(r.data.order.source !== 1){
-                       $(".j-footer").show().html(pay_again) 
-                    }  
+                       $(".j-footer").show().html(pay_again)
+                    }
                 }
             } else if (r.data.order.order_status == -2 || r.data.order.order_status == -3) {
                 $("#card-header-bg").addClass("bg cancel-bg")

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_order_detail.html

@@ -83,8 +83,9 @@
 											<span class="item-list-parents industryNum value"></span>
 										</p>
 										<p class="l-item">
-											<span class="dyzq">订阅周期：</span>
-											<span class="item-list-parents cyclecount value"></span>
+                                            <span class="subscribe_cycle">
+                                                <span class="dyzq">订阅周期：</span><span class="item-list-parents cyclecount value"></span>
+                                            </span>
 											<span class="discount-container hide">
 											    <span>&nbsp;+&nbsp;</span>
 											    <span class="highlight-text">赠送30天</span>

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

@@ -1630,17 +1630,20 @@ var vm = new Vue({
         split: '：',
         text: dateText
       }
-    	if(order.vip_type==1){
+    if(order.vip_type==1){
 			area.label="续费区域"
 			duration.label="续费周期"
 		}else if(order.vip_type==2){
 			area.label="升级区域"
 		}
-      	infoList = [area]
-	    if (order.vip_type==2 && filter_vip.buyset && filter_vip.buyset.upgrade==0){
-	    	infoList.push(ind)
-	    }
-		infoList.push(duration)
+    infoList = [area]
+	  if (order.vip_type==2 && filter_vip.buyset && filter_vip.buyset.upgrade==0){
+	    infoList.push(ind)
+	  }
+	  // 超级订阅升级，不展示订阅周期
+	  if(order.vip_type != '2') {
+      infoList.push(duration)
+    }
       if (date.text) {
         infoList.push(date)
       }

src/web/templates/frontRouter/wx/vipIntro/free/order_detail.html

@@ -306,7 +306,7 @@
                           $(".discount-container-seller .highlight-text").text('销售赠' + sellerGiveTime);
                           $(".discount-container-seller").removeClass("hide");
                         }
-                        
+
 
 
 
@@ -526,7 +526,7 @@
 
                 }
                 //周期
-                var effectiveBool = true; 
+                var effectiveBool = true;
                 //续费升级逻辑修改后判断是否不延期
                 if (filterObj.cycleunit == 0 && filterObj.cyclecount == 0) {
                   effectiveBool=false;

src/web/templates/pc/myOrder.html

@@ -332,7 +332,14 @@
                       <span v-if="item.vip_type=='1'">续费</span><span v-else-if="item.vip_type=='2'">升级</span><span v-else>购买</span>区域：@#item.vipInfo.area#@
                     </p>
                     <p v-if="item.vip_type=='2' && item.filter.buyset && item.filter.buyset.upgrade==0">升级采购单位行业：@#item.vipInfo.industry#@</p>
-                    <p><span v-if="item.vip_type=='1'">续费</span><span v-else>订阅</span>周期：@#item.vipInfo.cycle#@
+                    <p>
+                    <template v-if="item.vip_type=='1'">
+                        <span >续费周期：</span><span>@#item.vipInfo.cycle#@</span>
+                    </template>
+                    <template v-else-if="item.vip_type!='2'">
+                        <span >订阅周期：</span><span>@#item.vipInfo.cycle#@</span>
+                    </template>
+
                       <!--赠送30天-->
                       <span v-if="item.isUsedActiveCode" class="discount-container"><span> + </span><span
                           class="highlight-text">赠送30天</span></span>

src/web/templates/pc/vip_orderDetail.html

@@ -115,7 +115,7 @@
                     <div class="filter_data">
                         <p><span class="dq_text">购买区域</span>：<span class="dq"></span></p>
                         <p style="display:none;"><span class="hy_text">升级采购单位行业</span>：<span class="hysl"></span></p>
-                        <p><span class="zq_text">订阅周期</span>：<span class="dyzq"></span>
+                        <p class="subscribe_cycle"><span class="zq_text">订阅周期</span>：<span class="dyzq"></span>
                           <span class="discount-container hide">
                             <span>+</span>
                             <span class="highlight-text"></span>
@@ -486,6 +486,9 @@
                             $(".hy_text").parent("p").show();
                         }
                         $(".zq_text").text("延长周期");
+
+                        // 超级订阅升级，延长周期或订阅周期都不展示 P504版本增加
+                        $('.subscribe_cycle').hide()
                     }
 
                     //计价清单

src/web/templates/weixin/vipsubscribe/vip_order_detail.html

@@ -106,8 +106,9 @@
                             <span class="item-list-parents industryNum value"></span>
                         </p>
                         <p class="l-item">
-                            <span class="dyzq">订阅周期：</span>
-                            <span class="item-list-parents cyclecount value"></span>
+                            <span class="subscribe_cycle">
+                              <span class="dyzq">订阅周期：</span><span class="item-list-parents cyclecount value"></span>
+                            </span>
                             <span class="discount-container hide">
                                 <span>&nbsp;+&nbsp;</span>
                                 <span class="highlight-text">赠送30天</span>
@@ -292,7 +293,7 @@
                           $(".discount-container-seller .highlight-text").text('销售赠' + sellerGiveTime);
                           $(".discount-container-seller").removeClass("hide");
                         }
-                        
+
 
 
 
@@ -512,7 +513,7 @@
 
                 }
                 //周期
-                var effectiveBool = true; 
+                var effectiveBool = true;
                 //续费升级逻辑修改后判断是否不延期
                 if (filterObj.cycleunit == 0 && filterObj.cyclecount == 0) {
                 //   effectiveBool=false;
@@ -597,6 +598,9 @@
                         $(".dyhy").parent("p").show();
                     }
                     $(".dyzq").text("延长周期：");
+
+                  // 超级订阅升级，延长周期或订阅周期都不展示 P504版本增加
+                  $('.subscribe_cycle').hide()
                 }
 
                 if (r.data.order.order_status == 0) {
@@ -629,7 +633,7 @@
                         var nowtime = new Date()  //获取当前时间
                         endtime = new Date(order_create_time);  //定义结束时间
                         var lefttime = expiration_time ? new Date(expiration_time.replace(/-/g, '/')).getTime() - nowtime.getTime() : endtime.getTime() + downtime - nowtime.getTime() //距离结束时间的毫秒数
-                        
+
                         if (Math.floor(lefttime % 1000) <= 0) {
                             clearInterval(t)
                             $.ajax({
@@ -684,12 +688,12 @@
                       }
                     }
                     $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.pay_money || r.data.order.order_money) / 100) + "元");
-                    //P307 权益码兑换 支付金额 0 
+                    //P307 权益码兑换 支付金额 0
                     if(filterObj.badge=="exchange"){
                       $(".payPrice").text("￥ " + formatMoney(parseFloat(r.data.order.pay_money) / 100) + "元");
                     }
                     $("#card-header-bg").addClass("bg finish-bg")
-             
+
                     $("#card-header-bg").addClass("bg finish-bg")
                     $("#pageTitle").text("已完成");
                     $("#pageTitle").addClass("status")
@@ -754,7 +758,7 @@
                         if(r.data.order.source !== 1){
                           $('.j-footer').show().html(pay_again)
                          }
-                        
+
                     }
                     if (r.data.order.billingMode==0){
                        $(".j-footer").hide();//隐藏开发票