fix: 处理超级订阅续费无filter情况

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){
@@ -122,9 +122,10 @@ $(function () {
             }
             var areaText = "";
             var industry_vip = "";
+            var filterObj = {}
             //订单条件
-            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) || {};
                 // 活动角标
                 if (filterObj.badge) {
                     $(".order-img").addClass('badge-' + filterObj.badge)
@@ -405,6 +406,8 @@ $(function () {
                 var durationText = calcBackOrderTime(filterObjNew)
                 if (durationText) {
                     $('.cyclecount').text(durationText)
+                } else {
+                    $('.cyclecount').parents('.l-item').hide()
                 }
             }
 
@@ -630,7 +633,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/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){

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,8 @@
                 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 || '{}');
                     // 活动角标
                     if (filterObj.badge) {
                         $(".order-img").addClass('badge-' + filterObj.badge)
@@ -800,7 +800,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/vip_orderDetail.html

@@ -275,7 +275,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){
@@ -550,25 +550,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 +599,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 +646,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){
@@ -307,8 +307,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)
@@ -671,6 +671,8 @@
                     var durationText = calcBackOrderTime(filterObjNew)
                     if (durationText) {
                         $('.cyclecount').text(durationText)
+                    } else {
+                        $('.cyclecount').parents('.l-item').hide()
                     }
                 }
 
@@ -877,7 +879,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({