Merge branch 'dev4.5.5' of http://127.0.0.1:8080/qmx/jy into dev4.5.5

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/keyWord.css

@@ -87,7 +87,7 @@
   justify-content: center;
   margin-top: .28rem;
   padding: .16rem .48rem;
-  width: 3.2rem;
+  min-width: 3.2rem;
   height: 0.8rem;
   font-size: .32rem;
   line-height: .48rem;

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/vip_introduce.css

@@ -168,6 +168,9 @@ html,body {
   background-color: #1B1A2A;
   background-size: 100% 100%;
 }
+.jy-alert .weui-dialog {
+  left: .72rem;
+}
 
 .main .group {
   position: relative;

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

@@ -81,7 +81,11 @@ function resultCount() {
         $('.result_count').html('全部行业');
         result = [];
         if (buyCount != -1) {
-            $('.update_tips').show();
+            if(getParam('subvip') ==  'free') {
+              $('.update_tips').hide();
+            } else {
+              $('.update_tips').show();
+            }
         } else {
             $('.update_tips').hide();
         }
@@ -98,7 +102,11 @@ function resultCount() {
             }
         })
         if (count > buyCount && buyCount != -1) {
+          if(getParam('subvip') ==  'free') {
+            $('.update_tips').hide();
+          }else {
             $('.update_tips').show();
+          }
         } else {
             $('.update_tips').hide();
         }

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

@@ -106,6 +106,14 @@ var vm = new Vue({
       }
       return arr.join('&')
     },
