Merge branch 'dev2.10.11' of http://192.168.3.207:10080/qmx/jy into dev2.10.11

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

@@ -1130,11 +1130,12 @@ display: flex;
 }
 
 .msg_alert {
-    display: flex;
-    position: relative;
-    flex-direction: column;
-    align-items: center;
-    justify-content: space-between;
+  position: relative;
+  bottom: 0;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
 }
 
 .msg_alert>div{
@@ -1576,6 +1577,7 @@ body .loading_ p span {
 }
 
 .app-content {
+    position: relative;
     display: none;
     justify-content: space-between;
     flex-direction: column;

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

@@ -10,6 +10,34 @@
   background:url(../image/vip-index-bg.png) no-repeat center top #fff;
   background-size: 100% 5.42rem;
 }
+.icon-chahao {
+  position: relative;
+  display: inline-block;
+  width: .32rem;
+  height: .32rem;
+}
+
+.icon-chahao:before,
+.icon-chahao:after {
+  position: absolute;
+  content: '';
+  background-color: #fff;
+  top: 50%;
+  left: 50%;
+  width: .32rem;
+  height: .06rem;
+  border-radius: .06rem;
+}
+.icon-chahao.red:before,
+.icon-chahao.red:after {
+  background-color: #FB483D;
+}
+.icon-chahao:before {
+  transform: translate(-50%,-50%) rotate(45deg);
+}
+.icon-chahao:after {
+  transform: translate(-50%,-50%) rotate(-45deg);
+}
 .custom-header{
   background-color: transparent;
   position: relative;
@@ -219,18 +247,26 @@
   color: #FB483D;
 }
 
-.vip-header .expire-remind .icon-guanbi {
-  margin-right: 0.24rem;
-  font-size: 0.32rem;
-}
-
 .vip-header .expire-remind .remind-text {
   flex: 1;
   display: flex;
   align-items: center;
+  margin: 0 .16rem;
   font-size: 0.26rem;
 }
 
+.vip-header .expire-remind .remind-link {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0 .18rem;
+  height: .64rem;
+  color: #FB483D;
+  border: 1px solid #FB483D;
+  border-radius: .16rem;
+  font-size: .26rem;
+}
+
 .vip-body {
   padding-bottom: 0.32rem;
 }

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

@@ -192,6 +192,12 @@ $(function () {
     }
 
     function showTimeOut(endTime, isTrail) {
+        if (!isTrail) {
+            $('.vip-header .expire-remind .remind-link').attr('href', '/jyapp/vipsubscribe/vipsubscribe_renew').text('去续费')
+        } else {
+            $('.vip-header .expire-remind .remind-link').attr('href', '/jyapp/vipsubscribe/vipsubscribe_new').text('去购买')
+        }
+        
         var timeSub = endTime * 1000 - new Date().getTime();
         if (timeSub > 0 && timeSub < 60 * 60 * 24 * 1000 * 3) {
             var hours = Math.floor(timeSub / (60 * 60 * 1000));
@@ -699,6 +705,7 @@ $(function () {
             $('.title-vip-logo').show(); // 展示超级订阅logo
         } else {
             $(".custom-header-right.go_buy").show();
+            $('.title-vip-logo').hide(); // 隐藏title前的图标
             $('.title-tip').show(); // 展示试用7天
         }
     }

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

@@ -105,13 +105,12 @@
           </div> -->
           <!-- 到期提醒 -->
           <div class="expire-remind" style="display: none">
-            <i class="icon iconfont icon-guanbi close-expire-remind"></i>
+            <i class="j-icon icon-chahao red close-expire-remind"></i>
             <span class="remind-text">超级订阅服务试用即将过期，请及时购买！</span>
-            <a class="remind-link"></a>
+            <a class="remind-link" href="/jyapp/vipsubscribe/vipsubscribe_new">去购买</a>
           </div>
         </div>
         <ul class="vip-body">
-
           <li class="sub-info">
             <ul>
               <li class="area">

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

@@ -13,6 +13,14 @@
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/bootstrap.min.js"></script>
 {{include "/common/js.html"}}
 <style type="text/css">
+
+a:link{text-decoration:none; }  /* 指正常的未被访问过的链接*/
+
+a:visited{text-decoration:none; }/*指已经访问过的链接*/
+
+a:hover{text-decoration:none;}/*指鼠标在链接*/
+
+a:active{text-decoration:none;}/* 指正在点的链接*/ 
 .jyapp-icon-zuojiantou:before {
     content: "\A7"!important;
 }

src/jfw/modules/app/src/web/templates/weixin/wxkeyset/index.html

@@ -78,7 +78,7 @@
             :style="footerReminderShow ? 'bottom:1.8rem' : ''"
             @click="toSetKeyDetail('add', -1)"></div>
         <div class="j-footer" ref='jFooter'>
-            <div class="remind-container" v-show="footerReminderShow || keyList.length >= conf.maxKeyLength">
+            <div class="remind-container" v-show="footerReminderShow">
                 <div class="remind-left j-icon icon-del" @click="footerReminderShow = false"></div>
                 <div class="remind-center">
                     <span class="r-c-text">10个关键词不够用？</span>

src/jfw/modules/subscribepay/src/service/commonAction.go

@@ -249,7 +249,7 @@ func (this *CommonAction) GetCommonPayParam() {
 		payway := qutil.ObjToString((*oData)["pay_way"])
 		totalfee := qutil.IntAll((*oData)["order_money"])
 		//上次订单支付串是否可用
-		if prepayTime, err := time.ParseInLocation(qutil.Date_Full_Layout, qutil.ObjToString((*oData)["prepay_time"]), time.Local); err == nil {
+		if prepayTime, err := time.ParseInLocation(qutil.Date_Full_Layout, qutil.ObjToString((*oData)["prepay_time"]), time.Local); err == nil && payParam != "" {
 			if time.Now().Before(prepayTime.Add(time.Hour * 2)) { //支付串未过期
 				if payway == payway_req {
 					if payParam != "" {

src/web/staticres/vipsubscribe/css/keyset-detail.css

@@ -1,8 +1,5 @@
-/* 普通(非超级订阅)用户设置关键词 */
-.app-layout-content-b {
-  display: flex;
-  flex-direction: column;
-  background-color: #F5F6F7;
+html,body {
+  font-size: .3rem;
 }
 
 a.ext-link {

src/web/staticres/vipsubscribe/css/keyset-list.css

@@ -1,10 +1,6 @@
-/* 普通(非超级订阅)用户设置关键词 */
-.app-layout-content-b {
-  display: flex;
-  flex-direction: column;
-  background-color: #F5F6F7;
+html,body {
+  font-size: .3rem;
 }
-
 [v-cloak] {
   display: none!important;
 }

src/web/staticres/vipsubscribe/css/keyset-notkey.css

@@ -1,8 +1,5 @@
-/* 普通(非超级订阅)用户设置关键词 */
-.app-layout-content-b {
-  display: flex;
-  flex-direction: column;
-  background-color: #F5F6F7;
+html,body {
+  font-size: .3rem;
 }
 
 [v-cloak] {

src/web/staticres/vipsubscribe/css/vip_index_new.css

@@ -8,7 +8,34 @@
   -ms-user-select: none;
   user-select: none;
 }
+.icon-chahao {
+  position: relative;
+  display: inline-block;
+  width: .32rem;
+  height: .32rem;
+}
 
+.icon-chahao:before,
+.icon-chahao:after {
+  position: absolute;
+  content: '';
+  background-color: #fff;
+  top: 50%;
+  left: 50%;
+  width: .32rem;
+  height: .06rem;
+  border-radius: .06rem;
+}
+.icon-chahao.red:before,
+.icon-chahao.red:after {
+  background-color: #FB483D;
+}
+.icon-chahao:before {
+  transform: translate(-50%,-50%) rotate(45deg);
+}
+.icon-chahao:after {
+  transform: translate(-50%,-50%) rotate(-45deg);
+}
 .vip-upgrade {
   display: flex;
   flex-direction: column;
@@ -200,24 +227,32 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  height: 0.72rem;
+  height: 0.96rem;
   padding: 0 0.3rem;
-  background-color: #fe737a;
-  color: #fff;
-}
-
-.vip-header .expire-remind .icon-guanbi {
-  margin-right: 0.24rem;
-  font-size: 0.32rem;
+  background-color: #FEE9E8;
+  color: #FB483D;
 }
 
 .vip-header .expire-remind .remind-text {
   flex: 1;
   display: flex;
   align-items: center;
+  margin: 0 .16rem;
   font-size: 0.26rem;
 }
 
+.vip-header .expire-remind .remind-link {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0 .18rem;
+  height: .64rem;
+  color: #FB483D;
+  border: 1px solid #FB483D;
+  border-radius: .16rem;
+  font-size: .26rem;
+}
+
 .vip-body {
   padding-bottom: 0.32rem;
 }

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

@@ -184,6 +184,11 @@ $(function () {
     }
 
     function showTimeOut(endTime, isTrail) {
+        if (!isTrail) {
+            $('.vip-header .expire-remind .remind-link').attr('href', '/jyapp/vipsubscribe/vipsubscribe_renew').text('去续费')
+        } else {
+            $('.vip-header .expire-remind .remind-link').attr('href', '/jyapp/vipsubscribe/vipsubscribe_new').text('去购买')
+        }
         var timeSub = endTime * 1000 - new Date().getTime();
         if (timeSub > 0 && timeSub < 60 * 60 * 24 * 1000 * 3) {
             var hours = Math.floor(timeSub / (60 * 60 * 1000));

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

@@ -283,9 +283,9 @@
       </div> -->
       <!-- 到期提醒 -->
       <div class="expire-remind" style="display: none">
-          <i class="icon iconfont icon-guanbi close-expire-remind"></i>
-          <span class="remind-text">超级订阅服务试用即将过期，请及时购买！</span>
-          <a class="remind-link"></a>
+            <i class="j-icon icon-chahao red close-expire-remind"></i>
+            <span class="remind-text">超级订阅服务试用即将过期，请及时购买！</span>
+            <a class="remind-link" href="/jyapp/vipsubscribe/vipsubscribe_new">去购买</a>
       </div>
     </div>
     <!-- 升级 -->

src/web/templates/weixin/wxinfocontent_rec.html

@@ -21,6 +21,13 @@ body{
 	display: none;
 	/*padding-bottom: 50px;*/
 }
+a:link{text-decoration:none; }  /* 指正常的未被访问过的链接*/
+
+a:visited{text-decoration:none; }/*指已经访问过的链接*/
+
+a:hover{text-decoration:none;}/*指鼠标在链接*/
+
+a:active{text-decoration:none;}/* 指正在点的链接*/ 
 table {
     border-collapse: inherit !important;
     border-spacing: 2px !important;

src/web/templates/weixin/wxkeyset/filterset.html

@@ -158,15 +158,15 @@
     <div id="easy-alert">
         <span class="too-much">
             <span class="easy-alert-text">您订阅的关键词较多，可能会收不到推送信息。查看</span>
-            <a class="ext-link easy-alert-text" href="javascript:JyObj.openExternalLink('http://mp.weixin.qq.com/s/C3Zm-HCKX8iWrFCnGLu-Qg','使用帮助')">订阅帮助页面</a>
+            <a class="ext-link easy-alert-text" href="//mp.weixin.qq.com/s/C3Zm-HCKX8iWrFCnGLu-Qg">订阅帮助页面</a>
         </span>
         <span class="too-long">
             <span class="easy-alert-text">您订阅的关键词字数过多，可能会收不到推送信息。查看</span>
-            <a class="ext-link easy-alert-text" href="javascript:JyObj.openExternalLink('http://mp.weixin.qq.com/s/uXTI0Qmva2ZX1adLxxXD9Q','使用帮助')">订阅帮助页面</a>
+            <a class="ext-link easy-alert-text" href="//mp.weixin.qq.com/s/uXTI0Qmva2ZX1adLxxXD9Q">订阅帮助页面</a>
         </span>
         <span class="unexpected-char">
             <span class="easy-alert-text">您订阅的关键词包含特殊符号，可能会收不到推送信息。查看</span>
-            <a class="ext-link easy-alert-text" href="javascript:JyObj.openExternalLink('http://mp.weixin.qq.com/s/2u1rBaTZ7T_o8k7TbuM_fw','使用帮助')">订阅帮助页面</a>
+            <a class="ext-link easy-alert-text" href="//mp.weixin.qq.com/s/2u1rBaTZ7T_o8k7TbuM_fw">订阅帮助页面</a>
         </span>
     </div>
 

src/web/templates/weixin/wxkeyset/index.html

@@ -25,7 +25,7 @@
             <div class="banner-box">
                 <span class="j-icon vip-icon"></span>
                 <span class="content">300 组关键词特权</span>
-                <a class="right-action" href="/vipsubscribe/introducePage">免费试用</a>
+                <a class="right-action" href="/front/vipsubscribe/introducePage">免费试用</a>
             </div>
         </div>
         <div class="j-main keyset" ref="jMain">
@@ -75,13 +75,13 @@
             :style="footerReminderShow ? 'bottom:1.8rem' : ''"
             @click="toSetKeyDetail('add', -1)"></div>
         <div class="j-footer" ref='jFooter'>
-            <div class="remind-container" v-show="footerReminderShow || keyList.length >= conf.maxKeyLength">
+            <div class="remind-container" v-show="footerReminderShow">
                 <div class="remind-left j-icon icon-del" @click="footerReminderShow = false"></div>
                 <div class="remind-center">
                     <span class="r-c-text">10个关键词不够用？</span>
                     <span class="r-c-text">开通超级订阅，支持最多300个关键词</span>
                 </div>
-                <a class="remind-right" href="/vipsubscribe/introducePage" id="app-keyset-footer-banner">了解详情</a>
+                <a class="remind-right" href="/front/vipsubscribe/introducePage" id="app-keyset-footer-banner">了解详情</a>
             </div>
         </div>
     </div>