feat: 前台订单购买数量包含主账号数量

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

@@ -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)
+    var totalAccountCount = Number(buyAccountCount) + Number(giftAccountCount) + 1
     // 续费vip_type=1
     if (order.vip_type == 1 || order.service_type == 2) {
         // 人数就是购买人数

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

@@ -284,8 +284,8 @@
             if (r) {
                 //订单信息
                 $(".orderCode").text(orderCode);
-                var filterObj = JSON.parse(r.data.filter);
-                var filterNewObj = JSON.parse(r.data.new_filter);
+                var filterObj = JSON.parse(r.data.filter || '{}');
+                var filterNewObj = JSON.parse(r.data.new_filter || '{}');
                 var source = "";
                 if(filterObj.source){
                   source = filterObj.source;
@@ -459,7 +459,7 @@
             //}
             $(".level_value").text(level_value);
             //
-            var cycle;
+            var cycle = '';
             if(filterObj.cycle ){
               if (filterObj.level == 4) {
                 $(".productType").text("大会员-试用版")

src/jfw/modules/app/src/web/templates/commonPay/integral/integralDetail.html

@@ -166,7 +166,7 @@
                 //订单信息
                 $(".orderCode").text(orderCode);
                 var filterObj = JSON.parse(r.data.filter);
-                var filterNewObj = JSON.parse(r.data.new_filter);
+                var filterNewObj = JSON.parse(r.data.new_filter || '{}');
                 $(".count_value").text(formatMoney(filterObj.score||filterNewObj.num) + "枚");
                 $(".o-name").text("剑鱼币")
                 $(".order-img > img").attr("src", "/jyapp/commonPay/image/jianyubi.png")

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

@@ -766,7 +766,7 @@ var vm = new Vue({
     },
     getDataPackInfo: function (order) {
       var filterInfo = JSON.parse(order.filter)
-      var filterNewInfo = JSON.parse(order.new_filter)
+      var filterNewInfo = JSON.parse(order.new_filter || '{}')
       this.orderInfoFilter = filterInfo
       var specMap = {
         1: '标准字段包',

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

@@ -2737,7 +2737,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)
+      var totalAccountCount = Number(buyAccountCount) + Number(giftAccountCount) + 1
       // 续费vip_type=1
       if (order.vip_type == 1 || order.service_type == 2) {
         // 人数就是购买人数

src/web/templates/order/pc/integral/integralDetail.html

@@ -141,7 +141,7 @@
                     //订单信息
                     $(".order_code").text(orderCode);
                     var filterObj = JSON.parse(r.data.filter);
-                    var filterNewObj = JSON.parse(r.data.new_filter);
+                    var filterNewObj = JSON.parse(r.data.new_filter || '{}');
 
                     if (r.data.create_time) {
                         $(".order_time").text(r.data.create_time.replace("-", ".").replace("-", "."));

src/web/templates/pc/dataPack/packDetail.html

@@ -149,7 +149,7 @@
                     //订单信息
                     $(".order_code").text(orderCode);
                     var filterObj = JSON.parse(r.data.order.filter);
-                    var filterNewObj = JSON.parse(r.data.order.new_filter);
+                    var filterNewObj = JSON.parse(r.data.order.new_filter || '{}');
                     if (r.data.order.create_time) {
                         $(".order_time").text(r.data.order.create_time.replace(/-/g, "."));
                     }

src/web/templates/pc/member_orderDetail.html

@@ -224,7 +224,7 @@
                     //订单信息
                     $(".order_code").text(orderCode);
                     var filterObj = JSON.parse(r.data.filter);
-                    var filterNewObj = JSON.parse(r.data.new_filter);
+                    var filterNewObj = JSON.parse(r.data.new_filter || '{}');
                     var source = "";
                     if(filterObj.source){
                       source = filterObj.source;
@@ -300,7 +300,7 @@
                     //}
                     //启明星后台创建的订单 cycleType: 1-天  0-月  cycle:数量
                     $(".level").text(level);
-                    var cycle
+                    var cycle = ''
                   if(filterObj.cycle ){
                     cycle=filterObj.cycle;
                     if(filterObj.level==4||filterObj.cycleType===1){

src/web/templates/pc/myOrder.html

@@ -996,6 +996,8 @@
                 console.warn(v.order_code,e)
               }
               v.filter = t || {}
+            } else {
+              v.filter = {}
             }
 
             if (v.newFilter) {
@@ -1006,6 +1008,8 @@
                 console.warn(v.order_code,e)
               }
               v.newFilter = t || {}
+            } else {
+              v.newFilter = {}
             }
 
 
@@ -1018,7 +1022,8 @@
               }
               var buyAccountCount = v.filter.buyAccountCount || v.newFilter.buyAccountCount || 0
               var giftAccountCount = v.filter.giftAccountCount || v.newFilter.giftAccountCount || 0
-              var totalAccountCount = Number(buyAccountCount) + Number(giftAccountCount)
+              // 购买数量要加上主账号
+              var totalAccountCount = Number(buyAccountCount) + Number(giftAccountCount) + 1
 
               // 续费vip_type=1
               if (v.vip_type == 1) {
@@ -1154,18 +1159,22 @@
                 } else {
                   vipInfo.cycle = "-"
                 }
-              }else if(JSON.stringify(v.newFilter) !== JSON.stringify({})){
+              }else if(v.newFilter && Object.keys(v.newFilter).length>0){
+                  var cycle = ''
                   var cmap={1:"天",2:"月",3:"年",4:"季"}
                   if (v.newFilter.buy_type==v.newFilter.give_type){
-                    vipInfo.cycle = parseInt(v.newFilter.buy_cycle||0) +parseInt(v.newFilter.give_cycle||0) +cmap[v.newFilter.buy_type]
+                    cycle = parseInt(v.newFilter.buy_cycle||0) +parseInt(v.newFilter.give_cycle||0) +cmap[v.newFilter.buy_type]
                   }else{
                     if (v.newFilter.buy_cycle>0){
-                      vipInfo.cycle=v.newFilter.buy_cycle+cmap[v.newFilter.buy_type]
+                      cycle+=v.newFilter.buy_cycle+cmap[v.newFilter.buy_type]
                     }
                     if (v.newFilter.give_cycle>0){
-                      vipInfo.cycle+=v.newFilter.give_cycle+cmap[v.newFilter.give_type]
+                      cycle+=v.newFilter.give_cycle+cmap[v.newFilter.give_type]
                     }
                   }
+                  if (cycle) {
+                    vipInfo.cycle=cycle
+                  }
               }
               if (v.filter.cycleunit === 0 && v.filter.cyclecount === 0) {
                 vipInfo.cycle = "不延期";
@@ -1181,7 +1190,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)
+              var totalAccountCount = Number(buyAccountCount) + Number(giftAccountCount) + 1
               // 续费vip_type=1
               if (v.vip_type == 1) {
                 // 人数就是购买人数

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)
+            var totalAccountCount = Number(buyAccountCount) + Number(giftAccountCount) + 1
             // 续费vip_type=1
             if (order.vip_type == 1 || order.service_type == 2) {
                 // 人数就是购买人数