Selaa lähdekoodia

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

wangshan 9 vuotta sitten
vanhempi
commit
f34ee41a47

+ 1 - 0
core/src/message.json

@@ -1,6 +1,7 @@
 {
 	"weixinrpc":"127.0.0.1:82",
 	"swordfishaction":"/swordfish/page",
+	"signature":"/member/credit/myCredit",
 	"entsearchaction":"/search/enterprise/ent.html",
 	"lawsearchaction":"/law/qfw/index",
 	"msiteaction":"/ent/wsite/edit",

+ 6 - 0
core/src/qfw/front/webappointment.go

@@ -8,6 +8,7 @@ import (
 	"github.com/dchest/captcha"
 	"github.com/go-xweb/xweb"
 	. "gopkg.in/mgo.v2/bson"
+	"log"
 	member "qfw/member"
 	. "qfw/util/mongodb"
 	msg "qfw/util/msg"
@@ -211,6 +212,11 @@ func doappointment(a *Appointment) (status string) {
 	fmt.Println("-----", tim.Unix())
 	data["l_createdate"] = time.Now().Unix()
 	data["l_timestamp"] = time.Now().Unix() //时间戳
+	userinfo := *a.GetSession("userInfo").(*map[string]interface{})
+	if userinfo["s_avatar"] != nil {
+		data["s_pic"] = userinfo["s_avatar"]
+	}
+	log.Println(data["s_pic"])
 	tm := time.Now().Unix()
 	id := Save("serviceorder", data)
 	if len(id) > 0 {

+ 4 - 0
core/src/qfw/searchmarket/service.go

@@ -256,6 +256,10 @@ func (s *Service) Comment() error {
 					params["l_timeappend"] = time.Now().Unix()
 					params["l_timereply"] = time.Now().Unix()
 					params["s_nickname"] = s_nickname
+					userinfo := *s.GetSession("userInfo").(*map[string]interface{})
+					if userinfo["s_avatar"] != nil {
+						params["s_pic"] = userinfo["s_avatar"]
+					}
 					rs := mongo.Save("comment", params)
 					if rs != "" {
 						if s_demand == "1" {

+ 43 - 21
core/src/web/staticres/css/dev-qfw.css

@@ -1129,7 +1129,7 @@ a{
 }
  .b-menu div{
 	height:35px;
-	width:103px;
+	width:104px;
 	text-align:center;
 	cursor:pointer;
 }
@@ -1278,7 +1278,20 @@ a{
 	color: #999999;
 	font-size: 13px;
 }
+.graystar1 {
+	background: url(/images/startgray.png) no-repeat 0 0;
+	width: 127px;
+	height: 10px;
+	margin-top: 0px;
+}
 
+.greenstar1 {
+	background: url(/images/starred.png) no-repeat 0 0;
+	height: 10px;
+	margin-top: -5px;
+	background-position: 0px -1px;
+	width: 34%;
+}
 .a-servicedetail .gray-star {
 	background: url(/images/u019.png) no-repeat 0 0;
 	width: 127px;
@@ -1361,6 +1374,7 @@ a{
 	line-height: 40px;
 	text-align: center;
 	font-size: 13px;
+	    border-radius: 0;
 }
 
 .a-servicedetail .d_fwfl>a:hover {
@@ -1411,23 +1425,28 @@ a{
 
 .a-servicedetail .d_pjlb {
 	font-size: 12px;
+	word-wrap: break-word;
+}
+.a-servicedetail .pson{
 	border-bottom: 1px solid #f7f6f4;
 	padding: 20px 0px 20px 10px;
-	height: 100px;
-	word-wrap: break-word;
+	clear: both;
+	float: left;
 }
 .a-servicedetail .d_pjlb div.first {
 	float: left;
 }
 .a-servicedetail textarea {
-	width: 90%;
+	width: 100%;
 }
 
 .a-servicedetail .d_pjlb_zj {
+	clear:both;
 	margin-top: 10px;
 	background-color: #f7f6f4;
 	padding: 5px;
     word-wrap: break-word;
+	margin-left:104px;
 }
 
 .a-servicedetail .d_service_jl {
@@ -1667,6 +1686,9 @@ style="color:#D03102;margin-right:5px;"
 .g-comment textarea{
 	width: 90%;
 }
+.m-comment{
+	margin-top:-4px;
+}
 .m-comment li a{
 	display:block;
 	height:26px;
@@ -1770,9 +1792,7 @@ style="color:#D03102;margin-right:5px;"
 	border: 1px solid #F5DC99;
 }
 .m-detailintroduction{
-	width:925px;
 	background:#FFF;
-	padding:15px;
 }
 .f-d.u-overflow img,.m-detailintroduction img{
 	max-width:100%;
@@ -2130,22 +2150,24 @@ style="color:#D03102;margin-right:5px;"
 	margin-right:20px;
 }
 .u-loadmore{
+	top:45px;
+	clear:both;
 	display: block;
-    cursor: pointer;
-    background: #f7f6f4;
-    height: 37px;
-    color: #51545b;
-    font-weight: 700;
-    line-height: 37px;
-    text-align: center;
-    margin: 30px auto 40px;
-    text-decoration: none;
-    font-size: 14px;
-    position: relative;
-    z-index: 5;
-    -webkit-transition: all ease .7s;
-    -moz-transition: all ease .7s;
-    transition: all ease .7s;
+	cursor: pointer;
+	background: #f7f6f4;
+	height: 37px;
+	color: #51545b;
+	font-weight: 700;
+	line-height: 37px;
+	text-align: center;
+	margin: 30px auto 40px;
+	text-decoration: none;
+	font-size: 14px;
+	position: relative;
+	z-index: 5;
+	-webkit-transition: all ease .7s;
+	-moz-transition: all ease .7s;
+	transition: all ease .7s;
 }
 .u-loadmore:hover{
 	 background: #e1e2e5;

BIN
core/src/web/staticres/images/starred.png


BIN
core/src/web/staticres/images/startgray.png


+ 1 - 1
core/src/web/templates/common/hotservice.html

@@ -2,7 +2,7 @@
 <div id="hotService">
 	{{$s:=(Ad "service-right-01" 4)}}
 	{{range $k,$v := $s}}
-	<ul class="a-com-ul-block a-com-ul-blocknew" data-id="{{$v.s_id}}">
+	<ul class="a-com-ul-block a-com-ul-blocknew" data-id="{{$v.s_id}}" style="height: 233px;">
 		<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>

+ 8 - 6
core/src/web/templates/common/memberleft.html

@@ -83,7 +83,7 @@
 					<img class="img-circle" src="{{$s_avatar}}" onerror="this.className='img-circle defaultHeadImg';this.src='/images/image_radius_bg.png'">
 				{{end}}
 			</div>
-			<div><span style="line-height:35px" class="member-loginName cursor-pointer" onclick="window.location.href = '/member/show/memberindex'">{{session "nickName"}}</span></div>
+			<div><span style="line-height:30px" class="member-loginName cursor-pointer" onclick="window.location.href = '/member/show/memberindex'">{{session "nickName"}}</span></div>
 			<div>
 			{{if session "credit_qd"}}
 				{{if eq (session "credit_qd") "y"}}
@@ -101,7 +101,7 @@
 	<div style="width:198px;height:40px;text-align:center;">
 		<div style="float:left;width:90px;border-right:1px">
 			<div>积分</div>
-			<div><i class="glyphicon jinbi" style="width:25px;color:red;font-size:18px"></i>{{session "i_credit"}}</div>
+			<div><i class="glyphicon jinbi" style="width:25px;color:red;font-size:18px"></i><span style="font-weight:normal;">{{session "i_credit"}}</span></div>
 		</div>
 		<div style="height:40px;float:left;width:1px;background-color:#DDDDDD"></div>
 		<div style="float:left;width:105px;">
@@ -111,19 +111,21 @@
 				{{$identType := session "identType"}}
 				{{if eq 1 $identType}}
 					{{if eq 1 $identWay}}
-					<i class="glyphicon qyrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i>已认证企业
+					<i class="glyphicon qyrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">已认证企业</span>
 					{{end}}
 				{{else if eq 2 $identType}}
 					{{if eq 1 $identWay}}
-					<i class="glyphicon grrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i>已认证个人
+					<i class="glyphicon grrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">已认证个人</span>
 					{{end}}
 				{{else if eq 3 $identType}}
 					{{if eq 1 $identWay}}
-					<i class="glyphicon jgrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i>已认证机构
+					<i class="glyphicon jgrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">已认证机构</span>
 					{{end}}
+				{{else}}
+				<i class="glyphicon grrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">未认证</span>
 				{{end}}
 			{{else}}
-				<i class="glyphicon grrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i>未认证
+				<i class="glyphicon grrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">未认证</span>
 			{{end}}
 			</div>
 		</div>

+ 51 - 24
core/src/web/templates/service/detail.html

@@ -152,15 +152,15 @@
 			
 			{{if .T.status }}
 				{{if eq .T.status "comment"}}
-			<a type="button" class="btn text-muted">评价服务</a>
+			<a type="button" class="btn text-muted btnactive" style="margin-left: 15px;">评价服务</a>
 				{{end}}
 				{{if eq .T.status "appendcomment"}}
-			<a type="button" class="btn text-muted">追加评价</a>
+			<a type="button" class="btn text-muted btnactive" style="margin-left: 15px;">追加评价</a>
 				{{end}}
 			{{end}}
 			  
 		</div>
-		<div class="f-content u-overflow">
+		<div class="f-content u-overflow" style="background:#FFF;padding:20px 10px;float: left;width:100%;">
 		
 		{{if eq .T.isComment 0}}	
 		<!--添加详情-->
@@ -229,7 +229,7 @@
 				<strong class="f-floatl">
 					评分:
 				</strong>
-				<ul class="m-comment f-floatl">
+				<ul class="m-comment f-floatl" >
 					<li><a title="很不满意"></a></li>
 					<li><a title="不满意"></a></li>
 					<li><a title="一般"></a></li>
@@ -241,21 +241,35 @@
 		</div>
 			{{end}}
 			{{if eq .T.status "appendcomment"}}
-		<div class="margin-15">
+			<script>
+				var score={{.T.commentm.score}};
+				$(function(){
+					if(score==3){
+						$("#zpflower img").attr("src","/images/yflower.png");
+					}else if (score<3){
+						$("#zpflower img").attr("src","/images/bflower.png");
+					}
+					$(".f-content.u-overflow").css("padding-bottom","0px;");
+				});
+			</script>
+		<div class="margin-15" style="margin-bottom:10px;">
 			<div class="d_pjlb">
-				<div>
-					<span class="dspan">{{.T.commentm.s_nickname}}</span>
+				<div style="float:left;" id="zpflower">
+						<img  style="margin-top:-5px;margin-right:10px;" src="/images/rflower.png" />
 				</div>
-				<div>
-					<span>{{.T.commentm.s_comment}}</span>&nbsp;&nbsp;
+				<div style="float:left;">
+					<div>
+					<div class="graystar1"><div class="greenstar1" style="width: 100%;"></div></div>
 				</div>
-				
 				<div>
-				<span class="dspan">{{.T.sinfo.s_name}}</span>&nbsp;&nbsp;<span id="de-time"></span></div>
+					<span>{{.T.commentm.s_comment}}</span>&nbsp;&nbsp;
+				</div>				
 				<input type="hidden" id="s_orderid" value="{{.T.s_orderid}}"/>
 				<input type="hidden" id="s_serviceid" value="{{.T.sinfo._id}}"/>
 				<input type="hidden" id="s_type" value="append"/>
-				<textarea class="form-control" rows="6" id="s_append"></textarea>
+				</div>
+				<div style="clear:both;">&nbsp;</div>
+				<textarea class="form-control" rows="6" id="s_append" style="height:240px;"></textarea>
 				<script>$(function(){$("#de-time").text(getLocalTime({{.T.commentm.l_timestamp}}))})</script>
 			</div>
 			<div class="g-comment">
@@ -272,7 +286,7 @@
 		</div>
 		{{if .T.status }}
 			{{if eq .T.status "comment" "appendcomment"}}
-				<div class="row text-center padding-20">
+				<div class="row text-center padding-20" style="background:#FFF;width:925px;margin:0px auto;">
 					<button class="btn btn-primary u-w123 margin-t-10" id="commentbtn">发表评论</button>
 				</div>
 			{{end}}
@@ -408,9 +422,20 @@ function getComment(n,start){
 		success:function(s){
 			for(var i=0;i<s.length;i++){
 				var str="<div class='d_pjlb'>";
-				str+="<div class='first' style='margin-right:20px;'><img style='margin-top:13px;' src='/images/rflower.png'  /></div>"
-				str+="<div class='first'><div><img src='/images/u885.png'/></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><div><span style='font-size:13px;'>"+s[i]["s_comment"]+"</span></div>&nbsp;&nbsp;"
+				var img="<img style='margin-top:13px;' src='/images/rflower.png'  />";
+				var pic ="<img style='border-radius:37px;' width=37 src='/images/u885.png'/>";
+				if (s[i]["s_pic"] && s[i]["s_pic"]!=""){
+					pic="<img width=37 style='border-radius:37px;' src="+s[i]["s_pic"]+"/>";
+				}
+				var style=parseInt(s[i]["i_score"])/5*100+"";
+				if (parseInt(s[i]["i_score"])==3){
+					img="<img style='margin-top:13px;' src='/images/yflower.png'  />";
+				}else if(parseInt(s[i]["i_score"])<3){
+					img="<img style='margin-top:13px;' src='/images/bflower.png'  />";
+				}
+				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;"
 				if(isSelf==1 && s[i]["s_reply"]==""){
 					str+="<a style=\"color:#3a87ad;\" class=\"f-reply\" onclick=\"sreply(this)\">回复</a>";
 				}
@@ -419,15 +444,16 @@ function getComment(n,start){
 				str+="</div>";
 				if(s[i]["s_reply"]&&s[i]["s_reply"]!=""){
 					str+="<div class=\"d_pjlb_zj\"> <span class=\"dspan margin-l-15\">&nbsp;&nbsp;服务商回复:</span>";
-					str+="<span>"+s[i]["s_reply"]+"</span>&nbsp;&nbsp;&nbsp;&nbsp;--<span>"+getLocalTime(s[i]["l_timereply"])+"</span></div>";
+					str+="<span>"+s[i]["s_reply"]+"</span>&nbsp;&nbsp;&nbsp;&nbsp;--<span></span></div>";
 				}
 				if(s[i]["s_append"]&&s[i]["s_append"]!=""){
 					str+="<div class=\"d_pjlb_zj\">";
 					str+="<span class=\"dspan margin-l-15\">追加:</span>";
-					str+="<span>"+s[i]["s_append"]+"</span>&nbsp;&nbsp;&nbsp;&nbsp;--<span>"+getLocalTime(s[i]["l_timeappend"])+"</span>";
+					str+="<span>"+s[i]["s_append"]+"</span>&nbsp;&nbsp;&nbsp;&nbsp;<span></span>";
 					str+="</div>";
 				}
-				str+="<input name=\"s_id\" type=\"hidden\" value='"+s[i]["_id"]+"'></input>"
+				str+="<input name=\"s_id\" type=\"hidden\" value='"+s[i]["_id"]+"'></input>";
+				str+="</div>";
 				$("#commentinfo").append(str);
 			}
 			if(s.length<4){
@@ -443,11 +469,11 @@ function sreply(n){
 	if($("#g-reply").length!=0){
 		$("#g-reply").remove();
 	}
-	var after="<div id=\"g-reply\" style=\"text-align:right;\"><textarea id=\"s_reply\" style=\"width:100%;\" class=\"form-control\" rows=\"6\"></textarea> <button style=\"margin: 5px 0 0 0; width: 85px;\" id=\"replybtn\" class=\"btn btn-primary\">发送</button> </div>"
+	var after="<div id=\"g-reply\" style=\"text-align:right;\"><textarea id=\"s_reply\" style=\"width:87%;margin-left:108px;\" class=\"form-control\" rows=\"6\"></textarea> <button style=\"margin: 5px 0 0 0; width: 85px;\" id=\"replybtn\" class=\"btn btn-primary\">发送</button> </div>"
 	$(n).parent().after(after);
 	$("#replybtn").click(function(){
 		var data={};
-		id=$("#g-reply").parent().find("input[name=s_id]").val();
+		id=$("#g-reply").parent().parent().find("input[name=s_id]").val();
 		data["s_reply"]=$("#s_reply").val();
 		data["sid"]=id;
 		if(data["s_reply"]==""){
@@ -468,7 +494,7 @@ function sreply(n){
 					if(rs["f"]=="y"){
 						 var str="";
 							str+="<div class=\"d_pjlb_zj\"> <span class=\"dspan margin-l-15\">&nbsp;&nbsp;服务商回复:</span>";
-							str+="<span>"+rs["content"]+"</span>&nbsp;&nbsp;&nbsp;&nbsp;--<span>"+getLocalTime(rs["l_timereply"])+"</span></div>";
+							str+="<span>"+rs["content"]+"</span>&nbsp;&nbsp;&nbsp;&nbsp;--<span></span></div>";
 							$("#g-reply").parent().append(str);
 							$("#g-reply").prev().find("a").remove();
 							$("#g-reply").remove();
@@ -549,8 +575,9 @@ function comment(){
 					var s_servicename = r[i].s_servicename;
 					var l_createdate = r[i].l_createdate;
 					var src="/images/u885.png";
-					if(r[i].s_img && r[i].s_img==""){
-						src=r[i].s_img;
+					console.log(r[i]);
+					if (r[i]["s_pic"] && r[i]["s_pic"]!=""){
+						src=r[i]["s_pic"];
 					}
 					var tx="<div style='margin-right:50px;'><img height=34 class='radius' style='margin-bottom:10px;margin-right:-15px;'  src="+src+"  /></div>"
 					html+= '<tr class="fonttwo a-border-b"><td>'+tx+s_linkman+'</td><td>'+s_servicename+'</td><td>'+l_createdate+'</td></tr>'