Jelajahi Sumber

订阅设置组件封装

TANGSHIZHE 4 tahun lalu
induk
melakukan
430eacf00b
21 mengubah file dengan 609 tambahan dan 435 penghapusan
  1. 17 0
      src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/change_industry.css
  2. 0 147
      src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/vip_index_new.css
  3. 8 3
      src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/vip_introduce.css
  4. TEMPAT SAMPAH
      src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/image/icon-industry.jpg
  5. 14 1
      src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/change_industry.js
  6. 56 158
      src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_index_new.js
  7. 1 1
      src/jfw/modules/app/src/web/templates/vipsubscribe/change_industry.html
  8. 2 2
      src/jfw/modules/app/src/web/templates/vipsubscribe/messageType.html
  9. 1 23
      src/jfw/modules/app/src/web/templates/vipsubscribe/vip_index_new.html
  10. 55 8
      src/jfw/modules/app/src/web/templates/vipsubscribe/vip_introduce.html
  11. 101 4
      src/web/staticres/common-module/vipsubscribe/css/vip-subscribe-set-template.css
  12. 281 14
      src/web/staticres/common-module/vipsubscribe/js/vip-subscribe-set-template.js
  13. 5 6
      src/web/staticres/vipsubscribe/css/vip_index_new.css
  14. 9 3
      src/web/staticres/vipsubscribe/css/vip_introduce.css
  15. TEMPAT SAMPAH
      src/web/staticres/vipsubscribe/image/vip-index-bg.png
  16. 0 0
      src/web/staticres/vipsubscribe/js/vip-index-new-com.js
  17. 4 57
      src/web/staticres/vipsubscribe/js/vip_index_new.js
  18. 1 1
      src/web/templates/weixin/vipsubscribe/change_area.html
  19. 2 2
      src/web/templates/weixin/vipsubscribe/messageType.html
  20. 2 2
      src/web/templates/weixin/vipsubscribe/vip_index_new.html
  21. 50 3
      src/web/templates/weixin/vipsubscribe/vip_introduce.html

+ 17 - 0
src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/change_industry.css

@@ -498,12 +498,29 @@
   border-radius: 4px;
   min-width: 1.56rem;
 }
+.choose_industry .list .list_item .item_industry_list .switch_other {
+  margin: 0 .08rem;
+  margin-bottom: .25rem;
+  padding: 0 .3rem;
+  height: .7rem;
+  line-height: .7rem;
+  font-size: .28rem;
+  color: #1d1d1d;
+  background-color: #F5F6F7;
+  border-radius: 4px;
+  min-width: 1.56rem;
+}
 
 .choose_industry .list .list_item .item_industry_list .industry_item.active {
   color: #2ABED1;
   background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAHGSURBVHgB7da/T8JAFAfw11aRGNTGkKDRoUhMEBc68Adg4u4/YMRVB3Vz09EN/wQGVyNOJiamOjtUnFg0DA4OJOKvQAz2vHdSQklp77Aw+ab27rhPXrl+U4D/CrBSl2ZahiFV0ihtSCOyIcEQasko7UgEjvF64B2mjNKBjWENtEPEgMBh59jAwGXjPk8I2e0eDxzUzkx1XFXyQEjObT5QkGFTskEv073WBAYmL0xNHmOY5rUuEJAXCwQUwf4MYlRhehAAlfc3fb/4dlSJYH2DGFUygYIXtj4fhdPMIiQjYce4AoLViqojrzXbWgz2ErMQDY1C9asJt7XP9pxQh25R5YZtxWPsuvxRh5OnqmOeu0OMKortZ9QIu39vfvtim+YjvHWt8z2lnVGFWEFfYFjOfKCbNoQwLNkXw6hq5SJuhNjEiELhRPtA8GK07np22OuFRgQxRBG/qr7C2sw0D0afJylIIpgbapcvRsuSrLgsiv1u3mD/oX1weDDsrpzVK44ORaNqLhyClegknD+/eGJ0vwqRrKwDxKhS6LeHaFT5VSeG9+yR8kRVXyWRYl2ydBtjQzzpIVA12lOFfsvcEAuK5VX9unvBD+h28RDMijACAAAAAElFTkSuQmCC) no-repeat bottom right #E8FAFD;
   background-size: 0.28rem 0.28rem;
 }
