Merge branch 'feature/v4.10.2' of https://jygit.jydev.jianyu360.cn/qmx/jy into feature/v4.10.2

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

@@ -4,7 +4,7 @@ function calcBackOrderTime(filterObjNew) {
     if (Object.keys(filterObjNew).length <= 0) return
     var cycle = ''
     var cmap={1:"天",2:"月",3:"年",4:"季"}
-    if (filterObjNew.buy_type==filterObjNew.give_type){
+    if (filterObjNew.buy_type && filterObjNew.buy_type==filterObjNew.give_type){
         cycle = parseInt(filterObjNew.buy_cycle||0) +parseInt(filterObjNew.give_cycle||0) +cmap[filterObjNew.buy_type]
     }else{
         if (filterObjNew.buy_cycle>0){
@@ -22,7 +22,7 @@ function calcAccountNum(order) {
     var filter_vip_new = order.new_filter ? JSON.parse(order.new_filter) : {}
     var buyAccountCount = filterInfo.buyAccountCount || filter_vip_new.buyAccountCount || 0
     var giftAccountCount = filterInfo.giftAccountCount || filter_vip_new.giftAccountCount || 0
-    var totalAccountCount = Number(buyAccountCount) + Number(giftAccountCount) + 1
+    var totalAccountCount = Number(buyAccountCount) + Number(giftAccountCount)
 
     var addAreaCount = filterInfo.addAreaCount || filter_vip_new.addAreaCount || 0
     var onlyAddCount = addAreaCount <= 0 // 仅增购子账号
@@ -36,10 +36,6 @@ function calcAccountNum(order) {
         if (buyAccountCount == 0 && giftAccountCount == 0) {
             buyNumber2 = order.buyNum || filter_vip_new.finalAccountCount || 0
         } else {
-            // 仅增购子账号，不计算主账号数量
-            if (onlyAddCount) {
-                totalAccountCount -= 1
-            }
             buyNumber2 = order.buyNum || totalAccountCount || filter_vip_new.finalAccountCount || 0
         }
     } else {
@@ -48,6 +44,15 @@ function calcAccountNum(order) {
     return buyNumber2
 }
 
+function calcIsOnlyAddPower(order) {
+    var filter_vip = order.filter ? JSON.parse(order.filter) : {}
+    var filter_vip_new = order.new_filter ? JSON.parse(order.new_filter) : {}
+    var buyAccountCount = filter_vip.buyAccountCount || filter_vip_new.buyAccountCount || 0
+    var giftAccountCount = filter_vip.giftAccountCount || filter_vip_new.giftAccountCount || 0
+    var totalAccountCount = Number(buyAccountCount) + Number(giftAccountCount)
+    return totalAccountCount <= 0
+}
+
 $(function () {
     var canpay = true;
     var orderCode = decodeURIComponent(getParam("orderCode"));
@@ -85,7 +90,10 @@ $(function () {
                 }
             }
             var filterObjNew = JSON.parse(r.data.order.new_filter || '{}');
+            var order = r.data.order;
             //购买数量
+            var onlyAddPower = calcIsOnlyAddPower(order)
+            var upgrade = order.vip_type == 2 || order.service_type == 3
             if(r.data.order.buy_subject=='2'){
                 var buyAccountNum = calcAccountNum(r.data.order)
                 var num2 = r.data.order.buy_count||buyAccountNum
@@ -96,6 +104,10 @@ $(function () {
               $('.membernum').hide();
 
             }
+            if (onlyAddPower && upgrade) {
+                $('.membernum').parents('.l-item').hide()
+            }
+
             if (!r.data.order.discount_price || (r.data.order.discount_price && r.data.order.discount_price <= 0)) {
             		$(".discountPrice").parent().hide();
             }
@@ -122,21 +134,25 @@ $(function () {
             }
             var areaText = "";
             var industry_vip = "";
+            var filterObj = {}
+            var filterObjNew = {}
             //订单条件
-            if (r.data.order.filter) {
-                var filterObj = JSON.parse(r.data.order.filter);
+            if (r.data.order.filter || r.data.order.new_filter) {
+                filterObj = JSON.parse(r.data.order.filter || r.data.order.new_filter) || {};
+                filterObjNew = JSON.parse(r.data.order.new_filter || '{}');
+
                 // 活动角标
                 if (filterObj.badge) {
                     $(".order-img").addClass('badge-' + filterObj.badge)
                 }
                 var newbuyset = filterObj.newBuyset;
-                var give_type = filterObj.give_type;//时间类型：1/天、2/月
-                var seller_give_type = filterObj.seller_give_type;//时间类型：1/天、2/月
+                var give_type = filterObj.give_type || filterObjNew.activity_give_type;//时间类型：1/天、2/月
+                var seller_give_type = filterObj.seller_give_type || filterObjNew.give_type;//时间类型：1/天、2/月
                 // 双11活动判断
                 var can1111 = filterObj && filterObj.original_price
                 if (can1111 || give_type > 0 || seller_give_type > 0) {
-                    var giveTime = filterObj.give_cycle
-                    var sellerGiveTime = filterObj.seller_give_cycle
+                    var giveTime = filterObj.give_cycle || filterObjNew.activity_give_cycle
+                    var sellerGiveTime = filterObj.seller_give_cycle || filterObjNew.give_cycle
                     if (giveTime) {
                       if(give_type==1){
                         giveTime=giveTime+"天";
@@ -405,6 +421,8 @@ $(function () {
                 var durationText = calcBackOrderTime(filterObjNew)
                 if (durationText) {
                     $('.cyclecount').text(durationText)
+                } else {
+                    $('.cyclecount').parents('.l-item').hide()
                 }
             }
 
@@ -630,7 +648,7 @@ $(function () {
         }
 
         //计价清单
-        var filterObj = JSON.parse(r.data.order.filter);
+        filterObj = JSON.parse(r.data.order.filter || r.data.order.new_filter) || {};
         var upgradeSubtotail = filterObj.upgradeSubtotail;
         if (upgradeSubtotail) {	//有则显示
             $.ajax({

src/jfw/modules/app/src/web/templates/commonPay/medical/orderDetail.html

@@ -281,7 +281,8 @@
 
         //订单条件
         if (r.data.order.filter) {
-          var filterObj = JSON.parse(r.data.order.filter);
+          var filterObj = JSON.parse(r.data.order.filter || r.data.order.new_filter);
+          var filterObjNew = JSON.parse(r.data.order.new_filter || '{}');
           // 活动角标
           if (filterObj.badge) {
             $(".order-img").addClass('badge-' + filterObj.badge)
@@ -289,11 +290,11 @@
           var areaText = "";
           // 双11活动判断
           var can1111 = filterObj && filterObj.original_price
-          var give_type = filterObj.give_type;//时间类型：1/天、2/月
-          var seller_give_type = filterObj.seller_give_type;//时间类型：1/天、2/月
+          var give_type = filterObj.give_type || filterObjNew.activity_give_type;//时间类型：1/天、2/月
+          var seller_give_type = filterObj.seller_give_type || filterObjNew.give_type;//时间类型：1/天、2/月
           if (can1111 || give_type > 0 || seller_give_type > 0) {
-            var giveTime = filterObj.give_cycle;
-            var sellerGiveTime = filterObj.seller_give_cycle
+            var giveTime = filterObj.give_cycle || filterObjNew.activity_give_cycle;
+            var sellerGiveTime = filterObj.seller_give_cycle || filterObjNew.give_cycle
             if (giveTime) {
               if (give_type == 1) {
                 giveTime = giveTime + "天";

src/jfw/modules/subscribepay/src/entity/consts.go

@@ -10,7 +10,7 @@ const (
 	EquityErrMsg         = "您已开通%s权益，请于%s权益到期后再行兑换。"
 	MemberCycleTypeMonth = 0 // 单位 ：月
 	MemberCycleTypeDay   = 1 // 单位 ：天 当前版本不支持
-	MemberCycleTypeYear  = 2 // 单位 ：年
+	MemberCycleTypeYear  = 3 // 单位 ：年
 
 )
 

src/jfw/modules/subscribepay/src/entity/equityCode.go

@@ -620,7 +620,7 @@ func (e *EquityCode) UseEquityCodeAndAuthority() (m string, flag bool) {
 				"cycle":     cycle,
 				"level":     level,
 				"badge":     "exchange",
-				"cycleType": cycleType, // 0-月 1-天 2或者没有该字段的时候-年
+				"cycleType": cycleType, // 0-月 1-天 3
 			}
 			filterMap["zeroOrderType"] = "权益码兑换"
 			filter, _ := json.Marshal(filterMap)
@@ -1198,7 +1198,7 @@ func (e *EquityCode) H5UseEquityCodeAndAuthority() (m string, flag bool, status
 				"cycle":     cycle,
 				"level":     level,
 				"badge":     "exchange",
-				"cycleType": cycleType, // 0-月 1-天 2或者没有该字段的时候-年
+				"cycleType": cycleType, // 0-月 1-天 3-年
 			}
 			filterMap["zeroOrderType"] = "权益码兑换"
 			filter, _ := json.Marshal(filterMap)

src/jfw/modules/subscribepay/src/service/salesCreateOrder.go

@@ -661,7 +661,7 @@ func (o *SalesCreateOrder) GetOrderPayAllMsg() {
 			//	r.Err = errors.New("获取订单信息失败")
 			//	goto env
 			//}
-			field := "dor.id,dor.signing_subject,dor.order_code,dor.del_status,dor.prepay_time,dor.create_time,dor.pay_time,dor.pay_way,dor.user_phone,dor.original_price,dor.order_money,dor.refund_status,dor.pay_money,dor.applybill_status,dor.out_trade_no,jyd.filter,jyd.product_type,dor.order_status,dor.applybill_type,dor.applybill_taxnum,dor.applybill_company,jyd.service_starttime,jyd.service_endtime,jyd.service_type,dor.discount_price,dor.d_relation_id,dor.billingMode,dor.return_status,dor.is_backstage_order"
+			field := "dor.id,dor.signing_subject,dor.order_code,dor.del_status,dor.prepay_time,dor.create_time,dor.pay_time,dor.pay_way,dor.user_phone,dor.original_price,dor.order_money,dor.refund_status,dor.pay_money,dor.applybill_status,dor.out_trade_no,dor.filter,jyd.filter as new_filter,jyd.product_type,dor.order_status,dor.applybill_type,dor.applybill_taxnum,dor.applybill_company,jyd.service_starttime,jyd.service_endtime,jyd.service_type,dor.discount_price,dor.d_relation_id,dor.billingMode,dor.return_status,dor.is_backstage_order"
 			data, t, transactionId = CommonDetail(4, field, userId, order_code, o.Session())
 			//如果手机号号为空查找通过userid查找手机号
 			//if qutil.InterfaceToStr(data["user_phone"]) == "" {

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

@@ -1796,7 +1796,7 @@ var vm = new Vue({
     calcBackOrderTime: function(filterNewObj) {
       var cmap={1:"天",2:"月",3:"年",4:"季"}
       var cycle = ''
-      if (filterNewObj.buy_type==filterNewObj.give_type){
+      if (filterNewObj.buy_type && filterNewObj.buy_type==filterNewObj.give_type){
         cycle = parseInt(filterNewObj.buy_cycle||0) +parseInt(filterNewObj.give_cycle||0) +cmap[filterNewObj.buy_type]
       }else{
         if (filterNewObj.buy_cycle>0){
@@ -1816,8 +1816,8 @@ var vm = new Vue({
       var filter_vip_new = this.getNewFilterInfo(order)
       var giveHTML = ''
       // 活动赠送日期计算
-      var giveCycle = filter_vip.give_cycle
-      var giveType = filter_vip.give_type //时间类型：1/天、2/月
+      var giveCycle = filter_vip.give_cycle || filter_vip_new.activity_give_cycle
+      var giveType = filter_vip.give_type || filter_vip_new.activity_give_type //时间类型：1/天、2/月
       var give = ''
       if (giveCycle) {
         if (giveType == 1) {
@@ -1829,8 +1829,8 @@ var vm = new Vue({
       }
 
       // 销售赠送有效日期
-      var sellerGiveCycle = filter_vip.seller_give_cycle
-      var sellerGiveType = filter_vip.seller_give_type // 时间类型：1/天、2/月
+      var sellerGiveCycle = filter_vip.seller_give_cycle || filter_vip_new.give_cycle
+      var sellerGiveType = filter_vip.seller_give_type || filter_vip_new.give_type // 时间类型：1/天、2/月
       var sellerGive = ''
       if (sellerGiveCycle) {
         if (sellerGiveType == 1) {
@@ -2246,8 +2246,8 @@ var vm = new Vue({
 
       var giveHTML = ''
       // 活动赠送日期计算
-      var giveCycle = filter_vip.give_cycle
-      var giveType = filter_vip.give_type //时间类型：1/天、2/月
+      var giveCycle = filter_vip.give_cycle || filter_vip_new.activity_give_cycle
+      var giveType = filter_vip.give_type || filter_vip_new.activity_give_type //时间类型：1/天、2/月
       var give = ''
       if (giveCycle) {
         if (giveType == 1) {
@@ -2259,8 +2259,8 @@ var vm = new Vue({
       }
 
       // 销售赠送有效日期
-      var sellerGiveCycle = filter_vip.seller_give_cycle
-      var sellerGiveType = filter_vip.seller_give_type // 时间类型：1/天、2/月
+      var sellerGiveCycle = filter_vip.seller_give_cycle || filter_vip_new.give_cycle
+      var sellerGiveType = filter_vip.seller_give_type || filter_vip_new.give_type // 时间类型：1/天、2/月
       var sellerGive = ''
       if (sellerGiveCycle) {
         if (sellerGiveType == 1) {
@@ -2750,7 +2750,7 @@ var vm = new Vue({
       var filter_vip_new = this.getNewFilterInfo(order)
       var buyAccountCount = filterInfo.buyAccountCount || filter_vip_new.buyAccountCount || 0
       var giftAccountCount = filterInfo.giftAccountCount || filter_vip_new.giftAccountCount || 0
-      var totalAccountCount = Number(buyAccountCount) + Number(giftAccountCount) + 1
+      var totalAccountCount = Number(buyAccountCount) + Number(giftAccountCount)
 
       var addAreaCount = filterInfo.addAreaCount || filter_vip_new.addAreaCount
       var onlyAddCount = false
@@ -2772,9 +2772,6 @@ var vm = new Vue({
             buyNumber2 = order.buyNum || filter_vip_new.finalAccountCount || 0
         } else {
             // 仅增购子账号，不计算主账号数量
-            if (onlyAddCount) {
-                totalAccountCount -= 1
-            }
             buyNumber2 = order.buyNum || totalAccountCount || filter_vip_new.finalAccountCount || 0
         }
       } else {

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

@@ -208,7 +208,7 @@
         if (Object.keys(filterObjNew).length <= 0) return
         var cycle = ''
         var cmap={1:"天",2:"月",3:"年",4:"季"}
-        if (filterObjNew.buy_type==filterObjNew.give_type){
+        if (filterObjNew.buy_type && filterObjNew.buy_type==filterObjNew.give_type){
             cycle = parseInt(filterObjNew.buy_cycle||0) +cmap[filterObjNew.buy_type]
         }else{
             if (filterObjNew.buy_cycle>0){
@@ -307,8 +307,9 @@
                 var isUpgrade = order.vip_type === 2 || order.service_type === 3
 
                 //订单条件
-                if (r.data.order.filter) {
-                    var filterObj = JSON.parse(r.data.order.filter || '{}');
+                if (r.data.order.filter || r.data.order.new_filter) {
+                    var filterObj = JSON.parse(r.data.order.filter || r.data.order.new_filter || '{}');
+                    var filterObjNew = JSON.parse(r.data.order.new_filter || '{}');
                     // 活动角标
                     if (filterObj.badge) {
                         $(".order-img").addClass('badge-' + filterObj.badge)
@@ -316,11 +317,11 @@
                     var areaText = "";
                     // 双11活动判断
                     var can1111 = filterObj && filterObj.original_price
-                    var give_type = isNewOrder ? filterObj.activity_give_type : filterObj.give_type;//时间类型：1/天、2/月
-                    var seller_give_type = filterObj.seller_give_type;//时间类型：1/天、2/月
+                    var give_type = isNewOrder ? filterObjNew.activity_give_type : filterObj.give_type;//时间类型：1/天、2/月
+                    var seller_give_type = filterObj.seller_give_type || filterObjNew.give_type;//时间类型：1/天、2/月
                     if (can1111 || give_type > 0 || seller_give_type > 0) {
-                        var giveTime = isNewOrder ? filterObj.activity_give_cycle : filterObj.give_cycle;
-                        var sellerGiveTime = filterObj.seller_give_cycle || filterObj.give_cycle;
+                        var giveTime = isNewOrder ? filterObjNew.activity_give_cycle : filterObj.give_cycle;
+                        var sellerGiveTime = filterObj.seller_give_cycle || filterObjNew.give_cycle;
                         if (giveTime) {
                           if (give_type==1){
                             giveTime=giveTime+"天";
@@ -800,7 +801,7 @@
                 }
             }
             //计价清单
-            var filterObj = JSON.parse(r.data.order.filter);
+            var filterObj = JSON.parse(r.data.order.filter || r.data.order.new_filter) || {};
             var upgradeSubtotail = filterObj.upgradeSubtotail;
             if (upgradeSubtotail) {	//有则显示
                 $.ajax({

src/web/templates/pc/myOrder.html

@@ -1012,6 +1012,19 @@
               v.newFilter = {}
             }
 
+            // 赠送时间兼容
+            if (!v.filter.give_type && v.newFilter.activity_give_type) {
+              v.filter.give_type = v.newFilter.activity_give_type
+            }
+            if (!v.filter.give_cycle && v.newFilter.activity_give_cycle) {
+              v.filter.give_cycle = v.newFilter.activity_give_cycle
+            }
+            if (!v.filter.seller_give_type && v.newFilter.give_type) {
+              v.filter.seller_give_type = v.newFilter.give_type
+            }
+            if (!v.filter.seller_give_cycle && v.newFilter.give_cycle) {
+              v.filter.seller_give_cycle = v.newFilter.give_cycle
+            }
 
             // 大会员
             if (v.product_type === '大会员') {
@@ -1023,7 +1036,7 @@
               var buyAccountCount = v.filter.buyAccountCount || v.newFilter.buyAccountCount || 0
               var giftAccountCount = v.filter.giftAccountCount || v.newFilter.giftAccountCount || 0
               // 购买数量要加上主账号
-              var totalAccountCount = Number(buyAccountCount) + Number(giftAccountCount) + 1
+              var totalAccountCount = Number(buyAccountCount) + Number(giftAccountCount)
 
               // 续费vip_type=1
               if (v.vip_type == 1) {
@@ -1194,7 +1207,7 @@
               // vip_type: //0:购买 1:续费 2:升级 3:试用
               var buyAccountCount = v.filter.buyAccountCount || v.newFilter.buyAccountCount || 0
               var giftAccountCount = v.filter.giftAccountCount || v.newFilter.giftAccountCount || 0
-              var totalAccountCount = Number(buyAccountCount) + Number(giftAccountCount) + 1
+              var totalAccountCount = Number(buyAccountCount) + Number(giftAccountCount)
 
               var addAreaCount = v.filter.addAreaCount || v.newFilter.addAreaCount || 0
               // 升级
@@ -1202,7 +1215,7 @@
                 if (addAreaCount <= 0) {
                   vipInfo.onlyAddCount = true
                 }
-                if (totalAccountCount <= 1) {
+                if (totalAccountCount <= 0) {
                   vipInfo.onlyAddPower = true
                 }
               }
@@ -1217,9 +1230,6 @@
                     v.buyAccountNum = v.buyNum||v.newFilter.finalAccountCount || 0
                 } else {
                     // 仅增购子账号，不计算主账号数量
-                    if (vipInfo.onlyAddCount) {
-                      totalAccountCount -= 1
-                    }
                     v.buyAccountNum = v.buyNum||totalAccountCount||v.newFilter.finalAccountCount || 0
                 }
 

src/web/templates/pc/vip_orderDetail.html

@@ -173,7 +173,7 @@
             var filter_vip_new = order.new_filter ? JSON.parse(order.new_filter) : {}
             var buyAccountCount = filterInfo.buyAccountCount || filter_vip_new.buyAccountCount || 0
             var giftAccountCount = filterInfo.giftAccountCount || filter_vip_new.giftAccountCount || 0
-            var totalAccountCount = Number(buyAccountCount) + Number(giftAccountCount) + 1
+            var totalAccountCount = Number(buyAccountCount) + Number(giftAccountCount)
 
             var addAreaCount = filterInfo.addAreaCount || filter_vip_new.addAreaCount || 0
             var onlyAddCount = addAreaCount <= 0 // 仅增购子账号
@@ -189,9 +189,6 @@
                     buyNumber2 = order.buyNum || filter_vip_new.finalAccountCount || 0
                 } else {
                     // 仅增购子账号，不计算主账号数量
-                    if (onlyAddCount) {
-                        totalAccountCount -= 1
-                    }
                     buyNumber2 = order.buyNum || totalAccountCount || filter_vip_new.finalAccountCount || 0
                 }
             } else {
@@ -199,6 +196,16 @@
             }
             return buyNumber2
         }
+
+        function calcIsOnlyAddPower(order) {
+            var filter_vip = order.filter ? JSON.parse(order.filter) : {}
+            var filter_vip_new = order.new_filter ? JSON.parse(order.new_filter) : {}
+            var buyAccountCount = filter_vip.buyAccountCount || filter_vip_new.buyAccountCount || 0
+            var giftAccountCount = filter_vip.giftAccountCount || filter_vip_new.giftAccountCount || 0
+            var totalAccountCount = Number(buyAccountCount) + Number(giftAccountCount)
+            return totalAccountCount <= 0
+        }
+
         var serverInitTime = null
         var timerId = null
         $(function () {
@@ -275,7 +282,7 @@
                         if (Object.keys(filterObjNew).length <= 0) return
                         var cycle = ''
                         var cmap={1:"天",2:"月",3:"年",4:"季"}
-                        if (filterObjNew.buy_type==filterObjNew.give_type){
+                        if (filterObjNew.buy_type && filterObjNew.buy_type==filterObjNew.give_type){
                             cycle = parseInt(filterObjNew.buy_cycle||0) +parseInt(filterObjNew.give_cycle||0) +cmap[filterObjNew.buy_type]
                         }else{
                             if (filterObjNew.buy_cycle>0){
@@ -294,9 +301,10 @@
                         $(".discount-container .highlight-text").text("赠送30天");
                     }
                     // 活动赠
-                    var give_cycle=filterObj.give_cycle;
+                    var give_type = filterObj.give_type  || filterObjNew.activity_give_type;
+                    var give_cycle=filterObj.give_cycle || filterObjNew.activity_give_cycle;
                     if (give_cycle) {
-                      if (filterObj.give_type==1){
+                      if (give_type==1){
                         give_cycle = give_cycle + '天';
                       }else{
                         give_cycle = give_cycle < 12 ? (give_cycle + '个月') : ('1年');
@@ -307,9 +315,10 @@
                         $(".discount-container .highlight-text").text("活动赠"+give_cycle);
                     }
                     // 销售赠
-                    var seller_give_cycle=filterObj.seller_give_cycle;
+                    var seller_give_type = filterObj.seller_give_type || filterObjNew.give_type;
+                    var seller_give_cycle=filterObj.seller_give_cycle || filterObjNew.give_cycle;
                     if (seller_give_cycle) {
-                      if (filterObj.seller_give_type==1){
+                      if (seller_give_type==1){
                         seller_give_cycle = seller_give_cycle + '天';
                       }else{
                         seller_give_cycle = seller_give_cycle < 12 ? (seller_give_cycle + '个月') : ('1年');
@@ -332,6 +341,7 @@
                         //}else {
                             $("#status_success").removeClass("hide");
                         //}
+                        var order = r.data.order;
                         //兑换码 不展示支付时间 p307
                         if (r.data.order.pay_time&&filterObj.badge!="exchange"){
                             $(".pay_time_p").css("display", "");
@@ -341,9 +351,14 @@
                         if(r.data.order.buy_subject=='2'){
                             var buyAccountNum = calcAccountNum(r.data.order)
                             var num2 = r.data.order.buy_count||buyAccountNum
-                          $('.pay_number_t').text(num2+"人")
-                          $('.pay_number').show()
+                            $('.pay_number_t').text(num2+"人")
+                            $('.pay_number').show()
 
+                            var onlyAddPower = calcIsOnlyAddPower(r.data.order)
+                            var upgrade = order.vip_type == 2 || order.service_type == 3
+                            if (onlyAddPower && upgrade) {
+                                $('.pay_number').hide()
+                            }
                         }
                         //支付方式
                         if (r.data.order.billingMode===1){
@@ -550,25 +565,29 @@
                         } else if (year === 0 && month !== 0) {
                             $(".dyzq").text(month + "个月");
                         }
-                        if (filterObj.cycleunit == 1) {
-                            $(".dyzq").text(filterObj.cyclecount + "年")
-                        } else if (filterObj.cycleunit == 2) {
-                            $(".dyzq").text(filterObj.cyclecount + "个月")
-                        } else if (filterObj.cycleunit == 3) {
-                            $(".dyzq").text(filterObj.cyclecount + "天")
-                        } else if (filterObj.cycleunit == 4) {
-                            $(".dyzq").text(filterObj.cyclecount + "季")
+                        if (filterObj) {
+                            if (filterObj.cycleunit == 1) {
+                                $(".dyzq").text(filterObj.cyclecount + "年")
+                            } else if (filterObj.cycleunit == 2) {
+                                $(".dyzq").text(filterObj.cyclecount + "个月")
+                            } else if (filterObj.cycleunit == 3) {
+                                $(".dyzq").text(filterObj.cyclecount + "天")
+                            } else if (filterObj.cycleunit == 4) {
+                                $(".dyzq").text(filterObj.cyclecount + "季")
+                            }
                         }
                     } else {
                         //未支付
-                        if (filterObj.cycleunit == 1) {
-                            $(".dyzq").text(filterObj.cyclecount + "年")
-                        } else if (filterObj.cycleunit == 2) {
-                            $(".dyzq").text(filterObj.cyclecount + "个月")
-                        } else if (filterObj.cycleunit == 3) {
-                            $(".dyzq").text(filterObj.cyclecount + "天")
-                        } else if (filterObj.cycleunit == 4) {
-                            $(".dyzq").text(filterObj.cyclecount + "季")
+                        if (filterObj) {
+                            if (filterObj.cycleunit == 1) {
+                                $(".dyzq").text(filterObj.cyclecount + "年")
+                            } else if (filterObj.cycleunit == 2) {
+                                $(".dyzq").text(filterObj.cyclecount + "个月")
+                            } else if (filterObj.cycleunit == 3) {
+                                $(".dyzq").text(filterObj.cyclecount + "天")
+                            } else if (filterObj.cycleunit == 4) {
+                                $(".dyzq").text(filterObj.cyclecount + "季")
+                            }
                         }
                     }
                     if (r.data.order.order_status == 1) {
@@ -595,15 +614,18 @@
                         $(".zq_text").text("续费周期");
                     } else if (order.vip_type == 2 || order.service_type == 3) {
                         $(".vip_type").text("（升级）");
-                        if (filterObj.cycleunit == 1) {
-                            $(".dyzq").text(filterObj.cyclecount + "年")
-                        } else if (filterObj.cycleunit == 2) {
-                            $(".dyzq").text(filterObj.cyclecount + "个月")
-                        } else if (filterObj.cycleunit == 3) {
-                            $(".dyzq").text(filterObj.cyclecount + "天")
-                        } else if (filterObj.cycleunit == -1) {
-                            $(".dyzq").text("不延期");
+                        if (filterObj) {
+                            if (filterObj.cycleunit == 1) {
+                                $(".dyzq").text(filterObj.cyclecount + "年")
+                            } else if (filterObj.cycleunit == 2) {
+                                $(".dyzq").text(filterObj.cyclecount + "个月")
+                            } else if (filterObj.cycleunit == 3) {
+                                $(".dyzq").text(filterObj.cyclecount + "天")
+                            } else if (filterObj.cycleunit == -1) {
+                                $(".dyzq").text("不延期");
+                            }
                         }
+                        
                         //续费升级逻辑修改后判断是否不延期
                         if (filterObj.cycleunit == 0 && filterObj.cyclecount == 0) {
                             $(".dyzq").text("不延期");
@@ -639,7 +661,7 @@
                     }
 
                     //计价清单
-                    var filterObj = JSON.parse(r.data.order.filter);
+                    var filterObj = JSON.parse(r.data.order.filter) || {};
                     var upgradeSubtotail = filterObj.upgradeSubtotail;
                     if (upgradeSubtotail) {	//有则显示
                         $(".valuationList").css("display", "");

src/web/templates/weixin/commonPay/medical/orderDetail.html

@@ -212,7 +212,7 @@
         if (Object.keys(filterObjNew).length <= 0) return
         var cycle = ''
         var cmap={1:"天",2:"月",3:"年",4:"季"}
-        if (filterObjNew.buy_type==filterObjNew.give_type){
+        if (filterObjNew.buy_type && filterObjNew.buy_type==filterObjNew.give_type){
             cycle = parseInt(filterObjNew.buy_cycle||0) +parseInt(filterObjNew.give_cycle||0) +cmap[filterObjNew.buy_type]
         }else{
             if (filterObjNew.buy_cycle>0){
@@ -819,7 +819,7 @@
             $(".payPrice").text("￥ " + formatMoney(r.data.order.pay_money / 100) + "元");
         }
         //计价清单
-        var filterObj = JSON.parse(r.data.order.filter);
+        var filterObj = JSON.parse(r.data.order.filter) || {};
         var upgradeSubtotail = filterObj.upgradeSubtotail;
         if (upgradeSubtotail) {	//有则显示
             $.ajax({

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

@@ -274,7 +274,7 @@
         if (Object.keys(filterObjNew).length <= 0) return
         var cycle = ''
         var cmap={1:"天",2:"月",3:"年",4:"季"}
-        if (filterObjNew.buy_type==filterObjNew.give_type){
+        if (filterObjNew.buy_type && filterObjNew.buy_type==filterObjNew.give_type){
             cycle = parseInt(filterObjNew.buy_cycle||0) +parseInt(filterObjNew.give_cycle||0) +cmap[filterObjNew.buy_type]
         }else{
             if (filterObjNew.buy_cycle>0){

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

@@ -153,7 +153,7 @@
         if (Object.keys(filterObjNew).length <= 0) return
         var cycle = ''
         var cmap={1:"天",2:"月",3:"年",4:"季"}
-        if (filterObjNew.buy_type==filterObjNew.give_type){
+        if (filterObjNew.buy_type && filterObjNew.buy_type==filterObjNew.give_type){
             cycle = parseInt(filterObjNew.buy_cycle||0) +parseInt(filterObjNew.give_cycle||0) +cmap[filterObjNew.buy_type]
         }else{
             if (filterObjNew.buy_cycle>0){

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

@@ -229,7 +229,7 @@
         if (Object.keys(filterObjNew).length <= 0) return
         var cycle = ''
         var cmap={1:"天",2:"月",3:"年",4:"季"}
-        if (filterObjNew.buy_type==filterObjNew.give_type){
+        if (filterObjNew.buy_type && filterObjNew.buy_type==filterObjNew.give_type){
             cycle = parseInt(filterObjNew.buy_cycle||0) +parseInt(filterObjNew.give_cycle||0) +cmap[filterObjNew.buy_type]
         }else{
             if (filterObjNew.buy_cycle>0){
@@ -241,6 +241,42 @@
         }
         return cycle
     }
+
+    function calcAccountNum(order) {
+        var filterInfo = order.filter ? JSON.parse(order.filter) : {}
+        var filter_vip_new = order.new_filter ? JSON.parse(order.new_filter) : {}
+        var buyAccountCount = filterInfo.buyAccountCount || filter_vip_new.buyAccountCount || 0
+        var giftAccountCount = filterInfo.giftAccountCount || filter_vip_new.giftAccountCount || 0
+        var totalAccountCount = Number(buyAccountCount) + Number(giftAccountCount)
+
+        var addAreaCount = filterInfo.addAreaCount || filter_vip_new.addAreaCount || 0
+        var onlyAddCount = addAreaCount <= 0 // 仅增购子账号
+
+        // 续费vip_type=1
+        if (order.vip_type == 1 || order.service_type == 2) {
+            // 人数就是购买人数
+            buyNumber2 = filterInfo.buyAccountCount || filter_vip_new.finalAccountCount || 0
+        } else if (order.vip_type == 2 || order.service_type == 3) {
+            // 人数是升级人数/如果只补充服务，则人数就是购买人数
+            if (buyAccountCount == 0 && giftAccountCount == 0) {
+                buyNumber2 = order.buyNum || filter_vip_new.finalAccountCount || 0
+            } else {
+                buyNumber2 = order.buyNum || totalAccountCount || filter_vip_new.finalAccountCount || 0
+            }
+        } else {
+            buyNumber2 = order.buy_count || order.buyNum || filter_vip_new.finalAccountCount || 0
+        }
+        return buyNumber2
+    }
+
+    function calcIsOnlyAddPower(order) {
+        var filter_vip = order.filter ? JSON.parse(order.filter) : {}
+        var filter_vip_new = order.new_filter ? JSON.parse(order.new_filter) : {}
+        var buyAccountCount = filter_vip.buyAccountCount || filter_vip_new.buyAccountCount || 0
+        var giftAccountCount = filter_vip.giftAccountCount || filter_vip_new.giftAccountCount || 0
+        var totalAccountCount = Number(buyAccountCount) + Number(giftAccountCount)
+        return totalAccountCount <= 0
+    }
     $(function () {
         //分享
         initShare({{.T.signature}},{{.T.openid}}, 2, "jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
@@ -277,14 +313,24 @@
                     }
                 }
                 //购买数量
+                var order = r.data.order;
+                //购买数量
+                var onlyAddPower = calcIsOnlyAddPower(order)
+                var upgrade = order.vip_type == 2 || order.service_type == 3
                if(r.data.order.buy_subject=='2'){
-                 $('.membernum').show();
-                 $('.buy_num_value').text(r.data.order.buy_count+'人')
-
+                 var buyAccountNum = calcAccountNum(order)
+                 var num2 = r.data.order.buy_count||buyAccountNum
+                 $('.buy_num_value').text(num2+'人')
+                 if (num2) {
+                    $('.membernum').show();
+                 }
                 }else{
                   $('.membernum').parent().hide();
-
                 }
+                if (onlyAddPower && upgrade) {
+                    $('.membernum').parents('.l-item').hide()
+                }
+
                 if (!r.data.order.discount_price || (r.data.order.discount_price && r.data.order.discount_price <= 0)) {
             		    $(".discountPrice").parent().hide();
                 }
@@ -307,8 +353,8 @@
 
                 var filterObjNew = JSON.parse(r.data.order.new_filter || '{}');
                 //订单条件
-                if (r.data.order.filter) {
-                    var filterObj = JSON.parse(r.data.order.filter);
+                if (r.data.order.filter || r.data.order.new_filter) {
+                    var filterObj = JSON.parse(r.data.order.filter || r.data.order.new_filter);
                     // 活动角标
                     if (filterObj.badge) {
                         $(".order-img").addClass('badge-' + filterObj.badge)
@@ -316,11 +362,11 @@
                     var areaText = "";
                     // 双11活动判断
                     var can1111 = filterObj && filterObj.original_price
-                    var give_type = filterObj.give_type;//时间类型：1/天、2/月
-                    var seller_give_type = filterObj.seller_give_type;//时间类型：1/天、2/月
+                    var give_type = filterObj.give_type || filterObjNew.activity_give_type;//时间类型：1/天、2/月
+                    var seller_give_type = filterObj.seller_give_type || filterObjNew.give_type;//时间类型：1/天、2/月
                     if (can1111 || give_type > 0 || seller_give_type > 0) {
-                        var giveTime = filterObj.give_cycle;
-                        var sellerGiveTime = filterObj.seller_give_cycle
+                        var giveTime = filterObj.give_cycle || filterObjNew.activity_give_cycle
+                        var sellerGiveTime = filterObj.seller_give_cycle || filterObjNew.give_cycle
                         if (giveTime) {
                           if (give_type==1){
                             giveTime=giveTime+"天";
@@ -671,6 +717,8 @@
                     var durationText = calcBackOrderTime(filterObjNew)
                     if (durationText) {
                         $('.cyclecount').text(durationText)
+                    } else {
+                        $('.cyclecount').parents('.l-item').hide()
                     }
                 }
 
@@ -877,7 +925,7 @@
                 }
             }
             //计价清单
-            var filterObj = JSON.parse(r.data.order.filter);
+            var filterObj = JSON.parse(r.data.order.filter || r.data.order.new_filter) || {};
             var upgradeSubtotail = filterObj.upgradeSubtotail;
             if (upgradeSubtotail) {	//有则显示
                 $.ajax({