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

common/src/qfw/util/mongodb/mongodbSim.go

@@ -141,3 +141,38 @@ func (m *MongodbSim) Update(c string, query interface{}, set interface{}, upsert
 	}
 	return b
 }
+
+//批量插入
+func (m *MongodbSim) SaveBulk(c string, doc ...map[string]interface{}) bool {
+	sess := m.GetMgoConn()
+	b := true
+	if sess != nil {
+		defer func() {
+			b = false
+			if r := recover(); r != nil {
+				log.Println("[E]", r)
+				for skip := 1; ; skip++ {
+					_, file, line, ok := runtime.Caller(skip)
+					if !ok {
+						break
+					}
+					go log.Printf("%v,%v\n", file, line)
+				}
+			}
+		}()
+		defer m.DestoryMongoConn(sess)
+		coll := sess.DB(m.DbName).C(c)
+		bulk := coll.Bulk()
+		for _, v := range doc {
+			bulk.Insert(v)
+		}
+		_, err := bulk.Run()
+		if nil != err {
+			log.Println("BulkError", err)
+			b = false
+		}
+	} else {
+		b = false
+	}
+	return b
+}

common/src/qfw/util/mongodbutil/mongodbutil.go

@@ -0,0 +1,369 @@
+package mongoutil
+
+import (
+	"encoding/json"
+	"fmt"
+	mgo "gopkg.in/mgo.v2"
+	. "gopkg.in/mgo.v2/bson"
+	"log"
+	. "qfw/util"
+	"runtime"
+	"strings"
+	"time"
+)
+
+type PoolConfig struct {
+	Alias string
+	Addr  string
+	DB    string
+	Size  int
+}
+
+//连接池
+var pool map[string]chan *mgo.Session
+var Config []PoolConfig
+
+//[mongodb://][user:pass@]host1[:port1][,host2[:port2],...][/database][?options]
+//初始化mongodb连接池大小
+func InitMongodbPool() {
+	defer func() {
+		if r := recover(); r != nil {
+			log.Println("[E]", r)
+			for skip := 1; ; skip++ {
+				_, file, line, ok := runtime.Caller(skip)
+				if !ok {
+					break
+				}
+				go log.Printf("%v,%v\n", file, line)
+			}
+		}
+	}()
+	pool = make(map[string]chan *mgo.Session)
+	for _, v := range Config {
+		pool[v.Alias] = make(chan *mgo.Session, v.Size)
+		for i := 0; i < v.Size; i++ {
+			sess, err := createConn(v.Alias)
+			if err == nil && sess.Ping() == nil {
+				pool[v.Alias] <- sess
+			}
+		}
+	}
+}
+
+//从连接池中取得mongodb连接,懒加载模式
+func GetMgoConn(alias string) (session *mgo.Session) {
+	defer func() {
+		if r := recover(); r != nil {
+			log.Println("[E]", r)
+			for skip := 1; ; skip++ {
+				_, file, line, ok := runtime.Caller(skip)
+				if !ok {
+					break
+				}
+				go log.Printf("%v,%v\n", file, line)
+			}
+		}
+	}()
+	if v, ok := pool[alias]; ok {
+		select {
+		case session = <-v:
+			err := session.Ping()
+			if err == nil {
+				return session
+			} else {
+				session.Close()
+				session, err = createConn(alias)
+				if err == nil && session.Ping() == nil {
+					return session
+				}
+				return nil
+			}
+		case <-time.After(time.Second * 2):
+			//超时
+			return nil
+		}
+	} else {
+		return nil
+	}
+
+}
+
+//取session链接
+func createConn(alias string) (sess *mgo.Session, err error) {
+	for _, v := range Config {
+		if v.Alias == alias {
+			sess, err = mgo.Dial(v.Addr)
+			break
+		}
+	}
+	return sess, err
+}
+
+//释放连接，在取得连接后要使用defer DestoryMongoConn()进行释放
+func DestoryMongoConn(alias string, session *mgo.Session) {
+	if v, ok := pool[alias]; ok {
+		v <- session
+	}
+}
+
+//查询单条对象
+func FindOne(c, alias, db string, query interface{}) *map[string]interface{} {
+	return FindOneByField(c, alias, db, query, nil)
+}
+
+//查询单条对象
+func FindOneByField(c, alias, db string, query interface{}, fields interface{}) *map[string]interface{} {
+	defer func() {
+		if r := recover(); r != nil {
+			log.Println("[E]", r)
+			for skip := 1; ; skip++ {
+				_, file, line, ok := runtime.Caller(skip)
+				if !ok {
+					break
+				}
+				go log.Printf("%v,%v\n", file, line)
+			}
+		}
+	}()
+	res := Find(c, alias, db, query, nil, fields, true, -1, -1)
+	if nil != res && len(*res) > 0 {
+		return &((*res)[0])
+	}
+	return nil
+}
+
+//底层查询方法
+func Find(c, alias, db string, query interface{}, order interface{}, fields interface{}, single bool, start int, limit int) *[]map[string]interface{} {
+	sess := GetMgoConn(alias)
+	var res []map[string]interface{}
+	if sess != nil {
+		defer func() {
+			if r := recover(); r != nil {
+				log.Println("[E]", r)
+				for skip := 1; ; skip++ {
+					_, file, line, ok := runtime.Caller(skip)
+					if !ok {
+						break
+					}
+					go log.Printf("%v,%v\n", file, line)
+				}
+			}
+		}()
+		defer DestoryMongoConn(alias, sess)
+		res = make([]map[string]interface{}, 1)
+		coll := sess.DB(db).C(c)
+		var err error
+		if single {
+			err = coll.Find(ObjToM(query)).Select(ObjToOth(fields)).One(&res[0])
+		} else if start > -1 {
+			err = coll.Find(ObjToM(query)).Select(ObjToOth(fields)).Sort(ObjToArr(order)...).Skip(start).Limit(limit).All(&res)
+		} else {
+			err = coll.Find(ObjToM(query)).Select(ObjToOth(fields)).Sort(ObjToArr(order)...).All(&res)
+		}
+		if nil != err {
+			log.Println("FindError", err)
+		}
+	}
+	return &res
+}
+
+//修改对象
+func Update(c, alias, db string, query interface{}, set interface{}, upsert bool, multi bool) bool {
+	sess := GetMgoConn(alias)
+	b := true
+	if sess != nil {
+		defer func() {
+			if r := recover(); r != nil {
+				b = false
+				log.Println("[E]", r)
+				for skip := 1; ; skip++ {
+					_, file, line, ok := runtime.Caller(skip)
+					if !ok {
+						break
+					}
+					go log.Printf("%v,%v\n", file, line)
+				}
+			}
+		}()
+		defer DestoryMongoConn(alias, sess)
+		coll := sess.DB(db).C(c)
+		var err error
+		if upsert {
+			_, err = coll.Upsert(ObjToM(query), ObjToM(set))
+		} else {
+			if multi {
+				_, err = coll.UpdateAll(ObjToM(query), ObjToM(set))
+			} else {
+				err = coll.Update(ObjToM(query), ObjToM(set))
+			}
+		}
+		if nil != err {
+			log.Println("updateError", err)
+			b = false
+		}
+	}
+	return b
+}
+
+//删除对象
+func Del(c, alias, db string, query interface{}) bool {
+	sess := GetMgoConn(alias)
+	b := true
+	if sess != nil {
+		defer func() {
+			if r := recover(); r != nil {
+				log.Println("[E]", r)
+				for skip := 1; ; skip++ {
+					_, file, line, ok := runtime.Caller(skip)
+					if !ok {
+						break
+					}
+					go log.Printf("%v,%v\n", file, line)
+				}
+			}
+		}()
+		defer DestoryMongoConn(alias, sess)
+		coll := sess.DB(db).C(c)
+		_, err := coll.RemoveAll(ObjToM(query))
+		if nil != err {
+			log.Println("CountError", err)
+			b = false
+		}
+	}
+	return b
+}
+
+//保存对象
+func Save(c, alias, db string, doc interface{}) string {
+	sess := GetMgoConn(alias)
+	if sess != nil {
+		defer func() {
+			if r := recover(); r != nil {
+				log.Println("[E]", r)
+				for skip := 1; ; skip++ {
+					_, file, line, ok := runtime.Caller(skip)
+					if !ok {
+						break
+					}
+					go log.Printf("%v,%v\n", file, line)
+				}
+			}
+		}()
+		defer DestoryMongoConn(alias, sess)
+		coll := sess.DB(db).C(c)
+		obj := ObjToM(doc)
+		id := NewObjectId()
+		(*obj)["_id"] = id
+		err := coll.Insert(obj)
+		//log.Println(obj)
+		if nil != err {
+			log.Println("SaveError", err)
+			return ""
+		}
+		return (strings.Split(fmt.Sprintf("%s", id), `"`)[1])
+	}
+	return ""
+}
+
+//批量插入
+func SaveBulk(c, alias, db string, doc ...map[string]interface{}) bool {
+	sess := GetMgoConn(alias)
+	b := true
+	if sess != nil {
+		defer func() {
+			b = false
+			if r := recover(); r != nil {
+				log.Println("[E]", r)
+				for skip := 1; ; skip++ {
+					_, file, line, ok := runtime.Caller(skip)
+					if !ok {
+						break
+					}
+					go log.Printf("%v,%v\n", file, line)
+				}
+			}
+		}()
+		defer DestoryMongoConn(alias, sess)
+		coll := sess.DB(db).C(c)
+		bulk := coll.Bulk()
+		for _, v := range doc {
+			bulk.Insert(v)
+		}
+		_, err := bulk.Run()
+		if nil != err {
+			log.Println("BulkError", err)
+			b = false
+		}
+	} else {
+		b = false
+	}
+	return b
+}
+
+//对象转数组
+func ObjToArr(obj interface{}) []string {
+	if s, ok := obj.(string); ok {
+		if strings.ContainsAny(s, "{") {
+			//暂时简单支持此种写法
+			var temp = make(M)
+			var str = []string{}
+			json.Unmarshal([]byte(s), &temp)
+			for k, v := range temp {
+				m := IntAll(v)
+				if m > 0 {
+					str = append(str, k)
+				} else {
+					str = append(str, "-"+k)
+				}
+			}
+			return str
+		} else {
+			return strings.Split(s, ",")
+		}
+	} else if s1, ok1 := obj.([]string); ok1 {
+		return s1
+	} else {
+		return []string{}
+	}
+}
+
+func ObjToOth(query interface{}) *M {
+	return ObjToMQ(query, false)
+}
+func ObjToM(query interface{}) *M {
+	return ObjToMQ(query, true)
+}
+
+//obj(string,M)转M,查询用到
+func ObjToMQ(query interface{}, isQuery bool) *M {
+	data := make(M)
+	defer func() {
+		if r := recover(); r != nil {
+			log.Println("[E]", r)
+			for skip := 1; ; skip++ {
+				_, file, line, ok := runtime.Caller(skip)
+				if !ok {
+					break
+				}
+				go log.Printf("%v,%v\n", file, line)
+			}
+		}
+	}()
+	if s2, ok2 := query.(*map[string]interface{}); ok2 {
+		data = M(*s2)
+	} else if s3, ok3 := query.(*M); ok3 {
+		return s3
+	} else if s, ok := query.(string); ok {
+		json.Unmarshal([]byte(strings.Replace(s, "'", "\"", -1)), &data)
+		if ss, oks := data["_id"]; oks && isQuery {
+			data["_id"] = ObjectIdHex(ss.(string))
+		}
+	} else if s1, ok1 := query.(map[string]interface{}); ok1 {
+		data = s1
+	} else if s4, ok4 := query.(M); ok4 {
+		data = s4
+	} else {
+		data = nil
+	}
+	return &data
+}

common/src/qfw/util/mongodbutil/mongodbutil_test.go

@@ -0,0 +1,31 @@
+// mongodbutil_test
+package mongoutil
+
+import (
+	"log"
+	"testing"
+)
+
+func Test_pool(t *testing.T) {
+	conf := *new(PoolConfig)
+	conf.Addr = "192.168.3.18:27080"
+	conf.Alias = "A"
+	conf.DB = "qfw"
+	conf.Size = 5
+	config = append(config, conf)
+
+	conf = *new(PoolConfig)
+	conf.Addr = "192.168.3.18:27080"
+	conf.Alias = "B"
+	conf.DB = "spider"
+	conf.Size = 5
+	config = append(config, conf)
+
+	InitMongodbPool()
+
+	tmp := *FindOne("enterprise", "A", "qfw", `{"RegNo":"542125600001855"}`)
+	log.Println(tmp)
+
+	tmp = *FindOne("enterprise", "B", "spider", `{"REGNO":"410692000004499"}`)
+	log.Println(tmp)
+}

common/src/qfw/util/redis/redisutil.go

@@ -228,6 +228,35 @@ func GetBytes(code, key string) (ret *[]byte, err error) {
 	return
 }
 
