From 642adc007f6f0996b859e2ae133b126821823ac5 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 20 Nov 2019 14:37:26 +0800
Subject: [PATCH] fix ui

---
 src/main/resources/application-dev.properties |  22 +++++++++++++-----
 .../templates/partner_cashback_records.html   |   2 +-
 src/main/ui/static/images/R跨境商城.jpg   | Bin 0 -> 14901 bytes
 src/main/ui/static/images/r_cross_mall.png    | Bin 0 -> 19787 bytes
 src/main/ui/static/images/yangmaimai_sign.png | Bin 432 -> 547 bytes
 .../partner_incremental_service_info.html     |   6 ++---
 .../invoice/templates/invoice_assistant.html  |   2 +-
 .../tradelog/templates/balance_report.html    |   2 +-
 .../templates/incremental_trade_logs.html     |   6 ++---
 .../partner_incremental_trade_logs.html       |   6 ++---
 .../templates/partner_settlement_dialog.html  |   2 +-
 .../templates/partner_trade_logs.html         |   6 ++---
 .../tradelog/templates/trade_logs.html        |   6 ++---
 .../payment/tradelog/tradelog-manage.js       |   2 +-
 .../ui/static/payment/tradelog/tradelog.js    |   4 ++--
 15 files changed, 38 insertions(+), 28 deletions(-)
 create mode 100644 src/main/ui/static/images/R跨境商城.jpg
 create mode 100644 src/main/ui/static/images/r_cross_mall.png

diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index cf8501c5a..aee3d5b60 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -1,6 +1,16 @@
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.schema-name=royalpay_local
-spring.datasource.host=192.168.0.50:3306
-spring.datasource.url=jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
-spring.datasource.username=root
-spring.datasource.password=root
+#多数据源配置
+spring.datasource.type = com.zaxxer.hikari.HikariDataSource
+#数据源master
+
+spring.datasource.master.schema-name=royalpay_production
+spring.datasource.master.host=192.168.1.52:3306
+spring.datasource.master.jdbc-url=jdbc:mysql://${spring.datasource.master.host}/${spring.datasource.master.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
+spring.datasource.master.username=taylor
+spring.datasource.master.password=taylor
+
+#数据源salve
+spring.datasource.slave.schema-name=royalpay_production
+spring.datasource.slave.host=192.168.1.52:3306
+spring.datasource.slave.jdbc-url=jdbc:mysql://${spring.datasource.slave.host}/${spring.datasource.slave.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
+spring.datasource.slave.username=taylor
+spring.datasource.slave.password=taylor
\ No newline at end of file
diff --git a/src/main/ui/static/cashback/templates/partner_cashback_records.html b/src/main/ui/static/cashback/templates/partner_cashback_records.html
index eb00e422f..0157c9dd2 100644
--- a/src/main/ui/static/cashback/templates/partner_cashback_records.html
+++ b/src/main/ui/static/cashback/templates/partner_cashback_records.html
@@ -84,7 +84,7 @@
                                             <img src="/static/images/royalpay_sign_s.png"
                                                  uib-tooltip="RoyalPay" ng-if="record.source=='system'"/>
                                             <img src="/static/images/yangmaimai_sign.png"
-                                                 uib-tooltip="YangMaiMai" ng-if="record.source=='yangmaimai'"/>
+                                                 uib-tooltip="R跨境商城" ng-if="record.source=='R跨境商城'"/>
                                             {{record.order_id}}
                                         </td>
                                         <td ng-bind="record.cashback_amount|currency:'AUD '"></td>
