yangc 8 лет назад
Родитель
Сommit
623cd187c6

+ 6 - 0
src/main/webapp/resources/js/usercenter/controllers/forstore/order_pay_ctrl.js

@@ -10,6 +10,12 @@ define(['app/app'], function(app) {
 
 
 		$scope.payment = {};
 		$scope.payment = {};
 
 
+		// 手续费介绍提示框
+		$scope.showRemindTagIntro = false;
+
+		// 手续费减免提示框
+		$scope.showRemindTagActivity = false;
+
 		//订单加密解析器
 		//订单加密解析器
 		var enIdFilter = $filter('EncryptionFilter');
 		var enIdFilter = $filter('EncryptionFilter');
 
 

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

@@ -298,7 +298,7 @@
 	}
 	}
 	.sure_oder .oder_xq_list dl span.total-price strong{
 	.sure_oder .oder_xq_list dl span.total-price strong{
 		font-weight: normal;
 		font-weight: normal;
-		width: 150px;
+		width: 200px;
 		display: inline-block;
 		display: inline-block;
 		float: left;
 		float: left;
 		color: #666;
 		color: #666;
@@ -323,6 +323,32 @@
 		margin: 0;
 		margin: 0;
 		font-size: 14px;
 		font-size: 14px;
 	}
 	}
+	.sure_oder .oder_xq_list dl span.total-price .remind-tag {
+		position: absolute;
+		background: #fff;
+		padding: 12px;
+		border: 1px solid #d3e2fc;
+		top: 54px;
+	}
+	.sure_oder .oder_xq_list dl span.total-price .remind-tag .remind-tag-content {
+		text-align: left;
+		line-height: 21px;
+	}
+	.sure_oder .oder_xq_list dl span.total-price .remind-tag .remind-tag-content.red-text {
+		color: #ef2324;
+	}
+	.sure_oder .oder_xq_list dl span.total-price .remind-tag.intro {
+		left: -46px;
+	}
+	.sure_oder .oder_xq_list dl span.total-price .remind-tag.intro .remind-tag-content{
+		max-width: 214px;
+	}
+	.sure_oder .oder_xq_list dl span.total-price .remind-tag.activity {
+		left: 0;
+	}
+	.sure_oder .oder_xq_list dl span.total-price .remind-tag.activity .remind-tag-content{
+		max-width: 173px;
+	}
 	.sure_oder .oder_xq_list dl span.total-price strong .fa {
 	.sure_oder .oder_xq_list dl span.total-price strong .fa {
 		font-size: 19px;
 		font-size: 19px;
 		color: #cdddfc;
 		color: #cdddfc;
@@ -872,8 +898,20 @@
 										<em ng-if="deliveryList && deliveryList[details[0].storeid].fareType == 3" style="color:#e64040">到付</em>
 										<em ng-if="deliveryList && deliveryList[details[0].storeid].fareType == 3" style="color:#e64040">到付</em>
 									</em>
 									</em>
 								</p>
 								</p>
-								<p><strong><i class="fa fa-exclamation-circle"></i><span class="price-down">减免</span>手续费:</strong>
+								<p>
+									<strong>
+										<i class="fa fa-exclamation-circle" ng-mouseenter="showRemindTagIntro = true" ng-mouseleave="showRemindTagIntro = false"></i>
+										<span class="price-down" ng-mouseenter="showRemindTagActivity = true" ng-mouseleave="showRemindTagActivity = false">减免</span>
+										手续费:
+									</strong>
 									<em>$1.11(<i class="price-down-tag">$1.11</i>)</em>
 									<em>$1.11(<i class="price-down-tag">$1.11</i>)</em>
+									<div class="remind-tag intro" ng-show="showRemindTagIntro">
+										<div class="remind-tag-content">手续费:是指第三方支付机构在交易过程中,按照一定的百分比进行收取的费用。</div>
+										<div class="remind-tag-content red-text">手续费金额=订单金额 * 0.45%</div>
+									</div>
+									<div class="remind-tag activity" ng-show="showRemindTagActivity">
+										<div class="remind-tag-content">活动期间,减免手续费,已由商城支付给第三方机构。</div>
+									</div>
 								</p>
 								</p>
 								<p><strong>店铺合计:</strong>
 								<p><strong>店铺合计:</strong>
 									<em ng-if="order.status==501" ng-bind="storePrice[key] + fareList[details[0].storeid] | formateNumber :2 | currencySysmbol : order.currency.substring(0,3)"></em>
 									<em ng-if="order.status==501" ng-bind="storePrice[key] + fareList[details[0].storeid] | formateNumber :2 | currencySysmbol : order.currency.substring(0,3)"></em>