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

README.md

@@ -6,4 +6,3 @@ web用xweb框架
 v2.9.8
 线上课程
 
-

src/jfw/modules/app/src/app/front/jylog.go

@@ -28,9 +28,9 @@ var FMT = "2006_01_02_15_04_05"
 var LogPath = "./jylog"
 
 func init() {
-	//os.Mkdir(LogPath, os.ModePerm)
-	////默认保留15天内的日志，-1为永久保留
-	//initLog(15)
+	os.Mkdir(LogPath, os.ModePerm)
+	//默认保留15天内的日志，-1为永久保留
+	initLog(15)
 }
 
 func initLog(saveDay int) {

src/jfw/modules/app/src/app/front/login.go

@@ -161,13 +161,7 @@ func (l *Login) Login() error {
 			if phone == "" || l.GetSession("identCodeValue") == nil || l.GetString("identCode") != l.GetSession("identCodeValue") { //验证码不正确
 				return -1
 			} else {
-				query := map[string]interface{}{
-					"i_appid": 2,
-					"$or": []map[string]interface{}{
-						map[string]interface{}{"s_phone": phone},
-						map[string]interface{}{"s_m_phone": phone}},
-				}
-				user, ok := mongodb.FindOne("user", query)
+				ok, user := getPhoneUser(phone)
 				//登录成功
 				if !ok {
 					return 0
@@ -178,7 +172,7 @@ func (l *Login) Login() error {
 				phoneType := l.GetString("phoneType")
 				channel := l.GetString("channel")
 				deviceId := l.GetString("deviceId")
-				if user == nil || len(*user) == 0 {
+				if user == nil || len(user) == 0 {
 					//clearRidByRid(rid)
 					data := map[string]interface{}{
 						"i_appid":       2,
@@ -204,7 +198,7 @@ func (l *Login) Login() error {
 					}
 				} else {
 					jy.ClearPhoneIdentSession(l.Session())
-					returnSign = afterLogin(*user, l.Session(), rid, oid, phoneType, channel, deviceId, 1, false)
+					returnSign = afterLogin(user, l.Session(), rid, oid, phoneType, channel, deviceId, 1, false)
 					return 1
 				}
 			}
@@ -604,7 +598,12 @@ func (l *Login) ForgetPwd() error {
 				return "codeError"
 			}
 			//手机号是否已被注册
-			if !userIsExists(phone) {
+			if mongodb.Count("user", map[string]interface{}{
+				"i_appid": 2,
+				"$or": []map[string]interface{}{
+					map[string]interface{}{"s_phone": phone},
+					map[string]interface{}{"s_m_phone": phone}},
+			}) == 0 {
 				return "phoneNotExists"
 			} else if jy.SendPhoneIdentCode(phone, l.Session()) {
 				return "y"
@@ -624,14 +623,21 @@ func (l *Login) ForgetPwd() error {
 			if !passwordReg.MatchString(password) {
 				return "passwordError"
 			}
-			if !userIsExists(phone) { //用户已存在
+			ok, user := getPhoneUser(phone)
+			if !ok || user == nil || len(user) == 0 { //用户不存在
 				return "userNotExists"
 			}
-			query := map[string]interface{}{
-				"i_appid": 2,
-				"s_phone": phone,
-			}
-			if mongodb.Update("user", query, map[string]interface{}{"$set": map[string]interface{}{"s_password": qutil.GetMd5String(password), "l_updatepwdtime": time.Now().Unix()}}, false, false) {
+			if mongodb.Update("user", map[string]interface{}{
+				"_id": user["_id"],
+			}, map[string]interface{}{
+				"$set": map[string]interface{}{
+					"s_phone":         phone,
+					"s_password":      qutil.GetMd5String(password),
+					"l_updatepwdtime": time.Now().Unix(),
+				},
+				"$unset": map[string]interface{}{
+					"s_m_phone": "",
+				}}, false, false) {
 				l.DelSession("forgetPwdStep")
 				jy.ClearPhoneIdentSession(l.Session())
 				return "y"
@@ -756,6 +762,18 @@ func (l *Login) Brand() {
 /**********************************************************************
 ***********************************************************************
 ***********************************************************************/
+func getPhoneUser(phone string) (bool, map[string]interface{}) {
+	users, ok := mongodb.Find("user", map[string]interface{}{
+		"i_appid": 2,
+		"$or": []map[string]interface{}{
+			map[string]interface{}{"s_phone": phone},
+			map[string]interface{}{"s_m_phone": phone}},
+	}, `{"s_phone":-1}`, nil, false, 0, 1)
+	if users != nil && len(*users) > 0 {
+		return ok, (*users)[0]
+	}
+	return ok, nil
+}
 
 //手机号用户是否存在
 func userIsExists(phoneNum string) bool {

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

@@ -2728,13 +2728,13 @@ body{
 	z-index: 2000;
 	bottom: 0px;
 	width: 100%;
-	height: 50px;
+/*	height: 50px;*/
 	background-color: #37c6da;
 	border: 1px solid #37c6da;
-	color: #fff;
-	font-size: 15px;
-	padding-right: 15px;
-	text-align: center;
+/*	color: #fff;*/
+/*	font-size: 15px;*/
+/*	padding-right: 15px;*/
+/*	text-align: center;*/
 }
 .rests {
 	height: 50px;
@@ -3361,3 +3361,44 @@ body{
     font-size: .37rem;
     color: #2CB7CA;
 }
+/*dev2.10.2*/
+.resbm0{
+	display: flex;
+    position: relative;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-between;
+}
+.resbm0 div{
+	padding: .15rem .3rem;
+    color: #fff;
+    font-size: .26rem;
+	    width: 100%;
+		    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+.iconfont {
+    font-family: "iconfont" !important;
+    font-size: 16px;
+    font-style: normal;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+}
+.resbm0 div i{
+	font-size: .32rem;
+}
+.resbm0 div a{    
+	width: 1.44rem;
+    height: .64rem;
+    line-height: .64rem;
+    color: #fff !important;
+    text-align: center;
+    background: transparent;
+    border: 1px solid white;
+    border-radius: .32rem;
+    text-decoration: none;
+	display: flex;
+    align-items: center;
+    justify-content: center;
+}

src/jfw/modules/app/src/web/staticres/jyapp/js/searchindex.js

@@ -221,7 +221,7 @@ var SuperSearch = {
 		});
 		//是否开通超级搜索服务
 		//关闭搜索后订阅================================================================
-		$("#supersearchPage .dy_close").on("tap",function(){
+		$("#supersearchPage #close_set").on("tap",function(){
 			SuperSearch.showToOrder(false);
 			SuperSearch.dyDiv=true;
 		});
@@ -3068,22 +3068,25 @@ var Active_Tip = function(){
 	var _this = this;
 	//默认弹出框
 	if(_this.active == null){
-		var time = localStorage.getItem("lastAlertDate")
+		var time = localStorage.getItem("Active_Vip_Invite")
 		if(!time||_this.nowTime>parseInt(time)+1000*60*60*24*30){
-			_this.active = new Active_Default(_this.nowTime);
+			_this.active = new Active_Vip_Invite(_this.nowTime);
 		}
 	}
 	if(_this.active != null){
 		$("body").append('<div class="modal fade" id="myModal-tap" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="true" style="z-index: 100001;">'	
 						+'<div class="modal-dialog" style="height:100%;margin:0px;">'
 							+'<div style="width: 5.6rem;height: 7.2rem;position: relative;top: 3.5rem;left: 50%;margin-left: -2.8rem;">'
-								+'<img src="/jyapp/active/common/images/close.png" style="position: absolute;width: 27px;top:-66.5px;right: .3rem;" onclick="ActiveTip.close()">'
+								+'<img src="/jyapp/vipsubscribe/image/close.png" style="position: absolute;width: 27px;top:-66.5px;right: .3rem;" onclick="ActiveTip.close()">'
 								+_this.active.getHtml()
 							+'</div>'
 						+'</div>'
 					+'</div>');
 		_this.show("#myModal-tap");
 		$(".modal-backdrop").css("z-index","100000");
+		if(userId!=undefined&&userId!=""){
+			this.isLogin=true;
+		}
 		_this.active.init();
 	}else{
 		_this.close();
@@ -3409,6 +3412,26 @@ var Active_Default = function(nowTime){
 	}
 }
 //
+var Active_Vip_Invite = function(nowTime){
+	this.init = function(){
+		$("#goToInvite").on("tap",function(){
+			if(ActiveTip.isLogin){
+				ActiveTip.close();
+				window.location.href = "/jyapp/vipsubscribe/introducePage";
+			}else{
+				window.location.href = "/jyapp/free/login?url="+encodeURIComponent("/jyapp/vipsubscribe/introducePage");
+			}
+		});
+		localStorage.setItem("Active_Vip_Invite",nowTime);
+	}
+	this.getHtml = function(){
+		var html = '<div class="pop-new" style="background: url(/jyapp/vipsubscribe/image/vip_home.png);background-size: cover;height: inherit;width: inherit;border-radius: 8px;">'
+					+'<div style="position: absolute;color: #0687DB;font-size: 14px;bottom: .65rem;left: 50%;margin-left: -1.7rem;font-family: 微软雅黑;width: 3.4rem;border-radius: 20px;text-align: center;cursor: pointer;height: .8rem;line-height: .8rem;" id="goToInvite"></div>'
+				+'</div>';
+		return html;
+	}
+}
+//
 var ActiveTip = null;
 window.onload = function(){
 	ActiveTip = new Active_Tip();

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

@@ -252,6 +252,15 @@
         return false;
     }
 
+</script>
+<script>
+var _hmt = _hmt || [];
+(function() {
+  var hm = document.createElement("script");
+  hm.src = "https://hm.baidu.com/hm.js?72331746d85dcac3dac65202d103e5d9";
+  var s = document.getElementsByTagName("script")[0]; 
+  s.parentNode.insertBefore(hm, s);
+})();
 </script>
 </body>
 </html>

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

@@ -11,6 +11,7 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
     <script>
+		//
     		function afterReceivePushMessage(type,url){
           if(type=="bid" || type=="vipreport"){
             JyObj.showRedSpotOnMenu("subscribe");
@@ -106,6 +107,7 @@
                 window.location.href = '/jyapp/wxkeyset/keyset/seniorset';
             });
             $(".listcontent").scroll(function () {
+				console.log(3333)
                 scrollTop = $(this).scrollTop();
             });
             this.isCanSwitch=true;
@@ -298,19 +300,48 @@
             $.post("/jyapp/myinfo?t="+new Date().getTime(),null,function(r){
               if(r.userType=="vip"){
                 $(".switch").addClass("only-vip");
-                $(".switch>span").text("VIP订阅");
+                $(".switch").text("VIP订阅").show();
                 $(".switch").click(tosetpage);
                 thisClass.InitVip(r);
+				extend(1);
               }else{
-                $(".switch").addClass("only-personal");
-                $(".switch>span").text("￥5.8 开通VIP");
+				setTimeout(function(){
+					if (scrollTop==0){
+						$(".header_header").show();
+					}
+				},200)
+				$(".app-content").css("justify-content","flex-start");
+				$(".switch").addClass("only-personal");
+                $(".switch>span").text("免费试用 VIP");
                 $(".switch").click(tointroducepage);
+                $(".switch_ext").click(tointroducepage);
                 thisClass.InitPersonal(r);
                 userMergeQuery();
+				extend(0);
               }
             });
         }
-
+		function extend(i){
+			window.listScroll = function() {
+				if (i==0){
+				    var nowT = $(".listcontent").scrollTop()
+				    if (nowT > 0) {
+				        $(".header_header").css({height: (60 - nowT) +'px'})
+				        if (nowT > 50) {
+				            $(".header_header").hide();
+							$(".switch").fadeIn();
+				        }else{
+							$(".header_header").show();
+							$(".switch").fadeOut();
+						}
+				    } else {
+				        $(".header_header").css({height: (60) +'px'})
+				        $(".header_header").show()
+						$(".switch").fadeOut();
+				    }
+				}
+			 }
+		}
         //页面渲染处理
         function showPage() {
             //时间渲染
@@ -799,7 +830,7 @@
   <ul>
     <li>订阅</li>
     <li>
-      <div class="switch">
+      <div class="switch" style="display:none;">
         <span></span>
       </div>
     </li>
@@ -808,6 +839,13 @@
 </div>
 <div class="app-layout-content-b">
     <div class="app-content">
+		<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);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">
+				<span style="color:#fff;font-weight: bold;font-size: 15px;text-align: left;width: 4.1rem;">300 组关键词特权</span>
+				<span class="switch_ext" 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>
+		</div>
         <div class="_header">
             <!-- 筛选条件 -->
             <div class="filter_tab">
@@ -843,8 +881,8 @@
                 </div>
             </div>
         </div>
-        <div class="color_top"></div>
-        <div class="listcontent">
+        <div class="color_top" style="display:none;"></div>
+        <div class="listcontent" onscroll="listScroll()">
             <div id="list"></div>
         </div>
 

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -2,6 +2,7 @@
 <head>
 {{include "/common/meta.html"}}
 <link href="{{Msg "seo" "cdn"}}/jyapp/css/searchindex.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}"/>
 <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery-3.2.1.min.js?v={{Msg "seo" "version"}}"></script>
 {{include "/common/js.html"}}
 <script src="https://cdn.bootcdn.net/ajax/libs/vConsole/3.3.4/vconsole.min.js"></script>
@@ -127,7 +128,7 @@
 	            <p class="tips_text home_1" style="display: none;">设置订阅关键词，随时接收最新招标信息</p>
 	            <p class="tips_text home_2" style="display: none;">为了使您接收更多信息，可对关键词进行新增或修改。</p>
 	            <p class="tips_text home_3" style="display: none;">您未设置关键词，设置后接收信息更精准!</p>
-	            <p class="tips_text home_4" style="display: none;">开通VIP订阅，获取更多订阅信息。</p>
+	            <p class="tips_text home_4" style="display: none;">免费试用VIP订阅，商机获取能力提升30倍</p>
 	            <p class="tips_all" style="display: none;"><a class="GetAll">查看全部</a></p>
 	            <div class="tips_btn home_toset" style="display: none;">
 	                <a class="home_toset" >去设置</a>
@@ -199,7 +200,7 @@
 	                        </span>
 	                    </div>
 	                    <div class="export">
-	                        <span>
+	                        <span style="padding: 3px 8px 3px;border-radius: 10px;background: rgba(44,183,202, 0.1);">
 	                            <i class="jyapp-icon jyapp-icon-shujudaochu"></i>
 	                            <em>数据导出</em>
 	                        </span>
@@ -496,18 +497,26 @@
 		</div>
 		<div id="tempDiv" style="display:none;"></div>
 	</div>
-  <div class="resbm hidden" id="resbm">
-		<div class="rests">如果您对以上结果满意可</div>
+<!--  	<div class="resbm hidden" id="resbm">
+		<div class="rests"></div>
 		<div class="resdy" id="zjdy">直接订阅
 			<div class="jy_sprite_main sprite_jydyyou"></div>
-<!--			<img src="{{Msg "seo" "cdn"}}/jyapp/images/wx/jydyyou.png?v={{Msg "seo" "version"}}">-->
 		</div>
 		<div class="dy_close">
 			<div class="jy_sprite_main sprite_dy_close"></div>
-<!--			<img src="{{Msg "seo" "cdn"}}/jyapp/images/search/dy_close.png?v={{Msg "seo" "version"}}"/>-->
 		</div>
 		<div style="clear:both"></div>
-	</div>
+	</div>-->
+	
+    <div class="resbm hidden" id="resbm">
+		<div class="resbm0">
+	        <div>
+	            <i class="icon iconfont" id="close_set">&#xe61a;</i>
+	            <span>如果您对以上结果满意可【直接订阅】<br>更有VIP订阅等你试用。</span>
+	            <a id="zjdy" style="text-decoration: none;">直接订阅</a>
+	        </div>
+		</div>
+    </div>
 </section>
 <!--企业搜索页面-->
 <section id="entsearchPage" class="hidden">

src/jfw/modules/pushsubscribe/src/push/config.json

@@ -85,7 +85,7 @@
 	"wxTplMsg":{
 		"id":"ZEwMM_3pxBKsw94N9Xe-3SU-qK6T8kPlO2hVIW4oPAU",
 		"first":{
-			"value":"根据你当前订阅，剑鱼标讯为你推送以下信息。如需设置更多关键词，可购买VIP订阅。如不想继续收到此类信息，可在招标订阅设置页面取消订阅。",
+			"value":"根据你当前订阅，剑鱼标讯为你推送以下信息。免费试用VIP订阅，商机获取能力提升30倍。\n如不想接收，可在招标订阅设置页面取消订阅。",
 			"color":"#686868"
 		},
 		"vip_first":{

src/jfw/modules/weixin/src/tools/wxlog.go

@@ -0,0 +1,73 @@
+package tools
+
+/**
+日志文件自动切换，默认保留15天内日志
+**/
+
+import (
+	"log"
+	"os"
+	"path/filepath"
+	"regexp"
+	"time"
+
+	"github.com/go-xweb/xweb"
+	"github.com/robfig/cron"
+)
+
+//日志格式
+var fileReg = regexp.MustCompile("^(\\d{4}_[0-9_]{14})\\.log$")
+
+//当前日志文件句柄
+var LogFile *os.File
+
+//时间格式
+var FMT = "2006_01_02_15_04_05"
+
+//日志目录
+var LogPath = "./wxlog"
+
+func init() {
+	os.Mkdir(LogPath, os.ModePerm)
+	//默认保留15天内的日志，-1为永久保留
+	initLog(15)
+}
+
+func initLog(saveDay int) {
+	go logfile()
+	task := cron.New()
+	task.Start()
+	task.AddFunc("0 0 0 * * ?", func() {
+		go logfile()
+		time.Sleep(50 * time.Second)
+		if saveDay > 0 {
+			filepath.Walk(LogPath, func(path string, info os.FileInfo, err error) error {
+				str := fileReg.FindStringSubmatch(info.Name())
+				if len(str) == 2 {
+					t, er := time.ParseInLocation(FMT, str[1], time.Local)
+					if er == nil {
+						if (time.Now().Unix()-t.Unix())/86400 > int64(saveDay) {
+							log.Println("delete log file:", path, os.Remove(path))
+						}
+					}
+				}
+				return nil
+			})
+		}
+	})
+}
+
+//创建并切换输出文件
+func logfile() {
+	now := time.Now().Format(FMT)
+	file, _ := os.Create(LogPath + "/" + now + ".log")
+	log.SetOutput(file)
+	xweb.RootApp().Logger.SetOutput(file)
+	go func(file *os.File) {
+		time.Sleep(5 * time.Second)
+		if LogFile != nil {
+			LogFile.Close()
+		}
+		LogFile = file
+	}(file)
+}

src/web/staticres/css/wxsearch.css

@@ -1833,25 +1833,28 @@ body{
 	background-color: #37c6da;
 	border: 1px solid #37c6da;
 	color: #fff;
-	font-size: 15px;
+	font-size: 13px;
 	padding-right: 15px;
-	text-align: center;
 }
 .rests {
-	height: 50px;
-	line-height: 50px;
-	text-align: center;
+	height: 60px;
 	display: inline-block;
-	margin-right: 10px;
+	margin-right: 10px;    
+	margin-left: 0.7rem;
+	padding: .2rem 0px;
+    line-height: 0.4rem;
 }
 .resdy {
-	height: 35px;
-	width: 110px;
-	border: 1px solid #fff;
-	line-height: 35px;
-	border-radius: 20px;
-	text-align: center;
-	display: inline-block;
+	height:30px;
+    width:80px;
+    border: 1px solid #fff;
+    line-height:30px;
+    border-radius: 20px;
+    text-align: center;
+    display: inline-block;
+    right: 0.2rem;
+    position: absolute;
+    top: 0.28rem;
 }
 .resdy img {
 	width: 12px;
@@ -1862,8 +1865,8 @@ body{
 }
 .dy_close{
 	position: absolute;
-    right: 0px;
-    top: 0px;
+    left: 0px;
+    top: 0.38rem;
     padding: 5px 10px 10px 10px;
 }
 .dy_close img{

src/web/staticres/wx_dataExport/css/search_tab.css

@@ -48,6 +48,12 @@
   -webkit-transform: translateY(-50%);
           transform: translateY(-50%);
 	color: #2CB7CA;
+    background: #EFFAFC;
+    width: 1.65rem;
+    height: 0.52rem;
+    line-height: 0.55rem;
+    text-align: center;
+    border-radius: 0.25rem;
 }
 .selected-export-box .selected-export .export span i {
 /*  position: absolute;*/

src/web/templates/weixin/historypush.html

@@ -1042,6 +1042,16 @@
         .jy-alert-other .weui-dialog__ft{
           text-align:center !important;
         }
+        .freeuse{
+          background:#FFDAB0;
+          width: 1.36rem;
+          height: 0.4rem;
+          border-radius: 2rem;
+          color: #33375C !important;
+          font-weight: 800;
+          text-align: center;
+          line-height:0.45rem;
+		}
         .weui-dialog{
           left: 50%;
         }
@@ -1054,9 +1064,9 @@
         <div class="box">
             <div class="left">
                 <img src="/vipsubscribe/image/v.png" alt="v">
-                <h4>剑鱼标讯 VIP订阅</h4>
+                <h4>300组关键词特权</h4>
             </div>
-            <a onclick="tointroducepage()" class="right" style="text-decoration: none;">了解详情 > </a>
+            <a onclick="tointroducepage()" class="right freeuse" style="text-decoration: none;">免费试用</a>
         </div>
     </div>
     <!-- 筛选条件 -->
@@ -1128,7 +1138,8 @@
         <div class="open_remind" style="display: none;">
             <div class="remind_box">
                 <div class="remind_text">
-                    本次推送已达150条信息上限！开通VIP订阅，支持每天最多推送2000条信息
+                   <p>推送已达上限</p>
+                   <p>每日推送最多2000条 等你试用</p>
                 </div>
                 <a onclick="tointroducepage()" class="remind_btn" style="text-decoration: none;">了解详情</a>
             </div>
@@ -1157,7 +1168,7 @@
         <div class="nv_renew_toast" style="display: none;">
             <div>
                 <i class="icon iconfont" id="nv_close_renew">&#xe61a;</i>
-                <span>VIP订阅服务试用已过期，请及时购买！</span>
+                <span>VIP订阅试用已到期，￥5.8立享特权</span>
                 <a onclick="topay()">去购买</a>
             </div>
         </div>

src/web/templates/weixin/search/mainSearch.html

@@ -9,7 +9,7 @@
 <link href="{{Msg "seo" "cdn"}}/css/bootstrap.min.css" rel="stylesheet">
 <link href="{{Msg "seo" "cdn"}}/css/jy.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <link href="{{Msg "seo" "cdn"}}/css/common.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-<link href="{{Msg "seo" "cdn"}}/css/wxsearch.css?v={{Msg "seo" "version"}}11" rel="stylesheet" type="text/css" >
+<link href="{{Msg "seo" "cdn"}}/css/wxsearch.css?v={{Msg "seo" "version"}}" rel="stylesheet" type="text/css" >
 <link href="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.css" rel="stylesheet">
 <link href="{{Msg "seo" "cdn"}}/css/dropload.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <link href="{{Msg "seo" "cdn"}}/css/wxlist.css?v={{Msg "seo" "version"}}12" rel="stylesheet">
@@ -27,7 +27,7 @@
 <!--2.8-->
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base_myorder.css?v={{Msg "seo" "version"}}">
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/search_tab.css?v={{Msg "seo" "version"}}">
+<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/search_tab.css?v={{Msg "seo" "version"}}5">
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css">
 <!--2.8.5-->
 <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/css/wx/base.css?v={{Msg "seo" "version"}}" />
@@ -279,6 +279,18 @@
 	    padding: 0 3px;
 	    line-height: .39rem;
 	}
+  .modal-content {
+      position: relative;
+      background-color: #fff;
+       border: 0px solid #999 !important; 
+       border: 0px solid rgba(0,0,0,.2) !important; 
+      border-radius: 6px;
+      -webkit-box-shadow: 0 3px 9px rgba(0,0,0,.5);
+      box-shadow: none;
+      -webkit-background-clip: padding-box;
+      background-clip: padding-box;
+      outline: 0;
+  }
 	</style>
 </head>
 <body  style="min-height:100vh;">
@@ -286,15 +298,14 @@
 <div class="modal fade" data-backdrop="static"  id="homePageTap" tabindex="-1" role="dialog">
   <div class="modal-dialog" role="document">
     <div class="modal-content" style="background: unset;margin:.7rem;top: 2rem;">
+
       <div class="modal-body" style="padding:0px;">
-        <div style="background: #fff;border-radius: 10px;position: relative;width:5.7rem;height: 7.5rem;">
+<!--        <div style="background: #fff;border-radius: 10px;position: relative;width:5.7rem;height: 7.5rem;">-->
+      <div style="border-radius: 10px;position: relative;width:5.7rem;height: 7.5rem;">
 			<img onclick="tapClose(0)" src="/vipsubscribe/image/close.png" style="position: absolute;right: 0px;top: -1rem;width: .6rem;" >
-			<img src="/images/wx/frame.png" >
-			<div style="padding:.5rem .6rem;font-family: PingFang SC;font-style: normal;font-weight: normal;font-size: 12px;line-height: 22px;">
-				疫情阻止了我们出门的脚步，但却阻挡不了公司前进的步伐。
-				<br> 剑鱼标讯为广大企业推出<span style="color:#2ABED1;font-size:14px;">免费</span>的商机洞察功能，通过招标大数据的深度分析，全面透视企业的客户和竞争对手，助力企业开工大吉！
-			</div>
-			<div onclick="tapClose(1)" class="tap_div_btn" style="position: absolute;background: #2ABED1;border-radius: 41px;width: 5rem;height: .9rem;text-align: center;line-height: .9rem;color: #fff;left: 50%;margin-left: -2.5rem;bottom: .5rem;">查看详情</div>
+<!--			<img src="/images/wx/frame.png" >-->
+        <img src ="/vipsubscribe/image/vip_home.png" onclick="gotoIntroducePage()"> 
+<!--			<div onclick="tapClose(1)" class="tap_div_btn" style="position: absolute;background: #2ABED1;border-radius: 41px;width: 5rem;height: .9rem;text-align: center;line-height: .9rem;color: #fff;left: 50%;margin-left: -2.5rem;bottom: .5rem;">查看详情</div>-->
 		</div>
       </div>
     </div>
@@ -402,7 +413,7 @@
             <p class="tips_text home_1" style="display: none;">设置订阅关键词，随时接收最新招标信息</p>
             <p class="tips_text home_2" style="display: none;">为了使您接收更多信息，可对关键词进行新增或修改。</p>
             <p class="tips_text home_3" style="display: none;">您未设置关键词，设置后接收信息更精准!</p>
-            <p class="tips_text home_4" style="display: none;">开通VIP订阅，获取更多订阅信息。</p>
+            <p class="tips_text home_4" style="display: none;">免费试用VIP订阅，商机获取能力提升30倍。</p>
             <p class="tips_all" style="display: none;"><a class="GetAll">查看全部</a></p>
             <div class="tips_btn home_toset" style="display: none;">
                 <a class="home_toset" >去设置</a>
@@ -753,9 +764,9 @@
           查看更多
         </div>
       </div>
-			<div class="resbm hidden">
-				<div class="rests">如果您对以上结果满意可</div>
-				<div class="resdy" id="zjdy">直接订阅<img src="{{Msg "seo" "cdn"}}/images/wx/jydyyou.png"></div>
+			<div class="resbm ">
+				<div class="rests"><p>如果您对以上结果满意可【直接订阅】</p><p>更有VIP订阅等你试用。<p></div>
+				<div class="resdy" id="zjdy">直接订阅</div>
 				<div class="dy_close"><img src="{{Msg "seo" "cdn"}}/images/search/dy_close.png"/></div>
 				<div style="clear:both"></div>
 			</div>
@@ -1157,6 +1168,9 @@
     	['input', 'textarea'].includes(e.target.localName) && document.body.scrollIntoView(false)
     }, true)
 	}
+  function gotoIntroducePage(){
+    window.location.href="/front/vipsubscribe/introducePage";
+  }
 
 </script>
 <!--百度统计-->

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

@@ -28,6 +28,9 @@
         background-color: #2cb7ca;
         border-radius: .08rem;
     }
+    .redColor{
+      color:#FE737A;
+    }
 </style>
 <body>
 <script type="text/javascript">
@@ -48,7 +51,7 @@
         </div>
         <div class="recommend_box">
             <div class="recommend_title">
-                以下区域、行业的订阅推送已停止，为了不影响您的使用，请立即续费！
+                以下区域、行业的订阅推送已停止，<span class="redColor">现￥5.8即可继续使用！</span>
             </div>
             <div class="recommend_info">
                 <div class="info_area">
@@ -145,7 +148,7 @@
                     if (a < b && b < c) {
                         $(".renew_service").show();
                         $("#exprie").text("VIP订阅服务即将到期，请及时续费")
-                        $(".recommend_title").text("以下区域、行业的订阅推送即将停止，为了不影响您的使用，请立即续费！")
+                        $(".recommend_title").html("以下区域、行业的订阅推送即将停止，<span class='redColor'>现￥5.8即可继续使用！</span>")
                     }
                 } else {
 //					    	$(".renew_service").show();
@@ -212,7 +215,7 @@
                 if (exprie === "will") {
                     $(".renew_service").show();
                     $("#exprie").text("VIP订阅服务即将到期，请及时续费")
-                    $(".recommend_title").text("以下区域、行业的订阅推送即将停止，为了不影响您的使用，请立即续费！")
+                    $(".recommend_title").html("以下区域、行业的订阅推送即将停止，<span class='redColor'>现￥5.8即可继续使用！</span>")      
                 } else {
 //					    	$(".renew_service").show();
                     $(".aginBuy").show();
@@ -242,6 +245,15 @@
         return false;
     }
 
+</script>
+<script>
+var _hmt = _hmt || [];
+(function() {
+  var hm = document.createElement("script");
+  hm.src = "https://hm.baidu.com/hm.js?72331746d85dcac3dac65202d103e5d9";
+  var s = document.getElementsByTagName("script")[0]; 
+  s.parentNode.insertBefore(hm, s);
+})();
 </script>
 </body>
 </html>

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

@@ -87,6 +87,16 @@
 ._margin_b{
 	margin-bottom: 1rem;
 }
+.freeuse{
+          background:#FFDAB0;
+          width: 1.36rem;
+          height: 0.4rem;
+          border-radius: 2rem;
+          color: #33375C !important;
+          font-weight: 800;
+          text-align: center;
+          line-height:0.45rem;
+}
 </style>
 <script>
 initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
@@ -721,9 +731,9 @@ function tointroducepage(){
 		<div class="box">
 			<div class="left">
 				<img src="/vipsubscribe/image/v.png" alt="v">
-				<h4>剑鱼标讯 VIP订阅</h4>
+				<h4>300组关键词特权</h4>
 			</div>
-			<a onclick="tointroducepage()" class="right">了解详情 &gt; </a>
+			<a onclick="tointroducepage()" class="right freeuse">免费试用</a>
 		</div>
 	</div>
 	<div class="header">
@@ -873,7 +883,7 @@ function tointroducepage(){
             <div class="remind_box">
 				<i class="icon iconfont" id="close_set"></i>
                 <div class="remind_text">
-                    10个关键词不够用？<br>开通VIP订阅，支持最多300个关键词
+                    10个关键词不够用？<br>300组关键词特权 免费试用
                 </div>
                 <a onclick="tointroducepage()" class="remind_btn">了解详情</a>
             </div>