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

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

@@ -112,6 +112,7 @@ func (c *credit) InCreditAjx() error {
 				cd.UpuserCreditSession(userId, cd.B_FXFWXQ, "B", nil, c.Action)
 			} else {
 				cd.UpuserCreditSession(userId, cd.A_FXFWXQ, "A", nil, c.Action)
+				cd.UpuserCreditSession(userId, cd.B_FXFWXQ, "B", nil, c.Action)
 			}
 		}
 		if param == "qd" {

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 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}
+<<<<<<< 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/templates/common/memberleft.html

@@ -104,7 +104,7 @@
 			<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>
 		<div style="height:40px;float:left;width:1px;background-color:#DDDDDD"></div>
-		<div style="float:left;width:105px;">
+		<div onclick="window.location.href='/member/accountset/index'" style="float:left;width:105px;">
 			<div>认证</div>
 			<div>
 			{{if session "identType"}}
@@ -112,14 +112,20 @@
 				{{if eq 1 $identType}}
 					{{if eq 1 $identWay}}
 					<i class="glyphicon qyrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">已认证企业</span>
+					{{else}}
+					<i class="glyphicon qyrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">未认证企业</span>
 					{{end}}
 				{{else if eq 2 $identType}}
 					{{if eq 1 $identWay}}
 					<i class="glyphicon grrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">已认证个人</span>
+					{{else}}
+					<i class="glyphicon grrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">未认证个人</span>
 					{{end}}
 				{{else if eq 3 $identType}}
 					{{if eq 1 $identWay}}
 					<i class="glyphicon jgrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">已认证机构</span>
+					{{else}}
+					<i class="glyphicon jgrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">未认证机构</span>
 					{{end}}
 				{{else}}
 				<i class="glyphicon grrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">未认证</span>

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

@@ -101,7 +101,7 @@
 								<td width="10%" align="center">
 								<span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
 								<td width="30%" style="padding:110px">
-								去 <button class="btn btn-primary" onclick="toUrl('/member/accountset/index')">完成验证</button></td>
+								去 <button class="btn btn-primary" onclick="toUrl('/member/accountset/index')" style="padding-top:3px;padding-bottom:3px;">完成验证</button></td>
 								{{end}}
 							</tr>
 							<tr class="rowone">
@@ -134,7 +134,7 @@
 								<td width="30%" style="padding:110px"></td>
 								{{else}}
 								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
-								<td width="30%" style="padding:110px">去 <button class="btn btn-primary" onclick="toUrl('/member/yellowpage/show/enterprise/{{.T.user.s_enterpriseid}}')">完善资料</button></td>
+								<td width="30%" style="padding:110px">去 <button class="btn btn-primary" onclick="toUrl('/member/yellowpage/show/enterprise/{{.T.user.s_enterpriseid}}')" style="padding-top:3px;padding-bottom:3px;">完善资料</button></td>
 								{{end}}
 							</tr>
 							<tr class="rowtwo">