Home Explore Help
Sign In
qmx
/
qfw
7
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

zhanghongbo 9 years ago
parent
0334a5c682 f8f174bbad
commit
6144e74f4c
15 changed files with 19 additions and 5 deletions
Split View Show Diff Stats
  1. 2 0
      core/src/qfw/active/activemanage.go
  2. BIN
      core/src/web/staticres/images/flop/bg-1.png
  3. BIN
      core/src/web/staticres/images/flop/bg-2.png
  4. BIN
      core/src/web/staticres/images/flop/card-1.png
  5. BIN
      core/src/web/staticres/images/flop/card-2.png
  6. BIN
      core/src/web/staticres/images/flop/card-3.png
  7. BIN
      core/src/web/staticres/images/flop/card-4.png
  8. BIN
      core/src/web/staticres/images/flop/card-5.png
  9. BIN
      core/src/web/staticres/images/flop/card-6.png
  10. BIN
      core/src/web/staticres/images/flop/card.png
  11. BIN
      core/src/web/staticres/images/flop/min-blessing.png
  12. BIN
      core/src/web/staticres/wxswordfish/images/min-share-icon.png
  13. 2 2
      core/src/web/staticres/wxswordfish/share.js
  14. 14 2
      core/src/web/templates/active/flop.html
  15. 1 1
      weixin/src/qfw/weixin/wxadmin.go

+ 2 - 0
core/src/qfw/active/activemanage.go
View File 

@@ -264,6 +264,8 @@ func (a *Activemanage) Luckdraw(activecode, id string) error {
 
 				Tm := time.Now().AddDate(0, 0, 1)
 
 				if ret := redis.Get("other", "cj_"+openid+"_"+Tm.Format("2006_01_02")); ret == nil {
 
 					a.T["msg"] = "　　小主，分享给好友参加明天的抽奖吧！千万不要再忘记了，大奖可能就在明天~"
 
+				} else {
 
+					a.T["msg"] = "　　小主已获得明天的抽奖资格！明天记得要来啊~"
 
 				}
 
 			} else {
 
 				a.T["msg"] = "　　小主已获得明天的抽奖资格！明天记得要来啊~"

BIN
core/src/web/staticres/images/flop/bg-1.png
View File


BIN
core/src/web/staticres/images/flop/bg-2.png
View File


BIN
core/src/web/staticres/images/flop/card-1.png
View File


BIN
core/src/web/staticres/images/flop/card-2.png
View File


BIN
core/src/web/staticres/images/flop/card-3.png
View File


BIN
core/src/web/staticres/images/flop/card-4.png
View File


BIN
core/src/web/staticres/images/flop/card-5.png
View File


BIN
core/src/web/staticres/images/flop/card-6.png
View File


BIN
core/src/web/staticres/images/flop/card.png
View File


BIN
core/src/web/staticres/images/flop/min-blessing.png
View File


BIN
core/src/web/staticres/wxswordfish/images/min-share-icon.png
View File


+ 2 - 2
core/src/web/staticres/wxswordfish/share.js
View File 

@@ -15,7 +15,7 @@ function initShare(signature,shareid){
 
 	        wx.onMenuShareTimeline({
 
 			    title: '剑鱼招标订阅免费用，关注即可抽取iPad mini。', // 分享标题
 
 			    link: 'http://www.qimingxing.info/swordfish/share/'+shareid, // 分享链接
 
-			    imgUrl: 'http://www.qimingxing.info/wxswordfish/images/share-icon.png', // 分享图标
 
+			    imgUrl: 'http://www.qimingxing.info/wxswordfish/images/min-share-icon.png', // 分享图标
 
 			    success: function () { 
 			       //alert('分享成功');
 
 							$.ajax({    
@@ -37,7 +37,7 @@ function initShare(signature,shareid){
 
 			    title: '剑鱼招标订阅免费用，关注即可抽取iPad mini。', // 分享标题
 
 			    desc: '关注微信并设置剑鱼关键词，全国招标信息统统推送给您！', // 分享描述
 
 			    link: 'http://www.qimingxing.info/swordfish/share/'+shareid, // 分享链接
 
-			    imgUrl: 'http://www.qimingxing.info/wxswordfish/images/share-icon.png', // 分享图标
 
+			    imgUrl: 'http://www.qimingxing.info/wxswordfish/images/min-share-icon.png', // 分享图标
 
 			    type: 'link', // 分享类型,music、video或link，不填默认为link'
 
 			    dataUrl: '', // 如果type是music或video，则要提供数据链接，默认为空
 
 			    success: function () {

+ 14 - 2
core/src/web/templates/active/flop.html
View File 

@@ -9,7 +9,7 @@
 
 var signature = {{.T.signature}};
 
 var shareTitle = "{{.T.nickName}}在2016年{{.T.words}}";
 
 var shareLink = "http://www.qimingxing.info/active/flop/share/{{.T.openid}}";
 
-var shareIcon = "http://www.qimingxing.info/images/flop/blessing.png";
 
+var shareIcon = "http://www.qimingxing.info/images/flop/min-blessing.png";
 
 if(typeof(signature) != "undefined" && signature != null && signature.length == 4){
 
 	wx.config({
 
 	    debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
 
@@ -194,14 +194,18 @@ ul{
 
 }
 
 .page-before{
 
 	background-image: url("{{Msg "seo" "cdn"}}/images/flop/bg-1.png");
 
+	background-repeat: no-repeat;
 
+	background-position-x: center;
 
 }
 
 .page-after{
 
 	background-image: url("{{Msg "seo" "cdn"}}/images/flop/bg-2.png");
 
+	background-repeat: no-repeat;
 
+	background-position-x: center;
 
 }
 
 </style>
 
 </head>
 
 <body>
 
-<img src="{{Msg "seo" "cdn"}}/images/flop/bubble.png" class="bubble"{{if eq .T.flag 1}} style="display: none;"{{end}}>
 
+<img src="{{Msg "seo" "cdn"}}/images/flop/bubble.png" class="bubble"{{if ne .T.flag 2}} 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>
 
@@ -253,6 +257,14 @@ if({{.T.IsOver}}){
 
 $(function(){
 
 	var windowWidth = $(window).width();
 
 	var windowHeight = $(window).height();
 
+	var rate=((5/3)/(windowHeight/windowWidth))*100
 
+	if(rate>120){
 
+		rate=120
 
+		$(".page").css({"background-position-y":"-"+(rate/100*12)+"px"})
 
+	}else if(rate<100){
 
+		rate=100
 
+	}
 
+	$(".page").css({"background-size":"100% "+rate+"%"})
 
 	var defaultWidth = 320;
 
 	var defaultHeight = 416;
 
 	var width = 250; // 625 706

+ 1 - 1
weixin/src/qfw/weixin/wxadmin.go
View File 

@@ -51,7 +51,7 @@ func processWxAdmin(openid, content string, w ResponseWriter, r *Request) {
 
 						if res != nil && len(res) > 0 {
 
 							sum := 0
 
 							for _, v := range res {
 
-								resStr += "\n" + v["_id"].(string) + ":" + fmt.Sprintf("%x", v["count"])
 
+								resStr += "\n" + v["_id"].(string) + ":" + fmt.Sprintf("%d", v["count"].(int))
 
 								sum += v["count"].(int)
 
 							}
 
 							resStr += "\n" + "总数:" + fmt.Sprintf("%d", sum)