分支合并

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

@@ -50,19 +50,21 @@ type UserSign struct {
 //登录踢别人，自动登录检查有没有被踢出
 type Login struct {
 	*xweb.Action
-	login                xweb.Mapper `xweb:"/jyapp/free/login"`                //登录
-	register             xweb.Mapper `xweb:"/jyapp/free/register"`             //注册
-	wxLogin              xweb.Mapper `xweb:"/jyapp/free/wxLogin"`              //
-	signOut              xweb.Mapper `xweb:"/jyapp/free/signOut"`              //退出
-	forgetPwd            xweb.Mapper `xweb:"/jyapp/free/forgetPwd"`            //忘记密码
-	sess                 xweb.Mapper `xweb:"/jyapp/free/sess/(.*)"`            //微信跳转session登录
-	timeCheckRepeatLogin xweb.Mapper `xweb:"/jyapp/free/timeCheckRepeatLogin"` //定时发起ajax请求检查是否重复登录
-	updateRid            xweb.Mapper `xweb:"/jyapp/free/updateRid"`            //更新极光id，更新签名
-	identCodeLogin       xweb.Mapper `xweb:"/jyapp/free/identCodeLogin"`       //短信验证码登录
-	brand                xweb.Mapper `xweb:"/jyapp/free/message/brand"`        //设置手机类型和推送id
-	afterPageLoadToCheck xweb.Mapper `xweb:"/jyapp/free/afterPageLoadToCheck"` //检测
-	channelSign          xweb.Mapper `xweb:"/jyapp/free/channelSign"`          //渠道统计
-	savePushIdMsg        xweb.Mapper `xweb:"/jyapp/free/savePushIdMsg"`        //推送id记录
+	login                xweb.Mapper `xweb:"/jyapp/free/login"`                     //登录
+	register             xweb.Mapper `xweb:"/jyapp/free/register"`                  //注册
+	wxLogin              xweb.Mapper `xweb:"/jyapp/free/wxLogin"`                   //
+	signOut              xweb.Mapper `xweb:"/jyapp/free/signOut"`                   //退出
+	forgetPwd            xweb.Mapper `xweb:"/jyapp/free/forgetPwd"`                 //忘记密码
+	sess                 xweb.Mapper `xweb:"/jyapp/free/sess/(.*)"`                 //微信跳转session登录
+	timeCheckRepeatLogin xweb.Mapper `xweb:"/jyapp/free/timeCheckRepeatLogin"`      //定时发起ajax请求检查是否重复登录
+	updateRid            xweb.Mapper `xweb:"/jyapp/free/updateRid"`                 //更新极光id，更新签名
+	identCodeLogin       xweb.Mapper `xweb:"/jyapp/free/identCodeLogin"`            //短信验证码登录
+	brand                xweb.Mapper `xweb:"/jyapp/free/message/brand"`             //设置手机类型和推送id
+	afterPageLoadToCheck xweb.Mapper `xweb:"/jyapp/free/afterPageLoadToCheck"`      //检测
+	channelSign          xweb.Mapper `xweb:"/jyapp/free/channelSign"`               //渠道统计
+	changeiosUpdate      xweb.Mapper `xweb:"/jyapp/free/changeiosUpdate/(.*)/(.*)"` //ios更新显示
+	savePushIdMsg        xweb.Mapper `xweb:"/jyapp/free/savePushIdMsg"`             //推送id记录
+
 }
 
 var (
@@ -1243,3 +1245,21 @@ func (l *Login) SavePushIdMsg() {
 		"success": result,
 	})
 }
+func (l *Login) ChangeiosUpdate(version, flag string) {
+	updateMap := qutil.ObjToMap(config.Sysconfig["update"])
+	if version != qutil.ObjToString((*updateMap)["ios_version"]) {
+		log.Println(version, (*updateMap)["ios_version"])
+		l.Write("false")
+		return
+	}
+	if flag == "open" {
+		(*updateMap)["ios_openUpdate"] = true
+	} else if flag == "close" {
+		(*updateMap)["ios_openUpdate"] = false
+	}
+	str := "close"
+	if (*updateMap)["ios_openUpdate"].(bool) {
+		str = "open"
+	}
+	l.Write("ios openUpdate status is:%s", str)
+}

src/jfw/modules/app/src/config.json

@@ -75,6 +75,7 @@
 		"tipspace": 86400,
 		"ios_version": "2.7.3",
         "ios_mustupdate": false,
