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

core/src/qfw/front/index.go

@@ -232,7 +232,7 @@ func (i *Index) Reurl() error {
 	if i.GetSession("entid") == nil || i.GetSession("entid").(string) == "" {
 		i.Redirect("/member/show/memberindex")
 	} else {
-		str := "/member/yellowpage/show/showService/" + i.GetSession("entid").(string)
+		str := "/member/service/add"
 		i.Redirect(str)
 	}
 	return nil

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

@@ -364,16 +364,22 @@ a.new_red:hover, a.new_red:active {
 .member-left, .member-right {
 	vertical-align: top;
 	display: inline-block;
-	width: 942px;
 }
 
 .member-left {
 	width: 200px;
+	min-height: 900px;
+	font-weight: 100;
+	font-size: 14px;
+	color: #666;
+    width: 250px;
+	border: 1px solid #E5E6E9;
+	background-color: #fff;
 }
 
 .member-right {
-	width: 975px;
-	float: right;
+	width: 941px;
+	margin-left: 5px;
 }
 /*==========账号信息设置表单标题样式===========*/
 .member-panel {

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

@@ -1388,7 +1388,7 @@ function formclane(){
 }
 //在列表中点击添加服务按钮事件
 function addService(){
-	window.location.href="/member/yellowpage/show/showService/" + id;
+	window.location.href="/member/service/add";
 }
 //取消添加服务按钮事件
 function cancelService(){

core/src/web/staticres/js/qfw.js

@@ -336,13 +336,13 @@ function webSiteInit(){
 			}
 		}
 		//设置用户用心左右布局
-		var memberLeft_marginLeft = 0;
+		/*var memberLeft_marginLeft = 0;
 		if($(".member-content").length == 1 && $(".member-content>.member-left").length == 1 && $(".member-content>.member-right").length == 1){
 			$(".member-right").width($(".member-content").width() - 250 - 50);
 			if($(".member-content").children(".clearfix").length == 0){
 				$(".member-content").append('<div class="clearfix"></div>');
 			}
-		}
+		}*/
 	}catch(e){
 		clear_waitTopLoadOver();
 	}

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

@@ -1389,7 +1389,7 @@ function formclane(){
 }
 //在列表中点击添加服务按钮事件
 function addService(){
-	window.location.href="/member/yellowpage/show/showService/" + id;
+	window.location.href="/member/service/add";
 }
 //取消添加服务按钮事件
 function cancelService(){

core/src/web/templates/common/centerhead.html

@@ -35,47 +35,4 @@ body{
 			<li class="pull-right b-loginStatus" id="b-loginStatus"></li>
 		</ul>
 	</div>
-</div>
-<script type="text/javascript">
-//顶部是否加载完毕
-var topLoadOver = false;
-var keyCode=0;
-document.onkeydown=function(event){
-    var e = event || window.event || arguments.callee.caller.arguments[0];
-    if(e && e.keyCode==13){ // enter 键
-        keyCode=13
-    }
-};
-
-$(function (){
-	isMobile = !$("#b-loginStatus").is(":visible");
-	$("#searchFormBtn").click(function(){
-		keyCode = 13;
-		$("form#searchForm").submit();
-	});
-	$("form#searchForm").submit(function(){
-		var input_val = $(this).children("[type='text']").val().replace(/^\s+|\s+$/g,"");
-		if(input_val==""){
-			input_val = $("#header-searchInput").attr('placeholder');
-		}
-		if (keyCode==13){
-	 		if(input_val==""||input_val=="请输入关键字"){
-				keyCode=0;
-				return false;
-			}else {
-				$("input[name='words']").val(input_val);
-				keyCode=0;
-				return true;
-			}	
-		}
-	});
-	//
-	$("[id='releaseService']").click(function(){
-		if(isLogined){
-			window.location.href = "/front/reurl";
-		}else{
-			loginModalShow("/front/reurl");
-		}
-	});
-});
-</script>
+</div>

core/src/web/templates/common/head.html

@@ -329,7 +329,7 @@ function afterAutheFirstLogin(result){
 		$("body").append('{{include "/common/ploginmodal.html"}}');
 		$("#fristAutheLoginModal .com-nickName").text(result.nickName);
 		$("#fristAutheLoginModal .com-entName").text(result.entName+"店铺");
-		$("#fristAutheLoginModal .com-entCard a").attr("href","/member/yellowpage/edit/enterprise/"+entId);
+		$("#fristAutheLoginModal .com-entCard a").attr("href","/member/enterprise/edit");
 	}else{
 		$("body").append('{{include "/common/ologinmodal.html"}}');
 		$("#fristAutheLoginModal .com-nickName").text(result.nickName);
@@ -347,10 +347,10 @@ function afterAutheFirstLogin(result){
 			//$("#fristAutheLoginModal .com-who").text("完成以下操作，就可以领取红包啦：");
 		}else{
 			$("#fristAutheLoginModal .com-entCard").removeClass("hide");
-			$("#fristAutheLoginModal .com-entCard a").attr("href","/member/yellowpage/edit/enterprise/"+entId);
+			$("#fristAutheLoginModal .com-entCard a").attr("href","/member/enterprise/edit");
 		}
 	}
-	$("#fristAutheLoginModal .com-releaseService a").attr("href","/member/yellowpage/show/showService/"+entId);
+	$("#fristAutheLoginModal .com-releaseService a").attr("href","/member/service/add");
 	$("#fristAutheLoginModal").modal('show');
 }
 </script>

core/src/web/templates/common/memberleft.html

@@ -1,12 +1,4 @@
 <style type="text/css">
-.member-left{
-	font-weight: 100;
-	font-size: 14px;
-	color: #666;
-    width: 250px;
-	border: 1px solid #E5E6E9;
-	background-color: #fff;
-}
 .member_nav_a{
 	color: inherit;
 }
@@ -102,7 +94,7 @@
 .index-new-head .head-hidemenu i {
     color: #ff5a5f;
 }
-.member-left .glyphicon{
+.member-left .list-group .glyphicon{
 	font-size: 14px;
 	vertical-align: middle;
 	margin-right: 10px;

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

@@ -152,7 +152,7 @@ a.mycredit{
 								<td width="30%" style="padding:110px"></td>
 								{{else}}
 								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
-								<td width="30%" style="padding:110px">去 <button class="btn btn-primary" onclick="toUrl('{{if session "identWay"}}{{if eq (session "identWay") 1}}/member/enterprise/show{{else}}/member/accountset/index{{end}}{{else}}/member/accountset/index{{end}}')" style="padding-top:3px;padding-bottom:3px;">完善资料</button></td>
+								<td width="30%" style="padding:110px">去 <button class="btn btn-primary" onclick="toUrl('{{if session "identWay"}}{{if eq (session "identWay") 1}}/member/enterprise/edit{{else}}/member/accountset/index{{end}}{{else}}/member/accountset/index{{end}}')" style="padding-top:3px;padding-bottom:3px;">完善资料</button></td>
 								{{end}}
 							</tr>
 							<tr class="rowtwo">

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

@@ -63,14 +63,14 @@ if((role == "" || /^[9]$/.test(role)) && (identWay == "-1" || identWay == "0")){
 var entId = {{session "entid"}};
 $("#editEntInfo,#editEntInfo a").click(function(){
 	if(identWay == 1 && entId != ""){
-		window.location.href = "/member/enterprise/show";
+		window.location.href = "/member/enterprise/edit";
 	}else{
 		window.location.href = "/member/authentication/index";
 	}
 });
 $("#releaseService,#releaseService a").click(function(){
 	if(identWay == 1 && entId != ""){
-		window.location.href = "";
+		window.location.href = "/member/service/add";
 	}else{
 		window.location.href = "/member/authentication/index";
 	}

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

@@ -145,7 +145,7 @@ $(function(){
 		}else{
 			var href = null;
 			if(this.id == "editService"){
-				href = '/member/yellowpage/show/showService/{{session "entid"}}';
+				href = '/member/service/add';
 			}else{
 				href = '/member/enterprise/edit';
 			}
@@ -178,7 +178,7 @@ function afterLogin(data){
 		if(loginType == 0){
 			window.location.reload();
 		}else if(loginType == 1){
-			window.location.href = '/member/yellowpage/show/showService/'+data.entId;
+			window.location.href = '/member/service/add';
 		}else{
 			window.location.href = '/member/enterprise/edit';
 		}