From f7d1ffb83725653d39b84d4821793bfb8a7204bc Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 20 Sep 2018 14:32:07 +0800 Subject: [PATCH 1/4] fix rpay+ icon --- src/main/ui/static/analysis/clearing-log.js | 2 +- .../templates/manage_customers_orders.html | 2 +- .../analysis/templates/trans_analysis.html | 2 +- .../templates/trans_analysis_monthly.html | 2 +- .../transaction_amount_Analysis.html | 2 +- .../commons/services/clearingDetailService.js | 2 +- src/main/ui/static/config/bdprize/bdprize.js | 2 +- .../bdprize/templates/bd_prize_detail.html | 2 +- .../templates/bd_prize_month_report.html | 2 +- src/main/ui/static/images/rpayplus.png | Bin 1629 -> 2790 bytes .../partner/templates/partner_pay_logs.html | 2 +- .../tradelog/templates/balance_report.html | 2 +- .../templates/partner_trade_logs.html | 2 +- .../tradelog/templates/trade_logs.html | 2 +- 14 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js index d77ea8380..5683116bd 100644 --- a/src/main/ui/static/analysis/clearing-log.js +++ b/src/main/ui/static/analysis/clearing-log.js @@ -533,7 +533,7 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func case 'AlipayOnline': return '/static/images/alipay_online.png'; case 'System': - return '/static/images/rpayplus.png'; + return '/static/images/royalpay_sign.png'; case 'Bestpay': return '/static/images/bestpay_sign_lg.png'; case 'Wechat': diff --git a/src/main/ui/static/analysis/templates/manage_customers_orders.html b/src/main/ui/static/analysis/templates/manage_customers_orders.html index 735431137..531eadff2 100644 --- a/src/main/ui/static/analysis/templates/manage_customers_orders.html +++ b/src/main/ui/static/analysis/templates/manage_customers_orders.html @@ -92,7 +92,7 @@ HF Pay | RPay + + ng-click="params.channel='RPAY';doAnalysis(1)">RPay +

diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html index 67db5f858..14d91b836 100644 --- a/src/main/ui/static/analysis/templates/trans_analysis.html +++ b/src/main/ui/static/analysis/templates/trans_analysis.html @@ -99,7 +99,7 @@ HF Pay | RPay + + ng-click="params.channel='RPAY';doAnalysis(1)">RPay +

diff --git a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html index 0cae44777..7c393b9d2 100644 --- a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html +++ b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html @@ -69,7 +69,7 @@ HF Pay | RPay + + ng-click="params.channel='RPAY';doAnalysis(1)">RPay +

diff --git a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html index f5fd6e838..6267766b8 100644 --- a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html +++ b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html @@ -33,7 +33,7 @@ HF Pay RPay + + ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +

