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

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

@@ -130,7 +130,7 @@ func (c *credit) BookInfo() {
 	if ret := redis.Get(RedisDB, cd.B_QD+"_"+userId); ret != nil {
 		c.ServeJson(ret)
 	}
-	return
+	c.ServeJson("")
 }
 
 //会员中心更新session签到信息

core/src/qfw/searchmarket/demand.go

@@ -11,6 +11,7 @@ import (
 	. "gopkg.in/mgo.v2/bson"
 	"html/template"
 	"log"
+	"qfw/coreconfig"
 	. "qfw/coreconfig"
 	util "qfw/util"
 	"qfw/util/credit"
@@ -284,6 +285,13 @@ func (d *Demand) QueryDemand(id string) error {
 					d.T["identNotPass"] = true
 				}
 			}
+			//代码
+			servicecode := obj["s_servicecode"].(string)
+			serviceTypeName := coreconfig.GetServiceName(servicecode[0:2]) + " - "
+			if len(servicecode) > 2 {
+				serviceTypeName = serviceTypeName + coreconfig.GetServiceName(servicecode)
+			}
+			obj["servicetypename"] = serviceTypeName
 			//分享图片设置
 			s_share := obj["s_shareimg"]
 			unresize := obj["s_images"]

core/src/qfw/searchmarket/marketservice.go

@@ -196,7 +196,7 @@ func searhService(querymap map[string]string, n *Market) (*[]map[string]interfac
             "s_name":{"force_source": true},
 			"s_introduction":{"force_source": true}
         }
