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

common/src/qfw/util/encrypt_test.go

@@ -23,10 +23,10 @@ func Test_sim(t *testing.T) {
 
 	//s3 := "RFYoal5bCFdXWQoQB0JuWwlXAQFZCUVfFj4JMFtT"
 	s4 := "oJULtwzXo6EFV1Ah-XeyRBimXGM8"
-	se := SimpleEncrypt{Key: "topnet2015topnet2015"}
-	log.Println("=====", se.EncodeString(s4))
+	se := SimpleEncrypt{Key: "topnet"}
+	log.Println("=====", se.EncodeString(s4+",uid,111,swordfishaction"))
 	log.Println("=====", se.EncodeString(",1349385977,ASD"))
-	log.Println("---", se.DecodeString("GyUlIhEDDjcfWCAyIl4xBkgsERYiLAwZLCg9VkkBHQtcX1FBR1hJWldCREMHFhUBBwccBxYA"))
+	log.Println("---", se.DecodeString("GyUlIhEDSGheAzEpJl8kHB9oVEwmLRkDPTN/CB1AHQtcX1RFHkNGWgYLFgcWHFNTRVwbAQ=="))
 	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/coreutil/weixinrpc_test.go

@@ -10,7 +10,6 @@ import (
 	"net/rpc"
 	qrpc "qfw/util/rpc"
 	"testing"
-	"time"
 )
 
 const (
@@ -19,8 +18,9 @@ const (
 )
 
 func TestWeixinRpc(t *testing.T) {
-	SendManagerNotifyMsg(&qrpc.NotifyMsg{Openid: "oJULtwzXo6EFV1Ah-XeyRBimXGM8", Title: "冻结通知", Remark: "时间:2015-12-22", Detail: "企明星", Result: "冻结内容"})
-	time.After(20 * time.Second)
+	rpcserver = "112.74.194.135:91"
+	SendManagerNotifyMsg(&qrpc.NotifyMsg{Openid: "oJULtwzXo6EFV1Ah-XeyRBimXGM8", Title: "冻结通知", Remark: "时间:2015-12-22", Detail: "企明星通知", Result: "冻结内容通知"})
+
 }
 
 type MsgStruct struct {

core/src/qfw/front/webcentent.go

@@ -351,7 +351,7 @@ func (n *Newscont) Webregulationscontent(_id string) error {
 			data_7 := (*r)["l_fetchdate"]
 			(*r)["l_fetchdate"] = util.FormatDateWithObj(&data_7, util.Date_Full_Layout)
 			(*r)["s_content"] = template.HTML((*r)["s_content"].(string))
-			content, _ := n.Render4Cache("/manage/webcontent.html", &n.T)
+			content, _ := n.Render4Cache("/manage/webcontent-new.html", &n.T)
 			redis.Put("other", n.Url(), string(content), -1)
 			return n.SetBody(content)
 		} else {
@@ -376,9 +376,10 @@ func (n *Newscont) GetExpressList(list /*分类*/, param /*参数*/ string) erro
 
 		log.Println("querymap:", querymap)
 		//查询生成列表数据
-		if list == "qykb" {
+		if list == "qykb" || list == "zhsk" {
+			hotnews := elastic.GetPage("content", "content", `{"s_contenttype": "`+list+`"}`, `{"praise":-1}`, `{"_id":1,"s_title":1,"praise":1}`, 0, 10)
 			data, pagination := searhWebContent(querymap)
-			n.Render("/manage/web_newexpresslist.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
+			n.Render("/manage/web_newexpresslist.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination, "hotnews": hotnews})
 		} else if list == "zcfg" {
 			data, pagination := searhWebContentreg(querymap)
 			n.Render("/manage/web_regulationslist.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
@@ -389,9 +390,10 @@ func (n *Newscont) GetExpressList(list /*分类*/, param /*参数*/ string) erro
 		bs, _ := base64.StdEncoding.DecodeString(paramstr)
 		querymap := map[string]string{}
 		json.Unmarshal(bs, &querymap)
-		if list == "qykb" {
+		if list == "qykb" || list == "zhsk" {
+			hotnews := elastic.GetPage("content", "content", `{"s_contenttype": "`+list+`"}`, `{"praise":-1}`, `{"_id":1,"s_title":1,"praise":1}`, 0, 10)
 			data, pagination := searhWebContent(querymap)
-			n.Render("/manage/web_newexpresslist.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
+			n.Render("/manage/web_newexpresslist.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination, "hotnews": hotnews})
 		} else if list == "zcfg" {
 			data, pagination := searhWebContentreg(querymap)
 			n.Render("/manage/web_regulationslist.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
@@ -781,7 +783,7 @@ func (e *Newscont) GetLatestNews() {
 	    "bool": {
 		  "must":[{"term":{"s_contenttype":"qykb"}}]
 	    }},"_source":["s_title","releasetime","_id"]
-		,"from":0,"size":6,"sort":[{"releasetime":{"order":"desc"}}]}`
+		,"from":0,"size":8,"sort":[{"releasetime":{"order":"desc"}}]}`
 		//查询列表数据
 		client := elastic.GetEsConn()
 		defer elastic.DestoryEsConn(client)

core/src/qfw/mobile/mobile.go

@@ -22,6 +22,7 @@ type Mobile struct {
 	wxpushList     xweb.Mapper `xweb:"/wxpush/bid/(.*)/(.*)/(.*)"` //推送列表
 	wxpushListInfo xweb.Mapper `xweb:"/wxpush/bidinfo/(.*)"`       //推送列表
 	wxpushAjaxReq  xweb.Mapper `xweb:"/wxpush/bid/ajaxReq"`
+	wxpushView     xweb.Mapper `xweb:"/wxpush/bid/wxpushview/(.*)"` //推送结果预览
 }
 
 func init() {

core/src/qfw/mobile/wxmenu.go

@@ -14,6 +14,7 @@ import (
 	"qfw/util/redis"
 	qrpc "qfw/util/rpc"
 	"runtime"
+	"strings"
 	"time"
 )
 
@@ -68,7 +69,7 @@ func (m *Mobile) Wxrssset() error {
 				return m.Redirect("/swordfish/guide/first")
 			}
 			if (*userInfo)["o_msgset"] != nil {
-				for _, v := range (*userInfo)["o_msgset"].(map[string]interface{}) {
+				for ktype, v := range (*userInfo)["o_msgset"].(map[string]interface{}) {
 					if vobj, ok := v.(map[string]interface{}); ok {
 						if vobj["l_enddate"] != nil && vobj["i_status"] != nil {
 							if util.IntAll(vobj["i_status"]) == 1 {
@@ -78,6 +79,13 @@ func (m *Mobile) Wxrssset() error {
 								} else {
 									vobj["days"] = 0
 									//是否要扣
+									//更新状态2016-2-24修改
+									vobj["i_status"] = 0
+									mongodb.Update("user", `{"_id":"`+m.GetSession("userId").(string)+`"}`, map[string]interface{}{
+										"$set": map[string]interface{}{
+											"o_msgset." + ktype + ".i_switchstatus": 0,
+										},
+									}, false, false)
 								}
 							}
 						}
@@ -145,6 +153,7 @@ func (m *Mobile) SwordfishPay() error {
 					if i_credit > 0 {
 						isPay := map[string]interface{}{}
 						mapPush := map[string]string{}
+						mapCode := []string{}
 						for _, v := range types {
 							util.Try(func() {
 								b_newopen := false
@@ -173,6 +182,7 @@ func (m *Mobile) SwordfishPay() error {
 								if b_newopen { //进行扣费操作
 									isPay[v] = v
 									mapPush[v] = util.If(v == "bid", "中标", "招标").(string)
+									mapCode = append(mapCode, util.If(v == "bid", "A2", "A1").(string))
 								}
 							}, func(e interface{}) {
 								log.Println(e)
@@ -182,7 +192,7 @@ func (m *Mobile) SwordfishPay() error {
 						if i_credit >= 0 {
 							credit_a := util.IntAll(m.GetSession("credit_a"))
 							b := false
-							if b, _ = credit.OutCreditB(userId.(string), credit.V_JY, util.ObjToString(m.GetSession("s_m_openid")), 0, isPay, m.Action); b {
+							if b, _ = credit.OutCreditB(userId.(string), strings.Join(mapCode, ","), util.ObjToString(m.GetSession("s_m_openid")), 0, isPay, m.Action); b {
 								//先扣分，然后更新，然后返回结果
 								res["credit"] = i_credit
 								res["oprstatus"] = true
@@ -329,6 +339,41 @@ func (m *Mobile) AjaxReq() error {
 	return nil
 }
 
+//预览结果
+func (m *Mobile) WxpushView(stype string) error {
+	//rpc调用
+	b := false
+	util.Try(func() {
+		//对用户进行推送
+		var repl []byte
+		clent, errs := rpc.DialHTTP("tcp", coreconfig.SysConfig.PushRpc)
+		defer clent.Close()
+		mapPush := map[string]string{}
+		mapPush[stype] = util.If(stype == "bid", "中标", "招标").(string)
+		rpcData := qrpc.PushData{
+			Mopenid:  m.GetSession("s_m_openid").(string),
+			PushType: mapPush,
+		}
+		clent.Call("PushInfo.ResultView", &rpcData, &repl)
+		if errs == nil && repl != nil && len(repl) > 0 {
+			b = true
+			var mp map[string]interface{}
+			json.Unmarshal(repl, &mp)
+			m.T["data"] = mp
+		}
+	}, func(e interface{}) {
+		log.Println("给用户推送出错", e)
+	})
+	if b {
+		//m.T["signature"] = GetSignature(m.Url())
+		m.T["view"] = 1
+		m.T["shareid"] = cutil.FindMyShareId("topjy", m.Session().Get("s_m_openid").(string))
+		return m.Render("/swordfish/wxpush.html", &m.T)
+	} else {
+		return m.Render("/_error.html")
+	}
+}
+
 //推送列表
 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}`)

core/src/qfw/search/searchService.go

@@ -37,7 +37,7 @@ func (search *Search) EntCommunity() error {
 				}
 			}
 			if len(enterpriseids) > 0 {
-				ents := Find("enterprise", bson.M{"_id": enterpriseids}, nil, `{"s_avatar":1}`, false, -1, -1)
+				ents := Find("enterprise", bson.M{"_id": bson.M{"$in": enterpriseids}}, nil, `{"s_avatar":1}`, false, -1, -1)
 				if ents != nil && len(*ents) > 0 {
 					for _, identEnt := range *identEnts {
 						for _, ent := range *ents {

core/src/qfw/yellowpage/yellowpagemanager.go

@@ -266,36 +266,28 @@ func (yp *Yellowpage) EnterpriseInfo(id string) error {
 				relation = makeRelation(regNo, entName)
 				redis.Put("enterprise", "relation-"+regNo, relation, 7*ONEDAY)
 			}
-			r := relation.(map[string]interface{})
 			var nodes *[]map[string]interface{}
-			var relevantEnts []map[string]interface{}
-			if d, err := json.Marshal(r["nodes"]); err == nil && json.Unmarshal(d, &nodes) == nil && len(*nodes) > 0 {
+			if d, err := json.Marshal(relation.(map[string]interface{})["nodes"]); err == nil && json.Unmarshal(d, &nodes) == nil && len(*nodes) > 0 {
 				var regNos []string
 				for _, v := range *nodes {
 					if v["type"] == "e" {
 						regNos = append(regNos, v["name"].(string))
-						relevantEnts = append(relevantEnts, v)
 					}
 					if len(regNos) == 6 {
 						break
 					}
 				}
 				if len(regNos) > 0 {
-					ents := Find("enterprise", M{"RegNo": regNos}, nil, `{"s_avatar":1}`, false, -1, -1)
-					if ents != nil && len(*ents) > 0 {
-						for _, relevantEnt := range relevantEnts {
-							for _, ent := range *ents {
-								if ent["RegNo"] == relevantEnt["name"] {
-									ent["s_avatar"] = ent["s_avatar"]
-									ent["_id"] = util.BsonIdToSId(ent["_id"])
-									break
-								}
-							}
+					relevantEnts := Find("enterprise", M{"RegNo": M{"$in": regNos}}, nil, `{"s_avatar":1,"RegNo":1,"EntName":1}`, false, -1, -1)
+					if relevantEnts != nil && len(*relevantEnts) > 0 {
+						for _, relevantEnt := range *relevantEnts {
+							relevantEnt["_id"] = util.BsonIdToSId(relevantEnt["_id"])
+							break
 						}
+						yp.T["relevantEnts"] = relevantEnts
 					}
 				}
 			}
-			yp.T["relevantEnts"] = relevantEnts
 			contentuser, erruser := yp.Render4Cache("/yellowpage/enterpriseinfo.html", &yp.T)
 			if erruser == nil {
 				redis.PutBytes("enterprise", "enterpriseInfo_"+id, &contentuser, 7*ONEDAY)

core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-02-23 14:52:50"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-02-23 14:52:50"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-02-26 14:36:30"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-02-26 14:36:30"}},"marketisstart":true,"marketrate":300}

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

@@ -365,9 +365,6 @@ a:focus, a:hover{
 }
 .ent-tab-content{
 	margin-top: 10px;
-	background-color: #FFFFFF;
-	padding-top: 20px;
-	padding-bottom: 20px;
 }
 /********************企业画像**********************/
 .entinfo-basicinfo .b-com-content{
@@ -607,7 +604,6 @@ a:focus, a:hover{
 /********************关系网**********************/
 .entrelation{
 	position: relative;
-	padding: 0px 20px;
 }
 .entrelation svg{
 	position: relative;
@@ -632,22 +628,15 @@ a:focus, a:hover{
 	margin-top: 10px;
 	z-index: 2;
 }
-.entrelation .entrelation-controlls .entrelation-item{
-	border-radius: 2px;
-	box-shadow: 0 1px 4px rgba(0,0,0,0.3);
-	cursor: pointer;
-	margin-bottom: 8px;
-	float:left;
+.entrelation .entrelation-controlls>div{
+	margin-bottom: 15px;
 }
 .entrelation .entrelation-controlls .entrelation-box{
-	padding:10px;
-	float:left;
-}
-.entrelation .entrelation-controlls .entrelation-box div{
-	background: url(/images/view_icons.png) no-repeat;
-	width: 16px;
-	height: 16px;
-	opacity: 0.6;
+	border: 1px solid #e5e6e9;
+	width: 80px;
+	line-height: 30px;
+	text-align: center;
+	cursor: pointer;
 }
 :-moz-full-screen .entrelation,:-webkit-full-screen .entrelation,:-o-full-screen .entrelation,
 :-ms-full-screen .entrelation,:fullscreen .entrelation,:-ms-fullscreen .entrelation,:full-screen .entrelation{

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

@@ -149,10 +149,15 @@ a:focus, a:hover{
     color: #FF5A5F;
 }
 .index-new-qysq-con{
-	padding:10px 20px 50px 20px;
+	padding:30px 20px 80px 20px;
+}
+.index-new-wgw{
+	padding-bottom:30px;
 }
 .a-index .a-qysq .index-new-qysq-con img {
 	border:0px;
+	width:100px;
+	height:92px;
 }
 .a-index .index-new-wgw-fgx{
 	margin-top:-20px;
@@ -622,4 +627,29 @@ a:focus, a:hover{
 }
 #iWant div a{
 	margin-right:2px;
+}
+.a-index .index-qysq{
+	width:888px;
+	display: inline-block;
+	padding:10px;
+}
+.a-index .index-qysq-name{
+	display: block;
+    padding: 15px;
+}
+.a-index .carousel-control.rightmenu{
+	left: auto;
+    right: 0px;
+}
+.a-index #qysq-left{
+	height:56px;
+	width:22px;
+	margin-top: 110px;
+    margin-right: 100px;
+}
+.a-index #qysq-right{
+	height:56px;
+	width:22px;
+	margin-top: 110px;
+    margin-left: 100px;
 }

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

@@ -964,6 +964,14 @@ span.highlight {
 	content: "\60";
 }
 
+.fenxiang1:before{
+	content: "\2D";
+}
+
+.zan:before{
+	content: "\2E";
+}
+
 .icon-small {
 	font-size: 12px;
 }

core/src/web/staticres/js/entportrait.js

@@ -155,13 +155,14 @@ function b_afterLogin(flag){
 //加载关系网
 function initRelation(){
 	if(isLogined){
-		$(".entrelation").height(500);
+		if($("#entrelation-limit").hasClass("hide")){
+			$(".entrelation").height(500);
+		}
 		var relationNoData = function(){
 			$("#entrelation-limit,#entrelation-nologin").addClass("hide");
 			relation = "";
 			$("#entrelation-infovis").hide();
 			$("#entrelation-findnull").removeClass("hide");
-			$(".entrelation").css("height","auto");
 		}
 		$.ajax({
 			url: "/member/getRelation",
@@ -172,11 +173,11 @@ function initRelation(){
 					$("#entrelation-nologin").addClass("hide");
 					$("#entrelation-limit,#entrelation-noauthe").removeClass("hide");
 					$("#entrelation-infovis").hide();
-					$(".entrelation").css("height","auto");
 				}else if(r.flag == true && (r == null || typeof(r) == "undefined" || typeof(r.relation.links) == "undefined" || r.relation.links.length == 0 || typeof(r.relation.nodes) == "undefined" || r.relation.nodes.length <= 1)){
 					relationNoData();
 				}else if(r.flag == true){
 					$("#entrelation-limit,#entrelation-nologin").addClass("hide");
+					$(".entrelation").height(500);
 					loadJS("/js/d3.v3.min.js",function(){
 						loadJS("/js/geometry.js",function(){
 							loadJS("/js/relation.js",function(){

core/src/web/staticres/js/qfw.js

@@ -322,7 +322,7 @@ function webSiteInit(){
 		//设置用户用心左右布局
 		var memberLeft_marginLeft = 0;
 		if($(".member-content").length == 1 && $(".member-content>.member-left").length == 1 && $(".member-content>.member-right").length == 1){
-			$(".member-right").width($(".member-content").width() - 200 - 15);
+			$(".member-right").width($(".member-content").width() - 250 - 55);
 			if($(".member-content").children(".clearfix").length == 0){
 				$(".member-content").append('<div class="clearfix"></div>');
 			}

core/src/web/staticres/js/relation.js

@@ -2,6 +2,7 @@ function Relation(legcerNo,regNo,data){
 	this.legcerNo = legcerNo;
 	this.regNo = regNo;
 	this.data = data;
+	this.modleFlag = data.nodes.length>15;
 	this.zoomlevel = 1;
 	this.w = 0;
 	this.h = 0;
@@ -12,8 +13,12 @@ function Relation(legcerNo,regNo,data){
 	this.force = null;
 	this.lines = null;
 	this.nodes = null;
+	this.lineLables = null;
 	this.mouseoverstatus = false;
 	this.chargeVal = -1600;
+	this.tickFlag = true;
+	this.centerNodeX = 0;
+	this.centerNodeY = 0;
 }
 Relation.prototype.init = function(){
 	var thisClass = this;
@@ -21,11 +26,20 @@ Relation.prototype.init = function(){
 	thisClass.h = $("#entrelation").height();
 	$("#entrelation-infovis").width(thisClass.w).append(
 		'<div class="entrelation-controlls hidden-sm hidden-xs">'
-			+'<div class="entrelation-item">'
-				+'<div id="entrelation-fullscreen" class="entrelation-box" title_pos="left"><div class="entrelation-fullscreen"></div></div>'
-			+'</div>'
+		+'<div id="entrelation-pattern" class="entrelation-box" title_pos="left">一般模式</div>'
+		+'<div id="entrelation-verbosemode" class="entrelation-box" title_pos="left">详细模式</div>'
+			+'<div id="entrelation-fullscreen" class="entrelation-box" title_pos="left">全屏</div>'
 		+'</div>'
 	);
+	//一般模式
+	$("#entrelation-pattern").click(function(){
+		thisClass.pattern();
+	});
+	//详细模式
+	$("#entrelation-verbosemode").click(function(){
+		thisClass.verbosemode();
+	});
+	//全屏
 	$("#entrelation-fullscreen").click(function(){
 		thisClass.initFullScreen();
 	});
@@ -83,6 +97,32 @@ Relation.prototype.init = function(){
 		this.makeRelation();	
 	}catch(e){}
 }
+Relation.prototype.pattern = function(){
+	if(this.modleFlag){
+		return;
+	}
+	d3.selectAll("text").each(function (p){
+		if(p.type == "ce" || p.type == "e"){
+			$(this).text(p.shortText);
+		}
+	});
+	this.modleFlag = true;
+	this.makeTextBg();
+	this.makeTitle();
+}
+Relation.prototype.verbosemode = function(){
+	if(!this.modleFlag){
+		return;
+	}
+	d3.selectAll("text").each(function (p){
+		if(p.type == "ce" || p.type == "e"){
+			$(this).text(p.text);
+		}
+	});
+	this.modleFlag = false;
+	this.makeTextBg();
+	this.makeTitle();
+}
 Relation.prototype.dataProcess = function(){
 	var reg = new RegExp(/(有限公司|有限责任公司|股份有限公司|总公司|分公司|公司|事务所|合伙企业)$|\(.*\)|\（.*\）/g);
 	/*var provinces = [];
@@ -364,7 +404,6 @@ Relation.prototype.initFullScreen = function(){
        	document.mozFullScreenElement ||
        	document.webkitFullscreenElement ||
 		document.msFullscreenElement;
-    $(".entrelation-fullscreen").toggleClass("exit");
 	if(!fullscreenElement || fullscreenElement==null){
 		this.redrawflag = true;
 		$("#entrelation-fullscreen").attr("title","退出全屏视图 (F11)");
@@ -454,10 +493,11 @@ Relation.prototype.removeNode = function(obj){
 		}
 	});
 }
-Relation.prototype.tick = function(e){
+Relation.prototype.tick = function(){
 	var thisClass = this;
 	this.lines.attr("d", function(d){
-		var sy   = d.source.y,
+		var sx   = d.source.x,
+			sy   = d.source.y,
 			x    = d.target.x,
             y    = d.target.y;
 		if(sy > y){
@@ -465,7 +505,7 @@ Relation.prototype.tick = function(e){
 		}else{
 			sy += 5;
 		}
-		var line = new geo.LineSegment(d.source.x, sy, x, y);
+		var line = new geo.LineSegment(sx, sy, x, y);
 		for (var e in d.target.edge) {
             var ix = line.intersect(d.target.edge[e].offset(x, y));
             if (ix.in1 && ix.in2) {
@@ -474,18 +514,35 @@ Relation.prototype.tick = function(e){
                 break;
             }
         }
-        var dx = x - d.source.x,
+        var dx = x - sx,
 	        dy = y - sy,
-	        dr = Math.sqrt(dx * dx + dy * dy),
+	        dr = Math.sqrt(dx * dx + dy * dy);
 	        theta = Math.atan2(dy, dx) + Math.PI / 7.85,
 	        d90 = Math.PI / 2,
 	        dtxs = x - Math.cos(theta),
 	        dtys = y - Math.sin(theta);
-	    return "M" + d.source.x + "," + sy + "A" + dr + "," + dr + " 0 0 1," + x + "," + y + "A" + dr + "," + dr + " 0 0 0," + d.source.x + "," + sy + "M" + dtxs + "," + dtys +  "l" + (3.5 * Math.cos(d90 - theta) - 10 * Math.cos(theta)) + "," + (-3.5 * Math.sin(d90 - theta) - 10 * Math.sin(theta)) + "L" + (dtxs - 3.5 * Math.cos(d90 - theta) - 10 * Math.cos(theta)) + "," + (dtys + 3.5 * Math.sin(d90 - theta) - 10 * Math.sin(theta)) + "z";
-	});	
+			var dd = 39;
+		return "M" + sx + "," + sy + "A" + dr + " " + dr + ",0 0 1," + x + "," + y;
+		//return "M" + sx + "," + sy + "A" + dr + " " + dr + ",0 0 1," + x + "," + y + "A" + dr + " " + dr + ",0 0 0," + sx + "," + sy + "M" + dtxs + "," + dtys +  "l" + (3.5 * Math.cos(d90 - theta) - 10 * Math.cos(theta)) + "," + (-3.5 * Math.sin(d90 - theta) - 10 * Math.sin(theta)) + "L" + (dtxs - 3.5 * Math.cos(d90 - theta) - 10 * Math.cos(theta)) + "," + (dtys + 3.5 * Math.sin(d90 - theta) - 10 * Math.sin(theta)) + "z";
+	});
 	this.nodes.attr("transform", function(d) {
+		if(thisClass.tickFlag && d.type == "ce"){
+			d.x = thisClass.centerNodeX;
+			d.y = thisClass.centerNodeY;
+		}
 		return "translate(" + d.x + "," + d.y + ")scale(" + thisClass.zoomlevel+ ")";
 	});
+	this.lineLables.attr("transform",function(d){
+		var sx   = d.source.x,
+			sy   = d.source.y,
+			x    = d.target.x,
+            y    = d.target.y;
+		
+		return "translate("+(x)+","+(y)+")";
+	});
+	if(thisClass.tickFlag){
+		thisClass.force.tick();
+	}
 }
 Relation.prototype.zoomed = function() {
 	this.svg.attr("transform", 
@@ -542,6 +599,7 @@ Relation.prototype.makeRelation = function(){
 	var dragstatus = false;
 	var drag = this.force.drag()
 		.on("dragstart",function(d,i){
+			thisClass.tickFlag = false;
 			d.fixed = true;    //拖拽开始后设定被拖拽对象为固定
 			d3.event.sourceEvent.stopPropagation(); // Prevent panning
 		})
@@ -565,10 +623,11 @@ Relation.prototype.makeRelation = function(){
 	    .attr("height", this.h)
 		.call(zoom)
 		.append("g");
-	this.lines = this.svg.append("svg:g")
+	var gs = this.svg.append("svg:g")
 	    .selectAll("path")
 	    .data(this.force.links())
-	    .enter().append("path")
+	    .enter();
+	this.lines = gs.append("path")
 		.style("fill", function(p){
 	    	return (p.type=="cp" || p.isLegal)?"#cd93d7":"#cecece";
 	    })
@@ -578,6 +637,18 @@ Relation.prototype.makeRelation = function(){
 		.attr("stroke-width",function (e,i){
 			return e.linkVal;
 		});
+	this.lineLables = gs.append("g").each(function(){
+		d3.select(this).append("rect")	
+		.attr("rx", 5)
+	    .attr("ry", 5)
+		.attr("x", -99)
+	    .attr("y", -18)
+		.attr("height", 20)
+		.attr("fill", "#1B9196")
+		.attr("stroke", "#1B9196");
+		d3.select(this).append("text").text("1000万元");
+	});
+	
 	this.lines.each(function (d,i){
 		var invacconam = new Number(d.invacconam);
 		if(invacconam > 0){
@@ -608,7 +679,13 @@ Relation.prototype.makeRelation = function(){
 	this.nodes.append("rect")
 		.attr("rx", 5)
 	    .attr("ry", 5)
-		.attr('height', 20)
+		.attr('height', function(p){
+			if(p.type == "ce"){
+				return 25;
+			}else{
+				return 20;
+			}
+		})
 		.attr("fill", function(p){
 			if(p.type == "e" && (p.opstate == "11" || p.opstate == "07")){
 				return "#cecece";
@@ -626,10 +703,44 @@ Relation.prototype.makeRelation = function(){
 			}
 			return "1";
 		});
+	this.makeTitle();
+	this.nodes.append('text')
+    .text(function(d){
+		if(this.modleFlag){
+			return d.shortText;
+		}else{
+			return d.text;
+		}
+	})
+	.style("cursor",function (d,i){
+		if(d.type == "e"){
+			return "pointer";
+		}else{
+			return "auto";
+		}
+	})
+	.style("font-size",function (d,i){
+		if(d.type == "ce"){
+			return "16px";
+		}else{
+			return "14px";
+		}
+	})
+	.on("click",function (d,i){
+		if(!dragstatus && d.type == "e"){
+			window.open("/enterpriseInfoByRegNO/"+d.name+".html");
+		}
+	});
+	thisClass.makeTextBg();
+	thisClass.force.start();
+	//var diagonal = d3.svg.diagonal().projection(function(d) { return [d.y, d.x]; });
+}
+Relation.prototype.makeTitle = function(){
+	var thisClass = this;
 	this.nodes.each(function (d,i){
 		if(d.type == "ce" || d.type == "e"){
 			var title = "";
-			if(d.text != d.shortText){
+			if(thisClass.modleFlag){
 				title = d.text;
 			}
 			var regcap = d.regcap;
@@ -644,78 +755,70 @@ Relation.prototype.makeRelation = function(){
 				title += "注册资本："+regcap+"万元";
 			}
 			if(title != ""){
-				d3.select(this).append("title").text(title);
+				if($(this).children("title").length == 0){
+					d3.select(this).append("title").text(title);
+				}else{
+					$(this).children("title").text(title);
+				}
 			}
 		}
 	});
-	this.nodes.append('text')
-    .text(function(d){
-		return d.shortText;
-	})
-	.style("cursor",function (d,i){
-		if(d.type == "e"){
-			return "pointer";
-		}else{
-			return "auto";
-		}
-	})
-	.on("click",function (d,i){
-		if(!dragstatus && d.type == "e"){
-			window.open("/enterpriseInfoByRegNO/"+d.name+".html");
-		}
-	});
-	setTimeout(function() {
-	    thisClass.nodes.each(function(d) {
-	        var node   = d3.select(this),
-	            text   = node.selectAll('text'),
-	            bounds = {},
-	            first  = true;
-				
-			text.each(function() {
-	            var box = this.getBBox();
-	            if (first || box.x < bounds.x1) {
-	                bounds.x1 = box.x;
-	            }
-	            if (first || box.y < bounds.y1) {
-	                bounds.y1 = box.y;
-	            }
-	            if (first || box.x + box.width > bounds.x2) {
-	                bounds.x2 = box.x + box.width;
-	            }
-	            if (first || box.y + box.height > bounds.y2) {
-	                bounds.y2 = box.y + box.height;
-	            }
-	            first = false;
-	        }).attr('text-anchor', 'middle');
-				
-	        var padding  = {"left":3,"right":3,"top":2,"bottom":2},
-	            margin   = {"left":3,"right":3,"top":2,"bottom":2},
-	            oldWidth = bounds.x2 - bounds.x1;
-	
-	        bounds.x1 -= oldWidth / 2;
-	        bounds.x2 -= oldWidth / 2;
-	
-	        bounds.x1 -= padding.left;
-	        bounds.y1 -= padding.top;
-	        bounds.x2 += padding.left + padding.right;
-	        bounds.y2 += padding.top  + padding.bottom;
+}
+Relation.prototype.makeTextBg = function(){
+	var thisClass = this;
+	this.nodes.each(function(d) {
+        var node   = d3.select(this),
+            text   = node.selectAll('text'),
+            bounds = {},
+            first  = true;
 			
-			var width = bounds.x2 - bounds.x1;
-			var height = bounds.y2 - bounds.y1;
-	        node.select('rect')
-	            .attr('x', bounds.x1)
-	            .attr('y', bounds.y1)
-				//.attr('height', height)
-	            .attr('width', width);
-	            
-	        d.edge = {
-	            left   : new geo.LineSegment(bounds.x1, bounds.y1, bounds.x1, bounds.y2),
-	            right  : new geo.LineSegment(bounds.x2, bounds.y1, bounds.x2, bounds.y2),
-	            top    : new geo.LineSegment(bounds.x1, bounds.y1, bounds.x2, bounds.y1),
-	            bottom : new geo.LineSegment(bounds.x1, bounds.y2, bounds.x2, bounds.y2)
-	        };
-	    });
-	   thisClass.force.start();
-	},10);
-	//var diagonal = d3.svg.diagonal().projection(function(d) { return [d.y, d.x]; });
+		text.each(function() {
+            var box = this.getBBox();
+			box.x = 0;
+            if (first || box.x < bounds.x1) {
+                bounds.x1 = box.x;
+            }
+            if (first || box.y < bounds.y1) {
+                bounds.y1 = box.y;
+            }
+            if (first || box.x + box.width > bounds.x2) {
+                bounds.x2 = box.x + box.width;
+            }
+            if (first || box.y + box.height > bounds.y2) {
+                bounds.y2 = box.y + box.height;
+            }
+            first = false;
+        }).attr('text-anchor', 'middle');
+			
+        var padding  = {"left":3,"right":3,"top":2,"bottom":2},
+            margin   = {"left":3,"right":3,"top":2,"bottom":2},
+            oldWidth = bounds.x2 - bounds.x1;
+
+        bounds.x1 -= oldWidth / 2;
+        bounds.x2 -= oldWidth / 2;
+
+        bounds.x1 -= padding.left;
+        bounds.y1 -= padding.top;
+        bounds.x2 += padding.left + padding.right;
+        bounds.y2 += padding.top  + padding.bottom;
+		
+		var width = bounds.x2 - bounds.x1;
+		if(d.type == "ce"){
+			thisClass.centerNodeX = thisClass.w / 2;
+			thisClass.centerNodeY = thisClass.h / 2 + 5;
+		}
+		var height = bounds.y2 - bounds.y1;
+        node.select('rect')
+            .attr('x', bounds.x1)
+            .attr('y', bounds.y1)
+			//.attr('height', height)
+            .attr('width', width);
+            
+        d.edge = {
+            left   : new geo.LineSegment(bounds.x1, bounds.y1, bounds.x1, bounds.y2),
+            right  : new geo.LineSegment(bounds.x2, bounds.y1, bounds.x2, bounds.y2),
+            top    : new geo.LineSegment(bounds.x1, bounds.y1, bounds.x2, bounds.y1),
+            bottom : new geo.LineSegment(bounds.x1, bounds.y2, bounds.x2, bounds.y2)
+        };
+    });
 }

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

@@ -0,0 +1,75 @@
+<style type="text/css">
+.b-nav-main{
+	background-color: #FF5A5F;
+}
+.b-nav{
+	border-top-color: #FF5A5F;
+}
+.b-head .b-h-search form>span{
+	background-color: #FF5A5F;
+}
+.a-content{
+	margin-top:20px;
+}
+.b-head .head-hidemenu li:hover {
+    background-color: #FF5A5F;
+}
+body{
+	background-color:#f0f0f0;
+}
+</style>
+<!---->
+<div class="index-new-head b-head">
+	{{include "/common/top.html"}}
+	<div class="b-nav index-new-nva">
+		<ul>
+			<li class="b-nav-logo"><a href="/"><img src="/images/logo.png" class="logo"></a></li>
+<!--			<li class="b-nav-link b-nav-main"><a href="#">用户中心</a></li>-->
+			
+			<li class="pull-right b-loginStatus" id="b-loginStatus"></li>
+		</ul>
+	</div>
+</div>
+<script type="text/javascript">
+//顶部是否加载完毕
+var topLoadOver = false;
+var keyCode=0;
+document.onkeydown=function(event){
+    var e = event || window.event || arguments.callee.caller.arguments[0];
+    if(e && e.keyCode==13){ // enter 键
+        keyCode=13
+    }
+};
+
+$(function (){
+	isMobile = !$("#b-loginStatus").is(":visible");
+	$("#searchFormBtn").click(function(){
+		keyCode = 13;
+		$("form#searchForm").submit();
+	});
+	$("form#searchForm").submit(function(){
+		var input_val = $(this).children("[type='text']").val().replace(/^\s+|\s+$/g,"");
+		if(input_val==""){
+			input_val = $("#header-searchInput").attr('placeholder');
+		}
+		if (keyCode==13){
+	 		if(input_val==""||input_val=="请输入关键字"){
+				keyCode=0;
+				return false;
+			}else {
+				$("input[name='words']").val(input_val);
+				keyCode=0;
+				return true;
+			}	
+		}
+	});
+	//
+	$("[id='releaseService']").click(function(){
+		if(isLogined){
+			window.location.href = "/front/reurl";
+		}else{
+			loginModalShow(6);
+		}
+	});
+});
+</script>

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

@@ -1,8 +1,11 @@
 <style type="text/css">
 .member-left{
-	font-weight: 700;
+	font-weight: 100;
 	font-size: 14px;
 	color: #666;
+    width: 250px;
+	border: 1px solid #E5E6E9;
+	background-color: #fff;
 }
 .member_nav_a{
 	color: inherit;
@@ -23,8 +26,8 @@
 	white-space:nowrap;
 }
 #member_headImg img{
-	width: 70px;
-	height: 70px;
+	width: 80px;
+	height: 80px;
 }
 #member-left-headInfo{
 	cursor: auto;
@@ -36,7 +39,6 @@
 	vertical-align: middle;
 }
 #member-left-headInfo:hover{
-	background: none;
 	color: inherit;
 }
 .member-left .menu-childnode .menu-childnode2{
@@ -63,18 +65,50 @@
 .txbootleft{
 	float:left;
 	padding-left:5px;
-	
 }
 .txbootright{
 	float:right;
 	padding-right:5px;
 }
+#serviceMerchan,#personal,#vipMenu,#accountSetMenu{
+	height:45px;
+	font-size:16px;
+	border-top: 1px solid rgb(221, 221, 221);
+	border-bottom: 1px solid rgb(221, 221, 221);
+	margin-bottom:0px;
+	padding: 10px 45px;
+	font-weight: 700;
+}
+#serviceMerchan:hover,#personal:hover,#vipMenu:hover,#accountSetMenu:hover{
+	background-color:#e4e4e4;
+	color:#0099FA;
+}
+.list-group .list-group-item {
+	border:0px;
+    font-size: 14px;
+    color: #666666;
+	padding: 10px 0px 10px 70px;
+}
+a.list-group-item:hover{
+	background-color:#fff;
+}
+.member-right{
+	background-color:#fff;
+	padding:20px;
+	border: 1px solid #E5E6E9;
+}
+.b-round-dot {
+    background-color: rgb(255, 90, 95);
+}
+.index-new-head .head-hidemenu i {
+    color: rgb(255, 90, 95);
+}
 </style>
 {{$identWay := session "identWay"}}
 {{$s_role := printf "%v" (index (session "userInfo") "s_role")}}
 <div class="list-group" id="member-left-nav">
 	<a class="list-group-item" id="member-left-headInfo">
-		<div style="width:185px;text-align:center;">
+		<div style="width:235px;text-align:center;margin-top:20px;">
 			<div id="member_headImg">
 				{{$s_avatar := printf "%v" (index (session "userInfo") "s_avatar")}}
 				{{if session "headImg"}}
@@ -83,7 +117,7 @@
 					<img class="img-circle" src="{{$s_avatar}}" onerror="this.className='img-circle defaultHeadImg';this.src='/images/image_radius_bg.png'">
 				{{end}}
 			</div>
-			<div><span style="line-height:30px" class="member-loginName cursor-pointer" onclick="window.location.href = '/member/show/memberindex'">{{session "nickName"}}</span></div>
+			<div><span style="line-height:30px;font-size:16px;padding:5px 0px 10px;" class="member-loginName cursor-pointer" onclick="window.location.href = '/member/show/memberindex'">{{session "nickName"}}</span></div>
 			<div>
 			{{if session "credit_qd"}}
 				{{if eq (session "credit_qd") "y"}}
@@ -97,49 +131,49 @@
 			</div>
 		</div>
 	</a>
-	<a class="list-group-item" style="padding:10px 2px">
-	<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;" class="gold">{{session "i_credit"}}</span></div>
+	<a class="list-group-item" style="padding:5px 2px;">
+	<div style="line-height: 40px;width:248px;height:50px;text-align:center;">
+		<div onclick="creditModel(1)" style="float:left;width:120px;border-right:1px;">
+<!--			<div style="font-size: 12px;">积分</div>-->
+			<div><i class="glyphicon jinbi" style="width:20px;color:red;font-size:13px;margin-top: -7px;vertical-align: middle;"></i><span style="font-weight:700;font-size:16px;color:#FF5A5F;" class="gold">{{session "i_credit"}}</span><span class="font-size-12" style="color:#999999;"> 积分</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;">
-			<div>认证</div>
+		<div style="height:40px;float:left;width:1px;background-color:#e5e6e9"></div>
+		<div onclick="window.location.href='/member/accountset/index'" style="float:left;width:125px;">
+<!--			<div style="font-size: 12px;">认证</div>-->
 			<div>
 			{{if session "identType"}}
 				{{$identType := session "identType"}}
 				{{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>
+					<i class="glyphicon qyrz" style="width:25px;color:red;font-size:16px;margin-right:0px;"></i><span class="font-size-12" style="font-weight:normal;color:#999999;">已认证企业</span>
 					{{else}}
-					<i class="glyphicon qyrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">未认证企业</span>
+					<i class="glyphicon qyrz" style="width:25px;color:red;font-size:16px;margin-right:0px;"></i><span  class="font-size-12" style="font-weight:normal;color:#999999;">未认证企业</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>
+					<i class="glyphicon grrz" style="width:25px;color:red;font-size:16px;margin-right:0px;"></i><span  class="font-size-12" style="font-weight:normal;color:#999999;">已认证个人</span>
 					{{else}}
-					<i class="glyphicon grrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">未认证个人</span>
+					<i class="glyphicon grrz" style="width:25px;color:red;font-size:16px;margin-right:0px;"></i><span  class="font-size-12" style="font-weight:normal;color:#999999;">未认证个人</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>
+					<i class="glyphicon jgrz" style="width:25px;color:red;font-size:16px;margin-right:0px;"></i><span  class="font-size-12" style="font-weight:normal;color:#999999;">已认证机构</span>
 					{{else}}
-					<i class="glyphicon jgrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">未认证机构</span>
+					<i class="glyphicon jgrz" style="width:25px;color:red;font-size:16px;margin-right:0px;"></i><span  class="font-size-12" style="font-weight:normal;color:#999999;">未认证机构</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>
+				<i class="glyphicon grrz" style="width:25px;color:red;font-size:16px;margin-right:0px;"></i><span  class="font-size-12" style="font-weight:normal;color:#999999;">未认证</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>
+				<i class="glyphicon grrz" style="width:25px;color:red;font-size:16px;margin-right:0px;"></i><span  class="font-size-12" style="font-weight:normal;color:#999999;">未认证</span>
 			{{end}}
 			</div>
 		</div>
 	</div>
 	</a>
-	<a class="list-group-item" onclick="window.location.href = '/member/accountset/index'"><i class="glyphicon zhanghao"></i>账户设置</a>
-	<a class="list-group-item" onclick="window.location.href = '/member/swordfish/rssset'"><i class="glyphicon iconfontcolor71"></i>剑鱼（信息订阅）</a>
-	<a class="list-group-item" onclick="window.location.href = '/member/msgcenter'" id="msgCenter"><i class="glyphicon xiaoxi"></i>消息中心</a>
+	<div class="list-group-item" id="personal">个人菜单</div>
+	<a class="list-group-item" onclick="window.location.href = '/member/swordfish/rssset'">剑鱼（信息订阅）</a>
+	
 </div>
 <!-- vipcreditModal -->
 <div class="modal fade b-modal" id="vipcreditModal" tabindex="-1" role="dialog" aria-labelledby="vipcreditModalLabel">
@@ -210,6 +244,7 @@ var MemberLeftMenu = {
 		var html = "";
 
 		if(/^[2]$/.test(role)){//客服组长
+			html += this.accountSetMenu()+this.accountMenu()+this.messageMenu();
 			return;
 		}else if(role == "" || /^[9]$/.test(role)){//最大权限
 			html += this.myAppointment()+this.myDemand()+this.myYellowPageMenu(editEnterHref)+this.serverMenu(editEnterHref)+this.employeemanageMenu();
@@ -217,34 +252,48 @@ var MemberLeftMenu = {
 				html += this.callCenterMenu();
 			}
 			html += this.serviceMerchantMenu()+this.orderManageMenu()+this.bidManageMenu();
+			html += this.employeemanageMenu();
+			if(/^[3]$/.test(role)){//客服
+				html += this.callCenterMenu();
+			}
+			html += this.accountSetMenu()+this.accountMenu()+this.messageMenu();
 			html += this.vipMenu()+this.myCredit()+this.creditRule();
 		}else if(isCanEditEnt){
 			html += this.myYellowPageMenu(editEnterHref);
 			if(/^[1]$/.test(role)){//黄页编辑者
 				html += this.serverMenu(editEnterHref);
 			}
-			if(/^[3]$/.test(role)){//客服
-				html += this.callCenterMenu();
-			}
-			html += this.employeemanageMenu();
+			html += this.accountSetMenu()+this.accountMenu()+this.messageMenu();
 		}
 		$("#member-left-nav").append(html);
-		$("#serviceMerchan").click(function(){
-			$(this).children(".a-com-collapse").toggleClass("glyphicon-menu-up");
-			$(".menu-childnode").toggleClass("hide");
-		});
-		$("#vipMenu").click(function(){
-			$(this).children(".a-com-collapse2").toggleClass("glyphicon-menu-up");
-			$(".menu-childnode2").toggleClass("hide");
-		});
+		//$("#serviceMerchan").click(function(){
+		//	$(this).children(".a-com-collapse").toggleClass("glyphicon-menu-up");
+		//	$(".menu-childnode").toggleClass("hide");
+		//});
+		//$("#vipMenu").click(function(){
+		//	$(this).children(".a-com-collapse2").toggleClass("glyphicon-menu-up");
+		//	$(".menu-childnode2").toggleClass("hide");
+		//});
 	},
 	//实名认证菜单
 	autheMenu: function(){
 		return '<a class="list-group-item" onclick="window.location.href=\'/member/authentication/index\'"><i class="glyphicon shimingrenzheng"></i>实名1认证</a>';
 	},
+	//账户设置
+	accountMenu: function(){
+		return '<a class="list-group-item accountmenu" onclick="window.location.href = \'/member/accountset/index\'">账户设置</a>';
+	},
 	//服务商家菜单
 	serviceMerchantMenu: function(){
-		return '<a class="list-group-item" id="serviceMerchan"><i class="glyphicon gongshijianjie"></i>服务商家菜单<i class="a-com-collapse bootstrap-glyphicon glyphicon glyphicon-menu-down"></i></a>';
+		return '<div class="list-group-item" id="serviceMerchan">服务商家菜单</div>';
+	},
+	//帐号设置
+	accountSetMenu: function(){
+		return '<div class="list-group-item" id="accountSetMenu">帐号设置</div>';
+	},
+	//消息菜单
+	messageMenu: function(){
+		return '<a class="list-group-item" onclick="window.location.href = \'/member/msgcenter\'" id="msgCenter">网站消息</a>'
 	},
 	//员工管理菜单
 	employeemanageMenu: function(){
@@ -253,23 +302,23 @@ var MemberLeftMenu = {
 		if(!isCanEditEnt){
 			employeemanageHref = this.authentHref;
 		}
-		return '<a onclick="window.location.href=\''+employeemanageHref+'\'" class="list-group-item"><i class="glyphicon yuangongguanli"></i>员工管理</a>';
+		return '<a onclick="window.location.href=\''+employeemanageHref+'\'" class="list-group-item">员工管理</a>';
 	},
 	//客服中心菜单
 	callCenterMenu: function(){
 		return "";
-		return '<a onclick="openSChat()" class="list-group-item"><i class="glyphicon kefuzaixian"></i>客服中心</a>';
+		return '<a onclick="openSChat()" class="list-group-item">客服中心</a>';
 	},
 	//我的黄页菜单
 	myYellowPageMenu: function(href){
-		return '<a onclick="window.location.href=\''+href+'\'" class="list-group-item"><i class="glyphicon wodehuangye"></i>我的黄页</a>';
+		return '<a onclick="window.location.href=\''+href+'\'" class="list-group-item myyellow">我的黄页</a>';
 	},
 	//产品服务菜单
 	serverMenu: function(href){
 		if(this.authentHref != href){
 			href += '#service';
 		}
-		return '<a onclick="window.location.href=\''+href+'\'" class="list-group-item"><i class="glyphicon fuwu"></i>产品服务</a>';
+		return '<a onclick="window.location.href=\''+href+'\'" class="list-group-item">产品服务</a>';
 	},
 	//微官网菜单
 	microwebsiteMenu: function(){
@@ -277,31 +326,31 @@ var MemberLeftMenu = {
 	},
 	//我预约的服务
 	myAppointment: function(){
-		return '<a onclick="window.location.href=\'/member/myAppointment\'" class="list-group-item"><i class="glyphicon falvshengming"></i>我预约的服务</a>';
+		return '<a onclick="window.location.href=\'/member/myAppointment\'" class="list-group-item myappointment">我预约的服务</a>';
 	},
 	//我发布的需求
 	myDemand: function(){
-		return '<a onclick="window.location.href=\'/member/myDemand\'" class="list-group-item"><i class="glyphicon gongshixinxi"></i>我发布的需求</a>';
+		return '<a onclick="window.location.href=\'/member/myDemand\'" class="list-group-item mydemand">我发布的需求</a>';
 	},
 	//订单管理
 	orderManageMenu: function(){
-		return '<a onclick="window.location.href=\'/member/orderManage\'" class="menu-childnode list-group-item"><i class="glyphicon"></i>订单管理</a>';
+		return '<a onclick="window.location.href=\'/member/orderManage\'" class="menu-childnode list-group-item ordermanage">订单管理</a>';
 	},
 	//需求管理
 	bidManageMenu: function(){
-		return '<a onclick="window.location.href=\'/member/bidManage\'" class="menu-childnode list-group-item"><i class="glyphicon"></i>投标管理</a>';
+		return '<a onclick="window.location.href=\'/member/bidManage\'" class="menu-childnode list-group-item bidmanage">投标管理</a>';
 	},
 	//vip会有菜单
 	vipMenu: function(){
-		return '<a class="list-group-item" id="vipMenu"><i class="glyphicon jinbi"></i>会员中心<i class="a-com-collapse2 bootstrap-glyphicon glyphicon glyphicon-menu-down"></i></a>';
+		return '<div class="list-group-item" id="vipMenu">会员中心</div>';
 	},
 	//我的积分
 	myCredit: function(){
-		return '<a onclick="creditModel(1)" class="menu-childnode2 list-group-item" data-target="#vipcreditModal"><i class="glyphicon"></i>我的积分</a>';
+		return '<a onclick="creditModel(1)" class="menu-childnode2 list-group-item mycredit" data-target="#vipcreditModal">我的积分</a>';
 	},
 	//积分规则
 	creditRule: function(){
-		return '<a href="/member/credit/creditRule" class="menu-childnode2 list-group-item"><i class="glyphicon"></i>积分规则</a>';
+		return '<a href="/member/credit/creditRule" class="menu-childnode2 list-group-item credit">积分规则</a>';
 	}
  };
 $(function (){

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

@@ -4,8 +4,10 @@
 	<div class="b-nav index-new-nva">
 		<ul>
 			<li class="b-nav-logo"><a href="/"><img src="/images/logo.png" class="logo"></a></li>
-			<li class="b-nav-link b-nav-main"><a href="#">新闻资讯</a></li>
-			<li class="b-h-search">
+			<li class="b-nav-link b-nav-main"><a href="/front/content_qykb_list.html">新闻资讯</a></li>
+			<li class="b-nav-link b-nav-other index-new-nva-c"><a href="/front/content_qykb_list.html" class="news"  id="qykb">新闻资讯</a><a class="b-nav-s"></a></li>
+			<li class="b-nav-link b-nav-other index-new-nva-c"><a id="zhsk"  href="/front/content_zhsk_list.html">知识库</a></li>
+			<li class="b-h-search hidden">
 				<div class="input-group">
 			        <div class="input-group-btn hide">
 			        	<button type="button" id="header-searchBtn" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><font>服务</font><span class="hide caret margin-l-10"></span></button>

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

@@ -4,7 +4,7 @@
 	<div class="b-nav index-new-nva">
 		<ul>
 			<li class="b-nav-logo"><a href="/"><img src="/images/logo.png" class="logo"></a></li>
-			<li class="b-nav-link b-nav-main"><a href="#">政策法规</a></li>
+			<li class="b-nav-link b-nav-main"><a href="/front/content_zcfg_list.html">政策法规</a></li>
 			<li class="b-h-search">
 				<div class="input-group">
 			        <div class="input-group-btn hide">

core/src/web/templates/index.html

@@ -80,8 +80,8 @@
 						<br><a href="/market/050101/list.html">寻找法律援助</a>
 					</div>
 					<div class="a-com-six hidden-xs">
-						<img  data-original="/images/wdzx.png" class="lazy" >
-						<br><a href="/market/030301/list.html">网店装修</a>
+						<img  data-original="/images/more.png" class="lazy" >
+						<br><a href="/market/0/list.html">更多</a>
 					</div>
 				</li>
 			</ul>
@@ -147,14 +147,39 @@
 	-->
 	<div class="a-panel a-qysq">
 		<div class="a-com-title text-center index-new-title"><font><a target="_blank" href="/search/enterprise/ent.html">企业社区</a></font><br/><span class="hidden-xs">官方数据来源，提供详尽企业信息，及时掌握企业社会关系情报</span></div>
-		<div class="row index-new-qysq-con">
-			{{$s:=(Ad "index-center-06" 4)}}
-			{{range $k,$v := $s}}
-			<div class="index-new-qysqlist text-center"  style="{{if gt $k 0}} border-left:1px solid #E5E6E9; {{end}}">
-			<a  target="_blank" href="{{$v.s_link}}"{{if ge $k 2}} class="hidden-xs"{{end}}><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}}  data-original="{{if $v.s_pic}}{{$v.s_pic}}{{else}}/images/u166.png{{end}}" class="lazy"  onerror="this.src='/images/u166.png'"></a>
+		<div class="row index-new-qysq-con text-center">
+			<div id="myCarousel" class="carousel slide" style="height:300px;">  
+			   <!-- 轮播（Carousel）项目 -->
+			   <div class="carousel-inner">
+			         	{{$s:=(Ad "index-center-06" 16)}}
+			      <div class="item active itemno">
+						<div class="index-qysq">
+						{{range $k,$v := $s}}
+						{{if eq $k 4}}</div><div class="index-qysq">{{end}}
+						
+						{{if eq $k 8}} </div></div><div class="item itemno"><div class="index-qysq">{{end}}
+			    		{{if eq $k 12}}</div><div class="index-qysq">{{end}}
+				
+						<div class="index-new-qysqlist text-center">
+						<a  target="_blank" href="{{$v.s_link}}"{{if ge $k 2}} class="hidden-xs"{{end}}><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}}  data-original="{{if $v.s_pic}}{{$v.s_pic}}{{else}}/images/u166.png{{end}}" class="lazy"  onerror="this.src='/images/u166.png'"></a>
+						</br>
+						<a  target="_blank" href="{{$v.s_link}}" class="index-qysq-name font-size-12
+">{{$v.s_remark}}</a>
+						</div>
+						{{end}}
+						</div>
+			      </div>
+			    
+			   </div>
+			
+			   <!-- 轮播（Carousel）导航 -->
+			   <a class="carousel-control" href="#myCarousel" 
+			      data-slide="prev"><img id="qysq-left" src="/images/qysq-left.png"></a>
+			   <a class="carousel-control rightmenu" href="#myCarousel" 
+			      data-slide="next"><img id="qysq-right" src="/images/qysq-right.png"></a>
+			
 			</div>
-			{{end}}
-		</div>
+		</div> 
 	</div>
 			
 	<div class="a-panel hidden-xs index-new-wgw">
@@ -310,6 +335,10 @@
 </div>
 {{include "/common/bottom.html"}}
 <script>
+var itm = $(".itemno").length;
+if (itm < 2){
+	$(".carousel-control").addClass("hidden");
+}
 $(function(){
 var areload=$("a.reload");
 areload.click(function(){

core/src/web/templates/manage/web_help.html

@@ -235,6 +235,7 @@
 	</div>
 	</div>
 	<div id="help-content-2" class="help-opinioncontent hidden">
+	<div style="color:#cccccc;height:46px;line-height:46px;border-bottom:1px solid #E5E6E9;padding-left:40px;">您在企明星遇到任何问题，请在这里告诉我们，我们的工作人员会及时处理，感谢您的宝贵意见！</div>
 	<div class="help-opinionarticle">
 	
 		<form class="validForm form-horizontal" role="form" id="insertback" method="post">

core/src/web/templates/manage/web_newexpresslist.html

@@ -5,10 +5,11 @@
 <meta name="Keywords" content="{{Msg "seo" "qfw.newexpress.key"}}"/>
 <meta name="Description" content="{{Msg "seo" "qfw.newexpress.description"}}"/>
 <script src="/js/validform-min.js"></script>
+<script src="/js/jquery.cookie.js"></script>
 <style type="text/css">
 <!--
 body{
-background-color:#FFFFFF;
+background-color:#F0F0F0;
 }
 #content thead{
 display:none;
@@ -60,11 +61,94 @@ font-weight:normal;
 	background-color: #FF5A5F;
 }
 .a-content{
-	margin-top:20px;
+	margin-top:10px;
+	margin-bottom:10px;
 }
 .b-head .head-hidemenu li:hover {
     background-color: #FF5A5F;
 }
+.b-round-dot {
+    background-color: #FF5A5F;
+}
+.index-new-head .head-hidemenu i {
+    color: #FF5A5F;
+}
+.news-left{
+	width:75%;
+	float:left;
+}
+.news-right{
+	width:24%;
+	float:left;
+}
+.news-right .hotnews{
+	width:100%;
+	height:45px;
+	background-color:#F7F8FA;
+	border:1px solid #e5e6e9;
+	line-height:45px;
+	padding-left:20px;
+	margin-left:10px;
+	font-size: 18px;
+	border-bottom:0px;
+}
+.hotnewslists{
+	width:100%;
+	border:1px solid #e5e6e9;
+	padding:20px 10px;
+	margin-left:10px;
+	display:block;
+	height:380px;
+	background-color:#fff;
+	
+}
+.hotnewslists ul{
+	width:100%;
+	height:33px;
+	line-height:33px;
+}
+.lifirst{  
+	background-color: #ff5a5f;
+    text-align: center;
+    width: 15px;
+    height: 15px;
+    line-height: 16px;
+    color: #fff;
+    margin-top: 9px;
+	margin-right:5px;
+}
+.lisecond{
+	width:210px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+.lithree{
+	float:right;
+	color:#999;
+}
+.newsdiv1{
+	font-size:14px;
+	line-height:24px;
+	color: #000000;
+	height:50px;
+    overflow: hidden;
+	margin: 7px -40px 5px 0px;
+}
+.newsdiv2{
+	margin-right:20px;
+	color:#999;
+}
+#newsdiv{
+	margin-left:-45px;
+}
+.news-left #content{
+	border-top-left-radius: 0px;
+}
+.forwat{
+	color:#ff5a5f !important;
+	font-weight:bold;
+}
 </style>
 </head>
 <body>
@@ -91,8 +175,9 @@ font-weight:normal;
 		</div>
 		</div>-->
 		<div style="clear:both;"></div>
+		<div class="news-left">
 <!-- 中间 -->
-		<div class="row" style=" margin:0 auto; margin-top:10px;">
+		<div class="row" style=" margin:0 auto;">
 		<div id="content">
 		<div id="audit" class="clearfix">
 		<table class="table table-hover">
@@ -100,15 +185,31 @@ font-weight:normal;
 		{{range $k,$v:=.T.data}}
 		<tr>
 		<td>
-		<div class="form-group" >
-        <div class="col-sm-2 control-label" for="name" style="">
-		<img class="newListImg" style="width:100%; height:185px;border-radius: 4px;border:1px solid #CCCCCC; padding:2px;" src="{{if (index $v "s_pic1")}}{{index $v "s_pic1"}}{{else}}{{index $v "s_pic"}}{{end}}"/>
+		<div style="margin:15px 0px 0px 3px;"><a target="_blank" href="/front/webcontent/{{index $v "_id"}}.html" style="font-weight: bold; font-size: 16px;">{{index $v "s_title"}}</a></div>
+		<div class="form-group" style="margin-top:10px;height: 90px;" >
+        <div class="col-sm-3 control-label" for="name">
+		<img class="newListImg" style="width:150px;height:90px; padding:2px;" src="{{if (index $v "s_pic1")}}{{index $v "s_pic1"}}{{else}}{{index $v "s_pic"}}{{end}}"/>
+		</div>
+	    <div class="col-sm-9 control-label" for="name" id="newsdiv">
+		<div class="newsdiv1">{{if eq (index $v "s_content") ""}}{{index $v "s_description"}}{{else}}{{index $v "s_content"}}{{end}}</div>
+		<div class="newsdiv2 font-size-12">
+			<div style="float:left;">{{if eq (index $v "releasetime") ""}}{{index $v "l_createdate"}}{{else}}{{index $v "releasetime"}}{{end}}</div>
+			<div style="float:left;padding:0px 25px;"><i onClick='up({{index $v "_id"}},{{index $v "praise"}},{{$k}})' class="glyphicon zan"  style="cursor:pointer;"></i> <span class="bds_dz{{$k}}">{{index $v "praise"}}</span></div>
+			<div>{{index $v "s_source"}}</div>
+			<div style="float:left;" class="a-twostage-toolbar text-muted hidden">
+				<a class="pull-left" style="line-height: 25px;" onclick="$('#share').show('normal')"><span class="glyphicon fenxiang " style="font-size:12px;margin:0px 0px 0px 5px;color:#999;"></span><span style="color:#999;">分享</span></a>
+				<div class="bdsharebuttonbox " style="margin:-1px 0 0 0px;" id="share">
+					<a href="#" class="bds_qzone" data-cmd="qzone" title="分享到QQ空间"></a>
+					<a href="#" class="bds_tsina" data-cmd="tsina" title="分享到新浪微博"></a>
+					<a href="#" class="bds_tqq" data-cmd="tqq" title="分享到腾讯微博"></a>
+					<a href="#" class="bds_weixin" data-cmd="weixin" title="分享到微信"></a>
+					<a href="#" class="bds_renren" data-cmd="renren" title="分享到人人"></a>
+				</div>
+			</div>
+			<div style="clear:both;"></div>
+			
 		</div>
-	    <div class="col-sm-10" class="control-label" for="name" >
-		<div><a target="_blank" href="/front/webcontent/{{index $v "_id"}}.html" style="font-weight: bold; font-size: 16px;">{{index $v "s_title"}}</a></div>
-		<div><p style="font-size:14px;  padding:10px 0px; color: #999999;" >{{if eq (index $v "s_author") ""}}{{else}}作者：{{index $v "s_author"}}　　{{end}}文章来源：{{index $v "s_source"}}　　发布日期：{{if eq (index $v "releasetime") ""}}{{index $v "l_createdate"}}{{else}}{{index $v "releasetime"}}{{end}}
-		<span style="float:right; color:#CCCCCC;"><img style="width:18px;" src="/images/u164.png"/> <div style="float:right; color:#999999; margin-top:-48px; margin-right:-15px;">{{index $v "praise"}}</div></span></p></div>
-		<div style=" font-size:14px;line-height:24px;color: #000000;">{{if eq (index $v "s_content") ""}}{{index $v "s_description"}}{{else}}{{index $v "s_content"}}{{end}}</div>
+		
 		</div>
 		</div>
 		</td>
@@ -119,7 +220,7 @@ font-weight:normal;
 		</tbody>
 		</table>
 		<div>
-		<div class="text-center" style="margin-top: -20px;">
+		<div class="text-center">
 		<ul class="pagination">
 		{{range $k,$v:=.T.pagination}}
 			<li {{if index $v "iscurrent"}}class="disabled active"{{end}}>
@@ -134,9 +235,31 @@ font-weight:normal;
 		</div>
 		</div>
 		</div>
+		<div class="news-right">
+		<div class="hotnews">热门资讯</div>
+		<div class="hotnewslists">
+		
+		</div>
+		</div>
+		<div style="clear:both;"></div>
+		</div>
 {{include "/common/bottom.html"}}
 <script src="/js/qfwtable.js"></script>
 <script type="text/javascript">
+
+	var ctp = {{.T.querymap.contentType}};
+	if (ctp == "qykb"){
+		$("#qykb").addClass("forwat");
+	}else if(ctp == "zhsk"){
+		$("#zhsk").addClass("forwat");
+		
+	}
+	var html = ""
+	{{range $k,$v:=.T.hotnews}}
+		var k = {{$k}}+1
+		html += '<ul><li class="lifirst font-size-12" style="{{if gt $k 2}}background-color:#ccc;{{end}}">'+k+'</li><li class="lisecond"><a target="block" href="/front/webcontent/{{index $v "_id"}}.html">{{index $v "s_title"}}</a></li><li class="lithree text-center font-size-12">{{index $v "praise"}}</li></ul>'
+	{{end}}
+	$(".hotnewslists").append(html);
   	$(".rowImg").closest("tr").hover(function(){
 		$(".rowImg img",$(this)).attr("src","/images/xwzx1.png")
 	},function(){
@@ -155,7 +278,7 @@ function currPos(){
 $(function (){
 	//setNavbarActive(4);
 	//
-	$(".newListImg").height($(".newListImg").width());
+	//$(".newListImg").height($(".newListImg").width());
 	//
 	$(".backTop").click(function (){
 		$(window).scrollTop(0);
@@ -178,7 +301,34 @@ $(function (){
 		}
 	});
 });
-</script>
 
+var up = function (djno,praise,i){    
+    var no = djno;
+	var original = praise
+	var updown = $.cookie("_cms_updown_" + no);
+	if (updown) {
+		alert("您已经赞过了！");
+		return;
+	}else{
+		$.cookie("_cms_updown_"+ no,original+1,{expires:1} );
+		updown = $.cookie("_cms_updown_" + no);
+	}
+	$(".bds_dz").find("span").text(updown);
+
+    $.ajax({    
+        type:'post',        
+        url:'/front/praise/exp',    
+        data:{praise:original,_id:no},    
+        cache:false,    
+        dataType:'json', 
+        success:function(data){
+		 if (data.flag) {
+		     $(".bds_dz"+i).html(data.praise);
+		 }	  
+        }    
+        });  
+}
+</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>
 </body>
 </html>

core/src/web/templates/manage/web_regulationslist.html

@@ -5,6 +5,9 @@
 <meta name="Keywords" content="{{Msg "seo" "qfw.regulations.key"}}"/>
 <meta name="Description" content="{{Msg "seo" "qfw.regulations.description"}}"/>
 <style type="text/css">
+body{
+	background-color:#F0F0F0;
+}
 #audit td{
 	border:none;
 	border-bottom:1px solid #eeeeee;
@@ -25,18 +28,58 @@
     background-color: #FF7F47;
 }
 .a-content{
-	margin-top:20px;
+	margin-top:10px;
+	margin-bottom:10px;
 }
 .b-head .head-hidemenu li:hover {
     background-color: #FF7F47;
 }
+.b-round-dot {
+    background-color: #FF7F47;
+}
+.index-new-head .head-hidemenu i {
+    color: #FF7F47;
+}
+.nav-tabs li.active {
+    border-top: 3px solid #FF7F47;
+	margin-left: 20px;
+}
+.nav-tabs > li {
+    width: 110px;
+}
+.nav-tabs #c_all{
+	padding-left:35px;
+}
+.nav-tabs > li.active > a, .nav-tabs > li.active > a:hover{
+	border:0px;
+}
+.nav-tabs{
+	height: 45px;
+	border:0px;
+	background-color:#F6F8FA;
+}
+.reg-left{
+	width:79%;
+	float:left;
+	background-color: #fff;
+}
+.reg-right{
+	width:20%;
+	float:left;
+	background-color:#fff;
+	margin-left:10px;
+	padding-top:45px;
+}
+#audit{
+	padding:10px 40px;
+}
 </style>
 </head>
 <body>
 <!-- 头部 -->
 {{include "/common/reghead.html"}}
 <div class="a-content">
-
+	<div class="reg-left">
 		<!--<div class="container-fluid">
 		<div class="row text-center" style="height:100px;margin-top:5px;">
 		<div class="col-lg-4 col-md-5  hidden-sm hidden-xs ">
@@ -60,7 +103,7 @@
     <div class="borderB text-primary fontb frontS">所有分类</div>-->
 	<!--筛选条件_begin-->
 	
-    <ul class="nav nav-tabs" style="margin-top:10px;position:relative">
+    <ul class="nav nav-tabs" style="margin-bottom:0px;position:relative">
                <li class="active"><a href="#home" data-toggle="tab" id="c_all" name="all" value="c_all">全部</a></li>
                <li style=" display:none;" role="presentation"><a href="#" role="tab" data-toggle="tab">日期</a></li>
 			<li style=" display:none;" role="presentation"><a href="#" role="tab" data-toggle="tab">颁发单位</a></li>
@@ -69,15 +112,15 @@
 	
 
 				
-          <div id="audit" style="margin-top:3px;" class="clearfix">
+          <div id="audit" class="clearfix">
 		  <div class="dt-table-wrapper" style="min-height: 420px;">
 		  <table class="table table-hover">
 		  <tbody>
 		  {{range $k,$v:=.T.data}}
 			  <tr>
 			  <td>
-			  <div style="margin-top:10px;font-weight: bold;font-size:16px;"><a target="_blank"  href="/front/webregulationscontent/{{index $v "_id"}}.html">{{index $v "s_title"}}</a></div><div style=" font-size:12px; color:#666666; margin:15px 0px 5px 0; font-family: tahoma, arial, 'Hiragino Sans GB', 宋体, sans-serif; font-weight: 400; font-style:normal;"><span style="">发布日期：{{index $v "l_createdate"}}</span>　|　<span>所属类别：{{index $v "s_code"}}</span></div>
-			  <div style=" font-size:14px;line-height:24px;color: #000000; width:80%; padding: 5px 0px;">{{if eq (index $v "s_content") ""}}{{index $v "s_mbcontent"}}......{{else}}{{index $v "s_content"}}{{end}}</div>
+			  <div style="margin-top:10px;font-weight: bold;font-size:16px;"><a target="_blank"  href="/front/webregulationscontent/{{index $v "_id"}}.html">{{index $v "s_title"}}</a></div><div style=" font-size:12px; color:#999; margin:15px 0px 5px 0; font-family: tahoma, arial, 'Hiragino Sans GB', 宋体, sans-serif; font-weight: 400; font-style:normal;"><span style="">发布日期：{{index $v "l_createdate"}}</span>　|　<span>所属类别：{{index $v "s_code"}}</span></div>
+			  <div style=" font-size:14px;line-height:24px;color: #000000; padding: 10px 0px;">{{if eq (index $v "s_content") ""}}{{index $v "s_mbcontent"}}......{{else}}{{index $v "s_content"}}{{end}}</div>
 			  </td>
 			  </tr>
 			{{else}}
@@ -89,21 +132,32 @@
 		  </table>
 		  </div>
 		  <div>
-		  <div class="text-center" style="margin-top: -20px;">
-		  <ul class="pagination">
-		  {{range $k,$v:=.T.pagination}}
-			<li {{if index $v "iscurrent"}}class="disabled active"{{end}}>
-			<a {{if index $v "iscurrent"}}  style="background-color:#f5f5f5" href="#"{{else}}href="{{index $v "url"}}"{{end}}>{{index $v "page"}}</a>
-			
-			</li>
-		{{end}}
-		  </ul>
-		  </div>
+			  <div class="text-center" style="margin-top: -20px;">
+				  <ul class="pagination">
+				  {{range $k,$v:=.T.pagination}}
+					<li {{if index $v "iscurrent"}}class="disabled active"{{end}}>
+					<a {{if index $v "iscurrent"}}  style="background-color:#f5f5f5" href="#"{{else}}href="{{index $v "url"}}"{{end}}>{{index $v "page"}}</a>
+					
+					</li>
+				{{end}}
+				  </ul>
+			  </div>
 		  </div>
-		  </div>
-
-           </div>
-        </div>
+		 
+		
+		 </div>
+	</div>
+	
+	
+    <div class="reg-right text-center">
+		<div>
+		<img src="/images/u109.png"/>
+		</div>
+		<div style="margin:20px 0px 30px 0px;">
+		关注微信公众号：企明星
+		</div>
+	</div>      
+	<div style="clear:both;"></div>
 </div>
 {{include "/common/bottom.html"}}
 <!--selfPage_js_begin-->

core/src/web/templates/manage/webcontent-new.html

@@ -0,0 +1,204 @@
+<html>
+<head>
+<title>{{.T.s_title}}_政策法规_企明星</title>
+{{include "/common/inc.html"}}
+<meta name="Keywords" content="{{.T.s_keywords}}"/>
+<meta name="Description" content="{{.T.s_description}}"/>
+<script src="/js/validform-min.js"></script>
+<script src="/js/jquery.cookie.js"></script>
+<style type="text/css">
+body{
+	background-color:#F0F0F0;
+}
+#content { margin-left:0px;}
+.serachCondition{background-color:#F0F0F0;padding:10px;margin-top:10px;height:138px;border:1px solid #ADADAD;padding-left:30px;}
+.search li a{font-size:13px;}
+.active{background-color:#6CC3FF}
+.widget-box { background-color:#FFFFFF; border:0px;}
+.widget-content { border:0px;}
+
+.b-nav-main{
+	background-color: #FF7F47;
+}
+.b-nav{
+	border-top-color: #FF7F47;
+}
+.b-head .b-h-search form>span{
+	background-color: #FF7F47;
+}
+.b-head  .b-com-five {
+    background-color: #FF7F47;
+}
+.a-content{
+	margin-top:20px;
+}
+.b-head .head-hidemenu li:hover {
+    background-color: #FF7F47;
+}
+.b-round-dot {
+    background-color: #FF7F47;
+}
+.index-new-head .head-hidemenu i {
+    color: #FF7F47;
+}
+.reg-left{
+	width:79%;
+	float:left;
+	background-color: #fff;
+}
+.reg-right{
+	width:20%;
+	float:left;
+	background-color:#fff;
+	margin-left:10px;
+	padding-top:45px;
+}
+.regmul{
+	font-size:12px; 
+	border-bottom:1px dashed #98D6DC; 
+	padding-bottom:30px; 
+	color: #999999;
+}
+.reg-content{
+	font-size:14px; 
+	line-height:25px; 
+	margin-top:20px;
+}
+.reg-title{
+	font-weight:400; 
+	padding:30px 25px 10px 25px;
+	font-size:32px;
+}
+.one{
+	float:left;
+	width:40%;
+	text-align:right;
+	color:#000;
+	font-size:14px;
+}
+.one span{
+	cursor:pointer;
+	margin-left:6px;
+	margin-right:6px;
+}
+.text-muted{
+	margin-left:62px;
+}
+</style>
+</head>
+<body>
+{{include "/common/reghead.html"}}
+<!-- 中间 -->
+<div class="a-content">
+<div class="hidden">{{include "/manage/kb_slider.html"}}</div>
+	<div class="reg-left">
+		<div id="content" style=" border:1px solid #CCCCCC; border-top-left-radius:0px; margin-bottom:30px;">	
+			<div class="container-fluid">
+				<div class="row-fluid">
+					<div class="span12">		
+						<div class="widget-box">
+							<div class="widget-content nopadding">
+							<div style="margin:auto; margin-bottom:80px;">
+							
+							<div style="clear:both;"></div>
+							<h4><p class="reg-title text-center">{{.T.s_title}}</p></h4>
+							<div class="regmul" >
+								<p class="text-center">　　  发布日期： {{if eq .T.l_createdate "1970-01-01"}}-------{{else}}{{.T.l_createdate}}{{end}}　　文章来源：{{if eq .T.s_url ""}}{{.T.s_source}}{{else}}<a style="font-size:14px; color:#0000FF;" target="_blank" href="{{.T.s_url}}">{{if eq .T.s_code "gjgszj-fl"}}国家工商总局-法律{{else if eq .T.s_code "gjgszj-xzfggfxwj"}}国家工商总局-行政法规、法规性文件{{else}}国家工商总局-行政规章及规范性文件{{end}}</a>{{end}}</p>
+								<div style="width:916px;" class="text-center">
+									<div class="one">
+									【字体：<span onClick="change(1)">大</span><span onClick="change(2)">中</span><span onClick="change(3)">小</span>】
+									</div>
+									<div style="float:left;" class="a-twostage-toolbar text-muted">
+										<a class="pull-left" style="line-height: 25px;" onclick="$('#share').show('normal')"><span class="glyphicon fenxiang " style="font-size:14px;margin:0px 0px 0px 5px;color:#ff5a5f;"></span><span style="font-size:14px;color:#ff5a5f;">分享</span></a>
+										<div class="bdsharebuttonbox " style="margin:-1px 0 0 0px;" id="share">
+											<a href="#" class="bds_qzone" data-cmd="qzone" title="分享到QQ空间"></a>
+											<a href="#" class="bds_tsina" data-cmd="tsina" title="分享到新浪微博"></a>
+											<a href="#" class="bds_tqq" data-cmd="tqq" title="分享到腾讯微博"></a>
+											<a href="#" class="bds_weixin" data-cmd="weixin" title="分享到微信"></a>
+											<a href="#" class="bds_renren" data-cmd="renren" title="分享到人人"></a>
+										</div>
+									</div>
+									<div style="clear:both;"></div>
+								</div>
+								
+							</div>	
+							<div class="reg-content">
+							    {{.T.s_content}}
+							</div>
+							  
+							<div style="clear:both;"></div>
+							<div style="padding:20px 15px; margin-top:15px;">{{if .T.firstid }}<span style="font-size:14px;">上一篇：　<a href="/front/webregulationscontent/{{.T.firstid}}.html" class="ftnt">{{.T.firsttitle}}</a></span>{{else}}{{end}}</div>
+							<div style="padding:10px 15px;">{{if .T.nextid }}<span style="font-size:14px;" >下一篇：　<a href="/front/webregulationscontent/{{.T.nextid}}.html" class="ftnt">{{.T.nexttitle}}</a></span>{{else}}{{end}}</div>
+							<div style="clear:both;"></div>
+
+	                          </div>
+							</div>
+						</div>
+					</div>
+				</div>
+
+			</div>
+			
+		</div>
+	</div>
+	
+	<div class="reg-right text-center">
+		<div>
+		<img src="/images/u109.png"/>
+		</div>
+		<div style="margin:20px 0px 30px 0px;">
+		关注微信公众号：企明星
+		</div>
+	</div>
+	<div style="clear:both;"></div>
+</div>
+{{include "/common/bottom.html"}}
+<script type="text/javascript">
+//setNavbarActive(3);
+function currPos(){
+   return [["政策法规","/front/content_zcfg_list.html"]]
+}
+
+$(function (){ 
+	$(".backTop").click(function (){
+		$(window).scrollTop(0);
+	});
+ 
+});
+
+$(function(){
+	var _id = {{.T._id}}
+	var updown = $.cookie("_cms_updown_" + _id);
+	//$(".bds_dz").find("span").text(updown);
+});
+
+var up = function (djno){    
+    var no = djno;
+	var original = {{if .T.praise}}{{.T.praise}}{{else}}0{{end}}
+	var updown = $.cookie("_cms_updown_" + no);
+	if (updown) {
+		alert("您已经赞过了！");
+		return;
+	}else{
+		$.cookie("_cms_updown_"+ no,original+1,{expires:1} );
+		updown = $.cookie("_cms_updown_" + no);
+	}
+	$(".bds_dz").find("span").text(updown);
+
+    $.ajax({    
+        type:'post',        
+        url:'/front/praise/reg',    
+        data:{praise:original,_id:'{{.T._id}}'},    
+        cache:false,    
+        dataType:'json', 
+        success:function(data){
+		 if (data.flag) {
+		     $(".bds_dz").find("span").html(data.praise);
+		 }	  
+        }    
+        });  
+}
+</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>
+</body>
+</html>

core/src/web/templates/manage/webcontent.html

@@ -7,6 +7,9 @@
 <script src="/js/validform-min.js"></script>
 <script src="/js/jquery.cookie.js"></script>
 <style type="text/css">
+body{
+	background-color:#F0F0F0;
+}
 #content { margin-left:0px;}
 .serachCondition{background-color:#F0F0F0;padding:10px;margin-top:10px;height:138px;border:1px solid #ADADAD;padding-left:30px;}
 .search li a{font-size:13px;}
@@ -21,10 +24,34 @@
 #share a.bds_dz{ background:url(/images/u78.png); background-position: 62px -6px; width:65; height:34;}
 #share a.bds_more{ background:url(); margin-top:13px;}
 .bdsharebuttonbox{float: left;margin: 0px 0px 0px 0px; display:block;}
+.b-nav-main{
+	background-color: #FF7F47;
+}
+.b-nav{
+	border-top-color: #FF7F47;
+}
+.b-head .b-h-search form>span{
+	background-color: #FF7F47;
+}
+.b-head  .b-com-five {
+    background-color: #FF7F47;
+}
+.a-content{
+	margin-top:20px;
+}
+.b-head .head-hidemenu li:hover {
+    background-color: #FF7F47;
+}
+.b-round-dot {
+    background-color: #FF7F47;
+}
+.index-new-head .head-hidemenu i {
+    color: #FF7F47;
+}
 </style>
 </head>
 <body>
-{{include "/common/head.html"}}
+{{include "/common/reghead.html"}}
 <!-- 中间 -->
 <div class="a-content">
 <div style="display:none;">{{include "/manage/kb_slider.html"}}</div>
@@ -72,7 +99,7 @@
 </div>
 {{include "/common/bottom.html"}}
 <script type="text/javascript">
-setNavbarActive(3);
+//setNavbarActive(3);
 function currPos(){
    return [["政策法规","/front/content_zcfg_list.html"]]
 }

core/src/web/templates/manage/webexpresscontent.html

@@ -22,6 +22,27 @@
 .ftnt:hover{ text-decoration: none;}
 .firstimg{ width:100%;}
 .bdsharebuttonbox{float: left;margin: 0px 0px 0px 0px; display:block;}
+.b-nav-main{
+	background-color: #FF5A5F;
+}
+.b-nav{
+	border-top-color: #FF5A5F;
+}
+.b-head .b-h-search form>span{
+	background-color: #FF5A5F;
+}
+.a-content{
+	margin-top:20px;
+}
+.b-head .head-hidemenu li:hover {
+    background-color: #FF5A5F;
+}
+.b-round-dot {
+    background-color: #FF5A5F;
+}
+.index-new-head .head-hidemenu i {
+    color: #FF5A5F;
+}
 </style>
 <script type="text/javascript">
 $(document).ready(function(){
@@ -56,7 +77,7 @@ $(document).ready(function(){
 
 </head>
 <body>
-{{include "/common/head.html"}}
+{{include "/common/newshead.html"}}
         <div class="a-content">
 		
 	     <!--<div class="col-md-3 logoDiv" style=" height:80px; width:200px;">
@@ -130,7 +151,7 @@ $(document).ready(function(){
 	</div>
 {{include "/common/bottom.html"}}
 <script type="text/javascript">
-setNavbarActive(4);
+//setNavbarActive(4);
 function currPos(){
    return [["新闻资讯","/front/content_qykb_list.html"]]
 }

core/src/web/templates/member/accountset/bindmail.html

@@ -12,14 +12,14 @@
 </head>
 <body>
 <!-- 头部 -->
-{{include "/common/head.html"}}
+{{include "/common/centerhead.html"}}
 <!-- 中间 -->
 <div class="a-content member-content">
 	<div class="member-left">
 		{{include "/common/memberleft.html"}}
 	</div>
 	<div class="member-right">
-		<div class="panel-title-out"><i class="glyphicon youjian"></i><span>绑定邮箱</span></div>
+		<div class="panel-title-out"><i class="glyphicon youjian" style="color:#FF5A5F;"></i><span>绑定邮箱</span></div>
 		<div class="panel panel-default member-panel">
 			<div class="panel-body">
 				<div class="form-horizontal">

core/src/web/templates/member/accountset/bindphone.html

@@ -11,14 +11,14 @@
 </head>
 <body>
 <!-- 头部 -->
-{{include "/common/head.html"}}
+{{include "/common/centerhead.html"}}
 <!-- 中间 -->
 <div class="a-content member-content">
 	<div class="member-left">
 		{{include "/common/memberleft.html"}}
 	</div>
 	<div class="member-right">
-		<div class="panel-title-out"><i class="glyphicon lianxidianhua"></i><span>绑定手机</span></div>
+		<div class="panel-title-out"><i class="glyphicon lianxidianhua" style="color:#FF5A5F;"></i><span>绑定手机</span></div>
 		<div class="panel panel-default member-panel">
 			<div class="panel-body">
 				<div class="form-horizontal">

core/src/web/templates/member/accountset/bindweixin.html

@@ -5,7 +5,7 @@
 </head>
 <body>
 <!-- 头部 -->
-{{include "/common/head.html"}}
+{{include "/common/centerhead.html"}}
 <!-- 中间 -->
 <div class="a-content member-content">
 	<div class="member-left">

core/src/web/templates/member/accountset/index.html

@@ -254,11 +254,14 @@ function editInfoComplate(obj,type){
 	width: 60px;
 	height: 60px;
 }
+.accountmenu{
+	color:#FF5A5F !important;
+}
 </style>
 </head>
 <body>
 <!-- 头部 -->
-{{include "/common/head.html"}}
+{{include "/common/centerhead.html"}}
 <!-- 中间 -->
 <div class="a-content member-content">
 	<div class="member-left">
@@ -267,7 +270,7 @@ function editInfoComplate(obj,type){
 	<div class="member-right">
 		<!-- 基础信息 -->
 		
-		<div class="panel-title-out" id="accountInfo"><i class="glyphicon zhanghao"></i><span>账号信息</span></div>
+		<div class="panel-title-out" id="accountInfo"><i class="glyphicon zhanghao" style="color:#FF5A5F;"></i><span>账号信息</span></div>
 		<div class="panel panel-default">
 		  <div class="panel-body">
 		  	<table class="table account-info">
@@ -346,9 +349,9 @@ function editInfoComplate(obj,type){
 		  	<div class="panel-body">
 			  	<table class="table accountset-aqfw">
 					<tr>
-						<td width="80" class="topWidth-0px">安全等级：</td>
+						<td width="90px" class="topWidth-0px">安全等级：</td>
 						<td class="topWidth-0px safetLevel">
-							<div>{{if and .T.s_phone .T.s_email}}高{{else if and (not .T.s_phone) (not .T.s_email)}}低{{else}}中{{end}}</div>
+							<div style="margin-top: -5px;">{{if and .T.s_phone .T.s_email}}高{{else if and (not .T.s_phone) (not .T.s_email)}}低{{else}}中{{end}}</div>
 							<div class="safetLevelImg">{{if and .T.s_phone .T.s_email}}<div></div><div></div>{{else if and (not .T.s_phone) (not .T.s_email)}}{{else}}<div></div>{{end}}</div>
 						</td>
 						<td width="80" class="topWidth-0px"></td>

core/src/web/templates/member/accountset/setpwd.html

@@ -6,14 +6,14 @@
 </head>
 <body>
 <!-- 头部 -->
-{{include "/common/head.html"}}
+{{include "/common/centerhead.html"}}
 <!-- 中间 -->
 <div class="a-content member-content">
 	<div class="member-left">
 		{{include "/common/memberleft.html"}}
 	</div>
 	<div class="member-right">
-		<div class="panel-title-out"><i class="glyphicon mima"></i><span>修改密码</span></div>
+		<div class="panel-title-out"><i class="glyphicon mima" style="color:#FF5A5F;"></i><span>修改密码</span></div>
 		<div class="panel panel-default member-panel">
 			<div class="panel-body">
 				<form action="/member/accountset/setpwd" method="post" class="form-horizontal accountForm">

core/src/web/templates/member/accountset/updatephone.html

@@ -14,14 +14,14 @@
 </head>
 <body>
 <!-- 头部 -->
-{{include "/common/head.html"}}
+{{include "/common/centerhead.html"}}
 <!-- 中间 -->
 <div class="a-content member-content">
 	<div class="member-left">
 		{{include "/common/memberleft.html"}}
 	</div>
 	<div class="member-right">
-		<div class="panel-title-out"><i class="glyphicon lianxidianhua"></i><span>更换手机</span></div>
+		<div class="panel-title-out"><i class="glyphicon lianxidianhua" style="color:#FF5A5F;"></i><span>更换手机</span></div>
 		<div class="panel panel-default member-panel">
 			<div class="panel-body">
 				<div class="form-horizontal">

core/src/web/templates/member/accountset/updatepwd.html

@@ -6,14 +6,14 @@
 </head>
 <body>
 <!-- 头部 -->
-{{include "/common/head.html"}}
+{{include "/common/centerhead.html"}}
 <!-- 中间 -->
 <div class="a-content member-content">
 	<div class="member-left">
 		{{include "/common/memberleft.html"}}
 	</div>
 	<div class="member-right">
-		<div class="panel-title-out"><i class="glyphicon mima"></i><span>修改密码</span></div>
+		<div class="panel-title-out"><i class="glyphicon mima" style="color:#FF5A5F;"></i><span>修改密码</span></div>
 		<div class="panel panel-default member-panel">
 			<div class="panel-body">
 				<form action="/member/accountset/updatepwd" method="post" class="form-horizontal accountForm">

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

@@ -6,7 +6,7 @@
 <body>
 {{$identWay := session "identWay"}}
 <!-- 头部 -->
-{{include "/common/head.html"}}
+{{include "/common/centerhead.html"}}
 <!-- 中间 -->
 <div class="a-content member-content">
 	<div class="member-left">
@@ -17,7 +17,7 @@
 			{{include "/common/authentication.html"}}
 		{{else}}
 		<div class="panel-title-out">
-		    <i class="glyphicon shimingrenzheng"></i><span>实名认证</span>
+		    <i class="glyphicon shimingrenzheng" style="color:#FF5A5F;"></i><span>实名认证</span>
 		</div>
 		<div class="panel panel-default member-panel-middle">
 			<div class="panel-body">

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

@@ -3,16 +3,21 @@
 <title>投标管理</title>
 {{include "/common/inc.html"}}
 <script charset="utf-8" src="/js/paging.js"></script>
+<style type="text/css">
+.bidmanage{
+	color:#FF5A5F !important;
+}
+</style>
 </head>
 <body>
-{{include "/common/head.html"}}
+{{include "/common/centerhead.html"}}
 <!-- 中间 -->
 <div class="a-content member-content">
 	<div class="member-left">
 		{{include "/common/memberleft.html"}}
 	</div>
 	<div class="member-right">
-		<div class="panel-title-out"><i class="glyphicon liebiao"></i><span>投标管理</span></div>
+		<div class="panel-title-out"><i class="glyphicon liebiao" style="color:#FF5A5F;"></i><span>投标管理</span></div>
 		<div class="a-line"></div>
 		<table class="table a-table margin-t-20" id="bidManage">
 			<tr id="tableTitle">

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

@@ -81,7 +81,7 @@ label {
 </head>
 <body>
 <!-- 头部 -->
-{{include "/common/head.html"}}   
+{{include "/common/centerhead.html"}}
  <!-- 中间 -->
 <div class="a-content member-content" style="margin-bottom:20px">
   <!--左边部分-->
@@ -92,7 +92,7 @@ label {
 
   <div class="member-right">
 	<div class="panel-title-out">
-	   <i class="glyphicon shimingrenzheng icon_gray icon_large"></i><span>企业实名认证</span>
+	   <i class="glyphicon shimingrenzheng icon_gray icon_large" style="color:#FF5A5F;"></i><span>企业实名认证</span>
 	</div>
 	<div class="panel panel-default member-panel">
 		<div class="panel-body padding-lr-20">

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

@@ -3,6 +3,9 @@
 <title>积分规则</title>
 {{include "/common/inc.html"}}
 <style>
+a.credit{
+	color:#FF5A5F !important;
+}
 .credit-explain {
     background-color: #EEEEEE;
     padding: 10px 10px;
@@ -23,7 +26,7 @@
 	line-height:30px;
 }
 .sptext{
-	font-weight:bold;
+	font-size: 16px;
 	line-height:50px;
 }
 .dataintable {
@@ -44,12 +47,15 @@
     border: 1px solid #aaa;
 	text-align:center;
 }
+p{
+	color:#999;
+}
 </style>
 </head>
 <body>
 {{$identType := session "identType"}}
 <!-- 头部 -->
-{{include "/common/head.html"}}
+{{include "/common/centerhead.html"}}
 <!-- 中间 -->
 <div class="a-content member-content">
 	<div class="member-left">
@@ -58,7 +64,7 @@
 	<div class="member-right">
 		<div class="member-panel">
 			<div class="panel-title-out">
-				<i class="glyphicon jinbi"></i><span>积分规则</span>
+				<i class="glyphicon jinbi" style="color:#FF5A5F;"></i><span>积分规则</span>
 			</div>
 			<div class="a-line"></div>	
 			<div class="credit-explain">积分获取方法与计算规则</div>

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

@@ -136,6 +136,9 @@
 			width:57px;
 			bottom:0px;
 		}
+		a.mycredit{
+			color:#FF5A5F !important;
+		}
 	</style>
 </head>
 <body>

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

@@ -51,12 +51,29 @@
 	float:left;line-height:45px;
 	padding:0 5px;
 }
+a.mycredit{
+	color:#FF5A5F !important;
+}
+.nav-tabs > li.active > a, .nav-tabs > li.active > a:focus, .nav-tabs > li.active > a:hover{
+	border:0px;
+	color:#FF5A5F;
+	font-weight:700;
+}
+.nav-tabs > li.active{
+	border-top:3px solid #FF5A5F;
+}
+.nav-tabs > li{
+	width:110px;
+}
+#myli{
+	margin-left:35px;
+}
 </style>
 </head>
 <body>
 {{$identType := session "identType"}}
 <!-- 头部 -->
-{{include "/common/head.html"}}
+{{include "/common/centerhead.html"}}
 <!-- 中间 -->
 <div class="a-content member-content">
 	<div class="member-left">
@@ -65,12 +82,12 @@
 	<div class="member-right">
 		<div class="member-panel">
 			<div class="panel-title-out">
-				<i class="glyphicon jinbi"></i><span>我的积分</span>
+				<i class="glyphicon jinbi" style="color:#FF5A5F;"></i><span>我的积分</span>
 			</div>	
 			<div class="panel-body message a-border-t-only"  >	
-				<ul class="nav nav-tabs msgheader" style="margin-top:10px;position:relative">
-		                <li class="active" v="0"><a href="#list_0" data-toggle="tab" id="c_0" name="all" value="0">我的积分</a></li>
-		                <li v="1"><a href="#list_1" data-toggle="tab" id="c_1" name="all" value="1">积分明细</a></li>
+				<ul class="nav nav-tabs msgheader" style="margin-top:10px;position:relative;background-color: #f0f0f0;border-bottom: 0px;margin-left: -35px;">
+		                <li class="active text-center" v="0" id="myli"><a href="#list_0" data-toggle="tab" id="c_0" name="all" value="0">我的积分</a></li>
+		                <li v="1" class=" text-center"><a href="#list_1" data-toggle="tab" id="c_1" name="all" value="1">积分明细</a></li>
 		    	</ul>
 				<div class="tab-content" id="list_0">
 					<div class="credit-explain">当前积分 <span style="font-size:22;color:red">{{$.T.user.i_credit}}</span><span class="mx" onclick="outoClick('c_1')">查看积分明细</span></div>

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

@@ -17,7 +17,7 @@ var entType="企业"
 </script>
 </head>
 <body>
-{{include "common/head.html"}}
+{{include "/common/centerhead.html"}}
 <div id="entinfobg">	
 <div class="a-content">
 	<!--标题-->

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

@@ -14,7 +14,7 @@
 <script src="/js/validform-min.js"></script>
 </head>
 <body>
-{{include "/common/head.html"}}
+{{include "/common/centerhead.html"}}
 <div id="entinfobg">	
 	<div class="a-content">
 		<!--标题-->
@@ -151,7 +151,7 @@
 									<script>
 										$(function(){
 											$("#goToFeedback").click(function(){
-												$("body").append('<form id="goToFeedbackForm" action="/front/web_feedbacklist.html" method="post" class="hide"><input type="hidden" name="type" value="serviceclassify"></form>');
+												$("body").append('<form id="goToFeedbackForm" action="/front/web_O_help.html" method="post" class="hide"><input type="hidden" name="type" value="serviceclassify"></form>');
 												$("#goToFeedbackForm").submit();
 											});
 										});

core/src/web/templates/member/employeemanage/complate.html

@@ -5,7 +5,7 @@
 </head>
 <body>
 <!-- 头部 -->
-{{include "/common/head.html"}}
+{{include "/common/centerhead.html"}}
 <!-- 中间 -->
 <div class="a-content" style="text-align: center;padding-top: 100px;">
 	{{if .T.Invalid}}

core/src/web/templates/member/employeemanage/index.html

@@ -143,7 +143,7 @@
 <body>
 {{$flag := .T.flag}}
 <!-- 头部 -->
-{{include "/common/head.html"}}
+{{include "/common/centerhead.html"}}
 <!-- 中间 -->
 <div class="a-content member-content">
 	<div class="member-left">

core/src/web/templates/member/employeemanage/joinByLink.html

@@ -22,7 +22,7 @@
 </head>
 <body>
 <!-- 头部 -->
-{{include "/common/head.html"}}
+{{include "/common/centerhead.html"}}
 <!-- 中间 -->
 <div class="a-content" align="center">
 	<div class="joinByLink">

core/src/web/templates/member/employeemanage/joinByMail.html

@@ -33,7 +33,7 @@
 </head>
 <body>
 <!-- 头部 -->
-{{include "/common/head.html"}}
+{{include "/common/centerhead.html"}}
 <!-- 中间 -->
 <div class="a-content" align="center">
 	<form class="form-horizontal registerByMail" action="/front/registerByMail" method="post">

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

@@ -30,7 +30,7 @@
 </head>
 <body>
 <!-- 头部 -->
-{{include "/common/head.html"}}
+{{include "/common/centerhead.html"}}
 <!-- 中间 -->
 <div class="a-content member-content">
 	<div class="member-left">
@@ -42,7 +42,7 @@
 				<div class="message panel panel-default">
 					<div class="panel-body" onclick="window.location.href='/member/msgcenter'" style="cursor:pointer">
 						<div class="panel-title-in">
-							<i class="glyphicon xiaoxi"></i><span>消息中心</span>
+							<i class="glyphicon xiaoxi" style="color:#FF5A5F;"></i><span>消息中心</span>
 						</div>
 						<table class="table">
 							<tr>
@@ -59,7 +59,7 @@
 				<div class="yellowpage panel panel-default">
 					<div class="panel-body">
 						<div class="panel-title-in">
-							<i class="glyphicon wodehuangye"></i><span>我的黄页</span>
+							<i class="glyphicon wodehuangye" style="color:#FF5A5F;"></i><span>我的黄页</span>
 						</div>
 						<table class="table">
 							<tr>

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

@@ -1,13 +1,18 @@
 <html>
 <head>
-<title>消息中心</title>
+<title>网站消息</title>
 {{include "/common/inc.html"}}
 <script src="/js/qfwtable.js"></script>
+<style type="text/css">
+	a#msgCenter{
+		color:#FF5A5F !important;
+	}
+</style>
 </head>
 <body>
 {{$identType := session "identType"}}
 <!-- 头部 -->
-{{include "/common/head.html"}}
+{{include "/common/centerhead.html"}}
 <!-- 中间 -->
 <div class="a-content member-content">
 	<div class="member-left">
@@ -16,7 +21,7 @@
 	<div class="member-right">
 		<div class="member-panel">
 			<div class="panel-title-out">
-				<i class="glyphicon xiaoxi"></i><span>消息中心</span>
+				<i class="glyphicon xiaoxi" style="color:#FF5A5F;"></i><span>消息中心</span>
 			</div>	
 			<div class="panel-body message a-border-t-only"  >	
 				<ul class="nav nav-tabs msgheader" style="margin-top:10px;position:relative">
@@ -34,12 +39,12 @@
 	                <input type="checkbox" name="btnSelAll" onClick="checkAll(0,this)"> 全选
 	              </label>
 		          </div>
-							<div class="col-sm-2" style="margin:10px 0 0 -15px;">
+							<div class="col-sm-3" style="margin:10px 0 0 -15px;">
 								<button style="height:20px;line-height:10px;" onClick='del(0)'>删除</button>	
 								<button style="height:20px;line-height:10px;" onClick='flag(0)'>标记为已读</button>
 							</div>
 						</div>
-						<div class="op1 text-center" id="loadMore_0" onClick="loadMore(0)" style="cursor:pointer;height:30px;line-height:30px;text-align:center"><span class="btn btn-default" style="padding:5px 30px;" >加载更多...</span></div>					
+						<div class="op1 text-center" id="loadMore_0" onClick="loadMore(0)" style="cursor:pointer;height:30px;line-height:30px;text-align:center"><span class="btn btn-default" style="margin-left: -200px;padding:5px 30px;" >加载更多...</span></div>					
 						
 					</div>
 					<div class="tab-pane " id="list_1">
@@ -96,6 +101,10 @@
 	overflow:hidden;
 	text-overflow:ellipsis;
 }
+.member-right{
+	background-color:#fff;
+	padding:20px;
+}
 </style>
 
 <!-- 即时消息 -->

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

@@ -3,16 +3,21 @@
 <title>我预约的服务</title>
 {{include "/common/inc.html"}}
 <script charset="utf-8" src="/js/paging.js"></script>
+<style type="text/css">
+.myappointment{
+	color:#FF5A5F !important;
+}
+</style>
 </head>
 <body>
-{{include "/common/head.html"}}
+{{include "/common/centerhead.html"}}
 <!-- 中间 -->
 <div class="a-content member-content">
 	<div class="member-left">
 		{{include "/common/memberleft.html"}}
 	</div>
 	<div class="member-right">
-		<div class="panel-title-out"><i class="glyphicon falvshengming"></i><span>我预约的服务</span></div>
+		<div class="panel-title-out"><i class="glyphicon falvshengming" style="color:#FF5A5F;"></i><span>我预约的服务</span></div>
 		<div class="a-line"></div>
 		<table class="table a-table margin-t-20" id="myAppointment">
 			<tr id="tableTitle">

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

@@ -3,9 +3,14 @@
 <title>我发布的需求</title>
 {{include "/common/inc.html"}}
 <script charset="utf-8" src="/js/paging.js"></script>
+<style type="text/css">
+.mydemand{
+	color:#FF5A5F !important;
+}
+</style>
 </head>
 <body>
-{{include "/common/head.html"}}
+{{include "/common/centerhead.html"}}
 <!-- 中间 -->
 <div class="a-content member-content">
 	<div class="member-left">
@@ -13,7 +18,7 @@
 	</div>
 	<div class="member-right">
 		<div class="panel-title-out">
-			<i class="glyphicon gongshixinxi"></i><span>我发布的需求</span>
+			<i class="glyphicon gongshixinxi" style="color:#FF5A5F;"></i><span>我发布的需求</span>
 			<a class="btn btn-primary btn-sm pull-right" href="/market/demand/add.html">发需求</a>
 		</div>
 		<div class="a-line"></div>

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

@@ -3,16 +3,21 @@
 <title>订单管理</title>
 {{include "/common/inc.html"}}
 <script charset="utf-8" src="/js/paging.js"></script>
+<style type="text/css">
+.ordermanage{
+	color:#FF5A5F !important;
+}
+</style>
 </head>
 <body>
-{{include "/common/head.html"}}
+{{include "/common/centerhead.html"}}
 <!-- 中间 -->
 <div class="a-content member-content">
 	<div class="member-left">
 		{{include "/common/memberleft.html"}}
 	</div>
 	<div class="member-right">
-		<div class="panel-title-out"><i class="glyphicon dengjizhuangtai"></i><span>订单管理</span></div>
+		<div class="panel-title-out"><i class="glyphicon dengjizhuangtai" style="color:#FF5A5F;"></i><span>订单管理</span></div>
 		<div class="a-line"></div>
 		<table class="table a-table margin-t-20" id="orderManage">
 			<tr id="tableTitle">

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

@@ -61,7 +61,7 @@
 </head>
 <body>
 <!-- 头部 -->
-{{include "/common/head.html"}}   
+{{include "/common/centerhead.html"}}
  <!-- 中间 -->
 <div class="a-content member-content" style="margin-bottom:20px">
    <!--左边部分-->
@@ -74,7 +74,7 @@
 	  <!--右边开始-->
 	  <div class="member-right">
 		<!--右边头部提示信息-->
-		<div class="panel-title-out"><i class="glyphicon shimingrenzheng"></i><span>其他认证</span></div>
+		<div class="panel-title-out"><i class="glyphicon shimingrenzheng" style="color:#FF5A5F;"></i><span>其他认证</span></div>
 	   	<!--右边主要内容-->
 		<div class="panel panel-default member-panel">
 			<div class="padding-lr-20 panel-body">

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

@@ -58,7 +58,7 @@ label {
 </head>
 <body>
 <!-- 头部 -->
-{{include "/common/head.html"}}   
+{{include "/common/centerhead.html"}}
  <!-- 中间 -->
 <div class="a-content member-content">
    <!--左边部分-->
@@ -71,7 +71,7 @@ label {
 	  <!--右边开始-->
 	  <div class="member-right">
 		<!--右边头部提示信息-->
-		<div class="panel-title-out"><i class="glyphicon shimingrenzheng"></i><span>个人实名认证</span></div>
+		<div class="panel-title-out"><i class="glyphicon shimingrenzheng" style="color:#FF5A5F;"></i><span>个人实名认证</span></div>
 	   	<!--右边主要内容-->
 		<div class="panel panel-default member-panel">
 		 <div class="padding-lr-20 panel-body">

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

@@ -30,7 +30,7 @@ var entType="企业"
 </style>
 <body>
 {{$s_role := printf "%v" (index (session "userInfo") "s_role")}}
-{{include "/common/head.html"}}
+{{include "/common/centerhead.html"}}
 <div id="entinfobg">	
 <div class="a-content">
 	<!--标题-->

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

@@ -50,7 +50,7 @@
 </head>
 <body>
 <!-- 头部 -->
-{{include "/common/head.html"}}
+{{include "/common/centerhead.html"}}
 <!-- 中间 -->
 <div class="a-content member-content">
 	<div class="member-left">

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

@@ -8,6 +8,7 @@
 <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js"></script>
 <script>
 initShare({{.T.signature}},{{.T.shareid}});
+var b_view = "{{.T.view}}";
 $(function(){
 	var hm = document.createElement("script");
 	hm.src = "//hm.baidu.com/hm.js?ed198b177e527bb53684db20bb390e77";
@@ -18,9 +19,15 @@ $(function(){
 	var a_visitedindex = {{.T.data.a_visitedindex}};
 	var s_type = {{.T.data.s_type}};
 	var a_publishtime = {{.T.data.a_publishtime}};
-	$("body").prepend({{.T.data.s_content}});
+	var s_content={{.T.data.s_content}}
+	var mark="为你推送以下信息："
+	if(!s_content){
+		s_content="<div></div>"
+		mark="，在最新5天的数据中，没有匹配到相应的信息，请更换关键字或继续使用观察。<a style='text-decoration:underline' href='javascript:history.go(-1)'>返回</a>"
+	}
+	$("body").prepend(s_content);
 	if(typeof(s_words) != "undefined" && s_words.length > 0){
-		$("body>div:first").html('根据你设置的'+(s_type=="tender"?"招标公告":s_type=="bid"?"中标公告":"")+'关键词（<font class="keyword">'+s_words.join(" ; ").replace(/\+/gm," ")+'</font>）为你推送以下信息：');
+		$("body>div:first").html('根据你设置的'+(s_type=="tender"?"招标公告":s_type=="bid"?"中标公告":"")+'关键词（<font class="keyword">'+s_words.join(" ; ").replace(/\+/gm," ")+'</font>）'+mark);
 	}else{
 		$("body>div:first").remove();
 	}
@@ -117,7 +124,7 @@ function redirect(link){
 
 }
 function setVisitedIndex(obj){
-	if(obj.hasClass("visited")){
+	if(obj.hasClass("visited")||b_view){
 		return;
 	}
 	obj.addClass("visited");

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

@@ -41,6 +41,7 @@
 					<div>信息范围<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/right.png"></div>
 				</li>
 			</ul>
+			<a href="/wxpush/bid/wxpushview/tender">结果预览</a>
 		</li>
 		<li class="parent-node" id="bid">
 			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/zhongbiao.png">

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

@@ -397,6 +397,7 @@
 		</div>
 	</div>
 	<div class="b-right">
+		{{if .T.relevantEnts}}
 		{{if gt (len .T.relevantEnts) 0}}
 		<div class="b-adver b-scroll-list">
 			<div class="b-adver-title">相关企业</div>
@@ -406,7 +407,7 @@
 					<li{{if eq $k 0}} class="margin-0 border-t-0"{{end}}>
 						<div>
 							<img src="{{if $v.s_avatar}}{{$v.s_avatar}}{{else}}null{{end}}" onerror="this.src='/images/ent-logo.png'">
-							<a href="/enterprise/{{$v._id}}.html">{{$v.text}}</a>
+							<a href="/enterprise/{{$v._id}}.html">{{$v.EntName}}</a>
 						</div>
 					</li>
 				{{end}}
@@ -415,7 +416,8 @@
 			</div>
 		</div>
 		{{end}}
-		<div class="{{if gt (len .T.relevantEnts) 0}}margin-t-10 {{end}}b-adver">
+		{{end}}
+		<div class="{{if .T.relevantEnts}}{{if gt (len .T.relevantEnts) 0}}margin-t-10 {{end}}{{end}}b-adver">
 			<div class="b-adver-title">新闻动态</div>
 			<div class="b-adver-content newsInfo"></div>
 		</div>
@@ -435,6 +437,7 @@ var legcerNo = {{.T.res.LegCerNO}};
 var entName = {{.T.res.EntName}};
 var staffinfo = {{.T.res.staffinfo}};
 var synopsis = {{.T.res.s_synopsis}};
+var relevantEnts = {{.T.relevantEnts}};
 //联系地址
 //定义默认的郑州经纬度
 var ptlat=113.69884285509,  ptlng=34.791342526551;

credit/src/config.json

@@ -96,5 +96,6 @@
     "saveLogDuration": 1,
     "checkGiveDuration": 30,
     "swordfish_tipBeforeDays": "3,1",
-    "swordfish_subHour": 18
+	"timerHM":"0,m,29",
+    "swordfish_subHour": 14
 }

credit/src/main.go

@@ -176,12 +176,24 @@ func quartz() {
 /**
 ** 根据user表来处理
 **/
+
 func TimerSwordFishFromUser() {
+	bfirst := true
 	go func() {
 		for {
 			now := time.Now()
-			// 计算下一个零点
-			next := now.Add(duration_hour)
+			// 计算下一个零点,程序启动的那天没有执行
+			var next time.Time
+			if bfirst {
+				bfirst = false
+				if now.Hour() >= swordfish_subHour {
+					next = now.Add(duration_hour)
+				} else {
+					next = now
+				}
+			} else {
+				next = now.Add(duration_hour)
+			}
 			next = time.Date(next.Year(), next.Month(), next.Day(), swordfish_subHour, minutes, 10, 0, next.Location())
 			next64 := next.Unix()
 			if int64(next.Sub(now)) < 0 {
@@ -202,8 +214,8 @@ func TimerSwordFishFromUser() {
 					} {
 						query := coll.Find(&map[string]interface{}{
 							"o_msgset." + typeName + ".l_enddate": map[string]interface{}{
-								"$gte": next64 - 80000,
-								"$lte": next64 + int64(swordfish_tipBeforeDays[0]*24*3600) + 80000,
+								//"$gte": next64 - 90000, //防止遗漏
+								"$lte": next64 + int64(swordfish_tipBeforeDays[0]*24*3600) + 120000,
 							},
 							"o_msgset." + typeName + ".i_status":       1,
 							"o_msgset." + typeName + ".i_switchstatus": 1,
@@ -223,12 +235,12 @@ func TimerSwordFishFromUser() {
 									//提示
 									for _, v := range swordfish_tipBeforeDays {
 										if v == sub64 {
-											creditrpc.SendMsgWebAndWx(swordfish_dueTitle, fmt.Sprintf(swordfish_due, v), util.BsonIdToSId(tmp["_id"]), tmp["s_m_openid"].(string))
+											creditrpc.SendMsgWebAndWx(swordfish_dueTitle+"["+creditrpc.Message["txt_"+code]+"]", fmt.Sprintf(swordfish_due, v), util.BsonIdToSId(tmp["_id"]), tmp["s_m_openid"].(string))
 										}
 									}
 								}
 							}, func(e interface{}) {
-								log.Println("提前提示发送ERROR:", e)
+								log.Println("提前提示或扣积分ERROR:", e, tmp)
 							})
 							tmp = make(map[string]interface{})
 						}
@@ -271,13 +283,18 @@ func doSubCreditByUser(userId, umid, typeName, code string, next *time.Time, use
 			}
 			if creditlog.Save(creditDoc) {
 				//发送微信通知扣积分成功
-				creditrpc.SendMsgWebAndWx(swordfish_payTitle, fmt.Sprintf(swordfish_pay, -codeNum, restNum, util.FormatDate(&newDate, util.Date_Full_Layout)), userId, umid)
+				creditrpc.SendMsgWebAndWx(swordfish_payTitle+"["+creditrpc.Message["txt_"+code]+"]", fmt.Sprintf(swordfish_pay, -codeNum, restNum, util.FormatDate(&newDate, util.Date_Full_Layout)), userId, umid)
 			}
 		} else { //暂停操作
 			//更新操作
-			if mongodb.Update("user", `{"_id":"`+userId+`"}`, `{"$set":{"o_msgset.`+typeName+`.i_status":0}}`, false, false) {
+			//`{"$set":{"o_msgset.`+typeName+`.i_status":0}}`
+			if mongodb.Update("user", `{"_id":"`+userId+`"}`, &map[string]interface{}{
+				"$set": map[string]interface{}{
+					"o_msgset." + typeName + ".i_status": 0,
+				},
+			}, false, false) {
 				//暂停通知,因积分不够
-				creditrpc.SendMsgWebAndWx(swordfish_closeTitle, swordfish_close, userId, umid)
+				creditrpc.SendMsgWebAndWx(swordfish_closeTitle+"["+creditrpc.Message["txt_"+code]+"]", swordfish_close, userId, umid)
 			}
 		}
 	}, func(e interface{}) {

credit/src/qfw/creditlog/creditlog.go

@@ -41,7 +41,8 @@ func Save(doc map[string]interface{}) bool {
 		Failed("保存到日志记录失败，" + string(v))
 	} else {
 		//更新积分 i_credit到人
-		if doc["s_code"].(string) == "A1" {
+		scode := doc["s_code"].(string)[:1]
+		if scode == "A" {
 			b = mongodb.Update("user", `{"_id":"`+doc["s_uid"].(string)+`"}`, &map[string]interface{}{
 				"$inc": map[string]int{
 					"i_credit": doc["i_score"].(int),

credit/src/qfw/creditrpc/creditrpc.go

@@ -237,6 +237,15 @@ func (c *CreditRpc) InCreadit(param *qrpc.CreditData, replay *int) error {
 	return nil
 }
 
+func getTxt(code string) string {
+	codes := strings.Split(code, ",")
+	res := []string{}
+	for _, v := range codes {
+		res = append(res, Message["txt_"+v])
+	}
+	return strings.Join(res, ",")
+}
+
 //消费积分，增加扣费方式、手动还是自动
 func (c *CreditRpc) OutCreadit(param *qrpc.CreditData, replay *int) error {
 	defer func() {
@@ -253,15 +262,18 @@ func (c *CreditRpc) OutCreadit(param *qrpc.CreditData, replay *int) error {
 	*replay = 0
 	lock := GetMutex(param.Uid)
 	lock.Lock()
-	if len(param.Code) > 1 && Message[("txt_"+param.Code)] != "" {
+	if len(param.Code) > 1 {
 		i_scorenow := getCreditById(param.Uid)
 		first := param.Code[:1]
 		now := time.Now()
+
+		txt := getTxt(param.Code)
+
 		creditDoc := map[string]interface{}{
 			"s_uid":       param.Uid,
 			"s_umid":      param.Umid,
 			"s_code":      param.Code,
-			"s_operation": Message["txt_"+param.Code],
+			"s_operation": txt,
 			"i_type":      0,
 			"l_date":      now.Unix(),
 			"l_datenm":    time.Now().UnixNano() / 1000000,
@@ -293,7 +305,7 @@ func (c *CreditRpc) OutCreadit(param *qrpc.CreditData, replay *int) error {
 			*replay = creditDoc["i_score"].(int)
 			//发送微信通知扣积分成功
 			if first == "A" {
-				go SendMsgWebAndWx(Message["swordfish_payTitle"], fmt.Sprintf(Message["swordfish_pay"], creditDoc["i_score"], creditDoc["i_scorenow"], util.FormatDate(&newDate, util.Date_Full_Layout)), param.Uid, param.Umid)
+				go SendMsgWebAndWx(Message["swordfish_payTitle"]+"["+txt+"]", fmt.Sprintf(Message["swordfish_pay"], creditDoc["i_score"], creditDoc["i_scorenow"], util.FormatDate(&newDate, util.Date_Full_Layout)), param.Uid, param.Umid)
 			}
 		}
 	}

credit/src/qfw/creditrpc/creditrpc_test.go

@@ -2,7 +2,7 @@ package creditrpc
 
 import (
 	"log"
-
+	"qfw/util"
 	"testing"
 )
 
@@ -16,5 +16,17 @@ func Test(t *testing.T) {
 		log.Println(k, int(tmp), int(ret))
 	}
 	log.Println(tmp)
+	ssss := "A234"
+	log.Println(ssss[1:5])
 	//log.Println(uint64(int(tmp))&(1<<8), (1 << 8))
 }
+
+func Test_txt(t *testing.T) {
+	var SysConfig map[string]interface{}
+	util.ReadConfig("../../config.json", &SysConfig)
+	Message = map[string]string{}
+	for k, v := range SysConfig["message"].(map[string]interface{}) {
+		Message[k] = v.(string)
+	}
+	log.Println(getTxt("A2"))
+}

push/src/config.json

@@ -1,63 +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": 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": "请到网站个人中心查看详细."
-}
+{"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/dopush/dopush.go

@@ -40,6 +40,110 @@ func (b *Pjob) CreateUserInterestWord() {
 	b.Dfa.AddWord(words...)
 }
 
+//遍历数据只做标题预览
+func (p *Pjob) EachInfoForView(mopenid string) map[string]interface{} {
+	defer func() {
+		if r := recover(); r != nil {
+			fmt.Println("推送开始[E]", r)
+		}
+	}()
+	p.Cache = new(map[string]*[]*push.MemberInterest)
+	*p.Cache = push.InitCache(p.Stype, mopenid)
+	p.CreateUserInterestWord()
+
+	session := mongodb.GetMgoConn()
+	defer mongodb.DestoryMongoConn(session)
+	q := `{"type":"` + p.Stype + `"}`
+	n, _ := session.DB("qfw").C("bidding").Find(mongodb.ObjToOth(q)).Count()
+	userMap := &map[*push.MemberInterest]*list.List{}
+	if n == 0 {
+		log.Println("预览", p.Stype, "没有数据。")
+	} else {
+		query := session.DB("qfw").C("bidding").Find(mongodb.ObjToOth(q)).Sort("-publishtime").Iter()
+		var returnLastTimeLong int64 = 0
+	L1:
+		for tmp := new(map[string]interface{}); query.Next(tmp); {
+			title := util.ObjToString((*tmp)["title"])
+			if title != "" {
+				//返回匹配到的词组
+				res := p.Dfa.Analy(title)
+				if len(res) > 0 {
+					province := (*tmp)["area"].(string)
+					provinceVal := push.GetChoiceCode(province)
+					(*tmp)["title"] = `[<span class='area'>` + province + `</span>]` + title
+					for _, v := range res {
+						//根据关键词返回用户指针
+						tw := (*p.Cache)[v]
+						if tw != nil {
+							//遍历用户加入到此条信息上
+							for _, v2 := range *tw {
+								if v2.Province == "A" || v2.ProvinceVal&provinceVal > 0 {
+									s := (*userMap)[v2]
+									if s == nil {
+										s = list.New()
+										(*userMap)[v2] = s
+									}
+									s.PushBack(tmp)
+									if s.Len() > 50 {
+										break L1
+									}
+								}
+							}
+						}
+					}
+				}
+				if (*tmp)["comeintime"] != nil {
+					ttmp := (*tmp)["comeintime"].(int64)
+					if ttmp > returnLastTimeLong {
+						returnLastTimeLong = ttmp
+					}
+				}
+			}
+			tmp = new(map[string]interface{})
+		}
+	}
+	mcontent := map[string]interface{}{}
+	mcontent["s_type"] = p.Stype
+	bmatch := false
+	for kk, vv := range *(userMap) {
+		k := *kk
+		v := *vv
+		str := fmt.Sprintf("<div>根据您设置的关键词（%s）,给您推送以下"+p.StypeName+"信息:</div>", strings.Join(k.Interest, ";"))
+		//发送内容组合
+		i := 0
+		publishTimes := map[string]interface{}{}
+		publishTitle := map[string]bool{}
+		for ks := v.Front(); ks != nil; ks = ks.Next() {
+			k2 := *(ks.Value.(*map[string]interface{}))
+			title := strings.Replace(k2["title"].(string), "\n", "", -1)
+			if !publishTitle[title] {
+				publishTitle[title] = true
+				i++
+				str += "<div class='tslist'><span class='xh'>" + fmt.Sprintf("%d", i) + ".</span><a class='bt' target='_blank' href='" + k2["href"].(string) + "'>" + title + "</a></div>"
+				publishTimes[strconv.Itoa(i)] = k2["publishtime"]
+			}
+		}
+		if len(publishTimes) > 0 {
+			bmatch = true
+			mcontent["a_publishtime"] = publishTimes
+			mcontent["s_content"] = str
+			mcontent["s_words"] = k.Interest
+		}
+	}
+	mcontent["bmatch"] = bmatch
+	if !bmatch {
+		for _, one := range *p.Cache {
+			for _, onep := range *one {
+				mcontent["s_words"] = onep.Interest
+				break
+			}
+			break
+		}
+	}
+
+	return mcontent
+}
+
 func (p *Pjob) DoPush(mopenid, stime string, opr int, ltime int64) bool {
 	log.Println("开始执行任务：", p.StypeName, stime)
 	p.Cache = new(map[string]*[]*push.MemberInterest)
@@ -76,6 +180,7 @@ L1:
 			if len(res) > 0 {
 				province := (*tmp)["area"].(string)
 				provinceVal := push.GetChoiceCode(province)
+				(*tmp)["title"] = `[<span class='area'>` + province + `</span>]` + title
 				for _, v := range res {
 					//根据关键词返回用户指针
 					tw := (*cache)[v]

push/src/qfw/push/rpcpush/rpcpush.go

@@ -1,6 +1,7 @@
 package rpcpush
 
 import (
+	"encoding/json"
 	"fmt"
 	"log"
 	"qfw/push/bid"
@@ -15,6 +16,25 @@ type PushInfo struct {
 
 var PushInfoScopeDays int
 
+//RPC调用结果预览
+func (p *PushInfo) ResultView(data *qrpc.PushData, Reply *[]byte) error {
+	log.Println("rpc_data", data)
+	util.Try(func() {
+		for k, v := range data.PushType {
+			pj := dopush.Pjob{
+				MaxPushSize: bid.MaxPushSize,
+				Stype:       k,
+				StypeName:   v,
+			}
+			mp := pj.EachInfoForView(data.Mopenid)
+			log.Println("mp:", len((mp)))
+			*Reply, _ = json.Marshal(mp)
+		}
+	}, func(e interface{}) {})
+	return nil
+}
+
+//RPC调用推送信息
 func (p *PushInfo) PushMsg(data *qrpc.PushData, Reply *int) error {
 	log.Println("rpc_data", data)
 	util.Try(func() {

weixin/src/config.json

@@ -1,6 +1,6 @@
 {
 	"port":"82",
-	"domain":"www.qimingxing.info",
+	"domain":"127.0.0.1",
 	"imgpath":"/opt/qfw_dev/web/staticres",
 	"mongodbServers": "10.116.86.154:27080",
 	"elasticsearch":"http://10.116.86.154:9800",
@@ -10,24 +10,24 @@
 	"rpcport":"83",
 	"serviceTip":"服务指南",
 	"appcontext":"weixin",
-	"appid":"wx9fbe26c14a196021",
+	"appid":"wx9852f95aa927e646",
 	"token":"topnet2015",
-	"appsecret":"3243545279b584dd574a595071395be4",
+	"appsecret":"d4624c36b6795d1d99dcf0547af5443d",
         "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,退出认证操作。）",
-	"welcomeTip":"您已注册企明星！企明星是一个为全国企业提供专业化服务的互联网平台。企明星提供企业服务交易、剑鱼招标订阅、全国企业信息查询等多项服务。\n新春到，企明星多种活动火爆举行中。回复抽奖，即可参加“剑鱼抽奖”；回复福牌，即可参加“猴年翻福牌活动”。",
-	"oWelcomeTip":"您已注册企明星！企明星是一个为全国企业提供专业化服务的互联网平台。企明星提供企业服务交易、剑鱼招标订阅、全国企业信息查询等多项服务。\n新春到，企明星多种活动火爆举行中。回复抽奖，即可参加“剑鱼抽奖”；回复福牌，即可参加“猴年翻福牌活动”。",
+	"welcomeTip":"您已注册企明星！企明星是一个为全国企业提供专业化服务的互联网平台。企明星提供企业服务交易、剑鱼招标订阅、全国企业信息查询等多项服务。点击下方“剑鱼”可以订阅全国招标信息；点击“企业查询”可以免费查询全国企业信息。",
+	"oWelcomeTip":"您已注册企明星！企明星是一个为全国企业提供专业化服务的互联网平台。企明星提供企业服务交易、剑鱼招标订阅、全国企业信息查询等多项服务。点击下方“剑鱼”可以订阅全国招标信息；点击“企业查询”可以免费查询全国企业信息。",
 	"loginTip":"您已经成功登录企明星。",
 	"freezeTip":"您的帐号已经冻结，请联系管理员。",
 	"messagetpl":{
-		"identifytplid":"oGxkPyaV42z3KWykt58Tow9mBe_ImJvi8R3ajorVWOY",
+		"identifytplid":"sKn4r0or615ETYC-aI5OACPO_Q4-B8GYmgWoqcDghN4",
 		"offLinemsgtplid":"ExIeyFfoDNVJXhRDq09JbsjH_zbEJCB6gw6rxcV7atw",
-		"msgnotifytplid":"b7iuAMiTCIolnPhTdueKBVYThEMf2D-Bh2M_9v3J-68",
-		"managernotifytplid":"dplgu5Q644vzPdqcPXY7RqgItS3eXACmU1XDl27CvTA"
+		"msgnotifytplid":"fcke7PqteAtclzHV3ScdiePH48vxaH6M5aJF0O_7by8",
+		"managernotifytplid":"DIwMrPQToOhGfa6ZAQCCrqquzbLKajiXsKY0K_lQtWQ"
 	},
 	"activity":{
 		"activitycode":"topcj",

weixin/src/qfw/weixin/menu.go

@@ -19,27 +19,31 @@ func CreateMenu(rw http.ResponseWriter, r *http.Request) {
 	menu.Buttons[0].Type = MenuButtonTypeUrl ///search/enterprise/m_ent.html
 	menu.Buttons[0].Url = fmt.Sprintf(urlstr, "swordfishaction")
 
-	menu.Buttons[1].Name = "会员认证"
-	menu.Buttons[1].SubButtons = make([]MenuButton, 3)
-	menu.Buttons[1].SubButtons[0].Name = "企业认证"
-	menu.Buttons[1].SubButtons[0].Type = MenuButtonTypeKey
-	menu.Buttons[1].SubButtons[0].Key = "midentification"
-	menu.Buttons[1].SubButtons[1].Name = "个人认证"
-	menu.Buttons[1].SubButtons[1].Type = MenuButtonTypeKey
-	menu.Buttons[1].SubButtons[1].Key = "pidentification"
-	menu.Buttons[1].SubButtons[2].Name = "机构认证"
-	menu.Buttons[1].SubButtons[2].Type = MenuButtonTypeKey
-	menu.Buttons[1].SubButtons[2].Key = "oidentification"
+	menu.Buttons[1].Name = "企业查询"
+	menu.Buttons[1].Type = MenuButtonTypeUrl ///search/enterprise/m_ent.html
+	menu.Buttons[1].Url = fmt.Sprintf(urlstr, "entsearchaction")
 
+	/*
+		menu.Buttons[1].SubButtons = make([]MenuButton, 3)
+		menu.Buttons[1].SubButtons[0].Name = "企业认证"
+		menu.Buttons[1].SubButtons[0].Type = MenuButtonTypeKey
+		menu.Buttons[1].SubButtons[0].Key = "midentification"
+		menu.Buttons[1].SubButtons[1].Name = "个人认证"
+		menu.Buttons[1].SubButtons[1].Type = MenuButtonTypeKey
+		menu.Buttons[1].SubButtons[1].Key = "pidentification"
+		menu.Buttons[1].SubButtons[2].Name = "机构认证"
+		menu.Buttons[1].SubButtons[2].Type = MenuButtonTypeKey
+		menu.Buttons[1].SubButtons[2].Key = "oidentification"
+	*/
 	menu.Buttons[2].Name = "会员服务"
 	menu.Buttons[2].SubButtons = make([]MenuButton, 4)
 	menu.Buttons[2].SubButtons[0].Name = "微官网"
 	menu.Buttons[2].SubButtons[0].Type = MenuButtonTypeKey
 	menu.Buttons[2].SubButtons[0].Key = "msite" //"http://" + wf.SysConfig.Domain + "/weixin/site/edit" //微官网编辑
 
-	menu.Buttons[2].SubButtons[1].Name = "企业查询"
-	menu.Buttons[2].SubButtons[1].Type = MenuButtonTypeUrl ///search/enterprise/m_ent.html
-	menu.Buttons[2].SubButtons[1].Url = fmt.Sprintf(urlstr, "entsearchaction")
+	menu.Buttons[2].SubButtons[1].Name = "企业认证"
+	menu.Buttons[2].SubButtons[1].Type = MenuButtonTypeKey ///search/enterprise/m_ent.html
+	menu.Buttons[2].SubButtons[1].Key = "midentification"
 	//menu.Buttons[2].SubButtons[1].Type = MenuButtonTypeKey
 	//menu.Buttons[2].SubButtons[1].Key = "entsearch"
 

weixin/src/qfw/weixin/msgtxtchandler.go

@@ -52,9 +52,6 @@ func MsgTxtHandler(w ResponseWriter, r *Request) {
 			targeturl := fmt.Sprintf("http://%s/activity/%s/%s", wf.SysConfig.Domain, wf.SysConfig.Activity["activitycode"], se.EncodeString(r.FromUserName))
 			w.ReplyNews([]Article{Article{PicUrl: wf.SysConfig.Activity["picurl"], Title: wf.SysConfig.Activity["title"], Url: targeturl}})
 		}
-	} else if fp_reg.MatchString(r.Content) { //进入抽奖环节
-		targeturl := fmt.Sprintf("https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=http://%s/weixinoauth/action/%s&response_type=code&scope=snsapi_base&state=1#wechat_redirect", wf.SysConfig.Appid, wf.SysConfig.Domain, "turncards")
-		w.ReplyText(fmt.Sprintf(wf.SysConfig.Activity["tuenCards"], targeturl))
 	} else if strings.HasPrefix(r.Content, "内部报名") { //绑定拓普员工姓名
 		tmp := strings.Fields(r.Content)
 		//log.Println(tmp, len(tmp))
@@ -77,9 +74,7 @@ func MsgTxtHandler(w ResponseWriter, r *Request) {
 		//w.Reply2CustomerService()
 		//"小主的吩咐我们已经收到了，请耐心等待或留下您的联系方式（手机号或qq号），企明星客服会在下一个工作日9:00-17:00给小主回复哦！"
 		now := time.Now()
-		if now.Unix() > 1454601600 && now.Unix() < 1455465600 {//春节期间
-			w.ReplyText(wf.SysConfig.WeixinAutoRpl2)
-		} else if now.Weekday() == 6 || now.Weekday() == 0 || (now.Hour() > 17 || now.Hour() < 9) {
+		if now.Weekday() == 6 || now.Weekday() == 0 || (now.Hour() > 17 || now.Hour() < 9) {
 			dao.SaveWeixinOfflineMessage(r.FromUserName, r.Content, now.Unix())
 			w.ReplyText(wf.SysConfig.WeixinAutoRpl)
 		} else {

weixin/src/qfw/weixin/weixin.go

@@ -5,7 +5,6 @@ import (
 	"qfw/weixin/util"
 	wf "qfw/weixinconfig"
 	"regexp"
-	"time"
 )
 
 var Mux *Weixin
@@ -23,7 +22,7 @@ var subreg = regexp.MustCompile("^(\\d+)([smhd]{0,1})$")
 var DIR = ""
 
 //活动指令
-var cj_reg, fp_reg *regexp.Regexp
+var cj_reg *regexp.Regexp
 
 func InitWeixinSdk() {
 	keyword_voice_reg, _ = regexp.Compile("查询|搜索|检索|看|找|查|搜")
@@ -33,7 +32,7 @@ func InitWeixinSdk() {
 	WELCOME_MSG = wf.SysConfig.WelcomeTip
 	OWELCOME_MSG = wf.SysConfig.OWelcomeTip
 	cj_reg, _ = regexp.Compile("抽奖")
-	fp_reg, _ = regexp.Compile("福牌|翻牌")
+
 	//
 	for _, v := range wf.SysConfig.Mids {
 		mids[v] = true
@@ -77,9 +76,10 @@ func InitWeixinSdk() {
 	InitSSLClient()
 	util.StartSubscribeFilter(wf.SysConfig.SubscribeMonitorCyc, wf.SysConfig.SubscribeMonitorTimes)
 
-	go changeMsg()
+	//go changeMsg()
 }
 
+/**
 func changeMsg() {
 	now := time.Now().Unix()
 	if now > 1455552000 {
@@ -89,3 +89,4 @@ func changeMsg() {
 		time.AfterFunc(5*time.Minute, changeMsg)
 	}
 }
+**/