diff --git a/src/main/ui/static/commons/services/clearingDetailService.js b/src/main/ui/static/commons/services/clearingDetailService.js index 73de796be..c77d3fe80 100644 --- a/src/main/ui/static/commons/services/clearingDetailService.js +++ b/src/main/ui/static/commons/services/clearingDetailService.js @@ -51,7 +51,7 @@ define(['../app','decimal'], function (app,Decimal) { case 'AlipayOnline': return '/static/images/alipay_online.png'; case 'System': - return '/static/images/rpayplus.png'; + return '/static/images/royalpay_sign.png'; case 'Bestpay': return '/static/images/bestpay_sign_lg.png'; case 'Wechat': diff --git a/src/main/ui/static/config/bdprize/bdprize.js b/src/main/ui/static/config/bdprize/bdprize.js index d79cf24c4..3c418044d 100644 --- a/src/main/ui/static/config/bdprize/bdprize.js +++ b/src/main/ui/static/config/bdprize/bdprize.js @@ -383,7 +383,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) { case 'AlipayOnline': return '/static/images/alipay_online.png'; case 'System': - return '/static/images/rpayplus.png'; + return '/static/images/royalpay_sign.png'; case 'Bestpay': return '/static/images/bestpay_sign_lg.png'; case 'Wechat': 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 1e418ed94..a97dd0384 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}}
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 377e1386d..213408c10 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.png b/src/main/ui/static/images/rpayplus.png index 1350a89e2fe67c97088e46834a6a079290e67561..9b05b9b41440e9fce5252b6d740011e102333334 100644 GIT binary patch literal 2790 zcmaJ@c|4SB8y;lePBX?*I=#jknZ*z@5wjrGhzTR93|>f>)m7H0Kp+rx zx2vjaiEjY$s$sUST#ntKrn32x&H6 za0s4CcKMP^8aW`s1Og5og^G%bLPlYcY+fh|gTvuaXe*SJm8BG6$&Y3U=t4^t-|(vf z8RQ4?7#snE%>q^w>4EG>fdfKX=|5Lsa=yv3_+Q#2Z5T>O=b$i1^vadK0x6XL4`njH zq4@$T_;0=cQ<(1+%>hwVkk5|f1xW`NVz`ougD3Gox`55|VzUo??V?8*TfpXru{i*V z1ej6iK@8SPyx}u}LczPS_yRgB2y`PmAfysV1|t}cb+IL&aaaP;nn=Q6obBwaY|wTj z7c$yr6NZE(6TWiE?4U>{$P#?z2LHz+qP{tw19q1sQ@?X@Zh@j#9QG zkf)U7L?$?`^7105auipMnbZ8tx(*Q=u|?By!yCb81+Q3*WiO0TwT(+5l7gF22b{Un zo}3cb^gB>Z1j|+bsN#0{HrI4pSi<&v_+*w+sS`~6d)sr5*bdi4<+uKU3!fZyK@ExF zmVNhALNgGBQ^K=HPRqunN5M=>BvhLCP^XPk(#N)&BcsK-V#oXm2l-}`Dp>ZN?QW~L z8^oSF`2p!6?kP$o5yxXc#D^4>Ia(MW%h{0tjrwgOeVgiJ!pu?ojtSd!3GIZozTRp# z$f^BGzMIHY*{trw2QKsd-3zC*mG=s0H>*hyU6Q1J>auAgm$##;ZX``6+QwBG)ex2V zb`YW)7elOL%Nw=z=;3L;tD@gP$C?dmmho!QGuNOlbvt@}G{oyp#jR_9e!OK-*bu|6 z9$FRgbj@L(hxdLg=u|l?vb0w|mILkB^_M|IWFjt9B{Q?cDR60|LGnf;^GDe^7G`of zs`X>I=w>%DvH>XF1r{}yWie>F0($sj9N-6(hdb&l!l!MXOHe7VZo z&>`y!ZCb=aJJsj)IzKd7z}nBM(MIKZsx>k(uMQ7gg1)?H3!wJNS7q0DdJe$!{kZQF z72aJmt9{ojh5}o%?R<(X)yvxR<+O?qt3REUziLoh)#7g__wuy2h0dhJxoBhPPJz5{hhD{OMp`DovtW zn0B76-D(^1>*eN=F?QdzMZ!JPR^0Dx$$!BIYYATC^<63UJZSrb9{OD7aozK4Uo8d1 zTd(W0ehp>4Y#nOaX>cN}A0oc=27lp?V8W+ZpVTb-7?rS-T3xCyaH$XExVk2D-fFJX zdo&+cto=JAblj+a;dpq*4S`|pQs;RS_0F8lo9_RHm6c%mNb`$77QkA zswIws?#RjdJ;3pTzW(77c%~=mac>W-XMd6d&zyYXVAj=X$c3ZZZZa2!3U^K?HrvgGtZb^1V5N`b|q{(YsAVcf0lDOLo_DiZl2(&>@voS=nMpnQxX0r z7vaC`H#H^-CY2&usoOe^yvg3?oSo;D-0f}6JnIW@1a66bgQ(sryXm|uYGQgoHF`FG zOOQMPlqiVg-*1z=Ecz2Zf=)l)6X^t}koWJ1$lcL92DQn}h@dw=c|HBGuqqK2S zix%X^3@*oqKd-UX&2}w8%hzCS%_okyGtH4{HVS80w@~{Phxg2R=Ty|YU0XO4F7mW( z;HoyypJ?%^wTwKa{Ql6qho*Z{w{xCpC#-E?cq*kS+;HqIHYQ|bK{q+VN9Mw_fMiOn zDjoO7#qQm*UHKIu150;+Wn8(*X8G&y1K(v5oZTN@f6RO0uXG7s;9bgoEh@VkwmFuX z)?d2$V{HQ_{1NE>qw4b)*)>m=m4;KIfE<{dNu^?uT<3`juE)@mq>se@X9zKYmU8`tigMRK2`Rt zRI&T>eAAR|hlApvv0kpm-~&yX47hYrg|ug&ff}>>DL)XK7jVNT3LgCKho-do<*m>) zdqd^p%Q+^JEwC7ETec?^roPVQE1>)mA824wAuQ= zWD)#LsJWjAEy=wcKCd^4I{;J}HfIfF7`8bqsc__SkBW{6o4D${%?zme zbdz|rYx#u7=~u?$URItE#psCRS 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| 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 dd8618334..0939919a9 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 @@ -87,7 +87,7 @@ HFpay | RPay + + ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +

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 2ab2afc98..7d5d17fe9 100644 --- a/src/main/ui/static/payment/tradelog/templates/balance_report.html +++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html @@ -97,7 +97,7 @@ HF Pay | RPay + + ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +

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 b63e52165..efb867200 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 @@ -97,7 +97,7 @@ HF Pay RPay+ + ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay+

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 4a1d0ab54..13496d1a2 100644 --- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html @@ -135,7 +135,7 @@ HF Pay | RPay + + ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +

