diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js index 5683116bd..e610c6ee9 100644 --- a/src/main/ui/static/analysis/clearing-log.js +++ b/src/main/ui/static/analysis/clearing-log.js @@ -543,7 +543,7 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func case 'hf': return '/static/images/hf_sign_lg.png'; case 'Rpay': - return '/static/images/rpayplus.png'; + return '/static/images/rpayplus_sign_lg.png'; } } }); diff --git a/src/main/ui/static/analysis/templates/customer_analysis.html b/src/main/ui/static/analysis/templates/customer_analysis.html index d28281419..db731d054 100644 --- a/src/main/ui/static/analysis/templates/customer_analysis.html +++ b/src/main/ui/static/analysis/templates/customer_analysis.html @@ -179,7 +179,7 @@ uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/> - {{order.order_id}} diff --git a/src/main/ui/static/analysis/templates/settlement_transactions.html b/src/main/ui/static/analysis/templates/settlement_transactions.html index 247848535..7f19fc00e 100644 --- a/src/main/ui/static/analysis/templates/settlement_transactions.html +++ b/src/main/ui/static/analysis/templates/settlement_transactions.html @@ -50,7 +50,7 @@
  • - +
  • diff --git a/src/main/ui/static/commons/services/clearingDetailService.js b/src/main/ui/static/commons/services/clearingDetailService.js index c77d3fe80..fc23d7390 100644 --- a/src/main/ui/static/commons/services/clearingDetailService.js +++ b/src/main/ui/static/commons/services/clearingDetailService.js @@ -61,7 +61,7 @@ define(['../app','decimal'], function (app,Decimal) { case 'hf': return '/static/images/hf_sign_lg.png'; case 'Rpay': - return '/static/images/rpayplus.png'; + return '/static/images/rpayplus_sign_lg.png'; } } }); diff --git a/src/main/ui/static/commons/templates/order_detail.html b/src/main/ui/static/commons/templates/order_detail.html index 3184f16b2..3c63f639c 100644 --- a/src/main/ui/static/commons/templates/order_detail.html +++ b/src/main/ui/static/commons/templates/order_detail.html @@ -45,7 +45,7 @@ uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/> - {{order.order_id}} diff --git a/src/main/ui/static/config/bdprize/bdprize.js b/src/main/ui/static/config/bdprize/bdprize.js index 3c418044d..6b5fa2f4c 100644 --- a/src/main/ui/static/config/bdprize/bdprize.js +++ b/src/main/ui/static/config/bdprize/bdprize.js @@ -393,7 +393,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) { case 'hf': return '/static/images/hf_sign_lg.png'; case 'Rpay': - return '/static/images/rpayplus.png'; + return '/static/images/rpayplus_sign_lg.png'; } } }); diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html index a97dd0384..5c49583b6 100644 --- a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html +++ b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html @@ -135,7 +135,7 @@
    - +
    Transaction: ${{detail.RpayDetail.total_amount}}
    @@ -187,7 +187,7 @@ - + diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html index 213408c10..4d314367a 100644 --- a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html +++ b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html @@ -110,7 +110,7 @@
    - +
    BD Total Commission: ${{report.RpayReport.total_prize}}
    diff --git a/src/main/ui/static/images/rpayplus_sign.png b/src/main/ui/static/images/rpayplus_sign.png new file mode 100644 index 000000000..1350a89e2 Binary files /dev/null and b/src/main/ui/static/images/rpayplus_sign.png differ diff --git a/src/main/ui/static/images/rpayplus.png b/src/main/ui/static/images/rpayplus_sign_lg.png similarity index 100% rename from src/main/ui/static/images/rpayplus.png rename to src/main/ui/static/images/rpayplus_sign_lg.png diff --git a/src/main/ui/static/invoice/templates/invoice_assistant.html b/src/main/ui/static/invoice/templates/invoice_assistant.html index a477b413a..d00a3a693 100644 --- a/src/main/ui/static/invoice/templates/invoice_assistant.html +++ b/src/main/ui/static/invoice/templates/invoice_assistant.html @@ -206,7 +206,7 @@ uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/> - {{trade.order_id2}} diff --git a/src/main/ui/static/payment/custom/templates/custom.html b/src/main/ui/static/payment/custom/templates/custom.html index c4b3299e2..c3e911d21 100644 --- a/src/main/ui/static/payment/custom/templates/custom.html +++ b/src/main/ui/static/payment/custom/templates/custom.html @@ -101,7 +101,7 @@ uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/> - {{order.order_id}} diff --git a/src/main/ui/static/payment/invoice/templates/invoice.html b/src/main/ui/static/payment/invoice/templates/invoice.html index 6a49339c8..a26005322 100644 --- a/src/main/ui/static/payment/invoice/templates/invoice.html +++ b/src/main/ui/static/payment/invoice/templates/invoice.html @@ -200,7 +200,7 @@ uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/> - {{trade.order_id2}} diff --git a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html index 0939919a9..fc92231f4 100644 --- a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html +++ b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html @@ -187,7 +187,7 @@ - + {{trade.order_id}} diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html index 7d5d17fe9..412309d68 100644 --- a/src/main/ui/static/payment/tradelog/templates/balance_report.html +++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html @@ -296,7 +296,7 @@ uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/> - {{trade.order_id2}} diff --git a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html index 1d1f07f0e..527e66e50 100644 --- a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html +++ b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html @@ -7,7 +7,7 @@ diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html index efb867200..4d1b06b1a 100644 --- a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html @@ -324,7 +324,7 @@ AlipayOnline - + {{trade.order_id}} diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html index 13496d1a2..38cc5ba87 100644 --- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html @@ -353,7 +353,7 @@ uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/> - {{trade.order_id}}