订阅设置组件修改

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

@@ -981,7 +981,7 @@ function hasNoData() {
     }
     if(!NoDataShow) {
         if(!myInfo.haskey){
-            // $('.findnull-no-key').css("display", "block").siblings('.empty').hide()
+            $('.findnull-no-key').css("display", "block").siblings('.empty').hide()
         } else {
             $(".findnull_").css("display", "block").siblings('.empty').hide()
         }
@@ -1407,10 +1407,14 @@ function hasNoData() {
     if (isInTSguide) {
         window.location.href = '/jyapp/wxkeyset/keyset/index';
     } else {
-        if (myInfo.haskey) {
-            window.location.href = '/jyapp/wxkeyset/keyset/index';
+        if(myInfo.userType == 'vip') {
+            window.location.href = '/jyapp/vipsubscribe/toSetKeyWordPage'
         } else {
-            window.location.href = '/jyapp/wxkeyset/keyset/filterset?type=add&index=0&from=historypush';
+            if (myInfo.haskey) {
+                window.location.href = '/jyapp/wxkeyset/keyset/index';
+            } else {
+                window.location.href = '/jyapp/wxkeyset/keyset/filterset?type=add&index=0&from=historypush';
+            }
         }
     }
   }

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

@@ -51,7 +51,7 @@ var subScribeTemplate = `
           <span class="item-label" style="white-space: nowrap;">关键词匹配方式</span>
         </span>
         <span class="item-r">
-          <span class="keywords-text ellipsis match-way-value">{{info.defaultVal}}</span>
+          <span class="keywords-text ellipsis match-way-value"></span>
           <span class="iconfont icon-arrow"></span>
         </span>
       </div>
@@ -132,10 +132,10 @@ var subScribeTemplate = `
         <i class="weui-icon-clear" id="iosActionsheetCancel" @click="iosActionsheetCancel"></i>
       </div>
       <div class="weui-actionsheet__menu">
-        <div class="weui-actionsheet__cell" :class="{active:active==0}" @click="actionSheet('按标题匹配', 0)">
+        <div class="weui-actionsheet__cell titleMacth" :class="{active:active==1}" @click="actionSheet('按标题匹配', 1)">
           <p class="cell_title">按标题匹配</p>
         </div>
-        <div class="weui-actionsheet__cell" :class="{active:active==1}" @click="actionSheet('按全文匹配', 1)">
+        <div class="weui-actionsheet__cell allMacth" :class="{active:active==2}" @click="actionSheet('按全文匹配', 2)">
           <p class="cell_title">按全文匹配</p>
           <p class="small-title">会产生无效信息，请根据需要选择</p>
         </div>
@@ -176,7 +176,6 @@ var subComponent = {
       info: {
         area: '请选择区域',
         industry: '请选择采购单位行业',
-        defaultVal: '按标题匹配',
         infoType: '请选择信息类型'
       },
       // 匹配方式
@@ -189,6 +188,7 @@ var subComponent = {
   },
   mounted () {
     this.getData()
+    this.getResultView()
   },
   watch: {
     initdata: function(newVal, oldVal) {
@@ -204,7 +204,6 @@ var subComponent = {
       this.setKeyword()
       this.getActionDefault()
       this.getIndustryType()
-      this.getResultView()
       this.getProjectMatch()
     },
     // 设置区域
@@ -334,19 +333,21 @@ var subComponent = {
       let _this = this
       let defaultTitle = ''
       if(!this.initdata.matchWay) {
-        this.initdata.matchWay == 1
+        this.initdata.matchWay = 1
       }
       if(this.initdata.matchWay == 1) {
         defaultTitle = '按标题匹配'
+        this.active = 1
       } else if(this.initdata.matchWay == 2) {
         defaultTitle = '按全文匹配'
+        this.active = 2
       }
-      $('#iosActionsheet .weui-actionsheet__cell').each(function (index, item) {
-        var t = $(item).children().text().trim();
-        if (t == defaultTitle) {
-            $(this).addClass('active')
-        }
-      })
+      // $('#iosActionsheet .weui-actionsheet__cell').each(function (index, item) {
+      //   var t = $(item).children().text().trim();
+      //   if (t == defaultTitle) {
+      //       $(this).addClass('active')
+      //   }
+      // })
     },
     hideActionSheet: function() {
       var $iosMask = $('#iosMask');
@@ -366,42 +367,54 @@ var subComponent = {
       $iosActionsheet.addClass('weui-actionsheet_toggle');
       $iosMask.fadeIn(200);
     },
-    actionSheet: function(title, i) {
-      this.active = i
-      this.info.defaultVal = title
-      var $iosMask = $('#iosMask');
-      var $iosActionsheet = $('#iosActionsheet');
-      $iosActionsheet.removeClass('weui-actionsheet_toggle');
-      $iosMask.fadeOut(200);
-      $('.match-way-value').text(title)
-      var nowMode = title
-      var ModeArr = ['按标题匹配', '按全文匹配']
-      var nowIndex = ModeArr.indexOf(nowMode)
-      if (nowIndex !== -1) {
-          this.setMatchway(ModeArr.indexOf(nowMode) + 1)
-      } else {
-          // $(this).removeClass('active').siblings().addClass('active');
-          $('.match-way-value').text($(this).siblings().children('.cell_title').text())
-          weui.toast('关键词匹配方式修改失败', {
-              duration: 1500,
-              className: 'jy-toast',
-              callback: function () {
-                  console.log('close')
-              }
-          });
-      }
-    },
-    setMatchway(index) {
+    actionSheet: function(title, 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);
+            this.active = index
+            var $iosMask = $('#iosMask');
+            var $iosActionsheet = $('#iosActionsheet');
+            $iosActionsheet.removeClass('weui-actionsheet_toggle');
+            $iosMask.fadeOut(200);
+            $('.match-way-value').text(title)
+            if(index == 1) {
+              $('.titleMacth').addClass('active')
+              $('.allMacth').removeClass('active')
+            } else {
+              $('.titleMacth').removeClass('active')
+              $('.allMacth').addClass('active')
+            }
             reqData.matchway = index;
             sessionStorage.setItem('sub_vip_state', JSON.stringify(reqData))
-            _this.getResultView()
+          } else {
+            weui.toast('关键词匹配方式修改失败', {
+                duration: 1500,
+                className: 'jy-toast',
+                callback: function () {
+                    console.log('close')
+                }
+            });
           }
       })
+      // var nowMode = title
+      // var ModeArr = ['按标题匹配', '按全文匹配']
+      // var nowIndex = ModeArr.indexOf(nowMode)
+      // if (nowIndex !== -1) {
+      //     this.setMatchway(ModeArr.indexOf(nowMode) + 1)
+      // } else {
+      //     // $(this).removeClass('active').siblings().addClass('active');
+      //     $('.match-way-value').text($(this).siblings().children('.cell_title').text())
+      //     weui.toast('关键词匹配方式修改失败', {
+      //         duration: 1500,
+      //         className: 'jy-toast',
+      //         callback: function () {
+      //             console.log('close')
+      //         }
+      //     });
+      // }
+      this.getResultView()
     },
     // 项目匹配问号点击事件
     projectNotice: function () {
@@ -429,6 +442,8 @@ var subComponent = {
           } else {
             if(res.count < 30) {
               _this.littleShow = true
+            } else {
+              _this.littleShow = false
             }
             _this.resultTime = '(近3个月内共' + res.count + '条信息)'
           }

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

@@ -117,50 +117,7 @@
             </div>
           </a>
           <ul class="sub-info">
-            <!-- <li class="area">
-              <a class="item-container" href="/front/vipsubscribe/toChangeArea?header=save">
-                  <div class="item">
-                      <span class="item-l">
-                        <span class="item-label">区域</span>
-                      </span>
-                      <span class="item-r">
-                        <span class="tip-need-upgrade tip">需升级</span>
-                        <span class="iconfont icon-arrow"></span>
-                      </span>
-                  </div>
-                  <div>
-                    <span class="buy-set-area text ellipsis">0个省、0个市(分布在0个省内)</span>
-                  </div>
-                  <div class="sub-item">
-                      <span class="sub-l">已选择：</span>
-                      <span class="sub-r">
-                        <span class="text selected-area">0个省、0个市(分布在0个省内)</span>
-                      </span>
-                  </div>
-              </a>
-            </li>
-            <li class="industry">
-                <a class="item-container" href="/front/vipsubscribe/toChangeIndustry?header=save">
-                    <div class="item">
-                        <span class="item-l">
-                          <span class="item-label">采购单位行业</span>
-                        </span>
-                        <span class="item-r">
-                          <span class="tip-need-upgrade tip">需升级</span>
-                          <span class="iconfont icon-arrow"></span>
-                        </span>
-                    </div>
-                    <div>
-                      <span class="buy-set-industry industry-text ellipsis">0个行业</span>
-                    </div>
-                    <div class="sub-item">
-                        <span class="sub-l">已选择：</span>
-                        <span class="sub-r">
-                          <span class="text selected-industry">0个行业</span>
-                        </span>
-                    </div>
-                </a>
-            </li> -->
+            
             <li class="cycle">
                 <a class="item-container" href="/front/vipsubscribe/vipsubscribe_renew">
                     <div class="item">
@@ -187,114 +144,7 @@
           </ul>
         </li>
         <sub-component :linkobj="linkObj" :initdata="initData"></sub-component>
-        <!-- <li class="body-item keywords">
-            <a class="item-container" href="/front/vipsubscribe/toSetKeyWordPage">
-                <div class="item">
-                        <span class="item-l">
-                            <span class="leading jy-icon-keywords"></span>
-                            <span class="item-label">关键词</span>
-                        </span>
-                    <span class="item-r">
-                            <span class="keywords-text ellipsis">未分类</span>
-                            <span class="iconfont icon-arrow"></span>
-                        </span>
-                </div>
-            </a>
-        </li>
-        <li class="body-item match-way">
-          <a class="item-container" href="javascript:;">
-            <div class="item">
-              <span class="item-l">
-                <span class="leading jy-icon-matchkeywords"></span>
-                <span class="item-label" style="white-space: nowrap;">关键词匹配方式</span>
-              </span>
-              <span class="item-r">
-                <span class="keywords-text ellipsis match-way-value">按标题匹配</span>
-                <span class="iconfont icon-arrow"></span>
-              </span>
-            </div>
-          </a>
-        </li>
-        <li class="body-item info-type">
-            <a class="item-container" href="/front/vipsubscribe/toSetInfoTypePage">
-                <div class="item">
-                        <span class="item-l">
-                            <span class="leading jy-icon-info-type"></span>
-                            <span class="item-label">信息类型</span>
-                        </span>
-                    <span class="item-r">
-                            <span class="info-type-text ellipsis">全部类型</span>
-                            <span class="iconfont icon-arrow"></span>
-                        </span>
-                </div>
-            </a>
-        </li>
-        <li class="body-item push-setting" style="display:none">
-            <a class="item-container" href="/front/vipsubscribe/toSetPushSetPage">
-                <div class="item">
-                        <span class="item-l">
-                            <span class="leading jy-icon-push-setting"></span>
-                            <span class="item-label">推送设置</span>
-                        </span>
-                    <span class="item-r">
-                            <span class="push-setting-text ellipsis">实时推送</span>
-                            <span class="iconfont icon-arrow"></span>
-                        </span>
-                </div>
-            </a>
-        </li>
-        <li class="body-item project-match">
-            <a class="item-container" href="javascript:;">
-                <div class="item">
-                        <span class="item-l">
-                            <span class="leading jy-icon-project-match"></span>
-                            <span class="item-label">
-                                <span class="label-text">项目匹配</span>
-                                <i class="iconfont icon-bangzhu"></i>
-                            </span>
-                        </span>
-                    <span class="item-r media_switch">
-                            <div class="weui-cell__ft">
-                                <button class="jy-switch switch checked"></button>
-                            </div>
-                        </span>
-                </div>
-            </a>
-        </li>
-            <li class="body-item other">
-              <a class="item-container" href="javascript:;">
-                    <div class="item">
-                        <span class="item-l">
-                            <span class="leading_ jy-icon-othter-match"></span>
-                            <span class="item-label-other">
-                                <span class="label-text">“其它”采购单位</span>
-                                <i class="iconfont icon-bangzhu"></i>
-                            </span>
-                        </span>
-                        <span class="item-r media_switch">
-                            <div class="weui-cell__ft">
-                                <button class="jy-switch switch_other checked"></button>
-                            </div>
-                        </span>
-                    </div>
-                </a>
-            </li>
-            <li class="body-item resultpreview">
-              <a class="item-container" href="/front/vipsubscribe/toVIPViewPage">
-                    <div class="item">
-                        <span class="item-l">
-                            <span class="leading_ jy-icon-resultpreview-match"></span>
-                            <span class="item-label-other">
-                                <span class="label-text">推送结果预览</span>
-                            </span>
-                        </span>
-                        <span class="item-r media_switch">
-                            <span class="info-type-text ellipsis"></span>
-                            <span class="iconfont icon-arrow"></span>
-                        </span>
-                    </div>
-                </a>
-            </li> -->
+        
                     <li class="body-item" id="giveTimeBox" style="display: none;margin-top: 0.16rem;">
             <div class="item-container" href="javascript:;">
                 <div class="item">
@@ -323,20 +173,7 @@
       </ul>
     </div>
     <div class="vip-header">
-      <!-- <div class="header-renew trail" style="display: none">
-          <div class="renew-l">
-              <div class="vip-logo"></div>
-              <div class="vip-text free7days">超级订阅服务</div>
-          </div>
-          <a href="/front/vipsubscribe/vipsubscribe_new" class="renew-r">去购买</a>
-      </div>
-      <div class="header-renew renew" style="display: none">
-          <div class="renew-l">
-              <div class="vip-logo"></div>
-              <div class="vip-text">超级订阅服务</div>
-          </div>
-          <a href="/front/vipsubscribe/vipsubscribe_renew" class="renew-r">续费</a>
-      </div> -->
+      
       <!-- 到期提醒 -->
       <div class="expire-remind" style="display: none">
             <i class="j-icon icon-chahao red close-expire-remind"></i>
@@ -356,47 +193,7 @@
     <div class="vip-footer upgrade" id="coupon-vue" style="display: none;">
       <pay-order-template ref="couponRef" :config="$data" @update="updateS" @cancel="cancelEvent"></pay-order-template>
     </div>
-    <!-- <div class="vip-footer upgrade">
-        <div class="j-notice-bar bar-red vip-bar">限时6折，现在购买，帮您省<span class="reduce-price">0</span>元</div>
-        <div class="footer-preview-container">
-            <div class="price-preview">
-                <span class="preview-label">价格：</span>
-                <span class="preview-content">
-                        <span class="billing-list-btn"></span>
-                        <div class="billing-list-price">
-                            <span class="billing-mon">￥</span>
-                            <span class="billing-price">366.50</span>
-                        </div>
-                    </span>
-            </div>
-            <div class="origin-price">
-                <span class="discount-button">
-                    <span>优惠明细</span>
-                    <span class="iconfont icon-arrow"></span>
-                </span>
-                <span class="price-label">原价：</span>
-                <div class="price-container">
-                    <span class="currency-type">&yen;</span>
-                    <span class="price-num">5.80</span>
-                </div>
-            </div>
-            <div class="clause-box">
-                <span class="checkbox"></span>
-                <span class="clause-read" style="flex: 1">我已阅读，理解并接受<a href="/front/staticPage/wx-serviceterms.html">《剑鱼标讯线上购买与服务条款》</a></span>
-            </div>
-        </div>
-        <div class="footer-button-group j-button-group">
-            <button class="button-l reset j-button-cancel1">取消</button>
-            <button data-need-bind-phone class="button-r confirm j-button-confirm1" disabled>立即升级</button>
-        </div>
-    </div> -->
-    <!-- 修改 p18取消保存按键-->
-    <!-- <div class="vip-footer modify">
-        <div class="footer-button-group j-button-group">
-            <button class="button-l reset j-button-cancel1">取消</button>
-            <button class="button-r confirm j-button-confirm1">保存修改</button>
-        </div>
-    </div> -->
+    
 </div>
 <!-- 匹配方式 -->
 <div class="match-keywords-actionsheet">
@@ -465,98 +262,7 @@
         <div class="weui-half-screen-dialog__bd valuation_list">
             <div class="va-list-container">
                 <ul class="list-content">
-                    <!--<li class="list-item">
-                        <div class="item-top">
-                            <div class="item-header">
-                                <span class="header-label">有效日期：</span>
-                                <span class="header-content ellipsis">(1个月)2019年12月1日-2019年12月31日</span>
-                            </div>
-                            <div class="item-body">
-                                <div class="b-item body-area">
-                                    <div class="body-area-title text-title">区域</div>
-                                    <div class="body-area-sub">1个省、3个市(分布在2个省内)</div>
-                                </div>
-                                <div class="b-item body-industry">
-                                    <div class="body-industry-title text-title">采购单位行业</div>
-                                    <div class="body-industry-sub">3个行业</div>
-                                </div>
-                                <div class="vp-type">
-                                    <div class="vp-type-text">升级</div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="item-footer">
-                            <span class="footer-label">小计：</span>
-                            <span class="footer-content text-title">￥223.8</span>
-                        </div>
-                    </li>
-                    <li class="list-item">
-                        <div class="item-top">
-                            <div class="item-header">
-                                <span class="header-label">有效日期：</span>
-                                <span class="header-content ellipsis">(1个月)2019年12月1日-2019年12月31日</span>
-                            </div>
-                            <div class="item-body vp-oneline">
-                                <div class="b-item body-area">
-                                    <div class="body-area-title text-title">区域</div>
-                                    <div class="body-area-sub">1个省、3个市(分布在2个省内)</div>
-                                </div>
-                                <div class="vp-type">
-                                    <div class="vp-type-text">续续费</div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="item-footer">
-                            <span class="footer-label">小计：</span>
-                            <span class="footer-content text-title">￥223.8</span>
-                        </div>
-                    </li>
-                    <li class="list-item">
-                        <div class="item-top">
-                            <div class="item-header">
-                                <span class="header-label">有效日期：</span>
-                                <span class="header-content ellipsis">(1个月)2019年12月1日-2019年12月31日</span>
-                            </div>
-                            <div class="item-body">
-                                <div class="b-item body-area">
-                                    <div class="body-area-title text-title">区域</div>
-                                    <div class="body-area-sub">1个省、3个市(分布在2个省内)</div>
-                                </div>
-                                <div class="b-item body-industry">
-                                    <div class="body-industry-title text-title">采购单位行业</div>
-                                    <div class="body-industry-sub">3个行业</div>
-                                </div>
-                                <div class="vp-type">
-                                    <div class="vp-type-text">升级</div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="item-footer">
-                            <span class="footer-label">小计：</span>
-                            <span class="footer-content text-title">￥223.8</span>
-                        </div>
-                    </li>
-                    <li class="list-item">
-                        <div class="item-top">
-                            <div class="item-header">
-                                <span class="header-label">有效日期：</span>
-                                <span class="header-content ellipsis">(1个月)2019年12月1日-2019年12月31日</span>
-                            </div>
-                            <div class="item-body vp-oneline">
-                                <div class="b-item body-industry">
-                                    <div class="body-industry-title text-title">采购单位行业</div>
-                                    <div class="body-industry-sub">3个行业</div>
-                                </div>
-                                <div class="vp-type">
-                                    <div class="vp-type-text">升级</div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="item-footer">
-                            <span class="footer-label">小计：</span>
-                            <span class="footer-content text-title">￥223.8</span>
-                        </div>
-                    </li>-->
+                   
                 </ul>
             </div>
         </div>