diff --git a/src/main/ui/static/images/brand_white.png b/src/main/ui/static/images/brand_white.png new file mode 100644 index 000000000..5b0ab5a2a Binary files /dev/null and b/src/main/ui/static/images/brand_white.png differ diff --git a/src/main/ui/static/images/pay_new_year.png b/src/main/ui/static/images/pay_new_year.png new file mode 100644 index 000000000..22a7f1eeb Binary files /dev/null and b/src/main/ui/static/images/pay_new_year.png differ diff --git a/src/main/ui/static/images/payment_page_v3.jpg b/src/main/ui/static/images/payment_page_v3.jpg new file mode 100644 index 000000000..d43d61c7d Binary files /dev/null and b/src/main/ui/static/images/payment_page_v3.jpg differ diff --git a/src/main/ui/static/images/pmt_delete_white.png b/src/main/ui/static/images/pmt_delete_white.png new file mode 100644 index 000000000..4da834cb2 Binary files /dev/null and b/src/main/ui/static/images/pmt_delete_white.png differ diff --git a/src/main/ui/static/images/pmt_logo_wechat_white.png b/src/main/ui/static/images/pmt_logo_wechat_white.png new file mode 100644 index 000000000..8bd1317f7 Binary files /dev/null and b/src/main/ui/static/images/pmt_logo_wechat_white.png differ diff --git a/src/main/ui/static/payment/partner/templates/client_payment_info.html b/src/main/ui/static/payment/partner/templates/client_payment_info.html index 2472b716e..6b5cbd4b1 100644 --- a/src/main/ui/static/payment/partner/templates/client_payment_info.html +++ b/src/main/ui/static/payment/partner/templates/client_payment_info.html @@ -370,11 +370,13 @@
+
diff --git a/src/main/ui/static/payment/partner/templates/partner_payment_info.html b/src/main/ui/static/payment/partner/templates/partner_payment_info.html index 67635ced0..cd824b9da 100644 --- a/src/main/ui/static/payment/partner/templates/partner_payment_info.html +++ b/src/main/ui/static/payment/partner/templates/partner_payment_info.html @@ -514,6 +514,7 @@
@@ -521,6 +522,7 @@
+
diff --git a/src/main/ui/static/templates/alipay/v1/payment.js b/src/main/ui/static/templates/alipay/v1/payment.js index 9faa640fc..db74dc68c 100644 --- a/src/main/ui/static/templates/alipay/v1/payment.js +++ b/src/main/ui/static/templates/alipay/v1/payment.js @@ -380,33 +380,61 @@ $(function () { config.initialize(dialog); } var ft = $('
').appendTo(dialogBox); - if ($.isFunction(config.confirm)) { - var yes = $('', { - class: 'weui_btn_dialog primary', - text: 'OK', - style: 'background: #108ee9;color: #fff;' - }).appendTo(ft); - yes.click(function () { - config.confirm(dialog, true); - dialog.remove(); - }); - var no = $('', {class: 'weui_btn_dialog default', text: 'Cancel'}).appendTo(ft); - no.click(function () { - config.confirm(dialog, false); - dialog.remove(); - }) - } else { - var ok = $('', { - class: 'weui_btn_dialog primary', - text: 'OK', - style: 'background: #108ee9;color: #fff;' - }).appendTo(ft); - ok.click(function () { - dialog.remove(); - }) + if(window.paypad_version !== 'v3'){ + if ($.isFunction(config.confirm)) { + var yes = $('', { + class: 'weui_btn_dialog primary', + text: 'OK', + style: 'background: #108ee9;color: #fff;' + }).appendTo(ft); + yes.click(function () { + config.confirm(dialog, true); + dialog.remove(); + }); + var no = $('', {class: 'weui_btn_dialog default', text: 'Cancel'}).appendTo(ft); + no.click(function () { + config.confirm(dialog, false); + dialog.remove(); + }) + } else { + var ok = $('', { + class: 'weui_btn_dialog primary', + text: 'OK', + style: 'background: #108ee9;color: #fff;' + }).appendTo(ft); + ok.click(function () { + dialog.remove(); + }) + } + }else{ + if ($.isFunction(config.confirm)) { + var yes = $('', { + class: 'weui_btn_dialog primary', + text: 'OK', + style: 'background: #FF9705;color: #fff;' + }).appendTo(ft); + yes.click(function () { + config.confirm(dialog, true); + dialog.remove(); + }); + var no = $('', {class: 'weui_btn_dialog default', text: 'Cancel'}).appendTo(ft); + no.click(function () { + config.confirm(dialog, false); + dialog.remove(); + }) + } else { + var ok = $('', { + class: 'weui_btn_dialog primary', + text: 'OK', + style: 'background: #FF9705;color: #fff;' + }).appendTo(ft); + ok.click(function () { + dialog.remove(); + }) + } } dialog.appendTo($('body')); } } -}); \ No newline at end of file +}); diff --git a/src/main/ui/static/templates/payment/v1/payment.js b/src/main/ui/static/templates/payment/v1/payment.js index 1277153ad..a078c0add 100644 --- a/src/main/ui/static/templates/payment/v1/payment.js +++ b/src/main/ui/static/templates/payment/v1/payment.js @@ -390,33 +390,61 @@ $(function () { config.initialize(dialog); } var ft = $('
').appendTo(dialogBox); - if ($.isFunction(config.confirm)) { - var yes = $('', { - class: 'weui_btn_dialog primary', - text: 'OK', - style: 'background: #0bb20c;color: #fff;' - }).appendTo(ft); - yes.click(function () { - config.confirm(dialog, true); - dialog.remove(); - }); - var no = $('', {class: 'weui_btn_dialog default', text: 'Cancel'}).appendTo(ft); - no.click(function () { - config.confirm(dialog, false); - dialog.remove(); - }) + if(window.paypad_version !== 'v3'){ + if ($.isFunction(config.confirm)) { + var yes = $('', { + class: 'weui_btn_dialog primary', + text: 'OK', + style: 'background: #0bb20c;color: #fff;' + }).appendTo(ft); + yes.click(function () { + config.confirm(dialog, true); + dialog.remove(); + }); + var no = $('', {class: 'weui_btn_dialog default', text: 'Cancel'}).appendTo(ft); + no.click(function () { + config.confirm(dialog, false); + dialog.remove(); + }) + } else { + var ok = $('', { + class: 'weui_btn_dialog primary', + text: 'OK', + style: 'background: #0bb20c;color: #fff;' + }).appendTo(ft); + ok.click(function () { + dialog.remove(); + }) + } } else { - var ok = $('', { - class: 'weui_btn_dialog primary', - text: 'OK', - style: 'background: #0bb20c;color: #fff;' - }).appendTo(ft); - ok.click(function () { - dialog.remove(); - }) + if ($.isFunction(config.confirm)) { + var yes = $('', { + class: 'weui_btn_dialog primary', + text: 'OK', + style: 'background: #FF9705;color: #fff;' + }).appendTo(ft); + yes.click(function () { + config.confirm(dialog, true); + dialog.remove(); + }); + var no = $('', {class: 'weui_btn_dialog default', text: 'Cancel'}).appendTo(ft); + no.click(function () { + config.confirm(dialog, false); + dialog.remove(); + }) + } else { + var ok = $('', { + class: 'weui_btn_dialog primary', + text: 'OK', + style: 'background: #FF9705;color: #fff;' + }).appendTo(ft); + ok.click(function () { + dialog.remove(); + }) + } } dialog.appendTo($('body')); } } -}); \ No newline at end of file +}); diff --git a/src/main/ui/static/templates/payment/v3/payment.css b/src/main/ui/static/templates/payment/v3/payment.css new file mode 100644 index 000000000..97af1bfd5 --- /dev/null +++ b/src/main/ui/static/templates/payment/v3/payment.css @@ -0,0 +1,523 @@ + +body { + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + box-sizing: border-box; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); +} + +div, span, p, ul, li { + box-sizing: border-box; +} +.warning-sm{ + color:red; + font-size:10px; + transform-origin: left; + transform: scale(0.8); +} +.weui_grid { + padding: 7px; + height: 53px; +} + +.ff.key { + position: relative; +} + +.ff { + font-size: 26px; + color: #FFFFFF; +} + +.ff img { + margin: 10px auto; + display: block; + width: 34px; +} + +div.wait { + top: 0; + margin-left: auto; + margin-right: auto; + left: 0; + right: 0; + position: absolute; + vertical-align: middle; + text-align: center; + bottom: 0; + opacity: .5; + background-color: gray; + z-index: 10000; +} + +.bisnam { + font-size: 16px; + color: #aaaaaa; + text-align: center; + margin-top: 10px; +} + +.rmbcurrency { + font-size: 18px; + color: #FFFFFF; + vertical-align: text-bottom; + line-height: 38px; +} + +.static .rmbcurrency { + font-size: 14px; + line-height: 30px; +} + +.rmbvalue { + font-size: 24px; + color: #FFFFFF; + vertical-align: text-bottom; + float: right; +} + +.rmbvalue:before { + content: '≈¥'; + font-size: 16px; +} + +.paydetail { + float: right; + margin-top: 5px; + margin-left: 5px; +} + +.static .rmbvalue { + font-size: 18px; +} + +.currency { + font-size: 24px; + color: #FFFFFF; + /* line-height: 67px; */ + vertical-align: text-bottom; + padding-left: 10px; +} + +.static .currency { + color: #FFFFFF; + font-size: 25px; +} + +.value { + font-size: 60px; + line-height: 66px; + color: #FFFFFF; + margin-left: -5px; + vertical-align: text-bottom; + padding-right: 10px; +} + +.static .value { + color: #FFFFFF; + font-size: 24px; +} + +input.value { + background: transparent; + border: none; + line-height: 50px; +} + +input.value:active { + background: transparent; +} + +input.value:focus { + border: none; + outline: none; + user-select: none; + -webkit-user-select: none; + -moz-user-select: none; +} + +.pp { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + overflow-x: hidden; + background-color: #fbf9fe; +} + +.new_year { + width:100%; + height:100%; + position:absolute; + top:18%; + left:0; + z-index:-1; + border-radius: 0 0 25px 25px; +} +.bankpay { + text-align: center; + padding: 20px; +} + +@media screen and (max-height: 520px){ + .bankpay { + text-align: center; + padding: 0; + } +} +.row { + width: 100%; + padding: 0 20px; +} + +.hidden { + display: none; +} + +.hide-keyboard-btn { + width: 100%; +} + +.hide-keyboard-btn:after { + content: ''; + transform: rotate(45deg); + border-right: 2px solid #ccc; + border-bottom: 2px solid #ccc; + width: 30px; + height: 30px; + transform-origin: center; + display: block; + margin: auto; +} + +.remark-box.visible { + display: block; +} + +.remark-box.visible .remark-input { + font-size: 1.4em; + border: none; + background: #fff; +} + +.white-box { + background: #fff; + width: 96%; + margin: 10px auto; + display: block; + position: relative; + padding: 0 10px; + box-sizing: border-box; +} + +.white-box.full { + width: 100%; +} + +.logo-box .banner { + width: 100%; + display: block; +} + +.logo { + margin: auto; + display: block; + margin-top: 20px; + max-height: 60px; + max-width: 80%; +} + +.logo-small { + max-height: 100px; +} + +.currencyrow { + box-sizing: border-box; + margin-top: 80px; + text-align: center; + margin-bottom: 20px; +} + + +@media screen and (max-height:670px){ + .currencyrow { + box-sizing: border-box; + margin-top: 50px; + text-align: center; + margin-bottom: 20px; + } +} + +@media screen and (max-height: 520px){ + .currencyrow { + box-sizing: border-box; + margin-top: 20px; + text-align: center; + margin-bottom: 20px; + } +} + +.currencyrow:after { + content: ''; + display: block; + clear: both; +} + +.currencyrow > * { + display: inline-block; + vertical-align: bottom; + margin-bottom: 0; + box-sizing: border-box; +} + +.remark-input { + width: 100%; + font-size: 26px; + border-radius: 0; + outline: none; +} + +.remark-box { + display: none; +} + +.remark-box .remark-mask { + text-align: center; + height: 50px; + font-size: 0.9em; + line-height: 35px; + color: #ccc; +} + +.remark-label { + position: absolute; + top: 5px; + right: 5px; + font-size: 20px; + z-index: 1; + font-weight: bold; + color: #0d6aad; +} + +.coupons { + width: 100%; +} + +.coupons > li { + display: block; + width: 100%; + float: none; + color: #888888; + border-bottom: 1px dashed #aaa; + padding: 5px 0px; +} + +.coupons > li:after { + content: ''; + clear: both; + display: block +} + +.coupons > li:last-child { + border: none; +} + +.coupons .title, .coupons .desc, .coupons label { + display: block; +} + +.coupons .coupon-content { + display: block; + float: left; +} + +.coupons .title { + font-weight: bold; + font-size: 1em; +} + +.coupons .use-check { + position: relative; + display: block; + width: 25px; + background-repeat: no-repeat; + height: 25px; + background-size: contain; + float: right; + margin-right: 5px; + margin-top: 10px; +} + +.coupons .use-check.checked { + background-image: url(/static/images/checkbox-checked.png); +} + +.coupons .use-check.unchecked { + background-image: url(/static/images/checkbox-unchecked.png); +} + +.coupons .use-check.disabled { + background-image: url(/static/images/checkbox-disabled.png) !important; +} + +.coupons .desc { + font-size: 1em; +} + +.weui-wepay-logos { + background: transparent; +} + +.row.weui_grids:before, .row.weui_grids .weui_grid:before, .row.weui_grids .weui_grid:after { + display: none; +} + +.button_sp_area { + display: block; + position: relative; + margin-top: 10px; +} + +.button_sp_area:after { + content: ''; + clear: both; + display: block; +} + +.button_sp_area a { + height: 50px; + line-height: 50px; + padding: 0px; + font-family: Helvetica; + font-size: 20px; + float: left; + text-align: center; + border-radius: 0; + color: #fff; +} + +.button_sp_area .paynow { + width: 65%; + background: #FEB900; +} + +.button_sp_area.alipay .paynow { + background-color: #FEB900; +} + +.button_sp_area.rpay .paynow { + background-color: #FEB900; +} + +.button_sp_area .remark-btn { + width: 35%; + background: #FF9705 +} + +.pay-brands { + text-align: center; + line-height: 20px; + font-size: 24px; + margin-top: 12px; + color: #dddddd; +} + +.pay-brands img { + height: 18px; +} + +.pay-brands img.wechat-logo { + height: 14px; +} + +.weui_dialog_bd .final { + font-weight: bold; +} + +#coupon-box-toggle { + padding: 0 20px; + margin-bottom: 10px; + text-align: right; + color: #30af69; + font-size: 12px; + cursor: pointer; +} + +.coupons-container { + position: fixed; + z-index: 1; + top: 0; + left: 0; + right: 0; + bottom: 0; + overflow: auto; + display: none; +} + +.coupons-container.show{ + display: block; +} + +.coupons-container > .coupons-mask { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: rgba(0, 0, 0, .6); + z-index: 1; +} + +.coupons-container > .coupon-box { + position: fixed; + z-index: 4; + left: 50%; + top: 50%; + width: 95%; + background: #fff; + padding: 10px; + transform: translate(-50%, -50%); +} + +.coupons-container .coupon-box-title{ + width: 100%; + display: block; + background: #fff; + padding: 0 10px 5px; + font-size: 14px; + border-bottom: 1px solid #d0d0d0; +} + +.coupons-container .coupon-box-title:after{ + content: ''; + display: block; + clear: both; +} + +.coupons-container .coupon-box-title>.title{ + float: left; + display: block; + color: #0BB20C; +} + +.coupons-container .coupon-box-title>#close-coupon-box{ + color: #700; + float: right; + display: block; + cursor: pointer; +} + + +.actCharity-red{ + color: #FB5252; + display: inline; +} + +.actCharity{ + display: inline; +}