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

core/src/qfw/front/webcentent.go

@@ -11,6 +11,7 @@ import (
 	"github.com/go-xweb/xweb"
 	"html/template"
 	"log"
+	"math/rand"
 	"qfw/util"
 	"qfw/util/elastic"
 	. "qfw/util/mongodb"
@@ -18,6 +19,7 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+	"time"
 )
 
 type Newscont struct {
@@ -42,6 +44,54 @@ type Newscont struct {
 	getJsonList xweb.Mapper `xweb:"POST /front/(\\w+)list/list"`
 	//微信端使用通用信息展示页
 	weixincontent xweb.Mapper `xweb:"GET /front/weixincontent/(\\w+)"`
+	//获取最新的新闻资讯
+	getLatestNews xweb.Mapper `xweb:"/front/webcontent/getLatestNews"`
+	//帮助中心 意见反馈 关于我们 联系我们
+	webHelp xweb.Mapper `xweb:"/front/web_(\\w+)_help.html"`
+	//帮助中心 意见反馈 关于我们 联系我们
+	webMobileHelp xweb.Mapper `xweb:"/front/web_(\\w+)_mobilehelp.html"`
+}
+
+//帮助中心 意见反馈 关于我们 联系我们电脑端
+func (e *Newscont) WebHelp(tp string) error {
+	e.T["pageName"] = "帮助中心"
+	e.T["url"] = e.GetString("url")
+	e.T["type"] = e.GetString("type")
+	if tp == "A" {
+		e.T["tp"] = "1"
+	} else if tp == "O" {
+		e.T["tp"] = "2"
+	} else if tp == "H" {
+		e.T["tp"] = "3"
+	} else if tp == "L" {
+		e.T["tp"] = "4"
+	} else {
+		return e.Render("_error.html")
+	}
+	r := rand.New(rand.NewSource(time.Now().UnixNano()))
+	e.T["s_title_no"] = "qmx-" + fmt.Sprintf("%d%d", time.Now().Unix(), r.Int31n(99999))
+	e.SetSession("s_title_no", e.T["s_title_no"])
+	return e.Render("/manage/web_help.html", &e.T)
+}
+
+//帮助中心 意见反馈 关于我们 联系我们移动端
+func (e *Newscont) WebMobileHelp(tp string) error {
+	e.T["url"] = e.GetString("url")
+	e.T["type"] = e.GetString("type")
+	e.T["pageName"] = "帮助中心"
+	if tp == "A" {
+		e.T["tp"] = "1"
+	} else if tp == "O" {
+		e.T["tp"] = "2"
+	} else if tp == "L" {
+		e.T["tp"] = "3"
+	} else {
+		return e.Render("_error.html")
+	}
+	r := rand.New(rand.NewSource(time.Now().UnixNano()))
+	e.T["s_title_no"] = "qmx-" + fmt.Sprintf("%d%d", time.Now().Unix(), r.Int31n(99999))
+	e.SetSession("s_title_no", e.T["s_title_no"])
+	return e.Render("/manage/web_mobilehelp.html", &e.T)
 }
 
 //文章点赞
@@ -722,3 +772,34 @@ func SubstrByByte(str string, length int) string {
 	}
 	return ""
 }
+func (e *Newscont) GetLatestNews() {
+	var res []interface{}
+	if ret := redis.Get("other", "latestNews"); ret != nil {
+		res = ret.([]interface{})
+	} else {
+		var query = `{"query": {
+	    "bool": {
+		  "must":[{"term":{"s_contenttype":"qykb"}}]
+	    }},"_source":["s_title","releasetime","_id"]
+		,"from":0,"size":6,"sort":[{"releasetime":{"order":"desc"}}]}`
+		//查询列表数据
+		client := elastic.GetEsConn()
+		defer elastic.DestoryEsConn(client)
+		if client == nil {
+			e.ServeJson(res)
+		}
+		searchResult, err := client.Search().Index("content").Type("content").Source(query).Do()
+		if err != nil {
+			e.ServeJson(res)
+		}
+		if searchResult.Hits != nil {
+			resNum := len(searchResult.Hits.Hits)
+			res = make([]interface{}, resNum)
+			for i, hit := range searchResult.Hits.Hits {
+				json.Unmarshal(*hit.Source, &res[i])
+			}
+		}
+		redis.Put("other", "latestNews", res, 30*60) //缓存半个小时
+	}
+	e.ServeJson(res)
+}

core/src/qfw/manage/article.go

