1、头部去掉联系关于我们及底部加返回优软云修改。

2、审批图标修正。


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

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

@@ -32,6 +32,7 @@
 	</header> -->
 	<!-- top End -->
 	<!-- header Start -->
+	<div class="height6">&nbsp;</div>
 	<div class="navbar navbar-inverse" id="header" ng-controller="MyCtrl">
 		<div class="container">
 			<div class="navbar-header">
@@ -193,6 +194,9 @@
 						<a><i class="fa fa-phone"></i> 800-830-1818</a>
 					</p>
 				</div>
+				<div class="col-sm-2" style="float: right;">
+					<a href="www.ubtob.com" class="back-home">返回优软云</a>
+				</div>
 			</div>
 		</div>
 	</div>

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

@@ -760,6 +760,7 @@ ul>li.item-link>a {
 	color: #333333;
 	position: absolute;
 	right: 0;
+	font-size: 16px;
 }
 #home-headerBtns i {
 	padding-left: 20px;
@@ -910,7 +911,7 @@ ul>li.item-link>a {
 	width: 1170px;
 	margin: 0 auto;
 	padding: 0 15px;
-	margin-top: 90px;
+	margin-top: 65px;
 }
 
 .body:before,.body:after {
@@ -1146,7 +1147,6 @@ ul>li.item-link>a {
 }
 
 .todo .todo-label {
-	margin-top: 19px;
 	width: 100%;
 	height: 40px;
 	line-height: 45px;
@@ -1431,6 +1431,7 @@ ul>li.item-link>a {
 
 .notice {
 	height: 154px;
+	border: #e8e8e8 1px solid;
 }
 
 .notice .detail>li {
@@ -2457,7 +2458,7 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	border: #ccc 1px solid;
 	padding: 0;
 	margin: 0;
-	top: -200%;
+	top: -100%;
 }
 #change-company:before{
 	width: 18px;
@@ -2468,7 +2469,7 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	content: "";
 	display: inline-block;
 	position: absolute;
-	top: 85px;
+	top: 52px;
 	left: -9px;
 	transform: rotate(-45deg);
 	box-shadow: -1px -1px 2px #ccc;
@@ -2524,4 +2525,27 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 }
 .pane-header img{
 	vertical-align: text-bottom;
+}
+.height6{
+	width: 100%;
+	height: 10px;
+	background: #333333;
+}
+.back-home{
+	width:100px;
+	height: 30px;
+	display: inline-block;
+	background: #05acd1;
+	font-size: 14px;
+	color: #fff;
+	text-align: center;
+	line-height: 30px;
+	border-radius: 5px;
+	float: right;
+	bottom: 50px;
+	position: relative;
+}
+.back-home:hover{
+	background: #3a89d1;
+	text-decoration: none;
 }

src/main/webapp/resources/tpl/index/approvalFlow/home.html

@@ -20,7 +20,7 @@
             <div class="com_content" >
             	<ul>
                 	<li>
-                    	<div class="inco01"><a href="#"> <img src="resources/img/approvalFlow/1.png"></a></div>
+                    	<div class="inco01"><a href="#"> <img src="resources/img/approvalFlow/6.png"></a></div>
                         <div class="content_list">
                         	<span class="line01">请假单<br/><font>适用于请假审批  2017-02-27 18:00 更新</font></span>
                             <span ng-if="!vacation">审批人<a href="#" class="clolor02" ng-click="NoteSet()">（未设置）</a></span>
@@ -30,7 +30,7 @@
                         </div>
                     </li>
                     <li>
-                        <div class="inco01"><a href="#"> <img src="resources/img/approvalFlow/2.png"></a></div>
+                        <div class="inco01"><a href="#"> <img src="resources/img/approvalFlow/5.png"></a></div>
                         <div class="content_list">
                         	<span class="line01">加班<br/><font>适用于加班审批  2017-02-27 18:00更新</font></span>
                             <span ng-if="workovertime">审批人<a href="#" class="clolor01" ng-click="overTimeSet()">（已设置）</a></span>
@@ -40,7 +40,7 @@
                         </div>
                     </li>
                     <li>
-                        <div class="inco01"><a href="#"> <img src="resources/img/approvalFlow/3.png"></a></div>
+                        <div class="inco01"><a href="#"> <img src="resources/img/approvalFlow/4.png"></a></div>
                         <div class="content_list">
                         	<span class="line01">出差申请<br/><font>适用于出差审批  2017-02-27 18:00更新</font></span>
                             <span ng-if="!feeplease">审批人<a href="#" class="clolor02" ng-click="feePleaseSet()">（未设置）</a></span>
@@ -49,7 +49,7 @@
                         </div>
                     </li>
                    <!--  <li>
-                        <div class="inco01"><a href="#"> <img src="resources/img/approvalFlow/4.png"></a></div>
+                        <div class="inco01"><a href="#"> <img src="resources/img/approvalFlow/3.png"></a></div>
                         <div class="content_list">
                         	<span class="line01">报销<br/><font>适用于请假审批  2017-02-27 18:00更新</font></span>
                             <span>审批人<a href="#" class="clolor01">（已设置）</a></span>
@@ -57,7 +57,7 @@
                         </div>
                     </li>
                     <li>
-                        <div class="inco01"><a href="#"> <img src="resources/img/approvalFlow/5.png"></a></div>
+                        <div class="inco01"><a href="#"> <img src="resources/img/approvalFlow/2.png"></a></div>
                         <div class="content_list">
                         	<span class="line01">外勤<br/><font>适用于外勤审批  2017-02-27 18:00更新</font></span>
                             <span>审批人<a href="#" class="clolor01">（已设置）</a></span>
@@ -65,7 +65,7 @@
                         </div>
                     </li> -->
                     <li>
-                        <div class="inco01"><a href="#"> <img src="resources/img/approvalFlow/6.png"></a></div>
+                        <div class="inco01"><a href="#"> <img src="resources/img/approvalFlow/1.png"></a></div>
                         <div class="content_list">
                         	<span class="line01">工作日报<br/><font>适用于工作日报审批  2017-02-27 18:00更新</font></span>
                             <span ng-if="!workdaily">审批人<a href="#" class="clolor02" ng-click="workDailySet()">（未设置）</a></span>

src/main/webapp/resources/tpl/index/home/right.html

@@ -1,9 +1,13 @@
 <style>
 .data-wrap .todo {
 	margin-bottom: 15px;
+	 margin-top: 19px;
+}
+.data-wrap .todo .border01{
+	border: #e8e8e8 1px solid;
+	overflow: hidden;
 }
 </style>
-
 <!-- 交易信息 Start -->
 <div class="data-wrap" id="home-data-wrap">
 	
@@ -12,7 +16,7 @@
 		<div class="todo-label list-unstyled">
 			<em></em><label>工作任务</label>
 		</div>
-		<div class="todo-content" ng-controller="TodoCtrl">
+		<div class="border01 todo-content" ng-controller="TodoCtrl">
 			<div class="todo-content" id="saleTodo">
 				<div class="col-xs-2">
 					<li class="icon"><img  src="resources/img/home/sale.png" >销售</li>