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

core/src/qfw/active/activemanage.go

@@ -28,7 +28,7 @@ type Activemanage struct {
 func (a *Activemanage) Luckdraw(activecode, id string) error {
 	//userInfo := a.GetSession("userInfo").(*map[string]interface{})
 	openid := id //(*userInfo)["s_m_openid"].(string)
-	a.T["shareid"] = coreutil.FindMyShareId(openid)
+	a.T["shareid"] = coreutil.FindMyShareId(activecode, openid)
 	//
 	if activecode == "topcj" {
 		se := SimpleEncrypt{Key: "topnet2015topnet2015"}

core/src/qfw/coreutil/share.go

@@ -3,18 +3,25 @@ package coreutil
 import (
 	"fmt"
 	"qfw/util/mongodb"
+	"time"
 )
 
 //取到分享者的shareid
-func FindMyShareId(openid string) string {
+func FindMyShareId(activecode, openid string) string {
 	//userInfo := a.GetSession("userInfo").(*map[string]interface{})
 	//openid := (*userInfo)["s_m_openid"].(string)
-	ret := mongodb.FindOne("person_share", "{'s_openid':'"+openid+"'}")
+	ret := mongodb.FindOne("person_share", "{'s_openid':'"+openid+"','s_businesscode':'"+activecode+"'}")
 	var shareid string
 	if (*ret)["i_shareid"] == nil {
 		id := GetShareId(TYPE_INVITE)
 		GetShareQR(id)
 		shareid = fmt.Sprintf("%d", id)
+		data := make(map[string]interface{})
+		data["s_openid"] = openid
+		data["s_businesscode"] = activecode
+		data["shareid"] = shareid
+		data["l_timestamp"] = time.Now().Unix()
+		mongodb.Save("person_share", data)
 	} else {
 		shareid = (*ret)["i_shareid"].(string)
 	}

core/src/qfw/manage/feedback.go

@@ -14,6 +14,7 @@ import (
 	. "qfw/util/msg"
 	qrpc "qfw/util/rpc"
 	"strings"
+	"time"
 )
 
 //后台处理反馈建议页面
@@ -136,6 +137,7 @@ func (s *SystemManage) Updateback() error {
 		data["s_auditid"] = s.GetSession("userId")
 		data["s_record"] = s.GetString("s_record")
 		data["l_editordate"] = s.GetString("l_editordate")
+		data["l_timestamp"] = time.Now().Unix()
 		data2 := map[string]interface{}{
 			"$set": data,
 		}
@@ -151,7 +153,7 @@ func (s *SystemManage) Updateback() error {
 					title = front.SubstrByByte(title, 40) + "..."
 				}
 				s_detail := "以下是对你提交“" + title + "”意见的回复结果"
-				s_remark := "　 " + s.GetString("s_opinion")
+				s_remark := "　　" + s.GetString("s_opinion")
 				go func() {
 					coreutil.SendManagerNotifyMsg(&qrpc.NotifyMsg{Openid: openid, Title: s_result, Detail: s_detail, Remark: s_remark})
 				}()

core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-20 17:50:08"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-20 17:50:08"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-21 09:33:09"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-21 09:33:09"}},"marketisstart":true,"marketrate":300}

core/src/web/staticres/css/index-new.css

@@ -604,7 +604,7 @@ a:focus, a:hover{
 }
 .index-new-tg-con>ul>li>span:nth-child(2){
 	display:inline-block;
-	width:330px;
+	width:320px;
 	padding-left:10px;
 	padding-right: 10px;
 	color:#4E5051;