-    },"_source":["_id","s_opLocDistrict","s_name","s_images","i_comments","i_hits","i_sales","i_status","i_bids","s_enterprisename","s_enterpriseid","s_nickname","s_introduction","l_createdate","i_identType","f_price","i_identtype","i_comauthenttype"]
+    },"_source":["_id","s_opLocDistrict","s_name","s_images","i_comments","i_hits","i_sales","i_status","i_bids","s_enterprisename","s_enterpriseid","s_nickname","s_introduction","l_createdate","l_enddate","i_identType","f_price","i_identtype","i_comauthenttype"]
 	,"from":` + fmt.Sprintf("%v", ((currentPage-1)*perPage)) + `,
 	"size":` + fmt.Sprintf("%v", perPage) +
 		`,"sort":[` + sort + `] }`
@@ -237,7 +237,8 @@ func searhService(querymap map[string]string, n *Market) (*[]map[string]interfac
 			res[i]["s_introduction"] = template.HTML(s_introduction)
 			l_createdate, _ := res[i]["l_createdate"]
 			res[i]["l_createdate"] = FormatDateWithObj(&l_createdate, Date_Full_Layout)
-
+			l_enddate, _ := res[i]["l_enddate"]
+			res[i]["l_enddate"] = FormatDateWithObj(&l_enddate, Date_Full_Layout)
 			if res[i]["i_identType"] != nil {
 				i_identType := res[i]["i_identType"]
 				res[i]["i_identType"] = fmt.Sprint(i_identType)

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

@@ -2540,10 +2540,6 @@ style="color:#D03102;margin-right:5px;"
 .b-pcshare .bdsharebuttonbox{
 	display: none;	
 }
-.bd_weixin_popup{
-	opacity: 0;
-	visibility: hidden;
-}
 .b-pcshare-content{
 	position: absolute;
 	left: -1px;

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

@@ -664,5 +664,9 @@ a:focus, a:hover{
 	font-weight: bold;
 	word-wrap: break-word;
 	word-break: normal;
+}
+.bd_weixin_popup{
+	opacity: 0;
+	visibility: hidden;
 	white-space: normal;
 }

core/src/web/staticres/js/demand.js

@@ -113,13 +113,14 @@ function rechoose(t){
 			$(".g-demand").addClass("f-display");
 			$(".u-icon.f-step1").parent().addClass("check");
 			$(".u-icon.f-step2").parent().removeClass("check");
+			$(".f-processbaractive").css("width","0%");
 			window.scrollTo( 0, 0 );
 		}else{
 			$(".g-typelist").addClass("f-display");
 			$(".g-demand").removeClass("f-display");
-			$(".u-icon.f-step1").parent().removeClass("check");
+			$(".u-icon.f-step1").parent().addClass("check");
 			$(".u-icon.f-step2").parent().addClass("check");
-			
+			$(".f-processbaractive").css("width","21%");
 		}
 }
 

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

@@ -225,7 +225,7 @@
 		</div>
 		<div class="content">
 			<p class="h5">一、积分说明</p>
-				<p class="para">会员总积分由操作积分、充值积分组成，其中操作积分是由会员的日常操作得分， 充值积分是因为充值产生的，因为违规操作引起的扣分行为将影响会员积分 （发布无意义和重复信息扣除200积分，发布违反国家相关法规信息永久封号）。</p>
+				<p class="para">会员总积分由会员的日常操作得分，因为违规操作引起的扣分行为将影响会员积分 （发布无意义和重复信息扣除200积分，发布违反国家相关法规信息永久封号）。</p>
 			<p class="h5">二、积分获得方法</p>
 			<p class="para">1、做任务赚积分</p>
 					<p class="para">企明星为你准备了简单操作的新手任务，引导你对网站功能快速上手的同时， 还能获取相应的积分。全部完成更能一次额外获得1001积分哦~</p>
@@ -257,11 +257,9 @@
 						<td>70</td>
 					</tr>
 				</table>
-			<p class="para">4、增送</p>
+			<p class="para">4、邀请新用户</p>
 			<p>邀请新用户加入，邀请成功后，每人次可获得积分。</p>
-			<p class="para">5、充值</p>
-			<p class="para">充值可以快速获得积分，充值1元兑换100积分。充值积分不可用于会员升级，只可用于功能使用。</p>
-			<p class="para">6、活动增送</p>
+			<p class="para">5、活动增送</p>
 			<p class="para">企明星不定期开放各种任务，为活跃用户提供更多获取积分得方式，加速成长，获得积分。所以，常来看看哦~</p>
 			<p class="para">备注：会员积分可能有延迟，若超过24小时未加上，请于企明星客服联系。</p>
 		</div>
@@ -281,7 +279,7 @@
 						<td><img src="/images/40jf.png"><div>第四天</div></td>
 					</tr>
 				</table>
-				<table width="100%;" style="margin:0px auto;" class="creditbottom">
+				<table width="100%;" style="margin:0px auto;max-width: 241px;" class="creditbottom">
 					<tr>
 						<td style="margin-left:10px;"><img src="/images/50jf.png"><div>第五天</div></td>
 						<td><img src="/images/60jf.png"><div>第六天</div></td>
@@ -311,16 +309,18 @@
 			$(".f-close").bind("click",hide);
 			$("#bookinbtn").bind("click",qd);
 			bookinfo();
+			if ($(".gold").text()==""){
+				$(".gold").text("0");
+			}
 		});
 		function bookinfo(){
-			
 			$.ajax({
 				url:"/member/credit/bookinfo",
 				method:"POST",
 				type:"json",
 				success:function(r){
 					if (r){
-						var d={"1":"一","2":"二","3":"三","4":"四","5":"五","6":"六","7":"七","8":"八","9":"九","0":"零"}
+						var d={"1":"一","2":"二","3":"三","4":"四","5":"五","6":"六","7":"七","8":"八","9":"九","0":"零"};
 						$(".days").text(d[""+r[1]]);
 						$(".days").attr("data",r[1]);
 						var images=$(".bookinfo img");

core/src/web/templates/member/editservice.html

@@ -164,7 +164,7 @@
 							<div class="rowcontent"> 
 								<div class="two">价格：</div> 
 								<div class="three">
-									<input type="text" class="form-control price" id="s_price" name="s_price" onblur="checkprice(this);" value="{{.T.price}}"  maxlength="12" />元
+									<input type="text" class="form-control price" id="s_price" name="s_price" onblur="checkprice(this);" value="{{.T.price}}"  maxlength="6" />元
 									<!--面议-->
 									<input type="checkbox" id="s_pricemy" name="s_pricemy" value="1" >面议
 								</div> 

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

@@ -147,6 +147,7 @@ function del(n){
 //标记已读
 function flag(n){
 	var selected=$("input[name='_tableCheck']:checked",$("#list_"+n));
+	var size=selected.size();
 	if(selected.size()>0){
 		var s=[];
 		selected.each(function(){
@@ -154,8 +155,13 @@ function flag(n){
 		})
 		$.post("/member/msgflag",{ids:s.join(",")},function(data){
 			if(data&&data.success){
+				var count=parseInt($(".badge").eq(0).text());
+				if (count==size){
+					$(".badge").hide();
+				}else{
+						$(".badge").text(count-size);
+				}
 				reloadData(n);
-				reloadData(1);
 			}
 		},'json')
 	}else{

core/src/web/templates/member/myappointment.html

@@ -72,7 +72,7 @@ $(function(){
 			html += '</td><td align="center" class="a-table-operation">';
 			switch(i_status){
 				case 1:
-					html += '<a class="btn btn-default btn-sm a-table-revoke">撤销</a>';
+					html += '<a class="btn btn-default btn-sm a-table-revoke text-primary">撤销</a>';
 					break;
 				case 3:
 					html += '<button class="btn btn-success btn-sm" onclick="window.location.href=\'/market/detail/'+s_serviceid+'_comment_'+_id+'.html\'">评价</button>';

core/src/web/templates/member/showenterprise.html

@@ -396,7 +396,7 @@ var entType="企业"
 						
 						<div class="row qfw-row-marginbottom" >
 							<div class="col-sm-3" align="right" style="font-size:12px;">价格</div>
-							<div class="col-sm-8"><input type="text" class="qmx-price price"  name="s_price" datatype="s" /> 元</div>
+							<div class="col-sm-8"><input type="text" class="qmx-price price"  length=6 name="s_price" datatype="s" /> 元</div>
 						</div>	
 						
 						<div class="row qfw-row-marginbottom" >

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

@@ -8,9 +8,9 @@
 					<h4 class="modal-title" id="bidModalLabel"><b>参与投标</b></h4>
 				</div>
 				<div class="modal-body g-modal-body">
-					<p class="text-default u-font" style="color:#A0A0A0;font-size:13px;padding-left:8px; ">发布人:{{.T.demandInfo.s_name}}</p>
+					<p class="text-default u-font" style="color:#A0A0A0;font-size:13px;padding-left:8px; ">发布人:<span id="fbr"></span></p>
 					<p class="text-default">
-						<span id="bid-publishPerson" style="border-left: 3px solid #FF5A5F;    padding-left: 5px;">发布人：</span>
+						<span id="bid-publishPerson" style="border-left: 3px solid #FF5A5F;    padding-left: 5px;">发布人：{{.T.demandInfo.s_name}}</span>
 						<span class="pull-right">
 							已有
 							<span class="text-primary">{{if .T.demandInfo.i_bids}}{{.T.demandInfo.i_bids}}{{else}}0{{end}}</span>
@@ -97,7 +97,7 @@ $(function(){
 			alert("投标前请先进行认证！");
 			window.location.href = "/member/authentication/index";
 		}else if(isLogined){
-			$("#bid-publishPerson").text($("#publishPerson a").text());
+			$("#fbr").text($("#publishPerson a").text());
 			$('#bidModal').modal('show');
 		}else{
 			loginModalShow();

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

@@ -51,6 +51,7 @@
 					</li>
 				</ul>
 				<div class="u-processbar"></div>
+				<div class="u-processbar f-processbaractive" style="width:0%;background:#FF5A5F;top:-4px;"></div>
 			</div>
 			<p class="u-notice">
 				企明星郑重承诺：不收取您的任何费用，请放心发布。
@@ -207,6 +208,11 @@
 
 <script >
  //是否登录,没有登录必须登录。
+$(function(){
+			$("#setdemand").css("color","#FF5A5F");
+			$("#setdemand").css("font-weight","600");
+			$(".img-circle.b-com-first").css("background-color","#FF5A5F");
+		});
 	$(function(){
 		if(!isLogined){
 			loginModalShow();

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

@@ -85,7 +85,32 @@
 					</div>
 		 			<div class="col-xs-12 col-sm-8 d_service_main">
 			 			<div class="a-twostage-title u-overflow">{{.T.sinfo.s_name}}<small style="font-size:12px;font-weight:normal;" class="text-primary">&nbsp;&nbsp;&nbsp;{{.T.sinfo.servicetypename}}</small></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><span class="text-muted margin-r-10"><a href="/enterprise/{{.T.sinfo.s_enterpriseid}}.html" target="_blank">{{.T.sinfo.s_enterprisename}}</a></span> 
+						<span>	
+							{{$v:=.T.sinfo}}
+								{{ 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.0}}
+													<span class="glyphicon mprz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:-7px;">名片认证</small></span>					
+												{{else if eq $v.i_comauthenttype 1.0}}
+													<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:-7px;">营业执照认证</small></span>
+												{{else if eq $v.i_comauthenttype 3.0}}
+													<span class="glyphicon yjrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:-7px;">年报邮箱认证</small></span>
+												{{end}}
+										{{else}}
+												<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:-7px;">营业执照认证</small></span>
+										{{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}}
+								{{end}}
+						</span>
+						</div>
 			 			<div class="d-service-price">
 							<div>
 							{{if .T.sinfo.s_pricemy }}
@@ -259,7 +284,7 @@
 				<div style="float:left;" id="zpflower">
 						<img  style="margin-top:-5px;margin-right:10px;" src="/images/rflower.png" />
 				</div>
-				<div style="float:left;">
+				<div style="float:left;width:843px;">
 					<div>
 					<div class="graystar1"><div class="greenstar1" style="width: 100%;"></div></div>
 				</div>
@@ -446,7 +471,7 @@ function getComment(n,start){
 				}
 				str+="<div class='pson'><div class='first' style='margin-right:20px;'>"+img+"</div>";
 				str+="<div class='first'><div>"+pic+"</div><div><span  class=\"dspan\">"+s[i]["s_nickname"].substring(0,2)+"***</span></div></div>";
-				str+="<div class='first' style='width:722px;padding:5px 0 0 30px;'><div style='margin-bottom:10px;'> <div class='graystar1'><div class='greenstar1' style='width: "+style+"%;'></div></div></div><div><span style='font-size:13px;'>"+s[i]["s_comment"]+"</span></div>&nbsp;&nbsp;"
+				str+="<div class='first' style='width:722px;padding:5px 0 0 30px;'><div style='margin-bottom:10px;'> <div class='graystar1'><div class='greenstar1' style='width: "+style+"%;'></div></div></div><div><span style='font-size:13px;display: inline-block;width: 110%;'>"+s[i]["s_comment"]+"</span></div>&nbsp;&nbsp;"
 				if(isSelf==1 && s[i]["s_reply"]==""){
 					str+="<a style=\"color:#3a87ad;\" class=\"f-reply\" onclick=\"sreply(this)\">回复</a>";
 				}
@@ -659,5 +684,12 @@ function comment(){
 <SCRIPT src="/js/lib.js" type="text/javascript"></SCRIPT>
 <SCRIPT src="/js/163css.js" type="text/javascript"></SCRIPT>
 <script>window._bd_share_config={"common":{"bdSnsKey":{},"bdText":"","bdMini":"2","bdPic":"","bdStyle":"0","bdSize":"16","onAfterClick":function(){$.post("/member/credit/inCreditAjx",{"param":"fx"},function(r){})}},"share":{}};with(document)0[(getElementsByTagName('head')[0]||body).appendChild(createElement('script')).src='http://bdimg.share.baidu.com/static/api/js/share.js?v=89860593.js?cdnversion='+~(-new Date()/36e5)];</script>
+<script>
+		$(function(){
+			$("#releaseService").css("color","#FF5A5F");
+			$("#releaseService").css("font-weight","600");
+			$(".img-circle.b-com-first").css("background-color","#FF5A5F");
+		});
+</script>
 </body>
 </html>

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

@@ -79,7 +79,7 @@
 				<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 class="d_more qfw-text-more" onClick="less(this)"><small  style="cursor:hand;font-weight:600;color:#FF5A5F;">更多></small></div>	
 				</div>
 				<div class="f_zw ">
 					
@@ -143,18 +143,11 @@
 					{{end}}
 					{{if eq "demand" $.T.querymap.c_searchtype}}
 					
-					<div class="col-sm-2 col-xs-4" style="margin-left:10px;">
-					{{if eq $v.i_status 1.0 }}
-						<img src="/images/u288.png" />
-					{{else}}
-						{{if eq $v.i_status 2.0}}
-						<img src="/images/u252.png" />
-						{{end}}
-					{{end}}
-					</div>
+					
 					
 					{{end}}
 				</div>
+				
 				<div class="col-xs-12" style="margin-top:2px;margin-left:-9px;{{if $v.s_enterprisename}} margin-bottom:5px;{{else}}margin-bottom:25px;{{end}}">
 				{{if $v.s_enterprisename}} 
 					{{if eq "demand" $.T.querymap.c_searchtype}}
@@ -207,6 +200,19 @@
 						<span class="d_service_span text-muted f-code">{{$v.s_opLocDistrict}}</span>
 					</div>
 				</div>
+				{{if eq "demand" $.T.querymap.c_searchtype}}
+					<div class="col-sm-2 col-xs-4" style="margin-left:10px;">
+					{{if eq $v.i_status 1.0 }}
+						<img src="/images/u288.png" />
+					{{else}}
+						{{if eq $v.i_status 2.0}}
+						<img src="/images/u252.png" />
+						{{end}}
+					{{end}}
+					
+					<div style="position: absolute;width: 180px;height: 20px;overflow: hidden;color:#A0A0A0;">投标截止时间：{{$v.l_enddate}}</div>
+					</div>
+				{{end}}
 				{{if eq "service" $.T.querymap.c_searchtype}}
 				<div class="col-sm-2 col-xs-4" style="margin-top: 5px;">
 					价格：{{if eq $v.f_price 0.0}}<span class="text-primary text-bold">面议</span>{{else}}<span class="text-primary text-bold">{{$v.f_price}}</span>元{{end}}
@@ -287,6 +293,7 @@
 	var c_searchtype={{.T.querymap.c_searchtype}}
 	var fwlb = {{.T.serviceStr}}
 	$(function(){
+		$(".img-circle.b-com-first").css("background-color","#FF5A5F");
 		$(".b-menu").bind("changecontent",function(){$("#searchForm").submit();});
 		if ($("#c_searchtype").val()=="demand"){
 			$(".b-showname").text("找需求");

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

@@ -9,6 +9,10 @@
 			.g-tbform .text-default{
 				color:#666;
 			}
+			small.text-primary{
+				font-size:13px;
+				font-weight:400;
+			}
 		</style>
 		    {{include "/common/inc.html"}}
     <!-- extra CSS -->
@@ -51,10 +55,11 @@
 							{{else if eq .T.demandInfo.i_status 4}}
 							<span class="a-bg-gray  a-bg-gray-new">已撤销</span>
 							{{end}}
+							<small class="text-primary ">{{.T.demandInfo.servicetypename}}</small>
 				 			{{if .T.edit}}
 							<span>
 								<!-- <a class="btn btn-primary" style="font-size:14px;font-weight:400;float:right;" onclick="remove1('{{.T.demandInfo._id}}');">删除</a> -->
-								<a class="btn btn-primary" style="font-size:14px;font-weight:400;float:right;margin-right:5px;" href="/market/demand/{{.T.demandInfo._id}}.html">编辑</a>
+								<a class="btn-new a-table-recive" style="font-size:14px;font-weight:400;float:right;margin-right:5px;margin-top:7px;text-align:center;" href="/market/demand/{{.T.demandInfo._id}}.html">编辑</a>
 							</span>
 				 			{{end}}
 						</div>
@@ -98,7 +103,7 @@
 						</div>
 						<div style="height:60px;line-height:60px;background:#FBF0F1;">
 								<div style="float:left;padding-left:20px;"><span style="color:#A0A0A0;font-weight:600;">报价:</span><span class="var">
-								<span class="text-primary text-bold;">
+								<span class="text-primary text-bold">
 								{{if .T.demandInfo.i_isftf}}
 										{{if eq 1 .T.demandInfo.i_isftf}}
 											面议
@@ -207,7 +212,7 @@
     </div>
 	{{include "/service/bid.html"}}
 	<script charset="utf-8" src="/js/paging.js"></script>
-	<script>window._bd_share_config={"common":{"bdSnsKey":{},"bdText":"","bdMini":"2","bdPic":"http://test.qimingxing.info/upload/2015/10/27/2015102708191301041479.jpg","bdStyle":"0","bdSize":"16","onAfterClick":function(){alert(1);$.post("/member/credit/inCreditAjx",{"param":"fx"},function(r){})}},"share":{}};with(document)0[(getElementsByTagName('head')[0]||body).appendChild(createElement('script')).src='http://bdimg.share.baidu.com/static/api/js/share.js?v=89860593.js?cdnversion='+~(-new Date()/36e5)];</script>
+	<script>window._bd_share_config={"common":{"bdSnsKey":{},"bdText":"","bdMini":"2","bdPic":"http://test.qimingxing.info/upload/2015/10/27/2015102708191301041479.jpg","bdStyle":"0","bdSize":"16","onAfterClick":function(){$.post("/member/credit/inCreditAjx",{"param":"fx"},function(r){})}},"share":{}};with(document)0[(getElementsByTagName('head')[0]||body).appendChild(createElement('script')).src='http://bdimg.share.baidu.com/static/api/js/share.js?v=89860593.js?cdnversion='+~(-new Date()/36e5)];</script>
 	<script>
 		
 		loginBackType = -1;
@@ -484,6 +489,11 @@ function remove1(id){
 		}
 	});
 }
+$(function(){
+			$("#setdemand").css("color","#FF5A5F");
+			$("#setdemand").css("font-weight","600");
+			$(".img-circle.b-com-first").css("background-color","#FF5A5F");
+		});
 	</script>
 	{{include "/common/bottom.html"}}
   </body>