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

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

@@ -38,6 +38,14 @@ a {
 [ng-click] {
 	cursor: pointer;
 }
+
+.br-r {
+	border-right: 1px solid #e6e6e6;
+}
+
+.br-l {
+	border-left: 1px solid #e6e6e6;
+}
 /*inverse*/
 .text-default {
 	color: #56a022;
@@ -59,6 +67,11 @@ a {
 	color: #aaa;
 }
 
+.text-num {
+	font-style: normal;
+	font-family: verdana;
+}
+
 .text-small {
 	font-size: 10px;
 	font-family: "microsoft yahei";
@@ -67,6 +80,10 @@ a {
 	transform: scale(0.83);
 }
 
+.text-bold {
+	font-weight: 700;
+}
+
 .text-border-success {
 	border: 1px solid #f40;
 	color: #f40;

src/main/webapp/resources/tpl/index/sale/order.html

@@ -84,93 +84,140 @@
 	font-family: verdana;
 }
 
-.order-table .order-hd .order-time {
-	font-weight: 700;
-	font-family: verdana;
+.order-table .order-bd {
+	border-bottom: 1px solid #e6e6e6;
+}
+
+.order-table .order-bd td{
+	padding: 10px 5px;
+	overflow: hidden;
+	vertical-align: top;
+}
+
+.order-table .order-bd .product {
+	padding-left: 20px;
 }
 </style>
 	<table class="order-table block">
 		<thead>
 			<tr class="header">
-				<th class="baobei">宝贝</th>
-				<th class="price">单价(元)</th>
-				<th class="quantity">数量</th>
-				<th class="item-operate">商品操作</th>
-				<th class="amount">实付款(元)</th>
-				<th class="trade-status">交易状态</th>
-				<th class="trade-operate">交易操作</th>
+				<th>商品</th>
+				<th>单价</th>
+				<th>数量</th>
+				<th>交货日期</th>
+				<th>回复状态</th>
 			</tr>
 			<tr class="sep-row">
-				<td colspan="7"></td>
+				<td colspan="5"></td>
 			</tr>
 			<tr class="toolbar toolbar-top">
-				<td colspan="7">
+				<td colspan="5">
 					<div class="operates">
 						<label><input type="checkbox" class="selector select_all">全选</label>
-						<a href="javascript:void(0)" class="btn btn-default btn-xs">合并付款</a>
-						<a href="javascript:void(0)" class="btn btn-default btn-xs">合并代付</a>
-						<a href="javascript:void(0)" class="btn btn-default btn-xs">批量确认收货</a>
+						<a href="javascript:void(0)" class="btn btn-default btn-xs">批量回复</a>
 					</div> <!-- 分页 -->
 				</td>
 			</tr>
 		</thead>
 		<tbody>
 			<tr class="sep-row">
-				<td colspan="7"></td>
+				<td colspan="5"></td>
 			</tr>
 			<tr class="order-hd">
 				<td class="first">
 					<div class="order-main">
 						<span> <input type="checkbox" class="selector">
-						</span> <span class="order-time" title="2015-01-11 20:26">2015-01-11</span>
-						<span>订单号：<em class="order-code">933264676769308</em></span>
+						</span> <span class="text-num text-bold" title="2015-01-11 20:26">2015-01-11</span>
+						<span>订单号：<em class="text-num">933264676769308</em></span>
 					</div>
 				</td>
-				<td class="column" colspan="4"><a href="#">中国移动官方旗舰店</a></td>
-				<td colspan="2"></td>
+				<td class="column" colspan="3"><a href="#">中国移动官方旗舰店</a></td>
+				<td colspan="1"></td>
 			</tr>
 			<tr class="order-bd">
 				<td class="product">
-					<div class="desc">
-						<p class="product-name">
-							<a href="#"> 广东移动 </a>
-						</p>
-						<div class="product-spec" title="">手机 话费充值 50元 快充直充
-							24小时自动充即时到账</div>
+					<div class="text-num text-bold">
+						<a href="#"> 1.0125301S.T015</a>
 					</div>
+					<div>
+						<a href="#"> 广东移动 </a>
+					</div>
+					<div class="text-muted" title="">手机 话费充值 50元
+						快充直充 24小时自动充即时到账</div>
 				</td>
-				<td class="price" title="49.50">49.50</td>
-				<td class="quantity" title="1">1</td>
-				<td class="item-operate"><a href="#">申请售后 </a> <a href="#">投诉卖家</a>
-				</td>
-				<td class="amount" rowspan="1">
-					<p>
-						<em class="real-price special-num"> 49.50 </em>
-					</p> </a>
-				</td>
-				<td class="trade-status" rowspan="1"><a href="#"> 交易成功 </a> <span>
-						<a href="#"> 订单详情 </a>
-				</span></td>
-				<td class="trade-operate"><a href="#">追加评论</a> <a href="#">再次购买</a>
+				<td class="text-center text-num" title="49.50">49.50</td>
+				<td class="text-center text-num" title="1">1</td>
+				<td class="text-center text-num br-l">2015-03-01</td>
+				<td class="text-center br-l"><div>数量完成48%</div>
+					<div>交期未达标</div></td>
+			</tr>
+			<tr class="order-bd">
+				<td class="product">
+					<div class="text-num text-bold">
+						<a href="#"> 1.0125301S.T015</a>
+					</div>
+					<div>
+						<a href="#"> 广东移动 </a>
+					</div>
+					<div class="text-muted" title="">手机 话费充值 50元
+						快充直充 24小时自动充即时到账</div>
 				</td>
+				<td class="text-center text-num" title="49.50">49.50</td>
+				<td class="text-center text-num" title="1">1</td>
+				<td class="text-center text-num br-l">2015-03-01</td>
+				<td class="text-center br-l"><div>数量完成48%</div>
+					<div>交期未达标</div></td>
 			</tr>
 		</tbody>
-
-		<tfoot>
+		<tbody>
 			<tr class="sep-row">
-				<td colspan="7"></td>
+				<td colspan="5"></td>
 			</tr>
-			<tr class="toolbar toolbar-bottom">
-				<td colspan="7">
-					<div class="operates">
-						<label><input type="checkbox" class="selector select_all">全选</label>
-						<a href="javascript:void(0)" class="btn btn-default btn-xs">合并付款</a>
-						<a href="javascript:void(0)" class="btn btn-default btn-xs">合并代付</a>
-						<a href="javascript:void(0)" class="btn btn-default btn-xs">批量确认收货</a>
-					</div> <!-- 分页 -->
+			<tr class="order-hd">
+				<td class="first">
+					<div class="order-main">
+						<span> <input type="checkbox" class="selector">
+						</span> <span class="text-num text-bold" title="2015-01-11 20:26">2015-01-11</span>
+						<span>订单号：<em class="text-num">933264676769308</em></span>
+					</div>
 				</td>
+				<td class="column" colspan="3"><a href="#">中国移动官方旗舰店</a></td>
+				<td colspan="1"></td>
 			</tr>
-		</tfoot>
-
+			<tr class="order-bd">
+				<td class="product">
+					<div class="text-num text-bold">
+						<a href="#"> 1.0125301S.T015</a>
+					</div>
+					<div>
+						<a href="#"> 广东移动 </a>
+					</div>
+					<div class="text-muted" title="">手机 话费充值 50元
+						快充直充 24小时自动充即时到账</div>
+				</td>
+				<td class="text-center text-num" title="49.50">49.50</td>
+				<td class="text-center text-num" title="1">1</td>
+				<td class="text-center text-num br-l">2015-03-01</td>
+				<td class="text-center br-l"><div>数量完成48%</div>
+					<div>交期未达标</div></td>
+			</tr>
+			<tr class="order-bd">
+				<td class="product">
+					<div class="text-num text-bold">
+						<a href="#"> 1.0125301S.T015</a>
+					</div>
+					<div>
+						<a href="#"> 广东移动 </a>
+					</div>
+					<div class="text-muted" title="">手机 话费充值 50元
+						快充直充 24小时自动充即时到账</div>
+				</td>
+				<td class="text-center text-num" title="49.50">49.50</td>
+				<td class="text-center text-num" title="1">1</td>
+				<td class="text-center text-num br-l">2015-03-01</td>
+				<td class="text-center br-l"><div>数量完成48%</div>
+					<div>交期未达标</div></td>
+			</tr>
+		</tbody>
 	</table>
 </div>