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

@@ -137,8 +137,9 @@ $(function () {
             var filterObj = {}
             var filterObjNew = {}
             //订单条件
+            var order = r.data.order
             if (r.data.order.filter || r.data.order.new_filter) {
-                filterObj = JSON.parse(r.data.order.filter || r.data.order.new_filter) || {};
+                filterObj = JSON.parse(r.data.order.filter || '{}')
                 filterObjNew = JSON.parse(r.data.order.new_filter || '{}');
 
                 // 活动角标
@@ -146,13 +147,27 @@ $(function () {
                     $(".order-img").addClass('badge-' + filterObj.badge)
                 }
                 var newbuyset = filterObj.newBuyset;
-                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/月
+                var backCreateOrder = order.order_channel === 'xdqd04'
+
+                if (backCreateOrder) {
+                    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/月
+                } else {
+                    var give_type = filterObj.give_type;//时间类型：1/天、2/月
+                    var seller_give_type = filterObj.seller_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 || filterObjNew.activity_give_cycle
-                    var sellerGiveTime = filterObj.seller_give_cycle || filterObjNew.give_cycle
+                    if (backCreateOrder) {
+                        var giveTime = filterObj.give_cycle || filterObjNew.activity_give_cycle
+                        var sellerGiveTime = filterObj.seller_give_cycle || filterObjNew.give_cycle
+                    } else {
+                        var giveTime = filterObj.give_cycle
+                        var sellerGiveTime = filterObj.seller_give_cycle
+                    }
+
                     if (giveTime) {
                       if(give_type==1){
                         giveTime=giveTime+"天";

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

@@ -281,7 +281,7 @@
 
         //订单条件
         if (r.data.order.filter) {
-          var filterObj = JSON.parse(r.data.order.filter || r.data.order.new_filter);
+          var filterObj = JSON.parse(r.data.order.filter || '{}');
           var filterObjNew = JSON.parse(r.data.order.new_filter || '{}');
           // 活动角标
           if (filterObj.badge) {

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

@@ -1815,9 +1815,18 @@ var vm = new Vue({
       var filter_vip = this.getFilterInfo(order)
       var filter_vip_new = this.getNewFilterInfo(order)
       var giveHTML = ''
+      // 代用户下单
+      var backCreateOrder = order.order_channel === 'xdqd04'
       // 活动赠送日期计算
-      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/月
+      if (backCreateOrder) {
+        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/月
+      } else {
+        var giveCycle = filter_vip.give_cycle
+        var giveType = filter_vip.give_type //时间类型：1/天、2/月
+      }
+
+      
       var give = ''
       if (giveCycle) {
         if (giveType == 1) {
@@ -1829,8 +1838,14 @@ var vm = new Vue({
       }
 
       // 销售赠送有效日期
-      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/月
+      if (backCreateOrder) {
+        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/月
+      } else {
+        var sellerGiveCycle = filter_vip.seller_give_cycle
+        var sellerGiveType = filter_vip.seller_give_type // 时间类型：1/天、2/月
+      }
+      
       var sellerGive = ''
       if (sellerGiveCycle) {
         if (sellerGiveType == 1) {
@@ -2246,8 +2261,8 @@ var vm = new Vue({
 
       var giveHTML = ''
       // 活动赠送日期计算
-      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 giveCycle = filter_vip.give_cycle
+      var giveType = filter_vip.give_type //时间类型：1/天、2/月
       var give = ''
       if (giveCycle) {
         if (giveType == 1) {
@@ -2259,8 +2274,8 @@ var vm = new Vue({
       }
 
       // 销售赠送有效日期
-      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 sellerGiveCycle = filter_vip.seller_give_cycle
+      var sellerGiveType = filter_vip.seller_give_type // 时间类型：1/天、2/月
       var sellerGive = ''
       if (sellerGiveCycle) {
         if (sellerGiveType == 1) {

src/web/templates/pc/myOrder.html

@@ -1012,19 +1012,23 @@
               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.order_channel === 'xdqd04') {
+              // 赠送时间兼容
+              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 === '大会员') {

src/web/templates/pc/vip_orderDetail.html

@@ -233,6 +233,7 @@
                     if (r.data.order.new_filter) {
                         filterObjNew = JSON.parse(r.data.order.new_filter);
                     }
+                    var order = r.data.order
                     if (r.data.order.create_time) {
                         $(".order_time").text(r.data.order.create_time.replace(/-/g, "."));
                     }
@@ -300,9 +301,18 @@
                         $(".discount-container").removeClass("hide");
                         $(".discount-container .highlight-text").text("赠送30天");
                     }
+                    
+                    // 代用户下单订单
+                     var backCreateOrder = order.order_channel === 'xdqd04'
                     // 活动赠
-                    var give_type = filterObj.give_type  || filterObjNew.activity_give_type;
-                    var give_cycle=filterObj.give_cycle || filterObjNew.activity_give_cycle;
+                    if (backCreateOrder) {
+                        var give_type = filterObj.give_type  || filterObjNew.activity_give_type;
+                        var give_cycle=filterObj.give_cycle || filterObjNew.activity_give_cycle;
+                    } else {
+                        var give_type = filterObj.give_type;
+                        var give_cycle= filterObj.give_cycle;
+                    }
+                    
                     if (give_cycle) {
                       if (give_type==1){
                         give_cycle = give_cycle + '天';
@@ -315,8 +325,14 @@
                         $(".discount-container .highlight-text").text("活动赠"+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 (backCreateOrder) {
+                        var seller_give_type = filterObj.seller_give_type || filterObjNew.give_type;
+                        var seller_give_cycle=filterObj.seller_give_cycle || filterObjNew.give_cycle;
+                    } else {
+                        var seller_give_type = filterObj.seller_give_type;
+                        var seller_give_cycle=filterObj.seller_give_cycle;
+                    }
+                    
                     if (seller_give_cycle) {
                       if (seller_give_type==1){
                         seller_give_cycle = seller_give_cycle + '天';

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

@@ -354,7 +354,7 @@
                 var filterObjNew = JSON.parse(r.data.order.new_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 filterObj = JSON.parse(r.data.order.filter || '{}');
                     // 活动角标
                     if (filterObj.badge) {
                         $(".order-img").addClass('badge-' + filterObj.badge)
@@ -925,7 +925,7 @@
                 }
             }
             //计价清单
-            var filterObj = JSON.parse(r.data.order.filter || r.data.order.new_filter) || {};
+            var filterObj = JSON.parse(r.data.order.filter || '{}') || {};
             var upgradeSubtotail = filterObj.upgradeSubtotail;
             if (upgradeSubtotail) {	//有则显示
                 $.ajax({