网站改版

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

@@ -511,7 +511,6 @@ func UpdateEntDoc(id string) bool {
 	b := false
 	map2 := map[string]interface{}{}
 	util.ReadConfig(&map2)
-	log.Println(map2)
 	ent := mongodbutil.FindById("enterprise", map2["entMongodbAlias"].(string), map2["entMongodbName"].(string), id, "")
 	_ent := mongodb.FindById("enterprise", id, "")
 	if _ent != nil && len(*_ent) > 0 {
@@ -519,7 +518,6 @@ func UpdateEntDoc(id string) bool {
 			(*ent)[k] = v
 		}
 	}
-	log.Println(ent)
 	if ent != nil {
 		b = UpdateNewDoc("enterprise", "enterprise", ConverData(ent))
 	}

core/src/qfw/manage/auditing.go

@@ -796,7 +796,7 @@ func (s *SystemManage) Updateaudit() error {
 					}
 					member.UpdateSession(s.Action, r)
 				}, func(e interface{}) {})
-				redis.Del("enterprise", "enterpriseInfo_"+s_enterpriseid, "enterpriseInfo_user_"+s_enterpriseid)
+				redis.Del("enterprise", "enterpriseInfo_"+s_enterpriseid)
 			}()
 		} else {
 			flag = "false"

core/src/qfw/member/memberindex.go

@@ -212,7 +212,6 @@ func (m *MemberIndex) CheckPersonalStatus() error {
 			ist := util.IntAll(mobj["i_identificationstatus"]) //审核
 			it := util.IntAll(mobj["i_identificationtype"])
 			cty := util.IntAll(mobj["i_comauthenttype"]) //企业认证类型：1营业执照，2名片，3年报邮箱
-			s_tid := mobj["s_enterpriseid"].(string)
 			b := false
 			info := ""
 			otherinfo := ""
@@ -271,7 +270,7 @@ func (m *MemberIndex) CheckPersonalStatus() error {
 					m.ServeJson(&map[string]string{
 						"type": "4",
 						"cty":  fmt.Sprintf("%d", cty),
-						"url":  "/member/yellowpage/show/enterprise/" + s_tid,
+						"url":  "/member/enterprise/show",
 					})
 				}
 			}

core/src/qfw/member/membermanager.go

@@ -149,7 +149,7 @@ func autoAuth(uid, uname, s_avatar, entid, promotion_id string) {
 
 				Update("enterprise", `{"_id":"`+entid+`"}`, `{'$set':{'s_action':'01','s_avatar':'`+s_avatar+`','s_submitid':'`+uid+`'}}`, false, false)
 				elastic.UpdateEntDoc(entid)
-				redis.Del("enterprise", "enterpriseInfo_"+entid, "enterpriseInfo_user_"+entid)
+				redis.Del("enterprise", "enterpriseInfo_"+entid)
 			}()
 		}
 	}
