我的关注

core/src/qfw/front/index.go

@@ -39,9 +39,11 @@ func (i *Index) LoadIndex1(id string) error {
 
 //加载首页
 func (i *Index) LoadIndex() error {
+	i.SetSession("pcVisit", false)
 	return loadIndex(true, i.Action)
 }
 func (i *Index) PcIndex() error {
+	i.SetSession("pcVisit", true)
 	return loadIndex(false, i.Action)
 }
 func loadIndex(flag bool, i *xweb.Action) error {

core/src/qfw/member/member.go

@@ -34,6 +34,7 @@ type Member struct {
 	sendYearIdentCode  xweb.Mapper `xweb:"/front/sendYearIdentCode"`           //发送认证年报邮箱验证码
 	checkYearIdentCode xweb.Mapper `xweb:"/front/checkYearIdentCode"`          //验证输入的验证码
 	checkConMail       xweb.Mapper `xweb:"/member/accountset/checkConMail"`    //验证输入的邮箱是否是没认证的企业邮箱
+	myFollowEnts       xweb.Mapper `xweb:"/member/myFollowEnts"`               //我关注的企业
 	//weixinCallBack     xweb.Mapper `xweb:"/weixinCallBack"`                    //微信授权后的回调地址
 	//qqCallBack         xweb.Mapper `xweb:"/qqCallBack"`                        //QQ授权后的回调地址
 }

core/src/qfw/member/memberindex.go

@@ -11,7 +11,6 @@ import (
 	"log"
 	"qfw/coreconfig"
 	"qfw/coreutil"
-	"qfw/member/message"
 	"qfw/util"
 	. "qfw/util/mongodb"
 	qrpc "qfw/util/rpc"
@@ -287,9 +286,15 @@ func (m *MemberIndex) CheckPersonalStatus() error {
 
 //会员中心首页
 func (m *MemberIndex) ShowMemberIndex() error {
-	m.T["pageName"] = "用户中心"
 	GetNotPassReason(m.Action)
-	m.T["res"] = message.GetMsgList(m.Action.GetSession("userId").(string), 0, 5, -1)
+	userId := m.GetSession("userId").(string)
+	m.T["msgset"] = FindById("user", userId, `{"o_msgset":1}`)
+	m.T["pushlist"] = Find("wxpush", &map[string]interface{}{
+		"s_uid": userId,
+		"a_publishtime": map[string]interface{}{
+			"$exists": true,
+		},
+	}, `{"l_date":-1}`, `{"a_visitedindex":1,"s_words":1,"a_publishtime":1,"s_content":1}`, false, 0, 1)
 	return m.Render("/member/memberindex.html", &m.T)
 }
 

core/src/qfw/member/membermanager.go

@@ -13,6 +13,7 @@ import (
 	"github.com/go-xweb/httpsession"
 	"github.com/go-xweb/xweb"
 	. "gopkg.in/mgo.v2/bson"
+	"html/template"
 	"io/ioutil"
 	"log"
 	"math/rand"
@@ -751,7 +752,6 @@ func (m *Member) Accountset() error {
 //编辑用户昵称
 func (m *Member) EditNickName() {
 	nickname := m.GetString("value") //用户昵称
-	log.Println(nickname)
 	bol := Update("user", M{"_id": ObjectIdHex(m.GetSession("userId").(string))}, M{"$set": M{"s_nickname": nickname}}, false, false)
 	if bol {
 		//更新session、cookie
@@ -1397,3 +1397,85 @@ func getSmsCount(value string) int {
 	}
 	return count
 }
+
+//我关注的企业
+func (m *Member) MyFollowEnts() error {
+	r := Find("follow_enterprise", `{"s_userid":"`+m.GetSession("userId").(string)+`"}`, `{"l_createdate":-1}`, `{"_id":1,"s_entid":1}`, false, -1, -1)
+	if r != nil && len(*r) > 0 {
+		var entIds string
+		for k, v := range *r {
+			if k > 0 {
+				entIds += ","
+			}
+			entIds += `"` + v["s_entid"].(string) + `"`
+		}
+		ents := elastic.GetPage("enterprise", "enterprise", `{"_id":{"$in":[`+entIds+`]}}`, "", `"_id","EntName","RegOrgName","RegNo","EntType","LeRep","EstDate","OpLocDistrictName","RegCap","OpStateName","OpState","s_servicenames","s_action","OpLocDistrict","s_submitid","RegCapCurName","s_avatar"`, -1, -1)
+		if r != nil && len(*r) > 0 {
+			var userIds []ObjectId
+			for _, ent := range *ents {
+				ent["_id"] = BsonIdToSId(ent["_id"])
+				EntName, _ := ent["EntName"].(string)
+				tmpNo := ent["EntType"]
+				ent["RegCapEntType"] = tmpNo
+				if tmpNo != nil {
+					switch tmpNo.(string) {
+					case "4500", "6800", "6810", "6820", "7100", "7110", "7120", "7130", "7190", "9200", "6840", "2100", "2110", "2120", "2121", "2122", "2123", "2130", "2140", "2150", "2151", "2152", "2190", "2200", "2210", "2211", "2212", "2213", "2219", "2220", "2221", "2222", "2223", "2229", "4000", "4300", "4310", "4320", "4330", "4340", "4550", "4551", "4552", "4553", "4560", "5800", "5810", "5820":
+						ent["EntType"] = "5810"
+					}
+				}
+				//处理分公司
+				if ent["RegCapEntType"] != nil && ent["RegCapEntType"].(string) != "" {
+					RegCapEntType := ent["RegCapEntType"].(string)
+					if RegCapEntType == "5810" || RegCapEntType == "6810" || RegCapEntType == "7310" || RegCapEntType == "3200" || RegCapEntType == "3100" {
+						ent["RegCapEntType"] = "5810"
+					} else if len(RegCapEntType) > 1 {
+						if RegCapEntType[:1] == "2" {
+							ent["RegCapEntType"] = "5810"
+						}
+					}
+				}
+				entlerp, _ := ent["LeRep"].(string)
+				tmpentno, _ := ent["RegNo"].(string)
+				ent["RegNo"] = template.HTML(tmpentno)
+				if tmpNo == "9600" && strings.Contains(EntName, tmpentno) {
+					ent["EntName"] = template.HTML(strings.Replace(EntName, tmpentno, entlerp, -1))
+				} else {
+					ent["EntName"] = template.HTML(EntName)
+				}
+				ent["tmpentno"] = template.HTML(tmpentno)
+				LeRep, _ := ent["LeRep"].(string)
+				ent["LeRep"] = template.HTML(LeRep)
+				OpScope, _ := ent["OpScope"].(string)
+				if len(OpScope) > 0 {
+					ent["OpScope"] = template.HTML(OpScope)
+				}
+				stock, _ := ent["stock"].(string)
+				if len(stock) > 0 {
+					ent["stock"] = template.HTML(stock)
+				}
+				tmpdate, _ := ent["EstDate"]
+				if tmpdate != nil {
+					ent["EstDate"] = FormatDateWithObj(&tmpdate, Date_Short_Layout)
+				} else {
+					ent["EstDate"] = ""
+				}
+				if ent["s_submitid"] != nil && ent["s_submitid"].(string) != "" {
+					userIds = append(userIds, ObjectIdHex(ent["s_submitid"].(string)))
+				}
+			}
+			if len(userIds) > 0 {
+				users := Find("user", M{"_id": M{"$in": entIds}}, nil, `{"_id":1,"i_comauthenttype":1}`, false, -1, -1)
+				for _, ent := range *ents {
+					for _, user := range *users {
+						if ent["s_submitid"] == BsonIdToSId(user["_id"]) {
+							ent["i_comauthenttype"] = user["i_comauthenttype"]
+							continue
+						}
+					}
+				}
+			}
+		}
+		m.T["ents"] = ents
+	}
+	return m.Render("/member/myfollow.html", &m.T)
+}

core/src/qfw/member/yellowpage.go

@@ -39,7 +39,8 @@ type Yellowpage struct {
 	findservice   xweb.Mapper `xweb:"POST /member/service/findservice"`          //查找要修改数据
 	removeservice xweb.Mapper `xweb:"POST /member/service/removeservice"`        //下架服务
 
-	follow xweb.Mapper `xweb:"POST /member/enterprise/follow"` //关注企业
+	follow     xweb.Mapper `xweb:"POST /member/enterprise/follow"`     //关注企业
+	isFollowed xweb.Mapper `xweb:"POST /member/enterprise/isFollowed"` //查询关注状态
 }
 
 const ESTYPE string = "enterprise"
@@ -411,11 +412,9 @@ func (yp *Yellowpage) AddService() error {
 		}
 	}
 	currentuser := mongodb.FindById("user", yp.GetSession("userId").(string), nil)
-	log.Println(currentuser)
 	if len(*currentuser) != 0 && (*currentuser)["s_provider"] == nil {
 		mongodb.Update("user", `{"_id":"`+yp.GetSession("userId").(string)+`"}`, `{"$set":{"s_provider":1}}`, true, false)
 	}
-	log.Println((*currentuser)["s_provider"])
 	if tempFlag {
 		//删除缓存信息
 		redis.Del("enterprise", "enterpriseInfo_"+enterpriseid)
@@ -631,19 +630,18 @@ func (yp *Yellowpage) Follow() error {
 	userId := yp.GetSession("userId").(string)
 	status := "n"
 	if flag {
-		if mongodb.Del("follow-enterprise", `{"s_userid":"`+userId+`","s_entid":"`+entId+`"}`) {
+		if mongodb.Del("follow_enterprise", `{"s_userid":"`+userId+`","s_entid":"`+entId+`"}`) {
 			status = "y"
 		}
 	} else {
-		userInfo := yp.GetSession("userInfo").(*map[string]interface{})
-		s_m_openId := (*userInfo)["s_m_openid"]
-		if mongodb.Count("follow-enterprise", `{"s_userid":"`+userId+`"}`) >= 10 {
+		if mongodb.Count("follow_enterprise", `{"s_userid":"`+userId+`"}`) >= 10 {
 			status = "m"
-		} else {
-			if len(mongodb.Save("follow-enterprise", bson.M{
+		} else if mongodb.Count("follow_enterprise", `{"s_userid":"`+userId+`","s_entid":"`+entId+`"}`) == 0 {
+			userInfo := yp.GetSession("userInfo").(*map[string]interface{})
+			if len(mongodb.Save("follow_enterprise", bson.M{
 				"s_userid":     userId,
 				"s_entid":      entId,
-				"s_m_openid":   s_m_openId,
+				"s_m_openid":   (*userInfo)["s_m_openid"],
 				"l_createdate": time.Now().Unix(),
 			})) > 0 {
 				status = "y"
@@ -653,3 +651,15 @@ func (yp *Yellowpage) Follow() error {
 	yp.ServeJson(bson.M{"status": status})
 	return nil
 }
+
+//是否关注
+func (yp *Yellowpage) IsFollowed() error {
+	entId := yp.GetString("entId")
+	userId := yp.GetSession("userId").(string)
+	status := "n"
+	if mongodb.Count("follow_enterprise", `{"s_userid":"`+userId+`","s_entid":"`+entId+`"}`) > 0 {
+		status = "y"
+	}
+	yp.ServeJson(bson.M{"status": status})
+	return nil
+}

core/src/qfw/search/searchService.go

@@ -35,9 +35,10 @@ type EntInfo struct {
 
 //企业社区首页
 func (search *Search) EntCommunity() error {
+	pcVisit, _ := search.GetSession("pcVisit").(bool)
 	regex, _ := regexp.Compile("(Android|Mobile)")
 	ismobile := regex.FindAllString(search.Header("User-Agent"), -1)
-	if len(ismobile) > 0 {
+	if len(ismobile) > 0 && !pcVisit {
 		search.T["signature"] = mobile.GetSignature(search.Action)
 		search.Render("/member/incmobile/index.html", &search.T)
 		return nil
@@ -196,7 +197,7 @@ func appendFollow(data *[]map[string]interface{}, session *httpsession.Session)
 	if userId == nil {
 		return
 	}
-	follows := Find("follow-enterprise", `{"s_userid":"`+userId.(string)+`"}`, nil, `{"s_entid":1}`, false, -1, -1)
+	follows := Find("follow_enterprise", `{"s_userid":"`+userId.(string)+`"}`, nil, `{"s_entid":1}`, false, -1, -1)
 	if follows != nil && len(*follows) > 0 {
 		for _, d := range *data {
 			for _, f := range *follows {

core/src/qfw/yellowpage/yellowpagemanager.go

@@ -138,9 +138,10 @@ func GetEntInfo(id string) map[string]interface{} {
 
 //企业黄查询结果
 func (yp *Yellowpage) EnterpriseInfo(id string) error {
+	pcVisit, _ := yp.GetSession("pcVisit").(bool)
 	id = strings.Split(id, "#")[0]
 	regex, _ := regexp.Compile("(Android|Mobile)")
-	ismobile := len(regex.FindAllString(yp.Header("User-Agent"), -1)) > 0
+	ismobile := len(regex.FindAllString(yp.Header("User-Agent"), -1)) > 0 && !pcVisit
 	key := "enterpriseInfo_"
 	if ismobile {
 		key = "menterpriseInfo_"

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

@@ -73,7 +73,7 @@ a{
 	word-break: break-all;
 }
 .a-content {
-	max-width: 1200px;
+	width: 1200px;
 	margin-left: auto;
 	margin-right: auto;
 	padding: 0px;
@@ -2367,6 +2367,9 @@ style="color:#D03102;margin-right:5px;"
 .b-nav-other>a:hover,.b-nav-active>a{
 	font-weight: bold;
 }
+.b-head{
+	min-width: 1200px;
+}
 .b-head .b-loginbtn{
 	width: 40px;
 	height: 40px;
@@ -2492,7 +2495,7 @@ style="color:#D03102;margin-right:5px;"
 .b-content{
 	padding: 0px;
 	margin: 15px auto;
-	max-width: 1200px;
+	width: 1200px;
 }
 .b-left{
 	background-color: #FFFFFF;
@@ -2562,6 +2565,7 @@ style="color:#D03102;margin-right:5px;"
 	color: #666;
 	z-index: 1;
 	display: none;
+	width: 268px;
 }
 .b-pcshare-content img{
 	width: 19px;
@@ -2639,239 +2643,18 @@ style="color:#D03102;margin-right:5px;"
 /*认证完第一次登录 end*/
 /*分辨率小于1200的时候调整布局，算上滚动条1217*/
 @media (max-width: 1217px) {
-	.b-left{
-		width: 100%;
-	}
-	.b-right{
-		display: none;
-	}
-	.a-index .a-cols>.a-com-ul-block.a-com-last{
-		display: none;
-	}
-	.a-index .a-index-want .a-com-title{
-		padding-left: 10px;
-	}
-	.a-index .a-index-want{
-		height: inherit;
-		padding: 0px !important;
-	}
-	.a-index .a-index-fwxq{
-		display: none;
-	}
-	.a-index .a-index-hd{
-		display: none;
-	}
-	.a-index .a-index-want{
-		border-bottom-width: 1px !important;
-	}
-	.a-index .a-index-want li.a-com-last{
-		padding: 0px;
-	}
-	.a-index .a-index-want li.a-com-last>div{
-		margin: 3px;
-	}
+	
 }
 @media (max-width: 1107px) {
-	.a-index .a-index-want li.a-com-last{
-		text-align: center;
-	}
+	
 }
 @media (max-width: 1023px) {
-	.a-index-head{
-		width: 885px;
-		margin-left: auto;
-		margin-right: auto;
-	}
+	
 }
 /* 小屏幕（手机，小于等于 768px） */
 @media (max-width: 768px) {
-	/****企业名片信息页样式****/
-	.qfw-entinfo-padding41 {
-		padding: 0px 5px;
-	}
-	/********首页*******/
-	.a-header{
-		box-shadow: none;
-		margin-bottom: 0px;
-	}
-	.a-index{
-		padding-left: 0px;	
-		padding-right: 0px;	
-	}
-	.a-index .a-panel{
-		padding: 0px 5px;
-	}
-	.loginModal {
-	  	width: 93% !important;
-	}
-	.a-header .a-com-active {
-  		background-color: transparent;
-	}
-	.a-header table {
-		width: 100%;
-	}
-	.a-header td {
-	  	height: 60px;
-	  	line-height: 60px;
-	}
-	.a-header .a-h-logo{
-		padding-left: 10px;
-		padding-right: 15px;
-	}
-	.a-header .a-h-logo img {
-	  	width: 50px;
-	  	height: 50px;
-	}
-	.a-header .a-h-search {
-  		width: 100%;
-		padding-left: 15px;
-	}
-	.a-header .a-h-search .input-group{
-		height: auto;
-	}
-	.a-header .a-h-search form {
-		height: auto;
-	  	margin-top: 0px;
-	}
-	.a-header .a-h-nav{
-		position: absolute;
-		right: 0px;
-		top: 60px;
-		width: 150px;
-		z-index: 101;
-		padding-right: 0px;
-		line-height: 35px;
-	}
-	.a-header .a-h-nav ul{
-		background: black;
-		float: left;
-		opacity: 0.9;
-		text-align: left;
-		padding-top: 5px;
-		padding-bottom: 5px;
-	}
-	.a-header .a-h-nav .a-dot{
-		position: absolute;
-		right: 10px;
-  		bottom: 0px;
-	}
-	.a-header .a-h-nav ul img{
-		width: 25px;
-		height: 25px;
-		margin-left: 15px;
- 		margin-right: 15px;
-	}
-	.a-header .a-h-nav .a-line {
-	  	background-color: #5E5E5E;
-	}
-	.a-header .a-h-nav a{
-		color: #ffffff;
-	}
-	.a-header .a-h-nav li .a-line{
-		width: 100%;
-	}
-	.a-header .a-h-nav li>span{
-		display: inline-block;
-		position: relative;
-		vertical-align: top;
-		height: inherit;
-		padding-top: 5px;
-	}
-	.a-header .a-h-nav li{
-	  	width: 100%;
-	}
-	.a-header .a-h-nav-btn{
-		position: absolute;
-		right: 5px;
-		width: 30px;
-		height: 30px;
-		top: 50%;
-		margin-top: -15px;
-	}
-	.a-header .a-h-nav-btn>img{
-		width: inherit;
-		height: inherit;
-	}
-	.a-header .a-h-nav-btn>.a-dot{
-		position: absolute;
-		right: 0px;
-		top: 0px;
-	}
-	.m-nickName{
-		width: 85px;
-		text-overflow: ellipsis;
-		overflow: hidden;
-		white-space: nowrap;
-		display: inline-block;
-	}
-	.a-index-head {
-	  	width: 100%;
-	}
-	.a-index-head .a-i-h-middle {
-	  	padding-left: 0px;
-	  	width: 100%;
-	}
-	.a-index-head .a-i-h-right{
-		width: 100%;
-		padding: 20px 0px 0px 0px;
-		height: 100px;
-	}
-	.a-index-head .a-index-want{
-		border-width: 0px !important;
-	}
-	.a-index-head .a-index-want div.a-com-four{
-		width: 80px;
-	}
-	.a-index-head .a-index-want div{
-		width: 60px;
-	}
-	.a-index .a-index-want li.a-com-last {
-	  	text-align: left;
-	}
-	.a-index .a-index-want li.a-com-last>div {
-	  	margin: 0px;
-	}
-	.qfw-bottom{
-		position: relative;
-	}
-	.qfw-bottom-text{
-		position: absolute;
-		top: 50%;
-		margin-top: -26px;
-		height: 52px;
-		width: 100%;
-		display: block !important;
-	}
-	.qfw-bottom-text a {
-	  	margin-left: 5px;
-	  	margin-right: 5px;
-	}
-	.a-index .a-panel .a-com-title font{
-		font-size: 20px;
-	}
-	.a-content .a-c-left{
-		width: 100%;
-	}
-	.a-content .a-c-right{
-		display: none;
-	}
-	/*登录窗口*/
-	.loginModal .modal-header{
-		text-align: center;
-	}
-	.login-logo{
-		margin-left: 0px !important;
-		width: 96.6px !important;
-  		height: 40.8px !important;
-		margin-top: 10px !important;
-	}
-	.loginModal .modal-header{
-		height: auto !important;
-	}
-	.loginModal .otherlogin{
-		display: block !important;
-		padding: 0 !important;
-	}
+	
+	
 }
 .radius{
 	border-radius: 34px;
@@ -2952,4 +2735,54 @@ style="color:#D03102;margin-right:5px;"
 	border-radius: 5px;
 	text-align: center;
 	padding: 20px 25px;
+}
+
+.maskLayer{
+	position: fixed;
+	left: 0px;
+	right: 0px;
+	top: 0px;
+	bottom: 0px;
+	background-color: rgba(0,0,0,0.5);
+	display: none;
+	z-index: 998;
+}
+.tipTriangle{
+	position: absolute;
+	display: none;
+	z-index: 999;
+}
+.tipTriangle>div{
+	padding: 15px 14px;
+	margin-top: 10px;
+	background-color: rgb(255,255,255);
+}
+.tipTriangle .triangle-up{
+    width: 0;
+    height: 0;
+    display: block;
+	position: absolute;
+	border-bottom: 10px solid rgb(255, 255, 255);
+}
+.tipTriangle .triangle-right{
+	right: 20px;
+	border-left: 12px solid transparent;
+    border-right: 3px solid transparent;
+}
+.tipTriangle .triangle-left{
+	left: 20px;
+	border-right: 12px solid transparent;
+    border-left: 3px solid transparent;
+}
+.ent-status-r,.ent-status-g{
+	color: #ffffff;
+	padding: 2px 10px 2px 5px;
+}
+.ent-status-r{
+	background-image: url("/images/status-r.png");
+	background-size: 100% 100%;
+}
+.ent-status-g{
+	background-image: url("/images/status-g.png");
+	background-size: 100% 100%;
 }

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

@@ -42,6 +42,7 @@ a:focus, a:hover{
 	margin-top: -14.5px;
 	color: #56C4B0;
 	cursor: pointer;
+	width: 70px;
 }
 .ent-follow span{
 	margin-right: 5px;
@@ -159,18 +160,6 @@ a:focus, a:hover{
 .entlist-page .nav-tabs>.active:hover{
 	background-color: #FFFFFF;
 }
-.ent-status-r,.ent-status-g{
-	color: #ffffff;
-	padding: 2px 10px 2px 5px;
-}
-.ent-status-r{
-	background-image: url("/images/status-r.png");
-	background-size: 100% 100%;
-}
-.ent-status-g{
-	background-image: url("/images/status-g.png");
-	background-size: 100% 100%;
-}
 .entlist-page .qfw-entcontent-padding>img{
 	width: 90px;
 	height: 90px;
@@ -193,6 +182,11 @@ a:focus, a:hover{
 	word-break: break-all;
 	white-space: normal !important;
 }
+.tipTriangle>div>div{
+	margin-top: 10px;
+	color: #a0a0a0;
+	text-align: center;
+}
 .b-scroll-list .b-adver-content{
 	padding: 0px 10px 10px 10px;
 	max-height: 600px;
@@ -376,8 +370,12 @@ a:focus, a:hover{
 }
 .entinfo-page .b-com-head>.entinfo-cart{
 	margin-left: 160px;
+	min-height: 130px;
 	position: relative;
 }
+.entinfo-page .b-com-head>.entinfo-cart.entinfo-editcart{
+	height: auto;
+}
 .entinfo-page .b-com-head .b-com-first{
 	line-height: 25px;
 	margin-right: 60px;
@@ -424,8 +422,7 @@ a:focus, a:hover{
 .entinfo-page .b-com-head .glyphicon{
 	font-size: 17px;
 	color: #cccccc;
-	margin-right: 5px;
-	vertical-align: sub;
+	vertical-align: text-bottom;
 }
 .entinfo-page .b-com-head .b-com-last a{
 	color: #415fcf;
@@ -470,6 +467,25 @@ a:focus, a:hover{
 	margin-top: 10px;
 	min-height: 500px;
 }
+.entinfo-follow,.b-pcshare{
+	display: inline-block;
+	vertical-align: top;
+}
+.entinfo-follow span{
+	margin-right: 3px;
+}
+.entinfo-follow{
+	margin-top: 10px;
+	display: inline-block;
+	vertical-align: top;
+	font-size: 16px;
+	color: rgb(160, 160, 160);
+	margin-right: 10px;
+	cursor: pointer;
+}
+.entinfo-follow.ent-followed>span,.entinfo-follow.ent-followed{
+	color: #56C4B0 !important;
+}
 /********************企业画像**********************/
 .entinfo-basicinfo .b-com-content{
 	padding-top: 60px !important;
@@ -1114,43 +1130,4 @@ a:focus, a:hover{
 	position: absolute;
 	right: 0px;
 	top: 0px;
-}
-.entlist-page .flowmaxnumbg{
-	position: fixed;
-	left: 0px;
-	right: 0px;
-	top: 0px;
-	bottom: 0px;
-	background-color: rgba(0,0,0,0.5);
-	display: none;
-	z-index: 998;
-}
-.entlist-page .flowmaxnum{
-	position: absolute;
-	width: 250px;
-	display: none;
-	z-index: 999;
-}
-.entlist-page .flowmaxnum>div{
-	padding: 15px 14px;
-	margin-top: 10px;
-	background-color: rgb(255,255,255);
-}
-.entlist-page .flowmaxnum>div>div{
-	margin-top: 10px;
-	color: #a0a0a0;
-}
-.entlist-page .flowmaxnum a{
-	margin-top: 15px;
-	color: #a0a0a0;
-}
-.entlist-page .flowmaxnum .triangle-up{
-    width: 0;
-    height: 0;
-    border-left: 12px solid transparent;
-    border-right: 3px solid transparent;
-    border-bottom: 10px solid rgb(255, 255, 255);
-    display: block;
-	position: absolute;
-	right: 20px;
 }

core/src/web/staticres/css/membercenter.css

@@ -0,0 +1,145 @@
+/*******用户中心首页**********/
+.membercenter-index .pushlist .panel-title-out a{
+	color: #a0a0a0;
+}
+.membercenter-index .pushlist .panel-title-out a:hover{
+	color: #ff5a5f;
+}
+.membercenter-index .pushlist .tslist{
+	padding: 5px 20px 5px 10px;
+}
+.membercenter-index .pushlist .tslist .bt-parent{
+	width: 760px;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+.membercenter-index .pushlist .tslist a:hover{
+	color: inherit;
+}
+.membercenter-index .pushlist .tslist .time-diff{
+	display: inline-block;
+	float: right;
+	color: #a0a0a0;
+	width: 70px;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	text-align: right;
+}
+.membercenter-index .pushlist .tslist .keyword{
+	color: #ff5a5f;
+}
+.membercenter-index .pushlist .tslist>.xh{
+	margin-right: 10px;
+	vertical-align: top;
+}
+.membercenter-index .pushlist .tslist>*{
+	display: inline-block;
+}
+.membercenter-index .entCard{
+	margin-top: 20px;
+}
+.membercenter-index .entCard .row>div{
+	padding: 30px 40px !important;
+	cursor: pointer;
+}
+.membercenter-index .entCard img{
+	width: 100px;
+	height: 100px;
+}
+.membercenter-index .entCard b{
+	font-size: 16px;
+}
+.membercenter-index .entCard a{
+	float: right;
+	color: #ff5a5f;
+}
+.membercenter-index .entCard font{
+	margin-right: 3px;
+	color: #ff5a5f;
+	float: right;
+	font-size: 12px;
+	margin-left: 5px;
+	vertical-align: text-bottom;
+}
+.membercenter-index .entCard font>font{
+	margin-left: -2px;
+	vertical-align: baseline;
+}
+.membercenter-index .entCard .releaseDemand{
+	height: 100px;
+}
+.membercenter-index .entCard .releaseDemand img{
+	position: relative;
+	top: -8px;
+}
+.membercenter-index .pushlist .glyphicon.xiaoxi{
+	font-size: 18px;
+}
+.membercenter-index .entCard .glyphicon.qmx-icon-mingpian{
+	color: #fff;
+	font-size: 18px;
+	top: -1px;
+}
+.membercenter-index .entCard .panel-title-out{
+	position: relative;
+}
+.membercenter-index .entCard .panel-title-out>div{
+	width: 20px;
+	height: 16px;
+	background-color: #ff5a5f;
+	position: absolute;
+	top: 2px;
+}
+/******************我关注的企业*********************/
+.membercenter-myfollow li{
+	width: 100%;
+	position: relative;
+	border-bottom: 1px solid #ddd;
+	padding: 30px 5px;
+}
+.membercenter-myfollow li>img{
+	width: 90px;
+    height: 90px;
+    vertical-align: top;
+    position: absolute;
+    top: 50%;
+    margin-top: -45px;
+}
+.membercenter-myfollow li>div{
+	padding-left: 100px;
+}
+.membercenter-myfollow li a{
+	font-size: 16px;
+}
+.membercenter-myfollow .ent-follow {
+    position: absolute;
+    top: 50%;
+    right: 0px;
+    line-height: 27px;
+    margin-top: -14.5px;
+    color: rgb(86, 196, 176);
+    cursor: pointer;
+}
+.membercenter-myfollow a:hover,.membercenter-myfollow a:focus{
+	color: #ff5a5f;
+}
+.membercenter-myfollow .ent-follow span {
+    margin-right: 5px;
+    font-size: 16px;
+    vertical-align: middle;
+}
+.membercenter-myfollow .tipTriangle b{
+	font-size: 16px;
+}
+.membercenter-myfollow .tipTriangle button{
+	width: 80px;
+	margin-top: 15px;
+}
+.membercenter-myfollow .tipTriangle .btn-default{
+	background-color: #DEDEDE;
+	border-color: #DEDEDE;
+	color: #fff;
+	margin-left: 10px;
+}

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

@@ -406,11 +406,12 @@ a.new_red:hover, a.new_red:active {
 /*==========会员中心首页区块元素的标题===========*/
 .panel-title-in, .panel-title-out {
 	margin-bottom: 10px;
+	padding-left: 10px;
 }
 
 .panel-title-in i, .panel-title-out i {
 	font-size: 20px;
-	color: rgb(153, 153, 153);
+	color: #ff5a5f;
 	vertical-align: sub;
 	margin-right: 10px;
 }
@@ -424,10 +425,6 @@ a.new_red:hover, a.new_red:active {
 .panel-title-out .pull-right i {
 	font-size: 16px;
 }
-
-.panel-title-out .pull-right {
-	font-size: 12px;
-}
 /*==========点击邀请链接之后跳转到页面的样式===========*/
 .invite-form-title {
 	height: 60px;
@@ -1033,6 +1030,58 @@ span.highlight {
 	content: "\AF";
 }
 
+.qmx-icon-jianyu:before{
+	content: "\BB";
+}
+
+.qmx-icon-xuqiu:before{
+	content: "\B1";
+}
+
+.qmx-icon-renzheng:before{
+	content: "\B2";
+}
+
+.qmx-icon-mingpian:before{
+	content: "\B3";
+}
+
+.qmx-icon-fabufuwu:before{
+	content: "\B4";
+}
+
+.qmx-icon-dingdan:before{
+	content: "\B5";
+}
+
+.qmx-icon-toubiao:before{
+	content: "\B6";
+}
+
+.qmx-icon-jifen:before{
+	content: "\B7";
+}
+
+.qmx-icon-guize:before{
+	content: "\B8";
+}
+
+.qmx-icon-xiaoxi:before{
+	content: "\B9";
+}
+
+.qmx-icon-shezhi:before{
+	content: "\BA";
+}
+
+.qmx-icon-shimingrenzheng:before{
+	content: "\BD";
+}
+
+.qmx-icon-anquan:before{
+	content: "\BC";
+}
+
 .icon-small {
 	font-size: 12px;
 }

core/src/web/staticres/css/swordfish.css

@@ -343,10 +343,5 @@ a:focus, a:hover{
     border-color: #37C6DA;
 }
 @media (max-width: 1200px) {
-	.b-left{
-		width: 100%;
-	}
-	.b-right{
-		display: none;
-	}
+	
 }

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

@@ -236,11 +236,58 @@ $(function(){
 			dishonestyPaging = new DishonestyPaging();
 		}
 	});
+	//关注
+	$("#follow").click(function(){
+		if(!isLogined){
+			loginModalShow();
+			return;
+		}
+		var dataObj = {};
+		dataObj["flag"] = $(this).hasClass("ent-followed");
+		dataObj["entId"] = entId;
+		var thisClass = $(this);
+		$.post("/member/enterprise/follow",dataObj,function(r){
+			if(r.status == "y"){
+				if(dataObj.flag){
+					thisClass.html('<span class="glyphicon weiguanzhu"></span>关注');
+					TipAssembly.show("已取消<br>关注");
+				}else{
+					thisClass.html('<span class="glyphicon yiguanzhu"></span>已关注');
+					TipAssembly.show("已关注");
+				}
+				thisClass.toggleClass("ent-followed");
+			}else if(r.status == "m"){
+				TipAssembly.hide();
+				TipAssembly.triangleShow(thisClass,"left",250,10,0);
+			}else if(r.status == "n"){
+				if(dataObj.flag){
+					TipAssembly.show("取消关注失败！");
+				}else{
+					TipAssembly.show("关注失败！");
+				}
+			}else{
+				if(dataObj.flag){
+					TipAssembly.show("取消关注失败！");
+				}else{
+					TipAssembly.show("关注失败！");
+				}
+			}
+		});
+	});
+	$("#thinkAgain").click(function(){
+		TipAssembly.triangleHide();
+	});
 });
 function afterReLoadTop(flag,result){
 	//关系网如果没有数据，选项卡不可点
 	if(typeof(result) != "undefined"){
 		identWayFlag = result.identWay == 1;
+		//查询关注状态
+		$.post("/member/enterprise/isFollowed",{entId:entId},function(r){
+			if(r.status == "y"){
+				$("#follow").addClass("ent-followed").html('<span class="glyphicon yiguanzhu"></span>已关注');
+			}
+		});
 	}
 	relationFlag = flag && identWayFlag && !relFlag;
 	if(!$(".ent-tab>li:eq(1)").hasClass("ent-active") && relationFlag){

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

@@ -714,5 +714,17 @@ var TipAssembly = {
 	},
 	hide: function(){
 		$("#tipAssembly").remove();
+	},
+	triangleShow: function(obj,direction,width,top,left){
+		$("#maskLayer").unbind("click").click(function(e){
+			$(this).hide();
+			$("#tipTriangle").hide();
+		});
+		$("#tipTriangle>span").addClass("triangle-"+direction);
+		$("#tipTriangle").css({width:width,top: obj.offset().top+top,left: obj.offset().left+left}).show();
+		$("#maskLayer,#tipTriangle").show();
+	},
+	triangleHide: function(){
+		$("#maskLayer,#tipTriangle").hide();
 	}
 }

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

@@ -1,22 +1,16 @@
 <style type="text/css">
 .rzimg{
-	width:80px;
-	height:75px;
+	width: 120px;
+	height: 120px;
 	margin-left:14px;
 }
 .rztable{
 	max-width: 206px;
 	height: 310px;
 	text-align: center;
-	padding-top: 35px;
-	font-weight: bold;
 	cursor: pointer;
-	background-image: url('{{Msg "seo" "cdn"}}/images/u12.png');
 	margin: 20px auto 0px auto;
 }
-.rztable-mouseover{
-	background-image: url('{{Msg "seo" "cdn"}}/images/u12_mouseOver.png');
-}
 .rztable img{
 	margin-bottom: 10px;
 }
@@ -28,8 +22,9 @@
 	margin-left: 61.5px;
 }
 .rztable p {
-	padding:15px 19px;
-	font-weight:normal;
+	display: block;
+	height: 90px;
+	color: #a0a0a0;
 }
 .disablelink {
 	cursor: auto !important;
@@ -37,6 +32,16 @@
 .rztableParent{
 	padding-right: 0px;
 }
+.rztableParent span{
+	font-size: 16px;
+	font-weight: bold;
+	margin-bottom: 10px;
+	display: block;
+}
+.rztableParent button{
+	width:80px;
+	border-radius: 40px;
+}
 .notPassReason{
 	padding-bottom: 10px;
 	padding-left: 10px;
@@ -122,75 +127,46 @@
 	</div>
 {{end}}
 <div class="top-msage" id="topmsage">提示信息：只有进行实名认证的用户才能发布服务!<a onclick="$('#topmsage').hide();">x</a></div>
-<div class="panel panel-default">
-	<div class="panel-body">
-	   	<div class="panel-title-in">
-		    <i class="glyphicon shimingrenzheng"></i><span>实名认证</span>
+<div class="panel-title-out">
+	<i class="glyphicon qmx-icon-shimingrenzheng" style="font-size: 22px;"></i><span>实名认证</span>
+</div>
+<div class="a-line"></div>
+<div class="row margin-b-20">
+	<div class="col-sm-4 rztableParent">
+		<div class="rztable" id="ent_authe" href="/member/comaut/index">
+			<img class="rzimg" src="{{Msg "seo" "cdn"}}/images/ent_authe.png"/>
+			<br><span>企业实名认证</span>
+			<p>企业实名认证是“企明星”针对普通会员推出的免费认证服务，只要您有工商注册号，即可进行认证。</p>
+			<button  class="btn btn-primary">认证</button>
 		</div>
-		<div class="a-line"></div>
-		<div class="row">
-			<div class="col-sm-4 rztableParent">
-				<div class="rztable" id="ent_authe" href="/member/comaut/index">
-					<img class="rzimg" src="{{Msg "seo" "cdn"}}/images/ent_authe.png"/>
-					<br>企业实名认证
-					<p style="padding-bottom:10px;">企业实名认证是“企明星”针对普通会员推出的免费认证服务，只要您有工商注册号，即可进行认证。</p>
-					<button  class="btn btn-primary" style="width:80px;margin-top:-10px;">认证</button>
-				</div>
-			</div>
-			<div class="col-sm-4 rztableParent">
-				<div class="rztable" id="person_authe" href="/member/personauthent/index">
-					<img class="rzimg" src="{{Msg "seo" "cdn"}}/images/person_authe.png"/>
-					<br>个人实名认证
-					<p>个人实名认证是指通过身份证信息的核实，来证明会员身份的真实性，更好的促进交易。</p>
-					<button  class="btn  btn-primary" style="width:80px;margin-top:-10px;">认证</button>
-				</div>
-			</div>
-			<div class="col-sm-4 rztableParent">
-				<div class="rztable" id="other_authe" href="/member/otherauthent/index">
-					<img class="rzimg" src="{{Msg "seo" "cdn"}}/images/other_authe.png"/>
-					<br>机构认证
-					<p>政府、事业单位、各种协会或社会团体等，使用组织机构代码完成认证。</p>
-					<button  class="btn btn-primary" style="width:80px;margin-top:10px;">认证</button>
-				</div>
-			</div>
+	</div>
+	<div class="col-sm-4 rztableParent">
+		<div class="rztable" id="person_authe" href="/member/personauthent/index">
+			<img class="rzimg" src="{{Msg "seo" "cdn"}}/images/person_authe.png"/>
+			<br><span>个人实名认证</span>
+			<p>个人实名认证是指通过身份证信息的核实，来证明会员身份的真实性，更好的促进交易。</p>
+			<button  class="btn  btn-primary">认证</button>
+		</div>
+	</div>
+	<div class="col-sm-4 rztableParent">
+		<div class="rztable" id="other_authe" href="/member/otherauthent/index">
+			<img class="rzimg" src="{{Msg "seo" "cdn"}}/images/other_authe.png"/>
+			<br><span>机构认证</span>
+			<p>政府、事业单位、各种协会或社会团体等，使用组织机构代码完成认证。</p>
+			<button  class="btn btn-primary">认证</button>
 		</div>
 	</div>
 </div>
-
 <script type="text/javascript">
 $(function (){
 		//企业认证 点击事件
 		$("#ent_authe").click(function (){
 			window.location.href = "/member/comaut/index";
 		});
-		//企业认证
-		$("#ent_authe").mouseover(function (){
-			$(this).addClass("rztable-mouseover");
-			$(this).children("img").attr("src","{{Msg "seo" "cdn"}}/images/ent_authe_a.png");
-		}).mouseout(function (){
-			$(this).removeClass("rztable-mouseover");
-			$(this).children("img").attr("src","{{Msg "seo" "cdn"}}/images/ent_authe.png");
-		});
 		//个人认证 点击事件
 		$("#person_authe").click(function (){
 			window.location.href = "/member/personauthent/index";
 		});
-		//个人认证
-		$("#person_authe").mouseover(function (){
-			$(this).addClass("rztable-mouseover");
-			$(this).children("img").attr("src","{{Msg "seo" "cdn"}}/images/person_authe_a.png");
-		}).mouseout(function (){
-			$(this).removeClass("rztable-mouseover");
-			$(this).children("img").attr("src","{{Msg "seo" "cdn"}}/images/person_authe.png");
-		});
-		//其他认证
-		$("#other_authe").mouseover(function (){
-			$(this).addClass("rztable-mouseover");
-			$(this).children("img").attr("src","{{Msg "seo" "cdn"}}/images/other_authe_a.png");
-		}).mouseout(function (){
-			$(this).removeClass("rztable-mouseover");
-			$(this).children("img").attr("src","{{Msg "seo" "cdn"}}/images/other_authe.png");
-		});
 		//其他认证 点击事件
 		$("#other_authe").click(function (){
 			window.location.href = "/member/otherauthent/index";

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

@@ -1,6 +1,6 @@
 {{$userTypeString := printf "%v" (session "userType")}}
 <!-- 底部 -->
-<div class="hidden-xs" id="qfw-bottom">
+<div class="hidden-xs" id="qfw-bottom" style="min-width: 1200px;">
 	<ul class="hidden-xs bottom-bar" id="bottom-bar">
 		<li title="扫码登录"{{if or (session "userType") (eq $userTypeString "0")}} class="invisible"{{end}}><img src="{{Msg "seo" "cdn"}}/images/bottom-weixin.png"></li>
 		<li title="联系客服"{{if eq $userTypeString "0"}} class="invisible"{{end}}><a href="http://wpa.qq.com/msgrd?v=3&amp;uin=3240709056&amp;site=qq&amp;menu=yes"><img src="{{Msg "seo" "cdn"}}/images/bottom-qq.png"></a></li>

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

@@ -230,12 +230,12 @@ function afterLoginSkip(data,flag){
 			</div>
 			<div class="modal-body f-login" style="text-align:center;padding-top:20;">
 				<div class="row">
-					<div class="login wxlogin hidden-xs col-md-5">
+					<div class="login wxlogin col-xs-5">
 						<div class="text-muted" style="margin-top:5px;font-weight: 700;color:#000;font-size: 14px;">微信扫码登录</div>
 						<img alt="加载中.." style="width:124px;height:127px;margin:20px;" id="wxPic" class="border">
 						<div class="text-muted" style="line-height: 22px;margin-top:5px;font-family: tahoma, arial, 'Hiragino Sans GB', 宋体, sans-serif;;font-size: 12px;color: rgb(160, 160, 160);">使用微信扫描登录<br/>新用户自动注册</div>
 					</div>
-					<div class="login col-md-7" style="border-left:1px solid #F0F0F0;">
+					<div class="login col-xs-7" style="border-left:1px solid #F0F0F0;">
 						<form class="form-horizontal loginForm" method="post" style="width:220px;margin-left: 40px;">
 						  	<div class="text-muted" style="margin-top:5px;font-weight: 700;color:#000;font-size: 14px;">邮箱/手机登录</div>
 							<div class="form-group">

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

@@ -10,14 +10,6 @@
 .member_nav_a{
 	color: inherit;
 }
-.member-left .glyphicon{
-	font-size: 20px;
-	vertical-align: sub;
-	width: 30px;
-	text-align: center;
-	margin-right: 5px;
-	color: rgb(153, 153, 153);
-}
 .member-loginName{
 	display: inline-block;
 	max-width: 240px;
@@ -80,16 +72,23 @@
 	font-weight: 700;
 }
 #serviceMerchan:hover,#personal:hover,#vipMenu:hover,#accountSetMenu:hover{
-	background-color:#e4e4e4;
 	color:#0099FA;
 }
-.list-group .list-group-item {
+#serviceMerchan,#personal,#vipMenu,#accountSetMenu{
+	background-color:#F7F6F4;
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+#personal{
+	margin-top: 0px;
+}
+.member-left .list-group .list-group-item {
 	border: 0px;
     font-size: 14px;
-    color: #666666;
+    color: #666;
 	padding: 10px 0px 10px 70px;
 }
-a.list-group-item:hover{
+.member-left a.list-group-item:hover{
 	background-color:#fff;
 }
 .member-right{
@@ -98,10 +97,48 @@ a.list-group-item:hover{
 	border: 1px solid #E5E6E9;
 }
 .b-round-dot {
-    background-color: rgb(255, 90, 95);
+    background-color: #ff5a5f;
 }
 .index-new-head .head-hidemenu i {
-    color: rgb(255, 90, 95);
+    color: #ff5a5f;
+}
+.member-left .glyphicon{
+	font-size: 14px;
+	vertical-align: middle;
+	margin-right: 10px;
+	top: -1px;
+}
+.member-left .glyphicon.qmx-icon-jianyu {
+    font-size: 18px;
+	vertical-align: sub;
+}
+.member-left .glyphicon.qmx-icon-xuqiu {
+    font-size: 22px;
+}
+.member-left .glyphicon.bofangjilu {
+    font-size: 16px;
+	top: 0px;
+	opacity: 0.7;
+}
+.member-left .glyphicon.qmx-icon-dingdan {
+    font-size: 16px;
+}
+.member-left .glyphicon.qmx-icon-toubiao {
+    font-size: 16px;
+	margin-right: 8px;
+	top: 0px;
+}
+.member-left .glyphicon.qmx-icon-renzheng {
+    font-size: 16px;
+	top: 0px;
+}
+.member-left .glyphicon.qmx-icon-guize {
+    font-size: 16px;
+}
+.member-left .glyphicon.qmx-icon-mingpian {
+	font-size: 13px;
+	vertical-align: baseline;
+	top: 0px;
 }
 </style>
 {{$identWay := session "identWay"}}
@@ -117,7 +154,20 @@ a.list-group-item:hover{
 					<img class="img-circle" src="{{Msg "seo" "cdn"}}{{$s_avatar}}" onerror="this.className='img-circle defaultHeadImg';this.src='{{Msg "seo" "cdn"}}/images/image_radius_bg.png'">
 				{{end}}
 			</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><span style="font-size:16px;padding:10px 0px;" class="member-loginName cursor-pointer" onclick="window.location.href = '/member/show/memberindex'">{{session "nickName"}}</span></div>
+			{{if and (eq 1 $identWay) (session "identType")}}
+				<div style="padding-bottom:10px;">
+					<span>{{printf "%v" (index (session "userInfo") "s_enterprisename")}}</span>
+					{{$identType := session "identType"}}
+					{{if eq 1 $identType}}
+						<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 if eq 2 $identType}}
+						<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 if eq 3 $identType}}
+						<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}}
+				</div>
+			{{end}}
 			<div>
 			{{if session "credit_qd"}}
 				{{if eq (session "credit_qd") "y"}}
@@ -135,7 +185,7 @@ a.list-group-item:hover{
 	<div style="line-height: 24px;width:248px;height:50px;text-align:center;">
 		<div onclick="creditModel(1)" style="float:left;width:120px;border-right:1px;">
 			<div style="font-weight: 700;">积分</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:normal;" class="gold">{{session "i_credit"}}</span><span class="font-size-12 hidden" style="color:#999999;"> 积分</span></div>
+			<div><i class="glyphicon jinbi" style="width:20px;color:red;font-size:13px;margin-top: -5px;vertical-align: middle;"></i><span style="font-weight:normal;" class="gold">{{session "i_credit"}}</span><span class="font-size-12 hidden" style="color:#999999;"> 积分</span></div>
 		</div>
 		<div style="height:50px;float:left;width:1px;background-color:#e5e6e9"></div>
 		<div onclick="window.location.href='/member/accountset/index'" style="float:left;width:125px;">
@@ -172,7 +222,7 @@ a.list-group-item:hover{
 	</div>
 	</a>
 	<div class="list-group-item" id="personal">个人菜单</div>
-	<a class="list-group-item" onclick="window.location.href = '/member/swordfish/rssset'">剑鱼（信息订阅）</a>
+	<a class="list-group-item" onclick="window.location.href = '/member/swordfish/rssset'"><i class="glyphicon qmx-icon-jianyu"></i>剑鱼</a>
 	
 </div>
 <!-- vipcreditModal -->
@@ -229,7 +279,7 @@ a.list-group-item:hover{
 </div>
 <script type="text/javascript">
 var role = "{{$s_role}}"=="<nil>"?"":"{{$s_role}}";
-var identWay = "{{$identWay}}";
+var identWay = {{$identWay}};
 var entId = '{{session "entid"}}';
 var isCanEditEnt = entId!="";
 var MemberLeftMenu = {
@@ -240,17 +290,17 @@ var MemberLeftMenu = {
 			html += this.accountSetMenu()+this.accountMenu()+this.messageMenu();
 			return;
 		}else if(role == "" || /^[9]$/.test(role)){//最大权限
-			html += this.myAppointment()+this.myDemand()+this.myYellowPageMenu()+this.serverMenu()+this.employeemanageMenu();
+			html += this.myDemand()+this.myAppointment()+this.employeemanageMenu()+this.myFollow();
 			if(/^[9]$/.test(role)){
 				html += this.callCenterMenu();
 			}
-			html += this.serviceMerchantMenu()+this.orderManageMenu()+this.bidManageMenu();
+			html += this.serviceMerchantMenu()+this.autheMenu()+this.myYellowPageMenu()+this.serverMenu()+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();
+			html += this.accountSetMenu()+this.messageMenu()+this.accountMenu();
 		}else if(isCanEditEnt){
 			html += this.myYellowPageMenu();
 			if(/^[1]$/.test(role)){//黄页编辑者
@@ -262,11 +312,14 @@ var MemberLeftMenu = {
 	},
 	//实名认证菜单
 	autheMenu: function(){
-		return '<a class="list-group-item" onclick="window.location.href=\'/member/authentication/index\'"><i class="glyphicon shimingrenzheng"></i>实名1认证</a>';
+		if(identWay == 1){
+			return '';
+		}
+		return '<a class="list-group-item authemenu" onclick="window.location.href=\'/member/authentication/index\'"><i class="glyphicon qmx-icon-renzheng"></i>用户认证</a>';
 	},
 	//账户设置
 	accountMenu: function(){
-		return '<a class="list-group-item accountmenu" onclick="window.location.href = \'/member/accountset/index\'">账户设置</a>';
+		return '<a class="list-group-item accountmenu" onclick="window.location.href = \'/member/accountset/index\'"><i class="glyphicon qmx-icon-shezhi"></i>账户设置</a>';
 	},
 	//服务商家菜单
 	serviceMerchantMenu: function(){
@@ -278,7 +331,7 @@ var MemberLeftMenu = {
 	},
 	//消息菜单
 	messageMenu: function(){
-		return '<a class="list-group-item" onclick="window.location.href = \'/member/msgcenter\'" id="msgCenter">网站消息</a>'
+		return '<a class="list-group-item" onclick="window.location.href = \'/member/msgcenter\'" id="msgCenter"><i class="glyphicon qmx-icon-xiaoxi"></i>网站消息</a>'
 	},
 	//员工管理菜单
 	employeemanageMenu: function(){
@@ -302,7 +355,7 @@ var MemberLeftMenu = {
 		}else{//不可编辑黄页跳转到企业认证页面
 			href = this.authentHref;
 		}
-		return '<a onclick="window.location.href=\''+href+'\'" class="list-group-item myyellow">我的黄页</a>';
+		return '<a onclick="window.location.href=\''+href+'\'" class="list-group-item myyellow"><i class="glyphicon qmx-icon-mingpian"></i>企业/商家名片</a>';
 	},
 	//产品服务菜单
 	serverMenu: function(){
@@ -312,7 +365,7 @@ var MemberLeftMenu = {
 		}else{//不可编辑黄页跳转到企业认证页面
 			href = this.authentHref;
 		}
-		return '<a onclick="window.location.href=\''+href+'\'" class="list-group-item">产品服务</a>';
+		return '<a onclick="window.location.href=\''+href+'\'" class="list-group-item"><i class="glyphicon qmx-icon-fabufuwu"></i>发布服务</a>';
 	},
 	//微官网菜单
 	microwebsiteMenu: function(){
@@ -320,19 +373,19 @@ var MemberLeftMenu = {
 	},
 	//我预约的服务
 	myAppointment: function(){
-		return '<a onclick="window.location.href=\'/member/myAppointment\'" class="list-group-item myappointment">我预约的服务</a>';
+		return '<a onclick="window.location.href=\'/member/myAppointment\'" class="list-group-item myappointment"><i class="glyphicon bofangjilu"></i>我预约的服务</a>';
 	},
 	//我发布的需求
 	myDemand: function(){
-		return '<a onclick="window.location.href=\'/member/myDemand\'" class="list-group-item mydemand">我发布的需求</a>';
+		return '<a onclick="window.location.href=\'/member/myDemand\'" class="list-group-item mydemand"><i class="glyphicon qmx-icon-xuqiu"></i>我发布的需求</a>';
 	},
 	//订单管理
 	orderManageMenu: function(){
-		return '<a onclick="window.location.href=\'/member/orderManage\'" class="menu-childnode list-group-item ordermanage">订单管理</a>';
+		return '<a onclick="window.location.href=\'/member/orderManage\'" class="menu-childnode list-group-item ordermanage"><i class="glyphicon qmx-icon-dingdan"></i>订单管理</a>';
 	},
 	//需求管理
 	bidManageMenu: function(){
-		return '<a onclick="window.location.href=\'/member/bidManage\'" class="menu-childnode list-group-item bidmanage">投标管理</a>';
+		return '<a onclick="window.location.href=\'/member/bidManage\'" class="menu-childnode list-group-item bidmanage"><i class="glyphicon qmx-icon-toubiao"></i>投标管理</a>';
 	},
 	//vip会有菜单
 	vipMenu: function(){
@@ -340,11 +393,15 @@ var MemberLeftMenu = {
 	},
 	//我的积分
 	myCredit: function(){
-		return '<a onclick="creditModel(1)" class="menu-childnode2 list-group-item mycredit" data-target="#vipcreditModal">我的积分</a>';
+		return '<a onclick="creditModel(1)" class="menu-childnode2 list-group-item mycredit" data-target="#vipcreditModal"><i class="glyphicon qmx-icon-jifen"></i>我的积分</a>';
 	},
 	//积分规则
 	creditRule: function(){
-		return '<a href="/member/credit/creditRule" class="menu-childnode2 list-group-item credit">积分规则</a>';
+		return '<a href="/member/credit/creditRule" class="menu-childnode2 list-group-item credit"><i class="glyphicon qmx-icon-guize"></i>积分规则</a>';
+	},
+	//我关注的企业
+	myFollow: function(){
+		return '<a href="/member/myFollowEnts" class="menu-childnode2 list-group-item myfollow"><i class="glyphicon weiguanzhu"></i>我关注的企业</a>';
 	}
  };
 $(function (){

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

@@ -23,7 +23,7 @@
 			</div>
 			{{end}}
 		</div>
-		<div class="entinfo-cart">
+		<div class="entinfo-cart{{if eq .T.editFlag 2}} entinfo-editcart{{end}}">
 			{{if eq .T.editFlag 1}}<a class="btn btn-primary btn-save" href="/member/enterprise/edit">编辑</a>{{end}}
 			{{if eq .T.editFlag 2}}<button id="editSave" class="btn btn-primary btn-save">保存</button>{{end}}
 			<div class="b-com-first">
@@ -152,6 +152,9 @@
 			{{end}}
 		</div>
 		{{if ne .T.editFlag 2}}
+		<div class="entinfo-follow" id="follow">
+			<span class="glyphicon weiguanzhu"></span>关注
+		</div>
 		<div class="b-pcshare">
 			<span id="pcShare"><span class="glyphicon fenxiang"></span>分享</span>
 			<div class="b-pcshare-content" id="pcShare-content">
@@ -542,6 +545,14 @@
 	{{end}}
 </div>
 {{include "/common/bottom.html"}}
+<div class="maskLayer" id="maskLayer"></div>
+<div class="tipTriangle" id="tipTriangle">
+	<span class="triangle-up"></span>
+	<div>
+		剑鱼为给您更好的使用体验目前仅支持关注10家企业，你已成功关注10家企业，如需继续关注，请到“用户中心-我的关注”对已关注的企业进行取消关注后，可关注新的企业。
+		<div><span class="cursor-pointer" id="thinkAgain">再想想</span><span class="margin-lr-15">或</span>管理<button class="btn btn-primary margin-l-5" onclick="window.location.href='/member/myFollowEnts'">我的关注</button></div>
+	</div>
+</div>
 </body>
 <script type="text/javascript">
 var cdn = {{Msg "seo" "cdn"}};

core/src/web/templates/index.html

@@ -5,18 +5,15 @@
 {{include "/common/inc.html"}}
 <meta name="Keywords" content="{{Msg "seo" "qfw.homepage.key"}}"/>
 <meta name="Description" content="{{Msg "seo" "qfw.homepage.description"}}"/>
-<link href="{{Msg "seo" "cdn"}}/css/index-new.css" rel="stylesheet">
-<script src="{{Msg "seo" "cdn"}}/js/jquery.lazyload.min.js"></script>
 {{if .T.flag}}
 <script type="text/javascript">
-$(function(){
-	var wid = window.screen.width;
-	if (wid < 760){
-		window.location.href = "/front/webindexcontent/56efb9ba61fd0010d0000001.html";
+	if (window.screen.width < 760){
+		window.location.href = "/front/webindexcontent/56f24224af53745027000078.html";
 	} 
-});
 </script>
 {{end}}
+<link href="{{Msg "seo" "cdn"}}/css/index-new.css" rel="stylesheet">
+<script src="{{Msg "seo" "cdn"}}/js/jquery.lazyload.min.js"></script>
 </head>
 <body>
 {{include "/common/indexhead.html"}}
@@ -531,9 +528,9 @@ $(function(){
 	function adjustLayout(){
 		var windowWidth = $(window).width();
 		if(windowWidth>=1007 && windowWidth < 1200){
-			$(".a-i-h-right").css("width",windowWidth-10-200-685+"px");
+			//$(".a-i-h-right").css("width",windowWidth-10-200-685+"px");
 		}else{
-			$(".a-i-h-right").removeAttr("style");
+			//$(".a-i-h-right").removeAttr("style");
 		}
 		//
 		$(".a-xwzx").find("ul li.a-com-title").css("height","auto");

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

@@ -8,6 +8,9 @@
 body{
 	background-color:#f0f0f0;
 	}
+.b-head{
+	min-width: inherit;
+}
 .b-nav {
     border-top-color: rgb(255, 90, 95);
 }

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

@@ -32,7 +32,7 @@ $(function(){
 			$(".member-right").prepend('{{include "/common/authentication.html"}}');
 		}else{
 			var html = '<div class="panel-title-out">'
-					   		+'<i class="glyphicon shimingrenzheng"></i><span>实名认证</span>'
+					   		+'<i class="glyphicon qmx-icon-renzheng"></i><span>实名认证</span>'
 						+'</div>'
 						+'<div class="panel panel-default" style="line-height: 100px;">'
 							+'<div class="panel-body text-primary text-center " style="line-height: 40px;">'
@@ -261,7 +261,7 @@ function editInfoComplate(obj,type){
 	<div class="member-right">
 		<!-- 基础信息 -->
 		
-		<div class="panel-title-out" id="accountInfo"><i class="glyphicon zhanghao" style="color:#FF5A5F;"></i><span>账号信息</span></div>
+		<div class="panel-title-out" id="accountInfo"><i class="glyphicon qmx-icon-shezhi"></i><span>账号信息</span></div>
 		<div class="panel panel-default">
 		  <div class="panel-body">
 		  	<table class="table account-info">
@@ -335,7 +335,7 @@ function editInfoComplate(obj,type){
 		  </div>
 		</div>
 		<!-- 安全服务 -->
-		<div class="panel-title-out"><i class="glyphicon anquan"></i><span>安全服务</span></div>
+		<div class="panel-title-out"><i class="glyphicon qmx-icon-anquan"></i><span>安全服务</span></div>
 		<div class="panel panel-default">
 		  	<div class="panel-body">
 			  	<table class="table accountset-aqfw">

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

@@ -2,6 +2,11 @@
 <head>
 <title>实名认证</title>
 {{include "/common/inc.html"}}
+<style type="text/css">
+.authemenu{
+	color:#FF5A5F !important;
+}
+</style>
 </head>
 <body>
 {{$identWay := session "identWay"}}

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

@@ -17,7 +17,7 @@
 		{{include "/common/memberleft.html"}}
 	</div>
 	<div class="member-right">
-		<div class="panel-title-out"><i class="glyphicon liebiao" style="color:#FF5A5F;"></i><span>投标管理</span></div>
+		<div class="panel-title-out"><i class="glyphicon qmx-icon-toubiao"></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

@@ -74,7 +74,9 @@ label {
     font-size: 14px;
     border-color: #dddddd;
 	}
-
+.authemenu{
+	color:#FF5A5F !important;
+}
 </style>
 </head>
 <body>
@@ -90,7 +92,7 @@ label {
 
   <div class="member-right">
 	<div class="panel-title-out">
-	   <i class="glyphicon shimingrenzheng icon_gray icon_large" style="color:#FF5A5F;"></i><span>企业实名认证</span>
+	   <i class="glyphicon qyrz" 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

@@ -64,7 +64,7 @@ p{
 	<div class="member-right">
 		<div class="member-panel">
 			<div class="panel-title-out">
-				<i class="glyphicon jinbi" style="color:#FF5A5F;"></i><span>积分规则</span>
+				<i class="glyphicon qmx-icon-guize"></i><span>积分规则</span>
 			</div>
 			<div class="a-line"></div>	
 			<div class="credit-explain">积分获取方法与计算规则</div>

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

@@ -82,7 +82,7 @@ a.mycredit{
 	<div class="member-right">
 		<div class="member-panel">
 			<div class="panel-title-out">
-				<i class="glyphicon jinbi" style="color:#FF5A5F;"></i><span>我的积分</span>
+				<i class="glyphicon qmx-icon-jifen"></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;background-color: #f0f0f0;border-bottom: 0px;margin-left: -35px;">

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

@@ -2,25 +2,8 @@
 <head>
 <title>用户中心</title>
 {{include "/common/inc.html"}}
+<link href="{{Msg "seo" "cdn"}}/css/membercenter.css" rel="stylesheet">
 <style type="text/css">
-.message,.yellowpage{
-	height: 380px;
-}
-.yellowpage-content div{
-	background-image: url('{{Msg "seo" "cdn"}}/images/ellipse_red.png');
-	width: 83px;
-	height: 31px;
-	margin-top: 20px;
-	margin-bottom: 10px;
-	font-size: 12px;
-	color: white;
-	text-align: center;
-	line-height: 31px;
-	cursor: pointer;
-}
-.yellowpage-content span{
-	display: block;
-}
 .rowtt{
 	height:23px;
 	overflow:hidden;
@@ -36,49 +19,37 @@
 	<div class="member-left">
 		{{include "/common/memberleft.html"}}
 	</div>
-	<div class="member-right">
-		<div class="row" style="margin: 0px;">
-			<div class="col-md-6" id="message">
-				<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" style="color:#FF5A5F;"></i><span>消息中心</span>
-						</div>
-						<table class="table">
-							<tr>
-								<td id="indexMsg">
-									没有消息。
-								</td>
-								
-							</tr>
-						</table>
-					</div>
-				</div>
+	<div class="member-right membercenter-index">
+		{{if .T.pushlist}}
+		{{if gt (len .T.pushlist) 0}}
+		<div class="pushlist" id="pushlist">
+			<div class="panel-title-out">
+				<i class="glyphicon xiaoxi"></i>
+				<span>剑鱼-推送列表</span>
+				<a class="pull-right" href="/member/swordfish/infolist">更多推送信息</a>
 			</div>
-			<div class="col-md-6 padding-r-0" id="myYellowpage">
-				<div class="yellowpage panel panel-default">
-					<div class="panel-body">
-						<div class="panel-title-in">
-							<i class="glyphicon wodehuangye" style="color:#FF5A5F;"></i><span>我的黄页</span>
-						</div>
-						<table class="table">
-							<tr>
-								<td class="yellowpage-content">
-									<div onclick="window.location.href='{{if session "entid"}}/member/enterprise/show{{else}}/member/authentication/index{{end}}'">企业信息</div>
-									<span>完善企业信息让您获得更精准的服务和商机</span>
-									<div onclick="window.location.href='{{if session "entid"}}/member/enterprise/show{{session "entid"}}#service{{else}}/member/authentication/index{{end}}'">产品服务信息</div>
-									<span>完善 产品服务信息列表让您获得更多商业机会</span>
-									<div onclick="window.location.href='/market/demand/add.html'">发需求</div>
-									<span>一对一服务，迅速，高效的响应您的需求</span>
-								</td>
-							</tr>
-						</table>
-					</div>
+			<div class="a-line margin-b-10"></div>
+		</div>
+		{{end}}
+		{{end}}
+		<div id="entCard" class="entCard">
+			<div class="panel-title-out"><div></div><i class="glyphicon qmx-icon-mingpian"></i><span>企业名片/商家名片</span></div>
+			<div class="a-line"></div>
+			<div class="row">
+				<div class="col-xs-4" id="editEntInfo">
+					<b>编辑企业信息</b><img src="{{Msg "seo" "cdn"}}/images/bianjixinxi.png">
+					<div>完善企业信息让您获得更精准的服务和商机<font>><font>></font></font><a>我要编辑</a></div>
+				</div>
+				<div class="col-xs-4" id="releaseService">
+					<b>发布产品服务信息</b><img src="{{Msg "seo" "cdn"}}/images/fabuxinxi.png">
+					<div>完善产品服务信息列表让您获得更多商业机会<font>><font>></font></font><a>我要发布</a></div>
+				</div>
+				<div class="col-xs-4" id="releaseDemand">
+					<div class="releaseDemand"><b>发布需求</b><img src="{{Msg "seo" "cdn"}}/images/buxuqiu.png"></div>
+					<div>一对一服务，迅速，高效的响应你的需求<font>><font>></font></font><a>我要发布</a></div>
 				</div>
 			</div>
 		</div>
-		<div class="panel-title-in"><span>推荐企业</span></div>
-		<img src="{{Msg "seo" "cdn"}}/images/xwyd.png" style="width: 180px;height: 200px;"/>
 	</div>	
 </div>
 <!-- 底部 -->
@@ -87,68 +58,99 @@
 if((role == "" || /^[9]$/.test(role)) && (identWay == "-1" || identWay == "0")){
 	$(".member-right").prepend('{{include "/common/authentication.html"}}');
 }else if(!(role == "" || /^[9]$/.test(role) || (/^[1]$/.test(role) && identWay == "1"))){
-	$("#myYellowpage").remove();
-	$("#message").addClass("col-md-12").removeClass("col-md-6");
+	$("#entCard").remove();
 }
-function currPos(){
-   return [["用户中心","/member/show/memberindex"]]
-}
-
-var message={{.T.res}}
-
-$(function(){
-	createList()
-	var rowLine=$(".col-md-6")
-	if(rowLine.size()>0){
-		$(".rowtt").css("width",$(rowLine[0]).width()-190)
+var entId = {{session "entid"}};
+$("#editEntInfo,#editEntInfo a").click(function(){
+	if(identWay == 1 && entId != ""){
+		window.location.href = "/member/enterprise/show";
+	}else{
+		window.location.href = "/member/authentication/index";
+	}
+});
+$("#releaseService,#releaseService a").click(function(){
+	if(identWay == 1 && entId != ""){
+		window.location.href = "";
+	}else{
+		window.location.href = "/member/authentication/index";
 	}
-})
-
-
-function createList(){
-	if(message&&message.length>0){
-		var str=""
-		for(var i=0;i<message.length;i++){
-			var obj=message[i];
-			obj.l_date=obj.l_date*1000;
-			str+='<div class="rowLine" style="margin-bottom:5px;padding-bottom:8px;border-bottom:1px solid #ddd">';
-			switch(obj.i_messagetype){
-				case 1:
-				str+='<div class="pull-left" style="margin-right:5px;"><i style="padding:6px;padding-right:7px;background-color:#38B54A;color:#ffffff;font-size:26px;" class="glyphicon xitongshezhi icon-large"></i></div>'
-				str+='<div class="pull-left">'
-				str+='<div class="pull-left"><div class="rowtt">'+obj.s_title+'</div><div class="text-muted rowtt">'+obj.s_subcontent+'</div></div>'
-				str+='</div>'
-				str+='<div class="pull-right">'+new Date(obj.l_date).Format('yyyy-MM-dd')+'</div>';
-				break;
-				case 2:
-				str+='<div class="pull-left" style="margin-right:5px;"><i style="padding:5px;padding-right:7px;background-color:#943267;color:#ffffff;font-size:26px;" class="glyphicon xiaoxi icon-large"></i></div>'
-				str+='<div class="pull-left">'
-				str+='<div class="pull-left"><div class="rowtt">'+obj.s_title+'</div><div class="text-muted rowtt">'+obj.s_subcontent+'</div></div>'
-				str+='</div>'
-				str+='<div class="pull-right">'+new Date(obj.l_date).Format('yyyy-MM-dd')+'</div>';
-				break;
-				case 3:
-				str+='<div class="pull-left" style="margin-right:5px;"><i style="padding:4px;background-color:#EFB73E;color:#ffffff;font-size:26px;" class="glyphicon kefuzaixian icon-large"></i></div>'
-				str+='<div class="pull-left">'
-				str+='<div class="pull-left"><div class="rowtt">'+[obj.s_sendcompanyname]+'　'+obj.s_sendname+'</div><div class="text-muted rowtt">'+((obj.a_content&&obj.a_content.length>0)?(obj.a_content[0].s_content?obj.a_content[0].s_content:""):"")+'</div></div>'
-				str+='</div>'
-				str+='<div class="pull-right">'+new Date(obj.l_date).Format('yyyy-MM-dd')+'</div>';
-				break;
-				case 4:
-				str+='<div class="pull-left" style="margin-right:5px;"><i style="padding:5px;padding-right:7px;background-color:#943267;color:#ffffff;font-size:26px;" class="glyphicon kefuzaixian icon-large"></i></div>'
-				str+='<div class="pull-left">'
-				str+='<div class="pull-left"><div class="rowtt">'+obj.s_sendname+'</div><div class="text-muted rowtt">'+(obj.s_subcontent?(obj.s_subcontent.s_content?obj.s_subcontent.s_content:""):"")+'</div></div>'
-				str+='</div>'
-				str+='<div class="pull-right">'+new Date(obj.l_date).Format('yyyy-MM-dd')+'</div>';
-				break;
+});
+$("#releaseDemand,#releaseDemand a").click(function(){
+	window.location.href = "/market/demand/add.html";
+});
+var pushlist = {{.T.pushlist}};
+if(pushlist != "" && pushlist.length > 0){
+	var s_words = pushlist[0].s_words;
+	var a_publishtime = pushlist[0].a_publishtime;
+	var s_content = pushlist[0].s_content;
+	$("#pushlist").append("<div id='pushlist-content'>"+s_content+"</div>");
+	$("#pushlist-content").children("div:first").remove();
+	$(".tslist").each(function(i){
+		if($(this).index() >= 5){
+			$(this).remove();
+		}
+		$(this).children(".xh").text(function(i,v){
+			return v.replace(".","")
+		});
+		//关键词高亮
+		if(typeof(s_words) != "undefined"){
+			var html = $(this).find("a").text();
+			for(var i=0;i<s_words.length;i++){
+				if(s_words[i] != ""){
+					var wordsArray = s_words[i].split("+");
+					for(var si=0;si<wordsArray.length;si++){
+						var reg = new RegExp(wordsArray[si],"gm");
+						html = html.replace(reg,function(word){
+							return '<font class="keyword">'+word+'</font>';
+						});
+					}
+				}
 			}
-			str+='<div class="clearfix"></div></div>';
+			$(this).find("a").html(html);
 		}
-		$("#indexMsg").html(str)	
-	}
+		//已访问过的灰色
+		var xh = $(this).children(".xh").text();
+		if(typeof(a_visitedindex) != "undefined"){
+			for(var i=0;i<a_visitedindex.length;i++){
+				if(xh == a_visitedindex[i]){
+					$(this).find("a.bt").addClass("visited");
+				}
+			}
+		}
+		if(typeof(a_publishtime) != "undefined"){
+			$(this).find("a.bt").wrap("<div class='bt-parent'></div>");
+			$(this).append(function(){
+				if(a_publishtime == "" || typeof(a_publishtime[xh]) == "undefined"){
+					return "";
+				}else{
+					var date1=new Date(Number(a_publishtime[xh]+"000"));//开始时间
+					var date2=new Date();//结束时间
+					var date3=date2.getTime()-date1.getTime();//时间差的毫秒数
+					//计算出相差天数
+					var days=Math.floor(date3/(24*3600*1000));
+					//计算出小时数
+					var leave1=date3%(24*3600*1000);//计算天数后剩余的毫秒数
+					var hours=Math.floor(leave1/(3600*1000));
+					//计算相差分钟数
+					var leave2=leave1%(3600*1000);//计算小时数后剩余的毫秒数
+					var minutes=Math.floor(leave2/(60*1000));
+					//计算相差秒数
+					/*var leave3=leave2%(60*1000);//计算分钟数后剩余的毫秒数
+					var seconds=Math.round(leave3/1000);*/
+					var timeDiff = "1分钟";
+					if(days > 0){
+						timeDiff = days+"天";
+					}else if(hours > 0){
+						timeDiff = hours+"小时";
+					}else if(minutes > 0){
+						timeDiff = minutes+"分钟";
+					}
+					return '<div class="time-diff">'+timeDiff+'前</div>';
+				}
+			});
+		}
+	});
 }
-
-
 </script>
 </body>
 </html>

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

@@ -21,7 +21,7 @@
 	<div class="member-right">
 		<div class="member-panel">
 			<div class="panel-title-out">
-				<i class="glyphicon xiaoxi" style="color:#FF5A5F;"></i><span>消息中心</span>
+				<i class="glyphicon qmx-icon-xiaoxi"></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">

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

@@ -17,7 +17,7 @@
 		{{include "/common/memberleft.html"}}
 	</div>
 	<div class="member-right">
-		<div class="panel-title-out"><i class="glyphicon falvshengming" style="color:#FF5A5F;"></i><span>我预约的服务</span></div>
+		<div class="panel-title-out"><i class="glyphicon bofangjilu"></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

@@ -18,7 +18,7 @@
 	</div>
 	<div class="member-right">
 		<div class="panel-title-out">
-			<i class="glyphicon gongshixinxi" style="color:#FF5A5F;"></i><span>我发布的需求</span>
+			<i class="glyphicon qmx-icon-xuqiu" style="font-size: 22px;"></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/myfollow.html

@@ -0,0 +1,152 @@
+<html>
+<head>
+<title>我发布的需求</title>
+{{include "/common/inc.html"}}
+<link href="{{Msg "seo" "cdn"}}/css/membercenter.css" rel="stylesheet">
+<style type="text/css">
+.myfollow{
+	color:#FF5A5F !important;
+}
+</style>
+</head>
+<body>
+{{include "/common/centerhead.html"}}
+<!-- 中间 -->
+<div class="a-content member-content">
+	<div class="member-left">
+		{{include "/common/memberleft.html"}}
+	</div>
+	<div class="member-right membercenter-myfollow">
+		<div class="panel-title-out">
+			<i class="glyphicon weiguanzhu"></i><span>我关注的企业</span>
+		</div>
+		<div class="a-line"></div>
+		{{if .T.ents}}
+		<ul>
+			{{range $k,$v:=.T.ents}}
+			<li>
+				<img src="{{if index $v "s_avatar"}}{{Msg "seo" "cdn"}}{{index $v "s_avatar"}}{{else}}null{{end}}" onerror="this.src='/images/ent-logo.png'">
+				<div>
+					<a target="_blank" href="/enterprise/{{index $v "_id"}}.html"><b>
+						{{$lens:=len (index $v "EntName")}}									 
+						{{if eq $lens 0}}
+							{{index $v "LeRep"}}
+						{{else}}
+							{{index $v "EntName"}}
+						{{end}}
+					</b></a>
+					{{if index $v "OpState"}}
+					<span class="{{if eq (index $v "OpState") "07" "08" "11"}}ent-status-r{{else}}ent-status-g{{end}}">
+					<script>
+						var OpState = {{index $v "OpState"}};
+						var OpStateName = {{index $v "OpStateName"}};
+						if(OpState == "07"){
+							OpStateName = "注销";
+						}else if(OpState == "08"){
+							OpStateName = "撤销";
+						}else if(OpState == "11"){
+							OpStateName = "吊销";
+						}else if(OpState == "06"){
+							OpStateName = "存续";
+						}else{
+							if(OpStateName.length > 2){
+								OpStateName = OpStateName.substring(0,2);
+							}
+						}
+						document.write(OpStateName);
+					</script>
+					</span>
+					{{end}}
+					{{ if index $v "s_action"}}
+						{{ if eq (index $v "s_action") "01"}}
+							<span class="glyphicon qyrz   margin-l-10 jhtb"></span><span class="lineb " ><small>&nbsp;已认证企业&nbsp;</small></span>
+							{{ if $v.i_comauthenttype }}
+								{{ if eq $v.i_comauthenttype 2}}
+									<span class="glyphicon mprz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">名片认证</small></span>					
+								{{else if eq $v.i_comauthenttype 1}}
+									<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:5px;">营业执照认证</small></span>
+								{{else if eq $v.i_comauthenttype 3}}
+									<span class="glyphicon yjrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">年报邮箱认证</small></span>
+								{{end}}
+							{{else}}
+								<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:5px;">营业执照认证</small></span>
+							{{end}}
+						{{else if eq (index $v "s_action") "02"}}
+							<span class="glyphicon grrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证个人</small></span>
+						{{else if eq (index $v "s_action") "03"}}
+							<span class="glyphicon jgrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证机构</small></span>
+						{{end}}
+					{{end}}
+					<div class="margin-t-10">
+						<span><font class="b-disabled">注册号：</font><font  class="lineb " >{{index $v "RegNo"}}</font></span>
+						{{if index $v "EntType"}}
+							{{if eq $v.EntType "9600"}}
+								<span class="margin-l-15"><font class="b-disabled">经营者：</font><font  class="lineb " >{{index $v "LeRep"}}</font></span>
+							{{else if eq $v.EntType "5810"}}
+								<span class="margin-l-15"><font class="b-disabled">负责人：</font><font  class="lineb " >{{index $v "LeRep"}}</font></span>
+							{{else}}
+								<span class="margin-l-15"><font class="b-disabled">法定代表人：</font><font  class="lineb " >{{index $v "LeRep"}}</font></span>
+							{{end}}
+						{{end}}
+						{{if and (index $v "RegCap") ($v.RegCapEntType)}}
+							{{if and (ne $v.RegCapEntType "9600") (ne $v.RegCapEntType "5810") (ne $v.RegCapEntType "4540") (ne $v.RegCapEntType "4533")}}
+								<span class="margin-l-15"><font class="b-disabled">注册资本：</font><font  class="lineb " ><script>var d1={{$v.RegCap}};d1=d1?d1:0; var lenD1=(d1+"").length ;if(lenD1>4&&(d1+"").indexOf(".")>-1&&(lenD1-(d1+"").indexOf("."))>4){document.write(d1.toFixed(4))}else{document.write(d1)}</script>万{{if $v.RegCapCurName}}{{$v.RegCapCurName}}{{else}}元{{end}}</font></span>
+							{{end}}
+						{{end}}
+						<br>
+						<span><font class="b-disabled">成立日期：</font><font  class="lineb " >{{index $v "EstDate"}}</font></span>
+						<span class="margin-l-15"><font class="b-disabled">所在地：</font><font  class="lineb " >{{index $v "OpLocDistrictName"}}</font></span>
+					</div>
+					{{if $v.stock}}<div><font class="b-disabled">股东：</font><font  class="lineb ">{{index $v "stock"}}</font></div>{{end}}
+					{{if $v.OpScope}}<div><font class="b-disabled">经营范围：</font><font  class="lineb ">{{index $v "OpScope"}}</font></div>{{end}}
+				</div>
+				<span class="ent-follow">
+					<span class="glyphicon yiguanzhu"></span>已关注
+				</span>
+			</li>
+			{{end}}
+		</ul>
+		<div class="maskLayer" id="maskLayer"></div>
+		<div class="tipTriangle" id="tipTriangle">
+			<span class="triangle-up"></span>
+			<div class="text-center">
+				<b>确定取消关注？</b>
+				<div class="b-disabled margin-t-5"></div>
+				<button class="btn btn-primary" id="sure">确定</button>
+				<button class="btn btn-default" onclick="TipAssembly.triangleHide();">取消</button>
+			</div>
+		</div>
+		{{end}}
+	</div>	
+</div>
+<!-- 底部 -->
+{{include "/common/bottom.html"}}
+<script type="text/javascript">
+var currentNode = null;
+$(".ent-follow").click(function(){
+	TipAssembly.hide();
+	$("#tipTriangle>div>div").html($.trim($(this).prev().children("a:first").text()));
+	currentNode = $(this);
+	TipAssembly.triangleShow(currentNode,"right","auto",30,-135);
+});
+$("#sure").click(function(){
+	TipAssembly.triangleHide();
+	var dataObj = {};
+	dataObj["flag"] = true;
+	var entObj = currentNode.prev().children("a:first");
+	dataObj["entId"] = entObj.attr("href").split("/")[2].replace(".html","");
+	$.post("/member/enterprise/follow",dataObj,function(r){
+		if(r.status == "y"){
+			currentNode.children("span").removeClass("yiguanzhu").addClass("weiguanzhu");
+			TipAssembly.show("已取消<br>关注");
+			currentNode.parents("li").remove();
+		}else if(r.status == "n"){
+			TipAssembly.show("取消关注失败！");
+		}else{
+			TipAssembly.show("取消关注失败！");
+		}
+	});
+});
+</script>
+</body>
+</html>

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

@@ -17,7 +17,7 @@
 		{{include "/common/memberleft.html"}}
 	</div>
 	<div class="member-right">
-		<div class="panel-title-out"><i class="glyphicon dengjizhuangtai" style="color:#FF5A5F;"></i><span>订单管理</span></div>
+		<div class="panel-title-out"><i class="glyphicon qmx-icon-dingdan"></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

@@ -57,6 +57,9 @@
 	line-height: 25px;
 	vertical-align: top;
  }
+.authemenu{
+	color:#FF5A5F !important;
+}
 </style>
 </head>
 <body>
@@ -74,7 +77,7 @@
 	  <!--右边开始-->
 	  <div class="member-right">
 		<!--右边头部提示信息-->
-		<div class="panel-title-out"><i class="glyphicon shimingrenzheng" style="color:#FF5A5F;"></i><span>其他认证</span></div>
+		<div class="panel-title-out"><i class="glyphicon jgrz"></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

@@ -54,6 +54,9 @@ label {
 .mimg{
 		width:950px;
 }
+.authemenu{
+	color:#FF5A5F !important;
+}
 </style>
 </head>
 <body>
@@ -71,7 +74,7 @@ label {
 	  <!--右边开始-->
 	  <div class="member-right">
 		<!--右边头部提示信息-->
-		<div class="panel-title-out"><i class="glyphicon shimingrenzheng" style="color:#FF5A5F;"></i><span>个人实名认证</span></div>
+		<div class="panel-title-out"><i class="glyphicon grrz margin-0"></i><span>个人实名认证</span></div>
 	   	<!--右边主要内容-->
 		<div class="panel panel-default member-panel">
 		 <div class="padding-lr-20 panel-body">

core/src/web/templates/search/enterpriseList.html

@@ -125,9 +125,13 @@
 									{{if $v.OpScope }}<div><font class="b-disabled">经营范围：</font><font  class="lineb ">{{index $v "OpScope"}}</font></div>{{end}}
 								</div>
 							</div>
-							<div class="ent-follow{{if $v.followFlag}} ent-followed{{end}}">
-								<span class="glyphicon {{if $v.followFlag}}yiguanzhu{{else}}weiguanzhu{{end}}"></span>关注
-							</div>
+							<span class="ent-follow{{if $v.followFlag}} ent-followed{{end}}">
+								{{if $v.followFlag}}
+								<span class="glyphicon yiguanzhu"></span>已关注
+								{{else}}
+								<span class="glyphicon weiguanzhu"></span>关注
+								{{end}}
+							</span>
 						</div>
 					</div>
 				{{end}}
@@ -174,7 +178,7 @@
 	<!--左边显示区结束-->
 	
 	<!--右边显示区开始-->
-	<div class="b-right hidden-sm hidden-md hidden-xs b-right-content">
+	<div class="b-right b-right-content">
 		<div class="b-adver entlist-hotsearchwords">
 			<div class="b-adver-title">热搜词</div>
 			<div class="b-adver-content">
@@ -205,12 +209,12 @@
 	<!--右边显示区结束-->
 </div>
 {{include "/common/bottom.html"}}
-<div class="flowmaxnumbg" id="flowmaxnumbg"></div>
-<div class="flowmaxnum" id="flowmaxnum">
+<div class="maskLayer" id="maskLayer"></div>
+<div class="tipTriangle" id="tipTriangle">
 	<span class="triangle-up"></span>
 	<div>
 		剑鱼为给您更好的使用体验目前仅支持关注10家企业，你已成功关注10家企业，如需继续关注，请到“用户中心-我的关注”对已关注的企业进行取消关注后，可关注新的企业。
-		<div><span class="cursor-pointer" id="thinkAgain">再想想</span><span class="margin-lr-15">或</span>管理<button class="btn btn-primary margin-l-5" href="">我的关注</button></div>
+		<div><span class="cursor-pointer" id="thinkAgain">再想想</span><span class="margin-lr-15">或</span>管理<button class="btn btn-primary margin-l-5" onclick="window.location.href='/member/myFollowEnts'">我的关注</button></div>
 	</div>
 </div>
 <script>
@@ -237,49 +241,36 @@ $(function(){
 		$.post("/member/enterprise/follow",dataObj,function(r){
 			if(r.status == "y"){
 				if(dataObj.flag){
-					thisClass.children("span").removeClass("yiguanzhu").addClass("weiguanzhu");
+					thisClass.html('<span class="glyphicon weiguanzhu"></span>关注');
 					TipAssembly.show("已取消<br>关注");
 				}else{
-					thisClass.children("span").addClass("yiguanzhu").removeClass("weiguanzhu");
+					thisClass.html('<span class="glyphicon yiguanzhu"></span>已关注');
 					TipAssembly.show("已关注");
 				}
 				thisClass.toggleClass("ent-followed");
 			}else if(r.status == "m"){
 				TipAssembly.hide();
-				$("#flowmaxnumbg,#flowmaxnum").show();
-				$("#flowmaxnum").css({top: thisClass.offset().top+30,left: thisClass.offset().left-95}).show();
+				TipAssembly.triangleShow(thisClass,"right",250,30,-195);
 				//$("html,body").addClass("overflow-hidden");
 			}else if(r.status == "n"){
 				if(dataObj.flag){
-					TipAssembly.show("取消关注失败<br>请重新取消！");
+					TipAssembly.show("取消关注失败！");
 				}else{
-					TipAssembly.show("关注失败<br>请重新关注");
+					TipAssembly.show("关注失败！");
 				}
-				setTimeout(function(){
-					window.location.reload();
-				},3000);
 			}else{
 				if(dataObj.flag){
-					TipAssembly.show("取消关注失败<br>请重新取消！");
+					TipAssembly.show("取消关注失败！");
 				}else{
-					TipAssembly.show("关注失败<br>请重新关注");
+					TipAssembly.show("关注失败！");
 				}
-				setTimeout(function(){
-					window.location.reload();
-				},3000);
 			}
 		});
 	});
 	scrollUp("entlist-recommend");
 	$("#thinkAgain").click(function(){
-		$("#flowmaxnumbg,#flowmaxnum").hide();
+		TipAssembly.triangleHide();
 	});
-	document.getElementById("flowmaxnumbg").onclick = function(e){
-		if(e.target.id == "flowmaxnumbg"){
-			$("#flowmaxnumbg,#flowmaxnum").hide();
-			//$("html,body").removeClass("overflow-hidden");
-		}
-	}
 });
 </script>
 <script src="/js/enterprise.js"></script>

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

@@ -292,7 +292,7 @@
 	    
 	</div>
 		</div>
-<div class="a-c-right hidden-xs">
+<div class="a-c-right">
 {{if eq "demand" .T.querymap.c_searchtype}}
 {{include "/common/hotdemand.html"}}
 {{else}}
@@ -326,19 +326,19 @@
 		}
 		$(window).bind("resize",function(){
 			if(document.body.clientWidth<1209){
-					$(".a-content.container-fluid").css("width","");
-					$(".a-c-right.hidden-xs").hide();
-					$(".list-new-list").css("max-width","1200px");
+					//$(".a-content.container-fluid").css("width","");
+					//$(".a-c-right.hidden-xs").hide();
+					//$(".list-new-list").css("max-width","1200px");
 			}else{
-					$(".a-content.container-fluid").css("width","1200px");
-					$(".a-c-right.hidden-xs").show();
-					$(".list-new-list").css("max-width","940px");
+					//$(".a-content.container-fluid").css("width","1200px");
+					//$(".a-c-right.hidden-xs").show();
+					//$(".list-new-list").css("max-width","940px");
 			}
 		});
 		if(document.body.clientWidth<1209){
-			$(".a-content.container-fluid").css("width","");
-			$(".a-c-right.hidden-xs").hide();
-			$(".list-new-list").css("max-width","1200px");
+			//$(".a-content.container-fluid").css("width","");
+			//$(".a-c-right.hidden-xs").hide();
+			//$(".list-new-list").css("max-width","1200px");
 		}
 		$(".f-price").each(function(i,n){
 			var text=$(n).text();

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

@@ -54,9 +54,9 @@ $(function(){
 			}
 			$(this).find("a").html(html);
 		}
+		var xh = $(this).children(".xh").text();
 		//已访问过的灰色
 		if(typeof(a_visitedindex) != "undefined"){
-			var xh = $(this).children(".xh").text();
 			for(var i=0;i<a_visitedindex.length;i++){
 				if(xh == a_visitedindex[i]){
 					$(this).find("a.bt").addClass("visited");