feat: 免费用户/超级订阅 推送结果预览页面调整

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

@@ -11,7 +11,7 @@ var subNode = new Vue({
                 industry: '/jyapp/vipsubscribe/toChangeIndustry?header=save',
                 keyword: '/jyapp/vipsubscribe/toSetKeyWordPage',
                 infotype: '/jyapp/vipsubscribe/toSetInfoTypePage',
-                resultview: '/jyapp/vipsubscribe/toVIPViewPage',
+                resultview: '/jyapp/vipsubscribe/toVIPViewPage?vSwitch=v',
                 pushsetting: '/jyapp/big/page/push_setting_detail?header=超级订阅推送设置&type=super_subscribe',
                 freepush: '/jyapp/big/page/push_setting_detail?header=订阅&type=free_subscribe',
             },
@@ -106,6 +106,7 @@ var subNode = new Vue({
                     } else if(num <= 0) {
                         $('.custom-header-title').html('<span class="title-text">订阅管理-免费订阅</span>')
                         this.subInfoAjax = '/publicapply/free/subscribe'
+                        this.linkObj.resultview = '/jyapp/vipsubscribe/toVIPViewPage?vSwitch=f'
                     } else {
                         $('.custom-header-title').html('<span class="title-text"><em class="title_icon icon_vip"></em>订阅管理-超级订阅</span>')
                         this.subInfoAjax = '/subscribepay/vipsubscribe/getSubBuyMsg?t=' + new Date().getTime()
@@ -115,10 +116,12 @@ var subNode = new Vue({
                     this.subInfoAjax = '/subscribepay/vipsubscribe/getSubBuyMsg?t=' + new Date().getTime()
                 } else {
                     $('.custom-header-title').html('<span class="title-text">订阅管理-免费订阅</span>')
+                    this.linkObj.resultview = '/jyapp/vipsubscribe/toVIPViewPage?vSwitch=f'
                     this.subInfoAjax = '/publicapply/free/subscribe'
                 }
             } else {
                 $('.custom-header-title').html('<span class="title-text">订阅管理-免费订阅</span>')
+                this.linkObj.resultview = '/jyapp/vipsubscribe/toVIPViewPage?vSwitch=f'
                 this.subInfoAjax = '/publicapply/free/subscribe'
             }
         },

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

@@ -212,7 +212,7 @@
                     industry: '/jyapp/vipsubscribe/toChangeIndustry?header=save&subvip=free',
                     keyword: '/jyapp/vipsubscribe/toSetKeyWordPage',
                     infotype: '/jyapp/vipsubscribe/toSetInfoTypePage',
-                    resultview: '/jyapp/vipsubscribe/toVIPViewPage',
+                    resultview: '/jyapp/vipsubscribe/toVIPViewPage?vSwitch=v',
                     pushsetting: '/jyapp/big/page/push_settings'
                 },
                 initData: {},

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

@@ -125,9 +125,13 @@
 			var reqParam = {
 				"pageNum": pageNum++
 			};
+			var tempURL = '/publicapply/free/pushview'
+			if (getParam('vSwitch') == 'v') {
+				tempURL = '/subscribepay/afterPay/getPushView'
+			}
 			$.ajax({
 				type: 'post',
-				url: '/subscribepay/afterPay/getPushView',
+				url: tempURL,
 				data: reqParam,
 				dataType: 'json',
 				success: function(data){
@@ -166,9 +170,13 @@
 						var reqParam = {
 							"pageNum": pageNum++
 						};
+						var tempURL = '/publicapply/free/pushview'
+						if (getParam('vSwitch') == 'v') {
+							tempURL = '/subscribepay/afterPay/getPushView'
+						}
 						$.ajax({
 							type: 'post',
-							url: '/subscribepay/afterPay/getPushView',
+							url: tempURL,
 							data: reqParam,
 							dataType: 'json',
 							success: function(data){

src/web/staticres/vipsubscribe/js/vip_index_new.js

@@ -11,7 +11,7 @@ var subNode = new Vue({
                 industry: '/front/vipsubscribe/toChangeIndustry?header=save',
                 keyword: '/front/vipsubscribe/toSetKeyWordPage',
                 infotype: '/front/vipsubscribe/toSetInfoTypePage',
-                resultview: '/front/vipsubscribe/toVIPViewPage',
+                resultview: '/front/vipsubscribe/toVIPViewPage?vSwitch=v',
                 pushsetting: '/front/setting/push_detail?header=超级订阅推送设置&type=super_subscribe',
                 freepush: '/front/setting/push_detail?header=订阅&type=free_subscribe',
             },
@@ -89,6 +89,7 @@ var subNode = new Vue({
                     if (res.data.vt !== 'v' ) {
                         _this.vSwitch = 'f'
                         _this.linkObj.pushsetting = _this.linkObj.freepush
+                        _this.linkObj.resultview = '/front/vipsubscribe/toVIPViewPage?vSwitch=f',
                         document.title = '订阅管理-免费订阅'
                         $('.update_renew').hide()
                         $('.super-title').text('订阅管理-免费订阅');

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

@@ -13,8 +13,8 @@
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" type="text/css" href="/css/wxbutton.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/vip_introduce.css?v={{Msg "seo" "version"}}1">
-    <link rel="stylesheet" type="text/css" href="/css/land-page-coupon.css?v={{Msg "seo" "version"}}1"> 
+    <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/vip_introduce.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" type="text/css" href="/css/land-page-coupon.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/common-module/vipsubscribe/css/vip-subscribe-set-template.css?v={{Msg "seo" "version"}}' />
 </head>
@@ -208,7 +208,7 @@
                         industry: '/front/vipsubscribe/toChangeIndustry?header=save&subvip=free',
                         keyword: '/front/vipsubscribe/toSetKeyWordPage',
                         infotype: '/front/vipsubscribe/toSetInfoTypePage',
-                        resultview: '/front/vipsubscribe/toVIPViewPage',
+                        resultview: '/front/vipsubscribe/toVIPViewPage?vSwitch=v',
                         pushsetting: '/front/vipsubscribe/toSetPushSetPage'
                     },
                     initData: {},
@@ -298,7 +298,7 @@
           var max = res.list.sort(function(a,b){
               return b.reduce - a.reduce;
           })[0];
-          console.log(max.reduce) 
+          console.log(max.reduce)
           $('.coupon-num').html(max.reduce)
         } else {
           $('.coupon-tips').hide()

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

@@ -127,9 +127,13 @@
 			var reqParam = {
 				"pageNum": pageNum++
 			};
+			var tempURL = '/publicapply/free/pushview'
+			if (getParam('vSwitch') == 'v') {
+				tempURL = '/subscribepay/afterPay/getPushView'
+			}
 			$.ajax({
 				type: 'post',
-				url: '/subscribepay/afterPay/getPushView',
+				url: tempURL,
 				data: reqParam,
 				dataType: 'json',
 				success: function(data){
@@ -166,9 +170,13 @@
 						var reqParam = {
 							"pageNum": pageNum++
 						};
+						var tempURL = '/publicapply/free/pushview'
+						if (getParam('vSwitch') == 'v') {
+							tempURL = '/subscribepay/afterPay/getPushView'
+						}
 						$.ajax({
 							type: 'post',
-							url: '/subscribepay/afterPay/getPushView',
+							url: tempURL,
 							data: reqParam,
 							dataType: 'json',
 							success: function(data){