站点显示优化

application/index/view/global/frame_tpl.html

@@ -108,17 +108,22 @@
 		            <i><img src="/resource/image/logo@1x.png" class="houtai_footer_icon1"></i>
 		        </a>
 		    </div>
-		    <i><img src="/resource/image/icon_address_white@1x.png" class="address_control"></i>
-		    <select class="form-control btn2-city ld-Marheight-city user_city_choose_site new_class" disabled="disabled"> </select>
-		    <div class="dropdown">
+		    <!--<i><img src="/resource/image/icon_address_white@1x.png" class="address_control"></i>
+		    <select class="form-control btn2-city ld-Marheight-city user_city_choose_site new_class" disabled="disabled"> </select>-->
+		   
+		    <div class="dropdown" style="float: right;">
 		        <button class="btn btn-default dropdown-toggle new_btn" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"></button>
 		        <i><img src="/resource/image/Path20@1x.png" class="down_control"></i>
-		        <ul class="dropdown-menu c-user" aria-labelledby="dropdownMenu1">
+		        <ul class="dropdown-menu c-user" aria-labelledby="dropdownMenu1" style="left: 26px;">
 		            <li><a href="#">修改密码</a></li>
 		            <li role="separator" class="divider"></li>
 		            <li><a href="/index/logout" id="logout">退出登录</a></li>
 		        </ul>
 		    </div>
+		    <div style="display: none;">
+		    	<i><img src="/resource/image/icon_address_white@1x.png" class="address_control"></i>
+		    <select class="form-control btn2-city ld-Marheight-city user_city_choose_site new_class" disabled="disabled"> </select>
+		    </div>
 		</div>
 		<div id="hide_menu" class="" style="width:25px;display:inline;position:absolute;z-index:10000;top:80px;left:0px;">
 			<div class="width-136-hide hideBtn1" style="text-align:center;">

public/resource/js/mainIndex.js

@@ -84,7 +84,7 @@ define (['doT', 'text!temp/menu_template_tpl.html','ckfinder','ckfinderStart', '
 		        if (user_info_obj) {
 		            var temp = document.getElementById ('menu_tpl').innerHTML;
 		            var doTtmpl = doT.template (temp);
-		            $ ("#dropdownMenu1").append(user_info_obj['name']);
+		            $ ("#dropdownMenu1").append(user_info_obj['city']+'-'+user_info_obj['name']);
 		            $ ("#menu_bar").html (doTtmpl (user_info_obj['menu']));
 					
 					//回调