@@ -5,11 +5,9 @@
 package manage
 
 import (
-	"fmt"
 	"github.com/dchest/captcha"
 	"github.com/go-xweb/xweb"
 	. "gopkg.in/mgo.v2/bson"
-	"math/rand"
 	"qfw/util"
 	"qfw/util/elastic"
 	. "qfw/util/mongodb"
@@ -192,8 +190,9 @@ func (a *Article) Insertback() error {
 			data["s_remark"] = a.GetString("s_remark")
 			data["s_pic"] = a.GetString("s_pic")
 			data["s_link"] = a.GetString("s_link")
-			r := rand.New(rand.NewSource(time.Now().UnixNano()))
-			data["s_title_no"] = "qmx-" + fmt.Sprintf("%d%d", time.Now().Unix(), r.Int31n(99999))
+			//r := rand.New(rand.NewSource(time.Now().UnixNano()))
+			data["s_title_no"] = a.GetSession("s_title_no")
+			//"qmx-" + fmt.Sprintf("%d%d", time.Now().Unix(), r.Int31n(99999))
 
 			data["s_submitname"] = a.GetSession("loginName")
 			data["s_submitid"] = a.GetSession("userId")

core/src/qfw/manage/feedback.go

@@ -66,10 +66,14 @@ func (s *SystemManage) Getfeedback() error {
 			}
 			query = query + "}"
 			res["totalRows"] = Count("interaction", query)
-			data := *Find("interaction", query, []string{"-l_submitdate"}, `{"s_title":1,"_id":1,"s_title_no":1"i_type":1,"i_status":1,"l_submitdate":1}`, false, (currentPage-1)*size, size)
+			data := *Find("interaction", query, []string{"-l_submitdate"}, `{"s_remark":1,"s_title":1,"_id":1,"s_title_no":1"i_type":1,"i_status":1,"l_submitdate":1,"s_auditname":1}`, false, (currentPage-1)*size, size)
 			for _, v := range data {
 				data_v := v["l_submitdate"]
-				v["l_submitdate"] = util.FormatDateWithObj(&data_v, util.Date_Full_Layout)
+				v["l_submitdate"] = util.FormatDateWithObj(&data_v, util.Date_Short_Layout)
+				s_remark := v["s_remark"].(string)
+				if s_remark != "" && len(s_remark) > 40 {
+					v["s_remark"] = front.SubstrByByte(s_remark, 40)
+				}
 			}
 			res["data"] = data
 			res["currentPage"] = currentPage
@@ -118,12 +122,15 @@ func (s *SystemManage) Updateback() error {
 		_id := s.GetString("id")
 		s_submitid := s.GetString("s_submitid")
 		opinion := s.GetString("s_opinion")
-		title := s.GetString("s_title")
+		title := s.GetString("s_record")
+		if len(title) > 40 {
+			title = front.SubstrByByte(title, 40)
+		}
 		if s_submitid != "" {
 			m := &Msg{
 				Msgtype:   1,
 				Title:     "意见反馈",
-				Content:   "你好，你提交的意见反馈信息：" + title + " 我们的客服人员回复的处理意见：" + opinion,
+				Content:   "你好，你提交的有关于：" + title + "的意见反馈 我们的客服人员回复的处理意见：" + opinion,
 				ReceiveId: s_submitid,
 			}
 			m.SaveMsg()

core/src/qfw/search/search.go

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

core/src/qfw/search/searchService.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/go-xweb/xweb"
+	"gopkg.in/mgo.v2/bson"
 	"html/template"
 	"log"
 	"qfw/front"
@@ -20,6 +21,44 @@ import (
 	"strings"
 )
 
+//企业社区首页
+func (search *Search) EntCommunity() error {
+	//新认证企业
+	var newIndentEnts []interface{}
+	if ret := redis.Get("enterprise", "newIndentEnts"); ret != nil {
+		newIndentEnts = ret.([]interface{})
+	} else {
+		identEnts := Find("identification", `{"i_identificationstatus":1,"i_freeze":{"$ne":2},"i_identificationtype":{"$in":[1,5]}}`, []string{"-l_auditdate"}, `{"s_enterprisename":1,"s_enterpriseid":1}`, false, 0, 15)
+		if identEnts != nil && len(*identEnts) > 0 {
+			var enterpriseids []bson.ObjectId
+			for _, v := range *identEnts {
+				if v["s_enterpriseid"] != nil {
+					enterpriseids = append(enterpriseids, bson.ObjectIdHex(v["s_enterpriseid"].(string)))
+				}
+			}
+			if len(enterpriseids) > 0 {
+				ents := Find("enterprise", bson.M{"_id": enterpriseids}, nil, `{"s_avatar":1}`, false, -1, -1)
+				if ents != nil && len(*ents) > 0 {
+					for _, identEnt := range *identEnts {
+						for _, ent := range *ents {
+							if identEnt["s_enterpriseid"] == BsonIdToSId(ent["_id"]) {
+								identEnt["s_avatar"] = ent["s_avatar"]
+								break
+							}
+						}
+					}
+				}
+				for _, v := range *identEnts {
+					newIndentEnts = append(newIndentEnts, v)
+				}
+			}
+		}
+		redis.Put("enterprise", "newIndentEnts", newIndentEnts, 30*60) //缓存半个小时
+	}
+	search.T["newIndentEnts"] = newIndentEnts
+	return search.Render("/search/entcommunity.html", &search.T)
+}
+
 //获取某个企业服务列表数据
 func (search *Search) SearchEntSer(id string) error {
 	if search.Method() == "POST" {
@@ -147,6 +186,7 @@ func (n *Search) GetEnterpriseList(reqType, param /*参数*/ string) error {
 			"c_zb":        n.GetString("c_zb"),
 			"all":         n.GetString("all"),
 			"c_author":    n.GetString("c_author"),
+			"OpState":     n.GetString("OpState"),
 			"cityNo":      n.GetString("cityNo"), // 是否是第一次查询并且没有选择地市，自动根据IP来设
 		}
 		//查询生成列表数据
@@ -373,7 +413,14 @@ func searhWebContentent(querymap map[string]string, n *Search, reqType string) (
 			}
 			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" {
@@ -485,6 +532,7 @@ func searhWebContentent(querymap map[string]string, n *Search, reqType string) (
 	if client == nil {
 		return nil, nil
 	}
+	log.Println(query)
 	searchResult, err := client.Search().Index("enterprise").Type("enterprise").Source(query).Do()
 	if err != nil {
 		return nil, nil

core/src/qfw/swordfish/swordfishmanage.go

@@ -16,7 +16,7 @@ func (s *SwordFish) Swordfish() error {
 	} else {
 		now := time.Now()
 		unix := time.Date(now.Year(), now.Month(), now.Day(), now.Hour()-2, now.Minute(), now.Second(), now.Nanosecond(), time.Local).Unix()
-		r := mongodb.Find("bidding", bson.M{"comeintime": bson.M{"$lte": unix}}, `{"comeintime":-1}`, `{"title":1,"href":1,"publishtime":1}`, false, 0, 5)
+		r := mongodb.Find("bidding", bson.M{"comeintime": bson.M{"$lte": unix}}, `{"comeintime":-1}`, `{"title":1,"href":1,"publishtime":1}`, false, 0, 30)
 		if r != nil {
 			s.T["data"] = r
 		}
@@ -157,7 +157,7 @@ func getNewest() (list []interface{}) {
 	} else {
 		now := time.Now()
 		unix := time.Date(now.Year(), now.Month(), now.Day(), now.Hour()-2, now.Minute(), now.Second(), now.Nanosecond(), time.Local).Unix()
-		r := mongodb.Find("bidding", bson.M{"comeintime": bson.M{"$lte": unix}}, `{"comeintime":-1}`, `{"title":1,"href":1,"publishtime":1}`, false, 0, 5)
+		r := mongodb.Find("bidding", bson.M{"comeintime": bson.M{"$lte": unix}}, `{"comeintime":-1}`, `{"title":1,"href":1,"publishtime":1}`, false, 0, 30)
 		redis.Put("other", "swordfish_newest_list", *r, 30*60) //缓存半个小时
 		for _, v := range *r {
 			list = append(list, v)

core/src/qfw/yellowpage/yellowpage.go

@@ -17,8 +17,7 @@ type Yellowpage struct {
 	enterpriseInfo xweb.Mapper `xweb:"/enterprise/(\\w+).html"`
 	//根据企业注册号进入企业黄页
 	enterpriseInfoByRegNO xweb.Mapper `xweb:"/enterpriseInfoByRegNO/(\\w+).html"`
-	//获取关系网数据
-	getRelation xweb.Mapper `xweb:"/member/getRelation"`
+	getRelation           xweb.Mapper `xweb:"/member/getRelation"`
 }
 
 func (yp *Yellowpage) EnterpriseInfoByRegNO(regNO string) error {

core/src/qfw/yellowpage/yellowpagemanager.go

@@ -41,8 +41,8 @@ func FormatDate(src *interface{}) string {
 	return str
 }
 
-func GetEntInfo(id string) 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, "NB_email":1,"IndustryPhyName":1,"investor":1,"alterInfo":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,"s_email":1}`)
+func GetEntInfo(id string) map[string]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, "Nb_email":1,"IndustryPhyName":1,"investor":1,"alterInfo":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,"s_email":1,"staffinfo":1}`)
 	if res != nil && len(*res) > 0 {
 		id := (*res)["s_submitid"]
 		if id != nil {
@@ -259,6 +259,43 @@ func (yp *Yellowpage) EnterpriseInfo(id string) error {
 	} else {
 		if info := GetEntInfo(id); info != nil {
 			yp.T["res"] = info
+			regNo, _ := info["RegNo"].(string)
+			entName, _ := info["EntName"].(string)
+			relation := redis.Get("enterprise", "relation-"+regNo)
+			if relation == nil {
+				relation = makeRelation(regNo, entName)
+				redis.Put("enterprise", "relation-"+regNo, relation, 7*ONEDAY)
+			}
+			r := relation.(map[string]interface{})
+			var nodes *[]map[string]interface{}
+			var relevantEnts []map[string]interface{}
+			if d, err := json.Marshal(r["nodes"]); err == nil && json.Unmarshal(d, &nodes) == nil && len(*nodes) > 0 {
+				var regNos []string
+				for _, v := range *nodes {
+					if v["type"] == "e" {
+						regNos = append(regNos, v["name"].(string))
+						relevantEnts = append(relevantEnts, v)
+					}
+					if len(regNos) == 6 {
+						break
+					}
+				}
+				if len(regNos) > 0 {
+					ents := Find("enterprise", M{"RegNo": regNos}, nil, `{"s_avatar":1}`, false, -1, -1)
+					if ents != nil && len(*ents) > 0 {
+						for _, relevantEnt := range relevantEnts {
+							for _, ent := range *ents {
+								if ent["RegNo"] == relevantEnt["name"] {
+									ent["s_avatar"] = ent["s_avatar"]
+									ent["_id"] = util.BsonIdToSId(ent["_id"])
+									break
+								}
+							}
+						}
+					}
+				}
+			}
+			yp.T["relevantEnts"] = relevantEnts
 			contentuser, erruser := yp.Render4Cache("/yellowpage/enterpriseinfo.html", &yp.T)
 			if erruser == nil {
 				redis.PutBytes("enterprise", "enterpriseInfo_"+id, &contentuser, 7*ONEDAY)
@@ -396,10 +433,10 @@ func (yp *Yellowpage) GetRelation() error {
 		if regNo == "" || entName == "" {
 			return nil
 		}
-		relation := redis.Get("other", "relation-"+regNo)
+		relation := redis.Get("enterprise", "relation-"+regNo)
 		if relation == nil {
 			relation = makeRelation(regNo, entName)
-			redis.Put("other", "relation-"+regNo, relation, 7*ONEDAY)
+			redis.Put("enterprise", "relation-"+regNo, relation, 7*ONEDAY)
 		}
 		yp.ServeJson(M{"flag": true, "relation": relation})
 		r := relation.(map[string]interface{})

core/src/serviceclassify.json

@@ -1,7 +1,7 @@
 [
     {
         "code": "01",
-        "name": "工商、财税服务",
+        "name": "工商/财税服务",
         "image": "serviceclassify-01-new.png",
         "children": [
             {
@@ -10,33 +10,29 @@
                 "children": [
                     {
                         "code": "010101",
-                        "name": "公司注册"
+                        "name": "工商注册"
                     },
                     {
                         "code": "010102",
-                        "name": "工商年报"
+                        "name": "工商变更"
                     },
                     {
                         "code": "010103",
-                        "name": "公司注销"
-                    },
-                    {
-                        "code": "010104",
-                        "name": "公司变更"
+                        "name": "工商年报"
                     }
                 ]
             },
             {
                 "code": "0102",
-                "name": "财税服务",
+                "name": "税务服务",
                 "children": [
                     {
                         "code": "010201",
-                        "name": "代理记账"
+                        "name": "税务登记"
                     },
                     {
                         "code": "010202",
-                        "name": "财务咨询"
+                        "name": "税务筹划"
                     },
                     {
                         "code": "010203",
@@ -44,21 +40,31 @@
                     },
                     {
                         "code": "010299",
-                        "name": "其他咨询"
+                        "name": "代理报税"
                     }
                 ]
             },
             {
                 "code": "0103",
-                "name": "检测认证",
+                "name": "财务服务",
                 "children": [
                     {
                         "code": "010301",
-                        "name": "检测服务"
+                        "name": "代理记账"
                     },
                     {
                         "code": "010302",
-                        "name": "认证"
+                        "name": "财务审计"
+                    }
+                ]
+            },
+            {
+                "code": "0104",
+                "name": "认证服务",
+                "children": [
+                    {
+                        "code": "010301",
+                        "name": "认证服务"
                     }
                 ]
             }
@@ -95,11 +101,11 @@
                     },
                     {
                         "code": "020106",
-                        "name": "保险代理"
+                        "name": "保险业务"
                     },
                     {
                         "code": "020107",
-                        "name": "保险公司"
+                        "name": "融资上市"
                     }
                 ]
             }
@@ -144,14 +150,10 @@
                     },
                     {
                         "code": "030108",
-                        "name": "服装设计"
-                    },
-                    {
-                        "code": "030109",
                         "name": "产品设计"
                     },
                     {
-                        "code": "030110",
+                        "code": "030109",
                         "name": "礼品设计"
                     }
                 ]
@@ -170,58 +172,42 @@
                     },
                     {
                         "code": "030403",
-                        "name": "印刷软件"
-                    },
-                    {
-                        "code": "030404",
-                        "name": "电子出版"
-                    },
-                    {
-                        "code": "030405",
                         "name": "报刊出版"
                     },
                     {
-                        "code": "030406",
+                        "code": "030404",
                         "name": "写真喷绘"
                     },
                     {
-                        "code": "030407",
+                        "code": "030405",
                         "name": "手提袋"
                     },
                     {
-                        "code": "030408",
+                        "code": "030406",
                         "name": "印前服务"
                     },
                     {
-                        "code": "030409",
+                        "code": "030407",
                         "name": "办公文印"
                     },
                     {
-                        "code": "030410",
-                        "name": "宣传资料"
-                    },
-                    {
-                        "code": "030411",
+                        "code": "030408",
                         "name": "宣传资料"
                     },
                     {
-                        "code": "030412",
+                        "code": "030409",
                         "name": "包装印刷"
                     },
                     {
-                        "code": "030413",
+                        "code": "030410",
                         "name": "卡类印刷"
                     },
                     {
-                        "code": "030414",
+                        "code": "030411",
                         "name": "特殊印刷"
                     },
                     {
-                        "code": "030415",
-                        "name": "办公用品"
-                    },
-                    {
-                        "code": "030416",
+                        "code": "030412",
                         "name": "标签产品"
                     }
                 ]
@@ -270,20 +256,40 @@
     },
     {
         "code": "04",
-        "name": "人力资源、招聘服务",
+        "name": "人力资源服务",
         "image": "serviceclassify-04-new.png",
         "children": [
             {
                 "code": "0401",
-                "name": "人力资源服务",
+                "name": "人力资源体系建设",
                 "children": [
                     {
                         "code": "040101",
-                        "name": "人力资源咨询"
+                        "name": "人力资源规划"
                     },
                     {
                         "code": "040102",
-                        "name": "人力资源外包"
+                        "name": "招聘"
+                    },
+                    {
+                        "code": "040103",
+                        "name": "培训"
+                    },
+                    {
+                        "code": "040104",
+                        "name": "绩效管理"
+                    },
+                    {
+                        "code": "040105",
+                        "name": "薪酬管理"
+                    },
+                    {
+                        "code": "040106",
+                        "name": "劳动关系管理"
+                    },
+                    {
+                        "code": "040107",
+                        "name": "企业文化建设"
                     }
                 ]
             },
@@ -293,51 +299,74 @@
                 "children": [
                     {
                         "code": "040201",
-                        "name": "销售人员招聘"
+                        "name": "猎头服务"
                     },
                     {
                         "code": "040202",
-                        "name": "技术人员招聘"
+                        "name": "招聘外包"
                     },
                     {
                         "code": "040203",
-                        "name": "管理人员招聘"
-                    },
+                        "name": "职业介绍"
+                    }
+                ]
+            },{
+                "code": "0403",
+                "name": "培训服务",
+                "children": [
                     {
-                        "code": "040204",
-                        "name": "外贸人员招聘"
+                        "code": "040301",
+                        "name": "职业培训"
                     },
                     {
-                        "code": "040205",
-                        "name": "设计人员招聘"
+                        "code": "040302",
+                        "name": "就业培训"
                     },
                     {
-                        "code": "040206",
-                        "name": "翻译人员招聘"
+                        "code": "040303",
+                        "name": "管理培训"
+                    }
+                ]
+            },{
+                "code": "0404",
+                "name": "人事代理",
+                "children": [
+                    {
+                        "code": "040401",
+                        "name": "档案挂靠"
                     },
                     {
-                        "code": "040207",
-                        "name": "兼职职位"
+                        "code": "040402",
+                        "name": "社保代理"
                     },
                     {
-                        "code": "040208",
-                        "name": "财务会计人员招聘"
+                        "code": "040403",
+                        "name": "户口挂靠"
                     },
                     {
-                        "code": "040209",
-                        "name": "采购后勤人员招聘"
+                        "code": "040404",
+                        "name": "职称评定"
                     },
                     {
-                        "code": "040210",
-                        "name": "行政人事人员招聘"
+                        "code": "040405",
+                        "name": "组织关系挂靠"
+                    }
+                ]
+            },{
+                "code": "0405",
+                "name": "劳务派遣",
+                "children": [
+                    {
+                        "code": "040501",
+                        "name": "完全派遣"
                     },
                     {
-                        "code": "040211",
-                        "name": "客户服务人员招聘"
+                        "code": "040502",
+                        "name": "转移派遣"
                     },
                     {
-                        "code": "040212",
-                        "name": "物流仓储人员招聘"
+                        "code": "040503",
+                        "name": "短期或项目派遣"
                     }
                 ]
             }
@@ -345,7 +374,7 @@
     },
     {
         "code": "05",
-        "name": "法律服务、知识产权",
+        "name": "法律服务/知识产权",
         "image": "serviceclassify-05-new.png",
         "children": [
             {
@@ -354,7 +383,10 @@
                 "children": [
                     {
                         "code": "050101",
-                        "name": "法律服务"
+                        "name": "法律咨询"
+                    },{
+                        "code": "050101",
+                        "name": "法律代理"
                     }
                 ]
             },
@@ -384,78 +416,34 @@
     },
     {
         "code": "06",
-        "name": "教育培训、管理咨询",
+        "name": "管理咨询和创业辅导",
         "image": "serviceclassify-06-new.png",
         "children": [
             {
                 "code": "0601",
-                "name": "教育培训",
+                "name": "管理咨询",
                 "children": [
                     {
                         "code": "060101",
-                        "name": "管理培训"
+                        "name": "企业内诊"
                     },
                     {
                         "code": "060102",
-                        "name": "职业培训"
-                    },
-                    {
-                        "code": "060103",
-                        "name": "资格考试培训"
-                    },
-                    {
-                        "code": "060104",
-                        "name": "语言培训"
-                    },
-                    {
-                        "code": "060105",
-                        "name": "拓展培训"
-                    },
-                    {
-                        "code": "060106",
-                        "name": "经理人培训"
-                    },
-                    {
-                        "code": "060107",
-                        "name": "专业技能培训"
-                    },
-                    {
-                        "code": "060108",
-                        "name": "内审员培训"
-                    },
-                    {
-                        "code": "060199",
-                        "name": "其他教育培训"
+                        "name": "流程再造"
                     }
                 ]
             },
             {
                 "code": "0602",
-                "name": "管理咨询",
+                "name": "创业辅导",
                 "children": [
                     {
                         "code": "060201",
-                        "name": "战略咨询"
+                        "name": "产业链整合"
                     },
                     {
                         "code": "060202",
-                        "name": "政策法规"
-                    },
-                    {
-                        "code": "060203",
-                        "name": "企业文化"
-                    },
-                    {
-                        "code": "060204",
-                        "name": "风险管理"
-                    },
-                    {
-                        "code": "060205",
-                        "name": "认证咨询"
-                    },
-                    {
-                        "code": "060206",
-                        "name": "市场营销咨询"
+                        "name": "创业孵化"
                     }
                 ]
             }
@@ -613,87 +601,136 @@
     },
     {
         "code": "09",
-        "name": "营销推广",
+        "name": "教育培训",
         "image": "serviceclassify-09-new.png",
         "children": [
             {
                 "code": "0901",
-                "name": "营销推广",
+                "name": "教育培训",
                 "children": [
                     {
                         "code": "090101",
-                        "name": "搜索引擎优化"
+                        "name": "管理培训"
                     },
                     {
                         "code": "090102",
-                        "name": "微信营销"
+                        "name": "职业培训"
                     },
                     {
                         "code": "090103",
-                        "name": "微博营销"
+                        "name": "资格考试培训"
                     },
                     {
                         "code": "090104",
-                        "name": "阿里搜索"
+                        "name": "语言培训"
                     },
                     {
                         "code": "090105",
-                        "name": "SNS营销"
+                        "name": "拓展培训"
                     },
                     {
                         "code": "090106",
+                        "name": "经理人培训"
+                    },
+                    {
+                        "code": "090107",
+                        "name": "专业技能培训"
+                    },
+                    {
+                        "code": "090108",
+                        "name": "内审员培训"
+                    },
+                    {
+                        "code": "090109",
+                        "name": "其他教育培训"
+                    }
+                ]
+            }
+        ]
+    },
+	{
+        "code": "10",
+        "name": "营销推广",
+        "image": "serviceclassify-10-new.png",
+        "children": [
+            {
+                "code": "1001",
+                "name": "营销推广",
+                "children": [
+                    {
+                        "code": "100101",
+                        "name": "搜索引擎优化"
+                    },
+                    {
+                        "code": "100102",
+                        "name": "微信营销"
+                    },
+                    {
+                        "code": "100103",
+                        "name": "微博营销"
+                    },
+                    {
+                        "code": "100104",
+                        "name": "阿里搜索"
+                    },
+                    {
+                        "code": "100105",
+                        "name": "SNS营销"
+                    },
+                    {
+                        "code": "100106",
                         "name": "网络视频营销"
                     },
                     {
-                        "code": "090199",
+                        "code": "100199",
                         "name": "其他网络营销"
                     }
                 ]
             },
             {
-                "code": "0902",
+                "code": "1002",
                 "name": "文案策划",
                 "children": [
                     {
-                        "code": "090201",
+                        "code": "100201",
                         "name": "广告文案"
                     },
                     {
-                        "code": "090202",
+                        "code": "100202",
                         "name": "品牌策划"
                     },
                     {
-                        "code": "090203",
+                        "code": "100203",
                         "name": "网站策划"
                     },
                     {
-                        "code": "090204",
+                        "code": "100204",
                         "name": "企业文宣"
                     },
                     {
-                        "code": "090205",
+                        "code": "100205",
                         "name": "经济合同"
                     }
                 ]
             },
             {
-                "code": "0903",
+                "code": "1003",
                 "name": "广告服务",
                 "children": [
                     {
-                        "code": "090301",
+                        "code": "100301",
                         "name": "广告制作"
                     },
                     {
-                        "code": "090302",
+                        "code": "100302",
                         "name": "广告策划"
                     },
                     {
-                        "code": "090303",
+                        "code": "100303",
                         "name": "广告代理"
                     },
                     {
-                        "code": "090399",
+                        "code": "100399",
                         "name": "其他广告服务"
                     }
                 ]
@@ -701,177 +738,136 @@
         ]
     },
     {
-        "code": "10",
+        "code": "11",
         "name": "日常服务",
-        "image": "serviceclassify-10-new.png",
+        "image": "serviceclassify-11-new.png",
         "children": [
             {
-                "code": "1001",
+                "code": "1101",
                 "name": "日常服务",
                 "children": [
                     {
-                        "code": "100101",
+                        "code": "110101",
                         "name": "物业管理"
                     },
                     {
-                        "code": "100102",
+                        "code": "110102",
                         "name": "安全保卫"
                     },
                     {
-                        "code": "100103",
+                        "code": "110103",
                         "name": "宽带安装"
                     },
                     {
-                        "code": "100104",
+                        "code": "110104",
                         "name": "电话安装"
                     },
                     {
-                        "code": "100105",
+                        "code": "110105",
                         "name": "桶装饮用水"
                     }
                 ]
-            },
-            {
-                "code": "1002",
+            }, {
+                "code": "1102",
                 "name": "中介服务",
                 "children": [
                     {
-                        "code": "100201",
+                        "code": "110201",
                         "name": "房地产中介"
                     },
                     {
-                        "code": "100202",
-                        "name": "人才中介"
-                    },
-                    {
-                        "code": "100299",
+                        "code": "110202",
                         "name": "其他中介服务"
                     }
                 ]
-            },
-            {
-                "code": "1003",
+            }, {
+                "code": "1103",
                 "name": "搬迁服务",
                 "children": [
                     {
-                        "code": "100301",
+                        "code": "110301",
                         "name": "设备搬迁"
                     },
                     {
-                        "code": "100302",
+                        "code": "110302",
                         "name": "公司搬家"
                     },
                     {
-                        "code": "100303",
+                        "code": "110303",
                         "name": "厂房搬迁"
                     },
                     {
-                        "code": "100304",
+                        "code": "110304",
                         "name": "长途搬迁"
                     }
                 ]
-            },
-            {
-                "code": "1004",
+            }, {
+                "code": "1104",
                 "name": "物流服务",
                 "children": [
                     {
-                        "code": "100401",
+                        "code": "110401",
                         "name": "商检报关"
                     },
                     {
-                        "code": "100402",
+                        "code": "110402",
                         "name": "仓储配送"
                     },
                     {
-                        "code": "100403",
+                        "code": "110403",
                         "name": "特种物流"
                     },
                     {
-                        "code": "100404",
+                        "code": "110404",
                         "name": "货代"
                     },
                     {
-                        "code": "100405",
+                        "code": "110405",
                         "name": "快递"
-                    },
-                    {
-                        "code": "100406",
+                    },{
+                        "code": "110406",
                         "name": "国内水运"
                     },
                     {
-                        "code": "100407",
+                        "code": "110407",
                         "name": "国际海运"
                     },
                     {
-                        "code": "100408",
+                        "code": "110408",
                         "name": "国内陆运"
                     },
                     {
-                        "code": "100409",
+                        "code": "110409",
                         "name": "国内空运"
                     },
                     {
-                        "code": "100410",
+                        "code": "110410",
                         "name": "国际空运"
                     }
                 ]
             }
         ]
     },
-    {
-        "code": "11",
-        "name": "创业辅导服务",
-        "image": "serviceclassify-11-new.png",
-        "children": [
-            {
-                "code": "1101",
-                "name": "创业辅导服务",
-                "children": [
-                    {
-                        "code": "110101",
-                        "name": "创业指导咨询"
-                    },
-                    {
-                        "code": "110102",
-                        "name": "创业技术支持"
-                    },
-                    {
-                        "code": "110103",
-                        "name": "创业项目资源库"
-                    },
-                    {
-                        "code": "110104",
-                        "name": "创业孵化基地"
-                    }
-                ]
-            }
-        ]
-    },
     {
         "code": "12",
-        "name": "校企合作服务",
+        "name": "扶持资金申请",
         "image": "serviceclassify-12-new.png",
         "children": [
             {
                 "code": "1201",
-                "name": "校企合作服务",
+                "name": "扶持资金申请",
                 "children": [
                     {
                         "code": "120101",
-                        "name": "技术对接"
+                        "name": "创新基金"
                     },
                     {
                         "code": "120102",
-                        "name": "教师驻企"
+                        "name": "专项资金"
                     },
                     {
                         "code": "120103",
-                        "name": "合作生产"
-                    },
-                    {
-                        "code": "120104",
-                        "name": "订单培养"
+                        "name": "项目备案"
                     }
                 ]
             }
@@ -879,16 +875,25 @@
     },
     {
         "code": "13",
-        "name": "产业链整合服务",
+        "name": "校企合作服务",
         "image": "serviceclassify-13-new.png",
         "children": [
             {
                 "code": "1301",
-                "name": "产业链整合服务",
+                "name": "校企合作服务",
                 "children": [
                     {
                         "code": "130101",
-                        "name": "产业链整合"
+                        "name": "技术对接"
+                    },{
+                        "code": "130102",
+                        "name": "教师驻企"
+                    },{
+                        "code": "130103",
+                        "name": "合作生产"
+                    },{
+                        "code": "130104",
+                        "name": "订单培养"
                     }
                 ]
             }

core/src/timetask.json

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

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

@@ -295,6 +295,9 @@ a{
 	margin-right: 30px !important;
 }
 /*padding*/
+.padding-b-0{
+	padding-bottom: 0px !important;
+}
 .padding-lr-10 {
 	padding-left: 10px !important;
 	padding-right: 10px !important;
@@ -2597,6 +2600,17 @@ style="color:#D03102;margin-right:5px;"
 .u-weightsmall{
 	font-weight:200;
 }
+.b-adver .b-adver-title{
+	background-color: #F7F8FA;
+	line-height: 40px;
+	font-size: 16px;
+	padding-left: 20px;
+	border-bottom: 1px solid #e5e6e9;
+	font-weight: bold;
+}
+.b-adver .b-adver-content{
+	padding: 5px;
+}
 /*积分签到(连续)*/
 #bookin .modal-dialog{
 	width:535px;

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

@@ -92,6 +92,157 @@ a:focus, a:hover{
 	display: inline-block;
 	padding-left: 100px;
 }
+.entlist-page .b-right-content{
+	padding: 0px;
+}
+.entlist-page .entlist-hotsearchwords a{
+	display: inline-block;
+	margin: 10px;
+}
+.b-scroll-list .b-adver-content{
+	padding: 0px 10px 10px 10px;
+	max-height: 600px;
+	overflow-y: hidden;
+}
+.b-scroll-list img{
+	width: 50px;
+	height: 50px;
+	margin-right: 5px;
+}
+.b-scroll-list ul{
+	float: left;
+}
+.b-scroll-list li{
+	width: 100%;
+	margin-top: 10px;
+	border-top: 1px dashed #e5e6e9;
+	padding-top: 10px;
+}
+.b-scroll-list li>div>*{
+	display: inline-block;
+}
+.b-scroll-list li>div>a{
+	width: 165px;
+	vertical-align: middle;
+}
+/*********企业社区首页*****************/
+.ent-indexpage .b-left{
+	padding: 0px;
+	background-color: transparent;
+}
+.ent-indexpage .ent-index-search{
+	height: 380px;
+	background-image: url("/images/entcommunity/entsearch-bg.png");
+	background-repeat: no-repeat;
+	background-size: 100% 100%;
+	padding-left: 100px;
+	padding-top: 95px;
+}
+.ent-indexpage .ent-index-search>div{
+	margin-top: 10px;
+}
+.ent-indexpage .ent-index-search>.b-com-first{
+	font-size: 28px;
+	color: #ffffff;
+}
+.ent-indexpage .ent-index-search>.b-com-second{
+	font-size: 16px;
+	color: #a0a0a0;
+}
+.ent-indexpage .ent-index-search>.b-com-third{
+	font-size: 18px;
+	width: 70%;
+}
+.ent-indexpage .ent-index-search>.b-com-third>input{
+	font-size: inherit;
+	height: 45px;
+}
+.ent-indexpage .ent-index-search>.b-com-third>span{
+	height: 45px;
+	border-width: 0px;
+	background-color: #16A086;
+	color: #ffffff;
+	font-size: inherit;
+	border-radius: 0px;
+	padding-left: 20px;
+	padding-right: 20px;
+	cursor: pointer;
+}
+.ent-indexpage .ent-index-search .glyphicon{
+	margin-right: 5px;
+	font-size: 16px;
+}
+.ent-indexpage .ent-index-search>.b-com-fourth{
+	margin-top: 15px;
+	color: #ffffff;
+}
+.ent-indexpage .ent-index-search>.b-com-fourth>a{
+	margin-right: 5px;
+	color: #ffffff;
+}
+.ent-indexpage .ent-index-search>.b-com-fourth>a:hover{
+	color: #16A086;
+}
+.ent-indexpage .ent-index-recommend{
+	margin-top: 15px;
+	padding: 15px;
+	background-color: #ffffff;
+}
+.ent-indexpage .ent-index-recommend .b-com-title{
+	padding-bottom: 5px;
+	border-bottom: 1px solid #DFE0E2;
+	font-size: 18px;
+	padding-left: 5px;
+	margin-bottom: 15px;
+}
+.ent-indexpage .ent-index-recommend .b-com-title>span{
+	color: #16a086;
+	margin-right: 5px;
+}
+.ent-indexpage .ent-index-recommend .carousel-inner li{
+	width: 200px;
+	text-align: center;
+	margin-left: 20px;
+	margin-bottom: 20px;
+}
+.ent-indexpage .ent-index-recommend .carousel-inner img{
+	width: 90px;
+	height: 90px;
+}
+.ent-indexpage .ent-index-recommend .carousel-inner a{
+	display: block;
+	margin-top: 5px;
+}
+.ent-indexpage .carousel-indicators{
+	bottom: 0px;
+}
+.ent-indexpage .carousel-indicators li>img{
+	display: none;
+	width: 25px;
+	height: 25px;
+}
+.ent-indexpage .carousel-indicators li{
+	background-color: #585E64;
+	margin-left: 15px;
+	margin-right: 15px;
+}
+.ent-indexpage .carousel-indicators li.active{
+	background-color: transparent;
+	width: 25px;
+	height: 25px;
+	vertical-align: sub;
+}
+.ent-indexpage .carousel-indicators li.active>img{
+	background-color: transparent;
+	display: block;
+	margin-top: 2px;
+}
+.ent-indexpage .carousel{
+	padding-bottom: 50px;
+}
+.ent-indexpage .b-scroll-list .b-adver-content{
+	max-height: 750px;
+}
 /*********企业画像***************/
 .entinfo-page .b-com-head{
 	background-color: #FFFFFF;
@@ -296,7 +447,7 @@ a:focus, a:hover{
 	text-overflow: ellipsis;
 	overflow: hidden;
 	white-space: nowrap;
-	width: 350px;
+	width: 240px;
 	display: inline-block;
 }
 .entinfo-basicinfo .entinfo-round>a{
@@ -332,14 +483,14 @@ a:focus, a:hover{
 }
 /*注册资本*/
 .entinfo-basicinfo .entinfo-regcap{
-	right: 400px;
+	right: 410px;
 	top: 107px;
 	text-align: right;
 }
 .entinfo-basicinfo .entinfo-regcap>img{
-	width: 36px;
-	height: 36.5px;
-	right: -40px !important;
+	width: 52px;
+	height: 34px;
+	right: -55px !important;
 }
 .entinfo-basicinfo .entinfo-regcap-round{
 	top: 120px;
@@ -421,8 +572,8 @@ a:focus, a:hover{
 	top: -28px;
 }
 .entinfo-basicinfo .entinfo-operperiod>img{
-	width: 49.5px;
-	height: 49.5px;
+	width: 42px;
+	height: 44px;
 	left: -50px;
 }
 .entinfo-basicinfo .entinfo-operperiod-round{
@@ -504,35 +655,34 @@ a:focus, a:hover{
   height: 100%;
   background-color:#fff;
 }
-:-moz-full-screen {
-	background: #fff; 
+:-moz-full-screen{
+	background: #fff;
 }
-:-webkit-full-screen {
-	background: #fff; 
+:-webkit-full-screen{
+	background: #fff;
 }
 :-o-full-screen{
-	background: #fff; 
+	background: #fff;
 }
 :-ms-full-screen{
-	background: #fff; 
+	background: #fff;
 }
-:fullscreen {
-	background: #fff; 
+:fullscreen{
+	background: #fff;
 } 
-:-ms-fullscreen {
-	background: #fff; 
+:-ms-fullscreen{
+	background: #fff;
 } 
-:full-screen {
-	background: #fff; 
+:full-screen{
+	background: #fff;
 }
 .ent-findnull{
 	text-align: center;
 	padding: 50px 0px;
 }
 .entrelation-limit>div{
-	border-bottom: 1px solid #e5e6e9;
 	padding-top: 50px;
-	padding-bottom: 85px;
+	padding-bottom: 50px;
 }
 .entrelation-limit>img{
 	margin-top: 10px;
@@ -542,10 +692,7 @@ a:focus, a:hover{
 	width: 200px;
 }
 /*************产品服务******************/
-.ent-service{
-	padding: 0px 20px;
-}
-.ent-service td img{
+.ent-yellowpage td img{
 	width: 110px;
 	height: 101px;
 }
@@ -614,6 +761,89 @@ a:focus, a:hover{
 .ent-alterinfo li>div>div:last-of-type{
 	color: #A0A0A0;
 }
+/************主要人员****************/
+.ent-mainpersons{
+	padding-left: 25px;
+}
+.ent-mainpersons img{
+	width: 89px;
+	height: 90px;
+	display: inline-block;
+	vertical-align: top;
+}
+.ent-mainpersons span{
+	display: inline-block;
+	vertical-align: top;
+	margin-top: 25px;
+	text-align: center;
+}
+.ent-mainpersons>div>div{
+	display: inline-block;
+	border: 1px solid #e5e6e9;
+	border-radius: 5px;
+	padding: 10px 0px 10px 10px;
+}
+.ent-mainpersons font{
+	display: block;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	white-space: nowrap;
+	width: 115px;
+}
+.ent-mainpersons .b-com-name{
+	font-weight: bold;
+	font-size: 16px;
+	margin-bottom: 5px;
+}
+.ent-mainpersons .ent-positionName{
+	color: #a0a0a0;
+}
+.ent-mainpersons .staffinfo-horizontal{
+	width: 25px;
+	height: 1px;
+	background-color: #e5e6e9;
+	display: inline-block;
+	vertical-align: top;
+	margin-top: 55px;
+}
+.ent-mainpersons .staffinfo-vertical{
+	width: 1px;
+	height: 20px;
+	background-color: #e5e6e9;
+	display: block;
+	margin-left: 105px;
+}
+/************左右布局****************/
+.entinfo-page .b-scroll-list .b-adver-content{
+	overflow-y: visible;
+	max-height: none;
+}
+.entinfo-page .b-right{
+	margin-top: 10px;
+	float: none;
+	margin-left: 5px;
+}
+.entinfo-page .b-right .newsInfo ul{
+	padding-left: 5px;
+}
+.entinfo-page .b-right .newsInfo li{
+	width: 100%;
+	border-left: 1px solid #F7F8FA;
+	padding: 10px 10px 0px 15px;
+}
+.entinfo-page .b-right .newsInfo img{
+	width: 10px;
+	height: 10px;
+	margin: 0px 10px 5px -20px;
+}
+.entinfo-page .b-right span{
+	margin-bottom: 5px;
+	color: #A0A0A0;
+}
+.entinfo-page .b-right .newsInfo{
+	padding-top: 0px;
+	padding-bottom: 10px;
+}
 /************公用****************/
 .ent-layout-up{
 	padding: 0px 20px;

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

@@ -64,6 +64,11 @@ a:focus, a:hover{
 }
 .b-right>div{
 	padding-left: 10px;
+	max-height: 800px;
+	overflow-y: hidden;
+}
+.swordfish-index .b-right>div{
+	max-height: 650px;
 }
 .swordfish-right-title{
 	background-color: #F7F8FA;
@@ -265,14 +270,14 @@ a:focus, a:hover{
 	display: inline-block;
 	height: inherit;
 	vertical-align: top;
-	height: 604px;
+	height: 552px;
 }
 .swordfish-guide{
 	padding-left: 20px;
 	padding-right: 20px;
 }
 .swordfish-guide .carousel-inner{
-	width: 813px;
+	width: 825px;
 	left: 50%;
 	margin-left: -406.4px;
 }

core/src/web/staticres/js/enterprise.js

@@ -68,6 +68,8 @@ function reloadData(obj,name){
 	
 	
 	//搜索表单提交
+	$("#searchForm input[name=OpState]").val("");
+	$("#searchForm input[name=c_author]").val("");
 	$("#searchForm input[name="+name+"]").val(val);
 	
     document.forms['searchForm'].submit();

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

@@ -3,6 +3,89 @@ var relation = null;
 var serviceList = null;
 //解析服务列表
 $(function(){
+	//右侧最新消息
+	$.post("/front/webcontent/getLatestNews",null,function(r){
+		var html = '<ul>';
+		for(var i=0;i<r.length;i++){
+			html += '<li><span><img src="/images/swordfish/circle.png">'
+					+new Date(Number(r[i].releasetime+"000")).Format("yyyy-MM-dd hh:mm:ss")
+					+'</span><br><a href="/front/webcontent/'+r[i]._id+'.html">'+r[i].s_title+'</a></li>';
+		}
+		$(".newsInfo").html(html+'</ul><div class="clearfix"></div>');
+	});
+	//主要人员
+	if(typeof(staffinfo) != "undefined" && staffinfo != null && staffinfo.length > 0){
+		var staffinfos1 = [],staffinfos2 = [],staffinfos3 = [],staffinfos4 = [];
+		for(var i=0;i<staffinfo.length;i++){
+			switch(staffinfo[i].Position){
+				case "410A":
+				case "410B":
+				case "410C":
+				case "431A":
+				case "431B":
+					staffinfos1.push(staffinfo[i]);
+					break;
+				case "432A":
+				case "432K":
+					staffinfos2.push(staffinfo[i]);
+					break;
+				case "434Q":
+				case "434R":
+				case "436A":
+					staffinfos3.push(staffinfo[i]);
+					break;
+				default:
+					staffinfos4.push(staffinfo[i]);
+					break;
+			}
+		}
+		staffinfos1.sort(function(a,b){return a.Position-b.Position});
+		staffinfos2.sort(function(a,b){return a.Position-b.Position});
+		staffinfos3.sort(function(a,b){return a.Position-b.Position});
+		staffinfos4.sort(function(a,b){return a.Position-b.Position});
+		var hm = '<div class="ent-mainpersons">';
+		//计算出一行可以放几个
+		var maxCout = parseInt($(".ent-tab-content").width() / 241);
+		var verticalFlag = false;
+		var appendStaffinfo = function(obj,index){
+			var tmp = 0;
+			for(var i=0;i<obj.length;i++){
+				tmp++;
+				if(i==0){
+					hm+='<div class="staffinfo-level-'+index+'">';
+					if(verticalFlag){
+						hm+='<a class="staffinfo-vertical"></a>';
+					}
+				}
+				verticalFlag = true;
+				hm+='<div><img src="/images/entcommunity/mainperson'+index+'.png">'
+					+'<span><font class="b-com-name">'+obj[i].Name+'</font><font class="ent-positionName">'+obj[i].PositionName+'</font></span></div>';
+				//竖线
+				if(tmp == maxCout){
+					hm+='<a class="staffinfo-vertical"></a>';
+				}
+				//横线
+				if(i != obj.length-1){
+					if(tmp <= maxCout-1){
+						hm+='<a class="staffinfo-horizontal"></a>';
+					}else{
+						tmp = 0;
+					}
+				}
+				if(i==obj.length-1){
+					hm+='</div>';
+				}
+			}
+		}
+		appendStaffinfo(staffinfos1,1);
+		appendStaffinfo(staffinfos2,2);
+		appendStaffinfo(staffinfos3,3);
+		appendStaffinfo(staffinfos4,4);
+		hm+='</div>';
+		$(".ent-mainperson").html(hm);
+	}else{
+		$(".ent-mainperson .ent-findnull").removeClass("hide");
+	}
 	//联系地址
 	if($address){
 		loadJS("/js/jquery.cxselect.js",function(){
@@ -118,11 +201,12 @@ function initRelation(){
 function ServiceList(){
 	loadJS("/js/paging.js",function(){
 		paging = new Paging("serviceListPaging","/front/findServiceByEntId",{entId:entId},6,function(r){
-			if(r.length == 0){
-				$("#serviceList").next(".ent-findnull").removeClass("hide");
-				$("#serviceList").remove();
+			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;
@@ -161,12 +245,13 @@ function ServiceList(){
 			}
 			$("#serviceListPaging").parent().prevAll().remove();
 			$("#serviceListPaging").parent().before(html);
-			/*$(".ent-serviceintroduction").each(function(){
-				console.info($(this).height() +"------"+ $(this).children("div").height());
-				if($(this).height() < $(this).children("div").height()){
-					$(this).parent().append("......");
+			$(".ent-serviceintroduction").each(function(){
+				var text = $(this).text();
+				if(text.length > 200){
+					text = text.substring(0,150)+"...";
 				}
-			});*/
+				$(this).html(text);
+			});
 		});
 	});
 }

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

@@ -75,7 +75,7 @@ Relation.prototype.init = function(){
 	htmls= htmls+ "<div class='legend-text-bg' style='margin-top: 10px;margin-bottom: 10px;'><div style='background-color: #cecece;'></div><span style='margin-left: 5px;'>注吊销企业</span></div>";
 	htmls= htmls+ "<div><span style='font-size: 20px;font-weight: bold;color: #cecece;'>→</span><span style=''>投资关系（股东→企业）</span></div>";
 	htmls= htmls+ "<div><span style='font-size: 20px;font-weight: bold;color: #cd93d7;'>→</span><span style=''>法定代表人</span></div>";
-	htmls= htmls+ "<div style='margin:10px 0px;' class='hidden-sm hidden-xs'><span class='text-muted'>提示：点击鼠标右键可以删除不想看的节点。</span></div>";
+	//htmls= htmls+ "<div style='margin:10px 0px;' class='hidden-sm hidden-xs'><span class='text-muted'>提示：点击鼠标右键可以删除不想看的节点。</span></div>";
 	htmls= htmls+"</div>"
 	$("#entrelation").append(htmls);
 	try{	

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

@@ -11,7 +11,7 @@
 	<div class="container-fluid text-center qfw-bottom">
 		<div class="text-center hidden-xs"><img src="/images/bottom_logo.png"/></div>
 		<div class="qfw-bottom-text text-center">
-			<a href="/front/webaboutcontent/55933e99af53742bce0000ed.html">关于我们</a><span>|</span><a href="/front/webaboutcontent/55933eefaf53742bce00010c.html">联系我们</a><span>|</span>&nbsp;&nbsp;<span style="color:white">法律声明&nbsp;&nbsp;&nbsp;&nbsp;</span><span>|</span><a href="/front/web_helpcenterlist.html">帮助中心</a><span>|</span><a href="/front/web_feedbacklist.html">意见反馈</a>
+			<a href="/front/web_A_help.html">关于我们</a><span>|</span><a href="/front/web_L_help.html">联系我们</a><span>|</span>&nbsp;&nbsp;<span style="color:white">法律声明&nbsp;&nbsp;&nbsp;&nbsp;</span><span>|</span><a href="/front/web_H_help.html">帮助中心</a><span>|</span><a href="/front/web_O_help.html">意见反馈</a>
 			<div style="line-height:25px">©2015 拓普丰联&nbsp;版权所有<span>&nbsp;|&nbsp;</span>豫ICP备15016539号-1</div>
 		</div>
 	</div>

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

@@ -4,7 +4,7 @@
 	<div class="b-nav index-new-nva">
 		<ul>
 			<li class="b-nav-logo"><a href="/"><img src="/images/logo.png" class="logo"></a></li>
-			<li class="b-nav-link b-nav-main"><a href="/search/enterprise/ent.html">企业社区</a></li>
+			<li class="b-nav-link b-nav-main"><a href="/front/entCommunity.html">企业社区</a></li>
 			<li class="b-h-search">
 				<div class="input-group">
 			        <div class="input-group-btn hide">
@@ -12,11 +12,13 @@
 			        </div> <!--/btn-group -->
 					<form method="post" id="searchForm" action="/search/enterprise/ent.html">
 						<span id="searchFormBtn"><i class="glyphicon sousuo"></i></span>
-				        <input type="text" name="words" class="form-control" id="header-searchInput" placeholder="找企业" value="{{if .T.querymap}}{{index .T.querymap "query"}}{{end}}">
+				        <input type="text" class="form-control" id="header-searchInput" placeholder="找企业" value="{{if .T.querymap}}{{index .T.querymap "query"}}{{end}}">
+						<input type="hidden" name="words" value="{{if .T.querymap}}{{index .T.querymap "query"}}{{end}}">
 						{{if .T.querymap}}
 						<input type="hidden" name="city" id="city" value="{{index .T.querymap "city"}}">
 						<input type="hidden" name="cityNo" id="cityNo" value="{{index .T.querymap "cityNo"}}">
 						<input type="hidden" name="c_author" id="hauthor" value="{{index .T.querymap "c_author"}}">
+						<input type="hidden" name="OpState" value="{{index .T.querymap "OpState"}}">
 						<input type="hidden" name="c_hfl" id="hfl" value="{{index .T.querymap "c_hfl"}}">
 						<input type="hidden" name="c_zb" id="zb" value="{{index .T.querymap "c_zb"}}">
 						{{end}}
@@ -63,4 +65,35 @@ $(function (){
 		}
 	});
 });
+function scrollUp(id){
+	if($("#"+id+" .b-adver-content ul").height() > $("#"+id+" .b-adver-content").height()){
+		var marginTop = 0;
+		var firstHeight = $("#"+id+"  .b-adver-content ul>li:first").height();
+		if($("#"+id+" .b-adver-content ul").height() - $("#"+id+" .b-adver-content").height() < firstHeight+20){
+			$("#"+id+" .b-adver-content").css("max-height","none"); 
+			return;
+		}
+		var recommendInterval = null;
+		var recommendScroll = function(){
+			recommendInterval = setInterval(function(){
+				marginTop++;
+				$("#"+id+" .b-adver-content ul").css("margin-top","-"+marginTop);
+				if(firstHeight+20 == marginTop){
+					marginTop = 0;
+					$("#"+id+" .b-adver-content ul>li:first").removeClass("border-t-0");
+					$("#"+id+" .b-adver-content ul").append($("#"+id+" .b-adver-content ul>li:first")).css("margin-top",0);
+					firstHeight = $("#"+id+" .b-adver-content ul>li:first").height();
+				}
+			},50);
+		}
+		recommendScroll();
+		$("#"+id+" .b-adver-content ul").hover(function(){
+			if(recommendInterval != null){
+				clearInterval(recommendInterval);
+			}
+		},function(){
+			recommendScroll();
+		});
+	}
+}
 </script>

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

@@ -0,0 +1,52 @@
+<!---->
+<div class="index-new-head b-head">
+	{{include "/common/top.html"}}
+	<div class="b-nav index-new-nva">
+		<ul>
+			<li class="b-nav-logo index-new-nva-l"><a href="/"><img src="/images/logo.png" class="logo"></a></li>
+			
+		</ul>
+	</div>
+</div>
+<!--
+<script type="text/javascript">
+var isMobile = false;
+var keyCode=0;
+document.onkeydown=function(event){
+    var e = event || window.event || arguments.callee.caller.arguments[0];
+    if(e && e.keyCode==13){ // enter 键
+        keyCode=13
+    }
+};
+$(function (){
+	isMobile = !$("#b-loginStatus").is(":visible");
+	$("#searchFormBtn").click(function(){
+		keyCode = 13;
+		$("form#searchForm").submit();
+	});
+	$("form#searchForm").submit(function(){
+		var input_val = $(this).children("[type='text']").val().replace(/^\s+|\s+$/g,"");
+		if(input_val==""){
+			input_val = $("#header-searchInput").attr('placeholder');
+		}
+		if (keyCode==13){
+	 		if(input_val==""||input_val=="请输入关键字"){
+				keyCode=0;
+				return false;
+			}else {
+				$("input[name='words']").val(input_val);
+				keyCode=0;
+				return true;
+			}	
+		}
+	});
+	//
+	$("[id='releaseService']").click(function(){
+		if(isLogined){
+			window.location.href = "/front/reurl";
+		}else{
+			loginModalShow(6);
+		}
+	});
+});
+</script>-->

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

@@ -68,7 +68,7 @@ function loginModalShow(lbt){
 	$("#wxPic").attr("src","");
 	$.post("/front/wxlogin/getNum",function(data){
 		if(data&&data.num){		
-			$("#wxPic").attr("src","/weixin/sso/"+data.num);
+			$("#wxPic").attr("src","http://wxs.qimingxing.info/weixin/sso/"+data.num);
 			setTimes(data.num,35)		
 		}
 	},'json');

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

@@ -0,0 +1,72 @@
+<!---->
+<div class="index-new-head b-head">
+	{{include "/common/top.html"}}
+	<div class="b-nav index-new-nva">
+		<ul>
+			<li class="b-nav-logo"><a href="/"><img src="/images/logo.png" class="logo"></a></li>
+			<li class="b-nav-link b-nav-main"><a href="#">新闻资讯</a></li>
+			<li class="b-h-search">
+				<div class="input-group">
+			        <div class="input-group-btn hide">
+			        	<button type="button" id="header-searchBtn" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><font>服务</font><span class="hide caret margin-l-10"></span></button>
+			        </div> <!--/btn-group -->
+					<form method="post" id="searchForm" action="/front/content_qykb_list.html">
+						<span id="searchFormBtn"><i class="glyphicon sousuo"></i></span>
+				        <input type="text" name="query" class="form-control" id="header-searchInput" placeholder="找新闻资讯" value="{{if .T.querymap}}{{index .T.querymap "query"}}{{end}}">
+						{{if .T.querymap}}
+						<input type="hidden" name="city" id="city" value="{{index .T.querymap "city"}}">
+						<input type="hidden" name="cityNo" id="cityNo" value="{{index .T.querymap "cityNo"}}">
+						<input type="hidden" name="c_author" id="hauthor" value="{{index .T.querymap "c_author"}}">
+						<input type="hidden" name="c_hfl" id="hfl" value="{{index .T.querymap "c_hfl"}}">
+						<input type="hidden" name="c_zb" id="zb" value="{{index .T.querymap "c_zb"}}">
+						{{end}}
+					</form>
+	       		</div><!-- /input-group -->
+			</li>
+			<li class="pull-right b-loginStatus" id="b-loginStatus"></li>
+		</ul>
+	</div>
+</div>
+<script type="text/javascript">
+//顶部是否加载完毕
+var topLoadOver = false;
+var keyCode=0;
+document.onkeydown=function(event){
+    var e = event || window.event || arguments.callee.caller.arguments[0];
+    if(e && e.keyCode==13){ // enter 键
+        keyCode=13
+    }
+};
+
+$(function (){
+	isMobile = !$("#b-loginStatus").is(":visible");
+	$("#searchFormBtn").click(function(){
+		keyCode = 13;
+		$("form#searchForm").submit();
+	});
+	$("form#searchForm").submit(function(){
+		var input_val = $(this).children("[type='text']").val().replace(/^\s+|\s+$/g,"");
+		if(input_val==""){
+			input_val = $("#header-searchInput").attr('placeholder');
+		}
+		if (keyCode==13){
+	 		if(input_val==""||input_val=="请输入关键字"){
+				keyCode=0;
+				return false;
+			}else {
+				$("input[name='words']").val(input_val);
+				keyCode=0;
+				return true;
+			}	
+		}
+	});
+	//
+	$("[id='releaseService']").click(function(){
+		if(isLogined){
+			window.location.href = "/front/reurl";
+		}else{
+			loginModalShow(6);
+		}
+	});
+});
+</script>

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

@@ -0,0 +1,72 @@
+<!---->
+<div class="index-new-head b-head">
+	{{include "/common/top.html"}}
+	<div class="b-nav index-new-nva">
+		<ul>
+			<li class="b-nav-logo"><a href="/"><img src="/images/logo.png" class="logo"></a></li>
+			<li class="b-nav-link b-nav-main"><a href="#">政策法规</a></li>
+			<li class="b-h-search">
+				<div class="input-group">
+			        <div class="input-group-btn hide">
+			        	<button type="button" id="header-searchBtn" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><font>服务</font><span class="hide caret margin-l-10"></span></button>
+			        </div> <!--/btn-group -->
+					<form method="post" id="searchForm" action="/front/content_zcfg_list.html">
+						<span id="searchFormBtn"><i class="glyphicon sousuo"></i></span>
+				        <input type="text" name="query" class="form-control" id="header-searchInput" placeholder="找政策法规" value="{{if .T.querymap}}{{index .T.querymap "query"}}{{end}}">
+						{{if .T.querymap}}
+						<input type="hidden" name="city" id="city" value="{{index .T.querymap "city"}}">
+						<input type="hidden" name="cityNo" id="cityNo" value="{{index .T.querymap "cityNo"}}">
+						<input type="hidden" name="c_author" id="hauthor" value="{{index .T.querymap "c_author"}}">
+						<input type="hidden" name="c_hfl" id="hfl" value="{{index .T.querymap "c_hfl"}}">
+						<input type="hidden" name="c_zb" id="zb" value="{{index .T.querymap "c_zb"}}">
+						{{end}}
+					</form>
+	       		</div><!-- /input-group -->
+			</li>
+			<li class="pull-right b-loginStatus" id="b-loginStatus"></li>
+		</ul>
+	</div>
+</div>
+<script type="text/javascript">
+//顶部是否加载完毕
+var topLoadOver = false;
+var keyCode=0;
+document.onkeydown=function(event){
+    var e = event || window.event || arguments.callee.caller.arguments[0];
+    if(e && e.keyCode==13){ // enter 键
+        keyCode=13
+    }
+};
+
+$(function (){
+	isMobile = !$("#b-loginStatus").is(":visible");
+	$("#searchFormBtn").click(function(){
+		keyCode = 13;
+		$("form#searchForm").submit();
+	});
+	$("form#searchForm").submit(function(){
+		var input_val = $(this).children("[type='text']").val().replace(/^\s+|\s+$/g,"");
+		if(input_val==""){
+			input_val = $("#header-searchInput").attr('placeholder');
+		}
+		if (keyCode==13){
+	 		if(input_val==""||input_val=="请输入关键字"){
+				keyCode=0;
+				return false;
+			}else {
+				$("input[name='words']").val(input_val);
+				keyCode=0;
+				return true;
+			}	
+		}
+	});
+	//
+	$("[id='releaseService']").click(function(){
+		if(isLogined){
+			window.location.href = "/front/reurl";
+		}else{
+			loginModalShow(6);
+		}
+	});
+});
+</script>

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

@@ -45,8 +45,39 @@ function b_afterLogin(flag,result){
 }
 function swordfishLayoutInit(){
 	if(document.body.scrollHeight <= document.body.clientHeight){
-		$(".b-left").height(document.body.clientHeight-$(".swordfish-head").height() - $("#qfw-bottom").height());
+		$(".b-left").height(document.body.clientHeight - $(".b-head").height() - $("#qfw-bottom").height() - 60);
 		webSiteInit();
 	}
 }
+function scrollUp(){
+	if($(".b-right #list>div").height() > $(".b-right #list").height()){
+		var marginTop = 0;
+		var firstHeight = $(".b-right #list>div>div:first").height();
+		if($(".b-right #list>div").height() - $(".b-right #list").height() < firstHeight+20){
+			$(".b-right #list").css("max-height","none"); 
+			return;
+		}
+		var newsInterval = null;
+		var recommendScroll = function(){
+			newsInterval = setInterval(function(){
+				marginTop++;
+				$(".b-right #list>div").css("margin-top","-"+marginTop);
+				if(firstHeight+20 == marginTop){
+					marginTop = 0;
+					$(".b-right #list>div>div:first").removeClass("border-t-0");
+					$(".b-right #list>div").append($(".b-right #list>div>div:first")).css("margin-top",0);
+					firstHeight = $(".b-right #list>div>div:first").height();
+				}
+			},50);
+		}
+		recommendScroll();
+		$(".b-right #list").hover(function(){
+			if(newsInterval != null){
+				clearInterval(newsInterval);
+			}
+		},function(){
+			recommendScroll();
+		});
+	}
+}
 </script>

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

@@ -3,7 +3,7 @@
 		<ul class="pull-right">
 			<li><span class="img-circle b-com-first"><i class="glyphicon fuwushichang"></i></span><a href="/market/0/list.html">服务市场</a></li>
 			<li><span class="img-circle b-com-second"><i class="glyphicon jianyu"></i></span><a href="/front/swordfish">剑鱼</a></li>
-			<li><span class="img-circle b-com-third"><i class="glyphicon qiyeshequ"></i></span><a href="/search/enterprise/ent.html">企业社区</a></li>
+			<li><span class="img-circle b-com-third"><i class="glyphicon qiyeshequ"></i></span><a href="/front/entCommunity.html">企业社区</a></li>
 			<li><span class="img-circle b-com-four"><i class="glyphicon weiguanwang1"></i></span><a href="/front/wsite.html">微官网</a></li>
 			<li><span class="img-circle b-com-five"><i class="glyphicon zhengcefagui"></i></span><a href="/front/content_zcfg_list.html">政策法规</a></li>
 		</ul>

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

@@ -50,7 +50,7 @@ background-color:#FFFFFF;
 		<div class="col-sm-4">
 		</div>
 		</div>
-        <div class="form-group">
+        <div class="form-group hidden">
         <label id="col-sm-2" class="col-sm-2 control-label" for="name">问题标题：</label>
 	    <div class="col-sm-5">
 		<input name="s_title" id="s_title" class="form-control" value="{{.T.s_title}}"/>

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

@@ -10,13 +10,13 @@ border:0px;
 font-size:14px;
 }
 .table>thead>tr>th:nth-child(1){
-width:25%;
+width:17%;
 }
 .table>thead>tr>th:nth-child(2){
-width:15%;
+width:20%;
 }
 .table>thead>tr>th:nth-child(3){
-width:15%;
+width:12%;
 }
 .table>thead>tr>th:nth-child(4){
 width:10%;
@@ -25,7 +25,10 @@ width:10%;
 width:10%;
 }
 .table>thead>tr>th:nth-child(6){
-width:17%;
+width:10%;
+}
+.table>thead>tr>th:nth-child(7){
+width:15%;
 }
 .table>thead>tr>th{
 border:0px;
@@ -68,19 +71,32 @@ $(function(){
   , url: '/manage/feedback/p'
   , columns: [
         {
-            title: "问题描述"
-          , field: "s_title"
+            title: "问题编号"
+          , field: "s_title_no"
 		 // , css:{color:'#000000'}
 		 // , classname:"active"
 		 ,callback:function(ct,cd,val,k,m){
-			var v=ct["s_title"];
+			var v=ct["s_title_no"];
 			 var id = ct["_id"]
 			v="<a target='_blank' href='/manage/feedbackcontent/"+id+"'>"+v+"</a>"
 			return v
 		}	
         }, 
 		{
-            title: "来源"
+            title: "问题描述"
+          , field: "s_remark"
+		  , callback:function(ct,cd,val,k,m){
+				var v=ct["s_remark"];
+				if(v){
+					return v;
+				}else{
+					return "";
+				}
+				
+			}
+        }, 
+		{
+            title: "来源页面"
           , field: "s_source"
 		  , callback:function(ct,cd,val,k,m){
 				if(cd){
@@ -91,10 +107,6 @@ $(function(){
 				
 			}
         },
-		{
-            title: "用户名"
-          , field: "s_username"
-        },
 		
 		{
             title: "问题类型"
@@ -121,16 +133,20 @@ $(function(){
 		  ,callback:function(ct,cd,val,k,m){
 			var v=ct["i_status"];
 			if (v == 0){
-			v="<button class='btn  btn-warning btn-xs disabled' style='opacity:1;''>未处理</button>"
+			v="<button class='btn  btn-warning btn-xs' style='opacity:1;''>未处理</button>"
 			}else {
-			v="<button class='btn btn-info btn-xs disabled' style='opacity:1;''>已处理</button>"
+			v="<button class='btn btn-success btn-xs' style='opacity:1;''>已处理</button>"
 			}
 			return v
 		}	
         },
 		{
-            title: "提交时间"
+            title: "问题提交时间"
           , field: "l_submitdate"
+        },
+		{
+            title: "处理人"
+          , field: "s_auditname"
         },
 		{
 			title:"操作"

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

@@ -0,0 +1,539 @@
+<html>
+<head>
+<title>帮助中心</title>
+<meta name="msvalidate.01" content="D5F3ADC7EB4E65FFB8BF943AD56DD1F7" />
+{{include "/common/inc.html"}}
+<meta name="Keywords" content="{{Msg "seo" "qfw.homepage.key"}}"/>
+<meta name="Description" content="{{Msg "seo" "qfw.homepage.description"}}"/>
+<link href="/css/index-new.css" rel="stylesheet">
+<script src="/js/jquery.lazyload.min.js"></script>
+<script src="/js/upload.js"></script>
+<script type="text/javascript" src="/js/zDrag.js"></script>
+<script type="text/javascript" src="/js/zDialog.js"></script>
+<style>
+.help-index{
+	background-color:#fff; 
+	width:100%;
+	margin:10px 0px;
+}
+.help-menu{
+	width:260px;
+	float:left;
+}
+
+.help-active{
+	font-weight: 700;
+	background-color:#fff !important;
+}
+.help-menu ul li span:hover{
+	color:#FF5A5F;
+}
+.help-menu ul li:hover{
+	background-color:#f0f0f0;
+	
+}
+
+.help-menu ul li{
+	border-bottom:1px solid #E5E6E9;
+	width:260px;
+	cursor:pointer;
+	background-color:#f7f8fa;
+}
+.help-menu ul li img{
+	float:left;
+}
+.help-menu ul li span{
+	display:inline-block;
+	width:218px;
+	height:45px;
+	line-height:45px;
+	padding-left:35px;
+    font-family: '微软雅黑 Regular', '微软雅黑';
+    font-size: 14px;
+    color: #666666;
+}
+.help-content{
+	float:left;
+	border-left:1px solid #E5E6E9;
+	width:78%;
+	margin-right:-3px;
+}
+.help-title{
+	height:46px;
+	width:940px;
+	border-bottom:1px solid #E5E6E9;
+	line-height:46px;
+	padding-left:40px;
+	font-weight: 700;
+    font-size: 14px;
+    color: #666666;
+	margin-right:-2px;
+}
+.help-aboutimg{
+	margin-top:20px;
+}
+.help-aboutarticle{
+	padding:0px 30px 30px 30px;
+}
+.help-centerarticle{
+	padding:30px;
+	font-size: 15px;
+	
+}
+.help-opinionarticle{
+	padding:30px;
+}
+.help-aboutarticle p{
+	padding:1px 0px;
+}
+
+.help-aboutarticle h4{
+    font-family: '微软雅黑 Bold', '微软雅黑';
+    font-weight: 700;
+    font-size: 16px;
+    color: #333333;
+	margin-bottom:20px;
+	margin-top:40px;
+}
+.help-center{
+	border:1px solid #FFD1D2;
+	background-color:#FBF0F1;
+	height:75px;
+	padding:10px 30px;
+	line-height:25px;
+	font-size:15px;
+}
+.help-index .help-hx{
+	width:102%;
+	border-bottom:1px solid #E5E6E9;
+	margin:20px -10px;
+}
+.help-index .imgs {
+	width:85px;
+	height:81px;
+	margin:0;
+	padding:0;
+}
+.help-index .delbtn{
+	position:absolute;
+	margin:0 0 0 -10px;
+    padding:0 0 0 0;
+	background-color:#00ffff;
+	cursor:pointer;
+}
+.help-index .delbtn img{ 
+	height:15px; 
+	width:15px; 
+	margin-right:-20px; 
+	margin-top:-8px;
+}
+
+.help-index #table1{
+	_border-collapse:collapse;
+	text-align:center;
+	cellspacing:10px;
+	border-collapse:separate;
+}
+.help-index #mm{
+	margin-left:0px;
+	margin-top:20px;
+}
+.help-index #tr1 td{
+	padding:5px;
+}
+.help-index #tr1 td img{
+	border:1px solid #999999;
+}
+.help-index .btn-t{  
+    margin-top: 5px;
+	height:25px;
+	background-color:#f7f8fa; 
+	color:#000;
+	font-size: 14px; 
+	border:0px;
+	margin-right:20px;
+	line-height:14px;
+}
+.help-index .lable-t{
+	font-weight: 700; 
+	width:150px; 
+	font-size: 14px;
+	color: #1E1E1E;
+	text-align: right; 
+	margin-bottom:32px;
+}
+.help-index .widget-box { 
+	background-color:#fff; 
+	border:0px; 
+	padding-top:1px;
+}
+#_Container_0{
+	background-color:#FFFFFF;
+} 
+.help-index .btn-t.active{
+	color:#fff; 
+	background-color: #FF5A5F; 
+	border-color:#dddddd;
+}
+.help-index .btn-t:hover{
+	color:#fff;
+	background-color: #FF5A5F; 
+	border-color:#dddddd;
+}
+.help-index .btn.active {
+  	-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0);
+ 	 box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0);
+}
+.help-index .widget-content { 
+	border-bottom:0px;
+}
+.help-index .btnactive{
+	background-color:#FF5A5F;
+	color:#fff;
+}
+</style>
+</head>
+<body>
+{{include "/common/helphead.html"}}
+<div class="a-content a-index">	
+	<div class="help-index">
+	<div class="help-menu">
+	<ul>
+	<li class="help-active"  id="help-li_1" onclick="active(1)"><img class="help-img1" src="/images/u117.png"><span>关于我们</span><img style="float:right;padding: 10px 15px 0px 0px;" class="help-img1" src="/images/u33.png"></li>
+	<li id="help-li_2"  onclick="active(2)"><img class="help-img2"  style="visibility :hidden;" src="/images/u117.png"><span>意见反馈</span><img style="float:right;padding: 10px 15px 0px 0px;visibility :hidden;" class="help-img2" src="/images/u33.png"></li>
+	<li id="help-li_3"  onclick="active(3)"><img class="help-img3"  style="visibility :hidden;" src="/images/u117.png"><span>帮助中心</span><img style="float:right;padding: 10px 15px 0px 0px;visibility :hidden;" class="help-img3" src="/images/u33.png"></li>
+	<li id="help-li_4"  onclick="active(4)"><img class="help-img4"  style="visibility :hidden;" src="/images/u117.png"><span>联系我们</span><img style="float:right;padding: 10px 15px 0px 0px;visibility :hidden;" class="help-img4" src="/images/u33.png"></li>
+	</ul>
+	</div>
+	<div class="help-content">
+	<div class="help-title">关于我们</div>
+	<div id="help-content-1" class="help-aboutcontent">
+	<div class="help-aboutimg text-center"><img src="/images/u29.png"></div>
+	<div class="help-aboutarticle">
+	<h4>天时地利人和</h4>
+	<p>企明星是由河南拓普计算机网络工程有限公司进行运营管理，负责运营推广拓普丰联的O2O信息服务平台。2015年是我国全面深化改革的关键之年。今年的全国两会上，李克强总理在政府工作报告中提出，中小微企业大有可为，要扶上马、送一程，使“草根”创新蔚然成风、遍地开花。随着政府扶持的力度加大，政策纷纷出台，也就给广大的中小微企业提供快速发展的春风。借春风，好行船，在这样的机遇下，广大中小微企业的管理者磨拳擦掌，欲大展雄图。</p>
+	<p></p>
+	<p>顺风顺水的“行船”，难免有起伏跌宕。中小微企业发展中的瓶颈也就凸显出来，资金不足怎么办？人才不够怎么办？技术研究跟不上怎么办？业务品种单一没有好项目怎么办？？？这些困扰管理者们的问题，慢慢制约了企业的成长。在这种情况下，企明星应势而生！！</p>
+	<h4>什么是企明星？</h4>
+	<p>企明星是由河南拓普计算机网络工程有限公司进行运营管理，负责运营推广拓普丰联的O2O信息服务平台。</p>
+	<p></p>
+	<p>企明星面向于全国的所有中小微企业、学术研究团体、社会服务机构、行业协会。</p>
+	<p></p>
+	<p>企明星可以为企业提供专业体贴的技术创新、融资担保、市场运营、人才培训、法律维权、技术转让、互联网信息化等多种服务，完全可以满足绝大部分的中小微企业的各种个性化需求。</p>
+	<h4>为什么选择企明星？</h4>
+	<p>我们有海量数据支撑，大量用户入驻；</p>
+	<p>我们有严格的实名认证体系保证服务的可靠、安全；</p>
+	<p>我们有详尽全面的用户互评服务评价体系；</p>
+	<p>我们有强大的会员支撑体系；</p>
+	<p>我们有丰富多彩的线下活动；</p>
+	<h4>最后的话：</h4>
+	<p>首先，企明星最早在2013年就开始策划。</p>
+	<p>其次，经过一年的深思熟虑，于2014年下半年开始孕育。</p>
+	<p>再次，企明星于2015年7月呱呱落地。</p>
+	<p>最后，在各界同仁的帮助下，我们终于开始茁壮成长了！企明星秉行“优质、高效、真诚”的服务理念，旨在打造专门为中小微企业提供专业服务的精品平台，既为中小微企业寻找服务机构提供便利，又为服务机构的形象宣传业务推广提供展示窗口。</p>
+	<p>最后的最后，我们相信在国家政策的扶持下，在社会各界同仁的广泛照顾下，企明星将会稳步成长，并竭诚全力助您成为企业明星。</p>
+	</div>
+	</div>
+	<div id="help-content-2" class="help-opinioncontent hidden">
+	<div class="help-opinionarticle">
+	
+		<form class="validForm form-horizontal" role="form" id="insertback" method="post">
+        <input type="hidden" name="s_source" value="{{.T.url}}">
+		<div class="form-group hidden">
+        <label id="col-sm-2" class="col-sm-2 control-label" for="name"><span style="color:#D03102;margin-right:5px;">*</span>问题标题：</label>
+	    <div class="col-sm-3">
+		<input type="text" name="s_title" class="form-control" id="title" maxlength="50"   placeholder="请输入问题标题" >
+		</div>
+		<div class="col-sm-4">
+		</div>
+		</div>
+		
+		<div class="form-group">
+        <label id="col-sm-2" class="col-sm-2 control-label" for="name"><span style="color:#D03102;margin-right:5px;">*</span>问题类别：</label>
+	    <div class="col-sm-6 " data-toggle="buttons">
+			   <!--<label class="btn btn-default  btn-t" >
+				  <input type="radio" name="i_type" id="option1" value="0">信息分类</label>
+			   <label class="btn btn-default btn-t">
+				  <input type="radio" name="i_type" id="option2" value="1" >使用问题</label>
+			   <label class="btn btn-default btn-t" >
+				  <input type="radio" name="i_type" id="option3" value="2" >创意点子</label>
+			   <label class="btn btn-default btn-t" >
+				  <input type="radio" name="i_type" id="option3" value="3" >我要吐槽</label>
+			   <label class="btn btn-default btn-t" >
+				  <input type="radio" name="i_type" id="option3" value="4" >其他建议</label>-->
+			   <label class='btn btn-default btn-t' {{if eq .T.type "serviceclassify"}} active{{end}}>
+				  <input type="radio" name="i_type" id="option2" value="5" {{if eq .T.type "serviceclassify"}} checked="checked"{{end}}>服务分类</label>
+			   <label class="btn btn-default btn-t" >
+				  <input type="radio" name="i_type" id="option3" value="6" >问题咨询</label>
+			   <label class="btn btn-default btn-t" >
+				  <input type="radio" name="i_type" id="option3" value="7" >报告缺陷</label>
+			   <label class='btn btn-default btn-t active' >
+				  <input type="radio" name="i_type" id="option3" value="8" {{if not .T.type}} checked="checked"{{end}}>意见建议</label>
+		</div>
+		<div class="col-sm-2 text-center">
+		</div>
+		</div>
+	  
+		<div class="form-group" style="margin-top:20px; ">
+        <label id="col-sm-2" class="col-sm-2 control-label" for="name"><span style="color:#D03102;margin-right:5px;">*</span>问题描述：</label>
+	    <div class="col-sm-10">
+		<textarea style=" width:100%;padding:10px 8px; height:120px; max-width:740px;"  name="s_remark" class="form-control" id="remark"   placeholder="请在这里输入您的问题描述。" ></textarea>
+		</div>
+		</div>
+		
+        <div class="form-group" style="margin-top:20px;">
+        <label id="col-sm-2" class="col-sm-2 control-label" for="name"><span style="color:#D03102;margin-right:5px;"></span>上传图片：</label>
+	    <div class="col-sm-4 text-muted" style="margin-top:10px;">
+        最多可上传5张,支持jpg/gif/png格式（可选）
+		</div>
+		<div class="col-sm-6 text-right" style="margin-top:10px; font-size:12px;">
+		问题编号：{{.T.s_title_no}}
+		</div>
+		</div>
+		
+		<div class="form-group" style="margin-top:-15px;">
+        <label id="col-sm-2" class="col-sm-2 control-label" for="name"></label>
+	    <div class="col-sm-10">
+				<div id="pic" style="width:420px; ">
+					<table id="table1">
+					<tr id="tr1">
+					<!--<td id="tdbtn"><img class="imgs" src="/images/u117png" style="width:85px;height:81px;"></td>-->
+					</tr>
+					</table>
+			    </div>
+					<input type="hidden" value="" name="s_pic" id="imgurl"/> 
+				<div class="row text-left"  id="mm" style="position:relative;"></div>
+		</div>
+		</div>
+	  
+        <div class="form-group" style="margin-top:20px;">
+        <label id="col-sm-2" class="col-sm-2 control-label" for="name"><span style="color:#D03102;margin-right:5px;"></span>联系方式：</label>
+	    <div class="col-sm-8">
+        <input  type="text" name="s_link" value="" id="link" class="form-control"   placeholder="请留下你的QQ/邮箱/电话号码，方便我们的工作人员和你联系（可选）">
+		</div>
+		<div class="col-sm-2">
+		</div>
+		</div>
+		
+		<div class="form-group" style="margin-top:20px;">
+		<label class="col-md-2 control-label"><span style="color:#D03102;margin-right:5px;">*</span>验证码：</label>
+		<div class="input-group col-md-5 checkCodeId">
+			<input type="text" name="checkCodeId" class="form-control inputxt" maxlength="4" id="chedkcode" >
+			<span class="input-group-addon " id="phone-checkCodeId">
+				<img id="phone_captcha" src="/tool/captcha" onClick="reLoadCaptcha('phone_captcha');">
+				<a onClick="reLoadCaptcha('phone_captcha');" class="text-primary">刷新</a>
+			</span>
+		</div>
+		<div class="col-md-5">
+		</div>
+	  </div>
+
+		
+		<div style="margin-top:20px;" class="form-group">
+		<div class="col-sm-2"></div>
+		<div class="col-sm-4 ">
+		<input type="button" class="btn btn-primary" onClick="insertback()"  value="提交建议">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+		</div>
+		<div class="col-sm-6"></div>
+		</div>
+        </form>
+	</div>
+	</div>
+	<div id="help-content-3" class="help-centercontent hidden">
+	<div class="help-centerarticle">
+	<p>一、新手使用指南</p>
+	<p><a href="#">1.　如何成为注册用户</a></p>
+	<p><a href="#">2.　如何发布企业信息</a></p>
+	<p><a href="#">3.　如何管理企业信息</a></p>
+	<p><a href="#">4.　如何查找企业</a></p>
+	<p><a href="#">5.　企明星信息审核规范</a></p>
+	<div class="help-center">如果您通过局域网上网时，由于局域网通往外部的出口宽带限制，连接网站时发生超时错误都会发生连接不上的问题。如果遇到网页打不开的问题，有时只须刷新即可，有时需要您换个时间再登录。</div>
+	<div class="help-hx"></div>
+	<p>二、用户注册与登录</p>
+	<p><a href="#">1.　用户名修改</a></p>
+	<p><a href="#">2.　无法登录</a></p>
+	<p><a href="#">3.　手机号被占用</a></p>
+	<p><a href="#">4.　账户丢失或被盗</a></p>
+	<p><a href="#">5.　帐号注销</a></p>
+	</div>
+	</div>
+	<div id="help-content-4" class="help-linkcontent hidden">
+	<div class="help-aboutarticle">
+		<p style="margin-top:45px;">
+		<span style="font-family:'Arial Negreta', Arial;font-size:13px;font-weight:bold;line-height:normal;">客户</span><span style="font-family:'Arial Negreta', Arial;font-size:13px;line-height:normal;font-weight:700;">服务</span><span style="font-family:'Arial Normal', Arial;font-size:13px;line-height:normal;"> </span>
+		</p>
+		<p style="font-family:'Arial Normal', Arial;font-size:13px;">
+			请联系：在线客服 <a target="_blank" href="http://wpa.qq.com/msgrd?v=3&uin=3240709056&site=qq&menu=yes"><img border="0" src="http://wpa.qq.com/pa?p=2:3240709056:52" alt="点击这里给我发消息" title="点击这里给我发消息" /></a>
+		</p>
+			<p style="font-family:'Arial Normal', Arial;font-size:13px;">
+			<br />
+		</p>
+		<p style="font-family:'Arial Normal', Arial;font-size:13px;">
+			<span style="font-family:'Arial Negreta', Arial;font-weight:700;color:#000000;">商务合作</span>
+		</p>
+			
+		<p style="font-family:'Arial Normal', Arial;font-size:13px;">
+			电话：0371-65356670 转8073
+		</p>
+		<p style="font-family:'Arial Normal', Arial;font-size:13px;">
+			在线交流：<a target="_blank" href="http://wpa.qq.com/msgrd?v=3&uin=3240709056&site=qq&menu=yes"><img border="0" src="http://wpa.qq.com/pa?p=2:3240709056:52" alt="点击这里给我发消息" title="点击这里给我发消息" /></a>
+		</p>
+			
+		<p style="font-family:'Arial Normal', Arial;font-size:13px;">
+			<br />
+		</p>
+		<p style="font-family:'Arial Normal', Arial;font-size:13px;">
+			地址：河南省郑州市金水区经三路32号
+		</p>
+		<p style="font-family:'Arial Normal', Arial;font-size:13px;">
+			微信公众号搜索：qmx-cn 或扫描以下二维码：
+		</p>
+		<p style="font-family:'Arial Normal', Arial;font-size:13px;">
+			<br />
+		</p>
+		<p>
+		<img style="width:167px;" src="/images/swordfish/qrcode.png">
+		</p>
+	</div>
+	</div>
+	</div>
+	<div style="clear:both;"></div>
+	</div>
+</div>
+{{include "/common/bottom.html"}}
+<script type="text/javascript">
+var tp = {{.T.tp}}
+active(tp)
+$("#tdbtn").click(function(){
+	$("#upload").click();
+})
+function reLoadCaptcha(id){
+	document.getElementById(id).src='/tool/captcha?rnd='+Math.random()
+}
+function insertback(){    
+    var str4 = $("#chedkcode").val();
+	if (str4 == ''){
+	alert('验证码不能为空！')
+	return
+	}
+	//var str3 = $("#title").val();
+	//if (str3 == ''){
+	//alert('问题标题不能为空！')
+	//return
+	//}
+	var str1 = $("#remark").val();
+	if (str1 == ''){
+	alert('问题描述不能为空！')
+	return
+	}
+	
+    var Param = $("#insertback").serialize();
+    $.ajax({    
+        type:'post',        
+        url:'/front/insertback',    
+        data:Param,    
+        cache:false,    
+        dataType:'json', 
+        success:function(data){
+		  if (data.id != ""){
+			Dialog.alert(data.msg,function(){
+				$("#remark").val("");
+				$("#chedkcode").val("");
+				$("#title").val("");
+				$("#tr1").html("");
+				$("#link").val("");
+				reLoadCaptcha("phone_captcha");
+			}); 
+		  }else{
+			Dialog.alert(data.msg); 
+			reLoadCaptcha("phone_captcha");
+		  }   	  
+        }    
+        });    
+	} 
+function active(i){
+	for (j=1;j<5;j++){
+		if (j==i){
+		$("#help-content-"+j).removeClass("hidden");
+		$(".help-img"+j).css({"visibility":""});
+		$("#help-li_"+j).addClass("help-active");
+		}else{
+		$("#help-content-"+j).addClass("hidden");
+		$(".help-img"+j).css({"visibility":"hidden"});
+		$("#help-li_"+j).removeClass("help-active");
+		}
+	}
+	if (i==1){
+		$(".help-title").html("关于我们");
+	}else if(i==2){
+		$(".help-title").html("意见反馈");
+	}else if(i==3){
+		$(".help-title").html("帮助中心");
+	}else if(i==4){
+		$(".help-title").html("联系我们");
+	}
+}
+</script>
+
+<script type="text/javascript">
+var urls = ""; 
+var x = 0; 
+var str='str';
+$(function(){	
+	var option={
+		btnname:"图片上传",//按钮名
+		btnClass:"btn btn-primary",
+		btnCss:{"width":"80px","height":"36px","color":"white"},
+	    name:"upload",
+		action:"/filemanage/upload",
+		afterError:function(data,e){
+	//			$("img").attr("src",data.url).appendTo("#pic")
+	           alert("图片上传失败")
+			},
+		afterUpload:function(data){ //此处可以重写，上传后的处理
+		      if(x>4){
+				alert("图片数量已达到上限!");
+				return;
+			}
+			if (x==4){
+				$("#tdbtn").addClass("hidden");
+			}
+			$("#pic").css("margin-top","10px")
+			  var table = document.getElementById("table1");
+			  var tr = document.getElementById("tr1");
+			  var td = tr.insertCell(-1);
+			  //td.insertBefore("#tdbtn");
+			  var img = document.createElement('img');
+			  img.className="imgs";
+			  img.src=data.url;
+			  td.appendChild(img);
+			  x++;
+			strx = data.url;
+			if(urls == ''){
+			urls=strx;
+			}else{
+			urls=strx +','+ urls;
+			}
+			$("#imgurl").attr("value",urls);
+			  var btn = document.createElement("span");
+			  btn.innerHTML = "<img style='border:0px;' src='/images/cancel-circle.png'/>";
+			  btn.className = "delbtn";
+			  td.appendChild(btn);
+			  btn.onclick=function(){
+				var td = this.parentNode;
+				var urlss = urls.split(',');
+				urlss.splice(td.cellIndex,1);
+				tr.deleteCell(td.cellIndex);
+				urls = urlss.join(',');
+				$("#imgurl").attr("value",urls);
+				$("#tdbtn").removeClass("hidden");
+				x--;
+			  }
+		 }
+	};
+	$("#mm").upload(option);	
+		
+})
+</script>
+</body>
+</html>

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

@@ -0,0 +1,487 @@
+<html>
+<head>
+<title>帮助中心</title>
+<meta name="msvalidate.01" content="D5F3ADC7EB4E65FFB8BF943AD56DD1F7" />
+{{include "/common/inc.html"}}
+<meta name="Keywords" content="{{Msg "seo" "qfw.homepage.key"}}"/>
+<meta name="Description" content="{{Msg "seo" "qfw.homepage.description"}}"/>
+<link href="/css/index-new.css" rel="stylesheet">
+<script src="/js/jquery.lazyload.min.js"></script>
+<script src="/js/upload.js"></script>
+<script type="text/javascript" src="/js/zDrag.js"></script>
+<script type="text/javascript" src="/js/zDialog.js"></script>
+<style>
+body{
+	background-color:#fff;
+}
+.mobilemenu{
+	border-bottom:1px solid #CCCCCC;
+	height:45px;
+	line-height:45px;
+	margin-top: -15px;
+}
+.mobileactive{
+	border-bottom:2px solid #FF5A5F;
+	height: 45px;
+}
+.about-img{
+	width:100%;
+	padding-top:20px;
+}
+.about-content{
+	margin-top:-20px;
+	padding:0px 10px 10px 10px;
+}
+.about-content h4 {
+    font-family: '微软雅黑 Bold', '微软雅黑';
+    font-weight: 700;
+    font-size: 16px;
+    color: #333333;
+    margin-bottom: 20px;
+    margin-top: 40px;
+}
+.col-xs-4 span{
+	font-size: 15px;
+    font-weight: 700;
+	width:70%;
+	display:inline-block;
+}
+.mobilehelp-3{
+	padding:0px 30px;
+}
+.mobilehelp-2{
+	padding:20px;
+}
+
+.imgs {
+	width:85px;
+	height:81px;
+	margin:0;
+	padding:0;
+}
+.delbtn{
+	position:absolute;
+	margin:0 0 0 -10px;
+    padding:0 0 0 0;
+	background-color:#00ffff;
+	cursor:pointer;
+}
+.delbtn img{ 
+	height:15px; 
+	width:15px; 
+	margin-right:-20px; 
+	margin-top:-8px;
+}
+
+#table1{
+	_border-collapse:collapse;
+	text-align:center;
+	cellspacing:10px;
+	border-collapse:separate;
+}
+
+#mm{
+	margin-left:0px;
+	margin-top:20px;
+}
+#tr1 td{
+	padding:5px;
+}
+#tr1 td img{
+	border:1px solid #999999;
+}
+#tr2 td{
+	padding:5px;
+}
+#tr2 td img{
+	border:1px solid #999999;
+}
+#tr3 td{
+	padding:5px;
+}
+#tr3 td img{
+	border:1px solid #999999;
+}
+.btn-t{   
+	background-color:#f7f8fa; 
+	color:#000;
+	font-size: 14px; 
+	border-color:#dddddd; 
+	margin:5px;
+}
+.lable-t{
+	font-weight: 700; 
+	width:150px; 
+	font-size: 14px;
+	color: #1E1E1E;
+	text-align: right; 
+	margin-bottom:32px;
+}
+.widget-box { 
+	background-color:#fff; 
+	border:0px; 
+	padding-top:1px;
+}
+#_Container_0{
+	background-color:#FFFFFF;
+} 
+
+.mobile .btn-t.active{
+	color:#fff; 
+	background-color: #FF5A5F; 
+	border-color:#dddddd;
+}
+.mobile .btn-t:hover{
+	color:#fff;
+	background-color: #FF5A5F; 
+	border-color:#dddddd;
+}
+.btn.active {
+  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0);
+  box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0);
+}
+.widget-content { 
+	border-bottom:0px;
+}
+</style>
+</head>
+<body>
+<div class="mobile">	
+		<div class="mobilemenu">
+			<div class="form-group" >
+	        <div id="mobileabout" class="col-xs-4 col-sm-4 text-center" onclick="switchm(1)">
+			<span id="mobilemenu-1" class="mobileactive">关于我们</span></div>
+		    <div id="mobileopinion" class="col-xs-4 col-sm-4 text-center" onclick="switchm(2)">
+	        <span id="mobilemenu-2">意见反馈</span>
+			</div>
+			<div id="mobilelink" class="col-xs-4 col-sm-4 text-center" onclick="switchm(3)">
+	        <span id="mobilemenu-3">联系我们</span>
+			</div>
+			</div>
+		</div>
+		<div class="mobilehelp-1">
+		<div class="about-img text-center"><img src="/images/u29.png"></div>
+		<div class="about-content">
+			<h4 class="text-center">天时地利人和</h4>
+			<p>　　企明星是由河南拓普计算机网络工程有限公司进行运营管理，负责运营推广拓普丰联的O2O信息服务平台。2015年是我国全面深化改革的关键之年。今年的全国两会上，李克强总理在政府工作报告中提出，中小微企业大有可为，要扶上马、送一程，使“草根”创新蔚然成风、遍地开花。随着政府扶持的力度加大，政策纷纷出台，也就给广大的中小微企业提供快速发展的春风。借春风，好行船，在这样的机遇下，广大中小微企业的管理者磨拳擦掌，欲大展雄图。</p>
+			<p>　　</p>
+			<p>　　顺风顺水的“行船”，难免有起伏跌宕。中小微企业发展中的瓶颈也就凸显出来，资金不足怎么办？人才不够怎么办？技术研究跟不上怎么办？业务品种单一没有好项目怎么办？？？这些困扰管理者们的问题，慢慢制约了企业的成长。在这种情况下，企明星应势而生！！</p>
+			<h4 class="text-center">什么是企明星？</h4>
+			<p>　　企明星是由河南拓普计算机网络工程有限公司进行运营管理，负责运营推广拓普丰联的O2O信息服务平台。</p>
+			<p>　　</p>
+			<p>　　企明星面向于全国的所有中小微企业、学术研究团体、社会服务机构、行业协会。</p>
+			<p>　　</p>
+			<p>　　企明星可以为企业提供专业体贴的技术创新、融资担保、市场运营、人才培训、法律维权、技术转让、互联网信息化等多种服务，完全可以满足绝大部分的中小微企业的各种个性化需求。</p>
+			<h4 class="text-center">为什么选择企明星？</h4>
+			<p>　　我们有海量数据支撑，大量用户入驻；</p>
+			<p>　　我们有严格的实名认证体系保证服务的可靠、安全；</p>
+			<p>　　我们有详尽全面的用户互评服务评价体系；</p>
+			<p>　　我们有强大的会员支撑体系；</p>
+			<p>　　我们有丰富多彩的线下活动；</p>
+			<h4 class="text-center">最后的话：</h4>
+			<p>　　首先，企明星最早在2013年就开始策划。</p>
+			<p>　　其次，经过一年的深思熟虑，于2014年下半年开始孕育。</p>
+			<p>　　再次，企明星于2015年7月呱呱落地。</p>
+			<p>　　最后，在各界同仁的帮助下，我们终于开始茁壮成长了！企明星秉行“优质、高效、真诚”的服务理念，旨在打造专门为中小微企业提供专业服务的精品平台，既为中小微企业寻找服务机构提供便利，又为服务机构的形象宣传业务推广提供展示窗口。</p>
+			<p>　　最后的最后，我们相信在国家政策的扶持下，在社会各界同仁的广泛照顾下，企明星将会稳步成长，并竭诚全力助您成为企业明星。</p>
+		</div>
+		</div>
+		<div class="mobilehelp-2 hidden">
+		
+			<form class="validForm form-horizontal" role="form" id="insertback" method="post">
+	        <input type="hidden" name="s_source" value="{{.T.url}}">
+			<div class="form-group hidden">
+	        <label id="col-sm-2" class="col-sm-2 control-label" for="name"><span style="color:#D03102;margin-right:5px;">*</span>问题标题：</label>
+		    <div class="col-sm-3">
+			<input type="text" name="s_title" class="form-control" id="title" maxlength="50"   placeholder="请输入问题标题" >
+			</div>
+			<div class="col-sm-4">
+			</div>
+			</div>
+			
+			<div class="form-group">
+	        <label id="col-sm-2" class="col-sm-2 control-label" for="name"><span style="color:#D03102;margin-right:5px;">*</span>问题类别：</label>
+		    <div class="col-sm-10 " data-toggle="buttons">
+				   <!--<label class="btn btn-default  btn-t" >
+					  <input type="radio" name="i_type" id="option1" value="0">信息分类</label>
+				   <label class="btn btn-default btn-t">
+					  <input type="radio" name="i_type" id="option2" value="1" >使用问题</label>
+				   <label class="btn btn-default btn-t" >
+					  <input type="radio" name="i_type" id="option3" value="2" >创意点子</label>
+				   <label class="btn btn-default btn-t" >
+					  <input type="radio" name="i_type" id="option3" value="3" >我要吐槽</label>
+				   <label class="btn btn-default btn-t" >
+					  <input type="radio" name="i_type" id="option3" value="4" >其他建议</label>-->
+				   <label class='btn btn-default btn-t' {{if eq .T.type "serviceclassify"}} active{{end}}>
+				  <input type="radio" name="i_type" id="option2" value="5" {{if eq .T.type "serviceclassify"}} checked="checked"{{end}}>服务分类</label>
+			   <label class="btn btn-default btn-t" >
+				  <input type="radio" name="i_type" id="option3" value="6" >问题咨询</label>
+			   <label class="btn btn-default btn-t" >
+				  <input type="radio" name="i_type" id="option3" value="7" >报告缺陷</label>
+			   <label class='btn btn-default btn-t active' >
+				  <input type="radio" name="i_type" id="option3" value="8" {{if not .T.type}} checked="checked"{{end}}>意见建议</label>
+			</div>
+			</div>
+		  
+			<div class="form-group" style="margin-top:20px; ">
+	        <label id="col-sm-2" class="col-xs-5 col-sm-2 control-label" for="name"><span style="color:#D03102;margin-right:5px;">*</span>反馈内容：</label>
+		    <div class="col-xs-7 col-sm-10 text-right">
+			<span  class="text-right" style="margin-top:10px; font-size:12px;">
+			问题编号：{{.T.s_title_no}}
+			</span>
+			</div>
+			</div>
+			
+			
+			<div class="form-group">
+	        <label id="col-sm-2" class="col-sm-2 control-label" for="name"></label>
+		    <div class="col-sm-10">
+			<textarea style=" width:100%;padding:10px 8px; height:120px; max-width:740px;"  name="s_remark" class="form-control" id="remark"   placeholder="请输入反馈内容。" ></textarea>
+			</div>
+			</div>
+			
+	        <div class="form-group" style="margin-top:20px;">
+	        <label id="col-sm-2" class="col-sm-2 control-label" for="name"></label>
+		    <div class="col-sm-10 text-muted" style="margin-top:10px;">
+	        上传图片（最多可上传5张,支持jpg/gif/png格式）
+			</div>
+			</div>
+			
+			<div class="form-group" style="margin-top:-15px;">
+	        <label id="col-sm-2" class="col-sm-2 control-label" for="name"></label>
+		    <div class="col-sm-10">
+					<div id="pic" >
+						<table id="table1">
+						<tr id="tr1">
+						</tr>
+						<tr id="tr2">
+						</tr>
+						<tr id="tr3">
+						</tr>
+						</table>
+				    </div>
+						<input type="hidden" value="" name="s_pic" id="imgurl"/> 
+					<div class="row text-left"  id="mm" style="position:relative;"></div>
+			</div>
+			</div>
+		  
+	        <div class="form-group" style="margin-top:20px;">
+	        <label id="col-sm-2" class="col-sm-2 control-label" for="name"><span style="color:#D03102;margin-right:5px;"></span>联系方式：</label>
+		    <div class="col-sm-8">
+	        <input  type="text" name="s_link" value="" id="link" class="form-control"   placeholder="QQ/邮箱/电话号码（请正确填写信息）">
+			</div>
+			<div class="col-sm-2">
+			</div>
+			</div>
+			
+			<div class="form-group" style="margin-top:20px;">
+			<label  id="col-sm-2"  class="col-sm-2 control-label"><span style="color:#D03102;margin-right:5px;">*</span>验证码：</label>
+			<div class="input-group col-sm-5 checkCodeId">
+				<input type="text" name="checkCodeId" class="form-control inputxt" maxlength="4" id="chedkcode" >
+				<span class="input-group-addon " id="phone-checkCodeId">
+					<img id="phone_captcha" src="/tool/captcha" onClick="reLoadCaptcha('phone_captcha');">
+					<a onClick="reLoadCaptcha('phone_captcha');" class="text-primary">刷新</a>
+				</span>
+			</div>
+			<div class="col-sm-5">
+			</div>
+		  </div>
+	
+			
+			<div style="margin-top:20px;" class="form-group">
+			<div class="col-sm-2"></div>
+			<div class="col-sm-8 text-center">
+			<input type="button" style="width:200px;" class="btn btn-primary" onClick="insertback()"  value="　提　交　">
+			</div>
+			<div class="col-sm-2"></div>
+			</div>
+	        </form>
+		</div>
+		<div class="mobilehelp-3 hidden">
+			<p style="margin-top:45px;">
+			<span style="font-family:'Arial Negreta', Arial;font-size:13px;font-weight:bold;line-height:normal;">客户</span><span style="font-family:'Arial Negreta', Arial;font-size:13px;line-height:normal;font-weight:700;">服务</span><span style="font-family:'Arial Normal', Arial;font-size:13px;line-height:normal;"> </span>
+			</p>
+			<p style="font-family:'Arial Normal', Arial;font-size:13px;">
+				请联系：在线客服 <a target="_blank" href="http://wpa.qq.com/msgrd?v=3&uin=3240709056&site=qq&menu=yes"><img border="0" src="http://wpa.qq.com/pa?p=2:3240709056:52" alt="点击这里给我发消息" title="点击这里给我发消息" /></a>
+			</p>
+				<p style="font-family:'Arial Normal', Arial;font-size:13px;">
+				<br />
+			</p>
+			<p style="font-family:'Arial Normal', Arial;font-size:13px;">
+				<span style="font-family:'Arial Negreta', Arial;font-weight:700;color:#000000;">商务合作</span>
+			</p>
+				
+			<p style="font-family:'Arial Normal', Arial;font-size:13px;">
+				电话：0371-65356670 转8073
+			</p>
+			<p style="font-family:'Arial Normal', Arial;font-size:13px;">
+				在线交流：<a target="_blank" href="http://wpa.qq.com/msgrd?v=3&uin=3240709056&site=qq&menu=yes"><img border="0" src="http://wpa.qq.com/pa?p=2:3240709056:52" alt="点击这里给我发消息" title="点击这里给我发消息" /></a>
+			</p>
+				
+			<p style="font-family:'Arial Normal', Arial;font-size:13px;">
+				<br />
+			</p>
+			<p style="font-family:'Arial Normal', Arial;font-size:13px;">
+				地址：河南省郑州市金水区经三路32号
+			</p>
+			<p style="font-family:'Arial Normal', Arial;font-size:13px;">
+				微信公众号搜索：qmx-cn 或扫描以下二维码：
+			</p>
+			<p style="font-family:'Arial Normal', Arial;font-size:13px;">
+				<br />
+			</p>
+			<p class="text-center">
+			<img style="width:167px;" src="/images/swordfish/qrcode.png">
+			</p>
+		</div>
+</div>
+<script type="text/javascript">
+var tp = {{.T.tp}}
+switchm(tp)
+function switchm(i){
+	for (j=1;j<4;j++){
+		if (j==i){
+		$(".mobilehelp-"+j).removeClass("hidden");
+		$("#mobilemenu-"+j).addClass("mobileactive");
+		}else{
+		$(".mobilehelp-"+j).addClass("hidden");
+		$("#mobilemenu-"+j).removeClass("mobileactive");
+		}
+	}
+}
+
+function reLoadCaptcha(id){
+	document.getElementById(id).src='/tool/captcha?rnd='+Math.random()
+}
+function insertback(){    
+    var str4 = $("#chedkcode").val();
+	if (str4 == ''){
+	alert('验证码不能为空！')
+	return
+	}
+	//var str3 = $("#title").val();
+	//if (str3 == ''){
+	//alert('问题标题不能为空！')
+	//return
+	//}
+	var str1 = $("#remark").val();
+	if (str1 == ''){
+	alert('问题描述不能为空！')
+	return
+	}
+	
+    var Param = $("#insertback").serialize();
+    $.ajax({    
+        type:'post',        
+        url:'/front/insertback',    
+        data:Param,    
+        cache:false,    
+        dataType:'json', 
+        success:function(data){
+		  if (data.id != ""){
+			Dialog.alert(data.msg,function(){
+				$("#remark").val("");
+				$("#chedkcode").val("");
+				$("#title").val("");
+				$("#tr1").html("");
+				$("#link").val("");
+				reLoadCaptcha("phone_captcha");
+			}); 
+		  }else{
+			Dialog.alert(data.msg); 
+			reLoadCaptcha("phone_captcha");
+		  }   	  
+        }    
+        });    
+	} 
+function active(i){
+	for (j=1;j<5;j++){
+		if (j==i){
+		$("#help-content-"+j).removeClass("hidden")
+		$(".help-img"+j).css({"visibility":""});
+		$("#help-li_"+j).addClass("help-active")
+		}else{
+		$("#help-content-"+j).addClass("hidden")
+		$(".help-img"+j).css({"visibility":"hidden"});
+		$("#help-li_"+j).removeClass("help-active")
+		}
+	}
+	if (i==1){
+		$(".help-title").html("关于我们");
+	}else if(i==2){
+		$(".help-title").html("意见反馈");
+	}else if(i==3){
+		$(".help-title").html("帮助中心");
+	}else if(i==4){
+		$(".help-title").html("联系我们");
+	}
+}
+</script>
+
+<script type="text/javascript">
+var wmob = $(window).width();
+var urls = ""; 
+var x = 0; 
+var str='str';
+$(function(){	
+	var option={
+		btnname:"图片上传",//按钮名
+		btnClass:"btn btn-primary",
+		btnCss:{"width":"80px","height":"36px","color":"white"},
+	    name:"upload",
+		action:"/filemanage/upload",
+		afterError:function(data,e){
+	//			$("img").attr("src",data.url).appendTo("#pic")
+	           alert("图片上传失败")
+			},
+		afterUpload:function(data){ //此处可以重写，上传后的处理
+		      if(x>4){
+				alert("图片数量已达到上限!");
+				return;
+			}
+			var trm = $("#tr1 td").length;
+			$("#pic").css("margin-top","10px")
+			  var table = document.getElementById("table1");
+			if(trm < 3){
+				var tr = document.getElementById("tr1");
+			}else{
+				 if(wmob>(x+1)*95){
+			 		var tr = document.getElementById("tr1");
+				}else{
+					var tr = document.getElementById("tr2");
+				}
+			}
+			  var td = tr.insertCell(-1);
+			  var img = document.createElement('img');
+			  img.className="imgs";
+			  img.src=data.url;
+			  td.appendChild(img);
+			  x++;
+			strx = data.url;
+			if(urls == ''){
+			urls=strx;
+			}else{
+			urls=strx +','+ urls;
+			}
+			$("#imgurl").attr("value",urls);
+			  var btn = document.createElement("span");
+			  btn.innerHTML = "<img style='border:0px;' src='/images/cancel-circle.png'/>";
+			  btn.className = "delbtn";
+			  td.appendChild(btn);
+			  btn.onclick=function(){
+				var td = this.parentNode;
+				var urlss = urls.split(',');
+				urlss.splice(td.cellIndex,1);
+				tr.deleteCell(td.cellIndex);
+				urls = urlss.join(',');
+				$("#imgurl").attr("value",urls);
+				x--;
+			  }
+		 }
+	};
+	$("#mm").upload(option);	
+		
+})
+</script>
+</body>
+</html>

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

@@ -49,10 +49,26 @@ font-size:10px;
 font-weight:normal;
 }
 .table-bordered { border:0px;}
+
+.b-nav-main{
+	background-color: #FF5A5F;
+}
+.b-nav{
+	border-top-color: #FF5A5F;
+}
+.b-head .b-h-search form>span{
+	background-color: #FF5A5F;
+}
+.a-content{
+	margin-top:20px;
+}
+.b-head .head-hidemenu li:hover {
+    background-color: #FF5A5F;
+}
 </style>
 </head>
 <body>
-{{include "/common/head.html"}}
+{{include "/common/newshead.html"}}
 <div class="a-content">	
 	
 	    <!--<div class="container-fluid">
@@ -137,7 +153,7 @@ function currPos(){
 }
 
 $(function (){
-	setNavbarActive(4);
+	//setNavbarActive(4);
 	//
 	$(".newListImg").height($(".newListImg").width());
 	//

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

@@ -9,12 +9,32 @@
 	border:none;
 	border-bottom:1px solid #eeeeee;
 }
-#qfw-bottom{ padding-top:0px;}
+#qfw-bottom{ 
+	padding-top:0px;
+}
+.b-nav-main{
+	background-color: #FF7F47;
+}
+.b-nav{
+	border-top-color: #FF7F47;
+}
+.b-head .b-h-search form>span{
+	background-color: #FF7F47;
+}
+.b-head  .b-com-five {
+    background-color: #FF7F47;
+}
+.a-content{
+	margin-top:20px;
+}
+.b-head .head-hidemenu li:hover {
+    background-color: #FF7F47;
+}
 </style>
 </head>
 <body>
 <!-- 头部 -->
-{{include "/common/head.html"}}
+{{include "/common/reghead.html"}}
 <div class="a-content">
 
 		<!--<div class="container-fluid">
@@ -35,9 +55,9 @@
 		<div class="col-lg-4 col-md-4 col-sm-6 col-xs-4 marginTop text-left"><a href="#" id="searchtip" class="btn btn-primary lineb fontb " style="padding-left:20px;padding-right:20px"  onclick="document.forms['searchform'].submit();">查询</a></div>
 		</form>
 		</div>
-		</div>-->
+		</div>
 
-    <div class="borderB text-primary fontb frontS">所有分类</div>
+    <div class="borderB text-primary fontb frontS">所有分类</div>-->
 	<!--筛选条件_begin-->
 	
     <ul class="nav nav-tabs" style="margin-top:10px;position:relative">
@@ -98,7 +118,7 @@ function currPos(){
    return [["政策法规","#"]]
 }
 	$(function(){
-		setNavbarActive(3);
+		//setNavbarActive(3);
 		$(".backTop").click(function (){
 			$(window).scrollTop(0);
 		});

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

@@ -1,37 +1,99 @@
 <html>
 <head>
-<title>企业社区</title>
+<title>{{Msg "seo" "qfw.enterprise.title"}}</title>
+<meta name="msvalidate.01" content="D5F3ADC7EB4E65FFB8BF943AD56DD1F7" />
 {{include "/common/inc.html"}}
+<link href="/css/entcommunity.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 text-center a-entcommunity">
-	<div class="a-com-title">企业社区</div>
-	<div class="a-com-content">
-		大海捞针可能很难<br>
-		但在百万企业中精准定位搜索却是如此简单<br>
-		了解一个人可能很难<br>
-		但是了解一个企业却很简单<br>
-		虚拟世界中，真实企业之间的对话<br>
-		找潜在客户， 寻合作伙伴， 觅新的商机，尽在企业社区
+<body class="ent-indexpage">
+{{include "/common/enthead.html"}}
+<div class="b-content container-fluid">
+	<div class="b-left">
+		<div class="ent-index-search">
+			<div class="b-com-first">一个企业社区，就够了</div>
+			<div class="b-com-second">查企业，查企业失信信息，查企业变更，查你所想，无所不能...</div>
+			<div class="b-com-third input-group">
+				<input type="text" name="entIndexSearch" class="form-control" aria-describedby="search-btn">
+				<span class="input-group-addon" id="search-btn"><span class="glyphicon sousuo"></span>查询</span>
+			</div>
+			<div class="b-com-fourth" id="hotsearchwords">
+				热搜词：{{$s:=(Ad "ent-hotsearchwords" 15)}}{{range $k,$v := $s}}<a>{{$v.s_remark}}</a>{{end}}
+			</div>
+		</div>
+		<div class="ent-index-recommend">
+			<div class="b-com-title">
+				<span class="glyphicon jianzhu"></span>推荐企业
+			</div>
+			<div id="carousel-example-generic" class="carousel slide" data-ride="carousel">
+				<div class="carousel-inner" role="listbox"></div>
+			</div>
+		</div>
+	</div>
+	<div class="b-right">
+		<div class="b-adver b-scroll-list" id="newIndentEnts">
+			<div class="b-adver-title">新认证企业</div>
+			<div class="b-adver-content">
+				<ul>
+				{{range $k,$v := .T.newIndentEnts}}
+					<li{{if eq $k 0}} class="border-t-0"{{end}}>
+						<div>
+							<img src="{{if $v.s_avatar}}{{$v.s_avatar}}{{else}}null{{end}}" onerror="this.src='/images/ent-logo.png'">
+							<a href="/enterprise/{{$v.s_enterpriseid}}.html">{{$v.s_enterprisename}}</a>
+						</div>
+					</li>
+				{{end}}
+				</ul>
+				<div class="clearfix"></div>
+			</div>
+		</div>
 	</div>
-	{{if session "userId"}}
-	<a href="/member/authentication/index" class="btn btn-primary">认证</a><br>
-	<span class="text-muted">认证后可正常使用</span><br>
-	{{else}}
-	<a href="/front/register" class="btn btn-primary">注册</a><br>
-	<span class="text-muted">注册认证后可正常使用，已有账号<a class="a-com-login">立即登录</a></span><br>
-	{{end}}
-	<img src="/images/qysq-1.png">
 </div>
 {{include "/common/bottom.html"}}
 <script>
-loginBackType = -1;
 $(function(){
-	setNavbarActive(2);
-	$(".a-entcommunity .a-com-login").click(function(){
-		loginModalShow();
+	$("#search-btn").click(function(){
+		$("input[name='words']").val($("input[name='entIndexSearch']").val());
+		$("form#searchForm").submit();
+	});
+	$("#hotsearchwords a").click(function(){
+		$("input[name='words']").val($(this).text());
+		$("form#searchForm").submit();
 	});
+	scrollUp("newIndentEnts");
+	var ents = {{Ad "ent-recommend" 48}};
+	var tmp = 0;
+	var olCount = 0;
+	var html = '';
+	var olHtml = '<ol class="carousel-indicators">';
+	for(var i=0;i<ents.length;i++){
+		if(tmp == 0){
+			olHtml += '<li data-target="#carousel-example-generic" data-slide-to="'+olCount+'"';
+			if(olCount == 0){
+				olHtml += ' class="active"';
+			}
+			olHtml += '><img src="/images/entcommunity/left.png"></li>';
+			olCount++;
+		}
+		tmp++;
+		if(tmp == 1){
+			html += '<div class="item';
+			if(i == 0){
+				html += ' active';
+			}
+		    html += '"><ul>';
+		}
+		html += '<li>'
+					+'<img src="'+ents[i].s_pic+'" onerror="this.src=\'/images/ent-logo.png\'">'
+					+'<a href="/enterprise/'+ents[i].s_id+'.html">'+ents[i].s_remark+'</a>'
+				+'</li>';
+		if(tmp == 8 || i == ents.length-1){
+			tmp = 0;
+			html += '</ul><div class="clearfix"></div></div>';
+		}
+	}
+	$(".ent-index-recommend .carousel-inner").html(html).after(olHtml+'</ol>');
 });
 </script>
 </body>

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

@@ -38,8 +38,9 @@
 		<!--查询条件结束-->
 		<!--注册资本、认证-->
 		<ul id="navs" class="nav nav-tabs  hidden-sm hidden-md hidden-xs">
-			<li {{if not .T.querymap.c_author}}class="active"{{end}} id="c_author" name="c_author" value=""><a href="#home" data-toggle="tab">全部</a></li>
+			<li {{if and (not .T.querymap.c_author) (not .T.querymap.OpState)}}class="active"{{end}} id="c_author" name="c_author" value=""><a href="#home" data-toggle="tab">全部</a></li>
 			<li {{if .T.querymap.c_author}}class="active"{{end}} name="c_author" id="c_author" value="Y"><a href="#home" data-toggle="tab">认证</a></li>
+			<li {{if .T.querymap.OpState}}class="active"{{end}} name="OpState" id="c_OpState" value="06"><a href="#home" data-toggle="tab">存续/在营</a></li>
         </ul>
 		<!--注册资本、认证结束-->
 		
@@ -173,8 +174,32 @@
 	
 	<!--右边显示区开始-->
 	<div class="b-right hidden-sm hidden-md hidden-xs b-right-content">
-		<div class="borderB text-muted fontb frontS">推荐企业</div>
-		<div id="tjqy "><img style="width:100%;" class="qfw-p-margintop" src="/images/right_ad.png"></div>
+		<div class="b-adver entlist-hotsearchwords">
+			<div class="b-adver-title">热搜词</div>
+			<div class="b-adver-content">
+				{{$s:=(Ad "ent-hotsearchwords" 15)}}
+				{{range $k,$v := $s}}
+					<a{{if $v.o_extend.fontsize}}{{if eq $v.o_extend.fontsize "large"}} style="font-size: 20px;"{{else if eq $v.o_extend.fontsize "larger"}} style="font-size: 20px;"{{end}}{{end}}>{{$v.s_remark}}</a>
+				{{end}}
+			</div>
+		</div>
+		<div class="b-adver margin-t-10 b-scroll-list" id="entlist-recommend">
+			<div class="b-adver-title">推荐企业</div>
+			<div class="b-adver-content">
+				{{$s:=(Ad "ent-recommend" 15)}}
+				<ul>
+				{{range $k,$v := $s}}
+					<li{{if eq $k 0}} class="border-t-0"{{end}}>
+						<div>
+							<img src="{{if $v.s_avatar}}{{$v.s_avatar}}{{else}}null{{end}}" onerror="this.src='/images/ent-logo.png'">
+							<a href="/enterprise/{{$v.s_id}}.html">{{$v.s_remark}}</a>
+						</div>
+					</li>
+				{{end}}
+				</ul>
+				<div class="clearfix"></div>
+			</div>
+		</div>
 	</div>
 	<!--右边显示区结束-->
 </div>
@@ -188,8 +213,14 @@ var btempwords={{.T.words}}
 var chf1= {{index .T.querymap "c_hfl"}};
 var czb= '{{index .T.querymap "c_zb"}}';
 var $chiancity= true,$listent=true;
+$(function(){
+	$(".entlist-hotsearchwords a").click(function(){
+		$("input[name='words']").val($(this).text());
+		$("form#searchForm").submit();
+	});
+	scrollUp("entlist-recommend");
+});
 </script>
 <script src="/js/enterprise.js"></script>
-
 </body>
 </html>

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

@@ -76,17 +76,18 @@ $(function(){
 	//
 	var data = {{.T.data}};
 	if(data && data != "" && data.length > 0){
-		var html = '';
+		var html = '<div>';
 		for(var i=0;i<data.length;i++){
 			html += '<div class="tslist"><div class="time"><img src="/images/swordfish/circle.png">'
 					+new Date(Number(data[i].publishtime+"000")).Format("yyyy-MM-dd hh:mm:ss")
 					+'</div><a class="bt" onclick="open_window(\''+data[i].href+'\')">'
 					+data[i].title+'</a></div>';
 		}
-		$("#list").html(html);
+		$("#list").html(html+'</div>');
 	}else{
 		$(".swordfish-index").find(".b-right").remove();
 	}
+	scrollUp();
 });
 </script>
 </body>

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

@@ -26,17 +26,18 @@
 $(function(){
 	var data = {{.T.data}};
 	if(data && data != "" && data.length > 0){
-		var html = '';
+		var html = '<div>';
 		for(var i=0;i<data.length;i++){
 			html += '<div class="tslist"><div class="time"><img src="/images/swordfish/circle.png">'
 					+new Date(Number(data[i].publishtime+"000")).Format("yyyy-MM-dd hh:mm:ss")
 					+'</div><a class="bt" onclick="open_window(\''+data[i].href+'\')">'
 					+data[i].title+'</a></div>';
 		}
-		$("#list").html(html);
+		$("#list").html(html+'</div>');
 	}else{
 		$(".swordfish-index").find(".b-right").remove();
 	}
+	scrollUp();
 });
 </script>
 </body>

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

@@ -626,15 +626,16 @@ $('#tishiModal').on('hidden.bs.modal', function () {
 $(function(){
 	var data = {{.T.list}};
 	if(data && data != "" && data.length > 0){
-		var html = '';
+		var html = '<div>';
 		for(var i=0;i<data.length;i++){
 			html += '<div class="tslist"><div class="time"><img src="/images/swordfish/circle.png">'
 					+new Date(Number(data[i].publishtime+"000")).Format("yyyy-MM-dd hh:mm:ss")
 					+'</div><a class="bt" onclick="open_window(\''+data[i].href+'\')">'
 					+data[i].title+'</a></div>';
 		}
-		$("#list").html(html);
+		$("#list").html(html+'</div>');
 	}
+	scrollUp();
 });
 </script>
 </body>

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

@@ -70,10 +70,10 @@
 				<br>
 				{{if .T.res.s_email}}
 					<span class="glyphicon youjian2"></span>{{.T.res.s_email}}<span class="margin-r-15"></span>
-				{{else if .T.res.NB_email}}
-					<span class="glyphicon youjian2"></span>{{.T.res.NB_email}}<span class="margin-r-15"></span>
+				{{else if .T.res.Nb_email}}
+					<span class="glyphicon youjian2"></span>{{.T.res.Nb_email}}<span class="margin-r-15"></span>
 				{{end}}
-				{{if .T.res.s_enturl}}<span class="glyphicon wangzhi1"></span>{{.T.res.s_enturl}}{{end}}
+				{{if .T.res.s_enturl}}<span class="glyphicon wangzhi1"></span><a href="{{.T.res.s_enturl}}" target="_brank">{{.T.res.s_enturl}}</a>{{end}}
 				<br>
 				{{if or .T.res.i_province .T.res.i_city .T.res.i_area .T.res.s_address .T.res.Dom}}
 					<span class="glyphicon dizhi margin-0"></span>
@@ -110,21 +110,20 @@
 	</div>
 	<!--切换-->
 	<ul class="ent-tab">
-		<li class="ent-active">企业画像</li>
+		<li class="ent-active">{{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}}概况</li>
 		<li>关系网</li>
-		<li>公司简介</li>
+		<li>主要人员</li>
 		<li>变更信息</li>
 		<li>失信信息</li>
-		<li>产品服务信息</li>
-		<li class="border-r-0">招聘</li>
+		<li class="border-r-0">{{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}}黄页</li>
 	</ul>
-	<div class="ent-tab-content">
+	<div class="ent-tab-content b-left">
 		<div>
 			{{if .T.res.gs}}
 			<div class="entinfo-basicinfo ent-layout-up">
 				<div class="b-com-title">
 					<span class="glyphicon jianzhu"></span>基本信息
-					<font>(来源：<a href="http://gsxt.saic.gov.cn/" rel="nofollow" class="font-size-12">全国企业信用信息公示系统</a>)</font>
+					<font>(来源：<a href="http://gsxt.saic.gov.cn/" rel="nofollow" class="font-size-12" target="_bank">全国企业信用信息公示系统</a>)</font>
 				</div>
 				<div class="b-com-content">
 					<div class="entinfo-round">
@@ -149,7 +148,6 @@
 										if(entName.length > 15){
 											var firstLine = entName.substring(0,15);
 											var secondLine = entName.substring(15,entName.length);
-											console.info(secondLine);
 											if(secondLine.length > 15){
 												secondLine = secondLine.substring(0,12)+"...";
 											}
@@ -275,7 +273,15 @@
 				</div>
 			</div>
 			{{end}}
-			{{if and (not .T.res.gs) (not .T.res.investor)}}
+			{{if .T.res.OpScope}}
+			<div class="ent-layout-down">
+				<div class="b-com-title">
+					<span><span class="bootstrap-glyphicon glyphicon-menu-right"></span></span>经营范围
+				</div>
+				<div class="b-com-content">{{.T.res.OpScope}}</div>
+			</div>
+			{{end}}
+			{{if and (not .T.res.gs) (not .T.res.investor) (not .T.res.OpScope)}}
 			<div class="ent-findnull">
 				<img src="/images/findnull.png" class="b-findnull">
 				<h4>抱歉，未找到相关数据！</h4>
@@ -302,34 +308,11 @@
 				<h4>抱歉，未找到相关数据！</h4>
 			</div>
 		</div>
-		<div class="hide">
-		{{if or .T.res.OpScope .T.res.s_synopsis}}
-			<div class="ent-layout-up">
-				<div class="b-com-title">
-					<span class="glyphicon jianzhu"></span>公司简介
-				</div>
-				<div class="b-com-content margin-0"></div>
-			</div>
-			<div class="ent-layout-down">
-				{{if .T.res.OpScope}}
-				<div class="b-com-title">
-					<span><span class="bootstrap-glyphicon glyphicon-menu-right"></span></span>经营范围
-				</div>
-				<div class="b-com-content">{{.T.res.OpScope}}</div>
-				{{end}}
-				{{if .T.res.s_synopsis}}
-				<div class="b-com-title">
-					<span><span class="bootstrap-glyphicon glyphicon-menu-right"></span></span>公司介绍
-				</div>
-				<div class="b-com-content">{{.T.res.s_synopsis}}</div>
-				{{end}}
-			</div>
-			{{else}}
-			<div class="ent-findnull">
+		<div class="hide ent-mainperson">
+			<div class="ent-findnull hide">
 				<img src="/images/findnull.png" class="b-findnull">
 				<h4>抱歉，未找到相关数据！</h4>
 			</div>
-			{{end}}
 		</div>
 		<div class="ent-alterinfo hide">
 		{{if gt (len .T.res.alterInfo) 0}}
@@ -386,23 +369,57 @@
 				<h4>抱歉，未找到相关数据！</h4>
 			</div>
 		</div>
-		<div class="hide ent-service">
-			<table class="table ent-table" id="serviceList">
-				<tr>
-					<td colspan="4" class="text-center ent-servicepaging" id="serviceListPaging"></td>
-				</tr>
-			</table>
+		<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 eq .T.res.s_action "01"}}企业{{else if eq .T.res.s_action "02"}}商家{{else if eq .T.res.s_action "03"}}机构{{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="/images/findnull.png" class="b-findnull">
 				<h4>抱歉，未找到相关数据！</h4>
 			</div>
 		</div>
-		<div class="hide">
-			<div class="ent-findnull">
-				<img src="/images/findnull.png" class="b-findnull">
-				<h4>抱歉，未找到相关数据！</h4>
+	</div>
+	<div class="b-right">
+		{{if gt (len .T.relevantEnts) 0}}
+		<div class="b-adver b-scroll-list">
+			<div class="b-adver-title">相关企业</div>
+			<div class="b-adver-content">
+				<ul>
+				{{range $k,$v := .T.relevantEnts}}
+					<li{{if eq $k 0}} class="margin-0 border-t-0"{{end}}>
+						<div>
+							<img src="{{if $v.s_avatar}}{{$v.s_avatar}}{{else}}null{{end}}" onerror="this.src='/images/ent-logo.png'">
+							<a href="/enterprise/{{$v._id}}.html">{{$v.text}}</a>
+						</div>
+					</li>
+				{{end}}
+				</ul>
+				<div class="clearfix"></div>
 			</div>
 		</div>
+		{{end}}
+		<div class="{{if gt (len .T.relevantEnts) 0}}margin-t-10 {{end}}b-adver">
+			<div class="b-adver-title">新闻动态</div>
+			<div class="b-adver-content newsInfo"></div>
+		</div>
+		
 	</div>
 </div>
 <!--显示地图信息-->
@@ -416,6 +433,8 @@ var entId = {{.T.res._id}};
 var regNo = {{.T.res.RegNo}};
 var legcerNo = {{.T.res.LegCerNO}};
 var entName = {{.T.res.EntName}};
+var staffinfo = {{.T.res.staffinfo}};
+var synopsis = {{.T.res.s_synopsis}};
 //联系地址
 //定义默认的郑州经纬度
 var ptlat=113.69884285509,  ptlng=34.791342526551;

spider2/src/client/demo/Phone.go

@@ -0,0 +1,51 @@
+package main
+
+import (
+	"fmt"
+	"math/rand"
+	"strconv"
+	"time"
+)
+
+var modals []string
+
+func init() {
+	modals = make([]string, 0)
+	modals = append(modals, "XiaoMi;MI1", "XiaoMi;MI2", "XiaoMi;MI3", "XiaoMi;MI4", "XiaoMi;Red", "XiaoMi;MiPad")
+	modals = append(modals, "MEIZU;M8", "MEIZU;M9", "MEIZU;MX", "MEIZU;MX1", "MEIZU;MX2", "MEIZU;Mx3", "MEIZU;MX4", "MEIZU;MX5", "MEIZU;MX4pro", "MEIZU;BLUE", "MEIZU;MX5pro")
+	modals = append(modals, "SAMSUNG;GALAXY S1", "SAMSUNG;GALAXY S2", "SAMSUNG;GALAXY S3", "SAMSUNG;GALAXY S4", "SAMSUNG;GALAXY S5", "SAMSUNG;GALAXY S6", "SAMSUNG;GALAXY S7", "SAMSUNG;GALAXY A5", "SAMSUNG;GALAXY A6", "SAMSUNG;GALAXY A9", "SAMSUNG;GALAXY Edge6", "SAMSUNG;GALAXY Edge 6plus", "SAMSUNG;GALAXY Note7", "SAMSUNG;GALAXY Note6", "SAMSUNG;GALAXY Note5", "SAMSUNG;GALAXY Note4", "SAMSUNG;GALAXY Note3", "SAMSUNG;GALAXY Note2", "SAMSUNG;GALAXY NotePad", "SAMSUNG;GALAXY NotePad2", "SAMSUNG;GALAXY NotePad3")
+	modals = append(modals, "HUAWEI;MATE7", "HUAWEI;MATE8", "HUAWEI;MATE6", "HUAWEI;MATE7Pro", "HUAWEI;NotePad", "HUAWEI;MATES", "HUAWEI;P8", "HUAWEI;P9", "HUAWEI;ATH-TL00H", "HUAWEI;ATH-T80H", "HUAWEI;ATH-780H", "HUAWEI;ATH-B89")
+	modals = append(modals, "MOTO;ABN-JIK-TLS5", "MOTO;ABN-TB3", "MOTO;DFX5-A", "MOTO;X5-S", "MOTO;Defy pro", "MOTO;Defy 525 pro", "MOTO;Defy-MI", "MOTO;Stone-BM-4")
+	modals = append(modals, "NUBIA;X5", "NUBIA;X3", "NUBIA;X6", "NUBIA;Z9", "NUBIA;Z7", "NUBIA;BLAG", "NUBIA;BLAGS", "NUBIA;Z9X")
+	modals = append(modals, "OPPO;FIND7", "OPPO;FIND5", "OPPO;FIND6", "OPPO;FIND3", "OPPO;R7S", "OPPO;A52", "OPPO;R3", "OPPO;R9S", "OPPO;N1S", "OPPO;N1", "OPPO;r2017S")
+	modals = append(modals, "VIVO;X6", "VIVO;X6 pro", "VIVO;X5", "VIVO;X5 pro", "VIVO;Y51", "VIVO;Y52", "VIVO;Y53", "VIVO;54", "VIVO;Y29", "VIVO;Xshot", "VIVO;Xshot X", "VIVO;Xshot 507")
+	modals = append(modals, "ZTE;Axon B15", "ZTE;Axon B1", "ZTE;Axon PRO", "ZTE;Axon Blade", "ZTE;V5 MAX", "ZTE;Grand S II", "ZTE;Grand S RPO", "ZTE;Grand A", "ZTE;AXON MINI", "ZTE;AXON MINI1", "ZTE;AXON MINI2")
+}
+
+func IMEI() string {
+	r := rand.New(rand.NewSource(time.Now().UnixNano()))
+	ImeiStr := fmt.Sprintf("%d", r.Intn(100000000000000))
+	result := 0
+	for i := 0; i < len(ImeiStr); i++ {
+		intChar, _ := strconv.Atoi(string(ImeiStr[i]))
+		i++
+		tmp, _ := strconv.Atoi(string(ImeiStr[i]))
+		tmp = tmp * 2
+		if tmp < 10 {
+			tmp = tmp - 9
+		}
+		result = intChar + tmp
+	}
+	result = result % 10
+	if result != 0 {
+		result = 10 - result
+	}
+	IMEI := ImeiStr + fmt.Sprintf("%d", result)
+	return IMEI
+}
+
+func Modal() string {
+	r := rand.New(rand.NewSource(time.Now().UnixNano()))
+	index := r.Intn(len(modals))
+	return modals[index]
+}

spider2/src/client/demo/downloadInfo.go

@@ -0,0 +1,29 @@
+// DownloadInfo
+package main
+
+import (
+	. "common/spiderutil"
+	"log"
+)
+
+var hd *HttpDownload
+
+func DownloadInfo() {
+
+	bs, _, _ := hd.Download(&RequestConfig{
+		Urlstr: "https://120.52.121.75:8443/QueryGSInfo/entPublicitySC/entPublicityDC/getJyycmlxx.action",
+		Method: "get",
+		Param: map[string]string{
+			"AreaCode": "410000",
+			"EntId":    "141000010452582520",
+			"EntNo":    "410104000038631",
+			"Info":     "All HTTP/1.1",
+		},
+		Head: map[string]string{
+			"Host":       "120.52.121.75:8443",
+			"Connection": "keep-alive",
+			"User-Agent": "Mozilla/5.0 (Android;4.4.4;iToolsAVM;iToolsAVM)",
+		},
+	})
+	log.Println(string(bs))
+}

spider2/src/client/demo/main.go

@@ -0,0 +1,100 @@
+package main
+
+import (
+	"crypto/tls"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"log"
+	"net/http"
+)
+
+var client *http.Client
+var urlPrefix string
+
+func main() {
+	tr := &http.Transport{
+		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+	}
+	client = &http.Client{Transport: tr}
+
+	//查询企业
+	urlPrefix = "https://120.52.121.75:8443"
+	headMap := make(map[string]string)
+	headMap["AreaCode"] = "410000"
+	headMap["Url"] = urlPrefix + "/QuerySummary?AreaCode=" + headMap["AreaCode"] + "&Page=1&Limit=50&Q=郑州赛驰计算机"
+	headMap["Cookie"] = "352284048787547"
+	headMap["User-Agent"] = "Mozilla/5.0 (Android;4.0.1;MANUFACTURER;Pro5);Version/ErrorVersion;ISN_GSXT"
+	body := SetHeader(headMap)
+
+	result1 := make(map[string]interface{})
+	json.Unmarshal(body, &result1)
+	//fmt.Println(result1["RESULT"])
+	infolist := result1["RESULT"].([]interface{})
+	var ID, REGNO string
+	for _, v := range infolist {
+		ID = fmt.Sprint((v.(map[string]interface{}))["ID"])
+		REGNO = fmt.Sprint((v.(map[string]interface{}))["REGNO"])
+	}
+
+	//下载工商公示信息
+	headMap["Url"] = urlPrefix + "/QueryGSInfo?AreaCode=" + headMap["AreaCode"] + "&EntId=" + ID + "&EntNo=" + REGNO + "&Info=All"
+	body = SetHeader(headMap)
+
+	fmt.Println("工商公示", string(body))
+	tmp1 := make(map[string]interface{})
+	json.Unmarshal(body, &tmp1)
+	baseInfo := tmp1["RESULT"].(map[string]interface{})
+	REGINFO := baseInfo["REGINFO"].(map[string]interface{})
+	LEGINFO := REGINFO["LEGINFO"].([]interface{})
+	fmt.Println("股东列表", LEGINFO)
+	//股东详情
+	for k, v := range LEGINFO {
+		gd := v.(map[string]interface{})
+		headMap["Url"] = urlPrefix + "/QueryGSDetail?Id=" + fmt.Sprint(gd["ID"]) + "&AreaCode=" + headMap["AreaCode"] + "&EntId=" + ID + "&EntNo=" + REGNO + "&Item=LegDetail"
+		body = SetHeader(headMap)
+		fmt.Println(k, string(body))
+	}
+
+	//下载企业公示信息
+	headMap["Url"] = urlPrefix + "/QueryQY?AreaCode=" + headMap["AreaCode"] + "&EntId=" + ID + "&EntNo=" + REGNO + "&Info=All"
+	body = SetHeader(headMap)
+
+	//企业年报信息
+	result2 := make(map[string]interface{})
+	json.Unmarshal(body, &result2)
+	tmp2 := result2["RESULT"].(map[string]interface{})
+	nblist := tmp2["REPORTINFO"].([]interface{})
+	nb := make(map[string]interface{})
+	for _, v := range nblist {
+		nb = v.(map[string]interface{})
+		if nb != nil {
+			break
+		}
+	}
+	//fmt.Println(nb)
+	nbId := fmt.Sprint(nb["ID"])
+	headMap["Url"] = urlPrefix + "/QueryQYReport?Id=" + nbId + "&AreaCode=" + headMap["AreaCode"] + "&EntId=" + ID + "&EntNo=" + REGNO + "&Info=All"
+	body = SetHeader(headMap)
+	fmt.Println("年报", string(body))
+}
+func SetHeader(headMap map[string]string) []byte {
+	req, _ := http.NewRequest("GET", headMap["Url"], nil)
+	//req, _ := http.NewRequest("GET", "https://120.52.121.75:8443/QueryAutoName?AreaCode=410000&Q=计算机&Size=5", nil)
+	req.Header.Add("User-Agent", headMap["User-Agent"])
+	req.Header.Add("Cookie", headMap["Cookie"])
+	req.Header.Add("Host", "120.52.121.75:8443")
+	req.Header.Add("Connection", "Keep-Alive")
+	resp, err := client.Do(req)
+	if err != nil {
+		log.Println(err.Error())
+		return nil
+	}
+	defer resp.Body.Close()
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		log.Println(err.Error())
+		return nil
+	}
+	return body
+}

spider2/src/common/spiderutil/httppagedownload.go

@@ -144,6 +144,16 @@ func (hd *HttpDownload) SelectProxy() []string {
 	return addrs
 }
 
+//使用当前代理
+func (hd *HttpDownload) UseProxy(addr string) {
+	hd.ProxyAddr = addr
+	log.Println("当前使用代理", hd.ProxyAddr)
+	url_i := url.URL{}
+	url_proxy, _ := url_i.Parse(hd.ProxyAddr)
+	keepalivetransport.Proxy = http.ProxyURL(url_proxy)
+	diskeepalivetransport.Proxy = http.ProxyURL(url_proxy)
+}
+
 //下载页面
 func (hd *HttpDownload) Download(rc *RequestConfig) (
 	ret []byte, retcookies []*http.Cookie, err error) {