@@ -427,46 +427,48 @@ func (m *Member) RegisterComplete() error {
 //登录
 func (m *Member) Login() {
 	var status string = "n"
-	var info, freeze, code string
+	var entId interface{}
+	var userType, freeze, identWay int
 	s_pwd := m.GetString("s_pwd") //密码
 	if s_pwd != "" {              //密码为空不可登录
-		var loginType string            //登录类型
 		s_name := m.GetString("s_name") //用户名
 		r := FindOne("user", M{"$or": []M{M{"s_name": s_name}, M{"s_phone": s_name}, M{"s_email": s_name}}})
 		if r == nil || len(*r) == 0 {
-			info = "s_error" //用户不存在
+			status = "s_error" //用户不存在
 		} else {
-			if s_name == (*r)["s_name"].(string) {
-				loginType = "s_name"
-			} else if (*r)["s_phone"] != nil && s_name == (*r)["s_phone"].(string) {
-				loginType = "s_phone" //手机登录
-			} else if (*r)["s_email"] != nil && s_name == (*r)["s_email"].(string) {
-				loginType = "s_email" //邮箱登录
-			}
 			if GetMd5String(s_pwd) != (*r)["s_pwd"] {
-				info = "p_error" //密码错误
+				status = "p_error" //密码错误
 			} else {
+				var loginType string //登录类型
+				status = "y"
+				if s_name == (*r)["s_name"].(string) {
+					loginType = "s_name"
+				} else if (*r)["s_phone"] != nil && s_name == (*r)["s_phone"].(string) {
+					loginType = "s_phone" //手机登录
+				} else if (*r)["s_email"] != nil && s_name == (*r)["s_email"].(string) {
+					loginType = "s_email" //邮箱登录
+				}
 				//获取绑定企业信息
-				if (*r)["s_enterpriseid"] != nil && (*r)["s_enterpriseid"].(string) != "" {
-					code = (*r)["s_enterpriseid"].(string)
-					//enter := *FindOne("enterprise", `M{"_id":"`+r["s_enterpriseid"].(string)+`"}`)
-					enter := *FindById("enterprise", (*r)["s_enterpriseid"].(string), nil)
+				identWay = IntAll((*r)["i_identificationway"])
+				entId = (*r)["s_enterpriseid"]
+				if identWay == 1 && entId != nil && entId.(string) != "" {
+					enter := *FindById("enterprise", entId.(string), `{"_id":-1,"OpLocDistrict":1}`)
 					if enter != nil && enter["OpLocDistrict"] != nil {
 						(*r)["opLocDistrict"] = enter["OpLocDistrict"]
 					}
 				}
-				status = strconv.Itoa((*r)["i_type"].(int)) //用户类型
-				freeze = fmt.Sprint((*r)["i_freeze"])       //冻结状态
-				if freeze != "2" {
+				userType = IntAll((*r)["i_type"]) //用户类型
+				freeze = IntAll((*r)["i_freeze"]) //冻结状态
+				if freeze != 2 {
 					//更新session、cookie
 					UpdateCookieSession(m.Action, loginType, m.GetString("rememberMe") == "y", *r)
 				}
 			}
 		}
 	} else {
-		info = "p_error" //密码错误
+		status = "p_error" //密码错误
 	}
-	m.Write("{\"info\":\"" + info + "\",\"status\":\"" + status + "\",\"freeze\":\"" + freeze + "\",\"code\":\"" + code + "\"}")
+	m.ServeJson(M{"status": status, "freeze": freeze, "identWay": identWay, "userType": userType, "entId": entId})
 }
 
 //找回密码之后直接登录

core/src/qfw/member/yellowpage.go

@@ -6,7 +6,6 @@ package member
 
 import (
 	"fmt"
-	"github.com/bluemonday-master"
 	"github.com/go-xweb/xweb"
 	"gopkg.in/mgo.v2/bson"
 	"log"
@@ -30,17 +29,17 @@ import (
 type K map[string]interface{}
 type Yellowpage struct {
 	*xweb.Action
-	editEnterprise xweb.Mapper `xweb:"/member/yellowpage/edit/enterprise/(\\w+)"`  //编辑
-	dosave         xweb.Mapper `xweb:"/member/yellowpage/dosave/enterprise"`       //保存企业黄页信息
-	showEnterprise xweb.Mapper `xweb:"/member/yellowpage/show/enterprise/(\\w+)"`  //显示企黄页信息
-	showService    xweb.Mapper `xweb:"/member/yellowpage/show/showService/(\\w+)"` //显示添加服务页面
-	editService    xweb.Mapper `xweb:"/member/yellowpage/edit/showService/(\\w+)"` //编辑服务页面
-	upLoadEntImg   xweb.Mapper `xweb:"POST /member/yellowpage/upLoadEntImg"`       //上传企业相关图片
+	editEnterprise xweb.Mapper `xweb:"/member/enterprise/edit"`              //编辑
+	showEnterprise xweb.Mapper `xweb:"/member/enterprise/show"`              //显示企黄页信息
+	dosave         xweb.Mapper `xweb:"/member/yellowpage/dosave/enterprise"` //保存企业黄页信息
+	upLoadEntImg   xweb.Mapper `xweb:"POST /member/yellowpage/upLoadEntImg"` //上传企业相关图片
 
 	addService    xweb.Mapper `xweb:"/member/yellowpage/add/service/addservice"` //增加服务
 	delservice    xweb.Mapper `xweb:"POST /member/service/delservice"`           //删除数据
 	findservice   xweb.Mapper `xweb:"POST /member/service/findservice"`          //查找要修改数据
 	removeservice xweb.Mapper `xweb:"POST /member/service/removeservice"`        //下架服务
+
+	follow xweb.Mapper `xweb:"POST /member/enterprise/follow"` //关注企业
 }
 
 const ESTYPE string = "enterprise"
@@ -166,98 +165,71 @@ func (u *Yellowpage) Removeservice() error {
 	return nil
 }
 
-//编辑企业黄页的信息
-func (yp *Yellowpage) EditEnterprise(id string) error {
-	//判断用户是否登录，如果没有登录直接返回首页
-	if yp.GetSession("userId") == nil {
-		return yp.Redirect("/")
-	}
-	id = strings.Split(id, "#")[0]
-
-	yp.T["entinfo"] = yps.GetEntInfo(id)
-
-	yp.T["entid"] = id
-
-	return yp.Render("/member/editenterprise.html", &yp.T)
-}
-
-//保存企业黄页的信息
-func (yp *Yellowpage) Dosave() error {
-	var info string = "保存成功"
-	var status string = "y"
-	//判断用户是否登录，如果没有登录直接返回首页
-	if yp.GetSession("userId") == nil {
-		return yp.Redirect("/")
-	}
-
-	data := make(map[string]interface{})
-
-	var entid string = yp.GetString("id")
-	//过滤XSS
-	s_synopsis := Repl(yp.GetStringComm("s_synopsis"))
-
-	html := strings.ToLower(s_synopsis)
-	p := bluemonday.UGCPolicy()
-	p.AllowElements("s", "blockquote", "sup", "sub", "ol", "li", "ul", "b", "div", "strong", "p", "table", "span", "em", "u", "td", "tr", "tbody", "th", "thead", "i")
-	p.AllowAttrs("style", "align", "width", "height").OnElements("s", "blockquote", "sup", "sub", "ol", "li", "ul", "b", "div", "strong", "p", "table", "span", "em", "u", "td", "tr", "tbody", "th", "thead", "i")
-
-	html = p.Sanitize(html)
-	s_synopsis = html
-
-	data["s_synopsis"] = s_synopsis
-
-	data["s_persion"] = Repl(yp.GetString("s_persion"))
-	data["s_mobile"] = Repl(yp.GetString("s_mobile"))
-	data["s_enturl"] = Repl(yp.GetString("s_enturl"))
-	data["s_qq"] = Repl(yp.GetString("s_qq"))
-	data["s_weixin"] = Repl(yp.GetString("s_weixin"))
-	province, _ := yp.GetInt("province")
-	data["i_province"] = province
-	city, _ := yp.GetInt("city")
-	data["i_city"] = city
-	area, _ := yp.GetInt("area")
-	data["i_area"] = area
-	data["s_address"] = Repl(yp.GetString("s_address"))
-
-	dataSet := map[string]interface{}{
-		"$set": data,
-	}
-	//向mongodb库中写数据
-	flag := mongodb.Update(ESTYPE, "{'_id':'"+entid+"'}", &dataSet, false, false)
-	redis.Del("enterprise", "enterpriseInfo_"+entid)
-	redis.Del("enterprise", "enterpriseInfo_user_"+entid)
-	elastic.UpdateEntDoc(entid)
-	redis.DelByCodePattern("enterprise", "ipcity_*")
-	if !flag {
-		status = "n"
-		info = "保存信息失败"
-	} else { //首次创建企业名片，送积分
-		if !credit.AIsHasDo(credit.A_CJMP, util.Int64All(yp.GetSession("credit_a"))) {
-			credit.UpuserCreditSession(util.ObjToString(yp.GetSession("userId")), credit.A_CJMP, "A", nil, yp.Action)
-		}
+//我的黄页
+func (yp *Yellowpage) ShowEnterprise() error {
+	//判断用户是否审核通过
+	if checkuser(yp) == false {
+		return yp.Redirect("/member/accountset/index", http.StatusFound)
 	}
-	return yp.Write("{\"info\":\"" + info + "\",\"status\":\"" + status + "\"}")
+	return yps.CommonEntInfo(yp.Action, yp.GetSession("entid").(string), 1, false)
 }
 
-//用户登录后转到黄页选择模板与编辑黄页界面
-func (yp *Yellowpage) ShowEnterprise(id string) error {
-	if yp.GetSession("userId") == nil {
-		return yp.Redirect("/")
-	}
+//编辑企业黄页的信息
+func (yp *Yellowpage) EditEnterprise() error {
 	//判断用户是否审核通过
 	if checkuser(yp) == false {
 		return yp.Redirect("/member/accountset/index", http.StatusFound)
 	}
-	id = strings.Split(id, "#")[0]
-
-	yp.T["entinfo"] = yps.GetEntInfo(id)
-
-	yp.T["entid"] = id
-	yp.T["serviceClassify"] = coreconfig.ServiceClassify
+	return yps.CommonEntInfo(yp.Action, yp.GetSession("entid").(string), 2, false)
+}
 
-	opLocD := yp.GetSession("opLocDistrict")
-	yp.T["opLocDistrict"] = opLocD
-	return yp.Render("/member/showenterprise.html", &yp.T)
+//保存企业黄页的信息
+func (yp *Yellowpage) Dosave() error {
+	status := "n"
+	s_persion := Repl(yp.GetString("s_persion"))
+	//联系人不能为空
+	if s_persion == "" {
+		status = "personError"
+	} else {
+		data := make(map[string]interface{})
+		data["s_persion"] = s_persion
+		entid := yp.GetSession("entid").(string)
+		data["s_persion"] = Repl(yp.GetString("s_persion"))
+		data["s_mobile"] = Repl(yp.GetString("s_mobile"))
+		data["s_enturl"] = Repl(yp.GetString("s_enturl"))
+		data["s_qq"] = Repl(yp.GetString("s_qq"))
+		data["s_weixin"] = Repl(yp.GetString("s_weixin"))
+		data["s_email"] = Repl(yp.GetString("s_email"))
+		province, _ := yp.GetInt("i_province")
+		data["i_province"] = province
+		city, _ := yp.GetInt("i_city")
+		data["i_city"] = city
+		area, _ := yp.GetInt("i_area")
+		data["i_area"] = area
+		data["s_address"] = Repl(yp.GetString("s_address"))
+		dataSet := map[string]interface{}{
+			"$set": data,
+		}
+		//向mongodb库中写数据
+		if mongodb.Update(ESTYPE, "{'_id':'"+entid+"'}", &dataSet, false, false) {
+			status = "y"
+			go func() {
+				util.Try(func() {
+					redis.Del("enterprise", "enterpriseInfo_"+entid)
+					redis.DelByCodePattern("enterprise", "ipcity_*")
+					elastic.UpdateEntDoc(entid)
+					//首次创建企业名片，送积分
+					if !credit.AIsHasDo(credit.A_CJMP, util.Int64All(yp.GetSession("credit_a"))) {
+						credit.UpuserCreditSession(util.ObjToString(yp.GetSession("userId")), credit.A_CJMP, "A", nil, yp.Action)
+					}
+				}, func(e interface{}) {
+					log.Println(e)
+				})
+			}()
+		}
+	}
+	yp.ServeJson(&map[string]interface{}{"status": status})
+	return nil
 }
 
 //显示增加编辑服务页面
@@ -447,7 +419,6 @@ func (yp *Yellowpage) AddService() error {
 	if tempFlag {
 		//删除缓存信息
 		redis.Del("enterprise", "enterpriseInfo_"+enterpriseid)
-		redis.Del("enterprise", "enterpriseInfo_user_"+enterpriseid)
 		redis.DelByCodePattern("enterprise", "service-"+enterpriseid+"-*")
 		//将数据存到elastic中
 		flag2 := elastic.UpdateNewDoc("service", "service", doc)
@@ -652,3 +623,33 @@ func (yp *Yellowpage) UpLoadEntImg() error {
 		return yp.Write("n")
 	}
 }
+
+//关注企业
+func (yp *Yellowpage) Follow() error {
+	entId := yp.GetString("entId")
+	flag, _ := yp.GetBool("flag")
+	userId := yp.GetSession("userId").(string)
+	status := "n"
+	if flag {
+		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+`","s_entid":"`+entId+`"}`) >= 10 {
+			status = "m"
+		} else {
+			if len(mongodb.Save("follow-enterprise", bson.M{
+				"s_userid":     userId,
+				"s_entid":      entId,
+				"s_m_openid":   s_m_openId,
+				"l_createdate": time.Now().Unix(),
+			})) > 0 {
+				status = "y"
+			}
+		}
+	}
+	yp.ServeJson(bson.M{"status": status})
+	return nil
+}

core/src/qfw/search/searchService.go

@@ -4,6 +4,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"github.com/go-xweb/httpsession"
 	"github.com/go-xweb/xweb"
 	"gopkg.in/mgo.v2/bson"
 	"html/template"
@@ -158,7 +159,7 @@ func (n *Search) GetEnterpriseList(reqType, param /*参数*/ string) error {
 		}
 		//查询生成列表数据
 		data, pagination := searhWebContentent(querymap, n, reqType)
-
+		appendFollow(data, n.Session())
 		//查询送积分
 		queryStr := querymap["query"]
 		if len(queryStr) > 0 {
@@ -182,6 +183,7 @@ func (n *Search) GetEnterpriseList(reqType, param /*参数*/ string) error {
 
 		json.Unmarshal(bs, &querymap)
 		data, pagination := searhWebContentent(querymap, n, reqType)
+		appendFollow(data, n.Session())
 		n.Render("/search/enterpriseList.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
 	}
 	return nil
@@ -189,6 +191,23 @@ func (n *Search) GetEnterpriseList(reqType, param /*参数*/ string) error {
 	//return n.Render("/search/entcommunity.html")
 	//}
 }
+func appendFollow(data *[]map[string]interface{}, session *httpsession.Session) {
+	userId := session.Get("userId")
+	if userId == nil {
+		return
+	}
+	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 {
+				if f["s_entid"] == BsonIdToSId(d["_id"]) {
+					d["followFlag"] = true
+					continue
+				}
+			}
+		}
+	}
+}
 
 //即时搜索
 func (n *Search) Sim() error {

core/src/qfw/yellowpage/yellowpage.go

@@ -2,37 +2,19 @@ package yellowpage
 
 //企业黄页的Action
 import (
-	"fmt"
 	"github.com/go-xweb/xweb"
-	. "gopkg.in/mgo.v2/bson"
-	. "qfw/util/mongodb"
-	"strings"
 )
 
 type Yellowpage struct {
 	*xweb.Action
 	//进入企业黄页
-	wxenterpriseInfo xweb.Mapper `xweb:"/wx/enterprise/(\\w+).html"`
-	//进入企业黄页
 	enterpriseInfo xweb.Mapper `xweb:"/enterprise/(\\w+).html"`
-	//根据企业注册号进入企业黄页
-	enterpriseInfoByRegNO xweb.Mapper `xweb:"/enterpriseInfoByRegNO/(\\w+).html"`
 	//获取关系网数据
 	getRelation xweb.Mapper `xweb:"/member/getRelation"`
 	//获取失信信息
 	getDishonesty xweb.Mapper `xweb:"/front/getDishonesty"`
-	//获取企业的服务列表
-	findServiceByEntId xweb.Mapper `xweb:"/front/findServiceByEntId"`
 }
 
-func (yp *Yellowpage) EnterpriseInfoByRegNO(regNO string) error {
-	r := FindOne("enterprise", M{"RegNo": regNO})
-	if r == nil || len(*r) == 0 {
-		return yp.Render("/yellowpage/error.html")
-	}
-	id := strings.Split(fmt.Sprintf("%s", (*r)["_id"]), `"`)[1]
-	return yp.Redirect("/enterprise/" + id + ".html")
-}
 func init() {
 	xweb.AddAction(&Yellowpage{})
 }

core/src/qfw/yellowpage/yellowpagemanager.go

@@ -5,8 +5,7 @@ import (
 	"container/list"
 	"encoding/json"
 	"fmt"
-	"github.com/go-xweb/httpsession"
-	_ "github.com/go-xweb/xweb"
+	"github.com/go-xweb/xweb"
 	mgo "gopkg.in/mgo.v2"
 	. "gopkg.in/mgo.v2/bson"
 	"html/template"
@@ -132,206 +131,126 @@ func GetEntInfo(id string) map[string]interface{} {
 				(*res)["s_action"] = "N"
 			}
 		}
-		log.Println(res)
-		return *res
-	}
-	return nil
-}
-func WxGetEntInfo(id string, flag bool) interface{} {
-	res := FindById("enterprise", id, `{"RegNo":1, "EntName":1, "EntType":1, "EntTypeName":1, "OpLocDistrict":1, "LeRep":1, "LegCerNO":1, "Tel":1, "Dom":1, "OpScope":1, "OpFrom":1, "OpTo":1, "RegCap":1, "EstDate":1, "CompForm":1, "CompFormName":1, "OpState":1, "OpStateName":1, "RegOrgName":1, "IssBLicDate":1, "Timestamp":1, "s_synopsis":1, "SourceType":1, "s_weixin":1, "s_enturl, "i_province":1, "i_city":1, "i_area":1,"s_action":1,"s_persion":1,"s_mobile":1,"s_address":1,"s_avatar":1,"s_microwebsite":1,"s_qq":1,"s_submitid":1}`)
-	if res != nil {
-		submitid := (*res)["s_submitid"]
-		if submitid != nil {
-			ud := FindById("user", submitid.(string), `{"i_comauthenttype":1}`)
-			(*res)["i_comauthenttype"] = (*ud)["i_comauthenttype"]
-		}
-		opl, _ := (*res)["OpLocDistrict"].(string)
-		if len(opl) >= 2 {
-			if v, ok := city_map[opl[:2]]; ok {
-				(*res)["OpLoc"] = v
-			}
-		}
-		syno, _ := (*res)["s_synopsis"].(string)
-		(*res)["s_synopsis"] = template.HTML(syno)
-		ty, _ := (*res)["SourceType"].(string)
-		if ty == "01" {
-			(*res)["gs"] = true
-		} else {
-			(*res)["gs"] = false
-		}
-		OpFrom := (*res)["OpFrom"]
-		if OpFrom != nil {
-			(*res)["OpFrom"] = FormatDate(&OpFrom)
-		}
-		OpTo := (*res)["OpTo"]
-		if OpFrom != nil {
-			(*res)["OpTo"] = FormatDate(&OpTo)
-		}
-		IssBLicDate := (*res)["IssBLicDate"]
-		s_action := (*res)["s_action"]
-		if s_action == nil || s_action == "" {
-			(*res)["s_action"] = "N"
-		}
-		if OpFrom != nil {
-			(*res)["IssBLicDate"] = FormatDate(&IssBLicDate)
-		}
-		EstDate := (*res)["EstDate"]
-		if OpFrom != nil {
-			(*res)["EstDate"] = FormatDate(&EstDate)
-		}
-		//查询企业关系
-		//relation := Find("entrelation", &map[string]interface{}{
-		//	"aid": ObjectIdHex(id),
-		//}, nil, nil, false, -1, -1)
-		EntType, _ := (*res)["EntType"].(string)
-		//处理分公司
-		if EntType != "" {
-			if EntType == "5810" || EntType == "6810" || EntType == "7310" || EntType == "3200" || EntType == "3100" {
-				(*res)["EntType"] = "5810"
-			} else if len(EntType) > 1 {
-				if EntType[:1] == "2" {
-					(*res)["EntType"] = "5810"
-				}
-			}
-		}
-		en, _ := (*res)["EntName"].(string)
-		if en == "" {
-			(*res)["EntName"] = (*res)["LeRep"]
-		}
-		//
-		(*res)["EntTypeLabel"] = (mobile.GetDiffName(EntType))[0]
-		if flag {
-			RegNo, _ := (*res)["RegNo"].(string)
-			relation := makeRelation(RegNo, en)
-			if relation != nil {
-				(*res)["relation"] = relation
-			}
-		}
-
-		(*res)["entid"] = id
 		return *res
 	}
 	return nil
 }
 
-//企业黄查询结果
-func (yp *Yellowpage) WxenterpriseInfo(regNO string) error {
-	r := FindOne("enterprise", M{"RegNo": regNO})
-	if r == nil || len(*r) == 0 {
-		return yp.Render("/yellowpage/error.html")
-	}
-	id := strings.Split(fmt.Sprintf("%s", (*r)["_id"]), `"`)[1]
-	return yp.Redirect("/enterprise/" + id + ".html")
-}
-
 //企业黄查询结果
 func (yp *Yellowpage) EnterpriseInfo(id string) error {
 	id = strings.Split(id, "#")[0]
 	regex, _ := regexp.Compile("(Android|Mobile)")
-	ismobile := regex.FindAllString(yp.Header("User-Agent"), -1)
+	ismobile := len(regex.FindAllString(yp.Header("User-Agent"), -1)) > 0
 	key := "enterpriseInfo_"
-	if len(ismobile) > 0 {
+	if ismobile {
 		key = "menterpriseInfo_"
 	}
 	if ret, err := redis.GetBytes("enterprise", key+id); err == nil {
 		return yp.SetBody(*ret)
 	} else {
-		if info := GetEntInfo(id); info != nil {
-			yp.T["res"] = info
-			regNo, _ := info["RegNo"].(string)
-			entName, _ := info["EntName"].(string)
-			relation, relflag := getRelation(regNo, entName)
-			var nodes *[]map[string]interface{}
-			if relflag {
-				if d, err := json.Marshal(relation["nodes"]); err == nil && json.Unmarshal(d, &nodes) == nil && len(*nodes) > 0 {
-					//相关企业
-					var entmids []ObjectId
-					for _, v := range *nodes {
-						if v["type"] == "e" && v["entmid"] != nil && v["entmid"].(string) != "" {
-							entmids = append(entmids, ObjectIdHex(v["entmid"].(string)))
-						}
+		return CommonEntInfo(yp.Action, id, 0, ismobile)
+	}
+}
+func CommonEntInfo(yp *xweb.Action, id string, editFlag int, ismobile bool) error {
+	if info := GetEntInfo(id); info != nil {
+		yp.T["res"] = info
+		regNo, _ := info["RegNo"].(string)
+		entName, _ := info["EntName"].(string)
+		relation, relflag := getRelation(regNo, entName)
+		var nodes *[]map[string]interface{}
+		if relflag {
+			if d, err := json.Marshal(relation["nodes"]); err == nil && json.Unmarshal(d, &nodes) == nil && len(*nodes) > 0 {
+				//相关企业
+				var entmids []ObjectId
+				for _, v := range *nodes {
+					if v["type"] == "e" && v["entmid"] != nil && v["entmid"].(string) != "" {
+						entmids = append(entmids, ObjectIdHex(v["entmid"].(string)))
 					}
-					if len(entmids) > 0 {
-						relevantEnts := mongodbutil.Find("enterprise", cf.SysConfig.EntMongodbAlias, cf.SysConfig.EntMongodbName, M{"_id": M{"$in": entmids}}, 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"])
-								for _, node := range *nodes {
-									if node["entmid"] != nil && node["entmid"].(string) == relevantEnt["_id"] {
-										node["haslink"] = true
-										break
-									}
+				}
+				if len(entmids) > 0 {
+					relevantEnts := mongodbutil.Find("enterprise", cf.SysConfig.EntMongodbAlias, cf.SysConfig.EntMongodbName, M{"_id": M{"$in": entmids}}, 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"])
+							for _, node := range *nodes {
+								if node["entmid"] != nil && node["entmid"].(string) == relevantEnt["_id"] {
+									node["haslink"] = true
+									break
 								}
 							}
-							yp.T["relevantEnts"] = relevantEnts
 						}
-						relation["nodes"] = nodes
-						redis.Put("enterprise", "relation-"+regNo, relation, 7*ONEDAY)
+						yp.T["relevantEnts"] = relevantEnts
 					}
+					relation["nodes"] = nodes
+					redis.Put("enterprise", "relation-"+regNo, relation, 7*ONEDAY)
 				}
 			}
-			//相关新闻
-			var ids []ObjectId
-			newsIds := Find("rel_news", `{"s_entid":"`+id+`"}`, nil, `{"s_newsid":1}`, false, -1, -1)
-			if newsIds != nil && len(*newsIds) > 0 {
-				for _, v := range *newsIds {
-					if v["s_newsid"] != nil {
-						newsid, _ := v["s_newsid"].(string)
-						if newsid == "" {
-							continue
-						}
-						ids = append(ids, ObjectIdHex(newsid))
+		}
+		//相关新闻
+		var ids []ObjectId
+		newsIds := Find("rel_news", `{"s_entid":"`+id+`"}`, nil, `{"s_newsid":1}`, false, -1, -1)
+		if newsIds != nil && len(*newsIds) > 0 {
+			for _, v := range *newsIds {
+				if v["s_newsid"] != nil {
+					newsid, _ := v["s_newsid"].(string)
+					if newsid == "" {
+						continue
 					}
+					ids = append(ids, ObjectIdHex(newsid))
 				}
-				if len(ids) > 0 {
-					news := Find("trs_news", M{"_id": M{"$in": ids}}, `{"l_comeintime":-1}`, `{"s_link":1,"s_title":1,"l_comeintime":1}`, false, 0, 8)
-					if news != nil && len(*news) > 0 {
-						yp.T["relevantNews"] = news
-					}
+			}
+			if len(ids) > 0 {
+				news := Find("trs_news", M{"_id": M{"$in": ids}}, `{"l_comeintime":-1}`, `{"s_link":1,"s_title":1,"l_comeintime":1}`, false, 0, 8)
+				if news != nil && len(*news) > 0 {
+					yp.T["relevantNews"] = news
 				}
 			}
-			//失信信息第一页数据
-			yp.T["dishonesty"] = getDishonesty(util.If(info["LegCerNO"] != nil, info["LegCerNO"], "").(string), 1)
-			//服务列表第一页数据
-			yp.T["service"] = findServiceByEntId(id, 1, yp.Session())
-			//关系网数据
-			yp.T["relflag"] = relflag
-			//著作权
-			yp.T["copyright"] = FindOne("enterprise_copyright", `{"EntId":"`+id+`"}`)
-
+		}
+		//失信信息第一页数据
+		yp.T["dishonesty"] = getDishonesty(util.If(info["LegCerNO"] != nil, info["LegCerNO"], "").(string), 1)
+		//关系网数据
+		yp.T["relflag"] = relflag
+		//著作权
+		yp.T["copyright"] = FindOne("enterprise_copyright", `{"EntId":"`+id+`"}`)
+		//编辑企业名片标识
+		yp.T["editFlag"] = editFlag
+		//过滤企业名
+		if relflag && nodes != nil && len(*nodes) > 0 {
+			go func() {
+				util.Try(func() {
+					if filterEntName(nodes) > 0 {
+						relation["nodes"] = nodes
+						redis.Put("enterprise", "relation-"+regNo, relation, 7*ONEDAY)
+						redis.Del("enterprise", "enterpriseInfo_"+id)
+					}
+				}, func(e interface{}) {
+					log.Println("过滤企业名出错：", e)
+				})
+			}()
+		}
+		if editFlag > 0 {
+			return yp.Render("/enterprise/detail.html", &yp.T)
+		} else {
+			//服务数量
+			yp.T["serviceCount"] = getEntServiceCount(id)
 			var contentuser []byte
 			var erruser error
-			if len(ismobile) > 0 {
+			if ismobile {
 				contentuser, erruser = yp.Render4Cache("/member/incmobile/detailindex.html", &yp.T)
 			} else {
-				contentuser, erruser = yp.Render4Cache("/yellowpage/enterpriseinfo.html", &yp.T)
+				contentuser, erruser = yp.Render4Cache("/enterprise/detail.html", &yp.T)
 			}
-
 			if erruser == nil {
-				if len(ismobile) > 0 {
+				if ismobile {
 					redis.PutBytes("enterprise", "menterpriseInfo_"+id, &contentuser, 7*ONEDAY)
 				} else {
 					redis.PutBytes("enterprise", "enterpriseInfo_"+id, &contentuser, 7*ONEDAY)
 				}
 			}
-			//过滤企业名
-			if relflag && nodes != nil && len(*nodes) > 0 {
-				go func() {
-					util.Try(func() {
-						if filterEntName(nodes) > 0 {
-							relation["nodes"] = nodes
-							redis.Put("enterprise", "relation-"+regNo, relation, 7*ONEDAY)
-							redis.Del("enterprise", "enterpriseInfo_"+id)
-						}
-					}, func(e interface{}) {
-						log.Println("过滤企业名出错：", e)
-					})
-				}()
-			}
 			return yp.SetBody(contentuser)
-		} else {
-			return yp.Render("/_error.html")
 		}
+	} else {
+		return yp.Render("/_error.html")
 	}
 }
 
@@ -608,67 +527,16 @@ func getDishonesty(legcerNo string, currentPage int) map[string]interface{} {
 		return ret
 	}
 }
-func (yp *Yellowpage) FindServiceByEntId() error {
-	if yp.Method() == "POST" {
-		id := yp.GetString("entId")
-		currentPage, _ := yp.GetInteger("currentPage")
-		yp.ServeJson(findServiceByEntId(id, currentPage, yp.Session()))
-	}
-	return nil
-}
-func findServiceByEntId(id string, currentPage int, session *httpsession.Session) map[string]interface{} {
-	var res map[string]interface{}
-	if ret := redis.Get("enterprise", "service-"+id+"-"+fmt.Sprint(currentPage)); ret != nil {
-		res = ret.(map[string]interface{})
-	} else {
-		limit := 10
-		start := (currentPage - 1) * limit
-		var count int64
-		//分页
-		mustnot := `{"term" : {"i_status" : 1 }}`
-		var fields, collection, query, tempstrquery string
-		collection = "service"
-		tempstrquery = `{"query_string":{"default_field": "s_enterpriseid","query":"` + id + `"}}`
-		servicequery := ""
-		if session.Get("entid") == nil || session.Get("entid").(string) != id {
-			servicequery = `,"must_not" : [` + mustnot + `]`
-		}
-		query = `{"query": {
+
+//获取该企业的服务数量
+func getEntServiceCount(id string) int64 {
+	query := `{"query": {
 		    "bool": {
-			  "must":[` + tempstrquery + `]` + servicequery + `
+			  "must":[{"query_string":{"default_field": "s_enterpriseid","query":"` + id + `"}}],"must_not" : [{"term" : {"i_status" : 1 }}]
 		    }
 		  }}`
-		//需要查到的字段信息
-		fields = `"_id","s_name","s_introduction","s_images","s_enterpriseid","s_isshow","i_status","s_pricemy","i_comments","f_price","i_sales"`
-		if currentPage == 1 {
-			count = elastic.Count("service", collection, query)
-		}
-		//查询服务列表数据
-		result := elastic.Get("service", collection, `{"query":{"bool": {"must":[`+tempstrquery+`]`+servicequery+`}},
-		_source:[`+fields+`],
-		sort:{"l_createdate":"desc"},
-		from:`+fmt.Sprintf("%v", start)+`,
-		size:`+fmt.Sprintf("%v", limit)+`
-		}`)
-		for _, v := range *result {
-			b, _ := checkAuth(v)
-			if b {
-				v["s_isEdit"] = "1"
-			} else {
-				v["s_isEdit"] = "0"
-			}
-			if util.IntAll(v["i_status"]) == 1 {
-				v["s_remove"] = 1
-			} else {
-				v["s_remove"] = 0
-			}
-		}
-		res = map[string]interface{}{"list": result, "count": count, "pageSize": limit}
-		redis.Put("enterprise", "service-"+id+"-"+fmt.Sprint(currentPage), res, 7*24*60*60)
-	}
-	return res
+	return elastic.Count("service", "service", query)
 }
-
 func checkAuth(obj map[string]interface{}) (b bool, err string) {
 	if len(obj) > 0 {
 		//判断有没有预约的情况

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

@@ -2899,4 +2899,45 @@ style="color:#D03102;margin-right:5px;"
 	line-height: 75px;
 	text-align: center;
 	background: #FFF;
+}
+/**********百度地图*********/
+.baiduMap{
+	position: absolute;
+	top: 15%;
+	left: 15%;
+	right: 15%;
+	bottom: 15%;
+	border: 5px solid #dd4814;
+	background-color: rgb(255, 255, 255);
+	z-index: 1002;
+}
+.baiduMapError{
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	font-size: 18px;
+	text-align: center;
+	color: red;
+	width: 240px;
+	line-height: 24px;
+	margin-top: -12px;
+	margin-left: -120px;
+	letter-spacing: 2px;
+}
+.baiduMapArea{
+	position: fixed;
+	top: 0px;
+	left: 0px;
+	right: 0px;
+	bottom: 0px;
+	background: rgba(0, 0, 0, 0.8);
+	z-index: 1001;
+}
+.closeBaiduMap{
+    position: absolute;
+    top: 15%;
+    right: 15.5%;
+    margin-top: 5px;
+    z-index: 1003;
+	font-size: 16px;
 }

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

@@ -34,6 +34,97 @@ a:focus, a:hover{
 .ttcon ul li:hover{
 	color: #16a086;
 }
+.ent-follow{
+	position: absolute;
+	top: 50%;
+	right: 0px;
+	line-height: 27px;
+	margin-top: -14.5px;
+	color: green;
+	cursor: pointer;
+}
+.ent-follow span{
+	margin-right: 5px;
+	font-size: 16px;
+	vertical-align: middle;
+}
+/*********企业列表样式***************/
+.entlist-page .rowFl{
+	position:relative;
+	margin-top: 20px;
+	padding-bottom: 20px;
+}
+.entlist-page .rowFltt{
+	border-bottom:1px solid #ddd;
+}
+.entlist-page .rowsolid-bottom{
+	border-bottom:1px solid #CCCCCC;	
+}
+.entlist-page .rowFltt .qfw-text-more{
+	position:absolute;
+	right:10px;
+	top:2px;
+	font-weight:bold;
+	cursor:pointer;
+	color: #16a086;
+}
+.entlist-page .tt{
+	width:90px;
+	padding-left: 15px;
+}
+.entlist-page .city_china{
+	font-size:12px;
+}
+.entlist-page .city_china select{
+	border-bottom:1px dashed #CCCCCC;
+}
+.entlist-page .less{
+	height:20px;
+	overflow:hidden
+}
+.entlist-page .ttcon{
+	width:85%;
+	vertical-align:top
+}
+.entlist-page .ttcon ul{
+	display:inline-block;
+}
+.entlist-page .ttcon ul li{
+	display:inline-block;
+	margin-right:35px;
+	height:25px;
+	line-height:25px;
+	cursor:pointer;
+	margin-top:-2px;
+}
+.entlist-page .sel{
+	width: 20%;
+	min-width:80px;
+	max-width:180px;
+	height: 35px;
+	font-size: 14px;
+	color: #a0a0a0;
+	background-color: #fff;
+	border: 1px solid #ccc;
+	margin-right: 15px;
+}
+.entlist-page #navs {
+	position:relative
+}
+.entlist-page #navs .renzheng {
+	position:absolute;
+	right:10px;
+	bottom:0px;
+}
+/******列表详细信息*******/
+.entlist-page .borderB .qfw-entcontent-padding{
+	padding:20px 50px 20px 20px;
+	line-height: 25px;
+	position: relative;
+}
+.entlist-page .qfw-entcontent-padding .lineb a{
+	font-size:16px;
+}
 .entlist-page .entlist-allclaify{
 	color: #16a086;
 	font-weight: bold;
@@ -256,22 +347,40 @@ a:focus, a:hover{
 /*********企业画像***************/
 .entinfo-page .b-com-head{
 	background-color: #FFFFFF;
+	padding: 30px 30px 10px 30px;
 	position: relative;
-	padding: 30px;
 }
-.entinfo-page .b-com-head>img{
+.entinfo-page .b-com-head>.ent-logo{
 	position: absolute;
-	height: 130px;
-	width: 130px;
 	left: 30px;
 	top: 30px;
 }
+.entinfo-page .b-com-head>.ent-logo>img{
+	height: 130px;
+	width: 130px;
+}
+.entinfo-page .b-com-head>.ent-logo>.ent-uploadLogo{
+	position: absolute;
+	left: 0px;
+	right: 0px;
+	bottom: 0px;
+	line-height: 30px;
+	color: #ffffff;
+	background-color: gray;
+	opacity: 0.5;
+	text-align: center;
+	cursor: pointer;
+}
+.entinfo-page .b-com-head>div{
+	position: relative;
+}
 .entinfo-page .b-com-head>.entinfo-cart{
 	margin-left: 160px;
-	height: 130px;
+	position: relative;
 }
 .entinfo-page .b-com-head .b-com-first{
 	line-height: 25px;
+	margin-right: 60px;
 }
 .entinfo-page .b-com-head .b-com-first a{
 	color: #16a086;
@@ -285,6 +394,13 @@ a:focus, a:hover{
 .entinfo-page .b-com-head .b-com-second{
 	height: 29px;
 	line-height: 29px;
+	margin-right: 60px;
+}
+.entinfo-page .b-com-head .b-com-second>span{
+	margin-right: 30px;
+}
+.entinfo-page .b-com-head .b-com-second a{
+	color: rgb(22, 160, 134);
 }
 .entinfo-page .b-com-head .b-com-second .glyphicon{
 	color: #FF5A5F;
@@ -305,7 +421,7 @@ a:focus, a:hover{
 	line-height: 25px;
 	color: #A0A0A0;
 }
-.entinfo-page .b-com-head .b-com-last .glyphicon{
+.entinfo-page .b-com-head .glyphicon{
 	font-size: 17px;
 	color: #cccccc;
 	margin-right: 5px;
@@ -314,43 +430,6 @@ a:focus, a:hover{
 .entinfo-page .b-com-head .b-com-last a{
 	color: #415fcf;
 }
-.white_content {
-	display: none;
-	position: absolute;
-	top: 25%;
-	left: 25%;
-	width: 55%;
-	height: 55%;
-	padding: 20px;
-	border: 5px solid #dd4814;
-	background-color: white;
-	z-index: 1002;
-	overflow: auto;
-}
-.black_overlay {
-	display: none;
-	position: absolute;
-	top: 0px;
-	left: 0px;
-	right: 0px;
-	bottom: 0px;
-	background-color: black;
-	z-index: 1001;
-	-moz-opacity: 0.8;
-	opacity: .80;
-	filter: alpha(opacity=88);
-}
-.closeshowmap{
- 	display: none; 
-    position: absolute; 
-    top: 25%; 
-    left: 79%; 
-    float:right;
-    margin:5px 5px 0px 0px; 
-    background-color: white; 
-    z-index:1003; 
-    overflow: auto; 	
-}
 .ent-tab{
 	height: 50px;
 	background-color: #F6F8FA;
@@ -726,19 +805,6 @@ a:focus, a:hover{
 	margin-top: 20px;
 	width: 200px;
 }
-/*************产品服务******************/
-.ent-yellowpage td img{
-	width: 110px;
-	height: 101px;
-}
-.ent-table td.ent-servicepaging{
-	padding-bottom: 0px !important;
-}
-.ent-serviceintroduction{
-	word-wrap: break-word;
-	word-break: break-all;
-	white-space: normal !important;
-}
 /**************变更信息**********************/
 .ent-alterinfo li{
 	width: 100%;
@@ -956,10 +1022,6 @@ a:focus, a:hover{
 .ent-dishonesty .ent-table tr{
 	border-top: 1px solid #e5e6e9;
 }
-.ent-yellowpage .ent-table tr:nth-child(2n+1){
-	border-top: 1px solid #e5e6e9;
-	font-size: 16px;
-}
 .ent-table .b-com-name{
 	font-weight: bold;
 	word-wrap: break-word;
@@ -1007,4 +1069,49 @@ a:focus, a:hover{
 }
 .entinfo-page .badge.disabled{
 	background-color: #a0a0a0;
+}
+/************编辑***********/
+.b-editEnt-form .form-control{
+	display: inline-block;
+	width: 200px;
+	height: 32px;
+	margin-right: 20px;
+}
+.b-editEnt-form .b-com-last .form-control{
+	margin-right: 5px;
+}
+.b-editEnt-form [name='s_address']{
+	width: 315px;
+}
+.b-editEnt-form .glyphicon{
+	margin-right: 10px !important;
+}
+.b-editEnt-form .glyphicon.dizhi{
+	margin-right: 5px !important;
+}
+.b-editEnt-form>div{
+	margin: 8px 0px;
+}
+.select-control{
+	height: 34px;
+    width: 126px;
+    padding: 6px 12px;
+    font-size: 14px;
+    line-height: 1.42857143;
+	vertical-align: middle;
+    color: #555;
+    background-color: #fff;
+    background-image: none;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
+    box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
+    -webkit-transition: border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;
+    -o-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
+    transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
+}
+.entinfo-cart .btn-save{
+	position: absolute;
+	right: 0px;
+	top: 0px;
 }

core/src/web/staticres/js/baiduMap.js

@@ -0,0 +1,101 @@
+function BaiduMap(){
+	var closeMapNodeId = "closeBaiduMap";
+	(function(){
+		var div = document.createElement("div");
+		div.id = BaiduMap.mainNodeId;
+		div.className = BaiduMap.mainNodeId;
+		div.innerHTML = '<a href ="javascript:void(0)"><div id="'+closeMapNodeId+'" class="closeBaiduMap">X</div></a>'
+						+'<div id="baiduMap" class="'+BaiduMap.mapId+'"></div>';
+		document.body.appendChild(div);
+		div.onclick = function(e){
+			if(e.target.id == BaiduMap.mainNodeId || e.target.id == closeMapNodeId){
+				BaiduMap.closeMap();
+			}
+		}
+	})();
+	this.showMap = function(){
+		document.body.className += " overflow-hidden";
+		document.getElementById(BaiduMap.mainNodeId).style.display = 'block';
+	};
+	//地址解析
+	this.analysisAddress = function(province,city,area,address){
+		city = province + city;
+		address = area + address;
+		this.showMap();
+		var script = document.createElement('script');
+	    script.type = 'text/javascript';
+		script.src = "http://api.map.baidu.com/geocoder/v2/?address="+address+"&output=json&ak="+BaiduMap.key+"&callback=BaiduMap.renderOption";
+	    document.body.appendChild(script);
+	};
+	this.sign = function(callback){
+		var map = null;
+		var showInfo = function(e){
+			map.clearOverlays();
+			var point = new BMap.Point(e.point.lng,e.point.lat);
+			BaiduMap.showInfo(map,point,callback);
+			var marker = new BMap.Marker(point);
+			map.addOverlay(marker); //将标记添加到地图中
+		}
+		var myFun = function(result){
+			var point = new BMap.Point(result.center.lng,result.center.lat);
+			map = BaiduMap.initMap(point);
+			BaiduMap.showInfo(map,point,callback);
+			map.addEventListener("click", showInfo)
+		}
+		var myCity = new BMap.LocalCity();
+		myCity.get(myFun);
+	}
+};
+BaiduMap.key = "AFd8b176f363f23e6a23d516f4cfb742";
+BaiduMap.mainNodeId = "baiduMapArea";
+BaiduMap.mapId = "baiduMap";
+BaiduMap.error = function(){
+	document.getElementById(this.mapId).innerHTML = "<span class='baiduMapError'>您地址没有解析到结果!</span>";
+};
+BaiduMap.renderOption = function(response){
+	try{
+		if(response.status != 0){
+			this.error();
+			return;
+		}
+		var location = response.result.location;
+		BaiduMap.initMap(new BMap.Point(location.lng,location.lat));
+	}catch(e){}
+};
+BaiduMap.initMap = function(point){
+	var map = new BMap.Map(this.mapId); //初始化地图  
+	map.enableScrollWheelZoom(true);
+	if(point){
+		map.addOverlay(new BMap.Marker(point)); //将标记添加到地图中
+		map.centerAndZoom(point, 12); //设置中心点坐标和地图级别
+	}
+	return map;
+};
+BaiduMap.closeMap = function(){
+	var reg = new RegExp('(\\s|^)overflow-hidden(\\s|$)');
+    document.body.className = document.body.className.replace(reg, '');
+	document.getElementById(BaiduMap.mainNodeId).style.display = 'none';
+};
+BaiduMap.showInfo = function(map,point,callback){
+	BaiduMap.signCallback = callback;
+	var opts = {
+		width: 100     // 信息窗口宽度
+	}
+	var geoc = new BMap.Geocoder();
+	geoc.getLocation(point, function(rs){
+		var addComp = rs.addressComponents;
+		var province = addComp.province;
+		var city = addComp.city;
+		var district = addComp.district;
+		var street = addComp.street;
+		var streetNumber = addComp.streetNumber;
+		var html = "地址："+province+city+district+street+streetNumber;
+		html+='<br><a class="btn btn-default pull-right" onclick="BaiduMap.signComplate(\''+province+'\',\''+city+'\',\''+district+'\',\''+street+streetNumber+'\')">使用当前地址</a>';
+		var infoWindow = new BMap.InfoWindow(html,opts);  // 创建信息窗口对象
+		map.openInfoWindow(infoWindow,point); //开启信息窗口  
+	});
+}
+BaiduMap.signComplate = function(province,city,district,address){
+	BaiduMap.closeMap();
+	BaiduMap.signCallback(province,city,district,address);
+}

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

@@ -105,7 +105,7 @@ function getCaptchaImg(){
 
 function rechoose(t){
 		if (!isLogined){
-			loginModalShow(6);
+			loginModalShow("/front/reurl");
 			return;
 		}
 		if(t==0){

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

@@ -1,7 +1,6 @@
 var entType = "企业";
 var relationEntity = null;//关系网
 var copyrightEntity = null;//著作权
-var servicePaging = null;//服务列表
 var staffinfoEntity = null;//主要人员
 var dishonestyPaging = null;//失信
 var hasLoadPagingJs = false;//是否已经加载过js
@@ -19,6 +18,11 @@ var computerSoftCopyRightFlag = false;
 //专利
 var patent = null;
 var patentFlag = false;
+var baiduMap = null;
+//根据城市名和地址解析
+var provinceName = "";
+var cityName = "";
+var areaName = "";
 //解析服务列表
 $(function(){
 	staffinfoFlag = typeof(staffinfo) != "undefined" && staffinfo != null && staffinfo.length > 0;
@@ -66,25 +70,133 @@ $(function(){
 		$("#ent-tab-staffinfo").addClass("disabled");
 	}
 	//联系地址
-	if($address){
+	if(editFlag){
+		$("#uploadLogo").click(function(){
+			document.getElementById("upload").click();
+		});
+		var option={
+			btnname:"",
+			action:"/filemanage/upload",
+			btnClass:"",
+			afterError:function(data,e){
+				alert("上传LOGO失败，请重新上传。");
+			},
+			afterUpload:function(data){ //此处可以重写，上传后的处理
+				if(data.flag == true){
+					$.ajax({
+					  	type: "POST",
+					  	url: "/member/yellowpage/upLoadEntImg",
+					  	data: "field=s_avatar&url="+data.url,
+					 	dataType: "text",
+					  	success: function(result){
+							if (result == "y"){
+								$("#entLogo>img").attr("src",data.url);
+							}else{
+								alert("上传LOGO失败，请重新上传。");
+							}
+						},
+						error: function(){
+							alert("上传LOGO失败，请重新上传。");
+						}
+					});
+				}else{
+					alert(data.msg)
+				}
+		 	}
+		};
+		try{
+			loadJS(cdn+"/js/upload.js",function(){
+				$("#uploadLogo>div").upload(option);
+			});
+		}catch(e){}
+		//编辑的时候输入框失去焦点验证格式
+		$("#editForm").find("input").blur(function(){
+			var thisValue = $.trim(this.value);
+			if(this.name == "s_persion" && thisValue == ""){
+				alert("请输入联系人！");
+				return;
+			}
+			if(thisValue == ""){
+				return;
+			}
+			switch(this.name){
+				case "s_mobile":
+					if(!ValidDatatype.m(thisValue)){
+						alert("手机号格式不正确！");
+					}
+					break;
+				case "s_email":
+					if(!ValidDatatype.e(thisValue)){
+						alert("邮箱格式不正确！");
+					}
+					break;
+				case "s_enturl":
+					if(!ValidDatatype.url(thisValue)){
+						alert("网址格式不正确！");
+					}
+					break;
+			}
+		});
+		$("#editSave").click(function(){
+			var formNode = $("#editForm");
+			var value = formNode.find("[name='s_persion']").val();
+			if(value == ""){
+				alert("请输入联系人！");
+				return;
+			}
+			value = formNode.find("[name='s_mobile']").val();
+			if(value != "" && !ValidDatatype.m(value)){
+				alert("手机号格式不正确！");
+				return;
+			}
+			value = formNode.find("[name='s_email']").val();
+			if(value != "" && !ValidDatatype.e(value)){
+				alert("邮箱格式不正确！");
+				return;
+			}
+			value = formNode.find("[name='s_enturl']").val();
+			if(value != "" && !ValidDatatype.url(value)){
+				alert("网址格式不正确！");
+				return;
+			}
+			$.post("/member/yellowpage/dosave/enterprise",formNode.serialize(),function(r){
+				if(r.status == "personError"){
+					alert("请输入联系人！");
+				}else if(r.status == "y"){
+					alert("保存成功！");
+					window.location.href = "/member/enterprise/show";
+				}else{
+					alert("保存失败！");
+				}
+			});
+		});
 		loadJS(cdn+"/js/jquery.cxselect.js",function(){
 			$('#city_china').cxSelect({
 				selects: ['province', 'city', 'area'],
 				required:0
 			});
 			$.cxSelect.setVal(province,city,area);
-			var pt=province?($("#provincesel option[value="+province+"]").text()):"";
-			var ct=city?($("#citysel option[value="+city+"]").text()):"";
-			var at=area?($("#areasel option[value="+area+"]").text()):"";
-			//设置地图上显示的位置
-			$("#location").attr("value",as1);
-			$("#cityname").attr("value",pt.trim()+ct.trim()+at.trim());		
-			initMap();
-			$("#city_china").text(pt+ct+at+as1);
 		});
+	}else{
+		if($address){
+			loadJS(cdn+"/js/jquery.cxselect.js",function(){
+				$('#city_china').cxSelect({
+					selects: ['province', 'city', 'area'],
+					required:0
+				});
+				$.cxSelect.setVal(province,city,area);
+				var pt=province?($("#provincesel option[value="+province+"]").text()):"";
+				var ct=city?($("#citysel option[value="+city+"]").text()):"";
+				var at=area?($("#areasel option[value="+area+"]").text()):"";
+				provinceName = pt;
+				cityName = ct;
+				areaName = at;
+				//设置地图上显示的位置
+				$("#city_china").text(pt+ct+at+address);
+			});
+		}
+		pcShare();
 	}
-	//隐藏地图
-	$("#fade").click(closeMap);
 	//分享
 	$(".entinfo-share").click(function(){
 		$(".bdsharebuttonbox").show();
@@ -112,7 +224,7 @@ $(function(){
 			}
 		}
 		if(index == 1){
-			b_afterLogin(isLogined);
+			afterReLoadTop(isLogined);
 		}else if($(this).index() == 2 && staffinfoEntity == null){
 			//加载服务列表
 			staffinfoEntity = new StaffinfoEntity();
@@ -122,36 +234,10 @@ $(function(){
 		}else if($(this).index() == 5 && dishonestyPaging == null){
 			//加载失信列表
 			dishonestyPaging = new DishonestyPaging();
-		}else if($(this).index() == 6 && servicePaging == null){
-			//加载服务列表
-			servicePaging = new ServicePaging();
 		}
 	});
-	pcShare();
 });
-function initMap(){
-	//获取地图的经纬度
-	loadJS("http://api.map.baidu.com/getscript?v=2&ak=AFd8b176f363f23e6a23d516f4cfb742&services=&t=20150522093217",function(){
-		loadJS(cdn+"/js/geocoder.js",function(){
-			doOptions();
-		});
-	});
-}
-//显示地图
-function showMap(){
-	document.getElementById('mapshowdiv').style.display = 'block';
-	document.getElementById('closeshowmap').style.display = 'block';
-	document.getElementById('fade').style.display = 'block';
-	$("html,body").addClass("overflow-hidden");
-}
-//关闭地图
-function closeMap(){
-	document.getElementById('mapshowdiv').style.display = 'none';
-	document.getElementById('closeshowmap').style.display = 'none';
-	document.getElementById('fade').style.display = 'none';
-	$("html,body").removeClass("overflow-hidden");
-}
-function b_afterLogin(flag,result){
+function afterReLoadTop(flag,result){
 	//关系网如果没有数据，选项卡不可点
 	if(typeof(result) != "undefined"){
 		identWayFlag = result.identWay == 1;
@@ -384,74 +470,6 @@ function CopyrightEntity(){
 		$("#copyright .ent-findnull").removeClass("hide");
 	}
 }
-//服务列表
-function ServicePaging(){
-	this.initServiceList = function(){
-		var paging = new Paging("serviceListPaging","/front/findServiceByEntId",{entId:entId},service.pageSize,function(r){
-			if((typeof(synopsis) == "undefined" || synopsis == null || synopsis == "") && r.length == 0){
-				$(".ent-yellowpage .ent-findnull").removeClass("hide");
-				$(".ent-yellowpage .ent-layout-down").remove();
-				return;
-			}
-			$(".serviceList-layout").removeClass("hide");
-			var html = '';
-			for(var i=0;i<r.length;i++){
-				var f_price = r[i].f_price;
-				if(typeof(f_price) == "undefined" || f_price == null || f_price == ""){
-					f_price = 0;
-				}
-				var i_sales = r[i].i_sales;
-				if(typeof(i_sales) == "undefined" || i_sales == null || i_sales == ""){
-					i_sales = 0;
-				}
-				var i_comments = r[i].i_comments;
-				if(typeof(i_comments) == "undefined" || i_comments == null || i_comments == ""){
-					i_comments = 0;
-				}
-				var flag = typeof(r[i].s_isshow) != "undefined" && r[i].s_isshow != null && r[i].s_isshow.indexOf("3")>-1;
-				html += '<tr>'
-						+'<td rowspan="2" width="130"><img src="'+(r[i].s_images==""?"null":(cdn+r[i].s_images))+'" onerror="this.src=\''+cdn+'/images/services/default.png\'"></td>'
-						+'<td class="b-com-name">';
-				if(flag){
-					html += '<a href="/market/detail/'+r[i]._id+'.html">';
-				}
-				html += r[i].s_name;
-				if(flag){
-					html += '</a>';
-				}
-				html += '</td>';
-				if(flag){
-					html += '<td width="150" class="text-center"><font class="b-disabled">报价：</font><font class="text-primary">'+(r[i].s_pricemy==1?"面议":f_price+"元")+'</font></td>'
-						+'<td width="250" class="text-center"><font class="b-disabled">成交：</font><font class="text-primary">'+i_sales+'</font><font class="margin-lr-5 b-disabled">|</font><font class="b-disabled">评价：</font><font class="text-primary">'+i_comments+'</font></td>';
-				}else{
-					html += '<td>&nbsp;</td><td>&nbsp;</td>';
-				}
-				html += '</tr><tr>'
-					+'<td colspan="3"><div class="ent-serviceintroduction">'+r[i].s_introduction+'</div></td>'
-					+'</tr>';
-			}
-			$("#serviceListPaging").parent().prevAll().remove();
-			$("#serviceListPaging").parent().before(html);
-			$(".ent-serviceintroduction").each(function(){
-				var text = $(this).text();
-				if(text.length > 200){
-					text = text.substring(0,150)+"...";
-				}
-				$(this).html(text);
-			});
-		},service);
-		paging.firstPageDatas = null;
-	}
-	if(hasLoadPagingJs){
-		this.initServiceList();
-	}else{
-		var thisClass = this;
-		loadJS(cdn+"/js/paging.js",function(){
-			hasLoadPagingJs = true;
-			thisClass.initServiceList();
-		});
-	}
-}
 //失信信息
 function DishonestyPaging(){
 	this.initDishonesty = function(){
@@ -487,4 +505,41 @@ function DishonestyPaging(){
 			thisClass.initDishonesty();
 		});
 	}
+}
+function showMap(){
+	if(baiduMap == null){
+		loadJS("http://api.map.baidu.com/getscript?v=2.0&ak="+BaiduMap.key,function(){
+			baiduMap = new BaiduMap();
+			if(editFlag){
+				baiduMap.sign(function(province,city,district,address){
+					$("select.province option").each(function(){
+						if(province.startWith($(this).text())){
+							$(this).attr("selected",true);
+							$("select.province").trigger("change");
+							return false;
+						}
+					});
+					$("select.city option").each(function(){
+						if(city == $(this).text()){
+							$(this).attr("selected",true);
+							$("select.city").trigger("change");
+							return false;
+						}
+					});
+					$("select.area option").each(function(){
+						if(district == $(this).text()){
+							$(this).attr("selected",true);
+							$("select.area").trigger("change");
+							return false;
+						}
+					});
+					$("[name='s_address']").val(address);
+				});
+			}else{
+				baiduMap.analysisAddress(provinceName,cityName,areaName,address);
+			}
+		});
+	}else{
+		baiduMap.showMap();
+	}
 }

core/src/web/staticres/js/geocoder.js

@@ -1,84 +0,0 @@
-var SAMPLE_ADVANCED_POST = 'http://api.map.baidu.com/geocoder/v2/?ak=您的密钥&callback=renderOption&output=json';
-
-var advancedOptions = '';
-var address;
-var marker;
-function showOptionsURL(type) {	
-	try{
-	    advancedOptions = SAMPLE_ADVANCED_POST;   
-		address = document.getElementById('location').value; 
-	    var cityname=document.getElementById('cityname').value;
-		advancedOptions+="&address="+address;
-		advancedOptions+="&city="+cityname;
-	}catch(e){}
-};
-
-function renderOption(response) {
-	try{
-		if (response.status ) {
-				var text = "无正确的返回结果:\n";
-				document.getElementById('mapshowdiv').innerHTML = text;
-				return;
-		}
-		var location = response.result.location;
-		//纬度 location.lat
-		//经度 location.lng
-		ptlat =location.lng;
-		ptlng =location.lat;	
-		var map = new BMap.Map("mapshowdiv"); //初始化地图   
-		var opts = {type: BMAP_NAVIGATION_CONTROL_LARGE}; //初始化地图控件  
-		map.addControl(new BMap.NavigationControl(opts)); 
-		//经度                 纬度
-		//var ptlat=113.69884285509,  ptlng=34.791342526551;
-		var point = new BMap.Point(ptlat,ptlng); //初始化地图中心点  
-		marker = new BMap.Marker(point); //初始化地图标记  
-		marker.enableDragging(); //标记开启拖拽  
-		  
-		var gc = new BMap.Geocoder();
-		
-		//添加标记拖拽监听  
-		marker.addEventListener("dragend", function(e){  
-		    //获取地址信息  
-		    gc.getLocation(e.point, function(rs){  
-		        showLocationInfo(e.point, rs);  
-		    });  
-		});  
-		  
-		//添加标记点击监听  
-		marker.addEventListener("click", function(e){  
-		   gc.getLocation(e.point, function(rs){  
-		        showLocationInfo(e.point, rs);  
-		    });  
-		});  
-		map.clearOverlays(); 
-		map.centerAndZoom(point, 12); //设置中心点坐标和地图级别  
-		map.addOverlay(marker); //将标记添加到地图中 
-		map.panBy(280, 200);//中心点偏移多少像素（width,height）为div 宽高的1/2; 
-		}catch(e){}
-}
-
-function doOptions() {
-    var script = document.createElement('script');
-    script.type = 'text/javascript';
-    showOptionsURL('buttonClick');
-    var newURL = advancedOptions.replace('您的密钥','AFd8b176f363f23e6a23d516f4cfb742');
-	script.src = newURL;
-    document.body.appendChild(script);
-};
-
-//显示地址信息窗口  
-function showLocationInfo(pt, rs){  
-    var opts = {  
-      width : 280,     //信息窗口宽度  
-      height: 100,     //信息窗口高度  
-      title : ""  //信息窗口标题  
-    }  
-      
-    var addComp = rs.addressComponents;  
-    var addr = "当前位置：" + addComp.province + ", " + addComp.city + ", " + addComp.district + ", " + addComp.street + ", " + addComp.streetNumber + "<br />";  
-    //addr += "纬度: " + pt.lat + ", " + "经度：" + pt.lng;  
-    //alert(addr);  
-	
-    var infoWindow = new BMap.InfoWindow(addr, opts);  //创建信息窗口对象  
-    marker.openInfoWindow(infoWindow);  
-}  

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

@@ -24,6 +24,9 @@ var ValidDatatype = {
 	"e": function(gets,obj,curform,regxp){
 		return !!gets.match("^([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)$");
 	},
+	"url": function(gets,obj,curform,regxp){
+		return /^(\w+:\/\/)?\w+(\.\w+)+.*$/.test(gets);
+	},
 	"*4": /^[^\s]{4,4}$/,//四位任意字符
 	"n4": /^\d{4,4}$/,	//四位数字
 	"n6": /^\d{6,6}$/,	//六位数字

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

@@ -74,7 +74,7 @@ $(function (){
 		if(isLogined){
 			window.location.href = "/front/reurl";
 		}else{
-			loginModalShow(6);
+			loginModalShow("/front/reurl");
 		}
 	});
 });

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

@@ -108,7 +108,7 @@ $(function (){
 		if(isLogined){
 			window.location.href = "/front/reurl";
 		}else{
-			loginModalShow(6);
+			loginModalShow("/front/reurl");
 		}
 	});
 });

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

@@ -54,17 +54,13 @@
 </style>
 <script src="/js/validform-min.js"></script>
 <script type="text/javascript">
+//登录完之后要跳转的url
+var afterLoginUrl = null;
 //打开登录窗口
-function loginModalShow(lbt){
-	$("#head-navbar").toggleClass("hidden-xs");
-	if(loginBackType == null){
-		if(typeof(lbt) == "undefined" || lbt == null){
-			loginBackType = 0;
-		}else{
-			loginBackType = lbt;
-		}
+function loginModalShow(url){
+	if(typeof(url) != "undefined"){
+		afterLoginUrl = url;
 	}
-	if(lbt>7)loginBackType = lbt;
 	$("#wxPic").attr("src","");
 	$.post("/front/wxlogin/getNum",function(data){
 		if(data&&data.num){		
@@ -73,7 +69,6 @@ function loginModalShow(lbt){
 		}
 	},'json');
 	$('#loginModal').modal('show');
- 
 }
 t=''
 function setTimes(num,n){
@@ -86,7 +81,7 @@ function setTimes(num,n){
 			$.post("/front/wxlogin/getLogin/"+num,function(data){
 				try{			
 					if(data&&data.res){
-						if (data.freeze == "2"){
+						if (data.freeze == 2){
 			    				window.location.href="/front/webhelpcontent/55c818d8af537440a700000d.html";
 								return
 							}
@@ -145,33 +140,31 @@ $(function (){
 			$(o.obj).prev().text(msg).show();
 		},
 		callback:function(data){
-			if(data.status == "n"){
-				if (data.info == "s_error"){
-					login_errorProcess($("[name='s_name']"),"用户不存在")
-				}else{
-					login_errorProcess($("[name='s_pwd']"),"密码输入有误")
-				}
-			}else if (data.freeze == "2"){
-			    window.location.href="/front/webhelpcontent/55c818d8af537440a700000d.html";
-			}else if (data.status == "0"){//后台管理员
-				window.location.href="/manage/system";
-			}else{
-				//注册页面登录之后
-				$("#loginStatus").trigger("login");
-				afterLoginSkip(data,true);
-			}
-			//
 			if($("#loginModal [name='rememberMe']").is(':checked')==true){
 				document.cookie="loginName="+$("#loginModal [name='s_name']").val(); 
 			}
 			clearInterval(t);
+			if(data.status == "y"){
+				if(data.freeze == 2){
+				    window.location.href="/front/webhelpcontent/55c818d8af537440a700000d.html";
+				}else if (data.userType == 0){//后台管理员
+					window.location.href="/manage/system";
+				}else{
+					afterLoginSkip(data,true);
+				}
+			}else if (data.status == "s_error"){
+				login_errorProcess($("[name='s_name']"),"用户不存在")
+			}else if (data.status == "p_error"){
+				login_errorProcess($("[name='s_pwd']"),"密码输入有误")
+			}else{
+				window.location.reload();	
+			}
 		}
 	},"loginForm");
 	function login_errorProcess(obj,msg){
 		login_cssctlObj(obj.prev(),3);
 		obj.prev().text(msg).show();
 	}
-	
 	$(".loginFont").click(function(){
 		var v=$(this).attr("v")
 		$("#loginModal .loginFont").removeClass("text-primary");
@@ -179,68 +172,27 @@ $(function (){
 		$("#loginModal .login").hide();	
 		$("#loginModal ."+v).show();	
 	});
-	$("#loginStatus").bind("login",function(){
-		
-	});
 });
 function afterLoginSkip(data,flag){
-	//强制刷新
 	if(compulsoryreRresh){
-		window.location.href = window.location.href;
+		window.location.reload();
 		return;
 	}
 	if(flag){
-		switch(loginBackType){
-			case -1:
-				window.location.href = window.location.href;
-				break;
-			case 1://微官网
-				window.location.href="/member/wsite";
-				break;
-			case 2://员工邀请
-				window.location.href="/member/employeemanage/loginUserJoin";
-				break;
-			case 4://注册
-				window.location.href="/";
-				break;
-			case 5://预约
-				window.location.href="/front/appointlogin";
-				break;
-			case 6://投标
-				window.location.href="/front/reurl";
-				break;
-			case 7://用户中心首页
-				window.location.href = "/member/show/memberindex";
-				break;
-			case 8://录入产品服务信息
-				if(data.code==null || data.code == ""){
-					window.location.href = '/member/show/memberindex';
-				}else{
-					window.location.href = '/member/yellowpage/show/showService/'+data.code;
-				}
-				break;
-			case 9://录入企业信息
-				if(data.code==null || data.code == ""){
-					window.location.href = '/member/show/memberindex';
-				}else{
-					window.location.href = '/member/yellowpage/edit/enterprise/'+data.code;
-				}
-				break;
-			case 10://订阅设置
-				window.location.href = '/member/swordfish/rssset';
-				break;
-			case 11://信息列表
-				window.location.href = '/member/swordfish/infolist';
-				break;
-			default:
-				$('#loginModal').modal('hide');
+		if(afterLoginUrl == -1){//登录完之后回调
+			window.location.reload();
+		}else if(afterLoginUrl == 0){//登录完之后回调
+			try{
+				afterLogin(data);
+			}catch(e){}
+		}else if(afterLoginUrl == null){//登录完之后重新加载头部
+			reLoadTop();
+		}else{//登录完之后跳转到指定页面
+			window.location.href = afterLoginUrl;
 		}
+		$('#loginModal').modal('hide');
 	}
-	try{
-		reLoadTop();
-	}catch(e){
-		b_loadTop();
-	}
+	
 }
 </script>
 <!-- 登录弹出框 -->

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

@@ -235,19 +235,12 @@ var isCanEditEnt = entId!="";
 var MemberLeftMenu = {
 	authentHref: "/member/authentication/index",//企业认证页面url
 	init: function (){
-		var editEnterHref = null;
-		if(isCanEditEnt){//可以编辑黄页
-			editEnterHref = "/member/yellowpage/show/enterprise/"+entId;
-		}else{//不可编辑黄页跳转到企业认证页面
-			editEnterHref = this.authentHref;
-		}
 		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();
+			html += this.myAppointment()+this.myDemand()+this.myYellowPageMenu()+this.serverMenu()+this.employeemanageMenu();
 			if(/^[9]$/.test(role)){
 				html += this.callCenterMenu();
 			}
@@ -259,21 +252,13 @@ var MemberLeftMenu = {
 			html += this.accountSetMenu()+this.accountMenu()+this.messageMenu();
 			html += this.vipMenu()+this.myCredit()+this.creditRule();
 		}else if(isCanEditEnt){
-			html += this.myYellowPageMenu(editEnterHref);
+			html += this.myYellowPageMenu();
 			if(/^[1]$/.test(role)){//黄页编辑者
-				html += this.serverMenu(editEnterHref);
+				html += this.serverMenu();
 			}
 			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");
-		//});
 	},
 	//实名认证菜单
 	autheMenu: function(){
@@ -310,13 +295,22 @@ var MemberLeftMenu = {
 		return '<a onclick="openSChat()" class="list-group-item">客服中心</a>';
 	},
 	//我的黄页菜单
-	myYellowPageMenu: function(href){
+	myYellowPageMenu: function(){
+		var href = null;
+		if(isCanEditEnt){//可以编辑黄页
+			href = "/member/enterprise/show";
+		}else{//不可编辑黄页跳转到企业认证页面
+			href = this.authentHref;
+		}
 		return '<a onclick="window.location.href=\''+href+'\'" class="list-group-item myyellow">我的黄页</a>';
 	},
 	//产品服务菜单
-	serverMenu: function(href){
-		if(this.authentHref != href){
-			href += '#service';
+	serverMenu: function(){
+		var href = null;
+		if(isCanEditEnt){
+			href = "";
+		}else{//不可编辑黄页跳转到企业认证页面
+			href = this.authentHref;
 		}
 		return '<a onclick="window.location.href=\''+href+'\'" class="list-group-item">产品服务</a>';
 	},
@@ -372,8 +366,8 @@ function openSChat() {
 function qd(){
 	$.post("/member/credit/inCreditAjx",{"param":"qd"},function(r){
 		if (r.result=="y"){
-					bookinfo(1);
-				}
+			bookinfo(1);
+		}
 		changeStatus();
 	});
 }

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

@@ -67,7 +67,7 @@ $(function (){
 		if(isLogined){
 			window.location.href = "/front/reurl";
 		}else{
-			loginModalShow(6);
+			loginModalShow("/front/reurl");
 		}
 	});
 });

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

@@ -65,7 +65,7 @@ $(function (){
 		if(isLogined){
 			window.location.href = "/front/reurl";
 		}else{
-			loginModalShow(6);
+			loginModalShow("/front/reurl");
 		}
 	});
 });

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

@@ -21,7 +21,7 @@ function open_window(link){
 	}
 	window.open("/visit/redirect?url="+escape(link));
 }
-function b_afterLogin(flag,result){
+function afterReLoadTop(flag,result){
 	if(flag){
 		//立即体验
 		$("#experience").click(function(){
@@ -37,18 +37,15 @@ function b_afterLogin(flag,result){
 			window.location.href = "/member/swordfish/infolist";
 		});
 	}else{
-		//立即体验
-		$("#experience").click(function(){
-			loginModalShow();
-		});
-		$("#goToSearch").click(function(){
-			loginModalShow();
+		//立即体验，信息查询
+		$("#experience,#goToSearch").click(function(){
+			loginModalShow("/member/swordfish/searchinfolist");
 		});
 		$("#goToRssset").click(function(){
-			loginModalShow(10);
+			loginModalShow("/member/swordfish/rssset");
 		});
 		$("#goToInfolist").click(function(){
-			loginModalShow(11);
+			loginModalShow("/member/swordfish/infolist");
 		});
 	}
 }

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

@@ -11,7 +11,7 @@
 </div>
 <script type="text/javascript">
 $(function(){
-	b_loadTop();
+	reLoadTop();
 });
 //认证完之后首次登录
 function afterAutheFirstLogin(result){
@@ -21,7 +21,7 @@ function afterAutheFirstLogin(result){
 		$("body").append('{{include "/common/ploginmodal.html"}}');
 		$("#fristAutheLoginModal .com-nickName").text(result.nickName);
 		$("#fristAutheLoginModal .com-entName").text(result.entName+"店铺");
-		$("#fristAutheLoginModal .com-entCard a").attr("href","/member/yellowpage/edit/enterprise/"+entId);
+		$("#fristAutheLoginModal .com-entCard a").attr("href","/member/enterprise/edit");
 	}else{
 		$("body").append('{{include "/common/ologinmodal.html"}}');
 		$("#fristAutheLoginModal .com-nickName").text(result.nickName);
@@ -39,14 +39,14 @@ function afterAutheFirstLogin(result){
 			//$("#fristAutheLoginModal .com-who").text("完成以下操作，就可以领取红包啦：");
 		}else{
 			$("#fristAutheLoginModal .com-entCard").removeClass("hide");
-			$("#fristAutheLoginModal .com-entCard a").attr("href","/member/yellowpage/edit/enterprise/"+entId);
+			$("#fristAutheLoginModal .com-entCard a").attr("href","/member/enterprise/edit");
 		}
 	}
 	$("#fristAutheLoginModal .com-releaseService a").attr("href","/member/yellowpage/show/showService/"+entId);
 	$("#fristAutheLoginModal").modal('show');
 }
 //
-function b_loadTop(){
+function reLoadTop(){
 	$.ajax({
 	  	type: "POST",
 	  	url: "/front/getWebSiteTop",
@@ -106,7 +106,7 @@ function b_loadTop(){
 				$("body").append('{{include "/common/login.html"}}');
 			}
 			try{
-				b_afterLogin(isLogined,result);
+				afterReLoadTop(isLogined,result);
 			}catch(e){}
 		},
 		error: function(e){

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

@@ -66,7 +66,7 @@ $(function (){
 		if(isLogined){
 			window.location.href = "/front/reurl";
 		}else{
-			loginModalShow(6);
+			loginModalShow("/front/reurl");
 		}
 	});
 });

core/src/web/templates/yellowpage/enterpriseinfo.html → core/src/web/templates/enterprise/detail.html

@@ -6,6 +6,7 @@
 <meta name="Keywords" content="{{.T.res.EntName}},{{.T.res.EntName}}地址,{{.T.res.EntName}}怎么样"/>
 <meta name="Description" content="{{.T.res.OpScope}}"/>
 <link href="{{Msg "seo" "cdn"}}/css/entcommunity.css" rel="stylesheet">
+<script src="{{Msg "seo" "cdn"}}/js/baiduMap.js"></script>
 <script src="{{Msg "seo" "cdn"}}/js/entportrait.js"></script>
 </head>
 <body class="entinfo-page">
@@ -13,8 +14,18 @@
 <div class="b-content container-fluid">
 	<!--企业名片-->
 	<div class="b-com-head">
-		<img src="{{if .T.res.s_avatar}}{{Msg "seo" "cdn"}}{{.T.res.s_avatar}}{{else}}null{{end}}" onerror="this.src='{{Msg "seo" "cdn"}}/images/ent-logo.png'">
+		<div class="ent-logo" id="entLogo">
+			<img src="{{if .T.res.s_avatar}}{{Msg "seo" "cdn"}}{{.T.res.s_avatar}}{{else}}null{{end}}" onerror="this.src='{{Msg "seo" "cdn"}}/images/ent-logo.png'">
+			{{if eq .T.editFlag 2}}
+			<div id="uploadLogo" class="ent-uploadLogo">
+				上传企业LOGO
+				<div class="hide"></div>
+			</div>
+			{{end}}
+		</div>
 		<div class="entinfo-cart">
+			{{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">
 				<font class="b-com-title">{{if .T.res.EntName}}{{.T.res.EntName}}{{end}}</font>
 				{{if .T.res.OpState}}
@@ -41,23 +52,53 @@
 				{{end}}
 			</div>
 			<div class="b-com-second">
-				{{if .T.res.EntName }}
+				{{if .T.res.EntName}}
 					{{if .T.res.s_action}}
 						{{$identaction:=.T.res.s_action}}
 						{{if eq $identaction "01"}}
 						<script>entType="企业"</script>
+						<span>
 							<span class="glyphicon qyrz"></span>
 							已认证企业{{if .T.res.i_comauthenttype}}{{if eq .T.res.i_comauthenttype 2}}<font class="margin-lr-5">-</font><span class="glyphicon mprz"></span>名片认证{{else if eq .T.res.i_comauthenttype 1}}<font class="margin-lr-5">-</font><span class="glyphicon yyzzrz"></span>营业执照认证{{else if eq .T.res.i_comauthenttype 3}}<font class="margin-lr-5">-</font><span class="glyphicon yjrz"></span>年报邮箱认证{{end}}{{else}}<font class="margin-lr-5">-</font><span class="glyphicon yyzzrz"></span>营业执照认证{{end}}
+						</span>
 						{{else if eq $identaction "02"}}
 						<script>entType="商家"</script>
+						<span>
 							<span class="glyphicon grrz"></span>已认证个人
+						</span>
 						{{else if eq $identaction "03"}}
 						<script>entType="机构"</script>
+						<span>
 							<span class="glyphicon jgrz"></span>已认证机构
+						</span>
 						{{end}}
 					{{end}}
 				{{end}}
+				{{if .T.serviceCount}}<a>服务信息列表</a>{{end}}
 			</div>
+			{{if eq .T.editFlag 2}}
+			<form class="b-editEnt-form" id="editForm">
+				<div>
+					<span class="glyphicon ren2"></span><input type="text" name="s_persion" class="form-control" maxlength="10" value="{{.T.res.s_persion}}">
+					<span class="glyphicon shouji"></span><input type="text" name="s_mobile" class="form-control" maxlength="11" onKeyUp="rePlaceUnDigital(this)" value="{{.T.res.s_mobile}}">
+					<span class="glyphicon qq1"></span><input type="text" name="s_qq" class="form-control" maxlength="30" value="{{.T.res.s_qq}}">
+				</div>
+				<div>
+					<span class="glyphicon youjian2"></span><input type="text" name="s_email" class="form-control" value="{{.T.res.s_email}}">
+					<span class="glyphicon wangzhi1"></span><input type="text" name="s_enturl" class="form-control" value="{{.T.res.s_enturl}}">
+				</div>
+				<div class="b-com-last">
+					<span class="glyphicon dizhi"></span>
+					<span id="city_china">
+						<select class="province cxselect select-control" id="provincesel" name="i_province" data-first-title="全国"></select>								
+						<select class="city cxselect select-control" id="citysel" name="i_city" data-first-title="选择市"></select>
+						<select class="area cxselect select-control" id="areasel" name="i_area" data-first-title="选择县"></select>
+					</span>
+					<input type="text" name="s_address" class="form-control" maxlength="50" value="{{.T.res.s_address}}">
+					<a href="javascript:void(0)" class="font-size-12" onclick="showMap()">添加标记</a>
+				</div>
+			</form>
+			{{else}}
 			<div class="b-com-last">
 				{{if .T.res.s_persion}}<span class="glyphicon ren2"></span>{{.T.res.s_persion}}<span class="margin-r-15"></span>{{end}}
 				{{if or .T.res.s_mobile .T.res.Tel}}<span class="glyphicon shouji"></span>{{if .T.res.s_mobile}}{{.T.res.s_mobile}}{{else if .T.res.Tel}}{{.T.res.Tel}}{{end}}<span class="margin-r-15"></span>{{end}}
@@ -105,12 +146,12 @@
 							{{.T.res.Dom}}
 						{{end}}
 					</span>
-					<input id="location" type="hidden" value="{{if .T.res.Dom}}{{.T.res.Dom}}{{end}}">
-					<input id="cityname" type="hidden" value="">
 					<a href="javascript:void(0)" class="font-size-12" onclick="showMap()">查看详细地图</a>
 				{{end}}
 			</div>
+			{{end}}
 		</div>
+		{{if ne .T.editFlag 2}}
 		<div class="b-pcshare">
 			<span id="pcShare"><span class="glyphicon fenxiang"></span>分享</span>
 			<div class="b-pcshare-content" id="pcShare-content">
@@ -126,6 +167,7 @@
 				</div>
 			</div>
 		</div>
+		{{end}}
 	</div>
 	<!--切换-->
 	<ul class="ent-tab">
@@ -135,7 +177,6 @@
 		<li{{if and (not .T.copyright.WorkCopyRight) (not .T.copyright.SoftWareCopyRight) (not .T.copyright.Patent)}} class="disabled"{{end}}><div class="b-com-border-top"></div>著作权<front class="badge" id="ent-tab-copyright">0</front></li>
 		<li{{if not .T.res.alterInfo}} class="disabled"{{end}}><div class="b-com-border-top"></div>变更信息<front class="badge{{if .T.res.alterInfo}}{{if eq (len .T.res.alterInfo) 0}} disabled{{end}}{{else}} disabled{{end}}">{{if .T.res.alterInfo}}{{len .T.res.alterInfo}}{{else}}0{{end}}</front></li>
 		<li{{if not .T.dishonesty.count}} class="disabled"{{end}}><div class="b-com-border-top"></div>失信信息<front class="badge" id="ent-tab-dishonesty">0</front></li>
-		<li class="{{if and (not .T.service.count) (not .T.res.s_synopsis)}}disabled {{end}}border-r-0"><div class="b-com-border-top"></div>{{if .T.res.s_action}}{{if eq .T.res.s_action "01"}}企业{{else if eq .T.res.s_action "02"}}商家{{else if eq .T.res.s_action "03"}}机构{{else}}企业{{end}}{{else}}企业{{end}}黄页</li>
 	</ul>
 	<div class="ent-tab-content b-left{{if and (not .T.relevantNews) (not .T.relevantEnts)}} b-right-none{{end}}">
 		<!--企业概况-->
@@ -451,33 +492,6 @@
 				<h4>抱歉，未找到相关数据！</h4>
 			</div>
 		</div>
-		<!--企业黄页-->
-		<div class="hide ent-yellowpage">
-			{{if .T.res.s_synopsis}}
-			<div class="ent-layout-down">
-				<div class="b-com-title">
-					<span><span class="bootstrap-glyphicon glyphicon-menu-right"></span></span>{{if .T.res.s_action}}{{if eq .T.res.s_action "01"}}企业{{else if eq .T.res.s_action "02"}}商家{{else if eq .T.res.s_action "03"}}机构{{else}}企业{{end}}{{else}}企业{{end}}介绍
-				</div>
-				<div class="b-com-content">{{.T.res.s_synopsis}}</div>
-			</div>
-			{{end}}
-			<div class="ent-layout-down serviceList-layout hide">
-				<div class="b-com-title">
-					<span><span class="bootstrap-glyphicon glyphicon-menu-right"></span></span>产品服务信息
-				</div>
-				<div class="b-com-content padding-b-0">
-					<table class="table ent-table" id="serviceList">
-						<tr>
-							<td colspan="4" class="text-center ent-servicepaging" id="serviceListPaging"></td>
-						</tr>
-					</table>
-				</div>
-			</div>
-			<div class="ent-findnull hide">
-				<img src="{{Msg "seo" "cdn"}}/images/findnull.png" class="b-findnull">
-				<h4>抱歉，未找到相关数据！</h4>
-			</div>
-		</div>
 	</div>
 	{{if or .T.relevantEnts .T.relevantNews}}
 	<div class="b-right">
@@ -527,10 +541,6 @@
 	</div>
 	{{end}}
 </div>
-<!--显示地图信息-->
-<div id="mapshowdiv" class="white_content"></div>
-<a href ="javascript:void(0)" onclick="closeMap();"><div id="closeshowmap" class="closeshowmap">X</div></a>
-<div id="fade" class="black_overlay"></div>
 {{include "/common/bottom.html"}}
 </body>
 <script type="text/javascript">
@@ -550,18 +560,18 @@ var OpScope = {{.T.res.OpScope}};
 var service = {{.T.service}};
 var relFlag = {{.T.relflag}};
 var copyright = {{.T.copyright}};
+var editFlag = {{.T.editFlag}}==2;
+var opLocDistrict = {{.T.res.OpLocDistrict}};
 //联系地址
-//定义默认的郑州经纬度
-var ptlat=113.69884285509,  ptlng=34.791342526551;
 var province = {{.T.res.i_province}};
 var city = {{.T.res.i_city}};
 var area = {{.T.res.i_area}};
-var as1="{{.T.res.s_address}}";
-var $address=false,$listent=false;
+var address = {{.T.res.s_address}};
+var $address=false;
 {{if or .T.res.i_province .T.res.i_city .T.res.i_area .T.res.s_address}}
 	$address = true;
 {{else if .T.res.Dom}}
-	initMap();
+	address = {{.T.res.Dom}};
 {{end}}
 </script>
 </html>

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

@@ -126,7 +126,7 @@ $(function (){
 		if(isLogined){
 			window.location.href = "/front/reurl";
 		}else{
-			loginModalShow(6);
+			loginModalShow("/front/reurl");
 		}
 	});
 });

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

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

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

@@ -44,7 +44,7 @@ $(function (){
 		window.location.href = "/front/registerByLink";
 	});
 	$("#joinByLink-login").click(function(){
-		loginModalShow(2);
+		loginModalShow("/member/employeemanage/loginUserJoin");
 	});
 });
 </script>

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

@@ -64,9 +64,9 @@
 						<table class="table">
 							<tr>
 								<td class="yellowpage-content">
-									<div onclick="window.location.href='{{if session "entid"}}/member/yellowpage/show/enterprise/{{session "entid"}}{{else}}/member/authentication/index{{end}}'">企业信息</div>
+									<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/yellowpage/show/enterprise/{{session "entid"}}#service{{else}}/member/authentication/index{{end}}'">产品服务信息</div>
+									<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>

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

@@ -123,10 +123,9 @@ body{
 <!-- 底部 -->
 {{include "/common/bottom.html"}}
 <script type="text/javascript">
-loginBackType = 1;
+var loginType = 0;
 var isPreview = "{{.T.isPreview}}" == "true";
 $(function(){
-	//setNavbarActive(5);
 	if(!isPreview){
 		$(".step-1 span").each(function(){
 			if($(this).attr("value") == "{{.T.s_microwebsite}}"){
@@ -138,23 +137,25 @@ $(function(){
 	$(".editEnt").click(function(){
 		if(isPreview){
 			if(this.id == "editService"){
-				loginModalShow(8);
+				loginType = 1;
 			}else{
-				loginModalShow(9);
+				loginType = 2;
 			}
+			loginModalShow(0);
 		}else{
 			var href = null;
 			if(this.id == "editService"){
 				href = '/member/yellowpage/show/showService/{{session "entid"}}';
 			}else{
-				href = '/member/yellowpage/edit/enterprise/{{session "entid"}}';
+				href = '/member/enterprise/edit';
 			}
 			window.location.href = href;
 		}
 	});
 	$(".step-1 span").click(function(){
 		if(isPreview){
-			loginModalShow();
+			loginType = 0;
+			loginModalShow(0);
 			return;
 		}
 		$(".step-1 span").removeClass("selected");
@@ -170,6 +171,19 @@ $(function(){
    		});
 	});
 });
+function afterLogin(data){
+	if(data.identWay != 1){
+		window.location.href = '/member/show/memberindex';
+	}else{
+		if(loginType == 0){
+			window.location.reload();
+		}else if(loginType == 1){
+			window.location.href = '/member/yellowpage/show/showService/'+data.entId;
+		}else{
+			window.location.href = '/member/enterprise/edit';
+		}
+	}
+}
 </script>
 </body>
 </html>

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

@@ -83,7 +83,7 @@
 		  <span class="reg-thirdParty">
 			使用第三方账号<img class="weixinLoginBtn" src="{{Msg "seo" "cdn"}}/images/weixin.png" onClick="weixinLogin()"/>
 			<img class="qqLoginBtn" src="{{Msg "seo" "cdn"}}/images/u87.png" onClick="qqLogin()"/>登录，
-			<a href="javascript:void(0)" onclick="loginModalShow(4)" class="text-primary">已有账号去登录</a>
+			<a href="javascript:void(0)" onclick="loginModalShow('/')" class="text-primary">已有账号去登录</a>
 		  </span>
 		  <!-- Tab panes -->
 		  <div class="tab-content">

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

@@ -4,7 +4,6 @@
 <meta name="msvalidate.01" content="D5F3ADC7EB4E65FFB8BF943AD56DD1F7" />
 {{include "/common/inc.html"}}
 <script src="{{Msg "seo" "cdn"}}/js/jquery.cxselect.js"></script>
-<link href="{{Msg "seo" "cdn"}}/css/enterprise.css" rel="stylesheet">
 <link href="{{Msg "seo" "cdn"}}/css/entcommunity.css" rel="stylesheet">
 <meta name="Keywords" content="{{Msg "seo" "qfw.enterprise.key"}}"/>
 <meta name="Description" content="{{Msg "seo" "qfw.enterprise.description"}}"/>
@@ -17,13 +16,12 @@
 		<!--查询条件-->
 		<div class="border container-fluid hidden-sm hidden-xs" >
 			<div class="rowFl rowFltt">
-				<div class="tt lineb qfw-p-margintop" ><b>&nbsp;所&nbsp;在&nbsp;地：</b></div>
+				<div class="tt lineb margin-t-5" ><b>&nbsp;所&nbsp;在&nbsp;地：</b></div>
 				<div id="city_china" class="lineb ttcon" >
 					<select class="sel province cxselect yselect" disabled="disabled" id="c_province" name="province"></select>
 					<select class="sel city cxselect yselect" disabled="disabled" id="c_city" name="city"></select>
 					<select class="sel area cxselect yselect" disabled="disabled" id="c_area" name="area"></select>
 				</div>
-				<!--<div class="rowFlTip"><span class="text-primary lineb marginLeft qfw-p-margintoplist"><span class="glyphicon biaojidizhi icon_default text-primary" style="width:20px;"></span><small style="color:#999999;">目前系统有河南、广西、黑龙江、青海、西藏、安徽、山西和湖北的官方企业数据，更多数据持续加入中...</small></span></div>-->
 			</div>
 			<div class="rowFl rowFltt" >
 				<div class="tt lineb"><b>行业类别：</b></div>
@@ -127,6 +125,9 @@
 									{{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="bootstrap-glyphicon {{if $v.followFlag}}glyphicon-heart{{else}}glyphicon-heart-empty{{end}}"></span>关注
+							</div>
 						</div>
 					</div>
 				{{end}}
@@ -204,16 +205,55 @@
 	<!--右边显示区结束-->
 </div>
 {{include "/common/bottom.html"}}
-
-
 <script>
+compulsoryreRresh = true;
 var entsel = {{index .T.querymap "city"}}
-
 var btempwords={{.T.words}}
 var chf1= {{index .T.querymap "c_hfl"}};
 var czb= '{{index .T.querymap "c_zb"}}';
 var $chiancity= true,$listent=true;
 $(function(){
+	$(".ent-follow").click(function(){
+		if(!isLogined){
+			loginModalShow();
+			return;
+		}
+		var dataObj = {};
+		dataObj["flag"] = $(this).hasClass("ent-followed");
+		var entObj = $(this).prev().children("div").children("a:first");
+		if(!dataObj.flag && !confirm("你将关注“"+entObj.text().replace(/\s+/g,"")+"”，剑鱼将会推送该企业的企业情报给你，每月将会扣除1000积分")){
+			return;
+		}
+		dataObj["entId"] = entObj.attr("href").split("/")[2].replace(".html","");
+		var thisClass = $(this);
+		$.post("/member/enterprise/follow",dataObj,function(r){
+			if(r.status == "y"){
+				if(dataObj.flag){
+					thisClass.children("span").removeClass("glyphicon-heart").addClass("glyphicon-heart-empty");
+					alert("已取消关注");
+				}else{
+					thisClass.children("span").addClass("glyphicon-heart").removeClass("glyphicon-heart-empty");
+					alert("已关注");
+				}
+				thisClass.toggleClass("ent-followed");
+			}else if(r.status == "m"){
+				alert("剑鱼为给你更好的使用体验目前仅支持关注10家企业，你已成功关注10家企业，如需继续关注，请到“用户中心-我的关注”对已关注的企业进行取消关注后，可关注新的企业！");
+			}else if(r.status == "n"){
+				if(dataObj.flag){
+					alert("取消关注失败，请重新取消！");
+				}else{
+					alert("关注失败，请重新关注！");
+				}
+			}else{
+				if(dataObj.flag){
+					alert("取消关注失败，请重新取消！");
+				}else{
+					alert("关注失败，请重新关注！");
+				}
+				window.location.reload();
+			}
+		});
+	});
 	scrollUp("entlist-recommend");
 });
 </script>

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

@@ -1,172 +0,0 @@
-<html>
-<head>
-<title>{{Msg "seo" "qfw.enterprise.title"}}</title>
-<meta name="msvalidate.01" content="D5F3ADC7EB4E65FFB8BF943AD56DD1F7" />
-{{include "/common/inc.html"}}
-<script src="{{Msg "seo" "cdn"}}/js/jquery.cxselect.js"></script>
-<link href="{{Msg "seo" "cdn"}}/wxent/qfw-enterprise.css" rel="stylesheet">
-<meta name="Keywords" content="{{Msg "seo" "qfw.enterprise.key"}}"/>
-<meta name="Description" content="{{Msg "seo" "qfw.enterprise.description"}}"/>
-</head>
-<body>
-{{include "/common/head.html"}}
-<div class="a-content">
-	<!--中间内容开始-->
-	<div class="row qfw-row">
-		<!--左边显示区开始-->
-		<div class="col-lg-9" style="padding-right: 0px;">
-		<div class="borderB text-primary fontb frontS hidden-sm hidden-xs">所有分类</div>
-			<!--查询条件-->
-			<div class="border container-fluid hidden-sm hidden-xs qfw-p-margintoplist" >
-				<div class="rowFl rowFltt">
-					<div class="tt lineb qfw-p-margintop" >&nbsp;所&nbsp;在&nbsp;地：</div>
-					<div id="city_china" class="lineb ttcon qfw-p-margintoplist" >
-						<select class="sel province cxselect yselect" disabled="disabled" id="c_province" name="province"></select>
-						<select class="sel city cxselect yselect" disabled="disabled" id="c_city" name="city"></select>
-						<select class="sel area cxselect yselect" disabled="disabled" id="c_area" name="area"></select>
-					</div>
-					<!--<div class="rowFlTip"><span class="text-primary lineb marginLeft qfw-p-margintoplist"><span class="glyphicon biaojidizhi icon_default text-primary" style="width:20px;"></span><small style="color:#999999;">目前系统有河南、广西、黑龙江、青海、西藏、安徽、山西和湖北的官方企业数据，更多数据持续加入中...</small></span></div>-->
-				</div>
-				<div class="rowFl rowFltt" >
-					<div class="tt lineb">行业类别：</div>
-					<div class="lineb ttcon less" id="c_hfl"></div>
-					<div class="text-muted qfw-text-more" onClick="less(this)"><small>更多></small></div>
-				</div>
-				<div class="rowFl ">
-					<div class="tt lineb">注册资本：</div>
-					<div class="lineb ttcon less" id="c_zb"></div>
-				</div>
-			</div>
-			<!--查询条件结束-->
-			<!--注册资本、认证-->
-			<ul id="navs" class="nav nav-tabs  hidden-sm hidden-md hidden-xs qfw-p-margintoplist ">
-				<li class="active" id="c_all" name="all" value="0"><a href="#home" data-toggle="tab">全部</a></li>
-               	<span  class=" hidden-sm hidden-md hidden-xs renzheng" ><input type="checkbox" name="c_author" id="c_author" value="Y" {{if .T.querymap.c_author}}checked{{end}}/>认证</span>
-	        </ul>
-			<!--注册资本、认证结束-->
-			
-			<!--列表详细信息开始-->
-			<div>
-				{{if gt (len .T.data) 0}}
-					{{range $k,$v:=.T.data}}
-						<div class="borderB">
-							<div class="qfw-entcontent-padding">
-								<div class="lineb " >
-									<a target="_blank" href="/wx/enterprise/{{index $v "_id"}}.html">
-										{{$lens:=len (index $v "EntName")}}									 
-										{{if eq $lens 0}}
-											{{index $v "LeRep"}}
-										{{else}}
-											{{index $v "EntName"}}
-										{{end}}
-									</a>
-									
-									{{ if index $v "s_action"}}
-										{{ if eq (index $v "s_action") "01"}}
-											<span class="glyphicon qyrz   margin-l-10 jhtb"></span><span class=" " ><small>已认证企业</small></span>
-											{{ if $v.i_comauthenttype }}
-													{{ if eq $v.i_comauthenttype 2}}
-														<span class="glyphicon mprz   margin-r-10 jhtbtype"></span><span class=" " ><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=" " ><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=" " ><small style="margin-right:5px;">年报邮箱认证</small></span>
-													{{end}}
-											{{else}}
-													<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class=" " ><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=" " ><small>　已认证个人</small></span>
-										{{else if eq (index $v "s_action") "03"}}
-											<span class="glyphicon jgrz   margin-l-10 jhtb"></span><span class=" " ><small>　已认证机构</small></span>
-										{{end}}
-									{{end}}
-								</div>
-								
-								<div>
-									<span>注册号：<small  class="lineb " >{{index $v "RegNo"}}</small></span>
-									{{if index $v "EntType"}}
-										{{if eq $v.EntType "9600"}}
-											<span>经营者：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
-										{{else if eq $v.EntType "5810"}}
-											<span>负责人：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
-										{{else}}
-											<span>法定代表人：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
-										{{end}}
-									{{end}}
-									<span>经营状态：<small  class="lineb " >{{index $v "OpStateName"}}</small></span>
-									<span>成立日期：<small  class="lineb " >{{index $v "EstDate"}}</small></span>
-									<span>所在地：<small  class="lineb " >{{index $v "OpLocDistrictName"}}</small></span>
-								</div>
-								{{if $v.s_servicenames}}<div>产品服务：<small  class="lineb ">{{Html (Replace $v.s_servicenames "," "" 1)}}</small></div>{{end}}
-								{{if $v.stock }}<div>股东：<small  class="lineb ">{{index $v "stock"}}</small></div>{{end}}
-								{{if $v.OpScope }}<div>经营范围：<small  class="lineb ">{{index $v "OpScope"}}</small></div>{{end}}
-							</div>
-						</div>
-					{{end}}
-					<!--页码信息-->
-					<div class="text-center  hidden-sm hidden-md hidden-xs">
-						<ul class="pagination pagination-md ">
-						{{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 hidden-lg">
-						<ul class="pagination pagination-md ">
-						{{range $k,$v:=.T.pagination}}
-							
-							{{if eq $k 6}}
-							{{else if eq $k 7}}
-							{{else if eq $k 8}}
-							{{else}}
-								<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}}
-							
-						{{end}}
-						</ul>
-					</div>
-					<!--页码信息结束-->
-				
-				{{else}}
-					<div class="alert alert-error "><div class="text-center" style="margin:20px auto;"><img src="{{Msg "seo" "cdn"}}/images/u20.png"><h4><span class="glyphicon biaojidizhi icon_default text-primary"></span>&nbsp;<strong class="text-muted">没有找到相关内容，换个关键词试试</strong></h4></div></div>
-				{{end}}
-			</div>
-			<!--列表详细信息结束-->	
-		</div>
-		<!--左边显示区结束-->
-		
-		<!--右边显示区开始-->
-		<div class="col-lg-3 hidden-sm hidden-md hidden-xs collg3_width">
-			<div class="borderB text-muted fontb frontS">推荐企业</div>
-			<div id="tjqy "><img style="width:100%;" class="qfw-p-margintop" src="{{Msg "seo" "cdn"}}/images/right_ad.png"></div>
-		</div>
-		<!--右边显示区结束-->
-	</div>
-	<!--中间内容结束-->
-</div>
-
-
-<script>
-var entsel = {{index .T.querymap "city"}}
-
-var btempwords={{.T.words}}
-var chf1= {{index .T.querymap "c_hfl"}};
-var czb= '{{index .T.querymap "c_zb"}}';
-var $chiancity= true,$listent=true;
-setNavbarActive(2);
-</script>
-<script src="/wxent/qfw-enterprise.js"></script>
-
-</body>
-</html>

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

@@ -154,7 +154,7 @@ function appointment(){
 		dataType: 'json', 
 		success:function(data){
 			if (data.status == "no"){	
-				loginModalShow(5);
+				loginModalShow("/front/appointlogin");
 			}else if (data.status == "yes"){		
 	            $(".after_submit").click();
 			}
@@ -173,7 +173,7 @@ $(document).ready(function(){
 			if(status == "CheckCodeId_error"){
 				alert("验证码输入有误！"); 
 		  	}else if (status == "no"){//未登录用户	
-				loginModalShow(5);
+				loginModalShow("/front/appointlogin");
 			}else if(status == "aly"){
 			    $('#appointmentModal').modal('hide');
 				alert("您不能预约自己公司发布的服务！");

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

@@ -254,7 +254,7 @@
 	<script>window._bd_share_config={"common":{"bdSnsKey":{},"bdText":"","bdMini":"2","bdPic":"http://test.qimingxing.info/upload/2015/10/27/2015102708191301041479.jpg","bdStyle":"0","bdSize":"16","onAfterClick":function(){$.post("/member/credit/inCreditAjx",{"param":"fx"},function(r){})}},"share":{}};with(document)0[(getElementsByTagName('head')[0]||body).appendChild(createElement('script')).src='http://bdimg.share.baidu.com/static/api/js/share.js?v=89860593.js?cdnversion='+~(-new Date()/36e5)];</script>
 	<script>
 		
-		loginBackType = -1;
+		compulsoryreRresh = true;
 		$(function(){
 			$(".m-title span").click(function(e){
 					node=$(e.target);

core/src/web/templates/yellowpage/config.json

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

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

@@ -1,19 +0,0 @@
-<html>
-<head>
-	<title>企明星----未收录</title>
-	{{include "/common/inc.html"}}
-	<body>
-	{{include "/common/errorhead.html"}}
-	<div class="container-fluid b-content">
-		<div class="row" style="margin:50px 0;">
-			<div class="col-lg-6 col-md-6 col-sm-6" style="text-align:right">
-			 <img src="{{Msg "seo" "cdn"}}/images/findnull.png" class="b-findnull"/>
-			</div>
-			<div class="col-lg-6 col-md-6 col-sm-6" style="padding-top: 70px;">
-				<div style="text-indent:20px;"><h4><strong class="text-muted">抱歉！企明星网站暂未收录该企业信息。</strong></h4></div>
-			</div>
-		</div>
-	</div>
-	{{include "/common/bottom.html"}}
-	</body>
-</html>

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

@@ -1,407 +0,0 @@
-<html>
-<head>
-<title>{{.T.res.EntName}}_企业信息_企明星</title>
-<meta name="msvalidate.01" content="D5F3ADC7EB4E65FFB8BF943AD56DD1F7" />
-{{include "/common/inc.html"}}
-<meta name="Keywords" content="{{.T.res.EntName}},{{.T.res.EntName}}地址,{{.T.res.EntName}}怎么样"/>
-<meta name="Description" content="{{.T.res.OpScope}}"/>
-<link href="{{Msg "seo" "cdn"}}/wxent/qfw-enterprise.css" rel="stylesheet">
-<script src="{{Msg "seo" "cdn"}}/js/geocoder.js"></script>
-<script type="text/javascript" src="http://api.map.baidu.com/getscript?v=2&ak=AFd8b176f363f23e6a23d516f4cfb742&services=&t=20150522093217"></script>  
-<script src="{{Msg "seo" "cdn"}}/js/jquery.cxselect.js"></script>
-<script src="{{Msg "seo" "cdn"}}/js/qfwtable.js"></script>
-
-</head>
-<body>
-<div class="hidden-xs">{{include "/common/head.html"}}</div>
-<div id="entinfobg">	
-<div class="a-content">
-	<!--标题-->
-	<div id="titleactionimgs" class="row qfw-row">
-		<div>
-		<h3>
-		{{if .T.res.EntName }}
-			{{.T.res.EntName}}
-			{{if .T.res.s_qq}}
-				<script type="text/javascript">
-				    var online = new Array();
-				</script>
-				<script type= "text/javascript" src="http://webpresence.qq.com/getonline?Type=1&{{.T.res.s_qq}}:"></script>
-				<script type="text/javascript">
-					var imgSrc = "";
-			        if(online[0] == 1) {
-						imgSrc = "{{Msg "seo" "cdn"}}/images/qq_online.gif";
-			        }else{
-						imgSrc = "{{Msg "seo" "cdn"}}/images/qq_offline.gif";
-					}
-					document.write('<a target="_blank" href="http://wpa.qq.com/msgrd?v=3&uin={{.T.res.s_qq}}&site=qq&menu=yes"><img src="'+imgSrc+'" alt="点击这里给我发消息" title="点击这里给我发消息" border="0" /></a>');
-				</script>
-			{{end}}
-			{{if .T.res.s_microwebsite}}<span class="microwebsite visible-xs-inline"><i class="glyphicon weiguanwang"></i><a onclick="var _id = {{.T.res._id}};window.location.href='/ent/wsite/preview/'+_id">微官网</a></span>{{end}}
-		{{end}}
-		</h3>		
-		<!--企业认证图标--> 
-		{{if .T.res.EntName }}
-			{{if .T.res.s_action}}
-				{{$identaction:=.T.res.s_action}}		
-				{{if eq $identaction "01"}}
-					<span class="glyphicon qyrz   margin-l-10 jhtb"></span> <span class="identactionType">已认证企业　</span> 
-						{{ if .T.res.i_comauthenttype }}
-								{{ if eq .T.res.i_comauthenttype 2}}
-									<span class="glyphicon mprz   margin-r-10 jhtbtype"></span><span class=" " ><small style="color:#dd4814;margin-right:5px;">名片认证</small></span>					
-								{{else if eq .T.res.i_comauthenttype 1}}
-									<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class=" " ><small style="color:#dd4814;margin-left:3px;margin-right:5px;">营业执照认证</small></span>
-								{{else if eq .T.res.i_comauthenttype 3}}
-									<span class="glyphicon yjrz   margin-r-10 jhtbtype"></span><span class=" " ><small style="color:#dd4814;margin-right:5px;">年报邮箱认证</small></span>
-								{{end}}
-						{{else}}
-								<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class=" " ><small style="color:#dd4814;margin-left:3px;margin-right:5px;">营业执照认证</small></span>
-						{{end}}
-				{{else if eq $identaction "02"}}
-					<span class="glyphicon grrz   margin-l-10 jhtb"></span> <span class="identactionType">已认证个人</span>
-				{{else if eq $identaction "03"}}
-					<span class="glyphicon jgrz   margin-l-10 jhtb"></span> <span class="identactionType">已认证机构</span>
-				{{end}}
-			{{end}}
-		{{end}}
-		</div>
-	</div>
-	
-	<!--企业名片-->
-	{{if .T.res.s_persion}}	
-	<div class="row qfw-row qfw-p-margintop">
-		<div class="col-lg-12 border" id="our">
-			<div class="qfw-entinfo-padding41">
-				<h4><span class="glyphicon lianxiwomen icon_gray icon_large"></span>
-				<b>{{if .T.res.s_action}}  {{if eq .T.res.s_action "02"}}商家名片{{else if eq .T.res.s_action "01"}}企业名片{{else if eq .T.res.s_action "03"}}机构名片{{end}}{{end}}</b></h4>
-				<hr>
-				<!--企业名片详细信息-->				
-				{{if .T.res.s_persion }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon lianxiren icon_gray"></span></div> 
-						<div class="two" style="letter-spacing: 5px;">联系人：</div> 
-						<div class="three"><span class="span999">{{.T.res.s_persion}}</span></div>
-					</div> 
-				</div>
-				{{end}}
-				{{if .T.res.s_mobile }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon lianxidianhua icon_gray"></span></div> 
-						<div class="two">联系电话：</div> 
-						<div class="three"><span class="span999">{{.T.res.s_mobile}}</span></div>
-					</div> 
-				</div>
-				{{end}}
-				{{if .T.res.s_enturl }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon wangzhi icon_gray"></span></div> 
-						<div class="two">
-						{{if .T.res.s_action}}
-							{{if eq .T.res.s_action "01"}}
-								企业网站：
-							{{else if eq .T.res.s_action "02"}}
-								商家网站：
-							{{else if eq .T.res.s_action "03"}}
-								机构网站：
-							{{else}}
-							企业网站：
-							{{end}}
-						{{else}}
-						企业网站：
-						{{end}}
-						</div> 
-						<div class="three"><span class="span999">{{.T.res.s_enturl}}</span></div>
-					</div> 
-				</div>
-				{{end}}
-				{{if .T.res.s_qq }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon qq icon_gray"></span></div> 
-						<div class="two">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Q&nbsp;Q：</div> 
-						<div class="three"><span class="span999">{{.T.res.s_qq}}</span></div>
-					</div> 
-				</div>
-				{{end}}
-				{{if .T.res.s_weixin }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon weixinhao icon_gray"></span></div> 
-						<div class="two" style="letter-spacing: 5px;">微信号：</div> 
-						<div class="three"><span class="span999">{{.T.res.s_weixin}}</span>
-						{{if .T.res.s_qrcode}}
-						&nbsp;&nbsp;&nbsp;&nbsp;<a href="#" class="text-primary " onClick="viewBarCode({{.T.res.s_qrcode}});">扫一扫</a>
-						{{end}}
-						</div>
-					</div> 
-				</div>
-				{{end}}
-				{{if or .T.res.i_province .T.res.i_city .T.res.i_area .T.res.s_address  }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon lianxidizhi icon_gray"></span></div> 
-						<div class="two">联系地址：</div> 
-						<div class="three">
-							<span class="span999" id="city_china">
-								<select  class="province cxselect select" id="provincesel" name="province" data-first-title="全国"></select>								
-								<select class="city cxselect select" id="citysel" name="city" data-first-title="选择市"></select>
-								<select class="area cxselect select" id="areasel" name="area" data-first-title="选择县"></select>
-							</span>
-							
-							<input id="location"  type="hidden">
-							<input id="cityname"  type="hidden">
-							{{if .T.res.s_address}}
-							<span class="glyphicon biaojidizhi icon_default text-primary" ></span> 	
-							<a href = "javascript:void(0)" onclick = "document.getElementById('mapshowdiv').style.display='block';document.getElementById('closeshowmap').style.display='block';document.getElementById('fade').style.display='block';">查看详细地图</a>
-							{{end}}
-						</div>
-					</div> 
-				</div>
-				{{end}}
-				{{if .T.res.s_synopsis}}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one" style="vertical-align: top;"><span class="glyphicon falvshengming icon_gray"></span> </div> 
-						<div class="two" style="vertical-align: top;">
-						{{if .T.res.s_action}}
-							{{if eq .T.res.s_action "01"}}
-								企业介绍：
-							{{else if eq .T.res.s_action "02"}}
-								商家介绍：
-							{{else if eq .T.res.s_action "03"}}
-								机构介绍：
-							{{else}}
-							企业介绍：
-							{{end}}
-						{{else}}
-						企业介绍：
-						{{end}}
-						</div> 
-						<div class="three">{{.T.res.s_synopsis}}</div>
-					</div> 
-				</div>
-				{{end}}
-				
-				
-			</div>
-		</div>
-	</div>	
-	<!--显示地图信息-->
-	<div id="mapshowdiv" class="white_content"></div>
-	<a href = "javascript:void(0)" onclick = "document.getElementById('mapshowdiv').style.display='none';document.getElementById('closeshowmap').style.display='none';document.getElementById('fade').style.display='none';"><div id="closeshowmap" class="closeshowmap">X</div></a>
-	<div id="fade" class="black_overlay"></div> 	
-	{{end}}	
-	
-	<!--产品服务-->	
-	<div class="row qfw-row qfw-p-margintop " style="display:none;" id="service">
-		<div class="col-lg-12 border" >
-			<div class="qfw-entinfo-padding41">
-				<h4><span class="glyphicon fuwu icon_gray icon_large"></span>
-				<b>产品服务</b></h4>
-				<hr>
-				<div class="service_list" id="service_list">
-					<table style="width:100%;" class="text-muted mt"><tbody></tbody></table>
-					<div class="text-muted mt">该公司暂未发布服务信息</div>
-				</div>
-				<div class="op1 text-center" id="loadMore" onClick="loadMore()" >加载更多</div>
-			</div>
-		</div>
-	</div>
-	<!--公示信息-->
-	<div class="row qfw-row qfw-p-margintop" id="gs">
-		<div class="col-lg-12 border" >
-			<div class="qfw-entinfo-padding41">
-				<h4><span class="glyphicon gongshixinxi icon_gray icon_large"></span>
-				<b>公示信息</b>&nbsp{{if .T.res.gs }}<font id="qggs" style="font-size:12px;"><small>(来源：<a href="http://gsxt.saic.gov.cn/" rel="nofollow" style="text-decoration: underline;color: #0099FF;">全国企业信用信息公示系统</a>)</small></font>{{end}}</h4>
-				<hr>
-				{{if .T.res.gs }}
-				{{if .T.res.RegNo }}
-				    <div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon zhucehao icon_gray"></span></div> 
-							<div class="two">注册号：<span class="span999">{{.T.res.RegNo}}</span></div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.EntTypeName }}
-				  	<div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon qiyeleixing icon_gray"></span></div> 
-							<div class="two">类型： <span class="span999">{{.T.res.EntTypeName}}</span> </div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.LeRep }}
-				    <div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon faren icon_gray"></span></div> 
-							<div class="two">{{.T.res.EntTypeLabel}}：<span class="span999">{{.T.res.LeRep}}</span> </div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.RegCap }}
-					{{if and (ne .T.res.EntType "9600") (ne .T.res.EntType "5810")}}
-					 <div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon zican icon_gray"></span></div> 
-							<div class="two">注册资本：<span class="span999"><script>var d1={{.T.res.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> 万元</span></div> 
-						</div> 
-					</div>
-				    {{end}}
-				{{end}}
-				{{if .T.res.EstDate }}
-				  	<div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon riqi icon_gray"></span></div> 
-							<div class="two">成立日期：<span class="span999">{{.T.res.EstDate}}</span></div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.Dom }}
-				  	<div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon zhusuo icon_gray"></span></div> 
-							<div class="two">住所： <span class="span999">{{.T.res.Dom}} </span></div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.OpStateName }}
-				 	<div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon dengjizhuangtai icon_gray"></span></div> 
-							<div class="two">登记状态：<span class="span999">{{.T.res.OpStateName}}</span></div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.OpFrom }}
-					<div class="tablediv"> 
-					    <div class="rowcontent"> 
-					        <div class="one"><span class="glyphicon riqi icon_gray"></span></div> 
-					        <div class="two">营业期限：<span class="span999">自{{.T.res.OpFrom}}
-							{{if .T.res.OpTo }}至{{.T.res.OpTo }}{{end}}</span></div> 
-					    </div> 
-			       </div>
-				{{end}}
-				{{if .T.res.OpScope }}
-				   <div class="tablediv"> 
-					    <div class="rowcontent"> 
-					        <div class="one"><span class="glyphicon jingyingfanwei icon_gray"></span></div> 
-					        <div class="two">经营范围：<span class="span999">{{.T.res.OpScope}}</span></div> 
-					    </div> 
-			       </div>
-				{{end}}
-				{{if .T.res.RegOrgName }}
-					<div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon dengjijiguan icon_gray"></span></div> 
-							<div class="two">登记机关：<span class="span999">{{.T.res.RegOrgName}}</span> </div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.IssBLicDate }}
-					<div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon riqi icon_gray"></span></div> 
-							<div class="two">核准日期：<span class="span999">{{.T.res.IssBLicDate}} </span> </div> 
-						</div> 
-					</div>
-			 	{{end}}				
-				{{end}}
-			</div>
-		</div>
-	</div>	
-	<!--关系网-->
-	<div class="row qfw-row qfw-p-margintop">
-			<div class="col-lg-12 border" >
-			<div class="qfw-entinfo-padding41">
-				<h4><span class="glyphicon guanxiwang icon_gray icon_large"></span>
-				<b>关系网</b></h4>
-				<hr>
-				<div class="text-primary text-center" id="gxlogin">
-					<span class="text-muted">扫码登录认证后，即可查看企业股东信息，投资关系，公司关系脉络图等内容<br><a  href="javascript:void(0)" class="btn btn-primary login a-com-login margin-t-10">扫码登录</a></span><br>
-				</div>
-			</div>
-		</div>
-	
-	</div>
-</div>
-</div>
-
-
-
-<!--弹出窗口显示上传的图片-->
-<div class="modal fade" id="myModal" tabindex="-1" role="dialog" 
-   aria-labelledby="myModalLabel" aria-hidden="true">
-   <div class="modal-dialog mimg">
-        <div class="modal-content" style="width:400px;">
-         <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" style="margin-top: -10px;"
-               aria-hidden="true">×
-            </button>
-         </div>
-         <div class="modal-body" id="viewImgs" onclick="hideImgs()" style="cursor:pointer;text-align: center;" >
-            
-         </div>
-      </div><!-- /.modal-content -->
-   </div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
-
-<!--右侧导航菜单-->
-{{include "/common/rightnavbtn.html"}}
-<!--右侧导航菜单-->
-</body>
-<script type="text/javascript">
-$(function(){
-	$("#gxlogin .a-com-login").click(function(){
-		loginModalShow();
-	});
-	setNavbarActive(2);
-});
-
-
-var entsel="",btempwords,chf1,czb;
-
-//企业信息ID
- var id = {{.T.res._id}}
-//公式信息的变量
-var $gs = {{.T.res.gs}};
-var $relationlen=0
-//服务模板
-var template_content = "<tr><td><div class='row service_row'> "
-+"<div class='col-sm-1'><div style='width:120px; height:120px; background-color:#eee;'><img class='hidden-xs' src='${s_images}' style='width:120px;height:120px'></div></div>"
-+" <div class='col-sm-9'>"
-+"<div class='linebser service_des'><div class='servicename text-primary'><a class='text-primary' target='_blank' onclick='clickservicename(\"${_id}\",\"${s_isshow}\")'>${s_name}</a></div><div class='text-muted'>${s_introduction}</div></div>"
-+"</div></td><tr>"
-
-//注册号
-var regno="{{.T.res.RegNo}}";
-
-var legcerno = "{{.T.res.LegCerNO}}";
-var lerep="{{.T.res.LeRep}}";
-//联系地址
-var province = {{.T.res.i_province}};
-var city = {{.T.res.i_city}};
-var area = {{.T.res.i_area}};
-var as1="{{.T.res.s_address}}";
-var $chiancity= false,$listent=false;
-{{if or .T.res.i_province .T.res.i_city .T.res.i_area .T.res.s_address  }}
-	$chiancity= true;
-{{end}}
-
-var $resdata = {{.T.res.data}};
-var $entid = {{.T.res._id}};
-//定义默认的郑州经纬度
-var ptlat=113.69884285509,  ptlng=34.791342526551;
-
-//调用回调函数重新加载页面
-function publicCallBack(){
-	//location.reload();
-	window.location.href="/wx/enterprise/"+$entid+".html"
-}
-</script>
-<script src="/wxent/qfw-frontenterprise.js"></script>
-
-</html>

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

@@ -1,402 +0,0 @@
-<html>
-<head>
-<title>{{.T.res.EntName}}_企业信息_企明星</title>
-<meta name="msvalidate.01" content="D5F3ADC7EB4E65FFB8BF943AD56DD1F7" />
-{{include "/common/inc.html"}}
-<meta name="Keywords" content="{{.T.res.EntName}},{{.T.res.EntName}}地址,{{.T.res.EntName}}怎么样"/>
-<meta name="Description" content="{{.T.res.OpScope}}"/>
-<link href="{{Msg "seo" "cdn"}}/wxent/qfw-enterprise.css" rel="stylesheet">
-<script src="{{Msg "seo" "cdn"}}/js/geocoder.js"></script>
-<script type="text/javascript" src="http://api.map.baidu.com/getscript?v=2&ak=AFd8b176f363f23e6a23d516f4cfb742&services=&t=20150522093217"></script>  
-<script src="{{Msg "seo" "cdn"}}/js/jquery.cxselect.js"></script>
-<script src="{{Msg "seo" "cdn"}}/js/qfwtable.js"></script>
-
-</head>
-<body>
-<div class="hidden-xs">{{include "/common/head.html"}}</div>
-<div id="entinfobg">	
-<div class="a-content">
-	<!--标题-->
-	<div id="titleactionimgs" class="row qfw-row">
-		<div>
-		<h3>
-		{{if .T.res.EntName }}
-			{{.T.res.EntName}}
-			{{if .T.res.s_qq}}
-				<script type="text/javascript">
-				    var online = new Array();
-				</script>
-				<script type= "text/javascript" src="http://webpresence.qq.com/getonline?Type=1&{{.T.res.s_qq}}:"></script>
-				<script type="text/javascript">
-					var imgSrc = "";
-			        if(online[0] == 1) {
-						imgSrc = "{{Msg "seo" "cdn"}}/images/qq_online.gif";
-			        }else{
-						imgSrc = "{{Msg "seo" "cdn"}}/images/qq_offline.gif";
-					}
-					document.write('<a target="_blank" href="http://wpa.qq.com/msgrd?v=3&uin={{.T.res.s_qq}}&site=qq&menu=yes"><img src="'+imgSrc+'" alt="点击这里给我发消息" title="点击这里给我发消息" border="0" /></a>');
-				</script>
-			{{end}}			
-			{{if .T.res.s_microwebsite}}<span class="microwebsite visible-xs-inline"><i class="glyphicon weiguanwang"></i><a onclick="var _id = {{.T.res._id}};window.location.href='/ent/wsite/preview/'+_id">微官网</a></span>{{end}}
-		{{end}}
-		</h3>		
-		<!--企业认证图标--> 
-		{{if .T.res.EntName }}
-			{{if .T.res.s_action}}
-				{{$identaction:=.T.res.s_action}}		
-				{{if eq $identaction "01"}}
-					<span class="glyphicon qyrz   margin-l-10 jhtb"></span> <span class="identactionType">已认证企业</span>
-						{{ if .T.res.i_comauthenttype }}
-								{{ if eq .T.res.i_comauthenttype 2}}
-									<span class="glyphicon mprz   margin-r-10 jhtbtype"></span><span class=" " ><small style="color:#dd4814;margin-right:5px;">名片认证</small></span>					
-								{{else if eq .T.res.i_comauthenttype 1}}
-									<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class=" " ><small style="color:#dd4814;margin-left:3px;margin-right:5px;">营业执照认证</small></span>
-								{{else if eq .T.res.i_comauthenttype 3}}
-									<span class="glyphicon yjrz   margin-r-10 jhtbtype"></span><span class=" " ><small style="color:#dd4814;margin-right:5px;">年报邮箱认证</small></span>
-								{{end}}
-						{{else}}
-								<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class=" " ><small style="color:#dd4814;margin-left:3px;margin-right:5px;">营业执照认证</small></span>
-						{{end}}
-				{{else if eq $identaction "02"}}
-					<span class="glyphicon grrz   margin-l-10 jhtb"></span> <span class="identactionType">已认证个人</span>
-				{{else if eq $identaction "03"}}
-					<span class="glyphicon jgrz   margin-l-10 jhtb"></span> <span class="identactionType">已认证机构</span>
-				{{end}}
-			{{end}}
-		{{end}}
-		</div>
-	</div>
-	
-	<!--企业名片-->
-	{{if .T.res.s_persion}}	
-	<div class="row qfw-row qfw-p-margintop">
-		<div class="col-lg-12 border" id="our">
-			<div class="qfw-entinfo-padding41">
-				<h4><span class="glyphicon lianxiwomen icon_gray icon_large"></span>
-				<b>{{if .T.res.s_action}}  {{if eq .T.res.s_action "02"}}商家名片{{else if eq .T.res.s_action "01"}}企业名片{{else if eq .T.res.s_action "03"}}机构名片{{end}}{{end}}</b></h4>
-				<hr>
-				<!--企业名片详细信息-->				
-				{{if .T.res.s_persion }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon lianxiren icon_gray"></span></div> 
-						<div class="two" style="letter-spacing: 5px;">联系人：</div> 
-						<div class="three"><span class="span999">{{.T.res.s_persion}}</span></div>
-					</div> 
-				</div>
-				{{end}}
-				{{if .T.res.s_mobile }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon lianxidianhua icon_gray"></span></div> 
-						<div class="two">联系电话：</div> 
-						<div class="three"><span class="span999">{{.T.res.s_mobile}}</span></div>
-					</div> 
-				</div>
-				{{end}}
-				{{if .T.res.s_enturl }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon wangzhi icon_gray"></span></div> 
-						<div class="two">
-						{{if .T.res.s_action}}
-							{{if eq .T.res.s_action "01"}}
-								企业网站：
-							{{else if eq .T.res.s_action "02"}}
-								商家网站：
-							{{else if eq .T.res.s_action "03"}}
-								机构网站：
-							{{else}}
-							企业网站：
-							{{end}}
-						{{else}}
-						企业网站：
-						{{end}}
-						</div> 
-						<div class="three"><span class="span999">{{.T.res.s_enturl}}</span></div>
-					</div> 
-				</div>
-				{{end}}
-				{{if .T.res.s_qq }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon qq icon_gray"></span></div> 
-						<div class="two">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Q&nbsp;Q：</div> 
-						<div class="three"><span class="span999">{{.T.res.s_qq}}</span></div>
-					</div> 
-				</div>
-				{{end}}
-				{{if .T.res.s_weixin }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon weixinhao icon_gray"></span></div> 
-						<div class="two" style="letter-spacing: 5px;">微信号：</div> 
-						<div class="three"><span class="span999">{{.T.res.s_weixin}}</span>
-						{{if .T.res.s_qrcode}}
-						&nbsp;&nbsp;&nbsp;&nbsp;<a href="#" class="text-primary " onClick="viewBarCode({{.T.res.s_qrcode}});">扫一扫</a>
-						{{end}}
-						</div>
-					</div> 
-				</div>
-				{{end}}
-				{{if or .T.res.i_province .T.res.i_city .T.res.i_area .T.res.s_address  }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon lianxidizhi icon_gray"></span></div> 
-						<div class="two">联系地址：</div> 
-						<div class="three">
-							<span class="span999" id="city_china">
-								<select  class="province cxselect select" id="provincesel" name="province" data-first-title="全国"></select>								
-								<select class="city cxselect select" id="citysel" name="city" data-first-title="选择市"></select>
-								<select class="area cxselect select" id="areasel" name="area" data-first-title="选择县"></select>
-							</span>
-							
-							<input id="location"  type="hidden">
-							<input id="cityname"  type="hidden">
-							{{if .T.res.s_address}}
-							<span class="glyphicon biaojidizhi icon_default text-primary" ></span> 	
-							<a href = "javascript:void(0)" onclick = "document.getElementById('mapshowdiv').style.display='block';document.getElementById('closeshowmap').style.display='block';document.getElementById('fade').style.display='block';">查看详细地图</a>
-							{{end}}
-						</div>
-					</div> 
-				</div>
-				{{end}}
-				{{if .T.res.s_synopsis}}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one" style="vertical-align: top;"><span class="glyphicon falvshengming icon_gray"></span> </div> 
-						<div class="two" style="vertical-align: top;">
-						{{if .T.res.s_action}}
-							{{if eq .T.res.s_action "01"}}
-								企业介绍：
-							{{else if eq .T.res.s_action "02"}}
-								商家介绍：
-							{{else if eq .T.res.s_action "03"}}
-								机构介绍：
-							{{else}}
-							企业介绍：
-							{{end}}
-						{{else}}
-						企业介绍：
-						{{end}}
-						</div> 
-						<div class="three">{{.T.res.s_synopsis}}</div>
-					</div> 
-				</div>
-				{{end}}
-				
-				
-			</div>
-		</div>
-	</div>	
-	<!--显示地图信息-->
-	<div id="mapshowdiv" class="white_content"></div>
-	<a href = "javascript:void(0)" onclick = "document.getElementById('mapshowdiv').style.display='none';document.getElementById('closeshowmap').style.display='none';document.getElementById('fade').style.display='none';"><div id="closeshowmap" class="closeshowmap">X</div></a>
-	<div id="fade" class="black_overlay"></div> 	
-	{{end}}	
-	
-	<!--产品服务-->	
-	<div class="row qfw-row qfw-p-margintop " style="display:none;" id="service">
-		<div class="col-lg-12 border" >
-			<div class="qfw-entinfo-padding41">
-				<h4><span class="glyphicon fuwu icon_gray icon_large"></span>
-				<b>产品服务</b></h4>
-				<hr>
-				<div class="service_list" id="service_list">
-					<table style="width:100%;" class="text-muted mt"><tbody></tbody></table>
-					<div class="text-muted mt">该公司暂未发布服务信息</div>
-				</div>
-				<div class="op1 text-center" id="loadMore" onClick="loadMore()" >加载更多</div>
-			</div>
-		</div>
-	</div>
-	<!--公示信息-->
-	<div class="row qfw-row qfw-p-margintop" id="gs">
-		<div class="col-lg-12 border" >
-			<div class="qfw-entinfo-padding41">
-				<h4><span class="glyphicon gongshixinxi icon_gray icon_large"></span>
-				<b>公示信息</b>&nbsp{{if .T.res.gs }}<font id="qggs" style="font-size:12px;"><small>(来源：<a href="http://gsxt.saic.gov.cn/"  rel="nofollow" style="text-decoration: underline;color: #0099FF;">全国企业信用信息公示系统</a>)</small></font>{{end}}</h4>
-				<hr>
-				{{if .T.res.gs }}
-				{{if .T.res.RegNo }}
-				    <div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon zhucehao icon_gray"></span></div> 
-							<div class="two">注册号：<span class="span999">{{.T.res.RegNo}}</span></div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.EntTypeName }}
-				  	<div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon qiyeleixing icon_gray"></span></div> 
-							<div class="two">类型： <span class="span999">{{.T.res.EntTypeName}}</span> </div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.LeRep }}
-				    <div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon faren icon_gray"></span></div> 
-							<div class="two">{{.T.res.EntTypeLabel}}：<span class="span999">{{.T.res.LeRep}}</span> </div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.RegCap }}
-					{{if and (ne .T.res.EntType "9600") (ne .T.res.EntType "5810")}}
-					 <div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon zican icon_gray"></span></div> 
-							<div class="two">注册资本：<span class="span999"><script>var d1={{.T.res.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> 万元</span></div> 
-						</div> 
-					</div>
-				    {{end}}
-				{{end}}
-				{{if .T.res.EstDate }}
-				  	<div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon riqi icon_gray"></span></div> 
-							<div class="two">成立日期：<span class="span999">{{.T.res.EstDate}}</span></div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.Dom }}
-				  	<div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon zhusuo icon_gray"></span></div> 
-							<div class="two">住所： <span class="span999">{{.T.res.Dom}} </span></div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.OpStateName }}
-				 	<div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon dengjizhuangtai icon_gray"></span></div> 
-							<div class="two">登记状态：<span class="span999">{{.T.res.OpStateName}}</span></div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.OpFrom }}
-					<div class="tablediv"> 
-					    <div class="rowcontent"> 
-					        <div class="one"><span class="glyphicon riqi icon_gray"></span></div> 
-					        <div class="two">营业期限：<span class="span999">自{{.T.res.OpFrom}}
-							{{if .T.res.OpTo }}至{{.T.res.OpTo }}{{end}}</span></div> 
-					    </div> 
-			       </div>
-				{{end}}
-				{{if .T.res.OpScope }}
-				   <div class="tablediv"> 
-					    <div class="rowcontent"> 
-					        <div class="one"><span class="glyphicon jingyingfanwei icon_gray"></span></div> 
-					        <div class="two">经营范围：<span class="span999">{{.T.res.OpScope}}</span></div> 
-					    </div> 
-			       </div>
-				{{end}}
-				{{if .T.res.RegOrgName }}
-					<div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon dengjijiguan icon_gray"></span></div> 
-							<div class="two">登记机关：<span class="span999">{{.T.res.RegOrgName}}</span> </div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.IssBLicDate }}
-					<div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon riqi icon_gray"></span></div> 
-							<div class="two">核准日期：<span class="span999">{{.T.res.IssBLicDate}} </span> </div> 
-						</div> 
-					</div>
-			 	{{end}}				
-				{{end}}
-			</div>
-		</div>
-	</div>	
-	<!--关系网-->
-	<div class="row qfw-row qfw-p-margintop">
-			<div class="col-lg-12 border" >
-			<div class="qfw-entinfo-padding41">
-				<h4><span class="glyphicon guanxiwang icon_gray icon_large"></span>
-				<b>关系网</b></h4>
-				<hr>
-				<div class="text-primary text-center" id="gxlogin">
-					<span class="text-muted">认证后即可查看企业股东信息，投资关系，公司关系脉络图等内容<br><a  href="javascript:void(0)" class="btn btn-primary login a-com-login margin-t-10">认证</a></span>
-				</div>
-			</div>
-		</div>
-	
-	</div>
-</div>
-</div>
-
-
-
-<!--弹出窗口显示上传的图片-->
-<div class="modal fade" id="myModal" tabindex="-1" role="dialog" 
-   aria-labelledby="myModalLabel" aria-hidden="true">
-   <div class="modal-dialog mimg">
-        <div class="modal-content" style="width:400px;">
-         <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" style="margin-top: -10px;"
-               aria-hidden="true">×
-            </button>
-         </div>
-         <div class="modal-body" id="viewImgs" onclick="hideImgs()" style="cursor:pointer;text-align: center;" >
-            
-         </div>
-      </div><!-- /.modal-content -->
-   </div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
-
-<!--右侧导航菜单-->
-{{include "/common/rightnavbtn.html"}}
-<!--右侧导航菜单-->
-
-</body>
-<script type="text/javascript">
-$(function(){
-	$("#gxlogin .a-com-login").click(function(){
-		window.location.href="/member/accountset/index";
-	});
-	setNavbarActive(2);
-});
-
-
-var entsel="",btempwords,chf1,czb;
-
-//企业信息ID
- var id = {{.T.res._id}}
-//公式信息的变量
-var $gs = {{.T.res.gs}};
-var $relationlen=0
-//服务模板
-var template_content = "<tr><td><div class='row service_row'> "
-+"<div class='col-sm-1'><div style='width:120px; height:120px; background-color:#eee;'><img class='hidden-xs' src='${s_images}' style='width:120px;height:120px'></div></div>"
-+" <div class='col-sm-9'>"
-+"<div class='linebser service_des'><div class='servicename text-primary'><a class='text-primary' target='_blank' onclick='clickservicename(\"${_id}\",\"${s_isshow}\")'>${s_name}</a></div><div class='text-muted'>${s_introduction}</div></div>"
-+"</div></td><tr>"
-
-//注册号
-var regno="{{.T.res.RegNo}}";
-
-var legcerno = "{{.T.res.LegCerNO}}";
-var lerep="{{.T.res.LeRep}}";
-//联系地址
-var province = {{.T.res.i_province}};
-var city = {{.T.res.i_city}};
-var area = {{.T.res.i_area}};
-var as1="{{.T.res.s_address}}";
-var $chiancity= false,$listent=false;
-{{if or .T.res.i_province .T.res.i_city .T.res.i_area .T.res.s_address  }}
-	$chiancity= true;
-{{end}}
-
-var $resdata = {{.T.res.data}};
-var $entid = {{.T.res._id}};
-//定义默认的郑州经纬度
-var ptlat=113.69884285509,  ptlng=34.791342526551;
-</script>
-<script src="/wxent/qfw-frontenterprise.js"></script>
-
-</html>

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

@@ -1,391 +0,0 @@
-<html>
-<head>
-<title>{{.T.res.EntName}}_企业信息_企明星</title>
-<meta name="msvalidate.01" content="D5F3ADC7EB4E65FFB8BF943AD56DD1F7" />
-{{include "/common/inc.html"}}
-<meta name="Keywords" content="{{.T.res.EntName}},{{.T.res.EntName}}地址,{{.T.res.EntName}}怎么样"/>
-<meta name="Description" content="{{.T.res.OpScope}}"/>
-<link href="/wxent/qfw-enterprise.css" rel="stylesheet">
-<script src="{{Msg "seo" "cdn"}}/js/geocoder.js"></script>
-<script type="text/javascript" src="http://api.map.baidu.com/getscript?v=2&ak=AFd8b176f363f23e6a23d516f4cfb742&services=&t=20150522093217"></script>  
-<script src="{{Msg "seo" "cdn"}}/js/jquery.cxselect.js"></script>
-{{if .T.res.relation}}
-<script src="{{Msg "seo" "cdn"}}/js/d3.v3.min.js"></script>
-<script src="{{Msg "seo" "cdn"}}/js/geometry.js"></script>
-<script src="{{Msg "seo" "cdn"}}/js/qfwtable.js"></script>
-{{end}}
-<script>
-var entType="企业"
-</script>
-</head>
-<body>
-<div class="hidden-xs">{{include "/common/head.html"}}</div>
-<div id="entinfobg">	
-<div class="a-content">
-	<!--标题-->
-	<div id="titleactionimgs" class="row qfw-row">
-		<div>
-		<h3>
-		{{if .T.res.EntName }}
-			{{.T.res.EntName}}
-			{{if .T.res.s_qq}}
-				<script type="text/javascript">
-				    var online = new Array();
-				</script>
-				<script type= "text/javascript" src="http://webpresence.qq.com/getonline?Type=1&{{.T.res.s_qq}}:"></script>
-				<script type="text/javascript">
-					var imgSrc = "";
-			        if(online[0] == 1) {
-						imgSrc = "{{Msg "seo" "cdn"}}/images/qq_online.gif";
-			        }else{
-						imgSrc = "{{Msg "seo" "cdn"}}/images/qq_offline.gif";
-					}
-					document.write('<a target="_blank" href="http://wpa.qq.com/msgrd?v=3&uin={{.T.res.s_qq}}&site=qq&menu=yes"><img src="'+imgSrc+'" alt="点击这里给我发消息" title="点击这里给我发消息" border="0" /></a>');
-				</script>
-			{{end}}
-			{{if .T.res.s_microwebsite}}<span class="microwebsite visible-xs-inline"><i class="glyphicon weiguanwang"></i><a onclick="var _id = {{.T.res._id}};window.location.href='/ent/wsite/preview/'+_id">微官网</a></span>{{end}}
-		{{end}}
-		</h3>
-		<!--企业认证图标--> 
-		<!--企业认证图标--> 
-		{{if .T.res.EntName }}
-			{{if .T.res.s_action}}
-				{{$identaction:=.T.res.s_action}}		
-				{{if eq $identaction "01"}}
-				<script>entType="企业"</script>
-					<span class="glyphicon qyrz   margin-l-10 jhtb"></span> <span class="identactionType">已认证企业　</span> 
-						{{ if .T.res.i_comauthenttype }}
-								{{ if eq .T.res.i_comauthenttype 2}}
-									<span class="glyphicon mprz   margin-r-10 jhtbtype"></span><span class=" " ><small style="color:#dd4814;margin-right:5px;">名片认证</small></span>					
-								{{else if eq .T.res.i_comauthenttype 1}}
-									<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class=" " ><small style="color:#dd4814;margin-left:3px;margin-right:5px;">营业执照认证</small></span>
-								{{else if eq .T.res.i_comauthenttype 3}}
-									<span class="glyphicon yjrz   margin-r-10 jhtbtype"></span><span class=" " ><small style="color:#dd4814;margin-right:5px;">年报邮箱认证</small></span>
-								{{end}}
-						{{else}}
-								<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class=" " ><small style="color:#dd4814;margin-left:3px;margin-right:5px;">营业执照认证</small></span>
-						{{end}}
-				{{else if eq $identaction "02"}}
-				<script>entType="商家"</script>
-					<span class="glyphicon grrz   margin-l-10 jhtb"></span> <span class="identactionType">已认证个人</span>
-				{{else if eq $identaction "03"}}
-				<script>entType="机构"</script>
-					<span class="glyphicon jgrz   margin-l-10 jhtb"></span> <span class="identactionType">已认证机构</span>
-				{{end}}
-			{{end}}
-		{{end}}
-		</div>
-	</div>
-	
-	<!--企业名片-->
-	{{if .T.res.s_persion}}	
-	<div class="row qfw-row qfw-p-margintop">
-		<div class="col-lg-12 border" id="our">
-			<div class="qfw-entinfo-padding41">
-				<h4><span class="glyphicon lianxiwomen icon_gray icon_large"></span>
-				<b><script>document.write(entType)</script>名片</b></h4>
-				<hr>
-				<!--企业名片详细信息-->				
-				{{if .T.res.s_persion }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon lianxiren icon_gray"></span></div> 
-						<div class="two" style="letter-spacing: 5px;">联系人：</div> 
-						<div class="three"><span class="span999">{{.T.res.s_persion}}</span></div>
-					</div> 
-				</div>
-				{{end}}
-				{{if .T.res.s_mobile }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon lianxidianhua icon_gray"></span></div> 
-						<div class="two">联系电话：</div> 
-						<div class="three"><span class="span999">{{.T.res.s_mobile}}</span></div>
-					</div> 
-				</div>
-				{{end}}
-				{{if .T.res.s_enturl }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon wangzhi icon_gray"></span></div> 
-						<div class="two"><script>document.write(entType)</script>网站：</div> 
-						<div class="three"><span class="span999">{{.T.res.s_enturl}}</span></div>
-					</div> 
-				</div>
-				{{end}}
-				{{if .T.res.s_qq }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon qq icon_gray"></span></div> 
-						<div class="two">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Q&nbsp;Q：</div> 
-						<div class="three"><span class="span999">{{.T.res.s_qq}}</span></div>
-					</div> 
-				</div>
-				{{end}}
-				{{if .T.res.s_weixin }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon weixinhao icon_gray"></span></div> 
-						<div class="two" style="letter-spacing: 5px;">微信号：</div> 
-						<div class="three"><span class="span999">{{.T.res.s_weixin}}</span>
-						{{if .T.res.s_qrcode}}
-						&nbsp;&nbsp;&nbsp;&nbsp;<a href="#" class="text-primary " onClick="viewBarCode({{.T.res.s_qrcode}});">扫一扫</a>
-						{{end}}
-						</div>
-					</div> 
-				</div>
-				{{end}}
-				{{if or .T.res.i_province .T.res.i_city .T.res.i_area .T.res.s_address  }}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one"><span class="glyphicon lianxidizhi icon_gray"></span></div> 
-						<div class="two">联系地址：</div> 
-						<div class="three">
-							<span class="span999" id="city_china">
-								<select  class="province cxselect select" id="provincesel" name="province" data-first-title="全国"></select>								
-								<select class="city cxselect select" id="citysel" name="city" data-first-title="选择市"></select>
-								<select class="area cxselect select" id="areasel" name="area" data-first-title="选择县"></select>
-							</span>
-							
-							<input id="location"  type="hidden">
-							<input id="cityname"  type="hidden">
-							{{if .T.res.s_address}}
-							<span class="glyphicon biaojidizhi icon_default text-primary" ></span> 	
-							<a href = "javascript:void(0)" onclick = "document.getElementById('mapshowdiv').style.display='block';document.getElementById('closeshowmap').style.display='block';document.getElementById('fade').style.display='block';">查看详细地图</a>
-							{{end}}
-						</div>
-					</div> 
-				</div>
-				{{end}}
-				{{if .T.res.s_synopsis}}
-				<div class="tablediv"> 
-					<div class="rowcontent"> 
-						<div class="one" style="vertical-align: top;"><span class="glyphicon falvshengming icon_gray"></span> </div> 
-						<div class="two" style="vertical-align: top;"><script>document.write(entType)</script>介绍：</div> 
-						<div class="three">{{.T.res.s_synopsis}}</div>
-					</div> 
-				</div>
-				{{end}}
-				
-				
-			</div>
-		</div>
-	</div>	
-	<!--显示地图信息-->
-	<div id="mapshowdiv" class="white_content"></div>
-	<a href = "javascript:void(0)" onclick = "document.getElementById('mapshowdiv').style.display='none';document.getElementById('closeshowmap').style.display='none';document.getElementById('fade').style.display='none';"><div id="closeshowmap" class="closeshowmap">X</div></a>
-	<div id="fade" class="black_overlay"></div> 	
-	{{end}}	
-	
-	<!--产品服务-->	
-	<div class="row qfw-row qfw-p-margintop" id="service">
-		<div class="col-lg-12 border" >
-			<div class="qfw-entinfo-padding41">
-				<h4><span class="glyphicon fuwu icon_gray icon_large"></span>
-				<b>产品服务</b></h4>
-				<hr>
-				<div class="service_list" id="service_list">
-					<table style="width:100%;" class="text-muted mt"><tbody></tbody></table>
-					<div class="text-muted mt">该公司暂未发布服务信息</div>
-				</div>
-				<div class="op1 text-center" id="loadMore" onClick="loadMore()" >加载更多</div>
-			</div>
-		</div>
-	</div>
-	<!--公示信息-->
-	<div class="row qfw-row qfw-p-margintop" id="gs">
-		<div class="col-lg-12 border" >
-			<div class="qfw-entinfo-padding41">
-				<h4><span class="glyphicon gongshixinxi icon_gray icon_large"></span>
-				<b>公示信息</b>&nbsp{{if .T.res.gs }}<font id="qggs" style="font-size:12px;"><small>(来源：<a href="http://gsxt.saic.gov.cn/"  rel="nofollow" style="text-decoration: underline;color: #0099FF;">全国企业信用信息公示系统</a>)</small></font>{{end}}</h4>
-				<hr>
-				{{if .T.res.gs }}
-				{{if .T.res.RegNo }}
-				    <div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon zhucehao icon_gray"></span></div> 
-							<div class="two">注册号：<span class="span999">{{.T.res.RegNo}}</span></div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.EntTypeName }}
-				  	<div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon qiyeleixing icon_gray"></span></div> 
-							<div class="two">类型： <span class="span999">{{.T.res.EntTypeName}}</span> </div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.LeRep }}
-				    <div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon faren icon_gray"></span></div> 
-							<div class="two">{{.T.res.EntTypeLabel}}：<span class="span999">{{.T.res.LeRep}}</span> </div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.RegCap }}
-					{{if and (ne .T.res.EntType "9600") (ne .T.res.EntType "5810")}}
-					 <div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon zican icon_gray"></span></div> 
-							<div class="two">注册资本：<span class="span999"><script>var d1={{.T.res.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> 万元</span></div> 
-						</div> 
-					</div>
-				    {{end}}
-				{{end}}
-				{{if .T.res.EstDate }}
-				  	<div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon riqi icon_gray"></span></div> 
-							<div class="two">成立日期：<span class="span999">{{.T.res.EstDate}}</span></div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.Dom }}
-				  	<div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon zhusuo icon_gray"></span></div> 
-							<div class="two">住所： <span class="span999">{{.T.res.Dom}} </span></div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.OpStateName }}
-				 	<div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon dengjizhuangtai icon_gray"></span></div> 
-							<div class="two">登记状态：<span class="span999">{{.T.res.OpStateName}}</span></div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.OpFrom }}
-					<div class="tablediv"> 
-					    <div class="rowcontent"> 
-					        <div class="one"><span class="glyphicon riqi icon_gray"></span></div> 
-					        <div class="two">营业期限：<span class="span999">自{{.T.res.OpFrom}}
-							{{if .T.res.OpTo }}至{{.T.res.OpTo }}{{end}}</span></div> 
-					    </div> 
-			       </div>
-				{{end}}
-				{{if .T.res.OpScope }}
-				   <div class="tablediv"> 
-					    <div class="rowcontent"> 
-					        <div class="one"><span class="glyphicon jingyingfanwei icon_gray"></span></div> 
-					        <div class="two">经营范围：<span class="span999">{{.T.res.OpScope}}</span></div> 
-					    </div> 
-			       </div>
-				{{end}}
-				{{if .T.res.RegOrgName }}
-					<div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon dengjijiguan icon_gray"></span></div> 
-							<div class="two">登记机关：<span class="span999">{{.T.res.RegOrgName}}</span> </div> 
-						</div> 
-					</div>
-				{{end}}
-				{{if .T.res.IssBLicDate }}
-					<div class="tablediv"> 
-						<div class="rowcontent"> 
-							<div class="one"><span class="glyphicon riqi icon_gray"></span></div> 
-							<div class="two">核准日期：<span class="span999">{{.T.res.IssBLicDate}} </span> </div> 
-						</div> 
-					</div>
-			 	{{end}}				
-				{{end}}
-			</div>
-		</div>
-	</div>	
-	<!--关系网-->
-	<div class="row qfw-row qfw-p-margintop" id="gx">
-			<div class="col-lg-12 border padding-r-0" >
-			<div class="qfw-entinfo-padding41">
-				<h4><span class="glyphicon guanxiwang icon_gray icon_large"></span>
-				<b>关系网</b></h4>
-				<hr>
-				<div id="gxw_bs">
-				</div>
-				
-				<div id="infovis">			
-					 <div class="controlls  hidden-sm hidden-xs">
-						<div class="item" >
-							<div id="op_fullscreen" class="ico_box" title_pos="left"><div class="ico_fullscreen"></div></div>
-						</div>
-					</div>
-					
-				</div>
-			</div>
-		</div>
-	
-	</div>
-
-</div>
-</div>
-
-
-
-<!--弹出窗口显示上传的图片-->
-<div class="modal fade" id="myModal" tabindex="-1" role="dialog" 
-   aria-labelledby="myModalLabel" aria-hidden="true">
-   <div class="modal-dialog mimg">
-        <div class="modal-content" style="width:400px;">
-         <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" style="margin-top: -10px;"
-               aria-hidden="true">×
-            </button>
-         </div>
-         <div class="modal-body" id="viewImgs" onclick="hideImgs()" style="cursor:pointer;text-align: center;" >
-            
-         </div>
-      </div><!-- /.modal-content -->
-   </div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
-
-<!--右侧导航菜单-->
-{{include "/common/rightnavbtn.html"}}
-<!--右侧导航菜单-->
-</body>
-<script type="text/javascript">
-
-setNavbarActive(2);
-
-var entsel="",btempwords,chf1,czb;
-
-//企业信息ID
- var id = {{.T.res._id}}
-//公式信息的变量
-var $gs = {{.T.res.gs}};
-//关系网上的变量
-var  $relationlen = {{len .T.res.relation.links}};
-
-//服务模板
-var template_content = "<tr><td><div class='row service_row'> "
-+"<div class='col-sm-1'><div style='width:120px; height:120px; background-color:#eee;'><img class='hidden-xs' src='${s_images}' style='width:120px;height:120px'></div></div>"
-+" <div class='col-sm-9'>"
-+"<div class='linebser service_des'><div class='servicename text-primary'><a class='text-primary' target='_blank' onclick='clickservicename(\"${_id}\",\"${s_isshow}\")'>${s_name}</a></div><div class='text-muted'>${s_introduction}</div></div>"
-+"</div></td><tr>"
-//关系网数据
-data= {{.T.res.relation}};
-//注册号
-var regno="{{.T.res.RegNo}}";
-
-var legcerno = "{{.T.res.LegCerNO}}";
-var lerep="{{.T.res.LeRep}}";
-//联系地址
-var province = {{.T.res.i_province}};
-var city = {{.T.res.i_city}};
-var area = {{.T.res.i_area}};
-var as1="{{.T.res.s_address}}";
-var $chiancity= false,$listent=false;
-{{if or .T.res.i_province .T.res.i_city .T.res.i_area .T.res.s_address  }}
-	$chiancity= true;
-{{end}}
-
-var $resdata = {{.T.res.data}};
-var $entid = {{.T.res._id}};
-//定义默认的郑州经纬度
-var ptlat=113.69884285509,  ptlng=34.791342526551;
-var $res = {{.T.res}};
-</script>
-<script src="/wxent/qfw-frontenterprise.js"></script>
-
-</html>