p18:vip订阅->超级订阅: 介绍页和试用7天页面修改

src/jfw/modules/app/src/web/staticres/jyapp/css/subscribe.css

@@ -1618,7 +1618,7 @@ html, body {
   background-repeat: no-repeat;
   background-position: center;
   margin-right: 5px;
-  background-image:url("/jyapp/images/vip.png?v=51430");
+  background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAANpSURBVHgB7VdNTttAFH5jxyZIXaS70iKRnKBhE1p1AZyg7QkwJ4CeoOQEwAmAEwAnwCwq1IBKbpC0lQjtBi8qQW3PTN9z7MgEz9jgdJcvijyen+dv5v0OwBRTTKEFgwngdnBWN8HcQ2lNkFDDLpcDX5+de9uHkihNMCLHzMuYWFqy54fB6rP5d10oAQNKwjTMzw/IEbDPNq1tKInSBJHIB+UYqbwkyhP8z5jECXY1Y0dQEqUJkrfio58x1MexNpREJf0S/DxfAQveSymbjLFuKMPdSYQKHWTvshZWww3BRJNJ5vk82E17/ijMhIOLNQFif2w9ncKqiuSf31+aNrcOsVmHbGjXx/HzZHy9kOJT9eWbnRFB2kUwG/QywwUGXXuutZruSHYtQW5BATBgWyGEB+NE/V+dPRDgZCzwrFurwRqLXkSQVCsr8kT1ASTIbntndcu0mtKWy0jMUWxGx9IjpzEC41gYom/Pt7r+dedGJUcK+XHm1dJRZIO4oMY0ScUfdGQ0D38g4WkYEnGEJZxYplYWcvLoGRG0fdtFFXuPPpUE8engrr+Pugy2gI8VUNunDv3qXbU7FB0DDdbBnLr9KJJITHK5TqrIGs6x7UIy7+mVvMoQhoO7X4bh7vXgsI62tD9aj3aatGcbQ4dAVfagyCliwJdMHlMkSTtTpuHF7t/Lk2ndWc/J06gdXJ9vY/zcvDdhqPpCpxeHI3e8PzOTRDsg4TlIyBEouD+YUFS1+K0sckqCkWwujyEH8urbQtKOUp6EXWy68EgIIU5VY2qCTOYWmqERjFRKp26/bG1SUKe4SSqD4mSV85TBr6gdAhUKHNrc5G5WSvOvOjv4lQ2dAMy/i6rKW1vyF/ZASJEd3kfaCdkCG+3jiTdUg/pyS0KuHY6hjn8Hq5KdpKNANeTqBrUEOeNPuvAYzLgpPJnDqW64ohvEdHMUVIM9tezIEQCDe43yedz2KHUmc6JCRJN0yXZBg9xrp84O04E6C6p6L/X1rv2itQgaaE8wAtmhwguDmeAk/HHRxpDk0Z8H3DMtk06yySrsdW5ZprvPFCWIGcLF8j87TOC1Esunw+TVNM30OsiVLfKTQe6lKW1Pk0YR2bkEycZQVQcwaWBa1Nnv6PtQEH8HX/ex6l6DCYA2PDO35MAUU0xRHv8Al8ebBRh7GtgAAAAASUVORK5CYII=);
 }
 .app-layout-header .switch-vip:after,.app-layout-header .switch-personal:after,.app-layout-header .switch-ent:after{
   content: "";

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

@@ -1,5 +1,82 @@
+html,body {
+  height: 100%;
+}
+.j-container {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+
+.j-header {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 17px;
+  min-height: 20px;
+  z-index: 2;
+}
+
+.j-header .header-left,
+.j-header .header-title,
+.j-header .header-right {
+  display: flex;
+  align-items: center;
+}
+.j-header .header-left.hide,
+.j-header .header-right.hide {
+  visibility: hidden;
+}
+
+.j-header .header-left {
+  padding: .24rem;
+  width: 20px;
+  height: 20px;
+  color: #444;
+  font-size: 18px;
+  box-sizing: content-box;
+}
+.j-header .header-title {
+  position: absolute;
+  left: 50%;
+  color: #171826;
+  transform: translateX(-50%);
+  color: #fff;
+}
+.j-header .header-right {
+  height: 100%;
+  min-width: 20px;
+  font-size: 15px;
+  color: #2ABED1;
+}
+
+.j-container .j-header.transparent-header {
+  position: relative;
+  width: 100%;
+  background-color: #34355A;
+}
+
+.j-header.transparent-header .header-left {
+  color: #fff;
+}
+
+.j-main {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  overflow-y: scroll;
+  overflow-x: hidden;
+  font-size: 16px;
+}
+
+.j-footer {
+  box-shadow: 0px -2Px 8Px rgba(54, 147, 179, 0.051);
+}
 
 .trial_info {
+  margin-top: -1px;
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -131,6 +208,7 @@
 }
 
 .trial_info .trial_body .explain {
+  padding-bottom: 18px;
   color: #CFAD89;
 }
 

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

@@ -399,8 +399,7 @@
 }
 
 .radio-form .weui-check + .weui-icon-checked:before {
-  font-size: 16px;
-  margin-top: -3px;
+  font-size: 20px;
 }
 
 .radio-form .weui-check:checked + .weui-icon-checked:before {
@@ -473,7 +472,7 @@
 
 .vip_purchase .choose_condition .chooseList .choose_item a .info::placeholder,
 .vip_purchase .choose_condition .pay_mode .choose_item a .info::placeholder {
-  color: #000;
+  color: #9B9CA3;
 }
 
 .choose_item input:disabled, .choose_item input[disabled] {
@@ -483,7 +482,7 @@
 .vip_purchase .choose_condition .chooseList .choose_item a i.iconfont,
 .vip_purchase .choose_condition .pay_mode .choose_item a i.iconfont {
   float: right;
-  color: #707070;
+  color: #C0C4CC;
 }
 
 .vip_purchase .choose_condition .chooseList .choose_item .add_tips,
@@ -508,7 +507,7 @@
 .vip_purchase .choose_condition .chooseList .free-7day .info,
 .vip_purchase .choose_condition .pay_mode .free-7day .info {
   margin-right: .2rem;
-  color: #686868;
+  color: #9B9CA3;
 }
 
 .vip_purchase .choose_condition .chooseList {
@@ -530,11 +529,40 @@
   flex-direction: column;
   justify-content: center;
   text-align: center;
+  font-size: .26rem;
+  color: #5F5E64;
+}
+
+.table-label {
+  font-size: .28rem;
+  color: #5F5E64;
+  line-height: .4rem;
+  font-weight: 700;
+}
+
+.b-line {
+  position: relative;
+  margin-left: .18rem;
+  font-size: .3rem;
+  color: #171826;
+}
+
+.b-line:before {
+  content: '';
+  position: absolute;
+  left: -0.18rem;
+  top: 50%;
+  width: .06rem;
+  height: .32rem;
+  background-color: #2ABED1;
+  transform: translateY(-50%);
+  border-radius: .06rem;
 }
 
 .vip_purchase .choose_condition .vip_rules .vip_prise_table .table_title {
   margin-bottom: .3rem;
   margin-top: .3rem;
+  text-align: left;
 }
 
 .vip_purchase .choose_condition .vip_rules .vip_prise_table table {

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

@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="utf-8">
-    <title>VIP订阅-完善个人信息</title>
+    <title>超级订阅-完善个人信息</title>
     <meta name="viewport"
           content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
     <meta name="apple-mobile-web-app-capable" content="yes">
@@ -19,12 +19,13 @@
 </head>
 
 <body>
-<div class="app-layout-header jy-app-header">
-    <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
-    VIP订阅-完善个人信息
-<span></span></div>
-<div class="app-layout-content-b">
-    <div class="trial_info">
+<div class="j-container">
+    <div class="j-header jy-app-header transparent-header">
+        <span class="app-back jyapp-icon jyapp-icon-zuojiantou header-left"></span>
+        <span class="header-title">超级订阅</span>
+        <span class="header-right hide"></span>
+    </div>
+    <div class="j-main trial_info">
         <form class="form">
             <div class="trial_body" style="min-height: 100%">
                 <div class="banner">
@@ -95,7 +96,10 @@
 <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>
-
+    // 头部返回按钮事件
+    $('.j-header .header-left').on('click', function () {
+        window.history.back()
+    })
     //解决android 键盘遮挡输入框
     window.addEventListener("resize", function () {
         if (document.activeElement.tagName === "INPUT" || document.activeElement.tagName === "TEXTAREA") {
@@ -109,7 +113,7 @@
     $(function () {
         //initScroll()
         scrollView("input");
-        $(".btn").text("申请免费试用").attr("disabled", "disabled");
+        $(".btn").text("立即免费试用").attr("disabled", "disabled");
         //获取用户信息
         $DoPost("/subscribepay/trial/GetUserPhone", {}, function (r) {
             if (r.success) {
@@ -251,7 +255,6 @@
     });
     {{end}}
 
-
 </script>
 {{include "/common/baiducc.html"}}
 </body>

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

@@ -5,182 +5,156 @@
     <meta name="viewport"
           content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>VIP订阅</title>
+    <title>超级订阅</title>
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/rem.js"></script>
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}"/>
     <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/vipsubscribe/css/vip_introduce.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/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/appbutton.css?v={{Msg "seo" "version"}}"/>
 </head>
 <body>
-<div class="app-layout-header jy-app-header">
-    <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
-    VIP订阅
-<span></span></div>
-<div class="app-layout-content-b">
-	<div class="vip_introduce">
+<div class="j-container">
+    <div class="j-header jy-app-header transparent-header">
+      <span class="app-back jyapp-icon jyapp-icon-zuojiantou header-left"></span>
+      <span class="header-title">超级订阅</span>
+      <span class="header-right hide"></span>
+    </div>
+    <div class="j-main vip_introduce">
         <div class="main">
-            <div class="banner">
-                <div class="banner_screen">
-                    <h3 class="name">VIP 订阅专属服务</h3>
-                    <p class="introduce">VIP subscription service</p>
+            <div class="banner power group">
+                <div class="group-title">
+                    <span class="title-text line-title">超级订阅服务特权</span>
+                    <span class="title-bg-text">DINGYUEFUWU</span>
                 </div>
-                <div class="banner_screen live">
-                    <h3 class="title name">VIP订阅限时6折</h3>
-                    <h3 class="title name">全年仅此一次</h3>
-                    <p class="sub-title">抢购时间：7月7日 20:00 - 14日 20:00</p>
+                <div class="group-content grid">
+                    <span class="grid-item">
+                        <span class="circle-icon circle-icon-1"></span>
+                        <p class="item-desc">最多 300 组关键词</p>
+                    </span>
+                    <span class="grid-item">
+                        <span class="circle-icon circle-icon-2"></span>
+                        <p class="item-desc">每天最多接收 2000 条</p>
+                    </span>
+                    <span class="grid-item">
+                        <span class="circle-icon circle-icon-3"></span>
+                        <p class="item-desc">数据周报、月报</p>
+                    </span>
+                    <span class="grid-item">
+                        <span class="circle-icon circle-icon-4"></span>
+                        <p class="item-desc">订阅区域精确到市</p>
+                    </span>
                 </div>
             </div>
-            <div class="group">
-                <div class="group_title">
-                    <img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/image/group_title.png?v={{Msg "seo" "version"}}" alt="">
-                    <span>VIP订阅服务特权</span>
-                    <img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/image/group_title.png?v={{Msg "seo" "version"}}" class="pic_mark"
-                         alt="">
+            <div class="comparison group">
+                <div class="group-title">
+                    <span class="title-text line-title">整体服务对比</span>
+                    <span class="title-bg-text">FUWUDUIBI</span>
                 </div>
-                <div class="group_cont">
-                    <div class="grid">
-                        <div class="grid_item">
-                            <img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/image/group_1.png?v={{Msg "seo" "version"}}" alt="">
-                            <p>最多 300 组关键词</p>
+                <div class="group-content">
+                    <div class="table">
+                        <div class="c-thead row">
+                            <span class="free column column-l">免费版</span>
+                            <span class="prop column column-r color-deep-gold">超级订阅专属服务</span>
                         </div>
-                        <div class="grid_item">
-                            <img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/image/group_2.png?v={{Msg "seo" "version"}}" alt="">
-                            <p>每天最多接收 2000 条</p>
-                        </div>
-                        <div class="grid_item">
-                            <img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/image/group_3.png?v={{Msg "seo" "version"}}" alt="">
-                            <p>数据周报、月报</p>
-                        </div>
-                        <div class="grid_item">
-                            <img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/image/group_4.png?v={{Msg "seo" "version"}}" alt="">
-                            <p>订阅区域精确到市</p>
+                        <div class="c-tbody">
+                            <div class="row">
+                                <span class="column column-l">匹配单次公告信息</span>
+                                <span class="column column-r">
+                                    <p class="col-hd">匹配项目信息</p>
+                                    <p class="col-bd">根据你的订阅，为你推送所匹配项目后续的全部动态</p>
+                                </span>
+                            </div>
+                            <div class="row">
+                                <span class="column column-l">-</span>
+                                <span class="column column-r">
+                                    <p class="col-hd">按行业订阅</p>
+                                    <p class="col-bd">不知道如何设置关键词的时候，也可以按行业订阅</p>
+                                </span>
+                            </div>
+                            <div class="row">
+                                <span class="column column-l">-</span>
+                                <span class="column column-r">
+                                    <p class="col-hd">中标企业联系方式</p>
+                                    <p class="col-bd">招标公告与国家企业公式2种提取模式，让你直击企业</p>
+                                </span>
+                            </div>
+                            <div class="row">
+                                <span class="column column-l">最多10组关键词</span>
+                                <span class="column column-r">
+                                    <p class="col-hd">最多300组关键词</p>
+                                    <p class="col-bd">更多关键词，招标信息更全面</p>
+                                </span>
+                            </div>
+                            <div class="row">
+                                <span class="column column-l">仅支持标题匹配</span>
+                                <span class="column column-r">
+                                    <p class="col-hd">支持标题匹配+全文匹配</p>
+                                    <p class="col-bd">关键词匹配标题或全文 任你选</p>
+                                </span>
+                            </div>
+                            <div class="row">
+                                <span class="column column-l">订阅区域精确到省</span>
+                                <span class="column column-r">
+                                    <p class="col-hd">订阅区域精确到市</p>
+                                    <p class="col-bd">只看你最关注的招标信息</p>
+                                </span>
+                            </div>
+                            <!-- <div class="row">
+                                <span class="column column-l">-</span>
+                                <span class="column column-r">
+                                    <p class="col-hd">数据周报、月报</p>
+                                    <p class="col-bd">每周、每月推送你的订阅数据统计报告，帮助你全面掌握行业市场动态</p>
+                                </span>
+                            </div> -->
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="group">
-                <div class="group_title">
-                    <img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/image/group_title.png?v={{Msg "seo" "version"}}" alt="">
-                    <span>整体服务对比</span>
-                    <img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/image/group_title.png?v={{Msg "seo" "version"}}" class="pic_mark"
-                         alt="">
-                </div>
-                <div class="group_cont">
-                    <table class="table" cellpadding="0" cellspacing="0">
-                        <thead>
-                        <tr>
-                            <th class="free">免费版</th>
-                            <th class="prop">VIP订阅专属服务</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr>
-                            <td>
-                                <p class="miantitle">匹配单次公告信息</p>
-                            </td>
-                            <td>
-                                <p class="miantitle">匹配项目信息</p>
-                                <p class="subtitle">根据你的订阅，为你推送所匹配项目后续的全部动态</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <p class="miantitle">-</p>
-                            </td>
-                            <td>
-                                <p class="miantitle">按行业订阅</p>
-                                <p class="subtitle">不知道如何设置关键词的时候，也可以按行业订阅</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <p class="miantitle">-</p>
-                            </td>
-                            <td>
-                                <p class="miantitle">中标企业联系方式</p>
-                                <p class="subtitle">招标公告与国家企业公式2种提取模式，让你直击企业</p>
-                            </td>  
-                        </tr>
-                        <tr>
-                            <td>
-                                <p class="miantitle">最多<em style="color: #2CB7CA">10</em>组关键词</p>
-                            </td>
-                            <td>
-                                <p class="miantitle">最多<em style="color: #2CB7CA">300</em>组关键词</p>
-                                <p class="subtitle">更多关键词，招标信息更全面</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <p class="miantitle">仅支持标题匹配</p>
-                            </td>
-                            <td>
-                                <p class="miantitle">支持标题匹配+全文匹配</p>
-                                <p class="subtitle">关键词匹配标题或全文 任你选</p>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <p class="miantitle">订阅区域精确到省</p>
-                            </td>
-                            <td>
-                                <p class="miantitle">订阅区域精确到市</p>
-                                <p class="subtitle">只看你最关注的招标信息</p>
-                            </td>
-                        </tr>
-                        <!--
-                        <tr>
-                            <td>
-                                <p class="miantitle">-</p>
-                            </td>
-                            <td>
-                                <p class="miantitle">数据周报、月报</p>
-                                <p class="subtitle">每周、每月推送你的订阅数据统计报告，帮助你全面掌握行业市场动态</p>
-                            </td>
-                        </tr>
-                        -->
-                        </tbody>
-                    </table>
-                </div>
-            </div>
         </div>
-        <div class="menu">
-            <!-- {{.T.notShowTrial}} -->
-            <!-- {{if not .T.notShowTrial }}
-            <div class="j-button-group">
-                <a onclick="window.location.replace('/jyapp/vipsubscribe/trialInfo')" class="try_btn j-button-cancel1">试用7天</a>
-                <a onclick="window.location.replace('/jyapp/vipsubscribe/vipsubscribe_new')" class="subscribe_btn j-button-confirm1">去订阅</a>
-            </div>
-             {{else}}
-            <div class="j-footer" style="width: 100%;">
-                <a onclick="window.location.replace('/jyapp/vipsubscribe/vipsubscribe_new')" class="subscribe_btn j-button">去订阅</a>
-            </div>
-            {{end}} -->
-            <script>
-              var phone = {{session "s_phone"}}
-              if(phone=="18613717801"){
-                document.write('<div style="color: #2CB7CA;border-top: 1px solid #ddd;font-size: .33rem;background-color: #fff;position: absolute;left: 0px;right: 0px;top: 0px;bottom: 0px;text-align: center;">详情请咨询<span style="font-size: .28rem;padding-left: 10px;">zhengkun@topnet.net.cn</span></div>');
-              }else{
-                var html = "";
-                {{if not .T.notShowTrial}}
-                  html += '<div class="j-button-group"><a onclick="window.location.replace(\'/jyapp/vipsubscribe/trialInfo\')" class="try_btn j-button-cancel1">试用7天</a><a onclick="window.location.replace(\'/jyapp/vipsubscribe/vipsubscribe_new\')" class="subscribe_btn j-button-confirm1">去订阅</a> </div>';
-                {{else}}
-                  html += '<div class="j-footer" style="width: 100%;"><a onclick="window.location.replace(\'/jyapp/vipsubscribe/vipsubscribe_new\')" class="subscribe_btn j-button">去订阅</a></div>';
-                {{end}}
-                document.write(html);
-              }
-            </script>
+    </div>
+    <div class="vip-footer-container">
+        <div class="vip-intro-footer">
+            {{if not .T.notShowTrial}}
+            <span class="vi-footer-l" id="vip-free-7days" onclick="window.location.replace('/jyapp/vipsubscribe/trialInfo')">
+                <span class="text">试用7天</span>
+            </span>
+            {{end}}
+            <span class="vi-footer-r" id="vip-introduce" onclick="window.location.replace('/jyapp/vipsubscribe/vipsubscribe_new')">
+                <span class="text">开通 超级订阅</span>
+            </span>
         </div>
     </div>
 </div>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}"></script>
+<script>
+    // 头部返回按钮事件
+    $('.j-header .header-left').on('click', function () {
+        window.history.back()
+    })
+
+    // 头部滚动事件
+    $('.j-main .main').on('scroll', function () {
+        var headerDOM = $('.j-header.jy-app-header')
+        var scrollTop = this.scrollTop
+
+        // 是否有header-transparent这个类名
+        var hasClassT = headerDOM.hasClass('transparent-header')
+
+        if(scrollTop >= 75) {
+            if (!hasClassT) return
+            headerDOM.removeClass('transparent-header')
+        }else {
+            if (hasClassT) return
+            headerDOM.addClass('transparent-header')
+        }
+    })
+</script>
+
 {{include "/common/baiducc.html"}}
 </body>
 </html>

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

@@ -131,9 +131,9 @@
                     -->
                     <div class="vip_prise_table">
                         <table class="monthly">
-                            <caption class="table_title">- VIP订阅价格 -</caption>
+                            <caption class="table_title b-line">超级订阅价格</caption>
                             <tr>
-                                <td colspan="2">按月购买</td>
+                                <td class="table-label" colspan="2">按月购买</td>
                             </tr>
                             <tr>
                                 <td><span>5.8</span>元 月/市/行业</td>
@@ -150,7 +150,7 @@
                         </table>
                         <table class="yearly">
                             <tr>
-                                <td colspan="2">按年购买</td>
+                                <td class="table-label" colspan="2">按年购买</td>
                             </tr>
                             <tr>
                                 <td><span>58</span>元 年/市/行业</td>
@@ -166,7 +166,7 @@
                             </tr>
                         </table>
                         <dl class="tips">
-                            <dt>购买须知：</dt>
+                            <dt class="b-line">购买须知</dt>
                             <dd>套餐周期内，不支持套餐降级，续费可降级；</dd>
                             <dd>用户最多购买/续费3年套餐；</dd>
                             <dd>支持套餐升级，补差价（按月进行补差价，不足一个月按一个月计算)。</dd>

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

@@ -374,7 +374,7 @@
             $.post("/jyapp/myinfo?t="+new Date().getTime(),null,function(r){
               if(r.userType=="vip"){
                 $(".switch").addClass("only-vip");
-                $(".switch").text("VIP订阅").show();
+                $(".switch").text("超级订阅").show();
                 $(".switch").click(tosetpage);
                 thisClass.InitVip(r);
 				        extend(1);
@@ -965,7 +965,7 @@
       {{if and (not .T.isIosExam) (not .T.isIosExamPhone)}}
   		<div class="header_header" style="height: 60px;display:none;transition: all 0.1s;">
   			<div class="only-personal" style="position: absolute;top: .2rem;left: 4%;background-image: url(/jyapp/vipsubscribe/image/entback.png?v=51430);background-size: 100%;background-repeat: no-repeat;border-radius: 8px;width: 92%;display: flex;align-items: center;justify-content: space-between;height: 44px;">
-  				<img style="width: 20px;height: 20px; margin-left: .3rem;" src="/jyapp/vipsubscribe/image/Vector.png?t=1">
+  				<img style="width: 20px;height: 20px; margin-left: .3rem;" src="/jyapp/vipsubscribe/image/vip-icon.png?v=1">
   				<span style="color:#fff;font-weight: bold;font-size: 15px;text-align: left;width: 4.1rem;">300 组关键词特权</span>
   				<span class="switch_ext" id="app-historypush-vipSub-banner" style="border-radius: 32px;display: flex;flex-direction: row;padding: 3px 12px;font-size: 12px;color: #FAE7CA;margin-right: .2rem;background: linear-gradient(to bottom, #F1D090 0%, #FAE7CA 100%);color: #33323A;font-family: PingFang SC;font-size: 12px;line-height: 18px;letter-spacing: 0px;text-align: center;">免费试用</span>
   			</div>
@@ -1029,7 +1029,7 @@
             <div class="open_remind" style="display: none;">
                 <div class="remind_box">
                     <div class="remind_text">
-                        本次推送已达150条信息上限！开通VIP订阅，支持每天最多推送2000条信息
+                        本次推送已达150条信息上限！开通超级订阅，支持每天最多推送2000条信息
                     </div>
                     <a onclick="tointroducepage()" class="remind_btn" style="text-decoration: none;">了解详情</a>
                 </div>
@@ -1041,8 +1041,8 @@
             <div class="renew_toast" style="display: none;">
                 <div>
                     <i class="icon iconfont" id="close_renew">&#xe61a;</i>
-                    <span class="other">VIP订阅服务还有 <span class="isExpire"></span> 天到期，请及时续费！</span>
-                    <span class="today" style="display:none;">VIP订阅服务今天到期，请及时续费！</span>
+                    <span class="other">超级订阅服务还有 <span class="isExpire"></span> 天到期，请及时续费！</span>
+                    <span class="today" style="display:none;">超级订阅服务今天到期，请及时续费！</span>
                     <a onclick="torepay()">去续费</a>
                 </div>
             </div>
@@ -1050,8 +1050,8 @@
             <div class="_renew_toast" style="display: none;">
                 <div>
                     <i class="icon iconfont" id="_close_renew">&#xe61a;</i>
-                    <span class="other">VIP订阅服务还有 <span class="isExpire"></span> 天到期，请及时购买！</span>
-                    <span class="today" style="display:none;">VIP订阅服务今天到期，请及时购买！</span>
+                    <span class="other">超级订阅服务还有 <span class="isExpire"></span> 天到期，请及时购买！</span>
+                    <span class="today" style="display:none;">超级订阅服务今天到期，请及时购买！</span>
                     <a onclick="topay()">去购买</a>
                 </div>
             </div>
@@ -1059,7 +1059,7 @@
             <div class="nv_renew_toast" style="display: none;">
                 <div>
                     <i class="icon iconfont" id="nv_close_renew">&#xe61a;</i>
-                    <span>VIP订阅服务试用已过期，请及时购买！</span>
+                    <span>超级订阅服务试用已过期，请及时购买！</span>
                     <a onclick="topay()">去购买</a>
                 </div>
             </div>
@@ -1089,7 +1089,7 @@
     </div>
 </div>
 <!--弹窗 其他采购单位-->
-<div class="jy-alert jy-alert-other" style="display:none"> <div class="weui-mask weui-animate-fade-in"></div> <div class="weui-dialog weui-animate-fade-in">  <div class="weui-dialog__hd"><strong class="weui-dialog__title">提 示</strong></div>  <div class="weui-dialog__bd">每条信息的采购单位行业属性由机器自动识别，会存在少数无法识别的情况，此时将归类为“其它”。如无需订阅，可在VIP订阅设置内手动关闭。(注：当采购单位行业选择为全部时，关闭无效)</div> <div class="weui-dialog__ft">  <a href="javascript:;" onclick="close_other()" class="weui-dialog__btn weui-dialog__btn_">我知道了</a>  </div> </div> </div>
+<div class="jy-alert jy-alert-other" style="display:none"> <div class="weui-mask weui-animate-fade-in"></div> <div class="weui-dialog weui-animate-fade-in">  <div class="weui-dialog__hd"><strong class="weui-dialog__title">提 示</strong></div>  <div class="weui-dialog__bd">每条信息的采购单位行业属性由机器自动识别，会存在少数无法识别的情况，此时将归类为“其它”。如无需订阅，可在超级订阅设置内手动关闭。(注：当采购单位行业选择为全部时，关闭无效)</div> <div class="weui-dialog__ft">  <a href="javascript:;" onclick="close_other()" class="weui-dialog__btn weui-dialog__btn_">我知道了</a>  </div> </div> </div>
 <!-- 行业合并弹窗-->
 <div class="js_dialog merge" id="merge_dialog" style="display: none">
     <div class="weui-mask merge-dialog"></div>
@@ -1373,7 +1373,7 @@
             if(r.data.vip[0]&&r.data.vip[0]){
               //两个账户都为vip
               tipTime+=86400000*29  //如果是vip每月提示一次
-              showText='<em style="color:#2ABED1">手机号：'+r.data.phone+'、微信号：'+r.data.nickname+'</em><br> 且分别购买VIP订阅，账号暂时无法合并。您可等待任意账号下VIP订阅功能到期后，到剑鱼标讯“我的”中进行账号合并操作。</div>'
+              showText='<em style="color:#2ABED1">手机号：'+r.data.phone+'、微信号：'+r.data.nickname+'</em><br> 且分别购买超级订阅，账号暂时无法合并。您可等待任意账号下超级订阅功能到期后，到剑鱼标讯“我的”中进行账号合并操作。</div>'
               $(".dialog_alert .common_btn").text("确定");
             }
           }

src/web/staticres/css/subscribe.css

@@ -70,7 +70,7 @@
 .subscription .sub-center .sub-vip {
     width: 402px;
     height: 250px;
-    background: url('/images/subscribe/vip.png') no-repeat;
+    background: url(/vipsubscribe/image/vip-icon.png) no-repeat;
     background-position-x: center;
     /* margin-left: 54px; */
 }

src/web/staticres/vipsubscribe/css/trial_info.css

@@ -131,6 +131,7 @@
 }
 
 .trial_info .trial_body .explain {
+  padding-bottom: 18px;
   color: #CFAD89;
 }
 

src/web/staticres/vipsubscribe/css/vip_purchase.css

@@ -408,8 +408,7 @@ html, body {
 }
 
 .radio-form .weui-check + .weui-icon-checked:before {
-    font-size: 16px;
-    margin-top: -3px;
+  font-size: 20px;
 }
 
 .radio-form .weui-check:checked + .weui-icon-checked:before {
@@ -485,7 +484,7 @@ html, body {
 
 .vip_purchase .choose_condition .chooseList .choose_item a .info::placeholder,
 .vip_purchase .choose_condition .pay_mode .choose_item a .info::placeholder {
-    color: #000;
+  color: #9B9CA3;
 }
 
 .choose_item input:disabled, .choose_item input[disabled] {
@@ -495,7 +494,7 @@ html, body {
 .vip_purchase .choose_condition .chooseList .choose_item a i.iconfont,
 .vip_purchase .choose_condition .pay_mode .choose_item a i.iconfont {
     float: right;
-    color: #707070;
+    color: #C0C4CC;
 }
 
 .vip_purchase .choose_condition .chooseList .choose_item .add_tips,
@@ -520,7 +519,7 @@ html, body {
 .vip_purchase .choose_condition .chooseList .free-7day .info,
 .vip_purchase .choose_condition .pay_mode .free-7day .info {
     margin-right: .2rem;
-    color: #686868;
+    color: #9B9CA3;
 }
 
 .vip_purchase .choose_condition .chooseList {
@@ -542,11 +541,40 @@ html, body {
     flex-direction: column;
     justify-content: center;
     text-align: center;
+    font-size: .26rem;
+    color: #5F5E64;
+}
+
+.b-line {
+  position: relative;
+  margin-left: .18rem;
+  font-size: .3rem;
+  color: #171826;
+}
+
+.b-line:before {
+  content: '';
+  position: absolute;
+  left: -0.18rem;
+  top: 50%;
+  width: .06rem;
+  height: .32rem;
+  background-color: #2ABED1;
+  transform: translateY(-50%);
+  border-radius: .06rem;
+}
+
+.table-label {
+  font-size: .28rem;
+  color: #5F5E64;
+  line-height: .4rem;
+  font-weight: 700;
 }
 
 .vip_purchase .choose_condition .vip_rules .vip_prise_table .table_title {
     margin-bottom: .3rem;
     margin-top: .3rem;
+    text-align: left;
 }
 
 .vip_purchase .choose_condition .vip_rules .vip_prise_table table {

src/web/templates/weixin/historypush.html

@@ -5,7 +5,7 @@
     <meta HTTP-EQUIV="Cache-Control" CONTENT="no-cache, must-revalidate">
     <meta HTTP-EQUIV="expires" CONTENT="0">
     {{/*{{if .T.isVip}}*/}}
-    {{/*<title>VIP订阅</title>*/}}
+    {{/*<title>超级订阅</title>*/}}
     {{/*{{else}}*/}}
     {{/*<title>标讯订阅</title>*/}}
     {{/*{{end}}*/}}
@@ -393,7 +393,7 @@
                 $('.wx_header').show();
                 // $(".vip_set").show();
                 // TODO vip
-                $(".switch").addClass("only-vip");$(".switch").text("VIP订阅").show();
+                $(".switch").addClass("only-vip");$(".switch").text("超级订阅").show();
                 $(".switch").click(tosetpage);
                 // thisClass.InitVip(r);
                 // extend(1);
@@ -1051,7 +1051,7 @@
             background-repeat: no-repeat;
             background-position: center;
             margin-right: 5px;
-            background-image: url(/vip/vip.png);
+            background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAANpSURBVHgB7VdNTttAFH5jxyZIXaS70iKRnKBhE1p1AZyg7QkwJ4CeoOQEwAmAEwAnwCwq1IBKbpC0lQjtBi8qQW3PTN9z7MgEz9jgdJcvijyen+dv5v0OwBRTTKEFgwngdnBWN8HcQ2lNkFDDLpcDX5+de9uHkihNMCLHzMuYWFqy54fB6rP5d10oAQNKwjTMzw/IEbDPNq1tKInSBJHIB+UYqbwkyhP8z5jECXY1Y0dQEqUJkrfio58x1MexNpREJf0S/DxfAQveSymbjLFuKMPdSYQKHWTvshZWww3BRJNJ5vk82E17/ijMhIOLNQFif2w9ncKqiuSf31+aNrcOsVmHbGjXx/HzZHy9kOJT9eWbnRFB2kUwG/QywwUGXXuutZruSHYtQW5BATBgWyGEB+NE/V+dPRDgZCzwrFurwRqLXkSQVCsr8kT1ASTIbntndcu0mtKWy0jMUWxGx9IjpzEC41gYom/Pt7r+dedGJUcK+XHm1dJRZIO4oMY0ScUfdGQ0D38g4WkYEnGEJZxYplYWcvLoGRG0fdtFFXuPPpUE8engrr+Pugy2gI8VUNunDv3qXbU7FB0DDdbBnLr9KJJITHK5TqrIGs6x7UIy7+mVvMoQhoO7X4bh7vXgsI62tD9aj3aatGcbQ4dAVfagyCliwJdMHlMkSTtTpuHF7t/Lk2ndWc/J06gdXJ9vY/zcvDdhqPpCpxeHI3e8PzOTRDsg4TlIyBEouD+YUFS1+K0sckqCkWwujyEH8urbQtKOUp6EXWy68EgIIU5VY2qCTOYWmqERjFRKp26/bG1SUKe4SSqD4mSV85TBr6gdAhUKHNrc5G5WSvOvOjv4lQ2dAMy/i6rKW1vyF/ZASJEd3kfaCdkCG+3jiTdUg/pyS0KuHY6hjn8Hq5KdpKNANeTqBrUEOeNPuvAYzLgpPJnDqW64ohvEdHMUVIM9tezIEQCDe43yedz2KHUmc6JCRJN0yXZBg9xrp84O04E6C6p6L/X1rv2itQgaaE8wAtmhwguDmeAk/HHRxpDk0Z8H3DMtk06yySrsdW5ZprvPFCWIGcLF8j87TOC1Esunw+TVNM30OsiVLfKTQe6lKW1Pk0YR2bkEycZQVQcwaWBa1Nnv6PtQEH8HX/ex6l6DCYA2PDO35MAUU0xRHv8Al8ebBRh7GtgAAAAASUVORK5CYII=);
         }
         ._header .wx_header .wx_header_right {
             line-height: 56px;
@@ -1358,13 +1358,13 @@
         <div class="box">
             {{if .T.LiveState}}
               <div class="left">
-                  <img src="/vip/Vector.png?t=1" alt="v">
-                  <h4>VIP订阅6折 仅一次</h4>
+                  <img src="/vipsubscribe/image/vip-icon.png">
+                  <h4>超级订阅6折 仅一次</h4>
               </div>
               <a onclick="toLivePage()" class="right freeuse" style="text-decoration: none;background: linear-gradient(270deg, #F1D090 0%, #FAE7CA 100%)">限时抢</a>
             {{else}}
             <div class="left">
-                <img src="/vip/Vector.png?t=1" alt="v">
+                <img src="/vipsubscribe/image/vip-icon.png">
                 <h4>300组关键词特权</h4>
             </div>
             <a onclick="tointroducepage()" id="app-historypush-vipSub-topBanner" class="right freeuse" style="text-decoration: none;background: linear-gradient(270deg, #F1D090 0%, #FAE7CA 100%)">免费试用</a>
@@ -1414,8 +1414,8 @@
         <div class="renew_toast" style="display: none;">
             <div>
                 <i class="icon iconfont" id="close_renew">&#xe61a;</i>
-                <span class="other">VIP订阅服务还有 <span class="isExpire"></span> 天到期，请及时续费！</span>
-                <span class="today" style="display:none;">VIP订阅服务今天到期，请及时续费！</span>
+                <span class="other">超级订阅服务还有 <span class="isExpire"></span> 天到期，请及时续费！</span>
+                <span class="today" style="display:none;">超级订阅服务今天到期，请及时续费！</span>
                 <a onclick="torepay()">去续费</a>
             </div>
         </div>
@@ -1423,8 +1423,8 @@
         <div class="_renew_toast" style="display: none;">
             <div>
                 <i class="icon iconfont" id="_close_renew">&#xe61a;</i>
-                <span class="other">VIP订阅服务还有 <span class="isExpire"></span> 天到期，请及时购买！</span>
-                <span class="today" style="display:none;">VIP订阅服务今天到期，请及时购买！</span>
+                <span class="other">超级订阅服务还有 <span class="isExpire"></span> 天到期，请及时购买！</span>
+                <span class="today" style="display:none;">超级订阅服务今天到期，请及时购买！</span>
                 <a onclick="topay()">去购买</a>
             </div>
         </div>
@@ -1432,7 +1432,7 @@
         <div class="nv_renew_toast" style="display: none;">
             <div>
                 <i class="icon iconfont" id="nv_close_renew">&#xe61a;</i>
-                <span>VIP订阅试用已到期，￥5.8立享特权</span>
+                <span>超级订阅试用已到期，￥5.8立享特权</span>
                 <a onclick="topay()">去购买</a>
             </div>
         </div>
@@ -1473,7 +1473,7 @@
       </div>
   </div>
 </div><!--弹窗 其他采购单位-->
-<div class="jy-alert jy-alert-other" style="display: none;"> <div class="weui-mask weui-animate-fade-in"></div> <div class="weui-dialog weui-animate-fade-in">  <div class="weui-dialog__hd"><strong class="weui-dialog__title">提 示</strong></div>  <div class="weui-dialog__bd">每条信息的采购单位行业属性由机器自动识别，会存在少数无法识别的情况，此时将归类为“其它”。如无需订阅，可在VIP订阅设置内手动关闭。(注：当采购单位行业选择为全部时，关闭无效)</div> <div class="weui-dialog__ft">  <a href="javascript:;" onclick="close_other()" class="weui-dialog__btn weui-dialog__btn_">我知道了</a>  </div> </div> </div>
+<div class="jy-alert jy-alert-other" style="display: none;"> <div class="weui-mask weui-animate-fade-in"></div> <div class="weui-dialog weui-animate-fade-in">  <div class="weui-dialog__hd"><strong class="weui-dialog__title">提 示</strong></div>  <div class="weui-dialog__bd">每条信息的采购单位行业属性由机器自动识别，会存在少数无法识别的情况，此时将归类为“其它”。如无需订阅，可在超级订阅设置内手动关闭。(注：当采购单位行业选择为全部时，关闭无效)</div> <div class="weui-dialog__ft">  <a href="javascript:;" onclick="close_other()" class="weui-dialog__btn weui-dialog__btn_">我知道了</a>  </div> </div> </div>
 <!-- 行业合并弹窗-->
 <div class="js_dialog merge" id="merge_dialog" style="display: none">
     <div class="weui-mask merge-dialog"></div>
@@ -1686,7 +1686,7 @@
             if(r.data.vip[0]&&r.data.vip[0]){
               //两个账户都为vip
               tipTime+=86400000*29  //如果是vip每月提示一次
-              showText='<em style="color:#2ABED1">手机号：'+r.data.phone+'、微信号：'+r.data.nickname+'</em><br> 且分别购买VIP订阅，账号暂时无法合并。您可等待任意账号下VIP订阅功能到期后，到剑鱼标讯“我的”中进行账号合并操作。</div>'
+              showText='<em style="color:#2ABED1">手机号：'+r.data.phone+'、微信号：'+r.data.nickname+'</em><br> 且分别购买超级订阅，账号暂时无法合并。您可等待任意账号下超级订阅功能到期后，到剑鱼标讯“我的”中进行账号合并操作。</div>'
               $(".dialog_alert .common_btn").text("确定");
             }
           }

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

@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="utf-8">
-    <title>VIP订阅-完善个人信息</title>
+    <title>超级订阅</title>
     <meta name="viewport"
           content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
     <meta name="apple-mobile-web-app-capable" content="yes">
@@ -12,6 +12,7 @@
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" href="/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="/css/wxbutton.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="/vipsubscribe/css/trial_info.css?v={{Msg "seo" "version"}}">
 </head>
 
@@ -71,9 +72,9 @@
             </div>
         </div>
     </form>
-    <div class="trial_btn">
+    <div class="trial_btn j-footer">
         <!-- 未完善个人信息展示的按钮 type类型为submit-->
-        <button class="btn" type="submit">立即免费试用</button>
+        <button class="j-button btn" type="submit">立即免费试用</button>
         <!-- 已完善过个人信息 展示的按钮 type类型为button -->
     </div>
 </div>

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

@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -14,166 +15,121 @@
     <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"}}">
 </head>
+
 <body>
-    <div class="vip_introduce">
-        <div class="main">
-            <div class="banner">
-                {{if .T.LiveState}}
-                <div class="banner_screen">
-                    <h3 class="name" style="text-align:center;">VIP 订阅限时6折<br>全年仅此一次</h3>
-                    <p class="introduce">抢购时间：7月7日 20:00-14日 20:00</p>
-                </div>
-                {{else}}
-                <div class="banner_screen">
-                    <h3 class="name">VIP 订阅专属服务</h3>
-                    <p class="introduce">VIP subscription service</p>
-                </div>
-                {{end}}
-            </div>
-            <div class="group">
-                <div class="group_title">
-                    <img src="/vipsubscribe/image/group_title.png?v={{Msg "seo" "version"}}" alt="">
-                    <span>VIP订阅服务特权</span>
-                    <img src="/vipsubscribe/image/group_title.png?v={{Msg "seo" "version"}}" class="pic_mark" alt="">
-                </div>
-                <div class="group_cont">
-                    <div class="grid">
-                        <div class="grid_item">
-                            <img src="/vipsubscribe/image/group_1.png?v={{Msg "seo" "version"}}" alt="">
-                            <p>最多 300 组关键词</p>
-                        </div>
-                        <div class="grid_item">
-                            <img src="/vipsubscribe/image/group_2.png?v={{Msg "seo" "version"}}" alt="">
-                            <p>每天最多接收 2000 条</p>
-                        </div>
-                        <div class="grid_item">
-                            <img src="/vipsubscribe/image/group_3.png?v={{Msg "seo" "version"}}" alt="">
-                            <p>数据周报、月报</p>
-                        </div>
-                        <div class="grid_item">
-                            <img src="/vipsubscribe/image/group_4.png?v={{Msg "seo" "version"}}" alt="">
-                            <p>订阅区域精确到市</p>
-                        </div>
-                    </div>  
+    <div class="j-container">
+        <div class="j-main vip_introduce">
+            <div class="main">
+                <div class="banner power group">
+                    <div class="group-title">
+                        <span class="title-text line-title">超级订阅服务特权</span>
+                        <span class="title-bg-text">DINGYUEFUWU</span>
+                    </div>
+                    <div class="group-content grid">
+                        <span class="grid-item">
+                            <span class="circle-icon circle-icon-1"></span>
+                            <p class="item-desc">最多 300 组关键词</p>
+                        </span>
+                        <span class="grid-item">
+                            <span class="circle-icon circle-icon-2"></span>
+                            <p class="item-desc">每天最多接收 2000 条</p>
+                        </span>
+                        <span class="grid-item">
+                            <span class="circle-icon circle-icon-3"></span>
+                            <p class="item-desc">数据周报、月报</p>
+                        </span>
+                        <span class="grid-item">
+                            <span class="circle-icon circle-icon-4"></span>
+                            <p class="item-desc">订阅区域精确到市</p>
+                        </span>
+                    </div>
                 </div>
-            </div>
-            <div class="group">
-                    <div class="group_title">
-                        <img src="/vipsubscribe/image/group_title.png?v={{Msg "seo" "version"}}" alt="">
-                        <span>整体服务对比</span>
-                        <img src="/vipsubscribe/image/group_title.png?v={{Msg "seo" "version"}}" class="pic_mark" alt="">
+                <div class="comparison group">
+                    <div class="group-title">
+                        <span class="title-text line-title">整体服务对比</span>
+                        <span class="title-bg-text">FUWUDUIBI</span>
                     </div>
-                    <div class="group_cont">
-                        <table class="table"  cellpadding="0" cellspacing="0">
-                            <thead>
-                                <tr>
-                                    <th class="free">免费版</th>
-                                    <th class="prop">VIP订阅专属服务</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr>
-                                    <td>
-                                        <p class="miantitle">匹配单次公告信息</p>
-                                    </td>
-                                    <td>
-                                        <p class="miantitle">匹配项目信息</p>
-                                        <p class="subtitle">根据你的订阅，为你推送所匹配项目后续的全部动态</p>
-                                    </td>  
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <p class="miantitle">-</p>
-                                    </td>
-                                    <td>
-                                        <p class="miantitle">按行业订阅</p>
-                                        <p class="subtitle">不知道如何设置关键词的时候，也可以按行业订阅</p>
-                                    </td>  
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <p class="miantitle">-</p>
-                                    </td>
-                                    <td>
-                                        <p class="miantitle">中标企业联系方式</p>
-                                        <p class="subtitle">招标公告与国家企业公式2种提取模式，让你直击企业</p>
-                                    </td>  
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <p class="miantitle">最多<em style="color: #2CB7CA">10</em>组关键词</p>
-                                    </td>
-                                    <td>
-                                        <p class="miantitle">最多<em style="color: #2CB7CA">300</em>组关键词</p>
-                                        <p class="subtitle">更多关键词，招标信息更全面</p>
-                                    </td>  
-                                </tr>
-                                 <tr>
-                                    <td>
-                                        <p class="miantitle">仅支持标题匹配</p>
-                                    </td>
-                                    <td>
-                                        <p class="miantitle">支持标题匹配+全文匹配</p>
-                                        <p class="subtitle">关键词匹配标题或全文 任你选</p>
-                                    </td>  
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <p class="miantitle">订阅区域精确到省</p>
-                                    </td>
-                                    <td>
-                                        <p class="miantitle">订阅区域精确到市</p>
-                                        <p class="subtitle">只看你最关注的招标信息</p>
-                                    </td>  
-                                </tr>
-                                <!--
-                                <tr>
-                                    <td>
-                                        <p class="miantitle">-</p>
-                                    </td>
-                                    <td>
-                                        <p class="miantitle">数据周报、月报</p>
-                                        <p class="subtitle">每周、每月推送你的订阅数据统计报告，帮助你全面掌握行业市场动态</p>
-                                    </td>  
-                                </tr>
-                                -->
-                            </tbody>
-                        </table>
+                    <div class="group-content">
+                        <div class="table">
+                            <div class="c-thead row">
+                                <span class="free column column-l">免费版</span>
+                                <span class="prop column column-r color-deep-gold">超级订阅专属服务</span>
+                            </div>
+                            <div class="c-tbody">
+                                <div class="row">
+                                    <span class="column column-l">匹配单次公告信息</span>
+                                    <span class="column column-r">
+                                        <p class="col-hd">匹配项目信息</p>
+                                        <p class="col-bd">根据你的订阅，为你推送所匹配项目后续的全部动态</p>
+                                    </span>
+                                </div>
+                                <div class="row">
+                                    <span class="column column-l">-</span>
+                                    <span class="column column-r">
+                                        <p class="col-hd">按行业订阅</p>
+                                        <p class="col-bd">不知道如何设置关键词的时候，也可以按行业订阅</p>
+                                    </span>
+                                </div>
+                                <div class="row">
+                                    <span class="column column-l">-</span>
+                                    <span class="column column-r">
+                                        <p class="col-hd">中标企业联系方式</p>
+                                        <p class="col-bd">招标公告与国家企业公式2种提取模式，让你直击企业</p>
+                                    </span>
+                                </div>
+                                <div class="row">
+                                    <span class="column column-l">最多10组关键词</span>
+                                    <span class="column column-r">
+                                        <p class="col-hd">最多300组关键词</p>
+                                        <p class="col-bd">更多关键词，招标信息更全面</p>
+                                    </span>
+                                </div>
+                                <div class="row">
+                                    <span class="column column-l">仅支持标题匹配</span>
+                                    <span class="column column-r">
+                                        <p class="col-hd">支持标题匹配+全文匹配</p>
+                                        <p class="col-bd">关键词匹配标题或全文 任你选</p>
+                                    </span>
+                                </div>
+                                <div class="row">
+                                    <span class="column column-l">订阅区域精确到省</span>
+                                    <span class="column column-r">
+                                        <p class="col-hd">订阅区域精确到市</p>
+                                        <p class="col-bd">只看你最关注的招标信息</p>
+                                    </span>
+                                </div>
+                                <!-- <div class="row">
+                                <span class="column column-l">-</span>
+                                <span class="column column-r">
+                                    <p class="col-hd">数据周报、月报</p>
+                                    <p class="col-bd">每周、每月推送你的订阅数据统计报告，帮助你全面掌握行业市场动态</p>
+                                </span>
+                            </div> -->
+                            </div>
+                        </div>
                     </div>
                 </div>
+            </div>
         </div>
-        <div class="menu">
-            <!-- {{if not .T.notShowTrial }}
-            <div class="j-button-group">
-                <a onclick="window.location.replace('/front/vipsubscribe/trialInfo')" class="try_btn j-button-cancel1">试用7天</a>
-                <a onclick="window.location.replace('/front/vipsubscribe/vipsubscribe_new')"  class="subscribe_btn j-button-confirm1">去订阅</a>
+        <div class="vip-footer-container">
+            <div class="vip-intro-footer">
+                {{if not .T.notShowTrial}}
+                <span class="vi-footer-l" onclick="window.location.replace('/jyapp/vipsubscribe/trialInfo')">
+                    <span class="text">试用7天</span>
+                </span>
+                {{end}}
+                <span class="vi-footer-r" onclick="window.location.replace('/jyapp/vipsubscribe/vipsubscribe_new')">
+                    <span class="text">开通 超级订阅</span>
+                </span>
             </div>
-            {{else}}
-            <div class="j-footer" style="width: 100%;">
-                <a onclick="window.location.replace('/front/vipsubscribe/vipsubscribe_new')"  class="subscribe_btn j-button">去订阅</a>
-            </div> -->
-            <!-- {{end}} -->
-            <script>
-                var phone = {{session "s_phone"}}
-                if(phone=="18613717801"){
-                  document.write('<div style="color: #2CB7CA;border-top: 1px solid #ddd;font-size: .33rem;background-color: #fff;position: absolute;left: 0px;right: 0px;top: 0px;bottom: 0px;text-align: center;">详情请咨询<span style="font-size: .28rem;padding-left: 10px;">zhengkun@topnet.net.cn</span></div>');  
-                }else{
-                  var html = "";
-                  {{if not .T.notShowTrial}}
-                    html += '<div class="j-button-group"><a onclick="window.location.replace(\'/front/vipsubscribe/trialInfo\')" class="try_btn j-button-cancel1">试用7天</a><a onclick="window.location.replace(\'/front/vipsubscribe/vipsubscribe_new\')" class="subscribe_btn j-button-confirm1">去订阅</a> </div>';
-                  {{else}}
-                    html += '<div class="j-footer" style="width: 100%;"><a onclick="window.location.replace(\'/front/vipsubscribe/vipsubscribe_new\')" class="subscribe_btn j-button">去订阅</a></div>';
-                  {{end}}
-                  document.write(html);
-                }
-            </script>
         </div>
     </div>
     {{include "/common/weixin.html"}}
     <script src="/vipsubscribe/js/share.js?v={{Msg "seo" "version"}}"></script>
     <script>
-      initShare({{.T.signature}});
+        initShare({{.T.signature }});
     </script>
-{{include "/common/baiducc.html"}}
+    {{include "/common/baiducc.html"}}
 </body>
+
 </html>

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

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport"
           content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
-    <title>VIP订阅</title>
+    <title>超级订阅</title>
     <script src="/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" href="/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
@@ -96,65 +96,77 @@
                         </div>
                     </div>
                 {{end}}
-                <div class="vip_rules">
-                    <!--
-                      <div class="auto_renew weui-cells_checkbox radio-form">
-                          <label class="weui-cell weui-check__label" for="auto-renew">
-                              <div class="weui-cell__hd">
-                                  <input type="checkbox" class="weui-check" name="autoRenewService" id="auto-renew" />
-                                  <i class="weui-icon-checked"></i>
-                              </div>
-                              <div class="weui-cell__bd read">
-                                  <p>开通自动续费，根据当前订阅条件，服务到期时系统将为您自动续费</p>
-                              </div>
-                          </label>
-                      </div>
-                    -->
-                    <div class="vip_prise_table">
-                        <table class="monthly">
-                            <caption class="table_title">- VIP订阅价格 -</caption>
-                            <tr>
-                                <td colspan="2">按月购买</td>
-                            </tr>
-                            <tr>
-                                <td><span>5.8</span>元 月/市/行业</td>
-                                <td><span>18</span>元 月/市/全行业</td>
-                            </tr>
-                            <tr>
-                                <td><span>11.8</span>元 月/省/行业</td>
-                                <td><span>38</span>元 月/省/全行业</td>
-                            </tr>
-                            <tr>
-                                <td><span>118</span>元 月/全国/行业</td>
-                                <td><span>388</span>元 月/全国/全行业</td>
-                            </tr>
-                        </table>
-                        <table class="yearly">
-                            <tr>
-                                <td colspan="2">按年购买</td>
-                            </tr>
-                            <tr>
-                                <td><span>58</span>元 年/市/行业</td>
-                                <td><span>180</span>元 年/市/全行业</td>
-                            </tr>
-                            <tr>
-                                <td><span>118</span>元 年/省/行业</td>
-                                <td><span>380</span>元 年/省/全行业</td>
-                            </tr>
-                            <tr>
-                                <td><span>1180</span>元 年/全国/行业</td>
-                                <td><span>3880</span>元 年/全国/全行业</td>
-                            </tr>
-                        </table>
-                        <dl class="tips">
-                            <dt>购买须知：</dt>
-                            <dd>套餐周期内，不支持套餐降级，续费可降级；</dd>
-                            <dd>用户最多购买/续费3年套餐；</dd>
-                            <dd>支持套餐升级，补差价（按月进行补差价，不足一个月按一个月计算)。</dd>
-                            <dd>3个市及以上即为全省，10个省及以上即为全国。4个行业及以上即为全行业。</dd>
-                            <dd>购买的采购单位行业与地域为个数，购买后可不限次数进行更换。</dd>
-                        </dl>
-                    </div>
+            {{end}}
+            <div class="vip_rules">
+                <!--
+                  <div class="auto_renew weui-cells_checkbox radio-form">
+                      <label class="weui-cell weui-check__label" for="auto-renew">
+                          <div class="weui-cell__hd">
+                              <input type="checkbox" class="weui-check" name="autoRenewService" id="auto-renew" />
+                              <i class="weui-icon-checked"></i>
+                          </div>
+                          <div class="weui-cell__bd read">
+                              <p>开通自动续费，根据当前订阅条件，服务到期时系统将为您自动续费</p>
+                          </div>
+                      </label>
+                  </div>
+                -->
+                <div class="vip_prise_table">
+                    <table class="monthly">
+                        <caption class="table_title b-line">超级订阅价格</caption>
+                        <tr>
+                            <td class="table-label" colspan="2">按月购买</td>
+                        </tr>
+                        <tr>
+                            <td><span>5.8</span>元 月/市/行业</td>
+                            <td><span>18</span>元 月/市/全行业</td>
+                        </tr>
+                        <tr>
+                            <td><span>11.8</span>元 月/省/行业</td>
+                            <td><span>38</span>元 月/省/全行业</td>
+                        </tr>
+                        <tr>
+                            <td><span>118</span>元 月/全国/行业</td>
+                            <td><span>388</span>元 月/全国/全行业</td>
+                        </tr>
+                    </table>
+                    <table class="yearly">
+                        <tr>
+                            <td class="table-label" colspan="2">按月购买</td>
+                        </tr>
+                        <tr>
+                            <td><span>58</span>元 年/市/行业</td>
+                            <td><span>180</span>元 年/市/全行业</td>
+                        </tr>
+                        <tr>
+                            <td><span>118</span>元 年/省/行业</td>
+                            <td><span>380</span>元 年/省/全行业</td>
+                        </tr>
+                        <tr>
+                            <td><span>1180</span>元 年/全国/行业</td>
+                            <td><span>3880</span>元 年/全国/全行业</td>
+                        </tr>
+                    </table>
+                    <dl class="tips">
+                        <dt class="b-line">购买须知</dt>
+                        <dd>套餐周期内，不支持套餐降级，续费可降级；</dd>
+                        <dd>用户最多购买/续费3年套餐；</dd>
+                        <dd>支持套餐升级，补差价（按月进行补差价，不足一个月按一个月计算)。</dd>
+                        <dd>3个市及以上即为全省，10个省及以上即为全国。4个行业及以上即为全行业。</dd>
+                        <dd>购买的采购单位行业与地域为个数，购买后可不限次数进行更换。</dd>
+                    </dl>
+                </div>
+            </div>
+        </div>
+        <div class="fixed-bottom-box p15">
+            {{if not .T.isTrial }}
+            <div class="j-notice-bar bar-red vip-bar">限时6折，现在购买，帮您省<span class="reduce-price">0</span>元</div>
+            {{end}}
+            <div class="price">
+                <span class="billing-total">合计：</span>
+                <div class="billing-list-btn">
+                    <span class="billing-mon">&yen;</span>
+                    <strong class="billing-price">5.80</strong>
                 </div>
             </div>
             <div class="fixed-bottom-box p15">