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)}
 }
 

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/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-13 17:56:29"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-13 17:56:29"}},"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

@@ -112,7 +112,11 @@ a{
 	background-color: #E5E5E3;
 	padding: 5px;
 }
+
 /*边框*/
+.a-border-new{
+	border:1px solid #E5E6E9 !important;
+}
 .a-border {
 	border: 1px solid #ddd !important;
 }
@@ -139,6 +143,18 @@ a{
 	border-top: 1px solid #ddd !important;
 	box-shadow: none !important;
 }
+/*新样式*/
+.btn-primary-new{
+	
+	border:1px  solid #FF5A5F;	
+	height:32px;
+	vertical-align:center;
+	color:#FFF;
+	font-size:14px;
+	font-weight:600;
+	padding:0 ;
+	background-color:#FF5A5F ;
+}
 /*返回顶部*/
 .a-backTop{
 	height: 40px;
@@ -324,10 +340,16 @@ a{
 .a-twostage-title {
 	font-weight: 700;
 	font-size: 24px;
-	color: #666666;
+	color: #666;
 	margin-bottom: 10px;
 }
 /*头部样式*/
+.d-service-price{
+	background-color:#FBF0F1;
+	height: 65px;
+    	padding-top: 15px;
+	margin:20px 0 20px 0;
+}
 .a-header {
 	box-shadow: 0px 2px 2px #F4F4F4;
 	margin-bottom: 15px;
@@ -498,10 +520,11 @@ a{
 
 /*页面中间左右布局样式*/
 .a-com-ul-fbxq {
-	border: 1px solid #ddd;
-	float: left;
-	margin-bottom: 25px;
-	padding-bottom: 20px;
+	width:250px;
+	height:280px;
+	background-color:#FFF;
+	margin:2px;
+	text-align:center;
 }
 
 .a-com-ul-fbxq li {
@@ -532,12 +555,19 @@ a{
 
 .a-com-ul-fbxq button {
 	width: 80%;
-	margin-top: 15px;
 }
 
 .a-c-right>.a-com-title {
+	border-left: 3px solid #FF5A5F;
+	width: 250px;
+	height: 45px;
+	margin:10px 0 10px 1px;
+	line-height: 45px;
+	padding-left: 20px;
+	background: #FFF;
 	font-weight: bold;
-	margin-bottom: 10px;
+	color: #4E5051 !important;
+	
 }
 
 .a-c-right>div>.a-com-ul-block {
@@ -545,20 +575,17 @@ a{
 }
 /*类似热门需求的ul*/
 .a-com-ul-block {
-	border: 1px solid #ddd;
 	font-size: 12px;
 	float: left;
 	padding-bottom: 10px;
 }
 .a-com-ul-block .a-com-first{
-	height: 250px;
+	height: 230px;
 	display: table;
-	background-color: #ffffff;
 	text-align: center;
 }
 .a-com-ul-block .a-com-first a{
 	display: table-cell;
-    vertical-align: middle;
 }
 .a-com-ul-block .a-com-first-one{
 	height: 160px;
@@ -573,15 +600,17 @@ a{
 	max-width: 250px;
   	max-height: 250px;
 }
-
-.a-com-ul-block .a-com-title {
+.a-com-ul-block  .a-com-title {
 	font-size: 14px;
 	height: 20px;
 }
+.a-com-ul-block  .a-com-title  a{
+	color:#FFF;
+}
 
 .a-com-ul-block .a-com-title>div {
 	position: absolute;
-	left: 10px;
+	left: 0px;
 	right: 0px;
 	top: 0px;
 	bottom: 0px;
@@ -595,15 +624,14 @@ a{
 }
 
 .a-com-ul-block .a-com-name {
-	color: #999999;
+	color: #A0A0A0;
 	height: 20px;
 	padding-right: 10px;
 }
 
 .a-com-ul-block .a-com-name>div {
 	position: absolute;
-	left: 10px;
-	right: 30px;
+	left: 0px;
 	top: 0px;
 	bottom: 0px;
 	text-overflow: ellipsis;
@@ -983,9 +1011,22 @@ a{
 }
 
 .a-com-ul-block {
-	width: 252px;
+	width: 250px;
+	height:230px;
+}
+.a-com-ul-blocknew {
+	margin-left:1px;
 }
 
+.a-com-ul-blocknew .a-com-second{
+	border-top: 3px solid #FF5A5F;
+	position: relative;
+	width: 249px;
+	padding: 12px 0 0 10px;
+	height: 67px;
+	bottom: 66px;
+	background-image: url(/images/us46.png);
+}
 .a-index .a-transverse-advert {
 	height: 90px;
 }
@@ -1079,13 +1120,21 @@ a{
 }
 /*首页css-end*/
 /*服务预约原型css-start*/
+.a-servicedetail {
+	margin-top:10px;
+}
+
+.a-servicedetail .a-border{
+	border:none;
+}
 .a-servicedetail .container {
-	padding-top: 30px;
-	padding-left: 30px;
-	padding-bottom:15px;
+	background-color: #FFF;
+	padding:30px 0 25px 60px;	
 	width: 100%;
 }
-
+.pull-left{
+	margin-top:-10px;
+}
 .a-servicedetail .preview {
 	float: none;
 	text-align: center;
@@ -1195,7 +1244,7 @@ a{
 	background: url(/images/u019.png) no-repeat 0 0;
 	width: 127px;
 	height: 30px;
-	margin-left: -5px;
+	margin-left: 10px;
 	margin-top: 0px;
 }
 
@@ -1208,7 +1257,7 @@ a{
 }
 
 .a-servicedetail .d_service_main{
-	margin-left: 70px;
+	margin-left: 61px;
 }
 
 .a-servicedetail .d_service_star {
@@ -1218,11 +1267,13 @@ a{
 }
 
 .a-servicedetail .d_service_app {
-	margin-left: 110px;
+	margin-left: 130px;
 	margin-top: -25px;
 	margin-bottom: 12px;
 }
-
+.a-servicedetail .d_service_app .margin-lr-15{
+	color:#FF5A5F;
+}	
 .a-servicedetail .d_service_app span {
 	color: #333333;
 }
@@ -1231,12 +1282,23 @@ a{
 	color: #aea79f;
 	font-size: 23px;
 	padding: 0 0 10px 0;
+	float:left;
 }
 
 .a-servicedetail .d_service_quote{
-	color: #dd4814;
-	margin: 0 10px 0 10px;
+	margin: 7px 10px 0 10px;
+	padding-left:10px;
+	font-size:16px;
+	font-weight:600;
+}
+.a-servicedetail .d_service_quote .fix{
+	color:#A0A0A0;
 }
+.a-servicedetail .d_service_quote .var{
+	color:#FF5A5F;
+	margin-left:20px;
+}
+
 
 .a-servicedetail .d_submit {
 	margin-bottom: 10px;
@@ -1402,21 +1464,21 @@ style="color:#D03102;margin-right:5px;"
 }
 /*服务预约原型css-end*/
 /*服务市场列表css-start*/
+.a-servicelist{
+	margin:0px auto;
+	padding:20px 0 0 0;
+	display:block;
+}
 .a-servicelist .d_service_span {
 	margin-right: 15px;
 }
 
-.a-servicelist .d_row {
-	margin-top: 20px;
-	padding-bottom: 20px;
-	border-bottom: 1px solid #E7E7E7;
-}
 
 .a-servicelist .sel {
 	width: 20%;
 	min-width: 80px;
 	max-width: 180px;
-	height: 25px;
+	height: 30px;
 	font-size: 14px;
 	color: #555;
 	background-color: #fff;
@@ -1425,13 +1487,12 @@ style="color:#D03102;margin-right:5px;"
 }
 
 .a-servicelist .d_group {
-	margin-bottom: 15px;
-	border-bottom: 1px solid #ddd;
-	height: 110px;
+    margin:7px 20px 15px 2px;
+    border-bottom: 1px solid #ddd;
+    height: 119px;
 }
 
 .a-servicelist .d_style {
-	margin-left: 15px;
 	display: inline-block;
 }
 
@@ -1454,27 +1515,35 @@ style="color:#D03102;margin-right:5px;"
 }
 
 .a-servicelist .d_tj {
-	border: 1px solid #CCCCCC;
-	height: 40px;
-	margin-top: 20px;
-	background-color: #f7f6f4;
+	margin:-3px 0 0 0 ;
+	height: 45px;
+	background-color: #F6F8FA;
 }
 
-.a-servicelist .d_zhpx {
-	display: inline-block;
+.a-servicelist .d_zhpx,.a-servicelist .d_rq{
+	float:left;
+	height: 45px;
 	padding: 10px 20px;
+	width:112px;
+	font-size: 14px;
+	text-align:center;
+
+}
+
+.a-servicelist .d_zhpx {
 	background-color: #FFFFFF;
-	height: 38px;
-	color: #dd4814;
-	font-size: 13px;
+	color: #FF5A5F;
+	width:112px;
+	border-top:3px solid #FF5A5F;
+	border-left:0px !important;
+	border-right:0px;
 }
 
 .a-servicelist .d_rq {
-	display: inline-block;
-	padding: 10px 20px;
-	height: 38px;
-	color: #999999;
-	font-size: 13px;
+	line-height:28px;
+	color: #666;
+	font-weight:200;
+	border-right:1px solid #fff;
 }
 
 .a-servicelist .d_rq a{
@@ -1491,7 +1560,7 @@ style="color:#D03102;margin-right:5px;"
 }
 
 .a-servicelist .d_img {
-	height: 100px;
+	height: 92px;
 	width: 100px;
 }
 
@@ -1512,20 +1581,22 @@ style="color:#D03102;margin-right:5px;"
 
 .a-servicelist .d_style_hylb ul li {
 	display: inline-block;
-	margin-right: 15px;
+	margin-right: 14px;
 	height: 25px;
 	line-height: 25px;
 	cursor: pointer;
 	margin-top: -4px;
 }
- .u-key a,.u-key li{
-	color:#aea79f;
-	
-}
+
  .u-key a:hover,.u-key li:hover{
 	color: #dd4814;
 	text-decoration:none;
 }
+.d_tj{
+	padding:0 0 0 20px;
+	font-size:14px;
+	font-weight:600;
+}
 .d_tj div{
 	cursor:pointer;
 }
@@ -1537,9 +1608,10 @@ style="color:#D03102;margin-right:5px;"
 }
 .u-secondsort a{
 	display:block;
-	margin-right:10px;
+	margin-right:40px;
 	margin-bottom:10px;
 	float:left;
+	color:#666;
 }
 .g-comment{
 	height:25px;
@@ -2047,9 +2119,9 @@ style="color:#D03102;margin-right:5px;"
 	top: 0px;
 }
 .b-top{
-	height: 25px;
+	min-height: 25px;
 	line-height: 25px;
-	padding-right: 50px;
+	padding-right: 87px;
 	background-color: #464645;
 	font-size: 12px;
 	font-family: "SimSun";

core/src/web/staticres/fonts/index.html

@@ -0,0 +1,527 @@
+<html>
+<head>
+<title>字体图标测试</title>
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+<meta name="Generator" content="EditPlus">
+<meta name="Author" content="">
+<meta name="Keywords" content="">
+<meta name="Description" content="">
+<style>
+@font-face {
+	font-family: 'qimingxing';
+	src: url('qimingxing.woff');
+}
+
+.glyphicon {
+	position: relative;
+	top: 1px;
+	display: inline-block;
+	font-family: 'qimingxing';
+	font-style: normal;
+	font-weight: normal;
+	line-height: 1;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.anquan:before {
+	content: "\44";
+}
+
+.bianji:before {
+	content: "\22";
+}
+
+.biaojidizhi:before {
+	content: "\23";
+}
+
+.fuwu:before {
+	content: "\24";
+}
+
+.chenggongtishi:before {
+	content: "\25";
+}
+
+.dengjijiguan:before {
+	content: "\26";
+}
+
+.dengjizhuangtai:before {
+	content: "\27";
+}
+
+.douban:before {
+	content: "\28";
+}
+
+.falvshengming:before {
+	content: "\29";
+}
+
+.faren:before {
+	content: "\30";
+}
+
+.fenxiang:before {
+	content: "\32";
+}
+
+.gongshixinxi:before {
+	content: "\33";
+}
+
+.gongshijianjie:before {
+	content: "\34";
+}
+
+.guanxiwang:before {
+	content: "\35";
+}
+
+.huidingbu:before {
+	content: "\36";
+}
+
+.jiazai:before {
+	content: "\37";
+}
+
+.jingyingfanwei:before {
+	content: "\38";
+}
+
+.kehubiaoqian:before {
+	content: "\39";
+}
+
+.lianxidianhua:before {
+	content: "\40";
+}
+
+.lianxidizhi:before {
+	content: "\41";
+}
+
+.lianxiren:before {
+	content: "\42";
+}
+
+.lianxiwomen:before {
+	content: "\43";
+}
+
+.liaotianjilu:before {
+	content: "\45";
+}
+
+.liebiao:before {
+	content: "\46";
+}
+
+.mima:before {
+	content: "\47";
+}
+
+.qiyeleixing:before {
+	content: "\48";
+}
+
+.quanping:before {
+	content: "\4a";
+}
+
+.quanxianfenpei:before {
+	content: "\4b";
+}
+
+.riqi:before {
+	content: "\4c";
+}
+
+.shibai:before {
+	content: "\4d";
+}
+
+.shimingrenzheng:before {
+	content: "\4e";
+}
+
+.shuaxin2:before {
+	content: "\4f";
+}
+
+.sousuo:before {
+	content: "\50";
+}
+
+.tishi:before {
+	content: "\53";
+}
+
+.wangzhi:before {
+	content: "\54";
+}
+
+.wodehuangye:before {
+	content: "\55";
+}
+
+.weiguanwang:before {
+	content: "\56";
+}
+
+.weixinhao:before {
+	content: "\58";
+}
+
+.xiaoxi:before {
+	content: "\59";
+}
+
+.xiayibu:before {
+	content: "\5a";
+}
+
+.xitongshezhi:before {
+	content: "\62";
+}
+
+.youjian:before {
+	content: "\63";
+}
+
+.yuangongguanli:before {
+	content: "\64";
+}
+
+.kefuzaixian:before {
+	content: "\65";
+}
+
+.grrz:before {
+	content: "\66";
+}
+
+.zhanghao:before {
+	content: "\67";
+}
+
+.zhuanjie:before {
+	content: "\68";
+}
+
+.zhucehao:before {
+	content: "\69";
+}
+
+.zhusuo:before {
+	content: "\6a";
+}
+
+.zican:before {
+	content: "\6b";
+}
+
+.biaoqian:before {
+	content: "\70";
+}
+
+.biaoqing:before {
+	content: "\71";
+}
+
+.bofangjilu:before {
+	content: "\72";
+}
+
+.yjrz:before {
+	content: "\73";
+}
+
+.jgrz:before {
+	content: "\74";
+}
+
+.enterjian:before {
+	content: "\75";
+}
+
+.fuxuangougou:before {
+	content: "\76";
+}
+
+.guanbi:before {
+	content: "\77";
+}
+
+.iconfontcolor71:before {
+	content: "\78";
+}
+
+.liaotian:before {
+	content: "\79";
+}
+
+.ren:before {
+	content: "\7A";
+}
+
+.shangyihua:before {
+	content: "\7B";
+}
+
+.shangyiye:before {
+	content: "\7C";
+}
+
+.shuaxin:before {
+	content: "\7D";
+}
+
+.svgzuidahua:before {
+	content: "\7E";
+}
+
+.tupian:before {
+	content: "\A1";
+}
+
+.uploading:before {
+	content: "\A2";
+}
+
+.mprz:before {
+	content: "\A3";
+}
+
+.yyzzrz:before {
+	content: "\A4";
+}
+
+.yingyong:before {
+	content: "\A5";
+}
+
+.zhuanrengong:before {
+	content: "\A6";
+}
+
+.qyrz:before {
+	content: "\A7";
+}
+
+.zuixiaohua:before {
+	content: "\A8";
+}
+
+.qq:before {
+	content: "\7e";
+}
+
+.jianyu:before {
+	content: "\51";
+}
+
+.zhengcefagui:before {
+	content: "\52";
+}
+
+.fuwushichang:before {
+	content: "\49";
+}
+
+.qiyeshequ:before {
+	content: "\57";
+}
+
+.weiguanwang1:before {
+	content: "\61";
+}
+
+.icon-small {
+	font-size: 12px;
+}
+
+.icon-mini {
+	font-size: 10px;
+}
+
+.icon-large {
+	font-size: 24px;
+}
+
+.icon-xlarge {
+	font-size: 48px;
+}
+
+span {
+	line-height: 32px;
+	display: block;
+	height: 32px;
+	width: 270px;
+}
+</style>
+</head>
+
+<body>
+	<span class="glyphicon anquan icon-large">安全</span>
+	<span class="glyphicon bianji icon-large">编辑</span>
+	<span class="glyphicon biaojidizhi icon-large">标记地址</span>
+	<span class="glyphicon fuwu icon-large">服务</span>
+	<br>
+	<br>
+
+
+	<span class="glyphicon dengjizhuangtai icon-large">登记状态</span>
+	<span class="glyphicon dengjijiguan icon-large">登记机关</span>
+	<span class="glyphicon chenggongtishi icon-large">成功提示</span>
+	<span class="glyphicon douban icon-large">豆瓣</span>
+	<br>
+	<br>
+
+
+	<span class="glyphicon falvshengming icon-large">法律声明</span>
+	<span class="glyphicon faren icon-large">法人</span>
+	<span class="glyphicon gongshixinxi icon-large">公示简介</span>
+	<span class="glyphicon gongshijianjie icon-large">公示简介</span>
+	<br>
+	<br>
+
+
+
+
+	<span class="glyphicon fenxiang icon-large">分享</span>
+	<span class="glyphicon guanxiwang icon-large">关系网</span>
+	<span class="glyphicon huidingbu icon-large">回顶部</span>
+	<span class="glyphicon jiazai icon-large">加载</span>
+	<br>
+	<br>
+
+
+
+
+	<span class="glyphicon jingyingfanwei icon-large">经营范围</span>
+	<span class="glyphicon kehubiaoqian icon-large">客户标签</span>
+	<span class="glyphicon lianxidianhua icon-large">联系电话</span>
+	<span class="glyphicon lianxidizhi icon-large">联系地址</span>
+	<br>
+	<br>
+
+
+	<span class="glyphicon lianxiren icon-large">联系人</span>
+	<span class="glyphicon lianxiwomen icon-large">联系我们</span>
+	<span class="glyphicon liaotian icon-large">聊天</span>
+	<span class="glyphicon liaotianjilu icon-large">聊天记录</span>
+	<br>
+	<br>
+
+	<span class="glyphicon liebiao icon-large">列表</span>
+	<span class="glyphicon mima icon-large">密码</span>
+	<span class="glyphicon qiyeleixing icon-large">企业类型</span>
+	<br>
+	<br>
+
+
+	<span class="glyphicon quanping icon-large">全屏</span>
+	<span class="glyphicon quanxianfenpei icon-large">权限分配</span>
+	<br>
+	<br>
+
+
+
+
+	<span class="glyphicon riqi icon-large">日期</span>
+	<span class="glyphicon shibai icon-large">失败</span>
+	<span class="glyphicon shimingrenzheng icon-large">实名认证</span>
+	<span class="glyphicon shuaxin icon-large">刷新</span>
+	<span class="glyphicon shuaxin2 icon-large">刷新</span>
+	<br>
+	<br>
+
+
+	<span class="glyphicon sousuo icon-large">搜索</span>
+	<span class="glyphicon tishi icon-large">提示</span>
+	<br>
+	<br>
+
+	<span class="glyphicon wangzhi icon-large">网址</span>
+	<span class="glyphicon wodehuangye icon-large">我的黄页</span>
+	<span class="glyphicon weiguanwang icon-large">微官网</span>
+	<br>
+	<br>
+
+	<span class="glyphicon weixinhao icon-large">微信号</span>
+	<span class="glyphicon xiaoxi icon-large">消息</span>
+	<span class="glyphicon xiayibu icon-large">下一步</span>
+	<br>
+	<br>
+
+	<span class="glyphicon xitongshezhi icon-large">系统设置</span>
+	<span class="glyphicon youjian icon-large">邮件</span>
+	<span class="glyphicon yuangongguanli icon-large">员工管理</span>
+	<span class="glyphicon kefuzaixian icon-large">客服在线</span>
+	<br>
+	<br>
+
+
+	<span class="glyphicon zhanghao icon-large">帐号</span>
+	<span class="glyphicon zhuanjie icon-large">转接</span>
+	<span class="glyphicon zhucehao icon-large">注册号</span>
+	<br>
+	<br>
+
+	<span class="glyphicon zhusuo icon-large">住所</span>
+	<span class="glyphicon zican icon-large">资产</span>
+	<br>
+	<br>
+
+	<span class="glyphicon qq icon-large">企鹅</span>
+	<span class="glyphicon qyrz icon-large">企业认证</span>
+	<span class="glyphicon jgrz icon-large">机构认证</span>
+	<br>
+	<br>
+	<span class="glyphicon yyzzrz icon-large">营业执照认证</span>
+	<span class="glyphicon yjrz icon-large">邮件认证</span>
+	<span class="glyphicon grrz icon-large">个人认证</span>
+	<br>
+	<br>
+	<span class="glyphicon mprz icon-large">名片认证</span>
+	<br>
+	<br>
+	<span class="glyphicon biaoqing icon-large">表情</span>
+	<span class="glyphicon bofangjilu icon-large">播放记录</span>
+	<span class="glyphicon enterjian icon-large">退出</span>
+	<br>
+	<br>
+	<span class="glyphicon fuxuangougou icon-large">复选勾</span>
+	<span class="glyphicon guanbi icon-large">关闭</span>
+	<span class="glyphicon iconfontcolor71 icon-large">心</span>
+	<br>
+	<br>
+	<span class="glyphicon ren icon-large">人</span>
+	<span class="glyphicon shangyihua icon-large">上一划</span>
+	<span class="glyphicon shangyiye icon-large">上一页</span>
+	<br>
+	<br>
+	<span class="glyphicon fuxuangougou icon-large">复选勾</span>
+	<span class="glyphicon svgzuidahua icon-large">最大化</span>
+	<span class="glyphicon tupian icon-large">图片</span>
+	<br>
+	<br>
+	<span class="glyphicon uploading icon-large">上传中</span>
+	<span class="glyphicon yingyong icon-large">应用</span>
+	<span class="glyphicon zhuanrengong icon-large">转人工</span>
+	<br>
+	<br>
+	<span class="glyphicon jianyu icon-large">剑鱼</span>
+	<span class="glyphicon zhengcefagui icon-large">政策法规</span>
+	<span class="glyphicon fuwushichang icon-large">服务市场</span>
+	<br>
+	<br>
+	<span class="glyphicon qiyeshequ icon-large">企业社区</span>
+	<span class="glyphicon weiguanwang1 icon-large">微官网</span>
+</body>
+</html>

core/src/web/staticres/js/marketlist.js

@@ -1,7 +1,7 @@
 
 var citySim = [{"k":" 11","n":"北京市"},{"k":" 12","n":"天津市"},{"k":" 13","n":"河北省"},{"k":" 14","n":"山西省"},{"k":" 15","n":"内蒙古"},{"k":" 21","n":"辽宁省"},{"k":" 22","n":"吉林省"},{"k":" 23","n":"黑龙江省"},{"k":" 31","n":"上海市"},{"k":" 32","n":"江苏省"},{"k":" 33","n":"浙江省"},{"k":" 34","n":"安徽省"},{"k":" 35","n":"福建省"},{"k":" 36","n":"江西省"},{"k":" 37","n":"山东省"},{"k":" 41","n":"河南省"},{"k":" 42","n":"湖北省"},{"k":" 43","n":"湖南省"},{"k":" 44","n":"广东省"},{"k":" 45","n":"广西"},{"k":" 46","n":"海南省"},{"k":" 50","n":"重庆市"},{"k":" 51","n":"四川省"},{"k":" 52","n":"贵州省"},{"k":" 53","n":"云南省"},{"k":" 54","n":"西藏"},{"k":" 61","n":"陕西省"},{"k":" 62","n":"甘肃省"},{"k":" 63","n":"青海省"},{"k":" 64","n":"宁夏"},{"k":" 65","n":"新疆"},{"k":" 71","n":"台湾省"},{"k":" 81","n":"香港"},{"k":" 82","n":"澳门"}];
 $(function() {
-  setNavbarActive(0);
+
   getServiceType();
   //地区下拉框
   if ($chiancity) {
@@ -87,7 +87,7 @@ function initClicked(){
 	}else if(c_fwtype.length>1){
 		var c_parent=c_fwtype.substr(0,2)
 		$("#c_stype").find("a[value="+c_parent+"]").addClass("text-primary text-bold");
-		if(c_parent>"05"){
+		if(c_parent>"04"){
 			$(".d_style_hylb.text-muted.u-key.less").removeClass("less");
 			$(".d_more.qfw-text-more small").text("收起<")
 		}
@@ -161,7 +161,7 @@ function getServiceType(){
 		if(cc_fwtype==tmp[i]["code"]){
 			cn=tmp[i].children;
 			if(cn.length>0){
-				$(".f_zw").html("<div class=\"d_row\" style=\"padding-bottom:0px;padding-left:8px;\"><div class=\"f-sort\" ></div></div>")	
+				$(".f_zw").html("<div class=\"d_row\" style=\"background:#FBF0F1;padding:22px 0 0 20px;margin:-6px 0 20px 133px;\"><div class=\"f-sort\" ></div></div>")	
 			}
 			for(var j=0;j<cn.length;j++){
 				nodestr="";

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

@@ -128,22 +128,39 @@ function ScopeDialog(type,clickLi){
 		commonAjaxReq(thisClass,type);
 	});
 }
+//取积分
+function getCredit(){
+	
+}
+
 function commonAjaxReq(object,module){
+	//是关的不用处理
+	var dataObj = {
+		reqType: "other",
+		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 dataObj = {
-		reqType: "other"
-	};
+
 	var keysString = "",scopeString = "";
 	var thisClass = this;
 	this.afterCommit = function(){

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

@@ -527,4 +527,19 @@ img{
 	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/hotdemand.html

@@ -3,10 +3,15 @@
 	{{$s:=(Ad "service-right-02" 4)}}
 	{{range $k,$v := $s}}
 	<ul class="a-com-ul-block" data-id="{{$v.s_id}}">
-		<li class="a-com-first"><a href="{{$v.s_link}}"><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}} src="{{if $v.s_pic}}{{$v.s_pic}}{{else}}null{{end}}" onerror="this.src='/images/u166.png'"></a></li>
-		<li class="a-com-title"><div><a href="{{$v.s_link}}">{{$v.s_remark}}</a></div></li>
-		<li class="a-com-name"><div>{{$v.o_extend.entName}}</div></li>
-		<li class="a-com-last"></li>
+		<li class="a-com-second">
+			<div>
+				<ul>
+					<li class="a-com-first"><a href="{{$v.s_link}}"><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}} src="{{if $v.s_pic}}{{$v.s_pic}}{{else}}null{{end}}" width=250  onerror="this.src='/images/u166.png'"></a></li>
+					<li class="a-com-title"><div><a href="{{$v.s_link}}">{{$v.s_remark}}</a></div></li>
+					<li class="a-com-name"><div>{{$v.o_extend.entName}}</div></li>
+				</ul>
+			</div>
+		</li>
 	</ul>
 	{{end}}
 </div>

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

@@ -2,11 +2,16 @@
 <div id="hotService">
 	{{$s:=(Ad "service-right-01" 4)}}
 	{{range $k,$v := $s}}
-	<ul class="a-com-ul-block" data-id="{{$v.s_id}}">
-		<li class="a-com-first"><a href="{{$v.s_link}}"><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}} src="{{if $v.s_pic}}{{$v.s_pic}}{{else}}null{{end}}" onerror="this.src='/images/u166.png'"></a></li>
-		<li class="a-com-title"><div><a href="{{$v.s_link}}">{{$v.s_remark}}</a></div></li>
-		<li class="a-com-name"><div>{{$v.o_extend.entName}}</div></li>
-		<li class="a-com-last">评价<font>0</font></li>
+	<ul class="a-com-ul-block a-com-ul-blocknew" data-id="{{$v.s_id}}">
+		<li class="a-com-first"><a href="{{$v.s_link}}"><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}} src="{{if $v.s_pic}}{{$v.s_pic}}{{else}}null{{end}} " width=250 height=230 onerror="this.src='/images/u166.png'"></a></li>
+		<li class="a-com-second">
+			<div>
+				<ul>
+					<li class="a-com-title"><div><a href="{{$v.s_link}}">{{$v.s_remark}}</a></div></li>
+					<li class="a-com-name"><div>{{$v.o_extend.entName}}</div></li>
+				</ul>
+			</div>
+		</li>
 	</ul>
 	{{end}}
 </div>

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/releasedemand.html

@@ -1,8 +1,4 @@
-<ul class="a-com-ul-fbxq" >
-	<li class="text-center a-com-first">发布需求，坐等服务商上门</li>
-	<li class="text-muted a-com-step"><a>1</a>选择服务分类</li>
-	<li class="text-muted a-com-step"><a>2</a>描述您的需求</li>
-	<li class="text-muted a-com-step"><a>3</a>坐等服务商上门</li>
-	<li class="text-muted a-com-step"><a>4</a>服务达成，评价服务</li>
-	<li class="text-center"><button class="btn btn-primary" onclick="window.location.href='/market/demand/add.html'"><b>发 需 求</b></button></li>
-</ul>
+<div class="a-com-ul-fbxq" >
+	<img src="/images/marketnew/sidebar.png" />
+	<button class="btn btn-primary" onclick="window.location.href='/market/demand/add.html'">发 需 求</button>
+</div>

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/service/detail.html

@@ -14,15 +14,33 @@
 	#bdshare_weixin_qrcode_dialog{
 		    height: 330px !important;
 	}
+	body{
+			background-color:#F0F0F0;
+			font-family:"微软雅黑","宋体"
+		}
+	.container-fluid .a-content{
+		margin-top:10px;
+	}
+	.a-c-right{
+		margin-top:8px;
+	}
+	.text-muted a{
+		color: #aea79f;
+	}
+	.text-primary{
+		color:#FF5A5F;
+	}
 	</style>
+<link href="/css/index-new.css" rel="stylesheet">
 </head>
 <body>
 	<img src="{{.T.sinfo.s_shareimg}}" style="width:0px;height:0px;"/>
 	<!-- 审核头部 -->
-	{{include "/common/head.html"}}
+	{{include "/common/login.html"}}
+	{{include "/common/indexhead.html"}}
 	<div class="container-fluid a-content">
 		<div class="a-c-left a-servicedetail" >
-			<div class="a-border">
+			<div>
 				<div class="container">
    				<div class="margin-0">
   					<div class="col-sm-3 visible-lg">
@@ -58,30 +76,35 @@
 		 			<div class="col-xs-12 col-sm-8 d_service_main">
 			 			<div class="a-twostage-title u-overflow">{{.T.sinfo.s_name}}</div>
 						<div><span class="text-muted margin-r-10"><a href="/enterprise/{{.T.sinfo.s_enterpriseid}}.html" target="_blank">{{.T.sinfo.s_enterprisename}}</a></span></div>
-			 			<div class="d_service_star">
-							<div class="gray-star">
-			 					<div class="green-star" style="width:{{.T.style}}%"></div>
-		 						</div>
-		 					<div class="d_service_app">
-		 						<span class="margin-lr-15">{{.T.fscore}}分 </span>
-								<span style="">共 <a href="javascript:void(0)" class="text-primary" onClick="$('.d_fwfl a').eq(1)[0].click();">{{.T.sinfo.i_comments}}</a> 条评价</span>
-		 					</div>
-		 				</div>
-		 				<div>
-						
-						{{if .T.sinfo.s_pricemy }}
-							{{if eq .T.sinfo.s_pricemy "1" }}
-								<div class="d_service_quote">报价:<span>面议</span></div>
+			 			<div class="d-service-price">
+							<div>
+							{{if .T.sinfo.s_pricemy }}
+								{{if eq .T.sinfo.s_pricemy "1" }}
+									<div class="d_service_quote"><span class="fix">报价:</span><span class="var">面议</span></div>
+								{{else}}
+									{{if ne .T.sinfo.f_price "0.00" }}
+										<div class="d_service_quote"><span class="fix">报价:</span><span class="var" id="de-price">{{.T.sinfo.f_price}}</span>元</div>
+									{{end}}
+								{{end}}
 							{{else}}
 								{{if ne .T.sinfo.f_price "0.00" }}
 									<div class="d_service_quote">报价:<span id="de-price">{{.T.sinfo.f_price}}</span>元</div>
 								{{end}}
 							{{end}}
-						{{else}}
-							{{if ne .T.sinfo.f_price "0.00" }}
-								<div class="d_service_quote">报价:<span id="de-price">{{.T.sinfo.f_price}}</span>元</div>
-							{{end}}
-						{{end}}
+							</div>
+							<div style="float:left;"><img style="margin-top:-8px;" src="/images/marketnew/cut.png" /></div>
+							<div style="float:left;margin-top:8px;font-weight:600;color:#A0A0A0;">评分：</div>
+							<div class="d_service_star" style="float:left;">
+								<div class="gray-star">
+				 					<div class="green-star" style="width:{{.T.style}}%"></div>
+			 						</div>
+								<div class="d_service_app">
+		 						<span class="margin-lr-15">{{.T.fscore}}分 </span>
+								<span style="margin-left:-5px;">（ <a href="javascript:void(0)" class="text-primary" onClick="$('.d_fwfl a').eq(1)[0].click();">{{.T.sinfo.i_comments}}</a> 条评价）</span>
+		 					</div>
+		 				</div>
+						</div>
+						<div>
 						{{if eq .T.isal 1}}
 						<button type="submit" class="btn btn-default d_submit" data-toggle="modal" disabled="disabled">免费预约</button>
 						{{else}}
@@ -271,7 +294,6 @@
 {{include "/common/bottom.html"}}
 <script type="text/javascript">
 compulsoryreRresh = true;
-setNavbarActive(0);
 $(function(){
 	
 	$(".d_fwfl a").eq(0).addClass(".d_fwfl")

core/src/web/templates/service/list.html

@@ -4,164 +4,223 @@
 {{include "/common/inc.html"}}
 <meta name="Keywords" content="{{Msg "seo" "qfw.market.key"}}"/>
 <meta name="Description" content="{{Msg "seo" "qfw.market.description"}}"/>
+<style>
+	body{
+		background-color:#F0F0F0;
+		font-family:"Microsoft YaHei","SimSun"
+	}
+	.list-new-list{
+		max-width: 940px;
+		width:100%;
+       margin: 10px 0 0 0;
+   	    background-color: #fff;
+       float: left;
+	}
+	.list-query-new{
+		margin:0 20px 20px 20px;
+		padding:22px 60px 20px 40px;
+	}
+	.list-query-new .u-key,#city_china{
+		padding-left:50px;
+	}
+	.list-new-row{
+		padding:0 0 18px 0px;;
+	}
+	.list-new-row .d_style_hylb a ,#c_xuqu a{
+		margin-right:28px;
+	}
+	.d_group div.title{
+		margin-top:4px;
+	}
+	.d_group div.title a{
+		color:#666;
+		font-size:14px;
+		font-weight:600;
+	}
+	.list-new-row .d_style{
+		font-size:14px;
+		color:#4E5051;
+		font-weight:600;
+	}
+	.list-new-row .more{
+		vertical-align:top;
+	}
+	.a-content{
+		padding-left:0px;
+		padding-right:0px;
+	}
+	.a-c-right{
+		margin-top:9px;
+	}
+	.text-primary{
+		color:#FF5A5F !important;
+	}
+</style>
+<link href="/css/index-new.css" rel="stylesheet">
 </head>
-<body>
-{{include "/common/head.html"}}
-<div class="a-content container-fluid">
-	<div class="a-c-left a-servicelist" >
-		<div class=" container-fluid hidden-sm hidden-xs a-border">
-		{{if eq "demand" .T.querymap.c_searchtype }}
-		{{else}}
-			<div class="d_row">
-				<div class="d_style" >所&nbsp;在&nbsp;地&nbsp;：</div>
-				<div id="city_china" class="d_style1" >
-					<select class="sel province cxselect yselect" disabled="disabled" id="c_province" name="province"><option value="0">不限</option></select>
-					<select class="sel city cxselect yselect" disabled="disabled" id="c_city" name="city"><option value="0">选择市</option></select>
-					<select class="sel area cxselect yselect" disabled="disabled" id="c_area" name="area"><option value="0">选择县</option></select>
+<body >
+{{include "/common/login.html"}}
+{{include "/common/indexhead.html"}}
+<div class="a-content container-fluid" style="width:1200px;">
+	<div class="list-new-list">
+		<div class="a-servicelist" >
+			<div class=" container-fluid hidden-xs a-border-new list-query-new">
+			{{if eq "demand" .T.querymap.c_searchtype }}
+			{{else}}
+				<div class="list-new-row">
+					<div class="d_style" >所&nbsp;在&nbsp;地&nbsp;&nbsp;&nbsp;：</div>
+					<div id="city_china" class="d_style1" >
+						<select class="sel province cxselect yselect" disabled="disabled" id="c_province" name="province"><option value="0">不限</option></select>
+						<select class="sel city cxselect yselect" disabled="disabled" id="c_city" name="city"><option value="0">选择市</option></select>
+						<select class="sel area cxselect yselect" disabled="disabled" id="c_area" name="area"><option value="0">选择县</option></select>
+					</div>
 				</div>
+			{{end}}
+				<div class="list-new-row">
+					<div class="d_style more">服务类别&nbsp;&nbsp;：</div>
+					<div class="d_style_hylb text-muted less u-key" style="width:80%;" id="fwlb"></div>
+					<div class="d_more qfw-text-more" onClick="less(this)"><small  style="cursor:hand">更多></small></div>	
+				</div>
+				<div class="f_zw">
+					
+				</div>
+				<div class="list-new-row">
+					<div class="d_style" >发布时间&nbsp;&nbsp;：</div>
+					<div class="d_style_hylb text-muted u-key" id="c_release"><a value="">全部</a>&nbsp;&nbsp; <a value="1">今日发布</a>&nbsp;&nbsp; <a value="2">昨日发布</a>&nbsp;&nbsp; <a value="3">近三天发布</a> </div>
+				</div>
+				{{if eq "service" $.T.querymap.c_searchtype}}
+				<div class="list-new-row" style="height:26px;">
+					<div class="d_style" >认证类型&nbsp;&nbsp;：</div>
+					<div class="d_style_hylb text-muted u-key" id="c_auth"><a value="">全部</a>&nbsp;&nbsp; <a value="1">企业认证</a>&nbsp;&nbsp;  <a value="2">个人认证</a>&nbsp;&nbsp;<a value="3">机构认证</a></div>
+				</div>
+				{{else}}
+				<div class="border-b-0">
+					<div class="d_style" style="font-weight:700;" >需求状态&nbsp;&nbsp;：</div>
+					<div class="d_style_hylb text-muted u-key" id="c_xuqu"><a value="">全部</a>&nbsp;&nbsp; <a value="1">投标中</a>&nbsp;&nbsp;  <a value="3">任务超时</a>&nbsp;&nbsp; <a value="2">圆满结束</a></div>
+				</div>	
+				{{end}}
 			</div>
-		{{end}}
-			<div class="d_row" style="padding-bottom:10px;">
-				<div class="d_style d_fuwu">服务类别：</div>
-				<div class="d_style_hylb text-muted less u-key" style="width:80%;" id="fwlb"></div>
-				<div class="d_more qfw-text-more" onClick="less(this)"><small  style="cursor:hand">更多></small></div>	
-			</div>
-			<div class="f_zw">
-				
-			</div>
-			<div class="d_row">
-				<div class="d_style" >发布时间：</div>
-				<div class="d_style_hylb text-muted u-key" id="c_release"><a value="">全部</a>&nbsp;&nbsp; <a value="1">今日发布</a>&nbsp;&nbsp; <a value="2">昨日发布</a>&nbsp;&nbsp; <a value="3">近三天发布</a> </div>
-			</div>
-			{{if eq "service" $.T.querymap.c_searchtype}}
-			<div class="d_row border-b-0">
-				<div class="d_style" >认证类型：</div>
-				<div class="d_style_hylb text-muted u-key" id="c_auth"><a value="">全部</a>&nbsp;&nbsp; <a value="1">企业认证</a>&nbsp;&nbsp;  <a value="2">个人认证</a>&nbsp;&nbsp;<a value="3">机构认证</a></div>
-			</div>
-			{{else}}
-			<div class="d_row border-b-0">
-				<div class="d_style" >需求状态：</div>
-				<div class="d_style_hylb text-muted u-key" id="c_xuqu"><a value="">全部</a>&nbsp;&nbsp; <a value="1">投标中</a>&nbsp;&nbsp;  <a value="3">任务超时</a>&nbsp;&nbsp; <a value="2">圆满结束</a></div>
-			</div>	
+			<div class="d_tj">
+			<div class="d_zhpx" value="" style="border-left:1px solid #fff;">综合排序</div>
+			<div class="d_rq hidden-xs" value="1">浏览量</div>
+			
+			{{if eq "service" .T.querymap.c_searchtype }}
+			<div class="d_rq hidden-xs" value="2">人气</div>
 			{{end}}
-		</div>
-		<div class="d_tj">
-		<div class="d_zhpx" value="">综合排序</div>
-		<div class="d_rq" value="1">浏览量</div>
-		{{if eq "service" .T.querymap.c_searchtype }}
-		<div class="d_rq" value="2">成交量</div>
-		{{end}}
-		</div>
-		<div style="padding-top:20px;">
-		<!--循环列表-->
-		{{$type:=.T.querymap.c_searchtype }}
-		{{range $k, $v := .T.data}}
-  		<div class="d_group">
-			<div id="col-sm-2" class="col-sm-2 hidden-xs control-label" style="width:115px;height:100px">
-				{{if eq "demand" $.T.querymap.c_searchtype}}
-					<a target="_blank" href="/market/demandview/{{$v._id}}.html">
-					<div style="background-color:#E4E4E4;">
-					{{if eq "" $v.s_defaultimg}}
-						<img class="d_img" src="/images/services/default.png">
+			</div>
+			<div style="padding:20px 0 0 22px;">
+			<!--循环列表-->
+			{{$type:=.T.querymap.c_searchtype }}
+			{{range $k, $v := .T.data}}
+	  		<div class="d_group">
+				<div id="col-sm-2" class="col-sm-2 hidden-xs control-label" style="width:115px;height:100px">
+					{{if eq "demand" $.T.querymap.c_searchtype}}
+						<a target="_blank" href="/market/demandview/{{$v._id}}.html">
+						<div style="background-color:#E4E4E4;">
+						{{if eq "" $v.s_defaultimg}}
+							<img class="d_img" src="/images/services/default.png">
+						{{else}}
+							<img class="d_img" src="{{$v.s_defaultimg}}">
+						{{end}}
+						</div></a>
 					{{else}}
-						<img class="d_img" src="{{$v.s_defaultimg}}">
+						<a target="_blank" href="/market/detail/{{$v._id}}.html">
+						<div style="background-color:#E4E4E4;">
+						{{if eq "" $v.s_defaultimg}}
+							<img class="d_img" src="/images/services/default.png">
+						{{else}}
+							<img class="d_img" src="{{$v.s_defaultimg}}">
+						{{end}}
+						</div></a>
 					{{end}}
-					</div></a>
-				{{else}}
-					<a target="_blank" href="/market/detail/{{$v._id}}.html">
-					<div style="background-color:#E4E4E4;">
-					{{if eq "" $v.s_defaultimg}}
-						<img class="d_img" src="/images/services/default.png">
+				</div>
+				<div class="col-sm-6 col-xs-8">		
+				<div class="title">
+					{{if eq "demand" $.T.querymap.c_searchtype}}
+						<a target="_blank" href="/market/demandview/{{$v._id}}.html">{{$v.s_name}}</a>
 					{{else}}
-						<img class="d_img" src="{{$v.s_defaultimg}}">
+						<a target="_blank" href="/market/detail/{{$v._id}}.html">{{$v.s_name}}</a>	
 					{{end}}
-					</div></a>
-				{{end}}
-			</div>
-			<div class="col-sm-6 col-xs-8">		
-			<div>
-				{{if eq "demand" $.T.querymap.c_searchtype}}
-					<a target="_blank" href="/market/demandview/{{$v._id}}.html">{{$v.s_name}}</a>
-				{{else}}
-					<a target="_blank" href="/market/detail/{{$v._id}}.html">{{$v.s_name}}</a>	
-				{{end}}
-			</div>
-			<div style="padding-top:10px;padding-bottom:10px;">
-				<span class="d_service_span text-muted">{{if $v.s_enterprisename}}<a style="color:#aea79f;" href="/enterprise/{{$v.s_enterpriseid}}.html" target="_blank">{{$v.s_enterprisename}}</a>{{else}}{{$v.s_nickname}}{{end}}</span>
-			</div>
-			
-			{{if $v.s_enterprisename}} 
-				{{ if $v.i_identType }}
-					{{ if eq $v.i_identType "1"}}
-						<span class="glyphicon qyrz   margin-l-10 jhtb"></span><span class="lineb " ><small style="margin-left:5px;margin-right:5px;">已认证企业　</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>
+				</div>
+				<div style="padding-top:10px;padding-bottom:10px;">
+					<span class="d_service_span text-muted">{{if $v.s_enterprisename}}<a style="color:#aea79f;" href="/enterprise/{{$v.s_enterpriseid}}.html" target="_blank">{{$v.s_enterprisename}}</a>{{else}}{{$v.s_nickname}}{{end}}</span>
+				</div>
+					<div class="col-xs-12" style="margin-left:-9px;">
+					{{if $v.s_enterprisename}} 
+						{{ if $v.i_identType }}
+							{{ if eq $v.i_identType "1"}}
+								<span class="glyphicon qyrz   margin-l-10 jhtb"></span><span class="lineb " ><small style="margin-left:5px;margin-right:5px;">已认证企业　</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}}
-								<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_identType "2"}}
+								<span class="glyphicon grrz   margin-l-10 jhtb"></span><span class="lineb " ><small style="margin-left:-5px;margin-right:5px;"> 已认证个人</small></span>
+							{{else if eq $v.i_identType "3"}}
+								<span class="glyphicon jgrz   margin-l-10 jhtb"></span><span class="lineb " ><small style="margin-left:5px;margin-right:5px;">已认证机构</small></span>
+							{{end}}
 						{{end}}
-					{{else if eq $v.i_identType "2"}}
-						<span class="glyphicon grrz   margin-l-10 jhtb"></span><span class="lineb " ><small style="margin-left:-5px;margin-right:5px;"> 已认证个人</small></span>
-					{{else if eq $v.i_identType "3"}}
-						<span class="glyphicon jgrz   margin-l-10 jhtb"></span><span class="lineb " ><small style="margin-left:5px;margin-right:5px;">已认证机构</small></span>
 					{{end}}
+					</div>
+				</div>
+				{{if eq "service" $.T.querymap.c_searchtype}}
+				<div class="col-sm-4 col-xs-4 text-center hidden-xs" style="margin-top:10px;padding-right:0px;margin-left:30px;">
+					<div class="col-sm-8 " style="float:right;text-align:right;">
+						<div style="float:right;"><span class="d_col_span" style="font-size:14px;">成交量：<span style="color:#FF5A5F;font-weight:600;">{{$v.i_sales}}</span></span></div>
+						<div style="float:right;" ><span class="d_col_span" style="font-size:14px;">评价数：<span style="color:#FF5A5F;font-weight:600;">{{$v.i_comments}}</span></span>&nbsp;&nbsp;|&nbsp;&nbsp;</div>
+					</div>
+				</div>
+				{{else}}
+				<div class="col-sm-4 col-xs-4 text-center">
+					<div><span class="d_col_span">报价服务商:{{$v.i_bids}}</span></div>
+				</div>
 				{{end}}
-			{{end}}
 			</div>
-			
-			{{if eq "service" $.T.querymap.c_searchtype}}
-			<div class="col-sm-4 col-xs-4 text-center">
-				<div><span class="d_col_span">成交量:{{$v.i_sales}}</span></div>
-				<div><span class="d_col_span">评价数:{{$v.i_comments}}</span></div>
+			{{end}}	
+			{{if gt (len .T.data) 0}}
+			<!--分页-->
+			<div>
+				<div class="text-center" style="margin-top: -20px;">
+					<!--页码信息-->
+					<!--页码信息-->
+					<div class="text-center">
+						<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>
 			</div>
+			<!--页码信息结束-->
 			{{else}}
-			<div class="col-sm-4 col-xs-4 text-center">
-				<div><span class="d_col_span">报价服务商:{{$v.i_bids}}</span></div>
-			</div>
-			{{end}}
-		</div>
-		{{end}}	
-		{{if gt (len .T.data) 0}}
-		<!--分页-->
-		<div>
-			<div class="text-center" style="margin-top: -20px;">
-				<!--页码信息-->
-				<!--页码信息-->
-				<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>
+			<div class="alert alert-error ">
+				<div class="text-center" style="margin:20px auto;">
+					{{if eq "demand" $.T.querymap.c_searchtype}}
+						<!--抱歉！没有找到您所需要的需求。-->
+					{{else}}
+						<img src="/images/u20.png"><h4><span class="glyphicon biaojidizhi icon_default text-primary"></span>&nbsp;<strong class="text-muted">
+						抱歉！没有找到您所需要的服务信息。您也可以直接发布需求，等服务商家与您联系。<br><br>
+						<button style="width:260px" class="btn btn-primary" onclick="window.location.href='/market/demand/add.html'"><b>发 需 求</b></button>
 					{{end}}
-					</ul>
+					</strong></h4>
 				</div>
 			</div>
+			{{end}}
 		</div>
-		<!--页码信息结束-->
-		{{else}}
-		<div class="alert alert-error ">
-			<div class="text-center" style="margin:20px auto;">
-				{{if eq "demand" $.T.querymap.c_searchtype}}
-					<!--抱歉！没有找到您所需要的需求。-->
-				{{else}}
-					<img src="/images/u20.png"><h4><span class="glyphicon biaojidizhi icon_default text-primary"></span>&nbsp;<strong class="text-muted">
-					抱歉！没有找到您所需要的服务信息。您也可以直接发布需求，等服务商家与您联系。<br><br>
-					<button style="width:260px" class="btn btn-primary" onclick="window.location.href='/market/demand/add.html'"><b>发 需 求</b></button>
-				{{end}}
-				</strong></h4>
-			</div>
-		</div>
-		{{end}}
+	    
 	</div>
-    
-</div>
-<div class="a-c-right">
+		</div>
+<div class="a-c-right hidden-xs">
 {{include "/common/releasedemand.html"}}
 {{if eq "demand" .T.querymap.c_searchtype}}
 {{include "/common/hotdemand.html"}}
@@ -186,6 +245,24 @@
 	var c_xqtype = {{.T.querymap.c_xqtype}};
 	var c_searchtype={{.T.querymap.c_searchtype}}
 	var fwlb = {{.T.serviceStr}}
+	$(function(){
+		$(window).bind("resize",function(){
+			if(document.body.clientWidth<1209){
+					$(".a-content.container-fluid").css("width","");
+					$(".a-c-right.hidden-xs").hide();
+					$(".list-new-list").css("max-width","1200px");
+			}else{
+					$(".a-content.container-fluid").css("width","1200px");
+					$(".a-c-right.hidden-xs").show();
+					$(".list-new-list").css("max-width","940px");
+			}
+		});
+		if(document.body.clientWidth<1209){
+			$(".a-content.container-fluid").css("width","");
+			$(".a-c-right.hidden-xs").hide();
+			$(".list-new-list").css("max-width","1200px");
+		}
+	});
 </script>
 </body>
 </html>

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

@@ -44,9 +44,9 @@
 <div class="dialog creditTip-dialog">
 	<div class="tip">
 		<div>您添加了1个信息栏目（招标公告），确认后系统将每月扣除1000积分，您目前的积分余额是1500积分，扣除后将剩余500积分。</div>
-		<div class="float:right">
-		<button>提交</button>
-		<button>取消</button>
+		<div class="tip-button">
+		<span id="credit_yes">提交</span>
+		<span id="credit_no">取消</span>
 		</div>
 	</div>
 </div>
@@ -90,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");
 		}