Merge branch 'develop' of http://192.168.3.17/gitlab/zhanghongbo/qfw into develop

common/src/qfw/util/encrypt_test.go

@@ -67,6 +67,6 @@ func Test_int(t *testing.T) {
 
 func TestActivity(t *testing.T) {
 	se := SimpleEncrypt{Key: "topnet2015topnet2015"}
-	tmp := se.EncodeString("oZQC_s7VTU3p9SrhU27gA5v2MDk0")
+	tmp := se.EncodeString("obEpLuPmkfICwGUh8U3nwN_UK3qY")
 	log.Println(tmp, se.DecodeString(tmp))
 }

core/src/qfw/active/activemanage.go

@@ -161,24 +161,23 @@ func (a *Activemanage) Getluckdraw() error {
 		}
 		msg = "　　小主是真真的好运气，" + s_prize + "落入您囊中。红包将由系统自动发放到您的微信，请注意查收。<br/><br/>分享至朋友圈或好友即可以获得明天抽奖资格呦！乖，快去分享吧！大奖可能就在明天~~"
 	} else if (i > 275 && i < 310) || (i > 95 && i < 130) {
-		id := a.GetSession("userid").(string)
-		b := credit.UpuserCreditSession(id, "b6", "B", nil, a.Action)
+		//时间判断，提醒不同
+		//now := time.Now()
+		//不在工作时间
+		//if now.Weekday() == 6 || now.Weekday() == 0 || (now.Hour() > 18 || now.Hour() < 9) {
+		//
+		//	msg = "　　小主是真真的好运气，" + s_prize + "落入您囊中！<br/>　　请在微信留下您的联系方式（手机号或qq号），企明星客服会在下一个工作日9:00-17:00给小主回复哦!<br/>　　小主翻个牌子，动动小手分享活动，么么哒……（分享点击页面右上方···分享到朋友圈）"
+		//} else { //在工作时间
+		msg = "　　小主是真真的好运气，" + s_prize + "落入您囊中。请将您的联系方式和邮寄地址留言给企明星。我们会在活动截止后尽快为您发出。<br/><br/>分享至朋友圈或好友即可以获得明天抽奖资格呦！乖，快去分享吧！大奖可能就在明天~~"
+		//}
+	} else if i > 140 && i < 175 {
+		obid := BsonIdToSId(a.GetSession("userid"))
+		b := credit.UpuserCreditSession(obid, "b6", "B", nil, a.Action)
 		if b == true {
-			//时间判断，提醒不同
-			//now := time.Now()
-			//不在工作时间
-			//if now.Weekday() == 6 || now.Weekday() == 0 || (now.Hour() > 18 || now.Hour() < 9) {
-			//
-			//	msg = "　　小主是真真的好运气，" + s_prize + "落入您囊中！<br/>　　请在微信留下您的联系方式（手机号或qq号），企明星客服会在下一个工作日9:00-17:00给小主回复哦!<br/>　　小主翻个牌子，动动小手分享活动，么么哒……（分享点击页面右上方···分享到朋友圈）"
-			//} else { //在工作时间
-			msg = "　　小主是真真的好运气，" + s_prize + "落入您囊中。请将您的联系方式和邮寄地址留言给企明星。我们会在活动截止后尽快为您发出。<br/><br/>分享至朋友圈或好友即可以获得明天抽奖资格呦！乖，快去分享吧！大奖可能就在明天~~"
-			//}
+			msg = "　　小主是真真的好运气，200积分落入您囊中。积分将由系统自动发放到您的企明星账户，请登录www.qmx.top查看。<br/><br/>分享至朋友圈或好友即可以获得明天抽奖资格呦！乖，快去分享吧！大奖可能就在明天~~"
 		} else {
 			msg = "　　抽奖出错！小主不要桑心，联系企明星管理员，200积分还是您的！"
 		}
-
-	} else if i > 140 && i < 175 {
-		msg = "　　小主是真真的好运气，200积分落入您囊中。积分将由系统自动发放到您的企明星账户，请登录www.qmx.top查看。<br/><br/>分享至朋友圈或好友即可以获得明天抽奖资格呦！乖，快去分享吧！大奖可能就在明天~~"
 	} else { //不中奖
 		msg = "　　小主不要桑心，这次没有中奖哦，明天记得要来拼运气啊！<br/><br/>分享至朋友圈或好友即可以获得明天抽奖资格呦！乖，快去分享吧！大奖可能就在明天~~"
 	}

