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

common/src/qfw/util/credit/credit.go

@@ -6,8 +6,6 @@ import (
 	"qfw/util"
 	mogo "qfw/util/mongodb"
 	"qfw/util/rpc"
-	"strconv"
-	"strings"
 )
 
 var Rc rpc.RpcCall
@@ -16,14 +14,21 @@ var CreditA map[string]uint64
 var SysConfig map[string]interface{}
 
 const (
-	A_ZC   = "a1" //注册
-	A_RZ   = "a2" //认证
-	A_CJMP = "a3" //创建名片
-	A_BYX  = "a4" //绑定邮箱
-	A_BSJ  = "a5" //绑定手机
-	A_SCMP = "a6" //收藏名片
-	A_SCFW = "a7" //收藏服务
-	A_SYJY = "a8" //使用剑鱼
+	A_ZC     = "a1"  //注册
+	A_RZ     = "a2"  //认证
+	A_CJMP   = "a3"  //创建名片
+	A_BYX    = "a4"  //绑定邮箱
+	A_BSJ    = "a5"  //绑定手机
+	A_SCMP   = "a6"  //收藏名片
+	A_SCFW   = "a7"  //收藏服务
+	A_SYJY   = "a8"  //使用剑鱼
+	A_QYCX   = "a9"  //使用企业查询
+	A_FFW    = "a10" //发服务
+	A_FXQ    = "a11" //发需求
+	A_CKGXW  = "a12" //查看关系网
+	A_FXFW   = "a13" //分享服务
+	A_WCJY   = "a14" //完成交易
+	A_WCJYPJ = "a15" //完成交易评价
 
 	B_QD   = "b1" //签到
 	B_FFW  = "b2" //发服务
@@ -31,7 +36,7 @@ const (
 	B_FXFW = "b4" //分享服务
 	C_JY   = "c1" //交易
 	C_PJ   = "c2" //评价
-	C_TG   = "c3" //推广用户
+	C_TG   = "c3" //邀请用户
 
 	D_WXCZ  = "d1" //微信充值
 	E_EWMZR = "e1" //二维码转入
@@ -41,15 +46,11 @@ const (
 
 func init() {
 	util.ReadConfig(&SysConfig)
-	tmp := strings.Split(SysConfig["credit_a"].(string), ",")
 	CreditA = make(map[string]uint64)
-	for _, v := range tmp {
-		if len(v) > 1 {
-			n, _ := strconv.Atoi(v[1:])
-			CreditA[v] = uint64(n)
-		}
+	//初始化一次性任务
+	for i := 1; i < 16; i++ {
+		CreditA["a"+fmt.Sprint(i)] = uint64(i)
 	}
-
 	Rc = rpc.RpcCall{Addr: SysConfig["creditRpc"].(string)}
 }
 

common/src/qfw/util/encrypt_test.go

@@ -10,12 +10,9 @@ import (
 
 //加密解密测试
 func TestEncrypt(t *testing.T) {
-	se := &SimpleEncrypt{Key: "123456"}
-	tmp := []byte("这是一段测试文本")
-	se.Encode(&tmp)
-	log.Println(string(tmp))
-	se.Decode(&tmp)
-	log.Println(string(tmp))
+	se := &SimpleEncrypt{Key: "topnet"}
+
+	log.Println(se.EncodeString("oJULtwzXo6EFV1Ah-XeyRBimXGM8,ff,ff,swordfishaction"))
 }
 
 func Test_sim(t *testing.T) {

core/src/config.json

@@ -29,7 +29,6 @@
     "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",
 	"domainName":"http://www.qimingxing.info"
 
 }

core/src/main.go

@@ -11,6 +11,7 @@ import (
 	_ "qfw/front"
 	_ "qfw/manage"
 	_ "qfw/member"
+	_ "qfw/member/credit"
 	_ "qfw/member/message"
 	_ "qfw/microwebsite"
 	_ "qfw/mobile"

core/src/qfw/member/credit/credit.go

@@ -0,0 +1,13 @@
+// credit
+/**积分模块
+**张金坤
+**/
+package credit
+
+import (
+	"github.com/go-xweb/xweb"
+)
+
+func init() {
+	xweb.AddAction(&credit{})
+}

core/src/qfw/member/credit/creditdetail.go

@@ -0,0 +1,50 @@
+/**积分模块
+**张金坤
+**/
+package credit
+
+import (
+	"github.com/go-xweb/xweb"
+	"log"
+	"qfw/util"
+	cd "qfw/util/credit"
+	"qfw/util/mongodb"
+)
+
+type credit struct {
+	*xweb.Action
+	myCredit   xweb.Mapper `xweb:"/member/credit/myCredit"`   //我的积分
+	creditRule xweb.Mapper `xweb:"/member/credit/creditRule"` //积分规则
+}
+
+func (c *credit) MyCredit() error {
+	userId := util.ObjToString(c.GetSession("userId"))
+	log.Println("userId", userId)
+	if len(userId) > 0 {
+		user := *mongodb.FindById("user", userId, nil)
+		c.T["user"] = user
+		credit_a := util.IntAll(user["credit_a"])
+		c.T["A_RZ"] = cd.AIsHasDo(cd.A_RZ, credit_a)         //认证
+		c.T["A_CJMP"] = cd.AIsHasDo(cd.A_CJMP, credit_a)     //创建名片
+		c.T["A_BYX"] = cd.AIsHasDo(cd.A_BYX, credit_a)       //绑定邮箱
+		c.T["A_BSJ"] = cd.AIsHasDo(cd.A_BSJ, credit_a)       //绑定手机
+		c.T["A_SCMP"] = cd.AIsHasDo(cd.A_SCMP, credit_a)     //收藏名片
+		c.T["A_SCFW"] = cd.AIsHasDo(cd.A_SCFW, credit_a)     //收藏服务
+		c.T["A_SYJY"] = cd.AIsHasDo(cd.A_SYJY, credit_a)     //使用剑鱼
+		c.T["A_QYCX"] = cd.AIsHasDo(cd.A_QYCX, credit_a)     //使用企业查询
+		c.T["A_FFW"] = cd.AIsHasDo(cd.A_FFW, credit_a)       //发服务
+		c.T["A_FXQ"] = cd.AIsHasDo(cd.A_FXQ, credit_a)       //发需求
+		c.T["A_CKGXW"] = cd.AIsHasDo(cd.A_CKGXW, credit_a)   //查看关系网
+		c.T["A_FXFW"] = cd.AIsHasDo(cd.A_FXFW, credit_a)     //分享服务
+		c.T["A_WCJY"] = cd.AIsHasDo(cd.A_WCJY, credit_a)     //完成交易
+		c.T["A_WCJYPJ"] = cd.AIsHasDo(cd.A_WCJYPJ, credit_a) //完成交易评价
+		return c.Render("/member/credit/mycredit.html", &c.T)
+	} else {
+		return nil
+	}
+	return c.Render("/member/credit/mycredit.html")
+}
+
+func (c *credit) CreditRule() error {
+	return c.Render("/member/credit/creditrule.html")
+}

core/src/qfw/mobile/wxmenu.go

@@ -43,11 +43,13 @@ func (m *Mobile) Wxrssset() error {
 			}
 		}
 	}()
-	if m.Session().Get("userId") != nil {
+	userId := m.Session().Get("userId")
+	//userId = "55a39942af53740186000004"
+	if userId != nil {
 		m.T["signature"] = getSignature(m.Url())
-		userInfo := mongodb.FindById("user", m.GetSession("userId").(string), nil)
+		userInfo := mongodb.FindById("user", 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{}{
+			mongodb.Update("user", `{"_id":"`+userId.(string)+`"}`, map[string]interface{}{
 				"$set": map[string]interface{}{
 					"i_m_guide": 1,
 				},
@@ -208,22 +210,20 @@ func (m *Mobile) AjaxReq() error {
 		if userId := m.GetSession("userId"); userId != nil {
 			msgset := make(map[string]interface{})
 			//投标公告
-			if flag, _ := m.GetBool("tender_flag"); flag {
-				tender := make(map[string]interface{})
-				tender["a_key"] = m.GetSlice("tender_keys")
-				tender["s_scope"] = m.GetString("tender_scope")
-				msgset["tender"] = tender
-			}
-			//中标公告
-			if flag, _ := m.GetBool("bid_flag"); flag {
-				bid := make(map[string]interface{})
-				bid["a_key"] = m.GetSlice("bid_keys")
-				bid["s_scope"] = m.GetString("bid_scope")
-				msgset["bid"] = bid
+			set := make(map[string]interface{})
+			for _, v := range []string{"tender", "bid"} {
+				if len(m.GetString(v+"_scope")) > 0 {
+					tmp := make(map[string]interface{})
+					tmp["a_key"] = m.GetSlice(v + "_keys")
+					tmp["s_scope"] = m.GetString(v + "_scope")
+					tmp["i_status"], _ = m.GetInteger(v + "_status")
+					tmp["l_modifydate"] = time.Now().Unix()
+					set["o_msgset."+v] = tmp
+				}
 			}
 			//更新数据库
 			msgset["l_modifydate"] = time.Now().Unix()
-			if mongodb.Update("user", `{"_id":"`+userId.(string)+`"}`, &map[string]interface{}{"$set": map[string]interface{}{"o_msgset": msgset}}, false, false) {
+			if mongodb.Update("user", `{"_id":"`+userId.(string)+`"}`, &map[string]interface{}{"$set": set}, false, false) {
 				flag = "y"
 			}
 		}

core/src/qfw/search/searchService.go

@@ -180,6 +180,7 @@ func (n *Search) Sim() error {
 		return nil
 	}
 	searchResult, err := client.Search().Index("enterprise").Type("enterprise").Source(query).Do()
+
 	if err != nil {
 		n.ServeJson(&res)
 		return nil

core/src/timetask.json

@@ -1,2 +1 @@
-{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-11 14:05:58"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-11 14:05:58"}},"marketisstart":true,"marketrate":300}
-
+{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-13 18:36:29"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-13 18:36:29"}},"marketisstart":true,"marketrate":300}

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

@@ -54,10 +54,6 @@ a{
 .text-small{
 	font-size:12px;
 }
-.bootstrap-glyphicon {
-	font-family: 'Glyphicons Halflings' !important;
-}
-
 .a-com-active {
 	background-color: #dd4814;
 }
@@ -72,7 +68,7 @@ a{
 	max-width: 1200px;
 	margin-left: auto;
 	margin-right: auto;
-	padding: 0px 5px;
+	padding: 0px;
 }
 
 .a-content .a-c-left,.a-content .a-c-right{
@@ -882,7 +878,7 @@ a{
 }
 
 .a-index-want li.a-com-last{
-	padding: 10px 5px 0px 5px;
+	padding: 10px 0px 0px 15px;
 }
 
 .a-index-want div{
@@ -954,7 +950,7 @@ a{
 	padding-left:10px;
 }
 .a-index-hd>img{
-	width: 295px;
+	width: 305px;
 	height: 130px;
 }
 /*扫码送红包活动 start*/
@@ -2120,6 +2116,9 @@ style="color:#D03102;margin-right:5px;"
 	width: 82px;
 }
 /*********b版网站顶部***********/
+.b-body{
+	background-color: #f0f0f0;
+}
 .logo{
 	width: 156px;
 	height: 55px;
@@ -2141,7 +2140,7 @@ style="color:#D03102;margin-right:5px;"
 	font-size: 12px;
 	font-family: "SimSun";
 }
-.b-top>div,.swordfish-content{
+.b-top>div,.b-content{
 	max-width: 1200px;
 	margin: auto;
 }
@@ -2282,10 +2281,10 @@ style="color:#D03102;margin-right:5px;"
 }
 .b-head .head-hideMenu i.ren1{
 	margin-left: 2px;
+	margin-right: 5px;
 }
 .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;
@@ -2299,6 +2298,56 @@ style="color:#D03102;margin-right:5px;"
 .b-head a{
 	text-decoration: none;
 }
+.b-head .b-h-search{
+	padding-top: 14px;
+}
+.b-head .b-h-search .input-group{
+	width: 300px;
+}
+.b-head .b-h-search .form-control{
+	border-radius: 50px !important;
+}
+.b-head .b-h-search form>span i {
+    position: absolute;
+    right: 10px;
+    top: 50%;
+    z-index: 10;
+    font-size: 14px;
+    margin-top: -7px;
+	color:#fff;
+}
+.b-head .b-h-search form>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;
+}
+.b-content{
+	padding: 15px 0px 15px 0px;
+}
+.b-left{
+	background-color: #FFFFFF;
+	padding: 15px;
+	width: 940px;
+	display: inline-block;
+	vertical-align: top;
+}
+.b-right{
+	background-color: #FFFFFF;
+	width: 250px;
+	display: inline-block;
+	vertical-align: top;
+	float: right;
+}
+.b-right-content{
+	padding: 10px;
+}
 /*认证完第一次登录 end*/
 /*分辨率小于1200的时候调整布局，算上滚动条1217*/
 @media (max-width: 1217px) {

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

@@ -0,0 +1,69 @@
+body{
+	background-color: #f0f0f0;
+}
+a:focus, a:hover{
+	color: #16a086;
+}
+.b-round-dot{
+	background-color: #16a086;
+}
+.b-nav{
+	border-top-color: #16a086;
+}
+.b-nav-main{
+	background-color: #16a086;
+}
+.b-h-search{
+	padding-left: 30px;
+}
+.b-round-dot{
+	background-color: #16a086;
+}
+.b-head .b-h-search form>span{
+	background-color: #16a086;
+}
+.b-head .b-com-third{
+	background-color: #16a086;
+}
+.b-head .head-hideMenu i{
+	color: #16a086;
+}
+.b-head .head-hideMenu li:hover{
+	background-color: #16a086;
+}
+.ttcon ul li:hover{
+	color: #16a086;
+}
+.text-primary{
+	color: #16a086 !important;
+}
+.entlist-page .nav-tabs{
+	background-color: #f0f0f0;
+	margin-top: 20px;
+	margin-left: -15px;
+	margin-right: -15px;
+	padding-left: 15px;
+	border: 0px;
+}
+.entlist-page .nav-tabs>li{
+	width: 100px;
+	border-radius: 0px;
+	text-align: center;
+	height: 45px;
+}
+.entlist-page .nav-tabs>li>a{
+	border-radius: 0px;
+	border-width: 0px !important;
+	margin-right: 0px;
+	padding: 11px 15px
+}
+.entlist-page .nav-tabs>li>a:hover{
+	border: none;
+	background: none;
+}
+.entlist-page .nav-tabs>.active{
+	border-top: 3px solid #16a086;
+}
+.entlist-page .nav-tabs>.active:hover{
+	background-color: #FFFFFF;
+}

core/src/web/staticres/css/enterprise.css

@@ -2,9 +2,7 @@
 .qfw-row { margin-left: 0px; margin-right: 0px;}
 #titleactionimgs  img{margin-left:15px;width:18px;height:18px;}
 #titleactionimgs  h3{font-family: "微软雅黑 Regular", "微软雅黑";font-weight: normal;}
-
-.qfw-p-margintoplist{margin-top:10px;background-color: #fff;}
-.qfw-p-margintop{margin-top:10px;background-color: #fff;filter: alpha(Opacity=95);-moz-opacity: 0.95;opacity: 0.95;}
+.qfw-p-margintop{margin-top:5px;background-color: #fff;}
 .qfw-row-marginbottom{margin-bottom:10px;}
 span.highlight {
     text-decoration: inherit;
@@ -24,7 +22,7 @@ span.highlight {
 .rowsolid-bottom{
 	border-bottom:1px solid #CCCCCC;	
 }
-.rowFltt .qfw-text-more{position:absolute;right:10px;top:7px;cursor:pointer;}
+.rowFltt .qfw-text-more{position:absolute;right:10px;top:7px;cursor:pointer;color: #16a086;}
 .tt{
 	width:90px;
 	padding-left: 15px;
@@ -55,20 +53,16 @@ span.highlight {
 	cursor:pointer;
 	margin-top:-2px;
 }
-.ttcon ul li:hover{
-	color:#DE5E4E
-}
 .sel{
-  width: 20%;
-  min-width:80px;
-  max-width:180px;
-  height: 25px;
-
-  font-size: 14px;
-  color: #555;
-  background-color: #fff;
-  border: 1px solid #ccc;
-  border-radius: 4px;
+	width: 20%;
+	min-width:80px;
+	max-width:180px;
+	height: 35px;
+	font-size: 14px;
+	color: #555;
+	background-color: #fff;
+	border: 1px solid #ccc;
+	margin-right: 15px;
 }
 
 /******注册资本、认证*******/
@@ -329,4 +323,4 @@ form{margin-bottom: 0px;}
 	.identactionType{
 		color: #dd4814 ;
 	}
-}
+}

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

@@ -1,3 +1,6 @@
+body{
+	background-color: #f0f0f0;
+}
 /****indexhead*****/
 .b-nav{
     border-top-color: #FF5A5F;
@@ -16,41 +19,13 @@
 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;
+.b-head .b-h-search span{
 	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;
 }
@@ -60,36 +35,6 @@ a:focus, a:hover{
 .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 {
@@ -294,10 +239,6 @@ a:focus, a:hover{
     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;
 }
@@ -320,9 +261,6 @@ a:focus, a:hover{
 	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;
 }
@@ -382,11 +320,6 @@ a:focus, a:hover{
 .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;

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

@@ -463,6 +463,9 @@ a.new_red:hover, a.new_red:active {
 }
 
 /*==========覆盖bootstrap样式 start===========*/
+.bootstrap-glyphicon {
+	font-family: 'Glyphicons Halflings' !important;
+}
 [class*="col-"] {
 	padding-left: 0px !important;
 }
@@ -513,6 +516,9 @@ a.new_red:hover, a.new_red:active {
 .modal-header .close:focus, .modal-header .close:hover{
 	opacity: 1;
 }
+.form-control{
+	border-radius: 0px;
+}
 /*==========覆盖bootstrap样式 end===========*/
 .lineb {
 	display: inline-block;

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

@@ -1,6 +1,6 @@
 /********可以共用********/
 body{
-	background-color: #F0F0F0;
+	background-color: #f0f0f0;
 }
 a:focus, a:hover{
 	color: #37C6DA;
@@ -8,6 +8,12 @@ a:focus, a:hover{
 .b-round-dot{
 	background-color: #37C6DA;
 }
+.b-head .head-hideMenu i{
+	color: #37C6DA;
+}
+.b-head .head-hideMenu li:hover{
+	background-color: #37C6DA;
+}
 /********剑鱼********/
 .b-head .b-top li:hover>i{
 	background-color: #37C6DA !important;
@@ -24,30 +30,6 @@ a:focus, a:hover{
 .b-nav-other>a:hover,.b-nav-active>a{
 	color: #37C6DA !important;
 }
-.b-head .head-hideMenu i{
-	color: #37C6DA;
-}
-.b-head .head-hideMenu li:hover{
-	background-color: #37C6DA;
-}
-.swordfish-content{
-	padding: 15px 0px 15px 0px;
-}
-.swordfish-left{
-	background-color: #FFFFFF;
-	padding: 15px;
-	width: 940px;
-	display: inline-block;
-	vertical-align: top;
-}
-.swordfish-right{
-	padding-right: 0px;
-	background-color: #FFFFFF;
-	width: 250px;
-	display: inline-block;
-	vertical-align: top;
-	float: right;
-}
 .swordfish-page-title{
 	padding-bottom: 10px;
 	border-bottom: 1px solid #ddd;
@@ -74,7 +56,7 @@ a:focus, a:hover{
 .swordfish-rssset .btn>span{
 	margin-right: 5px;
 }
-.swordfish-rssset .swordfish-left>div{
+.swordfish-rssset .b-left>div{
 	margin-bottom: 15px;
 }
 .swordfish-qrcode{
@@ -226,7 +208,7 @@ a:focus, a:hover{
 	margin-bottom: 20px;
 }
 /*******剑鱼首页*******/
-.swordfish-index .swordfish-right>div{
+.swordfish-index .b-right>div{
 	padding-left: 10px;
 }
 .swordfish-index .swordfish-right-title{
@@ -326,10 +308,10 @@ a:focus, a:hover{
 	margin-right: 10px;
 }
 @media (max-width: 1200px) {
-	.swordfish-left{
+	.b-left{
 		width: 100%;
 	}
-	.swordfish-right{
+	.b-right{
 		display: none;
 	}
 }

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

@@ -37,7 +37,6 @@ function reloadData(obj,name){
 
 	name=name||obj.attr("name")
 	var val=(obj.attr("value")||obj.val());
-	
 	if (val==0) val=""
 	if(name=="city"&&!val){
 		var pids=obj.attr("id")
@@ -57,10 +56,6 @@ function reloadData(obj,name){
 			}
 		}
 		
-	}else if(name=="c_author"){
-		if(!obj.prop("checked")){
-			val="";
-		}
 	}
 	//调整value 值
 	if(val==10){

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

@@ -8,6 +8,8 @@ var isLogined = false;
 var loginBackType = null;
 //登录完之后强制刷新
 var compulsoryreRresh = false;
+//顶部是否加载完毕
+var topLoadOver = false;
 //表单验证的参数
 var cssctlObj = null;
 var ValidDatatype = {
@@ -547,19 +549,19 @@ function b_loadTop(){
 					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>';
+						+'<li onclick="window.location.href=\'/member/show/memberindex\'"><i class="glyphicon ren1"></i>用户中心</li>'
+						+'<li onclick="window.location.href=\'/front/logout\'" class="border-b-0"><i class="glyphicon tuichu"></i>退出</li>';
 						+'</ul></div>';
 				$("#b-loginStatus").html(html)
 				.mouseover(function(){
 					$("#head-hideMenu").show();
 				}).mouseleave(function(){
-					//$("#head-hideMenu").hide();
+					$("#head-hideMenu").hide();
 				});
 				$("#head-hideMenu").mouseover(function(){
 					$(this).show();
 				}).mouseleave(function(){
-					//$(this).hide();
+					$(this).hide();
 				});
 				//处理公用底部扫码登录按钮
 				$("#bottom-bar>li:first").addClass("invisible");

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

@@ -1,5 +1,6 @@
 //招标公告
 var Tender = {
+	status:false,
 	keyWordDialog: null,
 	getKeyWordDialog: function(clickLi){
 		if(this.keyWordDialog == null){
@@ -17,6 +18,7 @@ var Tender = {
 };
 //中标公告
 var Bid = {
+	status:false,
 	keyWordDialog: null,
 	getKeyWordDialog: function(clickLi){
 		if(this.keyWordDialog == null){
@@ -55,7 +57,7 @@ function KeyWordDialog(type,clickLi){
 		KeyWordDialog.AppendNode(dialogObj);
 	});
 	dialogObj.find(".submit").click(function(){
-		commonAjaxReq(thisClass);
+		commonAjaxReq(thisClass,type);
 	});
 	if(dialogObj.find(".keyWordGroup").length == 0){
 		KeyWordDialog.AppendNode(dialogObj);
@@ -71,15 +73,17 @@ KeyWordDialog.AppendNode = function(dialogObj,value){
 		return '<div class="keyWordGroup">'
 					+'<lable>关键词<font>'+index+'</font></lable>'
 					+'<div><input type="text" value="'+(value?value:"")+'" placeholder="示例：综合布线 电话线 网线" maxlength="100"></div>'
-					+'<div><img src="/wxswordfish/images/delete.png" class="delete"></div>'
+					+'<div>'+(index==1?'':'<img src="/wxswordfish/images/delete.png" class="delete">')+'</div>'
 				+'</div>';
 	}
 	var count = dialogObj.find(".keyWordGroup").length;
-	if(count >= 5){
+	if(count >= 10){
 		return;
 	}
 	var obj = $(getHtml(count+1,value));
 	dialogObj.find(".addKeyWordArea").before(obj);
+	//自动滚动到底部
+	$("#a_end")[0].scrollIntoView();
 	obj.find(".delete").click(function(){
 		dialogObj.find(".addKeyWord").removeAttr("disabled");
 		$(this).parents(".keyWordGroup").remove();
@@ -90,7 +94,7 @@ KeyWordDialog.AppendNode = function(dialogObj,value){
 	if(typeof(value) == "undefined" || value == ""){
 		obj.find("[type='text']").focus();
 	}
-	if(count == 4){
+	if(count >= 9){
 		dialogObj.find(".addKeyWord").attr("disabled",true);
 	}
 }
@@ -121,15 +125,42 @@ function ScopeDialog(type,clickLi){
 		}
 	});
 	dialogObj.find(".submit").click(function(){
-		commonAjaxReq(thisClass);
+		commonAjaxReq(thisClass,type);
 	});
 }
-function commonAjaxReq(object){
+//取积分
+function getCredit(){
+	
+}
+
+function commonAjaxReq(object,module){
+	//是关的不用处理
 	var dataObj = {
 		reqType: "other",
-		tender_flag: $("#tender-on-off").hasClass("open"),
-		bid_flag: $("#bid-on-off").hasClass("open")
+		snopshot:false
 	};
+	if($("#"+module+"-on-off").hasClass("open")){
+		//开服务要校验
+		if(module=="tender"){
+			if(!Tender.status){
+				//提示扣积分
+				//先取积分，规则然后提示
+				$(".creditTip-dialog").show()
+				$("html,body").addClass("overflow-hidden")
+				//生成快照
+				dataObj["snopshot"]=true
+			}
+		}else if(module=="bid"){
+			if(!Bid.status){
+				//提示扣积分
+				$(".creditTip-dialog").show()
+				$("html,body").addClass("overflow-hidden")
+				//生成快照
+				dataObj["snopshot"]=true
+			}
+		}
+	}
+
 	var keysString = "",scopeString = "";
 	var thisClass = this;
 	this.afterCommit = function(){
@@ -191,22 +222,12 @@ function commonAjaxReq(object){
 		});
 		return tender_scope.join(",");
 	}
-	/*******************招标公告****************/
-	if(dataObj.tender_flag){
-		dataObj["tender_keys"] = this.setKeyWord("tender");
-		dataObj["tender_scope"] = this.setScope("tender");
-		if(dataObj.tender_keys.length > 0 && dataObj.tender_scope == ""){
-			dataObj["tender_scope"] = "A";
-		}
-	}
-	/*******************中标公告****************/
-	if(dataObj.bid_flag){
-		dataObj["bid_keys"] = this.setKeyWord("bid");
-		dataObj["bid_scope"] = this.setScope("bid");
-		if(dataObj.bid_keys.length > 0 && dataObj.bid_scope == ""){
-			dataObj["bid_scope"] = "A";
-		}
+	dataObj[module+"_keys"] = this.setKeyWord(module);
+	dataObj[module+"_scope"] = this.setScope(module);
+	if(dataObj[module+"_keys"].length > 0 && dataObj[module+"_scope"] == ""){
+		dataObj[module+"_scope"] = "A";
 	}
+	dataObj[module+"_status"] = $("#"+module+"-on-off").hasClass("open")?1:0
 	/*****************************************/
 	$.ajax({
 		type: "POST",
@@ -271,12 +292,18 @@ $(function(){
 	if(typeof(msgset.tender) != "undefined"){
 		setKeyWord("tender",msgset.tender.a_key);
 		setScope("tender",msgset.tender.s_scope);
-		turnOn($("#tender-on-off"));
+		if(msgset.tender.i_status){
+			turnOn($("#tender-on-off"));
+			Tender.status=true
+		}
 	}
 	if(typeof(msgset.bid) != "undefined"){
 		setKeyWord("bid",msgset.bid.a_key);
 		setScope("bid",msgset.bid.s_scope);
-		turnOn($("#bid-on-off"));
+		if(msgset.bid.i_status){
+			turnOn($("#bid-on-off"));
+			Bid.status=true
+		}
 	}
 	//开关
 	$(".on-off").click(function(){
@@ -291,7 +318,18 @@ $(function(){
 		}else{
 			turnOn($(this));
 		}
-		commonAjaxReq(null);
+		//判断是不是开，是开再判断是不是在有效期内，如果不在有效期内，则进行提示并存快照
+		
+		commonAjaxReq(null,$(this).attr("v"));
+	});
+	//收费规则
+	$(".rule").closest(".parent-node").click(function(){
+		$(".credit-dialog").show();
+		$("html,body").addClass("overflow-hidden");
+	})
+	$("#credit-dialog-back").click(function(){
+		$(".credit-dialog").hide();
+		$("html,body").removeClass("overflow-hidden");
 	});
 	//
 	$("#tender-content>li").click(function(){

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

@@ -63,8 +63,8 @@ img{
 }
 .operation>.parent-node{
 	width: 100%;
-	height: 60px;
-	line-height: 60px;
+	height: 54px;
+	line-height: 54px;
 	border-bottom: 1px solid #CCCCCC;
 	position: relative;
 	font-size: 16px;
@@ -96,6 +96,13 @@ img{
 	background-image: url("/wxswordfish/images/off.png");
 	background-size: 100% 100%;
 }
+.operation>.parent-node>.rule{
+	background: url("/wxswordfish/images/right.png") no-repeat 10px;
+	background-size: 30% 50%;
+}
+.rule-content div{
+	height:30px;
+}
 .operation .on-off.open{
 	background-image: url("/wxswordfish/images/on.png");
 }
@@ -512,4 +519,27 @@ img{
 	width: 34%;
 	border-left: 1px solid #CCCCCC;
 	border-right: 1px solid #CCCCCC;
+}
+
+.tip{
+	margin:1px;
+	padding:5px;
+	background-color:#FAF5DF;
+	height:130px;
+	border:1px solid #F5DC9A;
+}
+.tip-button{
+	float: right;
+ 	margin-right: 50px;
+}
+.tip-button span{
+	border-radius:5px;
+	display:inline-block;
+	padding:3px 10px;
+	margin-right:5px;
+	border:1px solid #689AFF;
+	cursor:pointer;
+}
+.tip-button span:nth-child(1){
+	background-color:#24C0D7;
 }

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

@@ -0,0 +1,73 @@
+<!---->
+<div class="index-new-head b-head">
+	{{include "/common/top.html"}}
+	<div class="b-nav index-new-nva">
+		<ul>
+			<li class="b-nav-logo"><a href="/"><img src="/images/logo.png" class="logo"></a></li>
+			<li class="b-nav-link b-nav-main"><a href="/search/enterprise/ent.html">企业社区</a></li>
+			<li class="b-h-search">
+				<div class="input-group">
+			        <div class="input-group-btn hide">
+			        	<button type="button" id="header-searchBtn" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><font>服务</font><span class="hide caret margin-l-10"></span></button>
+			        </div> <!--/btn-group -->
+					<form method="post" id="searchForm" action="/search/enterprise/ent.html">
+						<span id="searchFormBtn"><i class="glyphicon sousuo"></i></span>
+				        <input type="text" name="words" class="form-control" id="header-searchInput" placeholder="找企业" value="{{if .T.querymap}}{{index .T.querymap "query"}}{{end}}">
+						<input type="hidden" name="city" id="city" value="{{index .T.querymap "city"}}">
+						<input type="hidden" name="cityNo" id="cityNo" value="{{index .T.querymap "cityNo"}}">
+						<input type="hidden" name="c_author" id="hauthor" value="{{index .T.querymap "c_author"}}">
+						<input type="hidden" name="c_hfl" id="hfl" value="{{index .T.querymap "c_hfl"}}">
+						<input type="hidden" name="c_zb" id="zb" value="{{index .T.querymap "c_zb"}}">
+					</form>
+	       		</div><!-- /input-group -->
+			</li>
+			<li class="pull-right b-loginStatus" id="b-loginStatus"></li>
+		</ul>
+	</div>
+</div>
+<script type="text/javascript">
+//顶部是否加载完毕
+var topLoadOver = false;
+var keyCode=0;
+document.onkeydown=function(event){
+    var e = event || window.event || arguments.callee.caller.arguments[0];
+    if(e && e.keyCode==13){ // enter 键
+        keyCode=13
+    }
+};
+$(function (){
+	b_loadTop();
+	$("#searchFormBtn").click(function(){
+		keyCode = 13;
+		$("form#searchForm").submit();
+	});
+	$("form#searchForm").submit(function(){
+		var input_val = $(this).children("[type='text']").val().replace(/^\s+|\s+$/g,"");
+		if(input_val==""){
+			input_val = $("#header-searchInput").attr('placeholder');
+		}
+		if (keyCode==13){
+	 		if(input_val==""||input_val=="请输入关键字"){
+				keyCode=0;
+				return false;
+			}else {
+				$("input[name='words']").val(input_val);
+				keyCode=0;
+				return true;
+			}
+		}
+	});
+	//设置即时下拉
+	$("#header-searchInput,#words").attr("autocomplete","off").keyup(function(){
+		imFind(this)
+	}).focus(function(){
+		imFind(this)
+	})
+	$("body").mouseout(function(e){
+		e=e||window.event
+		if(e.target == this){
+			$("#immediately").hide();
+		}
+	});
+});
+</script>

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

@@ -55,8 +55,6 @@
 	</table>
 </div>
 <script text="text/javascript">
-//顶部是否加载完毕
-var topLoadOver = false;
 var isMobile = false;
 var keyCode=0;
 document.onkeydown=function(event){

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

@@ -7,40 +7,31 @@
 			<li class="b-nav-link b-nav-main index-new-nva-c a-com-active fwsc"><a href="/market/0/list.html">服务市场</a></li>
 			<li class="b-nav-link b-nav-other index-new-nva-c"><a class="setserver"  id="releaseService">发服务</a><a class="b-nav-s"></a></li>
 			<li class="b-nav-link b-nav-other index-new-nva-c"><a id="setdemand"  href="/market/demand/add.html">发需求</a></li>
-			<li class="pull-right b-loginStatus" id="b-loginStatus"></li>
-			<li class="a-h-search">
-					<div class="input-group">
-				        <div class="input-group-btn hide">
-				        	<button type="button" id="header-searchBtn" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><font>服务</font><span class="hide caret margin-l-10"></span></button>
-				        </div> <!--/btn-group -->
-						<form method="post" id="searchForm" action="/market/0/list.html">
-							<span><i class="glyphicon sousuo" id="searchFormBtn"></i></span>
-					        <input type="text" name="words" class="form-control" id="header-searchInput" placeholder="{{if .T.hotword}}{{.T.hotword}}{{else}}找服务{{end}}">
-							<input type="hidden" name="city" id="city" value="">
-							<input type="hidden" name="cityNo" id="cityNo" value="">
-							<!-- 服务市场 -->
-							<input type="hidden" name="c_searchtype" id="c_searchtype" value="">
-							<input type="hidden" name="c_fwtype" id="c_fwtype" value="">
-							<input type="hidden" name="c_fbtime" id="c_fbtime" value="">
-							<input type="hidden" name="c_rztype" id="c_rztype" value="">
-							<input type="hidden" name="c_xqtype" id="c_xqtype" value="">
-							<input type="hidden" name="c_sorttype" value="">
-							<!-- 企业社区 -->
-							<input type="hidden" name="c_author" id="hauthor" value="">
-							<input type="hidden" name="c_hfl" id="hfl" value="">
-							<input type="hidden" name="c_zb" id="zb" value="">
-						</form>
-		       		</div><!-- /input-group -->
-				<div class="a-h-nav-btn">
-					<img src="/images/nav-btn.png" class="visible-xs-inline" id="nvaBtn">
-				</div>
+			<li class="b-h-search">
+				<div class="input-group">
+			        <div class="input-group-btn hide">
+			        	<button type="button" id="header-searchBtn" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><font>服务</font><span class="hide caret margin-l-10"></span></button>
+			        </div> <!--/btn-group -->
+					<form method="post" id="searchForm" action="/market/0/list.html">
+						<span id="searchFormBtn"><i class="glyphicon sousuo"></i></span>
+				        <input type="text" name="words" class="form-control" id="header-searchInput" placeholder="找服务" value="{{if .T.querymap}}{{index .T.querymap "query"}}{{end}}">
+						<input type="hidden" name="city" id="city" value="">
+						<input type="hidden" name="cityNo" id="cityNo" value="">
+						<!-- 服务市场 -->
+						<input type="hidden" name="c_searchtype" id="c_searchtype" value="">
+						<input type="hidden" name="c_fwtype" id="c_fwtype" value="">
+						<input type="hidden" name="c_fbtime" id="c_fbtime" value="">
+						<input type="hidden" name="c_rztype" id="c_rztype" value="">
+						<input type="hidden" name="c_xqtype" id="c_xqtype" value="">
+						<input type="hidden" name="c_sorttype" value="">
+					</form>
+	       		</div>
 			</li>
+			<li class="pull-right b-loginStatus" id="b-loginStatus"></li>
 		</ul>
 	</div>
 </div>
 <script type="text/javascript">
-//顶部是否加载完毕
-var topLoadOver = false;
 var isMobile = false;
 var keyCode=0;
 document.onkeydown=function(event){
@@ -72,11 +63,6 @@ $(function (){
 			}	
 		}
 	});
-	$("#header-searchInput").bind("focus blur",function(){
-		//$(".a-h-search").toggleClass("a-com-focus");
-		$(this).prev("i").toggleClass("text-primary");
-		//$("#loginStatus").toggleClass("hide");
-	});
 	//
 	$("[id='releaseService']").click(function(){
 		if(isLogined){
@@ -85,20 +71,5 @@ $(function (){
 			loginModalShow(6);
 		}
 	});
-	//手机版
-	$("#nvaBtn").click(function(){
-		if($(this).attr("src") == "/images/nav-btn.png"){
-			$(this).attr("src","/images/nav-btn-a.png");
-		}else{
-			$(this).attr("src","/images/nav-btn.png");
-		}
-		$("#head-navbar").toggleClass("hidden-xs");
-	});
-	$("body").click(function(e){
-		if(isMobile && e.target.id != "head-navbar-ul" && e.target.id != "nvaBtn"){
-			$("#head-navbar").addClass("hidden-xs");
-		}
-	});
 });
-
 </script>

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

@@ -39,7 +39,7 @@
 	background: none;
 	color: inherit;
 }
-.member-left .menu-childnode{
+.member-left .menu-childnode .menu-childnode2{
 	font-weight: normal;
 	text-indent: 1em;
 }
@@ -51,6 +51,10 @@
 	font-size: 12px;
 	vertical-align: middle;
 }
+.member-left .a-com-collapse2{
+	font-size: 12px;
+	vertical-align: middle;
+}
 .member-left .identType img{
 	width: 20px;
 	height: 20px;
@@ -120,6 +124,7 @@ var MemberLeftMenu = {
 				html += this.callCenterMenu();
 			}
 			html += this.serviceMerchantMenu()+this.orderManageMenu()+this.bidManageMenu();
+			html += this.vipMenu()+this.myCredit()+this.creditRule();
 		}else if(isCanEditEnt){
 			html += this.myYellowPageMenu(editEnterHref);
 			if(/^[1]$/.test(role)){//黄页编辑者
@@ -135,6 +140,10 @@ var MemberLeftMenu = {
 			$(this).children(".a-com-collapse").toggleClass("glyphicon-menu-up");
 			$(".menu-childnode").toggleClass("hide");
 		});
+		$("#vipMenu").click(function(){
+			$(this).children(".a-com-collapse2").toggleClass("glyphicon-menu-up");
+			$(".menu-childnode2").toggleClass("hide");
+		});
 	},
 	//实名认证菜单
 	autheMenu: function(){
@@ -188,6 +197,18 @@ var MemberLeftMenu = {
 	//需求管理
 	bidManageMenu: function(){
 		return '<a onclick="window.location.href=\'/member/bidManage\'" class="menu-childnode list-group-item"><i class="glyphicon"></i>投标管理</a>';
+	},
+	//vip会有菜单
+	vipMenu: function(){
+		return '<a class="list-group-item" id="vipMenu"><i class="glyphicon zhanghao"></i>会员中心<i class="a-com-collapse2 bootstrap-glyphicon glyphicon glyphicon-menu-down"></i></a>';
+	},
+	//我的积分
+	myCredit: function(){
+		return '<a onclick="window.location.href=\'/member/credit/myCredit\'" class="menu-childnode2 list-group-item"><i class="glyphicon"></i>我的积分</a>';
+	},
+	//积分规则
+	creditRule: function(){
+		return '<a onclick="window.location.href=\'/member/credit/creditRule\'" class="menu-childnode2 list-group-item"><i class="glyphicon"></i>积分规则</a>';
 	}
  };
 $(function (){

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

@@ -46,7 +46,7 @@ function b_loadTopCallBack(result){
 }
 function swordfishLayoutInit(){
 	if(document.body.scrollHeight <= document.body.clientHeight){
-		$(".swordfish-left").height(document.body.clientHeight-$(".swordfish-head").height() - $("#qfw-bottom").height());
+		$(".b-left").height(document.body.clientHeight-$(".swordfish-head").height() - $("#qfw-bottom").height());
 		webSiteInit();
 	}
 }

core/src/web/templates/index.html

@@ -7,7 +7,7 @@
 <meta name="Description" content="{{Msg "seo" "qfw.homepage.description"}}"/>
 <link href="/css/index-new.css" rel="stylesheet">
 </head>
-<body class="index-new-body">
+<body>
 {{include "/common/login.html"}}
 {{include "/common/indexhead.html"}}
 <div class="a-content a-index">	

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

@@ -0,0 +1,257 @@
+<html>
+<head>
+<title>我的积分</title>
+{{include "/common/inc.html"}}
+<script src="/js/qfwtable.js"></script>
+<style>
+.credit-explain {
+    background-color: #FCF8E3;
+    padding: 10px 0px;
+    border: 1px solid #F5DC99;
+    text-indent: 1em;
+}
+.credit {
+    padding: 10px 0px;
+}
+ 
+.ok-sign{
+    vertical-align: middle;
+	color:#A0D468;
+	font-size:22px
+}
+.n-ok-sign{
+    vertical-align: middle;
+	color:#CCCCCC;
+	font-size:22px
+}
+.mx{
+ 	color: #415FCF;
+	cursor:pointer;
+ 	padding: 10px 10px;
+}
+.rowone{
+	font-size:14;
+}
+.rowtwo{
+	font-size:14;background-color:#F7F8FA;
+}
+.btzrw{
+	height:45px;
+	border-bottom:1px solid #FF5A5F;
+}
+.btzrw-z{
+	background:#FF5A5F;
+	float:left;height:45px;
+	width:110px;color:white;
+	line-height:45px;
+	text-align:center;
+}
+.btzrw-ms{
+	float:left;line-height:45px;
+	padding:0 5px;
+}
+</style>
+</head>
+<body>
+{{$identType := session "identType"}}
+<!-- 头部 -->
+{{include "/common/head.html"}}
+<!-- 中间 -->
+<div class="a-content member-content">
+	<div class="member-left">
+		{{include "/common/memberleft.html"}}
+	</div>
+	<div class="member-right">
+		<div class="member-panel">
+			<div class="panel-title-out">
+				<i class="glyphicon zhanghao"></i><span>我的积分</span>
+			</div>	
+			<div class="panel-body message a-border-t-only"  >	
+				<ul class="nav nav-tabs msgheader" style="margin-top:10px;position:relative">
+		                <li class="active" v="0"><a href="#list_0" data-toggle="tab" id="c_0" name="all" value="0">我的积分</a></li>
+		                <li v="1"><a href="#list_1" data-toggle="tab" id="c_1" name="all" value="1">积分明细</a></li>
+		    	</ul>
+				<div class="tab-content" id="list_0">
+					<div class="credit-explain">当前积分 <span style="font-size:22;color:red">{{$.T.user.i_credit}}</span><span class="mx" onclick="outoClick('c_1')">查看积分明细</span></div>
+					<div class="credit">
+						<div class="btzrw">
+							<div class="btzrw-z">做任务赚积分</div>
+							<div class="btzrw-ms">（完成全部带 * 号的任务，可以额外获得1001积分哦）</div>
+						</div>
+						<table class="table a-table margin-t-20">
+							<tr style="text-align:center;">
+								<td width="60%"><b>任务描述</b></td>
+								<td width="10%" align="center"><b>状态</b></td>
+								<td width="30%" align="center"><b>操作</b></td>
+							</tr>
+							<tr class="rowone">
+								<td width="60%" style="text-indent: 7em;">* 新用户注册，得50积分</td>
+								<td width="10%" align="center"><span class="ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 已完成</td>
+								<td width="30%" style="padding:110px"></td>
+							</tr>
+							<tr class="rowtwo">
+								<td width="60%" style="text-indent: 7em;">* 完成实名认证，得100积分</td>
+								{{if eq .T.A_RZ true}}
+								<td width="10%" align="center">
+								<span class="ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 已完成</td>
+								<td width="30%" style="padding:110px"></td>
+								{{else}}
+								<td width="10%" align="center">
+								<span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
+								<td width="30%" style="padding:110px">
+								去 <button class="btn btn-primary" onclick="toUrl('')">完成验证</button></td>
+								{{end}}
+							</tr>
+							<tr class="rowone">
+								<td width="60%" style="text-indent: 7em;">* 绑定邮箱，得50积分</td>
+								{{if .T.A_BYX}}
+								<td width="10%" align="center"><span class="ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 已完成</td>
+								<td width="30%" style="padding:110px"></td>
+								{{else}}
+								<td width="10%" align="center">
+								<span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成
+								</td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">绑定邮箱</span></td>
+								{{end}}
+								
+							</tr>
+							<tr class="rowtwo">
+								<td width="60%" style="text-indent: 7em;">* 绑定手机，得50积分</td>
+								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">绑定手机</span></td>
+							</tr>
+							<tr class="rowone">
+								<td width="60%" style="text-indent: 7em;">* 完善你的企业黄页，得50积分</td>
+								{{if .T.A_CJMP}}
+								<td width="10%" align="center"><span class="ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 已完成</td>
+								<td width="30%" style="padding:110px"></td>
+								{{else}}
+								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
+								<td width="30%" style="padding:110px">去 <button class="btn btn-primary" onclick="toUrl('')">完善资料</button></td>
+								{{end}}
+							</tr>
+							<tr class="rowtwo">
+								<td width="60%" style="text-indent: 7em;">* 完成一次企业查询，得50积分</td>
+								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">企业社区</span>查询</td>
+							</tr>
+							<tr class="rowone">
+								<td width="60%" style="text-indent: 7em;">* 发布一条服务信息，得50积分（实名认证后才可使用）</td>
+								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">发服务</span></td>
+							</tr>
+							<tr class="rowtwo">
+								<td width="60%" style="text-indent: 7em;">*  发布一条需求信息，得50积分</td>
+								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">发需求</span></td>
+							</tr>
+							<tr class="rowone">
+								<td width="60%" style="text-indent: 7em;">* 去剑鱼订阅一组关键词，得50积分</td>
+								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">剑鱼</span></td>
+							</tr>
+							<tr class="rowtwo">
+								<td width="60%" style="text-indent: 7em;">* 查看神奇的关系网，得50积分（实名认证后才可查看）</td>
+								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">企业社区</span>查看</td>
+							</tr>
+							<tr class="rowone">
+								<td width="60%" style="text-indent: 7em;">* 分享一条服务/需求信息，得50积分</td>
+								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">服务市场</span>分享</td>
+							</tr>
+							<tr class="rowtwo">
+								<td width="60%" style="text-indent: 7em;">* 完成一次交易，得50积分</td>
+								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">服务市场</span></td>
+							</tr>
+							<tr class="rowone">
+								<td width="60%" style="text-indent: 7em;">* 完成一次交易评价，得50积分</td>
+								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">服务市场</span></td>
+							</tr>
+							<tr class="rowtwo">
+								<td width="60%" style="text-indent: 7em;">* 邀请新用户，得150积分</td>
+								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">邀请</span></td>
+							</tr>
+						</table>
+						<div class="btzrw">
+							<div class="btzrw-z">日常任务</div>
+							<div class="btzrw-ms"></div>
+						</div>
+						<table class="table a-table margin-t-20">
+							<tr style="text-align:center;">
+								<td width="60%"><b>任务描述</b></td>
+								<td width="10%" align="center"><b>状态</b></td>
+								<td width="30%" align="center"><b>操作</b></td>
+							</tr>
+							<tr class="rowone">
+								<td width="60%" style="text-indent: 7em;">连续签到第一天，得10积分</td>
+								<td width="10%" align="center"><span class="ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 已完成</td>
+								<td width="30%" style="padding:110px"></td>
+							</tr>
+							<tr class="rowtwo">
+								<td width="60%" style="text-indent: 7em;">完成5次企业查询，得50积分</td>
+								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span><span style="padding:0 13px">0/5</span></td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">企业社区</span>完成</td>
+							</tr>
+							<tr class="rowone">
+								<td width="60%" style="text-indent: 7em;">发布3条服务，得60积分</td>
+								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span><span style="padding:0 13px">0/3</span></td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">服务市场</span>完成</td>
+							</tr>
+							<tr class="rowtwo">
+								<td width="60%" style="text-indent: 7em;">发布3条需求，得60积分</td>
+								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span><span style="padding:0 13px">0/3</span></td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">服务市场</span>完成</td>
+							</tr>
+							<tr class="rowone">
+								<td width="60%" style="text-indent: 7em;">分享2条服务/需求信息，得40积分</td>
+								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span><span style="padding:0 13px">0/2</span></td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">服务市场</span>分享</td>
+							</tr>
+							<tr class="rowtwo">
+								<td width="60%" style="text-indent: 7em;">邀请一个新用户（微信剑鱼分享邀请新用户），得150积分</td>
+								<td width="10%" align="center"></td>
+								<td width="30%" style="padding:110px">去<span class="mx" onclick="toUrl('')">邀请</span></td>
+							</tr>
+							</table>
+						</div>
+					</div>
+				</div>
+				<div class="tab-content hide" id="list_1">
+					<div class="tab-pane" >
+						 222
+					</div>
+				</div>
+			</div>	
+		</div>
+	</div>
+</div>
+ 
+<!-- 底部 -->
+{{include "/common/bottom.html"}}
+<script type="text/javascript">
+$(function(){
+	$("#c_0,#c_1").click(function(){
+		var _v=$(this).attr("value")
+		checkContent("list_"+_v)
+	})
+})
+function checkContent(id){
+	$(".tab-content").each(function(){
+	    if($(this).attr("id")!=id){
+			$(this).addClass("hide");
+		}else{
+			$(this).removeClass("hide");
+		}
+	});
+}
+
+function outoClick(id){ 
+	document.getElementById(id).click();
+}
+</script>
+</body>
+</html>

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

@@ -5,155 +5,151 @@
 {{include "/common/inc.html"}}
 <script src="/js/jquery.cxselect.js"></script>
 <link href="/css/enterprise.css" rel="stylesheet">
+<link href="/css/entcommunity.css" rel="stylesheet">
 <meta name="Keywords" content="{{Msg "seo" "qfw.enterprise.key"}}"/>
 <meta name="Description" content="{{Msg "seo" "qfw.enterprise.description"}}"/>
 </head>
-<body>
-{{include "/common/head.html"}}
-<div class="a-content">
-	<!--中间内容开始-->
-	<div class="row qfw-row">
-		<!--左边显示区开始-->
-		<div class="col-lg-9">
-		<div class="borderB text-primary fontb frontS hidden-sm hidden-xs">所有分类</div>
-			<!--查询条件-->
-			<div class="border container-fluid hidden-sm hidden-xs qfw-p-margintoplist" >
-				<div class="rowFl rowFltt">
-					<div class="tt lineb qfw-p-margintop" >&nbsp;所&nbsp;在&nbsp;地：</div>
-					<div id="city_china" class="lineb ttcon qfw-p-margintoplist" >
-						<select class="sel province cxselect yselect" disabled="disabled" id="c_province" name="province"></select>
-						<select class="sel city cxselect yselect" disabled="disabled" id="c_city" name="city"></select>
-						<select class="sel area cxselect yselect" disabled="disabled" id="c_area" name="area"></select>
-					</div>
-					<!--<div class="rowFlTip"><span class="text-primary lineb marginLeft qfw-p-margintoplist"><span class="glyphicon biaojidizhi icon_default text-primary" style="width:20px;"></span><small style="color:#999999;">目前系统有河南、广西、黑龙江、青海、西藏、安徽、山西和湖北的官方企业数据，更多数据持续加入中...</small></span></div>-->
-				</div>
-				<div class="rowFl rowFltt" >
-					<div class="tt lineb">行业类别：</div>
-					<div class="lineb ttcon less" id="c_hfl"></div>
-					<div class="text-muted qfw-text-more" onClick="less(this)"><small>更多></small></div>
-				</div>
-				<div class="rowFl ">
-					<div class="tt lineb">注册资本：</div>
-					<div class="lineb ttcon less" id="c_zb"></div>
+<body class="entlist-page">
+{{include "/common/enthead.html"}}
+<div class="b-content container-fluid">
+	<!--左边显示区开始-->
+	<div class="b-left">
+		<!--查询条件-->
+		<div class="border container-fluid hidden-sm hidden-xs" >
+			<div class="rowFl rowFltt">
+				<div class="tt lineb qfw-p-margintop" >&nbsp;所&nbsp;在&nbsp;地：</div>
+				<div id="city_china" class="lineb ttcon" >
+					<select class="sel province cxselect yselect" disabled="disabled" id="c_province" name="province"></select>
+					<select class="sel city cxselect yselect" disabled="disabled" id="c_city" name="city"></select>
+					<select class="sel area cxselect yselect" disabled="disabled" id="c_area" name="area"></select>
 				</div>
+				<!--<div class="rowFlTip"><span class="text-primary lineb marginLeft qfw-p-margintoplist"><span class="glyphicon biaojidizhi icon_default text-primary" style="width:20px;"></span><small style="color:#999999;">目前系统有河南、广西、黑龙江、青海、西藏、安徽、山西和湖北的官方企业数据，更多数据持续加入中...</small></span></div>-->
 			</div>
-			<!--查询条件结束-->
-			<!--注册资本、认证-->
-			<ul id="navs" class="nav nav-tabs  hidden-sm hidden-md hidden-xs qfw-p-margintoplist ">
-				<li class="active" id="c_all" name="all" value="0"><a href="#home" data-toggle="tab">全部</a></li>
-               	<span  class=" hidden-sm hidden-md hidden-xs renzheng" ><input type="checkbox" name="c_author" id="c_author" value="Y" {{if .T.querymap.c_author}}checked{{end}}/>认证</span>
-	        </ul>
-			<!--注册资本、认证结束-->
-			
-			<!--列表详细信息开始-->
-			<div>
-				{{if gt (len .T.data) 0}}
-					{{range $k,$v:=.T.data}}
-						<div class="borderB">
-							<div class="qfw-entcontent-padding">
-								<div class="lineb " >
-									<a target="_blank" href="/enterprise/{{index $v "_id"}}.html">
-										{{$lens:=len (index $v "EntName")}}									 
-										{{if eq $lens 0}}
-											{{index $v "LeRep"}}
-										{{else}}
-											{{index $v "EntName"}}
-										{{end}}
-									</a>
-									
-									{{ if index $v "s_action"}}
-										{{ if eq (index $v "s_action") "01"}}
-											<span class="glyphicon qyrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证企业　</small></span>
-											{{ if $v.i_comauthenttype }}
-													{{ if eq $v.i_comauthenttype 2}}
-														<span class="glyphicon mprz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">名片认证</small></span>					
-													{{else if eq $v.i_comauthenttype 1}}
-														<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:5px;">营业执照认证</small></span>
-													{{else if eq $v.i_comauthenttype 3}}
-														<span class="glyphicon yjrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">年报邮箱认证</small></span>
-													{{end}}
-											{{else}}
-													<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:5px;">营业执照认证</small></span>
-											{{end}}
-										{{else if eq (index $v "s_action") "02"}}
-											<span class="glyphicon grrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证个人</small></span>
-										{{else if eq (index $v "s_action") "03"}}
-											<span class="glyphicon jgrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证机构</small></span>
-										{{end}}
+			<div class="rowFl rowFltt" >
+				<div class="tt lineb">行业类别：</div>
+				<div class="lineb ttcon less" id="c_hfl"></div>
+				<div class="qfw-text-more" onClick="less(this)"><small>更多></small></div>
+			</div>
+			<div class="rowFl ">
+				<div class="tt lineb">注册资本：</div>
+				<div class="lineb ttcon less" id="c_zb"></div>
+			</div>
+		</div>
+		<!--查询条件结束-->
+		<!--注册资本、认证-->
+		<ul id="navs" class="nav nav-tabs  hidden-sm hidden-md hidden-xs">
+			<li {{if not .T.querymap.c_author}}class="active"{{end}} id="c_author" name="c_author" value=""><a href="#home" data-toggle="tab">全部</a></li>
+			<li {{if .T.querymap.c_author}}class="active"{{end}} name="c_author" id="c_author" value="Y"><a href="#home" data-toggle="tab">认证</a></li>
+        </ul>
+		<!--注册资本、认证结束-->
+		
+		<!--列表详细信息开始-->
+		<div>
+			{{if gt (len .T.data) 0}}
+				{{range $k,$v:=.T.data}}
+					<div class="borderB">
+						<div class="qfw-entcontent-padding">
+							<div class="lineb " >
+								<a target="_blank" href="/enterprise/{{index $v "_id"}}.html">
+									{{$lens:=len (index $v "EntName")}}									 
+									{{if eq $lens 0}}
+										{{index $v "LeRep"}}
+									{{else}}
+										{{index $v "EntName"}}
 									{{end}}
-								</div>
+								</a>
 								
-								<div>
-									<span>注册号：<small  class="lineb " >{{index $v "RegNo"}}</small></span>
-									{{if index $v "EntType"}}
-										{{if eq $v.EntType "9600"}}
-											<span>经营者：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
-										{{else if eq $v.EntType "5810"}}
-											<span>负责人：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
+								{{ if index $v "s_action"}}
+									{{ if eq (index $v "s_action") "01"}}
+										<span class="glyphicon qyrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证企业　</small></span>
+										{{ if $v.i_comauthenttype }}
+												{{ if eq $v.i_comauthenttype 2}}
+													<span class="glyphicon mprz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">名片认证</small></span>					
+												{{else if eq $v.i_comauthenttype 1}}
+													<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:5px;">营业执照认证</small></span>
+												{{else if eq $v.i_comauthenttype 3}}
+													<span class="glyphicon yjrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">年报邮箱认证</small></span>
+												{{end}}
 										{{else}}
-											<span>法定代表人：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
+												<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:5px;">营业执照认证</small></span>
 										{{end}}
+									{{else if eq (index $v "s_action") "02"}}
+										<span class="glyphicon grrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证个人</small></span>
+									{{else if eq (index $v "s_action") "03"}}
+										<span class="glyphicon jgrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证机构</small></span>
 									{{end}}
-									<span>经营状态：<small  class="lineb " >{{index $v "OpStateName"}}</small></span>
-									<span>成立日期：<small  class="lineb " >{{index $v "EstDate"}}</small></span>
-									<span>所在地：<small  class="lineb " >{{index $v "OpLocDistrictName"}}</small></span>
-								</div>
-								{{if $v.s_servicenames}}<div>产品服务：<small  class="lineb ">{{Html (Replace $v.s_servicenames "," "" 1)}}</small></div>{{end}}
-								{{if $v.stock }}<div>股东：<small  class="lineb ">{{index $v "stock"}}</small></div>{{end}}
-								{{if $v.OpScope }}<div>经营范围：<small  class="lineb ">{{index $v "OpScope"}}</small></div>{{end}}
+								{{end}}
 							</div>
+							
+							<div>
+								<span>注册号：<small  class="lineb " >{{index $v "RegNo"}}</small></span>
+								{{if index $v "EntType"}}
+									{{if eq $v.EntType "9600"}}
+										<span>经营者：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
+									{{else if eq $v.EntType "5810"}}
+										<span>负责人：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
+									{{else}}
+										<span>法定代表人：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
+									{{end}}
+								{{end}}
+								<span>经营状态：<small  class="lineb " >{{index $v "OpStateName"}}</small></span>
+								<span>成立日期：<small  class="lineb " >{{index $v "EstDate"}}</small></span>
+								<span>所在地：<small  class="lineb " >{{index $v "OpLocDistrictName"}}</small></span>
+							</div>
+							{{if $v.s_servicenames}}<div>产品服务：<small  class="lineb ">{{Html (Replace $v.s_servicenames "," "" 1)}}</small></div>{{end}}
+							{{if $v.stock }}<div>股东：<small  class="lineb ">{{index $v "stock"}}</small></div>{{end}}
+							{{if $v.OpScope }}<div>经营范围：<small  class="lineb ">{{index $v "OpScope"}}</small></div>{{end}}
 						</div>
+					</div>
+				{{end}}
+				<!--页码信息-->
+				<div class="text-center  hidden-sm hidden-md hidden-xs">
+					<ul class="pagination pagination-md ">
+					{{range $k,$v:=.T.pagination}}
+						<li {{if index $v "iscurrent"}}class="disabled active"{{end}}>
+						<a {{if index $v "iscurrent"}}  style="background-color:#f5f5f5" href="#"{{else}}href="{{index $v "url"}}"{{end}}>{{index $v "page"}}</a>
+						
+						</li>
 					{{end}}
-					<!--页码信息-->
-					<div class="text-center  hidden-sm hidden-md hidden-xs">
-						<ul class="pagination pagination-md ">
-						{{range $k,$v:=.T.pagination}}
+					</ul>
+				</div>
+				<!--页码信息结束-->
+				
+				<!--页码信息-->
+				<div class="text-center hidden-lg">
+					<ul class="pagination pagination-md ">
+					{{range $k,$v:=.T.pagination}}
+						
+						{{if eq $k 6}}
+						{{else if eq $k 7}}
+						{{else if eq $k 8}}
+						{{else}}
 							<li {{if index $v "iscurrent"}}class="disabled active"{{end}}>
-							<a {{if index $v "iscurrent"}}  style="background-color:#f5f5f5" href="#"{{else}}href="{{index $v "url"}}"{{end}}>{{index $v "page"}}</a>
-							
+							<a {{if index $v "iscurrent"}}  style="background-color:#f5f5f5" href="#"{{else}}href="{{index $v "url"}}"{{end}}>
+							{{index $v "page"}}
+							</a>
 							</li>
 						{{end}}
-						</ul>
-					</div>
-					<!--页码信息结束-->
-					
-					<!--页码信息-->
-					<div class="text-center hidden-lg">
-						<ul class="pagination pagination-md ">
-						{{range $k,$v:=.T.pagination}}
-							
-							{{if eq $k 6}}
-							{{else if eq $k 7}}
-							{{else if eq $k 8}}
-							{{else}}
-								<li {{if index $v "iscurrent"}}class="disabled active"{{end}}>
-								<a {{if index $v "iscurrent"}}  style="background-color:#f5f5f5" href="#"{{else}}href="{{index $v "url"}}"{{end}}>
-								{{index $v "page"}}
-								</a>
-								</li>
-							{{end}}
-							
-						{{end}}
-						</ul>
-					</div>
-					<!--页码信息结束-->
-				
-				{{else}}
-					<div class="alert alert-error "><div class="text-center" style="margin:20px auto;"><img src="/images/u20.png"><h4><span class="glyphicon biaojidizhi icon_default text-primary"></span>&nbsp;<strong class="text-muted">没有找到相关内容，换个关键词试试</strong></h4></div></div>
-				{{end}}
-			</div>
-			<!--列表详细信息结束-->	
-		</div>
-		<!--左边显示区结束-->
-		
-		<!--右边显示区开始-->
-		<div class="col-lg-3 hidden-sm hidden-md hidden-xs collg3_width">
-			<div class="borderB text-muted fontb frontS">推荐企业</div>
-			<div id="tjqy "><img style="width:100%;" class="qfw-p-margintop" src="/images/right_ad.png"></div>
+						
+					{{end}}
+					</ul>
+				</div>
+				<!--页码信息结束-->
+			
+			{{else}}
+				<div class="alert alert-error "><div class="text-center" style="margin:20px auto;"><img src="/images/u20.png"><h4><span class="glyphicon biaojidizhi icon_default text-primary"></span>&nbsp;<strong class="text-muted">没有找到相关内容，换个关键词试试</strong></h4></div></div>
+			{{end}}
 		</div>
-		<!--右边显示区结束-->
+		<!--列表详细信息结束-->	
+	</div>
+	<!--左边显示区结束-->
+	
+	<!--右边显示区开始-->
+	<div class="b-right hidden-sm hidden-md hidden-xs b-right-content">
+		<div class="borderB text-muted fontb frontS">推荐企业</div>
+		<div id="tjqy "><img style="width:100%;" class="qfw-p-margintop" src="/images/right_ad.png"></div>
 	</div>
-	<!--中间内容结束-->
+	<!--右边显示区结束-->
 </div>
 {{include "/common/bottom.html"}}
 
@@ -165,7 +161,6 @@ var btempwords={{.T.words}}
 var chf1= {{index .T.querymap "c_hfl"}};
 var czb= '{{index .T.querymap "c_zb"}}';
 var $chiancity= true,$listent=true;
-setNavbarActive(2);
 </script>
 <script src="/js/enterprise.js"></script>
 

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

@@ -0,0 +1,173 @@
+<html>
+<head>
+<title>{{Msg "seo" "qfw.enterprise.title"}}</title>
+<meta name="msvalidate.01" content="D5F3ADC7EB4E65FFB8BF943AD56DD1F7" />
+{{include "/common/inc.html"}}
+<script src="/js/jquery.cxselect.js"></script>
+<link href="/css/enterprise.css" rel="stylesheet">
+<meta name="Keywords" content="{{Msg "seo" "qfw.enterprise.key"}}"/>
+<meta name="Description" content="{{Msg "seo" "qfw.enterprise.description"}}"/>
+</head>
+<body>
+{{include "/common/head.html"}}
+<div class="a-content">
+	<!--中间内容开始-->
+	<div class="row qfw-row">
+		<!--左边显示区开始-->
+		<div class="col-lg-9">
+		<div class="borderB text-primary fontb frontS hidden-sm hidden-xs">所有分类</div>
+			<!--查询条件-->
+			<div class="border container-fluid hidden-sm hidden-xs qfw-p-margintoplist" >
+				<div class="rowFl rowFltt">
+					<div class="tt lineb qfw-p-margintop" >&nbsp;所&nbsp;在&nbsp;地：</div>
+					<div id="city_china" class="lineb ttcon qfw-p-margintoplist" >
+						<select class="sel province cxselect yselect" disabled="disabled" id="c_province" name="province"></select>
+						<select class="sel city cxselect yselect" disabled="disabled" id="c_city" name="city"></select>
+						<select class="sel area cxselect yselect" disabled="disabled" id="c_area" name="area"></select>
+					</div>
+					<!--<div class="rowFlTip"><span class="text-primary lineb marginLeft qfw-p-margintoplist"><span class="glyphicon biaojidizhi icon_default text-primary" style="width:20px;"></span><small style="color:#999999;">目前系统有河南、广西、黑龙江、青海、西藏、安徽、山西和湖北的官方企业数据，更多数据持续加入中...</small></span></div>-->
+				</div>
+				<div class="rowFl rowFltt" >
+					<div class="tt lineb">行业类别：</div>
+					<div class="lineb ttcon less" id="c_hfl"></div>
+					<div class="text-muted qfw-text-more" onClick="less(this)"><small>更多></small></div>
+				</div>
+				<div class="rowFl ">
+					<div class="tt lineb">注册资本：</div>
+					<div class="lineb ttcon less" id="c_zb"></div>
+				</div>
+			</div>
+			<!--查询条件结束-->
+			<!--注册资本、认证-->
+			<ul id="navs" class="nav nav-tabs  hidden-sm hidden-md hidden-xs qfw-p-margintoplist ">
+				<li class="active" id="c_all" name="all" value="0"><a href="#home" data-toggle="tab">全部</a></li>
+               	<span  class=" hidden-sm hidden-md hidden-xs renzheng" ><input type="checkbox" name="c_author" id="c_author" value="Y" {{if .T.querymap.c_author}}checked{{end}}/>认证</span>
+	        </ul>
+			<!--注册资本、认证结束-->
+			
+			<!--列表详细信息开始-->
+			<div>
+				{{if gt (len .T.data) 0}}
+					{{range $k,$v:=.T.data}}
+						<div class="borderB">
+							<div class="qfw-entcontent-padding">
+								<div class="lineb " >
+									<a target="_blank" href="/enterprise/{{index $v "_id"}}.html">
+										{{$lens:=len (index $v "EntName")}}									 
+										{{if eq $lens 0}}
+											{{index $v "LeRep"}}
+										{{else}}
+											{{index $v "EntName"}}
+										{{end}}
+									</a>
+									
+									{{ if index $v "s_action"}}
+										{{ if eq (index $v "s_action") "01"}}
+											<span class="glyphicon qyrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证企业　</small></span>
+											{{ if $v.i_comauthenttype }}
+													{{ if eq $v.i_comauthenttype 2}}
+														<span class="glyphicon mprz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">名片认证</small></span>					
+													{{else if eq $v.i_comauthenttype 1}}
+														<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:5px;">营业执照认证</small></span>
+													{{else if eq $v.i_comauthenttype 3}}
+														<span class="glyphicon yjrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">年报邮箱认证</small></span>
+													{{end}}
+											{{else}}
+													<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:5px;">营业执照认证</small></span>
+											{{end}}
+										{{else if eq (index $v "s_action") "02"}}
+											<span class="glyphicon grrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证个人</small></span>
+										{{else if eq (index $v "s_action") "03"}}
+											<span class="glyphicon jgrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证机构</small></span>
+										{{end}}
+									{{end}}
+								</div>
+								
+								<div>
+									<span>注册号：<small  class="lineb " >{{index $v "RegNo"}}</small></span>
+									{{if index $v "EntType"}}
+										{{if eq $v.EntType "9600"}}
+											<span>经营者：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
+										{{else if eq $v.EntType "5810"}}
+											<span>负责人：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
+										{{else}}
+											<span>法定代表人：<small  class="lineb " >{{index $v "LeRep"}}</small></span>
+										{{end}}
+									{{end}}
+									<span>经营状态：<small  class="lineb " >{{index $v "OpStateName"}}</small></span>
+									<span>成立日期：<small  class="lineb " >{{index $v "EstDate"}}</small></span>
+									<span>所在地：<small  class="lineb " >{{index $v "OpLocDistrictName"}}</small></span>
+								</div>
+								{{if $v.s_servicenames}}<div>产品服务：<small  class="lineb ">{{Html (Replace $v.s_servicenames "," "" 1)}}</small></div>{{end}}
+								{{if $v.stock }}<div>股东：<small  class="lineb ">{{index $v "stock"}}</small></div>{{end}}
+								{{if $v.OpScope }}<div>经营范围：<small  class="lineb ">{{index $v "OpScope"}}</small></div>{{end}}
+							</div>
+						</div>
+					{{end}}
+					<!--页码信息-->
+					<div class="text-center  hidden-sm hidden-md hidden-xs">
+						<ul class="pagination pagination-md ">
+						{{range $k,$v:=.T.pagination}}
+							<li {{if index $v "iscurrent"}}class="disabled active"{{end}}>
+							<a {{if index $v "iscurrent"}}  style="background-color:#f5f5f5" href="#"{{else}}href="{{index $v "url"}}"{{end}}>{{index $v "page"}}</a>
+							
+							</li>
+						{{end}}
+						</ul>
+					</div>
+					<!--页码信息结束-->
+					
+					<!--页码信息-->
+					<div class="text-center hidden-lg">
+						<ul class="pagination pagination-md ">
+						{{range $k,$v:=.T.pagination}}
+							
+							{{if eq $k 6}}
+							{{else if eq $k 7}}
+							{{else if eq $k 8}}
+							{{else}}
+								<li {{if index $v "iscurrent"}}class="disabled active"{{end}}>
+								<a {{if index $v "iscurrent"}}  style="background-color:#f5f5f5" href="#"{{else}}href="{{index $v "url"}}"{{end}}>
+								{{index $v "page"}}
+								</a>
+								</li>
+							{{end}}
+							
+						{{end}}
+						</ul>
+					</div>
+					<!--页码信息结束-->
+				
+				{{else}}
+					<div class="alert alert-error "><div class="text-center" style="margin:20px auto;"><img src="/images/u20.png"><h4><span class="glyphicon biaojidizhi icon_default text-primary"></span>&nbsp;<strong class="text-muted">没有找到相关内容，换个关键词试试</strong></h4></div></div>
+				{{end}}
+			</div>
+			<!--列表详细信息结束-->	
+		</div>
+		<!--左边显示区结束-->
+		
+		<!--右边显示区开始-->
+		<div class="col-lg-3 hidden-sm hidden-md hidden-xs collg3_width">
+			<div class="borderB text-muted fontb frontS">推荐企业</div>
+			<div id="tjqy "><img style="width:100%;" class="qfw-p-margintop" src="/images/right_ad.png"></div>
+		</div>
+		<!--右边显示区结束-->
+	</div>
+	<!--中间内容结束-->
+</div>
+{{include "/common/bottom.html"}}
+
+
+<script>
+var entsel = {{index .T.querymap "city"}}
+
+var btempwords={{.T.words}}
+var chf1= {{index .T.querymap "c_hfl"}};
+var czb= '{{index .T.querymap "c_zb"}}';
+var $chiancity= true,$listent=true;
+setNavbarActive(2);
+</script>
+<script src="/js/enterprise.js"></script>
+
+</body>
+</html>

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

@@ -9,8 +9,8 @@
 <!-- 头部 -->
 {{include "/common/swordfishhead.html"}}
 <!-- 中间 -->
-<div class="swordfish-content container-fluid swordfish-index">
-	<div class="swordfish-left">
+<div class="b-content container-fluid swordfish-index">
+	<div class="b-left">
 		<div id="swordfish-guide" class="swordfish-guide carousel slide" data-ride="carousel">
 		    <div class="swordfish-guide-left">
 				<i class="bootstrap-glyphicon glyphicon glyphicon-menu-left" href="#swordfish-guide" data-slide="prev"></i>
@@ -53,7 +53,7 @@
 			</span>
 		</div>
 	</div>
-	<div class="swordfish-right">
+	<div class="b-right">
 		<div class="swordfish-right-title">
 			剑鱼最新消息
 		</div>
@@ -80,8 +80,7 @@ $(function(){
 		}
 		$("#list").html(html);
 	}else{
-		$(".swordfish-index").find(".swordfish-left").removeClass("col-xs-9");
-		$(".swordfish-index").find(".swordfish-right").remove();
+		$(".swordfish-index").find(".b-right").remove();
 	}
 });
 </script>

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

@@ -319,8 +319,8 @@ function loadMore(){
 <!-- 头部 -->
 {{include "/common/swordfishhead.html"}}
 <!-- 中间 -->
-<div class="swordfish-content container-fluid">
-	<div class="swordfish-left">
+<div class="b-content container-fluid">
+	<div class="b-left">
 		<div class="swordfish-page-title">
 			<i class="img-circle glyphicon jianyu"></i>推送记录
 		</div>
@@ -338,7 +338,7 @@ function loadMore(){
 			</div>
 		</div>
 	</div>
-	<div class="swordfish-right swordfish-qrcode text-center">
+	<div class="b-right swordfish-qrcode text-center">
 		<img src="/images/swordfish/qrcode.png">
 		<br>关注微信公众号：企明星
 	</div>

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

@@ -7,8 +7,8 @@
 <!-- 头部 -->
 {{include "/common/swordfishhead.html"}}
 <!-- 中间 -->
-<div class="swordfish-content container-fluid swordfish-rssset">
-	<div class="swordfish-left">
+<div class="b-content container-fluid swordfish-rssset">
+	<div class="b-left">
 		<div class="swordfish-page-title">
 			<i class="img-circle glyphicon jianyu"></i>订阅设置
 		</div>
@@ -77,7 +77,7 @@
 			<div class="swordfish-panel-c">开发中，敬请期待！</div>
 		</div>
 	</div>
-	<div class="swordfish-right swordfish-qrcode text-center">
+	<div class="b-right swordfish-qrcode text-center">
 		<img src="/images/swordfish/qrcode.png">
 		<br>关注微信公众号：企明星
 	</div>

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

@@ -18,7 +18,7 @@
 		<li class="parent-node">
 			<img src="/wxswordfish/images/zhaobiao.png">
 			招标公告
-			<span class="on-off" id="tender-on-off"></span>
+			<span class="on-off" id="tender-on-off" v="tender"></span>
 		</li>
 		<li class="child-node">
 			<ul id="tender-content">
@@ -33,7 +33,7 @@
 		<li class="parent-node">
 			<img src="/wxswordfish/images/zhongbiao.png">
 			中标公告
-			<span class="on-off" id="bid-on-off"></span>
+			<span class="on-off" id="bid-on-off" v="bid"></span>
 		</li>
 		<li class="child-node">
 			<ul id="bid-content">
@@ -50,20 +50,25 @@
 			企业情报
 			<span class="on-off" id="intelligence-on-off"></span>
 		</li>
+		<li class="parent-node">
+			<img src="/wxswordfish/images/qingbao.png">
+			收费规则
+			<span class="rule" id="rule"></span>
+		</li>
 	</ul>
 	
 	<!--关键词-->
 	<div class="dialog keyword-dialog" id="tender-keyword">
 		<div class="dialog-main">
 			<div class="dialog-head">
-				<div>订阅关键词<span>最多订阅5组关键词</span></div>
+				<div>订阅关键词<span>最多订阅10组关键词</span></div>
 				<div><span class="submit">确定</span></div>
 			</div>
 			<div class="dialog-content">
 				<div class="addKeyWordArea">
 					<lable></lable>
 					<div><button class="btn addKeyWord"><span class="icon">+</span>添加关键词</button></div>
-					<div></div>
+					<div id="a_end"></div>
 				</div>
 			</div>
 		</div>
@@ -80,23 +85,35 @@
 					<li>
 						<button class="btn active">全国</button>
 					</li>
+					<li>
+						<div>华北地区</div>
+						<button class="btn">北京</button>
+						<button class="btn">天津</button>
+						<button class="btn">河北</button>
+						<button class="btn">山西</button>
+						<button class="btn">内蒙古</button>
+					</li>
+					<li>
+						<div>东北地区</div>
+						<button class="btn">辽宁</button>
+						<button class="btn">吉林</button>
+						<button class="btn">黑龙江</button>
+					</li>
 					<li>
 						<div>华东地区</div>
 						<button class="btn">上海</button>
 						<button class="btn">江苏</button>
 						<button class="btn">浙江</button>
 						<button class="btn">安徽</button>
+						<button class="btn">福建</button>
 						<button class="btn">江西</button>
 						<button class="btn">山东</button>
-						<button class="btn">福建</button>
 					</li>
 					<li>
-						<div>华北地区</div>
-						<button class="btn">北京</button>
-						<button class="btn">天津</button>
-						<button class="btn">山西</button>
-						<button class="btn">河北</button>
-						<button class="btn">内蒙古</button>
+						<div>华南地区</div>
+						<button class="btn">广东</button>
+						<button class="btn">广西</button>
+						<button class="btn">海南</button>
 					</li>
 					<li>
 						<div>华中地区</div>
@@ -104,15 +121,6 @@
 						<button class="btn">湖北</button>
 						<button class="btn">湖南</button>
 					</li>
-					<li>
-						<div>华南地区</div>
-						<button class="btn">广东</button>
-						<button class="btn">广西</button>
-						<button class="btn">海南</button>
-						<button class="btn">香港</button>
-						<button class="btn">澳门</button>
-						<button class="btn">台湾</button>
-					</li>
 					<li>
 						<div>西南地区</div>
 						<button class="btn">重庆</button>
@@ -129,12 +137,7 @@
 						<button class="btn">宁夏</button>
 						<button class="btn">新疆</button>
 					</li>
-					<li>
-						<div>东北地区</div>
-						<button class="btn">黑龙江</button>
-						<button class="btn">吉林</button>
-						<button class="btn">辽宁</button>
-					</li>
+
 				</ul>
 			</div>
 		</div>

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

@@ -16,7 +16,7 @@
 	<div class="dialog-main">
 		<div class="dialog-head">
 			<div>如何分享</div>
-			<div><span id="share-dialog-back">返回</span></div>
+			<div><span id="share-dialog-back">确定</span></div>
 		</div>
 		<div class="dialog-content">
 			<div>
@@ -25,6 +25,32 @@
 		</div>
 	</div>
 </div>
+<div class="dialog credit-dialog">
+	<div class="dialog-main">
+		<div class="dialog-head">
+			<div>收费规则</div>
+			<div><span id="credit-dialog-back">确定</span></div>
+		</div>
+		<div class="dialog-content" style="height:115px;">
+			<div class="rule-content">
+				<div>剑鱼收费标准：</div>
+				<div>每个栏目、每月1000积分。。</div>
+				<div>积分按月扣除，到期后默认自动扣除下月积分，积分不足则停止服务。如果您不希望下月继续服务，可提前将服务关闭。</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="dialog creditTip-dialog">
+	<div class="tip">
+		<div>您添加了1个信息栏目（招标公告），确认后系统将每月扣除1000积分，您目前的积分余额是1500积分，扣除后将剩余500积分。</div>
+		<div class="tip-button">
+		<span id="credit_yes">提交</span>
+		<span id="credit_no">取消</span>
+		</div>
+	</div>
+</div>
+
 <!--意见反馈-->
 <div class="dialog feedback-dialog">
 	<div class="dialog-main">
@@ -64,7 +90,8 @@ $(function(){
 	});
 	//弹出框消失
 	$(".dialog").click(function(e){
-		if($(e.target).hasClass("dialog")){
+		var et=$(e.target)
+		if(et.hasClass("dialog")&&!et.hasClass("creditTip-dialog")){
 			$(this).hide();
 			$("html,body").removeClass("overflow-hidden");
 		}

credit/src/main.go

@@ -1,5 +1,5 @@
 /*
-信用积分
+积分等
 */
 
 package main
@@ -26,21 +26,14 @@ import (
 
 var SysConfig map[string]interface{}
 var swordfish_subHour int
-var swordfish_tipBeforeDays = make([]int, 0)
+var swordfish_tipBeforeDays []int
 var swordfish_dueTitle, swordfish_due, swordfish_closeTitle, swordfish_close, swordfish_payTitle, swordfish_pay string
 
 func init() {
 	util.ReadConfig(&SysConfig)
-	swordfish_subHour = util.IntAllDef(SysConfig["swordfish_subHour"], 18)
-	swordfish_dueTitle = SysConfig["swordfish_dueTitle"].(string)
-	swordfish_due = SysConfig["swordfish_due"].(string)
-	swordfish_closeTitle = SysConfig["swordfish_closeTitle"].(string)
-	swordfish_close = SysConfig["swordfish_close"].(string)
-	swordfish_payTitle = SysConfig["swordfish_payTitle"].(string)
-	swordfish_pay = SysConfig["swordfish_pay"].(string)
 	strDays := strings.Split(SysConfig["swordfish_tipBeforeDays"].(string), ",")
 	creditrpc.Rpcserver = SysConfig["weixinrpc"].(string)
-
+	swordfish_tipBeforeDays = make([]int, len(strDays))
 	for k, v := range strDays {
 		swordfish_tipBeforeDays[k], _ = strconv.Atoi(v)
 	}
@@ -61,6 +54,14 @@ func init() {
 		creditrpc.Message[k] = v.(string)
 	}
 
+	swordfish_subHour = util.IntAllDef(SysConfig["swordfish_subHour"], 18)
+	swordfish_dueTitle = creditrpc.Message["swordfish_dueTitle"]
+	swordfish_due = creditrpc.Message["swordfish_due"]
+	swordfish_closeTitle = creditrpc.Message["swordfish_closeTitle"]
+	swordfish_close = creditrpc.Message["swordfish_close"]
+	swordfish_payTitle = creditrpc.Message["swordfish_payTitle"]
+	swordfish_pay = creditrpc.Message["swordfish_pay"]
+
 	creditlog.Smtp = SysConfig["smtp"].(map[string]interface{})
 
 }