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

common/src/qfw/util/encrypt_test.go

@@ -22,10 +22,10 @@ func Test_sim(t *testing.T) {
 	//s2 := "GyUlIhEDDjcfWCAyIl4xBkgsERYiLAwZLCg9VkkbLj4zMRYDPRs5ATVZOxccPAkzFxw7CCpEFj41QlRAQFdFXlRMQVZcHRIbBgsWBxYcFQwEBwoa"
 
 	//s3 := "RFYoal5bCFdXWQoQB0JuWwlXAQFZCUVfFj4JMFtT"
-	s4 := "oJULtwzXo6EFV1Ah-XeyRBimXGM8,uid,123456,swordfishaction"
+	s4 := "oJULtwzXo6EFV//////??????----oJULtwzXsLVHoDeXBEWOXCkME9p4,oZQC_s_DfLpFKIKIP2TpiR-16Glg,1453788982,swordfishaction--1Ah-Xey,_R_B/i?mXGM8,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/qfw/member/memberindex.go

@@ -40,7 +40,7 @@ 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/web/staticres/css/dev-qfw.css

@@ -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){}

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/member/credit/mycredit.html

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

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}}
+							本栏目推送服务期还剩{{.T.msgset.tender.day}}天。想要服务不间断，请确保积分充足。 <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}}
+							本栏目推送服务期还剩{{.T.msgset.bid.day}}天。想要服务不间断，请确保积分充足。 <a href="/member/credit/myCredit">去做任务赚积分</a>
+							{{end}}
 						{{end}}
 					{{end}}
 				{{end}}

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") + "__" + k.Openid + "__" + wid + "__aa"})
 
 }