积分

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

@@ -12,7 +12,8 @@ type RpcCall struct {
 
 type CreditData struct {
 	Code       string //积分代码
-	Uid        string //用户
+	Uid        string //用户ID
+	Umid       string //用户m_open_id
 	Num        int    //积分值
 	OtherParam map[string]interface{}
 }

core/src/qfw/coreutil/weixinrpc_test.go

@@ -7,6 +7,7 @@ import (
 	"io/ioutil"
 	"log"
 	"net/http"
+	"net/rpc"
 	qrpc "qfw/util/rpc"
 	"testing"
 	"time"
@@ -101,3 +102,14 @@ func TestSay(t *testing.T) {
 func Test_GetJSInterfaceParam(t *testing.T) {
 	fmt.Println(GetJSInterfaceParam("www.baidu.com"))
 }
+
+func Test_credit(t *testing.T) {
+	client, _ := rpc.DialHTTP("tcp", "127.0.0.1:8765")
+	defer client.Close()
+	data := qrpc.CreditData{}
+	data.Code = "d1"
+	data.Uid = "55a39942af53740186000004"
+	data.Num = 3000
+	var reply int
+	client.Call("CreditRpc.InCreadit", &data, &reply)
+}

core/src/qfw/member/membermanager.go

@@ -463,10 +463,10 @@ func (m *Member) Login() {
 				}
 				stype := m.GetSession("audittype")
 				r_id := strings.Split(fmt.Sprintf("%s", r["_id"]), `"`)[1]
-				if stype == "first" {
+				if stype == "y" {
 					Update("user", &map[string]interface{}{
 						"_id": ObjectIdHex(r_id),
-					}, `{'$set':{'s_audittype':'second'}}`, false, false)
+					}, `{'$set':{'s_audittype':'n'}}`, false, false)
 				}
 			}
 		}
@@ -662,7 +662,7 @@ func (m *Member) Logout() error {
 	m.DelSession("identWay")      //认证状态
 	m.DelSession("identType")     //认证类型
 	m.DelSession("opLocDistrict") //行政区划代码
-	m.DelSession("audittype")     //认证后是否是第一次登录的标识第一次：first
+	m.DelSession("audittype")     //认证后是否是第一次登录的标识第一次：y
 	m.DelSession("promotion_id")  //推广id
 	m.DelSession("promotion_c")   //推广邮件代码
 	m.DelSession("credit_a")      //a积分任务
@@ -747,10 +747,6 @@ func (m *Member) Accountset() error {
 	m.T["s_pwd"] = r["s_pwd"]               //密码
 	m.T["s_bindweixin"] = r["s_bindweixin"] //绑定微信
 	m.T["pageName"] = "用户中心"
-	if m.GetSession("audittype") != nil {
-		m.T["audittype"] = m.GetSession("audittype")
-	}
-	m.DelSession("audittype")
 	GetNotPassReason(m.Action)
 	return m.Render("/member/accountset/index.html", &m.T)
 }
@@ -1134,6 +1130,7 @@ func UpdateSession(action *xweb.Action, r map[string]interface{}) {
 		} else {
 			setSessMap["phone"] = r["s_phone"]
 		}
+		setSessMap["audittype"] = r["s_audittype"] //认证后是否是第一次登录的标识第一次：y
 		/**
 		action.SetSession("loginName", r[loginType])               //登录名
 		action.SetSession("loginType", loginType)                  //登录类型

core/src/qfw/mobile/mobile.go

@@ -13,6 +13,7 @@ type Mobile struct {
 	guide         xweb.Mapper `xweb:"/swordfish/guide"`
 	share         xweb.Mapper `xweb:"/swordfish/share"`
 	wxrssset      xweb.Mapper `xweb:"/swordfish/page"`
+	getCredit     xweb.Mapper `xweb:"/credit/getcredit"`
 	msgSet        xweb.Mapper `xweb:"/swordfish/msgpushsetting/msgset"`
 	ajaxReq       xweb.Mapper `xweb:"/swordfish/ajaxReq"`
 	advise        xweb.Mapper `xweb:"/mobile/advise"`

core/src/qfw/mobile/wxmenu.go

@@ -118,6 +118,22 @@ func (m *Mobile) Wxrssset() error {
 	**/
 }
 