+        "ios_openUpdate":false,
         "apkurl": "http://web-jydev-wky.jianyu360.cn/jyapp/res/%s/jianyu360.apk",
         "channelDir":{
 			"baidu":"baiduSem",

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

@@ -362,9 +362,9 @@ function afterPageInit(){
 	var oid = getOtherPushId();
 	$.post("/jyapp/free/afterPageLoadToCheck?t="+new Date().getTime(),{sign:sign,rid:rid,oid:oid,phoneType:getPhoneType(),version:JyObj.getVersion()},function(r){
 		if(mySysIsIos()){
-			if(r.updateflag){
+			if(r.updateflag&&r.update.ios_openUpdate){
 				var version = JyObj.getVersion();
-				if(version != r.update.ios_version){
+				if(needUpdate(version,r.update.ios_version)){
 					//以后版本
 					if(r.update.ios_mustupdate){
 						JyObj.openExternalLink(r.webdomain+"/jyapp/free/goToUpdate?mustupdate=1","-1");
@@ -390,6 +390,28 @@ function afterPageInit(){
 	//记录推送id
 	savePushIdMsg();
 }
+function needUpdate(curVersion,upVersion){
+	v1=curVersion.split(".");
+	v2=upVersion.split(".");
+	var maxlen=v1.length>v2.length?v1.length:v2.length;
+    for(var i=0;i<maxlen;i++){
+		if(v1[i]==v2[i]){
+			continue
+		}
+		if(v1[i]==undefined){
+			v1[i]=-1;
+		}
+		if(v2[i]==undefined){
+			v2[i]=-1;
+		}
+    	if(parseInt(v1[i])<parseInt(v2[i])){
+			return true;
+		}else{
+			return false;
+		}
+    }
+	return false;
+}
 function redSpotOnMenu(){
 	$.post("/jyapp/free/showRedSpotOnMenu?t="+new Date().getTime(),null,function(r){
 		var noticeCount = r.notice;

src/jfw/modules/app/src/web/staticres/jyapp/js/popup/tap.js

@@ -1,7 +1,7 @@
 
 //$(function () {
 	window.onload =function(){
-		setTimeout(function(){
+		/*setTimeout(function(){
 			var version = JyObj.getVersion();
 			if (localStorage.getItem("popup_bx_"+version) != "A"){
 				var tapHtml = '<div class="modal fade" id="myModal-tap" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="true">'
@@ -21,34 +21,52 @@
 					$("#myModal-tap").modal("hide");
 				}catch(e){}
 			}
-		},500)
+		},500)*/
+		var lastAlertDate=localStorage.getItem("lastAlertDate")
+		if (!lastAlertDate||new Date().getTime()>parseInt(lastAlertDate)+1000*60*60*24*30){
+			var tapHtml = '<div class="modal fade" id="myModal-tap" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="true">'
+			+'<div class="modal-dialog" style="height:100%;margin:0px">'
+			+'<div class="pop-new" style="width: 5.6rem;height: 7.2rem;background: url(../images/search/dataexportAd.png);background-size: cover;border-radius: 8px;position: relative;top: 3.5rem;left: 50%;margin-left: -2.8rem;">'
+			+'<div style="position: absolute;top: -1rem;left: 5.25rem;height: 1rem; border-left: 1px solid #fff;font-family: 微软雅黑;"></div>'
+			+'<div style="position: absolute;color: #0687DB;font-size: 14px;bottom: .6rem;left: 50%;margin-left: -2.3rem;font-family: 微软雅黑;width: 4.6rem;border: 1px solid #fff;border-radius: 6px;text-align: center;cursor: pointer;height: .8rem;line-height: .8rem;" onclick="details()"></div>'
+			+'<div style="width: .5rem;height: .5rem;position: absolute;left: 5rem;top: -1.5rem;cursor: pointer;border: 1px solid #fff;border-radius: 15px;padding: 2px;" ><img class="popClose" style="left: 0.12rem;width: 54%;position: absolute;top: 0.1rem;" src="../images/search/dy_close.png" onclick="popClose()"></div>'
+			+'</div>'
+			+'</div>'
+			+'</div>'
+			$("body").append(tapHtml)
+			$("#myModal-tap").modal("show");
+		}else{
+			try{
+				$("#myModal-tap").modal("hide");
+			}catch(e){}
+		}
 	}
 //});
 
-function popClose(version){
-	addStorge(version);
+function popClose(){
+	//addStorge(version);
+	localStorage.setItem("lastAlertDate",new Date().getTime())
 	$("#myModal-tap").modal("hide");
 }
 
 function details(){
 	popClose();
-	var loginFlag = true
-	var tapRefer = "N"
-	var link = "https://res.jianyu360.com/jyapp/free/message/QQwSV1YVAVEBA0xfEVpSEQAGAg1CDUZa.html";
-	if(mySysIsIos()){
-		link = "https://res.jianyu360.com/jyapp/free/message/QQwSV1YXUQABA0xfEVpSEQAGAg1CDUZb.html"
-	}
-	if(userId != null&&userId != ""){
-		tapRefer = "T"
-		window.location.href = link+"?tapRefer="+tapRefer;
-	}else{
-		JyObj.openExternalLink(link+"?tapRefer="+tapRefer,"");
-	}
+	var href=window.location.protocol+"//"+window.location.host+"/sjdc/index.html"
+	JyObj.openExternalLink(href,"");
+//	var loginFlag = true
+//	var tapRefer = "N"
+//	var link = "http://res.jianyu360.com/sjdc/index.html";
+//	if(userId != null&&userId != ""){
+//		tapRefer = "T"
+//		window.location.href = link+"?tapRefer="+tapRefer;
+//	}else{
+//		JyObj.openExternalLink(link+"?tapRefer="+tapRefer,"");
+//	}
 }
 
-function addStorge(version){
-	localStorage.setItem("popup_bx_"+version, "A")
-}
+//function addStorge(version){
+//	localStorage.setItem("popup_bx_"+version, "A")
+//}
 
 
 function mySysIsIos(){

src/web/staticres/css/dataService.css

@@ -85,7 +85,7 @@
 
 .dataCorporation .apply {
 	margin-left: 150px;
-	margin-top: 40px;
+	margin-top: 30px;
 }
 
 .dataCorporation .apply p {
@@ -135,7 +135,7 @@
 	opacity: 1;
 	border-radius: 6px;
 	margin-left: 100px;
-	margin-top: 30px;
+	margin-top: 65px;
 }
 
 .dataCorporation button span {
@@ -203,6 +203,62 @@
 	opacity: 1;
 }
 
+.dataExport .help{
+	margin-left: 155px;
+	margin-top: 12px;
+}
+
+.dataExport .help p{
+	width: 80px;
+	height: 29px;
+	font-size: 20px;
+	font-family: "Microsoft YaHei",sans-serif;
+	font-weight: 400;
+	line-height: 29px;
+	color: rgba(102, 102, 102, 1);
+	opacity: 1;
+}
+
+.dataExport .bz{
+	margin-left: 30px;
+	margin-top: 15px;
+}
+
+.dataExport .bz p:nth-of-type(1){
+	width: 323px;
+	height: 48px;
+	font-size: 16px;
+	font-family: "Microsoft YaHei",sans-serif;
+	font-weight: 400;
+	line-height: 24px;
+	color: rgba(102, 102, 102, 1);
+	opacity: 1;
+}
+
+.dataExport .bz p:nth-of-type(2){
+	width: 323px;
+	height: 48px;
+	font-size: 16px;
+	font-family: "Microsoft YaHei",sans-serif;
+	font-weight: 400;
+	line-height: 24px;
+	color: rgba(102, 102, 102, 1);
+	opacity: 1;
+	margin-top: 5px;
+}
+
+.dataExport .bz p:nth-of-type(3){
+	width: 323px;
+	height: 48px;
+	font-size: 16px;
+	font-family: "Microsoft YaHei",sans-serif;
+	font-weight: 400;
+	line-height: 24px;
+	color: rgba(102, 102, 102, 1);
+	opacity: 1;
+	margin-top: 5px;
+}
+
 .dataExport button {
 	width: 180px;
 	height: 46px;
@@ -211,7 +267,7 @@
 	opacity: 1;
 	border-radius: 6px;
 	margin-left: 100px;
-	margin-top: 215px;
+	margin-top: 30px;
 }
 
 .dataExport button span {

src/web/staticres/pccss/index.css

@@ -369,59 +369,59 @@ input:-ms-input-placeholder {
 body{
 	overflow-y:hidden !important;  
 }
-.tan {
-  width: 515px;
-  height: 320px;
-  background: url("/images/pc/tan.png");
-  background-size: cover;
-  -webkit-border-radius: 8px;
-  -moz-border-radius: 8px;
-  border-radius: 8px;
-  position: relative;
-  top: 160px;
-  left: 420px;
-  display: none;
-}
-.tan img {
-  width: 35px;
-  height: 35px;
-  position: absolute;
-  left: 240px;
-  top: 335px;
-  cursor: pointer;
-}
-.tan .tan1{
-  font-family: "微软雅黑";
-  font-size: 32px;
-  font-weight: bolder;
-  color: #fff;
-  margin-left: 50px;
-  position: relative;
-  top: 50px;
-}
-.tan .tan2{
-  font-size: 18px;
-  color: #fff;
-  margin-left: 50px;
-  position: relative;
-  top: 70px;
-  float: left;
-}
-.tan .tan3{
-  width: 135px;
-  height: 32px;
-  border-radius: 18px;
-  background: #fff;
-  float: left;
-  clear: both;
-  text-align: center;
-  line-height: 32px;
-  position: relative;
-  top: 150px;
-  margin-left: 50px;
-}
-.tan .tan3 p{
-  font-size: 14px;
-  color: #0a74bf;
-  font-weight: bolder;
-}
+/*.tan {*/
+  /*width: 515px;*/
+  /*height: 320px;*/
+  /*background: url("/images/pc/tan.png");*/
+  /*background-size: cover;*/
+  /*-webkit-border-radius: 8px;*/
+  /*-moz-border-radius: 8px;*/
+  /*border-radius: 8px;*/
+  /*position: relative;*/
+  /*top: 160px;*/
+  /*left: 420px;*/
+  /*display: none;*/
+/*}*/
+/*.tan img {*/
+  /*width: 35px;*/
+  /*height: 35px;*/
+  /*position: absolute;*/
+  /*left: 240px;*/
+  /*top: 335px;*/
+  /*cursor: pointer;*/
+/*}*/
+/*.tan .tan1{*/
+  /*font-family: "微软雅黑";*/
+  /*font-size: 32px;*/
+  /*font-weight: bolder;*/
+  /*color: #fff;*/
+  /*margin-left: 50px;*/
+  /*position: relative;*/
+  /*top: 50px;*/
+/*}*/
+/*.tan .tan2{*/
+  /*font-size: 18px;*/
+  /*color: #fff;*/
+  /*margin-left: 50px;*/
+  /*position: relative;*/
+  /*top: 70px;*/
+  /*float: left;*/
+/*}*/
+/*.tan .tan3{*/
+  /*width: 135px;*/
+  /*height: 32px;*/
+  /*border-radius: 18px;*/
+  /*background: #fff;*/
+  /*float: left;*/
+  /*clear: both;*/
+  /*text-align: center;*/
+  /*line-height: 32px;*/
+  /*position: relative;*/
+  /*top: 150px;*/
+  /*margin-left: 50px;*/
+/*}*/
+/*.tan .tan3 p{*/
+  /*font-size: 14px;*/
+  /*color: #0a74bf;*/
+  /*font-weight: bolder;*/
+/*}*/

src/web/templates/pc/dataExport_sieve.html

@@ -386,6 +386,19 @@
 <body>
 {{include "/common/pchead.html"}}
 <section class="conditions-box w">
+    <!--顶部banner-->
+    <div class="banner" style="margin-bottom:30px;">
+    	{{$s:=(Ad "dataExport_Sieve_Banner" 1)}}
+			  {{range $k,$v := $s}}
+    			{{if $v.s_pic}}
+    				{{if $v.s_link}}<a href="{{$v.s_link}}" target="_blank"/>{{end}}
+    				<img src="{{$v.s_pic}}">
+    				{{if $v.s_link}}</a>{{end}}
+    			  {{else}}
+    			{{Html $v.s_script}}
+  			{{end}}
+			{{end}}
+    </div>
     <!--指示条-->
     <div class="progress_">
         <div class="pro l c3">

src/web/templates/pc/dataService.html

@@ -12,7 +12,7 @@
     {{include "/common/pnc.html"}}
     <script type="text/javascript" src="{{Msg "seo" "cdn"}}/pccss/n_rem.js?v={{Msg "seo" "version"}}"></script>
     <script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}"></script>
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/dataService.css?v={{Msg "seo" "version"}}2">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/dataService.css?v={{Msg "seo" "version"}}1">
     <link href="{{Msg "seo" "cdn"}}/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
     <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/pccss/reset_pc.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}" />
@@ -134,7 +134,21 @@
               </div>
               <div class="rr">
                   <p>
-                      剑鱼标讯提供全国招标投标数据的自助导出功能，企业可指定关键词、发布时间、地区或行业等筛选条件，剑鱼标讯以EXCEL表格形式提供数据。
+                      剑鱼标讯提供全国招投标数据的自助导出功能，企业可指定关键词、发布时间、地区或行业等筛选条件，剑鱼标讯以EXCEL表格形式提供数据。
+                  </p>
+              </div>
+              <div class="help">
+                  <p>帮助你</p>
+              </div>
+              <div class="bz">
+                  <p>
+                      1、全面获取市场信息，紧跟市场趋势，提前布局；
+                  </p>
+                  <p>
+                      2、准确掌握行业客户、竞争对手、合作伙伴的招投标活动；
+                  </p>
+                  <p>
+                      3、轻松挖掘潜在客户、合作伙伴，拓展市场空间。
                   </p>
               </div>
               <button onclick="window.open('/front/dataExport/toSieve')">

src/web/templates/pc/index.html

@@ -23,6 +23,43 @@
 50% {top: -25px;}
 100% {top: -20px;}
 }
+.tc{
+	width: 440px;
+	height: 295px;
+	background: url(/images/pc/tc.png);
+	background-size: cover;
+	border-radius: 8px;
+	position: relative;
+	left: 450px;
+	top: 155px;
+	cursor: pointer;
+	display: none;
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	z-index: 1000;
+}
+#close2x{
+	width: 30px;
+	height: 30px;
+	position: absolute;
+	left: 655px;
+	top: 465px;
+	cursor: pointer;
+	display: none;
+	z-index: 1000;
+}
+.tans{
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	background-color: #000;
+	display: none;
+	filter:alpha(opacity=50);  /*设置透明度为60%*/
+	opacity:0.5;  /*非IE浏览器下设置透明度为60%*/
+	z-index: 999;
+}
 </style>
 </head>
 	<body>
@@ -58,13 +95,11 @@
 					<!--<span class="movedot"></span>-->
 				</div>
 			</div>
-			<!-- 弹窗 
-			<div class="tan">
-				<span class="tan1">剑鱼标讯改名啦！</span>
-				<span class="tan2">再见，剑鱼标讯招标订阅！你好，剑鱼标讯！</span>
-				<span class="tan3"><p>去看看</p></span>
-				<img class="tanClose" src="/images/j-wx-code-close.png" onclick="tanClose()">
-			</div>-->
+			<!-- 弹窗 -->
+			<div class="tc ">
+		    </div>
+			<img src="/images/pc/close2x.png" id="close2x">
+			<div class="tans"></div>
 			<!-- 弹窗 -->
 			<div class="animtionBox box-3">
 				<span class="bg"></span>
@@ -146,14 +181,43 @@
 	</body>
 <script>
 // 弹窗
-//if (localStorage.getItem("change") != "change"){
-//	$('.tan').show();
-//}
-//function tanClose() {
-//	$('.tan').hide();
-//	localStorage.setItem("change", "change")
-//}
-
+var times = new Date().getTime();
+var show = times - localStorage.tc;
+if(localStorage.tc === undefined){
+	$(".tc").css("display","block");
+	$("#close2x").css("display","block");
+	$(".tans").css("display","block");
+}else{
+	if(show >= 2592000000){
+		$(".tc").css("display","block");
+		$("#close2x").css("display","block");
+		$(".tans").css("display","block");
+	}else{
+		$(".tc").css("display","none");
+		$("#close2x").css("display","none");
+		$(".tans").css("display","none");
+	}
+}
+$("#close2x").click(function () {
+	$(".tc").animate({
+		opacity: "hide"
+	}, "slow");
+	$("#close2x").animate({
+		opacity: "hide"
+	}, "slow");
+	$(".tans").animate({
+		opacity: "hide"
+	}, "slow");
+	var time = new Date().getTime();
+	localStorage.setItem("tc", time)
+});
+//
+$(".tc").on("click", function () {
+	window.location.href="front/dataExport/toSieve";
+	var time = new Date().getTime();
+	localStorage.setItem("tc", time)
+});
+//
 var localhref = location.href;
 window._bd_share_config = {
 	common : {