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

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

@@ -135,6 +135,15 @@ a.none:hover {
 	border-color: #7f64b5;
 }
 
+.text-ellipsis {
+	float: left;
+    width: 260px;
+    clear: left;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;	
+}
+
 .form-control {
 	border-color: #e1e1e1;
 }

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

@@ -1 +1 @@
-<div ui-view class="account-view"></div>
+<div ui-view class="account-view view-slide-in"></div>

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

@@ -259,7 +259,7 @@
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">
-			<th>商品</th>
+			<th width="280">商品</th>
 			<th width="120">备注</th>
 			<th width="240">数量</th>
 			<th width="90">价格</th>
@@ -338,7 +338,7 @@
 				<div>
 					<a ng-bind="::notice.orderItem.product.title"></a>
 				</div>
-				<div class="text-muted"
+				<div class="text-muted text-ellipsis"
 					ng-bind="::notice.orderItem.product.spec"></div>
 			</td>
 			<td class="text-center">
@@ -348,7 +348,7 @@
 						ng-model="notice.send.code" placeholder="送货单号">
 				</div>
 				<div style="margin: 5px auto" ng-if="notice.$editing" ng-click="autoCode(notice)">
-					<button style="width: 100%;" class="btn btn-default btn-xs">生产随机单号</button>
+					<button style="width: 100%;" class="btn btn-default btn-xs">生成随机单号</button>
 				</div>
 			</td>
 			<td class="br-l">

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

@@ -41,7 +41,7 @@
 				<td width="200">
 					<div ng-bind="::notice.orderItem.product.code"></div>
 					<div ng-bind="::notice.orderItem.product.title"></div>
-					<div class="text-muted" ng-bind="::notice.orderItem.product.spec"></div>
+					<div class="text-muted text-ellipsis" style="width: 180px;" ng-bind="::notice.orderItem.product.spec"></div>
 				</td>
 				<td width="80" class="text-center">
 					<div>