+    scrollTo: function (scrollTop, animate) {
+      var jMain = this.$refs.jMain
+      if (animate) {
+        $(jMain).animate({ scrollTop: scrollTop }, 300)
+      } else {
+        $(jMain).scrollTop(scrollTop)
+      }
+    },
     getKeywordsGroupList: function (needLoading) {
       var _this = this
       if (needLoading)  {
@@ -131,7 +139,7 @@ var vm = new Vue({
 
               if (needLoading && _this.scrollTop != 0) {
                 _this.$nextTick(function () {
-                  $(_this.$refs.jMain).animate({ scrollTop: _this.scrollTop }, 300)
+                  _this.scrollTo(_this.scrollTop)
                   _this.scrollTop = 0
                 })
               }
@@ -230,9 +238,13 @@ var vm = new Vue({
       this.showFilterPicker(false)
     },
     doFilter: function (groupName) {
+      var _this = this
       this.filter.groupName = groupName
       var rList = this.filterKeywordsList(groupName)
       this.filter.keywordsList = rList
+      this.$nextTick(function () {
+        _this.scrollTo(0)
+      })
     },
     // 筛选分类列表
     filterKeywordsList: function (filterName) {
@@ -492,7 +504,9 @@ var vm = new Vue({
     savePageState: function () {
       this.scrollTop = $(this.$refs.jMain).scrollTop()
       var data = {
-        filter: this.filter,
+        filter: {
+          groupName: this.filter.groupName
+        },
         scrollTop: this.scrollTop
       }
       sessionStorage.setItem(this.conf.sessKey, JSON.stringify(data))

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/keyword-info.js

@@ -48,7 +48,7 @@ var vm = new Vue({
   },
   computed: {
     tooLittleTipShow: function () {
-      return this.pInfo.pushCount < 30
+      return this.pInfo.pushCount != 0 && this.pInfo.pushCount < 30 && this.keyInfo.key
     },
     // 监听关键词和匹配方式变化
     needGetRecList: function () {
@@ -505,6 +505,10 @@ var vm = new Vue({
             matchway: this.keyInfo.matchWay
           })
         }
+
+        if (filterArr.length === 0) {
+          filterArr = this.allKeywordsList
+        }
       } else {
         filterArr = this.allKeywordsList
       }

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

@@ -46,7 +46,7 @@
             <div class="module-rec pd">
                 <div class="rec-cells card-radius" v-show="recListState.listAll.length">
                     <div class="rec-header">
-                        <div class="rec-title">相似订阅条件推荐</div>
+                        <div class="rec-title">相似订阅推荐</div>
                         <div class="rec-change" @click="nextPageRec">
                             <van-icon :class="recListState.loading ? 'active' : ''" name="replay"></van-icon>
                             <span class="text">换一批</span>

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

@@ -90,7 +90,7 @@
                 <div class="empty-text">暂无关键词组</div>
                 <button class="add-keyword-button" @click="addKeyWord" :disabled="filter.allKeywordsList.length >= conf.keywordMax">
                     <van-icon name="plus"></van-icon>
-                    <span class="button-text">订阅关键词</span>
+                    <span class="button-text">添加关键词组</span>
                 </button>
                 <div class="keywords-count">
                     关键词添加数量：<span class="highlight-text">${ totalKeywordsCount }</span> / ${ conf.keywordMax }

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

@@ -127,7 +127,7 @@
                     </button>
                 </div>
                 <div class="j-button-group" v-else>
-                    <button class="j-button-confirm" @click="addGroup">新建关键词分类</button>
+                    <button class="j-button-confirm" @click="addGroup">新增关键词分类</button>
                 </div>
             </div>
         </div>

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

@@ -220,6 +220,7 @@
         },
         created () {
           this.getUserInfo()  
+          this.iosBackRefresh()
         },
         methods: {
             getUserInfo: function() {
@@ -245,7 +246,18 @@
                         }
                     })
                 }
-            }
+            },
+            iosBackRefresh: function () {
+                var isPageHide = false;
+                window.addEventListener('pageshow', function () {
+                    if (isPageHide) {
+                        location.reload();
+                    }
+                });
+                window.addEventListener('pagehide', function () {
+                    isPageHide = true;
+                });
+            },
         }
     })
 </script>

src/web/staticres/common-module/vipsubscribe/css/vip-subscribe-set-template.css

@@ -352,7 +352,6 @@
   /* left: .72rem;
   right: .72rem; */
   border-radius: .16rem;
-  left: .72rem;
 }
 
 .jy-alert .weui-dialog__hd .weui-dialog__title {

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

@@ -9,7 +9,7 @@ var subScribeTemplate = `
           <span class="item-label">区域</span>
         </span>
         <span class="item-r">
-          <span class="keywords-text ellipsis">已选：{{info.area}}</span>
+          <span class="keywords-text ellipsis">{{info.area}}</span>
           <span class="iconfont icon-arrow"></span>
         </span>
       </div>
@@ -23,7 +23,7 @@ var subScribeTemplate = `
           <span class="item-label">采购单位行业</span>
         </span>
         <span class="item-r">
-          <span class="keywords-text ellipsis">已选：{{info.industry}}</span>
+          <span class="keywords-text ellipsis">{{info.industry}}</span>
           <span class="iconfont icon-arrow"></span>
         </span>
       </div>
@@ -212,7 +212,7 @@ var subComponent = {
       let _this = this
       if(this.initdata.area) {
         if(JSON.stringify(this.initdata.area) == '{}') {
-          this.info.area = '全国'
+          this.info.area = '已选：全国'
         } else {
           let proStr = ''
           Object.keys(this.initdata.area).forEach(function(item,index) {
@@ -234,7 +234,7 @@ var subComponent = {
           if(proStr[proStr.length - 1] == '、') {
             proStr = proStr.substr(0,proStr.length - 1);
           }
-          _this.info.area = proStr
+          _this.info.area = '已选：' + proStr
         }
       } else {
         this.info.area = '请选择区域'
@@ -245,9 +245,9 @@ var subComponent = {
       let _this = this
       if(this.initdata.industry) {
         if(this.initdata.industry.length == 0) {
-          this.info.industry = '全部行业'
+          this.info.industry = '已选：全部行业'
         } else {
-          this.info.industry = this.initdata.industry.join('、')
+          this.info.industry = '已选：' + this.initdata.industry.join('、')
         }
       } else {
         this.info.industry = '请选择采购单位行业'
@@ -283,7 +283,7 @@ var subComponent = {
             this.info.infoType = this.initdata.infotype.join('、')
           }
         } else {
-          this.info.infoType = '请选择信息类型'
+          this.info.infoType = '全部类型'
         }
       }
     },
@@ -392,12 +392,14 @@ var subComponent = {
       }
     },
     setMatchway(index) {
+      let _this = this
       $.post("/subscribepay/afterPay/setUserInfo", {pageType: "saveSeniorset", matchtype: index}, function (r) {
           if (r.flag) {
             var subVipState = sessionStorage.getItem('sub_vip_state');
             var reqData = JSON.parse(subVipState);
             reqData.matchway = index;
             sessionStorage.setItem('sub_vip_state', JSON.stringify(reqData))
+            _this.getResultView()
           }
       })
     },

src/web/staticres/vipsubscribe/css/keyWord.css

@@ -87,7 +87,7 @@
   justify-content: center;
   margin-top: .28rem;
   padding: .16rem .48rem;
-  width: 3.2rem;
+  min-width: 3.2rem;
   height: 0.8rem;
   font-size: .32rem;
   line-height: .48rem;

src/web/staticres/vipsubscribe/js/change_industry.js

@@ -81,7 +81,11 @@ function resultCount() {
         $('.result_count').html('全部行业');
         result = [];
         if (buyCount != -1) {
+          if(getParam('subvip') == 'free') {
+            $('.update_tips').hide();
+          } else {
             $('.update_tips').show();
+          }
         } else {
             $('.update_tips').hide();
         }
@@ -98,7 +102,11 @@ function resultCount() {
             }
         })
         if (count > buyCount && buyCount != -1) {
+          if(getParam('subvip') == 'free') {
+            $('.update_tips').hide()
+          } else {
             $('.update_tips').show();
+          }
         } else {
             $('.update_tips').hide();
         }

src/web/staticres/vipsubscribe/js/keyWord.js

@@ -106,6 +106,14 @@ var vm = new Vue({
       }
       return arr.join('&')
     },
+    scrollTo: function (scrollTop, animate) {
+      var jMain = this.$refs.jMain
+      if (animate) {
+        $(jMain).animate({ scrollTop: scrollTop }, 300)
+      } else {
+        $(jMain).scrollTop(scrollTop)
+      }
+    },
     getKeywordsGroupList: function (needLoading) {
       var _this = this
       if (needLoading)  {
@@ -130,7 +138,7 @@ var vm = new Vue({
               _this.filter.allKeywordsList = _this.filterKeywordsList()
               if (needLoading && _this.scrollTop != 0) {
                 _this.$nextTick(function () {
-                  $(_this.$refs.jMain).animate({ scrollTop: _this.scrollTop }, 300)
+                  _this.scrollTo(_this.scrollTop)
                   _this.scrollTop = 0
                 })
               }
@@ -229,9 +237,13 @@ var vm = new Vue({
       this.showFilterPicker(false)
     },
     doFilter: function (groupName) {
+      var _this = this
       this.filter.groupName = groupName
       var rList = this.filterKeywordsList(groupName)
       this.filter.keywordsList = rList
+      this.$nextTick(function () {
+        _this.scrollTo(0)
+      })
     },
     // 筛选分类列表
     filterKeywordsList: function (filterName) {
@@ -491,7 +503,9 @@ var vm = new Vue({
     savePageState: function () {
       this.scrollTop = $(this.$refs.jMain).scrollTop()
       var data = {
-        filter: this.filter,
+        filter: {
+          groupName: this.filter.groupName
+        },
         scrollTop: this.scrollTop
       }
       sessionStorage.setItem(this.conf.sessKey, JSON.stringify(data))

src/web/staticres/vipsubscribe/js/keyword-info.js

@@ -48,7 +48,7 @@ var vm = new Vue({
   },
   computed: {
     tooLittleTipShow: function () {
-      return this.pInfo.pushCount < 30
+      return this.pInfo.pushCount != 0 && this.pInfo.pushCount < 30 && this.keyInfo.key
     },
     // 监听关键词和匹配方式变化
     needGetRecList: function () {
@@ -505,6 +505,10 @@ var vm = new Vue({
             matchway: this.keyInfo.matchWay
           })
         }
+
+        if (filterArr.length === 0) {
+          filterArr = this.allKeywordsList
+        }
       } else {
         filterArr = this.allKeywordsList
       }

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

@@ -458,48 +458,6 @@ $(function () {
         $('.coupon-code-tx').off('click');
     }
 
-    // switch点击切换
-    $('.switch').on('click', function (e) {
-        var $this = $(this);
-        var hasChecked = $this.hasClass('checked');
-
-        if (!hasChecked) {
-            $this.addClass('checked');
-            setprojectmatch(1);
-        } else {
-            $this.removeClass('checked');
-            setprojectmatch(0);
-            weui.toast('项目匹配已关闭', {
-                duration: 1500,
-                className: 'jy-toast',
-                callback: function () {
-                    console.log('close')
-                }
-            });
-        }
-    })
-
-
-    // switch点击切换
-    $('.switch_other').on('click', function (e) {
-        var $this = $(this);
-        var hasChecked = $this.hasClass('checked');
-        if (!hasChecked) {
-            $this.addClass('checked');
-            setotherbuyerclass(1);
-        } else {
-            $this.removeClass('checked');
-            setotherbuyerclass(0);
-            weui.toast('“其它”采购单位已关闭', {
-                duration: 1500,
-                className: 'jy-toast other-buyerclass',
-                callback: function () {
-                    console.log('close')
-                }
-            });
-        }
-    })
-
     var $dialog;
 
     //保存取消提示 module 1 修改 2升级 3续费 4购买
@@ -810,13 +768,6 @@ $(function () {
         }
         $('.body-item.push-setting .push-setting-text').text(pushSettingMap[state.ratemode])
 
-        // 初始化项目匹配
-        if (state.projectmatch) {
-            $('.switch').addClass('checked')
-        } else {
-            $('.switch').removeClass('checked')
-        }
-
         // 初始化“其他"开关
         console.log(state.otherbuyerclass)
         if (state.otherbuyerclass == 1 || state.otherbuyerclass == null) {

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

@@ -44,7 +44,7 @@
                 <div class="module-rec pd">
                     <div class="rec-cells card-radius" v-show="recListState.listAll.length">
                         <div class="rec-header">
-                            <div class="rec-title">相似订阅条件推荐</div>
+                            <div class="rec-title">相似订阅推荐</div>
                             <div class="rec-change" @click="nextPageRec">
                                 <van-icon :class="recListState.loading ? 'active' : ''" name="replay"></van-icon>
                                 <span class="text">换一批</span>

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

@@ -83,7 +83,7 @@
                 <div class="empty-text">暂无关键词组</div>
                 <button class="add-keyword-button" @click="addKeyWord" :disabled="filter.allKeywordsList.length >= conf.keywordMax">
                     <van-icon name="plus"></van-icon>
-                    <span class="button-text">订阅关键词</span>
+                    <span class="button-text">添加关键词组</span>
                 </button>
                 <div class="keywords-count">
                     关键词添加数量：<span class="highlight-text">${ totalKeywordsCount }</span> / ${ conf.keywordMax }
@@ -107,7 +107,7 @@
             </div>
             <div class="j-button-group" v-else>
                 <button class="j-button-confirm" @click="addKeyWord" :disabled="filter.allKeywordsList.length >= conf.keywordMax">
-                    <span class="info-text">新增关键词</span>
+                    <span class="info-text">新增关键词组</span>
                     <span class="sub-text">（${ totalKeywordsCount } / ${ conf.keywordMax }）</span>
                 </button>
             </div>

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

@@ -125,7 +125,7 @@
                     </button>
                 </div>
                 <div class="j-button-group" v-else>
-                    <button class="j-button-confirm" @click="addGroup">新建关键词分类</button>
+                    <button class="j-button-confirm" @click="addGroup">新增关键词分类</button>
                 </div>
             </div>
         </div>

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

@@ -215,7 +215,8 @@
                 }
             },
             created () {
-              this.getUserInfo()  
+              this.getUserInfo()
+              this.iosBackRefresh()
             },
             methods: {
                 getUserInfo: function() {
@@ -251,7 +252,18 @@
                     reg = null;
                     r = null;
                     return context == null || context == "" || context == "undefined" ? "" : context;
-                }
+                },
+                iosBackRefresh: function () {
+                    var isPageHide = false;
+                    window.addEventListener('pageshow', function () {
+                        if (isPageHide) {
+                            location.reload();
+                        }
+                    });
+                    window.addEventListener('pagehide', function () {
+                        isPageHide = true;
+                    });
+                },
             }
         })
     </script>