Browse Source

feat: 超级订阅/免费订阅推送设置页面文字相关调整修复

zhangyuhan 3 years ago
parent
commit
713eb0dd12

+ 1 - 1
src/jfw/modules/app/src/web/templates/vipsubscribe/vip_viewPage.html

@@ -1,7 +1,7 @@
 <html>
 <head>
 	{{include "/common/meta.html"}}
-	<title>超级订阅结果预览</title>
+	<title>订阅结果预览</title>
 	{{include "/common/nnc.html"}}
 	<link href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/dropload.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 	<link href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/wxlist.css?v={{Msg "seo" "version"}}" rel="stylesheet">

+ 1 - 1
src/web/staticres/common-module/vipsubscribe/js/vip-subscribe-set-template.js

@@ -113,7 +113,7 @@ var subScribeTemplate = `
       </a>
     </li>
     <li class="body-item push-set" v-if="pushsetShow">
-      <a class="item-container" :href="linkobj.pushsetting">
+      <a class="item-container" :href="linkobj.pushLink || linkobj.pushsetting">
         <div class="item">
           <span class="item-l">
             <span class="leading_ jy-icon-push-set"></span>

+ 11 - 1
src/web/staticres/vipsubscribe/js/vip_index_new.js

@@ -12,7 +12,9 @@ var subNode = new Vue({
                 keyword: '/front/vipsubscribe/toSetKeyWordPage',
                 infotype: '/front/vipsubscribe/toSetInfoTypePage',
                 resultview: '/front/vipsubscribe/toVIPViewPage',
-                pushsetting: '/front/setting/push_detail?header=超级订阅推送设置&type=super_subscribe'
+                pushsetting: '/front/setting/push_detail?header=超级订阅推送设置&type=super_subscribe',
+                freepush: '/front/setting/push_detail?header=订阅&type=free_subscribe',
+                pushLink: ''
             },
             initData: {},
             userAreaNum: 1, // 用户修改地区剩余次数
@@ -33,6 +35,12 @@ var subNode = new Vue({
         })
     },
     methods: {
+        getPushLink: function () {
+            if (this.vSwitch === 'f') {
+                return this.linkObj.freepush
+            }
+            return this.linkObj.pushsetting
+        },
         superOrderTemplateMounted () {
             $('#pushResultPreview').attr('data-cl-event', 'c_wx_preview_buttonclick')
         },
@@ -78,12 +86,14 @@ var subNode = new Vue({
                 success: function(res) {
                     if (res.data.vt !== 'v' ) {
                         _this.vSwitch = 'f'
+                        _this.linkObj.pushLink = _this.getPushLink()
                         document.title = '订阅管理-免费订阅'
                         $('.update_renew').hide()
                         $('.super-title').text('订阅管理-免费订阅');
                         $('.super-title').css('background', 'none')
                     } else {
                         _this.vSwitch = 'v'
+                        _this.linkObj.pushLink = _this.getPushLink()
                         document.title = '订阅管理-超级订阅'
                         $('.update_renew').show()
                         $('.super-title').show();

+ 1 - 1
src/web/templates/weixin/vipsubscribe/vip_viewPage.html

@@ -1,7 +1,7 @@
 <html>
 <head>
 	<meta name="viewport" content="width=device-width,initial-scale=1.0">
-	<title>超级订阅结果预览</title>
+	<title>订阅结果预览</title>
 	{{include "/common/mnc.html"}}
 	<link href="{{Msg "seo" "cdn"}}/css/dropload.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 	<link href="{{Msg "seo" "cdn"}}/css/wxlist.css?v={{Msg "seo" "version"}}1" rel="stylesheet">