企业列表

core/src/web/staticres/js/enterprise.js

@@ -148,15 +148,22 @@ $(function(){
 		}else{
 			reloadData($(this))	
 		}	
-	})
-	
+	});
+	//safari浏览器下会先触发change后触发click
+	var clickFlag = false;
+	var changeFlag = false;
 	$("select[id^=c_]").click(function(){
-		cityMouse=this.id
+		clickFlag = true;
+		cityMouse=this.id;
+		if(changeFlag){
+			reloadData($(this),"city");
+		}
 	}).change(function(){
-		if(this.id==cityMouse){
-			reloadData($(this),"city")			
+		changeFlag = true;
+		if(clickFlag && this.id==cityMouse){
+			reloadData($(this),"city");
 		}
-	})	
+	});
 
 	//处理选择样式
 	$("div[id^=c_] li").click(function(){

core/src/web/staticres/js/marketlist.js

@@ -13,14 +13,22 @@ $(function() {
     setLocation(entsel);
   }
 
-  //点击,下拉时间
-  $("select[id^=c_]").click(function() {
-    cityMouse = this.id;
-  }).change(function() {
-    if (this.id == cityMouse) {
-      reloadData($(this), "city");
-    }
-  });
+    //点击,下拉时间
+    //safari浏览器下会先触发change后触发click
+	var clickFlag = false;
+	var changeFlag = false;
+	$("select[id^=c_]").click(function(){
+		clickFlag = true;
+		cityMouse=this.id;
+		if(changeFlag){
+			reloadData($(this),"city");
+		}
+	}).change(function(){
+		changeFlag = true;
+		if(clickFlag && this.id==cityMouse){
+			reloadData($(this),"city");
+		}
+	});
 	$(".d_tj div").click(function(n){
 			var node=$(n.target);
 			if(!node.hasClass("d_zhpx")){

core/src/web/staticres/wxent/qfw-enterprise.js

@@ -148,13 +148,21 @@ $(function(){
 		}	
 	})
 	
+	//safari浏览器下会先触发change后触发click
+	var clickFlag = false;
+	var changeFlag = false;
 	$("select[id^=c_]").click(function(){
-		cityMouse=this.id
+		clickFlag = true;
+		cityMouse=this.id;
+		if(changeFlag){
+			reloadData($(this),"city");
+		}
 	}).change(function(){
-		if(this.id==cityMouse){
-			reloadData($(this),"city")			
+		changeFlag = true;
+		if(clickFlag && this.id==cityMouse){
+			reloadData($(this),"city");
 		}
-	})	
+	});	
 
 	//处理选择样式
 	$("div[id^=c_] li").click(function(){

core/src/web/staticres/wxent/qfw-frontenterprise.js

@@ -140,13 +140,21 @@ $(function(){
 		}	
 	})
 	
+	//safari浏览器下会先触发change后触发click
+	var clickFlag = false;
+	var changeFlag = false;
 	$("select[id^=c_]").click(function(){
-		cityMouse=this.id
+		clickFlag = true;
+		cityMouse=this.id;
+		if(changeFlag){
+			reloadData($(this),"city");
+		}
 	}).change(function(){
-		if(this.id==cityMouse){
-			reloadData($(this),"city")			
+		changeFlag = true;
+		if(clickFlag && this.id==cityMouse){
+			reloadData($(this),"city");
 		}
-	})	
+	});	
 
 	//处理选择样式
 	$("div[id^=c_] li").click(function(){

core/src/web/templates/member/accountset/index.html

@@ -88,16 +88,6 @@ $(function(){
 			$(".member-right").append(html);
 		}
 	}
-	var upLoadType = "LOGO";
-	var updateHeadImg = "#uploadImg";
-	//控制管理员上传头像作为企业logo
-	if(role == "" || /^[9]$/.test(role)){
-		updateHeadImg += ",.previewPic90,.previewPic60";
-	}else{
-		upLoadType = "头像";
-		$("#upLoadHeadImgText").text(upLoadType+"：");
-		$("#entLogoArea").remove();
-	}
 	//
 	var s_avatar = "{{.T.s_avatar}}";
 	var headImg = '{{session "headImg"}}';
@@ -123,11 +113,11 @@ $(function(){
 	$("#uploadImg").html('<img class="img-circle'+addClass+'" src="'+s_avatar+'" onerror="'+addJs+'this.src=\''+errorImageUrl+'\'">');
 	//
 	var option={
-		btnname:"上传"+upLoadType,
+		btnname:"上传头像",
 		action:"/filemanage/upload",
 		btnClass:"",
 		afterError:function(data,e){
-			alert("上传"+upLoadType+"失败，请重新上传。");
+			alert("上传头像失败，请重新上传。");
 		},
 		afterUpload:function(data){ //此处可以重写，上传后的处理
 			if(data.flag == true){
@@ -139,13 +129,13 @@ $(function(){
 				  	success: function(result){
 						if (result == "y"){
 							$("#member_headImg").html("<img class='img-circle' src='"+data.url+"'>");
-							$(updateHeadImg).html("<img class='img-circle' src='"+data.url+"'>");
+							$("#uploadImg,.previewPic90,.previewPic60").html("<img class='img-circle' src='"+data.url+"'>");
 						}else{
-							alert("上传"+upLoadType+"失败，请重新上传。");
+							alert("上传头像失败，请重新上传。");
 						}
 					},
 					error: function(){
-						alert("上传"+upLoadType+"失败，请重新上传。");
+						alert("上传头像失败，请重新上传。");
 					}
 				});
 			}else{
@@ -309,7 +299,7 @@ function editInfoComplate(obj,type){
 					</td>
 				</tr>
 				<tr>
-					<td align="right"><b id="upLoadHeadImgText">LOGO：</b></td>
+					<td align="right"><b id="upLoadHeadImgText">头像：</b></td>
 					<td>
 						<div id="uploadImg" style="display: inline-block;width: 160px;">
 							
@@ -324,7 +314,7 @@ function editInfoComplate(obj,type){
 					<td></td>
 					<td colspan="2">
 						<div style="padding: 10px 30px;width: 535px;height: 180px;background-color: #F0F0F0;">
-							<div>你上传的logo将会生成2种头像尺寸，在企业黄页中做为你的企业头像使用：</div>
+							<div>你上传的头像将会生成2种头像尺寸：</div>
 							<div style="margin-top: 10px;margin-right: 40px;display: inline-block;">
 								<div class="previewPic90">
 									<img alt="" class="img-circle defaultHeadImg" src="/images/image_radius_bg.png">

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

@@ -103,12 +103,15 @@ var entType="企业"
 					<div class="rowcontent"> 
 						<div class="one"><span class="glyphicon tupian icon_gray"></span></div> 
 						<div class="two"><script>document.write(entType)</script>LOGO：</div> 
-						<div class="three" id="logoArea" style="cursor: pointer;width:90px;" onclick="document.getElementById('upload').click();">
+						<div class="three" id="logoArea">
 							{{if .T.entinfo.s_avatar}}
-							<img class='ent-LOGO' src='{{.T.entinfo.s_avatar}}'>
-							{{else}}
-							<img src="/images/services/default.png" style="width: 90px; height: 90px;"><div id="tips" style="text-align: center; width: 90px; position: absolute; color: #fff; top: 64px; background-color: #cccccc;">上传logo</div>
+							<img class='ent-LOGO' src='{{.T.entinfo.s_avatar}}' onerror="$(this).next().removeClass('hide');$(this).remove();">
 							{{end}}
+							<div{{if .T.entinfo.s_avatar}} class="hide"{{end}}>
+								<img src="/images/services/default.png" style="width: 90px; height: 90px;cursor: pointer;" onclick="document.getElementById('upload').click();">
+								<div id="tips" style="cursor: pointer;text-align: center; width: 90px; position: absolute; color: #fff; top: 64px; background-color: #cccccc;"  onclick="document.getElementById('upload').click();">上传logo</div>
+								<span class="margin-l-10" style="position: relative;top: 33px;">上传一张不超过10M的图片，支持jpg、png、bmp格式。建议尺寸260*260像素</span>
+							</div>
 						</div> 
 						<div class="four"></div>
 						<div id="uploadLogo" class="hide"></div>

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

@@ -117,7 +117,7 @@ var entType="企业"
 					<div class="rowcontent"> 
 						<div class="one"><span class="glyphicon tupian icon_gray"></span></div> 
 						<div class="two"><script>document.write(entType)</script>LOGO：</div> 
-						<div class="three"><img src="{{.T.entinfo.s_avatar}}" class="ent-LOGO" onerror="this.src='/images/ent-logo.png'"></div>
+						<div class="three"><img src="{{.T.entinfo.s_avatar}}" class="ent-LOGO" onerror="$(this).remove();"></div>
 					</div> 
 				</div>
 				{{end}}