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

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

@@ -1511,9 +1511,9 @@ a{
 	color: #D03102;
 	margin-right: 5px;
 }
-
-style="color:#D03102;margin-right:5px;"
-
+.d-bg-green{
+	
+}
 .a-servicedetail #no_reg{ 
 	margin-bottom:100px; 
 	margin-top:50px;

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-muted u-font">{{.T.demandInfo.s_name}}</p>
-					<p class="text-muted">
-						<span id="bid-publishPerson">发布人：</span>
+					<p class="text-default u-font" style="color:#A0A0A0;font-size:13px;padding-left:8px; ">发布人:{{.T.demandInfo.s_name}}</p>
+					<p class="text-default">
+						<span id="bid-publishPerson" style="border-left: 3px solid #FF5A5F;    padding-left: 5px;">发布人：</span>
 						<span class="pull-right">
 							已有
 							<span class="text-primary">{{if .T.demandInfo.i_bids}}{{.T.demandInfo.i_bids}}{{else}}0{{end}}</span>
@@ -19,17 +19,20 @@
 					</p>
 					<div class="g-tbform">
 						<div class="form-group">
-							<label class="col-sm-2 control-label text-muted">联系人</label>
-							<div class="col-sm-7">
+							<label class="col-sm-2 control-label text-default"><span style="color:red;">*</span> 联系人</label>
+							<div class="col-sm-5">
 								<input type="text" class="form-control" name="s_person" datatype="*" nullmsg="请输入联系人" maxlength="10"/>
 							</div>
-							<div class="col-sm-3">
-								<span class="Validform_checktip"></span>
+							<div class="col-sm-4">
+									<span class="checkbox-inline" style=" padding-left:10px;">
+											<input type="radio" name="i_sex" id="man" value="1" checked="checked">先生</span>
+									<span class="checkbox-inline" style=" padding-left:10px;">
+					 		<input type="radio" name="i_sex" id="woman" value="0"> 女士</span>
 							</div>
 						</div>
 						<div class="form-group">
-							<label class="col-sm-2 control-label text-muted">联系方式</label>
-							<div class="col-sm-7">
+							<label class="col-sm-2 control-label text-default"><span style="color:red;">*</span>联系方式</label>
+							<div class="col-sm-5">
 								<input type="text" class="form-control" name="s_phone" maxlength="11" onKeyUp="rePlaceUnDigital(this)" datatype="m" nullmsg="请输入电话" errormsg="手机号码格式错误"/>
 							</div>
 							<div class="col-sm-3">
@@ -37,23 +40,25 @@
 							</div>
 						</div>
 						<div class="form-group">
-							<label class="col-sm-2 control-label text-muted">报价</label>
-							<div class="col-sm-7">
+							<label class="col-sm-2 control-label text-default">报价</label>
+							<div class="col-sm-5">
 								<input type="text" class="form-control" ignore="ignore" datatype="f" name="f_price" nullmsg="请输入报价" errormsg="格式错误" maxlength="9"/>
 							</div>
 							<div class="col-sm-3">
-								<span class="Validform_checktip"></span>
+									<span class="checkbox-inline" style=" padding-left:10px;">
+										<input type="checkbox" name="i_price" value=-1 />面议
+									</span>
 							</div>
 						</div>
 						<div class="form-group">
-							<label class="col-sm-2 control-label text-muted">备注</label>
-							<div class="col-sm-7">
+							<label class="col-sm-2 control-label text-default">备注</label>
+							<div class="col-sm-10">
 								<textarea class="form-control" name="s_remarks" rows="4"></textarea>
 							</div>
 							<div class="col-sm-3"></div>
 						</div>
 						<div class="form-group">
-							<label class="col-sm-2 control-label text-muted" >验证码</label>
+							<label class="col-sm-2 control-label text-default" ><span style="color:red;">*</span>验证码</label>
 							<div class="col-sm-7 input-group checkCodeId" id="checkCodeId">
 								<input type="text" name="checkCodeId" class="form-control inputxt" maxlength="4" onKeyUp="rePlaceUnDigital(this)" datatype="n4" nullmsg="请输入验证码" errormsg="验证码格式错误" aria-describedby="checkCodeId">
 							    <span class="input-group-addon" id="checkCodeId">

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

@@ -6,6 +6,9 @@
 			#bdshare_weixin_qrcode_dialog{
 		    height: 330px !important;
 			}
+			.g-tbform .text-default{
+				color:#666;
+			}
 		</style>
 		    {{include "/common/inc.html"}}
     <!-- extra CSS -->
@@ -175,8 +178,8 @@
 							{{if .T.myDemand}}
 							<td width="30%">服务商名称</td>
 							<td width="10%" align="center">报价(元)</td>
-							<td width="20%" align="center">联系人/手机号</td>
-							<td width="20%" align="center">备注</td>
+							<td width="20%" align="center">联系人/联系方式</td>
+							<td width="20%" align="center">备注信息</td>
 							<td	width="10%" align="center">状态</td>
 							<td width="10%" align="center">操作</td>
 							{{else}}
@@ -205,6 +208,7 @@
 	<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>
+		
 		loginBackType = -1;
 		$(function(){
 			$(".m-title span").click(function(e){
@@ -237,7 +241,11 @@
 					html += '<tr data-id="'+_id+'" data-demandid="'+r[i].s_demandid+'" class="a-border-b">'
 								+'<td><div><a title="'+r[i].s_enterprisename+'" target="_brank" href="/enterprise/'+r[i].s_enterpriseid+'.html">'+r[i].s_enterprisename+'</a></div></td>';
 					if(isMyDemand){
-						html += '<td align="center"><div><span title="'+r[i].f_price+'">'+r[i].f_price+'</span></div></td>'
+						var price=r[i].f_price;
+						if (r[i].f_price==0){
+							price="面议";
+						}
+						html += '<td align="center"><div><span  class="price" title="'+r[i].f_price+'">'+price+'</span></div></td>'
 								+'<td align="center"><div><span title="'+r[i].s_person+'/'+r[i].s_phone+'">'+r[i].s_person+'/'+r[i].s_phone+'</span></div></td>'
 						  		+'<td align="center"><div><span title="'+r[i].s_remarks+'">'+r[i].s_remarks+'</span></div></td>';
 					}
@@ -451,6 +459,7 @@
 					}
 					str+="<input name=\"s_id\" type=\"hidden\" value='"+s[i]["_id"]+"'/>"
 					$("#commentinfo").append(str);
+					
 				}
 			}
 		})