Browse Source

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

wangchuanjin 9 years ago
parent
commit
aeb979f4d6

+ 1 - 1
core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-06-06 17:25:28"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-06-06 17:25:28"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-06-07 17:58:09"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-06-07 17:58:09"}},"marketisstart":true,"marketrate":300}

+ 3 - 3
core/src/web/templates/index.html

@@ -156,7 +156,7 @@
 			<div id="myCarousel" class="carousel slide" style="height:300px;">  
 			   <!-- 轮播(Carousel)项目 -->
 			   <div class="carousel-inner">
-			         	{{$s:=(Ad "index-center-06" 16)}}
+			         	{{$s:=(Ad "ent-recommend" 16)}}
 			      <div class="item active itemno">
 						<div class="index-qysq">
 						{{range $k,$v := $s}}
@@ -166,9 +166,9 @@
 			    		{{if eq $k 12}}</div><div class="index-qysq">{{end}}
 				
 						<div class="index-new-qysqlist text-center">
-						<a  target="_blank" href="{{$v.s_link}}"{{if ge $k 2}} class="hidden-xs"{{end}}><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}}  data-original="{{if $v.s_pic}}{{Msg "seo" "cdn"}}{{$v.s_pic}}{{else}}{{Msg "seo" "cdn"}}/images/u166.png{{end}}" class="lazy"  onerror="this.src='/images/u166.png'"></a>
+						<a  target="_blank" href="/enterprise/{{$v.s_id}}.html" {{if ge $k 2}} class="hidden-xs"{{end}}><img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}}  data-original="{{if $v.s_pic}}{{Msg "seo" "cdn"}}{{$v.s_pic}}{{else}}{{Msg "seo" "cdn"}}/images/u166.png{{end}}" class="lazy"  onerror="this.src='/images/u166.png'"></a>
 						</br>
-						<a  target="_blank" href="{{$v.s_link}}" class="index-qysq-name font-size-12
+						<a  target="_blank" href="/enterprise/{{$v.s_id}}.html" class="index-qysq-name font-size-12
 ">{{$v.s_remark}}</a>
 						</div>
 						{{end}}

+ 43 - 3
core/src/web/templates/member/credit/mcreditindex.html

@@ -42,7 +42,7 @@
 			float:left;
 			margin-right:25px;
 		}
-		div.title{
+		div.title,div.mytitle{
 			border-bottom:1px solid #F8F8F8;
 			height:40px;
 			line-height:42px;
@@ -55,9 +55,15 @@
 		.m-rules{
 			padding-left: 15px;
 		}
+		.my-rules{
+			padding-left: 15px;
+		}
 		.m-rules div.title:hover{
 			background:#F6F9F4;
 		}
+		.my-rules div.mytitle:hover{
+			background:#F6F9F4;
+		}
 		.m-rules div.title span{
 			line-height:40px;
 			padding-right:30px;
@@ -65,15 +71,31 @@
 			font-weight:100;
 			float:right;
 		}
+		.my-rules div.mytitle span{
+			line-height:40px;
+			padding-right:30px;
+			color:#CCCCCC;
+			font-weight:100;
+			float:right;
+		}
 		.m-rules div.title button{
 			margin-top:2px;
 			font-weight:600;
 			font-size:15px;
 		}
+		.my-rules div.mytitle button{
+			margin-top:2px;
+			font-weight:600;
+			font-size:15px;
+		}
 		.m-rules img{
 			width:22px;
 			margin:-5px 5px 0 0 ;
 		}
+		.my-rules img{
+			width:22px;
+			margin:-5px 5px 0 0 ;
+		}
 		.padding0{
 			padding-right:0px;
 		}
@@ -155,6 +177,21 @@
 		div.title b.u-back small a{
 			color:#B3B3B3;
 		}
+		.my-rules div.mytitle i.u-prefix{
+			color:#FF5A5F;
+			margin-right:5px;
+		}
+		div.mytitle b.u-mycunt{
+			padding-left:10px;
+			color:#FF5A5F;
+		}
+		div.mytitle b.u-back small{
+			font-weight:normal;
+			color:#F8F8F8;
+		}
+		div.mytitle b.u-back small a{
+			color:#B3B3B3;
+		}
 		.mycredit .content{
 			padding:15px;
 			padding-right:0px;
@@ -275,8 +312,8 @@
 		<div class="m-rules" target="creditrules">
 				<div class="title"><i class="u-prefix  glyphicon qmx-icon-jifen"></i> 积分规则<span class="glyphicon xiayibu"></span></div>
 		</div>
-		<div class="m-rules" target="">
-			<div class="title"><i class="u-prefix glyphicon yiguanzhu"></i> 我关注的企业<span class="glyphicon xiayibu"></span></div>
+		<div class="my-rules">
+			<div class="mytitle" onclick="window.location='/member/myFollowEnts'"><i class="u-prefix glyphicon yiguanzhu"></i> 我关注的企业<b class="u-mycunt">( 8 )</b><span class="glyphicon xiayibu"></span></div>
 		</div>
 	</div>
 	
@@ -374,6 +411,9 @@
 			
 	<script>
 		$(function(){
+				$.get("/member/enterprise/entcount",function(a){
+					$(".u-mycunt").text("("+a+")");
+				})
 				changeStatus();
 				$(".m-rules").bind("click",show);
 				$(".bookin").bind("click",show);

+ 3 - 4
core/src/web/templates/member/editservice.html

@@ -408,10 +408,9 @@ $("#tips").upload(
 	    name:"upload",
 		action:"/filemanage/upload?resize=250",
 		afterUpload:function(data){ //此处可以重写,上传后的处理	
-			
 			$("#mblocation .pic").css('display','block'); 
-			$("#mblocation .pic .imgLi").remove();
-			$("<li class='imgLi' style='background-color:#eee;width:85px;text-align: center; height:81px;border:1px dashed #000;'><img src='"+data.url+"' style='width:83px; height:79x;'><div id=tips style='text-align:center;width:83px;position: absolute;cursor: pointer; border:1px solid #ddd;background-color:#808080;color:#fff;font-size:14px;'>图片上传</div></li>").appendTo("#mblocation ul.pic");
+			$("#mblocation .pic .imgLi img").attr("src",data.url);
+			//$("<li class='imgLi' style='background-color:#eee;width:85px;text-align: center; height:81px;border:1px dashed #000;'><img src='"+data.url+"' style='width:83px; height:79x;'><div id=tips style='text-align:center;width:83px;position: absolute;cursor: pointer; border:1px solid #ddd;background-color:#808080;color:#fff;font-size:14px;'>图片上传</div></li>").appendTo("#mblocation ul.pic");
 			var urls=$("#mblocation input.imgs").val();
 			urls=urls||""
 			//urls +=data.url+",";
@@ -443,7 +442,7 @@ var TipAssembly = {
 			}else{
 				window.location.href="/market/0/list.html";
 			}
-		},3000);
+		},1000);
 		$("body").append('<div class="tipAssembly" id="tipAssembly">'+text+'</div>');
 		if(typeof(css) != "undefined"){
 			$("#tipAssembly").css(css);

+ 1 - 2
core/src/web/templates/member/incmobile/index.html

@@ -116,8 +116,7 @@ if(typeof(signature) != "undefined" && signature != null && signature.length ==
 <script src="{{Msg "seo" "cdn"}}/js/qfw.js"></script>
 <script>
 $(function(){
-	$.get("http://127.0.0.1/member/enterprise/entcount",function(a){
-		alert(a)
+	$.get("/member/enterprise/entcount",function(a){
 		$("#entcount").text(a);
 	})
 });

+ 78 - 10
core/src/web/templates/member/incmobile/list.html

@@ -1,4 +1,3 @@
-<!DOCTYPE HTML>
 <html>
  <head>
   <title> 企业社区-列表</title>
@@ -8,6 +7,27 @@
 	{{include "/common/inc.html"}}
  	<link href="{{Msg "seo" "cdn"}}/css/mobile/incmobile.css" rel="stylesheet">
 	<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
+	<style>
+	.tipAssembly{
+		position: absolute;
+	    width: 160px;
+	    border: 1px solid #999;
+	    text-align: center;
+	    height: 50px;
+	    line-height: 50px;
+	    border-radius: 10px;
+		background-color: #ccc;
+    	color: #fff;
+		padding: 0px;
+	}
+	#province li,#city li{
+		width: 100%;
+    	padding-right: 50%;
+	}
+	#reg li,#category li{
+		width: 100%;
+	}
+	</style>
  </head>
  <body>
 	<div class="col-xs-12">
@@ -298,23 +318,71 @@
 			$.get("/member/enterprise/isFollowed?entId="+id,function(r){
 				if (r.status=="n"){
 					$.get("/member/enterprise/follow?entId="+id+"&flag=false",function(rs){
-						TipAssembly.show("已关注");
-						me.find("i").attr("class","glyphicon yiguanzhu");
-						me.find("span").text("已关注");
-						
+						if (rs.status == "y"){
+							TipAssembly.show("已关注");
+							me.find("i").attr("class","glyphicon yiguanzhu");
+							me.find("span").text("已关注");
+						}else if(rs.status == "n"){
+							TipAssembly.show("关注失败!");
+						}else if(rs.status == "m"){
+							TipAssembly.show("您最多关注10家企业!");
+						}
 					});
 				}else{
 					$.get("/member/enterprise/follow?entId="+id+"&flag=true",function(rs){
-						
-						TipAssembly.show("已取消<br>关注");
-						me.find("i").attr("class","glyphicon weiguanzhu");
-						me.find("span").text("关注");
+						if (rs.status == "y"){
+							TipAssembly.show("已取消关注");
+							me.find("i").attr("class","glyphicon weiguanzhu");
+							me.find("span").text("关注");
+						}else if(rs.status == "n"){
+							TipAssembly.show("取消关注失败!");
+						}
 					})	;
 				}
 			})
 			  event.stopPropagation();
 		}
-		</script>
+		
+		
+//提示框
+var TipAssembly = {
+	timeout: null,
+	show: function(text,css){
+		if(this.timeout != null){
+			clearTimeout(this.timeout);
+			this.hide();
+			this.timeout = null;
+		}
+		var thisClass = this;
+		this.timeout = setTimeout(function(){
+			thisClass.hide();
+			thisClass.timeout = null;
+		},1000);
+		$("body").append('<div class="tipAssembly" id="tipAssembly">'+text+'</div>');
+		if(typeof(css) != "undefined"){
+			$("#tipAssembly").css(css);
+		}
+		var height=document.body.scrollHeight
+		$("#tipAssembly").css({"left":($(window).width()-140)/2});
+		$("#tipAssembly").css({"top":(height+200)/2});
+	},
+	hide: function(){
+		$("#tipAssembly").remove();
+	},
+	triangleShow: function(obj,direction,width,top,left){
+		$("#maskLayer").unbind("click").click(function(e){
+			$(this).hide();
+			$("#tipTriangle").hide();
+		});
+		$("#tipTriangle>span").addClass("triangle-"+direction);
+		$("#tipTriangle").css({width:width,top: obj.offset().top+top,left: obj.offset().left+left}).show();
+		$("#maskLayer,#tipTriangle").show();
+	},
+	triangleHide: function(){
+		$("#maskLayer,#tipTriangle").hide();
+	}
+}
+</script>
 
  </body>
 </html>

+ 4 - 1
core/src/web/templates/member/incmobile/myfollow.html

@@ -48,14 +48,16 @@
 		</div>
 {{end}}
 </div>
+<!--
 <div class="text-center" id="mf_add">
 	<span class="btn btn-default">+ 添加你关注的企业名称</span>
 </div>
-
+-->
 <div class="text-center" onClick="" id="mf_tishi">
 	<span class="glyphicon tishi"></span> <span>为给你更好的使用体验目前仅支持关注10家企业</span>
 </div>
 </div>
+<!--
 <div class="mf_addcontent  hidden">
 	<div class="mf_title">
 	<span class="mf_one">关注企业</span>
@@ -65,6 +67,7 @@
 	<textarea id="mf_entName" name="mf_entName" placeholder="企业名称"></textarea>
 	</div>
 </div>
+-->
 <body>