+.choose_industry .list .list_item .item_industry_list .switch_other.active {
+  color: #2ABED1;
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAHGSURBVHgB7da/T8JAFAfw11aRGNTGkKDRoUhMEBc68Adg4u4/YMRVB3Vz09EN/wQGVyNOJiamOjtUnFg0DA4OJOKvQAz2vHdSQklp77Aw+ab27rhPXrl+U4D/CrBSl2ZahiFV0ihtSCOyIcEQasko7UgEjvF64B2mjNKBjWENtEPEgMBh59jAwGXjPk8I2e0eDxzUzkx1XFXyQEjObT5QkGFTskEv073WBAYmL0xNHmOY5rUuEJAXCwQUwf4MYlRhehAAlfc3fb/4dlSJYH2DGFUygYIXtj4fhdPMIiQjYce4AoLViqojrzXbWgz2ErMQDY1C9asJt7XP9pxQh25R5YZtxWPsuvxRh5OnqmOeu0OMKortZ9QIu39vfvtim+YjvHWt8z2lnVGFWEFfYFjOfKCbNoQwLNkXw6hq5SJuhNjEiELhRPtA8GK07np22OuFRgQxRBG/qr7C2sw0D0afJylIIpgbapcvRsuSrLgsiv1u3mD/oX1weDDsrpzVK44ORaNqLhyClegknD+/eGJ0vwqRrKwDxKhS6LeHaFT5VSeG9+yR8kRVXyWRYl2ydBtjQzzpIVA12lOFfsvcEAuK5VX9unvBD+h28RDMijACAAAAAElFTkSuQmCC) no-repeat bottom right #E8FAFD;
+  background-size: 0.28rem 0.28rem;
+}
 
 .choose_industry .list .list_item .item_industry_list .industry_item[disabled] {
   color: #fff;

File diff ditekan karena terlalu besar
+ 0 - 147
src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/vip_index_new.css


+ 8 - 3
src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/vip_introduce.css

@@ -161,7 +161,7 @@ html,body {
 }
 
 .vip_introduce .main .banner {
-  padding-top: 7.2rem;
+  padding-top: 6.2rem;
   width: 100%;
   min-height: 16.88rem;
   background: url(/jyapp/vipsubscribe/image/vip_intro_bg-1@2x.jpg?v=51430) no-repeat top center;
@@ -171,7 +171,7 @@ html,body {
 
 .main .group {
   position: relative;
-  z-index: 1;
+  /* z-index: 1; */
 }
 
 .main .group .group-title {
@@ -257,7 +257,7 @@ html,body {
 
 /* 表格部分 */
 .comparison {
-  margin-top: -2rem;
+  margin-top: -2.2rem;
   margin-bottom: .44rem;
 }
 
@@ -460,3 +460,8 @@ html,body {
   background-size: contain;
   transform: translateX(100%);
 }
+
+.setaction{
+  padding: 0 .24rem;
+  width: 100%;
+}

TEMPAT SAMPAH
src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/image/icon-industry.jpg


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

@@ -148,7 +148,20 @@ $(function () {
         }
         resultCount();
     })
-
+    // 匹配未分类行业
+    $('.switch_other').on('click', function (e) {
+      $(this).toggleClass('active');
+      if ($(this).hasClass('active')) {
+        setotherbuyerclass(0)
+      } else {
+        setotherbuyerclass(1)
+      }
+    })
+    function setotherbuyerclass(index) {
+      $.post("/subscribepay/afterPay/setUserInfo", {pageType: "other_buyerclass", other: index}, function (r) {
+        console.log(r)
+      })
+    }
   /* ---S 行业推荐弹窗 @date 2021/4/1 ---*/
   // 监听页面滚动事件
   $('.form').scroll(function() {

+ 56 - 158
src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_index_new.js

@@ -13,7 +13,8 @@ var subNode = new Vue({
                 infotype: '/jyapp/vipsubscribe/toSetInfoTypePage',
                 resultview: '/jyapp/vipsubscribe/toVIPViewPage',
                 pushsetting: '/jyapp/big/page/push_settings'
-            }
+            },
+            initData: {}
         }
     }
 })
@@ -161,46 +162,6 @@ $(function () {
   */
   /* vue 代码 end */
 
-  //项目匹配开关
-  var checkedflag = true;
-  //其他采购单位开关
-  var checkedflag_other = true;
-
-  function setprojectmatch(index) {
-      if (checkedflag) {
-          checkedflag = false;
-          $.post("/subscribepay/afterPay/setUserInfo", {pageType: "projectMatch", pmindex: index}, function (r) {
-              if (r.flag) {
-                  checkedflag = true;
-                  reqData.projectmatch = index;
-                  sessionStorage.setItem('sub_vip_state', JSON.stringify(reqData))
-              }
-          })
-      }
-  }
-
-  function setMatchway(index) {
-      $.post("/subscribepay/afterPay/setUserInfo", {pageType: "saveSeniorset", matchtype: index}, function (r) {
-          if (r.flag) {
-              reqData.matchway = index;
-              sessionStorage.setItem('sub_vip_state', JSON.stringify(reqData))
-          }
-      })
-  }
-
-  function setotherbuyerclass(index) {
-      if (checkedflag_other) {
-          checkedflag_other = false;
-          $.post("/subscribepay/afterPay/setUserInfo", {pageType: "other_buyerclass", other: index}, function (r) {
-              if (r.flag) {
-                  checkedflag_other = true;
-                  reqData.otherbuyerclass = index;
-                  sessionStorage.setItem('sub_vip_state', JSON.stringify(reqData))
-              }
-          })
-      }
-  }
-
   function flushSubtotal(list) {
       var returnHtml = "";
       for (var i = 0; i < list.length; i++) {
@@ -280,6 +241,7 @@ $(function () {
           globalState = JSON.parse(globalStateStr);
           sessionStorage.removeItem("vip_change_time");
           reqData = JSON.parse(globalStateStr);
+          subNode.initData = res.data
           init(res.data)
       })
   }
@@ -406,17 +368,6 @@ $(function () {
       }
   }
 
-  // 项目匹配问号点击事件
-  $('.project-match .icon-bangzhu').on('click', function () {
-      var str = '开启后,系统将根据你订阅的关键词自动匹配出相关联的项目,并将相关联项目的后续动态在超级订阅内一并推送。'
-      weui.alert(str, {
-          title: '项目匹配',
-          className: 'jy-alert',
-          buttons: [{
-              label: '我知道了'
-          }]
-      });
-  })
   // 其他采购单位行业问号点击事件
   $('.other .icon-bangzhu').on('click', function () {
       var str = '每条信息的采购单位行业属性由机器自动识别,会存在少数无法识别的情况,此时将归类为“其它”。(注:当采购单位行业选择为全部时,关闭无效)'
@@ -445,50 +396,50 @@ $(function () {
   })
 
   // 关键词匹配方式
-  var defaultVal = $('.match-way-value').text()
-  var $iosActionsheet = $('#iosActionsheet');
-  var $iosMask = $('#iosMask');
-
-  function hideActionSheet() {
-      $iosActionsheet.removeClass('weui-actionsheet_toggle');
-      $iosMask.fadeOut(200);
-  }
-
-  $iosMask.on('click', hideActionSheet);
-  $('#iosActionsheet .weui-actionsheet__cell').each(function (index, item) {
-      var t = $(item).children().text().trim();
-      // console.log(t,$(this))
-      if (t == defaultVal) {
-          $(this).addClass('active')
-      }
-  })
-  $('#iosActionsheetCancel').on('click', hideActionSheet);
-  $('body').on('click', '.match-way', function () {
-      $iosActionsheet.addClass('weui-actionsheet_toggle');
-      $iosMask.fadeIn(200);
-  })
-  $('#iosActionsheet .weui-actionsheet__cell').on('click', function () {
-      $(this).addClass('active').siblings().removeClass('active');
-      $iosActionsheet.removeClass('weui-actionsheet_toggle');
-      $iosMask.fadeOut(200);
-      $('.match-way-value').text($(this).children('.cell_title').text())
-      var nowMode = $(this).children('.cell_title').text()
-      var ModeArr = ['按标题匹配', '按全文匹配']
-      var nowIndex = ModeArr.indexOf(nowMode)
-      if (nowIndex !== -1) {
-          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')
-              }
-          });
-      }
-  })
+//   var defaultVal = $('.match-way-value').text()
+//   var $iosActionsheet = $('#iosActionsheet');
+//   var $iosMask = $('#iosMask');
+
+//   function hideActionSheet() {
+//       $iosActionsheet.removeClass('weui-actionsheet_toggle');
+//       $iosMask.fadeOut(200);
+//   }
+
+//   $iosMask.on('click', hideActionSheet);
+//   $('#iosActionsheet .weui-actionsheet__cell').each(function (index, item) {
+//       var t = $(item).children().text().trim();
+//       // console.log(t,$(this))
+//       if (t == defaultVal) {
+//           $(this).addClass('active')
+//       }
+//   })
+//   $('#iosActionsheetCancel').on('click', hideActionSheet);
+//   $('body').on('click', '.match-way', function () {
+//       $iosActionsheet.addClass('weui-actionsheet_toggle');
+//       $iosMask.fadeIn(200);
+//   })
+//   $('#iosActionsheet .weui-actionsheet__cell').on('click', function () {
+//       $(this).addClass('active').siblings().removeClass('active');
+//       $iosActionsheet.removeClass('weui-actionsheet_toggle');
+//       $iosMask.fadeOut(200);
+//       $('.match-way-value').text($(this).children('.cell_title').text())
+//       var nowMode = $(this).children('.cell_title').text()
+//       var ModeArr = ['按标题匹配', '按全文匹配']
+//       var nowIndex = ModeArr.indexOf(nowMode)
+//       if (nowIndex !== -1) {
+//           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')
+//               }
+//           });
+//       }
+//   })
 
 
   $('body').on('click', '.jy-dialog .weui-mask', function () {
@@ -514,46 +465,6 @@ $(function () {
       window.history.back();
   });
 
-  // 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')
-              }
-          });
-      }
-  })
 
   //保存取消提示 module 1 修改 2升级 3续费 4购买
   function cancelTip(module) {
@@ -828,22 +739,16 @@ $(function () {
       flushShowTime(state.isTrial, selectTime, stratFlag, endflag);
 
       // 初始化关键词
-      if (state.items.length === 0) {
-          $('.body-item.keywords .keywords-text').text('未分类')
-      } else {
-          var arr = []
-          state.items.forEach(function (item, index) {
-              arr.push(item['s_item'])
-          })
-          $('.body-item.keywords .keywords-text').text(arr.join('、'))
-      }
+    //   if (state.items.length === 0) {
+    //       $('.body-item.keywords .keywords-text').text('未分类')
+    //   } else {
+    //       var arr = []
+    //       state.items.forEach(function (item, index) {
+    //           arr.push(item['s_item'])
+    //       })
+    //       $('.body-item.keywords .keywords-text').text(arr.join('、'))
+    //   }
 
-      // 初始化信息类型
-      if (state.infotype.length === 0) {
-          $('.body-item.info-type .info-type-text').text('全部类型')
-      } else {
-          $('.body-item.info-type .info-type-text').text(state.infotype.join('、'))
-      }
 
       if (state.matchway) {
           var ModeArr = ['按标题匹配', '按全文匹配']
@@ -855,13 +760,6 @@ $(function () {
           }
       }
 
-      // 初始化项目匹配
-      if (state.projectmatch) {
-          $('.switch').addClass('checked')
-      } else {
-          $('.switch').removeClass('checked')
-      }
-
       // 初始化“其他"开关
       if (state.otherbuyerclass == 1 || state.otherbuyerclass == null) {
           $('.switch_other').addClass('checked')

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

@@ -66,7 +66,7 @@
                         <!-- <div class="item_label"></div> -->
                         <div class="item_industry_list">
                             <button class="industry_item whole">全部行业</button>
-                            <button class="industry_item">匹配未分类行业</button>
+                            <button class="industry_item switch_other">匹配未分类行业</button>
                             <span class="wenhao">
                                 <i id="matchTips" class="iconfont icon-wenhao show_tips"></i>
                             </span>

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

@@ -281,8 +281,8 @@
                     var _userData = r.userData;
                     var _vipData = _userData["o_vipjy"];
                     var a_infotype = _vipData["a_infotype"]
-                    if (a_infotype!=undefined&&a_infotype.split("、").length>0&&a_infotype!=""){
-                        inputHtml(a_infotype.split("、"));
+                    if (a_infotype!=undefined&&a_infotype.length>0&&a_infotype!=""){
+                        inputHtml(a_infotype);
                         isLockButton (true);
                     }else{
                         $('.all span').addClass('active');

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

@@ -129,28 +129,6 @@
     <!-- <a href="/jyapp/vipsubscribe/vipsubscribe_renew" class="custom-header-right go_renew" style="display: none;">续费</a> -->
     <!-- <a href="/jyapp/vipsubscribe/vipsubscribe_new" class="custom-header-right go_buy" style="display: none;">去购买</a> -->
   </div>
-  <!-- 匹配方式 -->
-  <div class="match-keywords-actionsheet">
-    <div class="weui-mask" id="iosMask" style="opacity: 1;display: none;"></div>
-    <div class="weui-actionsheet" id="iosActionsheet">
-      <div class="weui-actionsheet__title">
-        <p class="weui-actionsheet__title-text">关键词匹配方式</p>
-        <i class="weui-icon-clear" id="iosActionsheetCancel"></i>
-      </div>
-      <div class="weui-actionsheet__menu">
-        <div class="weui-actionsheet__cell">
-          <p class="cell_title">按标题匹配</p>
-        </div>
-        <div class="weui-actionsheet__cell">
-          <p class="cell_title">按全文匹配</p>
-          <p class="small-title">会产生无效信息,请根据需要选择</p>
-        </div>
-      </div>
-      <!-- <div class="weui-actionsheet__action">
-    <div class="weui-actionsheet__cell" id="iosActionsheetCancel">取消</div>
-    </div> -->
-    </div>
-  </div>
   <div class="app-layout-content-b">
     {{if not .T.isLiveActive}}
     <div class="vip-upgrade">
@@ -238,7 +216,7 @@
               </li>
             </ul>
           </li>
-          <sub-component :linkobj="linkObj"></sub-component>
+          <sub-component :linkobj="linkObj" :initdata="initData"></sub-component>
           <!-- <li class="body-item area">
             <a class="item-container" href="/jyapp/vipsubscribe/toSetKeyWordPage">
               <div class="item">

+ 55 - 8
src/jfw/modules/app/src/web/templates/vipsubscribe/vip_introduce.html

@@ -13,6 +13,8 @@
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/css/public.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/weui.min.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_introduce.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/font.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/land-page-coupon.css?v={{Msg "seo" "version"}}"/>
@@ -24,7 +26,7 @@
       <span class="header-title">超级订阅</span>
       <span class="header-right hide"></span>
     </div>
-    <div class="j-main vip_introduce">
+    <div class="j-main vip_introduce vip-body" id="vip-body">
         <div class="main">
             <div class="banner power group">
                 <div class="active-content-tip">
@@ -51,7 +53,10 @@
                         <div class="active-r-text">4、此活动最终解释权归剑鱼标讯所有。</div>
                     </div>
                 </div>
-                <div class="group-title">
+                <div class="setaction">
+                    <sub-component type="introduce" :linkobj="linkObj" :initdata="initData"></sub-component>
+                </div>
+                <!-- <div class="group-title">
                     <span class="title-text line-title">超级订阅服务特权</span>
                     <span class="title-bg-text">DINGYUEFUWU</span>
                 </div>
@@ -80,7 +85,7 @@
                         <span class="circle-icon circle-icon-6"></span>
                         <p class="item-desc">搜索全国超七千万企业</p>
                     </span>
-                </div>
+                </div> -->
             </div>
             <div class="comparison group">
                 <div class="group-title">
@@ -180,15 +185,57 @@
         </div>
     </div>
 </div>
+<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.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/js/check-bind-phone.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}}/common-module/vipsubscribe/js/vip-subscribe-set-template.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/land-page-coupon.js?v={{Msg "seo" "mod_version"}}'></script>
-    <script>
-        $("#vip-introduce,#vip-free-7days").on('click', function () {
-            window.location.replace($(this).attr('data-url'))
-        })
-    </script>
+<script>
+    $("#vip-introduce,#vip-free-7days").on('click', function () {
+        window.location.replace($(this).attr('data-url'))
+    })
+</script>
+<script>
+    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'
+                },
+                initData: {}
+            }
+        },
+        created () {
+          this.getUserInfo()  
+        },
+        methods: {
+            getUserInfo: function() {
+                let _this = this
+                $.ajax({
+                    type: 'POST',
+                    url: '/subscribepay/vipsubscribe/getSubBuyMsg',
+                    success:function(res) {
+                        if(res.success) {
+                            _this.initData = res.data
+                        }
+                    }
+                })
+            }
+        }
+    })
+</script>
 <script>
         if (location.href.lastIndexOf('type=renew') !== -1) {
             $("#vip-introduce").hide()

File diff ditekan karena terlalu besar
+ 101 - 4
src/web/staticres/common-module/vipsubscribe/css/vip-subscribe-set-template.css


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

@@ -1,14 +1,15 @@
 var subScribeTemplate = `
+<div class="sub-scribe">
 <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="leading jy-icon-loaction"></span>
           <span class="item-label">区域</span>
         </span>
         <span class="item-r">
-          <span class="keywords-text ellipsis">已选:河南、安徽</span>
+          <span class="keywords-text ellipsis">已选:{{info.area}}</span>
           <span class="iconfont icon-arrow"></span>
         </span>
       </div>
@@ -18,11 +19,11 @@ var subScribeTemplate = `
     <a class="item-container" :href="linkobj.industry">
       <div class="item">
         <span class="item-l">
-          <span class="leading jy-icon-keywords"></span>
+          <span class="leading jy-icon-industry"></span>
           <span class="item-label">采购单位行业</span>
         </span>
         <span class="item-r">
-          <span class="keywords-text ellipsis">已选:财政</span>
+          <span class="keywords-text ellipsis">已选:{{info.industry}}</span>
           <span class="iconfont icon-arrow"></span>
         </span>
       </div>
@@ -42,7 +43,7 @@ var subScribeTemplate = `
       </div>
     </a>
     </li>
-    <li class="body-item match-way">
+    <li class="body-item match-way" @click="matchWay">
     <a class="item-container" href="javascript:;">
       <div class="item">
         <span class="item-l">
@@ -50,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">按标题匹配</span>
+          <span class="keywords-text ellipsis match-way-value">{{info.defaultVal}}</span>
           <span class="iconfont icon-arrow"></span>
         </span>
       </div>
@@ -64,7 +65,7 @@ var subScribeTemplate = `
           <span class="item-label">信息类型</span>
         </span>
         <span class="item-r">
-          <span class="info-type-text ellipsis">全部类型</span>
+          <span class="info-type-text ellipsis">{{info.infoType}}</span>
           <span class="iconfont icon-arrow"></span>
         </span>
       </div>
@@ -77,12 +78,12 @@ var subScribeTemplate = `
           <span class="leading jy-icon-project-match"></span>
           <span class="item-label">
             <span class="label-text">项目匹配</span>
-            <i class="iconfont icon-bangzhu"></i>
+            <i class="iconfont icon-bangzhu" @click="projectNotice"></i>
           </span>
         </span>
         <span class="item-r media_switch">
           <div class="weui-cell__ft">
-            <button class="jy-switch switch checked"></button>
+            <button class="jy-switch switch" :class="{checked:checkedflag}" @click="switchs"></button>
           </div>
         </span>
       </div>
@@ -94,7 +95,7 @@ var subScribeTemplate = `
           <span class="item-l">
             <span class="leading_ jy-icon-resultpreview-match"></span>
             <span class="item-label-other">
-              <span class="label-text">推送结果预览</span>
+              <span class="label-text">推送结果预览<span class="threeInfo">{{resultTime}}</span></span>
             </span>
           </span>
           <span class="item-r media_switch">
@@ -104,11 +105,11 @@ var subScribeTemplate = `
         </div>
       </a>
     </li>
-    <li class="body-item resultpreview">
+    <li class="body-item push-set" v-if="pushsetShow">
       <a class="item-container" href="linkobj.pushsetting">
         <div class="item">
           <span class="item-l">
-            <span class="leading_ jy-icon-resultpreview-match"></span>
+            <span class="leading_ jy-icon-push-set"></span>
             <span class="item-label-other">
               <span class="label-text">推送设置</span>
             </span>
@@ -121,6 +122,29 @@ var subScribeTemplate = `
       </a>
     </li>
   </ul>
+  <!-- 匹配方式 -->
+  <div class="match-keywords-actionsheet">
+    <div class="weui-mask" id="iosMask" @click="iosMask" style="opacity: 1;display: none;"></div>
+    <div class="weui-actionsheet" id="iosActionsheet">
+      <div class="weui-actionsheet__title">
+        <p class="weui-actionsheet__title-text">关键词匹配方式</p>
+        <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)">
+          <p class="cell_title">按标题匹配</p>
+        </div>
+        <div class="weui-actionsheet__cell" :class="{active:active==1}" @click="actionSheet('按全文匹配', 1)">
+          <p class="cell_title">按全文匹配</p>
+          <p class="small-title">会产生无效信息,请根据需要选择</p>
+        </div>
+      </div>
+      <!-- <div class="weui-actionsheet__action">
+    <div class="weui-actionsheet__cell" id="iosActionsheetCancel" @click="iosActionsheetCancel">取消</div>
+    </div> -->
+    </div>
+  </div>
+</div>
 `
 
 var subComponent = {
@@ -132,12 +156,255 @@ var subComponent = {
       default: function() {
         return {}
       }
+    },
+    "initdata": {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    },
+    "type": {
+      type: String,
+      default: function() {
+        return ''
+      }
     }
   },
   data: function() {
-    return {}
+    return {
+      info: {
+        area: '',
+        industry: '',
+        defaultVal: '按标题匹配',
+        infoType: '全部类型'
+      },
+      // 匹配方式
+      active: 1,
+      pushsetShow: true,
+      resultTime: '(近3个月内共条信息)',
+      checkedflag: false
+    }
+  },
+  mounted () {
+    this.getData()
+  },
+  watch: {
+    initdata: function(newVal, oldVal) {
+      if(newVal) {
+        this.getData()
+      }
+    }
   },
   methods: {
-    
+    getData: function() {
+      this.setArea()
+      this.setIndustry()
+      this.setKeyword()
+      this.getActionDefault()
+      this.getIndustryType()
+      this.getProjectMatch()
+      if(this.type == 'introduce') {
+        this.pushsetShow = false
+        this.resultTime = '(近三个月)'
+      }
+    },
+    // 设置区域
+    setArea: function() {
+      let _this = this
+      if(this.initdata.area) {
+        if(JSON.stringify(this.initdata.area) == '{}') {
+          this.info.area = '全国'
+        } else {
+          let proStr = ''
+          Object.keys(this.initdata.area).forEach(function(item,index) {
+            console.log(_this.initdata.area[item])
+            if(_this.initdata.area[item].length == 0) {
+              proStr += item + '、'
+            } else {
+              let cityStr = ''
+              _this.initdata.area[item].forEach(function(data, i) {
+                console.log(data)
+                cityStr += data + '、'
+              })
+              if (cityStr.length > 0) {
+                cityStr = cityStr.substr(0,cityStr.length - 1);
+              }
+              proStr += item+ '(' + cityStr + ')' + '、'
+            }
+          })
+          if(proStr[proStr.length - 1] == '、') {
+            proStr = proStr.substr(0,proStr.length - 1);
+          }
+          _this.info.area = proStr
+        }
+      }
+    },
+    // 设置行业
+    setIndustry: function() {
+      let _this = this
+      if(this.initdata.industry) {
+        if(this.initdata.industry.length == 0) {
+          this.info.industry = '全部行业'
+        } else {
+          this.info.industry = this.initdata.industry + ''
+        }
+      }
+    },
+    // 设置关键词
+    setKeyword: function() {
+      let state = this.initdata
+      if(state) {
+        if(state.items) {
+          if (state.items.length === 0) {
+            $('.body-item.keywords .keywords-text').text('未分类')
+          } else {
+              var arr = []
+              state.items.forEach(function (item, index) {
+                  arr.push(item['s_item'])
+              })
+              $('.body-item.keywords .keywords-text').text(arr.join('、'))
+          }
+        }
+      } else {
+        $('.body-item.keywords .keywords-text').text('未分类')
+      }
+    },
+    // 信息类型
+    getIndustryType: function() {
+      if(this.initdata) {
+        if(this.initdata.infotype) {
+          if (this.initdata.infotype.length === 0) {
+            this.info.infoType = '全部类型'
+          } else {
+            this.info.infoType = this.initdata.infotype.join('、')
+          }
+        }
+      }
+    },
+    // 项目匹配
+    getProjectMatch: function() {
+      if (this.initdata.projectmatch) {
+        $('.switch').addClass('checked')
+      } else {
+          $('.switch').removeClass('checked')
+      }
+    },
+    switchs: function() {
+      // switch点击切换
+      var $this = $(this);
+      var hasChecked = this.checkedflag;
+      console.log(hasChecked)
+      if (!hasChecked) {
+          this.checkedflag = true;
+          this.setprojectmatch(1);
+      } else {
+        this.checkedflag = false;
+          this.setprojectmatch(0);
+          weui.toast('项目匹配已关闭', {
+              duration: 1500,
+              className: 'jy-toast',
+              callback: function () {
+                  console.log('close')
+              }
+          });
+      }
+    },
+    setprojectmatch(index) {
+      console.log(this.checkedflag)
+      let _this = this
+      if (this.checkedflag) {
+        this.checkedflag = false;
+        $.post("/subscribepay/afterPay/setUserInfo", {pageType: "projectMatch", pmindex: index}, function (r) {
+            if (r.flag) {
+              var subVipState = sessionStorage.getItem('sub_vip_state');
+              var reqData = JSON.parse(subVipState);
+              _this.checkedflag = true;
+              reqData.projectmatch = index;
+              sessionStorage.setItem('sub_vip_state', JSON.stringify(reqData))
+            }
+        })
+      }
+    },
+    // 关键词匹配方式
+    getActionDefault: function() {
+      let _this = this
+      let defaultTitle = ''
+      if(this.initdata.matchWay == 1) {
+        defaultTitle = '按标题匹配'
+      } else if(this.initdata.matchWay == 2) {
+        defaultTitle = '按全文匹配'
+      }
+      $('#iosActionsheet .weui-actionsheet__cell').each(function (index, item) {
+        var t = $(item).children().text().trim();
+        console.log(t, defaultTitle)
+        if (t == defaultTitle) {
+            $(this).addClass('active')
+        }
+      })
+    },
+    hideActionSheet: function() {
+      var $iosMask = $('#iosMask');
+      var $iosActionsheet = $('#iosActionsheet');
+      $iosActionsheet.removeClass('weui-actionsheet_toggle');
+      $iosMask.fadeOut(200);
+    },
+    iosMask: function() {
+        this.hideActionSheet()
+    },
+    iosActionsheetCancel: function() {
+      this.hideActionSheet()
+    },
+    matchWay: function() {
+      var $iosMask = $('#iosMask');
+      var $iosActionsheet = $('#iosActionsheet');
+      $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) {
+      $.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))
+          }
+      })
+    },
+    // 项目匹配问号点击事件
+    projectNotice: function () {
+      var str = '开启后,系统将根据你订阅的关键词自动匹配出相关联的项目,并将相关联项目的后续动态在超级订阅内一并推送。'
+      weui.alert(str, {
+          title: '项目匹配',
+          className: 'jy-alert',
+          buttons: [{
+              label: '我知道了'
+          }]
+      });
+    }
   },
 }

+ 5 - 6
src/web/staticres/vipsubscribe/css/vip_index_new.css

@@ -52,9 +52,9 @@
 }
 .super-bg{
   width: 100%;
-  height: 5.56rem;
+  height: 2.84rem;
   background: url(../image/vip-index-bg.png) no-repeat center top #fff;
-  background-size: 100% 4.54rem;
+  background-size: 100% 92%;
 }
 
 .super-navbar{
@@ -121,7 +121,6 @@
 }
 .sub-info .area,.sub-info .industry,.sub-info .cycle{
   padding: 0.16rem 0;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
 }
 .sub-info .cycle{
   border: 0;
@@ -140,7 +139,7 @@
 }
 .vip-upgrade .vip-body {
   position: absolute;
-  top: 1.04rem;
+  top: 1.34rem;
   z-index: 10;
   width: 100%;
   overflow-x: hidden;
@@ -281,7 +280,7 @@
   box-sizing:border-box;
 }
 .vip-upgrade .vip-body .body-item:last-child{
-  display: none;
+  /* display: none; */
 }
 
 .vip-body .body-item .item-container {
@@ -355,7 +354,7 @@
 }
 
 .vip-body .keywords {
-  margin-top: .16rem;
+  /* margin-top: .16rem; */
 }
 
 .vip-body .keywords-text,.vip-body .info-type-text {

+ 9 - 3
src/web/staticres/vipsubscribe/css/vip_introduce.css

@@ -161,7 +161,7 @@ html,body {
 }
 
 .vip_introduce .main .banner {
-  padding-top: 7.2rem;
+  padding-top: 6.2rem;
   width: 100%;
   min-height: 16.88rem;
   background: url(/vipsubscribe/image/vip_intro_bg-1@2x.jpg?v=51430) no-repeat top center;
@@ -171,7 +171,7 @@ html,body {
 
 .main .group {
   position: relative;
-  z-index: 1;
+  /* z-index: 1; */
 }
 
 .main .group .group-title {
@@ -257,7 +257,7 @@ html,body {
 
 /* 表格部分 */
 .comparison {
-  margin-top: -2rem;
+  margin-top: -2.2rem;
   margin-bottom: .44rem;
 }
 
@@ -460,3 +460,9 @@ html,body {
   background-size: contain;
   transform: translateX(100%);
 }
+
+.setaction{
+  padding: 0 .24rem;
+  width: 100%;
+}
+

TEMPAT SAMPAH
src/web/staticres/vipsubscribe/image/vip-index-bg.png


+ 0 - 0
src/web/staticres/vipsubscribe/js/vip-index-new-com.js


+ 4 - 57
src/web/staticres/vipsubscribe/js/vip_index_new.js

@@ -13,7 +13,8 @@ var subNode = new Vue({
                 infotype: '/front/vipsubscribe/toSetInfoTypePage',
                 resultview: '/front/vipsubscribe/toVIPViewPage',
                 pushsetting: '/front/vipsubscribe/toSetPushSetPage'
-            }
+            },
+            initData: {}
         }
     }
 })
@@ -278,6 +279,7 @@ $(function () {
             sessionStorage.setItem('vip_index_read', true);
             globalState = JSON.parse(globalStateStr);
             reqData = JSON.parse(globalStateStr);
+            subNode.initData = res.data
             init(res.data)
         })
     }
@@ -404,17 +406,6 @@ $(function () {
         }
     }
 
-    // 项目匹配问号点击事件
-    $('.project-match .icon-bangzhu').on('click', function () {
-        var str = '开启后,系统将根据你订阅的关键词自动匹配出相关联的项目,并将相关联项目的后续动态在超级订阅内一并推送。'
-        weui.alert(str, {
-            title: '项目匹配',
-            className: 'jy-alert',
-            buttons: [{
-                label: '我知道了'
-            }]
-        });
-    })
 
     // 其他采购单位行业问号点击事件
     $('.other .icon-bangzhu').on('click', function () {
@@ -443,51 +434,6 @@ $(function () {
         $('.discount-button .icon-arrow').removeClass('up')
     })
 
-    // 关键词匹配方式
-    var defaultVal = $('.match-way-value').text()
-    var $iosActionsheet = $('#iosActionsheet');
-    var $iosMask = $('#iosMask');
-
-    function hideActionSheet() {
-        $iosActionsheet.removeClass('weui-actionsheet_toggle');
-        $iosMask.fadeOut(200);
-    }
-
-    $iosMask.on('click', hideActionSheet);
-    $('#iosActionsheet .weui-actionsheet__cell').each(function (index, item) {
-        var t = $(item).children().text().trim();
-        if (t == defaultVal) {
-            $(this).addClass('active')
-        }
-    })
-    $('#iosActionsheetCancel').on('click', hideActionSheet);
-    $('body').on('click', '.match-way', function () {
-        $iosActionsheet.addClass('weui-actionsheet_toggle');
-        $iosMask.fadeIn(200);
-    })
-    $('#iosActionsheet .weui-actionsheet__cell').on('click', function () {
-        $(this).addClass('active').siblings().removeClass('active');
-        $iosActionsheet.removeClass('weui-actionsheet_toggle');
-        $iosMask.fadeOut(200);
-        $('.match-way-value').text($(this).children('.cell_title').text())
-        var nowMode = $(this).children('.cell_title').text()
-        var ModeArr = ['按标题匹配', '按全文匹配']
-        var nowIndex = ModeArr.indexOf(nowMode)
-        if (nowIndex !== -1) {
-            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')
-                }
-            });
-        }
-    })
-
     $('body').on('click', '.jy-dialog .weui-mask', function () {
         pickerShow('.jy-dialog', false)
     })
@@ -913,6 +859,7 @@ $(function () {
     var reqData = JSON.parse(subVipState);
     if (subVipState) {
         init(reqData);
+        subNode.initData = reqData
         //判断是否修改
         var IndustryNoChange = JSON.stringify(reqData.oldIndustry.sort()) === JSON.stringify(reqData.industry.sort());
         var tmp1 = getAreaClassArr(reqData.oldArea);

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

@@ -32,7 +32,7 @@
 <div id="choose_area">
     <div class="result">
         <div class="result-purchased result-item">
-            <span class="result-label">区域</span>
+            <span class="result-label">已购买</span>
             <span class="result-info">
                     <p class="buy-set-info ellipsis"></p>
                 </span>

+ 2 - 2
src/web/templates/weixin/vipsubscribe/messageType.html

@@ -237,8 +237,8 @@
                 var _userData = r.userData;
                 var _vipData = _userData["o_vipjy"];
                 var a_infotype = _vipData["a_infotype"]
-                if (a_infotype != undefined && a_infotype.split("、").length > 0 && a_infotype != "") {
-                    inputHtml(a_infotype.split("、"));
+                if (a_infotype != undefined && a_infotype.length > 0 && a_infotype != "") {
+                    inputHtml(a_infotype);
                     isLockButton(true);
                 } else {
                     $('.all span').addClass('active');

+ 2 - 2
src/web/templates/weixin/vipsubscribe/vip_index_new.html

@@ -186,7 +186,7 @@
             </li>
           </ul>
         </li>
-        <sub-component :linkobj="linkObj"></sub-component>
+        <sub-component :linkobj="linkObj" :initdata="initData"></sub-component>
         <!-- <li class="body-item keywords">
             <a class="item-container" href="/front/vipsubscribe/toSetKeyWordPage">
                 <div class="item">
@@ -684,7 +684,6 @@
 <!--<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='{{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"}}
 <script>
     $(window).bind("pageshow", function (event) {
@@ -707,6 +706,7 @@
   })
 </script>
 <script src="/vipsubscribe/js/UpgradePrice.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>
 <script src="/vipsubscribe/js/vip_index_new.js?v={{Msg "seo" "version"}}"></script>
 </body>
 {{include "/common/baiducc.html"}}

+ 50 - 3
src/web/templates/weixin/vipsubscribe/vip_introduce.html

@@ -15,11 +15,13 @@
     <link rel="stylesheet" type="text/css" href="/css/wxbutton.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/vip_introduce.css?v={{Msg "seo" "version"}}1">
     <link rel="stylesheet" type="text/css" href="/css/land-page-coupon.css?v={{Msg "seo" "version"}}1"> 
+    <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/weui.min.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"}}' />
 </head>
 
 <body>
     <div class="j-container" id="vip-intro-container">
-        <div class="j-main vip_introduce">
+        <div class="j-main vip_introduce vip-body" id="vip-body">
             <div class="main">
                 <div class="banner power group">
                     <div class="active-content-tip">
@@ -46,7 +48,10 @@
                         <div class="active-r-text">4、此活动最终解释权归剑鱼标讯所有。</div>
                         </div>
                     </div>
-                    <div class="group-title">
+                    <div class="setaction">
+                        <sub-component type="introduce" :linkobj="linkObj" :initdata="initData"></sub-component>
+                    </div>
+                    <!-- <div class="group-title">
                         <span class="title-text line-title">超级订阅服务特权</span>
                         <span class="title-bg-text">DINGYUEFUWU</span>
                     </div>
@@ -75,7 +80,7 @@
                             <span class="circle-icon circle-icon-6"></span>
                             <p class="item-desc">搜索全国超七千万企业</p>
                         </span>
-                    </div>
+                    </div> -->
                 </div>
                 <div class="comparison group">
                     <div class="group-title">
@@ -176,8 +181,11 @@
         </div>
     </div>
     {{include "/common/weixin.html"}}
+    <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
     <script src='{{Msg "seo" "cdn"}}/structuredata/mobile/js/jquery.min.js'></script>
+    <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script src='{{Msg "seo" "cdn"}}/vipsubscribe/js/share.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>
     <!--<script src='{{Msg "seo" "cdn"}}/js/check-bind-phone.js?v={{Msg "seo" "version"}}'></script>-->
     <script src='{{Msg "seo" "cdn"}}/js/land-page-coupon.js?v={{Msg "seo" "version"}}'></script>
     <script>
@@ -185,6 +193,45 @@
             window.location.replace($(this).attr('data-url'))
         })
     </script>
+    <script>
+        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'
+                    },
+                    initData: {}
+                }
+            },
+            created () {
+              this.getUserInfo()  
+            },
+            methods: {
+                getUserInfo: function() {
+                    let _this = this
+                    $.ajax({
+                        type: 'POST',
+                        url: '/subscribepay/vipsubscribe/getSubBuyMsg',
+                        success:function(res) {
+                            if(res.success) {
+                                _this.initData = res.data
+                            }
+                        }
+                    })
+                }
+            }
+        })
+    </script>
     <script>
       if (location.href.lastIndexOf('type=renew') !== -1) {
           $("#vip-introduce").hide()

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini