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

core/src/web/staticres/css/mobile/incmobile.css

@@ -331,12 +331,23 @@ span#camera {
 	background-image: url("/images/status-r.png");
 }
 /*各详细页面*/
+#c_baseinfo{
+	width:100%；
+	overflow:hidden;
+}
+.comnav center{
+	font-size:16px;
+}
+.comnav .header{
+	color:#8bd0c3;
+}
 .comnav, .secnav{
 	height:50px;
 	padding:15px 0px 15px 20px;
 	color:#FFF;
 	text-align:left;
 	background:#16A086;
+	width:100%;
 }
 .combody.baseinfo li span{
 	padding-top:5px;
@@ -387,7 +398,6 @@ span#camera {
 	display:inline-block;
 	padding-bottom:15px;
 	border-bottom:1px solid #CCC;
-	min-width:190px;
 }
 .baseinfo li:last-child .entvar{
 	border-bottom:0px;;

core/src/web/staticres/js/entcommunity.js

@@ -34,6 +34,7 @@ mCommunity.prototype={
 			n=$(".nav-bar");
 			if(n.is(":visible")){
 				$(".nav-bar").slideUp(200);
+				$(".bottom").show();
 			}else{
 				$(".nav-bar").slideDown(200);
 			}

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

@@ -12,7 +12,7 @@
 		<div class="text-center hidden-xs"><img src="{{Msg "seo" "cdn"}}/images/bottom_logo.png"/></div>
 		<div class="qfw-bottom-text text-center">
 			<a href="/front/web_A_help.html">关于我们</a><span>|</span><a href="/front/web_L_help.html">联系我们</a><span>|</span>&nbsp;&nbsp;<span style="color:white">法律声明&nbsp;&nbsp;&nbsp;&nbsp;</span><span>|</span><a href="/front/web_H_help.html">帮助中心</a><span>|</span><a href="/front/web_O_help.html">意见反馈</a>
-			<div style="line-height:25px">©2015 拓普丰联&nbsp;版权所有<span>&nbsp;|&nbsp;</span>豫ICP备15016539号-1</div>
+			<div style="line-height:25px">©2015 拓普丰联&nbsp;版权所有<span>&nbsp;|&nbsp;</span><a href="http://www.miibeian.gov.cn/state/outPortal/loginPortal.action">京ICP备14030217号-2</a></div>
 		</div>
 	</div>
 </div>

core/src/web/templates/member/incmobile/baseinfo.html

@@ -91,13 +91,12 @@
 			<span class="col-xs-7 entvar">空</span>
 		</li>-->
 		<li>
-			<div class="col-xs-6" style="max-width:145px;">
+			<div class="col-xs-12">
 				<img src="{{Msg "seo" "cdn"}}/images/entcommunity/ren.png"  width=23 />
 				<span class="ent {{if not .T.res.LeRep}} entnull {{end}}">法定代表人</span>
+				<span class="entvar">{{if not .T.res.LeRep}}空{{else}}{{.T.res.LeRep}}{{end}}</span>
 			</div>
-			<div class="col-xs-6">
-				<span class="col-xs-6 entvar">{{if not .T.res.LeRep}}空{{else}}{{.T.res.LeRep}}{{end}}</span>
-			</div>
+
 		</li>
 	</ul>
 </div>

core/src/web/templates/member/incmobile/detailindex.html

@@ -11,6 +11,8 @@
 	<style>
 		body{
 			background:#FFF;
+			overflow:hidden;
+			width:100%;
 		}
 		.ent-mainpersons img{
 			width: 60px;

core/src/web/templates/member/incmobile/list.html

@@ -128,9 +128,10 @@
 				}
 				for (;i<len;i++){
 					data[i]["OpStateName"]=data[i]["OpStateName"]==""?"存续":data[i]["OpStateName"];
-					if (data[i]["OpStateName"].indexOf("在营")>-1){
+					if (data[i]["OpStateName"].indexOf("在营")>-1 || data[i]["OpStateName"].indexOf("在业")>-1){
 						data[i]["OpStateName"]="存续";
 					}
+			
 					var	loc=data[i]["OpLocDistrict"];
 					if(loc.length>6){
 						data[i]["OpLocDistrict"]=loc.substr(0,loc.lastIndexOf(" "));