+//获取积分
+func (m *Mobile) GetCredit() error {
+	userId := m.GetSession("userId")
+	res := map[string]interface{}{}
+	if userId != nil {
+		res["flag"] = true
+		user := mongodb.FindById("user", userId.(string), `{"_id":0,"i_credit":1}`)
+		if *user != nil {
+			res["val"] = util.IntAll((*user)["i_credit"])
+		}
+	} else {
+		res["flag"] = false
+	}
+	return nil
+}
+
 //订阅消息设置
 func (m *Mobile) MsgSet() error {
 	data := m.GetString("data")

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 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}
+{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-14 10:26:13"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-14 10:26:13"}},"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;
@@ -1983,20 +2055,6 @@ style="color:#D03102;margin-right:5px;"
 }
 /*企业社区未登录页面 end*/
 /*认证完第一次登录 start*/
-.fristAutheLoginModal .modal-header{
-	background-color: #FF5A5F;
-	border-top-left-radius: 6px;
-	border-top-right-radius: 6px;
-}
-.fristAutheLoginModal .modal-header h4{
-	color: #FFFFFF;
-	font-weight: bold;
-}
-.fristAutheLoginModal .modal-header i{
-	color: #FFFFFF;
-	font-size: 20px;
-	cursor: pointer;
-}
 .fristAutheLoginModal .chenggongtishi{
 	color: #A1D568;
 	vertical-align: sub;
@@ -2061,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/js/qfw.js

@@ -1,5 +1,5 @@
 //是否有新活动
-var hasNewActive = new Date() >= Date.parse(new Date("2015/12/14 00:00:00")) && new Date() < Date.parse(new Date("2016/1/14 00:00:00"));
+var hasNewActive = false;
 //网站初始化状态
 var webSiteInitFlag = true;
 //登录状态 false--未登录，true--已登录
@@ -487,100 +487,4 @@ function advertAjaxRqe(position){
 			}
 		});
 	}
