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

common/src/qfw/util/encrypt_test.go

@@ -24,8 +24,8 @@ func Test_sim(t *testing.T) {
 	//s3 := "RFYoal5bCFdXWQoQB0JuWwlXAQFZCUVfFj4JMFtT"
 	s4 := "oJULtwzXo6EFV1Ah-XeyRBimXGM8,uid,123456,swordfishaction"
 	se := SimpleEncrypt{Key: "topnet"}
-	log.Println(se.EncodeString(s4))
-	log.Println(se.DecodeString("GyUlIhEDDjcfWCAyIl4xBkgsERYiLAwZLCg9VkkSEkMWCEkHAwACCgMdBwcRDREdGwE=566666666666666"))
+	log.Println("=====", se.EncodeString(s4))
+	log.Println("---", se.DecodeString("GyUlIhEDDjcfWCAyIl4xBkgsERYiLAwZLCg9VkkBHQtcX1FBR1hJWldCREMHFhUBBwccBxYA"))
 	now := time.Now()
 	tom := time.Date(now.Year(), now.Month(), now.Day(), 18, 0, 0, 0, time.Local)
 	log.Println(now.Unix(), tom.Unix(), 1453686600-1453716000)

core/src/message.json

@@ -5,7 +5,7 @@
 	"entsearchaction":"/wx/search/enterprise/ent.html",
 	"lawsearchaction":"/law/qfw/index",
 	"msiteaction":"/ent/wsite/edit",
-	"wxpushlist":"/wxpush/bid/%s/%s/%s",
+	"wxpushlist":"/wxpush/bidinfo/%s",
 	"indentify":{
 		"success":{
 			"result":"企业认证",

core/src/qfw/active/activemanage.go

@@ -69,13 +69,12 @@ func (a *Activemanage) Luckdraw(activecode, id string) error {
 		if *u != nil {
 			if ret := redis.Get("other", "cj_"+openid+"_"+time.Now().Format("2006_01_02")); ret == nil {
 				//a.T = *u
-				fmt.Println("ret:::::::::", ret, "33333333333", time.Now().Format("2006_01_02"))
 				a.T["flog"] = "A"
 				Tm := time.Now().AddDate(0, 0, 1)
 				if ret := redis.Get("other", "cj_"+openid+"_"+Tm.Format("2006_01_02")); ret == nil {
-					a.T["msg"] = "小主，快分享朋友圈或好友即获得明天的抽奖资格吧！千万不要再忘记了，大奖可能就在明天~"
+					a.T["msg"] = "　　小主，快分享朋友圈或好友即获得明天的抽奖资格吧！千万不要再忘记了，大奖可能就在明天~"
 				} else {
-					a.T["msg"] = "小主莫贪心，每人每天只有一次抽奖机会呦！分享后明天再来吧！<br/><br/>　　小主翻个牌子，动动小手分享活动，么么哒……（分享点击页面右上方···分享到朋友圈）"
+					a.T["msg"] = "　　小主莫贪心，每人每天只有一次抽奖机会呦！分享后明天再来吧！<br/><br/>　　小主翻个牌子，动动小手分享活动，么么哒……（分享点击页面右上方···分享到朋友圈）"
 				}
 				return a.Render("/active/luckdraw.html", &a.T)
 			}
@@ -104,9 +103,8 @@ func (a *Activemanage) Getluckdraw() error {
 		if *u != nil {
 			if ret := redis.Get("other", "cj_"+openid+"_"+time.Now().Format("2006_01_02")); ret == nil {
 				//a.T = *u
-				fmt.Println("ret22:::::::::", ret)
 				a.T["flog"] = "A"
-				a.T["msg"] = "小主莫贪心，每天只有一次抽奖机会呦！分享至朋友圈或好友即可以获得明天抽奖资格呦！乖，快去分享吧！大奖可能就在明天~~"
+				a.T["msg"] = "　　小主莫贪心，每天只有一次抽奖机会呦！分享至朋友圈或好友即可以获得明天抽奖资格呦！乖，快去分享吧！大奖可能就在明天~~"
 				return a.Write(`{"flog":"` + flog + `","msg":"` + msg + `"}`)
 			}
 			redis.Del("other", "cj_"+openid+"_"+time.Now().Format("2006_01_02"))
@@ -161,7 +159,7 @@ func (a *Activemanage) Getluckdraw() error {
 			redpackage["s_actcode"] = s_actcode
 			Save("redpackage", redpackage)
 		}
-		msg = "　　小主是真真的好运气，" + s_prize + "落入您囊中。红包将由系统自动发放到您的微信，请注意查收。<br/><br/>分享至朋友圈或好友即可以获得明天抽奖资格呦！乖，快去分享吧！大奖可能就在明天~~"
+		msg = "　　小主是真真的好运气，" + s_prize + "落入您囊中。红包将由系统自动发放到您的微信，请注意查收。<br/><br/>　　分享至朋友圈或好友即可以获得明天抽奖资格呦！乖，快去分享吧！大奖可能就在明天~~"
 	} else if (i > 275 && i < 310) || (i > 95 && i < 130) {
 		//时间判断，提醒不同
 		//now := time.Now()
@@ -170,18 +168,18 @@ func (a *Activemanage) Getluckdraw() error {
 		//
 		//	msg = "　　小主是真真的好运气，" + s_prize + "落入您囊中！<br/>　　请在微信留下您的联系方式（手机号或qq号），企明星客服会在下一个工作日9:00-17:00给小主回复哦!<br/>　　小主翻个牌子，动动小手分享活动，么么哒……（分享点击页面右上方···分享到朋友圈）"
 		//} else { //在工作时间
-		msg = "　　小主是真真的好运气，" + s_prize + "落入您囊中。请将您的联系方式和邮寄地址留言给企明星。我们会在活动截止后尽快为您发出。<br/><br/>分享至朋友圈或好友即可以获得明天抽奖资格呦！乖，快去分享吧！大奖可能就在明天~~"
+		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 {
-			msg = "　　小主是真真的好运气，200积分落入您囊中。积分将由系统自动发放到您的企明星账户，请登录www.qmx.top查看。<br/><br/>分享至朋友圈或好友即可以获得明天抽奖资格呦！乖，快去分享吧！大奖可能就在明天~~"
+			msg = "　　小主是真真的好运气，200积分落入您囊中。积分将由系统自动发放到您的企明星账户，请登录www.qmx.top查看。<br/><br/>　　分享至朋友圈或好友即可以获得明天抽奖资格呦！乖，快去分享吧！大奖可能就在明天~~"
 		} else {
 			msg = "　　抽奖出错！小主不要桑心，联系企明星管理员，200积分还是您的！"
 		}
 	} else { //不中奖
-		msg = "　　小主不要桑心，这次没有中奖哦，明天记得要来拼运气啊！<br/><br/>分享至朋友圈或好友即可以获得明天抽奖资格呦！乖，快去分享吧！大奖可能就在明天~~"
+		msg = "　　小主不要桑心，这次没有中奖哦，明天记得要来拼运气啊！<br/><br/>　　分享至朋友圈或好友即可以获得明天抽奖资格呦！乖，快去分享吧！大奖可能就在明天~~"
 	}
 	return a.Write(`{"flog":"` + flog + `","msg":"` + msg + `","rotate":` + strconv.Itoa(int(i)) + `}`)
 

core/src/qfw/front/index.go

@@ -77,7 +77,7 @@ func (i *Index) LoadIndex() error {
 			}
 		}
 		//认证企业
-		entquery := `{"i_identificationstatus":1,"i_freeze":{"$ne":2}}`
+		entquery := `{"i_identificationstatus":1,"i_freeze":{"$ne":2},"i_identificationtype":{"$in":[1,5]}}`
 		entdata := *Find("identification", entquery, []string{"-l_auditdate"}, `{"s_enterprisename":1,"l_auditdate":1,"s_enterpriseid":1}`, false, 0, 8)
 		if entdata != nil {
 			for _, v := range entdata {

core/src/qfw/member/memberindex.go

@@ -38,9 +38,8 @@ func init() {
 }
 
 func (m *MemberIndex) Sess(str string) error {
-
 	util.Try(func() {
-		strs := strings.Split(str, "/")
+		strs := strings.Split(str, "__")
 		str := strings.Split(sewx.DecodeString(strs[0]), ",")
 		if len(str) == 4 {
 			openid := str[0]

core/src/qfw/member/membermanager.go

@@ -1081,7 +1081,7 @@ func returnFront(m *Member, key string) error {
 
 //更新cookie sessoin
 func UpdateCookieSession(action *xweb.Action, loginType string, flag bool, r map[string]interface{}) {
-	log.Println(r)
+	//log.Println(r)
 	freeze := IntAll(r["i_freeze"])
 	action.Session().Set("i_freeze", freeze)
 	if r["s_nickname"] == nil || r["s_nickname"].(string) == "" {

core/src/qfw/mobile/mobile.go

@@ -6,21 +6,22 @@ import (
 
 type Mobile struct {
 	*xweb.Action
-	index         xweb.Mapper `xweb:"/ent/(.*)/index"`
-	search        xweb.Mapper `xweb:"/ent/(.*)/search"`
-	detail        xweb.Mapper `xweb:"/ent/(.*)/detail/(.*)/(.*)"`
-	pageerror     xweb.Mapper `xweb:"/ent/(.*)/505"`
-	guide         xweb.Mapper `xweb:"/swordfish/guide"`
-	share         xweb.Mapper `xweb:"/swordfish/share/([^.]*)"`
-	wxrssset      xweb.Mapper `xweb:"/swordfish/page"`
-	getMyCredit   xweb.Mapper `xweb:"/member/credit/getcredit"`
-	swordfishPay  xweb.Mapper `xweb:"/member/credit/swordfishpay"`
-	msgSet        xweb.Mapper `xweb:"/swordfish/msgpushsetting/msgset"`
-	ajaxReq       xweb.Mapper `xweb:"/member/swordfish/ajaxReq"`
-	advise        xweb.Mapper `xweb:"/mobile/advise"`
-	adviseSave    xweb.Mapper `xweb:"/mobile/advisesave"`
-	wxpushList    xweb.Mapper `xweb:"/wxpush/bid/(.*)/(.*)/(.*)"` //推送列表
-	wxpushAjaxReq xweb.Mapper `xweb:"/wxpush/bid/ajaxReq"`
+	index          xweb.Mapper `xweb:"/ent/(.*)/index"`
+	search         xweb.Mapper `xweb:"/ent/(.*)/search"`
+	detail         xweb.Mapper `xweb:"/ent/(.*)/detail/(.*)/(.*)"`
+	pageerror      xweb.Mapper `xweb:"/ent/(.*)/505"`
+	guide          xweb.Mapper `xweb:"/swordfish/guide/(.*)"`
+	share          xweb.Mapper `xweb:"/swordfish/share/([^.]*)"`
+	wxrssset       xweb.Mapper `xweb:"/swordfish/page"`
+	getMyCredit    xweb.Mapper `xweb:"/member/credit/getcredit"`
+	swordfishPay   xweb.Mapper `xweb:"/member/credit/swordfishpay"`
+	msgSet         xweb.Mapper `xweb:"/swordfish/msgpushsetting/msgset"`
+	ajaxReq        xweb.Mapper `xweb:"/member/swordfish/ajaxReq"`
+	advise         xweb.Mapper `xweb:"/mobile/advise"`
+	adviseSave     xweb.Mapper `xweb:"/mobile/advisesave"`
+	wxpushList     xweb.Mapper `xweb:"/wxpush/bid/(.*)/(.*)/(.*)"` //推送列表
+	wxpushListInfo xweb.Mapper `xweb:"/wxpush/bidinfo/(.*)"`       //推送列表
+	wxpushAjaxReq  xweb.Mapper `xweb:"/wxpush/bid/ajaxReq"`
 }
 
 func init() {

core/src/qfw/mobile/wxmenu.go

@@ -22,11 +22,15 @@ var se util.SimpleEncrypt
 func init() {
 	se = util.SimpleEncrypt{Key: "topnet"}
 }
-
-func (m *Mobile) Guide() error {
+func (m *Mobile) Guide(sign string) error {
 	m.T["signature"] = GetSignature(m.Url())
 	m.T["shareid"] = cutil.FindMyShareId("topjy", m.Session().Get("s_m_openid").(string))
-	return m.Render("/swordfish/wxindex.html", &m.T)
+	m.T["sign"] = sign
+	if sign == "share" {
+		return m.Render("/swordfish/wxshareguide.html", &m.T)
+	} else {
+		return m.Render("/swordfish/wxindex.html", &m.T)
+	}
 }
 func (m *Mobile) Share(shareid string) error {
 	m.T["shareid"] = shareid
@@ -58,7 +62,7 @@ func (m *Mobile) Wxrssset() error {
 						"i_m_guide": 1,
 					},
 				}, false, false)
-				return m.Redirect("/swordfish/guide")
+				return m.Redirect("/swordfish/guide/first")
 			}
 			if (*userInfo)["o_msgset"] != nil {
 				for _, v := range (*userInfo)["o_msgset"].(map[string]interface{}) {
@@ -324,6 +328,14 @@ func (m *Mobile) AjaxReq() error {
 
 //推送列表
 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["signature"] = GetSignature(m.Url())
+	return m.Render("/swordfish/wxpush.html", &m.T)
+}
+
+//推送列表
+func (m *Mobile) WxpushListInfo(_id string) error {
 	/**
 	go func() {
 		mongodb.Update("message", `{"_id":"`+msgid+`"}`, `{"$set":{"i_status":1}}`, false, false)

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 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}
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-27 10:18:38"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-27 10:18:38"}},"marketisstart":true,"marketrate":300}

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

@@ -581,7 +581,7 @@ a{
 	border-left: 3px solid #FF5A5F;
 	width: 250px;
 	height: 45px;
-	margin:10px 0 10px 1px;
+	margin:1px 0 10px 1px;
 	line-height: 45px;
 	padding-left: 20px;
 	background: #FFF;
@@ -2365,8 +2365,7 @@ style="color:#D03102;margin-right:5px;"
 .b-head .b-loginbtn{
 	width: 40px;
 	height: 40px;
-	margin-top: 13px;
-	margin-right: 30px;
+	margin-right: 10px;
 }
 .b-head .headimg{
 	width: 40px;
@@ -2376,6 +2375,7 @@ style="color:#D03102;margin-right:5px;"
 .b-head .b-loginStatus{
 	padding: 0px 15px;
 	position: relative;
+	cursor: pointer;
 }
 .b-head .b-logined:hover{
 	background-color: #F7F9FB;
@@ -2595,6 +2595,26 @@ style="color:#D03102;margin-right:5px;"
 .b-disabled{
 	color: #A0A0A0;
 }
+.u-weightsmall{
+	font-weight:200;
+}
+/*积分签到(连续)*/
+#bookin .modal-dialog{
+	width:535px;
+}
+#bookin .content{
+	width: 430px;
+	margin-left: 10px;
+}
+#bookin .content table td{
+	text-align:center;
+}
+#bookin .content table.creditbottom td {
+    width: 111px;
+}
+#bookin .content img{
+	width:82px;
+}
 /*认证完第一次登录 end*/
 /*分辨率小于1200的时候调整布局，算上滚动条1217*/
 @media (max-width: 1217px) {

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

@@ -252,9 +252,11 @@ function showSnopshot(module,type,on){
 		try{
 			var days=eval("msgset."+module+".days")	
 			if(typeof days=="number"){
-				var tiptxt="本栏目推送服务期还剩<d style='color:red'>"+days+"</d>天"
-				if(winWidth<341){
-					tiptxt="服务期还剩<d style='color:red'>"+days+"</d>天"
+				if (days<6){
+					var tiptxt="本栏目推送服务期还剩<d style='color:red'>"+days+"</d>天"
+					if(winWidth<341){
+						tiptxt="服务期还剩<d style='color:red'>"+days+"</d>天"
+					}
 				}
 			}
 		}catch(e){}
@@ -520,6 +522,6 @@ $(function(){
 
 	//剑鱼协议
 	if(winWidth<341){
-		$("#prexieyi").html("");
+		$("#prexieyi").append("<br>");
 	}
 });

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

@@ -378,8 +378,7 @@ img{
 .swiper-slide img{
 	/*position: relative;
 	top: 50%;
-	margin-top: -302px;
-	*/
+	margin-top: -302px;*/
 	width: 100%;
 	height: 100%;
 }

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

@@ -19,9 +19,12 @@
 <style>
 *{padding:0; margin:0;}
 .lotteryMain{ width:100%;}
-.lotteryBg{ width:100%; height:100%; margin:0 auto; background:url(/images/activeimages/lotteryBg.jpg) no-repeat center center; position:relative; overflow:hidden;background-size: 375px 603px;}
+.lotteryBg{ width:100%; height:608px; margin:0 auto; background:url(/images/activeimages/lotteryBg.jpg) 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(/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;
+}
 </style>
 </head>
 
@@ -58,7 +61,16 @@
     	<img id="run" src="/images/activeimages/start.png" />
         <input id="btn_run" type="button" value="" />
     </div>
-</section>  
+</section> 
+<div class="col-xs-12" style="color:#fff; margin-top:-135px;font-weight:600;">
+<h3 style="font-weight:600;">活动规则</h3>
+<p>1、企明星所有粉丝用户均可以参与幸运抽奖；</p>
+<p>2、每位用户每天有一次抽奖机会；</p>
+<p>3、活动页面转发分享后获得第二天的抽奖资格；</p>
+<p>4、中奖用户请通过企明星微信与客服联系，告知联系方式；</p>
+<p>5、活动时间截止到2016年2月15日；</p>
+<p>6、iPadmini、书籍和U盘会在活动截止后统一邮寄发出。请注意查收。</p>
+</div> 
 <script>
 
 $(function(){ 

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

@@ -87,12 +87,12 @@
 			<div>
 			{{if session "credit_qd"}}
 				{{if eq (session "credit_qd") "y"}}
-					<button style="width:100px" class="btn" disabled>已签到</button>
+					<button id="credit_qd" style="width:100px" class="btn btn-default" onclick='$("#bookin").modal("show");' >查看签到</button>
 				{{else}}
-					<button id="credit_qd" style="width:100px" class="btn btn-primary" onclick="qd()">签到</button>
+					<button id="credit_qd" style="width:100px" class="btn btn-primary" onclick='$("#bookin").modal("show");'>签到</button>
 				{{end}}	
 			{{else}}
-				<button id="credit_qd" style="width:100px" class="btn btn-primary" onclick="qd()">签到</button>
+				<button id="credit_qd" style="width:100px" class="btn btn-primary" onclick='$("#bookin").modal("show");'>签到</button>
 			{{end}}	
 			</div>
 		</div>
@@ -101,7 +101,7 @@
 	<div style="width:198px;height:40px;text-align:center;">
 		<div onclick="creditModel(1)" style="float:left;width:90px;border-right:1px">
 			<div>积分</div>
-			<div><i class="glyphicon jinbi" style="width:25px;color:red;font-size:18px"></i><span style="font-weight:normal;">{{session "i_credit"}}</span></div>
+			<div><i class="glyphicon jinbi" style="width:25px;color:red;font-size:18px"></i><span style="font-weight:normal;" class="gold">{{session "i_credit"}}</span></div>
 		</div>
 		<div style="height:40px;float:left;width:1px;background-color:#DDDDDD"></div>
 		<div onclick="window.location.href='/member/accountset/index'" style="float:left;width:105px;">
@@ -156,6 +156,43 @@
 		</div>
 	</div>
 </div>
+<div class="modal fade b-modal in" id="bookin" tabindex="-1" role="dialog" aria-labelledby="bidModalLabel" aria-hidden="true">
+	<div class="modal-dialog">
+			<div class="modal-content">
+				<div class="modal-header u-weightsmall">
+					查看签到信息
+					<span data-dismiss="modal" aria-label="Close" class="close glyphicon guanbi1"></span>
+	    	  	</div>
+				<div class="modal-body">
+					<div class="content">
+						<div>
+								<table width="110%;" style="    margin: 15px auto;" class="credittop">
+								<tr>
+									<td><img src="/images/10jf.png"><div>第一天</div></td>
+									<td><img src="/images/20jf.png"><div>第二天</div></td>
+									<td><img src="/images/30jf.png"><div>第三天</div></td>
+									<td><img src="/images/40jf.png"><div>第四天</div></td>
+								</tr>
+							</table>
+							<table style="    margin: 0px 66px;    width: 80%;" class="creditbottom">
+								<tr>
+									<td><img src="/images/50jf.png"><div>第五天</div></td>
+									<td><img src="/images/60jf.png"><div>第六天</div></td>
+									<td><img src="/images/70jf.png"><div>第七天</div></td>
+								</tr>
+							</table>
+							<div class="text-center" style="width:110%;">
+									<button class="btn   " style="width:180px;margin-top:10px;" id="bookinbtn" disabled="disabled" style="display:none;">已签到</button>
+									<button class="btn btn-primary " style="width:180px;margin-top:10px;" id="bookinbtn1"  style="display:none;">签到</button>
+			
+							</div>
+							<div class="text-center" style="width:110%;"><small>(已连续签到<span class="days"></span>天)</small></div>
+						</div>
+					</div>
+				</div>
+			</div>
+	</div>
+</div>
 <script type="text/javascript">
 var role = "{{$s_role}}"=="<nil>"?"":"{{$s_role}}";
 var identWay = "{{$identWay}}";
@@ -270,14 +307,12 @@ var MemberLeftMenu = {
 $(function (){
 	//初始化菜单
 	MemberLeftMenu.init();
-	$.post("/member/credit/sessionQdAjx",{},function(r){
-		if(r&&r.result=="y"){
-			$("#credit_qd").attr("disabled","disabled");
-			$("#credit_qd").removeClass("btn-primary");
-			$("#credit_qd").html("已签到")
-		}
-	});
-	
+	changeStatus();
+	$("#bookinbtn1").bind("click",qd);
+	bookinfo();
+	if ($(".gold").text()==""){
+		$(".gold").text("0");
+	}
 });
 function openSChat() {
 	try {
@@ -288,8 +323,9 @@ function openSChat() {
 function qd(){
 	$.post("/member/credit/inCreditAjx",{"param":"qd"},function(r){
 		if (r.result=="y"){
-			window.location.reload()
-		}
+					bookinfo(1);
+				}
+		changeStatus();
 	});
 }
  
@@ -312,4 +348,60 @@ function toMyCredit(){
 	$("#vipcreditModal").modal("hide");
 	window.location.href="/member/credit/myCredit";
 }
+
+function changeStatus(){
+	$.ajax({
+		url:"/member/credit/sessionQdAjx",
+		success:function(n){
+			if (n.result=="n"){
+				$("#bookinbtn1").show();
+				$("#bookinbtn").hide();
+			}else{
+				$("#credit_qd").removeClass("btn-primary");
+				$("#credit_qd").addClass("btn-default");
+				$("#credit_qd").text("查看签到");
+				$("#bookinbtn").show();
+				$("#bookinbtn1").hide();
+			}
+		}
+	})
+}
+function bookinfo(isInCredit){
+	$.ajax({
+		url:"/member/credit/bookinfo",
+		method:"POST",
+		type:"json",
+		success:function(r){
+			if (r){
+				var d={"1":"一","2":"二","3":"三","4":"四","5":"五","6":"六","7":"七","8":"八","9":"九","0":"零"};
+				$(".days").text(d[""+r[1]]);
+				$(".days").attr("data",r[1]);
+				var images=$("#bookin .content img");
+				if(r[1]>7){
+					r[1]=1;
+				}
+				for(var i=0;i<r[1];i++){
+					var src=images.eq(i).attr("src");
+					if (src.indexOf("ff")==-1){
+						src=src.replace("f","ff");
+						images.eq(i).attr("src",src);
+					}
+				}
+			}else{
+				$(".days").text("0");
+				$(".days").attr("data",0);
+			}
+			if (isInCredit){
+				var g=parseInt($(".gold").text());
+				var days=parseInt($(".days").attr("data"))
+				if (days==0){
+					days=1
+				}
+				var d=parseInt(days*10)
+				var g=g+d;
+				$(".gold").text(g);
+			}
+		}
+	});
+}
 </script>

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><a href="/member/show/memberindex">'+result.nickName+'</a>';
+				html += '</span>'+result.nickName;
 				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,6 +78,9 @@ 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(){
@@ -96,7 +99,7 @@ function b_loadTop(){
 				}
 			}else{
 				isLogined = false;
-				var html = '<img class="b-loginbtn cursor-pointer" onclick="loginModalShow();" src="/images/swordfish/headimg.png">';
+				var html = '<span onclick="loginModalShow();"><img class="b-loginbtn" src="/images/swordfish/headimg.png">登录/注册</span>';
 				$("#b-loginStatus").html(html);
 				$("#bottom-bar>li").removeClass("invisible");
 				//登录

core/src/web/templates/member/credit/mycredit.html

@@ -350,7 +350,6 @@
 		</div>
 	</div>
 </div>
-
 <!-- 底部 -->
 {{include "/common/bottom.html"}}
 

core/src/web/templates/service/demand.html

@@ -18,6 +18,7 @@
 	.text-primary.a-com-title{
 		border-left:0px;
 		background:#F6F8FA;
+		margin-top:9px;
 		border:1px solid #E5E6E9;
 	}
 </style>

core/src/web/templates/service/detail.html

@@ -41,6 +41,9 @@
 		    margin-left: -47px;
    		 margin-right: -15px;
 	}
+	.a-c-right>.a-com-title{
+		margin-top:2px;
+	}
 	.white_content {
 	display: none;
 	position: absolute;
@@ -352,7 +355,6 @@
 		{{include "/service/appointment.html"}}
     </div>
 	<div class="a-c-right">
-	{{include "/common/releasedemand.html"}}
 	{{include "/common/hotservice.html"}}
 	</div>
 </div>

core/src/web/templates/service/list.html

@@ -292,7 +292,6 @@
 	</div>
 		</div>
 <div class="a-c-right hidden-xs">
-{{include "/common/releasedemand.html"}}
 {{if eq "demand" .T.querymap.c_searchtype}}
 {{include "/common/hotdemand.html"}}
 {{else}}

core/src/web/templates/service/viewsingledemand.html

@@ -49,6 +49,9 @@
 				white-space: nowrap;
 				line-height:21px !important;
 			}
+			.a-c-right>.a-com-title {
+				margin-top:10px !important;
+			}
 		</style>
 		    {{include "/common/inc.html"}}
     <!-- extra CSS -->

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

@@ -18,7 +18,7 @@
 	<p class="pinden">2，从原始信息发布到您收到剑鱼推送信息会经过一个复杂的技术处理和网络传输过程，企明星对您收到剑鱼推送信息的时间延迟指标不做承诺。由于您未能在某个时间内收到剑鱼推送信息而造成的任何结果，企明星不承担责任。</p>
 	<p class="pinden">3，企明星保证您收到的剑鱼推送信息符合您指定的订阅条件。企明星不保证您收到的剑鱼推送信息准确符合您的真实意图。</p>
 	<p class="pinden">4，您保证您使用剑鱼的设备以及微信App正常运行。如果由于您使用剑鱼的设备或微信App的问题造成您无法接收剑鱼推送信息，企明星不承担责任。</p>
-	<div class="col-xs-12 hidden-sm hidden-md hidden-lg" style="text-align:center;">
-	 <button class="btn btn-primary" onclick="window.location.href='/swordfish/page'" style="padding-top:3px;padding-bottom:3px;">返回</button></td>
-	</div>
+</div>
+<div class="col-xs-12 hidden-sm hidden-md hidden-lg" style="text-align:center;padding:0 0 50px 50px">
+	<button class="btn btn-primary" onclick="window.location.href='/swordfish/page'" style="padding-top:3px;padding-bottom:3px;">返回</button>
 </div>

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

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

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

@@ -47,12 +47,11 @@ $(function(){
 	var currentIndex = 0;
 	var mySwiper = new Swiper('.swiper-container', {
         pagination: '.swiper-pagination',
-        paginationClickable: true,
+        paginationClickable: false,
         direction: 'vertical',
 		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]);
@@ -93,7 +92,7 @@ $(function(){
 	}*/
 });
 function pageJump(){
-	{{if session "userId"}}
+	{{if eq .T.sign "first"}}
 		window.location.href = '/swordfish/page';
 	{{else}}
 		history.go(-1);

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

@@ -0,0 +1,112 @@
+<html>
+<head>
+<title>企明星-剑鱼-演示</title>
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+<link href="/wxswordfish/style.css" rel="stylesheet">
+<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>
+<div class="swiper-container">
+    <div class="swiper-wrapper">
+        <div class="swiper-slide">
+			<img src="/wxswordfish/images/share-cj.jpg" alt="Cinque Terre">
+		</div>
+       	<div class="swiper-slide">
+			<img src="/wxswordfish/images/guide-2.png">
+		</div>
+       	<div class="swiper-slide">
+			<img src="/wxswordfish/images/guide-3.png">
+		</div>
+		<div class="swiper-slide">
+			<img src="/wxswordfish/images/guide-4.png">
+		</div>
+		<div class="swiper-slide">
+			<img src="/wxswordfish/images/guide-5.png">
+		</div>
+		<div class="swiper-slide">
+			<img src="/wxswordfish/images/guide-6.png">
+		</div>
+    </div>
+    <!-- 如果需要分页器 -->
+   	<div class="swiper-pagination"></div>
+	<div class="guide-bottom">
+		<img class="arrow-up" src="/wxswordfish/images/up.png">
+		<img src="/wxswordfish/images/index.png" class="jumpGuide" onclick="history.go(-1);">
+	</div>
+</div>
+<img id="QRcode" style="position:absolute;z-index: 2;" src="/front/weixinshare/{{.T.shareid}}" >
+<script type="text/javascript">
+$(function(){
+	initShare({{.T.signature}},{{.T.shareid}});
+	var width = $(window).width();
+	var height = $(window).height();
+	var defaultHeight = 480;
+	var max = 750;
+	if(width > max){
+		width = max;
+	}
+	width = width*0.48;
+	var top = 380;
+	if(height > defaultHeight){
+		top = 380 / defaultHeight * height;
+	}
+	$("#QRcode").css({"width":width,"top": top-width,"left":"50%","margin-left": -(width/2)});
+	$(".bottom-toolbar,.feedback-dialog").remove();
+	var currentIndex = 0;
+	var flag = true;
+	var mySwiper = new Swiper('.swiper-container', {
+		loop: true,
+        pagination: '.swiper-pagination',
+        paginationClickable: false,
+        direction: 'vertical',
+		touchMoveStopPropagation: false,
+		virtualTranslate: true,
+		onSlideChangeStart: function(swiper){
+			if(flag){
+				flag = false;
+				return;
+			}
+			var prevSlide = $(swiper.slides[swiper.previousIndex]);
+			prevSlide.addClass("slide-active");
+			var activeSlide = $(swiper.slides[swiper.activeIndex]);
+			if(currentIndex > swiper.activeIndex){
+				activeSlide.addClass("slide-down");
+			}else if(currentIndex < swiper.activeIndex){
+				activeSlide.addClass("slide-up");
+			}
+			currentIndex = swiper.activeIndex;
+			activeSlide.one("webkitAnimationEnd",function(){
+				$(this).removeClass("slide-up").removeClass("slide-down");
+				prevSlide.removeClass("slide-active");
+			});
+		},
+		onSliderMove: function(swiper, event){
+			if(swiper.isBeginning){
+				$("#QRcode").show();
+			}else{
+				$("#QRcode").hide();
+			}
+			if(swiper.isEnd) {
+				currentIndex = 0;
+			}
+		}
+    });
+	/*
+	var imgHeight = 1159;
+	var imgWidth = 750;
+	var width = document.body.clientWidth;
+	var height = document.body.clientHeight;
+	if(imgWidth > width){
+		var h = width / imgWidth * imgHeight;
+		$(".swiper-slide img").css({width: width,height: h,marginTop: -(h / 2)});
+	}else if(imgHeight > height){
+		$(".swiper-slide img").css({width: height / imgHeight * imgWidth,height: height,marginTop: -(height / 2)});
+	}*/
+});
+</script>
+</body>
+</html>

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

@@ -76,7 +76,7 @@
 var feedback = null;
 $(function(){
 	$("#goToGuide").click(function(){
-		window.location.href = "/swordfish/guide";
+		window.location.href = "/swordfish/guide/other";
 	});
 	$("#feedback").click(function(){
 		if(feedback == null){
@@ -86,13 +86,9 @@ $(function(){
 		$("#feedback-textarea").focus().parent().removeClass("red-border");
 	});
 	$("[id='goToShare']").click(function(){
-		/*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");
+		window.location.href = "/swordfish/guide/share";
+		/*$(".share-dialog").show();
+		$("html,body").addClass("overflow-hidden");*/
 	});
 	$("#share-dialog-back").click(function(){
 		$(".share-dialog").hide();

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

@@ -274,6 +274,7 @@
 					<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">

etl/server/src/trsserver/trsserver.go

@@ -9,6 +9,7 @@ import (
 	"qfw/util"
 	"qfw/util/mongodb"
 	"sync"
+	"time"
 )
 
 var SysConfig map[string]interface{}
@@ -68,7 +69,8 @@ func TrsZtbSave(filename string, tmp []interface{}) {
 			if n == 0 {
 				if _, ok := v["publishtime"].(int64); !ok {
 					v["publishtime"] = int64(v["publishtime"].(float64))
-					v["comeintime"] = int64(v["comeintime"].(float64))
+					//v["comeintime"] = int64(v["comeintime"].(float64))
+					v["comeintime"] = time.Now().Unix()
 				}
 				err := session.DB(mongodbName).C(collection).Insert(v)
 				if err != nil {

push/src/qfw/push/dopush/dopush.go

@@ -66,6 +66,7 @@ func EachAllBidInfo(stype, TITLEA, ShortTitle string, lastTime int64, MaxPushSiz
 	query := session.DB("qfw").C("bidding").Find(mongodb.ObjToOth(q)).Sort("-publishtime").Iter()
 	userMap := &map[*push.MemberInterest]*list.List{}
 	var returnLastTime interface{}
+	var returnLastTimeLong int64 = 0
 L1:
 	for tmp := new(map[string]interface{}); query.Next(tmp); {
 		title := util.ObjToString((*tmp)["title"])
@@ -96,14 +97,18 @@ L1:
 					}
 				}
 			}
-			if returnLastTime == nil {
-				returnLastTime = (*tmp)["comeintime"]
+			if (*tmp)["comeintime"] != nil {
+				ttmp := (*tmp)["comeintime"].(int64)
+				if ttmp > returnLastTimeLong {
+					returnLastTimeLong = ttmp
+				}
 			}
 		}
 		tmp = new(map[string]interface{})
 	}
 	now := time.Now()
-	if pushType == 1 && returnLastTime != nil {
+	if pushType == 1 && returnLastTimeLong > 0 {
+		returnLastTime = returnLastTimeLong
 		push.PushConfig[stype+"StartTime"] = util.FormatDateWithObj(&returnLastTime, util.Date_Full_Layout)
 	}
 	for k, v := range *(userMap) {
@@ -228,6 +233,6 @@ func SendWeixin(k *push.MemberInterest, TITLE, ShortTitle, str, stype string, no
 		Date:    wxDate,
 		Service: "剑鱼君",
 		//Url:     push.PushConfig["bidViewDomain"].(string) + "/wxpush/bid/" + k.Openid + "/" + wid + "/aa"})
-		Url: push.PushConfig["bidViewDomain"].(string) + "/mobile/sess/" + se.EncodeString(k.Openid+",uid,"+strconv.Itoa(int(time.Now().Unix()))+",wxpushlist") + "/" + k.Openid + "/" + wid + "/aa"})
+		Url: push.PushConfig["bidViewDomain"].(string) + "/mobile/sess/" + se.EncodeString(k.Openid+",uid,"+strconv.Itoa(int(time.Now().Unix()))+",wxpushlist") + "__" + wid})
 
 }

weixin/src/config.json

@@ -1,37 +1,39 @@
 {
-    "port": "82",
-    "domain": "127.0.0.1",
-    "imgpath": "/opt/qfw_dev",
-    "redisServers": "enterprise=192.168.3.14:1379,service=192.168.3.14:2379,other=192.168.3.14:3379,sso=192.168.3.14:1379",
-    "mongodbServers": "192.168.3.18:27080",
-    "elasticsearch": "http://192.168.3.18:9800",
-    "elasticPoolSize": 30,
-    "mongodbPoolSize": 5,
-    "mongodbName": "qfw",
-    "rpcport": "83",
-    "serviceTip": "服务指南",
-    "appcontext": "weixin",
-    "appid": "wx9852f95aa927e646",
-    "token": "topnet2015",
-    "appsecret": "d4624c36b6795d1d99dcf0547af5443d",
-    "aboutmeurl": "http://mp.weixin.qq.com/s?__biz=MzA5MTk0MTk5Ng==&mid=211196233&idx=1&sn=4cfc27b0f739358654c28a985150f1c0#rd",
-    "conactusurl": "",
-    "wsqurl": "http://s.p.qq.com/pub/jump?d=AAAXeGLZ",
+	"port":"82",
+	"domain":"www.qimingxing.info",
+	"imgpath":"/opt/qfw_dev/web/staticres",
+	"mongodbServers": "10.116.86.154:27080",
+	"elasticsearch":"http://10.116.86.154:9800",
+        "elasticPoolSize": 30,
+	"mongodbPoolSize":5,
+	"mongodbName":"qfw",	"redisServers":"enterprise=10.116.86.154:1379,service=10.116.86.154:2379,other=10.116.86.154:3379,sso=10.116.86.154:1379,credit=10.116.86.154:4379",
+	"rpcport":"83",
+	"serviceTip":"服务指南",
+	"appcontext":"weixin",
+	"appid":"wx9fbe26c14a196021",
+	"token":"topnet2015",
+	"appsecret":"3243545279b584dd574a595071395be4",
+        "aboutmeurl":"http://www.qimingxing.info/article/aboutme",
+        "conactusurl":"http://www.qimingxing.info/article/contactus",
+	"wsqurl": "http://s.p.qq.com/pub/jump?d=AAAXeGLZ",
 	"entAuthTip":"，请按向导进行操作。第1步(共2步)：请输入完整的企业名称。\n（认证过程只涉及您所在企业的公开信息。除非事先获得您的授权，企明星不会将您的个人隐私信息公开或透露给第三方机构。输入q或Q,退出认证操作。）",
 	"perAuthTip":"，请按向导进行操作。第1步(共2步)：请输入商家名称。\n（除非事先获得您的授权，企明星不会将您的个人隐私信息公开或透露给第三方机构。输入q或Q,退出认证操作。）",
 	"othAuthTip":"，请按向导进行操作。第1步(共2步)：请输入完整的组织机构名称。\n（认证过程只涉及您所在机构的公开信息。除非事先获得您的授权，企明星不会将您的个人隐私信息公开或透露给第三方机构。输入q或Q,退出认证操作。）",
-	"oWelcomeTip":"您已成功注册企明星！\n企明星是一个为全国企业提供专业化服务的互联网平台。",
-        "loginTip":"您已经成功登录企明星，请在电脑端操作。",
-        "freezeTip":"您的帐号已经冻结，请联系管理员。",
-        "messagetpl":{
-                "identifytplid":"sKn4r0or615ETYC-aI5OACPO_Q4-B8GYmgWoqcDghN4",
-                "offLinemsgtplid":"ExIeyFfoDNVJXhRDq09JbsjH_zbEJCB6gw6rxcV7atw",
-                "msgnotifytplid":"fcke7PqteAtclzHV3ScdiePH48vxaH6M5aJF0O_7by8",
-                "managernotifytplid":"DIwMrPQToOhGfa6ZAQCCrqquzbLKajiXsKY0K_lQtWQ"
-        },"activity":{
-                "activitycode":"topcj",
-                "title":"企明星新年抽奖活动进行中",
-                "picurl":"http://www.qimingxing.info/images/choujiang.png"
-        },"weixinautorpl":"小主的吩咐我们已经收到了，请留下您的联系方式（手机号或qq号），企明星客服会在下一个工作日9:00-17:00给小主回复哦！",
-		"creditRpc":"127.0.0.1:8765"
-}
+	"welcomeTip":"您已成功注册企明星！企明星是一个为全国企业提供专业化服务的互联网平台。企明星提供企业服务交易、剑鱼招标订阅、免费企业查询等多项服务。\n新春到，剑鱼送祝福，企明星幸运抽奖活动火热举行中，回复抽奖，即可参与活动。",
+	"oWelcomeTip":"您已成功注册企明星！企明星是一个为全国企业提供专业化服务的互联网平台。企明星提供企业服务交易、剑鱼招标订阅、免费企业查询等多项服务。\n新春到，剑鱼送祝福，企明星幸运抽奖活动火热举行中，回复抽奖，即可参与活动。",
+	"loginTip":"您已经成功登录企明星。",
+	"freezeTip":"您的帐号已经冻结，请联系管理员。",
+	"messagetpl":{
+		"identifytplid":"oGxkPyaV42z3KWykt58Tow9mBe_ImJvi8R3ajorVWOY",
+		"offLinemsgtplid":"ExIeyFfoDNVJXhRDq09JbsjH_zbEJCB6gw6rxcV7atw",
+		"msgnotifytplid":"b7iuAMiTCIolnPhTdueKBVYThEMf2D-Bh2M_9v3J-68",
+		"managernotifytplid":"dplgu5Q644vzPdqcPXY7RqgItS3eXACmU1XDl27CvTA"
+	},
+	"activity":{
+		"activitycode":"topcj",
+		"title":"企明星新年抽奖活动进行中",
+		"picurl":"http://www.qimingxing.info/images/choujiang2.png"
+	},"weixinautorpl":"小主的吩咐我们已经收到了，请留下您的联系方式（手机号或qq号），企明星客服会在下一个工作日9:00-17:00给小主回复哦！",
+	"creditRpc":"127.0.0.1:8765"
+
+}