core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-26 08:13:30"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-26 08:13:30"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-26 09:21:12"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-26 09:21:12"}},"marketisstart":true,"marketrate":300}

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

@@ -33,6 +33,7 @@ a{
 }
 .font-size-12{
 	font-size: 12px;
+	font-family: tahoma, arial, 'Hiragino Sans GB', 宋体, sans-serif;
 }
 .font-size-10{
 	font-size: 10px;

core/src/web/staticres/css/entcommunity.css

@@ -145,13 +145,13 @@ a:focus, a:hover{
 	color: #A0A0A0;
 }
 .entinfo-page .b-com-head .b-com-last .glyphicon{
-	font-size: 18px;
+	font-size: 17px;
 	color: #cccccc;
 	margin-right: 5px;
 	vertical-align: sub;
 }
 .entinfo-page .b-com-head .b-com-last a{
-	color: blue;
+	color: #415fcf;
 }
 .white_content {
 	display: none;
@@ -194,6 +194,7 @@ a:focus, a:hover{
 	height: 50px;
 	background-color: #F6F8FA;
 	padding-left: 20px;
+	font-size: 16px;
 }
 .ent-tab li{
 	padding: 0px 20px;
@@ -285,10 +286,11 @@ a:focus, a:hover{
 	color: #16a086;
 	display: inline-block;
 	margin-bottom: 5px;
+	font-weight: bold;
 }
 .entinfo-basicinfo .entinfo-round>div>div>span.entinfo-disabled{
-	background-color: #f0f0f0;
-	color: #a0a0a0;
+	background-color: #dddddd;
+	color: #7f7f7f;
 }
 .entinfo-basicinfo .entinfo-round>div>div>span:nth-child(2){
 	text-overflow: ellipsis;
@@ -625,6 +627,9 @@ a:focus, a:hover{
 	font-size: 14px;
 	margin-left: 5px;
 }
+.ent-layout-up .b-com-title font a{
+	color: #415fcf;
+}
 .ent-layout-up .b-com-content{
 	padding-top: 30px;
 }

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

@@ -1,4 +1,7 @@
 function initShare(signature,shareid){
+	if(typeof(shareid) == "undefined" || shareid == null || shareid == ""){
+		shareid = "-1";
+	}
 	if(typeof(signature) != "undefined" && signature != null && signature.length == 4){
 		wx.config({
 		    debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。

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

@@ -8,9 +8,6 @@
 <script src="/js/jquery.js"></script>
 <script src="/wxswordfish/share.js"></script>
 <script src="/swiper/swiper.min.js"></script>
-<script>
-	var shareid="{{.T.shareid}}";
-</script>
 </head>
 <body>
 <div class="swiper-container">

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

@@ -7,7 +7,6 @@
 <script src="/js/jquery.js"></script>
 <script src="/wxswordfish/share.js"></script>
 <script>
-	var shareid="{{.T.shareid}}";
 $(function(){
 	var hm = document.createElement("script");
 	hm.src = "//hm.baidu.com/hm.js?ed198b177e527bb53684db20bb390e77";

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

@@ -11,7 +11,6 @@
 <script src="/wxswordfish/main.js"></script>
 <script>
 	var msgset= {{.T.msgset}};
-	var shareid="{{.T.shareid}}";
 </script>
 </head>
 <body>

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

@@ -86,13 +86,13 @@ $(function(){
 		$("#feedback-textarea").focus().parent().removeClass("red-border");
 	});
 	$("[id='goToShare']").click(function(){
-		if(typeof(shareid) == "undefined" || shareid == ""){
+		/*if(typeof(shareid) == "undefined" || shareid == ""){
 			window.location.href = "/swordfish/share/-1";
 		}else{
 			window.location.href = "/swordfish/share/"+shareid;
-		}
-		//$(".share-dialog").show();
-		//$("html,body").addClass("overflow-hidden");
+		}*/
+		$(".share-dialog").show();
+		$("html,body").addClass("overflow-hidden");
 	});
 	$("#share-dialog-back").click(function(){
 		$(".share-dialog").hide();
@@ -107,7 +107,7 @@ $(function(){
 		}
 	});
 	//
-	initShare({{.T.signature}},typeof(shareid)=="undefined"?"-1":shareid);
+	initShare({{.T.signature}},{{.T.shareid}});
 });
 //意见反馈
 function Feedback(){

core/src/web/templates/yellowpage/enterpriseinfo.html

@@ -88,7 +88,7 @@
 					</span>
 					<input id="location" type="hidden" value="{{if .T.res.Dom}}{{.T.res.Dom}}{{end}}">
 					<input id="cityname" type="hidden" value="">
-					<a href="javascript:void(0)" onclick="showMap()">查看详细地图</a>
+					<a href="javascript:void(0)" class="font-size-12" onclick="showMap()">查看详细地图</a>
 				{{end}}
 			</div>
 		</div>
@@ -124,7 +124,7 @@
 			<div class="entinfo-basicinfo ent-layout-up">
 				<div class="b-com-title">
 					<span class="glyphicon jianzhu"></span>基本信息
-					<font>(来源：<a href="http://gsxt.saic.gov.cn/" rel="nofollow" style="text-decoration: underline;color: #0099FF;">全国企业信用信息公示系统</a>)</font>
+					<font>(来源：<a href="http://gsxt.saic.gov.cn/" rel="nofollow">全国企业信用信息公示系统</a>)</font>
 				</div>
 				<div class="b-com-content">
 					<div class="entinfo-round">
@@ -143,7 +143,23 @@
 									</span>
 									<br>
 									{{end}}
-									{{if .T.res.EntName}}{{.T.res.EntName}}{{end}}
+									{{if .T.res.EntName}}
+									<script>
+										var entName = {{.T.res.EntName}};
+										if(entName.length > 15){
+											var firstLine = entName.substring(0,15);
+											var secondLine = entName.substring(15,entName.length);
+											console.info(secondLine);
+											if(secondLine.length > 15){
+												secondLine = secondLine.substring(0,12)+"...";
+											}
+											document.write(firstLine+"<br>"+secondLine);
+										}else{
+											document.write(entName);
+										}
+										
+									</script>
+									{{end}}
 								</div>
 								<br><img src="/images/entcommunity/triangle.png">
 							</span>
@@ -181,7 +197,7 @@
 						<!--公司类型-->
 					  	<div class="entinfo-enttype">
 							<div>
-								<span{{if not .T.res.EntTypeName}} class="entinfo-disabled"{{end}}>公司类型</span>
+								<span{{if not .T.res.EntTypeName}} class="entinfo-disabled"{{end}}>企业类型</span>
 								<span>{{if .T.res.EntTypeName}}{{.T.res.EntTypeName}}{{end}}</span>
 							</div>
 							<img src="/images/entcommunity/gongsileixing.png">
@@ -258,7 +274,6 @@
 					<span class="clearfix"></span>
 				</div>
 			</div>
-			{{end}}
 			{{if and (not .T.res.gs) (not .T.res.investor)}}
 			<div class="ent-findnull">
 				<img src="/images/findnull.png" class="b-findnull">