diff --git a/src/main/ui/static/images/R跨境商城.jpg b/src/main/ui/static/images/R跨境商城.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..9b0713935e0180587df4b00b6bc9ce12e5083607
GIT binary patch
literal 14901
zcmbVzWmFx@w(i0q!6mqB(BK~2-QC?;xVyW%1a}DT5Q4kAySw`%d+&ShJ?D-0<Gxxw
z#+;>HRqLy-tLLnKUwGdDAc_l%2?Ibt005AWAK?8BfG=QUWou_-Z*OEspzlgxZfj&h
zV`pUWPvZMBAOHaVuK)=N0SO5W^%0<9Vg3YI6j*rJj|&9}6%hdu6$uX=4GkTS2p1cd
zh?10)l8J#yP*4-(U-iNN{~CDz4M2hh41k7$fe-;ekwCzZK;C-*xE~_``*VE^<evZq
z4Fd@V4gmuCz65~&JH7MQe`WqJBu?iTk5{zxziI&MQ7$+vh?j$LFUN|0@KvuiK!`pk
zS-#nibuZXLX!_RK+(0{lwr)xqeW%om{{`h&e`728e271zb!pY9%V=JYu5F@#aJI*3
zhB2%?E_8(E%KwTQk#1d6J~!DVqR?MQM^aoo6K@1YS#(~Z;|L1?q7fMfnH+$>?G?8k
zFIP>ov{xVvnN?Ok=`gO}daV|97^~m8(ZSD@&i}xJeQo*z4^$C_(ew&<xhb9LC$B_}
z_|qDtlns$h>%2$!D~k^fjYMiry3r1y>5@_4+4>Zt#gS>0oT@}sqK?<aE?NF4DOOph
z{)OO5qIx3_R@Dlf*R{8IMp~-UsOcS5AlS^<J7Dek;4M*w1|z_tph#J#R##bF7{Hbm
z&E21*l0&3E&-8nqE|1Z?={YN~F=``pxZLNJ8?E}JD3ZI(d%&mjZ9EwH7m9RoDIC(x
zGZij|IVbze{d`ygFBFR0Q<aOCosN59bmcqXM!2oeL=&TfqfKu5<mJh^M*FX!BA7rk
zMQOSK>BLN6k1|ic0G(Bm!iAS|70tzJ67X_8b#hF$-D$*`Hvm9p{IdJt!F_5Wm-M1b
zh1Qpu$*<OFp0cqOAW7|6;a$z{1>~1$ZrRLjY{{O-ntH|YX!_$Y-K87Mf`2BBaf_+e
zLH=IR`nj_M02W$&2hW0>>6|o2_lz0OH1!UMw`J!zULQ0Hu7&*b7eMZg{2*GDNn68_
zNGH<3q(;n;SbuQ*yCsFg#gqN1liHU#SBj5r;o14SRk<#{G>sj4B95dMCNGDpOl`gP
zq=e%>8CAter`p>cWcSj{JXUP>w12-a798E*+qSCCl_M)o#0naxpUpcrV`<ROpDz9d
z(lg^a1lNdLJu)4-<^(&KX66+tHM!=5|2chGW_<`-sRK4XukNm5F(gsf>fY^QOFPFM
z)1vAfVAp1%y&~Hbuc)LP^!nLX@B|gexL`TgjPee^HT?zurC?0fs^JV_sG>(Y-gG1@
zsKHYVK~adYm=o2gQNf%%T7yH6J7{z+eiz<nxC2LGhR%RSz?wo(rj$Y<tkz*H!|X)n
zNOo}wqsC(`4S*vh5^q4|xb!Kri&jPSv1#~lXpU_3e&}9{047>|e0<JjZak+D1>SZ3
zs~y-}2~T&ZTOj*&w@>j!M03IRV}H1gQ|X<<8g^OoPoZ}}qb^iXrhO(&_w}b&7*F@~
zQ$(iryY9r|b>rz9-O{zuq`Qn&quW-hug@=&WikX%yNK6IXD7sC+skkIu4acy5=MIf
zJUp3_JHCON?+5={+W&jygL<$(xCQio5)S|X3H3odpdfz{4=CclwF(KxvS<5|0@7Q4
z%eDElaN|RV;2TV`a~Yl{_|QRr%qH&oytZEZd_*YWJf$kk;C_6l07aZZ8+jDdTb~d8
zlYgZBjUHOXeac4!1SfQ{qgj@UXW=9AAK?!*;{4OU|7J!2#7F-iK|!GZ>LA#EbkJ%p
z=}!s>tGU(FLPZnrhYos>yj^Jg_U3)@r~MWdR~%*XG?YK3Ko7>7iyFt2{-i@plK1sG
z*OQ2T=pgo^las5fMUTsWN`V!gP*%mw;mYm&Dfb`Yql-+401z;65U{@j#Gj5rfI~t7
zKtREu5iwZN30P3Rd_zKJMnxlJWbz>*A*bil{fE>+paJiI1d??)+vRKNPE4u9$W94^
zuQk<;hn7Yx$}F!mmGXwmFY+Q~s!=Yw$vBr|a~(WyUtjb@mAfFs=-hYRca!T-+Mb<_
zG2xAQ`q(cUBHD{~8a|6g-zAe*#^SmiBF%pY=4|Tw<l9b*o6OzYO9sgEJJaR(y|uAl
zQq12EW#TGXK3`mmfm88hC1{mu1U$tp)QavdL#FQL$JZLq47e<R&5RXdSK#nQ-DPjz
zy2p#r=d%kEUOIwkd#$oqns4j?CPDXt`o`dZB~>yMcEgM>liTT?4SF^$brZmNc2jK}
zH$Ms_B%6PsT(J6m<&?^vU7Ym}7-%;3EkUJGG*$&tD>OcfU4={biVnp7s9^b?<OjC@
z4p3F^{J1U}bhhU8t20<Sm*F9sou(oj;v|dQn6Z>d^*Ar=LtmFYGb*n-yvFd$C)lYA
z`BWS(ah+w5W*&*7<FZ;pA$+u9?}!H_5?5EbM6{-R9C}hyuIPpMv2k4q_ks(6*h8P6
z?7pjbiH!a9Thbbqyj`gq7ZNLHl5(|!?SHQMu3qjh(QKC0nv{A3NX<9t@h?WnE+Q^4
z$+uSe8C$gS(ycW<!u+>jdQ8M)_@1+rnGhTow{asnL4M|?SGm83^^fq&62ZINLjN3J
z#PFSIq)=x>-Rq1`<8DO8Z8OOGcHlvU+Q7;JiY&GlIJqQNMf!On`AQtqq$EN8LB10{
z@<63~kUPb4T-oJhX2QwTzGyJ_1n9rEN?WXb2eZ<}E^F1^Ia=XuLe*B438Y76zT)$w
z>R7g(+0EluGdj&-MYkQdFt(hpI%Soj`J`*y#)@2!8yeY=9y?uRm)SC1^ei>4DgMdO
z;IykLT3ggL=TKAl%I_^M0BboR{0Eb<olj7o)TQ;8hc-k@GEOy37q8#rpH2MMNJR2t
z%d{&*CZ3+plE}AZS!;0&3i|PYx7Aqe-|RvTxqnxRDW<#X;*IBXoID8>*{kM#?Nh5X
z@)^(|Y(}Z?yYnQRH<`jk-m+g2z1>BhF@SC*6%-us|0rAeQ6(5-XWNOAr7J6A;9;5}
z)tlbzW+$WgIXZ);2M%wSEbUC*tnxzun?^X{Xl=8N1`*iqiP-C4t{^oS*lpt?Q=@o|
z^WJ=``$cL~?|QY(79V!8mrmju`Vt=;Y=nzvNEdRU;)ZCAw$+4T+iaec<qQ}ecFkij
zSj^YOcd!~xCL6V18Kg0iteLgg-T_B<?Y>o`E_&wY^NDLJV@-iO-MHl0bl=N@c(&Q`
zLgVoe?S2Q6rOGL0?YCs&I7eK2axtS3bBeIWrj#M&b~B5j8Dt?E{tglcDM5m7ZH}<e
zK21B~cRBNJgXK&Rvg1#wA8hYS!pa^Hw=R(Cb>0&z)6V8fSAI6fFh?#tr;+go#h~54
zCtpEuDiQ7|MHzPN5{iQ7Y0Fcj_Z$et5};hn!umOGJ+4Gdc`MIQso)v2xdO8_XNjje
zXB!A45Tog%lrK`S`N-bMXj@wuo|-Y)jJzJlp~1)s+n(bU9;^Du!X~JOt(f>GB8I1I
z*_$S41H1w?H4`UX9>9*AeS%;EL6r|qoGiU9o-o~G9ZpliVPuHO(o4f|(l2bKSCEhJ
zZeVn>v9Jo>DlhPd5Y$@?OFQY65|}ImYG^6gn`|d~p{nHa_DBnE$41<&9!t?51vUo!
zP@B`DNan>gpp&k8R_!XzwqmN^EvW&6ZMkY4dYp0;mpAbY^=`+gXmvVYOj=#ha%ofp
zBk8tQi?d^<plZ5F7~TP!^aEi8wyu^JNf!|{y563l{fJ7oLKC(`l^J9??w991I}0O7
zwP(h@?m0j{jVt|)XT^*|hm09!d0EQnS(`mP#D3oW`02j=bnzxwD_hj@{}TMjR=fo2
za5wG`j6BiNc!q|zyAQL&!SvL=sx_wc-OLYqStFP86?JPo{*j$o9(|AY;!TTtg*w_A
zg&nEvkVjis>E?0aMXkL<k#TcOhuVXgdCv2b6aH7?ou8;CEEXpSzr=30i@D90AgJFG
z9&6`wn_qEGQ)$nu)~i8amT68}72BgvMZ@r}1@2CV2r|P@86qJ}rAuQmnN3%f4IxKo
z7g~D`FWvBnARqEu{wBFVrNQr1Rm-xs`$Qy#h0FgF+!Kq#Fm3_P25V~rf;v{}8+R&Y
z<w&A}eJJPh86tUYy32H}@holAY|A|5jy<ed9w;uA3qg#io1MTYg7_9|0{YF4oZXMD
zJVXAcJTjG11|zqB6TqEn1)zX!Y*uimKjU<yl+&PUvHEX|rRt43b5W!;qc7LRf&TOa
zYM3#PEyn&;_RNt*+M~;4&D<TQgtp}&Zl=Z-Ey61)nQ6b3^28HX>R<^NbIOWE@VEvB
z@9c@UC5Mb&dW)u0)@jY;jl|{7yTo~#R}u&ZwnvIb820$7j%^u2R4~3QQvX7cdbITV
zy+D+{lpD0Z8pp`{MJG<_K~CFW4c_mdE(Z6ocCMYpZN6|^{buo47)u%vi@AhG9d(QL
z+uPPm`_<6>Fhy)t*63ri(lhCr5W7Ke%iWIwEFDH_Gy4<TgGZ{cru41$L<&~kW;G}U
zHovQm(XJAIzjNw(=Op#kVH&O7q{^#dMamZ_n(yJwijF(MX?Te}HWYM+gYN+N?EJak
zM@$+viy4YlwQMCi#z6T7MwbdJ*LAFIx}bDi8E;6Fd~WJmVpUaTlU??TdGeBB{-0gq
zO=5Yl$Y?>ry}x;il@#c(gIdc=1_nvK`4}DbCI*xHSLa6ZhuFpTV9v>fI6(d9q<!l2
z@L3Zxg($_`CJl%8atqlG$}qHCc5M%y`HrAvk70GstWJ6g8~-y@E~J)Ly3K1ZE)iCy
z`z~`f3&_>@CZ@6}<OWM!M<Vhg<Xk?h{zzf2UHk*7GV0cGLxQGX5EZ;KOB$_ZI=<4E
zJ`XU@e-0D1`Ci6<W5z@zQ^H_lLgDety2<EmPM}C+P*bTwJX7^;R8vE`X~We=xntT$
z{2QZ-d{1{tR4%zkwy#!2<ww#fi{c-#J;Qb$A;C7s?soOxD0~M5%gnLuW~pul=gRlG
zky5LC2yK)k8jH2tJ{>p~j;uG>amg(s61`1%Ri@3bG92C((;5rC-aN0Ev#TBzSAD9s
zYBbv6@>D67Pu7Wkr^=_b_>$uo1>p=PLEV4W_A`6zWuXznoBnh~dc9c#`sz?(N=Z_Z
zStGK7jze0z)FWT=RPgYoWF)KnjVXB}G5^X6|K4kevJFl>CV1&=v37<0u5CEwiRcbu
z#XI0H^rb#%!274t`VHJv;UBinwX?cS!<Apzuql+tQ8%73&DA`~(yXzYD;)};O6#g4
zi?z4qT!XZ1CO@meXX29r6(L~08A6hoWR$bjr(+u{SjdgpC|K2acDFj6ma<yObs(f~
zhYZI1$a^je)vwlRXe|rXr8|96C{n1ZBH^02sr=rdF?l=@?>lt2+q`?X5*o@*wbmNd
zqD(bi^W<#4Y<)E}?`mYxR#TtNAif{v)DBGUmWnF+vy{W1Zcl@QES3jkbFnY<s(BCT
z@W~)b;>)F$GsdM;f`p7dz1{8S=LsJx_(r%!UNr;)w?`tfP5x|hatv8Q$=E7`r~}So
z$bzu$1#2wMU}#R1S6C3<@XlZ#&0FQ!MnSQ=Ln=EIbPuX?#6|<Dk;HE_`e{|URq%<I
zJ9Q3fR343V0?`h$1AiW3?t7>ao?2H0z15!HhI|{wsUCXRMZkXte8w*2{`dJ(LGe(j
zsc~mw!WEn!j(Nhd*k&Nqz>5)AIs`A!juBUMjk>TXoT~24lQw5Pl&R8gbF`Q*`_y^-
z4(R8h#lx^sW+ToV(%S&KN4zo+v7Y#5VX|fet642&6Ma$#dyBvnVN8(Bje)*PSC&u?
zrg0eH#45B>allqUK*DZU4P$Llq!8?E^)aG=l()coSL$JJCt_%&^aHSWvf)|($Qm%+
zI`ak1&T(Om5n~m@P3A2qZI5+m39Ubxfx+!cST4q(U?YZkyhSrAQD=^A30B15)cFR^
zcEY7tu0dSJ@noF4dB0KDWGC?x3wEd=4@r?nOf^xX3@R37geYbU;||k&K^&F6T)jtC
z;(3xLpEDURuxCtZ;6AmG3ek*gM_@4F92rc#va|oI`kmq5lZ&OjZWP#9b4v!=!x(M-
z3MN{P+{gzGduXB`=qAGEnehjX+xevv5y9<@_9<%Rp?3L91+Fa<{;g&Rcw9q+ch@9^
zZAjIAdiZe7&dW?jEhFWAOJuC3x>mGQqD5~>*X5NgBGku6s;#i!=7TtH)7X$2c+42D
zd(K@U?<|=YBChEARh^n9{ii~40`&2e9}OIVGQ(IL=<#@w`^!E4`k?OY_$Qp14wL5_
zBR5;?A%gSd9&B6p<nI6hDSK=#>vJ=U#y`Y&%p;V)v$w%SkcuO10{%pW2Nv`hGFo)w
zrP<r81xUa3B^;>HJO)=2BpQHyMPU5PD%8boVzL!3e7%;60S_j_8>Le7XIw7{w5g9~
zV;GF+&@UW<B_`^JEPe?e!=Pm_QChlyW;09qvNv{4VYQm!?LfmLG?(Qsv!yKaR+7Iu
z6&A^;R!TM`;4(3fS*t7q6!Y@xL69qg0h{2-$V9bnx&Lex>Y;{c%Z^6e4T2l%>nU7o
zx7aR2vkIin;$QrpBA8hb>T7pTqCN3tpwd?d-WXHodC=8c$Hht{)+_3d`?>B6rucU>
zfB78tjR~)atdzb3Ds7okrJcLDAXo^SEDaUuoZKyv^%C-9z*Ae*rhq9{#DOhk@d}^`
z&(pJ49V#7ayuVmjiGtj?|7>Zv*&4Tym}GUkMeh*k4)cN9X(DL<2#T6znmd%3YaJ09
zQe2k$$_EcN65?e|X=xgNS$S0~5uIvbjmybSk{ZZHWdxMRc9&GVwRvLV_)0|+qCD$-
zg4J%=yZxXFS#KPBnR?<Dp>b{OZ{x~?Ya|L->`q_tHTg^}1z~<)D?JSSkZ#6Gpwz6$
zg^R;RDlcr+bI%B>3za3D2qZEzdySixQZ85r7W~jdZ-O?%@sV96hRWqDs%RR-DB)6l
z6n@4`o9Uagel}F5IE2X+Di!dCgITsZN#TJHG9QO4T7oTHMinN+#yiZ5>dj~UZ9?o=
z&=VvYaa-a51&vn2Bl}AWpW3PWg@t$J=)n?<JGljKq;Fay^n}3Tri$4@16u>f%#O2+
zw;qo>4ZXM`vW3l<*xcr>LM+FP*%ZyBJDB`@{ElR^q`XnjXmUh<DMH}n3)C`MkCiL0
zbwY1<C@(;E!>>diJRr6dkIxt48}V%GFv7u>O`u(nGW1mkZo}P|nuMI52x}NTSe_ki
zcI2B!Qk@Lbk#6Vt8YYVVgDwU-YgL0R)_&61X?Eddo275xeztgpyaOJaKkN^RhyYMf
z02nAF92Df|55vQU{Q?vW8~}j?iHwLsNY6KgN<bv1qz8;oNUW`!hWf@Jub^m0%<mf;
zSB*x($fRuVmsj(<+b1VCziU!ZSKq+M!T%ro1PsrIeZm}Pi8<31*0kcQ!ZtK~%BW1<
z_)MR<C!SX!qr$=UEqz)xJ*xuds@2}kXJVjXHnE;BRQtzsZ>1n;C5Q#*$dKU6m9L)!
zN(p&J*3$JQaTW}WOZ36PD~6oTH>I-;gUY;P!b9AK8HF4d!MGG-n)arb{ul%6tMj>6
zO{+Dnr}eVP*5OW#TVU4Qh}3tw8n#St^1kEd${+S;Sy&Dgd+dp+jd=|?KdL|@w?G+U
z#DJ0ErKBU|^y!G2jz~l$&Ype3^Sqp%nZuUzKP<r0OcFSOvs2d5{Sje-Y{bK4O(eeg
zw32p2W~*=Cr@+%r9CzI=MVG@#O7ly<9DrY;L}Zf>!y4v5!WgAOACRu2$IV$JFNX;N
zkp*7V9VQi_e?3tL?_J?klq?k{nXlB5#&ilqBE^6fVOHqHhEF;<s!|Gu=^EtS3!-<;
z;HM0g>A27B_|7>SLL;%(V>d10G%&TgwHpJO@_m_nVNPo-qs$%1MYrO56jDV^XCKAI
zn{tws+0}9hPf!zC1G8AQ-ssnl42*UyrxM1&=NP58NPttZgtPOIY}aX)RK~VN1Zr+1
zauaa~nK2~a`ldMX0_7@6#F-t>079<N=he2tWZRa*Z17JI^LF}qF}6wsOqAD>M(LU9
ze7SwLao%HkhVOukUomdREa73*t%ILg-T^N(d0TKuw_AJCN32&k;*&BcP$CLB;0BI1
z^Muso-{y1rLtAyg6;5Fgl`4|Pzv9c&>qRlb_D|?w1{oaCg_2q3W<s0KZp-$G?ZydH
z?OMuknZfH&GxdB+mBFO~XvDXrj4<N!c^G3x|LCAzPMUQqobfY1MMMgM8S}7Oaz1d6
zV0(*RzPq?E(NC0M7p<nm`YF>+m^z(hXlZ5V){^|YZ=SrY#DkineYk<7mNVZB!_3HP
zPq!E}QtSX@)csR$3R`Gs&{ux~-Ib{_*ng{Hvb749yqMBMsT|xYgCklL^unCmD(`B7
ztP-WKh68fb$9R<Gt5X*7RP;mTX#0D~0oqg3c&QtNS0$}V?E)RKieUvRZH6vLP%#wY
zwEy?2o;g1@;`IWsh8<msnZ!O%g$b%#V7B7Tr&mprS#Hoy70g>1-m2N&{OoUWtHr5P
z%pqu@H#ni)o1A#Vc$hh-^9|1<c&B)ri+pzvRWIgQyP7lP`}5YKg*-m@Y*ogiT+8C<
zdVVYk0ro2rE!oEF9OB142ouJ#F5fRaH=Di>H8$Yp)o{cpB^>bK5=5Bs;H4*?@J#7*
zz&vf|{B#a5#8{VN-L_V;WJx?>t71E#+~<{vx$A%~3X53?u{=$JVSqtJGKMw8w8`zA
z?fHuO)s>&b9F2D?8Cq+dq7+T!D@m^fHgnn&&Z?#nD`nqlOO-xUsD%B&XOOO>rBYJx
z{{G*WHizS_ZICS%Az5nqx}iAcYN^o#0C;(677OMZ_Lin0+S$-6Ohm2=F5awx@Pbz9
zR|H@%{^YaQ8XoL2Lm9KWelDp1BERqOk@IXv10&VF1^2Y_Mq_V0rsEt7j(R0Y5?A{v
ze?t~7csPhHPT`Np4fg7K%uRk~aAxn|$kK7*3U%}>6B-?%sBdb~S1#}b+t^{qh&uM#
zQd>+|hvO0JOhx+7BNyF@J?J4K6#3_Q1{|Z*i|SMJD|PzxXTuMOwtKEdhB?YE1?bvJ
zBm*0MY;_)1@MDk1JW$vIwH<EbUB7>{@>|m^F-TfN!&V0Pi2o#rFlH)QtwyckpI4h>
zrH8xn>8o_E1K&1vavoQEU|Yh?yq@!dXUR4pDv^evmLW_V3&j!FioW9dQmj}aZs;@Y
zx+6yt!5UWdCHh8~CD_E{HrqckXK|g|WMgYp?X=f;r1vP<bRhBG2VxchA>hQF+Qm4y
zQ5*I`uEK=Ybx*pt>ic!5D3n_4Wdrf-%*UO2+*+c$`WB*9<Q~`>7u7O<2e~%Yg?r>e
z_uFGA;e<zQ|Af0ltZ~PKx$ogP^QMk2Oz+2*Poh}y6Tc($Xi193@#kkJ>a&oc4Zd#5
zsEm64Fvjj7j{#GitPZYAj;Y%uWe<@BP#~tz_&!`|>?3gA)*1L82wXvgDU(oQorq(P
z%1bc#`u1kszz}`DcWgjO+(({X5sD{{@_kcf*EHkGM@E#*E>5^>GMLSX!|$7~wjq+(
zJK!Mw9dJf)fxmmy`}L~kc*%t*izm;ieGeX?v#LhYxhDGd(wd{ryk}a5sYp;zTV9%N
zz>bo0Vz)l~=w@X5cra}F5mNk6e-OAL#lt1*SPkuQOvjy`?7Sp|yP_?I{^8>)8-gZQ
zjAJL}DQAcchryfPz3_EI`LR7?_ZjISdfz$P?B`9?cI?aTQ%Y{aPKWMXo3)lgXdvMZ
z3B2cs5m3j~R6-^+P5}{AL}YCS?3TXP@jwJ#gJzOR8B6}-31WS~`}DA2uATNOX{p4v
z(T*rbx$I<`FAN_ABJIb<B3;m*BaKx!yyW02NP)->0<4|A>gg!Mxg+{{#U6mG1|abK
z4(FSP%fXym0qSINC4wA)pBfoda9B0-8{9&PFf##{KNXQ42fjF@AT{LxfRi5wyb7%K
zs;ijqANn%-G}Wkstq`x%0i~<$m$_h^n78Xvuqxmu6w$K7B5Q90v?>wU(i;FaHiPS{
z#_`7OF;C9BSmb@R;=_34U+h#@KHfGp-DBLlHgi({A`e7U71fV0AQvF)OREN$^G9hv
za{1#^a57DIp<~+#jZ%5Z&$Q13A8zk{HhwkJsEVu|q+QF1MRS|qNK&Evj96MOwpryR
zIHGOnBOgja@Ee5l`7B!lt(Kx7&rWTZl~A-xMQTl|-vjEK!U*MJ3;{%#5P|&<ZVp)4
z@qh-CC~!JuL@-hQ8>wh;vC}9<B*FEQNa~cPjSN8qo{3q<d3$^cpj-KiheuBDQSIer
zYWN<<gfum@OU!S%Tjy-dt6dxMl==<};PbWzAr_S6KgF(s(M!ks`)nDBS&V4bxcGX^
z`h-K9Th!i)#+;9z9X9-<s{2|4);<?&z)dX-Vvl#v{|2vyb5uh`bg-W6sx>#H%p@e{
zNZNQ)79-L{aLMC=VjDg_eg><%5aLozLML{pvzCorn=xQ%-d}%vNX(CoDnFB;zlx6-
zqjW?x0@z%&RXuubG2v7`Aj>YM7|wlCzqdykrSW4QcXbVh)QJ<4CUd4CRdF?neOwb>
z$7-P3(GDf=?WJ_A)CQ6qiZkL!(Mg=eEiu|>=p<$7Dcx_T5f34p5nLm>!jt)vFTsm;
zH?I_#wI1}xV!R4(E?DefVnnI7EaZ`L^)>9{f~VP#WB3Wp^NUdaWE(2zbR;la!UzjO
zD*2?*LR=8UVm|vxCQjAYIH52|IgRY|0I&|5bHDrr=ik|{Z{p-UtM&p|$NB%xv>no}
zXCtu77OXQxjjf9JKV#ueee7(kKdZ5ws5UGJe}0jaBE%|J9j;JT;rN<{9)Yq3;qyDm
ziBRdo1<vII5)u7PNpmQNWG)5(p4a;q1b80tZPSC(`uLRI0pg>S25FvIKcNy$0;{pb
zAayiH2J)%cNhovUr+R!NPR)$zexTapQjN&C!jR&;p<K5=y{)n_3c#5*HX;h4n6*jZ
zDa!*h8&iTyB2L?SxFt=j_6Uy*IBn<=6fl=vQ`}N&Nv=DmTrsMD5!E2x86JrCziOoD
zM)eLO_O4t5i!u;?12CW>su={iH2S5yg(1VSD1Fz!>V_?4Tz<va^qY$Y?Rcz&0OM9}
z9xw6*v~NQUz>oMz0)-ilQPwdt!#4BkNd$ms&^wX>6pJfE+=T1)gnm5+ts&K~Ibqbg
zDxkB6AZTS@51n3z*rgeb^6Wkj+ufNkTYtB(CN`Y#Ic)NGk1^PVr&G#~j80%{SN39I
zIl_iXHfFX?@%9%7`nBasjY=-$!sr_|#*4ghbRwXwGGZrxDclL;3$33V_8$TTNa$8q
zB+mqu3yqa4lYaV)_qcgJagPCf#cw>_+!#5PZN*LFqgG7aNEDF%;d8*(KZG~+G&iq<
zPvI_ctfBR>>`v(_tQ;?|g6lf!>p$q{-?NRCt5%aVeoL_IxfbX)Xu_!tk_Z36z{cWA
z&2GHY0mDKGY9()S$2K-&?QO|?#4yvfTzPC?_?T*9-}vsLlaRdZYBB`Hk7_%?Jx_kW
zSopxce#6kZP|PhFGBqf4S7NNVU*tfFzClAVRP(Vjy9dChJb4-W5&GIkC#@Kz<i{D*
zT)*CVopBNhDtuR9O)7B_iLHrF*MvEjvX9I;eN8j?gt+f^5+(B@uBthvs5~^=(BWj1
zWTmh}87MzSs2jh*>8X2pX3@W%wFrM`h*|>tu<|69T|`Sbn7?TWXMAe+*nnpw#KP7O
zuEdoOxc&P|Dp}2cL=^i~5|@*<;DARFQs+wVCY^00q3OI!)~4~r=v(^5Xi7iHb|-}Q
zusDwq!r1*E;u#v5Em&Le;vk)ONaTw6wN3in3$KGgVSn@Zf2uU5gt7N%_mh41cQ6|P
zBJ`o|WPHO!4XtrJkwGvdnPOb|8N!0Vps2#U%xGdBi<sS{G8Ml%KMhE&E8__ECz^=L
zM8+g;<_M+rvxiGU&gGp~Nf+t$dP^7U{RiScZEJ-hZOLDPB=q!gxv9cYZDs9+hr~a&
zcZO*S_(Ae*`GB#WSuF5HMV;M!T{AcL4=xKFSs#vE1Z*gU>GjQR-6J>m7cNUu*jnzP
ztBWr$jEsXss+<8lM1H)uMP9*8-O&fHoi+$iYsK!rx235Ea_TwYn0I?CqHnieJk%H7
z0oru^{}o$=bM|2C#P>g~MR1S*8#*Hb+V0M2uq_>N>d99{c{v_dp`1`eB5VHCzGM5L
zdt4a?TM_egOCK*i{4KTkPasn=1Q<w5OB%6JqYdnW0@)$KZT`MQIoX+pX;nnZ%@@19
z?B;7_gkdgZ@|95>&}`fGxGAyEEdj@*R<3KE3g}zS{9{tYBGlgVxQbCh7|-t7$K+=J
z+NS%w1BhdU-|Tvtel#*nE3ZuR?k2G8h&U%ga|L75Kv4H#9_B0L*TjLxmu89BM~{tA
z(H+O=d8ZlI%-y7fdlv*vO4~r#c__;uy?IEqix39LMz@(f**ntX?-VPeTHw9Rv1>jm
zLH&)67!hNJE}UX3)>AZcfrx|05Vw@E=s)E3-)g8_Ek;n_JugYt5j&G6p_smth{71A
zbbx_yg&T|MY;(A8Ue#SPpf_PY<!rdhk;A@N=P5(5nhzOVNbU!~4#26?JaGqxZ;|+R
zSiQ;VHCwH(sO^b1fRWO6cjb1Qv#og+oJ!6YJjhM|hDQ=6cCeIIUiJA)L>sMK7&2s@
zTwpQL@Df_;>5x7|;fzlU<cv>~NBlJY=H``*q<8S&)v$cSZbkKjt4$a(ckHBFicdLj
zxchLtMNXexT)y85tf2#v^Z~e6z@M&FX?<OL9TwP7X^-WWcout2-<QALH?w(d8!Tpl
zyBbw+H`%LiCtT7G@h`}9jXVtR$J6EYhAZ>qQ4&*u^Nx<T^<2SP!nLZk4M2<xX#hiw
z&U4|$wmzUaE-hWig1lcuu7C|=KOJ8Z8B(8YazUZWh*}rf_F=OQz&?&h^WI$J3^VWX
zgpWH}`OVGl{8-o9Q13RTMOt=!6*96XwMvW&-Si)DK+d&k5?a%39a$M-K4i0%lB`L9
z>Jd-%9`_woA*_1`6cmQikCPrzy&kabCv)WBpGxN;9W&z*y?BX|VDI0-bVFp-U5+Dh
zBVa>9-A0HT)f$_msUdI<60RA4mj`~?eg3+5A1qp}3##}q=^&GNK7V)Eb=%)zYb0zw
zb=<V2nyfXQvttZ}N$mRI_VCxnrBBhIh_X&uER6^hshEQbPZo%mcpj<I%WxZn?PPvc
z9^zr{_-l@R3t=1ly5ury`OJaar+;bJyT$S^N|39k*-Txi#G;}@ToK}DhooExSVyez
zXF6xO2xvG<Uk}Fux?1ZPuLY;1#Qen1k6?E-a&k5p8|jyqrrH}%TWIEPjn=NS!8ATY
z1l2?arKL1k3q|kkm3*EgdT1)ib|cY22l11@8psI>fWnG&|LZ02i(y#y1!)MP5K`h!
z>TXDYEPVo*637m^wHbF6WzmGBq*1MYp%~Mc>*{JQNd}xVu7(WZ{J)bAu8hpbOQ3(r
z;rYeG{{#(uw9`||Pw;OH8AkO7lR=|!15|y)yiy4p3-d1Ip`?+|3_oUZ%n_)Y7D~8T
zvU~f+n5jD>MP0Uy+wwdggJL=HKB3Kji_1`2TZj}K{p8Hg{pL9#-D1$i@NDVXUga2H
zcaa%w6d;n8S!~%?RU$vpWQ#2Y9}r=DwYWMO)2-=@ws9$fv4df?6VFnODzzR4)|2y^
z@cU*a59zgpq&tdb&smHAevV?t&X##~taQvHaXsoCKnr#0ezRXfzLEL~e?4$DtNe<O
z;+)G;Dfk#8*qvf<NT+?xF8E3|yKkL)z3Oz@|2W!XW1q{r-g=U+rmXLmj9|$Sj}8k6
zEDSiFtuW4&g?{7Xhj}3rL6`onS?4Sr52f)`0}s3T4f?W9QG>JLELJW|j%0bDV8BSq
znH}|&+6dhqyE(ITHjBfyt}+I4TPs96YTFqbB-;(OX#w_mqM+}W$yy*SiwXU(#V9!%
zPQ!7V_<4@iga*E}8XEdgKVNii7^*82{E*S3X3Wq<b0hI`A|}^FZ>#}Blk6x_U#x%c
zk4Roc00515W1xU3bYi{s@l*I~!;`kq%+{+aosbGmz(Tx7cLn$Fm2PdV6{{f0gkoiP
z<bzsseg`^oPFs^yD>i!!$w@x8gaH(nKynBDTX*}gN!4wOAej8l2w3eZ`EKQ;er#QO
zDWVs^w)vIKVs=@0j9RtaN$oh~MMP+!887ylHh$B>or(YXe0$~hYk@Tde=7zOhhcN7
zyglYFSRyRH&)Zg42x=<F+h%rUbKZfaJSfULjAAWd4ul)e%&!X<k{!$VHWsUfn~mz3
zutN#ai`-G9)%`tBY>-ll08C(()`&59%v_-vs7nl<5FTMfl6xiewxL`rEWynnv1wVv
za&7HNTA6BrcJo(xDoa)(@GLbk`ylGG-qdJz@`Ma#jAAQN<FV<eQW8(C5v(sSNM#1}
zYR_nxRNbih6#57^Axejq{O({xWnZ@u=xdE&MYC(fdV4vg+-Mf@7>D_x@MWInUPh3`
zIO1#vB2#}SQ{p8h{Un^egJ(o9NR`N(3t~qED-GF+^#w;%Jlm#Zwr{m2tTIobQ+K{B
z;xgIiynSu4^#q=0;6K03w#q_S{952!^B%`Y537YC#Q?bW1;=c$#f)?zj~F;Q9>D+o
zAo*emV?D?_=hp^D9Ty_l`k<^@zLMnt574b)*M(2J+BT(A9vrD+RIK_M#_9@y)v^C@
zq4xioMWa)VR@X{R$8+#cp@B1MW5s>zJ|nHGg$m{;jaGLah%>&sPUwJygOUl%kgl>A
zMVq!pT$53uH+_1!>yutlBF!GKPuZwo&A%ygeM(E20PwnyjN&t2MTVvpVuU;Rs@Ts#
z{HZk<KbH*?SMDSiNb8FTN=$q!@><!DAi#<F)m9_!A>I@sB%SF})`hVrnkyTYHvq|n
zB7q0f+EtH!DD>SkWsE3Fe**Uz_E$=_B3m2`Eo`6L<sd9S&4a$;#7|t#o(s>u{#q`4
zul7^meHz|XX5(VjS=U*R^v)yfUqdw9WR7RZON9YX(#+Ry3sIKTO6P83B7>M~|K{Oy
z-obD*Q!2<5)oz+ZF+ETU=vf*wl<cSf{1^s;*t5Rf*XCtl$Fb=%4^+Lk_7H8U?meto
zxFY#B69=wB1R9p126X{zrEF!4m$D_QM}8CYP^5NE;h!Jh=dwU4>bklTXPo`Tu-dvO
zl6qRaH*+<rASKJrmLzOOpVP7CbnWy2VVBJNlHw^31*l@G7S%&D*%qvY;3-3ok={Dx
z-W+K#uI>qLf%!WgPepol|22xxd!23!P8C|MEu69utn(rynLj;PitUZn-QCAoBkmg>
zSxoFwe5<AqtU+6=Z>Q^~-Bi0GY=1@!(|pj)%r)lK<5WQi3H>nYF2a|gAwJwWTD5w|
zsJLNs;W&AfcwrNgD?JHLM6{2$LT)f@QoB#*?|_gtPGlO+?Z}CrR|Xbb^>+F10Cnp^
z7CZ1}L;~$>wNrE9fU?2L{W}-+jApG8k`ild$A?}N-%iX~@kR%bK9SnucYvl!?Payc
zQe$sO9tgh(s<;>oRuzG)G$C1*khX?h=iX(_*D%skB!MQ76nJ?kmZBiZR<g9fX7lDE
z71!}EuHDjxefIYBwL{=Zd#>XC6RkZ5TmqPa_a-DzhFC(-JegEkf|}yVEPh8IP6t|`
z<O>38($Lw}HanL@!xP3;#KAffpSI5R_m~^~#F{EuHPMVHH~gUcCb|$4KcR;uz!3RQ
z6*+^)N#|z>HFMoc9g4gItVX(Zh#H|*EZrHq?vK~zF&#B#GD=)%_~Qk8rSlYR`6jk?
zS!`yN+)@_c(r=Zt3t7O7UzJo!B7GJ+m6VPQbnjG+Qyr~`r8!B<C^5Elr~FvI7gFvp
zcu~f^1Cr!Ix8s%tV{&`aV}+3IiQs)h2K_0DtXD=~4TW2trRSL9fY=zZ%RseXJFvVQ
zpl(2QRr^D$wuU&qsg>o-hnpvGJF}4Q?KovFu8+YFY>Z}li;-**bDw_XcV*nuk@zS4
zwvD*rgiw+z(RT#^^kd*#Yo-Qw?~*$3kkl~6Yktlkx<V5pa$3$A5sL|Hhp1kqjkzB_
zwjsvYe~n9IaMP<8I^&Yu-$(ai-!|RBe^NCIS?Ce_CJhCo^j_~^Bh~}xnq*7wF&*Ri
z2CVo&Cz0Up%KbRirvncuvv9Cz8XmxT2-yg!ZN@$?vd6lq#q*&bL^G8qozDowa*EMu
zv(ZXhES+O3olMni7DNoNv>emm^O=tDYk`qTlF4^BTWXOuh~tFzUBlGZ?fS*GyflvP
zB@Q2X3eU3E8`7dzAg4>>#p+6*RKTIvxWgl^mVG?5pP1g*&Y!?iN@Of$*wN;|J=8)8
z)+TPi)R-m7?h?a^+;|8rkzwR$swk5OVH#joB}QN$KP3Z)H{ipH`8f|Y4Tgz;%bGok
zW$A_9xu^`M|JE;M`S^R4PI&lzZ7mXn#ds^6es@74`^RS;Z~z>5w4y2!jUJ1_r^LS1
z=^OOpZF-4uxX?Yud}9K^s`e4F(->~|Z*2@YFFUc~KVJ#9Eo)ZCB6X9of#Pg#lFWD?
z0COip7D;kKushkoEa$kkC?ZfgkXshESg(4Sr}u&XPB;~OOxWw_7l?HTPG7~43kQ{u
z72l=JiALRXF$x>r7L6T=sp=fkOWvB2y1G&C5~^N<G7xk7_+a-?xqFvvCu;Pn=ZljQ
z%!iYQt>*<>6uIUWt%YYbUR<kRI-e&F;Rl_ZD(CIWO}=m5%Oy1yN1+#y`PriKFivWH
zacvqc&kt=+bcQl|g3|~bDF+IZiJ#w*h{a|8PS!U}c0S_G(j4;gJbwCZx%0ytDv0!P
z8XF801QHS!;qSBBpdY8R|MG_ZafZsu)u4SLV&->1Bvw??GjjBei?5zUB_U&A)HSpP
z+WE!i<aPah@*M<(2k@%oCF$}bnDD}sQ!+;3Wj?3^@3Hr3vI=&I`#SPAPjWDtkoDWM
zHMuD=`r=HZ`^{&HhMIwd@oQcblKKj=gu$N?&`soMjR2KAZyJ~K3zqKam5rLp23qK*
zqfjf#ON;GRn|Xz~;ofx1Ih<k9w&*^4+n0w5n$j=F4+$$I)i|N{#39-DCCu-D%sjWB
z_eu5mhcrCoBF~ij1$%3Li)4%=ArWMJva@n_q1psm?bFzY=&Mrfw$m!ektB9FA=l!~
zP}r0i>%Me8CqjyrVvUP$0$0^iY*BT~p(FYM*&HUtw;xS!|7kiqyKtWs#yDcfHD$D>
zjXPaM--D^Ixu)N!5F}JX0|a~^%Jys2(&gLanJbT=*Hg=wyZjnp`)6@cePMT|Z6=k<
z6(*}~IR5a4KYgIW6oDXC#8NG8Q1XPO$TJy7w9exiYZ-#8*|S%=&j><ym|fe8@tXFR
z(UR7O`5o^*@8jaRRZa($+-1!ah6h0_;$@cDPbN5t1#7}40|EQ>&7^s{I5+9`xpkGv
zag5@dc2+`|%$uS1u|)+lY43os%XU@wVfFN^;VTO?FoC6A{!r5X9m19YOx<8il5rz}
zNv8#Q)uf(OifzGw@3OD6WvBfXt@(WnG#zcSiU&;lWu!gUNefex3P5-`PB?b-66Pnm
zz&yH>!8P?6WQ>@GD6m`)PIm$g6*iKCG9J>><)cw&g@ySH1TeoQO#3K`r8^pRoA^_B
zzdlzNjVmiUibN3?!*9b|DIx$Vo)X3xw_q7YPoqxD%>f%u1WZXf{@G4m4rIU?a=Nl$
zZFSpDu^_J?#5balkgVRVnbED!F>9narHIIGB$>=8yx-%5j3ulLLXG6w&PaZMSc3eN
zgw7=*|CQZ5{(*OqKX?ZP1BHV5^gr+pfdqg=hC)I68}W#!U(lKLfDSoC@`_4-Am26h
z0eA&nLnC8b``CoM$<4pNrT7c-X!=Z{BCQeKQQ5Rfy<(mz8|wYN3g7cDf7M5a6})~p
zYRb8>1obBggRyAy(9rH~Xt3#KEDAS%gG{W}r&a`_xmL$)L{KpH^f+(Q_hm5cuU;B-
zL&7b>_2(<<2y2mrESW(&etH6Knw-6AJbOO}QQmMIC4LuBc2$VtD!joT^)Nmu`gOcM
z;fP91g;<4ES9a$>HpUgrI5+=cw_cAce<`7=4->ZZ=eMguRzOJ2<l9Hm;Hyux8Y_v$
zxbgOrcp|+2d9AoID}gB|K1Mp59Lv-+?H^{}foQaCY);g|yW{*0NWt5C2Uz1kSan-A
z^Cqb5X*l5hb&KJjY|+xA4*Mn%phZ*&LynhgB}Y;gd)<$qorL?@tU1TF14Dhv%`~rP
zTv{qTJSd0BtGz^En93m=LoorqCHpe5v~7bCbr4@db_T_AbbyD3;l24%j^won&F!B1
zp3ea~vo;g%Y*$?48nnN*m}Qt}vWqWVrei~{R`pm1OeJzW7GBt2W8WktO83(E>1j)6
zzydn}uBrlaL=qO4+pOQJrVV7QSStiwNU&9!n%225)2|Ix2;f+fj<7lw$_lysJ|#~d
zY6mR#$L_f;IzeGd#C2ZPMJO`f8dE=3ryJ7-eH>(KLOUU~Zj%~kR=dOxCSnpYn~<df
z(W#F}RQObn`eUG)9ha3Xd~B(xxz{emAuYd2$dka?%I#OvbPkJcNf!#rZT$&6!-yGD
zTw|x<@|xoMx0$3FDho>epT+fVxkbO%POI!qTHkP(Oi$L`(^@jk92%&YJ~^7@iAlmg
z3&*&!MF0uoqMj$mFVk&(J&76)xEfROhtHde*X}qQ)>z$XrZef~ml#DbmJ7RWwdorg
zt#q$*NzeUA8Hh-mDOZ);=9`7eIt8;<_8>kD<m$EsPz|M|);WFp3QIwoABRoURPsZm
YDm)p|a5FY-B~(etZPwdA`+f2M03B92jQ{`u

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/r_cross_mall.png b/src/main/ui/static/images/r_cross_mall.png
new file mode 100644
index 0000000000000000000000000000000000000000..761f7ca4b65ed549cfd891a4dbb508270ea4ebe1
GIT binary patch
literal 19787
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
PI~tp@ftfyD*D3OU8n%F}

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/yangmaimai_sign.png b/src/main/ui/static/images/yangmaimai_sign.png
index 53883856b297b9fc8ee06d0d2e088bbf07353cc6..a77e570a0367ee573f70845072b682db8757b392 100644
GIT binary patch
delta 508
zcmV<Y0R#T91EU0xF@N1jL_t(I5sj0<YZFlr#(!_KO-<CIRkT5?;H838C_M>Y1y3G&
z@F<@A14O8&qV=NS&5H-I=pW!k3bmz_+7|Ju#DWT?id_*C4FsArn|*#S3GQxFN(SD(
zc{ATPGjC>}vG>RlFpcE~P|)f{0t_#Op7J~7$zE6qOhE}J#ec=vTWraZ&V1z#OgxJ5
z<!`Y14CWq!ZN_#8TmYN2aDN>(-a|>G)1xBD{r3k9kHM!mF#8|{_fjW!7&_lJ)vK`f
z9NxWvQwrpQUb@-#CBA+_kJZv9L?IkJrb`;g=Aqfp+KDk8ZSMdlN5Jb8=g7y;!9Wp~
zpY|BQMlgB}!hbq^S%HfB{8hWV(k|J%0$27cO?K%?8$Ny=uHIFE8J*KT?`~qGG3Ab^
z2Z?cgc&&+Cgxia|^6REumifmDFaRHCV^^aF#X0!B5!*VN8CfW&YwCjRZ}{JX%Y#0L
ze8aCDORZ@+lk+G^uSb?)>6_aT+p?eN_vllL-j+0GiFGIhDxq*TpFut{M!?80bigB@
zvGmC{nDxkI4AszbSd5BxCywh`_o^ff{jzK2kV?b0GX1PY_#%I<Hu<jXTRJ;hpj}0^
y#Bt4qqRocEpJ}7#>?&!y_W!o37TGTxo%#oc7^q!S6Bc3s0000<MNUMnLSTaKwE7<a

delta 393
zcmV;40e1eQ1h4~;F@I`FL_t(I5uH;pOT$1IeV3#mty1bxF_V;HJGkoLs1!FR7bgc7
z>F6K@2M1m1=3Ja~@&|}RogKu%#i4?z6s)#VrIt2H)0}se6XC)Uz2$@Vz4z|BFL`A4
zmYRO!eUDJAQ@}=qLx2V)I5zBwU6Q|OmqAgAppz*C2O7Uw?ter>xK@igc9<pCYGIAP
zV3NUH%0Ou*E_oC)7M9X62{#0iiV<uxVS$kXHe0pnAvdmr5Q6KE0XC*B^oJCywvYW<
z4=*kwu|x9JHcjZj>3kBk?hxg>9tx8tR;EnUdqdckhL%V1>;$MhI@rouSWKH(yXv6H
z@R5O-LR5o&=zp_?Bq|RMJW8>XOJMo3gHQkaR>9--=Lx?-&O5yCqnL@K<pwx<aze#i
zBP~%Foxct+V9Usk={Tvo0+wp%1cJ4B(?wh-@B)FzRcY|XmIU^ntB%Hlp(3byT&wX^
nsYt5cD3LspEYA3EoWB6ljDBvfPekhg0000<MNUMnLIPld3AVYb

diff --git a/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html b/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html
index ef6932fa2..caaaa6f17 100644
--- a/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html
+++ b/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html
@@ -139,8 +139,8 @@
                                                ng-click="params.source='ALL';loadTradeLogs(1)">All</a> |
                                             <a role="button" ng-class="{'bg-primary':params.source=='system'}"
                                                ng-click="params.source='system';loadTradeLogs(1)">System</a> |
-                                            <a role="button" ng-class="{'bg-primary':params.source=='yangmaimai'}"
-                                               ng-click="params.source='yangmaimai';loadTradeLogs(1)">Yangmaimai2</a>
+                                            <a role="button" ng-class="{'bg-primary':params.source=='R跨境商城'}"
+                                               ng-click="params.source='R跨境商城';loadTradeLogs(1)">R跨境商城</a>
                                         </p>
                                     </div>
                                 </div>-->
@@ -368,7 +368,7 @@
                                 <img src="/static/images/clearing-icon.png" uib-tooltip="clearing"  ng-if="trade.clearing_status=='1'"/>
                                 <i class="fa fa-check-circle-o text-danger" uib-tooltip="Refund Audition Required" ng-if="trade.audition"></i>
                                 <img src="/static/images/royalpay_sign_s.png" uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/>
-                                <img src="/static/images/yangmaimai_sign.png" uib-tooltip="YangMaiMai" ng-if="trade.source=='yangmaimai'"/>
+                                <img src="/static/images/yangmaimai_sign.png" uib-tooltip="R跨境商城" ng-if="trade.source=='R跨境商城'"/>
                                 <img src="/static/images/wechatpay_sign.png" uib-tooltip="Znyoo"  ng-if="trade.channel=='Znyoo'"/>
                                 <img src="/static/images/wechatpay_sign.png" uib-tooltip="Wechat Pay"  ng-if="trade.channel=='Wechat'"/>
                                 <img src="/static/images/bestpay_sign.png" uib-tooltip="BestPay" alt="BestPay" ng-if="trade.channel=='Bestpay'"/>
diff --git a/src/main/ui/static/invoice/templates/invoice_assistant.html b/src/main/ui/static/invoice/templates/invoice_assistant.html
index 820d76a7c..db6e5a9a0 100644
--- a/src/main/ui/static/invoice/templates/invoice_assistant.html
+++ b/src/main/ui/static/invoice/templates/invoice_assistant.html
@@ -197,7 +197,7 @@
                                     <img src="/static/images/royalpay_sign_s.png"
                                          uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/>
                                     <img src="/static/images/yangmaimai_sign.png"
-                                         uib-tooltip="yangmaimai" ng-if="trade.source=='yangmaimai'"/>
+                                         uib-tooltip="R跨境商城" ng-if="trade.source=='R跨境商城'"/>
                                     <img src="/static/images/wechatpay_sign.png"
                                          uib-tooltip="Znyoo" ng-if="trade.channel=='Znyoo'"/>
                                     <img src="/static/images/wechatpay_sign.png"
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 5787b756a..1a1c61623 100644
--- a/src/main/ui/static/payment/tradelog/templates/balance_report.html
+++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html
@@ -314,7 +314,7 @@
                                     <img src="/static/images/royalpay_sign_s.png"
                                          uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/>
                                     <img src="/static/images/yangmaimai_sign.png"
-                                         uib-tooltip="YangMaiMai" ng-if="trade.source=='yangmaimai'"/>
+                                         uib-tooltip="R跨境商城" ng-if="trade.source=='R跨境商城'"/>
                                     <img src="/static/images/wechatpay_sign.png"
                                          uib-tooltip="Znyoo" ng-if="trade.channel=='Znyoo'"/>
                                     <img src="/static/images/wechatpay_sign.png"
diff --git a/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html
index 19ca7bb26..7c1a6700f 100644
--- a/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html
@@ -348,8 +348,8 @@
                                 <th>Input Amount</th>
                                 <th>System Rate</th>
                                 <th>System Profit</th>
-                                <th>YangMaiMai Rate</th>
-                                <th>YangMaiMai Profit</th>
+                                <th>R跨境商城 Rate</th>
+                                <th>R跨境商城 Profit</th>
                                 <th>Status</th>
                                 <th>Create Time</th>
                                 <th>Operation</th>
@@ -366,7 +366,7 @@
                                     <img src="/static/images/royalpay_sign_s.png"
                                          uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/>
                                     <img src="/static/images/yangmaimai_sign.png"
-                                         uib-tooltip="YangMaiMai" ng-if="trade.source=='yangmaimai'"/>
+                                         uib-tooltip="R跨境商城" ng-if="trade.source=='R跨境商城'"/>
                                     <img src="/static/images/wechatpay_sign.png"
                                          uib-tooltip="WechatPay" ng-if="trade.channel=='Wechat'"/>
                                     <img src="/static/images/wechatpay_sign.png"
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html
index d578813d4..1724000a2 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html
@@ -101,8 +101,8 @@
                                                    ng-click="params.source='ALL';loadTradeLogs(1)">All</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.source=='system'}"
                                                    ng-click="params.source='system';loadTradeLogs(1)">System</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.source=='yangmaimai'}"
-                                                   ng-click="params.source='yangmaimai';loadTradeLogs(1)">Yangmaimai2</a>
+                                                <a role="button" ng-class="{'bg-primary':params.source=='R跨境商城'}"
+                                                   ng-click="params.source='R跨境商城';loadTradeLogs(1)">R跨境商城</a>
                                             </p>
                                         </div>
                                     </div>-->
@@ -330,7 +330,7 @@
                                      <img src="/static/images/clearing-icon.png" uib-tooltip="clearing"  ng-if="trade.clearing_status=='1'"/>
                                      <i class="fa fa-check-circle-o text-danger" uib-tooltip="Refund Audition Required" ng-if="trade.audition"></i>
                                      <img src="/static/images/royalpay_sign_s.png" uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/>
-                                     <img src="/static/images/yangmaimai_sign.png" uib-tooltip="YangMaiMai" ng-if="trade.source=='yangmaimai'"/>
+                                     <img src="/static/images/yangmaimai_sign.png" uib-tooltip="R跨境商城" ng-if="trade.source=='R跨境商城'"/>
                                      <img src="/static/images/wechatpay_sign.png" uib-tooltip="Znyoo"  ng-if="trade.channel=='Znyoo'"/>
                                      <img src="/static/images/wechatpay_sign.png" uib-tooltip="Wechat Pay"  ng-if="trade.channel=='Wechat'"/>
                                      <img src="/static/images/bestpay_sign.png" uib-tooltip="BestPay" alt="BestPay" ng-if="trade.channel=='Bestpay'"/>
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 8d7002b93..3477729cd 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
@@ -220,7 +220,7 @@
                 <tr ng-repeat="tr in report.report|propsFilter:{transaction_type:'Credit',channel:ctrl.channel,transaction_time:ctrl.day}:true">
                     <td>
                         <img src="/static/images/royalpay_sign_s.png" uib-tooltip="RoyalPay" ng-if="tr.source=='system'"/>
-                        <img src="/static/images/yangmaimai_sign.png" uib-tooltip="YangMaiMai" ng-if="tr.source=='yangmaimai'"/>
+                        <img src="/static/images/yangmaimai_sign.png" uib-tooltip="R跨境商城" ng-if="tr.source=='R跨境商城'"/>
                         <img class="channel-icon" ng-src="{{tr.channel|channel_image}}">{{tr.order_id}}
                     </td>
                     <td ng-bind="tr.transaction_time"></td>
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 be6c72794..b0b8c09bd 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
@@ -117,8 +117,8 @@
                                                    ng-click="params.source='ALL';loadTradeLogs(1)">All</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.source=='system'}"
                                                    ng-click="params.source='system';loadTradeLogs(1)">System</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.source=='yangmaimai'}"
-                                                   ng-click="params.source='yangmaimai';loadTradeLogs(1)">YangMaiMai</a>
+                                                <a role="button" ng-class="{'bg-primary':params.source=='R跨境商城'}"
+                                                   ng-click="params.source='R跨境商城';loadTradeLogs(1)">R跨境商城</a>
                                             </p>
                                         </div>
                                     </div>
@@ -420,7 +420,7 @@
                                      <img src="/static/images/clearing-icon.png" uib-tooltip="clearing"  ng-if="trade.clearing_status=='1'"/>
                                      <i class="fa fa-check-circle-o text-danger" uib-tooltip="Refund Audition Required" ng-if="trade.audition"></i>
                                      <img src="/static/images/royalpay_sign_s.png" uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/>
-                                     <img src="/static/images/yangmaimai_sign.png" uib-tooltip="Yangmaimai" ng-if="trade.source=='yangmaimai'"/>
+                                     <img src="/static/images/yangmaimai_sign.png" uib-tooltip="R跨境商城" ng-if="trade.source=='R跨境商城'"/>
                                      <img src="/static/images/wechatpay_sign.png" uib-tooltip="Znyoo"  ng-if="trade.channel=='Znyoo'"/>
                                      <img src="/static/images/wechatpay_sign.png" uib-tooltip="Wechat Pay"  ng-if="trade.channel=='Wechat'"/>
                                      <img src="/static/images/bestpay_sign.png" uib-tooltip="BestPay" alt="BestPay" ng-if="trade.channel=='Bestpay'"/>
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 e8547b206..1b2d1b30e 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
@@ -150,8 +150,8 @@
                                                    ng-click="params.source='ALL';loadTradeLogs(1)">All</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.source=='system'}"
                                                    ng-click="params.source='system';loadTradeLogs(1)">System</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.source=='yangmaimai'}"
-                                                   ng-click="params.source='yangmaimai';loadTradeLogs(1)">YangMaiMai</a>
+                                                <a role="button" ng-class="{'bg-primary':params.source=='R跨境商城'}"
+                                                   ng-click="params.source='R跨境商城';loadTradeLogs(1)">R跨境商城</a>
                                             </p>
                                         </div>
                                     </div>
@@ -465,7 +465,7 @@
                                     <img src="/static/images/royalpay_sign_s.png"
                                          uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/>
                                     <img src="/static/images/yangmaimai_sign.png"
-                                         uib-tooltip="YangMaiMai" ng-if="trade.source=='yangmaimai'"/>
+                                         uib-tooltip="R跨境商城" ng-if="trade.source=='R跨境商城'"/>
                                     <img src="/static/images/wechatpay_sign.png"
                                          uib-tooltip="WechatPay" ng-if="trade.channel=='Wechat'"/>
                                     <img src="/static/images/wechatpay_sign.png"
diff --git a/src/main/ui/static/payment/tradelog/tradelog-manage.js b/src/main/ui/static/payment/tradelog/tradelog-manage.js
index 10c7acb32..b07360021 100644
--- a/src/main/ui/static/payment/tradelog/tradelog-manage.js
+++ b/src/main/ui/static/payment/tradelog/tradelog-manage.js
@@ -326,7 +326,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
     }]);
     app.controller('globalIncrementalTradeLogCtrl', ['$scope', '$http', '$filter', 'commonDialog', 'refunder', 'orderService','$sce',
         function ($scope, $http, $filter, commonDialog, refunder, orderService,$sce) {
-            $scope.params = {source: 'yangmaimai',status: 'PAID',channel:'ALL', textType: 'all', datefrom: new Date(), dateto: new Date(),org_name:'ALL'};
+            $scope.params = {source: 'R跨境商城',status: 'PAID',channel:'ALL', textType: 'all', datefrom: new Date(), dateto: new Date(),org_name:'ALL'};
             $scope.pagination = {};
             $scope.today = new Date();
 
diff --git a/src/main/ui/static/payment/tradelog/tradelog.js b/src/main/ui/static/payment/tradelog/tradelog.js
index c41691a83..ff3dd0a0f 100644
--- a/src/main/ui/static/payment/tradelog/tradelog.js
+++ b/src/main/ui/static/payment/tradelog/tradelog.js
@@ -112,7 +112,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
                     $scope.tradeLogs[i].htmlTooltip = $sce.trustAsHtml('<div style="width: 180px">' +
                         '<h5>手续费组成</h5>'+'<div style="background-color:  #EFEFF5;height: 1px;margin-bottom: 10px;"></div>'+
                         '<p>system:'+ system_surcharge +'</p>' +
-                        '<p>yangmaimai:'+ incremental_surcharge +'</p>' +
+                        '<p>R跨境商城:'+ incremental_surcharge +'</p>' +
                         '<p>tax amount:'+ tax_amount +'</p>' +
                         '</div>');
                 }
@@ -297,7 +297,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
 
     app.controller('IncrementalTradeLogCtrl', ['$scope', '$http', '$filter', '$timeout', 'partnerRefunder', 'orderService', 'commonDialog',
         function ($scope, $http, $filter, $timeout, partnerRefunder, orderService, commonDialog) {
-            $scope.params = {source: 'yangmaimai',status: 'PAID', channel :'ALL' ,textType: 'all', datefrom: new Date(), dateto: new Date()};
+            $scope.params = {source: 'R跨境商城',status: 'PAID', channel :'ALL' ,textType: 'all', datefrom: new Date(), dateto: new Date()};
             $scope.pagination = {};
             $scope.today = new Date();
             $scope.isAll = true;