Browse Source

Merge branch 'feature-201802-wangcz' into dev

Administrator 7 years ago
parent
commit
283e31b2a6
100 changed files with 1020 additions and 786 deletions
  1. 3 3
      src/main/webapp/WEB-INF/views/normal/index.html
  2. 0 14
      src/main/webapp/resources/css/add.css
  3. 1 14
      src/main/webapp/resources/css/deputyOrder/order.css
  4. 251 106
      src/main/webapp/resources/css/index.css
  5. 1 30
      src/main/webapp/resources/css/public.css
  6. 0 14
      src/main/webapp/resources/css/style.css
  7. BIN
      src/main/webapp/resources/img/empty/load.png
  8. BIN
      src/main/webapp/resources/img/empty/uas_empty.png
  9. BIN
      src/main/webapp/resources/img/empty/way.png
  10. BIN
      src/main/webapp/resources/img/home/Icon_01.png
  11. BIN
      src/main/webapp/resources/img/home/Icon_02.png
  12. BIN
      src/main/webapp/resources/img/home/Icon_03.png
  13. BIN
      src/main/webapp/resources/img/home/Icon_04.png
  14. BIN
      src/main/webapp/resources/img/home/Icon_05.png
  15. BIN
      src/main/webapp/resources/img/home/Icon_06.png
  16. BIN
      src/main/webapp/resources/img/home/Icon_07.png
  17. BIN
      src/main/webapp/resources/img/home/Icon_08.png
  18. BIN
      src/main/webapp/resources/img/home/Icon_09.png
  19. BIN
      src/main/webapp/resources/img/home/Icon_10.png
  20. BIN
      src/main/webapp/resources/img/home/Icon_11.png
  21. BIN
      src/main/webapp/resources/img/home/Icon_12.png
  22. BIN
      src/main/webapp/resources/img/home/Icon_13.png
  23. BIN
      src/main/webapp/resources/img/home/Icon_14.png
  24. BIN
      src/main/webapp/resources/img/home/Icon_15.png
  25. BIN
      src/main/webapp/resources/img/home/Icon_16.png
  26. BIN
      src/main/webapp/resources/img/home/Icon_17.png
  27. BIN
      src/main/webapp/resources/img/home/Icon_18.png
  28. BIN
      src/main/webapp/resources/img/home/Icon_19.png
  29. BIN
      src/main/webapp/resources/img/home/Icon_20.png
  30. BIN
      src/main/webapp/resources/img/home/Icon_21.png
  31. BIN
      src/main/webapp/resources/img/home/Icon_22.png
  32. BIN
      src/main/webapp/resources/img/home/Icon_23.png
  33. BIN
      src/main/webapp/resources/img/home/Icon_24.png
  34. BIN
      src/main/webapp/resources/img/home/Icon_25.png
  35. BIN
      src/main/webapp/resources/img/home/Icon_26.png
  36. BIN
      src/main/webapp/resources/img/home/Icon_27.png
  37. BIN
      src/main/webapp/resources/img/home/Icon_28.png
  38. BIN
      src/main/webapp/resources/img/home/Icon_29.png
  39. BIN
      src/main/webapp/resources/img/home/Icon_30.png
  40. BIN
      src/main/webapp/resources/img/home/Icon_31.png
  41. BIN
      src/main/webapp/resources/img/home/Icon_32.png
  42. BIN
      src/main/webapp/resources/img/home/Icon_33.png
  43. BIN
      src/main/webapp/resources/img/home/Icon_34.png
  44. BIN
      src/main/webapp/resources/img/home/Icon_35.png
  45. BIN
      src/main/webapp/resources/img/home/Icon_36.png
  46. BIN
      src/main/webapp/resources/img/home/Icon_37.png
  47. BIN
      src/main/webapp/resources/img/home/Icon_38.png
  48. BIN
      src/main/webapp/resources/img/home/Icon_39.png
  49. BIN
      src/main/webapp/resources/img/home/Icon_40.png
  50. BIN
      src/main/webapp/resources/img/home/Icon_41.png
  51. BIN
      src/main/webapp/resources/img/home/Icon_42.png
  52. BIN
      src/main/webapp/resources/img/home/UU.png
  53. BIN
      src/main/webapp/resources/img/home/caigou.png
  54. BIN
      src/main/webapp/resources/img/home/caiwu.png
  55. BIN
      src/main/webapp/resources/img/home/entLib.png
  56. BIN
      src/main/webapp/resources/img/home/gonggao.png
  57. BIN
      src/main/webapp/resources/img/home/new.png
  58. BIN
      src/main/webapp/resources/img/home/target.png
  59. BIN
      src/main/webapp/resources/img/home/user.png
  60. BIN
      src/main/webapp/resources/img/home/xiaoshou.png
  61. BIN
      src/main/webapp/resources/img/home/xunjia.png
  62. BIN
      src/main/webapp/resources/img/icon/icon_nav.png
  63. BIN
      src/main/webapp/resources/img/logo/logo01.png
  64. 0 15
      src/main/webapp/resources/tpl/index/approvalFlow/enterprise.html
  65. 0 14
      src/main/webapp/resources/tpl/index/approvalFlow/log.html
  66. 33 30
      src/main/webapp/resources/tpl/index/approvalFlow/productmatches.html
  67. 0 14
      src/main/webapp/resources/tpl/index/approvalFlow/user.html
  68. 0 14
      src/main/webapp/resources/tpl/index/baseInfo/inquiryItem_detail.html
  69. 4 18
      src/main/webapp/resources/tpl/index/baseInfo/inquiry_list.html
  70. 13 5
      src/main/webapp/resources/tpl/index/baseInfo/invitation.html
  71. 16 0
      src/main/webapp/resources/tpl/index/baseInfo/prodList.html
  72. 15 0
      src/main/webapp/resources/tpl/index/fa/apBill.html
  73. 17 8
      src/main/webapp/resources/tpl/index/fa/apCheck.html
  74. 15 0
      src/main/webapp/resources/tpl/index/fa/arCheck.html
  75. 11 7
      src/main/webapp/resources/tpl/index/home/left.html
  76. 12 11
      src/main/webapp/resources/tpl/index/home/pagingRelease.html
  77. 258 150
      src/main/webapp/resources/tpl/index/home/right.html
  78. 17 3
      src/main/webapp/resources/tpl/index/make/accept.html
  79. 16 0
      src/main/webapp/resources/tpl/index/make/change.html
  80. 17 2
      src/main/webapp/resources/tpl/index/make/order.html
  81. 15 0
      src/main/webapp/resources/tpl/index/make/outorder.html
  82. 17 2
      src/main/webapp/resources/tpl/index/make/returns.html
  83. 14 10
      src/main/webapp/resources/tpl/index/purc/addOrder.html
  84. 33 30
      src/main/webapp/resources/tpl/index/purc/cart.html
  85. 14 10
      src/main/webapp/resources/tpl/index/purc/cart_detail.html
  86. 13 0
      src/main/webapp/resources/tpl/index/purc/deputyOrder.html
  87. 27 24
      src/main/webapp/resources/tpl/index/purc/inquiry.html
  88. 0 14
      src/main/webapp/resources/tpl/index/purc/inquiryInfo_detail.html
  89. 12 21
      src/main/webapp/resources/tpl/index/purc/inquiry_new.html
  90. 34 31
      src/main/webapp/resources/tpl/index/purc/inquiry_unapply.html
  91. 33 30
      src/main/webapp/resources/tpl/index/purc/order.html
  92. 15 0
      src/main/webapp/resources/tpl/index/purc/prodList.html
  93. 27 24
      src/main/webapp/resources/tpl/index/purc/pubInquiry.html
  94. 0 14
      src/main/webapp/resources/tpl/index/purc/pubInquiry_detail.html
  95. 15 24
      src/main/webapp/resources/tpl/index/purc/pubInquiry_new.html
  96. 14 24
      src/main/webapp/resources/tpl/index/purc/purcinquiry_new.html
  97. 11 21
      src/main/webapp/resources/tpl/index/purc/saved_tender.html
  98. 11 21
      src/main/webapp/resources/tpl/index/purc/tender.html
  99. 0 4
      src/main/webapp/resources/tpl/index/purc/tender_answer_detail.html
  100. 15 10
      src/main/webapp/resources/tpl/index/purc/tender_answer_list.html

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

@@ -27,7 +27,7 @@
 			<div class="navbar-header">
 				<span class="navbar-brand">
 					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"></a>
-					<a href="#/index" title="B2B商务首页"></a>
+					<a href="http://www.usoftmall.com" title="优软商城" target="_blank">优软商城</a>
 				</span>
 			</div>
 			<nav class="navbar-collapse">
@@ -44,7 +44,7 @@
 					</div>
 				</ul>
 				<div id="home-headerName">
-					<a ui-sref="approvalflow.enterprise"><span ng-bind="userInfo.enterprise.enName"></span> <i ng-if="userInfo.enSelect.length !== 0" class="fa fa-chevron-down"></i></a>
+					<a ui-sref="approvalflow.enterprise"><span ng-bind="userInfo.enterprise.enName"></span> <i ng-if="userInfo.enSelect.length !== 0" class="fa fa-angle-down"></i></a>
 				</div>
 				<div class="name-tk">
 					<div>
@@ -58,7 +58,7 @@
 					</div>
 				</div>
 				<div id="home-headerBtns" ng-controller="HeaderCtrl">
-					<a href="javascript:void(0);" class="user-btn" ui-sref="approvalflow.user"><i class="fa fa-user fa-lg"></i><span ng-bind="userInfo.userName"></span><i class="fa fa-chevron-down"></i></a>
+					<a href="javascript:void(0);" class="user-btn" ui-sref="approvalflow.user"><img src="static/img/home/user.png" alt="" style="margin-right: 5px;"/><span ng-bind="userInfo.userName"></span><i class="fa fa-angle-down"></i></a>
 				</div>
 				<div class="user-tk">
 					<div>

+ 0 - 14
src/main/webapp/resources/css/add.css

@@ -563,20 +563,6 @@ input:focus, select:focus {
     text-align: left;
 }
 /*产品资料-价格-新增*/
-.com_head {
-    width: 100%;
-    height: 40px;
-    line-height: 43px;
-    background: url(../img/purc/comm_bg01.png) no-repeat center;
-    background-size: 100%;
-}
-
-.com_head span {
-    margin-left: 20px;
-    color: #000;
-    font-size: 14px;
-}
-
 .com_head a {
     color: #327ebe;
     float: right;

+ 1 - 14
src/main/webapp/resources/css/deputyOrder/order.css

@@ -29,20 +29,7 @@ body {
 .com_title font {
     color:#327ebe;
 }
-.com_head {
-    width:100%;
-    height:40px;
-    line-height:44px;
-    background:url("../../img/deputyOrder/comm_bg01.png") no-repeat center;
-    background-color:#f5f5f5;
-    background-size: 100%;
-    margin-bottom: -11px;
-}
-.com_head span {
-    margin-left:20px;
-    color:#000;
-    font-size:14px;
-}
+
 .com_head a {
     color:#327ebe;
     float:right;

+ 251 - 106
src/main/webapp/resources/css/index.css

@@ -8,7 +8,7 @@ default-color: #56a022; 绿色
 body {
 	line-height: 1.6;
 	font-family: "Microsoft YaHei", "微软雅黑" !important;
-	color: #222;
+	color: #333;
 	font-size: 14px;
 	background-color: #f5f5f5;
 }
@@ -35,7 +35,7 @@ table {
 	outline: none
 }
 a {
-	color: #333;
+	color: #666;
 	text-decoration: none;
 }
 
@@ -690,11 +690,10 @@ ul>li.item-link>a {
 }
 
 #header.navbar-inverse {
+	position: relative;
 	background-color: #e8e8e8;
 	border: none;
-	border-top: 10px solid #d32526;
 	box-shadow: 0 0 10px #6f6f6f;
-	position: relative;
 }
 
 #header.navbar-inverse .navbar-brand {
@@ -715,39 +714,39 @@ ul>li.item-link>a {
 }
 
 #header.navbar-inverse .navbar-nav>li>a {
-	font-size: 20px;
-	font-famliy: Microsoft Yahei;
-	color: #000000;
+	font-size: 18px;
+	color: #fff;
 	width: 100px;
-	height: 50px;
+	height: 57px;
+	line-height: 27px;
 	text-align: center;
 }
 
 /** 顶部 start **/
 #home-search {
 	margin-left: 450px;
-	margin-top: 7px;
+	margin-top: 11px;
 	position: absolute;
 }
 
 #home-search a {
 	border-radius: 0;
 	width: 85px;
-	height: 36px;
+	height: 26px;
 	color: #ffffff !important;
-	background-color: #d32526;
-	border: 1px solid #d32526;
+	background-color: #ffa200;
 	font-size: 16px;
 }
 
 #home-search input {
-	border-radius: 0;
-	border: 1px solid #d32526;
-	width: 365px;
-	height: 36px;
+	width: 310px;
+	height: 30px;
+	background-color: #ffffff;
+	border-radius: 3px;
+	border: 1px solid #fff;
 	color: #000000;
-	text-align: center;
-	font-size: 16px;
+	text-align: left;
+	font-size: 13px;
 }
 @media screen and (max-width: 1199px) {
     #home-search input{
@@ -788,13 +787,15 @@ ul>li.item-link>a {
 	padding-right: 20px;
 	height: 50px;
 	line-height: 50px;
-	color: #333333;
-	font-size: 14px;
+	color: #fff;
+	font-size: 18px;
 }
 #home-headerName span{
 	text-align: right;
 	display:inline-block;
 	width:100%;
+	font-size: 16px;
+	color: #fff;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
@@ -803,6 +804,8 @@ ul>li.item-link>a {
 	position:absolute;
 	top:15px;
 	right:0;
+	font-size: 21px;
+	color: #fff;
 }
 
 
@@ -813,28 +816,30 @@ ul>li.item-link>a {
     padding-right: 35px;
 	height: 50px;
 	line-height: 50px;
-	color: #333333;
-	font-size: 16px;
+	color: #fff;
+	font-size: 18px;
 }
 #home-headerBtns i {
-	padding:0 10px;
+	margin-left: 5px;
+	color: #fff;
+	font-size: 21px;
 }
 #home-headerBtns a{
 	display: inline-block;
 }
 #home-headerBtns a:first-child span{
