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

core/src/message.json

@@ -6,6 +6,7 @@
 	"lawsearchaction":"/law/qfw/index",
 	"msiteaction":"/ent/wsite/edit",
 	"wxpushlist":"/wxpush/bidinfo/%s",
+	"turncards":"/active/flop/in/in",
 	"indentify":{
 		"success":{
 			"result":"企业认证",

core/src/qfw/active/active.go

@@ -10,7 +10,8 @@ var se util.SimpleEncrypt = util.SimpleEncrypt{Key: "topnet2015topnet2015"}
 
 type Active struct {
 	*xweb.Action
-	flop xweb.Mapper `xweb:"/active/flop/(.*)"`
+	flop     xweb.Mapper `xweb:"/active/flop/(.*)/(.*)"`
+	flopAjax xweb.Mapper `xweb:"/active/flopAjax"`
 }
 
 //抽奖活动

core/src/qfw/active/flop.go

@@ -17,77 +17,91 @@ import (
 var flopEncrypt util.SimpleEncrypt = util.SimpleEncrypt{Key: "flopActive"}
 
 //翻牌
-func (a *Active) Flop(encryptOpenid string) error {
-	//判断活动是否结束
-	if coreconfig.Flop.IsOver {
-		a.T["IsOver"] = true
-	} else {
-		a.T["IsOver"] = false
-		openid := flopEncrypt.DecodeString(encryptOpenid)
-		var flag int = 3             //标识
-		var cardType int = 1         //翻牌的类型
-		var multiple int = 2         //倍数
-		var nickName, words string   //昵称、牌上的文字
-		var oldCredit, newCredit int //新、老积分
-		var getFlopData = func() {
-			if data := mongodb.FindOne("flop", bson.M{"s_openid": openid}); data != nil && len(*data) > 0 {
-				nickName = (*data)["s_nickname"].(string)
-				oldCredit = util.IntAll((*data)["i_oldcredit"])
-				newCredit = util.IntAll((*data)["i_newcredit"])
-				cardType = util.IntAll((*data)["i_type"])
-				words = (*data)["s_words"].(string)
-				nickName = (*data)["s_nickname"].(string)
-			}
+func (a *Active) FlopAjax() error {
+	if a.GetSession("flopData") != nil {
+		data := a.GetSession("flopData").(bson.M)
+		if updateCredit(data["s_userid"].(string), util.IntAll(data["i_oldcredit"]), util.IntAll(data["i_newcredit"]), a.Action) {
+			mongodb.Save("flop", data)
+		} else {
+			log.Println("翻牌的时候", data["s_openid"].(string), "的积分修改失败！")
 		}
-		//分享出去
-		if a.GetSession("userId") == nil || a.GetSession("s_m_openid") == nil || a.GetSession("i_credit") == nil {
-			getFlopData()
-			a.T["shareid"] = coreutil.FindMyShareId("topjy", openid)
-		} else { //可以翻牌
-			s_openid := a.GetSession("s_m_openid").(string)
-			encryptOpenid = flopEncrypt.EncodeString(s_openid)
-			if a.GetSession("nickName") != nil {
-				nickName = a.GetSession("nickName").(string)
-			}
-			data := mongodb.FindOne("flop", bson.M{"s_openid": s_openid})
-			if data == nil || len(*data) == 0 {
-				oldCredit = a.GetSession("i_credit").(int)
-				multiple = getMultiple()
-				newCredit = oldCredit * multiple
-				//翻牌类型
-				card := coreconfig.Flop.Cards[rand.New(rand.NewSource(time.Now().UnixNano())).Intn(6)+1]
-				cardType = util.IntAll(card["type"])
-				words = card["words"].(string)
-				if updateCredit(a.GetSession("userId").(string), oldCredit, newCredit, a.Action) {
-					mongodb.Save("flop", bson.M{
-						"s_openid":     s_openid,
-						"i_oldcredit":  oldCredit,
-						"i_newcredit":  newCredit,
-						"l_createdate": time.Now().Unix(),
-						"i_type":       cardType,
-						"s_words":      words,
-						"s_nickname":   nickName,
-						"i_multiple":   multiple,
-					})
-				} else {
-					log.Println("翻牌的时候", s_openid, "的积分修改失败！")
-				}
-				flag = 1
+	}
+	return nil
+}
+
+//进入翻牌
+func (a *Active) Flop(reqType string, encryptOpenid string) error {
+	if reqType == "in" && a.GetSession("s_m_openid") != nil {
+		return a.Redirect("/active/flop/flop/" + flopEncrypt.EncodeString(a.GetSession("s_m_openid").(string)))
+	}
+	var flag int = 3             //标识
+	var cardType int = 1         //翻牌的类型
+	var multiple int = 2         //倍数
+	var nickName, words string   //昵称、牌上的文字
+	var oldCredit, newCredit int //新、老积分
+	openid := flopEncrypt.DecodeString(encryptOpenid)
+	var getFlopData = func() {
+		if data := mongodb.FindOne("flop", bson.M{"s_openid": openid}); data != nil && len(*data) > 0 {
+			nickName = (*data)["s_nickname"].(string)
+			oldCredit = util.IntAll((*data)["i_oldcredit"])
+			newCredit = util.IntAll((*data)["i_newcredit"])
+			cardType = util.IntAll((*data)["i_type"])
+			words = (*data)["s_words"].(string)
+			nickName = (*data)["s_nickname"].(string)
+			multiple = util.IntAll((*data)["i_multiple"])
+		}
+	}
+	//分享出去
+	if reqType == "share" || a.GetSession("userId") == nil || a.GetSession("s_m_openid") == nil || a.GetSession("i_credit") == nil {
+		getFlopData()
+		a.T["shareid"] = coreutil.FindMyShareId("topflop", openid)
+	} else { //可以翻牌
+		s_openid := a.GetSession("s_m_openid").(string)
+		encryptOpenid = flopEncrypt.EncodeString(s_openid)
+		if a.GetSession("nickName") != nil {
+			nickName = a.GetSession("nickName").(string)
+		}
+		data := mongodb.FindOne("flop", bson.M{"s_openid": s_openid})
+		if data == nil || len(*data) == 0 {
+			oldCredit = a.GetSession("i_credit").(int)
+			multiple = getMultiple()
+			newCredit = oldCredit * multiple
+			//翻牌类型
+			card := coreconfig.Flop.Cards[rand.New(rand.NewSource(time.Now().UnixNano())).Intn(6)]
+			cardType = util.IntAll(card["type"])
+			words = card["words"].(string)
+			//判断活动是否结束
+			if coreconfig.Flop.IsOver {
+				a.T["IsOver"] = true
 			} else {
-				getFlopData()
-				flag = 2
+				a.T["IsOver"] = false
+				a.SetSession("flopData", bson.M{
+					"s_userid":     a.GetSession("userId").(string),
+					"s_openid":     s_openid,
+					"i_oldcredit":  oldCredit,
+					"i_newcredit":  newCredit,
+					"l_createdate": time.Now().Unix(),
+					"i_type":       cardType,
+					"s_words":      words,
+					"s_nickname":   nickName,
+					"i_multiple":   multiple,
+				})
 			}
+			flag = 1
+		} else {
+			getFlopData()
+			flag = 2
 		}
-		a.T["openid"] = encryptOpenid
-		a.T["cardType"] = cardType
-		a.T["oldCredit"] = oldCredit
-		a.T["newCredit"] = newCredit
-		a.T["words"] = words
-		a.T["nickName"] = nickName
-		a.T["flag"] = flag
-		a.T["multiple"] = multiple
-		a.T["signature"] = mobile.GetSignature(a.Url())
 	}
+	a.T["signature"] = mobile.GetSignature(a.Url())
+	a.T["openid"] = encryptOpenid
+	a.T["cardType"] = cardType
+	a.T["oldCredit"] = oldCredit
+	a.T["newCredit"] = newCredit
+	a.T["words"] = words
+	a.T["nickName"] = nickName
+	a.T["flag"] = flag
+	a.T["multiple"] = multiple
 	return a.Render("/active/flop.html", &a.T)
 }
 

core/src/seo.json

@@ -1,4 +1,4 @@
-{
+{   "cdn":"//cdn.qmx.top:9000",
     "qfw": {
         "enterprise": {
             "description": "提供企业信息查询，企业产品服务查询，企业关系网展示",

core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-02-02 17:24:06"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-02-02 17:24:06"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-02-03 11:05:05"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-02-03 11:05:05"}},"marketisstart":true,"marketrate":300}

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

@@ -620,3 +620,6 @@ a:focus, a:hover{
 .index-new-tg-tb .bmrzqy img{
 	margin-bottom:0px;
 }
+#iWant div a{
+	margin-right:2px;
+}

core/src/web/templates/active/flop.html

@@ -1,13 +1,14 @@
 <html>
 <head>
-<title>企明星-翻牌活动</title>
+<title>猴年翻福牌，翻来好运气</title>
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+<meta content="telephone=no" name="format-detection" />
 <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="{{Msg "seo" "cdn"}}/js/jquery.js"></script>
 <script>
 var signature = {{.T.signature}};
 var shareTitle = "{{.T.nickName}}在2016年{{.T.words}}";
-var shareLink = "http://www.qimingxing.info/active/flop/{{.T.openid}}";
+var shareLink = "http://www.qimingxing.info/active/flop/share/{{.T.openid}}";
 var shareIcon = "http://www.qimingxing.info/images/flop/blessing.png";
 if(typeof(signature) != "undefined" && signature != null && signature.length == 4){
 	wx.config({
@@ -54,14 +55,18 @@ body{
 	font-family: tahoma, arial, 'Hiragino Sans GB', 'Microsoft YaHei', 宋体, sans-serif;
 	-webkit-tap-highlight-color: transparent;
 	background-color: #B63845;
+	font-size: 100%;
+}
+.page{
+	margin: 0px auto;
+	max-width: 750px;
+	position: relative;
+	background-size: 100% 100%;
+	height: 100%;
 }
 img{
 	vertical-align: sub;
 }
-.body-bg{
-	width: 100%;
-	height: 100%;
-}
 .btn{
 	width: 180px;
 	height: 43px;
@@ -76,7 +81,7 @@ img{
 	top: 0px;
 	width: 97.5px;
 	height: 53px;
-	display: none;
+	z-index: 1;
 }
 .cards{
 	position: absolute;
@@ -86,12 +91,12 @@ img{
 	display: none;
 }
 .cards>img{
-	width: 250px;
-	height: 282.4px;
+	width: 212.5px;
+	height: 240px;
 }
 .flop-tip{
 	color: #a52f2e;
-	background-image: url("/images/flop/tip-bg.png");
+	background-image: url("{{Msg "seo" "cdn"}}/images/flop/tip-bg.png");
 	background-size: 100% 100%;
 	position: absolute;
 	width: 280px;
@@ -99,7 +104,7 @@ img{
 	left: 50%;
 	margin-left: -145px;
 	display: none;
-	font-size: 14px;
+	font-size:0.875em;
 	font-weight: bold;
 	text-align: center;
 	padding: 5px;
@@ -110,22 +115,22 @@ img{
 	margin-right: 3px;
 }
 .flop-tip>font{
-	font-size: 12px;
+	font-size: 0.75em;
 	font-weight: normal;
 }
 .multiple{
-	font-size: 22px;
+	font-size: 1.75em;
 	text-align: center;
 	position: relative;
-	width: 15px;
+	width: 20px;
 	display: inline-block;
 	vertical-align: top;
 	overflow: hidden;
-	height: 20px;
+	height: 25px;
 }
 .flop-notice{
 	color: #ffa461;
-	background-image: url("/images/flop/flop-notice.png");
+	background-image: url("{{Msg "seo" "cdn"}}/images/flop/flop-notice.png");
 	background-size: 100% 100%;
 	position: absolute;
 	top: 30px;
@@ -153,7 +158,7 @@ img{
 	height: 90px;
 	background-color: #ffffff;
 }
-.flop-share>*{
+.flop-share>img{
 	display: inline-block;
 	width: 70px;
 	height: 70px;
@@ -162,10 +167,13 @@ img{
 	margin-top: 10px;
 }
 .flop-share>div{
+	display: inline-block;
 	width: 150px;
-	padding-top: 10px;
 	line-height: 25px;
-	font-size: 14px;
+	font-size: 0.875em;
+	position: relative;
+	top: 50%;
+	margin-top: -25px;
 }
 ul{
 	list-style: none;
@@ -177,47 +185,58 @@ ul{
 	left: 2px;
 	height: 155px;
 }
+.random li{
+	height: 25px;
+}
+.page-before{
+	background-image: url("{{Msg "seo" "cdn"}}/images/flop/bg-1.png");
+}
+.page-after{
+	background-image: url("{{Msg "seo" "cdn"}}/images/flop/bg-2.png");
+}
 </style>
 </head>
 <body>
-<img src="/images/flop/bubble.png" class="bubble">
-{{if eq .T.flag 1}}
-<img src="/images/flop/bg-1.png" class="body-bg" id="flop-before">
-{{end}}
-<img src="/images/flop/bg-2.png" class="body-bg" id="flop-after"{{if eq .T.flag 1}} style="display: none;"{{end}}>
-<div class="flop-notice">
-	<span>{{.T.nickName}}</span>，您的猴年福牌是:
-</div>
-<div class="cards">
-	{{if eq .T.flag 1}}<img src="/images/flop/card.png">{{end}}
-	<img src="/images/flop/card-{{.T.cardType}}.png"{{if eq .T.flag 1}} style="display: none;"{{end}}>
-</div>
-{{if eq .T.flag 1}}
-<img src="/images/flop/btn.png" class="btn">
-{{else if eq .T.flag 3}}
-<div class="flop-share">
-	<img src="/front/weixinshare/{{.T.shareid}}">
-	<div>
-		长按图片识别二维码<br>
-		您也可以测福牌
+<img src="{{Msg "seo" "cdn"}}/images/flop/bubble.png" class="bubble"{{if eq .T.flag 1}} style="display: none;"{{end}}>
+<div class="page{{if eq .T.flag 1}} page-before{{else}} page-after{{end}}">
+	<div class="flop-notice">
+		<span>{{.T.nickName}}</span>，您的猴年福牌是:
+	</div>
+	<div class="cards">
+		{{if eq .T.flag 1}}<img src="{{Msg "seo" "cdn"}}/images/flop/card.png">{{end}}
+		<img src="{{Msg "seo" "cdn"}}/images/flop/card-{{.T.cardType}}.png"{{if eq .T.flag 1}} style="display: none;"{{end}}>
+	</div>
+	{{if eq .T.flag 1}}
+	<img src="{{Msg "seo" "cdn"}}/images/flop/btn.png" class="btn">
+	{{else if eq .T.flag 3}}
+	<div class="flop-share">
+		<img src="/front/weixinshare/{{.T.shareid}}">
+		<div>
+			长按图片识别二维码<br>
+			您也可以测福牌
+		</div>
+	</div>
+	{{end}}
+	<div class="flop-tip">
+		恭喜！你的企明星积分翻
+		<span class="multiple">
+		{{if eq .T.flag 1}}
+		<ul class="random">
+			<li>7</li>
+			<li>3</li>
+			<li>6</li>
+			<li>8</li>
+			<li>5</li>
+			<li>9</li>
+			<li>2</li>
+		</ul>
+		{{else if eq .T.flag 2}}
+		{{.T.multiple}}
+		{{end}}
+		</span>倍！<br>
+		您的积分已从{{.T.oldCredit}}分涨到{{.T.newCredit}}分。<br>
+		<font>积分明细请到企明星(www.qmx.top)查询！</font>
 	</div>
-</div>
-{{end}}
-<div class="flop-tip">
-	恭喜！你的企明星积分翻
-	<span class="multiple">
-	<ul class="random">
-		<li>7</li>
-		<li>3</li>
-		<li>6</li>
-		<li>8</li>
-		<li>5</li>
-		<li>9</li>
-		<li>2</li>
-	</ul>
-	</span>倍！<br>
-	您的积分已从{{.T.oldCredit}}分涨到{{.T.newCredit}}分。<br>
-	<font>积分明细请到企明星(www.qmx.top)查询！</font>
 </div>
 <script type="text/javascript">
 if({{.T.IsOver}}){
@@ -228,12 +247,12 @@ $(function(){
 	var windowHeight = $(window).height();
 	var defaultWidth = 320;
 	var defaultHeight = 416;
-	var width = 250;
-	var height = 282.4;
-	var top = 120;
-	var noticeTop = 80;
+	var width = 212.5;
+	var height = 240;
+	var cardTop = 110;
+	var noticeTop = 70;
 	if(windowHeight > defaultHeight){
-		top = top / defaultHeight * windowHeight;
+		cardTop = cardTop / defaultHeight * windowHeight;
 		noticeTop = noticeTop / defaultHeight * windowHeight;
 	}
 	if(windowWidth > defaultWidth && windowHeight > defaultHeight){
@@ -242,25 +261,33 @@ $(function(){
 			width = 350
 		}
 		height = width / 625 * 706;
-		$(".cards>img").css({width: width,height: height}).show();
+		$(".cards>img").css({width: width,height: height});
 	}
-	$(".cards").css({"top": top}).show();
-	$(".flop-notice").css({"top": noticeTop});
-	if(windowHeight - $(".cards").height()  - top - $(".flop-tip").height() > 40){
-		$(".flop-tip").css({"line-height": "30px",top: $(".cards").height()+top});
+	$(".cards").css({top: cardTop}).show();
+	$(".flop-notice").css({top: noticeTop});
+	var flopTipTop = windowHeight - $(".cards").height()  - cardTop - $(".flop-tip").height();
+	if(flopTipTop > 30 && flopTipTop < 40){
+		$(".flop-tip").css({"line-height": "30px",top: $(".cards").height() + cardTop - 20});
+	}else if(flopTipTop > 40){
+		$(".flop-tip").css({"line-height": "30px",top: $(".cards").height() + cardTop - 10});
 	}else{
-		$(".flop-tip").css({"top": $(".cards").height()+top-30});
+		$(".flop-tip").css({top: $(".cards").height()+cardTop-20});
 	}
 	//
 	{{if eq .T.flag 1}}
-		$(".btn").css({"top": $(".cards").height()+top}).show();
-		$(".btn").click(function(){
-			$("#flop-before,.btn").hide();
-			$("#flop-after,.flop-tip,.flop-notice").show();
-			var marginTop = 0;
-			var plus = true;
+		$(".btn").css({top: $(".cards").height()+cardTop}).show();
+		$(".btn").one("click",function(){
+			if({{.T.IsOver}}){
+				alert("活动已经结束！");
+				return;
+			}
+			//
+			$.post("/active/flopAjax",null,null);
+			$(".page").addClass("page-after").removeClass("page-before");
+			$(".btn").hide();
+			$(".flop-tip,.flop-notice").show();
 			var randomInterval = setInterval(function(){
-				$(".random").css({top : "-22px"});
+				$(".random").css({top : "-24px"});
 				$(".random").append($(".random li:first"));
 			},20);
 			setTimeout(function(){
@@ -270,9 +297,9 @@ $(function(){
 			setTimeout(function(){
 				$(".bubble").fadeIn();
 			},3000);
-			$('.cards').children('img:first').stop().animate({'width':0},100,function(){
+			$('.cards').children('img:first').stop().animate({'width':0},500,function(){
 				$(this).hide().next().show();
-				$(this).next().animate({'width':width+'px'},500);
+				$(this).next().animate({'width':width+'px'},200);
 			});
 		});
 	{{else}}
@@ -281,6 +308,14 @@ $(function(){
 	{{if eq .T.flag 2}}
 		$(".flop-tip").show();
 	{{end}}
+	{{if eq .T.flag 3}}
+		var shareHeight = windowHeight - cardTop - height + 30;
+		if(shareHeight > 110){
+			shareHeight = 110;
+		}
+		$(".flop-share").css({height: shareHeight});
+		$(".flop-share>img").css({width: shareHeight-20,height: shareHeight-20});
+	{{end}}
 });
 </script>
 </body>

core/src/web/templates/active/luckdraw.html

@@ -7,21 +7,21 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" />
 <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,initial-scale=1.0" user-scalable="no" />
 <meta name="renderer" content="webkit">
-<link href="//cdn.qmx.top/css/bootstrap.min.css" rel="stylesheet">
-<script src="//cdn.qmx.top/js/jquery.js"></script>
-<script src="//cdn.qmx.top/js/active/Rotate.js"></script>
+<link href="{{Msg "seo" "cdn"}}/css/bootstrap.min.css" rel="stylesheet">
+<script src="{{Msg "seo" "cdn"}}/js/jquery.js"></script>
+<script src="{{Msg "seo" "cdn"}}/js/active/Rotate.js"></script>
 <script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
-<script src="//cdn.qmx.top/wxswordfish/share.js"></script>
-<script src="//cdn.qmx.top/js/bootstrap.min.js"></script>
+<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js"></script>
+<script src="{{Msg "seo" "cdn"}}/js/bootstrap.min.js"></script>
 <script>
 	initShare({{.T.signature}},{{.T.shareid}});
 </script>
 <style>
 *{padding:0; margin:0;}
 .lotteryMain{ width:100%;}
-.lotteryBg{ width:100%; height:608px; margin:0 auto; background:url(//cdn.qmx.top/images/activeimages/lotteryBg.png) no-repeat top center; position:relative; overflow:hidden;background-size: 375px 508px;}
+.lotteryBg{ width:100%; height:608px; margin:0 auto; background:url({{Msg "seo" "cdn"}}/images/activeimages/lotteryBg.png) no-repeat top center; position:relative; overflow:hidden;background-size: 375px 508px;}
 #run{ width:145px; height:145px; position:absolute; left:50%; top:50%;  margin-left:-73px; margin-top:-53px; z-index:1; transform:rotate(0deg); -ms-transform:rotate(0deg); }
-#btn_run{ width:80px; height:80px; background:url(//cdn.qmx.top/images/activeimages/btn_start.png) no-repeat; border:none; outline:none; position:absolute; left:50%; top:50%; margin-left:-40px; margin-top:-22px; z-index:2;cursor:pointer;background-position:0px 0px;background-size: 100% 100%;}
+#btn_run{ width:80px; height:80px; background:url({{Msg "seo" "cdn"}}/images/activeimages/btn_start.png) no-repeat; border:none; outline:none; position:absolute; left:50%; top:50%; margin-left:-40px; margin-top:-22px; z-index:2;cursor:pointer;background-position:0px 0px;background-size: 100% 100%;}
 .col-xs-12 p{
 	margin:0px 0px 5px;
 }
@@ -58,7 +58,7 @@
 </div>
 <section class="lotteryMain">
 	<div class="lotteryBg">
-    	<img id="run" src="//cdn.qmx.top/images/activeimages/start.png" />
+    	<img id="run" src="{{Msg "seo" "cdn"}}/images/activeimages/start.png" />
         <input id="btn_run" type="button" value="" />
     </div>
 </section> 
@@ -78,15 +78,15 @@ $(function(){
 	if (flog == "A"){
 		$(".modal-body").html("{{.T.msg}}")
 		$(".modstart").click();
-		$("#btn_run").attr('disabled',true).css("cursor","pointer").css("background","url(//cdn.qmx.top/images/activeimages/btn_end.png) no-repeat").css("background-size","100% 100%");
+		$("#btn_run").attr('disabled',true).css("cursor","pointer").css("background","url({{Msg "seo" "cdn"}}/images/activeimages/btn_end.png) no-repeat").css("background-size","100% 100%");
 	}else if (flog == "B"){
 		$(".modal-body").html("{{.T.msg}}")
 		$(".modstart").click();
-		$("#btn_run").attr('disabled',true).css("cursor","pointer").css("background","url(//cdn.qmx.top/images/activeimages/btn_end.png) no-repeat").css("background-size","100% 100%");
+		$("#btn_run").attr('disabled',true).css("cursor","pointer").css("background","url({{Msg "seo" "cdn"}}/images/activeimages/btn_end.png) no-repeat").css("background-size","100% 100%");
 	}else if (flog == "G"){
 		$(".modal-body").html("{{.T.msg}}")
 		$(".modstart").click();
-		$("#btn_run").attr('disabled',true).css("cursor","pointer").css("background","url(//cdn.qmx.top/images/activeimages/btn_end.png) no-repeat").css("background-size","100% 100%");
+		$("#btn_run").attr('disabled',true).css("cursor","pointer").css("background","url({{Msg "seo" "cdn"}}/images/activeimages/btn_end.png) no-repeat").css("background-size","100% 100%");
 	}
      $("#btn_run").click(function(){
 		$("#btn_run").attr('disabled',true).css("cursor","default"); 
@@ -110,10 +110,10 @@ function lottery(){
 					easing: $.easing.easeOutSine, 
 					callback: function(){ 
 						//alert(obj.results); 
-						$("#btn_run").attr('disabled',true).css("cursor","pointer").css("background","url(//cdn.qmx.top/images/activeimages/btn_end.png) no-repeat").css("background-size","100% 100%"); 
+						$("#btn_run").attr('disabled',true).css("cursor","pointer").css("background","url({{Msg "seo" "cdn"}}/images/activeimages/btn_end.png) no-repeat").css("background-size","100% 100%"); 
 							$(".modal-body").html(obj.msg)
 							$(".modstart").click();
-							$("#btn_run").attr('disabled',true).css("cursor","pointer").css("background","url(//cdn.qmx.top/images/activeimages/btn_end.png) no-repeat").css("background-size","100% 100%");
+							$("#btn_run").attr('disabled',true).css("cursor","pointer").css("background","url({{Msg "seo" "cdn"}}/images/activeimages/btn_end.png) no-repeat").css("background-size","100% 100%");
 					} 
 				});
 			}else if (obj.flog=="A"){

core/src/web/templates/common/top.html

@@ -67,7 +67,7 @@ function b_loadTop(){
 				if(hasMsgCount){
 					html += '<a class="b-round-dot"></a>';
 				}
-				html += '</span>'+result.nickName;
+				html += '</span><span>'+result.nickName+'</span>';
 				html += '<div id="head-hideMenu" class="head-hideMenu"><ul>'
 					    	+'<li onclick="window.location.href=\'/member/msgcenter\'"><i class="glyphicon youjian"></i><span>消息中心';
 				if(hasMsgCount){
@@ -78,9 +78,6 @@ function b_loadTop(){
 						+'<li onclick="window.location.href=\'/front/logout\'" class="border-b-0"><i class="glyphicon tuichu"></i>退出</li>';
 						+'</ul></div>';
 				$("#b-loginStatus").addClass("b-logined").html(html)
-				.click(function(){
-					window.location.href = "/member/show/memberindex";
-				})
 				.mouseover(function(){
 					$("#head-hideMenu").show();
 				}).mouseleave(function(){
@@ -91,6 +88,9 @@ function b_loadTop(){
 				}).mouseleave(function(){
 					$(this).hide();
 				});
+				$("#b-loginStatus>span").click(function(){
+					window.location.href = "/member/show/memberindex";
+				});
 				//处理公用底部扫码登录按钮
 				$("#bottom-bar>li:first").addClass("invisible");
 				//处理认证完之后第一次登录弹出提示框

core/src/web/templates/index.html

@@ -7,7 +7,6 @@
 <meta name="Description" content="{{Msg "seo" "qfw.homepage.description"}}"/>
 <link href="/css/index-new.css" rel="stylesheet">
 <script src="/js/jquery.lazyload.min.js"></script>
-
 </head>
 <body>
 {{include "/common/indexhead.html"}}

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

@@ -36,7 +36,7 @@
 				{{if .T.msgset}}
 					{{if .T.msgset.tender}}
 						{{if .T.msgset.tender.day}}
-							{{if gt 6 .T.msgset.tender.day}}
+							{{if and (gt 6 .T.msgset.tender.day) (gt .T.msgset.tender.day 0)}}
 							本栏目推送服务期还剩<span style="color:red"> {{.T.msgset.tender.day}} </span>天。想要服务不间断，请确保积分充足。 <a href="/member/credit/myCredit">去做任务赚积分</a>
 							{{end}}
 						{{end}}
@@ -72,7 +72,7 @@
 				{{if .T.msgset}}
 					{{if .T.msgset.bid}}
 						{{if .T.msgset.bid.day}}
-							{{if gt 6 .T.msgset.bid.day}}
+							{{if and (gt 6 .T.msgset.bid.day) (gt .T.msgset.bid.day 0)}}
 							本栏目推送服务期还剩<span style="color:red"> {{.T.msgset.bid.day}} </span>天。想要服务不间断，请确保积分充足。 <a href="/member/credit/myCredit">去做任务赚积分</a>
 							{{end}}
 						{{end}}

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

@@ -2,12 +2,12 @@
 <head>
 <title>企明星-剑鱼-演示</title>
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-<link href="//cdn.qmx.top/wxswordfish/style.css" rel="stylesheet">
-<link href="//cdn.qmx.top/swiper/swiper.min.css" rel="stylesheet">
+<link href="{{Msg "seo" "cdn"}}/wxswordfish/style.css" rel="stylesheet">
+<link href="{{Msg "seo" "cdn"}}/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="//cdn.qmx.top/js/jquery.js"></script>
-<script src="//cdn.qmx.top/wxswordfish/share.js"></script>
-<script src="//cdn.qmx.top/swiper/swiper.min.js"></script>
+<script src="{{Msg "seo" "cdn"}}/js/jquery.js"></script>
+<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js"></script>
+<script src="{{Msg "seo" "cdn"}}/swiper/swiper.min.js"></script>
 <script>
 	initShare({{.T.signature}},{{.T.shareid}});
 </script>
@@ -16,31 +16,31 @@
 <div class="swiper-container">
     <div class="swiper-wrapper">
         <div class="swiper-slide">
-			<img id="guide-firstImg" src="//cdn.qmx.top/wxswordfish/images/guide-1.png">
+			<img id="guide-firstImg" src="{{Msg "seo" "cdn"}}/wxswordfish/images/guide-1.png">
 		</div>
        	<div class="swiper-slide">
-			<img src="//cdn.qmx.top/wxswordfish/images/guide-2.png">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/guide-2.png">
 		</div>
        	<div class="swiper-slide">
-			<img src="//cdn.qmx.top/wxswordfish/images/guide-3.png">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/guide-3.png">
 		</div>
 		<div class="swiper-slide">
-			<img src="//cdn.qmx.top/wxswordfish/images/guide-4.png">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/guide-4.png">
 		</div>
 		<div class="swiper-slide">
-			<img src="//cdn.qmx.top/wxswordfish/images/guide-5.png">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/guide-5.png">
 		</div>
 		<div class="swiper-slide">
-			<img src="//cdn.qmx.top/wxswordfish/images/guide-1.png">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/guide-1.png">
 		</div>
     </div>
     <!-- 如果需要分页器 -->
    	<div class="swiper-pagination"></div>
 	<div class="guide-bottom">
-		<img class="arrow-up" src="//cdn.qmx.top/wxswordfish/images/up.png">
+		<img class="arrow-up" src="{{Msg "seo" "cdn"}}/wxswordfish/images/up.png">
 		<button class="btn experience" onclick="pageJump();">立即体验</button>
-		<img src="//cdn.qmx.top/wxswordfish/images/jump.png" class="jumpGuide" onclick="pageJump();">
-		<img class="goToShare" id="goToShare" src="//cdn.qmx.top/wxswordfish/images/guide-share.png">
+		<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/jump.png" class="jumpGuide" onclick="pageJump();">
+		<img class="goToShare" id="goToShare" src="{{Msg "seo" "cdn"}}/wxswordfish/images/guide-share.png">
 	</div>
 </div>
 {{include "/swordfish/wxtoolbar.html"}}
@@ -55,7 +55,7 @@ $(function(){
 		touchMoveStopPropagation: false,
 		virtualTranslate: true,
 		onInit: function(swiper){
-			$(swiper.slides[5]).children("img").attr("src","//cdn.qmx.top/wxswordfish/images/guide-6.png");
+			$(swiper.slides[5]).children("img").attr("src","{{Msg "seo" "cdn"}}/wxswordfish/images/guide-6.png");
 		},
 		onSlideChangeStart: function(swiper){
 			var prevSlide = $(swiper.slides[swiper.previousIndex]);

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

@@ -2,10 +2,10 @@
 <head>
 <meta name="viewport" content="width=device-width,initial-scale=1.0">
 <title>企明星-剑鱼-信息推送</title>
-<link href="//cdn.qmx.top/wxswordfish/style.css" rel="stylesheet">
+<link href="{{Msg "seo" "cdn"}}/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="//cdn.qmx.top/js/jquery.js"></script>
-<script src="//cdn.qmx.top/wxswordfish/share.js"></script>
+<script src="{{Msg "seo" "cdn"}}/js/jquery.js"></script>
+<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js"></script>
 <script>
 initShare({{.T.signature}},{{.T.shareid}});
 $(function(){

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

@@ -4,11 +4,11 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" />
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="renderer" content="webkit">
-<link href="//cdn.qmx.top/wxswordfish/style.css" rel="stylesheet">
+<link href="{{Msg "seo" "cdn"}}/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="//cdn.qmx.top/js/jquery.js"></script>
-<script src="//cdn.qmx.top/wxswordfish/share.js"></script>
-<script src="//cdn.qmx.top/wxswordfish/main.js"></script>
+<script src="{{Msg "seo" "cdn"}}/js/jquery.js"></script>
+<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js"></script>
+<script src="{{Msg "seo" "cdn"}}/wxswordfish/main.js"></script>
 <script>
 	var msgset= {{.T.msgset}};
 	initShare({{.T.signature}},{{.T.shareid}});
@@ -27,7 +27,7 @@
 </div>
 	<ul class="operation">
 		<li class="parent-node" id="tender">
-			<img src="//cdn.qmx.top/wxswordfish/images/zhaobiao.png">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/zhaobiao.png">
 			招标公告
 			<day class="show-days"></day>
 			<span class="on-off" id="tender-on-off" v="tender"></span>
@@ -35,15 +35,15 @@
 		<li class="child-node">
 			<ul id="tender-content">
 				<li>
-					<div>订阅关键词<img src="//cdn.qmx.top/wxswordfish/images/right.png"></div>
+					<div>订阅关键词<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/right.png"></div>
 				</li>
 				<li>
-					<div>信息范围<img src="//cdn.qmx.top/wxswordfish/images/right.png"></div>
+					<div>信息范围<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/right.png"></div>
 				</li>
 			</ul>
 		</li>
 		<li class="parent-node" id="bid">
-			<img src="//cdn.qmx.top/wxswordfish/images/zhongbiao.png">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/zhongbiao.png">
 			中标公告
 			<day class="show-days"></day>
 			<span class="on-off" id="bid-on-off" v="bid"></span>
@@ -51,22 +51,22 @@
 		<li class="child-node">
 			<ul id="bid-content">
 				<li>
-					<div>订阅关键词<img src="//cdn.qmx.top/wxswordfish/images/right.png"></div>
+					<div>订阅关键词<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/right.png"></div>
 				</li>
 				<li>
-					<div>信息范围<img src="//cdn.qmx.top/wxswordfish/images/right.png"></div>
+					<div>信息范围<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/right.png"></div>
 				</li>
 			</ul>
 		</li>
 		<li class="parent-node">
-			<img src="//cdn.qmx.top/wxswordfish/images/qingbao.png">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/qingbao.png">
 			企业情报
 			<span class="on-off" id="intelligence-on-off"></span>
 		</li>
 		<li class="parent-node">
-			<img src="//cdn.qmx.top/wxswordfish/images/feerule.png">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/feerule.png">
 			收费规则
-			<span style="right:0" class="rule"><img src="//cdn.qmx.top/wxswordfish/images/right.png" style="width: 10px;height: 17px;float: right;"></span>
+			<span style="right:0" class="rule"><img src="{{Msg "seo" "cdn"}}/wxswordfish/images/right.png" style="width: 10px;height: 17px;float: right;"></span>
 		</li>
 	</ul>
 	<!--剑鱼服务协议-->

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

@@ -2,12 +2,12 @@
 <head>
 <title>企明星-剑鱼</title>
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-<link href="//cdn.qmx.top/wxswordfish/style.css" rel="stylesheet">
-<link href="//cdn.qmx.top/swiper/swiper.min.css" rel="stylesheet">
+<link href="{{Msg "seo" "cdn"}}/wxswordfish/style.css" rel="stylesheet">
+<link href="{{Msg "seo" "cdn"}}/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="//cdn.qmx.top/js/jquery.js"></script>
-<script src="//cdn.qmx.top/wxswordfish/share.js"></script>
-<script src="//cdn.qmx.top/swiper/swiper.min.js"></script>
+<script src="{{Msg "seo" "cdn"}}/js/jquery.js"></script>
+<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js"></script>
+<script src="{{Msg "seo" "cdn"}}/swiper/swiper.min.js"></script>
 <script>
 	initShare({{.T.signature}},{{.T.shareid}});
 </script>
@@ -16,30 +16,30 @@
 <div class="swiper-container">
     <div class="swiper-wrapper">
         <div class="swiper-slide">
-			<img src="//cdn.qmx.top/wxswordfish/images/guide-0.png" alt="Cinque Terre">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/guide-0.png" alt="Cinque Terre">
 			<img id="QRcode" style="position:absolute;z-index: 2;" src="/front/weixinshare/{{.T.shareid}}" >
 		</div>
        	<div class="swiper-slide">
-			<img src="//cdn.qmx.top/wxswordfish/images/guide-2.png">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/guide-2.png">
 		</div>
        	<div class="swiper-slide">
-			<img src="//cdn.qmx.top/wxswordfish/images/guide-3.png">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/guide-3.png">
 		</div>
 		<div class="swiper-slide">
-			<img src="//cdn.qmx.top/wxswordfish/images/guide-4.png">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/guide-4.png">
 		</div>
 		<div class="swiper-slide">
-			<img src="//cdn.qmx.top/wxswordfish/images/guide-5.png">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/guide-5.png">
 		</div>
 		<div class="swiper-slide">
-			<img src="//cdn.qmx.top/wxswordfish/images/guide-0.png">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/guide-0.png">
 		</div>
     </div>
     <!-- 如果需要分页器 -->
    	<div class="swiper-pagination"></div>
 	<div class="guide-bottom">
-		<img class="arrow-up" src="//cdn.qmx.top/wxswordfish/images/up.png">
-		<img src="//cdn.qmx.top/wxswordfish/images/index.png" class="jumpGuide" onclick="backToIndex()">
+		<img class="arrow-up" src="{{Msg "seo" "cdn"}}/wxswordfish/images/up.png">
+		<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/index.png" class="jumpGuide" onclick="backToIndex()">
 	</div>
 </div>
 <script type="text/javascript">
@@ -70,7 +70,7 @@ $(function(){
 		touchMoveStopPropagation: false,
 		virtualTranslate: true,
 		onInit: function(swiper){
-			$("[data-swiper-slide-index='5']>img").attr("src","//cdn.qmx.top/wxswordfish/images/guide-6.png");
+			$("[data-swiper-slide-index='5']>img").attr("src","{{Msg "seo" "cdn"}}/wxswordfish/images/guide-6.png");
 		},
 		onSlideChangeStart: function(swiper){
 			if(flag){

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

@@ -5,11 +5,11 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" />
 <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,initial-scale=1.0" user-scalable="no" />
 <meta name="renderer" content="webkit">
-<link href="//cdn.qmx.top/css/bootstrap.min.css" rel="stylesheet">
+<link href="{{Msg "seo" "cdn"}}/css/bootstrap.min.css" rel="stylesheet">
 
 <script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
-<script src="//cdn.qmx.top/js/jquery.js"></script>
-<script src="//cdn.qmx.top/js/bootstrap.min.js"></script>
+<script src="{{Msg "seo" "cdn"}}/js/jquery.js"></script>
+<script src="{{Msg "seo" "cdn"}}/js/bootstrap.min.js"></script>
 
 <script src="/wxswordfish/share.js"></script>
 <script>
@@ -17,7 +17,7 @@
 </script>
 </head>
 <body style="margin:0px; background-color:#C5F7FE;">
-<img src="//cdn.qmx.top/wxswordfish/images/share-cj.jpg" class="img-responsive" alt="Cinque Terre">
+<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/share-cj.jpg" class="img-responsive" alt="Cinque Terre">
 <img id="img2" style="position:absolute;" class="img-responsive" src="/front/weixinshare/{{.T.shareid}}" >
 </body>
 <script>

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

@@ -2,12 +2,12 @@
 <head>
 <title>企明星-剑鱼-分享</title>
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-<link href="//cdn.qmx.top/wxswordfish/style.css" rel="stylesheet">
-<link href="//cdn.qmx.top/swiper/swiper.min.css" rel="stylesheet">
+<link href="{{Msg "seo" "cdn"}}/wxswordfish/style.css" rel="stylesheet">
+<link href="{{Msg "seo" "cdn"}}/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="//cdn.qmx.top/js/jquery.js"></script>
-<script src="//cdn.qmx.top/wxswordfish/share.js"></script>
-<script src="//cdn.qmx.top/swiper/swiper.min.js"></script>
+<script src="{{Msg "seo" "cdn"}}/js/jquery.js"></script>
+<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js"></script>
+<script src="{{Msg "seo" "cdn"}}/swiper/swiper.min.js"></script>
 <script>
 	initShare({{.T.signature}},{{.T.shareid}});
 </script>
@@ -16,30 +16,30 @@
 <div class="swiper-container">
     <div class="swiper-wrapper">
         <div class="swiper-slide">
-			<img src="//cdn.qmx.top/wxswordfish/images/share-cj.jpg" alt="Cinque Terre">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/share-cj.jpg" alt="Cinque Terre">
 			<img id="QRcode" style="position:absolute;z-index: 2;" src="/front/weixinshare/{{.T.shareid}}" >
 		</div>
        	<div class="swiper-slide">
-			<img src="//cdn.qmx.top/wxswordfish/images/guide-2.png">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/guide-2.png">
 		</div>
        	<div class="swiper-slide">
-			<img src="//cdn.qmx.top/wxswordfish/images/guide-3.png">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/guide-3.png">
 		</div>
 		<div class="swiper-slide">
-			<img src="//cdn.qmx.top/wxswordfish/images/guide-4.png">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/guide-4.png">
 		</div>
 		<div class="swiper-slide">
-			<img src="//cdn.qmx.top/wxswordfish/images/guide-5.png">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/guide-5.png">
 		</div>
 		<div class="swiper-slide">
-			<img src="//cdn.qmx.top/wxswordfish/images/share-cj.jpg">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/share-cj.jpg">
 		</div>
     </div>
     <!-- 如果需要分页器 -->
    	<div class="swiper-pagination"></div>
 	<div class="guide-bottom">
-		<img class="arrow-up" src="//cdn.qmx.top/wxswordfish/images/up.png">
-		<img src="//cdn.qmx.top/wxswordfish/images/index.png" class="jumpGuide" onclick="backToIndex()">
+		<img class="arrow-up" src="{{Msg "seo" "cdn"}}/wxswordfish/images/up.png">
+		<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/index.png" class="jumpGuide" onclick="backToIndex()">
 	</div>
 </div>
 <script type="text/javascript">
@@ -68,7 +68,7 @@ $(function(){
 		touchMoveStopPropagation: false,
 		virtualTranslate: true,
 		onInit: function(swiper){
-			$("[data-swiper-slide-index='5']>img").attr("src","//cdn.qmx.top/wxswordfish/images/guide-6.png");
+			$("[data-swiper-slide-index='5']>img").attr("src","{{Msg "seo" "cdn"}}/wxswordfish/images/guide-6.png");
 		},
 		onSlideChangeStart: function(swiper){
 			if(flag){

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

@@ -1,14 +1,14 @@
 <ul class="bottom-toolbar">
 	<li class="parent-node" id="goToGuide">
-		<img src="//cdn.qmx.top/wxswordfish/images/demo.png">
+		<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/demo.png">
 		查看演示
 	</li>
 	<li class="parent-node" id="feedback">
-		<img src="//cdn.qmx.top/wxswordfish/images/fankui.png">
+		<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/fankui.png">
 		意见反馈
 	</li>
 	<li class="parent-node" id="goToShare">
-		<img src="//cdn.qmx.top/wxswordfish/images/share.png">
+		<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/share.png">
 		分享
 	</li>
 </ul>

weixin/src/config.json

@@ -32,7 +32,8 @@
 	"activity":{
 		"activitycode":"topcj",
 		"title":"企明星新年抽奖活动进行中",
-		"picurl":"http://www.qimingxing.info/images/choujiang2.png"
+		"picurl":"http://www.qimingxing.info/images/choujiang2.png",
+		"tuenCards":"小主，来抢新年福牌了！\n剑鱼君派送神秘福牌！\n<a href='%s'>小主快快点这里翻福牌!</a>",
 	},"weixinautorpl":"小主的吩咐我们已经收到了，请留下您的联系方式（手机号或qq号），企明星客服会在下一个工作日9:00-17:00给小主回复哦！",
 	"creditRpc":"127.0.0.1:8765",
 	"subscribemonitorcyc":3,

weixin/src/qfw/weixin/msgtxtchandler.go

@@ -22,7 +22,12 @@ func MsgTxtHandler(w ResponseWriter, r *Request) {
 			if us.Type == "robot" {
 				w.ReplyText("再见了小主人，记得想我呦。")
 			} else {
-				w.ReplyText("您已经退出企明星会员认证程序。")
+				if us.Type == "wxadmin" {
+					w.ReplyText("您已经退出微信管理。")
+
+				} else {
+					w.ReplyText("您已经退出企明星会员认证程序。")
+				}
 			}
 			delete(UserSession, r.FromUserName)
 		}
@@ -37,7 +42,7 @@ func MsgTxtHandler(w ResponseWriter, r *Request) {
 		}
 	} else if r.Content == "微信管理" && mids[openid] {
 		UserSession[r.FromUserName] = NewUserSession("wxadmin")
-		w.ReplyText("您已进入微信管理，请输入指令操作:\n1.查看抽奖模式（指令:f0）\n2.切换抽奖模式（指令:c*,*为数字。如c0(自动模式),c1(手动模式1),c2(手动模式2),c3(手动模式3)）\n3.统计抽奖结果（tjr*,tjr120(最近两分钟),tjr120-1200(最近两分钟至最近20分钟之间的)）\n4.统计新用户数（tju*）\n5.服务器情况监测（ser0）\n6服务管理(man*,man1重启主程序(man11关闭)，man2重启微信,man3重启积分(man33关闭),man4重启微信认证(man44关闭))。\n输入q或Q离开。")
+		w.ReplyText("您已进入微信管理，请输入指令操作:\n1.查看抽奖模式（指令:f0）\n2.切换抽奖模式（指令:c*,*为数字。如c0(自动模式),c1(手动模式1),c2(手动模式2),c3(手动模式3)）\n3.统计抽奖结果（tjr*,tjr120(最近两分钟),tjr120-1200(最近两分钟至最近20分钟之间的)）\n4.统计新用户数（tju*）\n5.服务器情况监测（ser0）\n6服务管理(man*,man1重启主程序(man11关闭),man3重启积分(man33关闭),man4重启微信认证(man44关闭))。\n输入q或Q离开。")
 		return
 	} else if r.Content == "抽奖" { //进入抽奖环节
 		if time.Now().Unix() > 1455552000 { //活动过期 ，过期后，这段代码要删除
@@ -47,6 +52,10 @@ func MsgTxtHandler(w ResponseWriter, r *Request) {
 			targeturl := fmt.Sprintf("http://%s/activity/%s/%s", wf.SysConfig.Domain, wf.SysConfig.Activity["activitycode"], se.EncodeString(r.FromUserName))
 			w.ReplyNews([]Article{Article{PicUrl: wf.SysConfig.Activity["picurl"], Title: wf.SysConfig.Activity["title"], Url: targeturl}})
 		}
+	} else if r.Content == "翻牌" { //进入抽奖环节
+		targeturl := fmt.Sprintf("https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=http://%s/weixinoauth/action/%s&response_type=code&scope=snsapi_base&state=1#wechat_redirect", wf.SysConfig.Appid, wf.SysConfig.Domain, "turncards")
+		//w.ReplyNews([]Article{Article{Title: wf.SysConfig.Activity["tuenCards"], Url: targeturl,Description:}})
+		w.ReplyText(fmt.Sprintf(wf.SysConfig.Activity["tuenCards"], targeturl))
 	} else if strings.HasPrefix(r.Content, "内部报名") { //绑定拓普员工姓名
 		tmp := strings.Fields(r.Content)
 		//log.Println(tmp, len(tmp))

weixin/src/qfw/weixin/wxadmin.go

@@ -16,11 +16,10 @@ import (
 
 func processWxAdmin(openid, content string, w ResponseWriter, r *Request) {
 	util.Try(func() {
-
 		if openid != "" {
 			b, cmd, qleng, unit, var1, var2 := checkContent(content)
 			if b {
-				resStr := "无结果"
+				resStr := "结果:"
 				switch cmd {
 				case "f":
 					//查看抽奖模式
@@ -39,7 +38,7 @@ func processWxAdmin(openid, content string, w ResponseWriter, r *Request) {
 					qu1 := M{"$gte": var1}
 					if qleng == 2 { //取区间
 						qu1 = M{"$gte": var2, "$lte": var1}
-					} else {
+					} else if qleng != 1 {
 						w.ReplyText("指令异常，请重新输入。")
 						return
 					}
@@ -64,7 +63,7 @@ func processWxAdmin(openid, content string, w ResponseWriter, r *Request) {
 					qu1 := M{"$gte": var1}
 					if qleng == 2 { //取区间
 						qu1 = M{"$gte": var2, "$lte": var1}
-					} else {
+					} else if qleng != 1 {
 						w.ReplyText("指令异常，请重新输入。")
 						return
 					}
@@ -77,7 +76,7 @@ func processWxAdmin(openid, content string, w ResponseWriter, r *Request) {
 						if res != nil && len(res) > 0 {
 							sum := 0
 							for _, v := range res {
-								resStr += "\n" + util.If(v["_id"] == nil, "黑名单用户", "正常用户").(string) + ":" + fmt.Sprintf("%x", v["count"])
+								resStr += "\n" + util.If(v["_id"] == nil, "正常用户", "黑名单用户").(string) + ":" + fmt.Sprintf("%d", v["count"].(int))
 								sum += v["count"].(int)
 							}
 							resStr += "\n" + "总数:" + fmt.Sprintf("%d", sum)
@@ -106,11 +105,13 @@ func processWxAdmin(openid, content string, w ResponseWriter, r *Request) {
 						resStr = "关闭主程序完成"
 					case 2:
 						//重启weixin
+						/**
 						cmdstr := getNewCmd(DIR+"/weixin", "weixin")
 						if len(cmdstr) > 0 {
 							execCmd(DIR+"/weixin", "weixin", cmdstr, true)
 						}
-						resStr = "重启微信程序完成"
+						**/
+						resStr = "不支持重启微信"
 					case 22:
 						//不能关闭微信
 						break