+//删所有key
+func FlushDB(code string) bool {
+	b := false
+	defer func() {
+		if r := recover(); r != nil {
+			log.Println("[E]", r)
+			for skip := 1; ; skip++ {
+				_, file, line, ok := runtime.Caller(skip)
+				if !ok {
+					break
+				}
+				go log.Printf("%v,%v\n", file, line)
+			}
+		}
+	}()
+
+	conn := RedisPool[code].Get()
+	defer conn.Close()
+
+	var err error
+	_, err = conn.Do("FLUSHDB")
+	if nil != err {
+		log.Println("redisutil-FLUSHDBError", err)
+	} else {
+		b = true
+	}
+	return b
+}
+
 //支持删除多个key
 func Del(code string, key ...interface{}) bool {
 	b := false

core/src/qfw/front/webcentent.go

@@ -180,7 +180,7 @@ func (e *Newscont) GetJsonList(list string) error {
 
 //前台新闻资讯内容
 func (n *Newscont) Webcontent(_id string) error {
-	return n.viewContent4Front(_id, "/manage/webexpresscontent.html")
+	return n.viewContent4Front(_id, "/manage/webexpresscontent-new.html")
 }
 
 //前台微信新闻资讯内容
@@ -193,7 +193,7 @@ func (n *Newscont) viewContent4Front(_id string, temp string) error {
 	if ret := redis.Get("other", n.Url()); ret != nil {
 		return n.SetBody([]byte(ret.(string)))
 	} else {
-		r := elastic.GetByIdField("content", "content", _id, `"_id","s_title","l_createdate","s_pic","s_author","s_editorname","s_contenttype","praise","releasetime","s_subcontent","s_url","s_content","s_source","s_keywords","s_description"`)
+		r := elastic.GetByIdField("content", "content", _id, `"_id","s_title","l_createdate","s_pic","s_author","s_editorname","s_contenttype","praise","releasetime","s_subcontent","s_url","s_content","s_source","s_keywords","s_description","s_contenttype"`)
 		//r := mongodb.FindById("content", _id, `{"_id":1,"s_title":1,"l_createdate":1,"s_editorname":1,"s_contenttype":1,"s_content":1,"s_source":1}`)
 		if nil != r {
 			var i = 0
@@ -234,7 +234,8 @@ func (n *Newscont) viewContent4Front(_id string, temp string) error {
 			if len(author) < 1 {
 				(*r)["s_author"] = ""
 			}
-
+			hotnews := elastic.GetPage("content", "content", `{"s_contenttype": "qykb"}`, `{"praise":-1}`, `{"_id":1,"s_title":1,"praise":1}`, 0, 10)
+			(*r)["hotnews"] = hotnews
 			n.T = *r
 			(*r)["s_content"] = template.HTML((*r)["s_content"].(string))
 			content, _ := n.Render4Cache(temp, &n.T)
@@ -351,7 +352,7 @@ func (n *Newscont) Webregulationscontent(_id string) error {
 			data_7 := (*r)["l_fetchdate"]
 			(*r)["l_fetchdate"] = util.FormatDateWithObj(&data_7, util.Date_Full_Layout)
 			(*r)["s_content"] = template.HTML((*r)["s_content"].(string))
-			content, _ := n.Render4Cache("/manage/webcontent.html", &n.T)
+			content, _ := n.Render4Cache("/manage/webcontent-new.html", &n.T)
 			redis.Put("other", n.Url(), string(content), -1)
 			return n.SetBody(content)
 		} else {
@@ -376,9 +377,10 @@ func (n *Newscont) GetExpressList(list /*分类*/, param /*参数*/ string) erro
 
 		log.Println("querymap:", querymap)
 		//查询生成列表数据
-		if list == "qykb" {
+		if list == "qykb" || list == "zhsk" {
+			hotnews := elastic.GetPage("content", "content", `{"s_contenttype": "`+list+`"}`, `{"praise":-1}`, `{"_id":1,"s_title":1,"praise":1}`, 0, 10)
 			data, pagination := searhWebContent(querymap)
-			n.Render("/manage/web_newexpresslist.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
+			n.Render("/manage/web_newexpresslist.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination, "hotnews": hotnews})
 		} else if list == "zcfg" {
 			data, pagination := searhWebContentreg(querymap)
 			n.Render("/manage/web_regulationslist.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
@@ -389,9 +391,10 @@ func (n *Newscont) GetExpressList(list /*分类*/, param /*参数*/ string) erro
 		bs, _ := base64.StdEncoding.DecodeString(paramstr)
 		querymap := map[string]string{}
 		json.Unmarshal(bs, &querymap)
-		if list == "qykb" {
+		if list == "qykb" || list == "zhsk" {
+			hotnews := elastic.GetPage("content", "content", `{"s_contenttype": "`+list+`"}`, `{"praise":-1}`, `{"_id":1,"s_title":1,"praise":1}`, 0, 10)
 			data, pagination := searhWebContent(querymap)
-			n.Render("/manage/web_newexpresslist.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
+			n.Render("/manage/web_newexpresslist.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination, "hotnews": hotnews})
 		} else if list == "zcfg" {
 			data, pagination := searhWebContentreg(querymap)
 			n.Render("/manage/web_regulationslist.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination})
@@ -781,7 +784,7 @@ func (e *Newscont) GetLatestNews() {
 	    "bool": {
 		  "must":[{"term":{"s_contenttype":"qykb"}}]
 	    }},"_source":["s_title","releasetime","_id"]
-		,"from":0,"size":6,"sort":[{"releasetime":{"order":"desc"}}]}`
+		,"from":0,"size":8,"sort":[{"releasetime":{"order":"desc"}}]}`
 		//查询列表数据
 		client := elastic.GetEsConn()
 		defer elastic.DestoryEsConn(client)

core/src/qfw/manage/article.go

@@ -92,6 +92,7 @@ func (a *Article) Savearticle() error {
 			elastic.UpdateNewDoc("content", "content", FindById("content", id, ""))
 			redis.Del("other", string(id))
 			redis.Del("other", "/")
+			redis.Del("other", "latestNews") //最新消息
 		} else {
 			flag = "false"
 			msg = "保存失败！"
@@ -138,8 +139,10 @@ func (a *Article) Updatearticle() error {
 			msg = "修改成功！"
 			elastic.UpdateNewDoc("content", "content", FindById("content", _id, ""))
 			redis.Del("other", "/front/webcontent/"+_id+".html")
+			redis.Del("other", "/front/webhelpcontent/"+_id+".html")
 			redis.Del("other", "/front/weixincontent/"+_id)
 			redis.Del("other", "/")
+			redis.Del("other", "latestNews") //最新消息
 		} else {
 			flag = "false"
 			msg = "修改失败！"
@@ -162,6 +165,8 @@ func (a *Article) Delearticle() error {
 		if DelById("content", _id) {
 			flag = "true"
 			msg = "删除成功！"
+			redis.Del("other", "/")
+			redis.Del("other", "latestNews") //最新消息
 			elastic.DelById("content", "content", _id)
 		} else {
 			flag = "false"

core/src/qfw/manage/feedback.go

@@ -62,7 +62,7 @@ func (s *SystemManage) Getfeedback() error {
 				query = query + `,`
 			}
 			if len(search) > 0 {
-				query = query + `"s_title":{"$regex":"` + search + `"}`
+				query = query + `"s_title_no":{"$regex":"` + search + `"}`
 			}
 			query = query + "}"
 			res["totalRows"] = Count("interaction", query)

core/src/qfw/member/yellowpage.go

@@ -85,6 +85,7 @@ func (u *Yellowpage) Delservice() error {
 		flag := mongodb.Del("service", query)
 		if flag {
 			//再删除elasticsearch中的数据
+			redis.DelByCodePattern("enterprise", "service-"+entid.(string)+"-*")
 			flag2 := elastic.DelById(index, itype, id)
 			if flag2 {
 				u.ServeJson(&map[string]interface{}{
@@ -139,6 +140,7 @@ func (u *Yellowpage) Removeservice() error {
 			sid := strings.Split(fmt.Sprintf("%s", obj["_id"]), `"`)[1]
 			flag := mongodb.Update("service", `{"_id":"`+sid+`"}`, bson.M{"$set": bson.M{"i_status": 1}}, false, false)
 			if flag {
+				redis.DelByCodePattern("enterprise", "service-"+entid.(string)+"-*")
 				//修改elasticsearch中的数据
 				isUpdate := elastic.UpdateNewDoc(index, itype, mongodb.FindById("service", sid, nil))
 
@@ -448,6 +450,7 @@ func (yp *Yellowpage) AddService() error {
 		//删除缓存信息
 		redis.Del("enterprise", "enterpriseInfo_"+enterpriseid)
 		redis.Del("enterprise", "enterpriseInfo_user_"+enterpriseid)
+		redis.DelByCodePattern("enterprise", "service-"+enterpriseid+"-*")
 		//将数据存到elastic中
 		flag2 := elastic.UpdateNewDoc("service", "service", doc)
 		//Insertservicenames(enterpriseid)

core/src/qfw/mobile/index.go

@@ -20,3 +20,8 @@ func (m *Mobile) Index(code string) {
 		m.Render("mobile/index.html", &xweb.T{"code": code})
 	}
 }
+
+//手机首页
+func (m *Mobile) Mobileindex() error {
+	return m.Render("/mobile/mobileindex.html")
+}

core/src/qfw/mobile/mobile.go

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

core/src/qfw/mobile/wxmenu.go

@@ -14,6 +14,7 @@ import (
 	"qfw/util/redis"
 	qrpc "qfw/util/rpc"
 	"runtime"
+	"strings"
 	"time"
 )
 
@@ -152,6 +153,7 @@ func (m *Mobile) SwordfishPay() error {
 					if i_credit > 0 {
 						isPay := map[string]interface{}{}
 						mapPush := map[string]string{}
+						mapCode := []string{}
 						for _, v := range types {
 							util.Try(func() {
 								b_newopen := false
@@ -180,6 +182,7 @@ func (m *Mobile) SwordfishPay() error {
 								if b_newopen { //进行扣费操作
 									isPay[v] = v
 									mapPush[v] = util.If(v == "bid", "中标", "招标").(string)
+									mapCode = append(mapCode, util.If(v == "bid", "A2", "A1").(string))
 								}
 							}, func(e interface{}) {
 								log.Println(e)
@@ -189,7 +192,7 @@ func (m *Mobile) SwordfishPay() error {
 						if i_credit >= 0 {
 							credit_a := util.IntAll(m.GetSession("credit_a"))
 							b := false
-							if b, _ = credit.OutCreditB(userId.(string), credit.V_JY, util.ObjToString(m.GetSession("s_m_openid")), 0, isPay, m.Action); b {
+							if b, _ = credit.OutCreditB(userId.(string), strings.Join(mapCode, ","), util.ObjToString(m.GetSession("s_m_openid")), 0, isPay, m.Action); b {
 								//先扣分，然后更新，然后返回结果
 								res["credit"] = i_credit
 								res["oprstatus"] = true

core/src/qfw/search/searchService.go

@@ -37,7 +37,7 @@ func (search *Search) EntCommunity() error {
 				}
 			}
 			if len(enterpriseids) > 0 {
-				ents := Find("enterprise", bson.M{"_id": enterpriseids}, nil, `{"s_avatar":1}`, false, -1, -1)
+				ents := Find("enterprise", bson.M{"_id": bson.M{"$in": enterpriseids}}, nil, `{"s_avatar":1}`, false, -1, -1)
 				if ents != nil && len(*ents) > 0 {
 					for _, identEnt := range *identEnts {
 						for _, ent := range *ents {
@@ -120,50 +120,57 @@ func (search *Search) SearchEntSer(id string) error {
 func (search *Search) FindServiceByEntId() error {
 	if search.Method() == "POST" {
 		id := search.GetString("entId")
-		limit, _ := search.GetInteger("pageSize")
 		currentPage, _ := search.GetInteger("currentPage")
-		start := (currentPage - 1) * limit
-		var count int64
-		//分页
-		mustnot := `{"term" : {"i_status" : 1 }}`
-		var fields, collection, query, tempstrquery string
-		collection = "service"
-		tempstrquery = `{"query_string":{"default_field": "s_enterpriseid","query":"` + id + `"}}`
-		servicequery := ""
-		if search.GetSession("entid") == nil || search.GetSession("entid").(string) != id {
-			servicequery = `,"must_not" : [` + mustnot + `]`
-		}
-		query = `{"query": {
+		var res map[string]interface{}
+		if ret := redis.Get("enterprise", "service-"+id+"-"+fmt.Sprint(currentPage)); ret != nil {
+			res = ret.(map[string]interface{})
+		} else {
+			limit, _ := search.GetInteger("pageSize")
+			start := (currentPage - 1) * limit
+			var count int64
+			//分页
+			mustnot := `{"term" : {"i_status" : 1 }}`
+			var fields, collection, query, tempstrquery string
+			collection = "service"
+			tempstrquery = `{"query_string":{"default_field": "s_enterpriseid","query":"` + id + `"}}`
+			servicequery := ""
+			if search.GetSession("entid") == nil || search.GetSession("entid").(string) != id {
+				servicequery = `,"must_not" : [` + mustnot + `]`
+			}
+			query = `{"query": {
 		    "bool": {
 			  "must":[` + tempstrquery + `]` + servicequery + `
 		    }
 		  }}`
-		//需要查到的字段信息
-		fields = `"_id","s_name","s_introduction","s_images","s_enterpriseid","s_isshow","i_status","s_pricemy","i_comments","f_price","i_sales"`
-		if currentPage == 1 {
-			count = elastic.Count("service", collection, query)
-		}
-		//查询服务列表数据
-		result := elastic.Get("service", collection, `{"query":{"bool": {"must":[`+tempstrquery+`]`+servicequery+`}},
+			//需要查到的字段信息
+			fields = `"_id","s_name","s_introduction","s_images","s_enterpriseid","s_isshow","i_status","s_pricemy","i_comments","f_price","i_sales"`
+			if currentPage == 1 {
+				count = elastic.Count("service", collection, query)
+			}
+			//查询服务列表数据
+			result := elastic.Get("service", collection, `{"query":{"bool": {"must":[`+tempstrquery+`]`+servicequery+`}},
 		_source:[`+fields+`],
 		sort:{"l_createdate":"desc"},
 		from:`+fmt.Sprintf("%v", start)+`,
 		size:`+fmt.Sprintf("%v", limit)+`
 		}`)
-		for _, v := range *result {
-			b, _ := CheckAuth(v)
-			if b {
-				v["s_isEdit"] = "1"
-			} else {
-				v["s_isEdit"] = "0"
-			}
-			if IntAll(v["i_status"]) == 1 {
-				v["s_remove"] = 1
-			} else {
-				v["s_remove"] = 0
+			for _, v := range *result {
+				b, _ := CheckAuth(v)
+				if b {
+					v["s_isEdit"] = "1"
+				} else {
+					v["s_isEdit"] = "0"
+				}
+				if IntAll(v["i_status"]) == 1 {
+					v["s_remove"] = 1
+				} else {
+					v["s_remove"] = 0
+				}
 			}
+			res = map[string]interface{}{"list": result, "count": count}
+			redis.Put("enterprise", "service-"+id+"-"+fmt.Sprint(currentPage), res, 7*24*60*60)
 		}
-		search.ServeJson(&map[string]interface{}{"list": result, "count": count})
+		search.ServeJson(res)
 	}
 	return nil
 }

core/src/qfw/swordfish/swordfishmanage.go

@@ -142,8 +142,22 @@ func getSwordFish(lasttime int64, sid string, res []map[string]interface{}, coun
 	}
 	return getSwordFish(thistime, sid, res, count)
 }
+
+//查看原文跳转
 func (s *SwordFish) VisitRedirect() {
+	sid := s.GetString("id")
 	surl := s.GetString("url")
+	if len(sid) > 5 {
+		obj := *mongodb.FindById("bidding", sid, `{"publishtime":1,"_id":0,"detail":1,"title":1}`)
+		if obj != nil && len(obj) == 3 {
+			obj["url"] = surl
+			pt := obj["publishtime"]
+			obj["publishtime"] = util.FormatDateWithObj(&pt, util.Date_Full_Layout)
+			s.T["obj"] = obj
+			s.Render("/swordfish/wxinfocontent.html", &s.T)
+			return
+		}
+	}
 	if surl != "" {
 		s.Redirect(surl)
 	}

core/src/qfw/yellowpage/yellowpage.go

@@ -17,7 +17,10 @@ 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"`
+	//获取失信信息
+	getDishonesty xweb.Mapper `xweb:"/front/getDishonesty"`
 }
 
 func (yp *Yellowpage) EnterpriseInfoByRegNO(regNO string) error {

core/src/qfw/yellowpage/yellowpagemanager.go

@@ -266,36 +266,28 @@ func (yp *Yellowpage) EnterpriseInfo(id string) error {
 				relation = makeRelation(regNo, entName)
 				redis.Put("enterprise", "relation-"+regNo, relation, 7*ONEDAY)
 			}
-			r := relation.(map[string]interface{})
 			var nodes *[]map[string]interface{}
-			var relevantEnts []map[string]interface{}
-			if d, err := json.Marshal(r["nodes"]); err == nil && json.Unmarshal(d, &nodes) == nil && len(*nodes) > 0 {
+			if d, err := json.Marshal(relation.(map[string]interface{})["nodes"]); err == nil && json.Unmarshal(d, &nodes) == nil && len(*nodes) > 0 {
 				var regNos []string
 				for _, v := range *nodes {
 					if v["type"] == "e" {
 						regNos = append(regNos, v["name"].(string))
-						relevantEnts = append(relevantEnts, v)
 					}
 					if len(regNos) == 6 {
 						break
 					}
 				}
 				if len(regNos) > 0 {
-					ents := Find("enterprise", M{"RegNo": regNos}, nil, `{"s_avatar":1}`, false, -1, -1)
-					if ents != nil && len(*ents) > 0 {
-						for _, relevantEnt := range relevantEnts {
-							for _, ent := range *ents {
-								if ent["RegNo"] == relevantEnt["name"] {
-									ent["s_avatar"] = ent["s_avatar"]
-									ent["_id"] = util.BsonIdToSId(ent["_id"])
-									break
-								}
-							}
+					relevantEnts := Find("enterprise", M{"RegNo": M{"$in": regNos}}, nil, `{"s_avatar":1,"RegNo":1,"EntName":1}`, false, -1, -1)
+					if relevantEnts != nil && len(*relevantEnts) > 0 {
+						for _, relevantEnt := range *relevantEnts {
+							relevantEnt["_id"] = util.BsonIdToSId(relevantEnt["_id"])
+							break
 						}
+						yp.T["relevantEnts"] = relevantEnts
 					}
 				}
 			}
-			yp.T["relevantEnts"] = relevantEnts
 			contentuser, erruser := yp.Render4Cache("/yellowpage/enterpriseinfo.html", &yp.T)
 			if erruser == nil {
 				redis.PutBytes("enterprise", "enterpriseInfo_"+id, &contentuser, 7*ONEDAY)
@@ -537,3 +529,24 @@ func makeRelation(mnregno, mnname string) interface{} {
 	log.Println("生成 ", mnname, "关系网数据，耗时[", time.Now().Sub(t1).Seconds(), "]秒")
 	return data
 }
+
+//获取失信信息
+func (yp *Yellowpage) GetDishonesty() error {
+	if yp.Method() == "POST" {
+		legcerNo := yp.GetString("legcerNo")
+		currentPage, _ := yp.GetInteger("currentPage")
+		var res map[string]interface{}
+		if ret := redis.Get("enterprise", "dishonesty-"+legcerNo+"-"+fmt.Sprint(currentPage)); ret != nil {
+			res = ret.(map[string]interface{})
+		} else {
+			limit, _ := yp.GetInteger("pageSize")
+			start := (currentPage - 1) * limit
+			count := Count("laolai", `{"s_cardnum":"`+legcerNo+`"}`)
+			r := Find("laolai", `{"s_cardnum":"`+legcerNo+`"}`, `{"l_date":-1}`, `{"l_date":1,"iname":1,"court_name":1,"case_code":1,"performance":1}`, false, start, limit)
+			res = map[string]interface{}{"list": r, "count": count}
+			redis.Put("enterprise", "dishonesty-"+legcerNo+"-"+fmt.Sprint(currentPage), res, 7*24*60*60)
+		}
+		yp.ServeJson(res)
+	}
+	return nil
+}

core/src/seo.json

@@ -1,4 +1,4 @@
-{   "cdn":"//cdn.qmx.top:9000",
+{   "cdn":"",
     "qfw": {
         "enterprise": {
             "description": "提供企业信息查询，企业产品服务查询，企业关系网展示",

core/src/serviceclassify.json

@@ -34,10 +34,6 @@
                         "code": "010202",
                         "name": "税务筹划"
                     },
-                    {
-                        "code": "010203",
-                        "name": "会计服务"
-                    },
                     {
                         "code": "010299",
                         "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-24 18:07:19"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-02-24 18:07:19"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-03-09 11:12:16"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-03-09 11:12:16"}},"marketisstart":true,"marketrate":300}

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

@@ -2631,6 +2631,12 @@ style="color:#D03102;margin-right:5px;"
 /*认证完第一次登录 end*/
 /*分辨率小于1200的时候调整布局，算上滚动条1217*/
 @media (max-width: 1217px) {
+	.b-left{
+		width: 100%;
+	}
+	.b-right{
+		display: none;
+	}
 	.a-index .a-cols>.a-com-ul-block.a-com-last{
 		display: none;
 	}

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

@@ -365,9 +365,6 @@ a:focus, a:hover{
 }
 .ent-tab-content{
 	margin-top: 10px;
-	background-color: #FFFFFF;
-	padding-top: 20px;
-	padding-bottom: 20px;
 }
 /********************企业画像**********************/
 .entinfo-basicinfo .b-com-content{
@@ -607,7 +604,6 @@ a:focus, a:hover{
 /********************关系网**********************/
 .entrelation{
 	position: relative;
-	padding: 0px 20px;
 }
 .entrelation svg{
 	position: relative;
@@ -632,22 +628,15 @@ a:focus, a:hover{
 	margin-top: 10px;
 	z-index: 2;
 }
-.entrelation .entrelation-controlls .entrelation-item{
-	border-radius: 2px;
-	box-shadow: 0 1px 4px rgba(0,0,0,0.3);
-	cursor: pointer;
-	margin-bottom: 8px;
-	float:left;
+.entrelation .entrelation-controlls>div{
+	margin-bottom: 15px;
 }
 .entrelation .entrelation-controlls .entrelation-box{
-	padding:10px;
-	float:left;
-}
-.entrelation .entrelation-controlls .entrelation-box div{
-	background: url(/images/view_icons.png) no-repeat;
-	width: 16px;
-	height: 16px;
-	opacity: 0.6;
+	border: 1px solid #e5e6e9;
+	width: 80px;
+	line-height: 30px;
+	text-align: center;
+	cursor: pointer;
 }
 :-moz-full-screen .entrelation,:-webkit-full-screen .entrelation,:-o-full-screen .entrelation,
 :-ms-full-screen .entrelation,:fullscreen .entrelation,:-ms-fullscreen .entrelation,:full-screen .entrelation{
@@ -763,11 +752,11 @@ a:focus, a:hover{
 }
 /************主要人员****************/
 .ent-mainpersons{
-	padding-left: 25px;
+	padding-left: 10px;
 }
 .ent-mainpersons img{
-	width: 89px;
-	height: 90px;
+	width: 80px;
+	height: 80px;
 	display: inline-block;
 	vertical-align: top;
 }
@@ -799,7 +788,7 @@ a:focus, a:hover{
 	color: #a0a0a0;
 }
 .ent-mainpersons .staffinfo-horizontal{
-	width: 25px;
+	width: 20px;
 	height: 1px;
 	background-color: #e5e6e9;
 	display: inline-block;
@@ -897,7 +886,31 @@ a:focus, a:hover{
 .ent-table tr:first-child{
 	border-top: none !important;
 }
-.ent-table tr:nth-child(2n+1){
+.ent-dishonesty .b-com-content{
+	padding: 0px 20px 0px 20px;
+}
+.ent-dishonesty .ent-table td{
+	word-wrap: break-word;
+	word-break: break-all;
+	white-space: normal !important;
+}
+.ent-dishonesty .ent-table .b-com-first{
+	margin-bottom: 10px;
+	font-weight: bold;
+	font-size: 16px;
+}
+.ent-dishonesty .ent-table .b-com-second{
+	margin-bottom: 5px;
+	color: #a0a0a0;
+}
+.ent-dishonesty .ent-table .b-com-third span{
+	margin-right: 10px;
+	color: #a0a0a0;
+}
+.ent-dishonesty .ent-table tr{
+	border-top: 1px solid #e5e6e9;
+}
+.ent-yellowpage .ent-table tr:nth-child(2n+1){
 	border-top: 1px solid #e5e6e9;
 	font-size: 16px;
 }

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

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

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

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

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

@@ -68,7 +68,7 @@ a:focus, a:hover{
 	overflow-y: hidden;
 }
 .swordfish-index .b-right>div{
-	max-height: 650px;
+	max-height: 635px;
 }
 .swordfish-right-title{
 	background-color: #F7F8FA;
@@ -268,7 +268,6 @@ a:focus, a:hover{
 /*******剑鱼首页*******/
 .swordfish-guide>div{
 	display: inline-block;
-	height: inherit;
 	vertical-align: top;
 	height: 552px;
 }
@@ -307,7 +306,7 @@ a:focus, a:hover{
 .swordfish-guide-bottom{
 	display: block !important;
 	text-align: center;
-	padding: 20px;
+	padding-top: 20px;
 }
 .swordfish-guide-bottom .btn{
 	background-color: #37C6DA;

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

@@ -1,6 +1,7 @@
 var entType = "企业";
 var relation = null;
 var serviceList = null;
+var dishonesty = null;
 //解析服务列表
 $(function(){
 	//右侧最新消息
@@ -45,7 +46,7 @@ $(function(){
 		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 maxCout = parseInt($(".ent-tab-content").width() / (207+20));
 		var verticalFlag = false;
 		var appendStaffinfo = function(obj,index){
 			var tmp = 0;
@@ -61,7 +62,7 @@ $(function(){
 				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){
+				if(tmp == maxCout && i != obj.length-1){
 					hm+='<a class="staffinfo-vertical"></a>';
 				}
 				//横线
@@ -118,6 +119,9 @@ $(function(){
 		$(".ent-tab-content>div:eq("+$(this).index()+")").removeClass("hide");
 		if($(this).index() == 1){
 			b_afterLogin();
+		}else if($(this).index() == 4 && dishonesty == null){
+			//加载服务列表
+			dishonesty = new Dishonesty();
 		}else if($(this).index() == 5 && serviceList == null){
 			//加载服务列表
 			serviceList = new ServiceList();
@@ -155,13 +159,14 @@ function b_afterLogin(flag){
 //加载关系网
 function initRelation(){
 	if(isLogined){
-		$(".entrelation").height(500);
+		if($("#entrelation-limit").hasClass("hide")){
+			$(".entrelation").height(500);
+		}
 		var relationNoData = function(){
 			$("#entrelation-limit,#entrelation-nologin").addClass("hide");
 			relation = "";
 			$("#entrelation-infovis").hide();
 			$("#entrelation-findnull").removeClass("hide");
-			$(".entrelation").css("height","auto");
 		}
 		$.ajax({
 			url: "/member/getRelation",
@@ -172,11 +177,11 @@ function initRelation(){
 					$("#entrelation-nologin").addClass("hide");
 					$("#entrelation-limit,#entrelation-noauthe").removeClass("hide");
 					$("#entrelation-infovis").hide();
-					$(".entrelation").css("height","auto");
 				}else if(r.flag == true && (r == null || typeof(r) == "undefined" || typeof(r.relation.links) == "undefined" || r.relation.links.length == 0 || typeof(r.relation.nodes) == "undefined" || r.relation.nodes.length <= 1)){
 					relationNoData();
 				}else if(r.flag == true){
 					$("#entrelation-limit,#entrelation-nologin").addClass("hide");
+					$(".entrelation").height(500);
 					loadJS("/js/d3.v3.min.js",function(){
 						loadJS("/js/geometry.js",function(){
 							loadJS("/js/relation.js",function(){
@@ -200,7 +205,7 @@ function initRelation(){
 //服务列表
 function ServiceList(){
 	loadJS("/js/paging.js",function(){
-		paging = new Paging("serviceListPaging","/front/findServiceByEntId",{entId:entId},6,function(r){
+		new Paging("serviceListPaging","/front/findServiceByEntId",{entId:entId},6,function(r){
 			if((typeof(synopsis) == "undefined" || synopsis == null || synopsis == "") && r.length == 0){
 				$(".ent-yellowpage .ent-findnull").removeClass("hide");
 				$(".ent-yellowpage .ent-layout-down").remove();
@@ -254,4 +259,30 @@ function ServiceList(){
 			});
 		});
 	});
+}
+//失信信息
+function Dishonesty(){
+	loadJS("/js/paging.js",function(){
+		new Paging("dishonestyListPaging","/front/getDishonesty",{legcerNo:legcerNo},1,function(r){
+			if(r.length == 0){
+				$(".ent-dishonesty .ent-findnull").removeClass("hide");
+				$(".ent-dishonesty .ent-layout-up").remove();
+				return;
+			}
+			var html = '';
+			for(var i=0;i<r.length;i++){
+				html += '<tr><td>'
+					+'<div class="b-com-first">'+r[i].iname+'</div>'
+					+'<div class="b-com-second">案号：'+r[i].case_code+'</div>'
+					+'<div class="b-com-third">'
+						+'<span>法院：'+r[i].court_name+'</span>'
+						+'<span>状态：'+r[i].performance+'</span>'
+						+'<span>立案日期：'+new Date(Number(r[i].l_date+"000")).Format("yyyy-MM-dd")+'</span>'
+					+'</div>'
+					+'</td></tr>';;
+			}
+			$("#dishonestyListPaging").parent().prevAll().remove();
+			$("#dishonestyListPaging").parent().before(html);
+		});
+	});
 }

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

@@ -322,7 +322,7 @@ function webSiteInit(){
 		//设置用户用心左右布局
 		var memberLeft_marginLeft = 0;
 		if($(".member-content").length == 1 && $(".member-content>.member-left").length == 1 && $(".member-content>.member-right").length == 1){
-			$(".member-right").width($(".member-content").width() - 200 - 15);
+			$(".member-right").width($(".member-content").width() - 250 - 50);
 			if($(".member-content").children(".clearfix").length == 0){
 				$(".member-content").append('<div class="clearfix"></div>');
 			}
@@ -621,7 +621,7 @@ function pcShare(){
 						if($("#bdshare_weixin_qrcode_dialog").length == 1){
 							clearInterval(interval);
 							$("#share-weixin").append($("#bdshare_weixin_qrcode_dialog").find("table"));
-							$("#bdshare_weixin_qrcode_dialog").remove();
+							$("#bdshare_weixin_qrcode_dialog_bg,#bdshare_weixin_qrcode_dialog,.bdshare_dialog_bg,.bdshare_dialog_box").remove();
 						}else{
 							document.getElementById('bds_weixin').click();
 						}

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

@@ -2,6 +2,7 @@ function Relation(legcerNo,regNo,data){
 	this.legcerNo = legcerNo;
 	this.regNo = regNo;
 	this.data = data;
+	this.modleFlag = data.nodes.length>15;
 	this.zoomlevel = 1;
 	this.w = 0;
 	this.h = 0;
@@ -12,8 +13,12 @@ function Relation(legcerNo,regNo,data){
 	this.force = null;
 	this.lines = null;
 	this.nodes = null;
+	this.lineLables = null;
 	this.mouseoverstatus = false;
 	this.chargeVal = -1600;
+	this.tickFlag = true;
+	this.centerNodeX = 0;
+	this.centerNodeY = 0;
 }
 Relation.prototype.init = function(){
 	var thisClass = this;
@@ -21,11 +26,20 @@ Relation.prototype.init = function(){
 	thisClass.h = $("#entrelation").height();
 	$("#entrelation-infovis").width(thisClass.w).append(
 		'<div class="entrelation-controlls hidden-sm hidden-xs">'
-			+'<div class="entrelation-item">'
-				+'<div id="entrelation-fullscreen" class="entrelation-box" title_pos="left"><div class="entrelation-fullscreen"></div></div>'
-			+'</div>'
+		+'<div id="entrelation-pattern" class="entrelation-box" title_pos="left">一般模式</div>'
+		+'<div id="entrelation-verbosemode" class="entrelation-box" title_pos="left">详细模式</div>'
+			+'<div id="entrelation-fullscreen" class="entrelation-box" title_pos="left">全屏</div>'
 		+'</div>'
 	);
+	//一般模式
+	$("#entrelation-pattern").click(function(){
+		thisClass.pattern();
+	});
+	//详细模式
+	$("#entrelation-verbosemode").click(function(){
+		thisClass.verbosemode();
+	});
+	//全屏
 	$("#entrelation-fullscreen").click(function(){
 		thisClass.initFullScreen();
 	});
@@ -83,6 +97,32 @@ Relation.prototype.init = function(){
 		this.makeRelation();	
 	}catch(e){}
 }
+Relation.prototype.pattern = function(){
+	if(this.modleFlag){
+		return;
+	}
+	d3.selectAll("text").each(function (p){
+		if(p.type == "ce" || p.type == "e"){
+			$(this).text(p.shortText);
+		}
+	});
+	this.modleFlag = true;
+	this.makeTextBg();
+	this.makeTitle();
+}
+Relation.prototype.verbosemode = function(){
+	if(!this.modleFlag){
+		return;
+	}
+	d3.selectAll("text").each(function (p){
+		if(p.type == "ce" || p.type == "e"){
+			$(this).text(p.text);
+		}
+	});
+	this.modleFlag = false;
+	this.makeTextBg();
+	this.makeTitle();
+}
 Relation.prototype.dataProcess = function(){
 	var reg = new RegExp(/(有限公司|有限责任公司|股份有限公司|总公司|分公司|公司|事务所|合伙企业)$|\(.*\)|\（.*\）/g);
 	/*var provinces = [];
@@ -341,7 +381,7 @@ Relation.prototype.launchFullScreen = function(element) {
 }
 Relation.prototype.cancelFullScreen = function(){
 	this.h = $("#entrelation-infovis").height();  
-	$("#entrelation-fullscreen").attr("title","进入全屏视图"+((!!window.ActiveXObject || "ActiveXObject" in window)?"":" (F11)"));	
+	$("#entrelation-fullscreen").text("全屏").attr("title","进入全屏视图"+((!!window.ActiveXObject || "ActiveXObject" in window)?"":" (F11)"));	
 	//force.linkDistance(120).charge(-200).size([w,h]).resume();
 	$("#entrelation-infovis").css({width:this.w,height:this.h});
 	//设置svg标签的宽度与高度
@@ -364,10 +404,9 @@ Relation.prototype.initFullScreen = function(){
        	document.mozFullScreenElement ||
        	document.webkitFullscreenElement ||
 		document.msFullscreenElement;
-    $(".entrelation-fullscreen").toggleClass("exit");
 	if(!fullscreenElement || fullscreenElement==null){
 		this.redrawflag = true;
-		$("#entrelation-fullscreen").attr("title","退出全屏视图 (F11)");
+		$("#entrelation-fullscreen").text("退出").attr("title","退出全屏视图 (F11)");
 		this.launchFullScreen(this.infovisdiv);
 		var timeout = 100;
 		if(!!window.ActiveXObject || "ActiveXObject" in window){
@@ -454,10 +493,11 @@ Relation.prototype.removeNode = function(obj){
 		}
 	});
 }
-Relation.prototype.tick = function(e){
+Relation.prototype.tick = function(){
 	var thisClass = this;
 	this.lines.attr("d", function(d){
-		var sy   = d.source.y,
+		var sx   = d.source.x,
+			sy   = d.source.y,
 			x    = d.target.x,
             y    = d.target.y;
 		if(sy > y){
@@ -465,7 +505,7 @@ Relation.prototype.tick = function(e){
 		}else{
 			sy += 5;
 		}
-		var line = new geo.LineSegment(d.source.x, sy, x, y);
+		var line = new geo.LineSegment(sx, sy, x, y);
 		for (var e in d.target.edge) {
             var ix = line.intersect(d.target.edge[e].offset(x, y));
             if (ix.in1 && ix.in2) {
@@ -474,18 +514,54 @@ Relation.prototype.tick = function(e){
                 break;
             }
         }
-        var dx = x - d.source.x,
+        var dx = x - sx,
 	        dy = y - sy,
 	        dr = Math.sqrt(dx * dx + dy * dy),
 	        theta = Math.atan2(dy, dx) + Math.PI / 7.85,
 	        d90 = Math.PI / 2,
 	        dtxs = x - Math.cos(theta),
 	        dtys = y - Math.sin(theta);
-	    return "M" + d.source.x + "," + sy + "A" + dr + "," + dr + " 0 0 1," + x + "," + y + "A" + dr + "," + dr + " 0 0 0," + d.source.x + "," + sy + "M" + dtxs + "," + dtys +  "l" + (3.5 * Math.cos(d90 - theta) - 10 * Math.cos(theta)) + "," + (-3.5 * Math.sin(d90 - theta) - 10 * Math.sin(theta)) + "L" + (dtxs - 3.5 * Math.cos(d90 - theta) - 10 * Math.cos(theta)) + "," + (dtys + 3.5 * Math.sin(d90 - theta) - 10 * Math.sin(theta)) + "z";
-	});	
+		//return "M" + sx + "," + sy + "A" + dr + " " + dr + ",0 1 1," + x + "," + y;
+		return "M" + sx + "," + sy + "A" + dr + " " + dr + ",0 0 1," + x + "," + y + "A" + dr + " " + dr + ",0 0 0," + sx + "," + sy + "M" + dtxs + "," + dtys +  "l" + (3.5 * Math.cos(d90 - theta) - 10 * Math.cos(theta)) + "," + (-3.5 * Math.sin(d90 - theta) - 10 * Math.sin(theta)) + "L" + (dtxs - 3.5 * Math.cos(d90 - theta) - 10 * Math.cos(theta)) + "," + (dtys + 3.5 * Math.sin(d90 - theta) - 10 * Math.sin(theta)) + "z";
+	});
 	this.nodes.attr("transform", function(d) {
+		if(thisClass.tickFlag && d.type == "ce"){
+			d.x = thisClass.centerNodeX;
+			d.y = thisClass.centerNodeY;
+		}
 		return "translate(" + d.x + "," + d.y + ")scale(" + thisClass.zoomlevel+ ")";
 	});
+	/*this.lineLables.attr("transform",function(d){
+		var sx   = d.source.x,
+			sy   = d.source.y,
+			x    = d.target.x,
+            y    = d.target.y;
+		if(sy > y){
+			sy -= 12;
+		}else{
+			sy += 5;
+		}
+		var line = new geo.LineSegment(sx, sy, x, y);
+		for (var e in d.target.edge) {
+            var ix = line.intersect(d.target.edge[e].offset(x, y));
+            if (ix.in1 && ix.in2) {
+                x = ix.x;
+                y = ix.y;
+                break;
+            }
+        }
+        var dx = x - sx,
+	        dy = y - sy,
+	        dr = Math.sqrt(dx * dx + dy * dy);
+		var cx = (sx + x) / 2,
+			cy = (sy + y) / 2,
+			cr = dr - Math.sqrt(Math.pow(dr,2) - Math.pow(dr / 2,2));
+		//var c = convert(sx,sy,x,y,0,0,dr,dr,0);
+		return "translate("+(cx-cr)+","+(cy-cr)+")";
+	});*/
+	if(thisClass.tickFlag){
+		thisClass.force.tick();
+	}
 }
 Relation.prototype.zoomed = function() {
 	this.svg.attr("transform", 
@@ -542,6 +618,7 @@ Relation.prototype.makeRelation = function(){
 	var dragstatus = false;
 	var drag = this.force.drag()
 		.on("dragstart",function(d,i){
+			thisClass.tickFlag = false;
 			d.fixed = true;    //拖拽开始后设定被拖拽对象为固定
 			d3.event.sourceEvent.stopPropagation(); // Prevent panning
 		})
@@ -565,10 +642,11 @@ Relation.prototype.makeRelation = function(){
 	    .attr("height", this.h)
 		.call(zoom)
 		.append("g");
-	this.lines = this.svg.append("svg:g")
+	var gs = this.svg.append("svg:g")
 	    .selectAll("path")
 	    .data(this.force.links())
-	    .enter().append("path")
+	    .enter();
+	this.lines = gs.append("path")
 		.style("fill", function(p){
 	    	return (p.type=="cp" || p.isLegal)?"#cd93d7":"#cecece";
 	    })
@@ -578,6 +656,19 @@ Relation.prototype.makeRelation = function(){
 		.attr("stroke-width",function (e,i){
 			return e.linkVal;
 		});
+	/*this.lineLables = gs.append("g").each(function(d){
+		var invacconam = new Number(d.invacconam);
+		if(invacconam > 0){
+			var lenInvacconam = (invacconam + "").length;
+			if(lenInvacconam > 4 && (invacconam + "").indexOf(".") > -1 && (lenInvacconam - (invacconam + "").indexOf(".")) > 4){
+				invacconam = (new Number(invacconam)).toFixed(4);
+			}
+			d3.select(this).append("text").text(invacconam+"万元");
+		}else{
+			d3.select(this).remove();
+		}
+	});*/
+	
 	this.lines.each(function (d,i){
 		var invacconam = new Number(d.invacconam);
 		if(invacconam > 0){
@@ -608,7 +699,13 @@ Relation.prototype.makeRelation = function(){
 	this.nodes.append("rect")
 		.attr("rx", 5)
 	    .attr("ry", 5)
-		.attr('height', 20)
+		.attr('height', function(p){
+			if(p.type == "ce"){
+				return 25;
+			}else{
+				return 20;
+			}
+		})
 		.attr("fill", function(p){
 			if(p.type == "e" && (p.opstate == "11" || p.opstate == "07")){
 				return "#cecece";
@@ -626,10 +723,44 @@ Relation.prototype.makeRelation = function(){
 			}
 			return "1";
 		});
+	this.makeTitle();
+	this.nodes.append('text')
+    .text(function(d){
+		if(this.modleFlag){
+			return d.shortText;
+		}else{
+			return d.text;
+		}
+	})
+	.style("cursor",function (d,i){
+		if(d.type == "e"){
+			return "pointer";
+		}else{
+			return "auto";
+		}
+	})
+	.style("font-size",function (d,i){
+		if(d.type == "ce"){
+			return "16px";
+		}else{
+			return "14px";
+		}
+	})
+	.on("click",function (d,i){
+		if(!dragstatus && d.type == "e"){
+			window.open("/enterpriseInfoByRegNO/"+d.name+".html");
+		}
+	});
+	thisClass.makeTextBg();
+	thisClass.force.start();
+	//var diagonal = d3.svg.diagonal().projection(function(d) { return [d.y, d.x]; });
+}
+Relation.prototype.makeTitle = function(){
+	var thisClass = this;
 	this.nodes.each(function (d,i){
 		if(d.type == "ce" || d.type == "e"){
 			var title = "";
-			if(d.text != d.shortText){
+			if(thisClass.modleFlag){
 				title = d.text;
 			}
 			var regcap = d.regcap;
@@ -644,78 +775,178 @@ Relation.prototype.makeRelation = function(){
 				title += "注册资本："+regcap+"万元";
 			}
 			if(title != ""){
-				d3.select(this).append("title").text(title);
+				if($(this).children("title").length == 0){
+					d3.select(this).append("title").text(title);
+				}else{
+					$(this).children("title").text(title);
+				}
 			}
 		}
 	});
-	this.nodes.append('text')
-    .text(function(d){
-		return d.shortText;
-	})
-	.style("cursor",function (d,i){
-		if(d.type == "e"){
-			return "pointer";
-		}else{
-			return "auto";
-		}
-	})
-	.on("click",function (d,i){
-		if(!dragstatus && d.type == "e"){
-			window.open("/enterpriseInfoByRegNO/"+d.name+".html");
-		}
-	});
-	setTimeout(function() {
-	    thisClass.nodes.each(function(d) {
-	        var node   = d3.select(this),
-	            text   = node.selectAll('text'),
-	            bounds = {},
-	            first  = true;
-				
-			text.each(function() {
-	            var box = this.getBBox();
-	            if (first || box.x < bounds.x1) {
-	                bounds.x1 = box.x;
-	            }
-	            if (first || box.y < bounds.y1) {
-	                bounds.y1 = box.y;
-	            }
-	            if (first || box.x + box.width > bounds.x2) {
-	                bounds.x2 = box.x + box.width;
-	            }
-	            if (first || box.y + box.height > bounds.y2) {
-	                bounds.y2 = box.y + box.height;
-	            }
-	            first = false;
-	        }).attr('text-anchor', 'middle');
-				
-	        var padding  = {"left":3,"right":3,"top":2,"bottom":2},
-	            margin   = {"left":3,"right":3,"top":2,"bottom":2},
-	            oldWidth = bounds.x2 - bounds.x1;
-	
-	        bounds.x1 -= oldWidth / 2;
-	        bounds.x2 -= oldWidth / 2;
-	
-	        bounds.x1 -= padding.left;
-	        bounds.y1 -= padding.top;
-	        bounds.x2 += padding.left + padding.right;
-	        bounds.y2 += padding.top  + padding.bottom;
+}
+Relation.prototype.makeTextBg = function(){
+	var thisClass = this;
+	this.nodes.each(function(d) {
+        var node   = d3.select(this),
+            text   = node.selectAll('text'),
+            bounds = {},
+            first  = true;
 			
-			var width = bounds.x2 - bounds.x1;
-			var height = bounds.y2 - bounds.y1;
-	        node.select('rect')
-	            .attr('x', bounds.x1)
-	            .attr('y', bounds.y1)
-				//.attr('height', height)
-	            .attr('width', width);
-	            
-	        d.edge = {
-	            left   : new geo.LineSegment(bounds.x1, bounds.y1, bounds.x1, bounds.y2),
-	            right  : new geo.LineSegment(bounds.x2, bounds.y1, bounds.x2, bounds.y2),
-	            top    : new geo.LineSegment(bounds.x1, bounds.y1, bounds.x2, bounds.y1),
-	            bottom : new geo.LineSegment(bounds.x1, bounds.y2, bounds.x2, bounds.y2)
-	        };
-	    });
-	   thisClass.force.start();
-	},10);
-	//var diagonal = d3.svg.diagonal().projection(function(d) { return [d.y, d.x]; });
+		text.each(function() {
+            var box = this.getBBox();
+			box.x = 0;
+            if (first || box.x < bounds.x1) {
+                bounds.x1 = box.x;
+            }
+            if (first || box.y < bounds.y1) {
+                bounds.y1 = box.y;
+            }
+            if (first || box.x + box.width > bounds.x2) {
+                bounds.x2 = box.x + box.width;
+            }
+            if (first || box.y + box.height > bounds.y2) {
+                bounds.y2 = box.y + box.height;
+            }
+            first = false;
+        }).attr('text-anchor', 'middle');
+			
+        var padding  = {"left":3,"right":3,"top":2,"bottom":2},
+            margin   = {"left":3,"right":3,"top":2,"bottom":2},
+            oldWidth = bounds.x2 - bounds.x1;
+
+        bounds.x1 -= oldWidth / 2;
+        bounds.x2 -= oldWidth / 2;
+
+        bounds.x1 -= padding.left;
+        bounds.y1 -= padding.top;
+        bounds.x2 += padding.left + padding.right;
+        bounds.y2 += padding.top  + padding.bottom;
+		
+		var width = bounds.x2 - bounds.x1;
+		if(d.type == "ce"){
+			thisClass.centerNodeX = thisClass.w / 2;
+			thisClass.centerNodeY = thisClass.h / 2 + 5;
+		}
+		var height = bounds.y2 - bounds.y1;
+        node.select('rect')
+            .attr('x', bounds.x1)
+            .attr('y', bounds.y1)
+			//.attr('height', height)
+            .attr('width', width);
+            
+        d.edge = {
+            left   : new geo.LineSegment(bounds.x1, bounds.y1, bounds.x1, bounds.y2),
+            right  : new geo.LineSegment(bounds.x2, bounds.y1, bounds.x2, bounds.y2),
+            top    : new geo.LineSegment(bounds.x1, bounds.y1, bounds.x2, bounds.y1),
+            bottom : new geo.LineSegment(bounds.x1, bounds.y2, bounds.x2, bounds.y2)
+        };
+    });
+}
+// svg : [A | a] (rx ry x-axis-rotation large-arc-flag sweep-flag x y)+
+
+/* x1 y1 x2 y2 fA fS rx ry φ */
+function  radian( ux, uy, vx, vy ) {
+    var  dot = ux * vx + uy * vy;
+    var  mod = Math.sqrt( ( ux * ux + uy * uy ) * ( vx * vx + vy * vy ) );
+    var  rad = Math.acos( dot / mod );
+    if( ux * vy - uy * vx < 0.0 ) rad = -rad;
+    return  rad;
+}
+//https://www.w3.org/TR/SVG11/implnote.html#ArcImplementationNotes
+//conversion_from_endpoint_to_center_parameterization
+//sample :  convert(200,200,300,200,1,1,50,50,0,{})
+function convert(x1, y1, x2, y2, fA, fS, rx, ry, phi) {
+    var cx,cy,theta1,delta_theta;
+
+    if( rx == 0.0 || ry == 0.0 ) return -1;  // invalid arguments
+
+    var  s_phi = Math.sin( phi );
+    var  c_phi = Math.cos( phi );
+    var  hd_x = ( x1 - x2 ) / 2.0;   // half diff of x
+    var  hd_y = ( y1 - y2 ) / 2.0;   // half diff of y
+    var  hs_x = ( x1 + x2 ) / 2.0;   // half sum of x
+    var  hs_y = ( y1 + y2 ) / 2.0;   // half sum of y
+
+    // F6.5.1
+    var  x1_ = c_phi * hd_x + s_phi * hd_y;
+    var  y1_ = c_phi * hd_y - s_phi * hd_x;
+
+    var  rxry = rx * ry;
+    var  rxy1_ = rx * y1_;
+    var  ryx1_ = ry * x1_;
+    var  sum_of_sq = rxy1_ * rxy1_ + ryx1_ * ryx1_;   // sum of square
+    var  coe = Math.sqrt( ( rxry * rxry - sum_of_sq ) / sum_of_sq );
+    if( fA == fS ) coe = -coe;
+
+    // F6.5.2
+    var  cx_ = coe * rxy1_ / ry;
+    var  cy_ = -coe * ryx1_ / rx;
+
+    // F6.5.3
+    cx = c_phi * cx_ - s_phi * cy_ + hs_x;
+    cy = s_phi * cx_ + c_phi * cy_ + hs_y;
+
+    var  xcr1 = ( x1_ - cx_ ) / rx;
+    var  xcr2 = ( x1_ + cx_ ) / rx;
+    var  ycr1 = ( y1_ - cy_ ) / ry;
+    var  ycr2 = ( y1_ + cy_ ) / ry;
+
+    // F6.5.5
+    theta1 = radian( 1.0, 0.0, xcr1, ycr1 );
+
+    // F6.5.6
+    delta_theta = radian( xcr1, ycr1, -xcr2, -ycr2 );
+    var  PIx2 = Math.PI * 2.0;
+    while( delta_theta > PIx2 ) delta_theta -= PIx2;
+    while( delta_theta < 0.0 ) delta_theta += PIx2;
+    if( fS == false ) delta_theta -= PIx2;
+
+    var outputObj = { /* cx, cy, theta1, delta_theta */ 
+        cx : cx,
+        cy : cy,
+        theta1 : theta1,
+        delta_theta : delta_theta
+    }
+    console.dir(outputObj);
+
+    return outputObj;
+}
+function convert_tmp(x1, y1, x2, y2, fA, fS, rx, ry, phi) {
+    var cx,cy,theta1,delta_theta;
+
+    if( rx == 0.0 || ry == 0.0 ) return -1;  // invalid arguments
+
+    var  s_phi = Math.sin( phi );
+    var  c_phi = Math.cos( phi );
+    var  hd_x = ( x1 - x2 ) / 2.0;   // half diff of x
+    var  hd_y = ( y1 - y2 ) / 2.0;   // half diff of y
+    var  hs_x = ( x1 + x2 ) / 2.0;   // half sum of x
+    var  hs_y = ( y1 + y2 ) / 2.0;   // half sum of y
+
+    // F6.5.1
+    var  x1_ = c_phi * hd_x + s_phi * hd_y;
+    var  y1_ = c_phi * hd_y - s_phi * hd_x;
+
+    var  rxry = rx * ry;
+    var  rxy1_ = rx * y1_;
+    var  ryx1_ = ry * x1_;
+    var  sum_of_sq = rxy1_ * rxy1_ + ryx1_ * ryx1_;   // sum of square
+    var  coe = Math.sqrt( ( rxry * rxry - sum_of_sq ) / sum_of_sq );
+    if( fA == fS ) coe = -coe;
+
+    // F6.5.2
+    var  cx_ = coe * rxy1_ / ry;
+    var  cy_ = -coe * ryx1_ / rx;
+
+    // F6.5.3
+    cx = c_phi * cx_ - s_phi * cy_ + hs_x;
+    cy = s_phi * cx_ + c_phi * cy_ + hs_y;
+
+    var outputObj = { /* cx, cy */ 
+        cx : rxry,
+        cy : rxy1_
+    }
+    console.dir(outputObj);
+
+    return outputObj;
 }

core/src/web/staticres/wxswordfish/jquery.resize.js

@@ -0,0 +1,26 @@
+jQuery.event.special.resizeblock = {
+	setup: function(data, namespaces) {
+		var elem = this;
+		var handler = jQuery.proxy(jQuery.event.special.resizeblock.handler, elem);
+		jQuery(elem).data('handler', elem);
+		var ifr = $('<iframe style="position: absolute; top:0; left:0; width:100%; height:100%; border:0; margin:0; padding:0; z-index: -100;" />');
+		jQuery(elem).append(ifr);
+		jQuery(elem).data('resize_frame', ifr);
+		var wnd = $(ifr).get(0).contentWindow;
+		jQuery(wnd).on  ('resize', handler);
+	},
+	teardown: function(namespaces) {
+		var elem = this;
+		var handler = jQuery(elem).data('handler');
+		var ifr = jQuery(elem).data('resize_frame');
+		var wnd = $(ifr).get(0).contentWindow;
+		jQuery(wnd).off ('resize', handler);
+		jQuery(elem).remove(ifr);
+		jQuery(elem).data('resize_frame', null);
+		jQuery(elem).data('handler', null);
+	},
+	handler: function(event) {
+		var elem = this;
+		jQuery(elem).triggerHandler('resizeblock');
+	}
+}

core/src/web/staticres/wxswordfish/main.js

@@ -41,11 +41,13 @@ function KeyWordDialog(type,clickLi){
 	this.show = function(){
 		dialogObj.show();
 		$("html,body").addClass("overflow-hidden");
+		KeyWordDialog.SetContentHeight(dialogObj);
 		$(window).resize(function(){
 		  	KeyWordDialog.SetContentHeight(dialogObj);
 		});
 	};
 	this.hide = function(){
+		FOCUS=""
 		dialogObj.hide();
 		$("html,body").removeClass("overflow-hidden");
 		$(window).unbind("resize");
@@ -66,11 +68,57 @@ KeyWordDialog.SetContentHeight = function(dialogObj){
 	var padding = parseInt(contentObj.css('padding-top'))+parseInt(contentObj.css('padding-bottom'))
 	contentObj.css("max-height",document.body.clientHeight-dialogObj.find(".dialog-head").height()-padding-40);
 }
+
+function resizeKey(obj,parentObj){
+	var dialogTop=obj.closest(".dialog-main").offset().top
+		var H=63;
+		var ofh=obj.offset().top
+		var psh=parentObj[0].scrollHeight;
+		var pst=parentObj[0].scrollTop;
+		var poh=parentObj[0].offsetHeight;
+		//計算卷去的高度
+			var seq=poh+pst-psh
+		if(seq>5||seq<0){
+			parentObj[0].scrollTop=pst-seq
+		}else{
+			return
+		}
+		if(ofh<(dialogTop+H)){
+			parentObj[0].scrollTop=pst-((dialogTop+H)-ofh)
+		}else{
+			parentObj[0].scrollTop=pst+ofh-dialogTop-H
+		}
+}
+
+function _KeyFocus(objn){
+		var obj=$(objn),parentObj=obj.closest(".dialog-content");
+		resizeKey(obj,parentObj)
+		parentObj.unbind("resizeblock").bind("resizeblock",function(){
+			//resizeKey(obj,$(this));
+			parentObj.unbind("resizeblock");
+		})
+		//90
+		
+	//调整
+	//alert(dialogTop+"="+parentObj.height()+"="+obj.offset().top+"="+parentObj[0].offsetHeight+"="+parentObj[0].scrollHeight+"="+parentObj[0].scrollTop)
+}
+//
+var FOCUS
+function setFocus(obj){
+	if(!FOCUS){
+		FOCUS=$(obj)
+		var parentObj=FOCUS.closest(".dialog-content");
+		parentObj.unbind("resizeblock").bind("resizeblock",function(){
+				resizeKey(FOCUS,$(this));
+				parentObj.unbind("resizeblock");
+		})	
+	}
+}
 KeyWordDialog.AppendNode = function(dialogObj,value){
 	var getHtml = function(index,value){
 		return '<div class="keyWordGroup">'
 					+'<lable style="white-space:nowrap;">关键词<font>'+index+'</font></lable>'
-					+'<div><input type="text" value="'+(value?value:"")+'" placeholder="示例：综合布线 电话线 网线" maxlength="100"></div>'
+					+'<div><input type="text" onfocus="setFocus(this)" value="'+(value?value:"")+'" placeholder="示例：综合布线 电话线 网线" maxlength="100"></div>'
 					+'<div>'+(index==1?'':'<img src="/wxswordfish/images/delete.png" class="delete">')+'</div>'
 				+'</div>';
 	}
@@ -81,7 +129,7 @@ KeyWordDialog.AppendNode = function(dialogObj,value){
 	var obj = $(getHtml(count+1,value));
 	dialogObj.find(".addKeyWordArea").before(obj);
 	//自动滚动到底部
-	$("#a_end")[0].scrollIntoView();
+	dialogObj.find(".a_end")[0].scrollIntoView();
 	obj.find(".delete").click(function(){
 		dialogObj.find(".addKeyWord").removeAttr("disabled");
 		$(this).parents(".keyWordGroup").remove();
@@ -524,4 +572,13 @@ $(function(){
 	if(winWidth<341){
 		$("#prexieyi").append("<br>");
 	}
+	//预览跳转
+	$(".result-view").click(function(){
+		var val=$(this).closest("li").find("ul>li:first-child>div.com-last").text().replace(/\s+/ig,"")
+		if(val){
+			window.location.href="/wxpush/bid/wxpushview/"+$(this).attr("v")
+		}else{
+			alert("请输入关键字后预览。")
+		}
+	})
 });

core/src/web/staticres/wxswordfish/style.css

@@ -58,10 +58,10 @@ img{
 }
 /**************/
 .operation{
-	background-color: #F8F8F8;
 	margin-bottom: 20px;
 }
 .operation>.parent-node{
+	background-color: #F8F8F8;
 	width: 100%;
 	height: 54px;
 	line-height: 54px;
@@ -69,6 +69,23 @@ img{
 	position: relative;
 	font-size: 16px;
 }
+.parent-node-view{
+	width: 100%;
+	height: 50px;
+	line-height: 50px;
+	font-size: 16px;
+	text-align:center;
+}
+.result-view{
+	width:80%;
+	margin:5px auto;
+	background-color:#F5F4F4;
+	color:black;
+	font-family: tahoma, arial, 'Hiragino Sans GB', 'Microsoft YaHei', 宋体, sans-serif;
+	font-size: 14px;
+	font-size:16px;
+	border:1px solid #DBDBDB;
+}
 .operation>.parent-node>img{
 	margin-left: 10px;
 	margin-right: 10px;
@@ -114,12 +131,10 @@ img{
 	display: none;
 }
 .operation .child-node li{
-	border-top: 1px solid #ddd;
+	border-bottom: 1px solid #ddd;
 	padding: 15px 0px;
 }
-.operation .child-node li:first-child{
-	border-top-width: 0px;
-}
+
 .operation .child-node img{
 	width: 10px;
 	height: 17px;
@@ -290,6 +305,8 @@ img{
 /**引导页**/
 .swiper-pagination{
 	top: 80px !important;
+	transition: 0ms !important;
+	-webkit-transition: 0ms !important;
 }
 .swiper-pagination-bullet{
 	margin-bottom: 15px !important;
@@ -308,19 +325,19 @@ img{
 }
 .slide-down{
 	z-index: 2;
-	/* Firefox: */
+	/* Firefox: 
 	-moz-animation-name:slidedown;
 	-moz-animation-duration:0.5s;
 	-moz-animation-timing-function:ease-in;
 	-moz-animation-iteration-count:1;
-	-moz-animation-play-state:running;
-	/* Safari and Chrome: */
+	-moz-animation-play-state:running; */
+	/* Safari and Chrome:
 	-webkit-animation-name:slidedown;
 	-webkit-animation-duration:0.5s;
 	-webkit-animation-timing-function:ease-in;
 	-webkit-animation-iteration-count:1;
-	-webkit-animation-play-state:running;
-	/* Opera: */
+	-webkit-animation-play-state:running; */
+	/* Opera:
 	-o-animation-name:slidedown;
 	-o-animation-duration:0.5s;
 	-o-animation-timing-function:ease-in;
@@ -330,7 +347,7 @@ img{
 	-moz-transform: translateZ(0);
 	-ms-transform: translateZ(0);
 	-o-transform: translateZ(0);
-	transform: translateZ(0);
+	transform: translateZ(0);*/
 }
 @-webkit-keyframes slidedown {
 	0%{
@@ -342,19 +359,19 @@ img{
 }
 .slide-up{
 	z-index: 2;
-	/* Firefox: */
+	/* Firefox: 
 	-moz-animation-name:slideup;
 	-moz-animation-duration:0.5s;
 	-moz-animation-timing-function:ease-in;
 	-moz-animation-iteration-count:1;
-	-moz-animation-play-state:running;
-	/* Safari and Chrome: */
+	-moz-animation-play-state:running;*/
+	/* Safari and Chrome: 
 	-webkit-animation-name:slideup;
 	-webkit-animation-duration:0.5s;
 	-webkit-animation-timing-function:ease-in;
 	-webkit-animation-iteration-count:1;
-	-webkit-animation-play-state:running;
-	/* Opera: */
+	-webkit-animation-play-state:running;*/
+	/* Opera: 
 	-o-animation-name:slideup;
 	-o-animation-duration:0.5s;
 	-o-animation-timing-function:ease-in;
@@ -364,7 +381,7 @@ img{
 	-moz-transform: translateZ(0);
 	-ms-transform: translateZ(0);
 	-o-transform: translateZ(0);
-	transform: translateZ(0);
+	transform: translateZ(0);*/
 }
 
 @-webkit-keyframes slideup {
@@ -385,7 +402,7 @@ img{
 .swiper-pagination-bullet-active{
 	background-color: #35c5da !important;
 }
-..swiper-pagination-bullet{
+.swiper-pagination-bullet{
 	opacity: .1;
 }
 .guide-bottom{
@@ -552,4 +569,54 @@ img{
 	text-indent:2em;
 	padding:10px;
 }
-	
+/**********滑动css*********/
+.slide {
+	position: relative;
+	overflow: hidden;
+}
+.slide ul {
+	width: 100%;
+	height: 100%;
+	z-index: 1;
+	overflow: hidden;
+	background-size: 320px;
+}
+.slide li {
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 100%;
+	background: -webkit-radial-gradient(39% 77%,ellipse, #fff, #fff 50%, #edefff 70%);
+	background-size: 130% 120%;
+	-webkit-transition: transform .3s ease-in-out;
+	opacity: 0;
+}
+.slide img{
+	width: 100%;
+	height: 100%;
+}
+.slide-point {
+	position: absolute;
+	top: 10px;
+	right: 10px;
+	display: none;
+	width: 9px;
+	text-align: center;
+	font-size: 0;
+	z-index: 90;
+	-webkit-animation: dis-show 0s ease forwards;
+}
+.slide-point span {
+	margin: 6px auto;
+	width: 8px;
+	height: 8px;
+	border-radius: 100%;
+	background: #000;
+	opacity: .2;
+	display: block;
+	z-index: 100;
+}
+.slide-point span.current {
+	background: #007aff;
+	opacity: 1;
+}

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

@@ -1,6 +1,6 @@
 {{$userTypeString := printf "%v" (session "userType")}}
 <!-- 底部 -->
-<div id="qfw-bottom">
+<div class="hidden-xs" id="qfw-bottom">
 	<ul class="hidden-xs bottom-bar" id="bottom-bar">
 		<li title="扫码登录"{{if or (session "userType") (eq $userTypeString "0")}} class="invisible"{{end}}><img src="/images/bottom-weixin.png"></li>
 		<li title="联系客服"{{if eq $userTypeString "0"}} class="invisible"{{end}}><a href="http://wpa.qq.com/msgrd?v=3&amp;uin=3240709056&amp;site=qq&amp;menu=yes"><img src="/images/bottom-qq.png"></a></li>
@@ -16,7 +16,7 @@
 		</div>
 	</div>
 </div>
-<div id="testBottom"></div>
+<div class="hidden-xs" id="testBottom"></div>
 <div class="hidden">
 <script>
 var _hmt = _hmt || [];
@@ -53,7 +53,7 @@ var _hmt = _hmt || [];
 				loginModalShow(-1);
 				break;
 			case 2:
-				$("body").append('<form id="feedbackForm" action="/front/web_feedbacklist.html" method="post" class="hide"><input type="hidden" name="url" value="'+window.location.href+'"></form>');
+				$("body").append('<form id="feedbackForm" action="/front/web_O_help.html" method="post" class="hide"><input type="hidden" name="url" value="'+window.location.href+'"></form>');
 				$("#feedbackForm").submit();
 				break;
 			case 3:

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

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

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

@@ -1,5 +1,5 @@
 <!---->
-<div class="index-new-head b-head">
+<div class="index-new-head b-head hidden-xs">
 	{{include "/common/top.html"}}
 	<div class="b-nav index-new-nva">
 		<ul>

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

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

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

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

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

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

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

@@ -44,10 +44,18 @@ function b_afterLogin(flag,result){
 	}
 }
 function swordfishLayoutInit(){
+	var surHeight = document.body.clientHeight - $(".b-head").height() - 45;
+	if(surHeight < 681){
+		$(".swordfish-index .b-right>div").css("max-height",surHeight-15);
+		$("#swordfish-guide").height(surHeight);
+		$("#swordfish-guide>div").height(surHeight - 89);
+		var surWidth = 825 * (surHeight - 89) / 552;
+		$("#swordfish-guide .carousel-inner").width(surWidth).css("margin-left","-"+surWidth/2);
+	}
 	if(document.body.scrollHeight <= document.body.clientHeight){
 		$(".b-left").height(document.body.clientHeight - $(".b-head").height() - $("#qfw-bottom").height() - 60);
-		webSiteInit();
 	}
+	webSiteInit();
 }
 function scrollUp(){
 	if($(".b-right #list>div").height() > $(".b-right #list").height()){

core/src/web/templates/index.html

@@ -9,8 +9,30 @@
 <script src="/js/jquery.lazyload.min.js"></script>
 </head>
 <body>
+
+<!---->
+<div class="index-new-head b-head visible-xs">
+	<div style="height:25px;width:100%;background-color:#000;"></div>
+	<div class="b-nav index-new-nva">
+		<ul style="margin-left:15px;">
+			<li class="b-nav-logo index-new-nva-l"><a href="/"><img src="/images/logo.png" class="logo"></a></li>
+			
+		</ul>
+	</div>
+</div>
+<div class="text-center visible-xs" style="margin:40px 20px 20px 20px">
+	<div>
+	 	<p>企明星为了用户有更好的使用体验，</p>
+		<p>已成功把各项功能移植到</p>
+		<p>关注企明星公众号：</p>
+		<p>qmx-cn</p>
+		<p>或扫描二维码</p>
+	</div>
+	<div><img src="/images/u109.png"></div>
+</div>
+
 {{include "/common/indexhead.html"}}
-<div class="a-content a-index">	
+<div class="a-content a-index hidden-xs">	
 	<div class="a-index-head index-new-head">
 		<div class="a-i-h-left hidden-xs index-new-left">
 			<div class="text-center">全部服务分类</div>
@@ -80,8 +102,8 @@
 						<br><a href="/market/050101/list.html">寻找法律援助</a>
 					</div>
 					<div class="a-com-six hidden-xs">
-						<img  data-original="/images/wdzx.png" class="lazy" >
-						<br><a href="/market/030301/list.html">网店装修</a>
+						<img  data-original="/images/more.png" class="lazy" >
+						<br><a href="/market/0/list.html">更多</a>
 					</div>
 				</li>
 			</ul>
@@ -147,14 +169,39 @@
 	-->
 	<div class="a-panel a-qysq">
 		<div class="a-com-title text-center index-new-title"><font><a target="_blank" href="/search/enterprise/ent.html">企业社区</a></font><br/><span class="hidden-xs">官方数据来源，提供详尽企业信息，及时掌握企业社会关系情报</span></div>
-		<div class="row index-new-qysq-con">
-			{{$s:=(Ad "index-center-06" 4)}}
-			{{range $k,$v := $s}}
-			<div class="index-new-qysqlist text-center"  style="{{if gt $k 0}} border-left:1px solid #E5E6E9; {{end}}">
-			<a  target="_blank" href="{{$v.s_link}}"{{if ge $k 2}} class="hidden-xs"{{end}}><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}}  data-original="{{if $v.s_pic}}{{$v.s_pic}}{{else}}/images/u166.png{{end}}" class="lazy"  onerror="this.src='/images/u166.png'"></a>
+		<div class="row index-new-qysq-con text-center">
+			<div id="myCarousel" class="carousel slide" style="height:300px;">  
+			   <!-- 轮播（Carousel）项目 -->
+			   <div class="carousel-inner">
+			         	{{$s:=(Ad "index-center-06" 16)}}
+			      <div class="item active itemno">
+						<div class="index-qysq">
+						{{range $k,$v := $s}}
+						{{if eq $k 4}}</div><div class="index-qysq">{{end}}
+						
+						{{if eq $k 8}} </div></div><div class="item itemno"><div class="index-qysq">{{end}}
+			    		{{if eq $k 12}}</div><div class="index-qysq">{{end}}
+				
+						<div class="index-new-qysqlist text-center">
+						<a  target="_blank" href="{{$v.s_link}}"{{if ge $k 2}} class="hidden-xs"{{end}}><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}}  data-original="{{if $v.s_pic}}{{$v.s_pic}}{{else}}/images/u166.png{{end}}" class="lazy"  onerror="this.src='/images/u166.png'"></a>
+						</br>
+						<a  target="_blank" href="{{$v.s_link}}" class="index-qysq-name font-size-12
+">{{$v.s_remark}}</a>
+						</div>
+						{{end}}
+						</div>
+			      </div>
+			    
+			   </div>
+			
+			   <!-- 轮播（Carousel）导航 -->
+			   <a class="carousel-control" href="#myCarousel" 
+			      data-slide="prev"><img id="qysq-left" src="/images/qysq-left.png"></a>
+			   <a class="carousel-control rightmenu" href="#myCarousel" 
+			      data-slide="next"><img id="qysq-right" src="/images/qysq-right.png"></a>
+			
 			</div>
-			{{end}}
-		</div>
+		</div> 
 	</div>
 			
 	<div class="a-panel hidden-xs index-new-wgw">
@@ -310,6 +357,10 @@
 </div>
 {{include "/common/bottom.html"}}
 <script>
+var itm = $(".itemno").length;
+if (itm < 2){
+	$(".carousel-control").addClass("hidden");
+}
 $(function(){
 var areload=$("a.reload");
 areload.click(function(){

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

@@ -64,7 +64,7 @@ $(function(){
 		,callback:function(ct,cd,val,k,m){
 			var v=ct["i_status"]==1?ct["s_title"]:cd;
 			var id = ct["_id"]
-			if(v) v="<a href='/manage/content/"+id+"'>"+v+"</a>"
+			if(v) v="<a target='_blank' href='/manage/content/"+id+"'>"+v+"</a>"
 			return v
 		}	
         },

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

@@ -77,7 +77,7 @@ background-color:#FFFFFF;
         <div class="form-group">
         <label id="col-sm-2" class="col-sm-2 control-label" for="name">问题描述：</label>
 	    <div class="col-sm-6">
-		<textarea style=" width:100%;padding:10px 8px; height:100px; background-color:#F0F0F0;" name="s_record" class="form-control" disabled="disabled">{{.T.s_remark}}</textarea>
+		<textarea style=" width:100%;padding:10px 8px; height:100px; background-color:#F0F0F0;" name="s_remark" class="form-control" disabled="disabled">{{.T.s_remark}}</textarea>
 		</div>
 		<div class="col-sm-4">
 		</div>

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

@@ -515,7 +515,7 @@ function updatearticle(){
         cache:false,    
         dataType:'json', 
         success:function(data){
-			Dialog.alert(data.msg,function(){location.href ="/manage/articlelist"}); 
+			Dialog.alert(data.msg,function(){window.close()}); 
         }    
         });   
 	clickCount++;  
@@ -530,7 +530,7 @@ function updatearticle(){
         cache:false,    
         dataType:'json', 
         success:function(data){
-			Dialog.alert(data.msg,function(){location.href ="/manage/articlelist"}); 
+			Dialog.alert(data.msg,function(){window.close()}); 
         }    
         });    
 	})

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

@@ -191,6 +191,10 @@
 	background-color:#FF5A5F;
 	color:#fff;
 }
+.help-index label{
+	font-size:16px;
+	font-weight:normal;
+}
 </style>
 </head>
 <body>
@@ -235,6 +239,7 @@
 	</div>
 	</div>
 	<div id="help-content-2" class="help-opinioncontent hidden">
+	<div style="color:#cccccc;height:46px;line-height:46px;border-bottom:1px solid #E5E6E9;padding-left:40px;">您在企明星遇到任何问题，请在这里告诉我们，我们的工作人员会及时处理，感谢您的宝贵意见！</div>
 	<div class="help-opinionarticle">
 	
 		<form class="validForm form-horizontal" role="form" id="insertback" method="post">
@@ -274,14 +279,14 @@
 		</div>
 		</div>
 	  
-		<div class="form-group" style="margin-top:20px; ">
+		<div class="form-group" style="margin-top:35px; ">
         <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;">
+        <div class="form-group" style="margin-top:35px;">
         <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格式（可选）
@@ -291,7 +296,7 @@
 		</div>
 		</div>
 		
-		<div class="form-group" style="margin-top:-15px;">
+		<div class="form-group" style="margin-top:-5px;">
         <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; ">
@@ -306,7 +311,7 @@
 		</div>
 		</div>
 	  
-        <div class="form-group" style="margin-top:20px;">
+        <div class="form-group" style="margin-top:35px;">
         <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/邮箱/电话号码，方便我们的工作人员和你联系（可选）">
@@ -315,7 +320,7 @@
 		</div>
 		</div>
 		
-		<div class="form-group" style="margin-top:20px;">
+		<div class="form-group" style="margin-top:35px;">
 		<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" >
@@ -329,12 +334,12 @@
 	  </div>
 
 		
-		<div style="margin-top:20px;" class="form-group">
+		<div style="margin-top:50px;" 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 class="col-sm-8 text-center">
+		<input style="width: 240px;" type="button" class="btn btn-primary" onClick="insertback()"  value="　　　提　交　　　">
 		</div>
-		<div class="col-sm-6"></div>
+		<div class="col-sm-2"></div>
 		</div>
         </form>
 	</div>
@@ -342,19 +347,19 @@
 	<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>
+	<p><a target="_blank" href="/front/webhelpcontent/5594d3f3af5374369d000a31.html">1.　如何成为注册用户</a></p>
+	<p><a target="_blank" href="/front/webhelpcontent/5594d3f3af5374369d000a31.html">2.　如何发布企业信息</a></p>
+	<p><a target="_blank" href="/front/webhelpcontent/5594d3f3af5374369d000a31.html">3.　如何管理企业信息</a></p>
+	<p><a target="_blank" href="/front/webhelpcontent/5594d3f3af5374369d000a31.html">4.　如何查找企业</a></p>
+	<p><a target="_blank" href="/front/webhelpcontent/5594d3f3af5374369d000a31.html">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>
+	<p><a target="_blank" href="/front/webhelpcontent/5594d3f3af5374369d000a31.html">1.　用户名修改</a></p>
+	<p><a target="_blank" href="/front/webhelpcontent/5594d3f3af5374369d000a31.html">2.　无法登录</a></p>
+	<p><a target="_blank" href="/front/webhelpcontent/5594d3f3af5374369d000a31.html">3.　手机号被占用</a></p>
+	<p><a target="_blank" href="/front/webhelpcontent/5594d3f3af5374369d000a31.html">4.　账户丢失或被盗</a></p>
+	<p><a target="_blank" href="/front/webhelpcontent/5594d3f3af5374369d000a31.html">5.　帐号注销</a></p>
 	</div>
 	</div>
 	<div id="help-content-4" class="help-linkcontent hidden">

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,383 @@
+<html>
+<head>
+<title>{{.T.s_title}}_新闻资讯_企明星</title>
+{{include "/common/inc.html"}}
+<meta name="Keywords" content="{{.T.s_keywords}}"/>
+<meta name="Description" content="{{.T.s_description}}"/>
+<script src="/js/validform-min.js"></script>
+<script src="/js/jquery.cookie.js"></script>
+<style type="text/css">
+
+body{
+background-color:#F0F0F0;
+}
+#content { margin-left:0px;}
+.search li a{font-size:13px;}
+.active{background-color:#6CC3FF}
+.widget-box { background-color:#FFFFFF; border:0px;}
+.widget-content { border:0px;}
+#share a{
+	margin-right:15px;
+}
+#share a#bds_weixin{ background:url(/images/u78.png) no-repeat;background-position: 0px 0px; width:34; height:34;background-size: 328px 30px;}
+#share a#bds_tsina{ background:url(/images/u78.png) no-repeat; background-position: -50px -0px; width:34; height:34;background-size: 328px 30px;}
+#share a#bds_tqq{ background:url(/images/u78.png) no-repeat; background-position: -97px -0px; width:34; height:34;background-size: 328px 30px;}
+#share a#bds_qzone{ background:url(/images/u78.png) no-repeat; background-position: -148px -0px; width:34; height:34;background-size: 328px 30px;}
+#share a#bds_douban{ background:url(/images/u78.png) no-repeat; background-position: -198px -0px; width:34; height:34;background-size: 328px 30px;}
+#share a.bds_dz{ background:url(/images/u78.png) no-repeat; background-position: -248px -0px; width:90; height:34;background-size: 328px 30px;}
+#share a#bds_more{ background:url(); margin-top:13px;}
+.ftnt:hover{ text-decoration: none;}
+.firstimg{ width:100%;}
+.bdsharebuttonbox{float: left;margin: 0px;}
+.bdsharebuttonbox2{float: left;margin: 0px; display:block;}
+.b-nav-main{
+	background-color: #FF5A5F;
+}
+.b-nav{
+	border-top-color: #FF5A5F;
+}
+.b-head .b-h-search form>span{
+	background-color: #FF5A5F;
+}
+.a-content{
+	margin-top:20px;
+}
+.b-head .head-hidemenu li:hover {
+    background-color: #FF5A5F;
+}
+.b-round-dot {
+    background-color: #FF5A5F;
+}
+.index-new-head .head-hidemenu i {
+    color: #FF5A5F;
+}
+.newcon-left{
+	width:77%;
+	float:left;
+	background-color: #fff;
+}
+.newcon-right{
+	width:22%;
+	float:left;
+	background-color: #fff;
+	margin-left:10px;
+	
+}
+
+.newcon-right .hotnews{
+	width:100%;
+	height:45px;
+	background-color:#F7F8FA;
+	border:1px solid #e5e6e9;
+	line-height:45px;
+	padding-left:20px;
+	font-size: 18px;
+	border-bottom:0px;
+}
+.hotnewslists{
+	width:100%;
+	border:1px solid #e5e6e9;
+	padding:20px 10px;
+	display:block;
+	height:380px;
+	background-color:#fff;
+	
+}
+.hotnewslists ul{
+	width:100%;
+	height:33px;
+	line-height:33px;
+}
+.lifirst{  
+	background-color: #ff5a5f;
+    text-align: center;
+    width: 15px;
+    height: 15px;
+    line-height: 16px;
+    color: #fff;
+    margin-top: 9px;
+	margin-right:5px;
+}
+.lisecond{
+	width:210px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+.lithree{
+	float:right;
+	color:#999;
+}
+.a-content .container-fluid{
+	padding:0px;
+}
+.container-fluid .row-fluid:first-child {
+    margin-top:0px;
+}
+.newscontent{
+	margin:20px 70px;
+	padding-top:30px;
+	font-size:14px; 
+	line-height:32px; 
+}
+.fengexian{
+	border-top:1px dashed #ccc;
+	margin:20px 40px;
+}
+.one{
+	float:left;
+	width:50%;
+	text-align:right;
+	color:#000;
+	font-size:14px;
+}
+.one span{
+	cursor:pointer;
+	margin-left:6px;
+	margin-right:6px;
+}
+.text-muted{
+	margin-left:62px;
+}
+.forwat{
+	color:#ff5a5f !important;
+	font-weight:bold;
+}
+</style>
+<script type="text/javascript">
+$(document).ready(function(){
+	var _screenwidth = document.body.clientWidth-110;//缩放后的最大宽度
+	//所有大图等比缩放
+	$("img").each(function(){
+		if(this.width>_screenwidth){
+			//执行缩放操作
+			var w = this.width;
+			var h = this.height;
+			this.oldWidth=w;
+			this.oldHeight=h;
+			this.cusHeight=h/(new Number(w/_screenwidth));
+			this.cusWidth=_screenwidth;
+			this.height=this.cusHeight+50;
+			this.width=this.cusWidth+55;
+			this.title="点击我,查看原始尺寸图像";
+			$("img").removeAttr("style");
+			$(".container-fluid").css("padding-left","2px").css("padding-right","2px");
+			var obj = $(this);
+			obj.toggleClass('cus');
+			$(this).bind('click',function(){
+				var flag = obj.hasClass('cus')
+				this.width=flag?this.oldWidth:this.cusWidth+55;
+				this.height=flag?this.oldHeight:this.cusHeight+50;
+				obj.toggleClass('cus');
+			});
+		}
+	});
+});
+</script>
+
+</head>
+<body>
+{{include "/common/newshead.html"}}
+<div class="a-content">
+
+	<div class="newcon-left">
+		<!-- 中间 -->
+		<div class="row" style="margin-left:auto; margin-right:auto;">
+			
+				<div id="content" style="border-top-left-radius:0px;border-radius: 4px;  margin-bottom:30px;">
+					
+					<div class="container-fluid">
+						<div class="row-fluid">
+							<div class="span12">		
+								<div class="widget-box">
+									<div class="widget-content nopadding">
+									<div style=" margin:auto; margin-bottom:30px;">
+									
+									<div style="clear:both;"></div>
+									
+									<div class="visible-md visible-lg text-center" style="margin:auto; width:924px; height:450px; ">
+									<img src="{{.T.s_pic}}">
+									
+									</div>
+									<div class="text-center" style="height:100px;width:924px;margin-top:-100px;"><p style=" font-weight:bold; color:#fff; font-size:36px; line-height:50px;">{{.T.s_title}}</p>
+									</div>
+									
+									<div class="visible-sm visible-xs " style="position:relative; margin:auto; margin-top:20px;">
+									<img class="firstimg" src="{{.T.s_pic}}">
+									<div style="position:absolute;top:75%;margin-right:auto;margin-left:auto;background-image:url(/images/u35.png);height:25%;width:100%;">
+									<div style="height:50px;display: table-cell; vertical-align: middle;width:320px;"><h4 ><p style=" color:#000000; font-size: 14px; line-height:18px;" class="text-center">{{.T.s_title}}</p></h4></div>
+									</div>
+									</div>
+									
+									<p style="font-size:12px; padding:25px; padding-top:0px; color: #999999;" class="text-center">{{if eq .T.s_author ""}}{{else}}作者：{{.T.s_author}}　　{{end}}文章来源：{{if eq .T.s_url ""}}{{.T.s_source}}{{else}}<a style="font-size:14px; color:#0000FF;" target="_blank" href="{{.T.s_url}}">{{.T.s_source}}</a>{{end}}　　发布日期：{{if not .T.releasetime}}{{.T.l_createdate}}{{else}}{{.T.releasetime}}{{end}}</p>
+										<div style="width:916px;margin-top:20px;" class="text-center">
+									<div class="one">
+									【字体：<span onClick="change(1)">大</span><span onClick="change(2)">中</span><span onClick="change(3)">小</span>】
+									</div>
+									<div style="float:left;" class="a-twostage-toolbar text-muted">
+										<a class="pull-left" style="line-height: 25px;" onclick="$('#share').show('normal')"><span class="glyphicon fenxiang " style="font-size:14px;margin:0px 0px 0px 5px;color:#ff5a5f;"></span><span style="font-size:14px;color:#ff5a5f;">分享</span></a>
+										<div class="bdsharebuttonbox " style="margin:-1px 0 0 0px;" id="share">
+											<a href="#" class="bds_qzone" data-cmd="qzone" title="分享到QQ空间"></a>
+											<a href="#" class="bds_tsina" data-cmd="tsina" title="分享到新浪微博"></a>
+											<a href="#" class="bds_tqq" data-cmd="tqq" title="分享到腾讯微博"></a>
+											<a href="#" class="bds_weixin" data-cmd="weixin" title="分享到微信"></a>
+											<a href="#" class="bds_renren" data-cmd="renren" title="分享到人人"></a>
+										</div>
+									</div>
+									<div style="clear:both;"></div>
+								</div>
+										<div class="fengexian"></div>
+										<div class="newscontent">
+									    {{.T.s_content}}
+										</div>
+										
+			                          </div>
+									<div style="clear:both;"></div>
+									  
+									  <div style="float:left; margin-left:60px;"  id="share">
+										<div class="bdsharebuttonbox" style="display:block;">
+										<a href="#" class="bds_more" id="bds_more" data-cmd="more" style="font-size:14px;display:none;">分享到：</a>
+										<a href="#" class="bds_weixin" id="bds_weixin" data-cmd="weixin" title="分享到微信"></a>
+										<a href="#" class="bds_tsina" id="bds_tsina" data-cmd="tsina" title="分享到新浪微博"></a>
+										<a href="#" class="bds_tqq" id="bds_tqq" data-cmd="tqq" title="分享到腾讯微博"></a>
+										<a href="#" class="bds_qzone" id="bds_qzone" data-cmd="qzone" title="分享到QQ空间"></a>
+										<a href="#" class="bds_douban" id="bds_douban" data-cmd="douban" title="分享到豆瓣网"></a>
+										<a onClick="up({{.T._id}})" class="bds_dz" title="赞一个"><span style="font-size:10px; margin-top:7px; position:absolute; text-align:center; width:45px; color:#FF5A5F;margin-left:15px;" >{{.T.praise}}</span></a>
+										</div>			
+										<script>window._bd_share_config={"common":{"bdSnsKey":{},"bdText":"","bdMini":"2","bdPic":"","bdStyle":"0","bdSize":"16"},"share":{}};with(document)0[(getElementsByTagName('head')[0]||body).appendChild(createElement('script')).src='http://bdimg.share.baidu.com/static/api/js/share.js?v=89860593.js?cdnversion='+~(-new Date()/36e5)];</script>	
+										</div>
+									<div style="clear:both;"></div>
+									<div style="padding:20px 60px; margin-top:15px;">{{if .T.firstid }}<span style="font-size:14px;">上一篇：　<a href="/front/webcontent/{{.T.firstid}}.html" class="ftnt">{{.T.firsttitle}}</a></span>{{else}}{{end}}</div>
+									<div style="padding:10px 60px;">{{if .T.nextid }}<span>下一篇：　<a href="/front/webcontent/{{.T.nextid}}.html" class="ftnt">{{.T.nexttitle}}</a></span>{{else}}{{end}}</div>
+									<div style="clear:both;"></div>
+									</div>
+								</div>
+							</div>
+						</div>
+		
+					</div>
+					
+				</div>
+				
+		</div>
+	
+	</div>
+	
+	<div class="newcon-right">
+		<div class="hotnews">热门资讯</div>
+		<div class="hotnewslists">
+		
+		</div>
+		</div>
+	</div>
+	<div style="clear:both;"></div>
+</div>
+{{include "/common/bottom.html"}}
+<script type="text/javascript">
+	var ctp = {{.T.s_contenttype}};
+	if (ctp == "qykb"){
+		$("#qykb").addClass("forwat");
+	}else if(ctp == "zhsk"){
+		$("#zhsk").addClass("forwat");
+		
+	}
+function change(i){
+	if (i==1){
+		$(".newscontent").css("font-size","22px");
+	}else if (i==2){
+		$(".newscontent").css("font-size","18px");
+	}else if (i==3){
+		$(".newscontent").css("font-size","14px");
+	}
+	
+}
+//setNavbarActive(4);
+	var html = ""
+	{{range $k,$v:=.T.hotnews}}
+		var k = {{$k}}+1
+		html += '<ul><li class="lifirst font-size-12" style="{{if gt $k 2}}background-color:#ccc;{{end}}">'+k+'</li><li class="lisecond"><a target="block" href="/front/webcontent/{{index $v "_id"}}.html">{{index $v "s_title"}}</a></li><li class="lithree text-center font-size-12">{{index $v "praise"}}</li></ul>'
+	{{end}}
+	$(".hotnewslists").append(html);
+function currPos(){
+   return [["新闻资讯","/front/content_qykb_list.html"]]
+}
+$(function (){
+     var key = {{.T.s_keywords}}
+	 var strs = new Array();
+	 strs = key.split("，")
+	 for (i=0;i<strs.length ;i++ ) 
+			{ 
+			 $("#s_keywords").append("<span style='background-color:#D2D2D2; color:#fff; padding:5px 10px; margin-left:5px;font-size:12px;'>"+strs[i]+"</span>") 
+			} 
+
+	$(".backTop").click(function (){
+		$(window).scrollTop(0);
+	});
+ 
+	$('#loginModal').on('shown.bs.modal', function () {
+		$("#username").focus();
+	});
+	var obj = $(".navbar-nav li a.qfw-navbar-active");
+	$(".navbar-nav li a").mouseover(function (){
+		obj.removeClass("qfw-navbar-active");
+		$(this).addClass("qfw-navbar-active");
+	}).mouseout(function (){
+		$(this).removeClass("qfw-navbar-active");
+		obj.addClass("qfw-navbar-active");
+	});
+	$(".registerform").Validform({
+		tiptype:function(msg,o,cssctl){
+			cssctl($(o.obj).prev(),o.type);
+			$(o.obj).prev().text(msg).show();
+		}
+	});
+	$(".bds_weixin").on("click",function(){
+	    clearWeixin();	
+	});
+ 
+});
+
+function clearWeixin(){
+	if($(".bd_weixin_popup_foot").length>0){
+		$(".bd_weixin_popup_foot").html("&nbsp;");
+		return;
+	}else{
+		setTimeout(clearWeixin,30);
+	}
+}
+
+$(function(){
+	var _id = {{.T._id}}
+	var updown = $.cookie("_cms_updown_" + _id);
+	//$(".bds_dz").find("span").text(updown);
+});
+
+var up = function (djno){    
+    var no = djno;
+	var original = {{.T.praise}}
+	var updown = $.cookie("_cms_updown_" + no);
+	if (updown) {
+		alert("您已经赞过了！");
+		return;
+	}else{
+		$.cookie("_cms_updown_"+ no,original+1,{expires:1} );
+		updown = $.cookie("_cms_updown_" + no);
+	}
+	$(".bds_dz").find("span").text(updown);
+
+    $.ajax({    
+        type:'post',        
+        url:'/front/praise/exp',    
+        data:{praise:original,_id:'{{.T._id}}'},    
+        cache:false,    
+        dataType:'json', 
+        success:function(data){
+		 if (data.flag) {
+		     $(".bds_dz").find("span").html(data.praise);
+		 }	  
+        }    
+        });  
+}
+</script>
+</body>
+</html>

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

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

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

@@ -1,18 +1,32 @@
 <html>
 <head>
-<title>文章内容</title>
+<title>帮助中心</title>
 {{include "/common/inc.html"}}
 <script src="/js/validform-min.js"></script>
 <style type="text/css">
-#content { margin-left:0px;}
+body{
+	background-color:#f0f0f0;
+	}
+.b-nav {
+    border-top-color: rgb(255, 90, 95);
+}
+#content { 
+	margin-left:0px;
+	}
+.widget-box {
+	border:0px;
+	}
+.widget-content {
+	border-bottom:0px;
+	}
 </style>
 </head>
 <body>
+{{include "/common/helphead.html"}}
 <div class="container-fluid">
-{{include "/common/head.html"}}
 </div>
 <!-- 中间 -->
-<div class="row" style="width:96%; margin:0 auto; margin-top:10px;">
+<div class="row" style="padding:10px 50px; margin:0 auto;">
 		<div id="content">
 			
 			<div class="container-fluid">
@@ -21,7 +35,7 @@
 						<div class="widget-box">
 							<div class="widget-content nopadding">
 							<div style="width:90%; margin:auto; margin-bottom:80px;">
-							<h4><p style="font-weight:bold; border-bottom:1px dashed #98D6DC; padding-bottom:20px;" class="text-center">{{.T.s_title}}</p></h4>
+							<h4><p style="font-weight:bold; border-bottom:1px dashed #98D6DC; padding:20px;" class="text-center">{{.T.s_title}}</p></h4>
 							<div  style="font-size:14px; line-height:25px;">
 							    {{.T.s_content}}
 								</div>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -17,7 +17,7 @@ var entType="企业"
 </script>
 </head>
 <body>
-{{include "common/head.html"}}
+{{include "/common/centerhead.html"}}
 <div id="entinfobg">	
 <div class="a-content">
 	<!--标题-->
@@ -84,7 +84,7 @@ var entType="企业"
 				<div class="tablediv"> 
 					<div class="rowcontent"> 
 						<div class="one"><span class="glyphicon lianxidianhua icon_gray"></span></div> 
-						<div class="two">联系电话：</div> 
+						<div class="two">联系方式：</div> 
 						<div class="three"><input type="text" name="s_mobile" class="form-control" id="Tel" value="{{.T.entinfo.s_mobile}}"  maxlength="21" ignore="ignore" datatype="m" nullmsg="请输入手机号码" errormsg="手机号码格式错误" ></div> 
 						<div class="four" > <span class="Validform_checktip"></span></div>
 					</div> 

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

@@ -14,7 +14,7 @@
 <script src="/js/validform-min.js"></script>
 </head>
 <body>
-{{include "/common/head.html"}}
+{{include "/common/centerhead.html"}}
 <div id="entinfobg">	
 	<div class="a-content">
 		<!--标题-->
@@ -89,7 +89,7 @@
 								</div> 
 							</div> 
 						</div>						
-						<div class="tablediv"> 
+						<div class="tablediv hidden"> 
 							<div class="rowcontent"> 
 								<div class="two">服务范围：</div>
 								<div class="three">
@@ -104,7 +104,7 @@
 							</div> 
 						</div>
 						
-						<div class="tablediv"> 
+						<div class="tablediv" id="serviecetype"> 
 							<div class="rowcontent"> 
 								<div class="two">产品服务类型：</div> 
 								<div class="three">
@@ -151,7 +151,7 @@
 									<script>
 										$(function(){
 											$("#goToFeedback").click(function(){
-												$("body").append('<form id="goToFeedbackForm" action="/front/web_feedbacklist.html" method="post" class="hide"><input type="hidden" name="type" value="serviceclassify"></form>');
+												$("body").append('<form id="goToFeedbackForm" action="/front/web_O_help.html" method="post" class="hide"><input type="hidden" name="type" value="serviceclassify"></form>');
 												$("#goToFeedbackForm").submit();
 											});
 										});
@@ -297,13 +297,18 @@ function btnAddServices(){
 		url: "/member/yellowpage/add/service/addservice?_new="+t,
 		ajaxPost:true,
 		beforeSubmit:function(curform){
-			if($("#firstservicetype").val() == "00"){
-				$("#firstservicetype").click();
-				$("#firstservicetype").nextAll(".Validform_checktip").addClass("Validform_wrong").show();
-				$(window).scrollTop($("#firstservicetype").offset().top);
-				return false;
+			
+			if ($("#isshow_checked3").is(":checked")) { 
+				if($("#firstservicetype").val() == "00"){
+					$("#firstservicetype").click();
+					$("#firstservicetype").nextAll(".Validform_checktip").addClass("Validform_wrong").show();
+					$(window).scrollTop($("#firstservicetype").offset().top);
+					return false;
+				}else{
+					$("#firstservicetype").nextAll(".Validform_checktip").removeClass("Validform_wrong").hide();
+					return true;
+				}
 			}else{
-				$("#firstservicetype").nextAll(".Validform_checktip").removeClass("Validform_wrong").hide();
 				return true;
 			}
 		},
@@ -356,5 +361,17 @@ function initSecondServiceType(firstsertype){
 <script src="/js/enterprise.js"></script>
 <script>
    window.onload=function(){limouseover();}
+	if ($("#isshow_checked3").is(":checked")) {  
+		$("#serviecetype").removeClass("hidden");
+	}else{
+		$("#serviecetype").addClass("hidden");
+	};
+	$("#isshow_checked3").click(function(){
+		if ($("#isshow_checked3").is(":checked")) {  
+				$("#serviecetype").removeClass("hidden");
+		}else{
+				$("#serviecetype").addClass("hidden");
+		};
+	});
 </script>
 </html>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

core/src/web/templates/mobile/mobileindex.html

@@ -0,0 +1,39 @@
+
+<html>
+<head>
+<title>企明星_手机版首页</title>
+{{include "/common/inc.html"}}
+<meta name="Keywords" content="企明星 企业 企业服务网 企业社区 企业服务 企业目录 信用 信用查询 公司查询 法人代表 微官网"/>
+<meta name="Description" content="企明星是一款面向企业和个人提供服务的互联网产品，提供企业社区（企业产品服务信息发布、企业信息查询、企业关系网）、微官网、企业关系网、政策法规查询。"/>
+<style type="text/css">
+body{
+	background-color:#F0F0F0;
+}
+.b-nav {
+    border-top-color: #FF5A5F;
+}
+</style>
+</head>
+<body>
+<!---->
+<div class="index-new-head b-head">
+	<div style="height:25px;width:100%;background-color:#000;"></div>
+	<div class="b-nav index-new-nva">
+		<ul style="margin-left:15px;">
+			<li class="b-nav-logo index-new-nva-l"><a href="/"><img src="/images/logo.png" class="logo"></a></li>
+			
+		</ul>
+	</div>
+</div>
+<div class="text-center" style="margin:40px 20px 20px 20px">
+	<div>
+	 	<p>企明星为了用户有更好的使用体验，</p>
+		<p>已成功把各项功能移植到</p>
+		<p>关注企明星公众号：</p>
+		<p>qmx-cn</p>
+		<p>或扫描二维码</p>
+	</div>
+	<div><img src="/images/u109.png"></div>
+</div>
+</body>
+</html>

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

@@ -24,23 +24,18 @@
 		  	<div class="carousel-inner" role="listbox">
 			    <div class="item active">
 			      	<img src="/images/swordfish/guide-1.png">
-			     	<div class="carousel-caption"></div>
 			    </div>
 			    <div class="item">
 			      	<img src="/images/swordfish/guide-2.png">
-			      	<div class="carousel-caption"></div>
 			    </div>
 				<div class="item">
 			      	<img src="/images/swordfish/guide-3.png">
-			     	<div class="carousel-caption"></div>
 			    </div>
 			    <div class="item">
 			      	<img src="/images/swordfish/guide-4.png">
-			      	<div class="carousel-caption"></div>
 			    </div>
 				<div class="item">
 			      	<img src="/images/swordfish/guide-5.png">
-			     	<div class="carousel-caption"></div>
 			    </div>
 		  	</div>
 			<div class="swordfish-guide-right">

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

@@ -61,14 +61,8 @@ $(function(){
 			var prevSlide = $(swiper.slides[swiper.previousIndex]);
 			prevSlide.addClass("slide-active");
 			var activeSlide = $(swiper.slides[swiper.activeIndex]);
-			if(currentIndex > swiper.activeIndex){
-				activeSlide.addClass("slide-down");
-			}else if(currentIndex < swiper.activeIndex){
-				activeSlide.addClass("slide-up");
-			}
-			currentIndex = swiper.activeIndex;
-			activeSlide.one("webkitAnimationEnd",function(){
-				$(this).removeClass("slide-up").removeClass("slide-down");
+			var animateCallBack = function(){
+				activeSlide.removeClass("slide-up").removeClass("slide-down");
 				prevSlide.removeClass("slide-active");
 				if(swiper.activeIndex == 5){
 					$(".arrow-up").hide();
@@ -77,7 +71,13 @@ $(function(){
 					$(".experience").hide();
 					$(".arrow-up").show();
 				}
-			});
+			}
+			if(currentIndex > swiper.activeIndex){
+				activeSlide.addClass("slide-down").css({"top":"-100%"}).animate({"top":"0px"},"fast",null,animateCallBack);
+			}else if(currentIndex < swiper.activeIndex){
+				activeSlide.addClass("slide-up").css({"top":"100%"}).animate({"top":"0px"},"fast",null,animateCallBack);
+			}
+			currentIndex = swiper.activeIndex;
 		},
 		onSliderMove: function(swiper, event){
 			if(swiper.isEnd && (swiper.touches.currentX - swiper.touches.startX) > 20) {

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

@@ -0,0 +1,68 @@
+<html>
+<head>
+<meta name="viewport" content="width=device-width,initial-scale=1.0">
+<title>企明星-剑鱼-信息推送</title>
+<link href="{{Msg "seo" "cdn"}}/wxswordfish/style.css" rel="stylesheet">
+<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
+<script src="{{Msg "seo" "cdn"}}/js/jquery.js"></script>
+<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js"></script>
+<script>
+initShare({{.T.signature}},{{.T.shareid}});
+$(function(){
+	var hm = document.createElement("script");
+	hm.src = "//hm.baidu.com/hm.js?ed198b177e527bb53684db20bb390e77";
+	var s = document.getElementsByTagName("script")[0]; 
+	s.parentNode.insertBefore(hm, s);
+})
+</script>
+<style type="text/css">
+body{
+	margin:0;
+	padding:0;
+	color: #333;
+	padding-bottom: 50px;
+	font-size:14px;
+	font-family: tahoma, arial, 'Hiragino Sans GB', 'Microsoft YaHei', 宋体, sans-serif;
+}
+pre {
+	white-space: pre-wrap;
+	word-wrap: break-word;
+	font-family: tahoma, arial, 'Hiragino Sans GB', 'Microsoft YaHei', 宋体, sans-serif;
+	color:#5E6060;
+}
+.content{
+	padding:5px;
+}
+.info{
+	width:100%;
+}
+.abs{
+	height:35px;
+	line-height:35px;
+	text-overflow:ellipsis;
+    white-space:nowrap;
+    overflow:hidden;
+	padding:5px;
+	background-color:#F7F8FA;
+}
+.title{
+	width:90%;
+	margin:0 auto;
+	font-size:16px;
+	text-align:center;
+	font-weight:bolder;
+	padding-top:5px;
+	padding-bottom:5px;
+	color:#474747;
+}
+</style>
+</head>
+<body>
+<div class="info">
+	<div class="title">{{.T.obj.title}}</div>
+	<div class="abs">文章原始连接：<a href="{{.T.obj.url}}">{{.T.obj.url}}</a></div>
+	<div class="content" style=""><pre>{{.T.obj.detail}}</pre></div>
+</div>
+{{include "/swordfish/wxtoolbar.html"}}
+</body>
+</html>

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

@@ -21,9 +21,11 @@ $(function(){
 	var a_publishtime = {{.T.data.a_publishtime}};
 	var s_content={{.T.data.s_content}}
 	var mark="为你推送以下信息："
-	if(!s_content){
+	if(!s_content&&"1"==b_view){
 		s_content="<div></div>"
-		mark="，在最新5天的数据中，没有匹配到相应的信息，请更换关键字或继续使用观察。<a style='text-decoration:underline' href='javascript:history.go(-1)'>返回</a>"
+		mark="，在最新5天的数据中，没有匹配到相应的信息，请更换关键字或继续观察、使用。<a style='text-decoration:underline' href='javascript:history.go(-1)'>返回</a>"
+	}else if("1"==b_view){
+		mark="为你推送以下预览信息（<a style='text-decoration:underline' href='javascript:history.go(-1)'>返回</a>）："
 	}
 	$("body").prepend(s_content);
 	if(typeof(s_words) != "undefined" && s_words.length > 0){
@@ -104,7 +106,8 @@ $(function(){
 			abt.click(function(){
 				setVisitedIndex($(this));
 				var h=$(this).attr("s");
-				redirect(h);
+				var sid=$(this).attr("sid");
+				redirect(h,sid);
 				return false;
 			})
 		},800)
@@ -116,11 +119,11 @@ function open_window(link){
     var arg = '\u003cscript\u003elocation.replace("'+link+'")\u003c/script\u003e';
     window.open('javascript:window.name;', arg);
 }
-function redirect(link){ 
+function redirect(link,sid){ 
 	if(!/^http/.test(link)){
 		link="http://"+link
 	}
-	window.location.href="/visit/redirect?url="+escape(link)
+	window.location.href="/visit/redirect?id="+sid+"&url="+escape(link)
 
 }
 function setVisitedIndex(obj){

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

@@ -9,6 +9,7 @@
 <script src="{{Msg "seo" "cdn"}}/js/jquery.js"></script>
 <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js"></script>
 <script src="{{Msg "seo" "cdn"}}/wxswordfish/main.js"></script>
+<script src="{{Msg "seo" "cdn"}}/wxswordfish/jquery.resize.js"></script>
 <script>
 	var msgset= {{.T.msgset}};
 	initShare({{.T.signature}},{{.T.shareid}});
@@ -41,8 +42,11 @@
 					<div>信息范围<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/right.png"></div>
 				</li>
 			</ul>
-			<a href="/wxpush/bid/wxpushview/tender">结果预览</a>
+			<div  class="parent-node-view">
+				<button class="btn result-view" v="tender" >结果预览</button >	
+			</div>
 		</li>
+
 		<li class="parent-node" id="bid">
 			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/zhongbiao.png">
 			中标公告
@@ -58,7 +62,11 @@
 					<div>信息范围<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/right.png"></div>
 				</li>
 			</ul>
+			<div  class="parent-node-view">
+				<button class="btn result-view" v="bid" >结果预览</button >	
+			</div>
 		</li>
+		
 		<li class="parent-node">
 			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/qingbao.png">
 			企业情报
@@ -82,11 +90,11 @@
 				<div>订阅关键词<span>最多订阅10组关键词</span></div>
 				<div><span class="submit">确定</span></div>
 			</div>
-			<div class="dialog-content">
+			<div class="dialog-content" style="position:relative">
 				<div class="addKeyWordArea">
 					<lable></lable>
 					<div><button class="btn addKeyWord"><span class="icon">+</span>添加关键词</button></div>
-					<div id="a_end"></div>
+					<div class="a_end"></div>
 				</div>
 			</div>
 		</div>

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

@@ -80,16 +80,25 @@ $(function(){
 			var prevSlide = $(swiper.slides[swiper.previousIndex]);
 			prevSlide.addClass("slide-active");
 			var activeSlide = $(swiper.slides[swiper.activeIndex]);
+			var animateCallBack = function(){
+				activeSlide.removeClass("slide-up").removeClass("slide-down");
+				prevSlide.removeClass("slide-active");
+			}			
 			if(currentIndex == 0 && swiper.activeIndex == 0){
-				activeSlide.addClass("slide-down");
+				activeSlide.addClass("slide-down").css({"top":"-100%"}).animate({"top":"0px"},"normal",null,animateCallBack);
+				currentIndex = 6;
 			}else{
 				if(currentIndex > swiper.activeIndex){
-					activeSlide.addClass("slide-down");
+					activeSlide.addClass("slide-down").css({"top":"-100%"}).animate({"top":"0px"},"normal",null,animateCallBack);
 				}else if(currentIndex < swiper.activeIndex){
-					activeSlide.addClass("slide-up");
+					activeSlide.addClass("slide-up").css({"top":"100%"}).animate({"top":"0px"},"normal",null,animateCallBack);
+				}
+				if(currentIndex == 1 && swiper.activeIndex == 0){
+					currentIndex = 6;
+				}else{
+					currentIndex = swiper.activeIndex;
 				}
 			}
-			currentIndex = swiper.activeIndex;
 			if(currentIndex == 7){
 				currentIndex = 0;
 			}
@@ -98,10 +107,6 @@ $(function(){
 			}else{
 				$("#QRcode").hide();
 			}
-			activeSlide.one("webkitAnimationEnd",function(){
-				$(this).removeClass("slide-up").removeClass("slide-down");
-				prevSlide.removeClass("slide-active");
-			});
 		}
     });
 	/*
@@ -117,15 +122,14 @@ $(function(){
 	}*/
 });
 function backToIndex(){
-	if(mySwiper == null || mySwiper.activeIndex == 1){
+	if(mySwiper == null || mySwiper.activeIndex == 1 || mySwiper.activeIndex == 7){
 		return;
 	}
 	currentIndex = 1;
 	var prevSlide = $(mySwiper.slides[mySwiper.activeIndex]);
 	prevSlide.addClass("slide-active");
 	var activeSlide = $(mySwiper.slides[1]);
-	activeSlide.addClass("slide-down");
-	activeSlide.one("webkitAnimationEnd",function(){
+	activeSlide.addClass("slide-down").css({"top":"-100%"}).animate({"top":"0px"},"normal",null,function(){
 		$(this).removeClass("slide-up").removeClass("slide-down");
 		prevSlide.removeClass("slide-active");
 		mySwiper.slideTo(1, 1000, false);

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

@@ -0,0 +1,137 @@
+<html>
+<head>
+<title>企明星-剑鱼</title>
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+<link href="{{Msg "seo" "cdn"}}/wxswordfish/style.css" rel="stylesheet">
+<link href="{{Msg "seo" "cdn"}}/swiper/swiper.min.css" rel="stylesheet">
+<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
+<script src="{{Msg "seo" "cdn"}}/js/jquery.js"></script>
+<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js"></script>
+<script src="{{Msg "seo" "cdn"}}/swiper/swiper.min.js"></script>
+<script>
+	initShare({{.T.signature}},{{.T.shareid}});
+</script>
+</head>
+<body>
+<div class="swiper-container">
+    <div class="swiper-wrapper">
+        <div class="swiper-slide">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/guide-0.png" alt="Cinque Terre">
+			<img id="QRcode" style="position:absolute;z-index: 2;" src="/front/weixinshare/{{.T.shareid}}" >
+		</div>
+       	<div class="swiper-slide">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/guide-2.png">
+		</div>
+       	<div class="swiper-slide">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/guide-3.png">
+		</div>
+		<div class="swiper-slide">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/guide-4.png">
+		</div>
+		<div class="swiper-slide">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/guide-5.png">
+		</div>
+		<div class="swiper-slide">
+			<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/guide-0.png">
+		</div>
+    </div>
+    <!-- 如果需要分页器 -->
+   	<div class="swiper-pagination"></div>
+	<div class="guide-bottom">
+		<img class="arrow-up" src="{{Msg "seo" "cdn"}}/wxswordfish/images/up.png">
+		<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/index.png" class="jumpGuide" onclick="backToIndex()">
+	</div>
+</div>
+<script type="text/javascript">
+var mySwiper = null;
+var currentIndex = 0;
+$(function(){
+	initShare({{.T.signature}},{{.T.shareid}});
+	var width = $(window).width();
+	var height = $(window).height();
+	var defaultHeight = 416;
+	var max = 750;
+	if(width > max){
+		width = max;
+	}
+	width = width*0.48;
+	var top = 330;
+	if(height > defaultHeight){
+		top = top / defaultHeight * height;
+	}
+	$("#QRcode").css({"width":width,"height":width,"top": top-width,"left":"50%","margin-left": -(width/2)});
+	$(".bottom-toolbar,.feedback-dialog").remove();
+	var flag = true;
+	mySwiper = new Swiper('.swiper-container', {
+		loop: true,
+        pagination: '.swiper-pagination',
+        paginationClickable: false,
+        direction: 'vertical',
+		touchMoveStopPropagation: false,
+		virtualTranslate: true,
+		onInit: function(swiper){
+			$("[data-swiper-slide-index='5']>img").attr("src","{{Msg "seo" "cdn"}}/wxswordfish/images/guide-6.png");
+		},
+		onSlideChangeStart: function(swiper){
+			if(flag){
+				flag = false;
+				return;
+			}
+			var prevSlide = $(swiper.slides[swiper.previousIndex]);
+			prevSlide.addClass("slide-active");
+			var activeSlide = $(swiper.slides[swiper.activeIndex]);
+			if(currentIndex == 0 && swiper.activeIndex == 0){
+				activeSlide.addClass("slide-down");
+			}else{
+				if(currentIndex > swiper.activeIndex){
+					activeSlide.addClass("slide-down");
+				}else if(currentIndex < swiper.activeIndex){
+					activeSlide.addClass("slide-up");
+				}
+			}
+			currentIndex = swiper.activeIndex;
+			if(currentIndex == 7){
+				currentIndex = 0;
+			}
+			if(swiper.isEnd || swiper.activeIndex == 1){
+				$("#QRcode").show();
+			}else{
+				$("#QRcode").hide();
+			}
+			activeSlide.one("webkitAnimationEnd",function(){
+				$(this).removeClass("slide-up").removeClass("slide-down");
+				prevSlide.removeClass("slide-active");
+			});
+		}
+    });
+	/*
+	var imgHeight = 1159;
+	var imgWidth = 750;
+	var width = document.body.clientWidth;
+	var height = document.body.clientHeight;
+	if(imgWidth > width){
+		var h = width / imgWidth * imgHeight;
+		$(".swiper-slide img").css({width: width,height: h,marginTop: -(h / 2)});
+	}else if(imgHeight > height){
+		$(".swiper-slide img").css({width: height / imgHeight * imgWidth,height: height,marginTop: -(height / 2)});
+	}*/
+});
+function backToIndex(){
+	if(mySwiper == null || mySwiper.activeIndex == 1){
+		return;
+	}
+	currentIndex = 1;
+	var prevSlide = $(mySwiper.slides[mySwiper.activeIndex]);
+	prevSlide.addClass("slide-active");
+	var activeSlide = $(mySwiper.slides[1]);
+	activeSlide.addClass("slide-down");
+	activeSlide.one("webkitAnimationEnd",function(){
+		$(this).removeClass("slide-up").removeClass("slide-down");
+		prevSlide.removeClass("slide-active");
+		mySwiper.slideTo(1, 1000, false);
+		$("#QRcode").show();
+	});
+}
+</script>
+</body>
+</html>

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

@@ -78,16 +78,25 @@ $(function(){
 			var prevSlide = $(swiper.slides[swiper.previousIndex]);
 			prevSlide.addClass("slide-active");
 			var activeSlide = $(swiper.slides[swiper.activeIndex]);
+			var animateCallBack = function(){
+				activeSlide.removeClass("slide-up").removeClass("slide-down");
+				prevSlide.removeClass("slide-active");
+			}
 			if(currentIndex == 0 && swiper.activeIndex == 0){
-				activeSlide.addClass("slide-down");
+				activeSlide.addClass("slide-down").css({"top":"-100%"}).animate({"top":"0px"},"fast",null,animateCallBack);
+				currentIndex = 6;
 			}else{
 				if(currentIndex > swiper.activeIndex){
-					activeSlide.addClass("slide-down");
+					activeSlide.addClass("slide-down").css({"top":"-100%"}).animate({"top":"0px"},"fast",null,animateCallBack);
 				}else if(currentIndex < swiper.activeIndex){
-					activeSlide.addClass("slide-up");
+					activeSlide.addClass("slide-up").css({"top":"100%"}).animate({"top":"0px"},"fast",null,animateCallBack);
+				}
+				if(currentIndex == 1 && swiper.activeIndex == 0){
+					currentIndex = 6;
+				}else{
+					currentIndex = swiper.activeIndex;
 				}
 			}
-			currentIndex = swiper.activeIndex;
 			if(currentIndex == 7){
 				currentIndex = 0;
 			}
@@ -96,24 +105,19 @@ $(function(){
 			}else{
 				$("#QRcode").hide();
 			}
-			activeSlide.one("webkitAnimationEnd",function(){
-				$(this).removeClass("slide-up").removeClass("slide-down");
-				prevSlide.removeClass("slide-active");
-			});
 		}
     });
 });
 function backToIndex(){
-	if(mySwiper == null || mySwiper.activeIndex == 1){
+	if(mySwiper == null || mySwiper.activeIndex == 1 || mySwiper.activeIndex == 7){
 		return;
 	}
 	currentIndex = 1;
 	var prevSlide = $(mySwiper.slides[mySwiper.activeIndex]);
 	prevSlide.addClass("slide-active");
 	var activeSlide = $(mySwiper.slides[1]);
-	activeSlide.addClass("slide-down");
-	activeSlide.one("webkitAnimationEnd",function(){
-		$(this).removeClass("slide-up").removeClass("slide-down");
+	activeSlide.addClass("slide-down").css({"top":"-100%"}).animate({"top":"0px"},"fast",null,function(){
+		activeSlide.removeClass("slide-up").removeClass("slide-down");
 		prevSlide.removeClass("slide-active");
 		mySwiper.slideTo(1, 1000, false);
 		$("#QRcode").show();

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

@@ -363,8 +363,20 @@
 			</div>
 		{{end}}
 		</div>
-		<div class="hide">
-			<div class="ent-findnull">
+		<div class="hide ent-dishonesty">
+			<div class="ent-layout-up">
+				<div class="b-com-title">
+					<span><span class="glyphicon jianzhu"></span></span>失信信息
+				</div>
+				<div class="b-com-content">
+					<table class="table ent-table" id="dishonestyList">
+						<tr>
+							<td class="text-center ent-dishonestypaging" id="dishonestyListPaging"></td>
+						</tr>
+					</table>
+				</div>
+			</div>
+			<div class="ent-findnull hide">
 				<img src="/images/findnull.png" class="b-findnull">
 				<h4>抱歉，未找到相关数据！</h4>
 			</div>
@@ -397,6 +409,7 @@
 		</div>
 	</div>
 	<div class="b-right">
+		{{if .T.relevantEnts}}
 		{{if gt (len .T.relevantEnts) 0}}
 		<div class="b-adver b-scroll-list">
 			<div class="b-adver-title">相关企业</div>
@@ -406,7 +419,7 @@
 					<li{{if eq $k 0}} class="margin-0 border-t-0"{{end}}>
 						<div>
 							<img src="{{if $v.s_avatar}}{{$v.s_avatar}}{{else}}null{{end}}" onerror="this.src='/images/ent-logo.png'">
-							<a href="/enterprise/{{$v._id}}.html">{{$v.text}}</a>
+							<a href="/enterprise/{{$v._id}}.html">{{$v.EntName}}</a>
 						</div>
 					</li>
 				{{end}}
@@ -415,11 +428,11 @@
 			</div>
 		</div>
 		{{end}}
-		<div class="{{if gt (len .T.relevantEnts) 0}}margin-t-10 {{end}}b-adver">
+		{{end}}
+		<div class="{{if .T.relevantEnts}}{{if gt (len .T.relevantEnts) 0}}margin-t-10 {{end}}{{end}}b-adver">
 			<div class="b-adver-title">新闻动态</div>
 			<div class="b-adver-content newsInfo"></div>
 		</div>
-		
 	</div>
 </div>
 <!--显示地图信息-->
@@ -435,6 +448,7 @@ var legcerNo = {{.T.res.LegCerNO}};
 var entName = {{.T.res.EntName}};
 var staffinfo = {{.T.res.staffinfo}};
 var synopsis = {{.T.res.s_synopsis}};
+var relevantEnts = {{.T.relevantEnts}};
 //联系地址
 //定义默认的郑州经纬度
 var ptlat=113.69884285509,  ptlng=34.791342526551;