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

core/src/qfw/front/webcentent.go

@@ -50,6 +50,13 @@ type Newscont struct {
 	webHelp xweb.Mapper `xweb:"/front/web_(\\w+)_help.html"`
 	//帮助中心 意见反馈 关于我们 联系我们
 	webMobileHelp xweb.Mapper `xweb:"/front/web_(\\w+)_mobilehelp.html"`
+	//前台手机首页内容
+	webindexcontent xweb.Mapper `xweb:"GET /front/webindexcontent/(\\w+).html"`
+}
+
+//手机首页内容
+func (n *Newscont) Webindexcontent(_id string) error {
+	return n.viewContent4Front(_id, "/manage/webmobindex.html")
 }
 
 //帮助中心 意见反馈 关于我们 联系我们电脑端

core/src/qfw/manage/article.go

@@ -140,6 +140,7 @@ func (a *Article) Updatearticle() error {
 			elastic.UpdateNewDoc("content", "content", FindById("content", _id, ""))
 			redis.Del("other", "/front/webcontent/"+_id+".html")
 			redis.Del("other", "/front/webhelpcontent/"+_id+".html")
+			redis.Del("other", "/front/webindexcontent/"+_id+".html")
 			redis.Del("other", "/front/weixincontent/"+_id)
 			redis.Del("other", "/")
 			redis.Del("other", "latestNews") //最新消息

core/src/qfw/search/search.go

@@ -13,7 +13,6 @@ type Search struct {
 	sim               xweb.Mapper `xweb:"POST /search/sim"`                          //即时搜索
 	searchEntSer      xweb.Mapper `xweb:"/searchEntSer/(.*)"`                        //获取企业的服务列表
 	entCommunity      xweb.Mapper `xweb:"/front/entCommunity.html"`
-	wxMingpian        xweb.Mapper `xweb:"/wx/search/enterprise/mingpian"` //获取名片
 }
 
 func init() {

core/src/qfw/search/searchService.go

@@ -8,7 +8,6 @@ import (
 	"gopkg.in/mgo.v2/bson"
 	"html/template"
 	"log"
-	"qfw/coreutil"
 	"qfw/front"
 	. "qfw/member"
 	"qfw/mobile"
@@ -766,31 +765,3 @@ func searhWebContententMp(querymap map[string]string, n *Search, reqType string,
 	pagination := front.MakePagination(1, 1, 1, querymap, "/wx/search/enterprise/"+reqType+"ent_%s.html")
 	return &res, &pagination, has
 }
-
-//获取名片名称
-func (s *Search) WxMingpian() error {
-	res := make(map[string]string)
-	res["name"] = ""
-	res["on"] = "y"
-	if s.GetSession("s_m_openid") != nil {
-		serverId := s.GetString("serverId")
-		ret := coreutil.WxDownloadImg(serverId)
-		if len(ret) > 1 {
-			log.Println("picpath", ret[1])
-			res["on"] = ret[0]
-			names := coreutil.CardRecognition(ret[1])
-			for k, v := range names {
-				name := fmt.Sprint(v)
-				if mpian_reg.MatchString(name) {
-					res["name"] = name
-					break
-				}
-				if k == len(names)-1 {
-					res["name"] = name
-				}
-			}
-		}
-	}
-	s.ServeJson(&res)
-	return nil
-}

core/src/qfw/search/wxsearch.go

@@ -10,8 +10,9 @@ import (
 
 type Wxsearch struct {
 	*xweb.Action
-	wxgetEnterpriseList xweb.Mapper `xweb:"/wx/search/enterprise/([^.]*)ent([^.]*).html"` //查询企业列表
-	wxsearchEntSer      xweb.Mapper `xweb:"/wx/searchEntSer/(.*)"`                        //获取企业的服务列表
+	wxIndex             xweb.Mapper `xweb:"/wx/search/enterprise/index.html"` //查询企业列表
+	wxMingpian          xweb.Mapper `xweb:"/wx/search/enterprise/mingpian"`   //获取名片
+	wxgetEnterpriseList xweb.Mapper `xweb:"/wx/search/enterprise/list.html"`  //查询企业列表
 }
 
 var mpian_reg *regexp.Regexp //名片

core/src/qfw/search/wxsearchservice.go

@@ -7,8 +7,8 @@ import (
 	"github.com/go-xweb/xweb"
 	"html/template"
 	"log"
-	"qfw/front"
-	. "qfw/member"
+	"qfw/coreutil"
+	"qfw/mobile"
 	. "qfw/util"
 	"qfw/util/consts"
 	"qfw/util/elastic"
@@ -19,69 +19,15 @@ import (
 	"strings"
 )
 
-//获取某个企业服务列表数据
-func (search *Wxsearch) WxsearchEntSer(id string) error {
-	if search.Method() == "POST" {
-		//分页
-		currentPage, _ := strconv.Atoi(search.GetString("currentPage"))
-		perPage, _ := strconv.Atoi(search.GetString("perPage"))
-		if perPage == 0 {
-			perPage = 10
-		}
-		mustnot := `{"term" : {"i_status" : 1 }}`
-		var fields, collection, query, tempstrquery string
-		collection = "service"
-		tempstrquery = `{"query_string":{"default_field": "s_enterpriseid","query":"` + id + `"}}`
-		servicequery := ""
-		if search.GetSession("entid") == nil || search.GetSession("entid").(string) != id {
-			servicequery = `,"must_not" : [` + mustnot + `]`
-		} else {
-
-		}
-		query = `{"query": {
-		    "bool": {
-			  "must":[` + tempstrquery + `]` + servicequery + `
-		    }
-		  }}`
-		//需要查到的字段信息
-		fields = `"_id","s_name","s_introduction","s_images","s_enterpriseid","s_isshow","i_status"`
-		res := map[string]interface{}{}
-		res["totalRows"] = 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", ((currentPage-1)*perPage))+`,
-		size:`+fmt.Sprintf("%v", perPage)+`
-		}`)
-		//result := elastic.GetPage("service", collection, query, order_str, fields, (currentPage-1)*perPage, perPage)
-
-		for _, v := range *result {
-			b, _ := CheckAuth(v)
-			if b {
-				v["s_isEdit"] = "1"
-			} else {
-				v["s_isEdit"] = "0"
-			}
-			if IntAll(v["i_status"]) == 1 {
-				v["s_remove"] = 1
-			} else {
-				v["s_remove"] = 0
-			}
-		}
-
-		res["data"] = result
-		res["currentPage"] = currentPage
-		search.ServeJson(&res)
-	}
+//企业社区首页
+func (n *Wxsearch) WxIndex() error {
+	n.T["signature"] = mobile.GetSignature(n.Url())
+	n.Render("/member/incmobile/index.html", &n.T)
 	return nil
 }
 
 //企业列表
 func (n *Wxsearch) WxgetEnterpriseList(reqType, param /*参数*/ string) error {
-	//必须是登录之后的已认证用户才可以进入企业社区
-	//if ui, _ := (n.GetSession("userInfo")).(*map[string]interface{}); reqType == "m_" || (n.GetSession("userType") != nil && IntAll(n.GetSession("userType")) > 0) && ((n.GetSession("identWay") != nil && IntAll(n.GetSession("identWay")) == 1) || ((*ui)["s_pid"] != nil && (*ui)["s_pid"].(string) != "")) {
-	//n.T["uri"] = n.Uri()
 	i_mingpian := n.GetString("i_mingpian") //是否走名片查询
 	if len(param) == 0 {
 		//请求是表单提交，走的查询
@@ -98,17 +44,18 @@ func (n *Wxsearch) WxgetEnterpriseList(reqType, param /*参数*/ string) error {
 			"cityNo":      n.GetString("cityNo"), //是否是第一次查询并且没有选择地市，自动根据IP来设
 		}
 		//查询生成列表数据
+		var data *[]map[string]interface{}
+
+		var has bool = false
 		if i_mingpian != "" {
-			data, pagination, has := wxsearhWebContententMp(querymap, n, reqType, false)
-			n.Render("/member/incombile/list.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
+			data, has = wxsearhWebContententMp(querymap, n, reqType, false)
 			if !has {
-				data, pagination := wxsearhWebContentent(querymap, n, reqType)
-				n.Render("/member/incombile/list.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
+				data = wxsearhWebContentent(querymap, n, reqType)
 			}
 		} else {
-			data, pagination := wxsearhWebContentent(querymap, n, reqType)
-			n.Render("/member/incombile/list.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
+			data = wxsearhWebContentent(querymap, n, reqType)
 		}
+		n.Render("/member/incombile/list.html", &xweb.T{"querymap": querymap, "data": data})
 	} else {
 		//反转生成map
 		paramstr := param[1:]
@@ -117,14 +64,14 @@ func (n *Wxsearch) WxgetEnterpriseList(reqType, param /*参数*/ string) error {
 
 		json.Unmarshal(bs, &querymap)
 		log.Println(querymap)
-		data, pagination := wxsearhWebContentent(querymap, n, reqType)
-		n.Render("/member/incombile/list.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
+		data := wxsearhWebContentent(querymap, n, reqType)
+		n.Render("/member/incombile/list.html", &xweb.T{"querymap": querymap, "data": data})
 	}
 	return nil
 }
 
 //实际的查询企业社区业务逻辑
-func wxsearhWebContentent(querymap map[string]string, n *Wxsearch, reqType string) (*[]map[string]interface{}, *[]interface{}) {
+func wxsearhWebContentent(querymap map[string]string, n *Wxsearch, reqType string) *[]map[string]interface{} {
 	perPage, _ := strconv.Atoi(querymap["perPage"])
 	currentPage, _ := strconv.Atoi(querymap["currentPage"])
 	//修复
@@ -134,16 +81,16 @@ func wxsearhWebContentent(querymap map[string]string, n *Wxsearch, reqType strin
 	if currentPage < 1 {
 		currentPage = 1
 	}
-
+	if currentPage > 20 {
+		currentPage = 20
+	}
 	queryStr := querymap["query"]
 	fmt.Println("检索条件：", queryStr)
 	str := ``
 	//查询词
 	keyword := queryStr
 	//排序
-
 	sort := ""
-
 	//地区
 	city := querymap["city"]
 	var tempQuery = ""
@@ -151,7 +98,6 @@ func wxsearhWebContentent(querymap map[string]string, n *Wxsearch, reqType strin
 	cityNo := querymap["cityNo"]
 	tempBisOne := false
 	ipcity := ""
-	var total int64 = 500
 	if cityNo == "" && len(queryStr) == 0 {
 		querymap["cityNo"] = "1"
 		tn, er := ip.Find(n.Protocol())
@@ -160,18 +106,17 @@ func wxsearhWebContentent(querymap map[string]string, n *Wxsearch, reqType strin
 			case "河南", "广西", "黑龙江", "青海", "西藏", "安徽", "山西":
 				ipcity = consts.Scode[tn.Region]
 				if len(ipcity) > 0 {
-					tmp_res := redis.Get("enterprise", "wx_"+ipcity+"_1")
-					tmp_pag := redis.Get("enterprise", "wx_"+ipcity+"_2")
-					if nil != tmp_res && nil != tmp_pag {
+					tmp_res := redis.Get("enterprise", "wx_ipcity_"+ipcity+"_1")
+					if nil != tmp_res {
 						tmp_res1, oks1 := tmp_res.([]interface{})
-						tmp_pag1, oks2 := tmp_pag.([]interface{})
-						if tmp_res1 != nil && tmp_pag1 != nil && oks1 && oks2 {
+
+						if tmp_res1 != nil && oks1 {
 							tmp_resn := make([]map[string]interface{}, len(tmp_res1))
 							for k := 0; k < len(tmp_res1); k++ {
 								tmp_resn1, _ := tmp_res1[k].(map[string]interface{})
 								tmp_resn[k] = tmp_resn1
 							}
-							return &tmp_resn, &tmp_pag1
+							return &tmp_resn
 						}
 					}
 
@@ -184,7 +129,7 @@ func wxsearhWebContentent(querymap map[string]string, n *Wxsearch, reqType strin
 						      }
 						    }
 						  }
-						,"_source":["_id","EntName","RegOrgName","RegNo","EntType","LeRep","EstDate","OpLocDistrictName","OpStateName","s_servicenames","s_action","OpLocDistrict"]
+						,"_source":["_id","EntName","RegOrgName","RegNo","EntType","LeRep","EstDate","OpLocDistrictName","RegCap","OpStateName","OpState","s_servicenames","s_action","OpLocDistrict","RegCapCurName","s_avatar"]
 						,"from":0,
 						"size":` + fmt.Sprintf("%v", perPage) + `,
 						  "sort": [{"_score": "desc"},{"OpSint":"desc"},{"RegCap":"desc"}]
@@ -233,7 +178,14 @@ func wxsearhWebContentent(querymap map[string]string, n *Wxsearch, reqType strin
 			}
 			str += `{"term":{"EntType":"` + c_qfl + `"}}`
 		}
-
+		//存续/在营
+		OpState := querymap["OpState"]
+		if OpState != "" {
+			if len(str) > 0 {
+				str += ","
+			}
+			str += `{"term":{"OpState":"` + OpState + `"}}`
+		}
 		//认证
 		c_author := querymap["c_author"]
 		if c_author == "Y" {
@@ -243,17 +195,6 @@ func wxsearhWebContentent(querymap map[string]string, n *Wxsearch, reqType strin
 			str += `{
 				"terms":{"enterprise.s_action":["01"]}
 			}`
-
-			/**
-					str += `{
-			          "match": {
-			            "enterprise.s_action": {
-			              "query":"` + "01" + `",
-			              "operator": "and"
-			            }
-			          }
-			        }`
-					**/
 		}
 		queryShould := ""
 
@@ -329,25 +270,21 @@ func wxsearhWebContentent(querymap map[string]string, n *Wxsearch, reqType strin
 			"s_synopsis":{"force_source": true},
 			"stock":{"force_source": true}
         }
-    },"_source":["_id","EntName","RegOrgName","RegNo","EntType","LeRep","EstDate","OpLocDistrictName","OpStateName","s_servicenames","s_action","OpLocDistrict","s_submitid"]
+    },"_source":["_id","EntName","RegOrgName","RegNo","EntType","LeRep","EstDate","OpLocDistrictName","RegCap","OpStateName","OpState","s_servicenames","s_action","OpLocDistrict","s_submitid","RegCapCurName","s_avatar"]
 	,"from":` + fmt.Sprintf("%v", ((currentPage-1)*perPage)) + `,
 	"size":` + fmt.Sprintf("%v", perPage) +
 			`,"sort":[` + sort + `] }`
-
-		total = elastic.Count("enterprise", "enterprise", tempQuery)
-	}
-	if total > 500 {
-		total = 500
 	}
+
 	//查询列表数据
 	client := elastic.GetEsConn()
 	defer elastic.DestoryEsConn(client)
 	if client == nil {
-		return nil, nil
+		return nil
 	}
 	searchResult, err := client.Search().Index("enterprise").Type("enterprise").Source(query).Do()
 	if err != nil {
-		return nil, nil
+		return nil
 	}
 	var res []map[string]interface{}
 	if searchResult.Hits != nil {
@@ -362,13 +299,24 @@ func wxsearhWebContentent(querymap map[string]string, n *Wxsearch, reqType strin
 
 			EntName, _ := res[i]["EntName"].(string)
 			tmpNo := res[i]["EntType"]
+			res[i]["RegCapEntType"] = tmpNo
 			if tmpNo != nil {
 				switch tmpNo.(string) {
 				case "4500", "6800", "6810", "6820", "7100", "7110", "7120", "7130", "7190", "9200", "6840", "2100", "2110", "2120", "2121", "2122", "2123", "2130", "2140", "2150", "2151", "2152", "2190", "2200", "2210", "2211", "2212", "2213", "2219", "2220", "2221", "2222", "2223", "2229", "4000", "4300", "4310", "4320", "4330", "4340", "4550", "4551", "4552", "4553", "4560", "5800", "5810", "5820":
 					res[i]["EntType"] = "5810"
 				}
 			}
-
+			//处理分公司
+			if res[i]["RegCapEntType"] != nil && res[i]["RegCapEntType"].(string) != "" {
+				RegCapEntType := res[i]["RegCapEntType"].(string)
+				if RegCapEntType == "5810" || RegCapEntType == "6810" || RegCapEntType == "7310" || RegCapEntType == "3200" || RegCapEntType == "3100" {
+					res[i]["RegCapEntType"] = "5810"
+				} else if len(RegCapEntType) > 1 {
+					if RegCapEntType[:1] == "2" {
+						res[i]["RegCapEntType"] = "5810"
+					}
+				}
+			}
 			entlerp, _ := res[i]["LeRep"].(string)
 			tmpentno, _ := res[i]["RegNo"].(string)
 			if len(keyword) < 1 {
@@ -381,13 +329,6 @@ func wxsearhWebContentent(querymap map[string]string, n *Wxsearch, reqType strin
 			} else {
 				res[i]["EntName"] = template.HTML(EntName)
 			}
-			//当企业名称为空获取企业法人的名称
-			/**ename := template.HTML(EntName)
-			if res[i]["EntName"] == nil || len(ename) == 0 {
-				res[i]["EntName"] = res[i]["LeRep"]
-			}
-			**/
-			//
 
 			id := res[i]["s_submitid"]
 			if id != nil {
@@ -427,20 +368,15 @@ func wxsearhWebContentent(querymap map[string]string, n *Wxsearch, reqType strin
 
 		}
 	}
-	//log.Println(total)
-	//生成分页
-	pagination := front.MakePagination(perPage, currentPage, int(total), querymap, "/wx/search/enterprise/"+reqType+"ent_%s.html")
 
 	if tempBisOne && len(ipcity) > 0 {
-		redis.Put("enterprise", "wx_"+ipcity+"_1", res, 5*86400)
-		redis.Put("enterprise", "wx_"+ipcity+"_2", pagination, 5*86400)
+		redis.Put("enterprise", "wx_ipcity_"+ipcity+"_1", res, 5*86400)
 	}
-	return &res, &pagination
-
+	return &res
 }
 
 //通过企业名片查询
-func wxsearhWebContententMp(querymap map[string]string, n *Wxsearch, reqType string, has bool) (*[]map[string]interface{}, *[]interface{}, bool) {
+func wxsearhWebContententMp(querymap map[string]string, n *Wxsearch, reqType string, has bool) (*[]map[string]interface{}, bool) {
 	queryStr := querymap["query"]
 	fmt.Println("检索条件：", queryStr)
 	keyword := queryStr
@@ -478,11 +414,11 @@ func wxsearhWebContententMp(querymap map[string]string, n *Wxsearch, reqType str
 	client := elastic.GetEsConn()
 	defer elastic.DestoryEsConn(client)
 	if client == nil {
-		return nil, nil, false
+		return nil, false
 	}
 	searchResult, err := client.Search().Index("enterprise").Type("enterprise").Source(query).Do()
 	if err != nil {
-		return nil, nil, false
+		return nil, false
 	}
 	var res []map[string]interface{}
 	if searchResult.Hits != nil {
@@ -554,7 +490,33 @@ func wxsearhWebContententMp(querymap map[string]string, n *Wxsearch, reqType str
 			}
 		}
 	}
-	//生成分页
-	pagination := front.MakePagination(1, 1, 1, querymap, "/wx/search/enterprise/"+reqType+"ent_%s.html")
-	return &res, &pagination, has
+	return &res, has
+}
+
+//获取名片名称
+func (n *Wxsearch) WxMingpian() error {
+	res := make(map[string]string)
+	res["name"] = ""
+	res["on"] = "y"
+	if n.GetSession("s_m_openid") != nil {
+		serverId := n.GetString("serverId")
+		ret := coreutil.WxDownloadImg(serverId)
+		if len(ret) > 1 {
+			log.Println("picpath", ret[1])
+			res["on"] = ret[0]
+			names := coreutil.CardRecognition(ret[1])
+			for k, v := range names {
+				name := fmt.Sprint(v)
+				if mpian_reg.MatchString(name) {
+					res["name"] = name
+					break
+				}
+				if k == len(names)-1 {
+					res["name"] = name
+				}
+			}
+		}
+	}
+	n.ServeJson(&res)
+	return nil
 }

core/src/qfw/swordfish/swordfishmanage.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	_ "encoding/json"
 	"gopkg.in/mgo.v2/bson"
-	"log"
 	"net/rpc"
 	"qfw/util"
 	"qfw/util/mongodb"
@@ -96,9 +95,8 @@ func (s *SwordFish) Wxsearchlist() error {
 	s.T["s_name"] = s_name
 	s.T["success"] = false
 	s.T["s_type"] = s.GetString("s_type")
-	log.Println("s_type:", s_type, "s_name:", s_name, "keywords:", keywords)
 	if len(s_name) > 0 {
-		clent, errs := rpc.DialHTTP("tcp", "127.0.0.1:8766")
+		clent, errs := rpc.DialHTTP("tcp", coreconfig.SysConfig.PushRpc)
 		defer clent.Close()
 		rpcData := qrpc.PushData{
 			//Mopenid: "oJULtwzXo6EFV1Ah-XeyRBimXGM8",
@@ -117,7 +115,6 @@ func (s *SwordFish) Wxsearchlist() error {
 			if bmatch == true {
 				s.T["success"] = true
 			}
-			log.Println(s.T["msglist"])
 		}
 	}
 	return s.Render("/swordfish/wxsearchlist.html", &s.T)
@@ -142,7 +139,7 @@ func (s *SwordFish) Searchinfolist() error {
 	s.T["success"] = false
 	s.T["s_type"] = s.GetString("s_type")
 	if len(s_name) > 0 {
-		clent, errs := rpc.DialHTTP("tcp", "127.0.0.1:8766")
+		clent, errs := rpc.DialHTTP("tcp", coreconfig.SysConfig.PushRpc)
 		defer clent.Close()
 		rpcData := qrpc.PushData{
 			//Mopenid: "oJULtwzXo6EFV1Ah-XeyRBimXGM8",
@@ -161,7 +158,6 @@ func (s *SwordFish) Searchinfolist() error {
 			if bmatch == true {
 				s.T["success"] = true
 			}
-			log.Println(s.T["msglist"])
 		}
 	}
 	return s.Render("/swordfish/searchinfolist.html", &s.T)

core/src/timetask.json

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

core/src/web/templates/index.html

@@ -7,7 +7,14 @@
 <meta name="Description" content="{{Msg "seo" "qfw.homepage.description"}}"/>
 <link href="{{Msg "seo" "cdn"}}/css/index-new.css" rel="stylesheet">
 <script src="{{Msg "seo" "cdn"}}/js/jquery.lazyload.min.js"></script>
-
+<script type="text/javascript">
+$(function(){
+	var kd = document.body.clientWidth;
+	if(kd < 760){
+		window.location.href="/front/webindexcontent/56efb9ba61fd0010d0000001.html"
+	}
+});
+</script>
 </head>
 <body>
 

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

@@ -0,0 +1,126 @@
+<html>
+<head>
+<title>移动端首页</title>
+{{include "/common/inc.html"}}
+<script src="{{Msg "seo" "cdn"}}/js/validform-min.js"></script>
+<style type="text/css">
+body{
+	background-color:#f0f0f0;
+	}
+.b-nav {
+    border-top-color: rgb(255, 90, 95);
+}
+#content { 
+	margin-left:0px;
+	}
+.widget-box {
+	border:0px;
+	}
+.widget-content {
+	border-bottom:0px;
+	}
+.index-new-nva{
+	height:69px;
+}
+#contentindex{
+	 background: none repeat scroll 0 0 #fff;
+	 margin-right: 0; 
+     position: relative; 
+     width: auto; 
+    border-top-left-radius: 8px;
+}
+</style>
+</head>
+<body>
+<div class="index-new-head b-head">
+	<div class="b-nav index-new-nva text-center">
+		<a href="/"><img src="/images/logo.png" class="logo"></a>
+	</div>
+</div>
+<!-- 中间 -->
+<div class="row" style="padding:10px; margin:0 auto;">
+		<div id="contentindex">
+			
+			<div class="container-fluid">
+				<div style="margin-top:0px;" class="row-fluid">
+					<div class="span12">		
+							<div class="widget-content nopadding">
+								
+								<div style="width:98%; margin:auto; margin-bottom:10px;">
+									
+	<div style="margin-top: 40px;height:35px; border-bottom:1px solid #e5e6e9;">
+	<div style="height:20px;width:10px;background-color:#FF5A5F;float:left;"></div>
+	<div style="color:#FF5A5F;float:left;margin-left:15px;">网站介绍</div>
+	<div style="both:clear;"></div>
+	</div>
+	<div  style="margin-top: 20px;">{{.T.s_content}}</div>							
+		                        </div>
+							</div>
+						
+					</div>
+				</div>
+
+			</div>
+	
+	</div>
+
+
+</div>
+<div class="row" style="padding:0px 10px; margin:0 auto;">
+		<div id="contentindex">
+			
+			<div class="container-fluid">
+				<div style="margin-top:0px;" class="row-fluid">
+					<div class="span12">		
+							<div class="widget-content nopadding">
+								
+								<div style="width:98%; margin:auto; margin-bottom:10px;">
+	
+	<div style="margin-top: 40px;height:35px; border-bottom:1px solid #e5e6e9;">
+	<div style="height:20px;width:10px;background-color:#FF5A5F;float:left;"></div>
+	<div style="color:#FF5A5F;float:left;margin-left:15px;">手机体验</div>
+	<div style="both:clear;"></div>
+	</div>
+	<div style="width:100%;    margin-top: 20px;" class="text-center"><img src="{{if .T.s_pic }}{{.T.s_pic}}{{else}}{{Msg "seo" "cdn"}}/images/u109.png{{end}}"/></div>	
+	<div style="width:100%;margin-top: 20px;" class="text-center">微信关注企明星公众号qmx-cn，体验企明星的强大功能。</div>						
+		                        </div>
+							</div>
+					</div>
+				</div>
+
+			</div>
+	
+	</div>
+
+
+</div>
+{{include "/common/bottom.html"}}
+<script type="text/javascript">
+function currPos(){
+   return [["帮助中心","/front/web_helpcenterlist.html"]]
+}
+$(function (){
+	$(".backTop").click(function (){
+		$(window).scrollTop(0);
+	});
+	$('#loginModal').on('shown.bs.modal', function () {
+		$("#username").focus();
+	});
+	var obj = $(".navbar-nav li a.qfw-navbar-active");
+	$(".navbar-nav li a").mouseover(function (){
+		obj.removeClass("qfw-navbar-active");
+		$(this).addClass("qfw-navbar-active");
+	}).mouseout(function (){
+		$(this).removeClass("qfw-navbar-active");
+		obj.addClass("qfw-navbar-active");
+	});
+	$(".registerform").Validform({
+		tiptype:function(msg,o,cssctl){
+			cssctl($(o.obj).prev(),o.type);
+			$(o.obj).prev().text(msg).show();
+		}
+	});
+});
+</script>
+</body>
+</html>

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

@@ -2,16 +2,12 @@
 <head>
 <title>网站消息</title>
 {{include "/common/inc.html"}}
-<<<<<<< HEAD
-<script src="/js/qfwtable.js"></script>
 <style type="text/css">
 	a#msgCenter{
 		color:#FF5A5F !important;
 	}
 </style>
-=======
 <script src="{{Msg "seo" "cdn"}}/js/qfwtable.js"></script>
->>>>>>> release
 </head>
 <body>
 {{$identType := session "identType"}}

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

@@ -2,16 +2,12 @@
 <head>
 <title>我预约的服务</title>
 {{include "/common/inc.html"}}
-<<<<<<< HEAD
-<script charset="utf-8" src="/js/paging.js"></script>
 <style type="text/css">
 .myappointment{
 	color:#FF5A5F !important;
 }
 </style>
-=======
 <script charset="utf-8" src="{{Msg "seo" "cdn"}}/js/paging.js"></script>
->>>>>>> release
 </head>
 <body>
 {{include "/common/centerhead.html"}}

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

@@ -2,16 +2,12 @@
 <head>
 <title>我发布的需求</title>
 {{include "/common/inc.html"}}
-<<<<<<< HEAD
-<script charset="utf-8" src="/js/paging.js"></script>
 <style type="text/css">
 .mydemand{
 	color:#FF5A5F !important;
 }
 </style>
-=======
 <script charset="utf-8" src="{{Msg "seo" "cdn"}}/js/paging.js"></script>
->>>>>>> release
 </head>
 <body>
 {{include "/common/centerhead.html"}}

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

@@ -2,16 +2,12 @@
 <head>
 <title>订单管理</title>
 {{include "/common/inc.html"}}
-<<<<<<< HEAD
-<script charset="utf-8" src="/js/paging.js"></script>
 <style type="text/css">
 .ordermanage{
 	color:#FF5A5F !important;
 }
 </style>
-=======
 <script charset="utf-8" src="{{Msg "seo" "cdn"}}/js/paging.js"></script>
->>>>>>> release
 </head>
 <body>
 {{include "/common/centerhead.html"}}

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

@@ -50,11 +50,7 @@
 				{{range $k,$v:=.T.data}}
 					<div class="borderB">
 						<div class="qfw-entcontent-padding">
-<<<<<<< HEAD
-							<img src="{{if index $v "s_avatar"}}{{index $v "s_avatar"}}{{else}}null{{end}}" onerror="this.src='/images/ent-logo.png'">
-=======
-							<img src="{{Msg "seo" "cdn"}}/images/ent-logo.png">
->>>>>>> release
+							<img src="{{if index $v "s_avatar"}}{{Msg "seo" "cdn"}}{{index $v "s_avatar"}}{{else}}null{{end}}" onerror="this.src='/images/ent-logo.png'">
 							<div>
 								<div class="lineb " >
 									<a target="_blank" href="/enterprise/{{index $v "_id"}}.html"><b>
@@ -178,7 +174,6 @@
 	
 	<!--右边显示区开始-->
 	<div class="b-right hidden-sm hidden-md hidden-xs b-right-content">
-<<<<<<< HEAD
 		<div class="b-adver entlist-hotsearchwords">
 			<div class="b-adver-title">热搜词</div>
 			<div class="b-adver-content">
@@ -196,7 +191,7 @@
 				{{range $k,$v := $s}}
 					<li class="cursor-pointer{{if eq $k 0}} border-t-0{{end}}" onclick="window.location.href='/enterprise/{{$v.s_id}}.html'">
 						<div>
-							<img src="{{if $v.s_pic}}{{$v.s_pic}}{{else}}null{{end}}" onerror="this.src='/images/ent-logo.png'">
+							<img src="{{if $v.s_pic}}{{Msg "seo" "cdn"}}{{$v.s_pic}}{{else}}null{{end}}" onerror="this.src='/images/ent-logo.png'">
 							<a href="/enterprise/{{$v.s_id}}.html">{{$v.s_remark}}</a>
 						</div>
 					</li>
@@ -205,10 +200,6 @@
 				<div class="clearfix"></div>
 			</div>
 		</div>
-=======
-		<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>
->>>>>>> release
 	</div>
 	<!--右边显示区结束-->
 </div>

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

@@ -23,21 +23,6 @@
 			<!-- Wrapper for slides -->
 		  	<div class="carousel-inner" role="listbox">
 			    <div class="item active">
-<<<<<<< HEAD
-			      	<img src="/images/swordfish/guide-1.png">
-			    </div>
-			    <div class="item">
-			      	<img src="/images/swordfish/guide-2.png">
-			    </div>
-				<div class="item">
-			      	<img src="/images/swordfish/guide-3.png">
-			    </div>
-			    <div class="item">
-			      	<img src="/images/swordfish/guide-4.png">
-			    </div>
-				<div class="item">
-			      	<img src="/images/swordfish/guide-5.png">
-=======
 			      	<img src="{{Msg "seo" "cdn"}}/images/swordfish/guide-1.png">
 			     	<div class="carousel-caption"></div>
 			    </div>
@@ -56,7 +41,6 @@
 				<div class="item">
 			      	<img src="{{Msg "seo" "cdn"}}/images/swordfish/guide-5.png">
 			     	<div class="carousel-caption"></div>
->>>>>>> release
 			    </div>
 		  	</div>
 			<div class="swordfish-guide-right">

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

@@ -13,11 +13,7 @@
 <div class="b-content container-fluid">
 	<!--企业名片-->
 	<div class="b-com-head">
-<<<<<<< HEAD
-		<img src="{{if .T.res.s_avatar}}{{.T.res.s_avatar}}{{else}}null{{end}}" onerror="this.src='/images/ent-logo.png'">
-=======
-		<img src="{{Msg "seo" "cdn"}}/images/ent-logo.png">
->>>>>>> release
+		<img src="{{if .T.res.s_avatar}}{{Msg "seo" "cdn"}}{{.T.res.s_avatar}}{{else}}null{{end}}" onerror="this.src='/images/ent-logo.png'">
 		<div class="entinfo-cart">
 			<div class="b-com-first">
 				<font class="b-com-title">{{if .T.res.EntName}}{{.T.res.EntName}}{{end}}</font>
@@ -314,23 +310,19 @@
 					<h5>认证后即可查看企业股东信息，投资关系，公司关系脉络图等内容</h5>
 					<a href="/member/accountset/index" class="btn btn-primary">认证</a>
 				</div>
-<<<<<<< HEAD
 				<div class="dashed padding-0"></div>
-				<img src="/images/entcommunity/relation.png">
-=======
 				<img src="{{Msg "seo" "cdn"}}/images/entcommunity/relation.png">
->>>>>>> release
 			</div>
 			<div id="entrelation-findnull" class="ent-findnull hide">
 				<img src="{{Msg "seo" "cdn"}}/images/findnull.png" class="b-findnull">
 				<h4>抱歉，未找到相关数据！</h4>
 			</div>
 		</div>
-<<<<<<< HEAD
 		<div class="hide ent-mainperson">
 			<div class="ent-findnull hide">
 				<img src="/images/findnull.png" class="b-findnull">
-=======
+			</div>
+		</div>
 		<div class="hide">
 		{{if or .T.res.OpScope .T.res.s_synopsis}}
 			<div class="ent-layout-up">
@@ -356,7 +348,6 @@
 			{{else}}
 			<div class="ent-findnull">
 				<img src="{{Msg "seo" "cdn"}}/images/findnull.png" class="b-findnull">
->>>>>>> release
 				<h4>抱歉，未找到相关数据！</h4>
 			</div>
 		</div>
@@ -454,7 +445,6 @@
 			</div>
 		{{end}}
 		</div>
-<<<<<<< HEAD
 		<div class="hide ent-dishonesty">
 			<div class="ent-layout-up">
 				<div class="b-com-title">
@@ -470,11 +460,6 @@
 			</div>
 			<div class="ent-findnull hide">
 				<img src="/images/findnull.png" class="b-findnull">
-=======
-		<div class="hide">
-			<div class="ent-findnull">
-				<img src="{{Msg "seo" "cdn"}}/images/findnull.png" class="b-findnull">
->>>>>>> release
 				<h4>抱歉，未找到相关数据！</h4>
 			</div>
 		</div>
@@ -504,7 +489,6 @@
 				<h4>抱歉，未找到相关数据！</h4>
 			</div>
 		</div>
-<<<<<<< HEAD
 	</div>
 	<div class="b-right">
 		{{if .T.relevantEnts}}
@@ -522,12 +506,6 @@
 				{{end}}
 				</ul>
 				<div class="clearfix"></div>
-=======
-		<div class="hide">
-			<div class="ent-findnull">
-				<img src="{{Msg "seo" "cdn"}}/images/findnull.png" class="b-findnull">
-				<h4>抱歉，未找到相关数据！</h4>
->>>>>>> release
 			</div>
 		</div>
 		{{end}}