feat；老免费用户订阅首页弹窗设置

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/keyset-list.js

@@ -15,6 +15,10 @@
    *
    *  参考: https://www.cnblogs.com/mr-wuxiansheng/p/6296646.html
    */
+/*
+	*dev4.7.7
+	*老用户无论有没有设置关键词，进入index设置页面 弹窗立显，点击修改和添加关键词 弹窗弹出。
+*/
 Date.prototype.pattern = function (fmt) {
   var o = {
     'y+': this.getFullYear(),
@@ -193,7 +197,7 @@ var keySet = new Vue({
           // 如果没有设置关键词，清除历史记录，直接跳转到去设置关键词
           // 关键词超过 maxKeyLength 个显示底部框
           if (r.a_key && r.a_key.length === 0) {
-            location.replace('/jyapp/wxkeyset/keyset/filterset?type=add&index=0&from=historypush')
+            //location.replace('/jyapp/wxkeyset/keyset/filterset?type=add&index=0&from=historypush')
           } else if (r.a_key && r.a_key.length >= _this.conf.maxKeyTip) {
             _this.footerReminderShow = true
           } else {
@@ -360,15 +364,16 @@ var keySet = new Vue({
     },
     // 去关键词详情
     toSetKeyDetail: function (type, index) {
-      if (index === -1) {
-        index = this.keyList.length
-      }
+      	this.tipsType = true
+      //if (index === -1) {
+      //  index = this.keyList.length
+      //}
       // if (!this.userNewType) {
       //   this.tipsType = true
       // } else {
       //   location.href = '/jyapp/wxkeyset/keyset/filterset?type=' + type + '&index=' + index
       // }
-      location.href = '/jyapp/wxkeyset/keyset/filterset?type=' + type + '&index=' + index
+      //location.href = '/jyapp/wxkeyset/keyset/filterset?type=' + type + '&index=' + index
     },
     // 调整底部按钮距离
     adjustAddButtonPadding: function () {

src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -1987,8 +1987,8 @@ function hasNoData() {
                     if(myInfo.userType=="vip") {
                         window.location.href = '/jyapp/vipsubscribe/toSetKeyWordPage'
                     } else {
-                        window.location.href = '/jyapp/vipsubscribe/toSetKeyWordPage'
-                        // window.location.href = '/jyapp/wxkeyset/keyset/filterset?type=add&index=0&from=historypush';
+                        //window.location.href = '/jyapp/vipsubscribe/toSetKeyWordPage'
+                        window.location.href = '/jyapp/vipsubscribe/toSubVipSetPage';
                     }
                 }
             }
@@ -2003,8 +2003,8 @@ function hasNoData() {
                 if(myInfo.userType=="vip") {
                     window.location.href = '/jyapp/vipsubscribe/toSetKeyWordPage'
                 } else {
-                    window.location.href = '/jyapp/vipsubscribe/toSetKeyWordPage'
-                    // window.location.href = '/jyapp/wxkeyset/keyset/filterset?type=add&index=0&from=historypush';
+                    //window.location.href = '/jyapp/vipsubscribe/toSetKeyWordPage'
+                    window.location.href = '/jyapp/vipsubscribe/toSubVipSetPage';
                 }
             }
         }

src/jfw/modules/app/src/web/templates/weixin/wxkeyset/index.html

@@ -101,14 +101,14 @@
     </div>
     <script>
         // 双11活动文案修改
-        $.get('/jyactive/doubleEleven/isActiving?t=' + new Date().getTime(), function (r) {
-            if (r && r.data) {
-                if (r.data.isActiving) {
-                    $('*[data-name="doubleEleven_title"]').text('买超级订阅，买多久送多久！')
-                    $('*[data-name="doubleEleven_button"]').text('去抢')
-                }
-            }
-        })
+        //$.get('/jyactive/doubleEleven/isActiving?t=' + new Date().getTime(), function (r) {
+        //    if (r && r.data) {
+        //        if (r.data.isActiving) {
+        //            $('*[data-name="doubleEleven_title"]').text('买超级订阅，买多久送多久！')
+        //            $('*[data-name="doubleEleven_button"]').text('去抢')
+        //        }
+        //    }
+        //})
     </script>
 
 

src/web/staticres/vipsubscribe/js/keyset-list.js

@@ -15,6 +15,11 @@
    *
    *  参考: https://www.cnblogs.com/mr-wuxiansheng/p/6296646.html
    */
+
+/*
+	*dev4.7.7
+	*老用户无论有没有设置关键词，进入index设置页面 弹窗立显，点击修改和添加关键词 弹窗弹出。
+*/
 Date.prototype.pattern = function (fmt) {
   var o = {
     'y+': this.getFullYear(),
@@ -191,7 +196,7 @@ var keySet = new Vue({
           // 如果没有设置关键词，清除历史记录，直接跳转到去设置关键词
           // 关键词超过 maxKeyLength 个显示底部框
           if (r.a_key && r.a_key.length === 0) {
-            location.replace('/wxkeyset/keyset/filterset?type=add&index=0&from=historypush')
+            //location.replace('/wxkeyset/keyset/filterset?type=add&index=0&from=historypush')
           } else if (r.a_key && r.a_key.length >= _this.conf.maxKeyTip) {
             _this.footerReminderShow = true
           } else {
@@ -358,15 +363,16 @@ var keySet = new Vue({
     },
     // 去关键词详情
     toSetKeyDetail: function (type, index) {
-      if (index === -1) {
-        index = this.keyList.length
-      }
+    	this.tipsType = true
+      //if (index === -1) {
+      //  index = this.keyList.length
+      //}
       // if (!this.userNewType) {
       //   this.tipsType = true
       // } else {
       //   location.href = '/wxkeyset/keyset/filterset?type=' + type + '&index=' + index
       // }
-      location.href = '/wxkeyset/keyset/filterset?type=' + type + '&index=' + index
+      //location.href = '/wxkeyset/keyset/filterset?type=' + type + '&index=' + index
     },
     // 调整底部按钮距离
     adjustAddButtonPadding: function () {

src/web/templates/weixin/historypush.html

@@ -2038,11 +2038,11 @@
     // 免费用户关键词页面
     function tokeysetForFree () {
         setSessionStorage();
-        if (haskey) {
+        //if (haskey) {
             window.location.href = '/wxkeyset/keyset/index';
-        } else {
-            window.location.href = '/wxkeyset/keyset/filterset?type=add&index=0&from=historypush';
-        }
+        //} else {
+        //    window.location.href = '/wxkeyset/keyset/filterset?type=add&index=0&from=historypush';
+        //}
     }
 
      // 清除超级订阅购买、续费、升级页面相关的优惠券、商品规格缓存

src/web/templates/weixin/wxkeyset/index.html

@@ -164,14 +164,14 @@
     </div>
     <script>
         // 双11活动文案修改
-        $.get('/jyactive/doubleEleven/isActiving?t=' + new Date().getTime(), function (r) {
-            if (r && r.data) {
-                if (r.data.isActiving) {
-                    $('*[data-name="doubleEleven_title"]').text('买超级订阅，买多久送多久！')
-                    $('*[data-name="doubleEleven_button"]').text('去抢')
-                }
-            }
-        })
+        //$.get('/jyactive/doubleEleven/isActiving?t=' + new Date().getTime(), function (r) {
+        //    if (r && r.data) {
+        //        if (r.data.isActiving) {
+        //            $('*[data-name="doubleEleven_title"]').text('买超级订阅，买多久送多久！')
+        //            $('*[data-name="doubleEleven_button"]').text('去抢')
+        //        }
+        //    }
+        //})
     </script>
     <script src="https://cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js"></script>
     <script src="{{Msg "seo" "cdn"}}/js/swiper.min.js"></script>