Home Explore Help
Register Sign In
usoft
/
platform-b2b
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

administrator 11 years ago
parent
ac1b4e513c
commit
8e791f95b6
5 changed files with 108 additions and 14 deletions
Split View Show Diff Stats
  1. 2 2
      src/main/webapp/WEB-INF/views/normal/index.html
  2. 42 9
      src/main/webapp/resources/css/index.css
  3. 16 2
      src/main/webapp/resources/js/index/app.js
  4. 47 0
      src/main/webapp/resources/tpl/index/sale/index.html
  5. 1 1
      src/main/webapp/resources/tpl/index/sale/right.html

+ 2 - 2
src/main/webapp/WEB-INF/views/normal/index.html
View File 

@@ -12,7 +12,7 @@
 
 <link rel="stylesheet" href="static/lib/bootstrap/css/bootstrap.min.css" />

 <link rel="stylesheet"

 	href="static/lib/fontawesome/css/font-awesome.min.css" />

-<link rel="stylesheet" href="static/lib/angular/ng-table.min.css" />

+<link rel="stylesheet" href="static/lib/angular/ng-table.css" />

 <link rel="stylesheet" href="static/css/index.css" />

 </head>

 <body>

@@ -202,7 +202,7 @@
 
 					<li ng-class="{'active': routeState == 'user'}"><a

 						ui-sref="user">账户设置</a></li>

 					<li class="dropdown" ng-class="{'active': routeState == 'sale'}"><a

-						ui-sref="sale">销售管理</a> <!-- <ul class="dropdown-menu">

+						ui-sref="sale.index">销售管理</a> <!-- <ul class="dropdown-menu">

 							<li><a href="#">设置水印</a></li>

 							<li><a href="#">网店秀</a></li>

 							<li><a href="#">美图秀秀</a></li>

+ 42 - 9
src/main/webapp/resources/css/index.css
View File 

@@ -60,18 +60,18 @@ a {
 
 }

 

 .text-small {

-	font-size: 9px;

+	font-size: 10px;

 	font-family: "microsoft yahei";

-	-webkit-transform: scale(0.75);

-	-o-transform: scale(1);

-	transform: scale(0.75);

+	-webkit-transform: scale(0.83);

+	-o-transform: scale(0.83);

+	transform: scale(0.83);

 }

 

 .text-border-success {

 	border: 1px solid #f40;

 	color: #f40;

 	background-color: #fff;

-	padding: 0 2px;

+	padding: 2px 4px;

 }

 

 .form-control {

@@ -201,7 +201,7 @@ a {
 
 	color: #666;

 }

 

-.ac-legend tr>td{

+.ac-legend tr>td {

 	padding: 2px 0;

 	max-width: 120px;

 	overflow: hidden;

@@ -552,7 +552,7 @@ a {
 
 	text-align: center;

 }

 

-.user-count>li:not(:last-child) {

+.user-count>li:not (:last-child ) {

 	border-right: 1px solid #e8e8e8;

 }

 

@@ -713,7 +713,7 @@ a {
 
 	color: #2a6496;

 }

 

-.todo .todo-content>ul:not(:last-child) {

+.todo .todo-content>ul:not (:last-child ) {

 	border-bottom: 1px dashed #e8e8e8;

 	margin-bottom: 20px;

 }

@@ -865,7 +865,7 @@ a {
 
 	margin: 0;

 }

 

-#footer .list-inline>li:not(:last-child):after {

+#footer .list-inline>li:not (:last-child ):after {

 	margin-left: 15px;

 	content: "|"

 }

@@ -910,4 +910,37 @@ a {
 
 

 .table .text-right>span {

 	float: right;

+}

+/*sale */

+.sale .state {

+	margin-left: 0;

+}

+

+.sale .state .todo {

+	padding: 30px 0 15px 0;

+	border-right: 1px solid #e8e8e8;

+}

+

+.sale .state .todo>ul {

+	margin: 0 auto;

+}

+

+.sale .state .todo>ul>li {

+	width: 32%;

+	height: 60px;

+	border-left: 1px dashed #e6e6e6;

+	text-align: center;

+	position: relative;

+}

+

+.sale .state .todo>ul>li .title {

+	margin-bottom: 5px;

+}

+

+.sale .state .todo>ul>li:nth-child(3n+1) {

+	border-left: none;

+}

+

+.sale .state .level {

+	padding: 30px 0 15px 100px;

 }

+ 16 - 2
src/main/webapp/resources/js/index/app.js
View File 

@@ -36,17 +36,31 @@ define([ 'toaster', 'charts', 'ngTable', 'services', 'ui.router', 'ui.bootstrap'
 
 					templateUrl : "static/tpl/index/sale/right.html"

 				}

 			}

+		}).state('sale.index', {

+			url : "",

+			views : {

+				"sale-view" : {

+					templateUrl : "static/tpl/index/sale/index.html"

+				}

+			}

+		}).state('sale.home', {

+			url : "/",

+			views : {

+				"sale-view" : {

+					templateUrl : "static/tpl/index/sale/index.html"

+				}

+			}

 		}).state('sale.order', {

 			url : "/order",

 			views : {

-				"right-view" : {

+				"sale-view" : {

 					templateUrl : "static/tpl/index/sale/order.html"

 				}

 			}

 		}).state('sale.order.reply', {

 			url : "/reply",

 			views : {

-				"right-view" : {

+				"sale-view" : {

 					templateUrl : "static/tpl/index/sale/order.html"

 				}

 			}

+ 47 - 0
src/main/webapp/resources/tpl/index/sale/index.html
View File 

@@ -0,0 +1,47 @@
 
+<div class="sale">

+	<!-- 顶部状态 Start -->

+	<div class="row block state">

+		<div class="col-xs-6 todo">

+			<ul class="list-unstyled list-inline">

+				<li>

+					<div class="title">

+						<a href="#">待报价</a>

+					</div>

+					<div class="count">0</div>

+				</li>

+				<li>

+					<div class="title">

+						<a href="#">待发货</a>

+					</div>

+					<div class="count">0</div>

+				</li>

+				<li>

+					<div class="title">

+						<a href="#">待确认收货</a>

+					</div>

+					<div class="count">0</div>

+				</li>

+				<li>

+					<div class="title">

+						<a href="#">待回复</a>

+					</div>

+					<div class="count text-inverse">6</div>

+				</li>

+				<li>

+					<div class="title">

+						<a href="#">变更中</a>

+					</div>

+					<div class="count">0</div>

+				</li>

+				<li>

+					<div class="title">

+						<a href="#">退货中</a>

+					</div>

+					<div class="count">0</div>

+				</li>

+			</ul>

+		</div>

+		<div class="col-xs-6 level">2</div>

+	</div>

+	<!-- 顶部状态 End -->

+</div>

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/right.html
View File 

@@ -1 +1 @@
 
-<div ui-view="right-view"></div>
 
+<div ui-view="sale-view" class="sale-view"></div>