-}
-//认证完之后首次登录
-function afterAutheFirstLogin(result){
-	var identType = result.identType;
-	var entId = result.entId;
-	if(identType == 2){//个人认证
-		$("body").append('{{include "/common/ploginmodal.html"}}');
-		$("#fristAutheLoginModal .com-nickName").text(result.nickName);
-		$("#fristAutheLoginModal .com-entName").text(result.entName+"店铺");
-		$("#fristAutheLoginModal .com-entCard a").attr("href","/member/yellowpage/edit/enterprise/"+entId);
-	}else{
-		$("body").append('{{include "/common/ologinmodal.html"}}');
-		$("#fristAutheLoginModal .com-nickName").text(result.nickName);
-		$("#fristAutheLoginModal .com-entName").text(result.entName);
-		var comAuthentType = result.comAuthentType;
-		//企业认证标识：1：营业执照；2：企业名片；3：企业邮箱
-		var comAuthentText = comAuthentType==1?"营业执照认证":comAuthentType==2?"名片认证":comAuthentType==3?"邮箱认证":"";
-		var flag = comAuthentText!="";
-		$("#fristAutheLoginModal .com-identTypeText").html("，恭喜您完成"+(identType==1?"企业":identType==3?"机构":"")+"认证"+(flag?"-":"")+comAuthentText);
-		$("#fristAutheLoginModal .com-identTypeImg").append('<i class="glyphicon '+(identType==1?"qy":identType==3?"jg":"")+'rz"></i><font class="text-muted">已认证'+(identType==1?"企业":identType==3?"机构":"")+'</font>');
-		if(flag){
-			$("#fristAutheLoginModal .com-identTypeImg").append('<i class="glyphicon margin-r-5 '+(comAuthentType==1?"margin-r-10 yyzz":comAuthentType==2?"mp":comAuthentType==3?"yj":"")+'rz"></i><font class="text-muted">'+comAuthentText+'</font>');
-		}
-		if(hasNewActive){
-			$("#fristAutheLoginModal .com-who").text("完成以下操作，就可以领取红包啦：");
-		}else{
-			$("#fristAutheLoginModal .com-entCard").removeClass("hide");
-			$("#fristAutheLoginModal .com-entCard a").attr("href","/member/yellowpage/edit/enterprise/"+entId);
-		}
-	}
-	$("#fristAutheLoginModal .com-releaseService a").attr("href","/member/yellowpage/show/showService/"+entId);
-	$("#fristAutheLoginModal").modal('show');
-}
-//
-function b_loadTop(){
-	$.ajax({
-	  	type: "POST",
-	  	url: "/front/getWebSiteTop",
-	 	dataType: "json",
-		async: false,
-	  	success: function(result){
-			topLoadOver = true;
-			if(result.status == "y"){
-				isLogined = true;
-				var msgCount = result.msgCount;
-				var hasMsgCount = msgCount > 0;
-				msgCount = msgCount>999?'...':msgCount;
-				var avatar = null;
-				if(avatar != ""){
-					avatar = result.avatar;
-				}
-				var html = '<span><img class="img-circle headimg" src="'+avatar+'" onerror="this.src=\'/images/swordfish/headimg.png\'">';
-				if(hasMsgCount){
-					html += '<a class="b-round-dot"></a>';
-				}
-				html += '</span><a href="/member/show/memberindex">'+result.nickName+'</a>';
-				html += '<div id="head-hideMenu" class="head-hideMenu"><ul>'
-					    	+'<li onclick="window.location.href=\'/member/msgcenter\'"><i class="glyphicon youjian"></i><span>消息中心';
-				if(hasMsgCount){
-					html += '<a class="b-round-dot"></a>';
-				}
-				html += '</span></li>'
-						+'<li onclick="window.location.href=\'/member/show/memberindex\'"><i class="glyphicon ren1"></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").mouseover(function(){
-					$(this).show();
-				}).mouseleave(function(){
-					$(this).hide();
-				});
-				//处理公用底部扫码登录按钮
-				$("#bottom-bar>li:first").addClass("invisible");
-				//处理认证完之后第一次登录弹出提示框
-				if(result.auditType == "y"){
-					afterAutheFirstLogin(result);
-				}
-			}else{
-				isLogined = false;
-				var html = '<a onclick="loginModalShow();">登录/注册</a>';
-				$("#b-loginStatus").html(html);
-				$("#bottom-bar>li").removeClass("invisible");
-			}
-			try{
-				b_loadTopCallBack(result);
-			}catch(e){}
-		},
-		error: function(e){
-			topLoadOver = true;
-		}
-	});
 }

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

