手续费

src/main/webapp/resources/css/common.css

@@ -966,4 +966,93 @@ input[type="number"]{
 }
 select {
 	-moz-appearance: none;
+}
+
+/*买卖家订单详情及结算页手续费样式*/
+.oder_xq_list dl span.total-price{
+	float: right;
+	width: auto !important;
+	position: relative;
+	bottom: 22px;
+	z-index: 10;
+	/*margin-right: 20px;*/
+}
+.oder_xq_list dl span.total-price p{
+	line-height: 25px;
+	font-size: 14px;
+	text-align: right;
+}
+.oder_xq_list dl span.total-price p:last-child,
+.oder_xq_list dl span.total-price p:last-child em,
+.oder_xq_list dl span.total-price p:last-child strong{
+	color: #e64040;
+	font-weight: bold;
+}
+.oder_xq_list dl span.total-price p em{
+	color: #333;
+	width: 150px;
+	text-align: left;
+}
+.oder_xq_list dl span.total-price strong{
+	font-weight: normal;
+	width: 200px;
+	display: inline-block;
+	float: left;
+	color: #666;
+	padding-right: 15px;
+}
+.oder_xq_list dl span.total-price strong .price-down {
+	display: inline-block;
+	width: 32px;
+	height: 16px;
+	line-height: 16px;
+	text-align: center;
+	color: #fff;
+	background: #36ab67;
+	border-radius: 2px;
+	float: none;
+	font-size: 12px;
+	margin-right: 6px;
+	cursor: pointer;
+}
+.oder_xq_list dl span.total-price .price-down-tag {
+	text-decoration: line-through;
+	margin: 0;
+	font-size: 14px;
+}
+.oder_xq_list dl span.total-price .remind-tag {
+	position: absolute;
+	background: #fff;
+	padding: 12px;
+	border: 1px solid #d3e2fc;
+	top: 54px;
+}
+.oder_xq_list dl span.total-price .remind-tag .remind-tag-content {
+	text-align: left;
+	line-height: 21px;
+}
+.oder_xq_list dl span.total-price .remind-tag .remind-tag-content.red-text {
+	color: #ef2324;
+}
+.oder_xq_list dl span.total-price .remind-tag.intro {
+	left: -46px;
+}
+.oder_xq_list dl span.total-price .remind-tag.intro .remind-tag-content{
+	max-width: 214px;
+}
+.oder_xq_list dl span.total-price .remind-tag.activity {
+	left: 0;
+}
+.oder_xq_list dl span.total-price .remind-tag.activity .remind-tag-content{
+	max-width: 173px;
+}
+.oder_xq_list dl span.total-price strong .fa {
+	font-size: 19px;
+	color: #cdddfc;
+	margin-right: 5px;
+	vertical-align: middle;
+	cursor: pointer;
+}
+.oder_xq_list dl span.total-price em{
+	float: left;
 }

src/main/webapp/resources/js/common/controllers/commonCtrls.js

@@ -1751,6 +1751,23 @@ define([ 'app/app' ], function(app) {
 		};
 	}]);
 
+	// 手续费控制器
+	app.controller('poundageCtrl', ["$scope", "NumberService", function($scope, NumberService){
+		// 手续费介绍提示框
+		$scope.showRemindTagIntro = false;
+
+		// 手续费减免提示框
+		$scope.showRemindTagActivity = false;
+
+		$scope.getMul = function (val1, val2) {
+			return NumberService.mul(Number(val1), Number(val2));
+		}
+
+		$scope.getAdd = function (val1, val2) {
+			return NumberService.add(Number(val1), Number(val2));
+		}
+	}]);
+
   /**
    * 左侧导航栏控制器
    */

src/main/webapp/resources/js/usercenter/controllers/forstore/order_pay_ctrl.js