From 348dd76fd6b326509df029f08aa2a61e07f48eca Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 20 Sep 2018 15:06:11 +0800 Subject: [PATCH 2/4] fix rpay+ icon --- src/main/ui/static/analysis/clearing-log.js | 2 +- .../analysis/templates/customer_analysis.html | 2 +- .../templates/manage_customers_orders.html | 2 +- .../templates/settlement_transactions.html | 2 +- .../analysis/templates/trans_analysis.html | 2 +- .../templates/trans_analysis_monthly.html | 2 +- .../templates/transaction_amount_Analysis.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 -> 1566 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 | 4 ++-- .../tradelog/templates/balance_report.html | 4 ++-- .../templates/partner_settlement_dialog.html | 4 ++-- .../tradelog/templates/partner_trade_logs.html | 4 ++-- .../payment/tradelog/templates/trade_logs.html | 4 ++-- 22 files changed, 26 insertions(+), 26 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/manage_customers_orders.html b/src/main/ui/static/analysis/templates/manage_customers_orders.html index 531eadff2..bb65421f4 100644 --- a/src/main/ui/static/analysis/templates/manage_customers_orders.html +++ b/src/main/ui/static/analysis/templates/manage_customers_orders.html @@ -91,7 +91,7 @@ ng-click="params.channel='jd';doAnalysis(1)">JD Pay | HF Pay | - RPay +

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/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html index 14d91b836..4918d98d9 100644 --- a/src/main/ui/static/analysis/templates/trans_analysis.html +++ b/src/main/ui/static/analysis/templates/trans_analysis.html @@ -98,7 +98,7 @@ ng-click="params.channel='jd';doAnalysis(1)">JD Pay | HF Pay | - RPay +

    diff --git a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html index 7c393b9d2..7896d249a 100644 --- a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html +++ b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html @@ -68,7 +68,7 @@ ng-click="params.channel='jd';doAnalysis(1)">JD Pay | HF Pay | - RPay +

    diff --git a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html index 6267766b8..5f4be2c4e 100644 --- a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html +++ b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html @@ -32,7 +32,7 @@ ng-click="params.channel='jd';loadTradeLogs()">JD Pay | HF Pay - RPay +

    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..4c53e791cabe78375d5c7ea86cf24082ca632a77 GIT binary patch literal 1566 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc&_u!9QqR!T z(8R(}N5ROz&{*HVSl`fC*U-qyz|zXlQ~?TIxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf`)Hma%LWg zuL;)R>ucqiS6q^qmz?V9Vygr+LN7Bj#md;t+|j_&*vQGm$=T4*)xyHa)WE{o&Begf z%+T4`#Sy00B|o_|H#M&WrZ)wl*BGZ>P+G_>0NU)5T9jFqn&MWJpQ`}&vsES*w>UbP z7@Hcp8UoF8!tNG`-V`iuf$9bM1G`>*pkwqwF^d$_Fd<;_0Wsm}7RZ68{M0;PaxVg= z>nmB2!VC;d6FprVLn?0N1jl-a1d9B7cW0(-*;)H*|F>*#Fce}oJvgCm!FCU2C80N- zRXmsEx|BMW$Z<6vnODWJ_{GBZe+%U&u2^#D)xqgZyu7B@L(8MX%gf5s^3vaJdmJVA zqs{pFyy|m1pIf(|HQU;_q`hFygmxc6rUah#Q;GU*iR{iR zPak4C{i$)fSmR2qHy846cwfwk3#)0{W4V|s%;V!S{n?N07lutce0!Jtt7k>WB|jca zl*qR`#c-=n>c!cw9pCsH!l$S@F!D6bxLX?GGu5Ok;WlUDIkuzwh4x+0US@8}U96_? zfBLVy?wM|Ebcv@E>l@<6Si9suM`!nb4$$}*}8M{{f z_IQ4znuXop*n9w_^_D@sl&_*H&>0DKGAb z+36_~b~!~g$l2{Tqgr?PoY);+r!tpiZfN2bn5gmKV#+a-rAFD8SQdZ(>}2n9>8+#u y@7?FFbGo0jJRSS+jA>a;_S@4f>@Ab)StJ-vbxX7v@mW3umDrxHelF{r5}E)lY+L{U 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..ea3913570 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 @@ -86,7 +86,7 @@ ng-click="params.channel='JD';loadTradeLogs(1)">JDpay | HFpay | - RPay +

    @@ -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..915719219 100644 --- a/src/main/ui/static/payment/tradelog/templates/balance_report.html +++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html @@ -96,7 +96,7 @@ ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay | HF Pay | - RPay +

    @@ -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..41ea8d8a6 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 @@ -96,7 +96,7 @@ ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay | HF Pay - RPay+

    @@ -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..e17a89559 100644 --- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html @@ -134,7 +134,7 @@ ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay | HF Pay | - RPay +

    @@ -353,7 +353,7 @@ uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/> - {{trade.order_id}} From e9173949e1f00d055f6db94174ae0c4577ac5adf Mon Sep 17 00:00:00 2001 From: yangkai Date: Thu, 20 Sep 2018 15:06:14 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/static/templates/payment/success.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/ui/static/templates/payment/success.css b/src/main/ui/static/templates/payment/success.css index c68ad7747..974fbb4ea 100644 --- a/src/main/ui/static/templates/payment/success.css +++ b/src/main/ui/static/templates/payment/success.css @@ -352,7 +352,7 @@ } .points-dialog .dialog-content{ margin: auto; - width: 80%; + width: 90%; display: block; position: relative; margin-top: 100px; @@ -383,12 +383,12 @@ width: 100%; font-size: 14px; color: rgb(157, 255, 221); - margin-bottom: 24px; + margin-bottom: 10px; } .points-content .coin{ - width: 80px; - height: 80px; + width: 50px; + height: 50px; position: relative; background: url(/static/images/star.png) no-repeat; background-size: contain; From 66ead63d3819943760a7b28250a9bc6630d4685a Mon Sep 17 00:00:00 2001 From: "taylor.dang" Date: Thu, 20 Sep 2018 19:32:20 +0800 Subject: [PATCH 4/4] rpay --- .../commons/templates/order_detail.html | 2 +- .../images/rpay/icon_success_red_186x186.png | Bin 4930 -> 1925 bytes .../ui/static/images/rpay/rpay_horizental.png | Bin 8157 -> 2362 bytes .../payment/invoice/templates/invoice.html | 2 +- .../partner/templates/partner_pay_logs.html | 3 ++- .../templates/partner_trade_detail_edit.html | 2 +- .../templates/partner_trade_logs.html | 3 ++- .../tradelog/templates/trade_logs.html | 3 ++- .../templates/vipcustomer_detail.html | 3 ++- 9 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/ui/static/commons/templates/order_detail.html b/src/main/ui/static/commons/templates/order_detail.html index 3c63f639c..a73954b98 100644 --- a/src/main/ui/static/commons/templates/order_detail.html +++ b/src/main/ui/static/commons/templates/order_detail.html @@ -122,7 +122,7 @@

    -
    +

    diff --git a/src/main/ui/static/images/rpay/icon_success_red_186x186.png b/src/main/ui/static/images/rpay/icon_success_red_186x186.png index 340781e95141fc3211327284de8491c6ce24ca3b..398567d1c3d9d45dfa32a3d0d202e36463dde8c1 100644 GIT binary patch literal 1925 zcmd6o`8OMg7RRHtN30Q^t(Mx8Vj`ZUXcDn6A;A-SYp0e_`;=OX=-9V0h@}yRP9>Jw zrbeq(8l=U<(r2ru_MM>^^IyDk?)QG~Ip2Hk`TlmZu(oC(UI|_R006QuH*vUT_dnvk zdEM`fQwFb5g0;qDu6YG>{C}%fp$oz5WLi-Uwm87-`6%z^pX8xV(C*71k0&=N6%GPN zQ1RZMd@U7ZRu`B>Pn`|*IKfe`<5Z_iwZepz+4{Qx0M3UNCP;kj%;fwxVv{C-V?hLh z5yD_v&imUZk9)61=4X3+-C7leQKy&DGkSyJ!f$S;dwiMIB{&8@;YMfPP9STf5FVXQ z7%KlZRX-av`d4z2+cO=RP2n&BP&HL|n`oG>c>FQi98tX3b=quv%6$r^Oju(p&(_|O z4^83)(sg6vN7dY_ya~P0)Xdqr0a=X-Ts3P$nQxEZ=xDv=Skp`Fqj_7}Vo&61-O0L~ z-G$hyf4^zyIy&ODCkho>#a0E&u5IeFy14L5ZGuD5Bb`)CP4u?R+9;t&cE9m||0aWu!-DV?}< zE#p{}bk75gcIhGzd&@X>JE*Nju?b5{AS0ZxOftq48(w2mDdJ$DN4L~PTH=75hgLuh zUyM6}l8Y~)W7EJx^!!inI**-3uR0+Hi4>$2XfIc(rF{UMurY+Oh>fkc%xT$uou!kY z{o#!$0rolxL!Xnl%Ky*Y#D7<1wk4VIFS>$*SasWmeSH_zq)UItsT|wmW8c2D7>)B9 zu-Gq~KQ7H=EAC~hR~k!lt%5B|GQZCrQwuMN>8dGJ0 zSybtsI9_k*>`Z*@WsbhyxlFN>thI#yGZ|DnV{%^=a!i(0BG|P}=yWB20P^OwvtLmKDov}=9f_??&KOmAx^fYV4>+zYMr?!mc-u9gT-Bd1WHSmkjMiohC~xS ziWEV0S%mFXL=v4|);1}$_P&zGAcc6==_nJ&+Kk|7T=RK`Bp0$poQwmzKCNm;F~4BI_rpBO^CklPl;8||*GvPIgkCWPB+I*pkRFAw{LCkApqp&;5j zD2dq#k0>D*Y?l@&ePl3_Xp z>sv~GSCaCVu8)U{n$fPgnWnO9V%8v(WtM(h;K6sMA7`!0Jz_`uuQ1WzIcL#P8H?f$tT)|7 zryVwuTo1&ZJzRu^S`{IiO_qZv;dO5vbQhe2+t~eN9;vvT*%6%D} zNkySWfr|;ll@Q+h^}oRqlg?XM0Ot?;(B%-zxX)Xq+<{v+2o0%+$0btc7p}03lq`$@ zyp>B)GT1}#DH}K!_AhyV5tR)>zPpn11YNf0in9oQzG=6=KM%j3P03Awj^9t_(=h@b z6x7sTWjD~!rsv6+aQ^q9)8x2I9s)^9V%3&B9Bo@yVh~VB4`hV!wN%J~0yoL5m2{<3 zo0Xbx@R&(MqE-Ohvsi>kizvTkoSk16y8^$(&_puUU&tLr>f^-o=<#3qE*0Z`vA>ms zNJjQdq{R1{$ym=iC5$#rvuXt`z?wHHQ@_^feo8$L*`83&)(Pl9Hwlfr zd)DJ-=UqPBJy~|ZcGX4FdGzOp1WB{zAef-{TAq)_AqLybZ`}Pq_KFKYE|Y&_#%Hqk Q`fC9!Ft#SGD6f>i0gCOPt^fc4 literal 4930 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 JDvx@_{R7|FfuR5Z literal 8157 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 -

    -

    +

    {{trade.exchange_rate}}

    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 ea3913570..38df75df9 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 @@ -198,7 +198,8 @@ - + + - diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_detail_edit.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_detail_edit.html index 978617150..d91c3e058 100644 --- a/src/main/ui/static/payment/tradelog/templates/partner_trade_detail_edit.html +++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_detail_edit.html @@ -98,7 +98,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 41ea8d8a6..eb1d35318 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 @@ -336,7 +336,8 @@ - + + - 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 e17a89559..957cc9da3 100644 --- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html @@ -365,7 +365,8 @@ - + + - diff --git a/src/main/ui/static/payment/vipcustomer/templates/vipcustomer_detail.html b/src/main/ui/static/payment/vipcustomer/templates/vipcustomer_detail.html index 8b0e25e48..dde8ad87b 100644 --- a/src/main/ui/static/payment/vipcustomer/templates/vipcustomer_detail.html +++ b/src/main/ui/static/payment/vipcustomer/templates/vipcustomer_detail.html @@ -126,7 +126,8 @@ - + + -