git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@1147 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/WEB-INF/views/normal/index.html

@@ -29,8 +29,8 @@
 							<ul class="list-unstyled">
 								<li class="dropdown-submenu">
 									<a href="#" class="dropdown-toggle none"><strong class="text-info">{{userInfo.enterprise.enName}}</strong></a>
-									<ul class="dropdown-menu" ng-if="userInfo.enSelect" style="top: -16px;">
-										<li class="text-muted text-bold" style="padding: 0 15px;"><i class="fa fa-cog fa-fw"></i>切换企业到：</li>
+									<ul class="dropdown-menu arrow left" ng-if="userInfo.enSelect" style="top: -16px;">
+										<li class="text-muted text-bold" style="padding: 5px 15px;"><i class="fa fa-cog fa-fw"></i>切换企业到：</li>
 										<li class="divider"></li>
 										<li ng-repeat="e in userInfo.enSelect" class="item-link"><a ng-click="switchto(e.uu)">{{e.enName}}</a></li>
 									</ul>
@@ -49,41 +49,6 @@
 					</a></li>
 				</ul>
 				<ul class="nav navbar-nav navbar-right">
-					<!-- <li class="dropdown"><a href="#" role="button"
-						class="dropdown-toggle"> 我的UU <i class="fa fa-angle-down"></i>
-					</a>
-						<div class="dropdown-menu"
-							style="width: 420px; padding: 10px 15px">
-							<div class="row pills">
-								<div class="col-xs-4">
-									<h4>采购</h4>
-									<ul class="nav nav-pills">
-										<li><a href="purc#orders" title="已采购商品">已采购商品</a></li>
-										<li><a href="purc#inquiry" title="发布询价单">发布询价单</a></li>
-										<li><a href="purc#inquiries" title="管理询价单">管理询价单</a></li>
-										<li><a href="purc#order" title="新增采购单">新增采购单</a></li>
-									</ul>
-								</div>
-								<div class="col-xs-4">
-									<h4>销售</h4>
-									<ul class="nav nav-pills">
-										<li><a href="sale#orders" title="已卖出商品">已卖出商品</a></li>
-										<li><a href="prod#product" title="发布供应产品">发布供应产品</a></li>
-										<li><a href="prod#products" title="管理供应产品">管理供应产品</a></li>
-										<li><a href="sale#order" title="新增订单">新增订单</a></li>
-									</ul>
-								</div>
-								<div class="col-xs-4">
-									<h4>工具</h4>
-									<ul class="nav nav-pills">
-										<li><a href="#" title="个人空间">个人空间</a></li>
-										<li><a href="admin" title="企业空间">企业空间</a></li>
-										<li><a href="#" title="ERP">ERP</a></li>
-										<li><a href="#" title="行业信息">行业信息</a></li>
-									</ul>
-								</div>
-							</div>
-						</div></li> -->
 					<li class="dropdown"><a href="#/sale/todo/notice" role="button"
 						class="dropdown-toggle"> 待发货 
 							<i class="fa fa-angle-down"></i>

src/main/webapp/resources/css/index.css

@@ -207,9 +207,6 @@ a.none:hover {
 	top: 0;
 	left: 100%;
 	margin-top: 0;
-	-webkit-border-radius: 0 6px 6px 6px;
-	-moz-border-radius: 0 6px 6px 6px;
-	border-radius: 0 6px 6px 6px;
 }
 
 .dropdown-submenu:hover>.dropdown-toggle {
@@ -230,9 +227,6 @@ a.none:hover {
 	bottom: 0;
 	margin-top: 0;
 	margin-bottom: -2px;
-	-webkit-border-radius: 5px 5px 5px 0;
-	-moz-border-radius: 5px 5px 5px 0;
-	border-radius: 5px 5px 5px 0;
 }
 
 .dropdown-submenu.pull-left {
@@ -247,6 +241,29 @@ a.none:hover {
 	border-radius: 6px 0 6px 6px;
 }
 
+.dropdown-menu.arrow:before,.dropdown-menu.arrow:after {
+	content: '';
+	position: absolute;
+	top: 15%;
+	width: 0;
+	height: 0;
+	border: 10px solid transparent;
+}
+
+.dropdown-menu.arrow.left:before {
+	margin-top: -11px;
+	left: -20px;
+	border: 10px solid transparent;
+	border-right-color: #aaa;
+}
+
+.dropdown-menu.arrow.left:after {
+	margin-top: -11px;
+	left: -19px;
+	border: 10px solid transparent;
+	border-right-color:#fff;
+}
+
 .navbar {
 	margin-bottom: 0;
 	border-radius: 0;