Merge branch 'release' of 192.168.3.17:zhanghongbo/qfw into release

core/src/qfw/mobile/wxmenu.go

@@ -22,11 +22,12 @@ func init() {
 }
 
 func (m *Mobile) Guide() error {
-	m.T["shareData"] = getShareData(m.Url())
-	return m.Render("/swordfish/wxindex.html")
+	m.T["signature"] = getSignature(m.Url())
+	return m.Render("/swordfish/wxindex.html", &m.T)
 }
 func (m *Mobile) Share() error {
-	return m.Render("/swordfish/wxshare.html")
+	m.T["signature"] = getSignature(m.Url())
+	return m.Render("/swordfish/wxshare.html", &m.T)
 }
 
 func (m *Mobile) Wxrssset() error {
@@ -43,6 +44,7 @@ func (m *Mobile) Wxrssset() error {
 		}
 	}()
 	if m.Session().Get("userId") != nil {
+		m.T["signature"] = getSignature(m.Url())
 		userInfo := mongodb.FindById("user", m.GetSession("userId").(string), nil)
 		if i_m_guide := (*userInfo)["i_m_guide"]; util.IntAll(i_m_guide) == 0 {
 			mongodb.Update("user", `{"_id":"`+m.GetSession("userId").(string)+`"}`, map[string]interface{}{
@@ -71,7 +73,6 @@ func (m *Mobile) Wxrssset() error {
 			}
 		}
 		//m.T["mid"] = openid
-		m.T["shareData"] = getShareData(m.Url())
 		return m.Render("/swordfish/wxrssset.html", &m.T)
 	} else {
 		return m.Render("_err.html")
@@ -243,7 +244,7 @@ func (m *Mobile) WxpushList(s_m_openid string, _id string, msgid string) error {
 	**/
 	m.T["data"] = *mongodb.FindById("wxpush", _id, `{"s_content":1,"s_words":1,"a_visitedindex":1,"a_publishtime":1,"s_type":1}`)
 	m.T["_id"] = _id
-	m.T["shareData"] = getShareData(m.Url())
+	m.T["signature"] = getSignature(m.Url())
 	return m.Render("/swordfish/wxpush.html", &m.T)
 }
 
@@ -254,17 +255,18 @@ func (m *Mobile) WxpushAjaxReq() error {
 	}, false, false)
 	return nil
 }
-func getShareData(action string) []string {
+func getSignature(action string) []string {
 	url := coreconfig.SysConfig.DomainName + action
-	log.Println(url)
-	var shareData []string
-	if ret := redis.Get("other", "signature-"+url); ret != nil {
-		if d, err := json.Marshal(ret); err != nil || json.Unmarshal(d, &shareData) != nil {
-			shareData = coreutil.GetJSInterfaceParam(url)
+	var signature []string
+	if ret := redis.Get("other", "wxshare-"+url); ret != nil {
+		if d, err := json.Marshal(ret); err == nil {
+			json.Unmarshal(d, &signature)
 		}
-	} else {
-		shareData = coreutil.GetJSInterfaceParam(url)
-		redis.Put("other", "signature-"+url, shareData, 60*1000)
 	}
-	return shareData
+	if len(signature) == 0 {
+		signature = coreutil.GetJSInterfaceParam(url)
+		redis.Put("other", "wxshare-"+url, signature, 60*1000)
+	}
+	log.Println(url, "------", signature)
+	return signature
 }

core/src/seo.json

@@ -8,7 +8,7 @@
         "homepage": {
             "description": "企明星是一款面向企业和个人提供服务的互联网产品，提供企业社区（企业产品服务信息发布、企业信息查询、企业关系网）、微官网、企业关系网、政策法规查询。",
             "key": "企明星 企业 企业服务网 企业社区 企业服务 企业目录 信用 信用查询 公司查询 法人代表 微官网",
-            "title": "企明星-企业服务网-全国最大最真实的企业社区qq"
+            "title": "企明星-企业服务网-全国最大最真实的企业社区"
         },
         "market": {
             "description": "服务市场提供需求发布，服务发布，需求查询，服务查询",
@@ -25,15 +25,15 @@
             "key": "法律法规、行政规章制度、规范性文件",
             "title": "政策法规_企明星"
         },
-        "wsite": {
-            "description": "微官网_企明星",
-            "key": "微官网_企明星",
-            "title": "微官网_企明星"
-        },
         "swordfish": {
             "description": "剑鱼招标订阅是一款专为销售人员量身定制的招标信息订阅工具。只需微信关注企明星，点击“剑鱼”，即可随时免费收取招标信息推送。",
             "key": "剑鱼招标订阅 剑鱼招标 剑鱼订阅 招标订阅 销售神器 销售必备",
             "title": "剑鱼招标订阅，招标信息早知道！"
+        },
+        "wsite": {
+            "description": "微官网_企明星",
+            "key": "微官网_企明星",
+            "title": "微官网_企明星"
         }
     }
 }

core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-09 16:38:34"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-09 16:38:34"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-11 14:45:22"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-11 14:45:22"}},"marketisstart":true,"marketrate":300}

