Просмотр исходного кода

增加手续费提示,根据订单状态,计算取值修改

liusw 7 лет назад
Родитель
Сommit
b24b566905

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

@@ -495,7 +495,7 @@
 										<span class="price-down" ng-mouseenter="showRemindTagActivity = true" ng-mouseleave="showRemindTagActivity = false">减免</span>
 										手续费:
 									</strong>
-									<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>
+									<em>{{order.currency == 'RMB' ? '¥ ':'$'}}0.00(<i class="price-down-tag" ng-bind="getMul(order.ensurePrice, 0.00453) | 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>

+ 5 - 1
src/main/webapp/resources/view/usercenter/forstore/order_pay.html

@@ -857,7 +857,11 @@
 										<span class="price-down" ng-mouseenter="showRemindTagActivity = true" ng-mouseleave="showRemindTagActivity = false">减免</span>
 										手续费:
 									</strong>
-									<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>
+									<em ng-if="order.status == 501">{{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>
+									<em ng-if="order.status != 501">
+										<em ng-if="storeArray.length == 1">{{order.currency == 'RMB' ? '¥ ':'$'}}0.00(<i class="price-down-tag" ng-bind="getMul(order.ensurePrice, 0.00453) | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)">$1.11</i>)</em>
+										<em ng-if="storeArray.length != 1">{{order.currency == 'RMB' ? '¥ ':'$'}}0.00(<i class="price-down-tag" ng-bind="getMul(getAdd(storePrice[key], deliveryList[details[0].storeid].fare), 0.00453) | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)">$1.11</i>)</em>
+									</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>

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

@@ -552,7 +552,8 @@
 										<span class="price-down" ng-mouseenter="showRemindTagActivity = true" ng-mouseleave="showRemindTagActivity = false">减免</span>
 										手续费:
 									</strong>
-									<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>
+									<em ng-if="!isChange">{{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>
+									<em ng-if="isChange">{{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>