From f6ebe3f6ad7d07c5354eb56ee6b83bce9b6b3bbc Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 20 Sep 2018 14:49:37 +0800 Subject: [PATCH] fix rpay+ icon --- src/main/ui/static/analysis/clearing-log.js | 2 +- .../analysis/templates/customer_analysis.html | 2 +- .../templates/settlement_transactions.html | 2 +- .../commons/services/clearingDetailService.js | 2 +- .../static/commons/templates/order_detail.html | 2 +- src/main/ui/static/config/bdprize/bdprize.js | 2 +- .../bdprize/templates/bd_prize_detail.html | 4 ++-- .../bdprize/templates/bd_prize_month_report.html | 2 +- src/main/ui/static/images/rpayplus_sign.png | Bin 0 -> 1629 bytes .../{rpayplus.png => rpayplus_sign_lg.png} | Bin .../invoice/templates/invoice_assistant.html | 2 +- .../static/payment/custom/templates/custom.html | 2 +- .../payment/invoice/templates/invoice.html | 2 +- .../partner/templates/partner_pay_logs.html | 2 +- .../tradelog/templates/balance_report.html | 2 +- .../templates/partner_settlement_dialog.html | 4 ++-- .../tradelog/templates/partner_trade_logs.html | 2 +- .../payment/tradelog/templates/trade_logs.html | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 src/main/ui/static/images/rpayplus_sign.png rename src/main/ui/static/images/{rpayplus.png => rpayplus_sign_lg.png} (100%) 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 0000000000000000000000000000000000000000..1350a89e2fe67c97088e46834a6a079290e67561 GIT binary patch literal 1629 zcmZ`%3rtgI6h0`EwG46N;bW6tO*TO&+&*dVNF1by%oR&1s9_FDTT0bJg^NXy4IR#C zOniZ~hJ|cyQSb#W&LOh+egKN1(`3e|4Df}@RE)i)y*szKjhXD`-2Xr4Ki~JA@BX

    aoL*Bbjic8%LQjx7`y}}jX*hJ)^?b&6$IOSfeDs) z*aQhZP{zVA3v3(cYG6h+gxO&tMj02uz8Eco*FktK%xr^91fwj1*FcDqPn`Kc-X)+q zB9s>*6d0IbdFp*xEiYmXgd(K}?0Z0o$_VbCo$^YY{z{VG7d5wzC#Z(-Ciobg;6&8H zmTP|g>1k3s1dn>g^G*TPIXxZ|^o;(|(uD|RM}z{C(a-UnaHB^PZWSnT?Gz}H^-82c zSro^dn=a8}iBA4@&Pk0r$F)nKL?pJ5jyHf544mRZW2D9<&2UMyE|CUH1|wndNOhg( z*jdm1R(Fn_QRR+otVaMN%@}d)W?hW8_a6K7nYVXfq-wjT{hZra!4c=?dGGdn&vr8@ z2DkNV_QgxjxBHl6y-SvX%I*bA*~d>k-#0U{Y3|QycIdfhR|`Wf7@f;?2cLSHj(F<# zdT;l!L(klnDhB=dT)pn@Z$(Sq%Qr^WJDK=Q23!AhQ5n_HcEx6I*EP4U5V;6&rx-kK zXGW@ba6^}rdQV?;7glpEMHVC1adiAB%;PgzmQ_!1Ji`CaMr+f!U)9e)fFFntFTmdq zU_3vJh>Q^mVik5E+^xQMZXmMx$VajGrlB*ojVRLYF#?K^YEkV>%Uo5_0Fy46;}s@*+;Cm zTOY=rxPh1y zDTJg_C?<6x2_=zIVrev~ph%LxP+IpNg0;wK$zS#VgbMzqXe6X@6H1EmX}iAI1gTcN z*`(H+Erw-;JXRSi5{gJ7T_h*U6!ILol=yc%Q9#o+DlX1$x5rvI7QV=eEh;weF`bxz z%2POHT|ucekD^pXhEl7kkftaNLQ6ojn{A7G1LK=bQS(d|a{&z^h5U=?>LA2S9;5Rb zv(RFs3pmKd->+#9GIb0@ZLyl@RW=j&T*cW6&2tWArM;n})*%W+GD*BtERxHmt34sZ z2niXZlVK_6t~*vXKPjmun+V5t(wKIpHWl(M%T0I%akSMI=bN_NfV+96#bg)f#OL_r kMN*MiDp5$}GKC^Xrp(DEmoWXCen2%yO-@rCNXlLN7ygcY`~Uy| literal 0 HcmV?d00001 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}}