Merge branch 'wang20180309' into dev

# Conflicts:
#	src/main/webapp/WEB-INF/views/normal/index.html
#	src/main/webapp/resources/css/index.css

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

@@ -59,7 +59,7 @@
 				<div class="name-tk">
 					<div>
 						<ul class="user-message">
-							<li><a ui-sref="approvalflow.enterprise">&nbsp;(<span ng-bind="userInfo.enterprise.uu" class="red"></span>)<span class="red" ng-bind="userInfo.enterprise.enName"></span>{{}}&nbsp;</span></a></li>
+							<li><a ui-sref="approvalflow.enterprise"><span class="red" ng-bind="userInfo.enterprise.enName"></span>&nbsp;&nbsp;(<span ng-bind="userInfo.enterprise.uu" class="red"></span>)</a></li>
 							<li ng-repeat="e in userInfo.enSelect">
 								<a ng-click="switchto(e.uu)">{{e.enName}}</a>
 							</li>
@@ -73,10 +73,10 @@
 				<div class="user-tk">
 					<div>
 						<ul class="user-message">
-							<li><a ui-sref="approvalflow.userProduct">我的产品库</a></li>
-							<li><a ng-click="showMessage()" ng-class="{'notice-dot': message.toRead > 0}">消息中心<em></em></a></li>
-							<li><a ui-sref="approvalflow.flow">基础设置</a></li>
-							<li><a class="moblie-btn">手机二级维码</a></li>
+							<li><img src="static/img/all/repository.png"><a ui-sref="approvalflow.userProduct">我的产品库</a></li>
+							<li><img src="static/img/all/message.png"><a ng-click="showMessage()" ng-class="{'notice-dot': message.toRead > 0}">消息中心<em></em></a></li>
+							<li><img src="static/img/all/config.png"><a ui-sref="approvalflow.flow">基础设置</a></li>
+							<li><img src="static/img/all/code.png"><a class="moblie-btn">手机二级维码</a></li>
 							<li ng-click="logout()">退出账户</li>
 						</ul>
 						<div class="cart"><img src="static/img/all/carts.png" alt=""/></div>

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

@@ -2754,7 +2754,7 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	right: 155px;
 	top: 44px;
 	/* animation: slideDown .2s ease-in 1 normal both; */
-	width: 250px;
+	min-width: 250px;
 
 }
 .name-tk div{
@@ -2764,7 +2764,6 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 .name-tk .user-message{
 	padding-left: 0;
 	margin-bottom: 0;
-	width: 250px;
 	list-style: none;
 	border: 1px solid #ccc;
 	overflow: hidden;
@@ -2773,13 +2772,10 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	overflow-y: auto;
 }
 .name-tk .user-message li{
-	width: 250px;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
 	height: 50px;
 	line-height: 50px;
 	border-bottom: 1px solid #ccc;
+	padding-right:10px;
 }
 .name-tk .user-message li:last-child {
 	border-bottom: none;
@@ -2793,14 +2789,9 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 .name-tk .user-message li a{
 	padding-left: 10px;
 	display: inline-block;
-	width: 250px;
 	height: 38px;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
 }
 .name-tk .user-message li.active a{
-	width: 250px;
 	margin-top: 12px;
 	line-height: 38px;
 	background: #e8e8e8;
@@ -2813,20 +2804,11 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	float: left;
 	font-size: 13px;
 	color: #d32526;
-	width: 155px;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-}
-.name-tk .user-message li a span:last-child {
-	float: left;
-	font-size: 13px;
-	color: #999;
 }
 .name-tk div .cart {
 	position: absolute;
 	top: -28px;
-	left: 85px;
+	right: 85px;
 }
 .name-tk div .cart img{
 	width: 25px;
@@ -2864,6 +2846,10 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	line-height: 35px;
 	padding-left:15px;
 }
+.user-tk .user-message img{
+	padding-right:5px;
+	margin-top: -32px;
+}
 
 .user-tk .user-message li a{
 	display: inline-block;