-	font-size: 13px;
-	color: #52a9fa;
+	font-size: 16px;
+	color: #fff;
 	font-weight: bold;
 }
 #home-headerBtns a i.fa-user{
-	 color: #52a9fa;
+	 color: #fff;
  }
 #home-headerBtns a:first-child:hover span{
-	color: #d32526
+	color: #fff
 }
 #home-headerBtns a:hover i.fa-user{
-	color: #d32526;
+	color: #fff;
 }
 
 #home-headerBtns a span{
@@ -848,6 +853,13 @@ ul>li.item-link>a {
 /** 顶部 end **/
 
 /**dropdown-menu 样式 start **/
+#header.navbar-inverse {
+	position: relative;
+	height: 57px;
+	background-image: linear-gradient(180deg, #4392f7 0%, #366cf3 100%), linear-gradient( #0093e6, #0093e6);
+	border: none;
+	box-shadow: 0 0 10px #6f6f6f;
+}
 
 #dropdown-menu-sale {
 	color: #333333;
@@ -902,18 +914,21 @@ ul>li.item-link>a {
 }
 /**dropdown-menu 样式 end **/
 
-#header.navbar-inverse .navbar-nav>li>a:hover,#header.navbar-inverse .navbar-nav>li>a:focus
+#header.navbar-inverse .navbar-nav>li:hover>a,#header.navbar-inverse .navbar-nav>li:focus>a
 {
-	color: #d32526;
-	background-color: #e8e8e8;
+	color: #fff;
+	border-bottom: 2px solid #fff;
 }
 
 #header.navbar-inverse .navbar-nav>.active>a,#header.navbar-inverse .navbar-nav>.active>a:hover,#header.navbar-inverse .navbar-nav>.active>a:focus
+ {
+	 background: transparent ;
+	 border-bottom: 2px solid #fff;
+ }
+#header.navbar-inverse .navbar-nav>dropdown.active>a,#header.navbar-inverse .navbar-nav>dropdown.active>a:hover,#header.navbar-inverse .navbar-nav>dropdown.active>a:focus
 {
-	color: #d32526;
-	background-color: #e8e8e8;
-	font-color: #d32526;
-	border-bottom: 4px solid #d32526;
+	background: transparent ;
+	border-bottom: 2px solid transparent;
 }
 
 #header.navbar-inverse .navbar-nav>.disabled>a,#header.navbar-inverse .navbar-nav>.disabled>a:hover,#header.navbar-inverse .navbar-nav>.disabled>a:focus
@@ -978,17 +993,29 @@ ul>li.item-link>a {
 }
 
 #header .navbar-header .navbar-brand {
-	background: url("../img/logo/logo.png") no-repeat center;
+	position: relative;
+	background: url(../img/logo/logo01.png) no-repeat left center;
 	width: 218px;
 	margin: 0;
 	padding: 0;
-	line-height: 50px;
+	line-height: 57px;
+	height: 57px;
 }
 #header .navbar-header .navbar-brand a{
-	width: 44%;
 	float: left;
 	display: inline-block;
-	height: 50px;
+	height: 57px;
+	font-size: 16px;
+	color: #fff;
+}
+#header .navbar-header .navbar-brand a:before{
+	position: absolute;
+	top: 16px;
+	left: 105px;
+	content: '';
+	width: 2px;
+	height: 28px;
+	background-color: #fff;
 }
 #header .navbar-header .navbar-brand a:first-child{
 	width: 56%;
