支付手续费提示修改

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

@@ -910,6 +910,7 @@ define(['app/app'], function(app) {
 		$scope.calculateTotal = function () {
 			$scope.order.totalprice = 0;
 			$scope.storePrice = {};
+            $scope.poundageList = {};//手续费列表
 			angular.forEach($scope.order.orderDetails, function(detail) {
 				detail.ensurePrice = Number(NumberService.mul(detail.taxUnitprice, detail.number));
 				if(!$scope.storePrice[detail.storeName]) {
@@ -952,6 +953,15 @@ define(['app/app'], function(app) {
 				toaster.pop('info', '提示 ' + '您已取消编辑发票信息');
 			});
 		};
+
+		$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_pay.html

@@ -176,7 +176,7 @@
 		width: auto;
 		position: relative;
 		bottom: 22px;
-		margin-right: 20px;
+		/*margin-right: 20px;*/
 	}
 	.sure_oder .oder_xq_list dl span.total-price p{
 		line-height: 25px;
@@ -191,7 +191,7 @@
 	}
 	.sure_oder .oder_xq_list dl span.total-price p em{
 		color: #333;
-		width: 94px;
+		width: 150px;
 		text-align: left;
 	}
 	.pay_price a:hover{
@@ -302,7 +302,7 @@
 		display: inline-block;
 		float: left;
 		color: #666;
-		padding-right: 22px;
+		padding-right: 15px;
 	}
 	.sure_oder .oder_xq_list dl span.total-price strong .price-down {
 		display: inline-block;
@@ -904,7 +904,7 @@
 										<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>{{order.currency == 'RMB' ? '￥ ':'$'}}0.00（<i class="price-down-tag" ng-bind="getMul(getAdd(storePrice[key], fareList[details[0].storeid]), 0.00453) | formateNumber :2 | currencySysmbol : order.currency.substring(0,3)">$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>
@@ -914,7 +914,7 @@
 									</div>
 								</p>
 								<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="getAdd(storePrice[key], fareList[details[0].storeid]) | formateNumber :2 | currencySysmbol : order.currency.substring(0,3)"></em>
 									<em ng-if="order.status!=501">
 										<em ng-if="storeArray.length == 1" ng-bind="order.ensurePrice | formateNumber :2 | currencySysmbol : order.currency.substring(0,3)"></em>
 										<em ng-if="storeArray.length != 1" ng-bind="storePrice[key] + deliveryList[details[0].storeid].fare | formateNumber :2 | currencySysmbol : order.currency.substring(0,3)"></em>