yangc před 8 roky
rodič
revize
86724521ae

+ 1 - 1
src/main/webapp/resources/css/common.css

@@ -1018,7 +1018,7 @@ select {
 .oder_xq_list dl span.total-price .price-down-tag {
 	text-decoration: line-through;
 	margin: 0;
-	font-size: 14px;
+	font-size: 12px;
 }
 .oder_xq_list dl span.total-price .remind-tag {
 	position: absolute;

+ 1 - 1
src/main/webapp/resources/css/user/user.css

@@ -3413,7 +3413,6 @@ body {
 .sure_oder .oder_xq_list dl dd.pay_price {
     width: 100%;
     min-height: 240px;
-    padding-top: 20px;
     border-bottom: none;
 }
 
@@ -3434,6 +3433,7 @@ body {
 .pay_price div h4 em {
     color: #dd2727;
     font-size: 36px;
+    font-weight: bold;
 }
 
 .pay_price p {

binární
src/main/webapp/resources/img/user/bulb.png


+ 2 - 2
src/main/webapp/resources/view/usercenter/forstore/order_detail.html

@@ -472,8 +472,8 @@
 						</span>
 						<span class="total-price" ng-controller="poundageCtrl">
 								<p><strong>运费:</strong>
-									<em ng-if="rule && rule.fareType != 3" ng-bind="order.fare | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)" style="font-weight: bold"></em>
-									<em ng-if="rule && rule.fareType == 3"  style="font-weight: bold;color:#e64040">到付</em>
+									<em ng-if="rule && rule.fareType != 3" ng-bind="order.fare | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)"></em>
+									<em ng-if="rule && rule.fareType == 3" >到付</em>
 								</p>
 								<p>
 									<strong>

+ 26 - 3
src/main/webapp/resources/view/usercenter/forstore/order_pay.html

@@ -237,21 +237,25 @@
 	.pay_price div{
 		max-width: 490px;
 		width: auto;
-		min-height: 106px;
-		padding: 10px 10px 5px;
+		min-height: 133px;
+		padding: 29px 10px;
 	}
 	.pay_price h4,.pay_price p{
 		text-align: right;
 	}
 	.sure_oder .oder_xq_list dl dd.pay_price{
 		display: inline-block;
-		min-height: 170px;
+		min-height: 237px;
 	}
 	.pay_price div p{
 		float: left;
 		height: auto;
 		line-height: 25px;
 	}
+	.pay_price .bulb-remind {
+		padding-right: 80px;
+		font-size: 14px;
+	}
 	.oder-remark{
 		height: 30px;
 		border-bottom: none !important;
@@ -287,6 +291,7 @@
 		border-bottom: none;
 	}
 	.pay_price div{
+		min-height: unset;
 		margin-right: 0;
 	}
 	.pay_price div h6{
@@ -581,6 +586,23 @@
 	.oder_xq_list dl span a.unstand:hover b{
 		color: #323232!important;
 	}
+	.pay_price div {
+		width: 100%;
+		max-width: unset;
+		border: none;
+		background: #faf8f8;
+		text-align: right;
+	}
+	.pay_price div h6 {
+		font-size: 14px;
+		text-align: right;
+		line-height: 24px;
+		display: inline-block;
+		margin-left: 20px;
+	}
+	.pay_price div h6 strong {
+		font-weight: normal;
+	}
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr" id="pay-cart">
@@ -911,6 +933,7 @@
 								</select>
 							</span>
 							<a ng-click="confirmPay()">提交订单</a></p>
+						<p class="bulb-remind"><img src="static/img/user/bulb.png" alt="">若价格变动,请在订单提交后联系卖家改价</p>
 					</dd>
 				</dl>
 			</div>

+ 2 - 2
src/main/webapp/resources/view/vendor/forstore/purchase_detail.html

@@ -529,8 +529,8 @@
 						</span>
 						<span class="total-price" ng-controller="poundageCtrl">
 								<p><strong>运费:</strong>
-									<em ng-if="!rule || rule.fareType != 3" ng-bind="purchase.fare | formateNumber : 2 | currencySysmbol : purchase.currency.substring(0,3)" style="font-weight: bold"></em>
-									<em ng-if="rule && rule.fareType == 3" style="font-weight: bold;color:#e64040">到付</em>
+									<em ng-if="!rule || rule.fareType != 3" ng-bind="purchase.fare | formateNumber : 2 | currencySysmbol : purchase.currency.substring(0,3)"></em>
+									<em ng-if="rule && rule.fareType == 3">到付</em>
 								</p>
 								<p>
 									<strong>