Ver Fonte

订阅设置组件封装

TANGSHIZHE há 4 anos atrás
pai
commit
5a4ee98d7d

+ 6 - 1
src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/push_settings.js

@@ -221,9 +221,14 @@ var pushDetailSettingConf = {
             },
             },
             {
             {
                 value: 2,
                 value: 2,
-                title: '每日推送',
+                title: '每日推送 1 次',
                 label: '上午9点推送一次信息'
                 label: '上午9点推送一次信息'
             },
             },
+            {
+                value: 5,
+                title: '每日推送 2 次',
+                label: '上午9点推送一次信息,下午2点推送一次信息'
+            },
             {
             {
                 value: 3,
                 value: 3,
                 title: '每周推送',
                 title: '每周推送',

+ 2 - 2
src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/vip_index_new.css

@@ -130,11 +130,11 @@
   box-sizing:border-box;
   box-sizing:border-box;
 }
 }
 .vip-upgrade .vip-body .body-item:last-child{
 .vip-upgrade .vip-body .body-item:last-child{
-  display: none;
+  /* display: none; */
 }
 }
 .sub-box{
 .sub-box{
   background: url(../image/vip-index-bg.png) no-repeat center top #fff;
   background: url(../image/vip-index-bg.png) no-repeat center top #fff;
-  background-size: 100% 5.42rem;
+  background-size: 100% 3rem;
   padding-top: 21.33333vw;
   padding-top: 21.33333vw;
 }
 }
 .sub-info{
 .sub-info{

BIN
src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/image/export.png


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

@@ -40,6 +40,7 @@ function initData() {
     /* 已购买过的行业 */
     /* 已购买过的行业 */
     if (buyCount == -1) {
     if (buyCount == -1) {
         $('.result_name').html('全部行业')
         $('.result_name').html('全部行业')
+        $('.alr_purchase').hide()
     } else {
     } else {
         $('.result_name').html(buyCount + '个行业')
         $('.result_name').html(buyCount + '个行业')
     }
     }
@@ -190,7 +191,6 @@ $(function () {
 
 
   // 控制提示框
   // 控制提示框
   function showNeedPopver (show, e) {
   function showNeedPopver (show, e) {
-    console.log(e)
     if (show) {
     if (show) {
       var nowStr = getNeedPopverTip($(e.target).text())
       var nowStr = getNeedPopverTip($(e.target).text())
       if (nowStr !== '') {
       if (nowStr !== '') {

+ 19 - 0
src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_index_new.js

@@ -1,3 +1,22 @@
+var subNode = new Vue({
+    delimiters: ['${', '}'],
+    el: '#vip-body',
+    components: {
+        subComponent: subComponent
+    },
+    data: function() {
+        return {
+            linkObj: {
+                area: '/jyapp/vipsubscribe/toChangeArea?header=save',
+                industry: '/jyapp/vipsubscribe/toChangeIndustry?header=save',
+                keyword: '/jyapp/vipsubscribe/toSetKeyWordPage',
+                infotype: '/jyapp/vipsubscribe/toSetInfoTypePage',
+                resultview: '/jyapp/vipsubscribe/toVIPViewPage',
+                pushsetting: '/jyapp/big/page/push_settings'
+            }
+        }
+    }
+})
 function showGiveStatus (t) {
 function showGiveStatus (t) {
     if (t) {
     if (t) {
         // $(".banner-ad-box").css('display', 'flex')
         // $(".banner-ad-box").css('display', 'flex')

+ 2 - 2
src/jfw/modules/app/src/web/templates/vipsubscribe/change_industry.html

@@ -30,7 +30,7 @@
 <span></span></div>
 <span></span></div>
 <div class="app-layout-content-b">
 <div class="app-layout-content-b">
     <main class="choose_industry main">
     <main class="choose_industry main">
-        <div class="result">
+        <div class="result alr_purchase">
             <span class="label">已购买 </span>
             <span class="label">已购买 </span>
             <span class="result_name">全部行业</span>
             <span class="result_name">全部行业</span>
         </div>
         </div>
@@ -286,7 +286,7 @@
                   <a href="javascript:" class="weui-dialog__btn weui-dialog__btn_primary know">我知道了</a>
                   <a href="javascript:" class="weui-dialog__btn weui-dialog__btn_primary know">我知道了</a>
               </div>
               </div>
             </div>
             </div>
-          </div>
+        </div>
     </main>
     </main>
     <script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
     <script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
     <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js"></script>
     <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js"></script>

+ 37 - 7
src/jfw/modules/app/src/web/templates/vipsubscribe/vip_index_new.html

@@ -19,6 +19,8 @@
   <link rel="stylesheet" type="text/css"
   <link rel="stylesheet" type="text/css"
     href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/appbutton.css?v={{Msg "seo" "version"}}' />
     href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/appbutton.css?v={{Msg "seo" "version"}}' />
   <link rel="stylesheet" type="text/css"
   <link rel="stylesheet" type="text/css"
+    href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/vipsubscribe/css/vip-subscribe-set-template.css?v={{Msg "seo" "version"}}'>
+    <link rel="stylesheet" type="text/css"
     href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/css/vip_index_new.css?v={{Msg "seo" "version"}}'>
     href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/css/vip_index_new.css?v={{Msg "seo" "version"}}'>
   <link rel="stylesheet" type="text/css" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/layout.css' />
   <link rel="stylesheet" type="text/css" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/layout.css' />
   <link rel="stylesheet" type="text/css"
   <link rel="stylesheet" type="text/css"
@@ -78,7 +80,7 @@
     }
     }
 
 
     .sub-info {
     .sub-info {
-      min-height: 4.5rem;
+      min-height: 1.48rem;
     }
     }
 
 
     .banner-ad-box {
     .banner-ad-box {
@@ -155,7 +157,7 @@
       {{else}}
       {{else}}
       <div class="vip-upgrade live-20200707">
       <div class="vip-upgrade live-20200707">
         {{end}}
         {{end}}
-        <ul class="vip-body">
+        <ul class="vip-body" id="vip-body">
           <li class="sub-box">
           <li class="sub-box">
             <a data-href="/jyapp/vipsubscribe/introducePage?type=renew" class="banner-ad-box update"
             <a data-href="/jyapp/vipsubscribe/introducePage?type=renew" class="banner-ad-box update"
               style="display: none">
               style="display: none">
@@ -169,14 +171,13 @@
               </div>
               </div>
             </a>
             </a>
             <ul class="sub-info">
             <ul class="sub-info">
-              <li class="area">
+              <!-- <li class="area">
                 <a class="item-container" href="/jyapp/vipsubscribe/toChangeArea?header=save">
                 <a class="item-container" href="/jyapp/vipsubscribe/toChangeArea?header=save">
                   <div class="item">
                   <div class="item">
                     <span class="item-l">
                     <span class="item-l">
                       <span class="item-label">区域</span>
                       <span class="item-label">区域</span>
                     </span>
                     </span>
                     <span class="item-r">
                     <span class="item-r">
-                      <!-- <span class="tip-need-upgrade tip">需升级</span> -->
                       <span class="iconfont icon-arrow"></span>
                       <span class="iconfont icon-arrow"></span>
                     </span>
                     </span>
                   </div>
                   </div>
@@ -198,7 +199,6 @@
                       <span class="item-label">采购单位行业</span>
                       <span class="item-label">采购单位行业</span>
                     </span>
                     </span>
                     <span class="item-r">
                     <span class="item-r">
-                      <!-- <span class="tip-need-upgrade tip">需升级</span> -->
                       <span class="iconfont icon-arrow"></span>
                       <span class="iconfont icon-arrow"></span>
                     </span>
                     </span>
                   </div>
                   </div>
@@ -212,7 +212,7 @@
                     </span>
                     </span>
                   </div>
                   </div>
                 </a>
                 </a>
-              </li>
+              </li> -->
               <li class="cycle">
               <li class="cycle">
                 <a class="item-container" href="/jyapp/vipsubscribe/vipsubscribe_renew">
                 <a class="item-container" href="/jyapp/vipsubscribe/vipsubscribe_renew">
                   <div class="item">
                   <div class="item">
@@ -238,6 +238,35 @@
               </li>
               </li>
             </ul>
             </ul>
           </li>
           </li>
+          <sub-component :linkobj="linkObj"></sub-component>
+          <!-- <li class="body-item area">
+            <a class="item-container" href="/jyapp/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 industry">
+            <a class="item-container" href="/jyapp/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 keywords">
           <li class="body-item keywords">
             <a class="item-container" href="/jyapp/vipsubscribe/toSetKeyWordPage">
             <a class="item-container" href="/jyapp/vipsubscribe/toSetKeyWordPage">
               <div class="item">
               <div class="item">
@@ -331,7 +360,7 @@
                 </span>
                 </span>
               </div>
               </div>
             </a>
             </a>
-          </li>
+          </li> -->
           <li class="body-item" id="giveTimeBox" style="display: none;margin-top: 0.16rem;">
           <li class="body-item" id="giveTimeBox" style="display: none;margin-top: 0.16rem;">
             <div class="item-container" href="javascript:;">
             <div class="item-container" href="javascript:;">
               <div class="item">
               <div class="item">
@@ -676,6 +705,7 @@
     <script src='https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js'></script>
     <script src='https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js'></script>
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js'></script>
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js'></script>
     <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js> </script>
     <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js> </script>
+    <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/vipsubscribe/js/vip-subscribe-set-template.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}'></script>
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}'></script>
     <!--<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/check-bind-phone.js?v={{Msg "seo" "version"}}'></script>-->
     <!--<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/check-bind-phone.js?v={{Msg "seo" "version"}}'></script>-->

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

@@ -0,0 +1,140 @@
+.vip-body {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  overflow-y: scroll;
+  padding-bottom: 0.32rem;
+  overflow-x: hidden
+}
+
+.vip-body .body-item {
+  padding: 0.3rem 0.32rem;
+  position: relative;
+}
+.vip-body .body-item::after{
+  content: "";
+  position: absolute;
+  left: .6rem;
+  right: 0;
+  bottom: 0;
+  width: 100%;
+  -webkit-transform: scaleY(0.5);
+  transform: scaleY(0.5);
+  border-bottom: solid 1px rgba(0, 0, 0, 0.05);
+  box-sizing:border-box;
+}
+.vip-body .body-item:last-child{
+  /* display: none; */
+}
+
+.vip-body .vertical-center {
+  display: flex;
+  align-items: center;
+}
+
+.vip-body .body-item {
+  background-color: #fff;
+  /* border-bottom: 1px solid #cecece; */
+}
+.vip-body .tip {
+  display: none;
+  /* margin-right: .34rem; */
+  color: #FB483D;
+  font-size: .24rem;
+  line-height: .36rem;
+}
+.vip-body .item-container {
+  display: block;
+}
+
+.vip-body .body-item .item,
+.vip-body .body-item .sub-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  color: #686868;
+  font-size: 0.28rem;
+}
+
+.vip-body .body-item .item .item-l,
+.vip-body .body-item .item .item-r,
+.vip-body .body-item .sub-item .item-l,
+.vip-body .body-item .sub-item .item-r {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  flex-wrap: nowrap;
+}
+
+.vip-body .body-item .item .text,
+.vip-body .body-item .sub-item .text {
+  font-size: 0.26rem;
+}
+
+.vip-body .body-item .item .item-l {
+  font-size: 0.32rem;
+  color: #1d1d1d;
+  white-space: nowrap;
+}
+
+.vip-body .body-item .item .item-r {
+  width: 70%;
+}
+
+.vip-body .body-item .item .leading {
+  margin-right: 0.24rem;
+  width: 0.48rem;
+  height: 0.48rem;
+}
+
+.vip-body .body-item .item .iconfont {
+  margin-left: 0.12rem;
+  color: #C0C4CC;
+  font-size: 0.28rem;
+}
+
+.vip-body .body-item .sub-item {
+  justify-content: flex-start;
+}
+
+.vip-body .body-item .sub-item .sub-r {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.vip-body .area,
+.vip-body .industry,
+.vip-body .cycle {
+  padding: 0.16rem 0;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.04);
+}
+
+.vip-body .cycle {
+  /* margin: 0; */
+  border: 0;
+}
+
+.vip-body .keywords-text,.vip-body .info-type-text {
+  color: #9B9CA3;
+}
+.vip-body .info-type,.vip-body .other{
+  box-shadow:  0px 8px 0px #F5F6F7;
+}
+
+.vip-body .project-match {
+  margin-top: 0.16rem;
+  padding-top: 0.2rem !important;
+  padding-bottom: 0.2rem !important;
+  height: 1.1rem;
+}
+
+.vip-body .project-match .item-l .icon-bangzhu {
+  color: #2cb7ca;
+  font-size: 0.36rem;
+}
+
+.vip-body .project-match .item-r {
+  width: 60% !important;
+}

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

@@ -0,0 +1,143 @@
+var subScribeTemplate = `
+<ul>
+  <li class="body-item area">
+    <a class="item-container" :href="linkobj.area">
+      <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 industry">
+    <a class="item-container" :href="linkobj.industry">
+      <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 keywords">
+    <a class="item-container" :href="linkobj.keyword">
+      <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="linkobj.infotype">
+      <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 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 resultpreview">
+      <a class="item-container" :href="linkobj.resultview">
+        <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 resultpreview">
+      <a class="item-container" href="linkobj.pushsetting">
+        <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>
+  </ul>
+`
+
+var subComponent = {
+  name: 'vip-subscribe-set-template',
+  template: subScribeTemplate,
+  props: {
+    'linkobj': {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }
+  },
+  data: function() {
+    return {}
+  },
+  methods: {
+    
+  },
+}

+ 6 - 1
src/web/staticres/me/js/push_setting.js

@@ -211,9 +211,14 @@ var pushDetailSettingConf = {
             },
             },
             {
             {
                 value: 2,
                 value: 2,
-                title: '每日推送',
+                title: '每日推送 1 次',
                 label: '上午9点推送一次信息'
                 label: '上午9点推送一次信息'
             },
             },
+            {
+                value: 5,
+                title: '每日推送 2 次',
+                label: '上午9点推送一次信息,下午2点推送一次信息'
+            },
             {
             {
                 value: 3,
                 value: 3,
                 title: '每周推送',
                 title: '每周推送',

+ 37 - 0
src/web/staticres/vipsubscribe/css/change_industry.css

@@ -610,6 +610,43 @@
   background-color: #fff;
   background-color: #fff;
 }
 }
 
 
+#match_dialog .weui-dialog{
+  border-radius: 8px;
+  max-width: 6rem;
+  /* left: .72rem; */
+  /* right: .72rem; */
+}
+#match_dialog .weui-dialog__hd{
+  padding: .48rem 0 0.16rem;
+  color: #171826;
+  font-size: .36rem;
+  line-height: .52rem;
+}
+#match_dialog .weui-dialog__bd{
+  padding-bottom: .48rem;
+  margin: 0;
+  color: #5F5E64;
+  font-size: .3rem;
+  text-align: justify;
+}
+#match_dialog .weui-dialog__bd .match_notice{
+  display: block;
+  font-size: .26rem;
+  color: #9B9CA3;
+  margin-top: .36rem;
+}
+#match_dialog .weui-dialog__ft{
+  line-height: .92rem;
+  min-height: 0;
+}
+#match_dialog .weui-dialog__btn{
+  color: #2ABED1;
+  font-size: .36rem;
+  font-weight: 500;
+}
+#match_dialog .weui-dialog__btn:active {
+  background-color: #fff;
+}
 
 
 /* 添加行业弹窗 */
 /* 添加行业弹窗 */
 
 

+ 7 - 1
src/web/staticres/vipsubscribe/js/change_industry.js

@@ -40,6 +40,7 @@ function initData() {
     /* 已购买过的行业 */
     /* 已购买过的行业 */
     if (buyCount == -1) {
     if (buyCount == -1) {
         $('.result_name').html('全部行业')
         $('.result_name').html('全部行业')
+        $('.alr_purchase').hide()
     } else {
     } else {
         $('.result_name').html(buyCount + '个行业')
         $('.result_name').html(buyCount + '个行业')
     }
     }
@@ -109,8 +110,14 @@ $(function () {
       e.stopPropagation();
       e.stopPropagation();
       $('#js_dialog').show()
       $('#js_dialog').show()
     });
     });
+    // 匹配未分类行业提示框
+    $('#matchTips').click(function (e) {
+        e.stopPropagation();
+        $('#match_dialog').show()
+    });
     $('.know').click(function () {
     $('.know').click(function () {
       $('#js_dialog').hide()
       $('#js_dialog').hide()
+      $('#match_dialog').hide()
     })
     })
     // 点击导航跳转
     // 点击导航跳转
     $("body").on('click', '.slide a', function () {
     $("body").on('click', '.slide a', function () {
@@ -181,7 +188,6 @@ $(function () {
 
 
   // 控制提示框
   // 控制提示框
   function showNeedPopver (show, e) {
   function showNeedPopver (show, e) {
-    console.log(e)
     if (show) {
     if (show) {
       var nowStr = getNeedPopverTip($(e.target).text())
       var nowStr = getNeedPopverTip($(e.target).text())
       if (nowStr !== '') {
       if (nowStr !== '') {

+ 19 - 0
src/web/staticres/vipsubscribe/js/vip_index_new.js

@@ -1,3 +1,22 @@
+var subNode = new Vue({
+    delimiters: ['${', '}'],
+    el: '#vip-body',
+    components: {
+        subComponent: subComponent
+    },
+    data: function() {
+        return {
+            linkObj: {
+                area: '/front/vipsubscribe/toChangeArea?header=save',
+                industry: '/front/vipsubscribe/toChangeIndustry?header=save',
+                keyword: '/front/vipsubscribe/toSetKeyWordPage',
+                infotype: '/front/vipsubscribe/toSetInfoTypePage',
+                resultview: '/front/vipsubscribe/toVIPViewPage',
+                pushsetting: '/front/vipsubscribe/toSetPushSetPage'
+            }
+        }
+    }
+})
 function showGiveStatus (t) {
 function showGiveStatus (t) {
     if (t) {
     if (t) {
       $(".banner-ad-box").hide()
       $(".banner-ad-box").hide()

+ 20 - 3
src/web/templates/weixin/vipsubscribe/change_industry.html

@@ -23,12 +23,12 @@
 
 
 <body>
 <body>
 <main class="choose_industry main">
 <main class="choose_industry main">
-    <div class="result">
-        <span class="label">采购单位行业:</span>
+    <div class="result alr_purchase">
+        <span class="label">已购买 &nbsp;</span>
         <span class="result_name">全部行业</span>
         <span class="result_name">全部行业</span>
     </div>
     </div>
     <div class="result">
     <div class="result">
-        <span class="label">已选择</span>
+        <span class="label">已选择 &nbsp;</span>
         <span class="result_count"></span>
         <span class="result_count"></span>
         <p class="update_tips">已超出现订单购买范围,需升级</p>
         <p class="update_tips">已超出现订单购买范围,需升级</p>
     </div>
     </div>
@@ -59,6 +59,10 @@
                     <!-- <div class="item_label"></div> -->
                     <!-- <div class="item_label"></div> -->
                     <div class="item_industry_list">
                     <div class="item_industry_list">
                         <button class="industry_item whole">全部行业</button>
                         <button class="industry_item whole">全部行业</button>
+                        <button class="industry_item">匹配未分类行业</button>
+                        <span class="wenhao">
+                            <i id="matchTips" class="iconfont icon-wenhao show_tips"></i>
+                        </span>
                     </div>
                     </div>
                 </li>
                 </li>
                 <li class="list_item" id="C">
                 <li class="list_item" id="C">
@@ -268,6 +272,19 @@
         </div>
         </div>
       </div>
       </div>
     </div>
     </div>
+    <div class="js_dialog custom-dialog" id="match_dialog" style="opacity: 1;display: none;">
+        <div class="weui-mask"></div>
+        <div class="weui-dialog">
+          <div class="weui-dialog__hd">匹配未分类行业</div>
+          <div class="weui-dialog__bd">
+              <span>每条信息的采购单位行业属性由机器自动识别,会存在少数无法识别进行分类的情况。</span><br/>
+              <span class="match_notice">注:选择全部行业时,未分类行业默认被选中,关闭无效</span>
+          </div>
+          <div class="weui-dialog__ft">
+              <a href="javascript:" class="weui-dialog__btn weui-dialog__btn_primary know">我知道了</a>
+          </div>
+        </div>
+      </div>
 </main>
 </main>
 <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>

+ 10 - 7
src/web/templates/weixin/vipsubscribe/vip_index_new.html

@@ -17,6 +17,7 @@
     <link rel="stylesheet" href="/css/wxbutton.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="/css/wxbutton.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="/vipsubscribe/css/vip_index_new.css?v={{Msg "seo" "version"}}1">
     <link rel="stylesheet" href="/vipsubscribe/css/vip_index_new.css?v={{Msg "seo" "version"}}1">
     <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/common-module/coupon/css/pay-order-template.css?v={{Msg "seo" "version"}}' />
     <link rel="stylesheet" href='{{Msg "seo" "cdn"}}/common-module/coupon/css/pay-order-template.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"}}' />
     <style>
     <style>
         .jy-switch:before {
         .jy-switch:before {
             background-color: #fbfbfb;
             background-color: #fbfbfb;
@@ -103,7 +104,7 @@
         </div> -->
         </div> -->
       </div>
       </div>
     </div>
     </div>
-    <ul class="vip-body">
+    <ul class="vip-body" id="vip-body">
         <li class="sub-box">
         <li class="sub-box">
             <a data-href="/front/vipsubscribe/introducePage?type=renew" class="banner-ad-box update" style="display: none">
             <a data-href="/front/vipsubscribe/introducePage?type=renew" class="banner-ad-box update" style="display: none">
                 <span>限时续费,3个月起,续多久送多久!</span>
                 <span>限时续费,3个月起,续多久送多久!</span>
@@ -116,14 +117,14 @@
             </div>
             </div>
           </a>
           </a>
           <ul class="sub-info">
           <ul class="sub-info">
-            <li class="area">
+            <!-- <li class="area">
               <a class="item-container" href="/front/vipsubscribe/toChangeArea?header=save">
               <a class="item-container" href="/front/vipsubscribe/toChangeArea?header=save">
                   <div class="item">
                   <div class="item">
                       <span class="item-l">
                       <span class="item-l">
                         <span class="item-label">区域</span>
                         <span class="item-label">区域</span>
                       </span>
                       </span>
                       <span class="item-r">
                       <span class="item-r">
-                        <!-- <span class="tip-need-upgrade tip">需升级</span> -->
+                        <span class="tip-need-upgrade tip">需升级</span>
                         <span class="iconfont icon-arrow"></span>
                         <span class="iconfont icon-arrow"></span>
                       </span>
                       </span>
                   </div>
                   </div>
@@ -145,7 +146,7 @@
                           <span class="item-label">采购单位行业</span>
                           <span class="item-label">采购单位行业</span>
                         </span>
                         </span>
                         <span class="item-r">
                         <span class="item-r">
-                          <!-- <span class="tip-need-upgrade tip">需升级</span> -->
+                          <span class="tip-need-upgrade tip">需升级</span>
                           <span class="iconfont icon-arrow"></span>
                           <span class="iconfont icon-arrow"></span>
                         </span>
                         </span>
                     </div>
                     </div>
@@ -159,7 +160,7 @@
                         </span>
                         </span>
                     </div>
                     </div>
                 </a>
                 </a>
-            </li>
+            </li> -->
             <li class="cycle">
             <li class="cycle">
                 <a class="item-container" href="/front/vipsubscribe/vipsubscribe_renew">
                 <a class="item-container" href="/front/vipsubscribe/vipsubscribe_renew">
                     <div class="item">
                     <div class="item">
@@ -185,7 +186,8 @@
             </li>
             </li>
           </ul>
           </ul>
         </li>
         </li>
-        <li class="body-item keywords">
+        <sub-component :linkobj="linkObj"></sub-component>
+        <!-- <li class="body-item keywords">
             <a class="item-container" href="/front/vipsubscribe/toSetKeyWordPage">
             <a class="item-container" href="/front/vipsubscribe/toSetKeyWordPage">
                 <div class="item">
                 <div class="item">
                         <span class="item-l">
                         <span class="item-l">
@@ -292,7 +294,7 @@
                         </span>
                         </span>
                     </div>
                     </div>
                 </a>
                 </a>
-            </li>
+            </li> -->
                     <li class="body-item" id="giveTimeBox" style="display: none;margin-top: 0.16rem;">
                     <li class="body-item" id="giveTimeBox" style="display: none;margin-top: 0.16rem;">
             <div class="item-container" href="javascript:;">
             <div class="item-container" href="javascript:;">
                 <div class="item">
                 <div class="item">
@@ -682,6 +684,7 @@
 <!--<script src='{{Msg "seo" "cdn"}}/js/check-bind-phone.js?v={{Msg "seo" "version"}}'></script>-->
 <!--<script src='{{Msg "seo" "cdn"}}/js/check-bind-phone.js?v={{Msg "seo" "version"}}'></script>-->
 <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/coupon/js/pay-order-template.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/coupon/js/pay-order-template.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/common-module/vipsubscribe/js/vip-subscribe-set-template.js?v={{Msg "seo" "version"}}'></script>
 {{include "/common/weixin.html"}}
 {{include "/common/weixin.html"}}
 <script>
 <script>
     $(window).bind("pageshow", function (event) {
     $(window).bind("pageshow", function (event) {