完善支付手续费提示添加

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

@@ -1760,7 +1760,7 @@ define([ 'app/app' ], function(app) {
 		$scope.showRemindTagActivity = false;
 
 		$scope.getMul = function (val1, val2) {
-			return NumberService.mul(Number(val1), Number(val2));
+			return NumberService.mul(Number(val1), Number(val2)) < 0.01 ? 0.01 : NumberService.mul(Number(val1), Number(val2));
 		}
 
 		$scope.getAdd = function (val1, val2) {

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

@@ -470,25 +470,25 @@
 						<span class="wd02" style="width: 60%; text-align: left; margin-left: 40px; line-height: 30px;">配送方式：<i ng-bind="deliveryMethod[order.deliverytype]"></i>
 							<i style="color: #999;" ng-if="rule" ng-bind="'(' + rule.ruleName + ')'">（满1000元包邮，未满足的订单收取运费20元）</i>
 						</span>
-						<span class="total-price">
+						<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>
 								</p>
 								<p>
 									<strong>
-										<i class="fa fa-exclamation-circle"></i>
-										<span class="price-down">减免</span>
+										<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>$0.00（<i class="price-down-tag">$1.11</i>）</em>
-									<div class="remind-tag intro">
+									<em>{{order.currency == 'RMB' ? '￥ ':'$'}}0.00（<i class="price-down-tag" ng-bind="getMul(order.ensurePrice, 0.00435) | formateNumber : 2 | currencySysmbol : order.currency">$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">
-									<div class="remind-tag-content">活动期间，减免手续费，已由商城支付给第三方机构。</div>
-								</div>-->
+									<div class="remind-tag activity" ng-show="showRemindTagActivity">
+										<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>

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

@@ -527,25 +527,25 @@
 						<span class="wd02" style="width: 60%; text-align: left; margin-left: 40px; line-height: 30px;">配送方式：<i ng-bind="deliveryMethod[purchase.sendType]"></i>
 							<i style="color: #999;" ng-if="rule" ng-bind="'(' + rule.ruleName + ')'">（满1000元包邮，未满足的订单收取运费20元）</i>
 						</span>
-						<span class="total-price">
+						<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>
 								</p>
 								<p>
 									<strong>
-										<i class="fa fa-exclamation-circle"></i>
-										<span class="price-down">减免</span>
+										<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>$0.00（<i class="price-down-tag">$1.11</i>）</em>
-									<div class="remind-tag intro">
+									<em>{{purchase.currency == 'RMB' ? '￥ ':'$'}}0.00（<i ng-if="!isChange" ng-bind="getMul(purchase.ensurePrice, 0.00453) | formateNumber : 2 | currencySysmbol : purchase.currency" class="price-down-tag">$1.11</i><i ng-bind="getMul(purchase.currentTotal, 0.00453) | formateNumber : 2 | currencySysmbol : purchase.currency" ng-if="isChange" 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">
+									<div class="remind-tag activity" ng-show="showRemindTagActivity">
 										<div class="remind-tag-content">活动期间，减免手续费，已由商城支付给第三方机构。</div>
-									</div>-->
+									</div>
 								</p>
 								<p><strong>店铺合计：</strong>
 									<em ng-if="!isChange" ng-bind="purchase.ensurePrice | formateNumber : 2 | currencySysmbol : purchase.currency" style="font-weight: bold"></em>