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

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

@@ -195,7 +195,7 @@
 					</div>
 					<div class="btn-group btn-group-sm">
 						<button type="button" class="btn btn-default btn-line"
-							ng-class="{'btn-info':active=='end'}" ng-click="setActive('end')">已结案</button>
+							ng-class="{'btn-info':active=='end'}" ng-click="setActive('end')">已取消</button>
 					</div>
 				</div>
 			</div>
@@ -429,7 +429,7 @@
 					<span class="text-trans success">已发货</span>
 				</div>
 				<div ng-if="notice.end" class="block">
-					<span class="text-trans warning">已结案</span>
+					<span class="text-trans warning">已取消</span>
 				</div>
 				<div ng-if="(!notice.endQty || notice.endQty<notice.qty) && !notice.end && !notice.waiting">
 					<div ng-show="!notice.$editing">