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

common/src/qfw/util/common.go

@@ -367,3 +367,11 @@ func BsonIdToSId(uid interface{}) string {
 		return fmt.Sprintf("%x", string(uid.(bson.ObjectId)))
 	}
 }
+
+func GetSubDay(t1 int64) int {
+	tt1 := time.Unix(t1, 0)
+	tt2 := time.Now()
+	nt1 := time.Date(tt1.Year(), tt1.Month(), tt1.Day(), 0, 0, 0, 0, time.Local)
+	nt2 := time.Date(tt2.Year(), tt2.Month(), tt2.Day(), 0, 0, 0, 0, time.Local)
+	return int((nt1.Unix() - nt2.Unix()) / 86400)
+}

common/src/qfw/util/elastic/elasticutil_test.go

@@ -7,6 +7,7 @@ import (
 	"log"
 	"qfw/util/mongodb"
 	"testing"
+	"time"
 )
 
 func Test_Find1(t *testing.T) {
@@ -181,8 +182,17 @@ func Test_date(t *testing.T) {
 	//"1448267541"
 	//s := time.Now().UnixNano()
 	//log.Println(s, time.Now().Unix(), fmt.Sprintf("%d", s)[4:12], 999999/60/60)
-	var n uint64 = 1
-	log.Println(n<<62, int(n<<62))
+	t1 := time.Now().Unix()
+	t2 := t1 + 10000
+
+	tt1 := time.Unix(t1, 0)
+	tt2 := time.Unix(t2, 0)
+
+	nt1 := time.Date(tt1.Year(), tt1.Month(), tt1.Day(), 0, 0, 0, 0, time.Local)
+	nt2 := time.Date(tt2.Year(), tt2.Month(), tt2.Day(), 0, 0, 0, 0, time.Local)
+
+	log.Println((nt2.Unix() - nt1.Unix()) / 86400)
+
 }
 
 func Test_Getpage(t *testing.T) {

core/src/qfw/coreutil/share.go

@@ -2,6 +2,7 @@ package coreutil
 
 import (
 	"fmt"
+	"log"
 	"qfw/util/mongodb"
 	"time"
 )
@@ -14,12 +15,14 @@ func FindMyShareId(activecode, openid string) string {
 	var shareid string
 	if (*ret)["i_shareid"] == nil {
 		id := GetShareId(TYPE_INVITE)
+		log.Println("id:", id)
 		GetShareQR(id)
 		shareid = fmt.Sprintf("%d", id)
 		data := make(map[string]interface{})
 		data["s_openid"] = openid
 		data["s_businesscode"] = activecode
 		data["i_shareid"] = shareid
+		log.Println("shareid:", shareid)
 		data["l_timestamp"] = time.Now().Unix()
 		mongodb.Save("person_share", data)
 	} else {

core/src/qfw/front/webcentent.go

@@ -150,7 +150,11 @@ func (n *Newscont) viewContent4Front(_id string, temp string) error {
 			time := (*r)["releasetime"]
 			if time != nil && time != "" {
 				time = time.(float64)
-				f := elastic.GetPage("content", "content", `{"releasetime": {"$gt": `+fmt.Sprint(time)+`}, "s_contenttype": "qykb"}`, `"releasetime"`, `{"_id":1,"s_title":1}`, 0, 1)
+				contenttype := "qykb"
+				if (*r)["s_contenttype"] == "zhsk" {
+					contenttype = "zhsk"
+				}
+				f := elastic.GetPage("content", "content", `{"releasetime": {"$gt": `+fmt.Sprint(time)+`}, "s_contenttype": "`+contenttype+`"}`, `"releasetime"`, `{"_id":1,"s_title":1}`, 0, 1)
 				if len(*f) > 0 {
 					for _, v := range *f {
 						if i == 0 {
@@ -161,7 +165,7 @@ func (n *Newscont) viewContent4Front(_id string, temp string) error {
 					}
 				}
 				var j = 0
-				nt := elastic.GetPage("content", "content", `{"releasetime": {"$lt": `+fmt.Sprint(time)+`}, "s_contenttype": "qykb"}`, `{"releasetime":-1}`, `{"_id":1,"s_title":1}`, 0, 1)
+				nt := elastic.GetPage("content", "content", `{"releasetime": {"$lt": `+fmt.Sprint(time)+`}, "s_contenttype": "`+contenttype+`"}`, `{"releasetime":-1}`, `{"_id":1,"s_title":1}`, 0, 1)
 				if len(*nt) > 0 {
 					for _, v := range *nt {
 						if j == 0 {

core/src/qfw/member/credit/creditdetail.go

@@ -131,7 +131,7 @@ func (c *credit) BookInfo() {
 	if ret := redis.Get(RedisDB, cd.B_QD+"_"+userId); ret != nil {
 		c.ServeJson(ret)
 	}
-	return
+	c.ServeJson("")
 }
 
 //会员中心更新session签到信息

core/src/qfw/mobile/wxmenu.go

@@ -64,15 +64,12 @@ func (m *Mobile) Wxrssset() error {
 					if vobj, ok := v.(map[string]interface{}); ok {
 						if vobj["l_enddate"] != nil && vobj["i_status"] != nil {
 							if util.IntAll(vobj["i_status"]) == 1 {
-								sub := vobj["l_enddate"].(int64) - time.Now().Unix()
+								sub := util.GetSubDay(vobj["l_enddate"].(int64))
 								if sub >= 0 {
-									if sub%86400 == 0 {
-										vobj["days"] = sub / 86400
-									} else {
-										vobj["days"] = sub/86400 + 1
-									}
+									vobj["days"] = sub
 								} else {
 									vobj["days"] = 0
+									//是否要扣
 								}
 							}
 						}
@@ -192,12 +189,12 @@ func (m *Mobile) SwordfishPay() error {
 											PushType: mapPush,
 										}
 										clent.Call("PushInfo.PushMsg", &rpcData, &repl)
-										if errs == nil {
+										if errs == nil && repl == 1 {
 											//修改剑鱼占位值
 											credit.CheckSword(userId.(string), credit.A_JYSCTS, credit_a, m.Action)
 										}
 									}, func(e interface{}) {
-										log.Println("给用户摄推送出错", e)
+										log.Println("给用户推送出错", e)
 									})
 								}
 							}
@@ -274,6 +271,7 @@ func (m *Mobile) AjaxReq() error {
 		if userId := m.GetSession("userId"); userId != nil {
 			msgset := make(map[string]interface{})
 			set := make(map[string]interface{})
+			mapPush := map[string]string{}
 			for _, v := range []string{"tender", "bid"} {
 				if len(m.GetString(v+"_scope")) > 0 {
 					//还有一个截止时间字段和一个剑鱼服务状态
@@ -282,12 +280,35 @@ func (m *Mobile) AjaxReq() error {
 					set["o_msgset."+v+".a_key"] = m.GetSlice(v + "_keys")
 					set["o_msgset."+v+".s_scope"] = m.GetString(v + "_scope")
 					set["o_msgset."+v+".l_modifydate"] = time.Now().Unix()
+					if switchstatus == 1 {
+						mapPush[v] = util.If(v == "bid", "中标", "招标").(string)
+					}
 				}
 			}
 			//更新数据库
 			msgset["l_modifydate"] = time.Now().Unix()
 			if mongodb.Update("user", `{"_id":"`+userId.(string)+`"}`, &map[string]interface{}{"$set": set}, false, false) {
 				flag = "y"
+				credit_a := util.IntAll(m.GetSession("credit_a"))
+				if !credit.AIsHasDo(credit.A_JYSCTS, credit_a) && len(mapPush) > 0 {
+					util.Try(func() {
+						//对用户进行推送
+						var repl int
+						clent, errs := rpc.DialHTTP("tcp", coreconfig.SysConfig.PushRpc)
+						defer clent.Close()
+						rpcData := qrpc.PushData{
+							Mopenid:  m.GetSession("s_m_openid").(string),
+							PushType: mapPush,
+						}
+						clent.Call("PushInfo.PushMsg", &rpcData, &repl)
+						if errs == nil && repl == 1 {
+							//修改剑鱼占位值
+							credit.CheckSword(userId.(string), credit.A_JYSCTS, credit_a, m.Action)
+						}
+					}, func(e interface{}) {
+						log.Println("给用户推送出错", e)
+					})
+				}
 			}
 		}
 		break

core/src/qfw/searchmarket/demand.go

@@ -11,6 +11,7 @@ import (
 	. "gopkg.in/mgo.v2/bson"
 	"html/template"
 	"log"
+	"qfw/coreconfig"
 	. "qfw/coreconfig"
 	util "qfw/util"
 	"qfw/util/credit"
@@ -284,6 +285,13 @@ func (d *Demand) QueryDemand(id string) error {
 					d.T["identNotPass"] = true
 				}
 			}
+			//代码
+			servicecode := obj["s_servicecode"].(string)
+			serviceTypeName := coreconfig.GetServiceName(servicecode[0:2]) + " - "
+			if len(servicecode) > 2 {
+				serviceTypeName = serviceTypeName + coreconfig.GetServiceName(servicecode)
+			}
+			obj["servicetypename"] = serviceTypeName
 			//分享图片设置
 			s_share := obj["s_shareimg"]
 			unresize := obj["s_images"]

core/src/qfw/searchmarket/marketservice.go

@@ -196,7 +196,7 @@ func searhService(querymap map[string]string, n *Market) (*[]map[string]interfac
             "s_name":{"force_source": true},
 			"s_introduction":{"force_source": true}
         }
-    },"_source":["_id","s_opLocDistrict","s_name","s_images","i_comments","i_hits","i_sales","i_status","i_bids","s_enterprisename","s_enterpriseid","s_nickname","s_introduction","l_createdate","i_identType","f_price","i_identtype","i_comauthenttype"]
+    },"_source":["_id","s_opLocDistrict","s_name","s_images","i_comments","i_hits","i_sales","i_status","i_bids","s_enterprisename","s_enterpriseid","s_nickname","s_introduction","l_createdate","l_enddate","i_identType","f_price","i_identtype","i_comauthenttype"]
 	,"from":` + fmt.Sprintf("%v", ((currentPage-1)*perPage)) + `,
 	"size":` + fmt.Sprintf("%v", perPage) +
 		`,"sort":[` + sort + `] }`
@@ -237,7 +237,8 @@ func searhService(querymap map[string]string, n *Market) (*[]map[string]interfac
 			res[i]["s_introduction"] = template.HTML(s_introduction)
 			l_createdate, _ := res[i]["l_createdate"]
 			res[i]["l_createdate"] = FormatDateWithObj(&l_createdate, Date_Full_Layout)
-
+			l_enddate, _ := res[i]["l_enddate"]
+			res[i]["l_enddate"] = FormatDateWithObj(&l_enddate, Date_Full_Layout)
 			if res[i]["i_identType"] != nil {
 				i_identType := res[i]["i_identType"]
 				res[i]["i_identType"] = fmt.Sprint(i_identType)

core/src/timetask.json

@@ -1 +1,5 @@
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-22 14:49:19"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-22 14:49:19"}},"marketisstart":true,"marketrate":300}
+<<<<<<< HEAD
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-22 17:02:43"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-22 17:02:43"}},"marketisstart":true,"marketrate":300}
+=======
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-22 16:40:29"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-22 16:40:29"}},"marketisstart":true,"marketrate":300}
+>>>>>>> 7ab7600bc56154c82e3fe7e9aaea318065c5f6f4

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

@@ -2540,10 +2540,6 @@ style="color:#D03102;margin-right:5px;"
 .b-pcshare .bdsharebuttonbox{
 	display: none;	
 }
-.bd_weixin_popup{
-	opacity: 0;
-	visibility: hidden;
-}
 .b-pcshare-content{
 	position: absolute;
 	left: -1px;

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

@@ -664,5 +664,9 @@ a:focus, a:hover{
 	font-weight: bold;
 	word-wrap: break-word;
 	word-break: normal;
+}
+.bd_weixin_popup{
+	opacity: 0;
+	visibility: hidden;
 	white-space: normal;
 }

core/src/web/staticres/js/demand.js

@@ -113,13 +113,14 @@ function rechoose(t){
 			$(".g-demand").addClass("f-display");
 			$(".u-icon.f-step1").parent().addClass("check");
 			$(".u-icon.f-step2").parent().removeClass("check");
+			$(".f-processbaractive").css("width","0%");
 			window.scrollTo( 0, 0 );
 		}else{
 			$(".g-typelist").addClass("f-display");
 			$(".g-demand").removeClass("f-display");
-			$(".u-icon.f-step1").parent().removeClass("check");
+			$(".u-icon.f-step1").parent().addClass("check");
 			$(".u-icon.f-step2").parent().addClass("check");
-			
+			$(".f-processbaractive").css("width","21%");
 		}
 }
 

core/src/web/staticres/js/enterprise.js

@@ -159,7 +159,7 @@ $(function(){
 	//处理选择样式
 	$("div[id^=c_] li").click(function(){
 		$("li",$(this).closest("div")).removeClass("text-primary");
-		$(this).addClass("text-primary");
+		//$(this).addClass("text-primary");
 	})
 	//搜索关键字
 	var words=""

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

@@ -251,7 +251,7 @@ function showSnopshot(module,type,on){
 		//显示天数
 		try{
 			var days=eval("msgset."+module+".days")	
-			if(days){
+			if(typeof days=="number"){
 				var tiptxt="本栏目推送服务期还剩<d style='color:red'>"+days+"</d>天"
 				if(winWidth<341){
 					tiptxt="服务期还剩<d style='color:red'>"+days+"</d>天"

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

@@ -11,7 +11,7 @@
 	width: 520px;
 	height: 440px;
 }
-.loginModal a,.loginModal .text-primary{
+.loginModal .text-primary{
 	color: #ff5a5f !important;
 }
 .loginForm{
@@ -302,7 +302,7 @@ function afterLoginSkip(data,flag){
 							  	<a class="pull-right text-primary" href="/front/findpwd">忘记密码?</a>
 						  	</div>
 						  	<div class="form-group text-center margin-t-20">
-						    	<button type="submit" class="btn btn-primary" style="background-color: #ff5a5f;width: 100%;">登录</button>
+						    	<button type="submit" class="btn btn-primary" style="background-color: #ff5a5f;border-color: #ff5a5f;width: 100%;">登录</button>
 						  	</div>
 						</form>
 					</div>

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

@@ -225,7 +225,7 @@
 		</div>
 		<div class="content">
 			<p class="h5">一、积分说明</p>
-				<p class="para">会员总积分由操作积分、充值积分组成，其中操作积分是由会员的日常操作得分， 充值积分是因为充值产生的，因为违规操作引起的扣分行为将影响会员积分 （发布无意义和重复信息扣除200积分，发布违反国家相关法规信息永久封号）。</p>
+				<p class="para">会员总积分由会员的日常操作得分，因为违规操作引起的扣分行为将影响会员积分 （发布无意义和重复信息扣除200积分，发布违反国家相关法规信息永久封号）。</p>
 			<p class="h5">二、积分获得方法</p>
 			<p class="para">1、做任务赚积分</p>
 					<p class="para">企明星为你准备了简单操作的新手任务，引导你对网站功能快速上手的同时， 还能获取相应的积分。全部完成更能一次额外获得1001积分哦~</p>
@@ -257,11 +257,9 @@
 						<td>70</td>
 					</tr>
 				</table>
-			<p class="para">4、增送</p>
+			<p class="para">4、邀请新用户</p>
 			<p>邀请新用户加入，邀请成功后，每人次可获得积分。</p>
-			<p class="para">5、充值</p>
-			<p class="para">充值可以快速获得积分，充值1元兑换100积分。充值积分不可用于会员升级，只可用于功能使用。</p>
-			<p class="para">6、活动增送</p>
+			<p class="para">5、活动增送</p>
 			<p class="para">企明星不定期开放各种任务，为活跃用户提供更多获取积分得方式，加速成长，获得积分。所以，常来看看哦~</p>
 			<p class="para">备注：会员积分可能有延迟，若超过24小时未加上，请于企明星客服联系。</p>
 		</div>
@@ -281,7 +279,7 @@
 						<td><img src="/images/40jf.png"><div>第四天</div></td>
 					</tr>
 				</table>
-				<table width="100%;" style="margin:0px auto;" class="creditbottom">
+				<table width="100%;" style="margin:0px auto;max-width: 241px;" class="creditbottom">
 					<tr>
 						<td style="margin-left:10px;"><img src="/images/50jf.png"><div>第五天</div></td>
 						<td><img src="/images/60jf.png"><div>第六天</div></td>
@@ -311,16 +309,18 @@
 			$(".f-close").bind("click",hide);
 			$("#bookinbtn").bind("click",qd);
 			bookinfo();
+			if ($(".gold").text()==""){
+				$(".gold").text("0");
+			}
 		});
 		function bookinfo(){
-			
 			$.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":"零"}
+						var d={"1":"一","2":"二","3":"三","4":"四","5":"五","6":"六","7":"七","8":"八","9":"九","0":"零"};
 						$(".days").text(d[""+r[1]]);
 						$(".days").attr("data",r[1]);
 						var images=$(".bookinfo img");

core/src/web/templates/member/editservice.html

@@ -164,7 +164,7 @@
 							<div class="rowcontent"> 
 								<div class="two">价格：</div> 
 								<div class="three">
-									<input type="text" class="form-control price" id="s_price" name="s_price" onblur="checkprice(this);" value="{{.T.price}}"  maxlength="12" />元
+									<input type="text" class="form-control price" id="s_price" name="s_price" onblur="checkprice(this);" value="{{.T.price}}"  maxlength="6" />元
 									<!--面议-->
 									<input type="checkbox" id="s_pricemy" name="s_pricemy" value="1" >面议
 								</div> 

core/src/web/templates/member/message/msgindex.html

@@ -147,6 +147,7 @@ function del(n){
 //标记已读
 function flag(n){
 	var selected=$("input[name='_tableCheck']:checked",$("#list_"+n));
+	var size=selected.size();
 	if(selected.size()>0){
 		var s=[];
 		selected.each(function(){
@@ -154,8 +155,13 @@ function flag(n){
 		})
 		$.post("/member/msgflag",{ids:s.join(",")},function(data){
 			if(data&&data.success){
+				var count=parseInt($(".badge").eq(0).text());
+				if (count==size){
+					$(".badge").hide();
+				}else{
+						$(".badge").text(count-size);
+				}
 				reloadData(n);
-				reloadData(1);
 			}
 		},'json')
 	}else{

core/src/web/templates/member/myappointment.html

@@ -72,7 +72,7 @@ $(function(){
 			html += '</td><td align="center" class="a-table-operation">';
 			switch(i_status){
 				case 1:
-					html += '<a class="btn btn-default btn-sm a-table-revoke">撤销</a>';
+					html += '<a class="btn btn-default btn-sm a-table-revoke text-primary">撤销</a>';
 					break;
 				case 3:
 					html += '<button class="btn btn-success btn-sm" onclick="window.location.href=\'/market/detail/'+s_serviceid+'_comment_'+_id+'.html\'">评价</button>';

core/src/web/templates/member/showenterprise.html

@@ -396,7 +396,7 @@ var entType="企业"
 						
 						<div class="row qfw-row-marginbottom" >
 							<div class="col-sm-3" align="right" style="font-size:12px;">价格</div>
-							<div class="col-sm-8"><input type="text" class="qmx-price price"  name="s_price" datatype="s" /> 元</div>
+							<div class="col-sm-8"><input type="text" class="qmx-price price"  length=6 name="s_price" datatype="s" /> 元</div>
 						</div>	
 						
 						<div class="row qfw-row-marginbottom" >

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

@@ -8,9 +8,9 @@
 					<h4 class="modal-title" id="bidModalLabel"><b>参与投标</b></h4>
 				</div>
 				<div class="modal-body g-modal-body">
-					<p class="text-default u-font" style="color:#A0A0A0;font-size:13px;padding-left:8px; ">发布人:{{.T.demandInfo.s_name}}</p>
+					<p class="text-default u-font" style="color:#A0A0A0;font-size:13px;padding-left:8px; ">发布人:<span id="fbr"></span></p>
 					<p class="text-default">
-						<span id="bid-publishPerson" style="border-left: 3px solid #FF5A5F;    padding-left: 5px;">发布人：</span>
+						<span id="bid-publishPerson" style="border-left: 3px solid #FF5A5F;    padding-left: 5px;">发布人：{{.T.demandInfo.s_name}}</span>
 						<span class="pull-right">
 							已有
 							<span class="text-primary">{{if .T.demandInfo.i_bids}}{{.T.demandInfo.i_bids}}{{else}}0{{end}}</span>
@@ -97,7 +97,7 @@ $(function(){
 			alert("投标前请先进行认证！");
 			window.location.href = "/member/authentication/index";
 		}else if(isLogined){
-			$("#bid-publishPerson").text($("#publishPerson a").text());
+			$("#fbr").text($("#publishPerson a").text());
 			$('#bidModal').modal('show');
 		}else{
 			loginModalShow();

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

@@ -51,6 +51,7 @@
 					</li>
 				</ul>
 				<div class="u-processbar"></div>
+				<div class="u-processbar f-processbaractive" style="width:0%;background:#FF5A5F;top:-4px;"></div>
 			</div>
 			<p class="u-notice">
 				企明星郑重承诺：不收取您的任何费用，请放心发布。
@@ -207,6 +208,11 @@
 
 <script >
  //是否登录,没有登录必须登录。
+$(function(){
+			$("#setdemand").css("color","#FF5A5F");
+			$("#setdemand").css("font-weight","600");
+			$(".img-circle.b-com-first").css("background-color","#FF5A5F");
+		});
 	$(function(){
 		if(!isLogined){
 			loginModalShow();

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

@@ -41,6 +41,44 @@
 		    margin-left: -47px;
    		 margin-right: -15px;
 	}
+	.white_content {
+	display: none;
+	position: absolute;
+	top: 25%;
+	left: 25%;
+	width: 55%;
+	height: 55%;
+	padding: 20px;
+	border: 5px solid #dd4814;
+	background-color: white;
+	z-index: 1002;
+	overflow: auto;
+}
+.black_overlay {
+	display: none;
+	position: absolute;
+	top: 0px;
+	left: 0px;
+	right: 0px;
+	bottom: 0px;
+	background-color: black;
+	z-index: 1001;
+	-moz-opacity: 0.8;
+	opacity: .80;
+	filter: alpha(opacity=88);
+}
+.closeshowmap{
+ 	display: none; 
+    position: absolute; 
+    top: 25%; 
+    left: 79%; 
+    float:right;
+    margin:5px 5px 0px 0px; 
+    background-color: white; 
+    z-index:1003; 
+    overflow: auto; 	
+}
+
 	</style>
 <link href="/css/index-new.css" rel="stylesheet">
 </head>
@@ -85,7 +123,32 @@
 					</div>
 		 			<div class="col-xs-12 col-sm-8 d_service_main">
 			 			<div class="a-twostage-title u-overflow">{{.T.sinfo.s_name}}<small style="font-size:12px;font-weight:normal;" class="text-primary">&nbsp;&nbsp;&nbsp;{{.T.sinfo.servicetypename}}</small></div>
-						<div><span class="text-muted margin-r-10"><a href="/enterprise/{{.T.sinfo.s_enterpriseid}}.html" target="_blank">{{.T.sinfo.s_enterprisename}}</a></span></div>
+						<div><span class="text-muted margin-r-10"><a href="/enterprise/{{.T.sinfo.s_enterpriseid}}.html" target="_blank">{{.T.sinfo.s_enterprisename}}</a></span> 
+						<span>	
+							{{$v:=.T.sinfo}}
+								{{ if $v.i_identType }}
+									{{ if eq $v.i_identType 1}}
+										<span class="glyphicon qyrz   margin-l-10 jhtb"></span><span class="lineb " ><small style="margin-left:5px;margin-right:5px;">已认证企业　</small></span>
+										{{ if $v.i_comauthenttype }}
+												-
+												{{ if eq $v.i_comauthenttype 2.0}}
+													<span class="glyphicon mprz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:-7px;">名片认证</small></span>					
+												{{else if eq $v.i_comauthenttype 1.0}}
+													<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:-7px;">营业执照认证</small></span>
+												{{else if eq $v.i_comauthenttype 3.0}}
+													<span class="glyphicon yjrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:-7px;">年报邮箱认证</small></span>
+												{{end}}
+										{{else}}
+												<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:-7px;">营业执照认证</small></span>
+										{{end}}
+									{{else if eq $v.i_identType 2}}
+										<span class="glyphicon grrz   margin-l-10 jhtb"></span><span class="lineb " ><small style="margin-left:-5px;margin-right:5px;"> 已认证个人</small></span>
+									{{else if eq $v.i_identType 3}}
+										<span class="glyphicon jgrz   margin-l-10 jhtb"></span><span class="lineb " ><small style="margin-left:5px;margin-right:5px;">已认证机构</small></span>
+									{{end}}
+								{{end}}
+						</span>
+						</div>
 			 			<div class="d-service-price">
 							<div>
 							{{if .T.sinfo.s_pricemy }}
@@ -123,7 +186,9 @@
 				        {{end}}
 						</div>
 		 				<div class="margin-b-5 m-linkman">
+							{{if .T.einfo.s_persion}}
 							<span class="glyphicon ren2 icon_gray text-muted"  ></span><span class="margin-r-10 text-muted">{{.T.einfo.s_persion}}</span>
+							{{end}}
 							{{if .T.sinfo.s_phone}}	
 								<span class="glyphicon shouji icon_gray text-muted"  ></span><span class="margin-r-10 text-muted">{{.T.einfo.s_mobile}}</span>
 							{{end}}	
@@ -134,7 +199,12 @@
 							{{if .T.einfo.s_qq}}
 							<span class="glyphicon qq1 icon_gray  text-muted"  ></span><span class="text-muted"><a href="tencent://message/?uin={{.T.einfo.s_qq}}&Site=hexun.com/ngdao&Menu=yes" class="margin-r-10"><img src="/images/u124.png" style="margin-top:-10px;cursor:pointer;" /></a></span>
 							{{end}}
-							<br/><span class="glyphicon dizhi icon_gray  text-muted"  ></span><span class="text-muted"><span id="de-address"></span> </span><br/>
+							{{if .T.einfo.i_province}}
+							<br/><span class="glyphicon dizhi icon_gray  text-muted"  ></span><span class="text-muted"><span id="de-address"></span><a href="javascript:void(0)" onclick="showMap()" style="color:#000;">&nbsp;查看详细地图</a>
+								<input id="location" type="hidden" value="">
+								<input id="cityname" type="hidden" value="">
+							</span><br/>
+							{{end}}
 						</div>
 		 			</div>
 		 </div>
@@ -256,7 +326,7 @@
 				<div style="float:left;" id="zpflower">
 						<img  style="margin-top:-5px;margin-right:10px;" src="/images/rflower.png" />
 				</div>
-				<div style="float:left;">
+				<div style="float:left;width:843px;">
 					<div>
 					<div class="graystar1"><div class="greenstar1" style="width: 100%;"></div></div>
 				</div>
@@ -297,11 +367,20 @@
 	{{include "/common/hotservice.html"}}
 	</div>
 </div>
+<!--显示地图信息-->
+<div id="mapshowdiv" class="white_content"></div>
+<a href ="javascript:void(0)" onclick="closeMap();"><div id="closeshowmap" class="closeshowmap">X</div></a>
+<div id="fade" class="black_overlay"></div>
 {{include "/common/bottom.html"}}
 <script type="text/javascript">
 compulsoryreRresh = true;
 $(function(){
-	
+	//获取地图的经纬度
+	loadJS("http://api.map.baidu.com/getscript?v=2&ak=AFd8b176f363f23e6a23d516f4cfb742&services=&t=20150522093217",function(){
+		loadJS("/js/geocoder.js",function(){
+			doOptions();
+		});
+	});
 	$(".d_fwfl a").eq(0).addClass("d_fwfl")
 	$(".m-comment li").mouseover(function(a,b,c){
 			var node=$(a.currentTarget);
@@ -434,7 +513,7 @@ function getComment(n,start){
 				}
 				str+="<div class='pson'><div class='first' style='margin-right:20px;'>"+img+"</div>";
 				str+="<div class='first'><div>"+pic+"</div><div><span  class=\"dspan\">"+s[i]["s_nickname"].substring(0,2)+"***</span></div></div>";
-				str+="<div class='first' style='width:722px;padding:5px 0 0 30px;'><div style='margin-bottom:10px;'> <div class='graystar1'><div class='greenstar1' style='width: "+style+"%;'></div></div></div><div><span style='font-size:13px;'>"+s[i]["s_comment"]+"</span></div>&nbsp;&nbsp;"
+				str+="<div class='first' style='width:722px;padding:5px 0 0 30px;'><div style='margin-bottom:10px;'> <div class='graystar1'><div class='greenstar1' style='width: "+style+"%;'></div></div></div><div><span style='font-size:13px;display: inline-block;width: 110%;'>"+s[i]["s_comment"]+"</span></div>&nbsp;&nbsp;"
 				if(isSelf==1 && s[i]["s_reply"]==""){
 					str+="<a style=\"color:#3a87ad;\" class=\"f-reply\" onclick=\"sreply(this)\">回复</a>";
 				}
@@ -598,21 +677,28 @@ function comment(){
 						if(temp1["k"]==i_province){
 							var temp1c=temp1["s"]
 							if (i_city=="0"){
+								$("#location").val(address);
 								address=temp1["n"]+address;
 								$("#de-address").text(address);
+								$("#cityname").val(temp1["n"]);
 							}
 							for(var j=0;j<temp1c.length;j++){
 								 var temp2=temp1c[j];
 								  if(temp2["k"]==i_city){
 										if(typeof(temp2["s"])=="undefined"){
+											$("#location").val(address);
 											address=temp1["n"]+temp2["n"]+address;
 											$("#de-address").text(address);
+											$("#cityname").val(temp1["n"]+temp2["n"]);
 										}else{
 											var temp2c=temp2["s"];
 											for(var k=0;k<temp2c.length;k++){
 													temp3=temp2c[k];
 													if(temp3["k"]=i_area){
+														$("#location").val(address);
+														
 														address=temp1["n"]+temp2["n"]+temp3["n"]+address;
+														$("#cityname").val(temp1["n"]+temp2["n"]+temp3["n"]);
 														$("#de-address").text(address);
 														break;
 												}
@@ -627,11 +713,32 @@ function comment(){
 				$(".glyphicon.dizhi.icon_gray.text-muted").remove();
 			}
 		});
+		//显示地图
+	function showMap(){
+		document.getElementById('mapshowdiv').style.display = 'block';
+		document.getElementById('closeshowmap').style.display = 'block';
+		document.getElementById('fade').style.display = 'block';
+		$("html,body").addClass("overflow-hidden");
+	}
+	//关闭地图
+	function closeMap(){
+		document.getElementById('mapshowdiv').style.display = 'none';
+		document.getElementById('closeshowmap').style.display = 'none';
+		document.getElementById('fade').style.display = 'none';
+		$("html,body").removeClass("overflow-hidden");
+	}
 	</script>
 	
 <script src="/js/jquery.cxselect.js" type="text/javascript"> </script>
 <SCRIPT src="/js/lib.js" type="text/javascript"></SCRIPT>
 <SCRIPT src="/js/163css.js" type="text/javascript"></SCRIPT>
 <script>window._bd_share_config={"common":{"bdSnsKey":{},"bdText":"","bdMini":"2","bdPic":"","bdStyle":"0","bdSize":"16","onAfterClick":function(){$.post("/member/credit/inCreditAjx",{"param":"fx"},function(r){})}},"share":{}};with(document)0[(getElementsByTagName('head')[0]||body).appendChild(createElement('script')).src='http://bdimg.share.baidu.com/static/api/js/share.js?v=89860593.js?cdnversion='+~(-new Date()/36e5)];</script>
+<script>
+		$(function(){
+			$("#releaseService").css("color","#FF5A5F");
+			$("#releaseService").css("font-weight","600");
+			$(".img-circle.b-com-first").css("background-color","#FF5A5F");
+		});
+</script>
 </body>
 </html>

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

@@ -79,7 +79,7 @@
 				<div class="list-new-row">
 					<div class="d_style more">服务类别&nbsp;&nbsp;：</div>
 					<div class="d_style_hylb text-muted less u-key" style="width:80%;" id="fwlb"></div>
-					<div class="d_more qfw-text-more" onClick="less(this)"><small  style="cursor:hand">更多></small></div>	
+					<div class="d_more qfw-text-more" onClick="less(this)"><small  style="cursor:hand;font-weight:600;color:#FF5A5F;">更多></small></div>	
 				</div>
 				<div class="f_zw ">
 					
@@ -143,18 +143,11 @@
 					{{end}}
 					{{if eq "demand" $.T.querymap.c_searchtype}}
 					
-					<div class="col-sm-2 col-xs-4" style="margin-left:10px;">
-					{{if eq $v.i_status 1.0 }}
-						<img src="/images/u288.png" />
-					{{else}}
-						{{if eq $v.i_status 2.0}}
-						<img src="/images/u252.png" />
-						{{end}}
-					{{end}}
-					</div>
+					
 					
 					{{end}}
 				</div>
+				
 				<div class="col-xs-12" style="margin-top:2px;margin-left:-9px;{{if $v.s_enterprisename}} margin-bottom:5px;{{else}}margin-bottom:25px;{{end}}">
 				{{if $v.s_enterprisename}} 
 					{{if eq "demand" $.T.querymap.c_searchtype}}
@@ -207,6 +200,19 @@
 						<span class="d_service_span text-muted f-code">{{$v.s_opLocDistrict}}</span>
 					</div>
 				</div>
+				{{if eq "demand" $.T.querymap.c_searchtype}}
+					<div class="col-sm-2 col-xs-4" style="margin-left:10px;">
+					{{if eq $v.i_status 1.0 }}
+						<img src="/images/u288.png" />
+					{{else}}
+						{{if eq $v.i_status 2.0}}
+						<img src="/images/u252.png" />
+						{{end}}
+					{{end}}
+					
+					<div style="position: absolute;width: 180px;height: 20px;overflow: hidden;color:#A0A0A0;">投标截止时间：{{$v.l_enddate}}</div>
+					</div>
+				{{end}}
 				{{if eq "service" $.T.querymap.c_searchtype}}
 				<div class="col-sm-2 col-xs-4" style="margin-top: 5px;">
 					价格：{{if eq $v.f_price 0.0}}<span class="text-primary text-bold">面议</span>{{else}}<span class="text-primary text-bold">{{$v.f_price}}</span>元{{end}}
@@ -287,6 +293,7 @@
 	var c_searchtype={{.T.querymap.c_searchtype}}
 	var fwlb = {{.T.serviceStr}}
 	$(function(){
+		$(".img-circle.b-com-first").css("background-color","#FF5A5F");
 		$(".b-menu").bind("changecontent",function(){$("#searchForm").submit();});
 		if ($("#c_searchtype").val()=="demand"){
 			$(".b-showname").text("找需求");

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

@@ -9,6 +9,10 @@
 			.g-tbform .text-default{
 				color:#666;
 			}
+			small.text-primary{
+				font-size:13px;
+				font-weight:400;
+			}
 		</style>
 		    {{include "/common/inc.html"}}
     <!-- extra CSS -->
@@ -51,10 +55,11 @@
 							{{else if eq .T.demandInfo.i_status 4}}
 							<span class="a-bg-gray  a-bg-gray-new">已撤销</span>
 							{{end}}
+							<small class="text-primary ">{{.T.demandInfo.servicetypename}}</small>
 				 			{{if .T.edit}}
 							<span>
 								<!-- <a class="btn btn-primary" style="font-size:14px;font-weight:400;float:right;" onclick="remove1('{{.T.demandInfo._id}}');">删除</a> -->
-								<a class="btn btn-primary" style="font-size:14px;font-weight:400;float:right;margin-right:5px;" href="/market/demand/{{.T.demandInfo._id}}.html">编辑</a>
+								<a class="btn-new a-table-recive" style="font-size:14px;font-weight:400;float:right;margin-right:5px;margin-top:7px;text-align:center;" href="/market/demand/{{.T.demandInfo._id}}.html">编辑</a>
 							</span>
 				 			{{end}}
 						</div>
@@ -98,7 +103,7 @@
 						</div>
 						<div style="height:60px;line-height:60px;background:#FBF0F1;">
 								<div style="float:left;padding-left:20px;"><span style="color:#A0A0A0;font-weight:600;">报价:</span><span class="var">
-								<span class="text-primary text-bold;">
+								<span class="text-primary text-bold">
 								{{if .T.demandInfo.i_isftf}}
 										{{if eq 1 .T.demandInfo.i_isftf}}
 											面议
@@ -207,7 +212,7 @@
     </div>
 	{{include "/service/bid.html"}}
 	<script charset="utf-8" src="/js/paging.js"></script>
-	<script>window._bd_share_config={"common":{"bdSnsKey":{},"bdText":"","bdMini":"2","bdPic":"http://test.qimingxing.info/upload/2015/10/27/2015102708191301041479.jpg","bdStyle":"0","bdSize":"16","onAfterClick":function(){alert(1);$.post("/member/credit/inCreditAjx",{"param":"fx"},function(r){})}},"share":{}};with(document)0[(getElementsByTagName('head')[0]||body).appendChild(createElement('script')).src='http://bdimg.share.baidu.com/static/api/js/share.js?v=89860593.js?cdnversion='+~(-new Date()/36e5)];</script>
+	<script>window._bd_share_config={"common":{"bdSnsKey":{},"bdText":"","bdMini":"2","bdPic":"http://test.qimingxing.info/upload/2015/10/27/2015102708191301041479.jpg","bdStyle":"0","bdSize":"16","onAfterClick":function(){$.post("/member/credit/inCreditAjx",{"param":"fx"},function(r){})}},"share":{}};with(document)0[(getElementsByTagName('head')[0]||body).appendChild(createElement('script')).src='http://bdimg.share.baidu.com/static/api/js/share.js?v=89860593.js?cdnversion='+~(-new Date()/36e5)];</script>
 	<script>
 		
 		loginBackType = -1;
@@ -484,6 +489,11 @@ function remove1(id){
 		}
 	});
 }
+$(function(){
+			$("#setdemand").css("color","#FF5A5F");
+			$("#setdemand").css("font-weight","600");
+			$(".img-circle.b-com-first").css("background-color","#FF5A5F");
+		});
 	</script>
 	{{include "/common/bottom.html"}}
   </body>

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

@@ -57,22 +57,12 @@ $(function(){
 			var str="";
 			for(var i=0;i<res.length;i++){
 				var temp=res[i];
-				var s_type = temp["s_type"];
-				s_type = "bid";
-				if(s_type == "bid"){
-					s_type = "中标";
-				}else if(s_type == "tender"){
-					s_type = "招标";
-				}
-				if(s_type != ""){
-					str+="<span style='display: none;' class='dataType'>【"+s_type+"】</span>";
-				}
 				str+=temp["s_content"];
 				a_visitedindex=temp["a_visitedindex"];
 				a_publishtime=temp["a_publishtime"];
 				f_id=temp["_id"];
 			}
-			$("#conlist").append('<div id="ycwords">'+str+'</div>');			
+			$("#conlist").append('<div id="ycwords" datatype="'+temp["s_type"]+'">'+str+'</div>');			
 			//信息条总数
 			le=$(".tslist").length;
 			//
@@ -85,18 +75,24 @@ $(function(){
 				var html = $(this).html();
 				for(var i=0;i<s_words.length;i++){
 					if(s_words[i] != ""){
-						var reg = new RegExp(s_words[i],"gm");
-						html = html.replace(reg,function(word){
-							return '<font class="keyword">'+word+'</font>';
-						});
+						var wordsArray = s_words[i].split("+");
+						for(var si=0;si<wordsArray.length;si++){
+							var reg = new RegExp(wordsArray[si],"gm");
+							html = html.replace(reg,function(word){
+								return '<font class="keyword">'+word+'</font>';
+							});
+						}
 					}
 				}
 				for(var i=0;i<a_interest.length;i++){
 					if(a_interest[i] != ""){
-						var reg = new RegExp(a_interest[i],"gm");
-						html = html.replace(reg,function(word){
-							return '<font class="keyword">'+word+'</font>';
-						});
+						var interestArray = a_interest[i].split("+");
+						for(var si=0;si<interestArray.length;si++){
+							var reg = new RegExp(interestArray[si],"gm");
+							html = html.replace(reg,function(word){
+								return '<font class="keyword">'+word+'</font>';
+							});
+						}
 					}
 				}
 				$(this).html(html);
@@ -109,7 +105,15 @@ $(function(){
 						}
 					}
 				}
-				$(this).find("a.bt").wrap("<div class='bt-parent' id="+xh+"></div>");
+				var datatype = $(this).parents("#ycwords").attr("datatype");
+				if(datatype == "bid"){
+					datatype = "【中标】";
+				}else if(datatype == "tender"){
+					datatype = "【招标】";
+				}else{
+					datatype = "";
+				}
+				$(this).find("a.bt").prepend(datatype).wrap("<div class='bt-parent' id="+xh+"></div>");
 				$(this).append(function(){
 					if(a_publishtime == "" || typeof(a_publishtime[xh]) == "undefined"){
 						return "";
@@ -187,23 +191,13 @@ function loadMore(){
 			var str="";
 			for(var i=0;i<res.length;i++){
 				var temp=res[i];
-				var s_type = temp["s_type"];
-				s_type = "bid";
-				if(s_type == "bid"){
-					s_type = "中标";
-				}else if(s_type == "tender"){
-					s_type = "招标";
-				}
-				if(s_type != ""){
-					str+="<span style='display: none;' class='dataType'>【"+s_type+"】</span>";
-				}
 				str+=temp["s_content"];
 				a_visitedindex=temp["a_visitedindex"];
 				a_publishtime=temp["a_publishtime"];
 				f_id=temp["_id"];
 			}
 			
-			$("#conlist").append('<div id="ycwords">'+str+'</div>');
+			$("#conlist").append('<div id="ycwords" datatype="'+temp["s_type"]+'">'+str+'</div>');
 			//
 			$(".tslist").each(function(n){
 				$(this).children(".xh").text(function(i,v){
@@ -214,18 +208,24 @@ function loadMore(){
 				var html = $(this).html();
 				for(var i=0;i<s_words.length;i++){
 					if(s_words[i] != ""){
-						var reg = new RegExp(s_words[i],"gm");
-						html = html.replace(reg,function(word){
-							return '<font class="keyword">'+word+'</font>';
-						});
+						var wordsArray = s_words[i].split("+");
+						for(var si=0;si<wordsArray.length;si++){
+							var reg = new RegExp(wordsArray[si],"gm");
+							html = html.replace(reg,function(word){
+								return '<font class="keyword">'+word+'</font>';
+							});
+						}
 					}
 				}
 				for(var i=0;i<a_interest.length;i++){
 					if(a_interest[i] != ""){
-						var reg = new RegExp(a_interest[i],"gm");
-						html = html.replace(reg,function(word){
-							return '<font class="keyword">'+word+'</font>';
-						});
+						var interestArray = a_interest[i].split("+");
+						for(var si=0;si<interestArray.length;si++){
+							var reg = new RegExp(interestArray[si],"gm");
+							html = html.replace(reg,function(word){
+								return '<font class="keyword">'+word+'</font>';
+							});
+						}
 					}
 				}
 				$(this).html(html);
@@ -240,7 +240,15 @@ function loadMore(){
 					}
 				}
 				if($(this).children(".time-diff").length == 0){
-					$(this).find("a.bt").wrap("<div class='bt-parent' id="+vi+"></div>");
+					var datatype = $(this).parents("#ycwords").attr("datatype");
+					if(datatype == "bid"){
+						datatype = "【中标】";
+					}else if(datatype == "tender"){
+						datatype = "【招标】";
+					}else{
+						datatype = "";
+					}
+					$(this).find("a.bt").prepend(datatype).wrap("<div class='bt-parent' id="+vi+"></div>");
 					$(this).append(function(){
 						if(a_publishtime == "" || typeof(a_publishtime[vi]) == "undefined"){
 							return "";

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

@@ -32,10 +32,13 @@ $(function(){
 			var html = $(this).html();
 			for(var i=0;i<s_words.length;i++){
 				if(s_words[i] != ""){
-					var reg = new RegExp(s_words[i],"gm");
-					html = html.replace(reg,function(word){
-						return '<font class="keyword">'+word+'</font>';
-					});
+					var wordsArray = s_words[i].split("+");
+					for(var si=0;si<wordsArray.length;si++){
+						var reg = new RegExp(wordsArray[si],"gm");
+						html = html.replace(reg,function(word){
+							return '<font class="keyword">'+word+'</font>';
+						});
+					}
 				}
 			}
 			$(this).html(html);

credit/src/config.json

@@ -48,7 +48,7 @@
         "swordfish_closeTitle": "剑鱼服务暂停提醒",
         "swordfish_close": "您的剑鱼服务已经到期,已经暂停，请及时续费。",
         "swordfish_payTitle": "剑鱼服务订单提醒",
-        "swordfish_pay": "您已成功续订剑鱼，扣除积%d，剩余积分%d，剑鱼时长延期到%s",
+        "swordfish_pay": "您已成功续订剑鱼，扣除%d积分，剩余%d积分，剑鱼服务时长到:%s",
         "give": "转赠提醒",
         "give_pay": "转赠扣除提醒",
         "recharge": "充值成功提醒",

credit/src/main.go

@@ -202,8 +202,8 @@ func TimerSwordFishFromUser() {
 					} {
 						query := coll.Find(&map[string]interface{}{
 							"o_msgset." + typeName + ".l_enddate": map[string]interface{}{
-								"$gte": next64 - 60000,
-								"$lte": next64 + int64(swordfish_tipBeforeDays[0]*24*3600) + 60000,
+								"$gte": next64 - 80000,
+								"$lte": next64 + int64(swordfish_tipBeforeDays[0]*24*3600) + 80000,
 							},
 							"o_msgset." + typeName + ".i_status":       1,
 							"o_msgset." + typeName + ".i_switchstatus": 1,
@@ -214,14 +214,15 @@ func TimerSwordFishFromUser() {
 							util.Try(func() {
 								tmpCode := tmp["o_msgset"].(map[string]interface{})[typeName].(map[string]interface{})
 								endDate := tmpCode["l_enddate"].(int64)
-								sub64 := (endDate - next64) / 86400
+								sub64 := util.GetSubDay(endDate) //(endDate - next64) / 86400
+								log.Println("======---====", sub64)
 								if sub64 <= 0 {
 									//自动扣费
 									doSubCreditByUser(util.BsonIdToSId(tmp["_id"]), tmp["s_m_openid"].(string), typeName, code, &next, tmp)
 								} else {
 									//提示
 									for _, v := range swordfish_tipBeforeDays {
-										if int64(v) == sub64 {
+										if v == sub64 {
 											creditrpc.SendMsgWebAndWx(swordfish_dueTitle, fmt.Sprintf(swordfish_due, v), util.BsonIdToSId(tmp["_id"]), tmp["s_m_openid"].(string))
 										}
 									}

credit/src/qfw/creditrpc/creditrpc.go

@@ -310,7 +310,7 @@ func SendMsgWebAndWx(title, content, userId, umid string) {
 		ReceiveId: userId,
 	}
 	go m.SaveMsg()
-	go SendManagerNotifyMsg(&qrpc.NotifyMsg{Openid: umid, Title: title, Detail: "管理员", Remark: content})
+	go SendManagerNotifyMsg(&qrpc.NotifyMsg{Openid: umid, Title: title, Detail: "剑鱼君", Remark: content})
 
 }
 

push/src/config.json

@@ -1 +1 @@
-{"bid":{"interval":60,"lastpushtime":"2015-10-10 10:10:10"},"bidStartTime":"2015-12-30 17:28:48","bidTitle":"亲！剑鱼为您速报最新鲜的中标信息啦","bidViewDomain":"192.168.3.132","durationMinutes":10,"fixPush":"oJULtwzXo6EFV1Ah-XeyRBimXGM8","mail_bid":"\u003cdiv\u003e%s\u003c/div\u003e，想了解更多信息，请访问http://www.qimingxing.info。","maxPushSize":50,"mgoAddr":"192.168.3.18:27080","mgoSize":10,"province":{"上海":9,"云南":25,"内蒙古":5,"北京":1,"台湾":32,"吉林":7,"四川":13,"天津":2,"宁夏":30,"安徽":12,"山东":15,"山西":4,"广东":19,"广西":20,"新疆":31,"江苏":10,"江西":14,"河北":3,"河南":16,"浙江":11,"海南":21,"湖北":17,"湖南":18,"澳门":34,"甘肃":28,"福建":13,"西藏":26,"贵州":24,"辽宁":6,"重庆":22,"陕西":27,"青海":29,"香港":33,"黑龙江":8},"pushInfoScopeDays":30,"rpcPort":"8766","smtpAddr":"smtp.exmail.qq.com","smtpFromUser":"企明星","smtpPort":465,"smtpPwd":"qy123456","smtpUser":"qyfw@topnet.net.cn","tenderStartTime":"2015-12-30 17:28:48","tenderTitle":"亲！剑鱼为您速报最新鲜的招标信息啦","weixinRpcServer":"127.0.0.1:82","weixin_bid":"\u003cdiv\u003e%s最新招标信息\u003c/div\u003e\u003cdiv\u003e%s\u003c/div\u003e","wxRpcRemark":"请到网站个人中心查看详细."}
+{"bid":{"interval":60,"lastpushtime":"2015-10-10 10:10:10"},"bidStartTime":"2015-12-30 17:28:48","bidTitle":"亲！剑鱼为您速报最新鲜的中标信息啦","bidViewDomain":"192.168.3.132","durationMinutes":10,"fixPush":"oJULtwzXo6EFV1Ah-XeyRBimXGM8","mail_bid":"\u003cdiv\u003e%s\u003c/div\u003e，想了解更多信息，请访问http://www.qimingxing.info。","maxPushSize":50,"mgoAddr":"192.168.3.18:27080","mgoSize":10,"province":{"上海":9,"云南":25,"内蒙古":5,"北京":1,"台湾":32,"吉林":7,"四川":13,"天津":2,"宁夏":30,"安徽":12,"山东":15,"山西":4,"广东":19,"广西":20,"新疆":31,"江苏":10,"江西":14,"河北":3,"河南":16,"浙江":11,"海南":21,"湖北":17,"湖南":18,"澳门":34,"甘肃":28,"福建":13,"西藏":26,"贵州":24,"辽宁":6,"重庆":22,"陕西":27,"青海":29,"香港":33,"黑龙江":8},"pushInfoScopeDays":50,"rpcPort":"8766","smtpAddr":"smtp.exmail.qq.com","smtpFromUser":"企明星","smtpPort":465,"smtpPwd":"qy123456","smtpUser":"qyfw@topnet.net.cn","tenderStartTime":"2015-12-30 17:28:48","tenderTitle":"亲！剑鱼为您速报最新鲜的招标信息啦","weixinRpcServer":"127.0.0.1:82","weixin_bid":"\u003cdiv\u003e%s最新招标信息\u003c/div\u003e\u003cdiv\u003e%s\u003c/div\u003e","wxRpcRemark":"请到网站个人中心查看详细."}

push/src/qfw/push/cache.go

@@ -27,7 +27,11 @@ func InitCache(flag, m_openid string) map[string]*[]*MemberInterest {
 	cache := make(map[string]*[]*MemberInterest)
 	q := map[string]interface{}{}
 	if m_openid != "" {
-		q["s_m_openid"] = m_openid
+		q = map[string]interface{}{
+			"o_msgset." + flag + ".i_switchstatus": 1,
+			"o_msgset." + flag + ".i_status":       1,
+			"s_m_openid":                           m_openid,
+		}
 	} else {
 		fixPush := util.ObjToString(PushConfig["fixPush"])
 		if len(fixPush) > 5 {

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

@@ -39,12 +39,11 @@ func (p *Pjob) DoPush(mopenid, stime string, opr int, ltime int64) bool {
 	p.Cache = new(map[string]*[]*push.MemberInterest)
 	*p.Cache = push.InitCache(p.Stype, mopenid)
 	p.CreateUserInterestWord()
-	EachAllBidInfo(p.Stype, "["+p.StypeName+"信息]", p.StypeName, ltime, p.MaxPushSize, p.Dfa, p.Cache, opr)
-	return true
+	return EachAllBidInfo(p.Stype, "["+p.StypeName+"信息]", p.StypeName, ltime, p.MaxPushSize, p.Dfa, p.Cache, opr)
 }
 
 //遍历数据并执行推送操作
-func EachAllBidInfo(stype, TITLEA, ShortTitle string, lastTime int64, MaxPushSize int, dfas *dfa.DFA, cache *map[string]*[]*push.MemberInterest, pushType int) {
+func EachAllBidInfo(stype, TITLEA, ShortTitle string, lastTime int64, MaxPushSize int, dfas *dfa.DFA, cache *map[string]*[]*push.MemberInterest, pushType int) (res bool) {
 	defer func() {
 		if r := recover(); r != nil {
 			fmt.Println("推送开始[E]", r)
@@ -105,8 +104,10 @@ L1:
 		kk := *k
 		vv := *v
 		time.Sleep(50 * time.Millisecond)
+		res = true
 		go Send(&kk, &vv, now, TITLEA, ShortTitle, stype, MaxPushSize)
 	}
+	return res
 }
 
 //全局推送功能
@@ -208,7 +209,7 @@ func SendWeixin(k *push.MemberInterest, TITLE, ShortTitle, str, stype string, no
 		wxDate = time.Now().Local().Add(time.Duration(-n2) * time.Second).Add(time.Duration(-n1*24) * time.Hour).Format(util.Date_Full_Layout)
 	}
 
-	wxstr := "\n点击下方“详情”查看详细信息。\n以上" + ShortTitle + "信息，是剑鱼根据关键字“" + strings.Join(k.Interest, ";") + "”奋力查找并推送，如不合您心意，请猛戳企明星菜单“会员服务—剑鱼”进行修改。"
+	wxstr := "\n点击下方“详情”查看详细信息。\n以上" + ShortTitle + "信息，是剑鱼根据关键字“" + strings.Join(k.Interest, ";") + "”奋力查找并推送，如不合您心意，请猛戳企明星菜单“剑鱼”进行修改。"
 	push.SendWinXin(&qrpc.NotifyMsg{
 		Openid:  k.Openid,
 		Title:   push.PushConfig[stype+"Title"].(string),

weixin/src/config.json

@@ -24,9 +24,9 @@
         "loginTip":"您已经成功登录企明星，请在电脑端操作。",
         "freezeTip":"您的帐号已经冻结，请联系管理员。",
         "messagetpl":{
-                "identifytplid":"oGxkPyaV42z3KWykt58Tow9mBe_ImJvi8R3ajorVWOY",
+                "identifytplid":"sKn4r0or615ETYC-aI5OACPO_Q4-B8GYmgWoqcDghN4",
                 "offLinemsgtplid":"ExIeyFfoDNVJXhRDq09JbsjH_zbEJCB6gw6rxcV7atw",
-                "msgnotifytplid":"b7iuAMiTCIolnPhTdueKBVYThEMf2D-Bh2M_9v3J-68",
+                "msgnotifytplid":"fcke7PqteAtclzHV3ScdiePH48vxaH6M5aJF0O_7by8",
                 "managernotifytplid":"DIwMrPQToOhGfa6ZAQCCrqquzbLKajiXsKY0K_lQtWQ"
         },"activity":{
                 "activitycode":"topcj",

weixin/src/qfw/weixin/dao/sharedao.go

@@ -4,6 +4,7 @@ package dao
 import (
 	"fmt"
 	. "gopkg.in/mgo.v2/bson"
+	"log"
 	"qfw/util/credit"
 	. "qfw/util/mongodb"
 	"sync"
@@ -11,14 +12,16 @@ import (
 )
 
 //锁
-var sharelock *sync.Mutex
+var sharelock *sync.Mutex = &sync.Mutex{}
 
 //保存用户邀请关系,走线程池
 func SaveInviteLink(shareid string, myopenid string) {
+	log.Println("save user invitelink ", myopenid, shareid)
 	//先找邀请人信息
 	sharelock.Lock()
 	ret := FindOne("person_share", M{"i_shareid": shareid})
 	if *ret == nil {
+		log.Println("wu share info!!!!")
 		sharelock.Unlock()
 		return
 	}
@@ -34,11 +37,13 @@ func SaveInviteLink(shareid string, myopenid string) {
 	//取用户ID
 	ret = FindOne("user", M{"s_m_openid": source_opendid})
 	if *ret == nil {
+		log.Println("no found user!!!!")
 		sharelock.Unlock()
 		return
 	}
 	smid := fmt.Sprintf("%x", string(((*ret)["_id"]).(ObjectId)))
 	//积分处理,RPC
+	log.Println("smid:::", smid)
 	credit.InCreditB(smid, credit.C_TG, nil)
 	sharelock.Unlock()
 }

weixin/src/qfw/weixin/subscribehandler.go

@@ -49,7 +49,7 @@ func SubscribeHandler(w ResponseWriter, r *Request) {
 	} else {
 		source = ""
 	}
-
+	log.Println("source::", source, "flag:::", flag)
 	if digitreg.MatchString(source) {
 		dao.SaveSubscribeLogs(openid, unionid, bindweixin, "wangzhan", "subscribe")
 		if flag == 1 {