@@ -1011,17 +1038,16 @@ ul>li.item-link>a {
 }
 
 .body>.left {
-	width: 219px;
+	width: 185px;
 	float: left;
-	margin-right: 14px;
-	/* border-right: 1px solid #ddd; */
+	margin-right: 12px;
 }
 
 .body>.right {
-	width: 930px;
-	float: right;
+	width: 973px;
+	float: left;
 	font-size: 12px;
-	min-height: 718px;
+	min-height: 90vh;
 }
 @media ( max-height : 768px) {
 	.body>.right{
@@ -1149,27 +1175,38 @@ ul>li.item-link>a {
 
 .left-nav>ul>li>a {
 	display: block;
-	padding: 6px 20px;
+	padding-left:25px;
 	clear: both;
-	line-height: 1.42857143;
+	line-height: 50px;
 	/*white-space: nowrap;*/
-	font-size: 14px;
+	font-size: 16px;
+	border-bottom:1px dashed #e1e1e1;
+	color:#666;
 }
 
-.use>ul>li:hover,.left-nav>ul>li:hover,.left-nav>ul>li.active {
+.use>ul>li:hover {
 	background-color: #6f6f6f;
 }
 
+.left-nav>ul>li:hover,.left-nav>ul>li.active {
+	background-color: #eee;
+}
+
 .left-nav>ul>li.active {
-	background-color: #6f6f6f;
+	background-color: #eee;
 }
 
-.use>ul>li:hover *,.left-nav>ul>li:hover *,.left-nav>ul>li.active * {
+.use>ul>li:hover *{
 	color: #fff;
 	text-decoration: none;
 	background-color: #6f6f6f;
 }
 
+.left-nav>ul>li:hover *,.left-nav>ul>li.active * {
+	text-decoration: none;
+	background-color: #eee;
+}
+
 .icon-right {
 	float: right;
 	color: #888;
@@ -1178,8 +1215,6 @@ ul>li.item-link>a {
 
 .left-nav {
 	/*margin-top: 10px;*/
-	padding-bottom: 10px;
-	border-bottom: 1px solid #e8e8e8;
 	background-color: #ffffff;
 }
 
@@ -1195,26 +1230,52 @@ ul>li.item-link>a {
 }
 
 .nav-label {
-	text-indent: 35px;
-	height: 40px;
-	line-height: 40px;
-	color: #333333;
+	height: 50px;
+	line-height: 50px;
+	color: #333;
+	font-weight:bold;
 	cursor: pointer;
-	position: relative;
-	background-color: #eaeaea;
-	font-size: 14px;
+	font-size: 16px;
+	padding:0 10px;
+	border-bottom:1px dashed #e1e1e1;
+}
+
+/*.nav-label>i {*/
+	/*position: absolute;*/
+	/*left: 15px;*/
+	/*top: 18px;*/
+	/*width: 0;*/
+	/*height: 0;*/
+	/*border-color: transparent;*/
+	/*border-style: solid;*/
+	/*border-width: 5px 5px 0 5px;*/
+	/*border-top-color: #9ea9c0;*/
+/*}*/
+
+.nav_icon{
+	display:inline-block;
+	width:30px;
+	height:20px;
+	vertical-align: middle;
+	position:relative;
+	top:-3px;
+}
+.nav1_icon{
+	background: url(../img/icon/icon_nav.png)no-repeat 0 0;
 }
 
-.nav-label>i {
-	position: absolute;
-	left: 15px;
-	top: 18px;
-	width: 0;
-	height: 0;
-	border-color: transparent;
-	border-style: solid;
-	border-width: 5px 5px 0 5px;
-	border-top-color: #9ea9c0;
+.nav2_icon{
+	background: url(../img/icon/icon_nav.png)no-repeat -28px 0;
+}
+
+.nav3_icon{
+	background: url(../img/icon/icon_nav.png)no-repeat -58px 0;
+}
+.nav4_icon{
+	background: url(../img/icon/icon_nav.png)no-repeat -88px 0;
+}
+.nav5_icon{
+	background: url(../img/icon/icon_nav.png)no-repeat -118px 0;
 }
 
 .left-nav .icon-left {
@@ -1239,7 +1300,7 @@ ul>li.item-link>a {
 
 .right .data-wrap {
 	float: left;
-	width: 660px;
+	width: 755px;
 }
 
 .data-wrap .todo {
@@ -1277,8 +1338,7 @@ ul>li.item-link>a {
 
 .todo .todo-content {
 	clear: both;
-	background-color: #ffffff;
-	width: 660px;
+	width: 755px;
 	margin-left: 0px;
 	border-bottom: 1px solid #e8e8e8;
 	display: inline-block;
@@ -1363,11 +1423,11 @@ ul>li.item-link>a {
 
 /** left .feed-wrap start **/
 .left .feed-wrap {
-	float: right;
-	width: 218px;
+	/*float: right;*/
+	width: 185px;
 }
 .left .feed-wrap .notice:first-child {
-	margin-top: 3px;
+	margin-top: 0;
 }
 .pane {
 	/*margin-top: 20px;*/
@@ -1377,12 +1437,17 @@ ul>li.item-link>a {
 
 .pane .pane-header {
 	height: 40px;
-	background: #e8e8e8;
+	background: #fff;
 	line-height: 40px;
-	font-size: 14px;
+	font-size: 18px;
+    font-weight: bold;
 	padding: 0 15px;
 	border-bottom: 1px solid #e8e8e8;
-	color: #333;
+	color: #666;
+}
+
+.pane .pane-header .pull-right {
+	font-weight: normal;
 }
 
 .pane .pane-header .pull-right>a {
@@ -1482,9 +1547,8 @@ ul>li.item-link>a {
 	/*margin-top: 20px;*/
 }
 
-.side-image  img {
-	margin-bottom: 15px;
-	/*cursor: pointer;*/
+.side-image img {
+	margin-bottom: 0 !important ;
 }
 
 .side-image  img:hover {
@@ -2659,11 +2723,10 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	border-bottom: none;
 }
 .feed-wrap .carousel-inner{
-	width: 246px;
-	height: 600px;
+	width: 206px;
 }
 .feed-wrap .carousel-inner .item img{
-	width: 246px;
+	width: 206px;
 	height: 568px;
 }
 .feed-wrap .carousel-indicators .active{
@@ -2683,7 +2746,7 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	border: none;
 }
 .pane-header img{
-	vertical-align: text-bottom;
+	vertical-align: middle;
 }
 .height6{
 	width: 100%;
@@ -2768,10 +2831,13 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	margin-bottom: 0;
 	list-style: none;
 	border: 1px solid #ccc;
+	border-radius: 6px;
 	overflow: hidden;
 	background: #fff;
 	max-height: 550px;
 	overflow-y: auto;
+	box-shadow: 0px 0px 6px 0px
+	rgba(120, 120, 120, 0.2);
 }
 .name-tk .user-message li{
 	height: 50px;
@@ -2840,6 +2906,7 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	box-shadow: 3px 3px 5px #ccc;
 	overflow: hidden;
 	background: #fff;
+	border-radius: 6px;
 }
 .user-tk .user-message li{
 	width: 100%;
@@ -2933,32 +3000,112 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 
 
 /*公共详情*/
-.pub-com_head {
+.pub-com_head, .com_head {
 	width: 100%;
-	height: 40px;
-	line-height: 44px;
-	background: url("../img/approvalFlow/comm_bg01.png") no-repeat left;
-	background-color: #f5f5f5;
-	background-size: 100% 100%;
+	height: 50px;
+	line-height: 50px;
+	background: #366df3;
+	border-radius: 5px 5px 0 0 ;
+	/*background: url("../img/approvalFlow/comm_bg01.png") no-repeat left;*/
+	/*background-color: #f5f5f5;*/
+	/*background-size: 100% 100%;*/
 }
 
-.pub-com_head span {
-	margin-left: 20px;
-	color: #000;
-	font-size: 14px;
+.pub-com_head span, .com_head span{
+	margin-left: 10px;
+	color: #fff;
+	font-size: 18px;
 }
 .pub-com_head  .p-right{
 	float: right;
 }
 .pub-com_head  .p-right a{
-	color: #3a89d1;
+	color: #fff;
 	font-size: 14px;
 	margin-right: 20px;
 }
+.pub-com_head  .p-right a img{
+	margin-right: 3px;
+}
 .pub-com_head  .p-right a:hover{
-	color: #d32526;
 	text-decoration: underline;
 }
+
+.load_icon {
+	display:inline-block;
+	width:14px;
+	height:14px;
+	margin-left:10px;
+	vertical-align:middle;
+	background: url("../img/empty/load.png")no-repeat;
+}
+.way_icon {
+	display:inline-block;
+	width:20px;
+	height:14px;
+	margin-right:10px;
+	vertical-align:middle;
+	background: url("../img/empty/way.png")no-repeat;
+}
+
+#empty{
+	padding: 70px 0;
+	margin: 0 auto;
+	text-align: center;
+}
+#empty .left_img{
+	display:inline-block;
+	color:#366df3;
+}
+#empty .left_img a{
+	font-size: 25px;
+	color:#366df3;
+}
+#empty .left_img a img{}
+#empty .left_img a:last-child:before{
+	content: '';
+	position:relative;
+	top:6px;
+	display:inline-block;
+	width:2px;
+	height:27px;
+	background: #366df3;
+	margin: 0 10px;
+}
+#empty .right_link{
+	display:inline-block;
+	vertical-align:top;
+	padding-left:10px;
+	text-align: left;
+}
+#empty .right_link p{
+	margin: 0;
+	font-size: 14px;
+	color:#666;
+}
+#empty .right_link p span{}
+#empty .right_link a{
+	margin-left:10px;
+	color:#366df3;
+	font-size: 14px;
+}
+
+#empty_info{
+	padding-left: 60px;
+	padding-bottom:40px;
+}
+#empty_info .empty_title{
+	color:#366df3;
+	font-size: 18px;
+}
+#empty_info .empty_explain{
+	font-size: 16px;
+	color:#999;
+}
+#empty_info .empty_explain .info{
+	text-indent: -22px;
+}
+
 .title-div {
 	font-size: 14px;
 	font-weight: 600;
@@ -3162,8 +3309,8 @@ input::-webkit-clear{display:none;}
 }
 .enterprise-btn div{
 	position: absolute;
-	top: 45px;
-	left: 65px;
+	top: 30px;
+	left: 48px;
 }
 .enterprise-btn div a{
 	text-align: center;
@@ -3204,7 +3351,7 @@ input::-webkit-clear{display:none;}
 	margin-right: 5px;
 }
 #topSearch a:hover,#topSearch a.active{
-	background: #5078cb;
+	background: #366df3;
 	color: #fff;
 	text-decoration: none;
 }
@@ -3422,10 +3569,10 @@ input::-webkit-clear{display:none;}
 	background: #ea5a60;
 	position: absolute;
 	border-radius: 100%;
-	top: 10px;
+	top: 20px;
 }
 .left-nav>ul>li.active .new-dot,.left-nav>ul>li:hover .new-dot{
-	background: #ea5a60 !important;
+	background: #366df3 !important;
 }
 .left-nav>ul>li a{
 	position: relative;
@@ -3510,9 +3657,7 @@ input::-webkit-clear{display:none;}
 .unPrinted{
 	color: #5078cb !important;
 }
-.left-nav>ul>li:hover a{
-	background: #999;
-}
+
 .textmore{display: block;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
 #order-detail-list .table-default .header{
 	box-shadow: none;

+ 1 - 30
src/main/webapp/resources/css/public.css

@@ -19,7 +19,7 @@
 #public #topSearch{font-size: 16px;}
 #public .form-group-sm .form-control{height: 36px;/*line-height: 36px;*/border: #327ebe 1px solid;border-radius: 0px;font-size: 14px;}
 #public .search-bg .col-xs-6{/*margin-left: 90px;*/}
-#public .search-bg .input-group-addon{width: 70px;height: 36px;display: inline-block;background: #327ebe;font-size: 16px;text-align: center;line-height: 36px;color: #fff;padding: 0;border: none;border-radius: 0;position: absolute;top: 0;right: 0;}
+#public .search-bg .input-group-addon{width: 70px;height: 36px;display: inline-block;background: #366df3;font-size: 16px;text-align: center;line-height: 36px;color: #fff;padding: 0;border: none;border-radius: 0;position: absolute;top: 0;right: 0;}
 #public .order-table .header th,#public .inquiry-table .header th{height: 40px;line-height: 40px;background: none;font-size: 14px;}
 #public .order-table .order-hd,#public .inquiry-table .inquiry-hd{font-size: 14px;}
 #public .order-table .order-hd{ line-height: normal;}
@@ -41,35 +41,6 @@
     margin-left: 20px;
 }
 
-.pub-com_head {
-    width: 100%;
-    height: 40px;
-    line-height: 44px;
-    background: url("../img/approvalFlow/comm_bg01.png") no-repeat left;
-    background-color: #f5f5f5;
-    background-size: 100% 100%;
-}
-
-.pub-com_head span {
-    margin-left: 20px;
-    color: #000;
-    font-size: 14px;
-}
-.pub-com_head  .p-right{
-    float: right;
-}
-.pub-com_head  .p-right a{
-    color: #5078cb;
-    font-size: 14px;
-    margin-right: 20px;
-}
-.pub-com_head  .p-right a img{
-    margin-right: 3px;
-}
-.pub-com_head  .p-right a:hover{
-    color: #d32526;
-    text-decoration: underline;
-}
 #public .condition .toggle{
     font-size: 14px;
 }

+ 0 - 14
src/main/webapp/resources/css/style.css

@@ -76,20 +76,6 @@ body {
 	color: #327ebe;
 }
 
-.com_head {
-	width: 100%;
-	height: 40px;
-	line-height: 44px;
-	background: url("../img/approvalFlow/comm_bg01.png") no-repeat center;
-	background-color: #f5f5f5;
-}
-
-.com_head span {
-	margin-left: 20px;
-	color: #000;
-	font-size: 14px;
-}
-
 .com_head a {
 	color: #327ebe;
 	float: right;

BIN
src/main/webapp/resources/img/empty/load.png


BIN
src/main/webapp/resources/img/empty/uas_empty.png


BIN
src/main/webapp/resources/img/empty/way.png


BIN
src/main/webapp/resources/img/home/Icon_01.png


BIN
src/main/webapp/resources/img/home/Icon_02.png


BIN
src/main/webapp/resources/img/home/Icon_03.png


BIN
src/main/webapp/resources/img/home/Icon_04.png


BIN
src/main/webapp/resources/img/home/Icon_05.png


BIN
src/main/webapp/resources/img/home/Icon_06.png


BIN
src/main/webapp/resources/img/home/Icon_07.png


BIN
src/main/webapp/resources/img/home/Icon_08.png


BIN
src/main/webapp/resources/img/home/Icon_09.png


BIN
src/main/webapp/resources/img/home/Icon_10.png


BIN
src/main/webapp/resources/img/home/Icon_11.png


BIN
src/main/webapp/resources/img/home/Icon_12.png


BIN
src/main/webapp/resources/img/home/Icon_13.png


BIN
src/main/webapp/resources/img/home/Icon_14.png


BIN
src/main/webapp/resources/img/home/Icon_15.png


BIN
src/main/webapp/resources/img/home/Icon_16.png


BIN
src/main/webapp/resources/img/home/Icon_17.png


BIN
src/main/webapp/resources/img/home/Icon_18.png


BIN
src/main/webapp/resources/img/home/Icon_19.png


BIN
src/main/webapp/resources/img/home/Icon_20.png


BIN
src/main/webapp/resources/img/home/Icon_21.png


BIN
src/main/webapp/resources/img/home/Icon_22.png


BIN
src/main/webapp/resources/img/home/Icon_23.png


BIN
src/main/webapp/resources/img/home/Icon_24.png


BIN
src/main/webapp/resources/img/home/Icon_25.png


BIN
src/main/webapp/resources/img/home/Icon_26.png


BIN
src/main/webapp/resources/img/home/Icon_27.png


BIN
src/main/webapp/resources/img/home/Icon_28.png


BIN
src/main/webapp/resources/img/home/Icon_29.png


BIN
src/main/webapp/resources/img/home/Icon_30.png


BIN
src/main/webapp/resources/img/home/Icon_31.png


BIN
src/main/webapp/resources/img/home/Icon_32.png


BIN
src/main/webapp/resources/img/home/Icon_33.png


BIN
src/main/webapp/resources/img/home/Icon_34.png


BIN
src/main/webapp/resources/img/home/Icon_35.png


BIN
src/main/webapp/resources/img/home/Icon_36.png


BIN
src/main/webapp/resources/img/home/Icon_37.png


BIN
src/main/webapp/resources/img/home/Icon_38.png


BIN
src/main/webapp/resources/img/home/Icon_39.png


BIN
src/main/webapp/resources/img/home/Icon_40.png


BIN
src/main/webapp/resources/img/home/Icon_41.png


BIN
src/main/webapp/resources/img/home/Icon_42.png


BIN
src/main/webapp/resources/img/home/UU.png


BIN
src/main/webapp/resources/img/home/caigou.png


BIN
src/main/webapp/resources/img/home/caiwu.png


BIN
src/main/webapp/resources/img/home/entLib.png


BIN
src/main/webapp/resources/img/home/gonggao.png


BIN
src/main/webapp/resources/img/home/new.png


BIN
src/main/webapp/resources/img/home/target.png


BIN
src/main/webapp/resources/img/home/user.png


BIN
src/main/webapp/resources/img/home/xiaoshou.png


BIN
src/main/webapp/resources/img/home/xunjia.png


BIN
src/main/webapp/resources/img/icon/icon_nav.png


BIN
src/main/webapp/resources/img/logo/logo01.png


+ 0 - 15
src/main/webapp/resources/tpl/index/approvalFlow/enterprise.html

@@ -17,21 +17,6 @@
 		color: #327ebe;
 	}
 
-	.com_head {
-		width: 100%;
-		height: 40px;
-		line-height: 44px;
-		background: url("static/img/approvalFlow/comm_bg01.png") no-repeat left;
-		background-color: #f5f5f5;
-		background-size: 100% 100%;
-	}
-
-	.com_head span {
-		margin-left: 20px;
-		color: #000;
-		font-size: 14px;
-	}
-
 	.com_title01 {
 		height: 50px;
 		line-height: 50px;

+ 0 - 14
src/main/webapp/resources/tpl/index/approvalFlow/log.html

@@ -1,18 +1,4 @@
 <style>
-	.com_head {
-		width: 100%;
-		height: 40px;
-		line-height: 44px;
-		background: url("static/img/approvalFlow/comm_bg01.png") no-repeat left;
-		background-color: #f5f5f5;
-		background-size: 100% 100%;
-	}
-
-	.com_head span {
-		margin-left: 20px;
-		color: #000;
-		font-size: 14px;
-	}
 	.title-div .pull-right{
 		float: right;
 		margin-right: 15px;

+ 33 - 30
src/main/webapp/resources/tpl/index/approvalFlow/productmatches.html

@@ -262,39 +262,42 @@ tbody td div.text-mould {
 			</tr>
 		</thead>
 		<tbody ng-if="tableParams.total() == 0">
-			<tr>
-				<td colspan="7">
-					<div class="row text-muted info-container" style="padding: 50px 10px;">
-						<div class="col-md-4 text-center">
-							<br>
-							<br>
-							<div><img src="static/img/all/info.png" width="130px" height="90px"></div>
-							<div class="f16">当前没有对应的客户询价单!</div>
+		<tr>
+			<td colspan="6">
+				<div id="empty">
+					<div class="left_img">
+						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="#/index" title="B2B商务首页">B2B 商务</a>
+					</div>
+					<div class="right_link">
+						<p>当前没有对应的客户询价单!</p>
+					</div>
+				</div>
+			</td>
+		</tr>
+		<tr>
+			<td colspan="6">
+				<div id="empty_info">
+					<div class="f16 text-center empty_title">
+						<p>为什么我没有接收到客户的询价单?</p>
+					</div>
+					<div class="f14 empty_explain">
+						<div class="info">
+							<p>1、您的客户还没有提交审核询价单<br>
+								解决:与您的客户沟通确认单据是否已经审核(只有客户ERP中已经审核的单据才能接收到)</p>
 						</div>
-						<div class="col-md-8 br-l">
-							<div class="f16">
-								<p>为什么我没有接收到客户的询价单?</p>
-							</div>
-							<div class="f14">
-								<div class="info">
-									<p>1、您的客户还没有提交审核询价单<br>
-									解决:与您的客户沟通确认单据是否已经审核(只有客户ERP中已经审核的单据才能接收到)</p>
-								</div>
-								<div class="info">
-									<p>2、客户ERP中供应商信息有误<br>
-									解决:与您的客户沟通确认您的信息在客户的供应商资料中是否维护正确,尤其是企业UU号</p>
-								</div>
-								<div class="info">
-									<p>3、您的客户正在使用旧版本的UAS商务平台<br>
-									解决:我们仍有部分用户在使用旧版本UAS商务平台系统,你可以用您的企业UU号和管理员个人UU号 <a href="http://www.usoftchina.com" class="text-bold text-link" title="http://www.usoftchina.com" target="_blank">登陆旧版本UAS商务平台</a></p>
-								</div>
-							</div>
-							<br>
-							<br>
+						<div class="info">
+							<p>2、客户ERP中供应商信息有误<br>
+								解决:与您的客户沟通确认您的信息在客户的供应商资料中是否维护正确,尤其是企业UU号</p>
+						</div>
+						<div class="info">
+							<p>3、您的客户正在使用旧版本的UAS商务平台<br>
+								解决:我们仍有部分用户在使用旧版本UAS商务平台系统,你可以用您的企业UU号和管理员个人UU号 <a href="http://www.usoftchina.com" class="text-bold text-link" title="http://www.usoftchina.com" target="_blank">登陆旧版本UAS商务平台</a></p>
 						</div>
 					</div>
-				</td>
-			</tr>
+				</div>
+			</td>
+		</tr>
 		</tbody>
 		<tbody ng-repeat="product in $data track by product.id">
 			<tr>

+ 0 - 14
src/main/webapp/resources/tpl/index/approvalFlow/user.html

@@ -87,20 +87,6 @@
 	-moz-transition: all 0s ease-in-out;
 	transition: all 0s ease-in-out;
 }
-.com_head {
-	width: 100%;
-	height: 40px;
-	line-height: 44px;
-	background: url("static/img/approvalFlow/comm_bg01.png") no-repeat left;
-	background-color: #f5f5f5;
-	background-size: 100% 100%;
-}
-
-.com_head span {
-	margin-left: 20px;
-	color: #000;
-	font-size: 14px;
-}
 .title-div .pull-right{
 	float: right;
 	margin-right: 15px;

+ 0 - 14
src/main/webapp/resources/tpl/index/baseInfo/inquiryItem_detail.html

@@ -297,20 +297,6 @@ input[type="radio"], input[type="checkbox"] {
 	width: 400px;
 }
 
-.com_head {
-	width: 100%;
-	height: 40px;
-	line-height: 42px;
-	background: url(static/img/comm_bg01.png) no-repeat center;
-	background-size: 100%;
-}
-
-.com_head span {
-	margin-left: 20px;
-	color: #000;
-	font-size: 14px;
-}
-
 .com_head a {
 	color: #327ebe;
 	float: right;

+ 4 - 18
src/main/webapp/resources/tpl/index/baseInfo/inquiry_list.html

@@ -5,7 +5,7 @@
 /*新增样式 2017-04-19*/
     #tender-list{
          width: 1170px;
-         margin-left: -240px;
+         /*margin-left: -240px;*/
          background: #f5f5f5;
      }
 #tender-list .tender-label{
@@ -171,21 +171,6 @@
         position: relative;
         overflow: hidden;
     }
-    .pub-com_head span:before{
-        content: '';
-        position: absolute;
-        top: 17px;
-        left: 13px;
-        width: 4px;
-        height: 13px;
-        background: #000;
-    }
-    .pub-com_head span b{
-        margin-left: 10px;
-        font-weight: normal;
-        font-size: 14px;
-        color: #000;
-    }
     .pub-com_head span em{
         font-style: normal;
         font-size: 14px;
@@ -195,9 +180,10 @@
         float: right;
         padding-right: 30px;
         font-size: 14px;
-        color: #999;
+        color: #fff;
     }
     .tender-list-content .container{
+        width: 1170px !important;
         margin: 0 auto;
         padding: 0;
     }
@@ -324,7 +310,7 @@
             <div class="tender-label list-unstyled">
                 <div class="pub-com_head">
                     <span>
-                        <b>公共询价</b>
+                        公共询价
                         <!--(<em> 10 </em>)-->
                     </span>
                     <a href="#/index">返回</a>

+ 13 - 5
src/main/webapp/resources/tpl/index/baseInfo/invitation.html

@@ -184,11 +184,19 @@
 					</tr>
 			</tbody>
 			<tbody ng-if="tableParams.total() == 0" class="no-record-tab">
-				<tr>
-					<td>
-						<div class="text-muted"><h3><img src="static/img/icon/no-record.png" />暂无邀请记录!</h3></div>
-					</td>
-				</tr>
+			<tr>
+				<td colspan="5">
+					<div id="empty">
+						<div class="left_img">
+							<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+							<a href="#/index" title="B2B商务首页">B2B 商务</a>
+						</div>
+						<div class="right_link">
+							<p>暂无邀请记录</p>
+						</div>
+					</div>
+				</td>
+			</tr>
 			</tbody>
 		</table>
 	</div>

+ 16 - 0
src/main/webapp/resources/tpl/index/baseInfo/prodList.html

@@ -310,6 +310,22 @@ width: 80px;
                 <td class="text-center"><a ui-sref="sale.productDetail({id:product.id})" ng-click="isProductEdit()" target="_self" title="编辑" style="position: relative;top:1px;"><i class="fa fa-lg fa-edit"></i></a>|<a ng-click="deleteById(product.id)"  title="删除"><i class="fa fa-lg fa-trash"></i></a></td>
             </tr>
             </tbody>
+            <tbody ng-if="$data.length === 0">
+            <tr>
+                <td colspan="6">
+                    <div id="empty">
+                        <div class="left_img">
+                            <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                            <a href="#/index" title="B2B商务首页">B2B 商务</a>
+                        </div>
+                        <div class="right_link">
+                            <p>暂无对应的单据</p>
+                            <a href="javascript:location.reload()">点击重新加载<i class="load_icon"></i></a>
+                        </div>
+                    </div>
+                </td>
+            </tr>
+            </tbody>
         </table>
     </div>
 </div>

+ 15 - 0
src/main/webapp/resources/tpl/index/fa/apBill.html

@@ -197,6 +197,21 @@
 			<td colspan="6"></td>
 		</tr>
 	</thead>
+	<tbody ng-if="$data.length === 0">
+	<tr>
+		<td colspan="6">
+			<div id="empty">
+				<div class="left_img">
+					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+					<a href="#/index" title="B2B商务首页">B2B 商务</a>
+				</div>
+				<div class="right_link">
+					<p>暂无对应的发票信息</p>
+				</div>
+			</div>
+		</td>
+	</tr>
+	</tbody>
 	<tbody ng-repeat="bill in $data">
 		<tr class="order-hd">
 			<td class="first">

+ 17 - 8
src/main/webapp/resources/tpl/index/fa/apCheck.html

@@ -306,13 +306,22 @@
 			</tr>
 			<tr></tr>
 		</tbody>
+		<tbody ng-if="tableParams.total() == 0">
+		<tr>
+			<td colspan="6">
+				<div id="empty">
+					<div class="left_img">
+						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="#/index" title="B2B商务首页">B2B 商务</a>
+					</div>
+					<div class="right_link">
+						<p ng-if="active != 'all'">暂无对账信息!</p>
+						<p ng-if="active == 'all'">您还未生成对账单,请立即新增对账!</p>
+						<a ng-if="active == 'all'" ui-sref="fa.apCheckList"><i class="fa fa-plus-square"></i> 新增对账单</a>
+					</div>
+				</div>
+			</td>
+		</tr>
+		</tbody>
 	</table>
-	<div ng-if="active=='all' && tableParams.total() == 0" class="row">
-		<div class="col-xs-12" style="text-align: center;">
-			<h3 class="text-simple"><i class="fa fa-spinner"></i> &nbsp;您还未生成对账单,请立即新增对账</h3>
-		</div>
-		<div class="col-xs-12" style="margin-top:15px; text-align: center;">
-			<a class="text-simple append" ui-sref="fa.apCheckList"><big><i class="fa fa-plus-square"></i> 新增对账单</big></a>
-		</div>
-	</div>
 </div>

+ 15 - 0
src/main/webapp/resources/tpl/index/fa/arCheck.html

@@ -202,6 +202,21 @@
 			<th width="100">操作</th>
 		</tr>
 		</thead>
+		<tbody ng-if="$data.length === 0">
+		<tr>
+			<td colspan="6">
+				<div id="empty">
+					<div class="left_img">
+						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="#/index" title="B2B商务首页">B2B 商务</a>
+					</div>
+					<div class="right_link">
+						<p>暂无对应的对账单信息</p>
+					</div>
+				</div>
+			</td>
+		</tr>
+		</tbody>
 		<tbody ng-repeat="check in $data">
 			<tr>
 				<td class="first info" colspan="4">

+ 11 - 7
src/main/webapp/resources/tpl/index/home/left.html

@@ -27,7 +27,7 @@
 	}
 	/*公告非当日*/
 	.notice .pane-body ul li.nonday a{
-		color: #000;
+		color: #333;
 	}
 	/*!*公告当日已读*!*/
 	.notice .pane-body ul li.day-read a{
@@ -37,7 +37,7 @@
 		white-space: nowrap;
 		overflow: hidden;
 		text-overflow: ellipsis;
-		color: #000;
+		color: #333;
 	}
 	.notice .pane-body ul li.day-read img{
 		float: left;
@@ -51,7 +51,7 @@
 		white-space: nowrap;
 		overflow: hidden;
 		text-overflow: ellipsis;
-		color: #d32526;
+		color: #666;
 	}
 	.notice .pane-body ul li.day-unread img{
 		float: left;
@@ -91,6 +91,7 @@
 	.feed-wrap .pane{
 		height: 200px;
 		border: #e8e8e8 1px solid;
+		border-radius: 5px;
 	}
 	.feed-wrap .pane .pane-body{
 		height: 158px;
@@ -119,7 +120,7 @@
 
 	.feed-wrap .pane .pane-body li a em{
 		display: inline-block;
-		color: #d32526;
+		color: #333;
 		white-space: nowrap;
 		overflow: hidden;
 		text-overflow: ellipsis;
@@ -131,7 +132,10 @@
 	}
 	/*当日公共询价已读、未读**/
 	.feed-wrap .pane .pane-body li.day-read a em{
-		max-width: 150px;
+		max-width: 120px;
+	}
+	i.fa{
+		font-size: 24px;
 	}
 
 </style>
@@ -179,7 +183,7 @@
 	<div class="pane service" ng-controller="InquiryMessageListCtrl">
 		<div class="pane-header">
 			<img src="static/img/home/xunjia.png"> 公共询价<a class="pull-right text-muted"></a>
-			<span class="pull-right"><a ui-sref="baseInfo.inquiryList" class="text-light">更多>></a></span>
+			<span class="pull-right"><a ui-sref="baseInfo.inquiryList" class="text-light"><i class="fa fa-angle-right"></i></a></span>
 		</div>
 		<div class="pane-body">
 			<ul class="list-unstyled detail">
@@ -203,7 +207,7 @@
 	<div class="pane service" ng-controller="TenderCtrl">
 		<div class="pane-header">
 			<img src="static/img/home/target.png"> 公共招标<a href="serve" class="pull-right text-muted"></a>
-			<span class="pull-right"><a href="#/baseInfo/openTenderList" class="text-light">更多>></a></span>
+			<span class="pull-right"><a href="#/baseInfo/openTenderList" class="text-light"><i class="fa fa-angle-right"></i></a></span>
 		</div>
 		<div class="pane-body">
 			<ul class="list-unstyled detail">

+ 12 - 11
src/main/webapp/resources/tpl/index/home/pagingRelease.html

@@ -171,18 +171,19 @@
             </tr>
         </thead>
         <tbody ng-if="tableParams.total() == 0">
-            <tr>
-                <td colspan="6">
-                    <div class="row text-muted info-container" style="padding: 50px 10px;">
-                        <div>
-                            <br>
-                            <br>
-                            <div><img src="static/img/all/info.png" width="130px" height="90px"></div>
-                            <div class="f16">当前没有对应的消息!</div>
-                        </div>
+        <tr>
+            <td colspan="3">
+                <div id="empty">
+                    <div class="left_img">
+                        <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                        <a href="#/index" title="B2B商务首页">B2B 商务</a>
                     </div>
-                </td>
-            </tr>
+                    <div class="right_link">
+                        <p>当前没有对应的消息</p>
+                    </div>
+                </div>
+            </td>
+        </tr>
         </tbody>
         <tbody>
         <tr ng-repeat="releaseDetail in $data | orderBy: 'isRead'">

+ 258 - 150
src/main/webapp/resources/tpl/index/home/right.html

@@ -4,125 +4,241 @@
 		margin-top: 19px;
 	}
 	.data-wrap .todo .border01{
-		border: #e8e8e8 1px solid;
 		overflow: hidden;
-		min-height: 735px;
 	}
 	.toto-menu{
 		width: 100%;
 		margin: 0 auto;
 	}
 	.toto-menu .row{
-		margin: 0;
-		height: 270px;
+		margin: 0 0 20px;
+		width: 755px;
+		border: #e8e8e8 1px solid;
+		background: #fff;
+		box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
+		-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
+		-o-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
+		-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
+	}
+	.toto-menu .row .header{
+		padding-left: 10px;
+		width: 100%;
+		height: 35px;
+		line-height: 35px;
+		font-size: 18px;
+		font-weight: bold;
+		color: #545555;
 		border-bottom: #cfcfcf 1px solid;
 	}
-	.toto-menu .row:last-child{
-		border-bottom: none;
+	.toto-menu .row .header img{
+		margin-right: 10px;
 	}
-	.toto-menu .row  .col-md-3{
+	.toto-menu .row .content {
+		overflow: hidden;
+		padding: 0 24px 33px;
+		width: 100%;
+	}
+	.toto-menu .row .content .item-list{
+		float: left;
+		margin-right: 24px;
 		width: 80px;
-		border-right: #b3b3b3 1px dashed;
-		height: 100%;
-		/*padding-top: 11%;*/
-		padding-top: 14%;
+		text-align: -webkit-center;
+		cursor: pointer;
 	}
-	.toto-menu .row  .col-md-9{
-		width: 575px;
+	.toto-menu .row .content .item-list:last-child {
+		margin-right: 0;
 	}
-	.toto-menu .row  .col-md-3 p{
-		font-size: 22px;
-		text-align: center;
-		padding: 0;
+	.toto-menu .row .content .item-list a{
 		position: relative;
-		line-height: 30px;
-	}
-	.toto-menu .row  .col-md-3 span{
 		display: inline-block;
-		padding: 2px 5px;
-		background: #ee5762;
-		line-height: 16px;
-		text-align: center;
-		color: #fff;
-		font-size: 12px;
-		border-radius: 20px;
-		margin-left: 5px;
-		min-width: 40px;
-	}
-	.toto-menu .col-md-4{
 		text-align: center;
-		position: relative;
 	}
-	.toto-menu .new-dot{
+	.toto-menu .row .content .item-list b.new-dot{
 		width: 20px;
 		height: 20px;
 		line-height: 20px;
 		font-size: 12px;
 		color: #fff;
 		font-weight: inherit;
-		right: 60px;
-		top: 10px;
+		right: 0;
+		top: 30px;
 	}
-	.toto-menu .col-md-4 div{
-		width: 42px;
-		height: 42px;
-		border-radius: 5px;
-		text-align: center;
-		margin-left: 55px;
-		margin-bottom: 3px;
-		margin-top: 18px
+	.toto-menu .row .content .item-list .icons{
+		margin: 36px 0 20px;
+		width: 61px;
+		height: 61px;
+	}
+	.toto-menu .row .content .item-list p{
+		margin-bottom: 0;
+		font-size: 16px;
+		color: #666;
+	}
+	.toto-menu .row .content .item-list .icon_01{
+		background: url("static/img/home/Icon_01.png") center center no-repeat;
+	}
+	.toto-menu .row .content .item-list .icon_02{
+		background: url("static/img/home/Icon_02.png") center center no-repeat;
+	}
+	.toto-menu .row .content .item-list .icon_03{
+		background: url("static/img/home/Icon_03.png") center center no-repeat;
+	}
+	.toto-menu .row .content .item-list .icon_04{
+		background: url("static/img/home/Icon_04.png") center center no-repeat;
+	}
+	.toto-menu .row .content .item-list .icon_05{
+		 background: url("static/img/home/Icon_05.png") center center no-repeat;
+	}
+	.toto-menu .row .content .item-list .icon_06{
+		background: url("static/img/home/Icon_06.png") center center no-repeat;
+	}
+	.toto-menu .row .content .item-list .icon_07{
+		background: url("static/img/home/Icon_07.png") center center no-repeat;
+	}
+	.toto-menu .row .content .item-list .icon_08{
+		background: url("static/img/home/Icon_15.png") center center no-repeat;
+	}
+	.toto-menu .row .content .item-list .icon_09{
+		background: url("static/img/home/Icon_16.png") center center no-repeat;
+	}
+	.toto-menu .row .content .item-list .icon_10{
+		background: url("static/img/home/Icon_17.png") center center no-repeat;
+	}
+	.toto-menu .row .content .item-list .icon_11{
+		background: url("static/img/home/Icon_18.png") center center no-repeat;
+	}
+	.toto-menu .row .content .item-list .icon_12{
+		background: url("static/img/home/Icon_19.png") center center no-repeat;
+	}
+	.toto-menu .row .content .item-list .icon_13{
+		background: url("static/img/home/Icon_20.png") center center no-repeat;
+	}
+	.toto-menu .row .content .item-list .icon_14{
+		background: url("static/img/home/Icon_21.png") center center no-repeat;
 	}
-	.toto-menu .menu01 .col-md-4 div:hover{
-		background-color: #5078cb !important;
+	.toto-menu .row .content .item-list .icon_15{
+		background: url("static/img/home/Icon_29.png") center center no-repeat;
 	}
-	.toto-menu .menu02 .col-md-4 div:hover{
-		background-color: #27ae99 !important;
+	.toto-menu .row .content .item-list .icon_16{
+		background: url("static/img/home/Icon_30.png") center center no-repeat;
 	}
-	.toto-menu .menu03 .col-md-4 div:hover{
-		background-color: #dda333 !important;
+	.toto-menu .row .content .item-list .icon_17{
+		background: url("static/img/home/Icon_31.png") center center no-repeat;
 	}
-	.toto-menu .menu01 .col-md-4 div{
-		background: url("static/img/icon/menu-list01.png") no-repeat center;
+	.toto-menu .row .content .item-list .icon_18{
+		background: url("static/img/home/Icon_32.png") center center no-repeat;
 	}
-	.toto-menu .menu02 .col-md-4 div{
-		background: url("static/img/icon/menu-list02.png") no-repeat center;
+	.toto-menu .row .content .item-list .icon_19{
+		background: url("static/img/home/Icon_33.png") center center no-repeat;
 	}
-	.toto-menu .menu03 .col-md-4 div{
-		background: url("static/img/icon/menu-list03.png") no-repeat center;
+	.toto-menu .row .content .item-list .icon_20{
+		background: url("static/img/home/Icon_34.png") center center no-repeat;
 	}
-	.toto-menu .col-md-4 p{
-		font-size: 14px;
-		margin: 0;
+	.toto-menu .row .content .item-list .icon_21{
+		background: url("static/img/home/Icon_35.png") center center no-repeat;
 	}
-	.toto-menu .menu01 .col-md-4 div{
-		background-color: #52a9fa;
+
+	.toto-menu .row .content .item-list:hover .icons{
+		margin: 26px 0 30px;
+	}
+	.toto-menu .row .content .item-list:hover .new-dot{
+		top: 20px;
+	}
+	.toto-menu .row .content .item-list:hover .icon_01{
+		background: url("static/img/home/Icon_08.png") center center no-repeat;
+	}
+	.toto-menu .row .content .item-list:hover .icon_02{
+		background: url("static/img/home/Icon_09.png") center center no-repeat;
+	}
+	.toto-menu .row .content .item-list:hover .icon_03{
+		background: url("static/img/home/Icon_10.png") center center no-repeat;
+	}
+	.toto-menu .row .content .item-list:hover .icon_04{
+		background: url("static/img/home/Icon_11.png") center center no-repeat;
+	}
+	.toto-menu .row .content .item-list:hover .icon_05{
+		background: url("static/img/home/Icon_12.png") center center no-repeat;
+	}
+	.toto-menu .row .content .item-list:hover .icon_06{
+		background: url("static/img/home/Icon_13.png") center center no-repeat;
 	}
-	.toto-menu .menu02 .col-md-4 div{
-		background-color: #47c8b4;
+	.toto-menu .row .content .item-list:hover .icon_07{
+		background: url("static/img/home/Icon_14.png") center center no-repeat;
 	}
-	.toto-menu .menu03 .col-md-4 div{
-		background-color: #ebb959;
+	.toto-menu .row .content .item-list:hover .icon_08{
+		background: url("static/img/home/Icon_22.png") center center no-repeat;
 	}
-	.toto-menu .menu01 .col-md-4 div.menu01-1,.toto-menu .menu02 .col-md-4 div.menu02-1,.toto-menu .menu03 .col-md-4 div.menu03-1{
-		background-position: 0 0;
+	.toto-menu .row .content .item-list:hover .icon_09{
+		background: url("static/img/home/Icon_23.png") center center no-repeat;
 	}
-	.toto-menu .menu01 .col-md-4 div.menu01-2,.toto-menu .menu02 .col-md-4 div.menu02-2,.toto-menu .menu03 .col-md-4 div.menu03-2{
-		background-position: -42px 0;
+	.toto-menu .row .content .item-list:hover .icon_10{
+		background: url("static/img/home/Icon_24.png") center center no-repeat;
 	}
-	.toto-menu .menu01 .col-md-4 div.menu01-3,.toto-menu .menu02 .col-md-4 div.menu02-3,.toto-menu .menu03 .col-md-4 div.menu03-3{
-		background-position: -84px 0;
+	.toto-menu .row .content .item-list:hover .icon_11{
+		background: url("static/img/home/Icon_25.png") center center no-repeat;
 	}
-	.toto-menu .menu01 .col-md-4 div.menu01-4,.toto-menu .menu02 .col-md-4 div.menu02-4,.toto-menu .menu03 .col-md-4 div.menu03-4{
-		background-position: -126px 0;
+	.toto-menu .row .content .item-list:hover .icon_12{
+		background: url("static/img/home/Icon_26.png") center center no-repeat;
 	}
-	.toto-menu .menu01 .col-md-4 div.menu01-5,.toto-menu .menu02 .col-md-4 div.menu02-5,.toto-menu .menu03 .col-md-4 div.menu03-5{
-		background-position: -168px 0;
+	.toto-menu .row .content .item-list:hover .icon_13{
+		background: url("static/img/home/Icon_27.png") center center no-repeat;
 	}
-	.toto-menu .menu01 .col-md-4 div.menu01-6,.toto-menu .menu02 .col-md-4 div.menu02-6,.toto-menu .menu03 .col-md-4 div.menu03-6{
-		background-position: -210px 0;
+	.toto-menu .row .content .item-list:hover .icon_14{
+		background: url("static/img/home/Icon_28.png") center center no-repeat;
 	}
-	.toto-menu .menu01 .col-md-4 div.menu01-7,.toto-menu .menu02 .col-md-4 div.menu02-7{
-		background-position: -252px 0;
+	.toto-menu .row .content .item-list:hover .icon_15{
+		background: url("static/img/home/Icon_36.png") center center no-repeat;
+	}
+	.toto-menu .row .content .item-list:hover .icon_16{
+		background: url("static/img/home/Icon_37.png") center center no-repeat;
+	}
+	.toto-menu .row .content .item-list:hover .icon_17{
+		background: url("static/img/home/Icon_38.png") center center no-repeat;
+	}
+	.toto-menu .row .content .item-list:hover .icon_18{
+		background: url("static/img/home/Icon_39.png") center center no-repeat;
+	}
+	.toto-menu .row .content .item-list:hover .icon_19{
+		background: url("static/img/home/Icon_40.png") center center no-repeat;
+	}
+	.toto-menu .row .content .item-list:hover .icon_20{
+		background: url("static/img/home/Icon_41.png") center center no-repeat;
+	}
+	.toto-menu .row .content .item-list:hover .icon_21{
+		background: url("static/img/home/Icon_42.png") center center no-repeat;
+	}
+	.right .view-slide-in .feed-wrap{
+		width: 206px;
+		height: 205px;
+	}
+	.side-enterprise {
+		width: 206px;
+		height: 205px;
+		background-color: #ffffff;
+		border-radius: 5px;
+		margin-bottom:10px;
+		box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+		-webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+		-o-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+		-moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+	}
+	.side-enterprise .header{
+		padding-left: 16px;
+		height: 45px;
+		line-height: 45px;
+		border-bottom: 1px solid #dcdcdc;
+		font-size: 16px;
+		color: #333;
+		text-align: left;
+	}
+	.side-enterprise .enterprise-btn{
+		width: 206px;
+		height: 160px;
+		text-align: center;
+	}
+	.side-enterprise .enterprise-btn img{
+		margin-top: 10px;
+		width: 184px;
+		height: 139px;
 	}
 </style>
 <!-- 交易信息 Start -->
@@ -130,65 +246,57 @@
 
 	<!-- 待处理统计 Start -->
 	<div class="todo">
-		<div class="todo-label list-unstyled">
-			<em></em><label>工作台</label>
-		</div>
 		<div class="border01 todo-content" ng-controller="TodoCtrl">
 			<!--工作台导航-->
 			<div class="toto-menu">
 				<div class="menu01 row">
-					<div class="col-md-3">
-						<a href="#/sale/order" target="_blank">
-							<p>销<br/>售</p>
-							<!--<span>123</span>-->
-						</a>
-					</div>
-					<div class="col-md-9">
-						<div class="col-md-4">
+					<div class="header"><img src="static/img/home/xiaoshou.png" alt=""/>销售</div>
+					<div class="content">
+						<div class="item-list">
 							<a href="#/sale/order">
-								<div class="menu01-1"></div>
+								<div class="icon_01 icons"></div>
 								<p>销售订单</p>
 								<b class="new-dot" ng-if="getSaleOrderCount(unread) > 0">{{getSaleOrderCount(unread)>99?'99+':getSaleOrderCount(unread)}}</b>
 							</a>
 						</div>
-						<div class="col-md-4">
+						<div class="item-list">
 							<a href="#/sale/inquiry">
-								<div class="menu01-2"></div>
+								<div class="icon_02 icons"></div>
 								<p>报价</p>
 								<b class="new-dot" ng-if="getSaleInquiryCount(unread) > 0">{{getSaleInquiryCount(unread)>99?'99+':getSaleInquiryCount(unread)}}</b>
 							</a>
 						</div>
-						<div class="col-md-4">
+						<div class="item-list">
 							<a href="#/sale/tender">
-								<div class="menu01-3"></div>
+								<div class="icon_03 icons"></div>
 								<p>投标</p>
 								<b class="new-dot" ng-if="unread.tender > 0">{{unread.tender > 99 ? '99+' : unread.tender}}</b>
 							</a>
 						</div>
-						<div class="col-md-4">
+						<div class="item-list">
 							<a href="#/sale/notice">
-								<div class="menu01-4"></div>
+								<div class="icon_04 icons"></div>
 								<p>发货</p>
 								<b class="new-dot" ng-if="unread.notice > 0">{{unread.notice > 99 ? '99+' : unread.notice}}</b>
 							</a>
 						</div>
-						<div class="col-md-4">
+						<div class="item-list">
 							<a href="#/sale/prodList" ng-click="setOrdersRead('product')">
-								<div class="menu01-5"></div>
+								<div class="icon_05 icons"></div>
 								<p>产品库</p>
 								<b class="new-dot" ng-if="unread.product > 0">{{unread.product > 99 ? '99+' : unread.product}}</b>
 							</a>
 						</div>
-						<div class="col-md-4">
+						<div class="item-list">
 							<a href="#/sale/customer" ng-click="setOrdersRead('customer')">
-								<div class="menu01-6"></div>
+								<div class="icon_06 icons"></div>
 								<p>客户资料</p>
 								<b class="new-dot" ng-if="unread.customer > 0">{{unread.customer > 99 ? '99+' : unread.customer}}</b>
 							</a>
 						</div>
-						<div class="col-md-4">
-							<a href="">
-								<div class="menu01-7"></div>
+						<div class="item-list">
+							<a href="" target="_blank">
+								<div class="icon_07 icons"></div>
 								<p>销售报表</p>
 								<b class="new-dot" ng-if="false"></b>
 							</a>
@@ -196,101 +304,98 @@
 					</div>
 				</div>
 				<div class="menu02 row">
-					<div class="col-md-3">
-						<a href="#/purc/order"  target="_blank">
-							<p>采<br/>购</p>
-							<!--<span>56</span>-->
-						</a>
-					</div>
-					<div class="col-md-9">
-						<div class="col-md-4">
+					<div class="header"><img src="static/img/home/caigou.png" alt=""/>采购</div>
+					<div class="content">
+						<div class="item-list">
 							<a href="#/purc/order" ng-click="setActive('todo')">
-								<div class="menu02-1"></div>
+								<div class="icon_08 icons"></div>
 								<p>采购订单</p>
 								<b class="new-dot" ng-if="unread.purcOrder>0">{{unread.purcOrder>99?'99+':unread.purcOrder}}</b>
 							</a>
 						</div>
-						<div class="col-md-4">
+						<div class="item-list">
 							<a href="#/purc/purchaseinquiry">
-								<div class="menu02-2"></div>
-								<p>询价(求购)</p>
+								<div class="icon_09 icons"></div>
+								<p>询价(求购)</p>
 								<b class="new-dot" ng-if="unread.purcInquiry > 0">{{unread.purcInquiry > 99 ? '99+' : unread.purcInquiry}}</b>
 							</a>
 						</div>
-						<div class="col-md-4">
+						<div class="item-list">
 							<a href="#/purc/tender">
-								<div class="menu02-3"></div>
+								<div class="icon_10 icons"></div>
 								<p>招标</p>
 								<b class="new-dot" ng-if="unread.purcTender > 0">{{unread.purcTender > 99 ? '99+' : unread.purcTender}}</b>
 							</a>
 						</div>
-						<div class="col-md-4">
-							<div class="menu02-4"></div>
+						<div class="item-list">
+							<div class="icon_11 icons"></div>
 							<p>收货</p>
 							<b class="new-dot" ng-if="false"></b>
 						</div>
-						<div class="col-md-4">
+						<div class="item-list">
 							<a href="#/purc/product">
-								<div class="menu02-5"></div>
+								<div class="icon_12 icons"></div>
 								<p>物料库</p>
 								<b class="new-dot" ng-if="unread.purcProduct > 0">{{unread.purcProduct > 99 ? '99+' : unread.purcProduct}}</b>
 							</a>
 						</div>
-						<div class="col-md-4">
+						<div class="item-list">
 							<a href="#/purc/vendor">
-								<div class="menu02-6"></div>
+								<div class="icon_13 icons"></div>
 								<p>供应商资料</p>
 								<b class="new-dot" ng-if="unread.purcVendor > 0">{{unread.purcVendor > 99 ? '99+' : unread.purcVendor}}</b>
 							</a>
 						</div>
-						<div class="col-md-4">
-							<div class="menu02-7"></div>
+						<div class="item-list">
+							<div class="icon_14 icons"></div>
 							<p>采购报表</p>
 							<b class="new-dot" ng-if="false"></b>
 						</div>
 					</div>
 				</div>
-				<div class="menu03 row" style="height: 190px;">
-					<div class="col-md-3" style="padding-top: 10%;">
-						<a href="#/fa/apBill"  target="_blank">
-							<p>财<br/>务</p>
-							<!--<span>23</span>-->
-						</a>
-					</div>
-					<div class="col-md-9">
-						<div class="col-md-4">
+				<div class="menu03 row">
+					<div class="header"><img src="static/img/home/caiwu.png" alt=""/>财务</div>
+					<div class="content">
+						<div class="item-list">
 							<a href="#/fa/apBill">
-								<div class="menu03-1"></div>
+								<div class="icon_15 icons"></div>
 								<p>应收发票</p>
 								<b class="new-dot" ng-if="false"></b>
 							</a>
 						</div>
-						<div class="col-md-4">
+						<div class="item-list">
 							<a href="#/fa/apCheck">
-								<div class="menu03-2"></div>
+								<div class="icon_16 icons"></div>
 								<p>应收对账</p>
 								<b class="new-dot" ng-if="unread.apCheck > 0">{{unread.apCheck > 99 ? '99+' : unread.apCheck}}</b>
 							</a>
 						</div>
-						<div class="col-md-4">
-							<div class="menu03-3"></div>
+						<div class="item-list">
+							<div class="icon_17 icons"></div>
 							<p>应收报表</p>
 						</div>
-						<div class="col-md-4">
-							<div class="menu03-4"></div>
+						<div class="item-list">
+							<div class="icon_18 icons"></div>
 							<p>应付发票</p>
 						</div>
-						<div class="col-md-4">
+						<div class="item-list">
 							<a href="#/fa/arCheck">
-								<div class="menu03-5"></div>
+								<div class="icon_19 icons"></div>
 								<p>应付对账</p>
 								<b class="new-dot" ng-if="false"></b>
 							</a>
 						</div>
-						<div class="col-md-4">
-							<div class="menu03-6"></div>
+						<div class="item-list">
+							<div class="icon_20 icons"></div>
 							<p>应付报表</p>
 						</div>
+						<div class="item-list">
+							<a href="http://www.yitoa-fintech.com/">
+								<div class="icon_21 icons"></div>
+								<p>金融服务</p>
+								<b class="new-dot" ng-if="false"></b>
+							</a>
+						</div>
 					</div>
 				</div>
 			</div>
@@ -418,11 +523,14 @@
 <!-- 第三列图片 Start -->
 <div class="feed-wrap">
 	<div class="side-image">
-		<div class="enterprise-btn">
-			<img src="static/img/home/entLib.png" >
-			<div ng-controller="RequestAmountCtrl">
-				<a title="我的合作伙伴" ui-sref="baseInfo.myRequest">我的合作伙伴</a><br/>
-				<a title="新的合作伙伴" ui-sref="baseInfo.newPartner">新的合作伙伴<em ng-if="requestTodo.todo>0"></em></a>
+		<div class="side-enterprise">
+			<div class="header">企业圈</div>
+			<div class="enterprise-btn">
+				<img src="static/img/home/entLib.png" >
+				<div ng-controller="RequestAmountCtrl">
+					<a title="我的合作伙伴" ui-sref="baseInfo.myRequest">我的合作伙伴</a><br/>
+					<a title="新的合作伙伴" ui-sref="baseInfo.newPartner">新的合作伙伴<em ng-if="requestTodo.todo>0"></em></a>
+				</div>
 			</div>
 		</div>
 		<!--<a href="#/baseInfo/enterpriseList"><img src="static/img/home/entLib.png" ></a>-->

+ 17 - 3
src/main/webapp/resources/tpl/index/make/accept.html

@@ -107,9 +107,7 @@
 	<div class="pub-com_head">
 		<span>客户委外验收单</span>
 		<div class="p-right">
-			<a href="#" ng-click="exportXls()"
-			   target="_self" class="text-simple" title="导出Excel表格"><i
-					class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="condition block">
@@ -284,5 +282,21 @@
 				</td>
 			</tr>
 		</tbody>
+		<tbody ng-if="$data.length === 0">
+		<tr>
+			<td colspan="6">
+				<div id="empty">
+					<div class="left_img">
+						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="#/index" title="B2B商务首页">B2B 商务</a>
+					</div>
+					<div class="right_link">
+						<p>暂无对应的单据</p>
+						<a href="javascript:location.reload()">点击重新加载<i class="load_icon"></i></a>
+					</div>
+				</div>
+			</td>
+		</tr>
+		</tbody>
 	</table>
 </div>

+ 16 - 0
src/main/webapp/resources/tpl/index/make/change.html

@@ -266,5 +266,21 @@
 			</td>
 		</tr>
 	</tbody>
+	<tbody ng-if="$data.length === 0">
+	<tr>
+		<td colspan="6">
+			<div id="empty">
+				<div class="left_img">
+					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+					<a href="#/index" title="B2B商务首页">B2B 商务</a>
+				</div>
+				<div class="right_link">
+					<p>暂无对应的单据</p>
+					<a href="javascript:location.reload()">点击重新加载<i class="load_icon"></i></a>
+				</div>
+			</div>
+		</td>
+	</tr>
+	</tbody>
 </table>
 </div>

+ 17 - 2
src/main/webapp/resources/tpl/index/make/order.html

@@ -133,8 +133,7 @@
 	<div class="pub-com_head">
 		<span>客户委外单</span>
 		<div class="p-right">
-			<a href="#" ng-click="exportXls()"
-			   target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
 		</div>
 	</div>
 <div class="menu condition block">
@@ -418,5 +417,21 @@
 			</td>
 		</tr>
 	</tbody>
+	<tbody ng-if="$data.length === 0">
+	<tr>
+		<td colspan="6">
+			<div id="empty">
+				<div class="left_img">
+					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+					<a href="#/index" title="B2B商务首页">B2B 商务</a>
+				</div>
+				<div class="right_link">
+					<p>暂无对应的单据</p>
+					<a href="javascript:location.reload()">点击重新加载<i class="load_icon"></i></a>
+				</div>
+			</div>
+		</td>
+	</tr>
+	</tbody>
 </table>
 </div>

+ 15 - 0
src/main/webapp/resources/tpl/index/make/outorder.html

@@ -200,6 +200,21 @@
 				<td colspan="6"></td>
 			</tr>-->
 		</thead>
+		<tbody ng-if="$data.length === 0">
+		<tr>
+			<td colspan="6">
+				<div id="empty">
+					<div class="left_img">
+						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="#/index" title="B2B商务首页">B2B 商务</a>
+					</div>
+					<div class="right_link">
+						<p>暂无对应的订单信息</p>
+					</div>
+				</div>
+			</td>
+		</tr>
+		</tbody>
 		<tbody ng-repeat="order in $data track by order.id">
 			<tr class="order-hd" ng-dbclick="order.$collapsed=!order.$collapsed"
 				ng-class="{'text-bold': order.display>0}">

+ 17 - 2
src/main/webapp/resources/tpl/index/make/returns.html

@@ -112,8 +112,7 @@
 	<div class="pub-com_head">
 		<span>客户委外验退单</span>
 		<div class="p-right">
-			<a href="#" target="_self" ng-click="exportXls()"
-			   class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="#" target="_self" ng-click="exportXls()" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="condition block">
@@ -266,5 +265,21 @@
 				</td>
 			</tr>
 		</tbody>
+		<tbody ng-if="$data.length === 0">
+		<tr>
+			<td colspan="6">
+				<div id="empty">
+					<div class="left_img">
+						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="#/index" title="B2B商务首页">B2B 商务</a>
+					</div>
+					<div class="right_link">
+						<p>暂无对应的单据</p>
+						<a href="javascript:location.reload()">点击重新加载<i class="load_icon"></i></a>
+					</div>
+				</div>
+			</td>
+		</tr>
+		</tbody>
 	</table>
 </div>

+ 14 - 10
src/main/webapp/resources/tpl/index/purc/addOrder.html

@@ -249,16 +249,20 @@
 						</tr>
 					</thead>
 					<tbody ng-if="tableParams.total() == 0">
-						<tr>
-							<td class="text-center" colspan="7" ng-if="tip != null"><br>
-								<div class="text-muted" style="font-size: 14px;">
-									<i class="fa fa-spinner"></i> 搜索"{{tip}}"未找到产品信息,请重新输入搜索条件
-								</div></td>
-							<td class="text-center" colspan="7" ng-if="tip == null"><br>
-								<div class="text-muted" style="font-size: 14px;">
-									<i class="fa fa-spinner"></i> 您的供应商还未添加商品信息,请尽快通知供应商
-								</div></td>
-						</tr>
+					<tr>
+						<td colspan="5">
+							<div id="empty">
+								<div class="left_img">
+									<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+									<a href="#/index" title="B2B商务首页">B2B 商务</a>
+								</div>
+								<div class="right_link">
+									<p ng-if="tip != null">搜索"{{tip}}"未找到产品信息,请重新输入搜索条件</p>
+									<p ng-if="tip == null">您的供应商还未添加商品信息,请尽快通知供应商</p>
+								</div>
+							</div>
+						</td>
+					</tr>
 					</tbody>
 					<tbody>
 						<tr ng-repeat="product in $data">

+ 33 - 30
src/main/webapp/resources/tpl/index/purc/cart.html

@@ -241,39 +241,42 @@
 		</tr>
 	</thead>
 	<tbody ng-if="tableParams.total() == 0">
-		<tr>
-			<td colspan="6">
-				<div class="row text-muted info-container" style="padding: 50px 10px;">
-					<div class="col-md-4 text-center">
-						<br>
-						<br>
-						<div><img src="static/img/all/info.png" width="130px" height="90px"></div>
-						<div class="f16">当前没有对应的采购订单!</div>
+	<tr>
+		<td colspan="7">
+			<div id="empty">
+				<div class="left_img">
+					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+					<a href="#/index" title="B2B商务首页">B2B 商务</a>
+				</div>
+				<div class="right_link">
+					<p>当前没有对应的采购订单!</p>
+				</div>
+			</div>
+		</td>
+	</tr>
+	<tr>
+		<td colspan="6">
+			<div id="empty_info">
+				<div class="f16 text-center empty_title">
+					<p>为什么我没有采购订单?</p>
+				</div>
+				<div class="f14 empty_explain">
+					<div class="info">
+						<p>1、您的采购单在ERP系统上还没审核,订单无法上传到平台<br>
+							解决:采购员沟通确认单据是否已经审核(只有ERP中已经审核的单据才能接收到)</p>
 					</div>
-					<div class="col-md-8 br-l">
-						<div class="f16">
-							<p>为什么我没有采购订单?</p>
-						</div>
-						<div class="f14">
-							<div class="info">
-								<p>1、您的采购单在ERP系统上还没审核,订单无法上传到平台<br>
-								解决:采购员沟通确认单据是否已经审核(只有ERP中已经审核的单据才能接收到)</p>
-							</div>
-							<div class="info">
-								<p>2、ERP中供应商信息有误<br>
-								解决:与您的供应商沟通确认他的资料在供应商资料中是否维护正确,尤其是企业UU号</p>
-							</div>
-							<div class="info">
-								<p>3、您的供应商正在使用旧版本的UAS商务平台<br>
-								解决:我们仍有部分用户在使用旧版本UAS商务平台系统,你可以用您的企业UU号和管理员个人UU号 <a href="http://www.usoftchina.com" class="text-bold text-link" title="http://www.usoftchina.com" target="_blank">登陆旧版本UAS商务平台</a></p>
-							</div>
-						</div>
-						<br>
-						<br>
+					<div class="info">
+						<p>2、ERP中供应商信息有误<br>
+							解决:与您的供应商沟通确认他的资料在供应商资料中是否维护正确,尤其是企业UU号</p>
+					</div>
+					<div class="info">
+						<p>3、您的供应商正在使用旧版本的UAS商务平台<br>
+							解决:我们仍有部分用户在使用旧版本UAS商务平台系统,你可以用您的企业UU号和管理员个人UU号 <a href="http://www.usoftchina.com" class="text-bold text-link" title="http://www.usoftchina.com" target="_blank">登陆旧版本UAS商务平台</a></p>
 					</div>
 				</div>
-			</td>
-		</tr>
+			</div>
+		</td>
+	</tr>
 	</tbody>
 	<tbody ng-repeat="order in $data track by order.id">
 		<tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">

+ 14 - 10
src/main/webapp/resources/tpl/index/purc/cart_detail.html

@@ -247,16 +247,20 @@
 						</tr>
 					</thead>
 					<tbody ng-if="tableParams.total() == 0">
-						<tr>
-							<td class="text-center" colspan="7" ng-if="tip != null"><br>
-								<div class="text-muted" style="font-size: 14px;">
-									<i class="fa fa-spinner"></i> 搜索"{{tip}}"未找到产品信息,请重新输入搜索条件
-								</div></td>
-							<td class="text-center" colspan="7" ng-if="tip == null"><br>
-								<div class="text-muted" style="font-size: 14px;">
-									<i class="fa fa-spinner"></i> 您的供应商还未添加商品信息,请尽快通知供应商
-								</div></td>
-						</tr>
+					<tr>
+						<td colspan="5">
+							<div id="empty">
+								<div class="left_img">
+									<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+									<a href="#/index" title="B2B商务首页">B2B 商务</a>
+								</div>
+								<div class="right_link">
+									<p ng-if="tip != null">搜索"{{tip}}"未找到产品信息,请重新输入搜索条件</p>
+									<p ng-if="tip == null">您的供应商还未添加商品信息,请尽快通知供应商</p>
+								</div>
+							</div>
+						</td>
+					</tr>
 					</tbody>
 					<tbody>
 						<tr ng-repeat="product in $data">

+ 13 - 0
src/main/webapp/resources/tpl/index/purc/deputyOrder.html

@@ -317,6 +317,19 @@
                 </tr>
             </thead>
 			<tbody ng-if="tableParams.total() == 0">
+            <tr>
+                <td colspan="4">
+                    <div id="empty">
+                        <div class="left_img">
+                            <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                            <a href="#/index" title="B2B商务首页">B2B 商务</a>
+                        </div>
+                        <div class="right_link">
+                            <p>暂无对应的订单信息</p>
+                        </div>
+                    </div>
+                </td>
+            </tr>
 			</tbody>
 			<tbody ng-repeat="order in $data">
                 <tr>

+ 27 - 24
src/main/webapp/resources/tpl/index/purc/inquiry.html

@@ -432,33 +432,36 @@ margin-left: 55px;
 		<tbody ng-if="tableParams.total() == 0">
 		<tr>
 			<td colspan="7">
-				<div class="row text-muted info-container" style="padding: 50px 10px;">
-					<div class="col-md-4 text-center">
-						<br>
-						<br>
-						<div><img src="static/img/all/info.png" width="130px" height="90px"></div>
-						<div class="f16">当前没有对应的客户询价单!</div>
+				<div id="empty">
+					<div class="left_img">
+						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="#/index" title="B2B商务首页">B2B 商务</a>
 					</div>
-					<div class="col-md-8 br-l">
-						<div class="f16">
-							<p>为什么我没有接收到客户的询价单?</p>
+					<div class="right_link">
+						<p>当前没有对应的客户询价单!</p>
+					</div>
+				</div>
+			</td>
+		</tr>
+		<tr>
+			<td colspan="7">
+				<div id="empty_info">
+					<div class="f16 text-center empty_title">
+						<p>为什么我没有接收到客户的询价单?</p>
+					</div>
+					<div class="f14 empty_explain">
+						<div class="info">
+							<p>1、您的客户还没有提交审核询价单<br>
+								解决:与您的客户沟通确认单据是否已经审核(只有客户ERP中已经审核的单据才能接收到)</p>
+						</div>
+						<div class="info">
+							<p>2、客户ERP中供应商信息有误<br>
+								解决:与您的客户沟通确认您的信息在客户的供应商资料中是否维护正确,尤其是企业UU号</p>
 						</div>
-						<div class="f14">
-							<div class="info">
-								<p>1、您的客户还没有提交审核询价单<br>
-									解决:与您的客户沟通确认单据是否已经审核(只有客户ERP中已经审核的单据才能接收到)</p>
-							</div>
-							<div class="info">
-								<p>2、客户ERP中供应商信息有误<br>
-									解决:与您的客户沟通确认您的信息在客户的供应商资料中是否维护正确,尤其是企业UU号</p>
-							</div>
-							<div class="info">
-								<p>3、您的客户正在使用旧版本的UAS商务平台<br>
-									解决:我们仍有部分用户在使用旧版本UAS商务平台系统,你可以用您的企业UU号和管理员个人UU号 <a href="http://www.usoftchina.com" class="text-bold text-link" title="http://www.usoftchina.com" target="_blank">登陆旧版本UAS商务平台</a></p>
-							</div>
+						<div class="info">
+							<p>3、您的客户正在使用旧版本的UAS商务平台<br>
+								解决:我们仍有部分用户在使用旧版本UAS商务平台系统,你可以用您的企业UU号和管理员个人UU号 <a href="http://www.usoftchina.com" class="text-bold text-link" title="http://www.usoftchina.com" target="_blank">登陆旧版本UAS商务平台</a></p>
 						</div>
-						<br>
-						<br>
 					</div>
 				</div>
 			</td>

+ 0 - 14
src/main/webapp/resources/tpl/index/purc/inquiryInfo_detail.html

@@ -143,20 +143,6 @@
 	outline: none;
 }
 
-.com_head {
-	width: 100%;
-	height: 40px;
-	line-height: 42px;
-	background: url(static/img/comm_bg01.png) no-repeat center;
-	background-size: 100%;
-}
-
-.com_head span {
-	margin-left: 20px;
-	color: #000;
-	font-size: 14px;
-}
-
 .com_head a {
 	color: #327ebe;
 	float: right;

+ 12 - 21
src/main/webapp/resources/tpl/index/purc/inquiry_new.html

@@ -297,20 +297,6 @@
         width: 400px;
     }
 
-    .com_head {
-        width: 100%;
-        height: 40px;
-        line-height: 42px;
-        background: url(static/img/comm_bg01.png) no-repeat center;
-        background-size: 100%;
-    }
-
-    .com_head span {
-        margin-left: 20px;
-        color: #000;
-        font-size: 14px;
-    }
-
     .com_head a {
         color: #327ebe;
         float: right;
@@ -1174,13 +1160,18 @@
             </thead>
             <tbody ng-if="tableParams.total() == 0">
             <tr>
-                <td class="text-center" colspan="7" ng-if="tip != null">
-                    <br>
-                    <div class="text-muted" style="font-size: 14px;"><i class="fa fa-spinner"></i> 搜索"{{tip}}"未找到产品信息,请重新输入搜索条件</div>
-                </td>
-                <td class="text-center" colspan="7" ng-if="tip == null">
-                    <br>
-                    <div class="text-muted" style="font-size: 14px;"><i class="fa fa-spinner"></i> 暂无物料信息,<a ui-sref="purc.uploadProduct" target="_blank">立即添加</a></div>
+                <td colspan="5">
+                    <div id="empty">
+                        <div class="left_img">
+                            <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                            <a href="#/index" title="B2B商务首页">B2B 商务</a>
+                        </div>
+                        <div class="right_link">
+                            <p ng-if="tip != null">搜索"{{tip}}"未找到产品信息,请重新输入搜索条件</p>
+                            <p ng-if="tip == null">暂无物料信息</p>
+                            <a ng-if="tip == null" ui-sref="purc.uploadProduct" target="_blank"><i class="way_icon"></i>立即添加</a>
+                        </div>
+                    </div>
                 </td>
             </tr>
             </tbody>

+ 34 - 31
src/main/webapp/resources/tpl/index/purc/inquiry_unapply.html

@@ -308,43 +308,46 @@
 			<th width="100">操作</th>
 		</tr>
 		<tr class="sep-row">
-			<td colspan="5"></td>
+			<td colspan="6"></td>
 		</tr>
 	</thead>
 	<tbody ng-if="tableParams.total() == 0">
-		<tr>
-			<td colspan="6">
-				<div class="row text-muted info-container" style="padding: 50px 10px;">
-					<div class="col-md-4 text-center">
-						<br>
-						<br>
-						<div><img src="static/img/all/info.png" width="130px" height="90px"></div>
-						<div class="f16">当前没有对应的询价单!</div>
+	<tr>
+		<td colspan="6">
+			<div id="empty">
+				<div class="left_img">
+					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+					<a href="#/index" title="B2B商务首页">B2B 商务</a>
+				</div>
+				<div class="right_link">
+					<p>当前没有对应的询价单!</p>
+				</div>
+			</div>
+		</td>
+	</tr>
+	<tr>
+		<td colspan="6">
+			<div id="empty_info">
+				<div class="f16 text-center empty_title">
+					<p>为什么我没有询价单?</p>
+				</div>
+				<div class="f14 empty_explain">
+					<div class="info">
+						<p>1、您的采购单在ERP系统上还没审核,订单无法上传到平台<br>
+							解决:采购员沟通确认单据是否已经审核(只有ERP中已经审核的单据才能接收到)</p>
 					</div>
-					<div class="col-md-8 br-l">
-						<div class="f16">
-							<p>为什么我没有询价单?</p>
-						</div>
-						<div class="f14">
-							<div class="info">
-								<p>1、您的采购单在ERP系统上还没审核,订单无法上传到平台<br>
-								解决:采购员沟通确认单据是否已经审核(只有ERP中已经审核的单据才能接收到)</p>
-							</div>
-							<div class="info">
-								<p>2、ERP中供应商信息有误<br>
-								解决:与您的供应商沟通确认他的资料在供应商资料中是否维护正确,尤其是企业UU号</p>
-							</div>
-							<div class="info">
-								<p>3、您的供应商正在使用旧版本的UAS商务平台<br>
-								解决:我们仍有部分用户在使用旧版本UAS商务平台系统,你可以用您的企业UU号和管理员个人UU号 <a href="http://www.usoftchina.com" class="text-bold text-link" title="http://www.usoftchina.com" target="_blank">登陆旧版本UAS商务平台</a></p>
-							</div>
-						</div>
-						<br>
-						<br>
+					<div class="info">
+						<p>2、ERP中供应商信息有误<br>
+							解决:与您的供应商沟通确认他的资料在供应商资料中是否维护正确,尤其是企业UU号</p>
+					</div>
+					<div class="info">
+						<p>3、您的供应商正在使用旧版本的UAS商务平台<br>
+							解决:我们仍有部分用户在使用旧版本UAS商务平台系统,你可以用您的企业UU号和管理员个人UU号 <a href="http://www.usoftchina.com" class="text-bold text-link" title="http://www.usoftchina.com" target="_blank">登陆旧版本UAS商务平台</a></p>
 					</div>
 				</div>
-			</td>
-		</tr>
+			</div>
+		</td>
+	</tr>
 	</tbody>
 	<tbody ng-repeat="inquiry in $data track by inquiry.id">
 		<tr class="inquiry-hd" ng-dblclick="inquiry.$collapsed=!inquiry.$collapsed" ng-class="{'text-bold': inquiry.display>0}">

+ 33 - 30
src/main/webapp/resources/tpl/index/purc/order.html

@@ -312,39 +312,42 @@
 		</tr>
 	</thead>
 	<tbody ng-if="tableParams.total() == 0">
-		<tr>
-			<td colspan="6">
-				<div class="row text-muted info-container" style="padding: 50px 10px;">
-					<div class="col-md-4 text-center">
-						<br>
-						<br>
-						<div><img src="static/img/all/info.png" width="130px" height="90px"></div>
-						<div class="f16">当前没有对应的采购订单!</div>
+	<tr>
+		<td colspan="6">
+			<div id="empty">
+				<div class="left_img">
+					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+					<a href="#/index" title="B2B商务首页">B2B 商务</a>
+				</div>
+				<div class="right_link">
+					<p>当前没有对应的采购订单!</p>
+				</div>
+			</div>
+		</td>
+	</tr>
+	<tr>
+		<td colspan="6">
+			<div id="empty_info">
+				<div class="f16 text-center empty_title">
+					<p>为什么我没有采购订单?</p>
+				</div>
+				<div class="f14 empty_explain">
+					<div class="info">
+						<p>1、您的采购单在ERP系统上还没审核,订单无法上传到平台<br>
+							解决:采购员沟通确认单据是否已经审核(只有ERP中已经审核的单据才能接收到)</p>
 					</div>
-					<div class="col-md-8 br-l">
-						<div class="f16">
-							<p>为什么我没有采购订单?</p>
-						</div>
-						<div class="f14">
-							<div class="info">
-								<p>1、您的采购单在ERP系统上还没审核,订单无法上传到平台<br>
-								解决:采购员沟通确认单据是否已经审核(只有ERP中已经审核的单据才能接收到)</p>
-							</div>
-							<div class="info">
-								<p>2、ERP中供应商信息有误<br>
-								解决:与您的供应商沟通确认他的资料在供应商资料中是否维护正确,尤其是企业UU号</p>
-							</div>
-							<div class="info">
-								<p>3、您的供应商正在使用旧版本的UAS商务平台<br>
-								解决:我们仍有部分用户在使用旧版本UAS商务平台系统,你可以用您的企业UU号和管理员个人UU号 <a href="http://www.usoftchina.com" class="text-bold text-link" title="http://www.usoftchina.com" target="_blank">登陆旧版本UAS商务平台</a></p>
-							</div>
-						</div>
-						<br>
-						<br>
+					<div class="info">
+						<p>2、ERP中供应商信息有误<br>
+							解决:与您的供应商沟通确认他的资料在供应商资料中是否维护正确,尤其是企业UU号</p>
+					</div>
+					<div class="info">
+						<p>3、您的供应商正在使用旧版本的UAS商务平台<br>
+							解决:我们仍有部分用户在使用旧版本UAS商务平台系统,你可以用您的企业UU号和管理员个人UU号 <a href="http://www.usoftchina.com" class="text-bold text-link" title="http://www.usoftchina.com" target="_blank">登陆旧版本UAS商务平台</a></p>
 					</div>
 				</div>
-			</td>
-		</tr>
+			</div>
+		</td>
+	</tr>
 	</tbody>
 	<tbody ng-repeat="order in $data track by order.id">
 		<tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">

+ 15 - 0
src/main/webapp/resources/tpl/index/purc/prodList.html

@@ -259,6 +259,21 @@
                 <td colspan="5"></td>
             </tr>-->
             </thead>
+            <tbody ng-if="$data.length === 0">
+            <tr>
+                <td colspan="6">
+                    <div id="empty">
+                        <div class="left_img">
+                            <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                            <a href="#/index" title="B2B商务首页">B2B 商务</a>
+                        </div>
+                        <div class="right_link">
+                            <p>暂无对应的物料信息</p>
+                        </div>
+                    </div>
+                </td>
+            </tr>
+            </tbody>
             <tbody ng-repeat="product in $data">
             <tr class="order-hd">
             	<!--<td class="text-center"><input type="checkbox" ng-model="product.checked" ng-click="checkOne(product)" ng-disabled="product.cmpUuId != null"></td>-->

+ 27 - 24
src/main/webapp/resources/tpl/index/purc/pubInquiry.html

@@ -430,33 +430,36 @@ margin-left: 55px;
 		<tbody ng-if="tableParams.total() == 0">
 		<tr>
 			<td colspan="7">
-				<div class="row text-muted info-container" style="padding: 50px 10px;">
-					<div class="col-md-4 text-center">
-						<br>
-						<br>
-						<div><img src="static/img/all/info.png" width="130px" height="90px"></div>
-						<div class="f16">当前没有对应的客户询价单!</div>
+				<div id="empty">
+					<div class="left_img">
+						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+						<a href="#/index" title="B2B商务首页">B2B 商务</a>
 					</div>
-					<div class="col-md-8 br-l">
-						<div class="f16">
-							<p>为什么我没有接收到客户的询价单?</p>
+					<div class="right_link">
+						<p>当前没有对应的客户询价单!</p>
+					</div>
+				</div>
+			</td>
+		</tr>
+		<tr>
+			<td colspan="7">
+				<div id="empty_info">
+					<div class="f16 text-center empty_title">
+						<p>为什么我没有接收到客户的询价单?</p>
+					</div>
+					<div class="f14 empty_explain">
+						<div class="info">
+							<p>1、您的客户还没有提交审核询价单<br>
+								解决:与您的客户沟通确认单据是否已经审核(只有客户ERP中已经审核的单据才能接收到)</p>
+						</div>
+						<div class="info">
+							<p>2、客户ERP中供应商信息有误<br>
+								解决:与您的客户沟通确认您的信息在客户的供应商资料中是否维护正确,尤其是企业UU号</p>
 						</div>
-						<div class="f14">
-							<div class="info">
-								<p>1、您的客户还没有提交审核询价单<br>
-									解决:与您的客户沟通确认单据是否已经审核(只有客户ERP中已经审核的单据才能接收到)</p>
-							</div>
-							<div class="info">
-								<p>2、客户ERP中供应商信息有误<br>
-									解决:与您的客户沟通确认您的信息在客户的供应商资料中是否维护正确,尤其是企业UU号</p>
-							</div>
-							<div class="info">
-								<p>3、您的客户正在使用旧版本的UAS商务平台<br>
-									解决:我们仍有部分用户在使用旧版本UAS商务平台系统,你可以用您的企业UU号和管理员个人UU号 <a href="http://www.usoftchina.com" class="text-bold text-link" title="http://www.usoftchina.com" target="_blank">登陆旧版本UAS商务平台</a></p>
-							</div>
+						<div class="info">
+							<p>3、您的客户正在使用旧版本的UAS商务平台<br>
+								解决:我们仍有部分用户在使用旧版本UAS商务平台系统,你可以用您的企业UU号和管理员个人UU号 <a href="http://www.usoftchina.com" class="text-bold text-link" title="http://www.usoftchina.com" target="_blank">登陆旧版本UAS商务平台</a></p>
 						</div>
-						<br>
-						<br>
 					</div>
 				</div>
 			</td>

+ 0 - 14
src/main/webapp/resources/tpl/index/purc/pubInquiry_detail.html

@@ -143,20 +143,6 @@
 	outline: none;
 }
 
-.com_head {
-	width: 100%;
-	height: 40px;
-	line-height: 42px;
-	background: url(static/img/comm_bg01.png) no-repeat center;
-	background-size: 100%;
-}
-
-.com_head span {
-	margin-left: 20px;
-	color: #000;
-	font-size: 14px;
-}
-
 .com_head a {
 	color: #327ebe;
 	float: right;

+ 15 - 24
src/main/webapp/resources/tpl/index/purc/pubInquiry_new.html

@@ -297,20 +297,6 @@ input[type="radio"], input[type="checkbox"] {
 	width: 400px;
 }
 
-.com_head {
-	width: 100%;
-	height: 40px;
-	line-height: 42px;
-	background: url(static/img/comm_bg01.png) no-repeat center;
-	background-size: 100%;
-}
-
-.com_head span {
-	margin-left: 20px;
-	color: #000;
-	font-size: 14px;
-}
-
 .com_head a {
 	color: #327ebe;
 	float: right;
@@ -1136,16 +1122,21 @@ select.disabled {
 				</tr>
 			</thead>
 			<tbody ng-if="tableParams.total() == 0">
-				<tr>
-					<td class="text-center" colspan="7" ng-if="tip != null">
-						<br>
-						<div class="text-muted" style="font-size: 14px;"><i class="fa fa-spinner"></i> 搜索"{{tip}}"未找到产品信息,请重新输入搜索条件</div>
-					</td>
-					<td class="text-center" colspan="7" ng-if="tip == null">
-						<br>
-						<div class="text-muted" style="font-size: 14px;"><i class="fa fa-spinner"></i> 暂无物料信息,<a ui-sref="sale.newProdInfo" target="_blank">立即添加</a></div>
-					</td>
-				</tr>
+            <tr>
+                <td colspan="7">
+                    <div id="empty">
+                        <div class="left_img">
+                            <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                            <a href="#/index" title="B2B商务首页">B2B 商务</a>
+                        </div>
+                        <div class="right_link">
+                            <p ng-if="tip != null">搜索"{{tip}}"未找到产品信息,请重新输入搜索条件</p>
+                            <p ng-if="tip == null">暂无对应的单据</p>
+                            <a ng-if="tip == null" ui-sref="sale.newProdInfo" target="_blank"><i class="way_icon"></i>立即添加</a>
+                        </div>
+                    </div>
+                </td>
+            </tr>
 			</tbody>
 			<tbody>
 				<tr ng-repeat="product in $data">

+ 14 - 24
src/main/webapp/resources/tpl/index/purc/purcinquiry_new.html

@@ -299,20 +299,6 @@ input[type="radio"], input[type="checkbox"] {
 	width: 400px;
 }
 
-.com_head {
-	width: 100%;
-	height: 40px;
-	line-height: 42px;
-	background: url(static/img/comm_bg01.png) no-repeat center;
-	background-size: 100%;
-}
-
-.com_head span {
-	margin-left: 20px;
-	color: #000;
-	font-size: 14px;
-}
-
 .com_head a {
 	color: #327ebe;
 	float: right;
@@ -1154,16 +1140,20 @@ select.disabled {
 				</tr>
 			</thead>
 			<tbody ng-if="tableParams.total() == 0">
-				<tr>
-					<td class="text-center" colspan="7" ng-if="tip != null">
-						<br>
-						<div class="text-muted" style="font-size: 14px;"><i class="fa fa-spinner"></i> 搜索"{{tip}}"未找到产品信息,请重新输入搜索条件</div>
-					</td>
-					<td class="text-center" colspan="7" ng-if="tip == null">
-						<br>
-						<div class="text-muted" style="font-size: 14px;"><i class="fa fa-spinner"></i> 您还未添加商品信息</div>
-					</td>
-				</tr>
+            <tr>
+                <td colspan="7">
+                    <div id="empty">
+                        <div class="left_img">
+                            <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                            <a href="#/index" title="B2B商务首页">B2B 商务</a>
+                        </div>
+                        <div class="right_link">
+                            <p ng-if="tip != null">搜索"{{tip}}"未找到产品信息,请重新输入搜索条件</p>
+                            <p ng-if="tip == null">您还未添加商品信息</p>
+                        </div>
+                    </div>
+                </td>
+            </tr>
 			</tbody>
 			<tbody>
 				<tr ng-repeat="product in $data">

+ 11 - 21
src/main/webapp/resources/tpl/index/purc/saved_tender.html

@@ -316,20 +316,6 @@
         color: #5078cb;
     }
 
-    .com_head {
-        width: 100%;
-        height: 40px;
-        line-height: 42px;
-        background: url(static/img/comm_bg01.png) no-repeat center;
-        background-size: 100%;
-    }
-
-    .com_head span {
-        margin-left: 20px;
-        color: #000;
-        font-size: 14px;
-    }
-
     .com_head a {
         color: #327ebe;
         float: right;
@@ -1038,13 +1024,17 @@
             </thead>
             <tbody ng-if="tableParams.total() == 0">
             <tr>
-                <td class="text-center" colspan="7" ng-if="tip != null">
-                    <br>
-                    <div class="text-muted" style="font-size: 14px;"><i class="fa fa-spinner"></i> 搜索"{{tip}}"未找到产品信息,请重新输入搜索条件</div>
-                </td>
-                <td class="text-center" colspan="7" ng-if="tip == null">
-                    <br>
-                    <div class="text-muted" style="font-size: 14px;"><i class="fa fa-spinner"></i> 您还未添加商品信息</div>
+                <td colspan="5">
+                    <div id="empty">
+                        <div class="left_img">
+                            <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                            <a href="#/index" title="B2B商务首页">B2B 商务</a>
+                        </div>
+                        <div class="right_link">
+                            <p ng-if="tip != null">搜索"{{tip}}"未找到产品信息,请重新输入搜索条件</p>
+                            <p ng-if="tip == null">您还未添加商品信息</p>
+                        </div>
+                    </div>
                 </td>
             </tr>
             </tbody>

+ 11 - 21
src/main/webapp/resources/tpl/index/purc/tender.html

@@ -316,20 +316,6 @@ input[type="radio"], input[type="checkbox"] {
     color: #5078cb;
 }
 
-.com_head {
-	width: 100%;
-	height: 40px;
-	line-height: 42px;
-	background: url(static/img/comm_bg01.png) no-repeat center;
-	background-size: 100%;
-}
-
-.com_head span {
-	margin-left: 20px;
-	color: #000;
-	font-size: 14px;
-}
-
 .com_head a {
 	color: #327ebe;
 	float: right;
@@ -1071,13 +1057,17 @@ input[type="radio"], input[type="checkbox"] {
             </thead>
             <tbody ng-if="tableParams.total() == 0">
             <tr>
-                <td class="text-center" colspan="7" ng-if="tip != null">
-                    <br>
-                    <div class="text-muted" style="font-size: 14px;"><i class="fa fa-spinner"></i> 搜索"{{tip}}"未找到产品信息,请重新输入搜索条件</div>
-                </td>
-                <td class="text-center" colspan="7" ng-if="tip == null">
-                    <br>
-                    <div class="text-muted" style="font-size: 14px;"><i class="fa fa-spinner"></i> 您还未添加商品信息</div>
+                <td colspan="5">
+                    <div id="empty">
+                        <div class="left_img">
+                            <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                            <a href="#/index" title="B2B商务首页">B2B 商务</a>
+                        </div>
+                        <div class="right_link">
+                            <p ng-if="tip != null">搜索"{{tip}}"未找到产品信息,请重新输入搜索条件</p>
+                            <p ng-if="tip == null">您还未添加商品信息</p>
+                        </div>
+                    </div>
                 </td>
             </tr>
             </tbody>

+ 0 - 4
src/main/webapp/resources/tpl/index/purc/tender_answer_detail.html

@@ -160,10 +160,6 @@
         border: none;
     }
 
-
-
-    .com_head{width:100%;height:40px;line-height:42px;background:url(static/img/comm_bg01.png) no-repeat center;background-size: 100%;}
-    .com_head span{margin-left:20px;color:#000;font-size:14px;}
     .com_head a{color:#327ebe;float:right;margin-right:40px;font-size: 14px;}
     .com_head a i{margin-left: 5px;line-height: 40px;}
     .com_head a:hover{color: #d2272d;}

+ 15 - 10
src/main/webapp/resources/tpl/index/purc/tender_answer_list.html

@@ -343,17 +343,22 @@
             <tbody ng-if="tableParams.total() == 0">
             <tr>
                 <td colspan="6">
-                    <div class="row text-muted info-container" style="padding: 50px 10px;">
-                        <div class="col-md-4 text-center">
-                            <br>
-                            <br>
-                            <div><img src="static/img/all/info.png" width="130px" height="90px"></div>
-                            <div class="f16">当前没有对应的提问单!</div>
+                    <div id="empty">
+                        <div class="left_img">
+                            <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                            <a href="#/index" title="B2B商务首页">B2B 商务</a>
                         </div>
-                        <div class="col-md-8 br-l">
-                            <div class="f16">
-                                <p>尚无投标方对招标单发起提问!</p>
-                            </div>
+                        <div class="right_link">
+                            <p>当前没有对应的提问单!</p>
+                        </div>
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="6">
+                    <div id="empty_info">
+                        <div class="f16 text-center empty_title">
+                            <p>尚无投标方对招标单发起提问!</p>
                         </div>
                     </div>
                 </td>

Some files were not shown because too many files changed in this diff