@@ -10,12 +10,6 @@ define(['app/app'], function(app) {
 
 		$scope.payment = {};
 
-		// 手续费介绍提示框
-		$scope.showRemindTagIntro = false;
-
-		// 手续费减免提示框
-		$scope.showRemindTagActivity = false;
-
 		//订单加密解析器
 		var enIdFilter = $filter('EncryptionFilter');
 
@@ -954,14 +948,6 @@ define(['app/app'], function(app) {
 			});
 		};
 
-		$scope.getMul = function (val1, val2) {
-			return NumberService.mul(val1, val2);
-        }
-
-        $scope.getAdd = function (val1, val2) {
-            return NumberService.add(val1, val2);
-        }
-
 	}]);
 
 	//地址编辑模态框

src/main/webapp/resources/view/usercenter/forstore/order_detail.html

@@ -120,34 +120,6 @@
 		color: #333 !important;
 		margin-left: 40px;
 	}
-	.oder_xq_list dl span.total-price{
-		float: right;
-		width: auto !important;
-		position: relative;
-		bottom: 10px;
-		margin-right: 20px;
-	}
-	.oder_xq_list dl span.total-price p{
-		line-height: 25px;
-		font-size: 14px;
-		text-align: right;
-		font-weight: bold;
-		display: flex;
-	}
-	.oder_xq_list dl span.total-price p:first-child em{
-		color: #333;
-	}
-	.oder_xq_list dl span.total-price p:last-child{
-		color: #e64040;
-	}
-	.oder_xq_list dl span.total-price p em{
-		color: #e64040;
-	}
-	.oder_xq_list dl span.total-price strong {
-		width: 70px;
-		display: inline-block;
-		float: left;
-	}
 	.open-more{
 		text-align: center;
 		background: #f6f9ff;
@@ -503,6 +475,21 @@
 									<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>
 								</p>
+								<p>
+									<strong>
+										<i class="fa fa-exclamation-circle"></i>
+										<span class="price-down">减免</span>
+										手续费：
+									</strong>
+									<em>$0.00（<i class="price-down-tag">$1.11</i>）</em>
+									<div class="remind-tag intro">
+										<div class="remind-tag-content">手续费：是指第三方支付机构在交易过程中，按照一定的百分比进行收取的费用。</div>
+										<div class="remind-tag-content red-text">手续费金额=订单金额 * 0.45%</div>
+									</div>
+								<!--<div class="remind-tag activity">
+									<div class="remind-tag-content">活动期间，减免手续费，已由商城支付给第三方机构。</div>
+								</div>-->
+								</p>
 								<p><strong>店铺合计：</strong>
 									<em ng-bind="order.ensurePrice | formateNumber : 2 | currencySysmbol : order.currency" style="font-weight: bold"></em>
 								</p>

src/main/webapp/resources/view/usercenter/forstore/order_pay.html

@@ -171,29 +171,6 @@
 	.sure_oder .select{
 		padding-left: 15px;
 	}
-	.sure_oder .oder_xq_list dl span.total-price{
-		float: right;
-		width: auto;
-		position: relative;
-		bottom: 22px;
-		/*margin-right: 20px;*/
-	}
-	.sure_oder .oder_xq_list dl span.total-price p{
-		line-height: 25px;
-		font-size: 14px;
-		text-align: right;
-	}
-	.sure_oder .oder_xq_list dl span.total-price p:last-child,
-	.sure_oder .oder_xq_list dl span.total-price p:last-child em,
-	.sure_oder .oder_xq_list dl span.total-price p:last-child strong{
-		color: #e64040;
-		font-weight: bold;
-	}
-	.sure_oder .oder_xq_list dl span.total-price p em{
-		color: #333;
-		width: 150px;
-		text-align: left;
-	}
 	.pay_price a:hover{
 		color: #fff !important;
 		opacity: .9;
@@ -296,69 +273,6 @@
 		margin-top: 10px;
 		margin-left: 4px;
 	}
-	.sure_oder .oder_xq_list dl span.total-price strong{
-		font-weight: normal;
-		width: 200px;
-		display: inline-block;
-		float: left;
-		color: #666;
-		padding-right: 15px;
-	}
-	.sure_oder .oder_xq_list dl span.total-price strong .price-down {
-		display: inline-block;
-		width: 32px;
-		height: 16px;
-		line-height: 16px;
-		text-align: center;
-		color: #fff;
-		background: #36ab67;
-		border-radius: 2px;
-		float: none;
-		font-size: 12px;
-		margin-right: 6px;
-		cursor: pointer;
-	}
-	.sure_oder .oder_xq_list dl span.total-price .price-down-tag {
-		text-decoration: line-through;
-		margin: 0;
-		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 {
-		font-size: 19px;
-		color: #cdddfc;
-		margin-right: 5px;
-		vertical-align: middle;
-		cursor: pointer;
-	}
-	.sure_oder .oder_xq_list dl span.total-price em{
-		float: left;
-	}
 	.oder_xq_list dl .oder_l{
 		background: #f6f9ff;
 		border-bottom: #fff 1px solid;
@@ -887,7 +801,7 @@
 								</i>
 								<!--<button ng-click="getRule(order.storeid)">获取配送规则</button>-->
 							</span>
-							<span class="total-price">
+							<span class="total-price" ng-controller="poundageCtrl">
 								<p><strong>运费：</strong>
 									<em ng-if="order.status==501 && deliveryList[details[0].storeid].fareType == 3" style="color:#e64040">到付</em>
 									<em ng-if="order.status==501 && deliveryList[details[0].storeid].fareType != 3" ng-bind="fareList[details[0].storeid] | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)"></em>

src/main/webapp/resources/view/vendor/forstore/purchase_detail.html

@@ -159,34 +159,6 @@
 		color: #333 !important;
 		margin-left: 40px;
 	}
-	.oder_xq_list dl span.total-price{
-		float: right;
-		width: auto !important;
-		position: relative;
-		bottom: 10px;
-		margin-right: 20px;
-	}
-	.oder_xq_list dl span.total-price p{
-		line-height: 25px;
-		font-size: 14px;
-		text-align: right;
-		font-weight: bold;
-		display: flex;
-	}
-	.oder_xq_list dl span.total-price p:first-child em{
-		color: #333;
-	}
-	.oder_xq_list dl span.total-price p:last-child{
-		color: #e64040;
-	}
-	.oder_xq_list dl span.total-price p em{
-		color: #e64040;
-	}
-	.oder_xq_list dl span.total-price strong {
-		width: 70px;
-		display: inline-block;
-		float: left;
-	}
 	.oder_xq_list dl span.user-address{
 		width: 100% !important;
 		line-height: 30px;
@@ -560,6 +532,21 @@
 									<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>
 								</p>
+								<p>
+									<strong>
+										<i class="fa fa-exclamation-circle"></i>
+										<span class="price-down">减免</span>
+										手续费：
+									</strong>
+									<em>$0.00（<i class="price-down-tag">$1.11</i>）</em>
+									<div class="remind-tag intro">
+										<div class="remind-tag-content">手续费：是指第三方支付机构在交易过程中，按照一定的百分比进行收取的费用。</div>
+										<div class="remind-tag-content red-text">手续费金额=订单金额 * 0.45%</div>
+									</div>
+									<!--<div class="remind-tag activity">
+										<div class="remind-tag-content">活动期间，减免手续费，已由商城支付给第三方机构。</div>
+									</div>-->
+								</p>
 								<p><strong>店铺合计：</strong>
 									<em ng-if="!isChange" ng-bind="purchase.ensurePrice | formateNumber : 2 | currencySysmbol : purchase.currency" style="font-weight: bold"></em>
 									<em ng-if="isChange" ng-bind="purchase.currentTotal | formateNumber : 2 | currencySysmbol : purchase.currency" style="font-weight: bold"></em>