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

core/src/config.json

@@ -29,5 +29,7 @@
     "chatServer": "127.0.0.1:83",
     "chatRpc": "127.0.0.1:88",
 	"creditRpc":"127.0.0.1:8765",
-	"credit_a":"a1,a2,a3,a4,a5,a6,a7,a8"
+	"credit_a":"a1,a2,a3,a4,a5,a6,a7,a8",
+	"domainName":"http://www.qimingxing.info"
+
 }

core/src/github.com/mattn/go-sqlite3

@@ -0,0 +1 @@
+Subproject commit 5510da399572b4962c020184bb291120c0a412e2

core/src/qfw/coreconfig/SysConfig.go

@@ -23,8 +23,12 @@ type config struct {
 	ChatServer      string      `json:"chatServer"`
 	ChatRpc         string      `json:"chatRpc"`
 	ElasticPoolSize int         `json:"elasticPoolSize"`
+<<<<<<< HEAD
 	CreditRpc       string      `json:"creditRpc"`
 	CreditA         string      `json:"credit_a"`
+=======
+	DomainName      string      `json:"domainName"`
+>>>>>>> release
 }
 type smtp struct {
 	Addr     string `json:"addr"`

core/src/qfw/coreutil/weixinrpc.go

@@ -62,3 +62,18 @@ func PayBonus(p *qrpc.BonusMsg) bool {
 	}
 	return repl == "SUCCESS"
 }
+
+//取得JS接口参数
+func GetJSInterfaceParam(url string) []string {
+	var ret []string
+	client, err := rpc.DialHTTP("tcp", rpcserver)
+	if err != nil {
+		log.Println(err.Error())
+		return ret
+	}
+	err = client.Call("WeiXinRpc.GetJSInterfaceParam", url, &ret)
+	if err != nil {
+		log.Println(err.Error())
+	}
+	return ret
+}

core/src/qfw/coreutil/weixinrpc_test.go

