Browse Source

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

zhangxinlei1996 5 years ago
parent
commit
08f5ff46c1

+ 7 - 4
src/jfw/modules/app/src/app/front/vipsubscribe.go

@@ -77,11 +77,14 @@ func (s *Subscribepay) ToSetPage() {
 func (s *Subscribepay) Introduce() error {
 	userId := util.ObjToString(s.GetSession("userId"))
 	if userId == "" {
-		return s.Redirect("/swordfish/about")
+		return s.Redirect("/jyapp/login")
 	}
 	m, _ := public.MQFW.FindById("user", userId, `{"o_vipjy":1,"i_vip_status":1}`)
 	if len(*m) == 0 {
-		return s.Redirect("/swordfish/about")
+		return s.Redirect("/jyapp/login")
+	}
+	if util.IntAll((*m)["i_vip_status"]) > 0 {
+		return s.Redirect("/jyapp/vipsubscribe/toSetPage")
 	}
 	obj := util.ObjToMap((*m)["o_vipjy"])
 	s.T["notShowTrial"] = util.IntAll((*obj)["i_trial"]) == -1 || (*m)["i_vip_status"] != nil
@@ -92,11 +95,11 @@ func (s *Subscribepay) Introduce() error {
 func (s *Subscribepay) TrialInfo() error {
 	userId := util.ObjToString(s.GetSession("userId"))
 	if userId == "" {
-		return s.Redirect("/swordfish/about")
+		return s.Redirect("/jyapp/login")
 	}
 	m, ok := public.MQFW.FindById("user", userId, `{"o_vipjy":1}`)
 	if !ok || len(*m) == 0 {
-		return s.Redirect("/swordfish/about")
+		return s.Redirect("/jyapp/login")
 	}
 	obj := util.ObjToMap((*m)["o_vipjy"])
 	s.T["trialSign"] = util.IntAll((*obj)["i_trial"]) == 1

+ 3 - 3
src/jfw/modules/app/src/web/staticres/jyapp/css/wx/home.css

@@ -1,12 +1,12 @@
 .home {
   min-height: 100%;
-  background: #fff;
+  background: #F4F4F9;
 }
 
 .home .top {
   width: 100%;
-  height: 5.06rem;
-  padding-top: .99rem;
+  height: 5.36rem;
+  padding-top: 1.29rem;
   background: linear-gradient(#31cbe0, white);
 }
 

+ 1 - 1
src/jfw/modules/app/src/web/staticres/jyapp/css/wxsearch.css

@@ -111,7 +111,7 @@ form{
 
 #searchIndex .content {
   /*列表*/
-  padding: 0 .15rem;
+/*  padding: 0 .15rem;*/
 }
 
 #searchIndex .content li {

+ 5 - 1
src/jfw/modules/app/src/web/staticres/jyapp/js/wxSupersearch.js

@@ -559,8 +559,10 @@ var SuperSearch = {
 		var thisClass = this;
 		if(flag){
 			if(mySysIsIos()){
+				setTimeout(function(){
 				$("#supersearchPage input[name=super_searchinput]").focus();
 				thisClass.afterFocus();
+				},300);
 			}else{
 				setTimeout(function(){
 					$("#supersearchPage input[name=super_searchinput]").focus();
@@ -2154,8 +2156,10 @@ var SuperSearch = {
 				}
 				//时间
 				var publishtime = _list["publishtime"];
-				if(publishtime){
+				if(publishtime&&publishtime.length>=10){
 					publishtime = timeDiff(new Date(Number(publishtime+"000")));
+				}else{
+					publishtime = ""
 				}
 				homeListHtml +='<div class="price hide"></div>'
 									+'</div>'

+ 5 - 0
src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -867,6 +867,10 @@ body .loading_ p span {
 html,body{
 	background: #fff;
 }
+.color_top{
+	height: .2rem;
+	background: rgba(245,244,249,1);
+}
 </style>
 </head>
 <body>
@@ -937,6 +941,7 @@ html,body{
 			         </div>
 			    </div>
 			</div>
+			<div class="color_top"></div>
 			<div class="listcontent">
 				<div id="list"></div>
 			</div>

+ 111 - 151
src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -14,7 +14,7 @@
 <script src="/jyapp/mobiscroll/mobiscroll.min.js"></script>
 <script src="/jyapp/js/dropload.js?v={{Msg "seo" "version"}}12223"></script>
 <script type="text/javascript" src="/jyapp/js/wxEntsesearch.js?v={{Msg "seo" "version"}}"></script>
-<script type="text/javascript" src="/jyapp/js/wxSupersearch.js?v={{Msg "seo" "version"}}211"></script>
+<script type="text/javascript" src="/jyapp/js/wxSupersearch.js?v={{Msg "seo" "version"}}32"></script>
 <script type="text/javascript" src="/jyapp/js/bootstrap.min.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="/jyapp/js/popup/tap.js?v={{Msg "seo" "version"}}1"></script>
 <!--2.8-->
@@ -188,158 +188,118 @@
 </style>
 <!--主题内容-->
 <section id="searchIndex" class="hidden">
-	<!--2.8.5 start-->
-	<div class="home">
-        <div class="top">
-            <div class="home_search">
-                <div class="home_search_left inp-search">
-                    <img class="icon_search" src="/jyapp/images/search/home_search.png" alt="">
-                    <span>示例:税务局 软件</span>
-                </div>
-                <div class="home_search_right">
-                    <img class="icon_question" src="/jyapp/images/search/home_question.png" alt="">
-                </div>
-            </div>
-            <div class="home_banner">
-                <div class="swiper-container lunbo" id="swiper1">
-                    <div class="swiper-wrapper">
-						<!--轮播广告-->
-                    </div>
-                    <div class="swiper-pagination custorm_dot"></div>
-                </div>
-            </div>
-        </div>
-		{{$s_top:=(Ad "jy-appsearch-home-top" -1)}}
-		<script>
-			var ADTopList={{$s_top}}
-			if (ADTopList!=null){
-				var adhtml = '';
-				for(var i=0;i<ADTopList.length;i++){
-					var ADtitle = "";
-					if(ADTopList[i]["o_extend"]!=undefined&&ADTopList[i]["o_extend"].title!=undefined){
-						ADtitle=ADTopList[i]["o_extend"].title;
+	<!--头部-->
+	<div class="app-layout-header">
+		招标搜索
+	</div>
+	<section class="content">
+		<!--2.8.5 start-->
+		<div class="home">
+	        <div class="top">
+	            <div class="home_search">
+<!--					<input class="inp-search" type="text" name="" value="" maxlength="50" placeholder="示例:税务局 软件" readonly="">-->
+	                <div class="home_search_left inp-search">
+	                    <img class="icon_search" src="/jyapp/images/search/home_search.png" alt="">
+	                    <span>示例:税务局 软件</span>
+	                </div>
+	                <div class="home_search_right">
+	                    <img class="icon_question" src="/jyapp/images/search/home_question.png" alt="">
+	                </div>
+	            </div>
+	            <div class="home_banner">
+	                <div class="swiper-container lunbo" id="swiper1">
+	                    <div class="swiper-wrapper">
+							<!--轮播广告-->
+	                    </div>
+	                    <div class="swiper-pagination custorm_dot"></div>
+	                </div>
+	            </div>
+	        </div>
+			{{$s_top:=(Ad "jy-appsearch-home-top" -1)}}
+			<script>
+				var ADTopList={{$s_top}}
+				if (ADTopList!=null){
+					var adhtml = '';
+					for(var i=0;i<ADTopList.length;i++){
+						var ADtitle = "";
+						if(ADTopList[i]["o_extend"]!=undefined&&ADTopList[i]["o_extend"].title!=undefined){
+							ADtitle=ADTopList[i]["o_extend"].title;
+						}
+						adhtml+='<div class="swiper-slide">'
+				      	if(ADTopList[i]["o_extend"]!=undefined&&ADTopList[i]["o_extend"].linktype=="within"){
+				        	adhtml+="<a onclick=\"AdClick(this,"+false+",'"+ADTopList[i]["s_link"]+"')\"><img src='"+ADTopList[i]["s_pic"]+"'/></a>"
+				      	}else{
+				        	adhtml+="<a onclick=\"AdClick(this,"+true+",'"+ADTopList[i]["s_link"]+"','"+ADtitle+"')\"><img src='"+ADTopList[i]["s_pic"]+"'/></a>"
+				      	}
+						adhtml+='</div>'
+					}
+					if(ADTopList.length==1){
+						$(".swiper-pagination").hide();
+					}
+					if(adhtml!=""){
+						$(".home_banner .swiper-wrapper").html(adhtml);
 					}
-					adhtml+='<div class="swiper-slide">'
-			      	if(ADTopList[i]["o_extend"]!=undefined&&ADTopList[i]["o_extend"].linktype=="within"){
-			        	adhtml+="<a onclick=\"AdClick(this,"+false+",'"+ADTopList[i]["s_link"]+"')\"><img src='"+ADTopList[i]["s_pic"]+"'/></a>"
-			      	}else{
-			        	adhtml+="<a onclick=\"AdClick(this,"+true+",'"+ADTopList[i]["s_link"]+"','"+ADtitle+"')\"><img src='"+ADTopList[i]["s_pic"]+"'/></a>"
-			      	}
-					adhtml+='</div>'
-				}
-				if(ADTopList.length==1){
-					$(".swiper-pagination").hide();
-				}
-				if(adhtml!=""){
-					$(".home_banner .swiper-wrapper").html(adhtml);
 				}
-			}
-			$(function(){
-				//dev2.8.5
-		        var swiper1 = new Swiper('#swiper1',{
-		            autoplay: 3000,
-		            effect: 'fade',
-		            pagination: '.swiper-pagination',
-		            paginationClickable: true,
-		            loop: true,
-		        });
-			})
-		</script>
-        <!-- 导航菜单 -->
-        <div class="home_tab">
-            <div class="tab_container">
-                <a class="tab_item">
-                    <img src="/jyapp/images/search/home_tab_1.png" alt="">
-                    <span>搜中标企业</span>
-                </a>
-                <a class="tab_item">
-                    <img src="/jyapp/images/search/home_tab_2.png" alt="">
-                    <span>数据导出</span>
-                </a>
-                <a class="tab_item">
-                    <img src="/jyapp/images/search/home_tab_3.png" alt="">
-                    <span>标讯订阅</span>
-                </a>
-                <!-- 微信端展示APP下载 
-                <a class="tab_item">
-                    <img src="/jyapp/images/search/home_tab_4.png" alt="">
-                    <span>APP下载</span>
-                </a> -->
-            </div>
-        </div>
-        <!-- 最新标讯 -->
-        <div class="home_data">
-            <h3 class="data_nav">最新标讯</h3>
-            <div class="data_list">
-				<!--首页列表-->
-            </div>
-            <div class="no_data" style="display: none;">
-                <img src="/jyapp/images/search/nothing.png" alt="">
-                <p>为了使您接收更多信息,可对关键词进行新增或修改。</p>
-                <a class="home_toset">去设置</a>
-            </div>
-        </div>
-        <div class="tips">
-            <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_all" style="display: none;"><a class="GetAll">查看全部</a></p>
-            <div class="tips_btn home_toset" style="display: none;">
-                <a class="home_toset" >去设置</a>
-            </div>
-            <div class="tips_btn home_todetails" style="display: none;">
-                <a class="home_todetails" >了解详情</a>
-            </div>
-        </div>
-    </div>
-	<!--头部-->
-	<div class="search-header hide">
-		<!--<center style="color:#fff;line-height:50px;font-size: 16px;">招标搜索</center>-->
-		<div class="app-layout-header">
-			招标搜索
-		</div>
+				$(function(){
+					//dev2.8.5
+			        var swiper1 = new Swiper('#swiper1',{
+			            autoplay: 3000,
+			            effect: 'fade',
+			            pagination: '.swiper-pagination',
+			            paginationClickable: true,
+			            loop: true,
+			        });
+				})
+			</script>
+	        <!-- 导航菜单 -->
+	        <div class="home_tab">
+	            <div class="tab_container">
+	                <a class="tab_item">
+	                    <img src="/jyapp/images/search/home_tab_1.png" alt="">
+	                    <span>搜中标企业</span>
+	                </a>
+	                <a class="tab_item">
+	                    <img src="/jyapp/images/search/home_tab_2.png" alt="">
+	                    <span>数据导出</span>
+	                </a>
+	                <a class="tab_item">
+	                    <img src="/jyapp/images/search/home_tab_3.png" alt="">
+	                    <span>标讯订阅</span>
+	                </a>
+	                <!-- 微信端展示APP下载 
+	                <a class="tab_item">
+	                    <img src="/jyapp/images/search/home_tab_4.png" alt="">
+	                    <span>APP下载</span>
+	                </a> -->
+	            </div>
+	        </div>
+	        <!-- 最新标讯 -->
+	        <div class="home_data">
+	            <h3 class="data_nav">最新标讯</h3>
+	            <div class="data_list">
+					<!--首页列表-->
+	            </div>
+	            <div class="no_data" style="display: none;">
+	                <img src="/jyapp/images/search/nothing.png" alt="">
+	                <p>为了使您接收更多信息,可对关键词进行新增或修改。</p>
+	                <a class="home_toset">去设置</a>
+	            </div>
+	        </div>
+	        <div class="tips">
+	            <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_all" style="display: none;"><a class="GetAll">查看全部</a></p>
+	            <div class="tips_btn home_toset" style="display: none;">
+	                <a class="home_toset" >去设置</a>
+	            </div>
+	            <div class="tips_btn home_todetails" style="display: none;">
+	                <a class="home_todetails" >了解详情</a>
+	            </div>
+	        </div>
+	    </div>
 		
-		<!--搜索-->
-		<div class="search-tontrol">
-			<div>
-				<input class="inp-search" type="text" name="" value="" maxlength="50" placeholder="示例:税务局 软件" readonly/>
-			</div>
-			<!--点击关闭-->
-			<span id="seaClose" class="close"></span>
-			<a class="rightHref">
-			</a>
-		</div>
-	</div>
-	<section class="content hide">
-		<ul>
-			<li>
-				<a>
-					<div>中标企业搜索</div>
-					<div>搜索企业的所有中标项目信息</div>
-				</a>
-			</li>
-			<li class="dataExport">
-				<a>
-					<div>历史数据导出</div>
-					<div>导出任意条件的招标数据,按条数付费</div>
-				</a>
-			</li>
-      <li class="dataExport">
-				<a href="/jyapp/vipsubscribe/vipsubscribe_new">
-					<div>vip订阅</div>
-					<div>导出任意条件的招标数据,按条数付费</div>
-				</a>
-			</li>
-			{{if .T.pullnew}}
-			<li>
-				<a>
-					<div>邀请活动</div>
-					<div>资料包限时免费领</div>
-				</a>
-			</li>
-			{{end}}
-		</ul>
 	</section>
 </section>
 <!--超级搜索页面-->
@@ -951,7 +911,7 @@
 		backThisPage();
 		//点击帮助
 	    $(".home_search_right").click(function(){
-	        JyObj.openExternalLink('http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=3&sn=badf2d7da08654c58b58169e773f58f0#wechat_redirect','使用帮助')
+	        JyObj.openExternalLink('https://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=3&sn=badf2d7da08654c58b58169e773f58f0#wechat_redirect','使用帮助')
 			event.stopPropagation();
 	    });
 	    //数据导出页面

+ 1 - 0
src/jfw/modules/subscribepay/src/service/index_p1.go

@@ -41,6 +41,7 @@ func (this *IndexSearch) GetIndexMessage() {
 	areaCity := this.GetString("city")
 	nReq, _ := this.GetInteger("nReq")
 	userId := qutil.ObjToString(this.GetSession("userId"))
+	log.Println("userId:", userId)
 	if userId != "" {
 		redisData := redis.Get("other", "p1_indexMessage_"+userId)
 		if redisData != nil {