剑鱼修改

core/src/qfw/front/index.go

@@ -83,6 +83,10 @@ func (i *Index) GetWebSiteTop() error {
 		if userId := i.GetSession("userId"); userId != nil {
 			result["msgCount"] = msg.GetMsgCount(userId.(string))
 		}
+		userInfo := i.GetSession("userInfo").(*map[string]interface{})
+		if avatar := (*userInfo)["s_avatar"]; avatar != nil {
+			result["avatar"] = avatar.(string)
+		}
 		if audittype := i.GetSession("audittype"); audittype != nil && audittype == "y" {
 			i.DelSession("audittype")
 			result["auditType"] = audittype.(string)

core/src/qfw/member/message/message.go

@@ -10,5 +10,4 @@ import (
 
 func init() {
 	xweb.AddAction(&message{})
-	xweb.AddAction(&swordfish{})
 }

core/src/qfw/member/message/messagedetail.go

@@ -14,118 +14,22 @@ import (
 	"qfw/util"
 	"qfw/util/mongodb"
 	"qfw/util/msg"
-	"runtime"
 	"strings"
 	"time"
 )
 
 type message struct {
 	*xweb.Action
-	//memberIndexMsg xweb.Mapper `xweb:"/member/memberindexmsg"` //会员中心首页
 	msgCenter      xweb.Mapper `xweb:"/member/msgcenter"`      //消息中心
 	getMsgList     xweb.Mapper `xweb:"/member/getmsglist"`     //ajax获取消息列表
 	msgSet         xweb.Mapper `xweb:"/member/msgset"`         //消息设置
 	getMsgById     xweb.Mapper `xweb:"/member/getmsgbyid"`     //获取消息内容
 	msgDel         xweb.Mapper `xweb:"/member/msgdel"`         //删除消息
 	msgFlag        xweb.Mapper `xweb:"/member/msgflag"`        //标记消息
-	swordfish      xweb.Mapper `xweb:"/member/swordfish"`      //剑鱼
-	ajaxReq        xweb.Mapper `xweb:"/member/rssset/ajaxReq"` //订阅消息设置
-	rssSet         xweb.Mapper `xweb:"/member/rssset"`         //订阅消息设置
-	infolist       xweb.Mapper `xweb:"/member/infolist"`       //剑鱼
 	getCahtContent xweb.Mapper `xweb:"/member/getchatcontent"` //获取聊天内部数组内容
 	goCahtContent  xweb.Mapper `xweb:"/member/gochatcontent"`  //已登陆客户发送离线消息
 }
 
-//跳转到用户中心剑鱼首页
-func (m *message) Swordfish() error {
-	r := mongodb.Find("wxpush", `{"s_uid":"`+m.GetSession("userId").(string)+`"}`, `{"l_date":-1}`, `{"s_content":1,"a_publishtime":1,"a_visitedindex":1}`, false, 0, 1)
-	if r != nil && len(*r) == 1 {
-		(*r)[0]["_id"] = strings.Split(fmt.Sprintf("%s", (*r)[0]["_id"]), `"`)[1]
-		m.T["data"] = (*r)[0]
-	}
-	return m.Render("/member/message/swordfish.html", &m.T)
-}
-
-//跳转到订阅设置页面
-func (m *message) RssSet() error {
-	defer func() {
-		if r := recover(); r != nil {
-			log.Println("[E]", r)
-			for skip := 0; ; skip++ {
-				_, file, line, ok := runtime.Caller(skip)
-				if !ok {
-					break
-				}
-				go log.Printf("%v,%v\n", file, line)
-			}
-		}
-	}()
-	userId := m.Session().Get("userId")
-	if userId != nil {
-		u := mongodb.FindById("user", userId.(string), `{"o_msgset":1}`)
-		m.T["msgset"] = (*u)["o_msgset"]
-	}
-	//u := m.Session().Get("userInfo")
-	//userInfo := u.(*map[string]interface{})
-	/*entid := m.GetSession("entid")
-	if entid != nil {
-		local := mongodb.FindById("enterprise", entid.(string), `{"_id":0,"OpLocDistrict":1,"i_province":1}`)
-		if local != nil {
-			localids := (*local)["OpLocDistrict"]
-			i_province := (*local)["i_province"]
-			if localids != nil {
-				localid := localids.(string)
-				localid = localid[:2]
-				m.T["scode"] = localid
-				m.T["sname"] = consts.SRcode[localid]
-			} else if i_province != nil {
-				area := fmt.Sprintf("%d", i_province)
-				if len(area) > 1 {
-					area = area[:2]
-					m.T["scode"] = area
-					m.T["sname"] = consts.SRcode[area]
-				}
-			}
-		}
-
-	}*/
-	return m.Render("/member/message/rssset.html", &m.T)
-}
-func (m *message) AjaxReq() error {
-	var flag = "n"
-	msgset := make(map[string]interface{})
-	//投标公告
-	if tender_flag, _ := m.GetBool("tender_flag"); tender_flag {
-		tender := make(map[string]interface{})
-		tender["a_key"] = m.GetSlice("tender_keys")
-		tender["s_scope"] = m.GetString("tender_scope")
-		msgset["tender"] = tender
-	}
-	//中标公告
-	if bid_flag, _ := m.GetBool("bid_flag"); bid_flag {
-		bid := make(map[string]interface{})
-		bid["a_key"] = m.GetSlice("bid_keys")
-		bid["s_scope"] = m.GetString("bid_scope")
-		msgset["bid"] = bid
-	}
-	//更新数据库
-	msgset["l_modifydate"] = time.Now().Unix()
-	if mongodb.Update("user", `{"_id":"`+m.GetSession("userId").(string)+`"}`, &map[string]interface{}{"$set": map[string]interface{}{"o_msgset": msgset}}, false, false) {
-		flag = "y"
-	}
-	m.ServeJson(map[string]interface{}{
-		"flag": flag,
-	})
-	return nil
-}
-
-//跳转到用户中心剑鱼信息列表
-func (m *message) Infolist() error {
-	ms := mongodb.FindById("user", m.GetSession("userId").(string), `{"o_msgset:1"}`)
-	m.T["msgset"] = ms
-	return m.Render("/member/message/infolist.html", &m.T)
-}
-
 //删除消息
 func (m *message) MsgDel() error {
 	ids := m.GetString("ids")

core/src/qfw/swordfish/swordfish.go

@@ -9,7 +9,13 @@ import (
 
 type SwordFish struct {
 	*xweb.Action
-	showSwordFish xweb.Mapper `xweb:"/show/swordfish/fish"` //剑鱼展示页
+	swordfish     xweb.Mapper `xweb:"/front/swordfish"`                 //剑鱼
+	ajaxReq       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"`  //剑鱼列表
+	setVisited    xweb.Mapper `xweb:"/member/swordfish/setVisited"`     //已经访问过的列表
+	visitRedirect xweb.Mapper `xweb:"/visit/redirect"`                  //剑鱼跳转访问请求，后续统计
 }
 
 func init() {

core/src/qfw/swordfish/swordfishService.go

@@ -1,23 +0,0 @@
-package swordfish
-
-import (
-	"net/http"
-	util "qfw/util"
-)
-
-//企业列表
-func (sf *SwordFish) ShowSwordFish() error {
-	//必须是登录之后的已认证用户才可以进入企业社区
-	if sf.GetSession("userId") != nil {
-		utype := util.IntAll(sf.GetSession("userType"))
-		if utype == 0 {
-			return sf.Redirect("/manage/system", http.StatusFound)
-		} else {
-			return sf.Redirect("/member/swordfish", http.StatusFound)
-		}
-	} else {
-		//必须是注册登录之后的用户才可以进入剑鱼页面
-		return sf.Render("/swordfish/swordfish.html")
-	}
-
-}

core/src/qfw/swordfish/swordfishmanage.go

@@ -0,0 +1,141 @@
+package swordfish
+
+import (
+	"gopkg.in/mgo.v2/bson"
+	"qfw/util/mongodb"
+	"qfw/util/redis"
+	"time"
+)
+
+//跳转到用户中心剑鱼首页
+func (s *SwordFish) Swordfish() error {
+	if ret := redis.Get("other", "swordfish"); ret != nil && false {
+		return s.SetBody([]byte(ret.(string)))
+	} else {
+		now := time.Now()
+		unix := time.Date(now.Year(), now.Month(), now.Day(), now.Hour()-2, now.Minute(), now.Second(), now.Nanosecond(), time.Local).Unix()
+		r := mongodb.Find("bidding_back", bson.M{"comeintime": bson.M{"$lte": unix}}, `{"comeintime":-1}`, `{"title":1,"href":1,"publishtime":1}`, false, 0, 5)
+		if r != nil {
+			s.T["data"] = r
+		}
+		content, _ := s.Render4Cache("/swordfish/index.html", &s.T)
+		redis.Put("other", "swordfish", string(content), 30*60*1000) //缓存半个小时
+		return s.SetBody(content)
+	}
+}
+
+//跳转到订阅设置页面
+func (s *SwordFish) RssSet() error {
+	u := mongodb.FindById("user", s.GetSession("userId").(string), `{"o_msgset":1}`)
+	s.T["msgset"] = (*u)["o_msgset"]
+	return s.Render("/swordfish/rssset.html", &s.T)
+}
+func (s *SwordFish) AjaxReq() error {
+	var flag = "n"
+	msgset := make(map[string]interface{})
+	//投标公告
+	if tender_flag, _ := s.GetBool("tender_flag"); tender_flag {
+		tender := make(map[string]interface{})
+		tender["a_key"] = s.GetSlice("tender_keys")
+		tender["s_scope"] = s.GetString("tender_scope")
+		msgset["tender"] = tender
+	}
+	//中标公告
+	if bid_flag, _ := s.GetBool("bid_flag"); bid_flag {
+		bid := make(map[string]interface{})
+		bid["a_key"] = s.GetSlice("bid_keys")
+		bid["s_scope"] = s.GetString("bid_scope")
+		msgset["bid"] = bid
+	}
+	//更新数据库
+	msgset["l_modifydate"] = time.Now().Unix()
+	if mongodb.Update("user", `{"_id":"`+s.GetSession("userId").(string)+`"}`, &map[string]interface{}{"$set": map[string]interface{}{"o_msgset": msgset}}, false, false) {
+		flag = "y"
+	}
+	s.ServeJson(map[string]interface{}{
+		"flag": flag,
+	})
+	return nil
+}
+
+//跳转到用户中心剑鱼信息列表
+func (s *SwordFish) Infolist() error {
+	ms := mongodb.FindById("user", s.GetSession("userId").(string), `{"o_msgset:1"}`)
+	s.T["msgset"] = ms
+	return s.Render("/swordfish/infolist.html", &s.T)
+}
+func (s *SwordFish) SetVisited() {
+	sid := s.GetSession("userId").(string)
+	index, _ := s.GetInt("index")
+	_id := s.GetString("_id")
+	if sid != "" {
+		mongodb.Update("wxpush", `{"_id":"`+_id+`"}`, map[string]interface{}{
+			"$push": map[string]interface{}{"a_visitedindex": index},
+		}, false, false)
+	}
+}
+
+//取个人的剑鱼列表,返回时间和数组，数组中的每条是一个大数据包含多条,编号要重新编号,每条数据有count值
+func (s *SwordFish) Swordfishlist() error {
+	lasttime, _ := s.GetInt("lasttime")
+	sid := s.GetSession("userId").(string) //"56177ce036b82b0f04000001"
+	res := map[string]interface{}{}
+	res["success"] = false
+	if lasttime > 0 {
+		if lasttime == 1 {
+			lasttime = time.Now().Local().Unix()
+		}
+		thistime, list := getSwordFish(lasttime, sid, nil, 0)
+		if list != nil && len(*list) > 0 {
+			res["success"] = true
+			res["data"] = &list
+			res["thistime"] = thistime
+		}
+	}
+	s.ServeJson(&res)
+	return nil
+}
+
+//内部调用方法，取剑鱼消息列表，数量小于20继续取数
+func getSwordFish(lasttime int64, sid string, res []map[string]interface{}, count int) (thistime int64, list *[]map[string]interface{}) {
+	thistime = lasttime
+	if res == nil {
+		res = make([]map[string]interface{}, 0)
+	}
+	list = &res
+	tmps := mongodb.Find("wxpush", &map[string]interface{}{
+		"s_uid": sid,
+		"a_publishtime": map[string]interface{}{
+			"$exists": true,
+		},
+		"l_date": map[string]interface{}{
+			"$lt": lasttime,
+		},
+	}, `{"l_date":-1}`, nil, false, 0, 1)
+	if (*tmps) != nil && len(*tmps) == 1 && (*tmps)[0] != nil {
+		tmp := (*tmps)[0]
+		at := tmp["a_publishtime"]
+		if at != nil {
+			ats := at.(map[string]interface{})
+			thistime = tmp["l_date"].(int64)
+			count += len(ats)
+			tmp["count"] = len(ats)
+			res = append(res, tmp)
+			list = &res
+			if count >= 1 {
+				return
+			}
+		} else {
+			return
+		}
+	} else {
+		return
+	}
+	return getSwordFish(thistime, sid, res, count)
+}
+func (s *SwordFish) VisitRedirect() {
+	surl := s.GetString("url")
+	if surl != "" {
+		s.Redirect(surl)
+	}
+}

core/src/qfw/yellowpage/yellowpagemanager.go

@@ -181,7 +181,7 @@ func selectById(id string) *map[string]interface{} {
 
 //查找指定id的企业关系,并加入到结果集中,
 //递归查找关系
-func findRelation(certype, cerno, rtype string, level int, ls *list.List, sess *mgo.Session, querycache *list.List) {
+func findRelation(certype, cerno, name, rtype string, level int, ls *list.List, sess *mgo.Session, querycache *list.List) {
 	if level >= cf.SysConfig.Entrelation.Level {
 		return
 	}
@@ -198,32 +198,44 @@ func findRelation(certype, cerno, rtype string, level int, ls *list.List, sess *
 			invtype, _ := (*data)["invtype"].(string)
 			invcertype, _ := (*data)["invcertype"].(string)
 			invcerno, _ := (*data)["invcerno"].(string)
+			var invname string
+			if (*data)["invname"] != nil {
+				invname = (*data)["invname"].(string)
+			}
 			storeNode(data, ls, true, level)
-			findRelation(invcertype, invcerno, invtype, level+1, ls, sess, querycache)
+			findRelation(invcertype, invcerno, invname, invtype, level+1, ls, sess, querycache)
 		}
 		//查找我投资的公司
-		querykey2 := "invtype:e,invcerno:" + cerno
+		querykey2 := "invtype:e,invcerno:" + cerno + ",invname:" + name
 		if isContainInQueryCache(querykey2, querycache) {
 			return
 		}
-		iter = sess.DB("qfw").C("entrelation").Find(M{"invtype": "e", "invcerno": cerno}).Limit(cf.SysConfig.Entrelation.Limit).Iter()
+		iter = sess.DB("qfw").C("entrelation").Find(M{"invtype": "e", "invcerno": cerno, "invname": name}).Limit(cf.SysConfig.Entrelation.Limit).Iter()
 		for iter.Next(data) {
 			entregno, _ := (*data)["entregno"].(string)
 			storeNode(data, ls, false, level)
-			findRelation("", entregno, "e", level+1, ls, sess, querycache)
+			var entname string
+			if (*data)["entname"] != nil {
+				entname = (*data)["entname"].(string)
+			}
+			findRelation("", entregno, entname, "e", level+1, ls, sess, querycache)
 		}
 	} else {
 		//找出我投资的公司
-		querykey := "invcertype:" + certype + ",invcerno:" + cerno
+		querykey := "invcertype:" + certype + ",invcerno:" + cerno + ",invname:" + name
 		if isContainInQueryCache(querykey, querycache) {
 			return
 		}
-		iter := sess.DB("qfw").C("entrelation").Find(M{"invcertype": certype, "invcerno": cerno}).Limit(cf.SysConfig.Entrelation.Limit).Iter()
+		iter := sess.DB("qfw").C("entrelation").Find(M{"invcertype": certype, "invcerno": cerno, "invname": name}).Limit(cf.SysConfig.Entrelation.Limit).Iter()
 		data := new(map[string]interface{})
 		for iter.Next(data) {
 			entregno, _ := (*data)["entregno"].(string)
+			var entname string
+			if (*data)["entname"] != nil {
+				entname = (*data)["entname"].(string)
+			}
 			storeNode(data, ls, false, level)
-			findRelation("", entregno, "e", level+1, ls, sess, querycache)
+			findRelation("", entregno, entname, "e", level+1, ls, sess, querycache)
 		}
 	}
 }
@@ -283,7 +295,7 @@ func makeRelation(mnregno, mnname string) interface{} {
 
 	ls := list.New()
 	querycache := list.New()
-	findRelation("", mnregno, "e", 0, ls, sess, querycache)
+	findRelation("", mnregno, mnname, "e", 0, ls, sess, querycache)
 
 	node := map[string]interface{}{}
 	//加主节点

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

@@ -439,12 +439,16 @@ a{
 	color: #dd4814;
 }
 
-.a-header .a-loginStatus{
+.a-header .loginStatus{
 	width: 15%;
 	font-size: 14px;
 }
 
-.a-header .a-loginStatus>a {
+.loginStatus{
+	position: relative;
+}
+
+.loginStatus>a {
 	text-overflow: ellipsis;
 	overflow: hidden;
 	white-space: nowrap;
@@ -453,50 +457,50 @@ a{
 	margin-left: 5px;
 }
 
-.a-loginStatus .badge {
+.loginStatus .badge {
 	background-color: #dd4814;
 	margin-left: 10px;
 	font-weight: normal;
 }
 
-.a-header .a-loginStatus>.badge {
+.loginStatus>.badge {
 	position: absolute;
   	right: 15px;
   	top: 15px;
 }
 
-.a-header .a-loginStatus li {
+.loginStatus li {
 	width: 100%;
 }
 
-.a-header .a-loginStatus .popover-content {
+.loginStatus .popover-content {
 	padding: 0px;
 }
 
-.a-header .a-loginStatus li a {
+.loginStatus li a {
 	display: block;
 	padding: 5px 20px;
 	color: #333;
 	white-space: nowrap;
 }
 
-.a-header .a-loginStatus .popover {
+.loginStatus .popover {
 	padding: 0px;
 }
 
-.a-header .a-loginStatus li a:hover {
+.loginStatus li a:hover {
 	background-color: #dd4814;
 	text-decoration: none;
 	color: #fff;
 }
 
-.a-header .a-loginStatus .dropdown-menu {
+.loginStatus .dropdown-menu {
 	min-width: 100px;
 	left: -90px;
 	top: 15px;
 }
 
-.a-header .a-loginStatus .dropdown-menu>li>a {
+.loginStatus .dropdown-menu>li>a {
 	padding-right: 10px;
 	padding-left: 10px;
 }

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

@@ -13,6 +13,16 @@ a:focus, a:hover{
 .swordfish-head{
 	box-shadow: 0px 2px 2px #F4F4F4;
 }
+.swordfish-head .loginStatus{
+	padding-right: 15px;
+}
+.swordfish-head .loginStatus>.badge{
+	right: 21px;
+}
+.swordfish-head .loginStatus li a:hover {
+	background-color: #37C6DA;
+	color: #fff !important;
+}
 .swordfish-head a{
 	text-decoration: none;
 }
@@ -29,6 +39,12 @@ a:focus, a:hover{
 .swordfish-top li{
 	padding-left: 20px;
 }
+.swordfish-top li:hover>a{
+	color: #37C6DA !important;
+}
+.swordfish-top li:hover>i{
+	background-color: #37C6DA !important;
+}
 .swordfish-top a{
 	color: #A0A0A0;
 }
@@ -92,7 +108,6 @@ a:focus, a:hover{
 	height: 0px;
 }
 .swordfish-head .headimg{
-	margin-right: 10px;
 	width: 40px;
 	height: 40px;
 }
@@ -149,6 +164,7 @@ a:focus, a:hover{
 	background-color: #FCF8E3;
 	padding: 10px 30px;
 	border: 1px solid #F5DC99;
+	text-indent: 2em;
 }
 .swordfish-explain span{
 	color: #A0A0A0;
@@ -186,7 +202,7 @@ a:focus, a:hover{
 	padding: 0px 15px;
 }
 .swordfish-panel-c>div{
-	padding: 15px 0px;
+	padding: 15px 0px 15px 20px;
 	border-bottom: 1px solid #ddd;
 }
 .swordfish-panel-c-t{
@@ -232,13 +248,17 @@ a:focus, a:hover{
 	display: inline-block;
 	margin: 0px 10px;
 }
+.swordfish-keywords b{
+	display: inline-block;
+	width: 70px;
+}
 .swordfish-keywords img{
 	width: 20px;
 	height: 20px;
 	cursor: pointer;
 }
 .swordfish-keywords button{
-	margin-left: 75px;
+	margin-left: 80px;
 }
 .swordfish-scope-dialog li{
 	width: 100%;
@@ -263,6 +283,10 @@ a:focus, a:hover{
 	padding-left: 20px;
 	padding-top: 20px;
 }
+.swordfish-scope{
+	cursor: pointer;
+	display: inline-block;
+}
 .swordfish-panel-c-c .btn{
 	margin-right: 20px;
 	margin-bottom: 20px;

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

@@ -486,11 +486,35 @@ function advertAjaxRqe(position){
 		});
 	}
 }
-//
-function open_window(link){
-	if(!/^http/.test(link)){
-		link="http://"+link
+//认证完之后首次登录
+function afterAutheFirstLogin(result){
+	var identType = result.identType;
+	var entId = result.entId;
+	if(identType == 2){//个人认证
+		$("body").append('{{include "/common/ploginmodal.html"}}');
+		$("#fristAutheLoginModal .com-nickName").text(result.nickName);
+		$("#fristAutheLoginModal .com-entName").text(result.entName+"店铺");
+		$("#fristAutheLoginModal .com-entCard a").attr("href","/member/yellowpage/edit/enterprise/"+entId);
+	}else{
+		$("body").append('{{include "/common/ologinmodal.html"}}');
+		$("#fristAutheLoginModal .com-nickName").text(result.nickName);
+		$("#fristAutheLoginModal .com-entName").text(result.entName);
+		var comAuthentType = result.comAuthentType;
+		//企业认证标识：1：营业执照；2：企业名片；3：企业邮箱
+		var comAuthentText = comAuthentType==1?"营业执照认证":comAuthentType==2?"名片认证":comAuthentType==3?"邮箱认证":"";
+		var flag = comAuthentText!="";
+		$("#fristAutheLoginModal .com-identTypeText").html("，恭喜您完成"+(identType==1?"企业":identType==3?"机构":"")+"认证"+(flag?"-":"")+comAuthentText);
+		$("#fristAutheLoginModal .com-identTypeImg").append('<i class="glyphicon '+(identType==1?"qy":identType==3?"jg":"")+'rz"></i><font class="text-muted">已认证'+(identType==1?"企业":identType==3?"机构":"")+'</font>');
+		if(flag){
+			$("#fristAutheLoginModal .com-identTypeImg").append('<i class="glyphicon margin-r-5 '+(comAuthentType==1?"margin-r-10 yyzz":comAuthentType==2?"mp":comAuthentType==3?"yj":"")+'rz"></i><font class="text-muted">'+comAuthentText+'</font>');
+		}
+		if(hasNewActive){
+			$("#fristAutheLoginModal .com-who").text("完成以下操作，就可以领取红包啦：");
+		}else{
+			$("#fristAutheLoginModal .com-entCard").removeClass("hide");
+			$("#fristAutheLoginModal .com-entCard a").attr("href","/member/yellowpage/edit/enterprise/"+entId);
+		}
 	}
-    var arg = '\u003cscript\u003elocation.replace("'+link+'")\u003c/script\u003e';
-    window.open('javascript:window.name;', arg);
+	$("#fristAutheLoginModal .com-releaseService a").attr("href","/member/yellowpage/show/showService/"+entId);
+	$("#fristAutheLoginModal").modal('show');
 }

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

@@ -284,14 +284,8 @@ $(function(){
 		}
 		$("#"+type+"-content li:first").append('<div class="com-last">'+keys.join(";")+'</div>');
 	}
-	var setScope = function(type,scope,n){
+	var setScope = function(type,scope){
 		var dialogObj = $("#"+type+"-scope");
-		if(n){
-			if(scope!="A"){
-				dialogObj.find("ul:first li:first .btn").removeClass("active");
-			}
-		}
-		
 		if(typeof(scope) == "undefined" || scope == ""){
 			return;
 		}
@@ -299,6 +293,7 @@ $(function(){
 			dialogObj.find("ul:first li:first .btn").addClass("active");
 			scope = "全国";
 		}else{
+			dialogObj.find("ul:first li:first .btn").removeClass("active");
 			var scopeArray = scope.split(",");
 			for(var i=0;i<scopeArray.length;i++){
 				dialogObj.find(".btn").each(function(){
@@ -315,12 +310,12 @@ $(function(){
 			.append($("#tender-scope").clone().removeAttr("id").attr("id","bid-scope"));
 	if(typeof(msgset.tender) != "undefined"){
 		setKeyWord("tender",msgset.tender.a_key);
-		setScope("tender",msgset.tender.s_scope,1);
+		setScope("tender",msgset.tender.s_scope);
 		turnOn($("#tender-on-off"));
 	}
 	if(typeof(msgset.bid) != "undefined"){
 		setKeyWord("bid",msgset.bid.a_key);
-		setScope("bid",msgset.bid.s_scope,1);
+		setScope("bid",msgset.bid.s_scope);
 		turnOn($("#bid-on-off"));
 	}
 	//开关

core/src/web/templates/active/promotion_201512.html

@@ -401,7 +401,7 @@ function setTimes(num,n){
 						<ul id="s_con" style="font-size:13px;">
 							<li></li>
 							<li>
-								●“剑鱼”向企业推送富有价值的信息情报等，去体验&nbsp;&nbsp;<a target="_blank" href="/show/swordfish/fish" class="btn btn-primary" style="width:82px;margin-left:13px;">剑鱼</a>
+								●“剑鱼”向企业推送富有价值的信息情报等，去体验&nbsp;&nbsp;<a target="_blank" href="/front/swordfish" class="btn btn-primary" style="width:82px;margin-left:13px;">剑鱼</a>
 							</li>
 						</ul>
 					</div>

core/src/web/templates/active/promotion_201512_e.html

@@ -400,7 +400,7 @@ function setTimes(num,n){
 							<ul id="s_con" style="font-size:13px;">
 								<li></li>
 								<li>
-									●“剑鱼”向企业推送富有价值的信息情报等，去体验&nbsp;&nbsp;<a target="_blank" href="/show/swordfish/fish" class="btn btn-primary" style="width:82px;margin-left:13px;">剑鱼</a>
+									●“剑鱼”向企业推送富有价值的信息情报等，去体验&nbsp;&nbsp;<a target="_blank" href="/front/swordfish" class="btn btn-primary" style="width:82px;margin-left:13px;">剑鱼</a>
 								</li>
 							</ul>
 						</div>

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

@@ -11,7 +11,7 @@
 			<td class="a-h-nav hidden-xs" id="head-navbar">
 		       	<ul class="text-center" id="head-navbar-ul">
 			        <li><img src="/images/nav-fwsc.png" class="visible-xs-inline"><a href="/market/0/list.html">服务市场</a></li>
-					<li class="hidden-xs"><img src="/images/nav-jy.png" class="visible-xs-inline"><a href="/show/swordfish/fish">剑鱼</a></li>
+					<li class="hidden-xs"><img src="/images/nav-jy.png" class="visible-xs-inline"><a href="/front/swordfish">剑鱼</a></li>
 		            <li><img src="/images/nav-qysq.png" class="visible-xs-inline"><a href="/search/enterprise/ent.html">企业社区</a></li>
 		            <li><img src="/images/nav-zcfg.png" class="visible-xs-inline"><a href="/front/content_zcfg_list.html">政策法规</a></li>
 		            <li><img src="/images/nav-xwzx.png" class="visible-xs-inline"><a href="/front/content_qykb_list.html">新闻资讯</a></li>
@@ -49,7 +49,7 @@
 					<img src="/images/nav-btn.png" class="visible-xs-inline" id="nvaBtn">
 				</div>
 			</td>
-			<td id="loginStatus" class="a-loginStatus text-center hidden-xs">
+			<td id="loginStatus" class="loginStatus text-center hidden-xs">
 			</td>
 		</tr>
 	</table>
@@ -324,37 +324,6 @@ function setNavbarActive(index,type){
 	$("#head-navbar-ul li:first").removeClass("a-com-active");
 	$("#head-navbar-ul li:eq("+index+")").addClass("a-com-active");
 }
-function afterAutheFirstLogin(result){
-	var identType = result.identType;
-	var entId = result.entId;
-	if(identType == 2){//个人认证
-		$("body").append('{{include "/common/ploginmodal.html"}}');
-		$("#fristAutheLoginModal .com-nickName").text(result.nickName);
-		$("#fristAutheLoginModal .com-entName").text(result.entName+"店铺");
-		$("#fristAutheLoginModal .com-entCard a").attr("href","/member/yellowpage/edit/enterprise/"+entId);
-	}else{
-		$("body").append('{{include "/common/ologinmodal.html"}}');
-		$("#fristAutheLoginModal .com-nickName").text(result.nickName);
-		$("#fristAutheLoginModal .com-entName").text(result.entName);
-		var comAuthentType = result.comAuthentType;
-		//企业认证标识：1：营业执照；2：企业名片；3：企业邮箱
-		var comAuthentText = comAuthentType==1?"营业执照认证":comAuthentType==2?"名片认证":comAuthentType==3?"邮箱认证":"";
-		var flag = comAuthentText!="";
-		$("#fristAutheLoginModal .com-identTypeText").html("，恭喜您完成"+(identType==1?"企业":identType==3?"机构":"")+"认证"+(flag?"-":"")+comAuthentText);
-		$("#fristAutheLoginModal .com-identTypeImg").append('<i class="glyphicon '+(identType==1?"qy":identType==3?"jg":"")+'rz"></i><font class="text-muted">已认证'+(identType==1?"企业":identType==3?"机构":"")+'</font>');
-		if(flag){
-			$("#fristAutheLoginModal .com-identTypeImg").append('<i class="glyphicon margin-r-5 '+(comAuthentType==1?"margin-r-10 yyzz":comAuthentType==2?"mp":comAuthentType==3?"yj":"")+'rz"></i><font class="text-muted">'+comAuthentText+'</font>');
-		}
-		if(hasNewActive){
-			$("#fristAutheLoginModal .com-who").text("完成以下操作，就可以领取红包啦：");
-		}else{
-			$("#fristAutheLoginModal .com-entCard").removeClass("hide");
-			$("#fristAutheLoginModal .com-entCard a").attr("href","/member/yellowpage/edit/enterprise/"+entId);
-		}
-	}
-	$("#fristAutheLoginModal .com-releaseService a").attr("href","/member/yellowpage/show/showService/"+entId);
-	$("#fristAutheLoginModal").modal('show');
-}
 </script>
 <script type='text/javascript'>
 window.BWEUM||(BWEUM={});BWEUM.info = {"stand":true,"agentType":"browser","agent":"bi-collector.oneapm.com/static/js/bw-send-411.4.5.js","beaconUrl":"bi-collector.oneapm.com/beacon","licenseKey":"3Nvir~rAqyZ2Ra7i","applicationID":2274815};</script><script type="text/javascript" src="//bi-collector.oneapm.com/static/js/bw-loader-411.4.5.js">

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

@@ -140,46 +140,12 @@ function setTimes(num,n){
 							}
 						//登陆成功
 						clearInterval(t);
-						switch(loginBackType){
-							case 1://微官网
-								window.location.href="/member/wsite";
-								break;
-							case 2://员工邀请
-								window.location.href="/member/employeemanage/loginUserJoin";
-								break;
-							case 4://注册
-								window.location.href="/";
-								break;
-							case 5://预约
-								window.location.href="/front/appointlogin";
-								break;
-							case 6://投标
-								window.location.href="/front/reurl";
-								break;
-							case 7://用户中心首页
-								window.location.href = "/member/show/memberindex";	
-								break;
-							case 8://录入产品服务信息
-								if(data.code==null){
-									window.location.href = '/member/show/memberindex';
-								}else{
-									window.location.href = '/member/yellowpage/show/showService/'+data.code;
-								}
-								break;
-							case 9://录入企业信息
-								if(data.code==null){
-									window.location.href = '/member/show/memberindex';
-								}else{
-									window.location.href = '/member/yellowpage/edit/enterprise/'+data.code;
-								}
-								break;
-							default:
-								window.location.href = window.location.href;	
-						}
+						compulsoryreRresh = true;
+						afterLoginSkip();
 						$("img.login-logo").css("marginLeft",180);
 						$("div.modal-content").animate({
-					    width:'550px'
-					  });
+						    width:'550px'
+						});
 						if (data.flag==1 && data.auth==1){
 							$(".f-login").hide();
 							$(".f-logintip").show();
@@ -252,50 +218,7 @@ $(function (){
 			}else{
 				//注册页面登录之后
 				$("#loginStatus").trigger("login");
-				switch(loginBackType){
-					case -1:
-						window.location.href = window.location.href;
-						break;
-					case 1://微官网
-						window.location.href="/member/wsite";
-						break;
-					case 2://员工邀请
-						window.location.href="/member/employeemanage/loginUserJoin";
-						break;
-					case 4://注册
-						window.location.href="/";
-						break;
-					case 5://预约
-						window.location.href="/front/appointlogin";
-						break;
-					case 6://投标
-						window.location.href="/front/reurl";
-						break;
-					case 7://用户中心首页
-						window.location.href = "/member/show/memberindex";
-						break;
-					case 8://录入产品服务信息
-								if(data.code==null){
-									window.location.href = '/member/show/memberindex';
-								}else{
-									window.location.href = '/member/yellowpage/show/showService/'+data.code;
-								}
-								break;
-							case 9://录入企业信息
-								if(data.code==null){
-									window.location.href = '/member/show/memberindex';
-								}else{
-									window.location.href = '/member/yellowpage/edit/enterprise/'+data.code;
-								}
-								break;
-					default:
-						if(compulsoryreRresh){
-							window.location.href = window.location.href;
-						}else{
-							$('#loginModal').modal('hide');
-							reLoadTop();
-						}
-				}
+				afterLoginSkip();
 			}
 			//
 			if($("#loginModal [name='rememberMe']").is(':checked')==true){
@@ -320,6 +243,58 @@ $(function (){
 		
 	});
 });
+function afterLoginSkip(){
+	switch(loginBackType){
+		case -1:
+			window.location.href = window.location.href;
+			break;
+		case 1://微官网
+			window.location.href="/member/wsite";
+			break;
+		case 2://员工邀请
+			window.location.href="/member/employeemanage/loginUserJoin";
+			break;
+		case 4://注册
+			window.location.href="/";
+			break;
+		case 5://预约
+			window.location.href="/front/appointlogin";
+			break;
+		case 6://投标
+			window.location.href="/front/reurl";
+			break;
+		case 7://用户中心首页
+			window.location.href = "/member/show/memberindex";
+			break;
+		case 8://录入产品服务信息
+			if(data.code==null){
+				window.location.href = '/member/show/memberindex';
+			}else{
+				window.location.href = '/member/yellowpage/show/showService/'+data.code;
+			}
+			break;
+		case 9://录入企业信息
+			if(data.code==null){
+				window.location.href = '/member/show/memberindex';
+			}else{
+				window.location.href = '/member/yellowpage/edit/enterprise/'+data.code;
+			}
+			break;
+		case 10://订阅设置
+			window.location.href = '/member/swordfish/rssset';
+			break;
+		case 11://信息列表
+			window.location.href = '/member/swordfish/infolist';
+			break;
+		default:
+			if(compulsoryreRresh){
+				window.location.href = window.location.href;
+			}else{
+				$('#loginModal').modal('hide');
+				reLoadTop();
+			}
+	}
+}
 </script>
 <!-- 登录弹出框 -->
 <div class="modal fade" id="loginModal" tabindex="-1" role="dialog" aria-labelledby="loginModal" aria-hidden="true">
@@ -351,7 +326,7 @@ $(function (){
 									●&nbsp;&nbsp;验证企业身份<a href="/member/accountset/index" class="btn btn-primary" style="width:82px;margin-left:5px;">认证</a>
 								</li>
 								<li>
-									●“剑鱼”向企业推送富有价值的信息情报等，去体验<a href="/show/swordfish/fish" class="btn btn-primary" style="width:82px;margin-left:13px;">剑鱼</a>
+									●“剑鱼”向企业推送富有价值的信息情报等，去体验<a href="/front/swordfish" class="btn btn-primary" style="width:82px;margin-left:13px;">剑鱼</a>
 								</li>
 							</ul>
 						</div>

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

@@ -4,7 +4,7 @@
 		<div>
 			<ul class="pull-right">
 				<li><i class="img-circle glyphicon fuwushichang"></i><a href="/market/0/list.html">服务市场</a></li>
-				<li><i class="img-circle glyphicon jianyu swordfish-i-a"></i><a href="/show/swordfish/fish">剑鱼</a></li>
+				<li><i class="img-circle glyphicon jianyu swordfish-i-a"></i><a href="/front/swordfish">剑鱼</a></li>
 				<li><i class="img-circle glyphicon qiyeshequ"></i><a href="/search/enterprise/ent.html">企业社区</a></li>
 				<li><i class="img-circle glyphicon weiguanwang1"></i><a href="/front/wsite.html">微官网</a></li>
 				<li><i class="img-circle glyphicon zhengcefagui"></i><a href="/front/content_zcfg_list.html">政策法规</a></li>
@@ -14,18 +14,136 @@
 	<div class="swordfish-nva">
 		<ul>
 			<li class="swordfish-nva-l"><a href="/"><img src="/images/logo.png" class="logo"></a></li>
-			<li class="swordfish-nva-c"><a href="/member/swordfish">剑鱼</a><a class="swordfish-nva-s"></a></li>
-			<li class="swordfish-nva-c"><a href="/member/rssset">订阅设置</a><a class="swordfish-nva-s"></a></li>
-			<li class="swordfish-nva-c"><a href="/member/infolist">信息列表</a></li>
-			<li class="pull-right">
-				{{$s_avatar := printf "%v" (index (session "userInfo") "s_avatar")}}
-				{{if session "headImg"}}
-					<img class="img-circle headimg" src="{{$s_avatar}}" onerror="this.src='{{session "headImg"}}'">
-				{{else}}
-					<img class="img-circle headimg" src="{{$s_avatar}}" onerror="this.src='/images/swordfish/headimg.png'">
-				{{end}}
-				<a onclick="window.location.href = '/member/show/memberindex'">{{session "nickName"}}</a>
-			</li>
+			<li class="swordfish-nva-c"><a href="/front/swordfish">剑鱼</a><a class="swordfish-nva-s"></a></li>
+			<li class="swordfish-nva-c"><a id="goToRssset">订阅设置</a><a class="swordfish-nva-s"></a></li>
+			<li class="swordfish-nva-c"><a id="goToInfolist">推送记录</a></li>
+			<li class="pull-right loginStatus" id="loginStatus"></li>
 		</ul>
 	</div>
-</div>
+</div>
+<script type="text/javascript">
+function open_window(link){
+	if(!/^http/.test(link)){
+		link="http://"+link
+	}
+	window.open("/visit/redirect?url="+escape(link));
+}
+function reLoadTop(){
+	$.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 headImg = null;
+				if(headImg != ""){
+					headImg = result.headImg;
+				}
+				var html = '<img class="img-circle headimg" src="'+headImg+'" onerror="this.src=\'/images/swordfish/headimg.png\'">'
+							+'<a href="/member/show/memberindex" id="topNickName" class="nickName">'+result.nickName+'</a><span class="caret"></span>';
+				if(hasMsgCount){
+					html += '<span class="badge">'+msgCount+'</span>';
+				}
+				$("#loginStatus").html(html);
+				var content = '<ul>'
+						    	+'<li><a href="/member/msgcenter">消息中心';
+				if(hasMsgCount){
+					content += '<span class="badge">'+msgCount+'</span>';
+				}
+				content +='</a></li>'
+								+'<li><a href="/member/show/memberindex">用户中心</a></li>'
+								+'<li><a href="/front/logout">退出</a></li>'
+						  	+'</ul>';
+				$("#topNickName").popover({
+					html: true,
+					trigger: "manual",
+					placement: "bottom",
+					content: content
+				});
+				var hideflag = false;
+				$("#topNickName").mouseover(function() {
+					hideflag = true;
+					var obj = null;
+					if(typeof($("#topNickName").attr("aria-describedby")) == "undefined"){
+						$("#topNickName").popover('show');
+						obj = $("#"+$("#topNickName").attr("aria-describedby"));
+						var cssObj = {top: 45};
+						if(!hasMsgCount){
+							cssObj["text-align"] = "center";
+						}
+						obj.css(cssObj);
+						obj.find("li").mouseover(function(){
+							$(this).addClass("acitve");
+						}).mouseleave(function(){
+							$(this).removeClass("acitve");
+						});
+					}else{
+						obj = $("#"+$("#topNickName").attr("aria-describedby"));
+					}
+					obj.mouseover(function(){
+						hideflag = true;
+					}).mouseleave(function(){
+						hideflag = false;
+						setTimeout(function(){
+							if(!hideflag){
+								$("#topNickName").popover('hide');
+							}
+						},100);
+					});
+				}).mouseleave(function(){
+					hideflag = false;
+					setTimeout(function(){
+						if(!hideflag){
+							$("#topNickName").popover('hide');
+						}
+					},100);
+				});
+				//立即体验
+				$("#experience").click(function(){
+					window.location.href = "/member/swordfish/rssset";
+				});
+				$("#goToRssset").click(function(){
+					window.location.href = "/member/swordfish/rssset";
+				});
+				$("#goToInfolist").click(function(){
+					window.location.href = "/member/swordfish/infolist";
+				});
+				//处理公用底部扫码登录按钮
+				$("#bottom-bar>li:first").addClass("invisible");
+				//处理认证完之后第一次登录弹出提示框
+				if(result.auditType == "y"){
+					afterAutheFirstLogin(result);
+				}
+			}else{
+				isLogined = false;
+				$("#loginStatus").html('<a onclick="loginModalShow();">登录/注册</a>');
+				//立即体验
+				$("#experience").click(function(){
+					loginModalShow();
+				});
+				$("#goToRssset").click(function(){
+					loginModalShow(10);
+				});
+				$("#goToInfolist").click(function(){
+					loginModalShow(11);
+				});
+				$("#bottom-bar>li").removeClass("invisible");
+				//登录
+				$("body").append('{{include "/common/login.html"}}');
+			}
+		},
+		error: function(e){
+			topLoadOver = true;
+		}
+	});
+}
+$(function(){
+	reLoadTop();
+});
+</script>

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

@@ -1,294 +0,0 @@
-<html>
-<head>
-<title>消息订阅</title>
-{{include "/common/inc.html"}}
-</head>
-<body>
-{{$identType := session "identType"}}
-<!-- 头部 -->
-{{include "/common/head.html"}}
-<!-- 中间 -->
-<style>
-.member-right .fontb{
-	margin:30px 0 5px 0;
-}
-.inputkey,.checkbox{
-	margin-left:30px;
-	margin-right:30px;
-}
-.module{
-	cursor:pointer;
-	margin-top:20px;
-	padding:25px;
-	background-color:#F8F8F8;
-	border:1px solid #CECECE;
-}
-
-.mactive{
-	background-color:#FFFFCC;
-	border:2px solid #EBA675
-}
-
-.tips{
-	display:inline-block;
-	margin-left:2em;
-	font-weight:normal;
-}
-
-</style>
-<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 iconfontcolor71"></i><span>剑鱼（信息订阅）</span>
-			<span class="text-muted" style="font-size:12px;font-weight:normal;display:inline-block;margin-left:20px;">信息类型太少？没有我想要的？<a style="color:blue" href="/front/web_feedbacklist.html" target="_blank">去提意见！</a></span>
-		</div>		
-		<div class="panel-body a-border-t-only" id="setContent">
-		
-			<div class="remark" style="background-color:#FCF8E3;padding:10px;line-height:30px;color:#A87C22">
-				<div><span style="font-size:16px;font-weight:bold">“剑鱼”</span>是企明星的特色产品，它借助内置的互联网搜索引擎、大数据平台和自然语言分析系统，为企业从互联网上自动抓取、分析、筛选并推送富有价值的信息情报，比如本企业或其他企业的失信行为信息、受到行政处罚的信息、招标公告、中标公告等等。</div>
-				<div>　您在输入了想要订阅的信息主题以后，网上一旦发布这些主题的信息，剑鱼就会第一时间将信息推送给您。</div>
-			</div>
-		
-			<div class="module tender mactive" >
-				<div class="fontb" style="margin-top:0;font-size:20px;"><input name="moduleCheck" value="tender" type="checkbox"/>&nbsp;招标公告</div>
-				<div class="inputkey">
-					  <div class="fontb">订阅主题<span class="text-muted tips">示例：综合布线 机房装修 空调 视频会议 3D+打印机</span></div>
-					  <div class="form-group"><input class="form-control " name="a_key" placeholder="示例：综合布线 机房装修 空调 视频会议 3D+打印机"  type="text" value=""></div>
-					  <div><span class="text-muted">说明：最多输入5个订阅主题，每个主题之间用空格分开。每个主题可以包含一个或多个关键词，关键词之间用“+”号连接。</span></div>
-				</div>
-				
-				<div class="checkbox">
-						<div class="fontb">接收范围</div>
-				        <label style="padding-left:0">
-				          <input type="radio" name="tender_s_scope" checked value="A"> 全国信息
-				        </label>　　　
-						{{if .T.sname }}
-						<label>
-				          <input type="radio" name="tender_s_scope" value="{{.T.sname}}"> 本省信息({{.T.sname}})
-				        </label>
-						{{end}}
-			    </div>
-				<div class="checkbox">
-					  <div class="fontb">接收方式</div>
-				          <label>
-				            <input type="checkbox" name="a_mode" value="3"> 微信提醒
-				          </label>　　　
-						  <label>
-				            <input type="checkbox" name="a_mode" value="2"> 邮件通知
-				          </label>　
-						  <label>
-				           <input type="checkbox" checked disabled > 消息中心
-				          </label>　　　
-			      </div>
-			</div>
-			
-			
-			<div class="module bid">
-				<div class="fontb" style="margin-top:0;font-size:20px;"><input name="moduleCheck" value="bid" type="checkbox"/>&nbsp;中标公告</div>
-				<div class="inputkey">
-					  <div class="fontb">订阅主题<span class="text-muted tips">示例：综合布线 机房装修 空调 视频会议 3D+打印机</span></div>
-					  <div class="form-group"><input class="form-control " name="a_key" placeholder="示例 ：政府+采购+计算机 工程 建筑 安全"  type="text" value=""></div>
-					<div><span class="text-muted">说明：最多输入5个订阅主题，每个主题之间用空格分开。每个主题可以包含一个或多个关键词，关键词之间用“+”号连接。</span></div>
-				</div>
-				
-				<div class="checkbox">
-						<div class="fontb">接收范围</div>
-				        <label style="padding-left:0">
-				          <input type="radio" name="bid_s_scope" checked value="A"> 全国信息
-				        </label>　　　
-						{{if .T.sname }}
-						<label>
-				          <input type="radio" name="bid_s_scope" value="{{.T.sname}}"> 本省信息({{.T.sname}})
-				        </label>
-						{{end}}
-			        </div>
-					<div class="checkbox">
-					  <div class="fontb">接收方式</div>
-				          <label>
-				            <input type="checkbox" name="a_mode" value="3"> 微信提醒
-				          </label>　　　
-						  <label>
-				            <input type="checkbox" name="a_mode" value="2"> 邮件通知
-				          </label>　
-						  <label>
-				           <input type="checkbox" checked disabled > 消息中心
-				          </label>　　　
-			        </div>
-			</div>
-			
-			
-			<div class="bid" disabled style="margin-top:20px;padding:25px;background-color:#F8F8F8;border:1px solid #CECECE">
-				<div class="fontb" style="margin-top:0;font-size:20px;">企业情报</div>
-				<div class="text-muted" style="margin-left:30px;">竞争对手的情报，公司大事件，行业风险预警等等。。。</div>
-				<div class="text-muted" style="margin-left:30px;height:200px;line-height:200px;font-size:25px;">开发中，敬请期待！</div>
-			</div>
-				
-		</div>
-	</div>
-</div>
-<!-- 底部 -->
-{{include "/common/bottom.html"}}
-<script type="text/javascript">
-try{
-	identType=identType||""
-	if((role == "" || /^[9]$/.test(role)) && (identType == "-1" || identType == "0")){
-		$(".member-right").prepend('{{include "/common/authentication.html"}}');
-	}else{
-		if(!(role == "" || /^[9]$/.test(role) || (/^[1]$/.test(role) && identType == "1"))){
-			$("#myYellowpage").remove();
-			$("#message").addClass("col-md-12").removeClass("col-md-6");
-		}
-	}
-}catch(e){
-	
-}
-
-var msgset={{.T.msgset}}
-$(function(){	
-	$(".module").click(function(){
-		if(!$(this).hasClass("mactive")){
-			$(".module").removeClass("mactive")	
-			$(this).addClass("mactive")	
-		}
-	})
-	
-	$(".module input[name=moduleCheck]").click(function(){		
-		var check=$(this).prop("checked")
-		if(check){			
-			$(this).closest(".module").find("input[name=a_key]").removeAttr("disabled")
-		}else{
-			$(this).closest(".module").find("input[name=a_key]").attr("disabled","disabled")
-		}
-	})
-	
-	for(var i in msgset){
-		try{
-			var m=$("."+i)
-			$("input[name=moduleCheck][value='"+i+"']").prop("checked",true)
-			var key=msgset[i].a_key
-			var scope=msgset[i].s_scope
-			var a_mode=msgset[i].a_mode
-			if(key) $("input[name='a_key']",m).val(key.join(" "))
-			$("input[name$='s_scope'][value='"+scope+"']",m).prop("checked",true)
-			$(a_mode).each(function(i,ad){
-				$("input[name='a_mode'][value='"+ad+"']",m).prop("checked",true)
-			})
-		}catch(e){
-			
-		}
-	}
-	
-	setTimeout(function(){
-		webSiteInit()
-	},"10")
-	
-	$("input[name='moduleCheck'],input[name$='scope'],input[name='a_mode']").click(function(){
-		save()
-	})
-	/**
-	var t='';
-	$("input[name='a_key']").keyup(function (){
-	 	clearTimeout(t);
-	 	t = setTimeout("save()",100);
-	});
-	**/
-	var last;
-	$("input[name='a_key']").keyup(function(event){
-		last = event.timeStamp;
-		setTimeout(function(){
-			if(last-event.timeStamp==0){
-				save()
-			}
-		},650);
-	});
-	//初始设置
-	$(".module input[name=moduleCheck]").each(function(i,ad){		
-		var check=$(this).prop("checked")
-		if(check){			
-			$(this).closest(".module").find("input[name=a_key]").removeAttr("disabled")
-		}else{
-			$(this).closest(".module").find("input[name=a_key]").attr("disabled","disabled")
-		}
-	})
-})
-function save(){
-	var modules=$(".module input[name='moduleCheck']:checked")
-	var obj
-	modules.each(function(i,ad){
-		var moduleval=$(ad).val();
-		var m=$("."+moduleval)
-		var key=$("input[name='a_key']",m).val()
-		var keys=key.trim().split(/\s+/)
-		if(!key.trim()){
-			//alert("选中的关键词为空。")
-			return false
-		}else{
-			if(keys.length>5){
-				alert("关键词不能超过5个。")			
-				return false
-			}else if(key.trim()==""){
-			
-			}else{
-				for(var k=0;k<keys.length;k++){
-					if(keys[k].length>100){
-						alert("关键词长度不能大于100");
-						return false
-						break;
-					}
-				}
-				if(!obj) obj={}
-				if(!obj[moduleval]) obj[moduleval]={}	
-				obj[moduleval].a_key=keys;
-				obj[moduleval].s_scope=$("input[name$='s_scope']:checked",m).val()
-				var am=[]
-				$("input[name='a_mode']:checked",m).each(function(n,nm){
-					am.push($(nm).val())
-				})
-				obj[moduleval].a_mode=am
-			}
-		}
-	})
-	if(!obj){
-		//alert("选择订阅模块后，填写值无效，请检查.")
-		obj="";
-	}
-	
-	$.post("/member/msgset",{data:jsonToString(obj)},function(data){
-		//alert(data.msg)
-	},'json')
-	
-	/**
-	$.post("/member/msgset?"+$(obj).closest("form").serialize(),function(data){
-		$("#msgset").popover("hide")
-		alert(data.msg)
-	},'json')	
-	**/
-}
-
-jsonToString = function(o,f) {
-	var r = [];
-	if (typeof o == "string")
-		return "\"" + o.replace(/([\'\"\\])/g, "\\$1").replace(/(\n)/g, "\\n").replace(/(\r)/g, "\\r").replace(/(\t)/g, "\\t") + "\"";
-	if (typeof o == "object") {
-		if (!o.sort) {
-			for ( var i in o)
-				r.push((f?i:("\""+i + "\"")) +":"+ jsonToString(o[i]));
-			if (!!document.all && !/^\n?function\s*toString\(\)\s*\{\n?\s*\[native code\]\n?\s*\}\n?\s*$/.test(o.toString)) {
-				r.push("toString:" + o.toString.toString());
-			}
-			r = "{" + r.join() + "}";
-		} else {
-			for (var i = 0; i < o.length; i++)
-				r.push(jsonToString(o[i]));
-			r = "[" + r.join() + "]";
-		}
-		return r;
-	}
-	return o?o.toString():"";
-};
-</script>
-</body>
-</html>

core/src/web/templates/member/message/wxrssset - 副本.html

@@ -1,400 +0,0 @@
-<html>
-<head>
-<title>企明星-信息订阅</title>
-<meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" />
-<meta name="viewport" content="width=device-width,initial-scale=1.0">
-<meta name="renderer" content="webkit">
-<script src="/js/jquery.js"></script>
-</head>
-<style>
-body {
-	padding-top: 0px;
-	font-family: "微软雅黑 Regular", "微软雅黑";
-	color: #666;
-}
-.head{
-	padding:.5em;
-	font-size:1em;
-	color:#999999;
-}
-.ban{
-	width:100%;
-	background-color:#e9e9e9;
-	height:2em;
-	line-height:2em;
-	font-size:1.2em;
-}
-.minBan{
-	background-color:#FB8C00;
-	width:.5em;
-	height:2em;
-	display:inline-block
-}
-
-.arrow1,.arrow2{
-display:inline-block;
-position: relative;
-float:right;
-right:.8em;
-margin-top:0.3em;
-cursor:pointer;
-}
-.arrow2{
-	margin-top:0.5em;
-	right:1.8em;
-}
-.arrow1:after, .arrow1:before {
-  border: 15px solid transparent;
-  border-left: 15px solid #e9e9e9;
-  width: 0;
-  height: 0;
-  position: absolute;
-  top: 0;
-  right: -20px;
-  content: ' '
-}
- 
-.arrow1:before {
-  border-left-color: #999999;
-  right: -23px;
-}
-.arrow2:after, .arrow2:before {
-  border: 15px solid transparent;
-  border-top: 15px solid #e9e9e9;
-  width: 0;
-  height: 0;
-  position: absolute;
-  top: 0;
-  top: 0px;
-  content: ' '
-}
- 
-.arrow2:before {
-  border-top-color: #999999;
-  top: 3px;
-}
-.form-control {
-  display: block;
-  width: 100%;
-  height: 38px;
-  padding: 8px 12px;
-  font-size: 14px;
-  line-height: 1.42857143;
-  color: #333333;
-  background-color: #ffffff;
-  background-image: none;
-  border: 1px solid #cccccc;
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
-  -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-  transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-}
-.lg-input{
-  height: 5em;
-  padding: .5em;
-  font-size: .9em;
-  line-height: 1.3333333em;
-  border-radius: 0.3em;
-}
-
-.title{
-	font-size:1em;
-	margin:0.5em 0;
-}
-.con{
-	padding:0 1em;
-}
-.scope{
-	text-align:justify
-}
-.radio{
-	display:inline-block;
-	height:2em;
-	line-height:2em;
-	padding-left:2em;
-	font-size:1em;
-	width:5em;
-	margin-right:5%;
-	cursor:pointer;
-}
-.select{
-	background:url(/images/wx/btn_rou_h.png) no-repeat;
-	background-size:1.85em;
-}
-.noselect{
-	background:url(/images/wx/btn_rou_n.png) no-repeat;
-	background-size:1.85em;
-}
-.select2{
-	background:url(/images/wx/btn_squ_h.png) no-repeat;
-	background-size:1.85em;
-}
-.noselect2{
-	background:url(/images/wx/btn_squ_n.png) no-repeat;
-	background-size:1.85em;
-}
-.bantitle{
-	height:2em;
-	display:inline-block;
-}
-.hide{
-	display:none;
-}
-.module{
-	margin-bottom:0.2em;
-}
-.moduleCheck{
-	margin:0 0.1em;
-}
-.minBan2{
-	background-color:#FAA57B;
-}
-.tips{
-	font-size:0.8em;
-	margin-left:1em;
-}
-</style>
-<body>
-<div class="body">
-	<div class="head">
-	<div><span style="font-size:1.2em;color:#222222">“剑鱼”</span>是企明星的特色产品，它借助内置的互联网搜索引擎、大数据平台和自然语言分析系统，为企业从互联网上自动抓取、分析、筛选并推送富有价值的信息情报，比如本企业或其他企业的失信行为信息、受到行政处罚的信息、招标公告、中标公告等等。</div>
-	</div>
-	
-	<div class="module tender" value="tender">
-		<div class="ban"><div class="minBan minBan2">&nbsp;</div><span value="tender" class="moduleCheck noselect2" style="display:inline-block;width:35px;background-size: 1.5em;background-position:.1em">&nbsp;</span><div class="bantitle">招标公告</div><div  class="arrow arrow1"></div></div>
-		<div class="con hide">
-			<div class="title">关键词</div>
-			<div class="tips text-muted">示例：政府+采购+计算机 办公+工程 安全</div>
-			<div class="tips text-muted">说明：最多输入5个订阅主题，每个主题之间用空格分开。每个主题可以包含一个或多个关键词，关键词之间用“+”号连接。</div>
-			<div><textarea placeholder="示例：政府+采购+计算机 办公+工程 安全" class="form-control lg-input" ></textarea></div>
-			<div class="title">信息范围</div>
-			<div class="scope">
-				<span class="radio select" value="A">全国</span>
-				{{if .T.sname }}
-				<span class="radio noselect" value="{{.T.sname}}">本省{{.T.sname}}</span>
-				{{end}}
-			</div>
-			<div class="title">接收方式</div>
-			<div class="way">
-				<span value="3" class="radio noselect2">微信提醒</span>
-				<span value="2" class="radio noselect2">邮箱提醒</span>
-			</div>
-		</div>
-	</div>
-	
-	<div class="module bid" value="bid">
-		<div class="ban"><div class="minBan minBan2">&nbsp;</div><span value="bid" class="moduleCheck noselect2" style="display:inline-block;width:35px;background-size: 1.5em;background-position:.1em">&nbsp;</span><div class="bantitle">中标公告</div><div  class="arrow arrow1"></div></div>
-		<div class="con hide">
-			<div class="title">关键词</div>
-			<div class="tips text-muted">示例：政府+采购+计算机 办公+工程 安全</div>
-			<div class="tips text-muted">说明：最多输入5个订阅主题，每个主题之间用空格分开。每个主题可以包含一个或多个关键词，关键词之间用“+”号连接。</div>
-			<div><textarea placeholder="示例：政府+采购+计算机 办公+工程 安全" class="form-control lg-input" ></textarea></div>
-			<div class="title">信息范围</div>
-			
-			<div class="scope">
-				<span class="radio select" value="A">全国</span>
-				{{if .T.sname }}
-				<span class="radio noselect" value="{{.T.sname}}">本省{{.T.sname}}</span>
-				{{end}}
-			</div>
-			<div class="title">接收方式</div>
-			<div class="way">
-				<span value="3" class="radio noselect2">微信提醒</span>
-				<span value="2" class="radio noselect2">邮箱提醒</span>
-			</div>
-		</div>
-	</div>
-	
-	<div class="module other" disabled>
-		<div class="ban"><div class="minBan" style="background-color:#999999">&nbsp;</div><div class="bantitle" style="padding-left:2em;">企业情报</div><div style="" class="arrow arrow1"></div></div>
-		<div class="con hide">
-			<div class="title">企业情报</div>
-			<div class="text-muted" style="margin-left:1.2em;">竞争对手的情报，公司大事件，行业风险预警等等。。。</div>
-			<div class="text-muted" style="margin-left:2em;height:2em;line-height:2em;font-size:1.5em;">开发中，敬请期待！</div>
-		</div>
-	</div>
-
-</div>
-<script>
-var msgset={{.T.msgset}}
-function save(){
-	var modules=$(".module span.moduleCheck")
-	var obj
-	modules.each(function(i,ad){
-		if ($(ad).hasClass("select2")){	
-			var moduleval=$(ad).attr("value");
-			var m=$("."+moduleval)
-			var key=$("textarea",m).val()
-			var keys=key.trim().split(/\s+/)
-			if(keys.length>5){
-				alert("关键词不能超过5个。")			
-				return;
-			}else if(key.trim()==""){
-				
-			}else{
-				for(var k=0;k<keys.length;k++){
-					if(keys[k].length>100){
-						alert("关键词长度不能大于100");
-						return false
-						break;
-					}
-				}
-				if(!obj) obj={}
-				if(!obj[moduleval]) obj[moduleval]={}	
-				obj[moduleval].a_key=keys;
-				obj[moduleval].s_scope=$(".scope span.select",m).attr("value")
-				var am=[]
-				$(".way span.select2",m).each(function(n,nm){
-					am.push($(nm).attr("value"))
-				})
-				obj[moduleval].a_mode=am		
-			}
-		}	
-	})
-	if(!obj){
-		obj="";
-	}
-	$.post("/swordfish/msgpushsetting/msgset",{data:jsonToString(obj),mid:"{{.T.mid}}"})	
-}
-
-function sp(t){
-	if(!t.hasClass("select")){
-		var spans=t.closest("div").find("span")
-		spans.removeClass("select");
-		spans.addClass("noselect");
-		t.removeClass("noselect").addClass("select");
-	}
-}
-function way(t){
-	if(!t.hasClass("select2")){
-		t.removeClass("noselect2").addClass("select2");
-		t.prev("div").removeClass("minBan2");			
-		ban(t.closest(".ban"),"zk")
-	}else{
-		t.removeClass("select2").addClass("noselect2");
-		t.prev("div").addClass("minBan2");
-		ban(t.closest(".ban"),"zd")		
-	}
-}
-
-function ban(t,flag){
-		var arrow=t.find(".arrow");
-		if(!arrow.hasClass("arrow2")){
-			if(flag=="zd"){
-				
-			}else{
-				arrow.removeClass("arrow1").addClass("arrow2")
-				t.closest(".module").find(".con").show();				
-			}
-		}else{
-			if(flag=="zk"){
-				
-			}else{
-				arrow.removeClass("arrow2").addClass("arrow1")
-				t.closest(".module").find(".con").hide();			
-			}
-		}
-}
-
-
-$(function(){
-	$("span.moduleCheck").click(function(e){
-		way($(this))
-		e.stopPropagation();
-	})
-	
-	$(".scope span").click(function(){
-		sp($(this))
-	})
-	
-	$(".way span").click(function(){
-		way($(this))
-	})
-	
-	$(".ban").click(function(){
-		ban($(this))
-	})
-	
-	setTimeout(function(){	
-			for(var i in msgset){
-			try{
-				var m=$("."+i)
-				//$("input[name=moduleCheck][value='"+i+"']").prop("checked",true)
-				//$("span.moduleCheck",m).click();//removeClass("noselect2").addClass("select2");
-				way($("span.moduleCheck",m))
-				var key=msgset[i].a_key
-				$("textarea",m).val(key.join(" "))
-				var scope=msgset[i].s_scope
-				var a_mode=msgset[i].a_mode
-				var sp1=$(".scope span[value='"+scope+"']",m)
-				if(!sp1.hasClass("select")){		
-					sp(sp1)
-				}
-				$(".way span",m).each(function(n,ws){
-					$(a_mode).each(function(i,ad){
-						if($(ws).attr("value")==ad){
-							way($(ws))	
-						}
-					})
-				})
-			}catch(e){
-				
-			}
-		}
-	},10)
-	
-	if(!msgset){
-		$(".way span[value=3]").click()
-	}else if(!msgset.bid){
-		$(".bid .way span[value=3]").click()
-	}else if(!msgset.tender){
-		$(".tender .way span[value=3]").click()
-	}
-	
-	$("span.moduleCheck,div.scope span,div.way span").click(function(){
-		save()
-	})
-	
-	$("textarea").blur(function(){
-		save()
-	})
-	
-	var last;
-	$("textarea").keyup(function(event){
-		last = event.timeStamp;
-		setTimeout(function(){
-			if(last-event.timeStamp==0){
-				save()
-			}
-		},650);
-	});
-	
-})
-
-jsonToString = function(o,f) {
-	var r = [];
-	if (typeof o == "string")
-		return "\"" + o.replace(/([\'\"\\])/g, "\\$1").replace(/(\n)/g, "\\n").replace(/(\r)/g, "\\r").replace(/(\t)/g, "\\t") + "\"";
-	if (typeof o == "object") {
-		if (!o.sort) {
-			for ( var i in o)
-				r.push((f?i:("\""+i + "\"")) +":"+ jsonToString(o[i]));
-			if (!!document.all && !/^\n?function\s*toString\(\)\s*\{\n?\s*\[native code\]\n?\s*\}\n?\s*$/.test(o.toString)) {
-				r.push("toString:" + o.toString.toString());
-			}
-			r = "{" + r.join() + "}";
-		} else {
-			for (var i = 0; i < o.length; i++)
-				r.push(jsonToString(o[i]));
-			r = "[" + r.join() + "]";
-		}
-		return r;
-	}
-	return o?o.toString():"";
-};
-
-</script>
-</body>
-</html>

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

@@ -1,405 +0,0 @@
-<html>
-<head>
-<title>企明星-信息订阅</title>
-<meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" />
-<meta name="viewport" content="width=device-width,initial-scale=1.0">
-<meta name="renderer" content="webkit">
-<script src="/js/jquery.js"></script>
-</head>
-<style>
-body {
-	font-family: "微软雅黑 Regular", "微软雅黑";
-	color: #666;
-	margin:0;
-	padding:0;
-	background-color:#F9F9F9;
-}
-.form-control {
-  display: block;
-  width: 96%;
-  height: 38px;
-  padding: 8px 12px;
-  font-size: 14px;
-  line-height: 1.42857143;
-  color: #333333;
-  background-color: #ffffff;
-  background-image: none;
-  border: 1px solid #cccccc;
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
-  -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-  transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-}
-.lg-input{
-  height: 6em;
-  padding: .5em;
-  font-size: .9em;
-  line-height: 1.3333333em;
-  border-radius: 0.3em;
-}
-.hide{
-	display:none;
-}
-.head{
-	padding:1em;
-
-}
-.ban{
-	height:2.4em;
-	line-height:2.4em;
-	background-color:white;
-	margin-bottom:2px;
-	text-indent:1em;
-	width:100%;
-}
-.bantitle{
-	display:inline-block;
-}
-.slider,.sliderN{
-	display:inline-block;
-	position: relative;
-	float:right;
-	right:.8em;
-	top:.2em;
-	width:3.5em;
-	cursor:pointer;
-}
-.slider1{
-	background:url(/images/wx/on.gif) no-repeat;
-	background-size:3.2em;
-}
-.slider2{
-	background:url(/images/wx/off.png) no-repeat;
-	background-size:3.2em;
-}
-.way{
-	margin-top:0.8em;
-}
-.t{
-	height:2.4em;
-	line-height:2.4em;
-	border-bottom:2px solid #EEEEEE;
-	width:100%;
-	text-indent:1.5em;
-	background-color:#F3F3F3;
-}
-.title{
-	display:inline-block;	
-}
-.n{
-	display:inline-block;
-	min-width:100px;
-	white-space:nowrap;  
-	color:#999999;
-}
-.arrow{
-	display:inline-block;
-	position: relative;
-	float:right;
-	right:.2em;
-	top:.3em;
-	width:3.5em;
-	background:url(/images/wx/d.png) no-repeat;
-	background-size:1.8em;
-	cursor:pointer;
-}
-.top{
-	position:absolute;
-	height:160%;
-	z-index:1000;
-	top:0;
-	width:100%;
-	background-color:#000;
-}
-.infoWay{
-	position:fixed;
-	
-	z-index:1005;
-	width:100%;
-	background-color:white;
-	height:15em;
-	bottom:0;
-}
-.infoT{
-	height:2.2em;
-	line-height:2.2em;
-	background-color:#E2E2E2;
-	text-indent:1em;
-}
-.sel,.content{
-	margin-top:2em;
-}
-.content .text-muted{
-	text-indent:.5em;
-	line-height:2em;
-}
-.sb{
-	width:100%;
-	height:2.2em;
-	line-height:2.2em;
-	border-top:2px solid #F3F3F3;
-	text-align:center;
-	color:#C1C1C1;
-	cursor:pointer;
-}
-.check{
-	color:#333333;
-}
-.bot{
-	text-align:center;
-	position:absolute;
-	width:100%;
-	color:#E15F5E;
-	top:85%;
-	cursor:pointer;
-}
-</style>
-<body>
-<div class="body">
-	<div class="head" >
-	<div><span style="font-size:1.2em;color:#222222">“剑鱼”</span>-借助内置的互联网搜索引擎、大数据平台和自然语言分析系统，为企业从互联网上自动抓取、分析、筛选并推送富有价值的信息情报，比如本企业或其他企业的失信行为信息、受到行政处罚的信息、招标公告、中标公告等等。</div>
-	</div>
-	<div class="module tender" value="tender">
-		<div class="ban" value="tender"><div class="bantitle">招标公告</div><div class="slider slider2">&nbsp;</div></div>
-		<div class="con hide">
-			<div class="t"><div class="title">订阅主题：</div><input type="hidden" value=""/><div class="n zt"></div><div class="arrow" flag="dy">&nbsp;</div></div>
-			<div class="t"><div class="title">信息范围：</div><div class="n fw">全国</div><div class="arrow" flag="xx">&nbsp;</div></div>
-		</div>
-	</div>
-	
-	<div class="module bid" value="bid">
-		<div class="ban" value="bid"><div class="bantitle">中标公告</div><div class="slider slider2">&nbsp;</div></div>
-		<div class="con hide">
-			<div class="t"><div class="title">订阅主题：</div><input type="hidden" value=""/><div class="n zt"></div><div class="arrow" flag="dy">&nbsp;</div></div>
-			<div class="t"><div class="title">信息范围：</div><div class="n fw">全国</div><div class="arrow" flag="xx">&nbsp;</div></div>
-		</div>
-	</div>
-	
-	<div class="module other" disabled>
-		<div class="ban" onClick="alert('企业情报开发中，敬请期待。')"><div class="bantitle">企业情报</div><div class="sliderN slider2">&nbsp;</div></div>
-	</div>
-	
-	<div class="way" style="border-top:2px solid #F3F3F3;">
-		<div class="ban" value="a_weixin" v="3"><div class="bantitle">微信提醒</div><div class="slider slider2">&nbsp;</div></div>
-		<div class="ban" value="a_mail" v="2"><div class="bantitle">邮件提醒</div><div class="slider slider2">&nbsp;</div></div>
-	</div>
-
-	<div class="ban" style="background-color:#F9F9F9;"><div class="bantitle" style="cursor:pointer" onClick="window.location.href='/mobile/advise'">意见反馈</div></div>
-	
-</div>
-<div class="top hide"></div>
-<div class="infoWay hide xx">
-		<div class="infoT">信息范围</div>
-		<div class="sel">
-			<div class="sb check">全国</div>
-			{{if .T.sname }}
-				<div class="sb" value="{{.T.sname}}">本省({{.T.sname}})</div>
-			{{end}}
-		</div>
-		<div class="bot" onClick="surexx()">确定</div>
-</div>
-<div class="infoWay hide dy">
-		<div class="infoT">订阅主题</div>
-		<div class="content">
-		<div class="text-muted">示例:综合布线 视频会议 3D+打印机</div>
-		<textarea  placeholder='说明:最多输入5个订阅主题，每个主题之间用空格分开，每个订阅主题可以包含一个或多个关键字，关键字之间用“+”号连接。' class="form-control lg-input" ></textarea>
-		</div>
-		<div class="bot" onClick="suredy()">确定</div>
-</div>
-<script>
-var msgset={{.T.msgset}}
-
-function save(){
-	var obj,mode=[]
-	$("div.way .slider1").each(function(i,ad){
-		mode.push($(ad).closest("div.ban").attr("v"))
-	})
-	$("div.module .slider1").each(function(i,ad){
-		var ban=$(ad).closest(".ban")
-		var moduleval=ban.attr("value")
-		var con=ban.next(".con")
-		var key=con.find("input").val()
-		var keys=key.trim().replace(/\r\n/g,"").split(/\s+/)
-		if(keys.length>5){
-			alert("关键词不能超过5个。")			
-			return false;
-		}else if(key.trim()==""){
-			
-		}else{
-			for(var k=0;k<keys.length;k++){
-				if(keys[k].length>100){
-					alert("关键词长度不能大于100");
-					return false
-					break;
-				}
-			}
-			if(!obj) obj={}
-			if(!obj[moduleval]) obj[moduleval]={}	
-			obj[moduleval].a_key=keys;
-			var scope=con.find("div.fw").text();
-			if(scope=="全国"){
-				scope="A"
-			}else{
-				scope=scope.replace(/本省\((.*)\)/g,"$1")
-			}
-			obj[moduleval].s_scope=scope
-			obj[moduleval].a_mode=mode		
-		}
-	})
-	if(!obj){
-		obj="";
-	}
-	$.post("/swordfish/msgpushsetting/msgset",{data:jsonToString(obj),mid:"{{.T.mid}}"})
-}
-var wordw=20;
-function resizeCon(){
-	var winw=$(window).width();
-	var tw=100;
-	if (winw>300){
-		tw=winw-200;
-	}
-	var tl=tw/20;
-	$(".zt").each(function(i,ad){
-		var v=$(ad).prev("input").val();
-		if(v){
-			$(ad).text(v.length>tl?(v.substring(0,tl)+".."):v)
-		}else{
-			$(ad).text("")
-		}
-	})
-}
-
-var sthis="";
-$(function(){
-	$(".top").css({'opacity':'0.5'});
-	resizeCon();
-	window.onresize=resizeCon
-	$(".t").click(function(){
-		sthis=$(this).closest(".module").attr("value")
-		$(".top").show();
-		var sshow=$(this).find(".arrow").attr("flag");
-		$("."+sshow).show();
-		if(sshow=="dy"){
-			$("textarea").val($(this).find("input").val())
-		}else if(sshow=="xx"){
-			$(".sel .sb").removeClass("check")
-			$(".sel .sb:contains("+$(this).find(".fw").text()+")").addClass("check")
-		}
-	})
-	$(".sb").click(function(){
-		$(this).closest(".sel").find(".sb").removeClass("check");
-		$(this).addClass("check");
-	})
-	
-	$(".slider").click(function(){
-		var val=$(this).closest(".ban").attr("value")
-		var bcheck=false;
-		if($(this).hasClass("slider1")){
-			$(this).removeClass("slider1").addClass("slider2")
-		}else{
-			$(this).removeClass("slider2").addClass("slider1")		
-			bcheck=true;
-		}
-		if(val.indexOf("a_")>-1){
-			//weixin/mail
-		}else{
-			//tender/bid
-			if(bcheck){
-				$(".module[value="+val+"] .con").show()
-			}else{
-				$(".module[value="+val+"] .con").hide()				
-			}
-		}
-	})
-		
-	setTimeout(function(){	
-		for(var i in msgset){
-			try{
-				var m=$("."+i)
-				//$("input[name=moduleCheck][value='"+i+"']").prop("checked",true)
-				//$("span.moduleCheck",m).click();//removeClass("noselect2").addClass("select2");
-				$(".slider",m).click();
-				var key=msgset[i].a_key
-				$("input",m).val(key.join(" "))
-				var scope=msgset[i].s_scope
-				if(scope=="A"){
-					$(".fw",m).text("全国")
-				}else if(scope.length>1){
-					$(".fw",m).text("本省("+scope+")")					
-				}
-				var a_mode=msgset[i].a_mode
-				$(".way .ban").each(function(n,ws){
-					$(a_mode).each(function(i,ad){
-						if($(ws).attr("v")==ad){
-							if(!$(ws).find(".slider").hasClass("slider1")){
-								$(ws).find(".slider").click();
-							}
-						}
-					})
-				})
-			}catch(e){
-				
-			}
-			resizeCon();
-		}
-	},8)
-	
-	setTimeout(function(){	
-		$(".slider").click(function(){
-			save()
-		})
-	},10)
-})
-function surexx(){
-	$(".xx").hide();
-	$(".top").hide();
-	$(".module[value="+sthis+"] .fw").text($(".sel .check").text());
-	$(".sel .sb").removeClass("check")
-	save();
-}
-function suredy(){
-	var keys=$("textarea").val().trim().replace(/\r\n/g,"").split(/\s+/)
-	if(keys.length>5){
-			alert("关键词不能超过5个。")			
-			return false;
-	}
-	for(var k=0;k<keys.length;k++){
-		if(keys[k].length>100){
-			alert("关键词长度不能大于100");
-			return false
-			break;
-		}
-	}
-	$(".dy").hide();
-	$(".top").hide();
-	$(".module[value="+sthis+"] input").val($("textarea").val())
-	$("textarea").val("")
-	resizeCon();
-	save();
-}
-jsonToString = function(o,f) {
-	var r = [];
-	if (typeof o == "string")
-		return "\"" + o.replace(/([\'\"\\])/g, "\\$1").replace(/(\n)/g, "\\n").replace(/(\r)/g, "\\r").replace(/(\t)/g, "\\t") + "\"";
-	if (typeof o == "object") {
-		if (!o.sort) {
-			for ( var i in o)
-				r.push((f?i:("\""+i + "\"")) +":"+ jsonToString(o[i]));
-			if (!!document.all && !/^\n?function\s*toString\(\)\s*\{\n?\s*\[native code\]\n?\s*\}\n?\s*$/.test(o.toString)) {
-				r.push("toString:" + o.toString.toString());
-			}
-			r = "{" + r.join() + "}";
-		} else {
-			for (var i = 0; i < o.length; i++)
-				r.push(jsonToString(o[i]));
-			r = "[" + r.join() + "]";
-		}
-		return r;
-	}
-	return o?o.toString():"";
-};
-</script>
-</body>
-</html>

core/src/web/templates/member/message/swordfish.html → core/src/web/templates/swordfish/index.html

@@ -41,7 +41,7 @@
 					<i class="bootstrap-glyphicon glyphicon glyphicon-menu-right" href="#swordfish-guide" data-slide="next"></i>
 				</div>
 				<span class="swordfish-guide-bottom">
-					<a class="btn" role="button" href="/member/rssset">立即体验</a>
+					<a class="btn" role="button" id="experience">立即体验</a>
 					<ol class="carousel-indicators">
 					    <li data-target="#swordfish-guide" data-slide-to="0" class="active"></li>
 					    <li data-target="#swordfish-guide" data-slide-to="1"></li>
@@ -65,52 +65,19 @@
 <script type="text/javascript">
 $(function(){
 	$('#swordfish-guide').carousel({
-	  interval: 3000
+	  	interval: 8000
 	});
 	//
 	var data = {{.T.data}};
-	if(data != ""){
-		var publishtime = data.a_publishtime;
-		var visitedindex = data.a_visitedindex;
-		$("#list").html(data.s_content);
-		$("#list>div").each(function(i){
-			if(i > 9){
-				$(this).remove();
-				return true;
-			}
-			if(i == 0){
-				$(this).remove();
-			}else{
-				//已访问过的灰色
-				if(typeof(visitedindex) != "undefined"){
-					var xh = $(this).children(".xh").text();
-					xh = xh.replace(".","");
-					for(var i=0;i<visitedindex.length;i++){
-						if(xh == visitedindex[i]){
-							$(this).find("a.bt").addClass("swordfish-visited");
-						}
-					}
-				}
-				$(this).children(".xh").remove();
-				if(typeof(publishtime) != "undefined" && typeof(publishtime[i+1]) != "undefined"){
-					var time = new Date(Number(publishtime[i+1]+"000")).Format("yyyy-MM-dd hh:mm:ss")
-					$(this).prepend('<div class="time"><img src="/images/swordfish/circle.png">'+time+'</div>');
-				}
-				var bt = $(this).children(".bt");
-				var href = bt.attr("href");
-				if (href.indexOf("java") == -1){							
-					bt.attr("s",href).attr("href","javascript:void(0);");
-				}
-				bt.click(function(){
-					if(!$(this).hasClass("swordfish-visited")){
-						$(this).addClass("swordfish-visited");
-						$.post("/wxpush/bid/ajaxReq",{_id:data._id,index:$(this).parent().index()+1});
-					}
-					open_window($(this).attr("s"));
-					return false;
-				});
-			}
-		});
+	if(data != "" && data.length > 0){
+		var html = '';
+		for(var i=0;i<data.length;i++){
+			html += '<div class="tslist"><div class="time"><img src="/images/swordfish/circle.png">'
+					+new Date(Number(data[i].publishtime+"000")).Format("yyyy-MM-dd hh:mm:ss")
+					+'</div><a class="bt" target="_blank" href="javascript:void(0);" onclick="open_window(\''+data[i].href+'\')">'
+					+data[i].title+'</a></div>';
+		}
+		$("#list").html(html);
 	}else{
 		$(".swordfish-index").find(".swordfish-left").removeClass("col-xs-9");
 		$(".swordfish-index").find(".swordfish-right").remove();

core/src/web/templates/member/message/infolist.html → core/src/web/templates/swordfish/infolist.html

@@ -11,7 +11,7 @@ $(function(){
 	//
 	$.ajax({    
 		type:'post',        
-		url:'/member/message/swordfishlist',    
+		url:'/member/swordfish/swordfishlist',    
 		data:{lasttime:lasttime},    
 		cache:false,    
         dataType:'json',
@@ -19,12 +19,12 @@ $(function(){
 			if (data.success == false){
 					$("#more").hide();
 					$("#forkw").hide();
-					$("#conlist").html('<div id="kong" onClick="javascript:window.location.href=\'/member/rssset\'" class="text-center">你还没有设置关键字！请设置关键字！</div>');
+					$("#conlist").html('<div id="kong" onClick="javascript:window.location.href=\'/member/swordfish/rssset\'" class="text-center">没找到和你的关键词匹配的信息，去修改关键词！</div>');
 					return;
 			}
 			var res=data.data;
 			lasttime=data.thistime;
-			$.post('/member/message/swordfishlist',{lasttime:lasttime},function(data){
+			$.post('/member/swordfish/swordfishlist',{lasttime:lasttime},function(data){
 				if(data.success == false) {
 					$("#more").hide()
 					return;
@@ -60,6 +60,9 @@ $(function(){
 			}else{
 				$("#zhongb").addClass("hide");
 			}
+			if(s_words.length!=0 && a_interest.length!=0){
+				$("#zhaob>font").prepend("，");
+			}
 			
 			//信息条总数
 			le=$(".tslist").length;
@@ -158,14 +161,14 @@ function setVisitedIndex(obj){
 	f_id=obj.attr("f_id");
 	var index = obj.parent().attr("id")
 	obj.addClass("visited");
-	$.post("/member/message/setVisited",{_id:f_id,index:index});
+	$.post("/member/swordfish/setVisited",{_id:f_id,index:index});
 }
 //加载更多
 function loadMore(){
 		var vi="";
-		$.post('/member/message/swordfishlist',{lasttime:lasttime},function(data){
+		$.post('/member/swordfish/swordfishlist',{lasttime:lasttime},function(data){
 			lasttime=data.thistime;
-			$.post('/member/message/swordfishlist',{lasttime:lasttime},function(data){
+			$.post('/member/swordfish/swordfishlist',{lasttime:lasttime},function(data){
 				if(data.success == false) {
 					$("#more").hide()
 					return;
@@ -301,7 +304,7 @@ function loadMore(){
 .tim{padding:21px 0px;}
 .row{margin-left:10px;margin-right:10px;}
 #ycwords>div:first-child{display:none;}
-#forkw{padding:30px 0px 30px 50px;}
+#forkw{margin-top: 15px;padding:10px 0px 10px 50px;background-color: #F7F8FA;}
 .xh{width: 10%;color:#35C5DA;font-size:15px;font-weight:bold;margin:0px 20px;float:left;display: inline-block; width:18px;text-align:right;}
 .tslist{border-bottom:1px solid #ccc;width:100%; padding:15px 0px;}
 #timestamp{color:#ccc;}
@@ -325,7 +328,7 @@ function loadMore(){
 			</div>
 			
 			<!-- 关键词提示start -->
-			<div id="forkw" >根据你设置的关键词<span id="zhongb">　招标公告（<span style="color:#FF5A5F;"  id="ointerest"></span>）</span><span id="zhaob">　中标公告（<span style="color:#FF5A5F;"  id="okeywords"></span>）</span>　为你推送以下信息：</div>
+			<div id="forkw" >根据你设置的关键词<span id="zhongb"><font style="color:#FF5A5F;">招标公告</font>（<span id="ointerest"></span>）</span><span id="zhaob"><font style="color:#FF5A5F;">中标公告</font>（<span id="okeywords"></span>）</span>为你推送以下信息：</div>
 			<!-- 关键词提示end -->
 			<!-- 列表start -->
 			<div class="row"><div  class="col-sm-12" id="conlist"></div></div>

core/src/web/templates/member/message/rssset.html → core/src/web/templates/swordfish/rssset.html

@@ -40,7 +40,7 @@
 						<div class="swordfish-panel-c-t">
 							<span></span><div data-toggle="modal" data-target="#tender-scope-dialog">信息范围<i class="bootstrap-glyphicon glyphicon glyphicon-menu-down"></i></div>
 						</div>
-						<div class="swordfish-panel-c-c swordfish-scope">
+						<div class="swordfish-panel-c-c swordfish-scope" data-toggle="modal" data-target="#tender-scope-dialog">
 						
 						</div>
 					</div>
@@ -65,7 +65,7 @@
 						<div class="swordfish-panel-c-t">
 							<span></span><div data-toggle="modal" data-target="#bid-scope-dialog">信息范围<i class="bootstrap-glyphicon glyphicon glyphicon-menu-down"></i></div>
 						</div>
-						<div class="swordfish-panel-c-c swordfish-scope">
+						<div class="swordfish-panel-c-c swordfish-scope" data-toggle="modal" data-target="#bid-scope-dialog">
 							
 						</div>
 					</div>
@@ -233,12 +233,13 @@
 {{include "/common/bottom.html"}}
 <script type="text/javascript">
 $(function(){
-	var selectKeyword = function(type,keyword,n){
+	var selectKeyword = function(type,keyword){
 		if(keyword == "" || typeof(keyword) == "undefined"){
+			autoChecked(type,false);
 			return;
 		}
 		for(var i=0;i<keyword.length;i++){
-			appendKeyWord(type,keyword[i].replace(/\+/g," "),n);
+			appendKeyWord(type,keyword[i].replace(/\+/g," "));
 		}
 	}
 	var selectScope = function(type,scope){
@@ -265,14 +266,12 @@ $(function(){
 	var msgset = {{.T.msgset}};
 	if(msgset != ""){
 		if(typeof(msgset.tender) != "undefined"){
-			selectKeyword("tender",msgset.tender.a_key,1);
 			selectScope("tender",msgset.tender.s_scope);
-			autoChecked("tender",false,msgset.tender.s_scope,1);
+			selectKeyword("tender",msgset.tender.a_key);
 		}
 		if(typeof(msgset.bid) != "undefined"){
-			selectKeyword("bid",msgset.bid.a_key,1);
 			selectScope("bid",msgset.bid.s_scope);
-			autoChecked("bid",false,msgset.bid.s_scope,1);
+			selectKeyword("bid",msgset.bid.a_key);
 		}
 	}
 	$(".swordfish-nva>ul>li:eq(2)").addClass("swordfish-nva-active");
@@ -332,15 +331,9 @@ function afterSelectScope(type,btn){
 	autoChecked(type,true);
 	ajaxReq();
 }
-function autoChecked(type,flag,msg,n){
-
+function autoChecked(type,flag){
 	var obj = $("#"+type);
-	if(n==1){
-		if(msg.length=0){
-			obj.find(".swordfish-scope").html('<button class="btn swordfish-btn-a swordfish-country">全国</button>');
-			$("#"+type+"-scope-dialog li:first .btn").addClass("swordfish-btn-a");
-		}
-	}else if(obj.find(".swordfish-scope").children(".btn").length == 0){
+	if(obj.find(".swordfish-scope").children(".btn").length == 0){
 		obj.find(".swordfish-scope").html('<button class="btn swordfish-btn-a swordfish-country">全国</button>');
 		$("#"+type+"-scope-dialog li:first .btn").addClass("swordfish-btn-a");
 	}
@@ -357,7 +350,7 @@ function autoChecked(type,flag,msg,n){
 		ajaxReq();
 	}
 }
-function appendKeyWord(type,value,n){
+function appendKeyWord(type,value){
 	this.getHtml = function(index,value){
 		return '<div class="swordfish-keyword">'
 					+'<b>关键词<font>'+index+'</font>：</b>'
@@ -386,7 +379,7 @@ function appendKeyWord(type,value,n){
 		autoChecked(type,false);
 		ajaxReq();
 	});
-	autoChecked(type,false,"",n);
+	autoChecked(type,false);
 }
 function ajaxReq(){
 	var thisClass = this;
@@ -433,7 +426,7 @@ function ajaxReq(){
 	/*****************************************/
 	$.ajax({
 		type: "POST",
-		url: "/member/rssset/ajaxReq",
+		url: "/member/swordfish/rssset/ajaxReq",
 		data: dataObj,
 		dataType: "json",
 		traditional: true,

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

@@ -1,53 +0,0 @@
-<html>
-<head>
-<title>剑鱼_企明星</title>
-{{include "/common/inc.html"}}
-</head>
-<body>
-{{include "/common/head.html"}}
-<div class="a-content text-center a-entcommunity">
-<img class="carousel-inner img-responsive img-rounded invisible center-block" src="/images/qfw-fish.png">
-<div class="margin-b-20">
-{{if session "userId"}}
-<script>
-var utype= {{session "userType"}}
-if(utype==0){
-	window.location.href='/manage/system';
-}else{
-	window.location.href='/member/swordfish';
-}
-</script>
-{{else}}
-<a href="javascript:void(0)" class="btn btn-primary fishdl">扫码登录</a><br>
-<span class="text-muted">扫码登录即可免费体验</span>
-{{end}}
-</div>	
-</div>
-{{include "/common/bottom.html"}}
-<script>
-loginBackType = -1;
-webSiteInitFlag = false;
-$(function(){
-	setNavbarActive(1);
-	setTimeout(function(){
-		var h = $(".a-entcommunity>div").offset().top + $(".a-entcommunity>div").height() - document.body.clientHeight;
-		if(h > 0){
-			$(".a-entcommunity>img").css({width:($(".a-entcommunity>img").height()-h)/$(".a-entcommunity>img").height()*$(".a-entcommunity>img").width(),height:$(".a-entcommunity>img").height()-h})
-									.removeClass("invisible");
-			webSiteInitFlag = true;
-			webSiteInit();
-		}else{
-			$(".a-entcommunity>img").removeClass("invisible");
-		}
-	},100);
-	$(".a-entcommunity .a-com-login,.fishdl").click(function(){
-		loginModalShow();
-	});
-});
-
-function publicCallBack(){
-	window.location.href="/member/swordfish";
-}
-</script>
-</body>
-</html>