@@ -130,7 +130,26 @@ function ScopeDialog(type,clickLi){
 }
 //取积分
 function getCredit(){
-	
+	var score=0
+	$.ajax({
+		dataType:"json",
+		url:"/credit/getcredit",
+		type:"POST",
+		async:false,
+		success:function(msg){
+			if(msg){
+				if(msg.flag){
+					score=msg.val					
+				}else{
+					alert("请重新进入页剑鱼页面后操作")
+				}
+			}			
+		},
+		error:function(err){
+			alert("请稍后再试")
+		}
+	})
+	return score
 }
 
 function commonAjaxReq(object,module){
@@ -143,6 +162,7 @@ function commonAjaxReq(object,module){
 		//开服务要校验
 		if(module=="tender"){
 			if(!Tender.status){
+				alert(getCredit())
 				//提示扣积分
 				//先取积分，规则然后提示
 				$(".creditTip-dialog").show()
@@ -153,6 +173,7 @@ function commonAjaxReq(object,module){
 		}else if(module=="bid"){
 			if(!Bid.status){
 				//提示扣积分
+				alert(getCredit())
 				$(".creditTip-dialog").show()
 				$("html,body").addClass("overflow-hidden")
 				//生成快照

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

@@ -36,7 +36,6 @@ document.onkeydown=function(event){
     }
 };
 $(function (){
-	b_loadTop();
 	$("#searchFormBtn").click(function(){
 		keyCode = 13;
 		$("form#searchForm").submit();

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

@@ -322,6 +322,37 @@ function setNavbarActive(index,type){
 	$("#head-navbar-ul li:first").removeClass("a-com-active");
 	$("#head-navbar-ul li:eq("+index+")").addClass("a-com-active");
 }
+function afterAutheFirstLogin(result){
+	var identType = result.identType;
+	var entId = result.entId;
+	if(identType == 2){//个人认证
+		$("body").append('{{include "/common/ploginmodal.html"}}');
+		$("#fristAutheLoginModal .com-nickName").text(result.nickName);
+		$("#fristAutheLoginModal .com-entName").text(result.entName+"店铺");
+		$("#fristAutheLoginModal .com-entCard a").attr("href","/member/yellowpage/edit/enterprise/"+entId);
+	}else{
+		$("body").append('{{include "/common/ologinmodal.html"}}');
+		$("#fristAutheLoginModal .com-nickName").text(result.nickName);
+		$("#fristAutheLoginModal .com-entName").text(result.entName);
+		var comAuthentType = result.comAuthentType;
+		//企业认证标识：1：营业执照；2：企业名片；3：企业邮箱
+		var comAuthentText = comAuthentType==1?"营业执照认证":comAuthentType==2?"名片认证":comAuthentType==3?"邮箱认证":"";
+		var flag = comAuthentText!="";
+		$("#fristAutheLoginModal .com-identTypeText").html("，恭喜您完成"+(identType==1?"企业":identType==3?"机构":"")+"认证"+(flag?"-":"")+comAuthentText);
+		$("#fristAutheLoginModal .com-identTypeImg").append('<i class="glyphicon '+(identType==1?"qy":identType==3?"jg":"")+'rz"></i><font class="text-muted">已认证'+(identType==1?"企业":identType==3?"机构":"")+'</font>');
+		if(flag){
+			$("#fristAutheLoginModal .com-identTypeImg").append('<i class="glyphicon margin-r-5 '+(comAuthentType==1?"margin-r-10 yyzz":comAuthentType==2?"mp":comAuthentType==3?"yj":"")+'rz"></i><font class="text-muted">'+comAuthentText+'</font>');
+		}
+		if(hasNewActive){
+			//$("#fristAutheLoginModal .com-who").text("完成以下操作，就可以领取红包啦：");
+		}else{
+			$("#fristAutheLoginModal .com-entCard").removeClass("hide");
+			$("#fristAutheLoginModal .com-entCard a").attr("href","/member/yellowpage/edit/enterprise/"+entId);
+		}
+	}
+	$("#fristAutheLoginModal .com-releaseService a").attr("href","/member/yellowpage/show/showService/"+entId);
+	$("#fristAutheLoginModal").modal('show');
+}
 </script>
 <script type='text/javascript'>
 window.BWEUM||(BWEUM={});BWEUM.info = {"stand":true,"agentType":"browser","agent":"bi-collector.oneapm.com/static/js/bw-send-411.4.5.js","beaconUrl":"bi-collector.oneapm.com/beacon","licenseKey":"3Nvir~rAqyZ2Ra7i","applicationID":2274815};</script><script type="text/javascript" src="//bi-collector.oneapm.com/static/js/bw-loader-411.4.5.js">

core/src/web/templates/common/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/indexhead.html

@@ -42,7 +42,6 @@ document.onkeydown=function(event){
 };
 $(function (){
 	isMobile = !$("#b-loginStatus").is(":visible");
-	b_loadTop();
 	$("#searchFormBtn").click(function(){
 		keyCode = 13;
 		$("form#searchForm").submit();

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

@@ -1,10 +1,10 @@
 <!-- Modal -->
-<div class="modal fade fristAutheLoginModal" id="fristAutheLoginModal" tabindex="-1" role="dialog" aria-labelledby="fristAutheLoginModalLabel">
+<div class="modal fade fristAutheLoginModal b-modal" id="fristAutheLoginModal" tabindex="-1" role="dialog" aria-labelledby="fristAutheLoginModalLabel">
 	<div class="modal-dialog" role="document">
 		<div class="modal-content">
 			<div class="modal-header">
-				<i class="glyphicon shibai pull-right" data-dismiss="modal" aria-label="Close"></i>
-				<h4 class="modal-title" id="fristAutheLoginModalLabel">认证提示信息</h4>
+				<span data-dismiss="modal" aria-label="Close" class="close glyphicon guanbi1"></span>
+				认证提示信息
 			</div>
 			<div class="modal-body">
 				<form class="form-horizontal" role="form">

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

@@ -1,12 +1,10 @@
 <!-- Modal -->
-<div class="modal fade fristAutheLoginModal" id="fristAutheLoginModal" tabindex="-1" role="dialog" aria-labelledby="fristAutheLoginModalLabel">
+<div class="modal fade fristAutheLoginModal b-modal" id="fristAutheLoginModal" tabindex="-1" role="dialog" aria-labelledby="fristAutheLoginModalLabel">
 	<div class="modal-dialog" role="document">
 		<div class="modal-content">
 			<div class="modal-header">
-				<i class="glyphicon shibai pull-right" data-dismiss="modal" aria-label="Close"></i>
-				<h4 class="modal-title text-muted" id="fristAutheLoginModalLabel">
-					认证提示信息
-				</h4>
+				<span data-dismiss="modal" aria-label="Close" class="close glyphicon guanbi1"></span>
+				认证提示信息
 			</div>
 			<div class="modal-body">
 				<form class="form-horizontal" role="form">

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/common/swordfishhead.html

@@ -1,4 +1,3 @@
-{{include "/common/login.html"}}
 <link href="/css/swordfish.css" rel="stylesheet">
 <div class="b-head">
 	{{include "/common/top.html"}}
@@ -50,7 +49,4 @@ function swordfishLayoutInit(){
 		webSiteInit();
 	}
 }
-$(function(){
-	b_loadTop();
-});
 </script>

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

@@ -8,4 +8,107 @@
 			<li><span class="img-circle b-com-five"><i class="glyphicon zhengcefagui"></i></span><a href="/front/content_zcfg_list.html">政策法规</a></li>
 		</ul>
 	</div>
-</div>
+</div>
+<script type="text/javascript">
+$(function(){
+	b_loadTop();
+});
+//认证完之后首次登录
+function afterAutheFirstLogin(result){
+	var identType = result.identType;
+	var entId = result.entId;
+	if(identType == 2){//个人认证
+		$("body").append('{{include "/common/ploginmodal.html"}}');
+		$("#fristAutheLoginModal .com-nickName").text(result.nickName);
+		$("#fristAutheLoginModal .com-entName").text(result.entName+"店铺");
+		$("#fristAutheLoginModal .com-entCard a").attr("href","/member/yellowpage/edit/enterprise/"+entId);
+	}else{
+		$("body").append('{{include "/common/ologinmodal.html"}}');
+		$("#fristAutheLoginModal .com-nickName").text(result.nickName);
+		$("#fristAutheLoginModal .com-entName").text(result.entName);
+		var comAuthentType = result.comAuthentType;
+		//企业认证标识：1：营业执照；2：企业名片；3：企业邮箱
+		var comAuthentText = comAuthentType==1?"营业执照认证":comAuthentType==2?"名片认证":comAuthentType==3?"邮箱认证":"";
+		var flag = comAuthentText!="";
+		$("#fristAutheLoginModal .com-identTypeText").html("，恭喜您完成"+(identType==1?"企业":identType==3?"机构":"")+"认证"+(flag?"-":"")+comAuthentText);
+		$("#fristAutheLoginModal .com-identTypeImg").append('<i class="glyphicon '+(identType==1?"qy":identType==3?"jg":"")+'rz"></i><font class="text-muted">已认证'+(identType==1?"企业":identType==3?"机构":"")+'</font>');
+		if(flag){
+			$("#fristAutheLoginModal .com-identTypeImg").append('<i class="glyphicon margin-r-5 '+(comAuthentType==1?"margin-r-10 yyzz":comAuthentType==2?"mp":comAuthentType==3?"yj":"")+'rz"></i><font class="text-muted">'+comAuthentText+'</font>');
+		}
+		if(hasNewActive){
+			//$("#fristAutheLoginModal .com-who").text("完成以下操作，就可以领取红包啦：");
+		}else{
+			$("#fristAutheLoginModal .com-entCard").removeClass("hide");
+			$("#fristAutheLoginModal .com-entCard a").attr("href","/member/yellowpage/edit/enterprise/"+entId);
+		}
+	}
+	$("#fristAutheLoginModal .com-releaseService a").attr("href","/member/yellowpage/show/showService/"+entId);
+	$("#fristAutheLoginModal").modal('show');
+}
+//
+function b_loadTop(){
+	$.ajax({
+	  	type: "POST",
+	  	url: "/front/getWebSiteTop",
+	 	dataType: "json",
+		async: false,
+	  	success: function(result){
+			topLoadOver = true;
+			if(result.status == "y"){
+				isLogined = true;
+				var msgCount = result.msgCount;
+				var hasMsgCount = msgCount > 0;
+				msgCount = msgCount>999?'...':msgCount;
+				var avatar = null;
+				if(avatar != ""){
+					avatar = result.avatar;
+				}
+				var html = '<span><img class="img-circle headimg" src="'+avatar+'" onerror="this.src=\'/images/swordfish/headimg.png\'">';
+				if(hasMsgCount){
+					html += '<a class="b-round-dot"></a>';
+				}
+				html += '</span><a href="/member/show/memberindex">'+result.nickName+'</a>';
+				html += '<div id="head-hideMenu" class="head-hideMenu"><ul>'
+					    	+'<li onclick="window.location.href=\'/member/msgcenter\'"><i class="glyphicon youjian"></i><span>消息中心';
+				if(hasMsgCount){
+					html += '<a class="b-round-dot"></a>';
+				}
+				html += '</span></li>'
+						+'<li onclick="window.location.href=\'/member/show/memberindex\'"><i class="glyphicon ren1"></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").mouseover(function(){
+					$(this).show();
+				}).mouseleave(function(){
+					$(this).hide();
+				});
+				//处理公用底部扫码登录按钮
+				$("#bottom-bar>li:first").addClass("invisible");
+				//处理认证完之后第一次登录弹出提示框
+				if(result.auditType == "y"){
+					afterAutheFirstLogin(result);
+				}
+			}else{
+				isLogined = false;
+				var html = '<a onclick="loginModalShow();">登录/注册</a>';
+				$("#b-loginStatus").html(html);
+				$("#bottom-bar>li").removeClass("invisible");
+				//登录
+				$("body").append('{{include "/common/login.html"}}');
+			}
+			try{
+				b_loadTopCallBack(result);
+			}catch(e){}
+		},
+		error: function(e){
+			topLoadOver = true;
+		}
+	});
+}
+</script>

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

@@ -1,65 +0,0 @@
-<div class="qfw-header">
-	<div class="header-top">
-		<ul class="leftul"><li>企业服务网>用户中心 </li></ul>
-		
-		<ul style="padding-right:15px;">
-			{{if session "userName"}}
-			<li><a href="">{{session "userName"}}</a><a href="../../../member/logout">【退出】</a></li>
-			<li class="splitLine"></li>
-			<li class="dropdown">
-			<a id="dLabel" data-target="#" data-toggle="dropdown" aria-haspopup="true" role="button" aria-expanded="false" style="margin: 0px 8px;">
-			    我的企业网<span class="caret"></span>
-			  </a>
-			  <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel" style="min-width: 55px !important;">
-			    <li role="presentation"><a>实名认证</a></li>
-			    <li role="presentation"><a>我的黄页</a></li>
-			    <li role="presentation"><a>服务管理</a></li>
-			  </ul>
-			</li>
-			<li class="splitLine"></li>
-			{{else}}
-			<li><a data-toggle="modal" data-target="#loginModal">登录</a></li>
-			<li class="splitLine"></li>
-			<li><a href="../../../member/register">注册</a></li>
-			<li class="splitLine"></li>
-			{{end}}
-			<li><a>网站导航</a></li>
-		</ul>
-	</div>
-	<div class="header-table">		        
-		<div class="col-xs-5">
-			<table  style="  margin-top: 15px;">
-			<tr><td> <span style="font-size:20px;padding-top:5px;">
-				{{if .T.entinfo.EntName }}
-					{{.T.entinfo.EntName}}
-				{{else}}
-					暂无企业名称
-				{{end}}
-			</span></td></tr>
-			<tr class="hidden-xs"><td><img src="../../../images/qfw_qyrz.png"> 企业认证  <img src="../../../images/qfw_qw.png" style="width: 18px;height: 18px;"> 企网{{.T.entyear}}年 </td></tr>
-			</table>
-			
-		</div>
-		<div class="col-xs-5 hidden-xs" style="background-color: #6CC3FF;">
-		       	<div class="collapse navbar-collapse" style="padding: 0px !important;">
-			      <ul class="nav navbar-nav qfw-navbar">
-			        <li><a href="#" class="qfw-navbar-active" style="background-color: #6CC3FF;">企业信息</a></li>
-		            <li><a href="../search/service/ser" style="background-color: #6CC3FF;">服务列表</a></li>
-				   <!--用户登录后显示-->
-		            <li><a href="#" onclick="javascript:alert('功能模块开发中请等待...');" style="background-color: #6CC3FF;">信用档案</a></li>					
-			      </ul>
-			    </div>
-	       
-
-		</div>
-		<!--用户登录后显示-->
-		<div class="col-xs-2">
-			<div class="col-md-offset-1 col-md-3 text-center"  style="  margin-top: 15px;">
-			{{if session "userName"}}
-				<button class="btn btn-info btn-lg btn-width-150"  type="submit" onclick="btnSaveForm();">保存</button>
-			{{end}}
-			</div>
-		</div>
-		<!--用户登录后显示-->
-	</div>
-</div>

core/src/web/templates/index.html

@@ -8,7 +8,6 @@
 <link href="/css/index-new.css" rel="stylesheet">
 </head>
 <body>
-{{include "/common/login.html"}}
 {{include "/common/indexhead.html"}}
 <div class="a-content a-index">	
 	<div class="a-index-head index-new-head">

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>

credit/src/config.json

@@ -86,7 +86,7 @@
         "user": "qyfw@topnet.net.cn",
         "pwd": "qy123456",
         "fromuser": "企明星",
-        "touser": "renzheng@topnet.net.cn,zhanghongbo@topnet.net.cn"
+        "touser": "zhangjinkun@topnet.net.cn"
     },
     "saveLogDuration": 1,
     "checkGiveDuration": 30,

credit/src/main.go

@@ -159,12 +159,12 @@ func TimerSwordFish() {
 						sub64 := (endDate - next64) / (24 * 3600)
 						if sub64 == 0 {
 							//自动扣费
-							doSubCredit(tmp["s_userid"].(string), tmp["s_uid"].(string), typeName, code, &next)
+							doSubCredit(tmp["s_uid"].(string), tmp["s_umid"].(string), typeName, code, &next)
 						} else {
 							//提示
 							for _, v := range swordfish_tipBeforeDays {
 								if int64(v) == sub64 {
-									SendMsgWebAndWx(swordfish_dueTitle, fmt.Sprintf(swordfish_due, v), tmp["s_userid"].(string), tmp["s_uid"].(string))
+									SendMsgWebAndWx(swordfish_dueTitle, fmt.Sprintf(swordfish_due, v), tmp["s_uid"].(string), tmp["s_umid"].(string))
 								}
 							}
 						}
@@ -182,8 +182,8 @@ func TimerSwordFish() {
 }
 
 //自动扣费
-func doSubCredit(userId, uid, typeName, code string, next *time.Time) {
-	user := mongodb.FindById("user", uid, `{"i_credit":1,"o_msgset."`+typeName+`.i_status":1,"_id":0}`)
+func doSubCredit(userId, umid, typeName, code string, next *time.Time) {
+	user := mongodb.FindById("user", userId, `{"i_credit":1,"o_msgset."`+typeName+`.i_status":1,"_id":0}`)
 	if *user != nil {
 		util.Try(func() {
 			i_status := util.IntAllDef((*user)["o_msgset"].(map[string]interface{})[typeName].(map[string]interface{})["i_status"], -1)
@@ -198,8 +198,8 @@ func doSubCredit(userId, uid, typeName, code string, next *time.Time) {
 				if bsub { //扣分操作
 					newDate := next.AddDate(0, 1, 0)
 					creditDoc := map[string]interface{}{
-						"s_uid":     uid,
-						"s_userid":  userId,
+						"s_uid":     userId,
+						"s_umid":    umid,
 						"s_code":    code,
 						"i_type":    0,
 						"l_date":    next.Unix(),
@@ -208,13 +208,13 @@ func doSubCredit(userId, uid, typeName, code string, next *time.Time) {
 					}
 					if creditlog.Save(creditDoc) {
 						//发送微信通知扣积分成功
-						SendMsgWebAndWx(swordfish_payTitle, fmt.Sprintf(swordfish_pay, -codeNum, restNum, util.FormatDate(&newDate, util.Date_Full_Layout)), userId, uid)
+						SendMsgWebAndWx(swordfish_payTitle, fmt.Sprintf(swordfish_pay, -codeNum, restNum, util.FormatDate(&newDate, util.Date_Full_Layout)), userId, umid)
 					}
 				} else { //暂停操作
 					//更新操作
 					if mongodb.Update("user", `{"_id":"`+userId+`"}`, `{"$set":{"o_msgset.`+typeName+`.i_status":0}}`, false, false) {
 						//暂停通知,因积分不够
-						SendMsgWebAndWx(swordfish_closeTitle, swordfish_close, userId, uid)
+						SendMsgWebAndWx(swordfish_closeTitle, swordfish_close, userId, umid)
 					}
 
 				}
@@ -227,7 +227,7 @@ func doSubCredit(userId, uid, typeName, code string, next *time.Time) {
 }
 
 //发送微信和站内信通知
-func SendMsgWebAndWx(title, content, userId, uid string) {
+func SendMsgWebAndWx(title, content, userId, umid string) {
 	m := &msg.Msg{
 		Msgtype:   1,
 		Title:     title,
@@ -235,6 +235,6 @@ func SendMsgWebAndWx(title, content, userId, uid string) {
 		ReceiveId: userId,
 	}
 	go m.SaveMsg()
-	go creditrpc.SendManagerNotifyMsg(&qrpc.NotifyMsg{Openid: uid, Title: title, Detail: "管理员", Remark: content})
+	go creditrpc.SendManagerNotifyMsg(&qrpc.NotifyMsg{Openid: umid, Title: title, Detail: "管理员", Remark: content})
 
 }

credit/src/qfw/creditrpc/creditrpc.go

@@ -50,11 +50,16 @@ func (c *CreditRpc) InCreadit(param *qrpc.CreditData, replay *int) error {
 			"l_date": time.Now().Unix(),
 		}
 		switch first {
-		case "a", "d", "e": //立即生效
+		case "a": //立即生效
 			creditDoc["i_score"] = Score[param.Code]
 			if creditlog.Save(creditDoc) {
 				*replay = 1
 			}
+		case "d", "e":
+			creditDoc["i_score"] = util.If(param.Num > 0, param.Num, Score[param.Code]).(int)
+			if creditlog.Save(creditDoc) {
+				*replay = 1
+			}
 		case "b":
 			key := param.Code + "_" + param.Uid
 			//[0/1,time,alltimes] //是否完成,次数,总次数,
@@ -148,6 +153,7 @@ func (c *CreditRpc) OutCreadit(param *qrpc.CreditData, replay *int) error {
 		first := param.Code[:1]
 		creditDoc := map[string]interface{}{
 			"s_uid":   param.Uid,
+			"s_umid":  param.Umid,
 			"s_code":  param.Code,
 			"i_type":  0,
 			"l_date":  time.Now().Unix(),
@@ -163,7 +169,7 @@ func (c *CreditRpc) OutCreadit(param *qrpc.CreditData, replay *int) error {
 		if creditlog.Save(creditDoc) {
 			*replay = 1
 			//发送微信通知扣积分成功
-			go SendWeixin(param.Num, param.Uid, "")
+			go SendWeixin(param.Num, param.Umid, "")
 		}
 	}
 	lock.Unlock()