Просмотр исходного кода

Merge remote-tracking branch 'origin/release-20170915' into release-20170915

suntg 8 лет назад
Родитель
Сommit
924f999075
1 измененных файлов с 4 добавлено и 1 удалено
  1. 4 1
      src/main/webapp/resources/view/vendor/forstore/vendor_order.html

+ 4 - 1
src/main/webapp/resources/view/vendor/forstore/vendor_order.html

@@ -611,6 +611,9 @@
 	a.closeContact:hover > i {
 		color: white !important;
 	}
+	.conuter-box .content p{
+		line-height: 20px;
+	}
 </style>
 <div class="user_right fr">
 	<!--订单中心-->
@@ -829,7 +832,7 @@
 						<b style="float: none;">总共<em ng-bind="purchase.batchQty"></em>件商品</b>
 						<b style="float: none;">总金额:<em ng-bind="purchase.ensurePrice | formateNumber : 2 | currencySysmbol : purchase.currency"></em></b>
 					</dd>
-					<div class="com-del-box" ng-if="purchase.showGotoSettle && purchase.showTip == 1" style="display: block;">
+					<div class="conuter-box com-del-box" ng-if="purchase.showGotoSettle && purchase.showTip == 1" style="display: block;">
 						<div class="title">
 							<a ng-click="changeShow(purchase)"><i class="fa fa-close fa-lg"></i></a>
 						</div>