core/src/web/staticres/css/dev-qfw.css

@@ -2079,6 +2079,9 @@ style="color:#D03102;margin-right:5px;"
 .b-top li{
 	padding-left: 20px;
 }
+.b-top li a{
+	white-space: nowrap;
+}
 .b-top a{
 	color: #A0A0A0;
 }
@@ -2145,7 +2148,7 @@ style="color:#D03102;margin-right:5px;"
 	border-right: 1px solid #ffffff;
 	float: right;
 }
-.b-nav-other a:hover{
+.b-nav-other>a:hover,.b-nav-active>a{
 	font-weight: bold;
 }
 .b-head .headimg{

core/src/web/staticres/css/index-new.css

@@ -250,7 +250,7 @@ a:focus, a:hover{
 	margin-right:8px;
 }
 .a-index  .index-new-xwzx-con .index-new-xwzx-title{
-	width:220px;
+	width:210px;
     font-weight: 700;
     font-size: 16px;
 	white-space:nowrap;
@@ -265,7 +265,7 @@ a:focus, a:hover{
 }
 .a-index  .index-new-xwzx-con .index-new-xwzx-content{
 	height:40px;
-	width:220px;
+	width:210px;
     font-family: '宋体 Regular', '宋体';
     font-size: 12px;
     color: #A0A0A0;
@@ -282,7 +282,9 @@ a:focus, a:hover{
 .a-index-head .index-new-left > div {
 	background-color:#fff;
 	color:#FF5A5F;
-	border-bottom:1px solid #ccc;
+	border-bottom:1px solid #E5E6E9;
+	border-left:1px solid #E5E6E9;
+	border-right:1px solid #E5E6E9;
     font-weight: 700;
     font-size: 16px;
 	padding-left:0px;
@@ -290,7 +292,7 @@ a:focus, a:hover{
 .a-index-head .index-new-left > ul > li {
     font-size: 14px;
     color: #4E5051;	
-	padding-left:5px;
+	padding-left:10px;
 }
 
 .index-new-head .a-i-h-right .a-index-hd img{
@@ -372,11 +374,10 @@ a:focus, a:hover{
 }
 
 .a-index-head .a-i-h-middle > ul > li > a{
-	padding-top:8px;
-	padding-bottom:8px;
+	padding:13px 0px 13 25px;
 }
 .a-index-head .a-i-h-middle,.a-index-head .a-i-h-right{
-	height:438px;
+	height:439px;
 }
 .a-index .index-new-head{
 	margin-bottom:-10px;
@@ -397,6 +398,7 @@ a:focus, a:hover{
 	background-color:#f0f0f0;
 	height:35px;
 	line-height:35px;
+	padding-left:25px;
 }
 .index-new-rmxq-listcon{
 	height:420px;
@@ -467,13 +469,14 @@ a:focus, a:hover{
 	left:-1px;
 }
 .index-new-rmfw-bg1 span,.index-new-wgw-bg1 span{
-	border-top:4px solid #FF5A5F;
+	border-top:3px solid #FF5A5F;
 	display:inline-block;
-	width:250px; height:65px;
+	width:250px; 
+	height:67px;
 	background-image:url(/images/u46.png);
 	background-repeat:no-repeat;
 	background-position:-1px -2px;
-	background-size: 252px 65px;
+	background-size: 252px 67px;
 }
 .index-new-rmfw-remarktitle{
     font-size: 16px;
@@ -494,7 +497,9 @@ a:focus, a:hover{
 .a-index-head .index-new-left > ul {
 	background-color:#fff;
 	border-bottom:3px solid #FF5A5F;
-	padding-left:2px;
+	border-left:1px solid #E5E6E9;
+	border-right:1px solid #E5E6E9;
+	padding-left: 0px;
 }
 .index-new-qysqlist{
 	width:25%; 
@@ -515,4 +520,20 @@ a:focus, a:hover{
 }
 .b-round-dot{
 	background-color: rgb(255, 90, 95);
+}
+
+.a-index-head .a-i-h-left .index-new-zb {
+    width: 6px;
+    height: 10px;
+    margin-top: 10px;
+	margin-right:15px;
+}
+.a-index-head .a-i-h-middle > ul {
+	padding-left:0px;
+	border:1px solid #E5E6E9;
+	border-bottom:3px solid #FF5A5F;
+}
+.a-index-head .a-i-h-middle > ul > li {
+	background-color:#fff;
+	margin-bottom:0px;
 }

core/src/web/staticres/css/swordfish.css

@@ -21,7 +21,7 @@ a:focus, a:hover{
 .b-nav-main{
 	background-color: #37C6DA;
 }
-.b-nav-other a:hover{
+.b-nav-other>a:hover,.b-nav-active>a{
 	color: #37C6DA !important;
 }
 .b-head .head-hideMenu i{

core/src/web/staticres/js/qfw.js

@@ -572,8 +572,6 @@ function b_loadTop(){
 				var html = '<a onclick="loginModalShow();">登录/注册</a>';
 				$("#b-loginStatus").html(html);
 				$("#bottom-bar>li").removeClass("invisible");
-				//登录
-				$("body").append('{{include "/common/login.html"}}');
 			}
 			try{
 				b_loadTopCallBack(result);

core/src/web/staticres/wxswordfish/share.js

@@ -0,0 +1,40 @@
+function initShare(signature){
+	if(typeof(signature) != "undefined" && signature != null && signature.length == 4){
+		wx.config({
+		    debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+		    appId: signature[0], // 必填，公众号的唯一标识
+		    timestamp:signature[1], // 必填，生成签名的时间戳
+		    nonceStr: signature[2], // 必填，生成签名的随机串
+		    signature: signature[3],// 必填，签名，见附录1
+		    jsApiList: ['onMenuShareTimeline', 'onMenuShareAppMessage'] // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
+		});
+		wx.ready(function () {
+	        wx.onMenuShareTimeline({
+			    title: '剑鱼-招标订阅，招标信息早知道！', // 分享标题
+			    link: 'http://www.qimingxing.info/swordfish/share', // 分享链接
+			    imgUrl: 'http://www.qimingxing.info/wxswordfish/images/share-icon.png', // 分享图标
+			    success: function () { 
+			       //alert('分享成功');
+			    },
+			    cancel: function () { 
+			       //alert('分享失败，或用户取消了');
+			    }
+			});
+			
+			wx.onMenuShareAppMessage({
+			    title: '剑鱼-招标订阅，招标信息早知道！', // 分享标题
+			    desc: '关注微信并设置剑鱼关键词，全国招标信息统统推送给您！', // 分享描述
+			    link: 'http://www.qimingxing.info/swordfish/share', // 分享链接
+			    imgUrl: 'http://www.qimingxing.info/wxswordfish/images/share-icon.png', // 分享图标
+			    type: 'link', // 分享类型,music、video或link，不填默认为link
+			    dataUrl: '', // 如果type是music或video，则要提供数据链接，默认为空
+			    success: function () { 
+			        //alert('分享成功');
+			    },
+			    cancel: function () { 
+					//alert('分享失败，或用户取消了');
+			    }
+			});
+	    });
+	}
+}	

core/src/web/staticres/wxswordfish/style.css

@@ -385,9 +385,6 @@ img{
 .guide-bottom .arrow-up{
 	width: 30px;
 	height: 20px;
-	position: absolute;
-	left: 50%;
-	margin-left: -12.5px;
 	animation-name:start;
 	animation-duration:2s;
 	animation-timing-function:ease-in-out;
@@ -416,42 +413,47 @@ img{
 @-webkit-keyframes start {
 	0%{
 		opacity:0;
-		bottom: 0px;
+		margin-bottom: 0px;
 	}
 	60% {
 		opacity:1;
 	}
 	100% {
 		opacity:0;
-		bottom: 40px;
+		margin-bottom: 40px;
 	}
 }
 @-moz-keyframes start {
 	0%{
 		opacity:0;
-		bottom: 0px;
+		margin-bottom: 0px;
 	}
 	60% {
 		opacity:1;
 	}
 	100% {
 		opacity:0;
-		bottom: 40px;
+		margin-bottom: 40px;
 	}
 }
 @keyframes start {
 		0% {
 		opacity:0;
-		bottom: 0px;
+		margin-bottom: 0px;
 	}
 	60% {
 		opacity:1;
 	}
 	100% {
 		opacity:0;
-		bottom: 40px;
+		margin-bottom: 40px;
 	}
 }
+.guide-bottom .experience{
+	padding: 4px 8px;
+	margin-bottom: 20px;
+	display: none;
+}
 .guide-bottom .jumpGuide ,.guide-bottom .goToShare{
 	color: #D7D7D7;
 	position: absolute;

core/src/web/templates/index.html

@@ -45,7 +45,8 @@
 				<li>
 					<div class="a-parent">{{$v.name}}</div>
 					{{range $k, $v := $v.children}}
-					{{if gt $k 0}}<span></span>{{end}}<a href="/market/{{$v.code}}/list.html">{{$v.name}}</a>
+					<!--{{if gt $k 0}}<span></span>{{end}}-->
+					<a href="/market/{{$v.code}}/list.html">{{$v.name}}</a>
 					{{end}}
 				</li>
 				{{end}}

core/src/web/templates/swordfish/infolist.html

@@ -7,7 +7,7 @@
 <script type="text/javascript">
 	var lasttime=1,s_words,a_visitedindex,a_publishtime,le,f_id,a_interest;
 $(function(){
-	$(".swordfish-nav>ul>li:eq(3)").addClass("swordfish-nav-active");
+	$(".b-nav>ul>li:eq(3)").addClass("b-nav-active");
 	//
 	$.ajax({    
 		type:'post',        

core/src/web/templates/swordfish/rssset.html

@@ -272,7 +272,7 @@ $(function(){
 			selectKeyword("bid",msgset.bid.a_key);
 		}
 	}
-	$(".swordfish-nav>ul>li:eq(2)").addClass("swordfish-nav-active");
+	$(".b-nav>ul>li:eq(2)").addClass("b-nav-active");
 	$("#yjfk").click(function(){
 		$("body").append('<form id="feedbackForm" action="/front/web_feedbacklist.html" method="post" class="hide"><input type="hidden" name="url" value="'+window.location.href+'"></form>');
 		$("#feedbackForm").submit();

core/src/web/templates/swordfish/wxindex.html

@@ -6,6 +6,7 @@
 <link href="/swiper/swiper.min.css" rel="stylesheet">
 <script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
 <script src="/js/jquery.js"></script>
+<script src="/wxswordfish/share.js"></script>
 <script src="/swiper/swiper.min.js"></script>
 </head>
 <body>
@@ -34,7 +35,8 @@
    	<div class="swiper-pagination"></div>
 	<div class="guide-bottom">
 		<img class="arrow-up" src="/wxswordfish/images/up.png">
-		<img src="/wxswordfish/images/jump.png" class="jumpGuide" onclick="{{if session "userid"}}window.location.href='/swordfish/page'{{else}}history.go(-1);{{end}}">
+		<button class="btn experience" onclick="pageJump();">立即体验</button>
+		<img src="/wxswordfish/images/jump.png" class="jumpGuide" onclick="pageJump();">
 		<img class="goToShare" id="goToShare" src="/wxswordfish/images/guide-share.png">
 	</div>
 </div>
@@ -50,6 +52,7 @@ $(function(){
 		touchMoveStopPropagation: false,
 		virtualTranslate: true,
 		onSlideChangeStart: function(swiper){
+			console.info();
 			var prevSlide = $(swiper.slides[swiper.previousIndex]);
 			prevSlide.addClass("slide-active");
 			var activeSlide = $(swiper.slides[swiper.activeIndex]);
@@ -62,14 +65,19 @@ $(function(){
 			activeSlide.one("webkitAnimationEnd",function(){
 				$(this).removeClass("slide-up").removeClass("slide-down");
 				prevSlide.removeClass("slide-active");
+				if(swiper.activeIndex == 5){
+					$(".arrow-up").hide();
+					$(".experience").show();
+				}else{
+					$(".experience").hide();
+					$(".arrow-up").show();
+				}
 			});
 		},
 		onSliderMove: function(swiper, event){
-			{{if session "userid"}}
 			if(swiper.isEnd && (swiper.touches.currentX - swiper.touches.startX) > 20) {
-				window.location.href = "/swordfish/page";
+				pageJump();
 			}
-			{{end}}
 		}
     });
 	/*
@@ -84,6 +92,13 @@ $(function(){
 		$(".swiper-slide img").css({width: height / imgHeight * imgWidth,height: height,marginTop: -(height / 2)});
 	}*/
 });
+function pageJump(){
+	{{if session "userId"}}
+		window.location.href = '/swordfish/page';
+	{{else}}
+		history.go(-1);
+	{{end}}
+}
 </script>
 </body>
 </html>

core/src/web/templates/swordfish/wxpush.html

@@ -5,6 +5,7 @@
 <link href="/wxswordfish/style.css" rel="stylesheet">
 <script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
 <script src="/js/jquery.js"></script>
+<script src="/wxswordfish/share.js"></script>
 <script>
 $(function(){
 	var hm = document.createElement("script");

core/src/web/templates/swordfish/wxrssset.html

@@ -7,6 +7,7 @@
 <link href="/wxswordfish/style.css" rel="stylesheet">
 <script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
 <script src="/js/jquery.js"></script>
+<script src="/wxswordfish/share.js"></script>
 <script>
 	var msgset= {{.T.msgset}};
 </script>

core/src/web/templates/swordfish/wxshare.html

@@ -2,6 +2,12 @@
 <head>
 <title>企明星-剑鱼</title>
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
+<script src="/js/jquery.js"></script>
+<script src="/wxswordfish/share.js"></script>
+<script>
+	initShare({{.T.signature}});
+</script>
 </head>
 <body style="margin: 0px;">
 <img src="/wxswordfish/images/share-page.png" width="100%" height="100%">

core/src/web/templates/swordfish/wxtoolbar.html

@@ -15,12 +15,12 @@
 <div class="dialog share-dialog">
 	<div class="dialog-main">
 		<div class="dialog-head">
-			<div>分享</div>
+			<div>如何分享</div>
 			<div><span id="share-dialog-back">返回</span></div>
 		</div>
 		<div class="dialog-content">
 			<div>
-				点击右上角…按钮，选择发送给朋友，或分享到朋友圈，即可完成分享!
+				点击右上角…按钮，选择发送给朋友，或分享到朋友圈，即可完成分享！（对方收到邀请后看到的是剑鱼的宣传页面，不会看到您的设置信息，请放心）
 			</div>
 		</div>
 	</div>
@@ -70,45 +70,7 @@ $(function(){
 		}
 	});
 	//
-	var shareData = {{.T.shareData}};
-	if(typeof(shareData) != "undefined" && shareData != null && shareData.length == 4){
-		wx.config({
-		    debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
-		    appId: shareData[0], // 必填，公众号的唯一标识
-		    timestamp:shareData[1], // 必填，生成签名的时间戳
-		    nonceStr: shareData[2], // 必填，生成签名的随机串
-		    signature: shareData[3],// 必填，签名，见附录1
-		    jsApiList: ['onMenuShareTimeline', 'onMenuShareAppMessage'] // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
-		});
-		 wx.ready(function () {
-	        wx.onMenuShareTimeline({
-			    title: '剑鱼-招标订阅，招标信息早知道！', // 分享标题
-			    link: 'http://www.qimingxing.info/swordfish/share', // 分享链接
-			    imgUrl: 'http://www.qimingxing.info/wxswordfish/images/share-icon.jpg', // 分享图标
-			    success: function () { 
-			       //alert('分享成功');
-			    },
-			    cancel: function () { 
-			       //alert('分享失败，或用户取消了');
-			    }
-			});
-			
-			wx.onMenuShareAppMessage({
-			    title: '剑鱼-招标订阅，招标信息早知道！', // 分享标题
-			    desc: '关注微信并设置剑鱼关键词，全国招标信息统统推送给您！', // 分享描述
-			    link: 'http://www.qimingxing.info/swordfish/share', // 分享链接
-			    imgUrl: 'http://www.qimingxing.info/wxswordfish/images/share-icon.jpg', // 分享图标
-			    type: 'link', // 分享类型,music、video或link，不填默认为link
-			    dataUrl: '', // 如果type是music或video，则要提供数据链接，默认为空
-			    success: function () { 
-			        //alert('分享成功');
-			    },
-			    cancel: function () { 
-					//alert('分享失败，或用户取消了');
-			    }
-			});
-	    });
-	}
+	initShare({{.T.signature}});
 });
 //意见反馈
 function Feedback(){