From afee1234a3452a5b5757ece61cc5bfd58f1b4556 Mon Sep 17 00:00:00 2001 From: "james.zhao" Date: Tue, 9 Apr 2019 11:35:43 +0800 Subject: [PATCH] =?UTF-8?q?lakala=E6=89=8B=E7=BB=AD=E8=B4=B9=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/static/templates/cbpay/css/gateway.css | 2 +- .../ui/static/templates/cbpay/lakala/v1/gateway_jsapi.js | 8 ++++++-- .../templates/cbpay/lakala/v1/gateway_jsapi_phone.js | 8 ++++++-- .../ui/static/templates/cbpay/yeepay/v1/gateway_jsapi.js | 8 ++++++-- .../templates/cbpay/yeepay/v1/gateway_jsapi_phone.js | 8 ++++++-- .../templates/cbpay/yeepay/v1/gateway_jsapi_test.js | 8 ++++++-- 6 files changed, 31 insertions(+), 11 deletions(-) diff --git a/src/main/ui/static/templates/cbpay/css/gateway.css b/src/main/ui/static/templates/cbpay/css/gateway.css index 0aa92d66d..e853d0c1c 100644 --- a/src/main/ui/static/templates/cbpay/css/gateway.css +++ b/src/main/ui/static/templates/cbpay/css/gateway.css @@ -29,7 +29,7 @@ } .order-box{ - height: 550px; + height: 580px; width: 800px; margin: 2% auto; /*box-shadow: 0px 0px 25px 0px rgba(0,0,0,0.21);*/ diff --git a/src/main/ui/static/templates/cbpay/lakala/v1/gateway_jsapi.js b/src/main/ui/static/templates/cbpay/lakala/v1/gateway_jsapi.js index 196687505..7b2efdd6a 100644 --- a/src/main/ui/static/templates/cbpay/lakala/v1/gateway_jsapi.js +++ b/src/main/ui/static/templates/cbpay/lakala/v1/gateway_jsapi.js @@ -7,8 +7,12 @@ var num = function(obj){ var surchargeData = calculateSurcharge(obj.value-0); var surchargeAmount = Decimal.add(surchargeData.surcharge,surchargeData.tax); - $('#surchargeAmount').html(surchargeAmount+''); - $('#totalAmount').html(surchargeData.newPrice+''); + var currency = '$'; + if($('#select_currency').val()=='CNY'){ + currency = '￥'; + } + $('#surchargeAmount').html(currency+surchargeAmount+''); + $('#totalAmount').html(currency+surchargeData.newPrice+''); if(surchargeAmount+0===0 || !window.c4surcharge){ $('.surcharge').hide(); }else { diff --git a/src/main/ui/static/templates/cbpay/lakala/v1/gateway_jsapi_phone.js b/src/main/ui/static/templates/cbpay/lakala/v1/gateway_jsapi_phone.js index 16cf505d9..d669567a0 100644 --- a/src/main/ui/static/templates/cbpay/lakala/v1/gateway_jsapi_phone.js +++ b/src/main/ui/static/templates/cbpay/lakala/v1/gateway_jsapi_phone.js @@ -10,8 +10,12 @@ var num = function (obj) { var surchargeData = calculateSurcharge(obj.value - 0); var surchargeAmount = Decimal.add(surchargeData.surcharge, surchargeData.tax); - $('#surchargeAmount').html(surchargeAmount + ''); - $('#totalAmount').html(surchargeData.newPrice + ''); + var currency = '$'; + if($('#select_currency').val()=='CNY'){ + currency = '￥'; + } + $('#surchargeAmount').html(currency+surchargeAmount+''); + $('#totalAmount').html(currency+surchargeData.newPrice+''); if (surchargeAmount - 0 === 0 || !window.c4surcharge) { $('.surcharge').hide(); } else { diff --git a/src/main/ui/static/templates/cbpay/yeepay/v1/gateway_jsapi.js b/src/main/ui/static/templates/cbpay/yeepay/v1/gateway_jsapi.js index 6395a538e..67285f2a0 100644 --- a/src/main/ui/static/templates/cbpay/yeepay/v1/gateway_jsapi.js +++ b/src/main/ui/static/templates/cbpay/yeepay/v1/gateway_jsapi.js @@ -7,8 +7,12 @@ var num = function(obj){ var surchargeData = calculateSurcharge(obj.value-0); var surchargeAmount = Decimal.add(surchargeData.surcharge,surchargeData.tax); - $('#surchargeAmount').html(surchargeAmount+''); - $('#totalAmount').html(surchargeData.newPrice+''); + var currency = '$'; + if($('#select_currency').val()=='CNY'){ + currency = '￥'; + } + $('#surchargeAmount').html(currency+surchargeAmount+''); + $('#totalAmount').html(currency+surchargeData.newPrice+''); if(surchargeAmount+0==0 || !window.c4surcharge){ $('.surcharge').hide(); }else { diff --git a/src/main/ui/static/templates/cbpay/yeepay/v1/gateway_jsapi_phone.js b/src/main/ui/static/templates/cbpay/yeepay/v1/gateway_jsapi_phone.js index 2ded142e6..5da9823f0 100644 --- a/src/main/ui/static/templates/cbpay/yeepay/v1/gateway_jsapi_phone.js +++ b/src/main/ui/static/templates/cbpay/yeepay/v1/gateway_jsapi_phone.js @@ -10,8 +10,12 @@ var num = function (obj) { var surchargeData = calculateSurcharge(obj.value - 0); var surchargeAmount = Decimal.add(surchargeData.surcharge, surchargeData.tax); - $('#surchargeAmount').html(surchargeAmount + ''); - $('#totalAmount').html(surchargeData.newPrice + ''); + var currency = '$'; + if($('#select_currency').val()=='CNY'){ + currency = '￥'; + } + $('#surchargeAmount').html(currency+surchargeAmount+''); + $('#totalAmount').html(currency+surchargeData.newPrice+''); if (surchargeAmount - 0 == 0 || !window.c4surcharge) { $('.surcharge').hide(); } else { diff --git a/src/main/ui/static/templates/cbpay/yeepay/v1/gateway_jsapi_test.js b/src/main/ui/static/templates/cbpay/yeepay/v1/gateway_jsapi_test.js index d935cf9df..87c615860 100644 --- a/src/main/ui/static/templates/cbpay/yeepay/v1/gateway_jsapi_test.js +++ b/src/main/ui/static/templates/cbpay/yeepay/v1/gateway_jsapi_test.js @@ -7,8 +7,12 @@ var num = function(obj){ var surchargeData = calculateSurcharge(obj.value-0); var surchargeAmount = Decimal.add(surchargeData.surcharge,surchargeData.tax); - $('#surchargeAmount').html(surchargeAmount+''); - $('#totalAmount').html(surchargeData.newPrice+''); + var currency = '$'; + if($('#select_currency').val()=='CNY'){ + currency = '￥'; + } + $('#surchargeAmount').html(currency+surchargeAmount+''); + $('#totalAmount').html(currency+surchargeData.newPrice+''); if(surchargeAmount+0==0 || !window.c4surcharge){ $('.surcharge').hide(); }else {