@@ -7,7 +7,6 @@ import (
 	"io/ioutil"
 	"log"
 	"net/http"
-	"qfw/coreconfig"
 	qrpc "qfw/util/rpc"
 	"testing"
 	"time"
@@ -99,9 +98,6 @@ func TestSay(t *testing.T) {
 	log.Println(string(bs))
 
 }
-func Test_3(t *testing.T) {
-	title := coreconfig.RedPackage.Weixin["successtitle"].(string)
-	remark := coreconfig.RedPackage.Weixin["successremark"].(string)
-	detail := coreconfig.RedPackage.Weixin["sendname"].(string)
-	SendManagerNotifyMsg(&qrpc.NotifyMsg{Openid: "obEpLuDb5eXrbRni239Lw_Ff4b8A", Title: title, Detail: detail, Remark: remark})
+func Test_GetJSInterfaceParam(t *testing.T) {
+	fmt.Println(GetJSInterfaceParam("www.baidu.com"))
 }

core/src/qfw/front/front.go

@@ -13,5 +13,4 @@ func init() {
 	xweb.AddAction(&CaptchaComponent{})
 	xweb.AddAction(&Newscont{})
 	xweb.AddAction(&Appointment{})
-	xweb.AddAction(&Wxpush{})
 }

core/src/qfw/front/wxpush.go

@@ -1,35 +0,0 @@
-/*推送列表
- *@Author 王传进
- */
-package front
-
-import (
-	"github.com/go-xweb/xweb"
-	mongodb "qfw/util/mongodb"
-)
-
-type Wxpush struct {
-	*xweb.Action
-	wxpushList xweb.Mapper `xweb:"/wxpush/bid/(.*)/(.*)/(.*)"` //推送列表
-	ajaxReq    xweb.Mapper `xweb:"/wxpush/bid/ajaxReq"`
-}
-
-//推送列表
-func (w *Wxpush) WxpushList(s_m_openid string, _id string, msgid string) error {
-	/**
-	go func() {
-		mongodb.Update("message", `{"_id":"`+msgid+`"}`, `{"$set":{"i_status":1}}`, false, false)
-	}()
-	**/
-	w.T["data"] = *mongodb.FindById("wxpush", _id, `{"s_content":1,"s_words":1,"a_visitedindex":1,"a_publishtime":1,"s_type":1}`)
-	w.T["_id"] = _id
-	return w.Render("/wxpush/index.html", &w.T)
-}
-
-func (w *Wxpush) AjaxReq() error {
-	index, _ := w.GetInteger("index")
-	mongodb.Update("wxpush", `{"_id":"`+w.GetString("_id")+`"}`, map[string]interface{}{
-		"$push": map[string]interface{}{"a_visitedindex": index},
-	}, false, false)
-	return nil
-}

core/src/qfw/manage/seo.go

@@ -41,6 +41,9 @@ func (s *SystemManage) Seo() error {
 			s.T["wsite_title"] = util.GetPropertie("qfw.wsite.title", coreconfig.SeoConfig).(string)
 			s.T["wsite_key"] = util.GetPropertie("qfw.wsite.key", coreconfig.SeoConfig).(string)
 			s.T["wsite_description"] = util.GetPropertie("qfw.wsite.description", coreconfig.SeoConfig).(string)
+			s.T["swordfish_title"] = util.GetPropertie("qfw.swordfish.title", coreconfig.SeoConfig).(string)
+			s.T["swordfish_key"] = util.GetPropertie("qfw.swordfish.key", coreconfig.SeoConfig).(string)
+			s.T["swordfish_description"] = util.GetPropertie("qfw.swordfish.description", coreconfig.SeoConfig).(string)
 			return s.Render("/manage/updateseo.html")
 		} else {
 			return s.Redirect("/")
@@ -76,6 +79,9 @@ func (s *SystemManage) Updateseo() error {
 		util.SetPropertie("qfw.wsite.title", s.GetString("wsite_title"), coreconfig.SeoConfig)
 		util.SetPropertie("qfw.wsite.key", s.GetString("wsite_key"), coreconfig.SeoConfig)
 		util.SetPropertie("qfw.wsite.description", s.GetString("wsite_description"), coreconfig.SeoConfig)
+		util.SetPropertie("qfw.swordfish.title", s.GetString("swordfish_title"), coreconfig.SeoConfig)
+		util.SetPropertie("qfw.swordfish.key", s.GetString("swordfish_key"), coreconfig.SeoConfig)
+		util.SetPropertie("qfw.swordfish.description", s.GetString("swordfish_description"), coreconfig.SeoConfig)
 		util.WriteSysConfig("./seo.json", &coreconfig.SeoConfig)
 		flag = "true"
 		msg = "修改成功！"

core/src/qfw/member/membermanager.go

@@ -427,7 +427,7 @@ func (m *Member) RegisterComplete() error {
 //登录
 func (m *Member) Login() {
 	var status string = "n"
-	var info, freeze string
+	var info, freeze, code string
 	s_pwd := m.GetString("s_pwd") //密码
 	if s_pwd != "" {              //密码为空不可登录
 		var loginType string            //登录类型
@@ -448,6 +448,7 @@ func (m *Member) Login() {
 			} else {
 				//获取绑定企业信息
 				if r["s_enterpriseid"] != nil && r["s_enterpriseid"].(string) != "" {
+					code = r["s_enterpriseid"].(string)
 					//enter := *FindOne("enterprise", `M{"_id":"`+r["s_enterpriseid"].(string)+`"}`)
 					enter := *FindById("enterprise", r["s_enterpriseid"].(string), nil)
 					if enter != nil && enter["OpLocDistrict"] != nil {
@@ -472,7 +473,7 @@ func (m *Member) Login() {
 	} else {
 		info = "p_error" //密码错误
 	}
-	m.Write("{\"info\":\"" + info + "\",\"status\":\"" + status + "\",\"freeze\":\"" + freeze + "\"}")
+	m.Write("{\"info\":\"" + info + "\",\"status\":\"" + status + "\",\"freeze\":\"" + freeze + "\",\"code\":\"" + code + "\"}")
 }
 
 //找回密码之后直接登录

core/src/qfw/mobile/mobile.go

@@ -6,16 +6,19 @@ import (
 
 type Mobile struct {
 	*xweb.Action
-	index      xweb.Mapper `xweb:"/ent/(.*)/index"`
-	search     xweb.Mapper `xweb:"/ent/(.*)/search"`
-	detail     xweb.Mapper `xweb:"/ent/(.*)/detail/(.*)/(.*)"`
-	pageerror  xweb.Mapper `xweb:"/ent/(.*)/505"`
-	guide      xweb.Mapper `xweb:"/swordfish/guide"`
-	wxrssset   xweb.Mapper `xweb:"/swordfish/page"`
-	msgSet     xweb.Mapper `xweb:"/swordfish/msgpushsetting/msgset"`
-	ajaxReq    xweb.Mapper `xweb:"/swordfish/ajaxReq"`
-	advise     xweb.Mapper `xweb:"/mobile/advise"`
-	adviseSave xweb.Mapper `xweb:"/mobile/advisesave"`
+	index         xweb.Mapper `xweb:"/ent/(.*)/index"`
+	search        xweb.Mapper `xweb:"/ent/(.*)/search"`
+	detail        xweb.Mapper `xweb:"/ent/(.*)/detail/(.*)/(.*)"`
+	pageerror     xweb.Mapper `xweb:"/ent/(.*)/505"`
+	guide         xweb.Mapper `xweb:"/swordfish/guide"`
+	share         xweb.Mapper `xweb:"/swordfish/share"`
+	wxrssset      xweb.Mapper `xweb:"/swordfish/page"`
+	msgSet        xweb.Mapper `xweb:"/swordfish/msgpushsetting/msgset"`
+	ajaxReq       xweb.Mapper `xweb:"/swordfish/ajaxReq"`
+	advise        xweb.Mapper `xweb:"/mobile/advise"`
+	adviseSave    xweb.Mapper `xweb:"/mobile/advisesave"`
+	wxpushList    xweb.Mapper `xweb:"/wxpush/bid/(.*)/(.*)/(.*)"` //推送列表
+	wxpushAjaxReq xweb.Mapper `xweb:"/wxpush/bid/ajaxReq"`
 }
 
 func init() {

core/src/qfw/mobile/wxmenu.go

@@ -5,9 +5,12 @@ import (
 	"fmt"
 	"log"
 	"math/rand"
+	"qfw/coreconfig"
+	"qfw/coreutil"
 	"qfw/util"
 	"qfw/util/consts"
 	"qfw/util/mongodb"
+	"qfw/util/redis"
 	"runtime"
 	"time"
 )
@@ -19,7 +22,12 @@ func init() {
 }
 
 func (m *Mobile) Guide() error {
-	return m.Render("/swordfish/wxindex.html")
+	m.T["signature"] = getSignature(m.Url())
+	return m.Render("/swordfish/wxindex.html", &m.T)
+}
+func (m *Mobile) Share() error {
+	m.T["signature"] = getSignature(m.Url())
+	return m.Render("/swordfish/wxshare.html", &m.T)
 }
 
 func (m *Mobile) Wxrssset() error {
@@ -36,6 +44,7 @@ func (m *Mobile) Wxrssset() error {
 		}
 	}()
 	if m.Session().Get("userId") != nil {
+		m.T["signature"] = getSignature(m.Url())
 		userInfo := mongodb.FindById("user", m.GetSession("userId").(string), nil)
 		if i_m_guide := (*userInfo)["i_m_guide"]; util.IntAll(i_m_guide) == 0 {
 			mongodb.Update("user", `{"_id":"`+m.GetSession("userId").(string)+`"}`, map[string]interface{}{
@@ -225,3 +234,39 @@ func (m *Mobile) AjaxReq() error {
 	})
 	return nil
 }
+
+//推送列表
+func (m *Mobile) WxpushList(s_m_openid string, _id string, msgid string) error {
+	/**
+	go func() {
+		mongodb.Update("message", `{"_id":"`+msgid+`"}`, `{"$set":{"i_status":1}}`, false, false)
+	}()
+	**/
+	m.T["data"] = *mongodb.FindById("wxpush", _id, `{"s_content":1,"s_words":1,"a_visitedindex":1,"a_publishtime":1,"s_type":1}`)
+	m.T["_id"] = _id
+	m.T["signature"] = getSignature(m.Url())
+	return m.Render("/swordfish/wxpush.html", &m.T)
+}
+
+func (m *Mobile) WxpushAjaxReq() error {
+	index, _ := m.GetInteger("index")
+	mongodb.Update("wxpush", `{"_id":"`+m.GetString("_id")+`"}`, map[string]interface{}{
+		"$push": map[string]interface{}{"a_visitedindex": index},
+	}, false, false)
+	return nil
+}
+func getSignature(action string) []string {
+	url := coreconfig.SysConfig.DomainName + action
+	var signature []string
+	if ret := redis.Get("other", "wxshare-"+url); ret != nil {
+		if d, err := json.Marshal(ret); err == nil {
+			json.Unmarshal(d, &signature)
+		}
+	}
+	if len(signature) == 0 {
+		signature = coreutil.GetJSInterfaceParam(url)
+		redis.Put("other", "wxshare-"+url, signature, 60*1000)
+	}
+	log.Println(url, "------", signature)
+	return signature
+}

core/src/qfw/swordfish/swordfish.go

@@ -10,7 +10,7 @@ import (
 type SwordFish struct {
 	*xweb.Action
 	swordfish     xweb.Mapper `xweb:"/front/swordfish"`                 //剑鱼
-	ajaxReq       xweb.Mapper `xweb:"/member/swordfish/rssset/ajaxReq"` //订阅消息设置ajax请求
+	rsssetAjaxReq xweb.Mapper `xweb:"/member/swordfish/rssset/ajaxReq"` //订阅消息设置ajax请求
 	rssSet        xweb.Mapper `xweb:"/member/swordfish/rssset"`         //订阅消息设置
 	infolist      xweb.Mapper `xweb:"/member/swordfish/infolist"`       //剑鱼
 	swordfishlist xweb.Mapper `xweb:"/member/swordfish/swordfishlist"`  //剑鱼列表

core/src/qfw/swordfish/swordfishmanage.go

@@ -30,7 +30,7 @@ func (s *SwordFish) RssSet() error {
 	s.T["msgset"] = (*u)["o_msgset"]
 	return s.Render("/swordfish/rssset.html", &s.T)
 }
-func (s *SwordFish) AjaxReq() error {
+func (s *SwordFish) RsssetAjaxReq() error {
 	var flag = "n"
 	msgset := make(map[string]interface{})
 	//投标公告
@@ -60,7 +60,7 @@ func (s *SwordFish) AjaxReq() error {
 
 //跳转到用户中心剑鱼信息列表
 func (s *SwordFish) Infolist() error {
-	ms := mongodb.FindById("user", s.GetSession("userId").(string), `{"o_msgset:1"}`)
+	ms := mongodb.FindById("user", s.GetSession("userId").(string), `{"o_msgset":1}`)
 	s.T["msgset"] = ms
 	return s.Render("/swordfish/infolist.html", &s.T)
 }

core/src/seo.json

@@ -8,7 +8,7 @@
         "homepage": {
             "description": "企明星是一款面向企业和个人提供服务的互联网产品，提供企业社区（企业产品服务信息发布、企业信息查询、企业关系网）、微官网、企业关系网、政策法规查询。",
             "key": "企明星 企业 企业服务网 企业社区 企业服务 企业目录 信用 信用查询 公司查询 法人代表 微官网",
-            "title": "企明星-企业服务网-全国最大最真实的企业社区qq"
+            "title": "企明星-企业服务网-全国最大最真实的企业社区"
         },
         "market": {
             "description": "服务市场提供需求发布，服务发布，需求查询，服务查询",
@@ -25,6 +25,11 @@
             "key": "法律法规、行政规章制度、规范性文件",
             "title": "政策法规_企明星"
         },
+        "swordfish": {
+            "description": "剑鱼招标订阅是一款专为销售人员量身定制的招标信息订阅工具。只需微信关注企明星，点击“剑鱼”，即可随时免费收取招标信息推送。",
+            "key": "剑鱼招标订阅 剑鱼招标 剑鱼订阅 招标订阅 销售神器 销售必备",
+            "title": "剑鱼招标订阅，招标信息早知道！"
+        },
         "wsite": {
             "description": "微官网_企明星",
             "key": "微官网_企明星",

core/src/serviceclassify.json

@@ -2,7 +2,7 @@
     {
         "code": "01",
         "name": "工商、财税服务",
-        "image": "serviceclassify-01.png",
+        "image": "serviceclassify-01-new.png",
         "children": [
             {
                 "code": "0101",
@@ -67,7 +67,7 @@
     {
         "code": "02",
         "name": "金融服务",
-        "image": "serviceclassify-02.png",
+        "image": "serviceclassify-02-new.png",
         "children": [
             {
                 "code": "0201",
@@ -108,7 +108,7 @@
     {
         "code": "03",
         "name": "设计服务",
-        "image": "serviceclassify-03.png",
+        "image": "serviceclassify-03-new.png",
         "children": [
             {
                 "code": "0301",
@@ -271,7 +271,7 @@
     {
         "code": "04",
         "name": "人力资源、招聘服务",
-        "image": "serviceclassify-04.png",
+        "image": "serviceclassify-04-new.png",
         "children": [
             {
                 "code": "0401",
@@ -346,7 +346,7 @@
     {
         "code": "05",
         "name": "法律服务、知识产权",
-        "image": "serviceclassify-05.png",
+        "image": "serviceclassify-05-new.png",
         "children": [
             {
                 "code": "0501",
@@ -385,7 +385,7 @@
     {
         "code": "06",
         "name": "教育培训、管理咨询",
-        "image": "serviceclassify-06.png",
+        "image": "serviceclassify-06-new.png",
         "children": [
             {
                 "code": "0601",
@@ -464,7 +464,7 @@
     {
         "code": "07",
         "name": "商旅服务",
-        "image": "serviceclassify-07.png",
+        "image": "serviceclassify-07-new.png",
         "children": [
             {
                 "code": "0701",
@@ -533,7 +533,7 @@
     {
         "code": "08",
         "name": "IT服务",
-        "image": "serviceclassify-08.png",
+        "image": "serviceclassify-08-new.png",
         "children": [
             {
                 "code": "0801",
@@ -614,7 +614,7 @@
     {
         "code": "09",
         "name": "营销推广",
-        "image": "serviceclassify-09.png",
+        "image": "serviceclassify-09-new.png",
         "children": [
             {
                 "code": "0901",
@@ -703,7 +703,7 @@
     {
         "code": "10",
         "name": "日常服务",
-        "image": "serviceclassify-10.png",
+        "image": "serviceclassify-10-new.png",
         "children": [
             {
                 "code": "1001",
@@ -822,7 +822,7 @@
     {
         "code": "11",
         "name": "创业辅导服务",
-        "image": "serviceclassify-11.png",
+        "image": "serviceclassify-11-new.png",
         "children": [
             {
                 "code": "1101",
@@ -851,7 +851,7 @@
     {
         "code": "12",
         "name": "校企合作服务",
-        "image": "serviceclassify-12.png",
+        "image": "serviceclassify-12-new.png",
         "children": [
             {
                 "code": "1201",
@@ -880,7 +880,7 @@
     {
         "code": "13",
         "name": "产业链整合服务",
-        "image": "serviceclassify-13.png",
+        "image": "serviceclassify-13-new.png",
         "children": [
             {
                 "code": "1301",
@@ -893,60 +893,5 @@
                 ]
             }
         ]
-    },
-    {
-        "code": "14",
-        "name": "涉外企业服务",
-        "image": "serviceclassify-14.png",
-        "children": [
-            {
-                "code": "1401",
-                "name": "涉外企业服务",
-                "children": [
-                    {
-                        "code": "140101",
-                        "name": "涉外法律服务"
-                    },
-                    {
-                        "code": "140102",
-                        "name": "招商引资"
-                    },
-                    {
-                        "code": "140103",
-                        "name": "涉外咨询"
-                    },
-                    {
-                        "code": "140104",
-                        "name": "海外上市"
-                    }
-                ]
-            },
-            {
-                "code": "1402",
-                "name": "进出口代理",
-                "children": [
-                    {
-                        "code": "140201",
-                        "name": "全套代理"
-                    },
-                    {
-                        "code": "140202",
-                        "name": "采购代理"
-                    },
-                    {
-                        "code": "140203",
-                        "name": "单证服务"
-                    },
-                    {
-                        "code": "140204",
-                        "name": "清关服务"
-                    },
-                    {
-                        "code": "140205",
-                        "name": "退税服务"
-                    }
-                ]
-            }
-        ]
     }
 ]

core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-05 17:12:57"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-05 17:12:57"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-11 14:45:22"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-11 14:45:22"}},"marketisstart":true,"marketrate":300}

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

@@ -1,7 +1,7 @@
 /*原型开发公用的css文件*/
 body {
 	padding-top: 0px;
-	font-family: "微软雅黑 Regular", "微软雅黑";
+	font-family: tahoma, arial, 'Hiragino Sans GB', 'Microsoft YaHei', 宋体, sans-serif;
 	color: #666;
 }
 table{
@@ -292,9 +292,6 @@ a{
 	padding: 0px 20px !important;
 }
 /*登录提醒css*/
-.f-logintip h3,.f-logintip1 h3,.f-logintip2 h3{
-    font-family: "微软雅黑 Regular", "微软雅黑";
-}
 .m-logintip{
 	width: 460px;
     height: 160px;
@@ -360,8 +357,9 @@ a{
 }
 
 .a-header .a-h-logo img{
-	width: 161px;
-	height: 68px;
+	width: 156px;
+    height: 55px;
+    margin-top: 7.5px;
 }
 
 .a-header .a-h-nav {
@@ -745,7 +743,7 @@ a{
 }
 
 .a-index>div {
-	margin-bottom: 20px;
+	margin-bottom: 10px;
 }
 
 .a-index-head {
@@ -859,13 +857,13 @@ a{
 }
 
 .a-index-want li.a-com-last{
-	padding: 10px 10px 0px 10px;
+	padding: 10px 5px 0px 5px;
 }
 
 .a-index-want div{
 	display: inline-block;
 	text-align: center;
-	width: 80px;
+	width: 86px;
 	cursor: pointer;
 }
 
@@ -890,8 +888,6 @@ a{
 
 .a-index-head .a-i-h-right ul {
 	float: left;
-	padding-left: 10px;
-	padding-right: 5px;
 	border: 1px solid #ddd;
 	width: 100%;
 }
@@ -930,6 +926,7 @@ a{
 	font-size: 16px;
 	margin-bottom: 5px;
 	display: block;
+	padding-left:10px;
 }
 .a-index-hd>img{
 	width: 295px;
@@ -940,7 +937,7 @@ a{
 	height: 32px;
 	overflow: hidden;
 	position: absolute;
-	top: 101px;
+	top: 75px;
 	width: 100%;
 }
 .a-index-hd .smshb span{
@@ -968,7 +965,6 @@ a{
 
 .a-index .a-panel>.a-com-title {
 	color: #999999;
-	margin-bottom: 10px;
 }
 
 .a-index .a-panel .a-com-title font {
@@ -1042,7 +1038,6 @@ a{
 	width: 210px;
 	height: 120px;
 	border: 1px solid #ddd;
-	float: left;
 	padding: 1px
 }
 
@@ -1749,7 +1744,6 @@ style="color:#D03102;margin-right:5px;"
 
 .g-detail p.u-title {
 	margin: 18px 0 10px 0;
-	font-family: 'Arial Negreta', 'Arial';
 	font-weight: 700;
 	color: #dd4814;
 }
@@ -1882,7 +1876,6 @@ style="color:#D03102;margin-right:5px;"
 	padding:30px 30px 0px 30px;
 }
 .m-demandtable {
-    font-family: '微软雅黑 Regular', '微软雅黑';
 	font-weight: 400;
     font-style: normal;	
 	color: #333333;
@@ -2057,6 +2050,186 @@ style="color:#D03102;margin-right:5px;"
 	border-color: #FF5A5F;
 	width: 82px;
 }
+/*********b版网站顶部***********/
+.logo{
+	width: 156px;
+	height: 55px;
+	margin-top: 5.5px;
+}
+.b-round-dot{
+	width: 6px;
+	height: 6px;
+	border-radius: 50%;
+	position: absolute;
+	display: block;
+	top: 0px;
+}
+.b-top{
+	height: 25px;
+	line-height: 25px;
+	padding-right: 50px;
+	background-color: #464645;
+	font-size: 12px;
+	font-family: "SimSun";
+}
+.b-top>div,.swordfish-content{
+	max-width: 1200px;
+	margin: auto;
+}
+.b-top li{
+	padding-left: 20px;
+}
+.b-top li a{
+	white-space: nowrap;
+}
+.b-top a{
+	color: #A0A0A0;
+}
+.b-top li>span{
+	margin-right: 5px;
+	background-color: #A0A0A0;
+	text-align: center;
+	padding: 3px 9px;
+	position: relative;
+}
+.b-top i{
+	position: absolute;
+	left: 0px;
+}
+.b-top i.fuwushichang{
+	left: 3px;
+	top: 3px;
+}
+.b-top i.qiyeshequ{
+	left: 4.5px;
+	top: 2px;
+}
+.b-top i.jianyu{
+	font-size: 16px;
+	left: 3px;
+	top: 1px;
+}
+.b-top i.weiguanwang1{
+	left: 4px;
+	top: 1px;
+	font-size: 14px
+}
+.b-top i.zhengcefagui{
+	left: 4.5px;
+	top: 2px;
+}
+.b-nav{
+	background-color: #FFFFFF;
+	border-top: 3px solid;
+}
+.b-nav>ul{
+	height: 66px;
+	line-height: 66px;
+	max-width: 1200px;
+	margin: auto;
+}
+.b-nav-logo{
+	padding-right: 40px;
+}
+.b-nav-link{
+	width: 120px;
+	text-align: center;
+}
+.b-nav-main a{
+	font-size: 18px;
+	color: #FFFFFF !important;
+	font-weight: bold;
+}
+.b-nav-s{
+	width: 1px;
+	height: 20px;
+	margin-top: 25px;
+	border-left: 1px solid #e5e6e9;
+	border-right: 1px solid #ffffff;
+	float: right;
+}
+.b-nav-other>a:hover,.b-nav-active>a{
+	font-weight: bold;
+}
+.b-head .headimg{
+	width: 40px;
+	height: 40px;
+	margin-right: 5px;
+}
+.b-head .b-loginStatus{
+	padding: 0px 15px;
+	position: relative;
+}
+.b-head .b-loginStatus:hover{
+	background-color: #F7F9FB;
+}
+.b-head .b-loginStatus:hover>a{
+	color: inherit !important;
+}
+.b-head .b-loginStatus>span{
+	position: relative;
+	display: inline-block;
+}
+.b-head .b-loginStatus>span .b-round-dot{
+	right: 5px;
+	width: 8px;
+	height: 8px;
+}
+.b-head .b-loginStatus>a{
+	display: inline-block;
+	position: relative;
+}
+.b-head .head-hideMenu{
+	display: none;
+	position: absolute;
+	width: 120px;
+	left: 50%;
+	margin-left: -60px;
+}
+.b-head .head-hideMenu ul{
+	background-color: #F7F9FB;
+	box-shadow: 0 5px 10px rgba(0,0,0,.2);
+	margin-top: 1px;
+	float: left;
+}
+.b-head .head-hideMenu li{
+	width: 100%;
+	border-bottom: 1px solid #EDEEEF;
+	line-height: 40px;
+	padding-left: 20px;
+	cursor: pointer;
+}
+.b-head .head-hideMenu li .b-round-dot{
+	right: -6px;
+}
+.b-head .head-hideMenu li>span{
+	position: relative;
+}
+.b-head .head-hideMenu i{
+	margin-right: 5px;
+}
+.b-head .head-hideMenu i.youjian{
+	font-size: 12px;
+}
+.b-head .head-hideMenu i.ren1{
+	margin-left: 2px;
+}
+.b-head .head-hideMenu i.ren1,.b-head .head-hideMenu i.tuichu{
+	font-size: 16px;
+	margin-right: 15px !important;
+}
+.b-head .head-hideMenu li:hover{
+	color: #fff;
+}
+.b-head .head-hideMenu li:hover>i{
+	color: #fff;
+}
+.b-head .head-hideMenu li:hover .b-round-dot{
+	background-color: #FFFFFF;
+}
+.b-head a{
+	text-decoration: none;
+}
 /*认证完第一次登录 end*/
 /*分辨率小于1200的时候调整布局，算上滚动条1217*/
 @media (max-width: 1217px) {

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

@@ -0,0 +1,539 @@
+/****indexhead*****/
+.b-nav{
+    border-top-color: #FF5A5F;
+}
+.index-new-head .loginStatus li a:hover {
+	background-color: #FF5A5F;
+	color: #fff !important;
+}
+.a-com-active{
+	background-color:#FF5A5F;
+}
+.index-new-head .loginstatus {
+    padding-right: 15px;
+}
+
+a:focus, a:hover{
+	color: #FF5A5F;
+}
+.index-new-nva .a-h-search{
+    width: 25%;
+	float:right;
+	padding-top:18px;
+}
+.index-new-nva .a-h-search span i {
+    position: absolute;
+    right: 10px;
+    top: 50%;
+    z-index: 10;
+    font-size: 14px;
+    margin-top: -7px;
+	color:#fff;
+}
+.index-new-nva .a-h-search span{
+    position: absolute;
+    right: 10px;    
+	border-radius: 50px;
+    top: 50%;
+    z-index: 20;
+    margin-top: -19px;
+	margin-right:-10px;
+    display: inline-block;
+	width:38px;
+	height:38px;
+	border:1px solid #FF5A5F;
+	background-color:#FF5A5F;
+}
+.index-new-nva .a-h-search .input-group {
+    width: 100%;
+    height: inherit;
+}
+.index-new-nva #header-searchInput{
+	border-radius: 50px;
+}
+.index-new-head .head-hideMenu li:hover {
+    background-color: #FF5A5F;
+}
+.index-new-head .head-hideMenu li:hover>i {
+    color: #fff;
+}
+.index-new-head .head-hideMenu i {
+    color: #FF5A5F;
+}
+.index-new-head .head-hideMenu i.ren1, .index-new-head .head-hideMenu i.tuichu {
+    font-size: 16px;
+    margin-right: 15px !important;
+}
+.index-new-head .head-hideMenu i.ren1 {
+    margin-left: 2px;
+}
+.index-new-head .loginStatus>span .round-dot {
+    right: 5px;
+    width: 8px;
+    height: 8px;
+}
+.index-new-head .round-dot {
+    background-color: #FF5A5F;
+    width: 6px;
+    height: 6px;
+    border-radius: 50%;
+    position: absolute;
+    display: block;
+    top: 0px;
+	padding:0px;
+	margin-right:2px;
+}
+.index-new-head .head-hideMenu li:hover .round-dot {
+    background-color: #FFFFFF;
+}
+.index-new-head .head-hideMenu li .round-dot {
+    right: 15px;
+	top:10px;
+}
+/*****index****/
+
+.a-index-head .a-i-h-right .a-index-want {
+	border:1px solid #E5E6E9;
+	margin-bottom: 10px;
+	background-color:#fff;
+}
+.index-new-row{
+	margin-top:20px;
+	border-bottom:3px solid #FF5A5F;
+	margin-bottom:0px;
+}
+.index-new-fwfl{
+    width: 200px;
+    text-align: center;
+    font-size: 18px;
+	margin-left:0px;
+	color:#fff;
+	font-weight:bold;
+}
+.index-new-row>ul{
+    height: 60px;
+    line-height: 60px;
+    max-width: 1200px;
+    margin: auto;
+}
+.index-new-row>ul>li img {
+	width:40px;
+	height:40px;
+	margin-left:10px;
+}
+.index-new-row>ul>li span {
+	margin-left:50px;
+	color:#FF5A5F;
+	font-size:18px;
+	font-weight:bold;
+	
+}
+.index-new-row>ul>li a {
+    font-family: '宋体 Regular', '宋体';
+    font-size: 12px;
+    color: #4E5051;
+	}
+	
+.index-new-row>ul>li a:hover{
+	color:#FF5A5F;
+    text-decoration: none;
+}
+.index-new-rmfw-title,.index-new-rmxq-title{
+	border:1px solid #f0f0f0;
+	margin-bottom:0px;
+	padding:10px 25px; 
+	border-bottom:0px;
+}
+.a-qysq,.index-new-wgw,.index-new-xwzx{
+	border:1px solid #f0f0f0; 
+	padding:10px;
+}
+.index-new-rmxq-list,.index-new-rmfw-list{
+	border:1px solid #E5E6E9;
+}
+.index-new-rmxq-list{
+	height:420px;
+}
+.index-new-fbfw-a{
+	padding:10;
+    font-size: 14px;
+    color: #666666;	
+}
+.index-new-rmfw-remark{
+	margin-top:-60px;
+}
+.index-new-rmfw-remark a{
+    font-size: 16px;
+    color: #FFFFFF;
+} 
+.index-new-rmfw-fgx{
+	border:1px solid #FF5A5F; 
+	margin-top:-70px;
+}
+.index-new-rmfw-name{
+	margin-top:-32px;
+}
+.index-new-rmxq-remark a{
+    font-weight: 700;
+    font-size: 16px;
+}
+.a-com-servcename{
+    font-family: '宋体 Regular', '宋体';
+    font-size: 12px;
+    color: #FF5A5F;
+	padding:5px 0px;
+}
+.index-new-rmxq-name{
+	margin-top:20px;
+	margin-bottom:30px;
+}
+.index-new-rmxq-name div,.index-new-rmxq-name a{
+    font-family: '宋体 Regular', '宋体';
+    font-size: 12px;
+    color: #A0A0A0;
+}
+.a-qysq .a-com-title span,.index-new-wgw .a-com-title span{
+	display:inline-block;
+	margin-top:10px;
+	margin-bottom:20px;
+}
+
+.a-index .a-qysq .a-com-title font a,.a-index .index-new-wgw .a-com-title font a,.a-index .index-new-xwzx .a-com-title font a{
+    font-weight: 700;
+    font-size: 24px;
+    color: #FF5A5F;
+}
+.index-new-qysq-con{
+	padding:10px 20px 50px 20px;
+}
+.a-index .a-qysq .index-new-qysq-con img {
+	border:0px;
+}
+.a-index .index-new-wgw-fgx{
+	margin-top:-20px;
+	margin-bottom:10px;
+}
+.index-new-wgwcon{
+	padding:0px 150px;
+}
+.a-index .index-new-wgw-remark a{
+    font-size: 14px;
+    color: #FFFFFF;
+}
+.a-index .index-new-wgw-remark{
+	margin-top:-40px;
+}
+.a-index .index-new-wgw-fgx2{
+	border:1px solid #FF5A5F;
+	margin-top:-55px;
+}
+.a-index .index-new-title{
+	padding:20px;
+}
+.a-index .index-new-first img{
+    width:100px;
+	height:92px;
+    display: table;
+    background-color: rgb(255, 255, 255);
+    text-align: center;	
+}
+.a-index  .index-new-xwzx-con{
+	padding:20px 30px;
+}
+.a-index  .index-new-xwzx-con ul{
+	width:350px;
+	border:0px;
+	background-color:#fff;
+}
+.a-index  .index-new-xwzx-con .index-new-first{
+	width:100px;
+	margin-right:8px;
+}
+.a-index  .index-new-xwzx-con .index-new-xwzx-title{
+	width:210px;
+    font-weight: 700;
+    font-size: 16px;
+	white-space:nowrap;
+	overflow:hidden;
+	text-overflow:ellipsis; 
+}
+.a-index  .index-new-xwzx-con .index-new-xwzx-date{
+	width:70px;
+    font-family: '宋体 Regular', '宋体';
+    font-size: 12px;
+    color: #A0A0A0;
+}
+.a-index  .index-new-xwzx-con .index-new-xwzx-content{
+	height:40px;
+	width:210px;
+    font-family: '宋体 Regular', '宋体';
+    font-size: 12px;
+    color: #A0A0A0;
+	overflow:hidden;
+	text-overflow:ellipsis;
+	line-height: 23px;
+}
+.a-index .a-index-head .index-new-left{
+	border-top:3px solid #FF5A5F;
+}
+.a-index .a-index-head{
+	margin-top:10px;
+}
+.a-index-head .index-new-left > div {
+	background-color:#fff;
+	color:#FF5A5F;
+	border-bottom:1px solid #E5E6E9;
+	border-left:1px solid #E5E6E9;
+	border-right:1px solid #E5E6E9;
+    font-weight: 700;
+    font-size: 16px;
+	padding-left:0px;
+}
+.a-index-head .index-new-left > ul > li {
+    font-size: 14px;
+    color: #4E5051;	
+	padding-left:10px;
+}
+
+.index-new-head .a-i-h-right .a-index-hd img{
+	width:292px;
+}
+.a-index .a-index-want .a-com-two {
+    margin: 20px 0px 40px;
+}
+.a-index-head  .a-new-hover {
+    background-color: #f0f0f0;
+    color: #000;
+}
+.a-index-head .a-i-h-left .index-new-zb{
+	float:right;
+	width:20px;
+	height:30px;
+}
+.a-index-head .a-i-h-right .a-com-title-line {
+	border-bottom:1px solid #f0f0f0;
+	width:293px;
+	margin-left:-10px;
+}
+.a-index-head .a-i-h-right .a-com-title {
+	background-color:#F7F8FA;
+	padding-left:10px;
+	border:1px solid rgb(240, 240, 240);
+}
+.index-new-body {
+	background-color:#f0f0f0;
+}
+.a-index-head .a-i-h-right, .a-rmfw,.a-rmxq,.a-qysq,.a-xwzx,.index-new-wgw{
+	background-color:#fff;
+}
+.index-new-rmxq-list .a-com-ul-block .a-com-last{
+	padding-left:0px;
+}
+.a-index .a-panel .index-new-rmfw-title font a,.a-index .a-panel .index-new-rmxq-title font a{
+	color:#000;
+}
+#one-levelClassify #index-new-qztb{
+	margin-top:-3px;
+}
+.a-index-head .a-i-h-right ul {
+	height:298px;
+	margin-bottom:20px;
+}
+.a-index .a-index-want .a-com-two {
+	margin:30px 5px 40px;
+}
+.a-index .a-qysq-con{
+	width:100%;
+	height:300px;
+	background-color:#E5E3E3;
+	margin-top:-20px;
+}
+.a-index .a-qysq-con ul{
+	padding:50px;
+}
+.a-index .a-qysq-con ul li{
+	width:25%;
+}
+.a-index .a-qysq-con ul li div{
+	margin-bottom:5px;
+}
+.a-index .a-qysq-con ul li img{
+	width:200px; 
+	height:114px;
+}
+.a-index .a-qysq-con .qysq-cpmp-title{
+	padding:10px 0px; 
+	font-size:18px;
+	font-weight:bold;
+}
+.a-index .a-qysq-con .qysq-entname{
+	font-size:14px;
+}
+.a-index a:hover{
+    text-decoration: none;
+}
+
+.a-index-head .a-i-h-middle > ul > li > a{
+	padding:13px 0px 13 25px;
+}
+.a-index-head .a-i-h-middle,.a-index-head .a-i-h-right{
+	height:439px;
+}
+.a-index .index-new-head{
+	margin-bottom:-10px;
+}
+.index-new-head .a-i-h-right{
+	margin-left:10px;
+	padding-left:0px;
+	width:293px;
+}
+.a-index .a-index-head .a-i-h-right {
+	padding-left:0px;
+	margin-left:10px;
+	background-color: #f0f0f0;
+}
+.a-index-head .a-i-h-middle .a-parent {
+    margin-bottom: 5px;
+    font-weight: bold;
+	background-color:#f0f0f0;
+	height:35px;
+	line-height:35px;
+	padding-left:25px;
+}
+.index-new-rmxq-listcon{
+	height:420px;
+    width:25%; 
+    float:left;
+}
+.index-new-rmfw-listcon{
+	height:270px;
+    width:25%; 
+    float:left;
+}
+.index-new-rmxq-listcon span{
+	width:250px; 
+	display:inline-block; 
+	margin-bottom:3px;
+}
+.index-new-rmxq-listimg,.index-new-wgw-listimg{
+	width:100%;
+	padding-top:25px;
+	padding-bottom:15px;
+}
+.index-new-rmxq-listtype a,.index-new-rmxq-listas a,.index-new-rmxq-name a,.index-new-rmxq-remark a{
+	float:left;
+}
+.index-new-rmxq-listas .a-com-last{
+	margin-left:-5px;
+}
+.index-new-rmfw-listcon .index-new-rmxq-listimg .index-new-spanqmfw{
+	display:inline-block;
+	width:250px; 
+	height:230px;
+	position:relative;
+}
+.index-new-wgw-listcon .index-new-wgw-listimg .index-new-spanqmfw{
+	display:inline-block;
+	width:250px; 
+	height:230px;
+	position:relative;
+}
+.index-new-rmfw-remarktitle{
+	position:absolute; 
+	z-index:4; 
+	top:174px; 
+	left:10px;
+}
+.index-new-rmfw-nameent{
+	position:absolute; 
+	z-index:4; 
+	top:184px; 
+	left:10px;
+    margin-top: 20px;
+    margin-bottom: 30px;
+}
+.index-new-wgw-nameent{
+	position:absolute; 
+	z-index:4; 
+	top:184px; 
+	left:10px;
+}
+.index-new-rmfw-nameent a {
+    font-family: '宋体 Regular', 宋体;
+    font-size: 12px;
+    color: rgb(160, 160, 160);
+}
+.index-new-rmfw-bg1,.index-new-wgw-bg1{
+	position:absolute; 
+	top:163px; 
+	left:-1px;
+}
+.index-new-rmfw-bg1 span,.index-new-wgw-bg1 span{
+	border-top:3px solid #FF5A5F;
+	display:inline-block;
+	width:250px; 
+	height:67px;
+	background-image:url(/images/u46.png);
+	background-repeat:no-repeat;
+	background-position:-1px -2px;
+	background-size: 252px 67px;
+}
+.index-new-rmfw-remarktitle{
+    font-size: 16px;
+    color: #FFFFFF;
+}
+.index-new-rmfw-remarktitle a,.index-new-rmfw-nameent  a{
+	color:#fff;
+}
+.index-new-wgw-listcon {
+    height: 270px;
+    width: 33%;
+    float: left;
+}
+.index-new-wgw-nameent a{
+    font-size: 14px;
+    color: #FFFFFF;
+}
+.a-index-head .index-new-left > ul {
+	background-color:#fff;
+	border-bottom:3px solid #FF5A5F;
+	border-left:1px solid #E5E6E9;
+	border-right:1px solid #E5E6E9;
+	padding-left: 0px;
+}
+.index-new-qysqlist{
+	width:25%; 
+	float:left;
+}
+.a-com-ul-block{
+	padding-bottom: 0px;
+}
+.a-com-ul-block>li{
+	margin-bottom: 0px;
+}
+.a-com-ul-block .index-new-xwzx-date,.a-com-ul-block .index-new-xwzx-content{
+	margin-top: 5px;
+}
+.index-new-rmxq-listimg img{
+	width:250px;
+	height:230px;
+}
+.b-round-dot{
+	background-color: rgb(255, 90, 95);
+}
+
+.a-index-head .a-i-h-left .index-new-zb {
+    width: 6px;
+    height: 10px;
+    margin-top: 10px;
+	margin-right:15px;
+}
+.a-index-head .a-i-h-middle > ul {
+	padding-left:0px;
+	border:1px solid #E5E6E9;
+	border-bottom:3px solid #FF5A5F;
+}
+.a-index-head .a-i-h-middle > ul > li {
+	background-color:#fff;
+	margin-bottom:0px;
+}

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

@@ -3,12 +3,10 @@
 }
 
 .fontdiv {
-	font-family: "微软雅黑";
 	font-size: 16px;
 }
 
 a.new_nva:link, a.new_nva:visited {
-	font-family: '微软雅黑';
 	font-size: 16px;
 	font-weight: normal;
 	color: #000;
@@ -16,7 +14,6 @@ a.new_nva:link, a.new_nva:visited {
 }
 
 a.new_nva:hover, a.new_nva:active {
-	font-family: '微软雅黑';
 	font-size: 16px;
 	font-weight: normal;
 	color: #DA512D;
@@ -148,7 +145,6 @@ a.new_red:hover, a.new_red:active {
 
 .qfw-header font {
 	vertical-align: middle;
-	font-family: '黑体', '微软雅黑';
 	font-weight: bold;
 	font-size: 30px;
 	color: #999;
@@ -218,6 +214,7 @@ a.new_red:hover, a.new_red:active {
 	width: 100%;
 	margin-bottom: 0px;
 	cursor: pointer;
+	margin-top: 5px;
 }
 /* 第三方登录图标 */
 .weixinLoginBtn, .qqLoginBtn {
@@ -438,7 +435,6 @@ a.new_red:hover, a.new_red:active {
 	text-align: left;
 	margin-top: 0px;
 	margin-bottom: 30px;
-	font-family: "微软雅黑 Regular", "微软雅黑";
 	font-weight: 400;
 	font-size: 24px;
 	background-color: #F7F7F7;
@@ -449,7 +445,6 @@ a.new_red:hover, a.new_red:active {
 }
 
 .invite-form-title font {
-	font-family: "微软雅黑 Bold", "微软雅黑";
 	font-weight: 700;
 	font-size: 22px;
 }
@@ -477,7 +472,6 @@ a.new_red:hover, a.new_red:active {
 }
 
 .fontb {
-	font-family: '黑体', '微软雅黑';
 	font-weight: bold;
 }
 

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

@@ -2,207 +2,34 @@
 body{
 	background-color: #F0F0F0;
 }
-.logo{
-	width: 156px;
-	height: 66px;
-}
 a:focus, a:hover{
-	color: #37C6DA !important;
+	color: #37C6DA;
 }
-.round-dot{
+.b-round-dot{
 	background-color: #37C6DA;
-	width: 6px;
-	height: 6px;
-	border-radius: 50%;
-	position: absolute;
-	display: block;
-	top: 0px;
 }
 /********剑鱼********/
-.swordfish-head{
-	box-shadow: 0px 2px 2px #F4F4F4;
-}
-.swordfish-head .swordfish-loginStatus{
-	padding: 0px 15px;
-	position: relative;
-}
-.swordfish-head .swordfish-loginStatus:hover{
-	background-color: #F7F9FB;
-}
-.swordfish-head .swordfish-loginStatus:hover>a{
-	color: inherit !important;
-}
-.swordfish-head .swordfish-loginStatus>span{
-	position: relative;
-	display: inline-block;
-}
-.swordfish-head .swordfish-loginStatus>span .round-dot{
-	right: 5px;
-	width: 8px;
-	height: 8px;
-}
-.swordfish-head .swordfish-loginStatus>a{
-	display: inline-block;
-	position: relative;
-}
-.swordfish-head .head-hideMenu{
-	display: none;
-	position: absolute;
-	width: 120px;
-	left: 50%;
-	margin-left: -60px;
-}
-.swordfish-head .head-hideMenu ul{
-	background-color: #F7F9FB;
-	box-shadow: 0 5px 10px rgba(0,0,0,.2);
-	margin-top: 1px;
-	float: left;
-}
-.swordfish-head .head-hideMenu li{
-	width: 100%;
-	border-bottom: 1px solid #EDEEEF;
-	line-height: 40px;
-	padding-left: 20px;
-	cursor: pointer;
-}
-.swordfish-head .head-hideMenu li .round-dot{
-	right: -6px;
-}
-.swordfish-head .head-hideMenu li>span{
-	position: relative;
-}
-.swordfish-head .head-hideMenu i{
-	color: #37C6DA;
-	margin-right: 5px;
-}
-.swordfish-head .head-hideMenu i.youjian{
-	font-size: 12px;
+.b-head .b-top li:hover>i{
+	background-color: #37C6DA !important;
 }
-.swordfish-head .head-hideMenu i.ren1{
-	margin-left: 2px;
+.b-head .b-com-second{
+	background-color: #35C5DA !important;
 }
-.swordfish-head .head-hideMenu i.ren1,.swordfish-head .head-hideMenu i.tuichu{
-	font-size: 16px;
-	margin-right: 15px !important;
+.b-nav{
+	border-top-color: #37C6DA;
 }
-.swordfish-head .head-hideMenu li:hover{
+.b-nav-main{
 	background-color: #37C6DA;
-	color: #fff;
-}
-.swordfish-head .head-hideMenu li:hover>i{
-	color: #fff;
-}
-.swordfish-head .head-hideMenu li:hover .round-dot{
-	background-color: #FFFFFF;
-}
-.swordfish-head a{
-	text-decoration: none;
-}
-.swordfish-top{
-	height: 25px;
-	line-height: 25px;
-	padding-right: 50px;
-	background-color: #464645;
-	font-size: 12px;
-	font-family: "SimSun";
 }
-.swordfish-top>div,.swordfish-content{
-	max-width: 1200px;
-	margin: auto;
-}
-.swordfish-top li{
-	padding-left: 20px;
-}
-.swordfish-top li:hover>a{
+.b-nav-other>a:hover,.b-nav-active>a{
 	color: #37C6DA !important;
 }
-.swordfish-top li:hover>i{
-	background-color: #37C6DA !important;
-}
-.swordfish-top a{
-	color: #A0A0A0;
-}
-.swordfish-top li>span{
-	margin-right: 5px;
-	background-color: #A0A0A0;
-	text-align: center;
-	padding: 3px 9px;
-	position: relative;
-}
-.swordfish-top i{
-	position: absolute;
-	left: 0px;
-}
-.swordfish-top i.fuwushichang{
-	left: 3px;
-	top: 3px;
-}
-.swordfish-top i.qiyeshequ{
-	left: 4.5px;
-	top: 2px;
-}
-.swordfish-top i.jianyu{
-	font-size: 16px;
-	left: 3px;
-	top: 1px;
-}
-.swordfish-top i.weiguanwang1{
-	left: 4px;
-	top: 1px;
-	font-size: 14px
-}
-.swordfish-top i.zhengcefagui{
-	left: 4.5px;
-	top: 2px;
-}
-.swordfish-i-a{
-	background-color: #37C6DA !important;
-}
-.swordfish-nva{
-	border-top: 3px solid #37C6DA;
-	background-color: #FFFFFF;
-}
-.swordfish-nva>ul{
-	height: 66px;
-	line-height: 66px;
-	max-width: 1200px;
-	margin: auto;
-}
-.swordfish-nva-l{
-	padding-right: 20px;
-}
-.swordfish-nva-c{
-	width: 100px;
-	text-align: center;
-}
-.swordfish-nva-s{
-	width: 1px;
-	height: 20px;
-	margin-top: 25px;
-	border-left: 1px solid #e5e6e9;
-	border-right: 1px solid #ffffff;
-	float: right;
+.b-head .head-hideMenu i{
+	color: #37C6DA;
 }
-.swordfish-nva-main{
+.b-head .head-hideMenu li:hover{
 	background-color: #37C6DA;
 }
-.swordfish-nva-main a{
-	font-size: 18px;
-	color: #FFFFFF !important;
-	font-weight: bold;
-}
-.swordfish-nva-rssset,.swordfish-nva-infolist{
-	font-family: "SimSun";
-}
-.swordfish-nva-rssset a:hover,.swordfish-nva-infolist a:hover,.swordfish-nva-active a{
-	font-weight: bold;
-	color: #37C6DA !important;
-}
-.swordfish-head .headimg{
-	width: 40px;
-	height: 40px;
-	margin-right: 5px;
-}
 .swordfish-content{
 	padding: 15px 0px 15px 0px;
 }
@@ -317,7 +144,6 @@ a:focus, a:hover{
 }
 .swordfish-panel-c-t>div{
 	display: inline-block;
-	cursor: pointer;
 }
 .swordfish-panel-c-t>div>span{
 	font-family: "SimSun";
@@ -349,12 +175,10 @@ a:focus, a:hover{
 	border-radius: 0px;
 	border-color: #e5e6e9;
 	box-shadow: none;
-	font-family: "SimSun";
 }
 .swordfish-keywords lable{
 	display: inline-block;
 	width: 70px;
-	font-family: "SimSun";
 }
 .swordfish-keywords img{
 	width: 20px;

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

@@ -444,7 +444,7 @@ function advertAjaxRqe(position){
 			data += "&serviceId="+id;
 		}
 	});
-	$("#hotDemand ul").each(function(){
+	$("#hotDemand>div").each(function(){
 		var id = $(this).attr("data-id");
 		if(id != ""){
 			data += "&demandId="+id;
@@ -467,16 +467,16 @@ function advertAjaxRqe(position){
 					var status = demand[i].status;
 					var html = null;
 					if(status == 1){
-						html = '<span class="a-bg-blue">等待选标</span>';
+						html = '<img src="/images/u385.png"/>';
 					}else if(status == 2){
-						html = '<span class="a-bg-red">圆满结束</span>';
+						html = '<img src="/images/u347.png"/>';
 					}else if(status == 3){
 						html = '<span class="a-bg-gray">任务超时</span>';
 					}else if(status == 4){
 						html = '<span class="a-bg-gray">已撤销</span>';
 					}
 					if(html != null){
-						$('#hotDemand [data-id="'+demand[i].id+'"]>.a-com-last').html(html);
+						$('#hotDemand [data-id="'+demand[i].id+'"] .a-com-last').html(html);
 					}
 					if(demand[i].online == "y"){
 						$('#hotDemand [data-id="'+demand[i].id+'"]>.a-com-name>i').addClass("text-primary");
@@ -517,4 +517,68 @@ function afterAutheFirstLogin(result){
 	}
 	$("#fristAutheLoginModal .com-releaseService a").attr("href","/member/yellowpage/show/showService/"+entId);
 	$("#fristAutheLoginModal").modal('show');
+}
+//
+function b_loadTop(){
+	$.ajax({
+	  	type: "POST",
+	  	url: "/front/getWebSiteTop",
+	 	dataType: "json",
+		async: false,
+	  	success: function(result){
+			topLoadOver = true;
+			if(result.status == "y"){
+				isLogined = true;
+				var msgCount = result.msgCount;
+				var hasMsgCount = msgCount > 0;
+				msgCount = msgCount>999?'...':msgCount;
+				var avatar = null;
+				if(avatar != ""){
+					avatar = result.avatar;
+				}
+				var html = '<span><img class="img-circle headimg" src="'+avatar+'" onerror="this.src=\'/images/swordfish/headimg.png\'">';
+				if(hasMsgCount){
+					html += '<a class="b-round-dot"></a>';
+				}
+				html += '</span><a href="/member/show/memberindex">'+result.nickName+'</a>';
+				html += '<div id="head-hideMenu" class="head-hideMenu"><ul>'
+					    	+'<li onclick="window.location.href=\'/member/msgcenter\'"><i class="glyphicon youjian"></i><span>消息中心';
+				if(hasMsgCount){
+					html += '<a class="b-round-dot"></a>';
+				}
+				html += '</span></li>'
+						+'<li onclick="window.location.href=\'/member/show/memberindex\'"><i class="glyphicon ren1">&nbsp;</i>用户中心</li>'
+						+'<li onclick="window.location.href=\'/front/logout\'" class="border-b-0"><i class="glyphicon tuichu">&nbsp;</i>退出</li>';
+						+'</ul></div>';
+				$("#b-loginStatus").html(html)
+				.mouseover(function(){
+					$("#head-hideMenu").show();
+				}).mouseleave(function(){
+					//$("#head-hideMenu").hide();
+				});
+				$("#head-hideMenu").mouseover(function(){
+					$(this).show();
+				}).mouseleave(function(){
+					//$(this).hide();
+				});
+				//处理公用底部扫码登录按钮
+				$("#bottom-bar>li:first").addClass("invisible");
+				//处理认证完之后第一次登录弹出提示框
+				if(result.auditType == "y"){
+					afterAutheFirstLogin(result);
+				}
+			}else{
+				isLogined = false;
+				var html = '<a onclick="loginModalShow();">登录/注册</a>';
+				$("#b-loginStatus").html(html);
+				$("#bottom-bar>li").removeClass("invisible");
+			}
+			try{
+				b_loadTopCallBack(result);
+			}catch(e){}
+		},
+		error: function(e){
+			topLoadOver = true;
+		}
+	});
 }

core/src/web/staticres/microwebsite/mobile/css/style.css

@@ -1,6 +1,6 @@
 /* 公共css start */
 body{
-	font-family: "微软雅黑",Microsoft YaHei, Tahoma, Helvetica, Arial, sans-serif;
+	font-family: tahoma, arial, 'Hiragino Sans GB', 'Microsoft YaHei', 宋体, sans-serif;
 	-webkit-tap-highlight-color:rgba(255,0,0,0);
 	margin: 0px;
 	background-image: url("/microwebsite/images/bg.png");

core/src/web/staticres/microwebsite/mobile/js/edit.js

@@ -217,17 +217,30 @@ function kindEditInit(node,obj){
 		allowImageRemoteImageRemote:false,
 		uploadJson : '/filemanage/upload?resize=800',
 		afterCreate:function() {
-			this.sync()
+			this.sync();
+			if(this.html() == ""){
+				this.html('<span style="color:#999;font-size:16px;">'+(node=="#synopsis"?"企业介绍":"产品服务描述")+'</span>');
+			}
 		},
 		beforesubmit:function(){
 			this.sync()
 		},
 		afterBlur: function(){
-			this.sync()
+			this.sync();
+			if(this.html() == ""){
+				this.html('<span style="color:#999;font-size:16px;">'+(node=="#synopsis"?"企业介绍":"产品服务描述")+'</span>');
+			}
+		},
+		afterFocus: function(){
+			if(this.html() == '<span style="color:#999;font-size:16px;">'+(node=="#synopsis"?"企业介绍":"产品服务描述")+'</span>'){
+				this.html("");
+				
+			}
+			this.sync();
 		}
 	});
 	$(".ke-toolbar,.ke-statusbar").remove();
-	$(obj).contents().find("head style").append(".ke-content{color: #FFFFFF;font-size: 14px;font-weight:bold;}");
+	$(obj).contents().find("head style").append(".ke-content{padding-left: 10px;color: #FFFFFF;font-size: 14px;font-weight:bold;}");
 }
 //
 $(function (){
@@ -359,5 +372,6 @@ $(function (){
 	initEntForm();
 	//将原有的服务信息保存下来，用于比较信息有没有修改，如果修改了才发起请求修改数据库
 	initServiceForm();
-	kindEditInit("#synopsis,.service-desc",".ke-edit-iframe");
+	kindEditInit("#synopsis",".ke-edit-iframe");
+	kindEditInit(".service-desc",".ke-edit-iframe");
 });