From 69a41e0421af5bf77a9dedcc6b45a0e5885afa29 Mon Sep 17 00:00:00 2001
From: fmk <fengmeikan@hotmail.com>
Date: Fri, 2 Jul 2021 18:33:16 +0800
Subject: [PATCH 1/5] xiugai

---
 .../main/kotlin/com/zsw/huixiang/MinPlugin.kt |   1 +
 .../2x/{default_avatar.png => default_1.png}  | Bin
 assets/image/2x/default_2_1.png               | Bin 0 -> 27877 bytes
 .../3x/{default_avatar.png => default_1.png}  | Bin
 assets/image/3x/default_2_1.png               | Bin 0 -> 50557 bytes
 .../{default_avatar.png => default_1.png}     | Bin
 assets/image/default_2_1.png                  | Bin 0 -> 10286 bytes
 ios/Podfile.lock                              |  14 +-
 .../xcshareddata/xcschemes/Runner.xcscheme    |   2 +-
 lib/address/city_picker_page.dart             |   1 -
 lib/home/activity_list_page.dart              | 166 +++---
 lib/home/points_mall_page.dart                |  11 +-
 lib/integral/integral_page.dart               |  49 +-
 lib/mine/mine_card_page.dart                  |   3 +-
 lib/mine/mine_page.dart                       |   4 +-
 lib/mine/user_info_page.dart                  |   2 +-
 lib/order/exchange_history_page.dart          |   2 +-
 lib/retrofit/retrofit_api.g.dart              | 507 ------------------
 lib/union/union_page.dart                     |   4 +-
 lib/view_widget/coupon_widget.dart            |   2 +-
 pubspec.lock                                  | 151 +++++-
 pubspec.yaml                                  |   6 +-
 22 files changed, 285 insertions(+), 640 deletions(-)
 rename assets/image/2x/{default_avatar.png => default_1.png} (100%)
 create mode 100644 assets/image/2x/default_2_1.png
 rename assets/image/3x/{default_avatar.png => default_1.png} (100%)
 create mode 100644 assets/image/3x/default_2_1.png
 rename assets/image/{default_avatar.png => default_1.png} (100%)
 create mode 100644 assets/image/default_2_1.png
 delete mode 100644 lib/retrofit/retrofit_api.g.dart

diff --git a/android/app/src/main/kotlin/com/zsw/huixiang/MinPlugin.kt b/android/app/src/main/kotlin/com/zsw/huixiang/MinPlugin.kt
index 79782cbc..0b18b535 100644
--- a/android/app/src/main/kotlin/com/zsw/huixiang/MinPlugin.kt
+++ b/android/app/src/main/kotlin/com/zsw/huixiang/MinPlugin.kt
@@ -106,3 +106,4 @@ class MinPlugin: FlutterPlugin, MethodCallHandler {
     channel.setMethodCallHandler(null)
   }
 }
+
diff --git a/assets/image/2x/default_avatar.png b/assets/image/2x/default_1.png
similarity index 100%
rename from assets/image/2x/default_avatar.png
rename to assets/image/2x/default_1.png
diff --git a/assets/image/2x/default_2_1.png b/assets/image/2x/default_2_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c02da7bc489cfdf375c4073e531683b2c0c5f3f
GIT binary patch
literal 27877
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
ahQYTjSzsw+LKO2CV=4+y<V$6r2mTLbG!>fw

literal 0
HcmV?d00001

diff --git a/assets/image/3x/default_avatar.png b/assets/image/3x/default_1.png
similarity index 100%
rename from assets/image/3x/default_avatar.png
rename to assets/image/3x/default_1.png
diff --git a/assets/image/3x/default_2_1.png b/assets/image/3x/default_2_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..b554cadc208ffe271305ed0048bd438214020bd5
GIT binary patch
literal 50557
zcmeEu^;^{a)-K)BAteY3NGhSypp<lXNlJG}hcptB(juMGF?4ss(B0ibbH0Sne&4;%
zA8@X7?H|0r8D{1aYu)Q!_gZTLq$P!)pb()zK|wwFBqAUS1qBBK1qD5igaACk8`&QZ
z{D8KR75)HK&_}WX{6|1v`ICW!1QadsI}#MMpAi(?-Jbyeh=6}kP_QY`P_V#H=)1>K
zVE#S}2a^K(_jl;|yFYY4qc4Yo;)D7mz%TCzy<MwftDqEJP{oIB%>Mx!Mqn=BnYWqg
z5&~p!e9%zOq2$m&PGKqJQu+7hug(0~tzVkEl^8$SnSsZJ41{8^(EToFwTY*+FP<TX
zedBZWllIFxXDVtP8{`pQLn7TsIb!gAFAP#~&bKh5;9842N<P|EwqZr$gMz{IfPy23
zg8ut!u~)-YUhK<=Z~yDj`#)&FX~1d-`q!WSeN_hq%zK#PFGW9T|K}S$JSz;f_n&V>
z9)vWH)REe1kn?XJ4!nj0x(4<?9`&TB@Sr3Q!jI4X@E;4dgxg2|zih)FD#U|c)ieX;
zpPl_(F0cvC|8C;ps{VTu|8D>PHK%|1>wg{lUuW@vlK(}ge<5e_e<AkYV#|Mn-9Lf&
zzY+T{q53cF_;(OR;`{%Fb}SnVs{duZ^PUs~yj<%Akh04+O8C*$KWdsjwa;<dcF$B!
z>_+3qP}^Onky=ClrN}lR06}H1NE1i8XCSL6o_(IrAd)lB!Gm*4If3{fznr(#W_Vlb
z{JUNquh2uM?JY*#7K}j!RRoH>i_bL5UmkLx|7F8rGjNu0dXNhi=X<N`(1u|@vYwvb
zdG1hl>6^P(wZLfqwh||Zsfqy1wW-LM7x((GzcA6#FHZ7&DG)8CmmB6IWphDxMehvB
zrbF{-ZC*-C6hUP5VvSeTI~4=Cdzdq#1Sq)KmyM?njLFg+4xfPDc1tvO<~+p7!C9}x
z?i5m8SeR_5)bnP)S)#vkCu&Q*fE{&rJekETX2wsc-pchOY(b4>xSBB*Txpf?yjFkB
zRtTHcv5DJShz<MEYL!AzbTzfowk;^y)b^bHYYB%@ZP3v+#*_O`WR3?8tVfef2=RV7
zD&pi0ZXs$)<<knd^wzzuiAgQ~D(*v2XA>I^)1mLUx85>pE)<-US69&c@U@TP$3-_3
zFQVKg)~}*_p5B-{tWRzr<8aJrTJ-(e;;~+yP;gE-eqoR^Q>Tlb<EaUD%k7>adiDn?
z`g3x1Dv}QhaeFF!D+?QL672n_zrt+53WK3%^m(xD9#&5U)EKAVbt{UQ!|0X+PKXv&
zT8Xy<`6{J78t)K2Y~e;$r_c|ugAkM>lT{GLpWtwtZW|rws#m6T<d<9ZpYE2CiT7x6
zd%N;Hp>%L7uwv?e`cV-9B8-24RrmxAqe^NkRJE&t0n&Bhx{5{<<gignN{}0oUsh0F
zGWcnnxjz*Pe|fnY`m*3ablTc^#i=6OB}z@3%jiCn3S);m(^~0KK^1~|2w1UvDSG_B
z)YPh{6Spdj5yl28k3?bL58LZczY)Zu(I+?5G>}J9%sLw+CYbhYTf(mz(CG{2ENCHt
z25!buD&M6eYBHp#Ede>ds<7GB^5l<HiF8-1Z!w;E{m!34Wo7oQg<a--sfy8;Ev$Mv
z;lc&UN4nR;`AnHnxg=6#n%s*Q78p*@-J|K<>Q?5S-MxgPW$Vu>HyD*gyOqHG%B*63
z&Z$lyx}ILC_imE+Hr~*K)qwTdChsfuW8R_<(^XMWL^=xlq@C(LOe#kNEV-!2>&;19
zGC7({VFP+Mo28nqKPX820v|&KSxRR%%V(B3D!{bFHQI}QB|DX2{LWb$rI$Gy!E-bC
z@o!NbEXqWJ$-rD&xIf>-ODuX!8YSm-5?bb+d!+~G*<R*2h})k>_F=?&tWZA@p4m^F
z+FfCD*3g&PcrX0P+&qMiIg?Lc=BJvBtUkJTa{&$0T#mA7;)z|-(6=gNz<e7>UU*Py
zqchUVdEHrzXO$oy7W61;OywzP;WofPNv~=`j3LdnJU+N3i1f*>e*zTNk|G;iI*JH*
zzN8H&!>xWmNo1f>>`3ftFE@|5>7v*el`a&&L9WzOm0Z$L1xu0$rE!m=@JApeenvqS
z>~)XL(N5NN(blmrMX<H3dKt+jQ$Zq$4NR66;V8E8)s${w)ot;ma8fP>yut6$cs{-Q
zH)0u`*$3(DZ1$=nK21lNphS!MP4I4ix$D$1w9_;wraxXpzg|jAM$~6W&R$v6gG5%f
zzA^l{7J^(~<mQjAjc4fB{CC-T11^x=$HK6hdp<hH3uwY}Q108R2!^r<9z~SHl3LI%
zqS4!Gf#uW$sD)1*(lMAi<i1aNGWVEg*M!s9r{4;D2RjnpGWV@burc!?_8|4K=*s)n
zp`BYsM5MiT@a)$j!z(8y3X(<ABDg7_K@eoRs-Ud5o}1f`oC3Mz?(w=vRM$hEKtLr1
zE+*yyajS*$*vNuBHMTaY2~bWqYpbunI;}9;jN^i?rn$&GQ*_;HRs;*L_sIx&%8{a%
zcHO5gsWsQF#m<Qw#$=Uo3B4%E2T`oi@Amd@cBtJ27YSi{Y477tZEPa(jR_|%7&5vV
zDXrSPQb1Km#T#YSDKkIq=*=@7igxnc2IX5}xV5YNa6y?{#!%$Zjp7VJ!8qDZVia-B
z@MqfVG^bDsl4U3kla=QyXa2_4zBIV?87^gW0duNFW5gRW;Mu)5><*F4MH9i!WnKyJ
z=2bg~Q<yGttzNxBN}LMJU&_B=DAY(tP;Qk4C131a!QZ=ki4>G@!*(Gw<)hFeF3P7r
zuD5Qa#3m!x>LLDRGO^%|w=^Ei3tC9o%53}YfML^nIYRGLVstIuEjqSHm5U~ER-aii
zi>l>nM2j}pY3y9g{VreX+RD%88qJ)$tqxKmD_T`IlcQ4UqY&21Vvhq_9-5id?zT8i
z_quw<bu}538AW}*D1>9lfqOQjZI29Ch{g>U={>TOhp~G4#f*t>B6awedVpAduxJZ*
zVncpQT)KY0OmWe6Y(g1Tdc_|V9}ymFm<=Txqa@%dN={3W(vN$TPMor|MZe}^b<+f5
zzlGee7&z*U2Z4>i>c5UJ<j?94Czw>eatg|3p)?T5RVXD7(O~922T5^G55Y*=@~4(J
zbS*J3&?dh*ael*YxWucU8hFsAs8BP0-5DJ-oza^6BTyDI-unslHaEu_DNDS#{QfJ{
zBc%?vl>9J%&oK&72W|PZ{ZxgwmD>f%aQ<Ul>P>$d##Cfrt@-AWL<C}O?f}@px1shH
zG4bcx0q$Q?m?6TqXu=$Vm+`FPl_Xbl9Gb9CurNDJ4!zexe}#KH@x{XD_IM%YHseaN
zmEvyyG08F#9GM-{DFsfh{uq!PjhpGP>n#}PcETu+y?i)v^Qq3I*r@~iYd433hFE`{
zGad;+^l;v}Q&Of50v>`r=UjF!H`g0Vhb9U%udi=sOznj8yBb(>?LljK@{4*eZ*Z+F
z*T*)HL&IQ&jmQ}sPM%e7lRi08)bpNfa!G}zYFN5QEfw-GLP1}{&x>5x4;Qzef<^Pz
z+sUN$i@AMG5rJx-J=NO{;ue#mo}8$`r#In6q$kvxWCtO+7$><iw^=u~;^Ot78{~>{
zS^|MGa*ofXn|!4#&o}EX*~bjh32v`@oFx(LOe1jkex14(pXg@>Vt29%@{pME?DdU@
zxX!~3xE?yM6IzV9?f%A~+7cTi4x~j26>ADMwx-xtD{4N5RlF<?SIQsaAJ_!N*G7A=
z!hgAsfUhqBe$;bA^cv>j0{CR%a5ZaZo2K-`gxCnDR(yUhn#!yh9x49{n9#SDOZU8b
zFO(yTyoh{~t}7`T?%0iXv|1N}JcB6dp#<jLc(S`+aQQ9hBO=G8bH4aeXJzX5xa4Du
zCP}Y>9bK*TCw~e`Cu6APBU``M*(*)i_13X7p}b0NILakEz#^{)*)}A8$+xpMCMlAK
zV@G;eVHhEt$dis>J8j$t@ze7Y@)srNsB}bnrfkc}&)?0MOXVq;aMaXgI7&=UsB>OL
zYH&_;n?amuB@kS^1ExAFHHs_)2rs@`fx=~S;k+CroM5fiF!wTEk;Hh+dHU*VqEd9x
z#C%zXyyMv^SIP_8!VGlU27-IRiK5|1c9E{(RAFUM;uEUFO5<(ikr>xeP8WD6BSv}U
zE<air(-Kj5czi5!!>HNjAMo&XwrLddlB%>#Dfz#12p@c!oaIi_{T~}hLlSYZ0H_Ff
zWNKA#&nq4mdH=Y}&xO5WUYW|Z%}zQt+^zjPQ_wrp6(|MLg=RWGjnIH$20BKF&~m{`
z;x^;~iMPB_mvXMoY&$x)X{#y(QVQ-#>?)Bkn1wH`DOx~=wCw=HsPg_!ExvAP*|hUg
zv09qKh12v}4$G&;T>lE4(62L<Xn8vfM<+3znC1h8X0E34hW(_f{~p~Iq>8~o4B59(
ztIRT63jY0|OJ@)%tth$Xrr;S*-N*YV)`RJPTYt!M<dXErnmSZrz!v3IA0;vw=BmMa
z8OCdBn|pW$Bke3Lk@)+EleLOX=Gg?U!v$4c?XTW(PPiOQK)K~tupJi3wvko4I#07_
zpOKlq-z}K#ePdBSx+7Vk`F5ekdzTRB*12=FF!3OZs=^CxQjGNbu6M5AOv8Ry{dWA#
z5f8_FsKjUYrA0iPGxP~bm)o6yHi!M-nuOz9YPm$8@p?H(`rIdsq+F@|D*Fld>hrHm
z%1?RTO*jY&TpevxXcV%`Q<<P_)ej8LORB!VP0ER@j9KgJwvs9s-*C8fcRrBYd+%s^
z{x&lQMO2~EjMPqrw#l<iS5u772yH8W684dO`|(}eYBAWXc8NSDw1k3u=?kT>Q}0;k
z+h0<Og65oivz)Swe={i%uxTR~?5GwG-U=l4x9HN&5sWS)t=DsN+-4mu=+d4;ve}V*
zcb@I2isA4Z!K3^l;0!=Nov`UE*EkS8^TZ)v{}_0B>vF+>gD|}&A6P__rk27ZL@(u5
zuBvMh<P14fDyUmaYDj9MSaK3x;ovn;U=T^~{B+#6!jzcsn)z^vt$CF_#8_G$6zDbN
z7!yJo^V@i@*zAUsTW63Mz>bAw`tTP^Su6$vBy!!;4&WUdvB0jj-6hm}YN>|+lpuZ<
zp$Eg<LtJrK!x!_b+ABxG-(dP>t(QxTlYQGIihUBCjR!5z5&Tqk4m+%C;|0YOh<cIf
z*osL#EI+D*d@p~QWKyZ;R3DOFb7#2zvE5F{p^Q}9tztnalIZgYEp%JriFcpITV1&v
z{vG0R?xuN-{{$0Hk?fdqu%@Et%MKeqPr7VY=`S>;omlEXB&1!b_Dr<XInA>Xx(mN2
zr|<^KyqdMWF(-0S9`bQ;7xKt_pvwbUm}MyGka}xK`dJ}Fw?siY>kqbPCo8)au1~5c
z3@t`har6)jO>rH*YD=5=7upvrk_Gn^%`*T%M{&I-tOsyx2*wPP(fqP#JlTr=j<B5e
zXiO*P;4;7NlE>$ByG$v@9Kp%8s6)hMuaA@|*rg@7grcHL7A4Z8zPDx7pg5}aRWJ2B
zkv!#;;Grn0UC8$x-|qcT<BwEu?^y>3?2LzWt+`lFOJm!b{?seVAkRc6{fhMZX&wkQ
zVD4n9!b`YOs4P-T0(~$<zW7~1=)AwbZm+Kb+`f|OY=U1{z8;a!Q!F6q=eR+0kc2}L
z^O0{7_28JmYwPU3Ugg>I97s}a#=OGsg($vgtgs9B0Kzr1XjrnTWwbBl(x<TaDD?(|
zhp*O@!6J<__O)BpaaT5*42J3-TqaLuKBIf?;M+4oH(dsB_>(%**3;>@w%9K>OJJc|
zBP{nNTlkuu^{hJ(cIuy__VO_ve%|BADTVSGoO_Gt83`%tCY#m3a2l-LRAb*tKYw}i
zN12YBa`R%o?(!NfRCq2O^<ZI?lE>%QFbNLP#{v8mHGPjKQdNF2W~Wi;%UNM10=l7g
zad41zxocYZrDVxE{i>Ujr3*AI>Sm2_D);i8sabYbH50ODICIbMbXaYJJ07Jn%k|)+
z20uOCUHD#Jn_GU;9LytZXd>6O*PRe$(jj1SQ4=z8GruZ!h**$+(U@#@TYd@BEj*9g
zbCTSfXSk(&!?ThOjx4mkRNA#C78kI{2}g|hPC0wdC8i=>;BG4SqG4cXko0oDio^z8
zB>l#{nEh3|7U+!Gqb#05aR(pUeY$JZRsHt6N!<ii-Ke{kX^$2gr88tmLRYA40&HG)
z5?_#U?6<@~kl1z9sbbYEf3@}9RUYNzd{*W7#JXzUbaFwx`36PToR;wgmQLBo5L{%C
z`&15HmO$#Pk<}OGgHB3tKYM_*FDdH6*X;UC2}>E{+eJa|ds?y$<W}UI;6#->;O-EG
z;f^M7o3$5}QkgA1{8>iH2&>GQRx<jQL31Om;ModN*g+=g<;z!rEv<d}Mlw~GR=p+B
zem4PNa-`&#M%Uu>u~B=?qpEdT_vBAj@1pR6d);HKa?6G!9Zl7${&d9*pf;^U?P8jv
zNV)fw;+0a)8e`!VAruwN73p2S_w%!F>89u4ll0B9LxLo4I<UW5hC4es4>gtSd<E&2
zNlDJa7l3c+quZPu*A>jj{^KyA2=R(KY(~Zu^Si%PJpurKCdy`e@B#ecQ^c0maN22b
zlXV~2>$0EgWl*ZD*=+7UOMC*&&EWfO%sP)G-Ui2Jp$xXhaKoU2oL>T>hc6$3zLSbE
z&bYr7gD$iiDV8~3OQ*%24d&JD3zt}-OYCY%2fZ5M9>by(=1bnO6ea|XzKr@b`df+B
zGkAZT3aggG#%Y_CT6%yLfgMSYgick5BYt)N<fP;iJM@pQ1<XjPt85ds)-YTZo1Y;g
zU5Px{`o&x9828DB&7De9Ra@6{pDnp!eR<7ariv<~_`V1Yc_oMXH(bGG+~p*tgRM7o
zw!j1t9n)J4gi74GLR$@o8Si)3lwOHCQIf;v6;0_UIHIlgC=)l=>HRLsWraaJg8X&b
zl5*#`{mLJeuW9t$f>x}U7$o!c)N9^+0jp7XUPOi^j2!7sr4aU0)92N7#&Rpx&g|u7
zI<G0)klB5kCjLHKAuE>%-gR)S-PL$=Vljj%UCM77(M{fUfayFV?}jnknLW)(3K6lH
zZ;wB{6!Ew06gXjM@6fmL-<Vsd9x@)zqe&=tj~ISqe{r8nc^==%K+g(}?~2Uxp42IS
zwgGlfqnsGbc1?q!R@S4hoHe4Ho;^!fs&)dlP@TPIvw>nA4=HYn)3=nE4z2YQ^c5~5
zB<-3|L~<#X@Xc<j*I&;yuL`b4z-fp$m^50rk!@Fsx46zVa!}daKM3Y}l~*t4&@q>3
zZ9N=CS*S7P&V60b%P?14{8_8(dX*Rl`T8Zc-w_Vlb-E!{wdPhuiM99E-23@<s+H?;
zDoN~DxDhzL1hv|UsmRek|14Y!Alb$>5>D*asV&$zfxA#dYY;qI_L_FwBHkbNbf#o^
zjb}g<_C)0)bQj%J!`i}3$>Qo;Fkle_Tu-)Wtv;szFr`sjm~-DCPcY68x-`#C*2h;k
zjEGySMHk2$mXIuVXTLsGCh{8Zcyp4YKsRpi>Qxb#n$xY|!Ebx00lz&0`(xcnJh6B%
z%oK_$JoX{3vp8(Tugi`GNg*3gBZF&b_$xNnIVX5Zm-42~qAZ6UPZjp|`$F{gLLCx=
z>7%|y@IzvwzQ~z7%M&wGw<h|V?WM0;h8F|O7<A5z4_2<`ugS1;bvd{1PTo7rh6;r7
zH|Ah`!+%XfBmm*6Uky()>1jVzF&re4kq8NDFv8(sT2c#18V^P$%+=vg2^u08;Et<L
zpf8fx!Yq{k6}*v6)ao>wl+K3J1>44>RiFE9PRGVNzZ^T%TCoHA_hsv^aavvx8tEE&
zyoHjsB{yo`ByTa82vDxEi+no@UF%a$w}bPFl06kN$e7@5pL1`~=@u%Pv)?RE`D)No
zq-!t{Z~HyPnr{Sx*?gl4ozR_mX$v8D%#UkU&EmGH%`~>*;26*JuWK93e-_1YyzK(>
z)Xr10^`CQ`LXO5u%#>V`K&hnIKECZN%So^OzKxMjP>r5JOs@jdZwsB>n6sZwm*hem
z6)u{i>z`SmHI^u-?nU_imTWteddJI~?sW8yo`Eu_bKpChtX*OPW%yE{Wt;$z!d+*H
zwaOb26iEzXTk{C8!=jiyiLl~nInACs;qsYgde>YxNMYbb^;@gWO?&>*)*r-qGxR;o
zUQk{RuE+3n@4$l{W-$Px%Zk!(Ow0tL8qm6!Wj;N+yT!9ZeVP{A%?^oXZ+lUG28aup
z+gAZQ@eg5++~zK|NGQ{OahDr0hj`eNYyHufH)r9gt8+7$#2dwtP)0~iDkL>06bmp;
zgv4Xz$(k_#NDZzR=toYD(78Gf$yJoy6N4ymYCTC7-2e?ek*76putjAJ#b?P<7qlgq
z)&BmztW3wOW$?_8)d6{V=Cv6DVFEG3H!c~vHyQl}lRM2#g_8xhdJ?8DoH8N&3P`eM
zs_pWVSvcA{)}8*?l2p$mt4&rKgulO>JASUm2c+^{rb=A2#?L4G6mc1?=UBWiV$)Rt
z8S>Di)aZbgX*LrVsdnxF?RKB#So3<dDYFixv0-1p>XQatW^1<znT=Hb_{#0|w>=E^
z+r`Q3Z?}ranr;)elfq;!4%ay5f}KD1cU=7LqaR`dfVhY*(1bj9!lEtCK*(YQoqc6>
zfeD1Pjp?_t{$!f3mYHwsk5pNfI+WUjA10i|3)dDqX{(b3*=R3z=KDbLM`UbTD-L2O
znsy`gRaUd1qu`iiuSOc-4`OpI7e_Mv-yODHoNEhZQ|fSyQdpsVbcA<Y5aSRQ>LN24
zyxF2MZboB{i3-Ne_w+)bPHK%8WFeISFkSDz_qK*Qm9GvB&au1{_Gp^XN1C%3?z^re
zcq!@kd#^{Jh~G&3j7Mj87{tyi*-kr`btGrzG>blLAg$-|R8&eg+(<q0Cy!9^wW!CD
zLkxQ5uoWwGB+9<OLad|S1paM;KnQ#-UFUoE<zShOkJs@EFOVLH&?-6*Lv0Khej?u;
zNhy{xpmh7a5gyeKb;>fOBIKR?s^C@(x2edGb6D@}-5u<N+;0@40M5XMAv>v=kNuEC
z_EuMf^FX53%wT%<P^hv66>l^p2O7l!-1k*){Cp;4*ASuvDyLR6(J16rljt{M`v{sU
z#Y;WRXG<DqFkd;7V#C!CN(w&Fi%X?{#?~y8bI_TFl+{nuF38-ULqjjITKuVS@al)r
z!I<>(GZ_Y%Pjxg;{IYnkNr#=8JjJfliYpkoJ){^ImVW2X#qtR6eS^F;ym2YyJ=n1e
z<rEBmA!jU$ML7f$o3}BSL4tyfl>Q*RP6J(1+UEJxC3mzw3?GJhl1{v(hd6U`HRKC3
zQR!69>orl93wwr%b$g~6+;_t4sX>=KFLcFxgWT|=LRW>l-(a#5ZeZ7QT3;s=vZf^N
zE3dem6jkX+Sc-KeTl1-}XOR)u=a0beR00N$YfUzlHo!Y~lQy(0K6ufQ5=G^Swwi_X
zZJZ~HVxIx^rP3(;4oCk<2I=_%XN6pjhj!s<9&5TYP1DNK#c!Mh&I<^Y@YHUO#4euP
zxe}2?vBU<Y_bfEtE&4TQ80<VykeSB8#}ar56;*<OhB>V&WpG!1Avc42VV^O*?>1$o
z6u=#j*m)*@-he%|68W40(WB``VV0iuio?uXtXS7aCx$^~9gsVYLZGrQz^Yvz3l*LW
z^yM~n>gVy6=@|at4yhMM$Vf%kYw(Fb%=Z&YwW$`SglSUZBzw#FktvF5%@57}+$fHr
zj33laTM{cC@nxpMRQQ}svWBP66U)w`Ch;`Oq`5tn<k`Ye(HvV$mI&649yLxB<{nYH
zMw%*u%$_g!rHGY;&RS&Go~TW@<H~0n)z(dX5f9nhw#c!AF!pKe4Z{{5Ih*Vfq%de3
z{};wi)S7G>u<5KFulWA&doMkzOv~yaeu=G!N&*d!51-;<&yM&klB)UB2Kt2&TX>`9
zR6f~Zh==;#h{%{nNMfNZdTH)6V%A?z1IKk6Yb$!cViG$g1%4(tmizL-VMs+<j>s#x
zR(|!lw`?|^(ub90uR3oj!oesX{l>yqu0rfw*mf!FzBHNMO_K_%k|9(lugs9rwbm2m
zS-+*qF8j+E3vsQ=^egbX;#Xmfrs`^^7S!D8PG<9txiq?(M?v?s3q)r@au!?7Z@Xs9
z*M6KxZs5!G{c!w^Np|wJ%@#q2@^ceJq+!2m6a!?o`Wj%uRLu@|nW&B59hEGJ?t!~w
z!m7v}4U@{z$^kt2up)A6%%*g5!z)3Y*gNH85LT)8OuEK(E7rngjta1;1roO6A+h9m
ze7=@uhQFP&y6l4(@+p5(t$B;~y|jj->HW}TC1;c^<lph-`{ZcMY}2j7;gekLH=BIO
zBxs()<n61!Y<hD>!t~_G-q8nsFoKoIZ%Nh2$eF+#)f#!z3-OKG;T*8+aUFJ<6}D~R
zU`{JJ$W+rhMY)mbqe!pAUBy2eiOn*k!CNiyUD7O}*sKXLI?}>}DUU4t^lFG))1Bl2
zxO?u>78bCN%!Bj7ip;B81W7&dC#?>ihe4eQHRjpo+HAoMfd^GgJ}=y<S^bSOHp%E-
zETLm#BE~@5kb~Yr^h-2;;G71Q_2-T5@JlL?a5fMgb>m5>t*u)^m`<zZ-N14q7Bz28
zols?T101gP+SBJ=Z?0D^CE^E)p10USNtUV~s$w5}qsM!45V{KY)pi4a*yFXZKeq@v
z`N|a?%5rsp4y~Z@3c3<Qp7rO!PYQ$5=fdgDEn8Yk(Xk7&D{7P{^i=T#Yxn8s|0XO@
zFofcKzRPRhseAv#)7(%C^Kq434ElQnAneI!RCj!Ute}Pc%KYJDw~7|V|5N})d@S=A
zOH&mDuC>}=v5-eV_&vmD+@<7v?bmtX@1P0eJ3NZJ^17db9%ja;=KQMzDXxQypufQ9
zJsAbW$T%!KSIppdnktR+F3icUip<g<elU07jas%RKx@o8TG$Y961h}2>s^20j$<&M
z|32Bjq?r?lB`U=}AxjL2bEL+7lJet+D00dpkW$?NX(3a|g9j2)q$DcttP8REM74LX
zC<^dx@7mX3o@CWEx2GYeV4h=5F+_X+Y8=AVbIf7pW0pXNjdGGF>Nr2mtpiG2PpvUc
zOTKu>vm)vwXC|(0d>K`g`5d#MfE%ZsMEgdhO>$u$zUphzk_1a-89r^m)0N1<X`T24
zsDPHEKymlyvlp$Wcqh)z?iH8&n^+FZZS3HQIbyp{LL{iPB5AUo<dg_~<oAS;Tp#Ge
zl@)4x@+cu6z`fYF|8wA|4*iyJJO}b@G_s$E_LKWwo-IP@W&Cf3N!&QJ(?Rv~!PgKW
zF$HPCZ+fKAPLUsOqsTN%9Lp4BpB~p|#?6tjEz`hqZB}=NnB}VPb(7|ZeyAz$p;fv%
zoc0SBa)``ISEd#n3`1IyCxzZrlZ5iQp%&%!e;0GfUa*dd{8h9?c9chlRC1y2B!|2H
z0;|I6V0suDxj$m>L75kY5{9yXxtHGf=6R55;OYlI94xV=!)H~0kPqtO=AE){^~<3q
z9wIviec?ZNzvejv+gGM_a54{j?J+;u$zykIOStExm^yIT*@n%-B;2ak<Z7))UoIP7
z1lnT`bol9^V;X^#;BRND;5UAWbIoYj1&DJ)t8fG3LG%<KTnJQ+J1&Ndb8r5PD9O+;
zsW02y)c;v?*G@<JJzJ)|oy+i&ZxZUEQ@R8FuF+XH@#o9?^`-@Q1m_Op2hQrA&mP1D
zgW=0_6HMhgE=PBX>l9szA?qB3)t@O<ejVfp^Xj<MQ$3F=$he;5o8c{Aa$NLYBr@^n
zW`7<M(fX;wvuGq0MpgWq6hhq)HXu~2h%G9pcGiwZ>&C$b$P&ERc{dtuc!4rxJ`g7<
zjN=U>7Nq<|k}S%`#nI@y^K=fke?TfeE*8a_M_te_iVv!J6dzJESc8Onk;#RzA1G0=
zH{ao{!Vgle*oU?Ak-vnY?Nqd&y$pccELEcmuNDCH6=86jo-Y%3DYiV5JOfc+=zJXS
zSF!c9Z~Kil|1Gh%;S*sV|3v+G`>Ws^dvSVapx_;VUtrytMtfy@bmRu9pB{RdlTV^a
zajMzO?;S8KL;**>q|UMMC+YI+&}_FX2+^gw{Tu4;vw@|ka&o^GE)ey!yj5yT2%==f
zOh$N$hWmkt{IlYjZ?NtbO`!p_@VF{bo)-D8J=|qFVCCBd!=s0K;VRV~y|dByiFbbu
zJy6gq?pm)~9kNT?P23Q{Xk4yBWi<Sp8kxr)v%f|TFMnTH>~58koHXyYv-MN468+vy
z?9+Yo_Bu_2=?!H?kA2PM?rs|0B)|SqG%iEZv8F~!mWN-osraU9zIceBS&NAeHfpeD
zonu8XX^gIc+6o6`qAWu5z<s-AhRKO3$5hfpEQZsFI8Q#xFSbZzi67j7m9mN2xjmiB
z+=y7d+aAYM$v=$bZ@g)-_Tve@%%5JMvSh+2Fw_0!UT}5%1E_e8f54%G4}}MM>@cD$
z8J1FPAJ^`2*)NXUlCH0}Ww0s&eywT1*3SA5OPUo+w4JsjC2*RaEWL})w{@lub}3h_
z8S!xBJTbv%u;J_xiQ><72LJqZHPWT=3Ym<GQ%MkRx%KH>=WKkB9T3@f@95QKOuhAF
zdW_t!@nGkjO}fpGCM7*N&uJ*g$4^4R7R-_!lFklpUw2{m(nRGwbp$`9J2%3?L~O9k
zI=)B07ke=7E&^k<`i=4ZMq+`cjQWBKE;pZ9YGY<wyfM<k?}|@i9Th2Tgv}EmY%>Z^
z$bXKxJ2x=KucJuoHMXD3RjwGE8G*mPRgF|mAt9*sb`1~5K)H=M$oqa)*b{!xQOtn<
zT>3}!FS;6@aG{249(mA?C`MTLZ4x_d<Y@}hcZrOF!VVujS<)Y*-Xzq#oYx`j(3?0J
z6j?78$;`eE<|`}zGzF_abPU<t^{cX%#)`w=EBgjO9;u2Gg@z_XLG5Ahvc#r<gM@ko
z5AGBx*fF);(>(8THJn-cv@=;gw|S}x$4}Onc~PzBTB~wdb=jC<s4m!;IzJNZdK%kE
zHky{7a%j&;!K~qXi}99c$vySX!gO#8TZ2~p9b8AO2(P5nZ2jDZ2IX(|^A!BUs2bSl
zh<|?JF%gaVO5LCuRQ(Wl`0TL(Jt=XkFYh6q@*s;`71Hsid!$?%Px%zmh9raQ8st}&
z*jDV_KUb|}!0sh!o)4sf&S^hCm9pV;LJ$`BkOmFS&7DQ=6i^fBV_KMIKU2c{mSsPj
zidS$t{WRB+Jkulc6enO_@Wh6<y@g71)9a%5C$DDBo?8;z48(YQ=URiucyTFLSUpq$
zS!4uPgTjh03N`IMEb^UV``>DjO>}?zd2gvua2Y-gIf4p2h@3JTd@F&%f^cxKPoF-s
zMkETUB6i&|ms0pX1t=CV-%<MzlPi1?)peyx1mUL9(Iw8%5}?l&8Fz)_Pc!9*EI$~&
zdNy#Ds_M7WQ?GF81JX+k${`;x1RFtI!Ubj5<<bvJDS79D56Hh$<ZyT$?%FUU@`Ze>
zTW}+DD_nzrh0JdUBWT@0m>T&c3ZA|!%RAnHi!PE!GeS;>BNb-xgm-kwS}4(?5TX+n
z_^e9bCJ5XjtO`E_H!fR8Rp6*!bIJZ-&o)7KjI%7M2jRg&{5{Y*51Rz>eP@Wy1+r&v
zEtlLXK3gqfd&mYUkvgyWQd|!5`}8N9*KQX8`X#k0<JWNZSAFolMFkt>>)#M;;9j60
zgY5#D&uR|7(e*J{&Xq@cceZTUN^!&|-~{4lRb)Z2eb*AoJzTx+pYcZ~JoJ<)d?QS_
zs)|F{KBOdFZ`^1oUB=IOTP+FM3jAQhx~@zi!#yYCd;K!J6X*!5W{Q`b;v9dwv5wD3
zQ;r*y=?V`UfIalU1wa6(bnKoOo<4+GL72(>*?Q}Wou&%qK)yX?rpXyCBfG77i>jUY
zZY5!&JY9k*f+$}#-OU3-DlF0w?i@+W;<B+dulOoc;oX<z-SZLvMY{B+GHeh&5w7`s
zUF;KJ0_L7!c)hs9y;d-@E42k`%Swj333t>;x8<UdiXD<DaV#PsjRD00y+id0rL-Qt
zuMj)N0?T$~aMWC~j3XSpdKUM;vfg939uj~ggvFR>u=gkbj0<KepXchf4kD#t24+L;
zezyO0hZebFTC`DcN4Y(I0Z@-Fcp?#At3)*JJz4H#OjvfA8}M)jgfO@1LQ_X(2L1D<
zkNz<?<R94v;P#WtrwZB8f1YWCxPoV|Q+CF4J5PSO;gY71k@Z@Fy~7N<t~d(UkzIW$
zkwz>`Q7PbU^An&|>ji$D6hZpi_Hu6aC1+xGhkbuX)WI&Q8aP2Q6?`4p$(>!0ukt{+
zM?y>_B=IZvwt2MV2kr%p1a#RfnuOw-CLLD`5M)Ky1ef*G>$!6TUkUW1Bu5Nhl|`*i
z$riN%Wzsh;#;Wxu1e~vHnn~mHH}85sYr88h)LlnQn0lE`e_haeE9q^ZGB0vU2=hV2
zN~Jzu2Wm?T2z}BFUpWswV<b>}3705m>znYJgI873Dygs%GYw%~C&~?t1VOYLsISbU
z6Z-*ua?Q=eK!0GrqFi=kMtpujRpD?<4%e5x4m}B&$lQDi4*}>3g@O|<Dv;mN{U*XR
z?wU%$PAqEo=-$Bx)8*sdXm75c@a&DZEtNw?l)3cW%yx5oW=WFk(-K<P=_-&784shk
ztA<Khl&}kh%ecFik}CItGBaY=$8@ZvbguQP&(Q60t+_RAO#lbGB5L6=97x4k_DABx
z(JB1YzGv<0qE7@RiWrXW(e_4#uB#+63W!r5SI1>+Q66{<IVPY4@ZsWx+#?duTNBIY
zL-?mK&%Ft64bKs)@~17rG1|#_vG-S_oF8Cr?d$dl1*w>$=c6kT&>CNOKfWCs$G6xn
z0!yszVgI@U3NzE`eI}pSp^i-hlz8edK11|Q`UnSIWBbmB2p-r4Jz$wE-SL@^AGnB3
z)2+4c&<<A1@d$2sJB2kS=_If0IxU%D*|Zlzr@|wV-@7?Y*TS9iN}LyGawj~zQdeHk
zbI>XS<HwkCHrm=`VI1XpY&vXd)of$kH<Q8<6v1~it~x-W&gR9A4IP1EuhUC^ab>Bt
zhe?Y7z>h_G{7N3|%9HRVxlBc3)Yc3Y%QjEFeN)$FS*5)V63sW>*Kxv$u#~gkqKR(b
z%c+LIYHW}qQMys{bcK^gD8e{*bt*Z!aX7609)f|%>e}l6_SR*s92qwx5F24hhSr0E
zRUU<z)Ck&XwYSj?%;GqlXq<1O#hPf{`;ODAo%%|C;v?bpP|SEqX&VEJXP3H`FY|&~
z!sC#jBS4ECvHtc2i13~7^cT9dgo-2RhWg}TgaohpcmE;lRU<oK-&q)PnVcBgs}@#3
zlDBX>E7){%jGO$#*voYAbs5hm-H3sX+VEpYd7*9`EtFm$C0|IGi!KkVqlsxGN}0R)
zXtQ}OyJ(9EM;tA=ZG6h-;a+=|iz$u7D44vG92{)+QhkZ>7ciB1l}(>gWQkCmV=Sx!
zDSkcPoa{>=-&W93e<)O8#(svG+=x1Wq`W1}rG<YwC4XZfv2i%wTyp5#=|#bkBSuf+
zK7vL5Tg}TkXBAV*_Vt7(EyH59&jsD|Z870ZuPZ6l4cIsw>h~mCz(x420D3%|BD}WE
zxp9B)^sEm>kUTjIITm~0L*%4@Iigp$z`nIfonn7rBX{?SjUx@$+}NhOyHm}i;THuX
zFPC*KWt?OOv}QzMvF(=0xtCp5n=sqCm93N?X{yL`q?0-XpyrT8T@Q!2M-X0jLH5dy
zLpl#{uA6rX;YG1jif2=?6f4VC;b`b+ikSUh8hw&MO6sJ3fLIK`kS9vUdT{R{mi)B|
zoF0k8u>)v0KPFv!eoXa6L!gfsv$+!IfSiZ|j&_6SB_K>wM{jAFY!Ed^hdg)noznD>
z-T=xZ{nAd~C@4!o^?8-kX2lw}C-|pKZ+)uHZ`3o=qy&0Bb?=RJUmKg8ZN5?cozRm9
zjC4#v>WIy!r!OIbfLNTSvpJx=I%yh;i!vu@xor{s+IXT2QqJkPQ{NX3d?U1>pCO-n
z)lxs*B_x_BBMD{1CLV*|INp5z*p1^)4%{XTir=Hv0SXZ<TpHzmj|O%7A3@%%7r$*0
z<?Z+;VL6zV>Z{X+@K*3Eea;07$PM{vL+4fR5zV8a6pNfqds2D`>;8lQ&1piMFN&xD
zQhu59BoJm`w_e~HX{Ud+!mH}Ov@8zTIkSz%(}%p{zQy29g1?g_8Q@kk)0H?L`@#R$
zQ<Qg+xI_Q5^n(jOoW+0E5AT|e9^dV*j4g8aS=K5~asMvupJ&Or0bEY=qpQ8|jQ-b4
z?rI}H00I-Nj*sxr`T5UFfHxGmyZ(&@(Zc`v;KM3{?}RAI7$5#eNBQSSq2Pu-0%+@0
zIYjrLtN8D>{&n>K&)gRIJMNi(UDi)=?d3kwch-h2Pv)w25G*jNfabD-UlpyR4s(_a
z6&y2n>O0U+VgvZ@Pp&6zk6h-igS!W$YlZ@`dgzG)%o&5m^Jak`a`L@o*IFq8G-Nk3
zvu@&0AuL4Iv+BbZT1jT%G}fE^&Z3F^pJD9%d2Diu`9=*+p$B%2De{wVZ-4<})cgi=
zDTX+srv?oq3Lv2Kx6&?s^cAlk@n6I1P`@*N2eYSy4`!!5i8O8Hp#D*+gmc`niL}bi
zT$bA785bAxHcvM1rXrK-s`ct~I##nFe&Gk}_EfnO@S+Jk+8+~@A&C^jKmE1tD<%#(
zWn*Q>cGbVar#^AZa=_R{^GJj3dd=w7evWXfKa9EnV6qC#x`&;cv>@GQVo)%06yzW4
z>ehTO$uehwX%o_L4yXvbY5UynSAyCqRz7r{bP3zmeUG0;z7K^--nR#>{K6OM!QDlo
z8d7{tl1*!uZ*E$)fJqxOQAsFnxxQ~W3^6qY4PUp(3;%u>fQJIXLpBJQ*Zw@PjQ#n-
z=PZxV5KKw#eZ7BDvdhcpvRL}ty<S2Afu|(PL${ZpMt9!ra>?xh*#Ke`13<yVO8@ZV
z28KoFPZO~qqbDr8fcmL%)Ekl}03AWd=j<NpT(XPmkX`cpXLr>@;sX@T(0~IZ_a^ZB
zSMan1lt(S1Ki7&5ITeylwIry#yqBJ!Ay?NSld8Yi<=OM{^<GF>59u??d*$>F83|#U
z9n3*M@Bi-IybmxLbFQ}9OI&Niaht5^%J^=fA$f#r4G?<e6kq>rT_Ac`Kc6o!?-BMH
zwaN0)CbF@^aONG41R=zQ$ghcz!&uzwa%t#KBt7eX-N=IyjxSbT;_XgtJ#%=R9g5KG
zhyROodg#!yu*`-GPw&cscT3WTkv*v&8C;*Ox=J_MBeR3~0(M(zqOB-%`QFXu#|N+r
ztQz|RkISpcPt?M2kHizo6VZ>)>1J!b@h30kBhGUTz}<})y_0zQrzo=(6*k0oR|y!}
zGLaZBw4#?FCyj_iZ=AC8yHi^1Bk{!%KVLjDrZhjO?Eitro~1bJq}3}otLql(8cM^;
zD)p%~E*0*h&yr~^uMMWg4{XshfVqdM+R`>xi{^*|diT#9WP)>lHz*DZVEZssIOF4C
zu}JVqdT1qG4!Dlm8f*_%9obCZd3tKp+1B<RDJKt()~Xs!Q(G%tFX4V9Fa|_|)%eq+
zkLB^zazHrH4xF!i-1loWxMeuU%v~|Sab?~)I*(&~d<6|Ow-vZM4&3&PjpvBb&Y+q+
zvkGOLT0C4`>l=IR$oMx}AOnSa5hy>oN3Rs8Oi{lAGLf41+R{|gx{;K8W*lPhA*Zny
zbD~mbW0UREy4@A=HmUDV&?_Gj!MpP9ohG7KWBUjqu{<!cYqzUyUm;Vd$<-k@NgG@5
zQ>mlKNUB(v_1iyqZXj%DsqZCKtb3FNMGJCye*Ak#J^0W$2tD{;lTaUBGMvv9m=U=Y
zOP1(F4l}%f#y$}%zndj{`PHXWlLtQ>b2<gr$0DvDl$`vvKhX%pMVac;SaSaNi!sRG
z0EZrMZh6<I1-R<#Ex6rE&fQ`KgtK^HxF));FS4ByvEd^Xg|cE;O{#mr3dEua`&;K*
z1yo0%OIFRaA882JJT$nHZnfqNv{Y|np~bVDX7*6?16HVg3ebkwYc_4T$HS|HgQ0Gy
zPx=bB!<Y_s)=0&fq6Jq)p~j>w3k=wF%UP1xJ~_S+g$9`S_$a;Rio78Cmq2vKW(q<#
zt5aC;!0@8ES{L*`wmbn$^J$-sAL%_Zp)@$4V}54KKtOBD?0b#kseQ+4l4b9YRA!u=
zsnw9!@`nA69ptqo(sjaZn-!n*14*g(JUX;KnGEoJ=$?B8b8Dyh;~Rm8C~XD9Ujd^%
z<tFZC2fI64Zj)#|niXcO3e3pK&wsiV@1{Ngk?0PMrdvaNJ4l?_p`!7lI3td2fSiNs
zI9KERZd#Gi?(L+c%h9)^0QBk7*EgCr2x&v5NA7<PzA<Uh7<vf6@YXnuv(1<urFx6v
zW$je2PD-rr=cJ>#IL|D-+Q3X>#xM9w%E)=3DPR^$7SJA}${5l#$tI-9V^TkKvNI;U
zK3^x%+59A_@)a!GN^T+r49~kIb<V?VRt>k(b1$_@?Nsd)S`_+@&Y*3{J`bSLYbL%d
z8PtnsGOe}k*m~FRyb`DUEAB#})%#AIspq|^4z-mgg8Apne^T<DH~iG?jd(nfPgv69
zHKK5CI&Idba=3g&+2_3G3pY%Ku05YP=ar9I$Gcs8JS+;Go7hgvE1SXn8QVzGe%5d4
zU#V`JPn(i~>l0vs@k`f8{&qeoy#W3hP#XmdF5#cLyh+k>TaSt@^eRakm~V;LL5D$C
zT#<EQqETK}u!{tLBZMqP*pa)M*akYI?<11|3hT>oK<&M@TT5b`I>xHDrn1Rzgx4_D
z1*ORSdZ-Z@3)UK6UiF2?;YoiPSn7T9_I#NXuZ!XMt2EweUm;&t(IyU-{X(^Iclj2t
z-JQ}kusvJ#*Hd9U_!ku8@3`ij5G<;Hft=uBEBw?G(@|}K<il&)MM<WzLyOGq*+a7r
z5K3Y-f$*OZLtXpGM>E9vj4vi@!F^R9wsqAc&S@dd5|=Z5FNteD+^X4WRZjMq6vdod
zx<#SLKf9UVSwLQsV^0aYN%+c+6M19tvsp)NMK#7yA0b^Ild1AHn()SM2CUwlFG(j{
z*|t;8>^pfLgY(<Mu{0rt1o^w7#JniPj*NlaP&iC9tV_A-(Z8WQm+!zV1V`y{RYRhD
zUk}$fHyJ8!P{9U5HkGfaZwK|&rbCTSFD)<6k5)k}8KnC+QH9j+(E#ae1X>WoR;8-Z
z5y7eQwzICACUoWmEP3P4&X}Z9HbuNY#Oe>ml>yR|2n8PLw5FsSBHmDQ97@v-&^xdu
z4o!_|pGR~Zx{U#DRq>UNB32{SLubStQm7)QV7<<Nzk&9ML~Jm!W492Ny{|sE<bIlO
zE&2OkAbIJ~TouNl??P5yzX!XGnjnopru}>RV-^@Gxz`PiDXSe~+OX2uXbhWyDHW@&
zu4s@u`$;(n53AL(FlLb1FQ~V2&cfy^FqX+{mvT@k<s)6qw~uzB7Ok}?hRIWM_?&mo
zlJ}t_30Ttn4RBVKyl&HvnO~&^%%sHao!UYGmi&J5a!Kuj>l`zGgD^djwx`d0_aEL-
z#Wgp#Q&(W_)_HsK@;cSf2%=$pll@i!<7_Lj@B-UYQ~^+y<4RGvrJ~?8H9=qn{OGUz
z9|7s4_xanGIvN|+kWJrA@dV2%BP9CRQVYgM!o;U-4U>i--seyE=yXOe_gl*%c4xY^
zLQt3b`+JXk4{xGCwa+{d23SVcW-E_>0_4`U$uW{g`}Cxehe{oHjW5b)D;K7*b8Pax
zQVTD=2JFf$uS{+87M2Lt>z}r83KZ`rRM)B*uv13tZ!44v9Ma)m7L3ZmH-*DvlZ;gQ
zN~BmWc<Cgc@>TO)oy<Ri4?v5KBC7mN{(_?jh9?3}=jHt70`li8QDmUe&wTph%NJR+
zP(}Ig3mf+Gq!hF*G$v4P^O|1mR%(^7y8r{OQ+H|%17j$u=JXs$qIrJ!LYJqBKP2o!
zF46wZiBzRTkWvT^>UN2L07e0ceLWY%lT$|@NulhoXz9@~au;McICmd|+B5<5j&Hr$
z!m(LJHPvy+*oTE&dN%SenWm5{QkG~$i8Q8ZT!UnHutzA~F{)O~y0eN~5nUI<YlYjg
z0LCC^$#kgDx5*B*R5uWy;P=XJ-vQ&e3WuSLXOf@7Un+lk<@a+ysU~sGNV59%yYaf+
zCv;|y@!6k1*n?K&cJsx5l8ta6!4=S1Ab+H5wQw&kAZ0uI$!7J;&x!bSzFyLgxFunn
zIuwkOz!z$9tn0n@o65?X{h-w(C3-1`hbWKSa2~Bn4$XVQ9yO*b>G8XlV0!hC&D>k?
zsd)M)x`jI)DYUaDxq{&?dz6sNnEjMEVil;WZ}AlHZr*Gx$D6Z0dHz%2TXwLo^Wz2C
z+|lVOP<hXTlQG9OMC}sqZe_3(SbWiLqR|(z$XDMAHHo?Xohv-eMpsK<E()uxq`31|
z^{Hz~)GBHM6w02|Xsl9F{bb;emvV0x)6al@{=i%yU}>t<Gi_vfaK-z{5_`Qdc?Lwk
zY4?QNakgVt5bx~852i$AJusYvI4=KwDD~XFK5ixvGS+eXgQ~+vK6Td|S&nB|_m_qM
z!_{%mojXSk+le7W$}*aD&VwVzHft;I3D*fYiCwB1{uF`8slhwS#j|E*GZ3IDzrAa>
zQ&};|t*>U}W>16tjFOVFpyk8CXkqYCHY?$Qmg<VPHc63dRui9TcZseV?O0{p;i%*h
zN?Z=2%NO)82&4N-l4?<RZRIK!0OntMKBsH}Y$AWMsXd8*z6WV{4d+qY@H~T)y=3w^
zySDr%(RhJO6MUN$u;ugJc_v5WfHWhi-hPmIPA-BSWj32rkMo99m%CeJPNS?7NYOUr
zP`#{O1L4N&51()8)&*?LJOlCkWO8kWHE+405!80wKv6PMfXkTNG$YXJLr#B7-^E0<
zB}9nGyxh&O%sYLtGm(S4|A+mxrutD<C^}MKchP(qtTC^RSWwr@-DI31gDOWK;Q%nQ
z=4NPwBbV)n$>k^Y5HR`5?@|&ox;~ftj7nP(`ODfx>`J5G_e*U6A=2>?>PPo_+;tb7
z>)%6u5p<xEAXwvmSyTUdmP3wt{A<ZsBF!Q^;HDEvs_grCEbe5XqGqLKg2=-9;PP$s
zfm_N#<+}?7?AKp5Z$qxja*dbZbhY}t?^p&9=%(+AnO(^Eh!y8j0dRGn`#h%b%TkW8
zWzj0gqvl(1yU2Vm7dRi?MeWWYqN5Cw?hPUg3$7Z$iLx7>*7Rlp2u~S@3W|i<<E}bh
zjxqEMe7<%AiuCG>b!EG6Y|uwQ-7^w53HFmKB;!WUud&I3@o>?0C5|UJ9lI}xMv-ay
z=xp`RUj{HHAFFTWOJ>p{hSJaIg!l;Rf*mHO74Q$>f!SE14+E_2lYK&vlHtAB_uA=~
zOd$8=ZbF0=OuM=bgZRtu3TTznqsuogmk!g6Hbmd#o~qL4%+K}JZ1I@A7ya4@MgLes
z@q7=!Knry9=ZEueu*C`Ezf{~IU_@HOxQKaE-}vn|sa)NWaJjx70PQcJ`R8OF?*PBC
zZyqhM)gt4}EOrN(#ncvMj=qZ0rp<R)kKVuv&cLDJPI>)eHuGjV&A)dK9D9N@%DU@~
zkC$@juGaGj3kjNb@79a`UAa<$4O5<5%hq!^$X1eX5<aA&-EAxPMNRd>rwWT!^vp;^
zw#2<ReytYbIDCVcywjy~F@%vB9|q)Q<{bzyoHU@L3?8bc0Jp-F08}(qf{;hSE+f&y
z{!FS=Gj71*vw5Af!KgXiPo+i4Dai}q+Yf?+;0F56Y;sR4^;_|F{f$tkD<^oy{8Hg^
z=-qF`)e=GazNhk&^E<!Zw0rG>C7qQmEz`Mmzpt$NJpm@2Xr0L0yU>Noh%-zqt9Odk
zEbuV#87njK2EMf2Y>ai!cEliQJ1S{imnyS1GWFH%p}$SC+@gn{SBbC4L4lLFK-^Qm
z8FJO(yd4r92dae*@8Q-Iy!L_d5fHfddCH;JKi?Qgh3$Xiz83(tx@*q6qmQ1K<SC?^
zp$yYnpU;XUs*cs@_illCWk?-i5m44&Vw5Ru&>fwsh2;Y+@K<}-PvTJ&B6)V7vW&iE
zGF?!k#wI}{1A0Uc504n~c)tvBC|CV4P6&UNFudlWAaphz{8fY6P;ehf5Z-0bw#)7q
zQW=xS(PWcL_DqR^eEb|-yEo!$Bm?ETiyRO7hTxqsf}D6e-}Sj7!}ccuVNZXpQaE4#
z8IaBw7Fo^?(L9XY0#ZOQFoB@Wh2i!nR)}*#2V9fZx%I_BqXnPMKZnP^xG5%V0ZKNN
z$;r-h8as7w4A!@Z2pjt2it<EZ0Y7hiFYIMMsekOI-RC`S>z#6|$J339Uqw#FyXlmT
zo5y0<k~+{=w_4ONgk;Y+@gDzztWF7`)*cc?@u#M8=)={X&%OyG^J0{5iYT;9IP~Ui
zwIGj(z<!$GCz=bsJTEFk4_f#;DMCvB>~yldU66YH=4eOB)wU6s+?9Mu{P6uAcN+nc
z<c9b=apO+vrS#<74dFBqx&cbH>d8L&e)0Cl$?quZ8|9B~50;4~HzA(C`PRnb53Z9P
zT)=x5bl7~HxBSCj2?v-Xqd0j-GZLMUk5^Wf+jbVq*_mlkL?trkHT~-uqkk0+T-}k1
zoijhqaF!H64_mo%s8+z|#$+Ysby>;-I@CVzc{u7f^DvP=?So(xMBxZ#V{QsdhFap#
zMPXc3rDNNo9akogaap8eh_#d8aJcvO-Cq8LOwW;A=ObfleiV6)7WU8?7FKpwe%u*i
zvAW+>EHccyp2}OG1r9t3W?Qi8I%g`rf@mdPerXD+v!B1UJVG@GYG`Ee1NONl>d)$%
z4hab8OaBj7Um4Kk|9;KL(TtGMDJ`8!w@8PeG^ms`NVCyBKt+)55Cv4aMvqWZLO{9^
z7+r(?r+$CWi|6Hd1NVpP{#@sr>zr$vVZ)v`gG!jR*85}`YWY3C*|c}866pM-cU0mo
zH*QA$@S~G-n)GD4pPfyu*^K8@VjZS$=ZVqe!`nvc@K^ii=2h@M25}}x(V2H8E;6p#
z2l?yN3t#qrfsf6_)l$&!vOyxgqoqVAO4%oE6E4J&bp&e^(hg$)^i7uaWu5-d-i~F;
zIa>IC!r+%M42pPZ_I%@?EcjJfaSV&kq09^NSqHx*R9=)@X%Ts$8Ai{~c7aLJ%sW$U
zF-S_FF`GNSI6@ihEiv89E7^PjHMT))k2q1&jZ(YpwMTHSHMG~xe*da)I7^g(KPnj5
zIH1Y=`7?nI49kSZ%xyYa4Hw5gFyLX-^+F$pujjKjKA$fm@r}dfyJE{8s$PwG=~iut
z`f+dte+GlHybSL9^wc<QG(e>4xCQPgP^K+xFpRa$D_iF^-S`2wS=%oDLw`PXLeck4
zZdI`A>3=3BXotlg*+{U8&->qolSEe5BID>Pl7$&A?l9$ryP0Lb4)b}x-Nw8iskW^B
z#$x!e&D|~gcqQmQ>t?6m(9i)3vxl$cbod;qZ1Ct8p)Xf=aFiOECQ8W4$XK}|4iG(u
z?629&SY-HWh(lc{giwW<Py?TqMXjEboCIt_2XUQE;UCHcq~-RFRzlWG{g5+9uB#_N
zW4xuePFOtC@X12vGr`3j4z@GFx%<OT!c||T;jzah!|JQP3v$gb6Rx*6Hg!fl1{y0R
z$UhB1%s9J(Oxr~_J31PVQU42o<6|G9hgcb2j4=KusyeZcVir6d$Rqf-xq~d#J!&ee
zY(Glip$_JTuXb8=vFIws@g28Z>Adgo+*P!_Kx7HQ#O!G5t?j}CZ4FxK#fE(atjuki
zu|$Wvod90?Bw0#KN8JA0P!dNcLV^CKvSFdHuI4JPmQ@(-?VL&7*v;6x^xw^KsQ@qf
z)}TxN2`aO7W~--Sx-&w;!|2m*EuraFvp|TAItsG@>49Ju+k$KtqSuH$%uAr0zWa|#
zF;4j^nTr0${H(ig3%PdD678lu$>Q)|yER7ie*7oSMl<w{^B=<DBIL=oevVarTF-TA
zwvMd+dK3(4Tvux-c-d>le7jz?y8xn4rRF(7i_D3nYc85ljSwgLsu6C<??n?#;&8T>
zy@oWsW2UGcC>I*wr}ujrT|17|<=W4Vdt&s~+$Ix`zpHHCp|oGYBdDKcC?|cj{_#go
zG{PRTp>jN=L&aLIp8whE^JVMvW-N35sVk=I8QI%E;dpo0%~YNF+ek+6$j9LRo4jOn
z)10FLrPou=IrSXC>HYz%ZKE0At@+P3pWAUpY%Ljz%KW&=^v8q9=}iUtO+~`tW5Rzo
zWkx0L3VOQJB1h!-Z`A^T#i`I&h><$W)5~i<Pg*z8`0i*&kE##l^EWmVZ9Z5`)5Eu)
z-w`jQkXFsTe1IZa$H>US!-TBd%J1oZEerdpk@BFe)tmd?zBJN;iUYcI9-Lhn1eH4*
zUA*<v;`t#zfAqZ*iP-pYF_cq1d&+=N18Mf6zc&j7(}e9knu>8hUUd2X{*bs5o0U7h
z&(b-Q0Md3G<hB@}V^!nPMM_9!A*_q`x^g}DouE4i*7xaPPEZG?v%QT_b|S{iQj%oE
zDSZZb|HDh!m<g$kt^miIfBjjT&Ewb6t;wD0)2d833A*G?J$xc@!L^=BkV9tv+1pTz
z*{!Nid81pWU>Bim2Q}PVG;Ql<dMUe1uab(7*L1lL8j4AmR4m&ouH1e<`HsQ*iP?tA
zUUxHK*+DfVeTeleP)!;ahDAs>C{3P8;>3GKU;ya!j3eUHS`K2!^%^G!K2S8~GDxF-
zEM&1Wm9ekb=p=>Ko})RxDv4+p&mZ0nShPIvu>^F4BiG-ArsH=jB|LR({<+gjQo?{N
zmZ9kyhPD>~MogYFp9a(agSs|VnDL14v}wlWUrnYX5wykJy1h_4>bIv#fM3#eX>E2K
zJ90Df6?vva{FywH9XGcgdH$>Z5z|~T>8Pu6uu@RhTVxA<;IG4X3HItu!)a#d-aG2n
zE?r^cjQadyhwx9B0Pf8>$--`TUUrxDax65MU#z@8(xb(hhE(@STu1q1liC?f`ZCXi
z3oOJw^8yAF5)gn?5;A_+QEc1}DAQ3yHaym0<w<VzP)ZHL_!k!57ditg#7zYBFBMCq
z1fJ^uwyNF1_4*K*1Mr$}b)d&jYWrT{^S$mrP(|=s(HX6GrKp>#^uI}#UVa;V?q*^@
z%9R$KTTtb5V);n&BG{j9$cqB^^7ej1cOmXu0=UiX1<Fr`x;BAHe0{dkB0n3e^X7h;
z<(Y5&t{_fBy?1Rm^vdMD!un*TZ{{(pht>s-(ZwSWwvvpJnmA9Zd~0|0QH-@@&MQjI
zMCZzvn`i~skN}H#XqC(MZjGnZ6(8Y_*hf0nvgm98+T-ZF{Y!Y2>9dYXhTKH+QvGRF
ziPI9wL|UDQr7v*|gCaGx{-3F)^W##7Z&1GpN)1Mt7&rc7gu>i^1c*07gT;S&woNIJ
zC)rYc1ATo8zfL)0jkFr6u9v-Gahr8#+yAux=BlW^8!|yY#IW0&R^Q!*=sJIdAT>Eh
z4^tnwlbt48R>uCBQd++d3jUnvB}0!%H+V((;ay|K5>GyKyfAg-#c@{gOO81pZXfDM
zo+Q`Tgs>uMEoiTs=KBOs(fPcYRxsGtJL4?Xt~}=3?RBpXq{kF~aj%+_z0PwB9S#{X
z<kY$|U+IN$HDgCWf>07=qVZRjAp8$JH9U~ke%sbfd_<OZ))JiQvg8`lj(UH6u!x$y
znWNjLsKqP0DZ5HnQ45cfx|&7gto|p%c3Aw$Yzcni^8UAqfsQ+W^i<`}N>%o)hxyBv
z?+P`BP|=U@$AlfZL2R2u)uuVury@kCX6t~R!PInv52Y^CW->}q3j_!h;k8SG6B!S^
z;yJEs(=^A-5@fQ;Y#F|EKg7ALby15tI;$_s0Yv2W7*~gba2NkA&D%zuQW^@fF;nX9
zC|KY@4RD_r!WV9{7|+yRY%QIs7#_bUp6BPAqq70@|JL>;G|wFDg<qZ==q-v`nJ17B
zR1Cx$H@diuE;D+CABlLg)iR}(3Yd0>`B8H=$Nb%VgrNllaUB<CJp@i`i8TMolS8=F
zM39ciqgn=L@wC0U$DfDyBz<q_he}M{u2LB`5t!9qGyK~9de{)r=I&3YkJHmuA1v2l
zg|EhgQ|c9eyS2O;X0dMnp0JO17w5T+!dK@8q2sda5?%`PCe|&}JQWU=JFgaZa|lIm
zBTDB3(y$qu&DD|hG9+DOc$O^~q+~KP!-*>6f~&RBjbeu2AK5$n0Uh~^h7*GRZl}yF
zfqzUlaE;A1)ywi*hK6so*v3p43oIuW4-=qnEayu7Jc~Fl<JdmQPiwx`2RBKCNypn@
zFuafTv&uHrzg;+(>=Ndw(b(@FiP;PO_a=)|>IcC6bS(CX`Q^%LLL?@eAzi9lp&0#X
zq-grH-!55F2`*-_L^Wk)f)3#*?25p&{jBA>a~M)Ux28p$QZR3)8}4DG8WxEq^uCk6
zcCxfXh+B2^nI`#+^r{41>)=7M?;Yy(JN}z09(nA<;XfjlW}fmtDbKm|Fot#=;H=6u
z3Zi62zI!(xwAAlb$Kx+^b(<?E9Pedf7A|@Tefs&J>V8;;#lG87c<7%=l>8@!7i3Xm
ze1yxPrMoQ|JnPCOpl;oi?VY^P{}i#W4>6Ivm*bm1|2`m6k+Sjm@(Eo2JazpBBKB^m
zI*v!k`oWD-K%1TpZT_&=Qn%}$5o?iG$VG}#<2Bm^oxZrDzaON<^1Ma{`x$49$_0%<
zzPwLJ{zKLX6ebLoOq`yc%Hq<)hqg8#RC*((bWGTAIhCGxmais*U94BreL~pPvhH<<
zXH%j6t<7k%{5sHpt~Xs<ND&6h9~f0|UZ*q(GyoAKKdFrfy%RZjZ_u;A2S0>suFIQr
z(a1GC9z9fb&;nmLZ9^`5F0N-A6o)5U2}|JpzutlYL&BzyUkCg(^C->|_M5r>cJ)NB
z{xIM7PQV2o6hAr)tytfz%+8yAP8?$D7*NwvZQrbp@9|O#%1*?Y!ObD%=mkdEOo(xb
z&um;1U8S-KMTN*P%_{Gl%{rN?D$YRRp<jQUlKv7qO4H4E#tuu#&%K)z!7S$A{i*-z
z@qOjdXZ|jUUS^S5gTSgUp3zBr$E8%lPX?5~qn+kXA)V|TU0snMVv#R?(e8&NB<g4O
zd|8S291cf*<-V>GCzR2y&zw-gq;y4g7BGg-g@;8aarxW1NZ-tc9wPMZ#qR!A60v<M
zOXq3uf5HT_G4}bb^{rA4VD-O|5GGqe*Gc=`4AR{-y{r91UijOo<K9yRXRRBdr_w<I
zN)=LIa&boQSpzaDC;T57{Z@@mh}+6iF)K$Q>D;_5hvj3v41Js22d)L%IRz9Kch#Pk
z&cMebf6pRJa7W4f{Qay}cWZuNZDZlOR`Bi*fjqu{082~lur@l~C%EZ8uNte1(jo;q
z;csOavZ1mM@Q5zH#Kc2K!4ds9gx9>`Y?7x+AwBgsr4Fo0@@m+)&p|YxL-joec~QkQ
zs_@vDnIP`#kaigcD~sb;HRG3(NzvZ>IT)|q*ED{TDIN9O&1v0?;jUMvR*n5%=N&7^
ztb)gS=(|Tuh`L5FdeoVD1ww9W@yqL@+HERrNumGQJ4z!kEN(krljU#a3zre{{J5#y
zb<hSQGfdIxAUbgw0JC}fB*Xsm%Oc<Hk`>5s;y_2^WSwDGx^t+~u;UX2rZ)zB92Ys5
z8H5_Gqv_SaPL7qOHNJ1-Q|R!(lIh#4^v4yfz|Lv#W3vk7^)mvU2fuR8sF-(G!qwbz
z)W~>9*&IV&yllwqSloN??f_!iDlEi}7)T*&U>kbR@|h{<(F)7-9|7w_%IK`r2its^
z5a;Yy0#6j&WSbwVLyBbB+%7cn#E!l<QGR2auVBB|HFjs&dmuEOtvZ&(GvL|w9n);n
zt-qs?S#SHqxWc<+S#K0!G*0|4E6iNUpdgmLg1UXCR*5rdPs8GHc4q45H4_`Odeol3
zx!V7;zKOoYoDqp7IQqXGgpU*-%)8#nt%}Fu{^YYLBevf{aMeeuMT33ze(d%m?=k@<
zIJOJHB-|O6mlLFZx_wRbpgUHo+-=_IJ?JX9<fFMb8MF-5xKe$z*GPnIcx-A0@7ffK
zDx~}%prwfK-Z%iFfN7>gE0$Q6QHOghw2_=+G`l$v%PSc_?=xR*NSEtL|Aqa1q0MfU
zN0I>?GL2UE0etXt{Ymu$eMiY|YhIwKfF&mCS+Re@Ut$+Qw~O;GH(y@7{n^u^@4K#4
zE~w?wn+>xkn?ErS<~p>!^X3<h)V=WKOmjD~cNPiZJVQc0Lgvp9UXLE7;75uxhi~%w
zs!a3Atua*M7Ra-F)=Y7>XOT7t5B;Bg;F&1KJ@CHue&WCB@Qb7lyt&Jp^(OL=iU)88
zX8YjBX403*-#U!TZ^ADF<e54&$TFxDwT{CM!P@zqi5hfi5BP{fX4*(r&p+-!ou>#a
zX|vipj5cu1?ATDBFxD=%xl{7t3YMtdM>7YlX`Cciru3b<RD0$|%>w>!(Z)Ma<>iRd
zR)`D<k=LDzw-HN?^3Stlj?qDT=QDhOSzGcC9OaZ@UKj4~ZL4bWk|gHE>oF7Pz{wCM
z@<DQZdopW=Q_J?(vi2Y5Lru8!A9g-hTd%UuN3^|KHuC%M$<3lx&6wqW=_Zp)(^e5#
zXw9LMcaL!kCM?bbuli6=kyzHffrQDB2tL_C5Wmx{Y4?fJ<DJp3?|R@%Cdu3&njmLC
z%^#w)O|w$@0px{SZm}lmO@dKB&UmQ~`+EKfLQq96iVQ!*Q!bK7k^dE4TnFtPc_D)i
z|4;piXI{i{7$Wj~{WXGqv@;+?>n?h3H&-~q^HT{Oqo1g7#0fx+s6QX_YLeOdwO%uz
znQLA$t6lL;)HFdVp=bt+W&PyM@&>KI$&J-hD9PEh5YtJ)VdssDwkA^ORr|`jOr@KV
zvc)s}mq=@@NsRdjvT%ySg2(zDy81mGHG|!49ir*zF&575ZXA=el8@fLGA8N`6zfQv
z6VhGwA&@JY?mOQ-X88$2MMZwJM|_=Pyt_DutkuJD+&%ar9yStEtl<x9)>w(caNqfR
zhh`hTv}-&8)8kUuZP7L5_7^ho6bA8O7+E;+t07nM@&9}y&*=ZuRXuwm!C$oXA_>~H
z_~1Gygc|y)R-yg~GV$vfk{@N=bYxo=*0q@aUa4yS;$2F)B{KMzse##!%I^sKc<hTx
zrfN*$>4`@_#JS;$MHhuxvYKCVI@cETiFz^5Eo4B02DRX|zWDJvSYTGM0y{|OL=Qwf
zxJv$N5aD~D6z&)U|5Edfp<l~W-&r-p@3=A71hg#l-L^n9;xKcNz1?MudNzqXoBgng
zl*N=9k>J8y_v@Pe;3VZ;=jP+^&qL!lc3I=X#Z37;;U)<mK5{;bOU{=575FpRJeBd#
zhh$AV<z2)FKAsZWgpj^?p+5QK|5*pb{$LXA@r@^cZ{`$FTzrjajMa_I)ScZ+bf5ZY
z!Oi)4@7*p-i@9u8M7qeq@yS8o;eaR7w58qQ@{$2T`e>RbbIGA>kq+Yx;DPtwl*o`g
z%W&4P3^>NDEtcH?f~Pyh(S`Z}P8=VFD$mA%<Geg#MNeVS2JPKHvOg?nMU=nug7$&c
zVF?8yC-zd!goHEjB9#zZ(mYe`i;e*u`4cc&>@h%*7mN{n@5Z{kYX+%mMqX3;?fp*A
z8nsJH(n+K1v2p^L>QpPzQ^qY&nQ;1d@lnZs-C;{8=OOd^{-0LU@$t_>WS6Y~;lETE
zV{VEH976svwfS}4{m6~;WDvPMOPaUeRAtfFb2BZcaH#Iv=)O&jDpJE?bZ-)WWj2c?
z8rtHz5HG2(3*mdPZO`<RHVV!!s>F892P)6;V#;zb!8hhr>Wa6Gru=bz+gHYpcgop%
ze$H)metF(0_RN1bSD`#0RJmBiLkG#rJuEZv=%TGeNfRuLnqSH+*V~&JT1F<O2?c*+
zzsvdJB25iiPN~8!C@EfTnU4V{xROtaRNl)F8jBtlI+1A#u{o2(3#NFiG)&3A82J=S
zPx)^N4i>f;CL!FBxUymUuiH-GzHL#E7JU|ftg@fAactG0yS`gn6f`$Don+<<oyoDG
z3ntP@2c$dL9uqB(aALH_$-AK#$*Kgw+r$!g<K%Fak;W0cw*s*CWwp7t8kl>t)y$(J
z(I~i3_NpgOv{RmtLkp}IU3-;vpnhEkzxkAYpCPyotAq<zNB!7(mJF`7-z%9^QeQcC
zb2YEAI(St9kvo_q)k~U?k8QJt^J6Q+vLO$Sb04_CV*M|#KcC~fv<{J+C^Th>7VuE0
z(e?APev0Ht?a$9!y1jgyq(p;5B+#W~Li)Cz;#z*2`BNC52CDIe!gB(g*nhC>|NBoD
zCqTRUOfX~gC){ZvX*mh$6HJLJeU=4#J}v|y8tZ|1ra~%@`|6Zu?!K0q)3JYxqp02_
zFkID{weZlu-HDXxMZY>-!9e1ZmMhFQb}GR%z;$iZ7+UGO_X0q8IXnZ0k~bKWqFVjC
zUyzudkBPN@AjNdyrdk`Trl~sQB}&WTqUfGbpu}y*7)6l#h2N(pL*}=4#+)Yc43}$c
z4~foy`CbQKh4<VTzgJoZ2xZ!<Owz7Vk6w%ayryE-YdxTJMRng3^4|;dpY~w<#|Ts0
zFn*tLos8RmvZFfC(eKIn`rC$(rrqWiyDq=DL<r&9LnlZ@R4l)PWeZy74j${WTwG6@
z*;Yf>_jOfi+vWYMTxX-_VdkE%VvY7(nyaSWT0-rPXYY=4uS(SqfR0vmMw+=lG$3;0
zQI<{wXrCh;zkx0cKWs&zPYYNAlfswGE{qHqSSDExql0JY3Pc6~1+kIOG7a(8Y7L&K
ztKH>fxMAHKL@zD`N&fVm56C1~plLl{7=z*xjs|g8yH%70%|+gSWydagb`uQU))N*H
zl6>XhCn*`|=kRnwtnFT$vw;ug-9X9{<U-JaTqByB_=$9*ulpr7k+j|`TKCDe&9#AG
z(dz!i#q}N@yGDU=?mmrsP#J>>o7sNCfr;e97$BuHK)B(?0akhiDo*#QMbCa7A+qn#
zqm|1dxetE&k}?H~%gGvMu4A+GDKvlN&7V&I!V^wF&tf~pcC2rY!sLZsOnPgs23SZ;
zW>!o?SFlt)>UPYaAI5h^?a3hOp??&6kbJF>FzOM>iH-D#g$MUoYao)4cd2vry%RwV
zEuP<&Z$Q`z?1fAeld9yc4V#r&U>#CH>nXaeSf%cGIu7p1%i>#eWH1*@asCcB_L>AM
zX#`K$WvWp!sIdN!x#=n^`G9w-@BYU16!TB!Q-WwNdqoY{GQ&K?ChQP;y4I+$L*S$O
z@mQ9K%udlpV4~<2d-q)bMC}wpgm)x$N?ZQfgWVA1F9%kb>t0d{8+h8SwZ}LFF?xGs
znzhK^u7Ez2Hn7pvV&H-7AN+S73tahZ`3;0~@PEfa1c;oTEt(^SU8>Z+;kFX;VW?KX
z_AxO2hL}jMDIR440sQT&)swLJ`l<=Xnr^pX#z<0k_qO)gEZ_|rdmbrU;-<fmaq&oD
zeOu7+rgZFPVrFLiP-^8unr7s@X=n}|^A?L*`wf($$+#8Hh+wC5(=!Wo`@vK`9jzga
zep~8!D(`&39Cf&X=N&Jy5#1kia6`4Z+29ta)(RKiU8W98{b`i7JkkHt;TxnG`QG0Z
ztzcfhSK~PUEqsD-A<;ODeAT}L2F5wEiPfE<1Ks_&*gQj}rwtc^J#OVzOSDPs;OQcl
zpaU=dd_?=YGe(n|gx0*s(I#kQ)tf{W-MXFJ>$hRW^A6z|eM-U^pxv&ei2diF0y7n_
z(dv8K+_QOq&q*^s0T+3jmk_*XaxFz|%{UKUfbjJ$@|?xQssqUqg8h`+Orz5;bITQz
zH}k^XWTqKM_A6rPm$sziyIl!W<CXH|0Mk=75AStEpyofu7%C|bH!3icQTUXKgvyRU
z+ApHkT;=I=H|8ng^}d_k=}WkMD9)}GkSvoLlzh0-CTHF7!Cu(*Vr%6RY$T(=lI-&n
zsHnhLf;b+ECcb3`RRDzdv{h=}c%vb?p>@4Rp)y30x1Q(ez4OxQHN1r+I}$LdVBxM~
zg(O+@JkRa9K~0ax@vo+28m2fBC?VUeLL4&a!<BarYryS#)A}t#8~f2i0-NLz5HFRU
zuJs*Xy3#UFVTDk9GRBldt>QN}!TzCV-2<`6fm`3+D`6rJEu846z@)b5&&w=RZE3LT
z6aUV@x50Y<jxqrn4P9V&f&VSQQ4U;+kFgf5x4T7rC<lT<@O+e*)M=6pli0Iod`B_d
z^vU8@a{{R2-bfD?X@=Y@ARU^|Yk=@qH8&Y3rx=t{J?sQ<m1vzb;s{2??V6k}5{|{u
zwiHe74ux#i1Qy=8wf)6#k3G|cVgL->kx*T~w#Dt}FmSVvmZX6+t*sk>l7}aAXZ?U4
zwGPCw+_&+#VoOwzy6{xBF`fNA_9h{wOn_Iuc|UbCKsNn8ZtRYF(_!_u5b+Y=TVgS<
zmG0}H_J{a{B==MUe2PWN(jBT3LqsG?h<r9;JLeUg*s@@Iy6PN-cWfl&banHiv3PM9
z^ZKv95kwG<aijE~QFIeHak=iXk&sopUh}{{&zrVN2dVAAU)Bz+B2E4t7U$?2TyfkJ
zPMz!5e{V15yHEgB*8QkYs)s*qZiw_SO22nVyZ^FvY~sy1JeZXENqnno@)aOf-)fie
zE5MUvev86~gCh_+11Kay&Pei|#Q<!ye$bgwYjl0eZWiC)VhLD0C`BTxRPX4ULc@bk
zG&nmh4e=l(Ol$2@&c<_y8iQQgmydOy&`)lcE%?k8d_}m63Xe*0Q?SYtmMw<t=ntJT
zf@b=I7QGB2thd~sgR$#1%2Dl0n%(?*BJjJbFUkrNPu=dmjsQk4MoSAa+|6L{C5>(M
z58Q~rJH@&`9{Y;bFoHT}@#Rg;jHfeNM?D30(kTHJ)$O~zz8ZaZg46J@8xhs%WTz$5
ziKTW!$gbyTR0zDgP4eTJzm%bfrlpgM^-Jk`F*<VQxHeVJp|!1+)X$u99T3fbZ*H?v
zzCHTRULQ{D|4#G?HW+Iv^1?dA-z6KXMj`4jU2X=**@`6Bwn$MG2)L{Zrx}Y%Kh4^T
zn8smK-;LT?y(x=-pbRP)9P`{<i9uclT7^VzwF=7$5O;TfG%$)kw2kd(L=F#+yqT6x
zXzRqu>_+U$eSJru9vh=9t{}g6OML}1<1%5BY8|GQ{y2T65s9O5CKBxxG4N%n+ka@!
zQB`RvYB<Rb>ff{s-E4gcT%u0|SURavb;M|)G=`-V-bl>TEuXo-Ug~I2P7PgZG%CnG
z_vE{3<Wv4Frq}0jHGXOAlOp1GLXER;FYu^uM7IxS9sM~v5bu}kw<x>UVB7K#sE0Lp
z8=$BD44BF!J`OIY?VR;2W(%UTH*S+tf~YE?*b0I5k%zb(gGCejyEUCfEystUgn!Pk
z{0@K=F!|KofgeDqnXgBsh++>X^j@Um2CxneDW`NM6D8j~0x9cUp!<<a(?fJ+6mtZi
z*Sfi9?<vlkE-V5tO*4p{C9lS9oJ{zRMQh;Q9`t%Mvwh@E7jkMfDVNTPfMeBPiGKBN
zErUS@B0eKT7I%3E$vjOJvhInz#uT=ph{9DdnKIEYA)2Es8s*pb3F?wIL#ReNYz*ap
z+B{o3RghQ>vwIx5IbDCe{G?h!l!7p9frY*=#p_z~s#-^i2ePnm@bUYRFfPSdDk+Jo
znLcjnQ=tFouEe-(ZeE?N$%ca^#X!??8pL-f$QDZHYc!~G+d9VIheg5+X<v(4fxBOX
zB!hAM@7Qxh;i{0F;_`qsGl97w@rGSCPGB}o&rV@)nJGV$ABz1!C9hhGmGqybI#R<r
zQMV{=!?uXoU6lEMFEbN1J$AFoNYGsj^3cqm!=+H&RAw}+IruJp<m%_2IK<9N_@n=n
z3mdBM2YX+6>c#O=M%3dv?uIuw*qm`&T`>5GBBh#Q<9#+X(B%kOK?L7eNm|`;=2p3Y
z7{z*zljV}xeou`6YSA-WDYqXku`f6#(sXw{@_t-eDQMA_>YgXaa}(hLia*!MHbwQW
z&`xA$5XhYRe>|RPg8hgI3|OVDveH(6^96(zhBAF*t*hK}()i9ARQSBT_^}Pt#>$@k
zD8HVG*ge#bzK-7PtBU6j=IjhwlS|(6^N0XF@sID4X>T0PLmMvCjHkF?w!i$=2}Ytn
zhO}MmmQ)wd66O#VaKq8n2LUClqF7^A)ftOxz}+&erEPz*Xo`%(c-s%(n%@!I7n5}=
zxS~Ry(iQ>?KM&4Ofn&;Dk=@d5VV6cK`JdGJdbqErO9Ss<E@I9}a~t@~9~_6NR5>L@
z6-7P$TJpbTyG03TJ!NcAUk~l79I{I$iy=v@xuJ+8*Rjg>TKh^XuRs!}4(M<lLudp|
z*AAl9Rmpc0c-Eabx_}`X-#~$u=I*TL1N?<aE`;0=pPe>O&ZS7sx0fWIdb1to4<6IF
zkh!mZdZ&IU%{S+5ygV`uPs^P=vi&aP-v+0OI%H02#*$ggu_sX=4YL?N)j)Z^le7Qe
zYRy!<w7i|Qa61-WMo$lD^iZU(<tKJ1#KKpr#YyrB_v*G$bPMuhutiy`X`-ftN7v4j
zsL|%2<pbccdXmJ&^iXJq*R>4S7YjuSoZjmCR&$ikn0JM=_3(H1AEuWfS2u^@WfSJb
z`9I==oW)xyxUoKFv~top`U|EKG7=0t#MT(jDQEcfIxp-qPVz0p68*|<5EXaD+8c3-
zI_xT2{n}tho;%d=Bcz07>O4Jb@sW3#K6^A*)_;(v1=EUr((}(B{kd5c%LrM88*=8e
zU~wG5Xn+4{kX+MpTpnG(wg1XP04utA-tZzAC`v?l6d}#O*+z9Xa_H$_M4;v<sX<}|
z#KB_QS$i+#415;fnmQeNaM9G8Xz=E#>iva4<ug!i<O)mTJkpEf`7!~h@5UyZFxi%a
zY0Na!=<?~&A@6NW7zYCYDQ$1oA9dQ8dzj)koZ-x%P7UJ`XeiYr%(n|MCmpkv#C==+
zi57(AlE`Abbl|LlqP+WgHw)ra(V{qr%PoM?@!#}*tJZeAe0&p-9Mfr|e0aOyZkQW#
zXWxI(IsqH%|8o;D7V3IxG$*AkGOM2)4t(v!p#=>c>9Y#(nUxzz5r4I{GDAyjNCadK
zNqm@Pe=tdJH+X}5V2?5Z2C$RFiYxXTC1V#U21P^Xr=z3?!nUZKO<To-o~P@1_1|3b
z{ViI`QHmwz|Cou^l5r#w0$x7I{@$+Obv$Id<BvT2pg<LHv6f<w#S_#u@O6Vns%y|s
zg9)n;;9LZx=#D%zsv#v8MBuF~yB;uJ5_W6QCP$s;@j#y`@|cux`!18Wv}>PYmE-9P
zvd5Nh<RS`d7}OI&%94w{4@Sg=r9I?&k<Q7TkH)Y(#qECPE8Xu&`1-gwJhCo9b*!na
zvwB`wFlBJ`vCA{uC1w)pZVun@Y)md9-)8u05z^Xk_O;na5C>^EPxO3w2igW~xt}F0
z1UETPlMRBg7ngQaH?&*7jJ4<dDTSgiP|iS)>|eX_M;QDX)^a!Gd_8!JKCHB!7k3b3
zyII=H$-5gthR<-u!ON>EjEqQ)&%~lGLa`Up%!&%znz1TFS?FE#7pAwrzq;)tBnoz)
z8DfNM4k}5q*I`_ae=8D-`xG=vF-jEY{<rljx>G3D?#YJ;(@f1VV#{q#ZaT2RfNv11
z4|9W>3T1h*=DVL9QDbv{gik>`P9xWZz+y%DujMxzsHUu3c=|_HC79oP9q@iU_lOMB
zqZg@9Yn%m*Tt8o{FxqPu7;jRb6;v%=*}m(L$FU!a@Aw1Qi?;G_j5F&`LS3To;Qb~;
zxVROIQrIenwLI06!hTB~o=`%M`&C2lA<ga_RgC{iwMC03yHY4~H5i*qeMXk~U_L{v
z;P96OuCO49IM~Z;2giW^K+RUO5WF*~*l)j-HVTQn&bt@begU6ueOIXHpBK`R3RSQ^
ze|+fv?xwsXmLt!%*b}?QT3shfsvbf)299x$*S5`O9Ew$nGvZ|?Q5l*Ld#83UDs@|i
zF+$qm#}8v1KsO19evd92Ol9xpVl7E8l}Z6tiiO(3QwNnYaqx*QYV^$DQJ##?97su%
za<{MlLUs>7$}L)&Fa}(~g&e9^kN^E_myjY<$MN_<i+u9@4g=mvX4J(f1yU^GKrKTu
z_hKHH#*Jcf-z_tEo-=s6-q*H<CXdrUcUmsEn;dEirmxq?@cXH$-_DKJ-RbNHt|J(9
z{G|(9>e(_BW*eIQgAgAcFIYL#3dB?4_UmcHj`?q7J&=E>aVc>n#XoX6ciryyh9Fz!
zR>&G<^vERSY9$g|c9J@)(ls&;E$X#8@OksS2Xqep6csEQ{=>@pTB?p1Dd3<EwhnFH
z`pN0@qzp2TZ1L%_Y)=+XpnV~i-S=j3cZYur5B}@SbC%%pQuuN#oVz>rP_g@M)a)jc
z45aXaJnyC<%Nf4|V2>At^^>@+@6D{dGdh~Tk7k@a7FuqqniA9(l^SovA4^&O>4_43
zZ_wuv1=x?2*_)@=tqZ6iGcdk%-AaM5MG6d>TJlvk&^!3--rpOcA+G}pPk415vkd&(
z*p}Ql72RYC=BnM%(gA}*Y^Sl7t>+^nq2>NEM~LH}yOGP@)C>;&Xi3<*InDAB@W(tw
zuzd^+vs|TW(=sn^gmA1BYGFR*nk#dU2+g)qZk7zJ@<S~x^WdMK4V(0`tg1qf4k17R
z7}=V9{E-M5{V9&5`txfDtUqkXw0fgp;bf2(Z>?DY!(dq!%;|%z7SA3kbv6qmf)<k1
z(?SaIk9?ars-6V-1Zf#58c)P(bz~@&2L{<C2Q59RGD`-9)%X<x%1b()oU2-{MZ=*1
zg3JoLr94Tf00*nM*?e^Xh#)|xIymSq&F<>6NYJwHfo8<rGKH5ipEpazlP1zf)P`>>
z?3{}!5*f#XDU~&@R_SH8ew1Kt1nRd`Af0fL5A~fXMogNXY@$%(#B8@P)7<L-$!n2n
zCs&rX8!2^?LQZL#FnWB`F2%6ka%)sgne(}cdotqo9|$`D2}|T3e2U}vL$Ev$REnBR
zvO%(OmqKK&S|(FNR$j{JiaxmA&g*xrZe3_lPoz9myw3Bpr)&~@xOWOp{iQ+W{?QFN
zjWRm<%(96Dj2aqb3d{46#_2}ngXbwkNOk{DGQIgP8x?~$j+X~agiI?oXRX}>;3l~N
z`?LlA?rT2wP@b5V?l9p?A#%6Yfooa6liG4K_)6)nmqM9f&cjrira<`{!Q^s$c7|Co
z>`_Fgrd<E|hWt=97>B1&1OEJMt$ua6&tu|O-+keQB3j*gM()^U2TS2%dDZuN<|9uf
zJ(c2bFN6yvj~3W{a_jPMq)8-Pb2L)~KU@+V_X#VD<FlbpEQPuveF$|cq$w<NF)GTs
z0qd9G;=3B6rNA`ca<%IZ8#C}2C)lD~Wz?LM>qKu27?fB}*X~y=ok%(i?(ol{!xIS@
z;rd&^lk6Bp>FMs?%RdKvavz}lt0EJv7E8{zlzzMe${gzQ*0Gh7EsF*94DN84zX8}d
z#B#`feh$hcV5GmdZgTwd5Q$1x3v4evqp{WKY)eb+)>DF4aO|*jBSOIJ^3RxmZ~t!>
zfI`h@e<?4NUz7-I!Xx=2tYssE{3L8h-SU!gHbjnuz%?p-wGLsQ%*G)l9YS}x`AteH
zk(5zFBkD3R>4d0tscAXsg*N6lD^#8bvbT2oe_@bFWQg@7xwozfRJ|?`{+%+k2#QcC
zx(&#au$J+4dV2h;jI87l;gCj+U>rR;_{sfoO<sRazAO920#S$?7-uSqJ6j&@y#0u2
zUubcJpPN&-kIq(@op0@UW~ff$UL#rc_1L{K!(sVT@>0npz2J;)4o`(K!a6mM!>R6b
z40M*7e4UTqnG1##8RO<o{8B$e+ynL2+||-Y<}3yEKkZI&On#DTc&Mpbuy*Ko9<U(v
z_sB!?Fq%p`TpgzW2btw@d#uk@KK$k}^<cT5dqukAi-&S>N+l|%DY+Eo9|<g2Mt?bt
z02VB~?xDnw2*k(QX9BaW2g4d&sy*cjMyP+PWG{!PA#2y2<mtnco??N8274C@D_3p_
zj}sIK$wk5|B$J?pP>fne&ihtAIVTAJgn`1_Nw6O=QxOjrCjmVNC6&GR2@hsD&SdFJ
z?PZG|8p980_Xy<H73|m8Jj|x;0;af7ukFqTs=eIslxT(>evyB!g7y17zwIF--psG)
z0v!9%&aVe`;CSg@%j9g$6~4m47rw<Hxv<n2t*iAmz{Dq8;Y;{qbm_&=T_GB8M6F=s
zj1~GLU<^Rb{fzv^?wDmF_Z~y+MNU`R4+}G@3M}fR;DBL{hg%ACLCITbrW}TAK49yk
z5Nblqmq3N&<Kr?4<LW=7#KB)I33d&#|2?=_Gw{)DRRt6fA(C(ftnN8~bD-UJGo9uT
zko-?5wZu@ltNmGN(LZb>Bo~VpD^?gbRdf~f$&|_fMv&vYt3W8C13NlAE>i)9<b0@2
zCnk{06zD2pG|@k}uX<QRQC`%2to!`ZLD}XzZ2Akb%8#Y%oloR+;T-_;ftL!2QBO)Z
zw2nD&L&xzP^5p!*P^!oLQ1C;*(uE3N%ck?Szxhx!Fp<?-eXu8vSgH_!+~JTu?4On_
zB$ZBR{}v`3Le%A3+Ntomcdqrh%?}=)<g^4(X|aoN-m=awDcl;tk#GLOC9vO(p~`?=
zROs&l8qdJ)@bbXL)M%T#;t)SDZ~3eqOVc5LDmDbZAytu!Q-NC-ogM6IUj31H7g0fi
zrr@UXI8yuB-`n;($m?*C$exm$fECFSdqO~h11`QDnw5IZc30ywYY&80gX#-HQ>s(5
zmeX0d#z9!qz%)Y6Fjvpq{`bB^VnTm5+I{r_@0a!KW99@S!p!l|Qg`ROHJd+anIy)2
z{Ivfo^0r4Ec42Kp(+hv@mH9MW9+;m%SMRijJet9PH%}95fnTZ>neD4fjn#V~eFSq1
zYbXRRaxaJc9z1kfzrAEiRoA^nQS|ER!i56tdDmhx+=hUP^jOSp%6o*nLYvM-X#)pb
zs(BV6FlvGGDAulsD?Jb)l)GVGm=VS5H32$_eKHQ<Q8X1C?z>@t?eT@ekB_s!iFC7X
zhhw<mt@D~p{;qQ|Y-H})(ZZsJH0@M&q(uaMF)+zURCKH|tFdf@4Cv1A{q;;jjjozw
zUsV<xPTqzDHY?gb)RN_fL3^nf-2QF8^wN(1<0nW;-DHuHqQV?cqwM6`*AwZ(4fNQ@
ztdkKA9<^2)6Fklj*pqWtc?)#n@uHY_CC*N#-UPkLh@s1cIIE<*?mSEhsIu_en*U7w
zsY?R*TSO%@KB#X*=iKAhVM5tccEugJ%Cg1oL@!}>F*6(z5My`KgG4IuP`QKB3D!10
z)4iRUiPf(P|9G?vwmR+!<D;Oz{c)N~v1eZ{g!4n`ftEVfhoR{WMUHIV@o0)tVHWJI
zx=$=z$)aO8&vCHm@1$xk!v#`iBl_jmuHL|P9Ho1Qxky>kaZNDaP$q-D`4wlko1v|J
zhN>@)(Rsvyk=WlIC?b31@AXxB<Li8X-K}r2IBSZRN+QQCuV{?4du0xZEqdxq&)jp>
z!e4o8C~0-et65EE*6yM4rTbfD{dV}7pVvf;>TM84$zi6*U6?nE3FIbTm9T<5)6nuR
zN8DXpd~doVX%l&Ykrm&~#Zs{Txa}40`k~HMYhip$Tu0o_Ql{wfaV6E8+eQA~>xSF!
zOnG-=iW=Aax`os9${l@eAGjxy<4o{-vpnqOI^43?CbIZMA4J3fDice&RqB`H#R;aB
z)Oe=W9`m`q>E;c!M8qKu4skS5Jnt9u<GnnKU<v`A`1c1+r!~x>5eM9Lq8H08eHll7
zZ|tR}lNVEW7|d*HVmjw?F!xKCxwfK8$36W0)jtq$J`NX1s@}n>b*`RqKX?7u^PBaP
zY}P`;U9QddEB^iu784x-d|lHI09a%{fzYsmPwGB^f}g<kCbpD5Ql=cD0}0Y*Pakvh
z^UV>Y4;3CXb~B?(HWZgUL_zAffV%MeXOB~QbzD{Frq{9>l&|BFs;ZpYWD%<7q(VpT
zT|COEO<t@0iX^~qU+0m}-gp@dPnSIgq~h195f7b9T(v=D%NUh9T0yzMR#@#RoAXa%
zx#z%qp2dk&cKxb+$mQ%hwMbVWE9}8IMdi?nDiB7^IUfE7=ZpXMb1E2SZr9exPIUP_
zeu9_>HvO|npTjnwxY;Jr4q{}=eo%z^h>Aaqej6{Ant(P0OXenqzmd%o51&VV@&3&j
z#S%B%pR|QFgJddrg{@(~u+!H%xTuq;^h0FnL1aO+BQcRvrl3cqY2W5UjAXGTj}bC|
zIXII4VJ!Pv*wpvB=aMhb(z<|rELOV@0yPw`W3l*-IY^|FZ!KbTF&v7~7puPKl-9gz
z^J)B6?;|aad={eV$#@=Bk%Ak>Lj=g}Tsz~9s!%v7xu-)EgWYfa$Y*e7du3L3t0OTw
zD%)YOP%Ji>0U!EBzsl0gs{!=tJ>YzGEL3v;Q~I2B5V{jd@rF4yFHb>Z2F+tgG?-+B
zM^Wb=;cfpCto-F%8ooF-?LFooNR5zF#j(*>)buN6N>1@iWKC=+o6QzRraVH&SXy&d
z)v!h8t_1ve;aCl}o7L#8^AWm^vWqx5HTeD0O9!uS$ZF|Flx6B>p7LRL`B5;n#o8rU
z<^Et;P@Lu^OCiN_Ypi-l<swg6-sSIv{x^&2Ohi)`?KUwY6^zTB?H7yiE4BFIPOL6+
zmz%(ogt4Rp18XN_D1RZpu)Zx9m<d1O;Cqnl-a}ICkmqTPF@I|JjL;G2n3rn$S3IT$
zM6N6!Ba99udZ<mtTo~B#^jO)Z_{#)H-G8H=iC^4QjlAivXo~@cRd^QDJK^|42rEj{
z@I=@l!D|Qwid;*+bU#(IX;>vnN;wdsD&%o8M+@4pIQzh{B!cygq*F~(MuV<?TDlZ=
zxsDAv>CEOKnNI!8j&eTU58&DygiE`q-TzW08$D?dmHP&JFwtiC^DF=HmT}?VHsu3J
zvccncgP$(jI(xsDP-Ruy2ryRn-v_<d4{~qHgWc+~e7uY<mr6~xQGIC$!S2-N3B4@F
z-g%(E3Y}mo--C`}*%L;c4M*9ii+@FX*|yJm3KPWNSPBT1$sOhurLb7tl-Z5gKHJuQ
zO9*15mMa!se_$ItLtV$RGs(O3-v4$nnS&A{jUMRlR(Qw$@{3ZONN%&gVCbvTfN5A$
z^^FcD)^KP$4}o9RT`<crlcb;a=We+i`^x^UUv&)r*zYs()&29SSrKXni7ez$lv!-I
zl2%xut-hS681^rr)gZ-+qy^zH#zm*_Z_ab<AO04KM+NY;uBMi~e$d4ub;U`YcUwNJ
z+wSK_zmhT<1oJkhS~!1Nq{>W%N5Z=@l}Zt$x>3CfZv2EeuP6D`v~v9=eCK9QVy5ar
zvz*B-x1Oxjm7?a<6itVXB3a;js&fjMZV0qWoL%;{Uz70~Y;{jv-8I}xWy#3ceer$K
zdV_hWMh&{`xLTdQ_sIA&yv53fgcHotN6tVabE;upc+a0j1xq~!!C@DH3O(cWWx|yC
zf+zb_^VII5=%_BLtNmG0MN0>{0q{3fkDwZ9+#Ss^fzPHgR-R_XMjd1k+TL&bYVF2f
zdm8N8c#FPWI{*Z=v_`AGrN}vYqc%dVV2yr7EiF45XK?oG(GwhYH_ecMm(J9?iFGHy
zuJ#rym^KDKV_{^@M)JShn>CJV7{vXO31mcOj!zyQ9UgohWo8XlCe*u1Lw;L%sODir
zz#0TRJ_VC#(kb$|K4_|*p(!kzdi2OL?3(Kv|2w^>#saX_iNV}Om>_Z2&R0!q*4F@~
zfo)uBkzyX}Cy`@|<>i8KFD)=uses@MRV9@kD|6E1y=eOf?32qA;p}1SeT|^<Z`Ez;
zxII~8h|cn?6ojg47>x+5%t3zCnUOIH(dx_){koG)wPjo|rhFYY{7b<L)wLE5)KC%;
ziaKzf@%Www`I?JOmq9|XZk4PW*@M{`Q{!TUv^TFafTBc6LBp=<y8DsUutu4ld|5vW
zKA-Fkb=EV>q1+Rge9Na@vo{;!88agWY<X>u0KG$O9@kL-emd+G_s91cu*-Axmem$k
zpPn%*{D|vFQPEWxBSYmPhEV95>jYtx_QTy+wsNs(k~98o@g{ivhEJu!>h(DyHlB4Q
z=8aJ79rloLG->`qn9kq%$km;&s+(!m#mtDJ)W6eCK}yB9wpbTjJ+f9)Uoy%bsqVi8
zLN-61;VoAnCSnjwdV8}J+Qw=^o7vvvD;u|Q$FFO;$`yfru5b&DVl0~ZfzQlL6*x@a
zM>ZDbc`Rb|Q3CND%f1NWCoV6Sp6-x&ge!fxV8(~SB5RF4vq-LO8(q}QbCIy*7!uw0
zqGqx(l<fs`V`d>rh^Di}_t$3e(LCqh4_b^Qt_){XTM=RvT#J*hMEaDNgPLp;%b$nE
zutebOqTHw}IH>dLDroW|dmElN+R7o3UkQLwh*dJ;Gvbx>5l~+lhcdf2Z}L4fEdSQy
zAQR<K4Sy}^u{8L7_t%2TWv>2@<d8n*XKrALnY_BbBn;zJ6YnnYac!HR+mTB+U^3u{
z=>{veg|*KPBW5W@l)L*81K8mBJBV!x)pn#@!=GN4qPWP4Vd3r{BZ~fr%cDiOU-}D;
zdLGIIGuR@Y99Al?8IF<*xyWE+5uE4WelM6cmMIfvT#2sPFy)YCPG-R_3nuTnL(Xe^
z^8=?tQxP2a^E#V5)-Me^XpM>^m!hr38+5843G|3$A6a62)ngwj$I`U?Eh)OA%RWhj
zJpt_ky3J)c&H!5tlpKBx@cg!vPti6Hzq_H-9rS=Ver$QN1dA>EiwL%mVA>erh)|wj
zM+k6<MaaMT7yB!VN8Oceg32RbQ(joaHXnQ^=I9tL?Mam>>5BWtcLLel2Aqf~7*d$E
z@Ta?f1F;22Y$P^r$Rsix0}>Ahzi>IZvF$I%8I;Zg-8Y}qJPWQsQ*8SGuE<h6>D(UL
zG!#b+QyewfDk?60CP4lcdodM0OL@&vf>lINO-<WM&mt<-H{k1MAHft<jmojfEw&eT
zK5b`6s*(dOmP~x+8tCwd5!Utvca?jIlgI=k8r0Vii}S}h##mp*WJ9d~*0CE?Sm+@O
z$gdx6=*C2y$BCinOS)Xp3>E*CsM1tZ`H;0p3OAjBYppFYL^&Iy3q!8XQFk6$YP)D_
zSFJ=$Ly5-=uj{WF-_LEa6t%rKE*mLwvy%68O@7W%%E;m@|C~dgDS415jQXkaEFc3%
ziu73uhEyLQ<Cmea_{ztNu|><yo1HT(Ij`Iqar_`VS@5Ax@AbZx4|^A<{8Di9f6(Lm
zRVp{AJf=o?hs#4QnhaO$@_@FA!3_D@h@!gwP&!e(iLJ^7k)gox6ky+h0v_ivd)r&7
zN-e!F8>8)uGTo4UeUTyw{T$=l7i+}t><w=nr|lz2<W;2;CLqyD>N9MgUaWky6my)X
z$xULM4i!uPQ-Xd#N8r{2mu1aAH|q%yfP4FAJkZ*Zwc3`+P?%!jp~_&j99Wpae;BWq
zJQ_e$y8II{cdG-YcIGeOcrkFDBW`E0rkbpiyG3ds(pE3Lc#2pA34M!`S>5JJXGwnH
zx=J5U?6rc$4pz}@V#_5Yf)BbVx=AWq?5DM!9eK}PGmYu3;j9jhQSJR&-K5+S0GvH(
z6MsEFLj09Q@b=}H_obfoUrBIDl2TY=NwVvF>`!ZTqX8%*2q)dDm&bbTv)lSyEt8kz
zsG{*cG)yN5I_@sCU(j{s6akJg_N=~siM8QlZ*B<^g}OS%{o=z#Li=7#RX+S^PFO&X
zzAA@A#Cb)pFei!E0F=6d{y7IFK4;-$>D!dHsL!zeL@HXn2GQB)MZ;UdJ%@}}q&L4l
zfc77TX^vBEDKLb^8q<M!Ws28@@%s=5O$N9p+F+_UqHRq!70moD>M1+*(%M^s9c79%
zRoB>gX{Y5}!Ce2;>;G&dfiR3dlxy##_veYOZ~;e`hqvt76jg0w_t`UpR-4WOHbIKG
zRC3C-guHma^?EpR?QfZxmEXnE;POJ=5a@lvF(l1Q2EGi|!m1<cQ!OT5$;5m?jzn~6
z(arcaQTc}9Dm9e9I6l%gk(z#oYb}sk)xCBSEac0@14VdKto$%lRORS<Z=b1Q(LI2T
zQ>E}=5LkLC3fUMw4VJou&r@uEW9VE!QQ4u!qwFRQEh{dVQ)PdIu;MwqLW!5vh$}eQ
zoXnLQ<b{#whZYj41-iCN<}xQIr&8an-ZF6T8d4M6OH=g$<EgxA*%ew5P6UsNkSxc#
zF0=yD0d{7^Gpr{Mdu{KT!4YMP>HDjysV=rQ7Lra%T1HOdj~D+GCx&o6>i7XQADS!s
zb9*-4#g!&q`ovT@ei*t}g3X!%q}^0FaraZ1VdGSfD$fMh5g<i}b(^*#%t=Y@d!j07
zi(+S+Rvf>jJMR#%?}W();ac;3yo1f((AcUcwE^o;71*##ysXnBZ++nrYcb{FRh;B;
zh1JXT-qh_mAbWwBCUbG98ff3cZ<q6i;8oAq8%72o1FkeTkB1##!J+l{lm61{M>p#Z
zQ|;pr=X*j-i;S0av0J-O6@1eWR@Wc*QQw&nim3?mk=W6k+qstXP0G8f&#)2vM<G2}
zDVx6*vX3tUbeq5qK_jQ$|5$wp20jMneb)Qa9X!l|tcC6Is9U|WPdc{kKUW8uw)_wJ
zy~{G@=gY}P9%3CFTyE5ZaVR=sTRfM4mOvM7JU=okyF02%_>{6e<>_zW=6fr~5`Xf1
z6<;(t#er{*C0=az@KybDu;RCIYx8NJ7cciLhmNInQ&#~pkhUglbR5r*MhU*dyvFCN
zj_%o~@(80})XFS}Bm8wdJkkE>$jbp0s{`i6|4f>iOJ|rlsYlS|wa=fwzD*Y@Z0Yq%
zgk)4&i(*;s)lC08d%QzgwDVBVc5zs}*IJNQ4N#qLWCZ46uMFE%?-whWZ2O6PS(WTP
zToDG1p;G}^y=Wc0ESGB?YK>uoju0j<csfHKO`;bVt*v*0o~`AreqUq=im`BaCRv(f
zVv<4f3dqZ|DEJuj)x@6X{a<_E9S&C$_N`leg|K?rL<v!XXln_pq-fy@k?2VfA!_uR
z#p)3eL@z-e5=4pKcM&Z}LUdM(x~yK`gCyVceE)yf^<CHd>|f{XnRCyanS1V;`~LlA
zW@P8OuFS`!!_}L3N8m7;6a4|4bYQ%lAfxg-DYA|Y5rq0GM>O_$s^+OvAiW=QYwH2D
zAR%jM7VYShd`s-IZ!5P${_tC|u;fS`t3GlZMnZ%a{F!tF!hmmeFT#HfuyAG1s#qKB
zexQ^WLK<@`Pfm9FE?9a_myRa-sLX|(n{;vuL0{2KAJ^dMqtNw<Uv^B<(PV94yXNI=
zxHwYzS^J`*wL9w2T#(MsCHbS0ecjm<3($1=6aJmNZ7uuz6TLUN=+B&NiH`~a_MBQ>
zcqQ`X&Wr;>GN@0CSMppLYEf`f+=Pke*tzvq<jC6EyFo)Mm18g0sbv>hW-T>tqbVKs
z%NnDk3zuF%H3?-&uGlbT-xD*XCa8JYujxWalSQoBpJ(d;uUUi`iB*|BNEa|skJ`*K
zO;vf^TH$^%B~XKmnju?$iEdTl9es-IH~+5@fPV2`3Ji2(3~a7Go|q0oN5sS$t#6xu
zG0}3Dha4K74zNJE;mQEngX=CRga;U1(+la923IL#_GY8B^}2n!KdJAWJ9mV8b<vT1
zaKy!Ba78a9Y@pmHVSTk7-zpImK+q#&a;!Tki?L3BQR5LuKY-eCHW0Z$-xFh}-@*S^
zmMKp8RrJLJxYH^_k650WVH-R4<%ay>m-)rMvJP~PWp!8&-IIu-qvoH36$knYDiNV&
z3F1yp#b!$zJ3bE}jB0P|I((dbj^xJ|^G}rnP+B)SAo}3eV<g9Ls=~_t&TZQ%@RuZ)
z=n^1PzK{ENn6%w|=Noaa`oYIxZMV<{r~ULqxxQ?ljGSJ!Q>as)<YabtrgA4;K`mX@
zv3Q{BljWb}fG(bR-awkYb3m3pHd5^2zYFo_&GdM{NuPh%@azmf`13#T;{44M#^Kv<
z4u4epm$(ycIUx(j6AlAA&i$WkPA}6%Pq6p+JI%#^QvWH3XCk0+CS*^x|C!C{Hw4rn
zfMzr`qG{#*llr&h`G+Sailu1u7r6iX|NloHCRP-`|H<oj)!8!y0K+kJu4szT2j6`=
z$IYQ{Q|o0y=$(wL@U><&=EMEXYR#<m;@@91Vh<G7ew%W~`%Hq8DE*+fw|4R4<GsLv
zjsX#7b2@=KiS3vjj{?XQGaXTdZ}wiX4exGRg=fua=crS&$z&%;dMB%;jFH%np9o#K
z4G3K63vx9&%i`3X%!z;)9L$wHW%SbGVrny1GQ$=dqle}1yiM$6Q7GGKZ?X!{ASNFt
zm2jp!eak@zXyuByQlHmn?KQ!4uE7%KJUu;C7mAl68Bt!T-OZDTS%`_0gObsNmqy#x
z?#k@HKGCj#>Q_LcRlAs{oV`0zOH!UPXi!sz?Vp-POQ55fV1Eg7DCTyxYq4L=>FPPe
zb@PZ79XD9Cq-WSPG?UQ?3U4~h6{JApPBb|FM1ybUPa6JeL=Ntv?aoPyj!*?OIzK+V
zBwn=CE5xGM7~$4Q3Xrwy-5)F{*whg3ZHkg@aXGX`j0T+Yu$9Jn0R3An2!fvahlCWR
zH~n=S!q6%8PU2xL9+VE%4J#k1z{kX76)SE(KFV>NG{&c7;6v_3jgX&+n7>CNW3kfk
z!x9}QV?rAv{<sa5hk%zu7<t+vhu+EruN=&Tqu=5*uyJ+g{GvJg^dmUru8gkRt=TzF
zkF-zWcCo7UJN4Ifi|h}+=tfrM@56fr{bn`fj-udd)SP#20W&g%yO2o7l}KJse$mv(
z@j6W(Z5Hu5>#&i<sB&A~u;am?Sab|{E^!hGLUTz!(Vx0om?jb5!yI2|a(&53>Nqir
z@8X^NJtJ-@ays`boCHVVva<>R(|cog(z!L9gMT}hfdGOBYRyQMv?z*WvSm>G5<9?1
znAjH7#LCxdZO$6_MjtwgZ85h(9$`AIrY9z6I_&pSip}QR_QMTe;|#&kf@G%S@yr%u
z1snstk0O%wBSIAnhsBb`>MiHA)!_<W-bw{sZHCzIJt4y{0-hUv&lq90RCM2RcRWyD
z$@NRxe=|2Ldq1q~5$$tqb})sbi{;i7Ls#+fQcP(#F5$am#^iQX7S|8D0_npwX+a`(
z()R7F+Gk5m?<9R8UmzWWJkVi<8!u}Cc-%F6W|bE|-?@EZbV>2dj`V=74@^CL9-(Lv
zr$)^4O+y@*81R1t;iL8CgUrW3IBxf93o}J4=rUq^{dzcM(+k_^M3o6|CiTAB>bZQG
zq$49x+iV)Ym9UV>o7yW8l<MK1+<fmW!B~{9BB<=#8Q*6G9^y;5><wVtF!)e)j-i{2
zmm{y!L?LoMgN9v9Y;?aNn-uL_!U@dW(-$9G-XCWlx?Lbw1V`fDfoHmSt&~uj7|*8>
zo9|fYkdBs!X7we2X0$hG^hBXpI`lq?(IXj`h6#)Ac|k!xzpoQX`%2Ttg{DW&Mb&Qx
zjcHauResg$g)hJCA4~*K;fdLrD;zEvHxo>#$?Ob4hx@D`MAoQ&>8v{q<N&+eZ_bZ<
z-mhxD^6K4^6~Dp5hs6pDG}*2e?8PhLtz9CiDZ6IkA7X=(4weo+i@U8ZA5{&yc)K;O
zdT^NEqHq2Q<!1tLzM=%F$4+%`XErA)EzyOaYSJPYmkNc}BqWeWX~N!oEMTA(<hE9-
z9uNdTmwT8LO<^)N<~O;Dc9$B0OXIa#@uEeTfo*`$)3`}(9NTQRS?dwauL9vPe=&G|
zu|{s|^J~Mol49vt?z%BLFH#fHZj;`}g-hWZkprLnZnMKfVrGmkElB%yZcLHmQ#G6?
z_VF`~nl`Iq<Xh6gBHulG2NN&j+v+8I9=duPh)Vg*S@_bS-8SMXqs#ZAX1&acE=ENi
zaJ%!&_LxhWFZJ%B-F!5b^tL$1@o{?bK;Nx+I`Hl}8sOq<VP2OQh%gRJRj0C9K8)^R
zlepYfTkUmm``0i$B6nh?Ic!f|@^o!*gYDr^IbFEhGar`J_M__?yc4Y<<ZM05tI92f
z@>NiZ-9lPBk)zpE10y6oLxXLY0GeUfbfEq(cFGJ1?mb!NF-_!V5|1y~9%RN#3dXm_
zO0OFRr0?{Dolz)H8Yq$a=rT?36)D7zG+}o+<oAN9&bN3Tqk4_0rvtB_x4ZYIetAEj
zxH?&R-1VJ~a`ro;$>3@Tu3GW$h2|Nok8POZ(q5*!Wh*~AN^d`0kxE<>sZ_ZP(mq@q
zhTkBv)d6K*1kK&;h^;W@8Ua6X_ekt`hYLK`raNfYj3I;=xv!3bCs$iaa4S*NguarH
zMte<^4~YPV0>MR7p3D2#d^u*hJqhM%tru1?Q9@4~!eseD-2x{~^VAJ0DvqCKsUO*B
zwa@`sz<O;`l!dvdo=TfMs~J#CI7TD|BWL-`j`(?<0CR=*J6K@0>0FA9R~AqN^Kvxz
zGLuX5LC-1sZce^$H(Vbq^?G_`$zgiZRM?}~9qL}hC&tP)cBEGvF9zneUweZ0Eg|H~
z6!^gA4C$>Lw5lIDFeyOqF%sgemj<k?M6{jJZMcrE)g1Ul1X%6M%SYl@wuFNzS;?rs
zCvIY_8+N#;p^SFTy~Z}2UmrK56DfvWwU}tL^X$)_DtukX?zP-(xLDXX40^PM?!kIB
z3yssSG|oH2c%4yOGAxS?BftWsm(@24L9TUF$E^ePm$p*mUXFF>GD#b|AJRp5K|BY0
z3S_BGP_AZm5GfNHvWS$ceoGOhb7V+I0u?UXjmNmG<A>sN^)y)0UZ#z9w`438oiUu#
zk}LW9#2(b=ERZRWI^}ecM-F714P??F9M`TpFFikMn?F}n$d}zBNzAl`HgG+4%{lhP
z5C`Wq5=wJC=xxTunCI40sm8f<7qy{dstBTt{%EaQX=EoAx_?sFG$39a-s}}+ty0iM
zO(!;0R34Lw+s-$=N#s2?Z-X`!_7SJx!UVZDCVlR;sm3OTD2r`IA15h3^8{6FHD}^W
zP*>eusfZj^-YkxfZP!i(gi_s3kj&ViQU=qr*6rcSrz0_LpYJXsb?3JBwxYv<wN4i%
zcRnYppHoz>N@P$YY#RF%tb^Xap|MxXFk60Z0Y=q$ebX<3o#Z~WY673Nt9^b$-fkNC
ziqoIm)7%}knkHFqDE{zzjflpgato>LPOf7VjCW&lNBGzwtYJdz_H?k>p<K<7B&O^#
zk~?)eO~mu6#|&4}GgJ2va=x{28O-xK>!pI%`q3lW>LzY!a{34Lwx-&)hzj^3Dwi|3
zGf9IYLP%c4%#zzefxfM#)g;5bWx^<e(Y9%)acs)BW)b<V#L6`F`PyR_h;dYoMi@E2
zsBn(7=B>c3THFI{7oYc0ug!M$JZNvqgygafB!U5YJ~%vWbboaEM=+a-Zyo<ryW`TG
zD-o(7*9e1g3X_867LBAyx!Y28p+13ae6^PL-s(<|Z@p3J3=+pHv<DMxUE=lj&W<{m
z>5K1Uorp~1$V_W{=^SHE?6opk>qG<cwGyteP|Bd!EOu#1mMq-BZ2F1urCvuUw=6P>
zhGft^@{ZntYevZyT{Yz#dWGq!vx*jn_ucoUSL5vqnnk;<_|+Wm+n5w#cfIMZ6A!sR
zF{n|z6qS=aeDS%iN6nGQ>9qP&s{gk~_6p8v0>JG=IX(C4K`j`BQiytWPuBJNIr14o
zo`%$<U7fvXzYkc&oi+dOwpq&edvP1QhH0t0O4q^&0t3`&*QiQ3wVDFz*IuN73Z3m#
z+z-Vus*o)l&H-v|6;&hqAlY#;g`Lx4b}Fvpdg;sYvBYvd<nZ4bw&@B?WZ`$EObo_M
z#UI+hEHx|;p32J-VBK&`m+<Ql+yx)*IWK2XyJw)$pvlTEJ8cxs)6U`e+I4|-7S4yT
zVUSi$9q2|2J}p>By$Jdh)iNI%oag&+1&YS<9GPq0w1qEbTu|C&3y7d6ju}bBa4Pvj
zyD8*N;U13SPd7G_s+6WB)cZu+2Kf6X@nW40j23oT(Xgix1P4clI4!7JE5cVkIOc&2
zg_>TWy8V})S==o2@6b9!re4l6TLeu+P;oHGl$Q#nB_NHFu|eSFpkKvjryZvkS3<W@
znHlsCiAp@}fb%a&2E@1g%68PUDJ=b4n;XM0ZnP=}TKVsmV_7+urM5;^pMAIyd@<s2
zv|0;kkDzpfR}X@+tyzyLgz%yAl{%a(o|`vB?J>2j{xB+P#~cySP!FsBvv_1rB!F!t
zuufi0{fuR&phOT5V31&8g$n#RNuMldp*)((ucmtywv9YwcwM*Il8QU%vYpxO;Jh!#
zQ|R%tLiRlggNa59J_E(XJ;Kp=Zx~1Y6jmj{!l*{~^wMlFbDfE0&5!;r1rQ&?Se>mG
z>;RE^;Qoe7xww21eUZ{^G=?MeJkN-`iF2NU8YQd=_4Nr(V7t+~H7<-Vl{VvEVMfPC
zNo=Ba@PzQ35w=p5{ZW8nVf2TZkogA(Wi-Vw`Pr^F&8Qk*YRQy$Xn#TiOWNR!-sd66
zcn>up!q3j;m9UoS5U={{fhl0u?;n?R3pvIUG(wb0AFXxGWhZc}bu4$zI15$<ZsSt1
zwIA$?F23>KW6m}O$LZL6E8fwn<o{OIfI~=LvwKeE6H9ijlq%>zEP2}JWud5_I*QMb
zg=g;vL2TjVdCML)`XHrdnLvYjll=1=n;$ZQTYoaz+`a%+fno_`_z{{#@y_)#Yflv`
z6;%&#J_6De3S4CHvo#PSl_Z{+T8Fvr@t6~@G>@8)<eU_NNJztk;&l7951X%En}aVU
zvnhvu*(_%bn#BnZ*vg&<PE)&xcx0#I00c>(rm1>l3sNL7*)>UwvoPhMYiSIVe_n1(
zlCk#48jCV;2(l!}^1JZ4m)u%UTNEqe#kSNk<Munou%7rXpBaPi8F!w{^my*YIYN<(
zWlrX8`a4Bqs&+N%*W|)P`+{3c(sxX<u0ose68xD64HcVwo>UgEyLsQMQ<uMahLqL4
zv;vrw%jeyj?^=DY?v)@%SIwwhYuIA7q3}5VZXz$(N9$y}k`FCua~p9-L$1B2WVI1N
zu1a5-HEXl*opH4qlgNAlja+56;am-A3|@^siz=;f5^WyeoLEUrlQ<ji7D;f1v%qPv
zJb~a9yRwfctVz>A_0SL%7vFXocEkD}^y$%f?Qt3_oKjm*^|SS^Kxr^@JUqP*-ju3#
zBoVh?!d&WdcQ0;nUBW(@Ovmdlytv==W;0pO6%#v5yh{GPaouAMUgCuyvw`|5uhm%r
z<jUslWBaD{Q0|PFtG7ihc*jF!IGDzs!3H3?FPULY8*HI>Fr%Ui%B2Gui`<u<t09PO
zHJAOJnyI36BP1zUb<ahzHoaLhzBL|@&x2|vI3G;)J#mjE#b!yG_u7I~gam}i{f--}
zAS1&0i$+(wu-p*8nmncI(ao>)z^)L`$?fRH@u;Ryu3VS%nOAnkgFSU=IDCQ!PLa5V
zWqu$sxK$VcJqdX@+yrqO?*6p4O*fG9+}9i^8(<E+ysyZwYNV{*9M#^sYMmuu+U=2h
z$wwWZv_?4)=0b8o_gqq@FA*78CWDiJG(QFR<NPtF&BJn;R|>tjn*f|)_qtpzqK6N$
zOx33^P}l04d(?2y7LuDo5UHSai71Uh!C!}OG|Qx!N=p~B%)hNV8lceb&>%y<fnY3U
zM(Y&zl#ewlG0%pVi`Z;S^f5YF(hP;|wGYIZhWe(P3B-_OLmZk&)EI7u$;?b;$)E#R
z3ANQPgC9Sc&Wm#5`ZdJ-n}He)<~FT5;95?hI9$oOYU_3|^Tk$6BwgvAwlu=Zm)3?5
zmDv52xed!hcLYpy`{`{FMBHy)quYt~V{!?&f6^xprwXCx_W$0xG1;(X1nj}hVZJnT
z_+zZr&L^s<RYHqiDMG3c6Z3pqJ0Y#_8hDkRqf$r<o&K6wU2#_V`3!s;nK3si;9YSQ
zDTdAbKoqwnE=kQQ#vRnJXY7Y99-SGs-(Q^(h!-+v<lf5=qTy4#k9#0z<lJ1G($4+y
zGBq#c>m5>qz9%xC3?d3;_Qou^+ow@2rGb+;2CMYy8CRU1+bSv3MbhboY)--ZJKYqV
zEFR6fW92J97p&Ybm-zFj`s*XrHp!~?s42@HJ}1j%o(6AqZ-f}UlK8rIr5WGDT>k>8
zW4Gf9*UXUcaoZe<n$B@6TkRfe<ut!czXMX+0#E*oG@|X|ry-8^(WbZ&CIW{a))5ij
z%%(6oygb?43UQHYB6!1ldG<$MLcPFkqJ_7lMaM_`7`Hz0a7cKa{A%$7jl9uV#vhBe
zkxl-PLu)Hu&FB3LRYPLQy46HIimhI^JFsr@iZ@%0oN5I45t3Z*WODMOalpCSfOV_T
z1OkC0d^q?Wz!7hF&!-e~<x+ZV)~&XUD6l%HTrH#7JC)7q%|L!#s^aR3kcF)^qlii=
zH|KVm0>A{lwP^oIdQ|bP&HdhbKTvjpMCH=*dBvKavx|N&$oxYRU@NMP4|b<j-?s>5
z%w@}M+-XjTp<zY1CfBCMj^FE9yj4FPZ%M)v!l}IxN@c~$N+gpbqE2FFovC50Eww&0
zK6rE;bliyUSvj<qqkRb?y-hf{ssi0JoA>7tq~uW#eU(;wH7asCoBG3C!nG*60x2Q~
zAA{QE8LQ2WRfvfUE2B#1jBR|siIw8B*0#VHS}Y}o6?t5LyfpU{q@8JrDw=pj|I6s#
zB^fHLa<=Mf?LC{k6BB`0n%o6P)J3-HWNedh^PV)~b(5YmYmSb0<V^IU9_QO}Xo|MQ
z;VbJ>HD>daTd341m8%p1vijQ>_m(B-quo6fsS3TBUX~4f-B03m5#p1c3xvJ|u|0i-
z?Sgzlf)Cawa*{9sYusEN!Q0iT6+^y6mW^Alc}DVlzpUTcBaLA>9`AEH416ukdZ4UZ
zxo)%+>00pcjmMnG<Kynt?Ty7wP)b^#B>X)zqF%1_-M7JYiF%m|ah7awB2{arhWYkx
z38wI&#bzPz=Lvx2m^1Q>T8jNpLq?I5_+7BJ4~XRQc!;MOf#+Kz_@c`5%?7z#;TLj6
zB^!q}eh;Jz-JDmYkJ|VAyhi;Iuhe~yB8A@g3Du8V_rPR4%#DaY9KvLr->B3E)7$i~
zjiO`l{C%w(A%ru2`wPr5>qYtBE*G4qmbLM}lVtyOfo%LN4h+B9fbxe|OVXYYaFlu&
z4B<Aqaz@nj7>~7l+5+vdnsr@Iq^e)hT+);S>UpE?P85D@E;`Y~O$<3`C9bS-97p!o
zc(jQkEA6!#$7P&1Y7&r6&<|k#i1067shSs>{BhH!HBPdBspPh?o$nOa>I~;~aK9u!
zl!_v<Vt*gp`Ud9s_jkRGCl5euv!1&P-=;?5s01SpMn_EnLhJdy5Gk7L(GaHdKj~j|
z2C&;;I&?#xs|c)*b?cFb(PhC2e6o+4gnX;6O)6zx$wO#E@23a^WxRz>_mR^a^)i~c
zIW3rfltqq6hkVMGQcmEpkgYXq-}!NQY-e3OJfcKb?pmdV&mM<sQZpTE#M^_bwvC*_
z4Buu26Lwt19z`-mCyiQ2n$zhNL@T?vf6a|b&?!i$DqW!<W>)@c1tlMNmc2rdxn)*B
z!<$e`#KmjAz+wlHUreN;n5}fU_0XO%=mK?W)2offqX(mY0B2d>k~=pcnWmXM_}x$z
zOGga<{b6g`0>4>P5qM&2j44HL4~^x`+A?qJ^{J^?pT%=leZ0QahuEpNKZGo5vh;k2
zx4POjXe?+9p|`m(nrtamGu2fh)OWM6^4BsthcqIgbJ}Fj@q%&W*c)(G$>{boB%?wC
zM7>jO?S|3eczYU+c8Mo2@6~Iz?C|U4qAhL{B0^$fEcca_bU_iHCs1!%v#iH~5ZvR7
zWVkBcBKSx(Ul6x+w2)Jw$`|MFURu&hl6JDi^5?rdb|>5q+uw01l)jshTTusF=yTsD
z3@DLk!qI<6Tz(Q2_{211@bE&|#(Q{8nbJJ0KfUc9-f-bKcFpn0RAYj?MQ|Ox2P}kr
z{hNAujt22#0`Obh`iOd;ZFgl3WTMfz^(A@SzFQjHkX_EJCLP6!-RFf(=q2$n;(6Z(
z6xl>EA~d4uqBl^DD)$f;VV*J-JRX*l$&rGV(7izD_Bwu{hnI3uRgx%%;Hz-Me9`{b
zj0=0XDGS6k4H1Yu)Mm%dksZ70<}>z^G9aCkVX0LW;%CAi6^D>?Hi6lyRWqq^d<UuA
zs{7FE{&`g|oDkZUYSz3XcH;uE4h(C(B)!#j;#G`o{G2q-nP687zYopa{V|?XyW3dz
z?VW{UtE`1E4<)gASdplysjqL?EUFCVedO-Ri6(ltQ-76ODce<twEm#v;%ry)n$sMX
zR-D={B9DRExK+j7(y+k+!?}9}DdF{E!~;_c!~+(ikIT8y=H3t$L&e!n_`U$O%JldC
ziCYNT;E?+Ufs3>)sTPr2!GuA<#RS;<sY0v8+G0g7veKY;Mbzf~oaHd6QvQl4wHqyi
zhVp}YRMWs|Z=urrak6G4Sraqedi(uu2a~8*lY^>D@S;gC$Bm};JSqo1RVG|L4Fohe
zx7s4}V;Dk_ns%u3H`kYF(XwCDPk|GxByYy4=mhns(k6JiUeFsGYpor~S!jdWbX5o6
z81DC*)~3=P2V7W@)HiENsMk4n=+GS+s;;mh&?398zk33siCqMtWXnZPCnOE&Pz5dB
zY%k6TYW8`|yM<&bNz5L(Rw;Is`vF+ds~eH61R>{(gxrHkID7oPF%}ng43dN$=p*Lx
zuC{!u%Tq5}?d)}7p9lqiKv2M#dm0Fo4L$C@g1&Yav0#k}PtUa{$QWQ}+qs4Fd@@vf
zo#dRj|3E6vx#hyG1PSHM=im{P9xsPkpg_w`fIk;kF5QFF_YJ0g#Nx6%dpDG&FxRSx
zda4<f@pTmVFy^NHjyVXS*aA1%UAH~ek1^HSpVhZ!dBL(jCvL&gY<DWpO|kLFh+|?0
zN={VBQc~mFX5n0<^9K9m97J%?bV=$q0yOORa3u@<62+8vezV|k4sv6P6SfpV-gEc^
z!e#k}nf?-l4cI(I%=w{Kc7<8QBxj3rEmsA=c9dQw4V&r}UA!v01)`_mhkhi?B2ouk
zVXmV~e!MpS)hoQj9NEa--?{ks3alvP$0BSWYZg8ET;tq_#xE}@|5B^3)Zp>)29ICd
zq9>#MfIUyl;RDvZhLy*!q!wCGx8AF}S!B-jXf}}?NYPs=c7t@`)flkfl~1=@=&FJj
z+Y!Jc*6g{pjhU^0c!99z_Fu{IWVeA;pVJ3v5N5Kjq{-B~dvt%6B;P9fr719?!zoh?
z#NX}|AJY*hLfs9+^H74M`GgY#1NAx7U3iRGgY-;qY^N69eBzGMSDvwf5WImB8Xf09
zGKA%OM|rPM(+Mgg!OxmH=x?aR@>d8(Qs}DI`MI$MlVRfeX~0$+q0DiaK?vH?8B!~6
z)HCH3dgC9>;Y#XXo94WW4$IqAiTB?Y&+YQ!WIT(?H-+~2vy|@jbZ?81N07VQ(r*<o
zb9!S^)B1Ifx)!frP+D}oRA}Y<Ox@&eYl{r>qW2`JWhTAMMS|`bBk~zIp3}MoRD9nS
z*0x<z_>OB$^q!)I8iYissj9rVUgO;$V=o^Bi3u^E?uoB~<Pvw@jBkq9AjJ5<B0vzN
z*zLx|w3_ZYi_0DFZNA`2-4cj(p$5>8ndQ9(-6gB@uGyo>wJsT@x%L}3vRiOF@NeZc
zJ&8hI$kp3;3Yr2!v`WYYwVC~i)++j-#-m2=Yphg(0N#<~qJ1<Tq9(=k`Ea-T)YNZi
z0v&X3wo2yGZ+unmI=AXQgipAsorfrL>D!c_$x$q$<Ci=(<obA_?`0NRaKEDQ#;var
z?nS*bb-zIB3R@7Q$8|vXEyFMPPd^D*b_GOziQzoA8QQQ<^Cx?|gT&Twu_6|~m?QcD
z{>Pa7rc3hbzi?Sn(EV_StqyvO78G9${SnPrmld<GD7&Eedl!knPI!})`Ah7lTree~
z^V~{@peW~TUC0X~!s+h=ww13N-pCO8m-;`9Wy-dQ+x)Ppa3;H9RIP!P&}}$Oj_X%u
zK@<)fqoP-j#ZwZLdRtf=5tAb_-7#5|g0mWbc}M-kekIE!+}T&hr`^a^&>{J97T7tL
zM+Ct3e;GcUJBikvL>a(@e~$uqgaU_wJ9kuPHIpi#EX%~O%(-Ye0%B}PEXiziiZ1NR
zW~v2%NuJNd>i;UaY6ee(@o$*E!B~?3N}vvRLhz|ul)J&EjcJ<OPyJJWl0g4pf=>Zw
z5HXP7>5L4>I$fDWn8`2${p{~QfBkt%L%4EQxZjCSo+t$Y?or+s3;Dm!zW)SA{+%kA
zVEdo9XHS3}BuVtGi&OsoN6KH9D*j%7a{D7rhX+ukOQnNazxML^Bc9|!I!}YbKW=|r
z0(D12c;4tq?yubz{!!dN8!!AW;%UbEC;%;{yj-q#f?NMvo;ApU?$izZ*ON;p42B@4
z;diIL!M`2>G;;F)O9t@%`IF_b%Hhkuo9Q2w%Stpt{EyqS%K%D%S)ub^GyJZY|C-^q
z68_g4{@uI&GfKY=<^L9=MA#qyl7N7u`8wj7{y%l$zn<~W+TaGp!2gEpv)RP|mY(s?
m_W!Rp{IfRxf9wsoV`4Aee1_^a0U`q6cU@Hr@j=-v@P7amP9xm_

literal 0
HcmV?d00001

diff --git a/assets/image/default_avatar.png b/assets/image/default_1.png
similarity index 100%
rename from assets/image/default_avatar.png
rename to assets/image/default_1.png
diff --git a/assets/image/default_2_1.png b/assets/image/default_2_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..c118bf58c1d4e32604f1a3d7646d45f458cf9527
GIT binary patch
literal 10286
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
OQIu1at&x8J>3;y16CdON

literal 0
HcmV?d00001

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 59775bd6..ce2b31a0 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -25,6 +25,10 @@ PODS:
     - Flutter
   - Toast (4.0.0)
   - TOCropViewController (2.6.0)
+  - video_player (0.0.1):
+    - Flutter
+  - wakelock (0.0.1):
+    - Flutter
   - webview_flutter (0.0.1):
     - Flutter
 
@@ -37,6 +41,8 @@ DEPENDENCIES:
   - image_picker (from `.symlinks/plugins/image_picker/ios`)
   - permission_handler (from `.symlinks/plugins/permission_handler/ios`)
   - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
+  - video_player (from `.symlinks/plugins/video_player/ios`)
+  - wakelock (from `.symlinks/plugins/wakelock/ios`)
   - webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)
 
 SPEC REPOS:
@@ -64,6 +70,10 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/permission_handler/ios"
   shared_preferences:
     :path: ".symlinks/plugins/shared_preferences/ios"
+  video_player:
+    :path: ".symlinks/plugins/video_player/ios"
+  wakelock:
+    :path: ".symlinks/plugins/wakelock/ios"
   webview_flutter:
     :path: ".symlinks/plugins/webview_flutter/ios"
 
@@ -81,7 +91,9 @@ SPEC CHECKSUMS:
   shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
   TOCropViewController: 3105367e808b7d3d886a74ff59bf4804e7d3ab38
-  webview_flutter: 3603125dfd3bcbc9d8d418c3f80aeecf331c068b
+  video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e
+  wakelock: bfc7955c418d0db797614075aabbc58a39ab5107
+  webview_flutter: d2b4d6c66968ad042ad94cbb791f5b72b4678a96
 
 PODFILE CHECKSUM: 80a5bea9f6900750909f6d3fad1d3a0f1e560f5a
 
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index c5375023..fb2dffc4 100644
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -40,7 +40,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
diff --git a/lib/address/city_picker_page.dart b/lib/address/city_picker_page.dart
index 54527808..cb4a38cd 100644
--- a/lib/address/city_picker_page.dart
+++ b/lib/address/city_picker_page.dart
@@ -3,7 +3,6 @@
 
 
 
-import 'package:azlistview/azlistview.dart';
 import 'package:flutter/material.dart';
 import 'package:huixiang/view_widget/my_appbar.dart';
 
diff --git a/lib/home/activity_list_page.dart b/lib/home/activity_list_page.dart
index c4812920..d5688d4b 100644
--- a/lib/home/activity_list_page.dart
+++ b/lib/home/activity_list_page.dart
@@ -56,7 +56,6 @@ class _ActivityListPage extends State<ActivityListPage> {
     Navigator.of(dialogContext).pop();
     if (baseData.isSuccess) {
       PageInfo pageInfo = PageInfo.fromJson(baseData.data);
-
       _refreshController.refreshCompleted();
       setState(() {
         activityList = pageInfo.list.map((e) => Activity.fromJson(e)).toList();
@@ -101,7 +100,12 @@ class _ActivityListPage extends State<ActivityListPage> {
           physics: BouncingScrollPhysics(),
           itemCount: activityList == null ? 0 : activityList.length,
           itemBuilder: (context, position) {
-            return activityItem(activityList[position]);
+            return InkWell(
+              onTap: () {
+                Navigator.of(context).pushNamed('/router/store_detail_page');
+              },
+              child: activityItem(activityList[position]),
+            );
           },
         ),
       ),
@@ -109,89 +113,99 @@ class _ActivityListPage extends State<ActivityListPage> {
   }
 
   Widget activityItem(Activity activity) {
-    return Container(
-      margin: EdgeInsets.only(left: 16, right: 16, top: 8, bottom: 8),
-      decoration: BoxDecoration(
-        color: Colors.white,
-        boxShadow: [
-          BoxShadow(
-            color: Colors.black.withAlpha(12),
-            offset: Offset(0, 3),
-            blurRadius: 14,
-            spreadRadius: 0,
-          )
-        ],
-        borderRadius: BorderRadius.all(Radius.circular(8)),
-      ),
-      child: Column(
-        children: [
-          // MImage(
-          //   activity.coverImg,
-          //   radius: BorderRadius.only(
-          //       topLeft: Radius.circular(8), topRight: Radius.circular(8)),
-          //   fit: BoxFit.cover,
-          //   errorSrc: "assets/image/default_avatar.png",
-          //   fadeSrc: "assets/image/default_avatar.png",
-          // ),
-          ClipRRect(
-            borderRadius: BorderRadius.only(
-                topLeft: Radius.circular(8), topRight: Radius.circular(8)),
-            child: Image.network(
-              "https://t7.baidu.com/it/u=1297102096,3476971300&fm=193&f=GIF",
+    return AspectRatio(
+      aspectRatio: 1.3826,
+      child: Container(
+        margin: EdgeInsets.only(left: 16, right: 16, top: 8, bottom: 8),
+        decoration: BoxDecoration(
+          color: Colors.white,
+          boxShadow: [
+            BoxShadow(
+              color: Colors.black.withAlpha(12),
+              offset: Offset(0, 3),
+              blurRadius: 14,
+              spreadRadius: 0,
+            )
+          ],
+          borderRadius: BorderRadius.all(Radius.circular(8)),
+        ),
+        child: Column(
+          children: [
+            MImage(
+              activity.coverImg,
+              aspectRatio: 2.1375,
+              radius: BorderRadius.only(
+                topLeft: Radius.circular(8),
+                topRight: Radius.circular(8),
+              ),
               fit: BoxFit.cover,
+              errorSrc: "assets/image/default_2_1.png",
+              fadeSrc: "assets/image/default_2_1.png",
             ),
-          ),
-          Container(
-            padding: EdgeInsets.only(left: 16, right: 16, top: 8, bottom: 12),
-            child: Column(
-              mainAxisAlignment: MainAxisAlignment.spaceAround,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text(
-                  activity.mainTitle,
-                  style: TextStyle(
+            Container(
+              padding: EdgeInsets.only(left: 16, right: 16, top: 8, bottom: 12),
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.spaceAround,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    activity.mainTitle,
+                    style: TextStyle(
                       fontWeight: FontWeight.bold,
                       fontSize: 14,
-                      color: Colors.black),
-                ),
-                Text(
-                  activity.viceTitle,
-                  style: TextStyle(fontSize: 10, color: Color(0xFF727272)),
-                ),
-                Row(
-                  crossAxisAlignment: CrossAxisAlignment.end,
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    Text(
-                      activity.storeName == null ? "" : activity.storeName,
-                      style: TextStyle(color: Color(0xFF060606), fontSize: 12),
+                      color: Colors.black,
+                    ),
+                  ),
+                  SizedBox(
+                    height: 4,
+                  ),
+                  Text(
+                    activity.viceTitle,
+                    style: TextStyle(
+                      fontSize: 10,
+                      color: Color(0xFF727272),
                     ),
-                    Column(
-                      crossAxisAlignment: CrossAxisAlignment.end,
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      children: [
-                        Text(
-                          activity.startTime.split(" ")[1],
-                          style: TextStyle(
+                  ),
+                  Row(
+                    crossAxisAlignment: CrossAxisAlignment.end,
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Text(
+                        activity.storeName == null ? "" : activity.storeName,
+                        style: TextStyle(
+                          color: Color(0xFF060606),
+                          fontSize: 12,
+                        ),
+                      ),
+                      Column(
+                        crossAxisAlignment: CrossAxisAlignment.end,
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: [
+                          Text(
+                            activity.startTime.split(" ")[1],
+                            style: TextStyle(
                               color: Color(0xFF32A060),
                               fontSize: 12,
-                              fontWeight: FontWeight.bold),
-                        ),
-                        Text(
-                          activity.startTime.split(" ")[0],
-                          style: TextStyle(
+                              fontWeight: FontWeight.bold,
+                            ),
+                          ),
+                          Text(
+                            activity.startTime.split(" ")[0],
+                            style: TextStyle(
                               color: Color(0xFF32A060),
                               fontSize: 12,
-                              fontWeight: FontWeight.bold),
-                        ),
-                      ],
-                    )
-                  ],
-                )
-              ],
-            ),
-          )
-        ],
+                              fontWeight: FontWeight.bold,
+                            ),
+                          ),
+                        ],
+                      )
+                    ],
+                  )
+                ],
+              ),
+            )
+          ],
+        ),
       ),
     );
   }
diff --git a/lib/home/points_mall_page.dart b/lib/home/points_mall_page.dart
index 466783b7..a9094c12 100644
--- a/lib/home/points_mall_page.dart
+++ b/lib/home/points_mall_page.dart
@@ -11,6 +11,7 @@ import 'package:huixiang/retrofit/data/goods.dart';
 import 'package:huixiang/retrofit/data/page.dart';
 import 'package:huixiang/retrofit/data/user_info.dart';
 import 'package:huixiang/retrofit/retrofit_api.dart';
+import 'package:huixiang/view_widget/classic_header.dart';
 import 'package:huixiang/view_widget/custom_image.dart';
 import 'package:huixiang/view_widget/item_title.dart';
 import 'package:flutter_swiper_null_safety/flutter_swiper_null_safety.dart';
@@ -121,7 +122,7 @@ class _PointsMallPage extends State<PointsMallPage> {
     return SmartRefresher(
       enablePullDown: true,
       enablePullUp: true,
-      header: WaterDropHeader(),
+      header: MyHeader(),
       footer: CustomFooter(
         builder: (BuildContext context, LoadStatus mode) {
           Widget body;
@@ -255,8 +256,8 @@ class _PointsMallPage extends State<PointsMallPage> {
                   topRight: Radius.circular(4),
                 ),
                 fit: BoxFit.cover,
-                errorSrc: "assets/image/default_avatar.png",
-                fadeSrc: "assets/image/default_avatar.png",
+                errorSrc: "assets/image/default_1.png",
+                fadeSrc: "assets/image/default_1.png",
               ),
               // Container(
               //   child: AspectRatio(
@@ -417,8 +418,8 @@ class _PointsMallPage extends State<PointsMallPage> {
             height: 50,
             radius: BorderRadius.all(Radius.circular(2)),
             fit: BoxFit.cover,
-            errorSrc: "assets/image/default_avatar.png",
-            fadeSrc: "assets/image/default_avatar.png",
+            errorSrc: "assets/image/default_1.png",
+            fadeSrc: "assets/image/default_1.png",
           ),
           Expanded(
             child: Container(
diff --git a/lib/integral/integral_page.dart b/lib/integral/integral_page.dart
index 8bebfd69..54ceb383 100644
--- a/lib/integral/integral_page.dart
+++ b/lib/integral/integral_page.dart
@@ -273,31 +273,34 @@ class _IntegralPage extends State<IntegralPage> {
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Column(
-              mainAxisAlignment: MainAxisAlignment.start,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text(
-                  "0${position + 1}",
-                  style: TextStyle(
-                      color: Color(0xFF353535),
-                      fontSize: 14,
-                      fontWeight: FontWeight.bold),
-                ),
-                SizedBox(
-                  height: 10,
-                ),
-                Container(
-                  alignment: Alignment.center,
-                  child: Text(
-                    S.of(context).shenmijifendali,
+            Expanded(
+              child:Column(
+                mainAxisAlignment: MainAxisAlignment.start,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    "0${position + 1}",
                     style: TextStyle(
-                      color: Color(0xFF727272),
-                      fontSize: 12,
+                        color: Color(0xFF353535),
+                        fontSize: 14,
+                        fontWeight: FontWeight.bold),
+                  ),
+                  SizedBox(
+                    height: 10,
+                  ),
+                  Container(
+                    alignment: Alignment.center,
+                    child: Text(
+                      S.of(context).shenmijifendali,
+                      style: TextStyle(
+                        color: Color(0xFF727272),
+                        fontSize: 12,
+                      ),
                     ),
                   ),
-                ),
-              ],
+                ],
+              ),
+              flex: 1,
             ),
             Container(
               alignment: Alignment.center,
@@ -426,7 +429,7 @@ class _IntegralPage extends State<IntegralPage> {
                       return signInItem(position);
                     },
                     staggeredTileBuilder: (position) {
-                      return StaggeredTile.count(position == 6 ? 2 : 1, 1.22);
+                      return StaggeredTile.count(position == 6 ? 2 : 1, 1.28);
                     }),
                 InkWell(
                   onTap: signIn,
diff --git a/lib/mine/mine_card_page.dart b/lib/mine/mine_card_page.dart
index 9326d64b..d91609b5 100644
--- a/lib/mine/mine_card_page.dart
+++ b/lib/mine/mine_card_page.dart
@@ -7,6 +7,7 @@ import 'package:huixiang/retrofit/data/base_data.dart';
 import 'package:huixiang/retrofit/data/coupon.dart';
 import 'package:huixiang/retrofit/data/page.dart';
 import 'package:huixiang/retrofit/retrofit_api.dart';
+import 'package:huixiang/view_widget/classic_header.dart';
 import 'package:huixiang/view_widget/coupon_widget.dart';
 import 'package:huixiang/view_widget/item_title.dart';
 import 'package:huixiang/view_widget/my_tab.dart';
@@ -129,7 +130,7 @@ class _MineCardPage extends State<MineCardPage> {
                   child: SmartRefresher(
                     enablePullDown: true,
                     enablePullUp: true,
-                    header: ClassicHeader(),
+                    header: MyHeader(),
                     footer: CustomFooter(
                       builder: (context, mode) {
                         Widget body;
diff --git a/lib/mine/mine_page.dart b/lib/mine/mine_page.dart
index 0f083bad..8090a594 100644
--- a/lib/mine/mine_page.dart
+++ b/lib/mine/mine_page.dart
@@ -404,8 +404,8 @@ class _MinePage extends State<MinePage> with AutomaticKeepAliveClientMixin {
             width: 84,
             height: 84,
             fit: BoxFit.cover,
-            errorSrc: "assets/image/default_avatar.png",
-            fadeSrc: "assets/image/default_avatar.png",
+            errorSrc: "assets/image/default_1.png",
+            fadeSrc: "assets/image/default_1.png",
           ),
           SizedBox(
             width: 16,
diff --git a/lib/mine/user_info_page.dart b/lib/mine/user_info_page.dart
index a172053a..f671cb57 100644
--- a/lib/mine/user_info_page.dart
+++ b/lib/mine/user_info_page.dart
@@ -410,7 +410,7 @@ class _UserInfoPage extends State<UserInfoPage> {
                     fit: BoxFit.cover,
                   )
                 : Image.asset(
-                    "assets/image/default_avatar.png",
+                    "assets/image/default_1.png",
                     width: 42,
                     height: 42,
                     fit: BoxFit.cover,
diff --git a/lib/order/exchange_history_page.dart b/lib/order/exchange_history_page.dart
index 466a8988..b01491cb 100644
--- a/lib/order/exchange_history_page.dart
+++ b/lib/order/exchange_history_page.dart
@@ -357,7 +357,7 @@ class _ExchangeHistoryList extends State<ExchangeHistoryList> {
                     ? exchangeOrder.creditOrderDetailList[0].goodsMainImg
                     : "",
                 errorBuilder: (context, error, stackTrace) {
-                  return Image.asset("assets/image/default_avatar.png",
+                  return Image.asset("assets/image/default_1.png",
                       fit: BoxFit.cover);
                 },
                 width: 66,
diff --git a/lib/retrofit/retrofit_api.g.dart b/lib/retrofit/retrofit_api.g.dart
deleted file mode 100644
index 71c615fa..00000000
--- a/lib/retrofit/retrofit_api.g.dart
+++ /dev/null
@@ -1,507 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'retrofit_api.dart';
-
-// **************************************************************************
-// RetrofitGenerator
-// **************************************************************************
-
-class _ApiService implements ApiService {
-  _ApiService(this._dio, {this.baseUrl}) {
-    ArgumentError.checkNotNull(_dio, '_dio');
-    baseUrl ??= 'http://192.168.10.236:8766/app';
-  }
-
-  final Dio _dio;
-
-  String baseUrl;
-
-  @override
-  Future<BaseData> upload(data, folderId) async {
-    ArgumentError.checkNotNull(data, 'data');
-    ArgumentError.checkNotNull(folderId, 'folderId');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = FormData();
-    _data.files.add(MapEntry(
-        'file',
-        MultipartFile.fromFileSync(data.path,
-            filename: data.path.split(Platform.pathSeparator).last)));
-    if (folderId != null) {
-      _data.fields.add(MapEntry('folderId', folderId.toString()));
-    }
-    final _result = await _dio.request<Map<String, dynamic>>('/file/upload',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'POST',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = BaseData.fromJson(_result.data);
-    return value;
-  }
-
-  @override
-  Future<dynamic> searchPoi(lat, lng, keywords, size, page) async {
-    ArgumentError.checkNotNull(lat, 'lat');
-    ArgumentError.checkNotNull(lng, 'lng');
-    ArgumentError.checkNotNull(keywords, 'keywords');
-    ArgumentError.checkNotNull(size, 'size');
-    ArgumentError.checkNotNull(page, 'page');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    final _result = await _dio.request(
-        'https://restapi.amap.com/v3/place/around?key=542b46afa8e4b88fe1eb3c4d0ba0872f&location=$lat,$lng&keywords=$keywords&offset={size}&page={page}&extensions=all',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'GET',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = _result.data;
-    return value;
-  }
-
-  @override
-  Future<BaseData> memberLogin(param) async {
-    ArgumentError.checkNotNull(param, 'param');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    _data.addAll(param ?? <String, dynamic>{});
-    final _result = await _dio.request<Map<String, dynamic>>(
-        '/auth/platform/memberLogin',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'POST',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = BaseData.fromJson(_result.data);
-    return value;
-  }
-
-  @override
-  Future<BaseData> sendVerify(mobile) async {
-    ArgumentError.checkNotNull(mobile, 'mobile');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    final _result = await _dio.request<Map<String, dynamic>>(
-        '/auth/sendVerify/$mobile',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'GET',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = BaseData.fromJson(_result.data);
-    return value;
-  }
-
-  @override
-  Future<BaseData> creditGoods(param) async {
-    ArgumentError.checkNotNull(param, 'param');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    _data.addAll(param ?? <String, dynamic>{});
-    final _result = await _dio.request<Map<String, dynamic>>(
-        '/creditGoods/list',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'POST',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = BaseData.fromJson(_result.data);
-    return value;
-  }
-
-  @override
-  Future<BaseData> creditGoodsById(id) async {
-    ArgumentError.checkNotNull(id, 'id');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    final _result = await _dio.request<Map<String, dynamic>>('/creditGoods/$id',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'GET',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = BaseData.fromJson(_result.data);
-    return value;
-  }
-
-  @override
-  Future<BaseData> queryInfo() async {
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    final _result = await _dio.request<Map<String, dynamic>>('/member/info',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'GET',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = BaseData.fromJson(_result.data);
-    return value;
-  }
-
-  @override
-  Future<BaseData> editInfo(param) async {
-    ArgumentError.checkNotNull(param, 'param');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    _data.addAll(param ?? <String, dynamic>{});
-    final _result = await _dio.request<Map<String, dynamic>>(
-        '/member/editMemberInfo',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'POST',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = BaseData.fromJson(_result.data);
-    return value;
-  }
-
-  @override
-  Future<BaseData> signInInfo() async {
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    final _result = await _dio.request<Map<String, dynamic>>(
-        '/member/signInInfo',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'GET',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = BaseData.fromJson(_result.data);
-    return value;
-  }
-
-  @override
-  Future<BaseData> signIn() async {
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    final _result = await _dio.request<Map<String, dynamic>>('/member/signIn',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'GET',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = BaseData.fromJson(_result.data);
-    return value;
-  }
-
-  @override
-  Future<BaseData> recharge(param) async {
-    ArgumentError.checkNotNull(param, 'param');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    _data.addAll(param ?? <String, dynamic>{});
-    final _result = await _dio.request<Map<String, dynamic>>('/member/recharge',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'POST',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = BaseData.fromJson(_result.data);
-    return value;
-  }
-
-  @override
-  Future<BaseData> receiveCoupon(param) async {
-    ArgumentError.checkNotNull(param, 'param');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    _data.addAll(param ?? <String, dynamic>{});
-    final _result = await _dio.request<Map<String, dynamic>>(
-        '/member/receiveCoupon',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'POST',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = BaseData.fromJson(_result.data);
-    return value;
-  }
-
-  @override
-  Future<BaseData> creditOrderList(param) async {
-    ArgumentError.checkNotNull(param, 'param');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    _data.addAll(param ?? <String, dynamic>{});
-    final _result = await _dio.request<Map<String, dynamic>>(
-        '/creditOrder/list',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'POST',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = BaseData.fromJson(_result.data);
-    return value;
-  }
-
-  @override
-  Future<BaseData> creditOrder(param) async {
-    ArgumentError.checkNotNull(param, 'param');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    _data.addAll(param ?? <String, dynamic>{});
-    final _result = await _dio.request<Map<String, dynamic>>(
-        '/creditOrder/create',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'POST',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = BaseData.fromJson(_result.data);
-    return value;
-  }
-
-  @override
-  Future<BaseData> addAddress(param) async {
-    ArgumentError.checkNotNull(param, 'param');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    _data.addAll(param ?? <String, dynamic>{});
-    final _result = await _dio.request<Map<String, dynamic>>('/address/add',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'POST',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = BaseData.fromJson(_result.data);
-    return value;
-  }
-
-  @override
-  Future<BaseData> deleteAddress(param) async {
-    ArgumentError.checkNotNull(param, 'param');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    _data.addAll(param ?? <String, dynamic>{});
-    final _result = await _dio.request<Map<String, dynamic>>('/address/delete',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'POST',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = BaseData.fromJson(_result.data);
-    return value;
-  }
-
-  @override
-  Future<BaseData> queryAddress(id) async {
-    ArgumentError.checkNotNull(id, 'id');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    final _result = await _dio.request<Map<String, dynamic>>(
-        '/address/detail/$id',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'GET',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = BaseData.fromJson(_result.data);
-    return value;
-  }
-
-  @override
-  Future<BaseData> queryMemberAddress() async {
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    final _result = await _dio.request<Map<String, dynamic>>(
-        '/address/queryMemberAddress',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'GET',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = BaseData.fromJson(_result.data);
-    return value;
-  }
-
-  @override
-  Future<BaseData> updateAddress(param) async {
-    ArgumentError.checkNotNull(param, 'param');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    _data.addAll(param ?? <String, dynamic>{});
-    final _result = await _dio.request<Map<String, dynamic>>('/address/update',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'POST',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = BaseData.fromJson(_result.data);
-    return value;
-  }
-
-  @override
-  Future<BaseData> queryCoupon(param) async {
-    ArgumentError.checkNotNull(param, 'param');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    _data.addAll(param ?? <String, dynamic>{});
-    final _result = await _dio.request<Map<String, dynamic>>(
-        '/coupon/centreList',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'POST',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = BaseData.fromJson(_result.data);
-    return value;
-  }
-
-  @override
-  Future<BaseData> queryCard(param) async {
-    ArgumentError.checkNotNull(param, 'param');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    _data.addAll(param ?? <String, dynamic>{});
-    final _result = await _dio.request<Map<String, dynamic>>(
-        '/coupon/packageList',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'POST',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = BaseData.fromJson(_result.data);
-    return value;
-  }
-
-  @override
-  Future<BaseData> queryStore(param) async {
-    ArgumentError.checkNotNull(param, 'param');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    _data.addAll(param ?? <String, dynamic>{});
-    final _result = await _dio.request<Map<String, dynamic>>('/store/list',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'POST',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = BaseData.fromJson(_result.data);
-    return value;
-  }
-
-  @override
-  Future<BaseData> informationList(param) async {
-    ArgumentError.checkNotNull(param, 'param');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    _data.addAll(param ?? <String, dynamic>{});
-    final _result = await _dio.request<Map<String, dynamic>>(
-        '/information/list',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'POST',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = BaseData.fromJson(_result.data);
-    return value;
-  }
-
-  @override
-  Future<BaseData> informationInfo(param) async {
-    ArgumentError.checkNotNull(param, 'param');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    _data.addAll(param ?? <String, dynamic>{});
-    final _result = await _dio.request<Map<String, dynamic>>(
-        '/information/{id}',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'POST',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = BaseData.fromJson(_result.data);
-    return value;
-  }
-
-  @override
-  Future<BaseData> creditOrderReceive(id) async {
-    ArgumentError.checkNotNull(id, 'id');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    final _result = await _dio.request<Map<String, dynamic>>(
-        '/creditOrder/receive/$id',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'GET',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = BaseData.fromJson(_result.data);
-    return value;
-  }
-}
diff --git a/lib/union/union_page.dart b/lib/union/union_page.dart
index b477f97c..3b946f67 100644
--- a/lib/union/union_page.dart
+++ b/lib/union/union_page.dart
@@ -393,8 +393,8 @@ class _UnionPage extends State<UnionPage> with AutomaticKeepAliveClientMixin {
             width: 95,
             height: 95,
             fit: BoxFit.cover,
-            errorSrc: "assets/image/default_avatar.png",
-            fadeSrc: "assets/image/default_avatar.png",
+            errorSrc: "assets/image/default_1.png",
+            fadeSrc: "assets/image/default_1.png",
           ),
           SizedBox(
             width: 12,
diff --git a/lib/view_widget/coupon_widget.dart b/lib/view_widget/coupon_widget.dart
index 7f12a6c2..29735322 100644
--- a/lib/view_widget/coupon_widget.dart
+++ b/lib/view_widget/coupon_widget.dart
@@ -81,7 +81,7 @@ class CouponWidget extends StatelessWidget {
                                 fit: BoxFit.cover,
                                 errorBuilder: (context, error, e) {
                                   return Image.asset(
-                                      "assets/image/default_avatar.png");
+                                      "assets/image/default_1.png");
                                 },
                               ),
                             ),
diff --git a/pubspec.lock b/pubspec.lock
index 1aade8a4..e1ca4785 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -50,13 +50,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.6.1"
-  azlistview:
-    dependency: "direct main"
-    description:
-      name: azlistview
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.1"
   boolean_selector:
     dependency: transitive
     description:
@@ -148,6 +141,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.4"
+  chewie:
+    dependency: transitive
+    description:
+      name: chewie
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.12.2"
+  chewie_audio:
+    dependency: transitive
+    description:
+      name: chewie_audio
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.2"
   cli_util:
     dependency: transitive
     description:
@@ -190,6 +197,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.1"
+  css_colors:
+    dependency: transitive
+    description:
+      name: css_colors
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.1"
+  csslib:
+    dependency: transitive
+    description:
+      name: csslib
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.16.2"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -244,6 +265,20 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_html:
+    dependency: "direct main"
+    description:
+      name: flutter_html
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.3.0"
+  flutter_layout_grid:
+    dependency: transitive
+    description:
+      name: flutter_layout_grid
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.10.5"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
@@ -270,6 +305,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.4.0"
+  flutter_svg:
+    dependency: transitive
+    description:
+      name: flutter_svg
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.20.0-nullsafety.3"
   flutter_swiper_null_safety:
     dependency: "direct main"
     description:
@@ -308,6 +350,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.0"
+  html:
+    dependency: transitive
+    description:
+      name: html
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.14.0+4"
   http:
     dependency: transitive
     description:
@@ -357,6 +406,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.6"
+  import_js_library:
+    dependency: transitive
+    description:
+      name: import_js_library
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.2"
   intl:
     dependency: "direct main"
     description:
@@ -441,6 +497,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.0"
+  path_drawing:
+    dependency: transitive
+    description:
+      name: path_drawing
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.5.1"
+  path_parsing:
+    dependency: transitive
+    description:
+      name: path_parsing
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.1"
   path_provider_linux:
     dependency: transitive
     description:
@@ -483,6 +553,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.2"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.1.0"
   platform:
     dependency: transitive
     description:
@@ -560,13 +637,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.26.0"
-  scrollable_positioned_list:
-    dependency: transitive
-    description:
-      name: scrollable_positioned_list
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.10"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -712,6 +782,48 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
+  video_player:
+    dependency: transitive
+    description:
+      name: video_player
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.1"
+  video_player_platform_interface:
+    dependency: transitive
+    description:
+      name: video_player_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.2.0"
+  video_player_web:
+    dependency: transitive
+    description:
+      name: video_player_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.4+1"
+  wakelock:
+    dependency: transitive
+    description:
+      name: wakelock
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.1+1"
+  wakelock_platform_interface:
+    dependency: transitive
+    description:
+      name: wakelock_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.0+1"
+  wakelock_web:
+    dependency: transitive
+    description:
+      name: wakelock_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.0+3"
   watcher:
     dependency: transitive
     description:
@@ -727,12 +839,12 @@ packages:
     source: hosted
     version: "1.2.0"
   webview_flutter:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: webview_flutter
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.9"
+    version: "1.0.7"
   win32:
     dependency: transitive
     description:
@@ -747,6 +859,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.0"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "5.1.2"
   yaml:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 7bddd4c6..841a9efa 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -45,7 +45,7 @@ dependencies:
   rxdart: ^0.26.0
   retrofit: ^1.3.4+1
   json_annotation: ^3.1.1
-  webview_flutter: ^2.0.8
+#  webview_flutter: ^2.0.8
   logger: ^1.0.0
 
   flutter_screenutil: ^5.0.0+2
@@ -62,7 +62,9 @@ dependencies:
   image_cropper: ^1.4.1
   image_picker_gallery_camera: ^0.1.6
 #  flukit: ^1.0.2
-  azlistview: ^1.1.1
+#  azlistview: ^1.1.1
+
+  flutter_html: ^1.3.0    #2.1.0
 
 dev_dependencies:
   flutter_test:

From b3e2083d1241755c14aef1fdc8a12bfd96f8e41c Mon Sep 17 00:00:00 2001
From: fmk <fengmeikan@hotmail.com>
Date: Fri, 2 Jul 2021 19:20:35 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/home/activity_list_page.dart  |   6 +-
 lib/home/huixiang_brand_page.dart | 912 +++++++++++++++---------------
 lib/integral/integral_page.dart   |   2 +-
 lib/mine/recharge_page.dart       |   1 -
 lib/union/union_page.dart         |   2 +-
 5 files changed, 461 insertions(+), 462 deletions(-)

diff --git a/lib/home/activity_list_page.dart b/lib/home/activity_list_page.dart
index d5688d4b..524b9da9 100644
--- a/lib/home/activity_list_page.dart
+++ b/lib/home/activity_list_page.dart
@@ -114,7 +114,7 @@ class _ActivityListPage extends State<ActivityListPage> {
 
   Widget activityItem(Activity activity) {
     return AspectRatio(
-      aspectRatio: 1.3826,
+      aspectRatio: 1.38,
       child: Container(
         margin: EdgeInsets.only(left: 16, right: 16, top: 8, bottom: 8),
         decoration: BoxDecoration(
@@ -133,7 +133,7 @@ class _ActivityListPage extends State<ActivityListPage> {
           children: [
             MImage(
               activity.coverImg,
-              aspectRatio: 2.1375,
+              aspectRatio: 2.1,
               radius: BorderRadius.only(
                 topLeft: Radius.circular(8),
                 topRight: Radius.circular(8),
@@ -145,7 +145,7 @@ class _ActivityListPage extends State<ActivityListPage> {
             Container(
               padding: EdgeInsets.only(left: 16, right: 16, top: 8, bottom: 12),
               child: Column(
-                mainAxisAlignment: MainAxisAlignment.spaceAround,
+                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   Text(
diff --git a/lib/home/huixiang_brand_page.dart b/lib/home/huixiang_brand_page.dart
index 67435f68..b560a464 100644
--- a/lib/home/huixiang_brand_page.dart
+++ b/lib/home/huixiang_brand_page.dart
@@ -104,462 +104,462 @@ class _BrandPage extends State<BrandPage> with SingleTickerProviderStateMixin, A
                       banner(),
                       buildInfo(),
                       buildTab(),
-                      Container(
-                        decoration: new BoxDecoration(
-                          border: Border(
-                              bottom: BorderSide(
-                                  color: Colors.black, width: 0.0)),
-                          color: Colors.black,
-                        ),
-                        key: chiliGlobalKey,
-                        child: Image.asset(
-                          "assets/image/brand_store_cj.png",
-                          fit: BoxFit.fill,
-                          width: double.infinity,
-                        ),
-                      ),
-                      Container(
-                        decoration: new BoxDecoration(
-                          border: Border(
-                              bottom: BorderSide(
-                                  color: Colors.black, width: 0.0)),
-                          color: Colors.black,
-                        ),
-                        padding:
-                        EdgeInsets.only(left: 79, right: 85, bottom: 19),
-                        child: Column(
-                          mainAxisAlignment: MainAxisAlignment.spaceAround,
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            Padding(
-                              padding: EdgeInsets.only(bottom: 7),
-                              child: Text(
-                                "01  百年川椒(汉街店）",
-                                style: TextStyle(
-                                    fontSize: 12, color: Color(0xffFFFCF5)),
-                              ),
-                            ),
-                            Row(
-                              mainAxisAlignment: MainAxisAlignment.start,
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                Text(
-                                  "地址:",
-                                  style: TextStyle(
-                                      fontSize: 10, color: Colors.white),
-                                ),
-                                Padding(
-                                  padding: EdgeInsets.only(bottom: 5),
-                                  child: Text(
-                                    "武昌区楚河汉街第一街区万达总部\n国际C座对面",
-                                    style: TextStyle(
-                                        fontSize: 10, color: Colors.white),
-                                  ),
-                                ),
-                              ],
-                            ),
-                            Row(
-                              mainAxisAlignment:
-                              MainAxisAlignment.spaceBetween,
-                              crossAxisAlignment: CrossAxisAlignment.center,
-                              children: [
-                                Expanded(
-                                  flex: 1,
-                                  child: Text(
-                                    "时间:09:30-21:30",
-                                    style: TextStyle(
-                                        fontSize: 10, color: Colors.white),
-                                  ),
-                                ),
-                                Container(
-                                  padding: EdgeInsets.only(
-                                      left: 7, right: 10, bottom: 2, top: 2),
-                                  width: 43,
-                                  height: 14,
-                                  decoration: new BoxDecoration(
-                                    image: new DecorationImage(
-                                      image: new AssetImage(
-                                          "assets/image/icon_look.png"),
-                                    ),
-                                  ),
-                                  child: Text(
-                                    "去逛逛",
-                                    style: TextStyle(
-                                        fontSize: 8, color: Colors.white),
-                                  ),
-                                ),
-                              ],
-                            )
-                          ],
-                        ),
-                      ),
-                      Container(
-                        decoration: new BoxDecoration(
-                          border: Border(
-                              bottom: BorderSide(
-                                  color: Colors.black, width: 0.0)),
-                          color: Colors.black,
-                        ),
-                        padding:
-                        EdgeInsets.only(left: 79, right: 85, bottom: 34),
-                        child: Column(
-                          mainAxisAlignment: MainAxisAlignment.spaceAround,
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            Padding(
-                              padding: EdgeInsets.only(bottom: 8),
-                              child: Text(
-                                "02  百年川椒(光谷店）",
-                                style: TextStyle(
-                                    fontSize: 12, color: Color(0xffFFFCF5)),
-                              ),
-                            ),
-                            Row(
-                              mainAxisAlignment: MainAxisAlignment.start,
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                Text(
-                                  "地址:",
-                                  style: TextStyle(
-                                      fontSize: 10, color: Colors.white),
-                                ),
-                                Padding(
-                                  padding: EdgeInsets.only(bottom: 5),
-                                  child: Text(
-                                    "洪山区关山大道哈乐城2楼(保利时\n代)",
-                                    style: TextStyle(
-                                        fontSize: 10, color: Colors.white),
-                                  ),
-                                ),
-                              ],
-                            ),
-                            Row(
-                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                              crossAxisAlignment: CrossAxisAlignment.center,
-                              children: [
-                                Expanded(
-                                  flex: 1,
-                                  child: Text(
-                                    "时间:09:30-21:30",
-                                    style: TextStyle(
-                                        fontSize: 10, color: Colors.white),
-                                  ),
-                                ),
-                                Container(
-                                  padding: EdgeInsets.only(
-                                      left: 7, right: 10, bottom: 2, top: 2),
-                                  width: 43,
-                                  height: 14,
-                                  decoration: new BoxDecoration(
-                                    image: new DecorationImage(
-                                      image: new AssetImage(
-                                          "assets/image/icon_look.png"),
-                                    ),
-                                  ),
-                                  child: Text(
-                                    "去逛逛",
-                                    style: TextStyle(
-                                        fontSize: 8, color: Colors.white),
-                                  ),
-                                ),
-                              ],
-                            )
-                          ],
-                        ),
-                      ),
-                      SizedBox(
-                        height: 16,
-                      ),
-                      Container(
-                        decoration: new BoxDecoration(
-                          border: Border(
-                              bottom: BorderSide(
-                                  color: Colors.white, width: 0.0)),
-                          color: Colors.white,
-                        ),
-                        key: milkTeaGlobalKey,
-                        child: Image.asset(
-                          "assets/image/brand_store_hx.png",
-                          fit: BoxFit.fill,
-                          width: double.infinity,
-                        ),
-                      ),
-                      Container(
-                        decoration: new BoxDecoration(
-                          border: Border(
-                              bottom: BorderSide(
-                                  color: Colors.white, width: 0.0)),
-                          color: Colors.white,
-                        ),
-                        padding:
-                        EdgeInsets.only(left: 32, right: 33, bottom: 18),
-                        child: Column(
-                          mainAxisAlignment: MainAxisAlignment.spaceAround,
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            Row(
-                              mainAxisAlignment: MainAxisAlignment.start,
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                Padding(
-                                  padding: EdgeInsets.only(right: 12),
-                                  child: Text(
-                                    "●",
-                                    style: TextStyle(
-                                        fontSize: 10,
-                                        color: Color(0xffE2BA83)),
-                                  ),
-                                ),
-                                Padding(
-                                  padding: EdgeInsets.only(bottom: 8),
-                                  child: Text(
-                                    "武昌区松竹路汉街总部国际C座正对面(肥肥虾庄旁)",
-                                    style: TextStyle(
-                                        fontSize: 10,
-                                        color: Color(0xff604843)),
-                                  ),
-                                ),
-                              ],
-                            ),
-                            Row(
-                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                              crossAxisAlignment: CrossAxisAlignment.center,
-                              children: [
-                                Padding(
-                                  padding: EdgeInsets.only(right: 12),
-                                  child: Text(
-                                    "●",
-                                    style: TextStyle(
-                                        fontSize: 10,
-                                        color: Color(0xffE2BA83)),
-                                  ),
-                                ),
-                                Expanded(
-                                  flex: 1,
-                                  child: Text(
-                                    "10:00-21:00",
-                                    style: TextStyle(
-                                        fontSize: 10,
-                                        color: Color(0xff604843)),
-                                  ),
-                                ),
-                                Text(
-                                  "去逛逛",
-                                  style: TextStyle(
-                                      fontSize: 13, color: Color(0xff604843)),
-                                ),
-                                Image.asset("assets/image/icon_right_z.png"),
-                              ],
-                            )
-                          ],
-                        ),
-                      ),
-                      Container(
-                        decoration: new BoxDecoration(
-                          border: Border(
-                              bottom: BorderSide(
-                                  color: Colors.white, width: 0.0)),
-                          color: Colors.white,
-                        ),
-                        padding:
-                        EdgeInsets.only(left: 32, right: 33, bottom: 18),
-                        child: Column(
-                          mainAxisAlignment: MainAxisAlignment.spaceAround,
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            RoundButton(
-                              width: 142,
-                              height: 28,
-                              text: "海峡姐妹荟聚A店",
-                              textColor: Colors.white,
-                              fontSize: 14,
-                              padding: EdgeInsets.only(
-                                  top: 4, bottom: 4, left: 14, right: 14),
-                              backgroup: Color(0xffE2BA83),
-                              fontWeight: FontWeight.bold,
-                            ),
-                            Row(
-                              mainAxisAlignment: MainAxisAlignment.start,
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                Padding(
-                                  padding:
-                                  EdgeInsets.only(right: 12, top: 12),
-                                  child: Text(
-                                    "●",
-                                    style: TextStyle(
-                                        fontSize: 10,
-                                        color: Color(0xffE2BA83)),
-                                  ),
-                                ),
-                                Padding(
-                                  padding:
-                                  EdgeInsets.only(bottom: 8, top: 12),
-                                  child: Text(
-                                    "硚口区园博大道1号武汉荟聚购物中心2楼F区\n109-4号商铺",
-                                    style: TextStyle(
-                                        fontSize: 10,
-                                        color: Color(0xff604843)),
-                                  ),
-                                ),
-                              ],
-                            ),
-                            Row(
-                              mainAxisAlignment:
-                              MainAxisAlignment.spaceBetween,
-                              crossAxisAlignment: CrossAxisAlignment.center,
-                              children: [
-                                Padding(
-                                  padding: EdgeInsets.only(right: 12),
-                                  child: Text(
-                                    "●",
-                                    style: TextStyle(
-                                        fontSize: 10,
-                                        color: Color(0xffE2BA83)),
-                                  ),
-                                ),
-                                Expanded(
-                                  flex: 1,
-                                  child: Text(
-                                    "10:00-21:00",
-                                    style: TextStyle(
-                                        fontSize: 10,
-                                        color: Color(0xff604843)),
-                                  ),
-                                ),
-                                Text(
-                                  "去逛逛",
-                                  style: TextStyle(
-                                      fontSize: 13, color: Color(0xff604843)),
-                                ),
-                                Image.asset("assets/image/icon_right_z.png"),
-                              ],
-                            )
-                          ],
-                        ),
-                      ),
-                      SizedBox(
-                        height: 16,
-                      ),
-                      Container(
-                        decoration: new BoxDecoration(
-                          border: Border(
-                              bottom: BorderSide(
-                                  color: Color(0xff052C4B), width: 0.0)),
-                          color: Color(0xff052C4B),
-                        ),
-                        key: breadGlobalKey,
-                        child: Image.asset(
-                          "assets/image/brand_store_bg.png",
-                          fit: BoxFit.fill,
-                          width: double.infinity,
-                        ),
-                      ),
-                      Container(
-                        decoration: new BoxDecoration(
-                          border: Border(
-                              bottom: BorderSide(
-                                  color: Color(0xff052C4B), width: 0.0)),
-                          color: Color(0xff052C4B),
-                        ),
-                        padding:
-                        EdgeInsets.only(left: 46, right: 44, bottom: 21),
-                        child: Column(
-                          mainAxisAlignment: MainAxisAlignment.spaceAround,
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            Padding(
-                              padding: EdgeInsets.only(bottom: 8),
-                              child: Text(
-                                "01  前进麦味(光谷店）",
-                                style: TextStyle(
-                                    fontSize: 12, color: Color(0xffFFFCF5)),
-                              ),
-                            ),
-                            Padding(
-                              padding: EdgeInsets.only(bottom: 5),
-                              child: Text(
-                                "地址:洪山区关山大道328号附7号",
-                                style: TextStyle(
-                                    fontSize: 10, color: Colors.white),
-                              ),
-                            ),
-                            Row(
-                              mainAxisAlignment:
-                              MainAxisAlignment.spaceBetween,
-                              crossAxisAlignment: CrossAxisAlignment.center,
-                              children: [
-                                Expanded(
-                                  flex: 1,
-                                  child: Text(
-                                    "时间:09:00-20:30",
-                                    style: TextStyle(
-                                        fontSize: 10, color: Colors.white),
-                                  ),
-                                ),
-                                Text(
-                                  "去了解",
-                                  style: TextStyle(
-                                      fontSize: 13, color: Color(0xffFFFDF6)),
-                                ),
-                                Image.asset("assets/image/icon_right.png"),
-                              ],
-                            )
-                          ],
-                        ),
-                      ),
-                      Container(
-                        decoration: new BoxDecoration(
-                          border: Border(
-                              bottom: BorderSide(
-                                  color: Color(0xff052C4B), width: 0.0)),
-                          color: Color(0xff052C4B),
-                        ),
-                        padding:
-                        EdgeInsets.only(left: 46, right: 44, bottom: 41),
-                        child: Column(
-                          mainAxisAlignment: MainAxisAlignment.spaceAround,
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            Padding(
-                              padding: EdgeInsets.only(bottom: 8),
-                              child: Text(
-                                "02  前进麦味(哈乐城店）",
-                                style: TextStyle(
-                                    fontSize: 12, color: Color(0xffFFFCF5)),
-                              ),
-                            ),
-                            Padding(
-                              padding: EdgeInsets.only(bottom: 5),
-                              child: Text(
-                                "地址:武昌区凯德1818蓝调步行街(蔡明纬店旁)",
-                                style: TextStyle(
-                                    fontSize: 10, color: Colors.white),
-                              ),
-                            ),
-                            Row(
-                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                              crossAxisAlignment: CrossAxisAlignment.center,
-                              children: [
-                                Expanded(
-                                  flex: 1,
-                                  child: Text(
-                                    "时间:09:00-20:30",
-                                    style: TextStyle(
-                                        fontSize: 10, color: Colors.white),
-                                  ),
-                                ),
-                                Text(
-                                  "去了解",
-                                  style: TextStyle(
-                                      fontSize: 13, color: Color(0xffFFFDF6)),
-                                ),
-                                Image.asset("assets/image/icon_right.png"),
-                              ],
-                            )
-                          ],
-                        ),
-                      ),
+                      // Container(
+                      //   decoration: new BoxDecoration(
+                      //     border: Border(
+                      //         bottom: BorderSide(
+                      //             color: Colors.black, width: 0.0)),
+                      //     color: Colors.black,
+                      //   ),
+                      //   key: chiliGlobalKey,
+                      //   child: Image.asset(
+                      //     "assets/image/brand_store_cj.png",
+                      //     fit: BoxFit.fill,
+                      //     width: double.infinity,
+                      //   ),
+                      // ),
+                      // Container(
+                      //   decoration: new BoxDecoration(
+                      //     border: Border(
+                      //         bottom: BorderSide(
+                      //             color: Colors.black, width: 0.0)),
+                      //     color: Colors.black,
+                      //   ),
+                      //   padding:
+                      //   EdgeInsets.only(left: 79, right: 85, bottom: 19),
+                      //   child: Column(
+                      //     mainAxisAlignment: MainAxisAlignment.spaceAround,
+                      //     crossAxisAlignment: CrossAxisAlignment.start,
+                      //     children: [
+                      //       Padding(
+                      //         padding: EdgeInsets.only(bottom: 7),
+                      //         child: Text(
+                      //           "01  百年川椒(汉街店）",
+                      //           style: TextStyle(
+                      //               fontSize: 12, color: Color(0xffFFFCF5)),
+                      //         ),
+                      //       ),
+                      //       Row(
+                      //         mainAxisAlignment: MainAxisAlignment.start,
+                      //         crossAxisAlignment: CrossAxisAlignment.start,
+                      //         children: [
+                      //           Text(
+                      //             "地址:",
+                      //             style: TextStyle(
+                      //                 fontSize: 10, color: Colors.white),
+                      //           ),
+                      //           Padding(
+                      //             padding: EdgeInsets.only(bottom: 5),
+                      //             child: Text(
+                      //               "武昌区楚河汉街第一街区万达总部\n国际C座对面",
+                      //               style: TextStyle(
+                      //                   fontSize: 10, color: Colors.white),
+                      //             ),
+                      //           ),
+                      //         ],
+                      //       ),
+                      //       Row(
+                      //         mainAxisAlignment:
+                      //         MainAxisAlignment.spaceBetween,
+                      //         crossAxisAlignment: CrossAxisAlignment.center,
+                      //         children: [
+                      //           Expanded(
+                      //             flex: 1,
+                      //             child: Text(
+                      //               "时间:09:30-21:30",
+                      //               style: TextStyle(
+                      //                   fontSize: 10, color: Colors.white),
+                      //             ),
+                      //           ),
+                      //           Container(
+                      //             padding: EdgeInsets.only(
+                      //                 left: 7, right: 10, bottom: 2, top: 2),
+                      //             width: 43,
+                      //             height: 14,
+                      //             decoration: new BoxDecoration(
+                      //               image: new DecorationImage(
+                      //                 image: new AssetImage(
+                      //                     "assets/image/icon_look.png"),
+                      //               ),
+                      //             ),
+                      //             child: Text(
+                      //               "去逛逛",
+                      //               style: TextStyle(
+                      //                   fontSize: 8, color: Colors.white),
+                      //             ),
+                      //           ),
+                      //         ],
+                      //       )
+                      //     ],
+                      //   ),
+                      // ),
+                      // Container(
+                      //   decoration: new BoxDecoration(
+                      //     border: Border(
+                      //         bottom: BorderSide(
+                      //             color: Colors.black, width: 0.0)),
+                      //     color: Colors.black,
+                      //   ),
+                      //   padding:
+                      //   EdgeInsets.only(left: 79, right: 85, bottom: 34),
+                      //   child: Column(
+                      //     mainAxisAlignment: MainAxisAlignment.spaceAround,
+                      //     crossAxisAlignment: CrossAxisAlignment.start,
+                      //     children: [
+                      //       Padding(
+                      //         padding: EdgeInsets.only(bottom: 8),
+                      //         child: Text(
+                      //           "02  百年川椒(光谷店）",
+                      //           style: TextStyle(
+                      //               fontSize: 12, color: Color(0xffFFFCF5)),
+                      //         ),
+                      //       ),
+                      //       Row(
+                      //         mainAxisAlignment: MainAxisAlignment.start,
+                      //         crossAxisAlignment: CrossAxisAlignment.start,
+                      //         children: [
+                      //           Text(
+                      //             "地址:",
+                      //             style: TextStyle(
+                      //                 fontSize: 10, color: Colors.white),
+                      //           ),
+                      //           Padding(
+                      //             padding: EdgeInsets.only(bottom: 5),
+                      //             child: Text(
+                      //               "洪山区关山大道哈乐城2楼(保利时\n代)",
+                      //               style: TextStyle(
+                      //                   fontSize: 10, color: Colors.white),
+                      //             ),
+                      //           ),
+                      //         ],
+                      //       ),
+                      //       Row(
+                      //         mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      //         crossAxisAlignment: CrossAxisAlignment.center,
+                      //         children: [
+                      //           Expanded(
+                      //             flex: 1,
+                      //             child: Text(
+                      //               "时间:09:30-21:30",
+                      //               style: TextStyle(
+                      //                   fontSize: 10, color: Colors.white),
+                      //             ),
+                      //           ),
+                      //           Container(
+                      //             padding: EdgeInsets.only(
+                      //                 left: 7, right: 10, bottom: 2, top: 2),
+                      //             width: 43,
+                      //             height: 14,
+                      //             decoration: new BoxDecoration(
+                      //               image: new DecorationImage(
+                      //                 image: new AssetImage(
+                      //                     "assets/image/icon_look.png"),
+                      //               ),
+                      //             ),
+                      //             child: Text(
+                      //               "去逛逛",
+                      //               style: TextStyle(
+                      //                   fontSize: 8, color: Colors.white),
+                      //             ),
+                      //           ),
+                      //         ],
+                      //       )
+                      //     ],
+                      //   ),
+                      // ),
+                      // SizedBox(
+                      //   height: 16,
+                      // ),
+                      // Container(
+                      //   decoration: new BoxDecoration(
+                      //     border: Border(
+                      //         bottom: BorderSide(
+                      //             color: Colors.white, width: 0.0)),
+                      //     color: Colors.white,
+                      //   ),
+                      //   key: milkTeaGlobalKey,
+                      //   child: Image.asset(
+                      //     "assets/image/brand_store_hx.png",
+                      //     fit: BoxFit.fill,
+                      //     width: double.infinity,
+                      //   ),
+                      // ),
+                      // Container(
+                      //   decoration: new BoxDecoration(
+                      //     border: Border(
+                      //         bottom: BorderSide(
+                      //             color: Colors.white, width: 0.0)),
+                      //     color: Colors.white,
+                      //   ),
+                      //   padding:
+                      //   EdgeInsets.only(left: 32, right: 33, bottom: 18),
+                      //   child: Column(
+                      //     mainAxisAlignment: MainAxisAlignment.spaceAround,
+                      //     crossAxisAlignment: CrossAxisAlignment.start,
+                      //     children: [
+                      //       Row(
+                      //         mainAxisAlignment: MainAxisAlignment.start,
+                      //         crossAxisAlignment: CrossAxisAlignment.start,
+                      //         children: [
+                      //           Padding(
+                      //             padding: EdgeInsets.only(right: 12),
+                      //             child: Text(
+                      //               "●",
+                      //               style: TextStyle(
+                      //                   fontSize: 10,
+                      //                   color: Color(0xffE2BA83)),
+                      //             ),
+                      //           ),
+                      //           Padding(
+                      //             padding: EdgeInsets.only(bottom: 8),
+                      //             child: Text(
+                      //               "武昌区松竹路汉街总部国际C座正对面(肥肥虾庄旁)",
+                      //               style: TextStyle(
+                      //                   fontSize: 10,
+                      //                   color: Color(0xff604843)),
+                      //             ),
+                      //           ),
+                      //         ],
+                      //       ),
+                      //       Row(
+                      //         mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      //         crossAxisAlignment: CrossAxisAlignment.center,
+                      //         children: [
+                      //           Padding(
+                      //             padding: EdgeInsets.only(right: 12),
+                      //             child: Text(
+                      //               "●",
+                      //               style: TextStyle(
+                      //                   fontSize: 10,
+                      //                   color: Color(0xffE2BA83)),
+                      //             ),
+                      //           ),
+                      //           Expanded(
+                      //             flex: 1,
+                      //             child: Text(
+                      //               "10:00-21:00",
+                      //               style: TextStyle(
+                      //                   fontSize: 10,
+                      //                   color: Color(0xff604843)),
+                      //             ),
+                      //           ),
+                      //           Text(
+                      //             "去逛逛",
+                      //             style: TextStyle(
+                      //                 fontSize: 13, color: Color(0xff604843)),
+                      //           ),
+                      //           Image.asset("assets/image/icon_right_z.png"),
+                      //         ],
+                      //       )
+                      //     ],
+                      //   ),
+                      // ),
+                      // Container(
+                      //   decoration: new BoxDecoration(
+                      //     border: Border(
+                      //         bottom: BorderSide(
+                      //             color: Colors.white, width: 0.0)),
+                      //     color: Colors.white,
+                      //   ),
+                      //   padding:
+                      //   EdgeInsets.only(left: 32, right: 33, bottom: 18),
+                      //   child: Column(
+                      //     mainAxisAlignment: MainAxisAlignment.spaceAround,
+                      //     crossAxisAlignment: CrossAxisAlignment.start,
+                      //     children: [
+                      //       RoundButton(
+                      //         width: 142,
+                      //         height: 28,
+                      //         text: "海峡姐妹荟聚A店",
+                      //         textColor: Colors.white,
+                      //         fontSize: 14,
+                      //         padding: EdgeInsets.only(
+                      //             top: 4, bottom: 4, left: 14, right: 14),
+                      //         backgroup: Color(0xffE2BA83),
+                      //         fontWeight: FontWeight.bold,
+                      //       ),
+                      //       Row(
+                      //         mainAxisAlignment: MainAxisAlignment.start,
+                      //         crossAxisAlignment: CrossAxisAlignment.start,
+                      //         children: [
+                      //           Padding(
+                      //             padding:
+                      //             EdgeInsets.only(right: 12, top: 12),
+                      //             child: Text(
+                      //               "●",
+                      //               style: TextStyle(
+                      //                   fontSize: 10,
+                      //                   color: Color(0xffE2BA83)),
+                      //             ),
+                      //           ),
+                      //           Padding(
+                      //             padding:
+                      //             EdgeInsets.only(bottom: 8, top: 12),
+                      //             child: Text(
+                      //               "硚口区园博大道1号武汉荟聚购物中心2楼F区\n109-4号商铺",
+                      //               style: TextStyle(
+                      //                   fontSize: 10,
+                      //                   color: Color(0xff604843)),
+                      //             ),
+                      //           ),
+                      //         ],
+                      //       ),
+                      //       Row(
+                      //         mainAxisAlignment:
+                      //         MainAxisAlignment.spaceBetween,
+                      //         crossAxisAlignment: CrossAxisAlignment.center,
+                      //         children: [
+                      //           Padding(
+                      //             padding: EdgeInsets.only(right: 12),
+                      //             child: Text(
+                      //               "●",
+                      //               style: TextStyle(
+                      //                   fontSize: 10,
+                      //                   color: Color(0xffE2BA83)),
+                      //             ),
+                      //           ),
+                      //           Expanded(
+                      //             flex: 1,
+                      //             child: Text(
+                      //               "10:00-21:00",
+                      //               style: TextStyle(
+                      //                   fontSize: 10,
+                      //                   color: Color(0xff604843)),
+                      //             ),
+                      //           ),
+                      //           Text(
+                      //             "去逛逛",
+                      //             style: TextStyle(
+                      //                 fontSize: 13, color: Color(0xff604843)),
+                      //           ),
+                      //           Image.asset("assets/image/icon_right_z.png"),
+                      //         ],
+                      //       )
+                      //     ],
+                      //   ),
+                      // ),
+                      // SizedBox(
+                      //   height: 16,
+                      // ),
+                      // Container(
+                      //   decoration: new BoxDecoration(
+                      //     border: Border(
+                      //         bottom: BorderSide(
+                      //             color: Color(0xff052C4B), width: 0.0)),
+                      //     color: Color(0xff052C4B),
+                      //   ),
+                      //   key: breadGlobalKey,
+                      //   child: Image.asset(
+                      //     "assets/image/brand_store_bg.png",
+                      //     fit: BoxFit.fill,
+                      //     width: double.infinity,
+                      //   ),
+                      // ),
+                      // Container(
+                      //   decoration: new BoxDecoration(
+                      //     border: Border(
+                      //         bottom: BorderSide(
+                      //             color: Color(0xff052C4B), width: 0.0)),
+                      //     color: Color(0xff052C4B),
+                      //   ),
+                      //   padding:
+                      //   EdgeInsets.only(left: 46, right: 44, bottom: 21),
+                      //   child: Column(
+                      //     mainAxisAlignment: MainAxisAlignment.spaceAround,
+                      //     crossAxisAlignment: CrossAxisAlignment.start,
+                      //     children: [
+                      //       Padding(
+                      //         padding: EdgeInsets.only(bottom: 8),
+                      //         child: Text(
+                      //           "01  前进麦味(光谷店）",
+                      //           style: TextStyle(
+                      //               fontSize: 12, color: Color(0xffFFFCF5)),
+                      //         ),
+                      //       ),
+                      //       Padding(
+                      //         padding: EdgeInsets.only(bottom: 5),
+                      //         child: Text(
+                      //           "地址:洪山区关山大道328号附7号",
+                      //           style: TextStyle(
+                      //               fontSize: 10, color: Colors.white),
+                      //         ),
+                      //       ),
+                      //       Row(
+                      //         mainAxisAlignment:
+                      //         MainAxisAlignment.spaceBetween,
+                      //         crossAxisAlignment: CrossAxisAlignment.center,
+                      //         children: [
+                      //           Expanded(
+                      //             flex: 1,
+                      //             child: Text(
+                      //               "时间:09:00-20:30",
+                      //               style: TextStyle(
+                      //                   fontSize: 10, color: Colors.white),
+                      //             ),
+                      //           ),
+                      //           Text(
+                      //             "去了解",
+                      //             style: TextStyle(
+                      //                 fontSize: 13, color: Color(0xffFFFDF6)),
+                      //           ),
+                      //           Image.asset("assets/image/icon_right.png"),
+                      //         ],
+                      //       )
+                      //     ],
+                      //   ),
+                      // ),
+                      // Container(
+                      //   decoration: new BoxDecoration(
+                      //     border: Border(
+                      //         bottom: BorderSide(
+                      //             color: Color(0xff052C4B), width: 0.0)),
+                      //     color: Color(0xff052C4B),
+                      //   ),
+                      //   padding:
+                      //   EdgeInsets.only(left: 46, right: 44, bottom: 41),
+                      //   child: Column(
+                      //     mainAxisAlignment: MainAxisAlignment.spaceAround,
+                      //     crossAxisAlignment: CrossAxisAlignment.start,
+                      //     children: [
+                      //       Padding(
+                      //         padding: EdgeInsets.only(bottom: 8),
+                      //         child: Text(
+                      //           "02  前进麦味(哈乐城店）",
+                      //           style: TextStyle(
+                      //               fontSize: 12, color: Color(0xffFFFCF5)),
+                      //         ),
+                      //       ),
+                      //       Padding(
+                      //         padding: EdgeInsets.only(bottom: 5),
+                      //         child: Text(
+                      //           "地址:武昌区凯德1818蓝调步行街(蔡明纬店旁)",
+                      //           style: TextStyle(
+                      //               fontSize: 10, color: Colors.white),
+                      //         ),
+                      //       ),
+                      //       Row(
+                      //         mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      //         crossAxisAlignment: CrossAxisAlignment.center,
+                      //         children: [
+                      //           Expanded(
+                      //             flex: 1,
+                      //             child: Text(
+                      //               "时间:09:00-20:30",
+                      //               style: TextStyle(
+                      //                   fontSize: 10, color: Colors.white),
+                      //             ),
+                      //           ),
+                      //           Text(
+                      //             "去了解",
+                      //             style: TextStyle(
+                      //                 fontSize: 13, color: Color(0xffFFFDF6)),
+                      //           ),
+                      //           Image.asset("assets/image/icon_right.png"),
+                      //         ],
+                      //       )
+                      //     ],
+                      //   ),
+                      // ),
                     ],
                   ),
                 ),
diff --git a/lib/integral/integral_page.dart b/lib/integral/integral_page.dart
index 54ceb383..6316fa0a 100644
--- a/lib/integral/integral_page.dart
+++ b/lib/integral/integral_page.dart
@@ -325,7 +325,7 @@ class _IntegralPage extends State<IntegralPage> {
           borderRadius: BorderRadius.all(Radius.circular(4)),
         ),
         child: Column(
-          mainAxisAlignment: MainAxisAlignment.spaceAround,
+          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             Text(
diff --git a/lib/mine/recharge_page.dart b/lib/mine/recharge_page.dart
index 3b09e865..7b3e3ae3 100644
--- a/lib/mine/recharge_page.dart
+++ b/lib/mine/recharge_page.dart
@@ -83,7 +83,6 @@ class _RechargePage extends State<RechargePage> {
               ),
               Container(
                 width: double.infinity,
-                height: 0.171.sh,
                 margin:
                     EdgeInsets.only(left: 20, right: 20, top: 12, bottom: 4),
                 padding:
diff --git a/lib/union/union_page.dart b/lib/union/union_page.dart
index 3b946f67..b8dc23c7 100644
--- a/lib/union/union_page.dart
+++ b/lib/union/union_page.dart
@@ -170,7 +170,7 @@ class _UnionPage extends State<UnionPage> with AutomaticKeepAliveClientMixin {
     }).catchError((error) {
       refreshController.refreshFailed();
     });
-    Navigator.pop(dialogContext);
+    Navigator.of(dialogContext).pop();
     if (baseData.isSuccess) {
       storeList = (baseData.data as List<dynamic>)
           .map((e) => Store.fromJson(e))

From 4f1cdda3c9de705511fdfedd281a50ec64dc19b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=93=88=E5=93=88=E5=93=88?= <fengmeikan@hotmail.com>
Date: Sun, 4 Jul 2021 19:27:52 +0800
Subject: [PATCH 3/5] =?UTF-8?q?ios=E6=89=93=E5=8C=85=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ios/Runner/Runner.entitlements                |   8 +
 ios/UniMPSDK/Readme/iOSThirdPartyNotices.txt  | 847 ------------------
 ios/UniMPSDK/license.md                       |  54 --
 lib/retrofit/data/activity.g.dart             |  44 -
 lib/retrofit/data/address.g.dart              |  40 -
 lib/retrofit/data/base_data.g.dart            |  32 -
 lib/retrofit/data/base_data_extra.g.dart      |  14 -
 lib/retrofit/data/coupon.g.dart               |  64 --
 lib/retrofit/data/data_type.g.dart            |  18 -
 lib/retrofit/data/exchange_order.g.dart       |  45 -
 lib/retrofit/data/exchange_order_goods.g.dart |  53 --
 lib/retrofit/data/goods.g.dart                |  61 --
 lib/retrofit/data/member_rank.g.dart          |  33 -
 lib/retrofit/data/page.g.dart                 |  30 -
 lib/retrofit/data/sign_in.g.dart              |  46 -
 lib/retrofit/data/sign_info.g.dart            |  32 -
 lib/retrofit/data/store.g.dart                |  74 --
 lib/retrofit/data/store_type.g.dart           |  18 -
 lib/retrofit/data/task.g.dart                 |  42 -
 lib/retrofit/data/upload_result.g.dart        |  67 --
 lib/retrofit/data/user_entity.g.dart          |  39 -
 lib/retrofit/data/user_info.g.dart            |  48 -
 lib/retrofit/data/verify_code.g.dart          |  33 -
 23 files changed, 8 insertions(+), 1734 deletions(-)
 create mode 100644 ios/Runner/Runner.entitlements
 delete mode 100644 ios/UniMPSDK/Readme/iOSThirdPartyNotices.txt
 delete mode 100644 ios/UniMPSDK/license.md
 delete mode 100644 lib/retrofit/data/activity.g.dart
 delete mode 100644 lib/retrofit/data/address.g.dart
 delete mode 100644 lib/retrofit/data/base_data.g.dart
 delete mode 100644 lib/retrofit/data/base_data_extra.g.dart
 delete mode 100644 lib/retrofit/data/coupon.g.dart
 delete mode 100644 lib/retrofit/data/data_type.g.dart
 delete mode 100644 lib/retrofit/data/exchange_order.g.dart
 delete mode 100644 lib/retrofit/data/exchange_order_goods.g.dart
 delete mode 100644 lib/retrofit/data/goods.g.dart
 delete mode 100644 lib/retrofit/data/member_rank.g.dart
 delete mode 100644 lib/retrofit/data/page.g.dart
 delete mode 100644 lib/retrofit/data/sign_in.g.dart
 delete mode 100644 lib/retrofit/data/sign_info.g.dart
 delete mode 100644 lib/retrofit/data/store.g.dart
 delete mode 100644 lib/retrofit/data/store_type.g.dart
 delete mode 100644 lib/retrofit/data/task.g.dart
 delete mode 100644 lib/retrofit/data/upload_result.g.dart
 delete mode 100644 lib/retrofit/data/user_entity.g.dart
 delete mode 100644 lib/retrofit/data/user_info.g.dart
 delete mode 100644 lib/retrofit/data/verify_code.g.dart

diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements
new file mode 100644
index 00000000..fbad0237
--- /dev/null
+++ b/ios/Runner/Runner.entitlements
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>keychain-access-groups</key>
+	<array/>
+</dict>
+</plist>
diff --git a/ios/UniMPSDK/Readme/iOSThirdPartyNotices.txt b/ios/UniMPSDK/Readme/iOSThirdPartyNotices.txt
deleted file mode 100644
index a273b41d..00000000
--- a/ios/UniMPSDK/Readme/iOSThirdPartyNotices.txt
+++ /dev/null
@@ -1,847 +0,0 @@
-Third Party Legal Notices
-
-This product use Third Party code for certain functions may include licensed under
-terms that require iOS App to display the following notices:
-
-
-************************************************************************************
-GPUImage
-
-Copyright (c) 2012, Brad Larson, Ben Cochran, Hugues Lismonde, Keitaroh Kobayashi, Alaric Cole, Matthew Clark, Jacob Gundersen, Chris Williams.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-Neither the name of the GPUImage framework nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-************************************************************************************
-TZImagePickerController
-
-The MIT License (MIT)
-
-Copyright (c) 2016 Zhen Tan
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-************************************************************************************
-zxingify-objc
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
-************************************************************************************
-incubator-weex
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2019 Apache Weex (Incubating)
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
-==============================================================================
-
-Apache Weex Submodules:
-
-Apache Weex includes a number of submodules with separate copyright notices
-and license terms. Your use of these submodules is subject to the terms and
-conditions of the following licenses.
-
-This product bundles vuejs v1.0.12, which is available under a
-"MIT" license. For details, see https://github.com/vuejs/vue/blob/v1.0.12/LICENSE and following files:
-  src/js-framework/dist/index.js
-  runtime/frameworks/legacy/core/array.js
-  runtime/frameworks/legacy/core/dep.js
-  runtime/frameworks/legacy/core/object.js
-  runtime/frameworks/legacy/core/observer.js
-  runtime/frameworks/legacy/core/state.js
-  runtime/frameworks/legacy/core/watcher.js
-
-  The MIT License (MIT)
-
-  Copyright (c) 2013-2014 Yuxi Evan You
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-
-
-This product bundles Guava v20.0, which is available under a "Apache" license. For details, see https://github.com/google/guava/blob/v20.0/COPYING and following files:
-  android/sdk/src/main/java/org/apache/weex/utils/WXDataStructureUtil.java
-
-This product bundles json11 v1.0.0, which is available under a "MIT" license. For details, see https://github.com/dropbox/json11/tree/v1.0.0 and following files:
-   weex_core/Source/third_party/json11/json11.cc
-   weex_core/Source/third_party/json11/json11.hpp
-
-   /* Copyright (c) 2013 Dropbox, Inc.
-   *
-   * Permission is hereby granted, free of charge, to any person obtaining a copy
-   * of this software and associated documentation files (the "Software"), to deal
-   * in the Software without restriction, including without limitation the rights
-   * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   * copies of the Software, and to permit persons to whom the Software is
-   * furnished to do so, subject to the following conditions:
-   *
-   * The above copyright notice and this permission notice shall be included in
-   * all copies or substantial portions of the Software.
-   *
-   * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   * THE SOFTWARE.
-   */
-
-This product bundles chromium v66.0.3344.2, which is available under a "BSD-style" license. For details, see https://github.com/chromium/chromium/blob/66.0.3344.2/ and following files:
-   modp_b64:
-      The following files are copied from https://github.com/chromium/chromium/tree/master/third_party/modp_b64 and their names are listed below:
-         weex_core/Source/base/base64/modp_base64/modp_b64_data.h
-         weex_core/Source/base/base64/modp_base64/modp_b64.cc
-         weex_core/Source/base/base64/modp_base64/modp_b64.h
-
-      License for above files:
-         * MODP_B64 - High performance base64 encoder/decoder
-         * Version 1.3 -- 17-Mar-2006
-         * http://modp.com/release/base64
-         *
-         * Copyright (c) 2005, 2006  Nick Galbreath -- nickg [at] modp [dot] com
-         * All rights reserved.
-         *
-         * Redistribution and use in source and binary forms, with or without
-         * modification, are permitted provided that the following conditions are
-         * met:
-         *
-         *   Redistributions of source code must retain the above copyright
-         *   notice, this list of conditions and the following disclaimer.
-         *
-         *   Redistributions in binary form must reproduce the above copyright
-         *   notice, this list of conditions and the following disclaimer in the
-         *   documentation and/or other materials provided with the distribution.
-         *
-         *   Neither the name of the modp.com nor the names of its
-         *   contributors may be used to endorse or promote products derived from
-         *   this software without specific prior written permission.
-         *
-         * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-         * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-         * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-         * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-         * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-         * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-         * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-         * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-         * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-         * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-         * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-   ICU:
-      The following files are copied from https://github.com/chromium/chromium/tree/66.0.3344.2/base/third_party/icu and their names are listed below:
-         weex_core/Source/base/third_party/icu/icu_utf.h
-         weex_core/Source/base/third_party/icu/icu_utf.cpp
-      
-      License for above files:
-         /* COPYRIGHT AND PERMISSION NOTICE (ICU 58 and later)
-         *
-         * Copyright © 1991-2017 Unicode, Inc. All rights reserved.
-         * Distributed under the Terms of Use in http://www.unicode.org/copyright.html
-         *
-         * Permission is hereby granted, free of charge, to any person obtaining
-         * a copy of the Unicode data files and any associated documentation
-         * (the "Data Files") or Unicode software and any associated documentation
-         * (the "Software") to deal in the Data Files or Software
-         * without restriction, including without limitation the rights to use,
-         * copy, modify, merge, publish, distribute, and/or sell copies of
-         * the Data Files or Software, and to permit persons to whom the Data Files
-         * or Software are furnished to do so, provided that either
-         * (a) this copyright and permission notice appear with all copies
-         * of the Data Files or Software, or
-         * (b) this copyright and permission notice appear in associated
-         * Documentation.
-         * 
-         * THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
-         * ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-         * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-         * NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-         * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
-         * NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
-         * DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-         * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-         * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-         * PERFORMANCE OF THE DATA FILES OR SOFTWARE.
-         * 
-         * Except as contained in this notice, the name of a copyright holder
-         * shall not be used in advertising or otherwise to promote the sale,
-         * use or other dealings in these Data Files or Software without prior
-         * written authorization of the copyright holder.
-         *
-         * ---------------------
-         *
-         * Third-Party Software Licenses
-         *  
-         * This section contains third-party software notices and/or additional
-         * terms for licensed third-party software components included within ICU
-         * libraries.
-         * 
-         * 1. ICU License - ICU 1.8.1 to ICU 57.1
-         *
-         * COPYRIGHT AND PERMISSION NOTICE
-         * 
-         * Copyright (c) 1995-2016 International Business Machines Corporation and others
-         * All rights reserved.
-         *  
-         * Permission is hereby granted, free of charge, to any person obtaining
-         * a copy of this software and associated documentation files (the
-         * "Software"), to deal in the Software without restriction, including
-         * without limitation the rights to use, copy, modify, merge, publish,
-         * distribute, and/or sell copies of the Software, and to permit persons
-         * to whom the Software is furnished to do so, provided that the above
-         * copyright notice(s) and this permission notice appear in all copies of
-         * the Software and that both the above copyright notice(s) and this
-         * permission notice appear in supporting documentation.
-         * 
-         * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-         * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-         * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-         * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-         * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY
-         * SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
-         * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-         * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-         * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-         * 
-         * Except as contained in this notice, the name of a copyright holder
-         * shall not be used in advertising or otherwise to promote the sale, use
-         * or other dealings in this Software without prior written authorization
-         * of the copyright holder.
-         * 
-         * All trademarks and registered trademarks mentioned herein are the
-         * property of their respective owners.
-
-   Other files:
-      weex_core/Source/base/android/jniprebuild/jni_generator.py
-
-      The license for this file is below:
-      # Copyright (c) 2012 The Chromium Authors. All rights reserved.
-      # Use of this source code is governed by a BSD-style license that can be
-      # found in the LICENSE file.
-
-This product bundles Android Open Source Project vandroid-4.2.2_r1, which is available under a "BSD" license. For details, see https://android.googlesource.com/platform/bionic/+/android-4.2.2_r1/libc/README and following files:
-  weex_core/Source/IPC/futex.h
-
-This product bundles files from Boost under "Boost Software License". For more details, reference http://www.boost.org/LICENSE_1_0.txt
-  weex_core/Source/js_runtime/utils/base64.hpp
-
-  //
-  // Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
-  //
-  // Distributed under the Boost Software License, Version 1.0. (See accompanying
-  // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-  //
-
-
-************************************************************************************
-ZipArchive
-
-Copyright (c) 2010-2015, Sam Soffes, https://soff.es
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-************************************************************************************
-ijkplayer
-
-Copyright (c) 2017 Bilibili
-Licensed under LGPLv2.1 or later
-ijkplayer required features are based on or derives from projects below:
-
-LGPL
-  FFmpeg
-  libVLC
-  kxmovie
-  soundtouch
-zlib license
-  SDL
-BSD-style license
-  libyuv
-ISC license
-  libyuv/source/x86inc.asm
-
-android/ijkplayer-exo is based on or derives from projects below:
-
-Apache License 2.0
-  ExoPlayer
-
-android/example is based on or derives from projects below:
-
-GPL
-  android-ndk-profiler (not included by default)
-
-ios/IJKMediaDemo is based on or derives from projects below:
-
-Unknown license
-  iOS7-BarcodeScanner
-
-ijkplayer's build scripts are based on or derives from projects below:
-
-  gas-preprocessor
-  VideoLAN
-  yixia/FFmpeg-Android
-  kewlbear/FFmpeg-iOS-build-script
-
-Commercial Use
-ijkplayer is licensed under LGPLv2.1 or later, so itself is free for commercial use under LGPLv2.1 or later
-
-But ijkplayer is also based on other different projects under various licenses, which I have no idea whether they are compatible to each other or to your product.
-
-IANAL, you should always ask your lawyer for these stuffs before use it in your product.
-
-
-************************************************************************************
-SVProgressHUD
-
-MIT License
-
-Copyright (c) 2011-2018 Sam Vermette, Tobias Tiemerding and contributors.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-************************************************************************************
-SDWebImage
-
-Copyright (c) 2009-2018 Olivier Poitrey rs@dailymotion.com
- 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
- 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
- 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
-************************************************************************************
-Masonry
-
-Copyright (c) 2011-2012 Masonry Team - https://github.com/Masonry
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
-************************************************************************************
-HJDanmakuDemo
-
-MIT License
-
-Copyright (c) 2015 庞海礁
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
diff --git a/ios/UniMPSDK/license.md b/ios/UniMPSDK/license.md
deleted file mode 100644
index 6ddb0cac..00000000
--- a/ios/UniMPSDK/license.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# html5plus runtime 使用许可协议
-本协议是数字天堂（北京）网络技术有限公司（以下称“DCloud”）与您之间达成的关于html5plus runtime及相关配套软件（以下简称本软件）的协议。
-本协议签订地点为中华人民共和国北京市海淀区。
-您使用本软件即视为您已阅读并同意受本协议的约束。
-
-## 定义
-html5plus runtime，即DCloud公司提供的App端引擎，该引擎可用于5+App、wap2app、uni-app的App端打包，及5+sdk、uni小程序sdk等离线打包用sdk。
-本软件包含iOS版和Android版。
-
-本软件包括很多模块，包括DCloud的uni统计、uni-AD、uniPush等业务的客户端sdk部分，也属于本产品的模块。但这些模块都可以由您自行选择是否启用。
-
-## 知识产权及使用授权
-您可以自由下载、使用、复制本软件而不需要向DCloud付费。无时间和地域限制。
-DCloud所拥有的知识产权，包括但不限于商标、专利、著作权、商业秘密、专有数据、源码，并不发生转移或共享。
-您使用本软件开发的代码及输出物，即手机端移动应用，其知识产权归属您所有。
-类似于您开发的应用内嵌了jvm或.net framework，虽然您的java代码的著作权属于您，但jvm等三方runtime的知识产权仍归原作者所有。
-如果DCloud开源了某些代码，这些代码会有单独的开源许可协议并提供在github等网站的DCloud官方账号下。您可以在遵守这些开源协议的基础上使用DCloud开源的代码。
-本软件可能会使用第三方软件或技术，例如三方开源代码，这类使用已经确保遵循这些三方软件的授权协议。详细的列表在本软件目录下的ThirdPartyNotices文件中查阅。
-特别的，如果您使用uni小程序sdk，该产品的授权范围仅限制在原生App中将某个栏目或模块进行小程序化而使用，不可用于将uni-app前端代码打包成App。
-您不得破解、反编译、逆向工程本软件，不得破解或劫持本软件网络请求，不得对DCloud服务进行网络攻击，不得利用DCloud系统漏洞谋利或侵害DCloud利益，不得替换、删改本软件自带的非用户自定义文件。
-未经书面许可您不可利用DCloud产品的全部或部分文件、模块、组件来制作与DCloud争夺用户的产品。
-
-
-## 隐私条款
-DCloud尊重用户隐私，遵循国家对数据隐私保护的相关法律法规，并在此公开所有本软件会上报DCloud服务器的数据清单，以及说明数据采集的必要性。
-1. 异常崩溃、错误日志
-本软件发生错误异常、崩溃时，会将错误信息发送给DCloud服务器。
-这些信息除了错误内容，也包括应用基本信息（如appid、包名）和环境信息（如设备型号、os名称、版本、网络类型等）。
-同时DCloud会提供web界面供您查看了解崩溃情况。您可以分析错误在什么情况下产生，不同设备的崩溃率分布情况，并进行改进。
-由于开发者的代码为前端代码，无法捕获原生异常和崩溃。如果DCloud不提供此信息，您将无法了解相关情况，所以采集和输出报告是帮助您顺利使用本软件的必要举措。
-2. 启动速度性能分析
-本软件每次启动会记录启动时长，也包括上述应用基本信息和环境信息。
-同时DCloud会提供web界面供你了解相关性能报表。您可以分析在不同的设备、网络环境下您的应用的启动速度是否异常，并进行改进。
-由于开发者的代码为前端代码，无法记录App初始启动计时点。如果DCloud不提供此信息，您将无法了解相关情况，所以采集和输出报告是帮助您顺利使用本软件的必要举措。
-3. 本软件不会采集用户的短信、通讯录、相册、剪贴板信息，不会采集用户的摄像头、麦克风数据。
-4. 除非国家法律法规规定或得到您的许可，否则DCloud不会将采集的数据授权给任何第三方。
-5. 如果您使用了DCloud的其他联网业务，比如uni统计、uni-AD、uniPush，这些业务的隐私条款不包括在本协议中。
-
-## 安全
-您理解并同意，本软件同其他软件一样，无法承诺绝对的安全性。
-当DCloud发现本软件的任何安全漏洞时，将及时在[社区](https://ask.dcloud.net.cn/explore/)发送公告，并将及时发布紧急更新补丁和升级推送通知。
-
-## 免责声明和违约条款
-您在使用本软件前应进行有效评估，DCloud不因您使用本软件而承担任何法律责任或经济赔偿责任。
-如果您违反本协议，包括但不限于破解本软件，DCloud将有权停止您使用本软件，造成的损失由您自行承担。
-如果您给DCloud造成重大损失，或者在接收到DCloud的停止违约通知后拒不改正，DCloud将有权停止对您的DCloud所有产品和服务的使用授权，罚没您在DCloud所有产品服务中的预付款项和应收款项，因此造成的损失由您自行承担。
-如果您的行为产生法律问题，DCloud有权追责您的法律责任。
-
-## 协议修订
-根据发展，DCloud可能会对本协议进行修改。修改时，DCloud会在产品或者网页中显著的位置发布相关信息以便及时通知到用户。如果您选择继续使用本软件，即表示您同意接受这些修改。
-
-## 联系我们
-若您对本软件有任何疑问、意见和建议，欢迎联系我们：[网站](https://DCloud.io)
-若您对本协议有任何不满，希望更改条款，可以通过与 bd@dcloud.io 沟通，商谈您需要的付费版使用协议。
diff --git a/lib/retrofit/data/activity.g.dart b/lib/retrofit/data/activity.g.dart
deleted file mode 100644
index de88e232..00000000
--- a/lib/retrofit/data/activity.g.dart
+++ /dev/null
@@ -1,44 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'activity.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-Activity _$ActivityFromJson(Map<String, dynamic> json) {
-  return Activity()
-    ..id = json['id'] as String
-    ..createTime = json['createTime'] as String
-    ..createUser = json['createUser']
-    ..updateTime = json['updateTime'] as String
-    ..updateUser = json['updateUser']
-    ..storeId = json['storeId'] as String
-    ..mainTitle = json['mainTitle'] as String
-    ..viceTitle = json['viceTitle'] as String
-    ..content = json['content'] as String
-    ..coverImg = json['coverImg'] as String
-    ..startTime = json['startTime'] as String
-    ..endTime = json['endTime'] as String
-    ..state = json['state'] as int
-    ..isDelete = json['isDelete'] as int
-    ..storeName = json['storeName'] as String;
-}
-
-Map<String, dynamic> _$ActivityToJson(Activity instance) => <String, dynamic>{
-      'id': instance.id,
-      'createTime': instance.createTime,
-      'createUser': instance.createUser,
-      'updateTime': instance.updateTime,
-      'updateUser': instance.updateUser,
-      'storeId': instance.storeId,
-      'mainTitle': instance.mainTitle,
-      'viceTitle': instance.viceTitle,
-      'content': instance.content,
-      'coverImg': instance.coverImg,
-      'startTime': instance.startTime,
-      'endTime': instance.endTime,
-      'state': instance.state,
-      'isDelete': instance.isDelete,
-      'storeName': instance.storeName,
-    };
diff --git a/lib/retrofit/data/address.g.dart b/lib/retrofit/data/address.g.dart
deleted file mode 100644
index 392f0ad0..00000000
--- a/lib/retrofit/data/address.g.dart
+++ /dev/null
@@ -1,40 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'address.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-Address _$AddressFromJson(Map<String, dynamic> json) {
-  return Address()
-    ..address = json['address'] as String
-    ..area = json['area'] as String
-    ..city = json['city'] as String
-    ..cityInfo = json['cityInfo'] as String
-    ..id = json['id'] as String
-    ..isDefault = json['isDefault'] as bool
-    ..latitude = json['latitude'] as String
-    ..longitude = json['longitude'] as String
-    ..mid = json['mid'] as String
-    ..phone = json['phone'] as String
-    ..province = json['province'] as String
-    ..tag = json['tag'] as String
-    ..username = json['username'] as String;
-}
-
-Map<String, dynamic> _$AddressToJson(Address instance) => <String, dynamic>{
-      'address': instance.address,
-      'area': instance.area,
-      'city': instance.city,
-      'cityInfo': instance.cityInfo,
-      'id': instance.id,
-      'isDefault': instance.isDefault,
-      'latitude': instance.latitude,
-      'longitude': instance.longitude,
-      'mid': instance.mid,
-      'phone': instance.phone,
-      'province': instance.province,
-      'tag': instance.tag,
-      'username': instance.username,
-    };
diff --git a/lib/retrofit/data/base_data.g.dart b/lib/retrofit/data/base_data.g.dart
deleted file mode 100644
index a4422b59..00000000
--- a/lib/retrofit/data/base_data.g.dart
+++ /dev/null
@@ -1,32 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'base_data.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-BaseData _$BaseDataFromJson(Map<String, dynamic> json) {
-  return BaseData()
-    ..code = json['code'] as int
-    ..data = json['data']
-    ..extra = json['extra'] == null
-        ? null
-        : BaseDataExtra.fromJson(json['extra'] as Map<String, dynamic>)
-    ..isError = json['isError'] as bool
-    ..isSuccess = json['isSuccess'] as bool
-    ..msg = json['msg'] as String
-    ..path = json['path'] as String
-    ..timestamp = json['timestamp'] as String;
-}
-
-Map<String, dynamic> _$BaseDataToJson(BaseData instance) => <String, dynamic>{
-      'code': instance.code,
-      'data': instance.data,
-      'extra': instance.extra,
-      'isError': instance.isError,
-      'isSuccess': instance.isSuccess,
-      'msg': instance.msg,
-      'path': instance.path,
-      'timestamp': instance.timestamp,
-    };
diff --git a/lib/retrofit/data/base_data_extra.g.dart b/lib/retrofit/data/base_data_extra.g.dart
deleted file mode 100644
index ea48de2d..00000000
--- a/lib/retrofit/data/base_data_extra.g.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'base_data_extra.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-BaseDataExtra _$BaseDataExtraFromJson(Map<String, dynamic> json) {
-  return BaseDataExtra();
-}
-
-Map<String, dynamic> _$BaseDataExtraToJson(BaseDataExtra instance) =>
-    <String, dynamic>{};
diff --git a/lib/retrofit/data/coupon.g.dart b/lib/retrofit/data/coupon.g.dart
deleted file mode 100644
index 2e658e18..00000000
--- a/lib/retrofit/data/coupon.g.dart
+++ /dev/null
@@ -1,64 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'coupon.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-Coupon _$CouponFromJson(Map<String, dynamic> json) {
-  return Coupon()
-    ..id = json['id'] as String
-    ..createTime = json['createTime'] as String
-    ..createUser = json['createUser'] as String
-    ..updateTime = json['updateTime'] as String
-    ..updateUser = json['updateUser'] as String
-    ..bizType = json['bizType'] as int
-    ..fullAmount = json['fullAmount'] as String
-    ..discountAmount = json['discountAmount'] as String
-    ..discountPercent = json['discountPercent'] as int
-    ..bizId = json['bizId'] as String
-    ..publishStartTime = json['publishStartTime'] as String
-    ..publishEndTime = json['publishEndTime'] as String
-    ..useStartTime = json['useStartTime'] as String
-    ..useEndTime = json['useEndTime'] as String
-    ..promotionId = json['promotionId'] as String
-    ..centreDisplay = json['centreDisplay'] as bool
-    ..tenantCode = json['tenantCode'] as String
-    ..isDelete = json['isDelete'] as int
-    ..couponName = json['couponName'] as String
-    ..couponImg = json['couponImg'] as String
-    ..couponDescription = json['couponDescription'] as String
-    ..memberCouponId = json['memberCouponId'] as String
-    ..receiveTime = json['receiveTime'] as String
-    ..useTime = json['useTime']
-    ..status = json['status'] as int;
-}
-
-Map<String, dynamic> _$CouponToJson(Coupon instance) => <String, dynamic>{
-      'id': instance.id,
-      'createTime': instance.createTime,
-      'createUser': instance.createUser,
-      'updateTime': instance.updateTime,
-      'updateUser': instance.updateUser,
-      'bizType': instance.bizType,
-      'fullAmount': instance.fullAmount,
-      'discountAmount': instance.discountAmount,
-      'discountPercent': instance.discountPercent,
-      'bizId': instance.bizId,
-      'publishStartTime': instance.publishStartTime,
-      'publishEndTime': instance.publishEndTime,
-      'useStartTime': instance.useStartTime,
-      'useEndTime': instance.useEndTime,
-      'promotionId': instance.promotionId,
-      'centreDisplay': instance.centreDisplay,
-      'tenantCode': instance.tenantCode,
-      'isDelete': instance.isDelete,
-      'couponName': instance.couponName,
-      'couponImg': instance.couponImg,
-      'couponDescription': instance.couponDescription,
-      'memberCouponId': instance.memberCouponId,
-      'receiveTime': instance.receiveTime,
-      'useTime': instance.useTime,
-      'status': instance.status,
-    };
diff --git a/lib/retrofit/data/data_type.g.dart b/lib/retrofit/data/data_type.g.dart
deleted file mode 100644
index 1ea5414e..00000000
--- a/lib/retrofit/data/data_type.g.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'data_type.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-DataType _$DataTypeFromJson(Map<String, dynamic> json) {
-  return DataType()
-    ..desc = json['desc'] as String
-    ..code = json['code'] as String;
-}
-
-Map<String, dynamic> _$DataTypeToJson(DataType instance) => <String, dynamic>{
-      'desc': instance.desc,
-      'code': instance.code,
-    };
diff --git a/lib/retrofit/data/exchange_order.g.dart b/lib/retrofit/data/exchange_order.g.dart
deleted file mode 100644
index dfe5cd44..00000000
--- a/lib/retrofit/data/exchange_order.g.dart
+++ /dev/null
@@ -1,45 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'exchange_order.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-ExchangeOrder _$ExchangeOrderFromJson(Map<String, dynamic> json) {
-  return ExchangeOrder()
-    ..id = json['id'] as String
-    ..createTime = json['createTime'] as String
-    ..createUser = json['createUser'] as String
-    ..updateTime = json['updateTime'] as String
-    ..updateUser = json['updateUser'] as String
-    ..storeId = json['storeId'] as String
-    ..mid = json['mid'] as String
-    ..orderCode = json['orderCode'] as String
-    ..amount = json['amount'] as String
-    ..state = json['state'] as int
-    ..useTyped = json['useTyped'] as int
-    ..isDelete = json['isDelete'] as int
-    ..creditOrderDetailList = (json['creditOrderDetailList'] as List)
-        ?.map((e) => e == null
-            ? null
-            : ExchangeOrderGoods.fromJson(e as Map<String, dynamic>))
-        ?.toList();
-}
-
-Map<String, dynamic> _$ExchangeOrderToJson(ExchangeOrder instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'createTime': instance.createTime,
-      'createUser': instance.createUser,
-      'updateTime': instance.updateTime,
-      'updateUser': instance.updateUser,
-      'storeId': instance.storeId,
-      'mid': instance.mid,
-      'orderCode': instance.orderCode,
-      'amount': instance.amount,
-      'state': instance.state,
-      'useTyped': instance.useTyped,
-      'isDelete': instance.isDelete,
-      'creditOrderDetailList': instance.creditOrderDetailList,
-    };
diff --git a/lib/retrofit/data/exchange_order_goods.g.dart b/lib/retrofit/data/exchange_order_goods.g.dart
deleted file mode 100644
index 8ffd8d2d..00000000
--- a/lib/retrofit/data/exchange_order_goods.g.dart
+++ /dev/null
@@ -1,53 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'exchange_order_goods.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-ExchangeOrderGoods _$ExchangeOrderGoodsFromJson(Map<String, dynamic> json) {
-  return ExchangeOrderGoods()
-    ..id = json['id'] as String
-    ..createTime = json['createTime'] as String
-    ..createUser = json['createUser'] as String
-    ..updateTime = json['updateTime'] as String
-    ..updateUser = json['updateUser'] as String
-    ..orderId = json['orderId'] as String
-    ..goodsId = json['goodsId'] as String
-    ..categoryId = json['categoryId'] as String
-    ..name = json['name'] as String
-    ..description = json['description'] as String
-    ..worth = json['worth'] as String
-    ..price = json['price'] as String
-    ..couponId = json['couponId'] as String
-    ..canPick = json['canPick'] as bool
-    ..canDelivery = json['canDelivery'] as bool
-    ..goodsMainImg = json['goodsMainImg'] as String
-    ..goodsViceImg = json['goodsViceImg'] as String
-    ..goodsNumber = json['goodsNumber'] as int
-    ..isDelete = json['isDelete'] as int;
-}
-
-Map<String, dynamic> _$ExchangeOrderGoodsToJson(ExchangeOrderGoods instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'createTime': instance.createTime,
-      'createUser': instance.createUser,
-      'updateTime': instance.updateTime,
-      'updateUser': instance.updateUser,
-      'orderId': instance.orderId,
-      'goodsId': instance.goodsId,
-      'categoryId': instance.categoryId,
-      'name': instance.name,
-      'description': instance.description,
-      'worth': instance.worth,
-      'price': instance.price,
-      'couponId': instance.couponId,
-      'canPick': instance.canPick,
-      'canDelivery': instance.canDelivery,
-      'goodsMainImg': instance.goodsMainImg,
-      'goodsViceImg': instance.goodsViceImg,
-      'goodsNumber': instance.goodsNumber,
-      'isDelete': instance.isDelete,
-    };
diff --git a/lib/retrofit/data/goods.g.dart b/lib/retrofit/data/goods.g.dart
deleted file mode 100644
index 8923d6b2..00000000
--- a/lib/retrofit/data/goods.g.dart
+++ /dev/null
@@ -1,61 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'goods.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-Goods _$GoodsFromJson(Map<String, dynamic> json) {
-  return Goods()
-    ..canDelivery = json['canDelivery'] as bool
-    ..canPick = json['canPick'] as bool
-    ..categoryId = json['categoryId'] as String
-    ..categoryName = json['categoryName'] as String
-    ..couponId = json['couponId'] as String
-    ..createTime = json['createTime'] as String
-    ..createUser = json['createUser']
-    ..description = json['description'] as String
-    ..id = json['id'] as String
-    ..isDelete = json['isDelete']
-    ..isHot = json['isHot'] as bool
-    ..mainImgPath = json['mainImgPath'] as String
-    ..name = json['name'] as String
-    ..price = json['price'] as String
-    ..sales = json['sales']
-    ..sortOrder = json['sortOrder']
-    ..state = json['state']
-    ..stock = json['stock']
-    ..storeId = json['storeId'] as String
-    ..updateTime = json['updateTime'] as String
-    ..updateUser = json['updateUser'] as String
-    ..viceImgPaths =
-        (json['viceImgPaths'] as List)?.map((e) => e as String)?.toList()
-    ..worth = json['worth'] as String;
-}
-
-Map<String, dynamic> _$GoodsToJson(Goods instance) => <String, dynamic>{
-      'canDelivery': instance.canDelivery,
-      'canPick': instance.canPick,
-      'categoryId': instance.categoryId,
-      'categoryName': instance.categoryName,
-      'couponId': instance.couponId,
-      'createTime': instance.createTime,
-      'createUser': instance.createUser,
-      'description': instance.description,
-      'id': instance.id,
-      'isDelete': instance.isDelete,
-      'isHot': instance.isHot,
-      'mainImgPath': instance.mainImgPath,
-      'name': instance.name,
-      'price': instance.price,
-      'sales': instance.sales,
-      'sortOrder': instance.sortOrder,
-      'state': instance.state,
-      'stock': instance.stock,
-      'storeId': instance.storeId,
-      'updateTime': instance.updateTime,
-      'updateUser': instance.updateUser,
-      'viceImgPaths': instance.viceImgPaths,
-      'worth': instance.worth,
-    };
diff --git a/lib/retrofit/data/member_rank.g.dart b/lib/retrofit/data/member_rank.g.dart
deleted file mode 100644
index 5971713a..00000000
--- a/lib/retrofit/data/member_rank.g.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'member_rank.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-MemberRank _$MemberRankFromJson(Map<String, dynamic> json) {
-  return MemberRank()
-    ..id = json['id'] as String
-    ..nextId = json['nextId'] as String
-    ..nextName = json['nextName'] as String
-    ..nextOrigin = json['nextOrigin'] as int
-    ..rankContent = json['rankContent'] as String
-    ..rankImg = json['rankImg'] as String
-    ..rankName = json['rankName'] as String
-    ..rankOrigin = json['rankOrigin'] as int
-    ..status = json['status'] as bool;
-}
-
-Map<String, dynamic> _$MemberRankToJson(MemberRank instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'nextId': instance.nextId,
-      'nextName': instance.nextName,
-      'nextOrigin': instance.nextOrigin,
-      'rankContent': instance.rankContent,
-      'rankImg': instance.rankImg,
-      'rankName': instance.rankName,
-      'rankOrigin': instance.rankOrigin,
-      'status': instance.status,
-    };
diff --git a/lib/retrofit/data/page.g.dart b/lib/retrofit/data/page.g.dart
deleted file mode 100644
index 0eae5c04..00000000
--- a/lib/retrofit/data/page.g.dart
+++ /dev/null
@@ -1,30 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'page.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-PageInfo _$PageInfoFromJson(Map<String, dynamic> json) {
-  return PageInfo()
-    ..pageNum = json['pageNum'] as int
-    ..pageSize = json['pageSize'] as int
-    ..size = json['size'] as int
-    ..pages = json['pages'] as int
-    ..hasPreviousPage = json['hasPreviousPage'] as bool
-    ..hasNextPage = json['hasNextPage'] as bool
-    ..total = json['total'] as String
-    ..list = json['list'] as List;
-}
-
-Map<String, dynamic> _$PageInfoToJson(PageInfo instance) => <String, dynamic>{
-      'pageNum': instance.pageNum,
-      'pageSize': instance.pageSize,
-      'size': instance.size,
-      'pages': instance.pages,
-      'hasPreviousPage': instance.hasPreviousPage,
-      'hasNextPage': instance.hasNextPage,
-      'total': instance.total,
-      'list': instance.list,
-    };
diff --git a/lib/retrofit/data/sign_in.g.dart b/lib/retrofit/data/sign_in.g.dart
deleted file mode 100644
index 5d4abcd0..00000000
--- a/lib/retrofit/data/sign_in.g.dart
+++ /dev/null
@@ -1,46 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'sign_in.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-SignIn _$SignInFromJson(Map<String, dynamic> json) {
-  return SignIn()
-    ..balance = json['balance'] as String
-    ..category = json['category'] as String
-    ..createTime = json['createTime'] as String
-    ..createUser = json['createUser'] as String
-    ..id = json['id'] as String
-    ..isDeleted = json['isDeleted'] as bool
-    ..linkId = json['linkId'] as String
-    ..mark = json['mark'] as String
-    ..mid = json['mid'] as String
-    ..number = json['number'] as String
-    ..pm = json['pm'] as int
-    ..status = json['status'] as bool
-    ..title = json['title'] as String
-    ..type = json['type'] as String
-    ..updateTime = json['updateTime'] as String
-    ..updateUser = json['updateUser'] as String;
-}
-
-Map<String, dynamic> _$SignInToJson(SignIn instance) => <String, dynamic>{
-      'balance': instance.balance,
-      'category': instance.category,
-      'createTime': instance.createTime,
-      'createUser': instance.createUser,
-      'id': instance.id,
-      'isDeleted': instance.isDeleted,
-      'linkId': instance.linkId,
-      'mark': instance.mark,
-      'mid': instance.mid,
-      'number': instance.number,
-      'pm': instance.pm,
-      'status': instance.status,
-      'title': instance.title,
-      'type': instance.type,
-      'updateTime': instance.updateTime,
-      'updateUser': instance.updateUser,
-    };
diff --git a/lib/retrofit/data/sign_info.g.dart b/lib/retrofit/data/sign_info.g.dart
deleted file mode 100644
index 9b6e5f9c..00000000
--- a/lib/retrofit/data/sign_info.g.dart
+++ /dev/null
@@ -1,32 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'sign_info.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-SignInfo _$SignInfoFromJson(Map<String, dynamic> json) {
-  return SignInfo()
-    ..point = json['point'] as String
-    ..rank = json['rank'] == null
-        ? null
-        : MemberRank.fromJson(json['rank'] as Map<String, dynamic>)
-    ..signInList = (json['signInList'] as List)
-        ?.map((e) =>
-            e == null ? null : SignIn.fromJson(e as Map<String, dynamic>))
-        ?.toList()
-    ..taskList = (json['taskList'] as List)
-        ?.map(
-            (e) => e == null ? null : Task.fromJson(e as Map<String, dynamic>))
-        ?.toList()
-    ..rewardList = (json['rewardList'] as List)?.map((e) => e as int)?.toList();
-}
-
-Map<String, dynamic> _$SignInfoToJson(SignInfo instance) => <String, dynamic>{
-      'point': instance.point,
-      'rank': instance.rank,
-      'signInList': instance.signInList,
-      'taskList': instance.taskList,
-      'rewardList': instance.rewardList,
-    };
diff --git a/lib/retrofit/data/store.g.dart b/lib/retrofit/data/store.g.dart
deleted file mode 100644
index 1371b5c7..00000000
--- a/lib/retrofit/data/store.g.dart
+++ /dev/null
@@ -1,74 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'store.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-Store _$StoreFromJson(Map<String, dynamic> json) {
-  return Store()
-    ..id = json['id'] as String
-    ..createTime = json['createTime'] as String
-    ..createUser = json['createUser'] as String
-    ..updateTime = json['updateTime'] as String
-    ..updateUser = json['updateUser'] as String
-    ..tenantCode = json['tenantCode'] as String
-    ..useErp = json['useErp'] as bool
-    ..openStartTime = json['openStartTime'] as String
-    ..openEndTime = json['openEndTime'] as String
-    ..storeName = json['storeName'] as String
-    ..distance = (json['distance'] as num)?.toDouble()
-    ..logo = json['logo'] as String
-    ..shipAddress = json['shipAddress'] as String
-    ..remark = json['remark']
-    ..mobile = json['mobile'] as String
-    ..longitude = json['longitude'] as String
-    ..latitude = json['latitude'] as String
-    ..refundAddress = json['refundAddress']
-    ..refundTel = json['refundTel']
-    ..refundContact = json['refundContact']
-    ..isAutoSendRefundAddress = json['isAutoSendRefundAddress'] as int
-    ..province = json['province'] as String
-    ..city = json['city'] as String
-    ..district = json['district'] as String
-    ..address = json['address'] as String
-    ..headName = json['headName'] as String
-    ..headMobile = json['headMobile'] as String
-    ..deliveryInfo = json['deliveryInfo']
-    ..posType = json['posType'] == null
-        ? null
-        : StoreType.fromJson(json['posType'] as Map<String, dynamic>);
-}
-
-Map<String, dynamic> _$StoreToJson(Store instance) => <String, dynamic>{
-      'id': instance.id,
-      'createTime': instance.createTime,
-      'createUser': instance.createUser,
-      'updateTime': instance.updateTime,
-      'updateUser': instance.updateUser,
-      'tenantCode': instance.tenantCode,
-      'useErp': instance.useErp,
-      'openStartTime': instance.openStartTime,
-      'openEndTime': instance.openEndTime,
-      'storeName': instance.storeName,
-      'distance': instance.distance,
-      'logo': instance.logo,
-      'shipAddress': instance.shipAddress,
-      'remark': instance.remark,
-      'mobile': instance.mobile,
-      'longitude': instance.longitude,
-      'latitude': instance.latitude,
-      'refundAddress': instance.refundAddress,
-      'refundTel': instance.refundTel,
-      'refundContact': instance.refundContact,
-      'isAutoSendRefundAddress': instance.isAutoSendRefundAddress,
-      'province': instance.province,
-      'city': instance.city,
-      'district': instance.district,
-      'address': instance.address,
-      'headName': instance.headName,
-      'headMobile': instance.headMobile,
-      'deliveryInfo': instance.deliveryInfo,
-      'posType': instance.posType,
-    };
diff --git a/lib/retrofit/data/store_type.g.dart b/lib/retrofit/data/store_type.g.dart
deleted file mode 100644
index 7466837c..00000000
--- a/lib/retrofit/data/store_type.g.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'store_type.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-StoreType _$StoreTypeFromJson(Map<String, dynamic> json) {
-  return StoreType()
-    ..desc = json['desc'] as String
-    ..code = json['code'] as String;
-}
-
-Map<String, dynamic> _$StoreTypeToJson(StoreType instance) => <String, dynamic>{
-      'desc': instance.desc,
-      'code': instance.code,
-    };
diff --git a/lib/retrofit/data/task.g.dart b/lib/retrofit/data/task.g.dart
deleted file mode 100644
index d3e953c3..00000000
--- a/lib/retrofit/data/task.g.dart
+++ /dev/null
@@ -1,42 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'task.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-Task _$TaskFromJson(Map<String, dynamic> json) {
-  return Task()
-    ..aspects = json['aspects'] as String
-    ..complateNum = json['complateNum'] as int
-    ..conplateNum = json['conplateNum'] as int
-    ..createTime = json['createTime'] as String
-    ..createUser = json['createUser'] as String
-    ..id = json['id'] as String
-    ..limitDay = json['limitDay'] as int
-    ..name = json['name'] as String
-    ..rewardType = json['rewardType'] as int
-    ..rewardValue = json['rewardValue'] as String
-    ..status = json['status'] as bool
-    ..type = json['type'] as String
-    ..updateTime = json['updateTime'] as String
-    ..updateUser = json['updateUser'] as String;
-}
-
-Map<String, dynamic> _$TaskToJson(Task instance) => <String, dynamic>{
-      'aspects': instance.aspects,
-      'complateNum': instance.complateNum,
-      'conplateNum': instance.conplateNum,
-      'createTime': instance.createTime,
-      'createUser': instance.createUser,
-      'id': instance.id,
-      'limitDay': instance.limitDay,
-      'name': instance.name,
-      'rewardType': instance.rewardType,
-      'rewardValue': instance.rewardValue,
-      'status': instance.status,
-      'type': instance.type,
-      'updateTime': instance.updateTime,
-      'updateUser': instance.updateUser,
-    };
diff --git a/lib/retrofit/data/upload_result.g.dart b/lib/retrofit/data/upload_result.g.dart
deleted file mode 100644
index dcfe4bb9..00000000
--- a/lib/retrofit/data/upload_result.g.dart
+++ /dev/null
@@ -1,67 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'upload_result.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-UploadResult _$UploadResultFromJson(Map<String, dynamic> json) {
-  return UploadResult()
-    ..id = json['id'] as String
-    ..createTime = json['createTime'] as String
-    ..createUser = json['createUser'] as String
-    ..updateTime = json['updateTime'] as String
-    ..updateUser = json['updateUser'] as String
-    ..dataType = json['dataType'] == null
-        ? null
-        : DataType.fromJson(json['dataType'] as Map<String, dynamic>)
-    ..submittedFileName = json['submittedFileName'] as String
-    ..treePath = json['treePath'] as String
-    ..grade = json['grade'] as int
-    ..isDelete = json['isDelete'] as bool
-    ..folderId = json['folderId'] as String
-    ..url = json['url'] as String
-    ..size = json['size'] as String
-    ..folderName = json['folderName'] as String
-    ..group = json['group']
-    ..path = json['path'] as String
-    ..relativePath = json['relativePath'] as String
-    ..fileMd5 = json['fileMd5']
-    ..contextType = json['contextType'] as String
-    ..filename = json['filename'] as String
-    ..ext = json['ext'] as String
-    ..icon = json['icon'] as String
-    ..createMonth = json['createMonth'] as String
-    ..createWeek = json['createWeek'] as String
-    ..createDay = json['createDay'] as String;
-}
-
-Map<String, dynamic> _$UploadResultToJson(UploadResult instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'createTime': instance.createTime,
-      'createUser': instance.createUser,
-      'updateTime': instance.updateTime,
-      'updateUser': instance.updateUser,
-      'dataType': instance.dataType,
-      'submittedFileName': instance.submittedFileName,
-      'treePath': instance.treePath,
-      'grade': instance.grade,
-      'isDelete': instance.isDelete,
-      'folderId': instance.folderId,
-      'url': instance.url,
-      'size': instance.size,
-      'folderName': instance.folderName,
-      'group': instance.group,
-      'path': instance.path,
-      'relativePath': instance.relativePath,
-      'fileMd5': instance.fileMd5,
-      'contextType': instance.contextType,
-      'filename': instance.filename,
-      'ext': instance.ext,
-      'icon': instance.icon,
-      'createMonth': instance.createMonth,
-      'createWeek': instance.createWeek,
-      'createDay': instance.createDay,
-    };
diff --git a/lib/retrofit/data/user_entity.g.dart b/lib/retrofit/data/user_entity.g.dart
deleted file mode 100644
index 7554c6ed..00000000
--- a/lib/retrofit/data/user_entity.g.dart
+++ /dev/null
@@ -1,39 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'user_entity.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-UserEntity _$UserEntityFromJson(Map<String, dynamic> json) {
-  return UserEntity()
-    ..account = json['account'] as String
-    ..avatar = json['avatar'] as String
-    ..expiration = json['expiration'] as String
-    ..expire = json['expire'] as String
-    ..mobile = json['mobile'] as String
-    ..name = json['name'] as String
-    ..refreshToken = json['refreshToken'] as String
-    ..token = json['token'] as String
-    ..tokenType = json['tokenType'] as String
-    ..userId = json['userId'] as String
-    ..userType = json['userType'] as String
-    ..workDescribe = json['workDescribe'] as String;
-}
-
-Map<String, dynamic> _$UserEntityToJson(UserEntity instance) =>
-    <String, dynamic>{
-      'account': instance.account,
-      'avatar': instance.avatar,
-      'expiration': instance.expiration,
-      'expire': instance.expire,
-      'mobile': instance.mobile,
-      'name': instance.name,
-      'refreshToken': instance.refreshToken,
-      'token': instance.token,
-      'tokenType': instance.tokenType,
-      'userId': instance.userId,
-      'userType': instance.userType,
-      'workDescribe': instance.workDescribe,
-    };
diff --git a/lib/retrofit/data/user_info.g.dart b/lib/retrofit/data/user_info.g.dart
deleted file mode 100644
index 2b13dca0..00000000
--- a/lib/retrofit/data/user_info.g.dart
+++ /dev/null
@@ -1,48 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'user_info.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-UserInfo _$UserInfoFromJson(Map<String, dynamic> json) {
-  return UserInfo()
-    ..vipNo = json['vipNo'] as String
-    ..nickname = json['nickname'] as String
-    ..headimg = json['headimg'] as String
-    ..userType = json['userType'] as bool
-    ..sex = json['sex'] as String
-    ..level = json['level'] as int
-    ..addressId = json['addressId'] as String
-    ..remark = json['remark'] as String
-    ..phone = json['phone'] as String
-    ..createTime = json['createTime'] as String
-    ..birth = json['birth'] as String
-    ..balance = json['balance']
-    ..money = json['money'] as String
-    ..points = json['points'] as String
-    ..isBind = json['isBind'] as bool
-    ..memberRankVo = json['memberRankVo'] == null
-        ? null
-        : MemberRank.fromJson(json['memberRankVo'] as Map<String, dynamic>);
-}
-
-Map<String, dynamic> _$UserInfoToJson(UserInfo instance) => <String, dynamic>{
-      'vipNo': instance.vipNo,
-      'nickname': instance.nickname,
-      'headimg': instance.headimg,
-      'userType': instance.userType,
-      'sex': instance.sex,
-      'level': instance.level,
-      'addressId': instance.addressId,
-      'remark': instance.remark,
-      'phone': instance.phone,
-      'createTime': instance.createTime,
-      'birth': instance.birth,
-      'balance': instance.balance,
-      'money': instance.money,
-      'points': instance.points,
-      'isBind': instance.isBind,
-      'memberRankVo': instance.memberRankVo,
-    };
diff --git a/lib/retrofit/data/verify_code.g.dart b/lib/retrofit/data/verify_code.g.dart
deleted file mode 100644
index 662a87e0..00000000
--- a/lib/retrofit/data/verify_code.g.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'verify_code.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-VerifyCode _$VerifyCodeFromJson(Map<String, dynamic> json) {
-  return VerifyCode()
-    ..code = json['code'] as int
-    ..data = json['data'] as Map<String, dynamic>
-    ..extra = json['extra'] == null
-        ? null
-        : BaseDataExtra.fromJson(json['extra'] as Map<String, dynamic>)
-    ..isError = json['isError'] as bool
-    ..isSuccess = json['isSuccess'] as bool
-    ..msg = json['msg'] as String
-    ..path = json['path'] as String
-    ..timestamp = json['timestamp'] as String;
-}
-
-Map<String, dynamic> _$VerifyCodeToJson(VerifyCode instance) =>
-    <String, dynamic>{
-      'code': instance.code,
-      'data': instance.data,
-      'extra': instance.extra,
-      'isError': instance.isError,
-      'isSuccess': instance.isSuccess,
-      'msg': instance.msg,
-      'path': instance.path,
-      'timestamp': instance.timestamp,
-    };

From 76cd4106492509cf7a17944ca4315497c663b79e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=93=88=E5=93=88=E5=93=88?= <fengmeikan@hotmail.com>
Date: Sun, 4 Jul 2021 19:28:27 +0800
Subject: [PATCH 4/5] =?UTF-8?q?ios=E6=89=93=E5=8C=85=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ios/Flutter/AppFrameworkInfo.plist            |   4 +-
 ios/Podfile.lock                              |   2 +-
 ios/Runner.xcodeproj/project.pbxproj          | 323 +-------
 ios/Runner/Info.plist                         |  28 +-
 ios/Runner/Runner.entitlements                |   4 +-
 lib/home/huixiang_brand_page.dart             | 704 ++++++------------
 lib/retrofit/data/activity.g.dart             |  44 ++
 lib/retrofit/data/address.g.dart              |  40 +
 lib/retrofit/data/base_data.g.dart            |  32 +
 lib/retrofit/data/base_data_extra.g.dart      |  14 +
 lib/retrofit/data/coupon.g.dart               |  64 ++
 lib/retrofit/data/data_type.g.dart            |  18 +
 lib/retrofit/data/exchange_order.g.dart       |  45 ++
 lib/retrofit/data/exchange_order_goods.g.dart |  53 ++
 lib/retrofit/data/goods.g.dart                |  61 ++
 lib/retrofit/data/member_rank.g.dart          |  33 +
 lib/retrofit/data/page.g.dart                 |  30 +
 lib/retrofit/data/sign_in.g.dart              |  46 ++
 lib/retrofit/data/sign_info.g.dart            |  32 +
 lib/retrofit/data/store.g.dart                |  74 ++
 lib/retrofit/data/store_type.g.dart           |  18 +
 lib/retrofit/data/task.g.dart                 |  42 ++
 lib/retrofit/data/upload_result.g.dart        |  67 ++
 lib/retrofit/data/user_entity.g.dart          |  39 +
 lib/retrofit/data/user_info.g.dart            |  48 ++
 lib/retrofit/data/verify_code.g.dart          |  33 +
 lib/retrofit/retrofit_api.g.dart              | 507 +++++++++++++
 pubspec.lock                                  | 250 +++----
 28 files changed, 1774 insertions(+), 881 deletions(-)
 create mode 100644 lib/retrofit/data/activity.g.dart
 create mode 100644 lib/retrofit/data/address.g.dart
 create mode 100644 lib/retrofit/data/base_data.g.dart
 create mode 100644 lib/retrofit/data/base_data_extra.g.dart
 create mode 100644 lib/retrofit/data/coupon.g.dart
 create mode 100644 lib/retrofit/data/data_type.g.dart
 create mode 100644 lib/retrofit/data/exchange_order.g.dart
 create mode 100644 lib/retrofit/data/exchange_order_goods.g.dart
 create mode 100644 lib/retrofit/data/goods.g.dart
 create mode 100644 lib/retrofit/data/member_rank.g.dart
 create mode 100644 lib/retrofit/data/page.g.dart
 create mode 100644 lib/retrofit/data/sign_in.g.dart
 create mode 100644 lib/retrofit/data/sign_info.g.dart
 create mode 100644 lib/retrofit/data/store.g.dart
 create mode 100644 lib/retrofit/data/store_type.g.dart
 create mode 100644 lib/retrofit/data/task.g.dart
 create mode 100644 lib/retrofit/data/upload_result.g.dart
 create mode 100644 lib/retrofit/data/user_entity.g.dart
 create mode 100644 lib/retrofit/data/user_info.g.dart
 create mode 100644 lib/retrofit/data/verify_code.g.dart
 create mode 100644 lib/retrofit/retrofit_api.g.dart

diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
index f828bd22..4082f5a6 100644
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/ios/Flutter/AppFrameworkInfo.plist
@@ -3,11 +3,11 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
+	<string>zh_CN</string>
 	<key>CFBundleExecutable</key>
 	<string>App</string>
 	<key>CFBundleIdentifier</key>
-	<string>io.flutter.flutter.app</string>
+	<string>com.zsw.yixinhuixiang</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index ce2b31a0..37c20a5b 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -97,4 +97,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 80a5bea9f6900750909f6d3fad1d3a0f1e560f5a
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.9.1
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 16e6a11a..c15cbbf7 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -11,19 +11,6 @@
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		7D05B55EA8C2ECD1708F92A2 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F2320ABFFF6437281BD669B8 /* Pods_Runner.framework */; };
-		899907BF2684536800EFF71A /* UniMPSDK in Resources */ = {isa = PBXBuildFile; fileRef = 899907BE2684536800EFF71A /* UniMPSDK */; };
-		899907CC2684539400EFF71A /* liblibUI.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 899907C02684539400EFF71A /* liblibUI.a */; };
-		899907CD2684539400EFF71A /* storage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 899907C12684539400EFF71A /* storage.framework */; };
-		899907CE2684539400EFF71A /* liblibIO.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 899907C22684539400EFF71A /* liblibIO.a */; };
-		899907CF2684539400EFF71A /* libcoreSupport.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 899907C32684539400EFF71A /* libcoreSupport.a */; };
-		899907D02684539400EFF71A /* liblibWeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 899907C42684539400EFF71A /* liblibWeex.a */; };
-		899907D12684539400EFF71A /* liblibNavigator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 899907C52684539400EFF71A /* liblibNavigator.a */; };
-		899907D22684539400EFF71A /* liblibPDRCore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 899907C62684539400EFF71A /* liblibPDRCore.a */; };
-		899907D32684539400EFF71A /* liblibNativeObj.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 899907C72684539400EFF71A /* liblibNativeObj.a */; };
-		899907D42684539400EFF71A /* liblibNativeUI.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 899907C82684539400EFF71A /* liblibNativeUI.a */; };
-		899907D52684539400EFF71A /* liblibPGInvocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 899907C92684539400EFF71A /* liblibPGInvocation.a */; };
-		899907D62684539400EFF71A /* liblibStorage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 899907CA2684539400EFF71A /* liblibStorage.a */; };
-		899907D72684539400EFF71A /* libSDWebImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 899907CB2684539400EFF71A /* libSDWebImage.a */; };
 		89FD2B59267CA8F20096F581 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 89FD2B58267CA8F20096F581 /* JavaScriptCore.framework */; };
 		89FD2B5B267CA90E0096F581 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 89FD2B5A267CA90E0096F581 /* AVFoundation.framework */; };
 		89FD2B5D267CA91A0096F581 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 89FD2B5C267CA91A0096F581 /* OpenGLES.framework */; };
@@ -61,6 +48,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		052D2C662690B88300E13C32 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
 		07D433417D1E71C6BEBF9AE7 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
@@ -70,118 +58,6 @@
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
-		891CC2142680265F00864D33 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
-		897B6581268C786100EE32D1 /* DCUniMPSDKEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DCUniMPSDKEngine.h; sourceTree = "<group>"; };
-		897B6582268C786100EE32D1 /* DCUniMP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DCUniMP.h; sourceTree = "<group>"; };
-		897B6583268C786100EE32D1 /* DCUniMPConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DCUniMPConfiguration.h; sourceTree = "<group>"; };
-		897B6584268C786100EE32D1 /* DCUniMPInstance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DCUniMPInstance.h; sourceTree = "<group>"; };
-		897B6586268C786100EE32D1 /* WXModuleProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXModuleProtocol.h; sourceTree = "<group>"; };
-		897B6587268C786100EE32D1 /* WXResourceLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXResourceLoader.h; sourceTree = "<group>"; };
-		897B6588268C786100EE32D1 /* WXApmForInstance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXApmForInstance.h; sourceTree = "<group>"; };
-		897B6589268C786100EE32D1 /* WXWebSocketHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXWebSocketHandler.h; sourceTree = "<group>"; };
-		897B658A268C786100EE32D1 /* WXImgLoaderProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXImgLoaderProtocol.h; sourceTree = "<group>"; };
-		897B658B268C786100EE32D1 /* WXComponentManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXComponentManager.h; sourceTree = "<group>"; };
-		897B658C268C786100EE32D1 /* WXScrollerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXScrollerProtocol.h; sourceTree = "<group>"; };
-		897B658D268C786100EE32D1 /* WXRichText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXRichText.h; sourceTree = "<group>"; };
-		897B658E268C786100EE32D1 /* WXView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXView.h; sourceTree = "<group>"; };
-		897B658F268C786100EE32D1 /* WXValidateProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXValidateProtocol.h; sourceTree = "<group>"; };
-		897B6590268C786100EE32D1 /* WXDefine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXDefine.h; sourceTree = "<group>"; };
-		897B6591268C786100EE32D1 /* JSContext+Weex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "JSContext+Weex.h"; sourceTree = "<group>"; };
-		897B6592268C786100EE32D1 /* WXExtendCallNativeProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXExtendCallNativeProtocol.h; sourceTree = "<group>"; };
-		897B6593268C786100EE32D1 /* WXSDKEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXSDKEngine.h; sourceTree = "<group>"; };
-		897B6594268C786100EE32D1 /* style.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = style.h; sourceTree = "<group>"; };
-		897B6595268C786100EE32D1 /* WXResourceRequestHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXResourceRequestHandler.h; sourceTree = "<group>"; };
-		897B6596268C786100EE32D1 /* WXDisplayLinkManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXDisplayLinkManager.h; sourceTree = "<group>"; };
-		897B6597268C786100EE32D1 /* WXUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXUtility.h; sourceTree = "<group>"; };
-		897B6598268C786100EE32D1 /* WXResourceRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXResourceRequest.h; sourceTree = "<group>"; };
-		897B6599268C786100EE32D1 /* WXConvert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXConvert.h; sourceTree = "<group>"; };
-		897B659A268C786100EE32D1 /* WXPageEventNotifyEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXPageEventNotifyEvent.h; sourceTree = "<group>"; };
-		897B659B268C786100EE32D1 /* WXSDKInstance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXSDKInstance.h; sourceTree = "<group>"; };
-		897B659C268C786100EE32D1 /* WXSDKManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXSDKManager.h; sourceTree = "<group>"; };
-		897B659D268C786100EE32D1 /* WXDebugTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXDebugTool.h; sourceTree = "<group>"; };
-		897B659E268C786100EE32D1 /* WXType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXType.h; sourceTree = "<group>"; };
-		897B659F268C786100EE32D1 /* WXApmProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXApmProtocol.h; sourceTree = "<group>"; };
-		897B65A0268C786100EE32D1 /* WXJSFrameworkLoadProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXJSFrameworkLoadProtocol.h; sourceTree = "<group>"; };
-		897B65A1268C786100EE32D1 /* WXExceptionUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXExceptionUtils.h; sourceTree = "<group>"; };
-		897B65A2268C786100EE32D1 /* WXIndicatorComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXIndicatorComponent.h; sourceTree = "<group>"; };
-		897B65A3268C786100EE32D1 /* WXErrorView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXErrorView.h; sourceTree = "<group>"; };
-		897B65A4268C786100EE32D1 /* NSObject+WXSwizzle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+WXSwizzle.h"; sourceTree = "<group>"; };
-		897B65A5268C786100EE32D1 /* WXMonitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXMonitor.h; sourceTree = "<group>"; };
-		897B65A6268C786100EE32D1 /* WXSDKInstance+DCExtend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "WXSDKInstance+DCExtend.h"; sourceTree = "<group>"; };
-		897B65A7268C786100EE32D1 /* WXRecyclerComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXRecyclerComponent.h; sourceTree = "<group>"; };
-		897B65A8268C786100EE32D1 /* WXScrollerComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXScrollerComponent.h; sourceTree = "<group>"; };
-		897B65A9268C786100EE32D1 /* WXNetworkProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXNetworkProtocol.h; sourceTree = "<group>"; };
-		897B65AA268C786100EE32D1 /* WXTracingManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXTracingManager.h; sourceTree = "<group>"; };
-		897B65AB268C786100EE32D1 /* WXComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXComponent.h; sourceTree = "<group>"; };
-		897B65AC268C786100EE32D1 /* WXPrerenderManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXPrerenderManager.h; sourceTree = "<group>"; };
-		897B65AD268C786100EE32D1 /* WXComponent+Layout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "WXComponent+Layout.h"; sourceTree = "<group>"; };
-		897B65AE268C786100EE32D1 /* layout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = layout.h; sourceTree = "<group>"; };
-		897B65AF268C786100EE32D1 /* WXSDKInstance+Bridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "WXSDKInstance+Bridge.h"; sourceTree = "<group>"; };
-		897B65B0268C786100EE32D1 /* UniPluginProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UniPluginProtocol.h; sourceTree = "<group>"; };
-		897B65B1268C786100EE32D1 /* WXModalUIModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXModalUIModule.h; sourceTree = "<group>"; };
-		897B65B2268C786100EE32D1 /* WXAnalyzerCenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXAnalyzerCenter.h; sourceTree = "<group>"; };
-		897B65B3268C786100EE32D1 /* WXVoiceOverModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXVoiceOverModule.h; sourceTree = "<group>"; };
-		897B65B4268C786100EE32D1 /* WXRootView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXRootView.h; sourceTree = "<group>"; };
-		897B65B5268C786100EE32D1 /* WXAppConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXAppConfiguration.h; sourceTree = "<group>"; };
-		897B65B6268C786100EE32D1 /* WXListComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXListComponent.h; sourceTree = "<group>"; };
-		897B65B7268C786100EE32D1 /* WXSDKError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXSDKError.h; sourceTree = "<group>"; };
-		897B65B8268C786100EE32D1 /* WXRootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXRootViewController.h; sourceTree = "<group>"; };
-		897B65B9268C786100EE32D1 /* WXNavigationProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXNavigationProtocol.h; sourceTree = "<group>"; };
-		897B65BA268C786100EE32D1 /* WXAnalyzerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXAnalyzerProtocol.h; sourceTree = "<group>"; };
-		897B65BB268C786100EE32D1 /* WeexSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeexSDK.h; sourceTree = "<group>"; };
-		897B65BC268C786100EE32D1 /* WXBridgeManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXBridgeManager.h; sourceTree = "<group>"; };
-		897B65BD268C786100EE32D1 /* WXResourceResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXResourceResponse.h; sourceTree = "<group>"; };
-		897B65BE268C786100EE32D1 /* WXBaseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXBaseViewController.h; sourceTree = "<group>"; };
-		897B65BF268C786100EE32D1 /* WXAppMonitorProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXAppMonitorProtocol.h; sourceTree = "<group>"; };
-		897B65C0268C786100EE32D1 /* WeexProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeexProtocol.h; sourceTree = "<group>"; };
-		897B65C1268C786100EE32D1 /* WXJSExceptionProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXJSExceptionProtocol.h; sourceTree = "<group>"; };
-		897B65C2268C786100EE32D1 /* WXJSExceptionInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXJSExceptionInfo.h; sourceTree = "<group>"; };
-		897B65C3268C786100EE32D1 /* WXTracingProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXTracingProtocol.h; sourceTree = "<group>"; };
-		897B65C4268C786100EE32D1 /* flex_enum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = flex_enum.h; sourceTree = "<group>"; };
-		897B65C5268C786100EE32D1 /* WXConfigCenterProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXConfigCenterProtocol.h; sourceTree = "<group>"; };
-		897B65C6268C786100EE32D1 /* WXEventModuleProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXEventModuleProtocol.h; sourceTree = "<group>"; };
-		897B65C7268C786100EE32D1 /* WXURLRewriteProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXURLRewriteProtocol.h; sourceTree = "<group>"; };
-		897B65C8268C786100EE32D1 /* WXAComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXAComponent.h; sourceTree = "<group>"; };
-		897B65C9268C786100EE32D1 /* WXBridgeProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXBridgeProtocol.h; sourceTree = "<group>"; };
-		897B65CA268C786100EE32D1 /* DCUniMPError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DCUniMPError.h; sourceTree = "<group>"; };
-		897B65CB268C786100EE32D1 /* DCUniMPMenuActionSheetStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DCUniMPMenuActionSheetStyle.h; sourceTree = "<group>"; };
-		899907BE2684536800EFF71A /* UniMPSDK */ = {isa = PBXFileReference; lastKnownFileType = folder; path = UniMPSDK; sourceTree = "<group>"; };
-		899907C02684539400EFF71A /* liblibUI.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibUI.a; path = UniMPSDK/Core/Libs/liblibUI.a; sourceTree = "<group>"; };
-		899907C12684539400EFF71A /* storage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = storage.framework; path = UniMPSDK/Core/Libs/storage.framework; sourceTree = "<group>"; };
-		899907C22684539400EFF71A /* liblibIO.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibIO.a; path = UniMPSDK/Core/Libs/liblibIO.a; sourceTree = "<group>"; };
-		899907C32684539400EFF71A /* libcoreSupport.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoreSupport.a; path = UniMPSDK/Core/Libs/libcoreSupport.a; sourceTree = "<group>"; };
-		899907C42684539400EFF71A /* liblibWeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibWeex.a; path = UniMPSDK/Core/Libs/liblibWeex.a; sourceTree = "<group>"; };
-		899907C52684539400EFF71A /* liblibNavigator.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibNavigator.a; path = UniMPSDK/Core/Libs/liblibNavigator.a; sourceTree = "<group>"; };
-		899907C62684539400EFF71A /* liblibPDRCore.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibPDRCore.a; path = UniMPSDK/Core/Libs/liblibPDRCore.a; sourceTree = "<group>"; };
-		899907C72684539400EFF71A /* liblibNativeObj.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibNativeObj.a; path = UniMPSDK/Core/Libs/liblibNativeObj.a; sourceTree = "<group>"; };
-		899907C82684539400EFF71A /* liblibNativeUI.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibNativeUI.a; path = UniMPSDK/Core/Libs/liblibNativeUI.a; sourceTree = "<group>"; };
-		899907C92684539400EFF71A /* liblibPGInvocation.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibPGInvocation.a; path = UniMPSDK/Core/Libs/liblibPGInvocation.a; sourceTree = "<group>"; };
-		899907CA2684539400EFF71A /* liblibStorage.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibStorage.a; path = UniMPSDK/Core/Libs/liblibStorage.a; sourceTree = "<group>"; };
-		899907CB2684539400EFF71A /* libSDWebImage.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDWebImage.a; path = UniMPSDK/Core/Libs/libSDWebImage.a; sourceTree = "<group>"; };
-		89E5805D26830B060084CF42 /* liblibUI.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibUI.a; path = "../../../Downloads/UniMPSDK_iOS@3.1.18/UniMPSDK/Core/Libs/liblibUI.a"; sourceTree = "<group>"; };
-		89E5805E26830B060084CF42 /* liblibNavigator.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibNavigator.a; path = "../../../Downloads/UniMPSDK_iOS@3.1.18/UniMPSDK/Core/Libs/liblibNavigator.a"; sourceTree = "<group>"; };
-		89E5805F26830B060084CF42 /* liblibWeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibWeex.a; path = "../../../Downloads/UniMPSDK_iOS@3.1.18/UniMPSDK/Core/Libs/liblibWeex.a"; sourceTree = "<group>"; };
-		89E5806026830B060084CF42 /* liblibIO.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibIO.a; path = "../../../Downloads/UniMPSDK_iOS@3.1.18/UniMPSDK/Core/Libs/liblibIO.a"; sourceTree = "<group>"; };
-		89E5806126830B060084CF42 /* libSDWebImage.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDWebImage.a; path = "../../../Downloads/UniMPSDK_iOS@3.1.18/UniMPSDK/Core/Libs/libSDWebImage.a"; sourceTree = "<group>"; };
-		89E5806226830B060084CF42 /* liblibNativeObj.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibNativeObj.a; path = "../../../Downloads/UniMPSDK_iOS@3.1.18/UniMPSDK/Core/Libs/liblibNativeObj.a"; sourceTree = "<group>"; };
-		89E5806326830B060084CF42 /* libcoreSupport.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoreSupport.a; path = "../../../Downloads/UniMPSDK_iOS@3.1.18/UniMPSDK/Core/Libs/libcoreSupport.a"; sourceTree = "<group>"; };
-		89E5806426830B060084CF42 /* storage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = storage.framework; path = "../../../Downloads/UniMPSDK_iOS@3.1.18/UniMPSDK/Core/Libs/storage.framework"; sourceTree = "<group>"; };
-		89E5806526830B060084CF42 /* liblibNativeUI.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibNativeUI.a; path = "../../../Downloads/UniMPSDK_iOS@3.1.18/UniMPSDK/Core/Libs/liblibNativeUI.a"; sourceTree = "<group>"; };
-		89E5806626830B060084CF42 /* liblibPDRCore.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibPDRCore.a; path = "../../../Downloads/UniMPSDK_iOS@3.1.18/UniMPSDK/Core/Libs/liblibPDRCore.a"; sourceTree = "<group>"; };
-		89E5806726830B060084CF42 /* liblibPGInvocation.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibPGInvocation.a; path = "../../../Downloads/UniMPSDK_iOS@3.1.18/UniMPSDK/Core/Libs/liblibPGInvocation.a"; sourceTree = "<group>"; };
-		89E5806826830B060084CF42 /* liblibStorage.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibStorage.a; path = "../../../Downloads/UniMPSDK_iOS@3.1.18/UniMPSDK/Core/Libs/liblibStorage.a"; sourceTree = "<group>"; };
-		89FD2B40267CA8BE0096F581 /* liblibStorage.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibStorage.a; path = "../../../Downloads/UniMPSDK_iOS@3.1.17/UniMPSDK/Core/Libs/liblibStorage.a"; sourceTree = "<group>"; };
-		89FD2B41267CA8BE0096F581 /* liblibUI.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibUI.a; path = "../../../Downloads/UniMPSDK_iOS@3.1.17/UniMPSDK/Core/Libs/liblibUI.a"; sourceTree = "<group>"; };
-		89FD2B42267CA8BE0096F581 /* liblibNavigator.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibNavigator.a; path = "../../../Downloads/UniMPSDK_iOS@3.1.17/UniMPSDK/Core/Libs/liblibNavigator.a"; sourceTree = "<group>"; };
-		89FD2B43267CA8BE0096F581 /* liblibWeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibWeex.a; path = "../../../Downloads/UniMPSDK_iOS@3.1.17/UniMPSDK/Core/Libs/liblibWeex.a"; sourceTree = "<group>"; };
-		89FD2B44267CA8BE0096F581 /* storage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = storage.framework; path = "../../../Downloads/UniMPSDK_iOS@3.1.17/UniMPSDK/Core/Libs/storage.framework"; sourceTree = "<group>"; };
-		89FD2B45267CA8BE0096F581 /* libSDWebImage.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDWebImage.a; path = "../../../Downloads/UniMPSDK_iOS@3.1.17/UniMPSDK/Core/Libs/libSDWebImage.a"; sourceTree = "<group>"; };
-		89FD2B46267CA8BE0096F581 /* liblibIO.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibIO.a; path = "../../../Downloads/UniMPSDK_iOS@3.1.17/UniMPSDK/Core/Libs/liblibIO.a"; sourceTree = "<group>"; };
-		89FD2B47267CA8BE0096F581 /* libcoreSupport.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoreSupport.a; path = "../../../Downloads/UniMPSDK_iOS@3.1.17/UniMPSDK/Core/Libs/libcoreSupport.a"; sourceTree = "<group>"; };
-		89FD2B48267CA8BE0096F581 /* liblibPDRCore.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibPDRCore.a; path = "../../../Downloads/UniMPSDK_iOS@3.1.17/UniMPSDK/Core/Libs/liblibPDRCore.a"; sourceTree = "<group>"; };
-		89FD2B49267CA8BE0096F581 /* liblibNativeObj.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibNativeObj.a; path = "../../../Downloads/UniMPSDK_iOS@3.1.17/UniMPSDK/Core/Libs/liblibNativeObj.a"; sourceTree = "<group>"; };
-		89FD2B4A267CA8BE0096F581 /* liblibPGInvocation.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibPGInvocation.a; path = "../../../Downloads/UniMPSDK_iOS@3.1.17/UniMPSDK/Core/Libs/liblibPGInvocation.a"; sourceTree = "<group>"; };
-		89FD2B4B267CA8BE0096F581 /* liblibNativeUI.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibNativeUI.a; path = "../../../Downloads/UniMPSDK_iOS@3.1.17/UniMPSDK/Core/Libs/liblibNativeUI.a"; sourceTree = "<group>"; };
 		89FD2B58267CA8F20096F581 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		89FD2B5A267CA90E0096F581 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
 		89FD2B5C267CA91A0096F581 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
@@ -199,7 +75,6 @@
 		89FD2B74267CA9B40096F581 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		89FD2B76267CA9BD0096F581 /* QuickLook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickLook.framework; path = System/Library/Frameworks/QuickLook.framework; sourceTree = SDKROOT; };
 		89FD2B78267CA9CA0096F581 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
-		89FD2BAD267CB7770096F581 /* Libs */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Libs; path = Runner/uni/Libs; sourceTree = "<group>"; };
 		89FD2BAF267CBF9D0096F581 /* SwiftMinPlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftMinPlugin.swift; sourceTree = "<group>"; };
 		89FD2BB3267CC0830096F581 /* MinPlugin.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MinPlugin.h; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
@@ -217,18 +92,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				899907CC2684539400EFF71A /* liblibUI.a in Frameworks */,
-				899907CD2684539400EFF71A /* storage.framework in Frameworks */,
-				899907CE2684539400EFF71A /* liblibIO.a in Frameworks */,
-				899907CF2684539400EFF71A /* libcoreSupport.a in Frameworks */,
-				899907D02684539400EFF71A /* liblibWeex.a in Frameworks */,
-				899907D12684539400EFF71A /* liblibNavigator.a in Frameworks */,
-				899907D22684539400EFF71A /* liblibPDRCore.a in Frameworks */,
-				899907D32684539400EFF71A /* liblibNativeObj.a in Frameworks */,
-				899907D42684539400EFF71A /* liblibNativeUI.a in Frameworks */,
-				899907D52684539400EFF71A /* liblibPGInvocation.a in Frameworks */,
-				899907D62684539400EFF71A /* liblibStorage.a in Frameworks */,
-				899907D72684539400EFF71A /* libSDWebImage.a in Frameworks */,
 				89FD2B79267CA9CA0096F581 /* CoreLocation.framework in Frameworks */,
 				89FD2B77267CA9BD0096F581 /* QuickLook.framework in Frameworks */,
 				89FD2B75267CA9B40096F581 /* QuartzCore.framework in Frameworks */,
@@ -256,32 +119,6 @@
 		0485BB88CB64F946A09CD99C /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				89E5806326830B060084CF42 /* libcoreSupport.a */,
-				899907C32684539400EFF71A /* libcoreSupport.a */,
-				89E5806026830B060084CF42 /* liblibIO.a */,
-				89E5806226830B060084CF42 /* liblibNativeObj.a */,
-				89E5806526830B060084CF42 /* liblibNativeUI.a */,
-				899907C72684539400EFF71A /* liblibNativeObj.a */,
-				899907C82684539400EFF71A /* liblibNativeUI.a */,
-				89E5805E26830B060084CF42 /* liblibNavigator.a */,
-				89E5806626830B060084CF42 /* liblibPDRCore.a */,
-				89E5806726830B060084CF42 /* liblibPGInvocation.a */,
-				89E5806826830B060084CF42 /* liblibStorage.a */,
-				899907C22684539400EFF71A /* liblibIO.a */,
-				899907C52684539400EFF71A /* liblibNavigator.a */,
-				899907C62684539400EFF71A /* liblibPDRCore.a */,
-				899907C92684539400EFF71A /* liblibPGInvocation.a */,
-				899907CA2684539400EFF71A /* liblibStorage.a */,
-				89E5805D26830B060084CF42 /* liblibUI.a */,
-				89E5805F26830B060084CF42 /* liblibWeex.a */,
-				89E5806126830B060084CF42 /* libSDWebImage.a */,
-				899907C42684539400EFF71A /* liblibWeex.a */,
-				899907CB2684539400EFF71A /* libSDWebImage.a */,
-				89E5806426830B060084CF42 /* storage.framework */,
-				899907C02684539400EFF71A /* liblibUI.a */,
-				899907C12684539400EFF71A /* storage.framework */,
-				891CC2142680265F00864D33 /* StoreKit.framework */,
-				89FD2BAD267CB7770096F581 /* Libs */,
 				89FD2B78267CA9CA0096F581 /* CoreLocation.framework */,
 				89FD2B76267CA9BD0096F581 /* QuickLook.framework */,
 				89FD2B74267CA9B40096F581 /* QuartzCore.framework */,
@@ -299,18 +136,6 @@
 				89FD2B5C267CA91A0096F581 /* OpenGLES.framework */,
 				89FD2B5A267CA90E0096F581 /* AVFoundation.framework */,
 				89FD2B58267CA8F20096F581 /* JavaScriptCore.framework */,
-				89FD2B47267CA8BE0096F581 /* libcoreSupport.a */,
-				89FD2B46267CA8BE0096F581 /* liblibIO.a */,
-				89FD2B49267CA8BE0096F581 /* liblibNativeObj.a */,
-				89FD2B4B267CA8BE0096F581 /* liblibNativeUI.a */,
-				89FD2B42267CA8BE0096F581 /* liblibNavigator.a */,
-				89FD2B48267CA8BE0096F581 /* liblibPDRCore.a */,
-				89FD2B4A267CA8BE0096F581 /* liblibPGInvocation.a */,
-				89FD2B40267CA8BE0096F581 /* liblibStorage.a */,
-				89FD2B41267CA8BE0096F581 /* liblibUI.a */,
-				89FD2B43267CA8BE0096F581 /* liblibWeex.a */,
-				89FD2B45267CA8BE0096F581 /* libSDWebImage.a */,
-				89FD2B44267CA8BE0096F581 /* storage.framework */,
 				F2320ABFFF6437281BD669B8 /* Pods_Runner.framework */,
 			);
 			name = Frameworks;
@@ -326,96 +151,6 @@
 			path = Pods;
 			sourceTree = "<group>";
 		};
-		897B6580268C786100EE32D1 /* Headers */ = {
-			isa = PBXGroup;
-			children = (
-				897B6581268C786100EE32D1 /* DCUniMPSDKEngine.h */,
-				897B6582268C786100EE32D1 /* DCUniMP.h */,
-				897B6583268C786100EE32D1 /* DCUniMPConfiguration.h */,
-				897B6584268C786100EE32D1 /* DCUniMPInstance.h */,
-				897B6585268C786100EE32D1 /* weexHeader */,
-				897B65CA268C786100EE32D1 /* DCUniMPError.h */,
-				897B65CB268C786100EE32D1 /* DCUniMPMenuActionSheetStyle.h */,
-			);
-			name = Headers;
-			path = UniMPSDK/Core/Headers;
-			sourceTree = "<group>";
-		};
-		897B6585268C786100EE32D1 /* weexHeader */ = {
-			isa = PBXGroup;
-			children = (
-				897B6586268C786100EE32D1 /* WXModuleProtocol.h */,
-				897B6587268C786100EE32D1 /* WXResourceLoader.h */,
-				897B6588268C786100EE32D1 /* WXApmForInstance.h */,
-				897B6589268C786100EE32D1 /* WXWebSocketHandler.h */,
-				897B658A268C786100EE32D1 /* WXImgLoaderProtocol.h */,
-				897B658B268C786100EE32D1 /* WXComponentManager.h */,
-				897B658C268C786100EE32D1 /* WXScrollerProtocol.h */,
-				897B658D268C786100EE32D1 /* WXRichText.h */,
-				897B658E268C786100EE32D1 /* WXView.h */,
-				897B658F268C786100EE32D1 /* WXValidateProtocol.h */,
-				897B6590268C786100EE32D1 /* WXDefine.h */,
-				897B6591268C786100EE32D1 /* JSContext+Weex.h */,
-				897B6592268C786100EE32D1 /* WXExtendCallNativeProtocol.h */,
-				897B6593268C786100EE32D1 /* WXSDKEngine.h */,
-				897B6594268C786100EE32D1 /* style.h */,
-				897B6595268C786100EE32D1 /* WXResourceRequestHandler.h */,
-				897B6596268C786100EE32D1 /* WXDisplayLinkManager.h */,
-				897B6597268C786100EE32D1 /* WXUtility.h */,
-				897B6598268C786100EE32D1 /* WXResourceRequest.h */,
-				897B6599268C786100EE32D1 /* WXConvert.h */,
-				897B659A268C786100EE32D1 /* WXPageEventNotifyEvent.h */,
-				897B659B268C786100EE32D1 /* WXSDKInstance.h */,
-				897B659C268C786100EE32D1 /* WXSDKManager.h */,
-				897B659D268C786100EE32D1 /* WXDebugTool.h */,
-				897B659E268C786100EE32D1 /* WXType.h */,
-				897B659F268C786100EE32D1 /* WXApmProtocol.h */,
-				897B65A0268C786100EE32D1 /* WXJSFrameworkLoadProtocol.h */,
-				897B65A1268C786100EE32D1 /* WXExceptionUtils.h */,
-				897B65A2268C786100EE32D1 /* WXIndicatorComponent.h */,
-				897B65A3268C786100EE32D1 /* WXErrorView.h */,
-				897B65A4268C786100EE32D1 /* NSObject+WXSwizzle.h */,
-				897B65A5268C786100EE32D1 /* WXMonitor.h */,
-				897B65A6268C786100EE32D1 /* WXSDKInstance+DCExtend.h */,
-				897B65A7268C786100EE32D1 /* WXRecyclerComponent.h */,
-				897B65A8268C786100EE32D1 /* WXScrollerComponent.h */,
-				897B65A9268C786100EE32D1 /* WXNetworkProtocol.h */,
-				897B65AA268C786100EE32D1 /* WXTracingManager.h */,
-				897B65AB268C786100EE32D1 /* WXComponent.h */,
-				897B65AC268C786100EE32D1 /* WXPrerenderManager.h */,
-				897B65AD268C786100EE32D1 /* WXComponent+Layout.h */,
-				897B65AE268C786100EE32D1 /* layout.h */,
-				897B65AF268C786100EE32D1 /* WXSDKInstance+Bridge.h */,
-				897B65B0268C786100EE32D1 /* UniPluginProtocol.h */,
-				897B65B1268C786100EE32D1 /* WXModalUIModule.h */,
-				897B65B2268C786100EE32D1 /* WXAnalyzerCenter.h */,
-				897B65B3268C786100EE32D1 /* WXVoiceOverModule.h */,
-				897B65B4268C786100EE32D1 /* WXRootView.h */,
-				897B65B5268C786100EE32D1 /* WXAppConfiguration.h */,
-				897B65B6268C786100EE32D1 /* WXListComponent.h */,
-				897B65B7268C786100EE32D1 /* WXSDKError.h */,
-				897B65B8268C786100EE32D1 /* WXRootViewController.h */,
-				897B65B9268C786100EE32D1 /* WXNavigationProtocol.h */,
-				897B65BA268C786100EE32D1 /* WXAnalyzerProtocol.h */,
-				897B65BB268C786100EE32D1 /* WeexSDK.h */,
-				897B65BC268C786100EE32D1 /* WXBridgeManager.h */,
-				897B65BD268C786100EE32D1 /* WXResourceResponse.h */,
-				897B65BE268C786100EE32D1 /* WXBaseViewController.h */,
-				897B65BF268C786100EE32D1 /* WXAppMonitorProtocol.h */,
-				897B65C0268C786100EE32D1 /* WeexProtocol.h */,
-				897B65C1268C786100EE32D1 /* WXJSExceptionProtocol.h */,
-				897B65C2268C786100EE32D1 /* WXJSExceptionInfo.h */,
-				897B65C3268C786100EE32D1 /* WXTracingProtocol.h */,
-				897B65C4268C786100EE32D1 /* flex_enum.h */,
-				897B65C5268C786100EE32D1 /* WXConfigCenterProtocol.h */,
-				897B65C6268C786100EE32D1 /* WXEventModuleProtocol.h */,
-				897B65C7268C786100EE32D1 /* WXURLRewriteProtocol.h */,
-				897B65C8268C786100EE32D1 /* WXAComponent.h */,
-				897B65C9268C786100EE32D1 /* WXBridgeProtocol.h */,
-			);
-			path = weexHeader;
-			sourceTree = "<group>";
-		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
@@ -430,8 +165,6 @@
 		97C146E51CF9000F007C117D = {
 			isa = PBXGroup;
 			children = (
-				897B6580268C786100EE32D1 /* Headers */,
-				899907BE2684536800EFF71A /* UniMPSDK */,
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
@@ -451,6 +184,7 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
+				052D2C662690B88300E13C32 /* Runner.entitlements */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
 				97C146FD1CF9000F007C117D /* Assets.xcassets */,
 				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
@@ -529,7 +263,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				899907BF2684536800EFF71A /* UniMPSDK in Resources */,
 				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
@@ -687,7 +420,8 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
@@ -702,9 +436,10 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-ObjC";
 				SDKROOT = iphoneos;
-				SUPPORTED_PLATFORMS = iphoneos;
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -716,8 +451,11 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 56486KV75J;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = 3;
+				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -744,8 +482,11 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/UniMPSDK/Core/Libs",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.zsw.huixiang1;
+				MARKETING_VERSION = 1.0.2;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = com.zsw.hx;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "huixiang app";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -780,7 +521,8 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -836,7 +578,8 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
@@ -851,9 +594,10 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-ObjC";
 				SDKROOT = iphoneos;
-				SUPPORTED_PLATFORMS = iphoneos;
+				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -867,8 +611,11 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 56486KV75J;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = 3;
+				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -895,8 +642,11 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/UniMPSDK/Core/Libs",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.zsw.huixiang1;
+				MARKETING_VERSION = 1.0.2;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = com.zsw.hx;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "huixiang app";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -910,8 +660,12 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 56486KV75J;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution: Zhili Zhiji (Wuhan) Culture Technology Co., Ltd. (YF3Q8DVP52)";
+				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = 3;
+				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -938,8 +692,11 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/UniMPSDK/Core/Libs",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.zsw.huixiang1;
+				MARKETING_VERSION = 1.0.2;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = com.zsw.hx;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "huixiang app";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 74f1ede4..82e3cb14 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -2,12 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>拍视频需要录音权限</string>
-	<key>NSCameraUsageDescription</key>
-	<string>打开相机拍照</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>打开相册</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
@@ -29,15 +23,33 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppleMusicUsageDescription</key>
+	<string>是否允许访问媒体</string>
+	<key>NSCalendarsUsageDescription</key>
+	<string>是否允许访问日历</string>
+	<key>NSCameraUsageDescription</key>
+	<string>打开相机拍照</string>
+	<key>NSContactsUsageDescription</key>
+	<string>是否允许访问联系人信息</string>
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>是否允许访问位置信息</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>定位</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>拍视频需要录音权限</string>
+	<key>NSMotionUsageDescription</key>
+	<string>是否允许访问运行</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>打开相册</string>
+	<key>NSSpeechRecognitionUsageDescription</key>
+	<string>是否允许语音识别</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements
index fbad0237..903def2a 100644
--- a/ios/Runner/Runner.entitlements
+++ b/ios/Runner/Runner.entitlements
@@ -2,7 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>keychain-access-groups</key>
-	<array/>
+	<key>aps-environment</key>
+	<string>development</string>
 </dict>
 </plist>
diff --git a/lib/home/huixiang_brand_page.dart b/lib/home/huixiang_brand_page.dart
index b560a464..a7dabb7f 100644
--- a/lib/home/huixiang_brand_page.dart
+++ b/lib/home/huixiang_brand_page.dart
@@ -13,7 +13,8 @@ class BrandPage extends StatefulWidget {
   }
 }
 
-class _BrandPage extends State<BrandPage> with SingleTickerProviderStateMixin, AutomaticKeepAliveClientMixin {
+class _BrandPage extends State<BrandPage>
+    with SingleTickerProviderStateMixin, AutomaticKeepAliveClientMixin {
   ScrollController tabcontroller;
 
   List<String> tabs = [
@@ -104,462 +105,246 @@ class _BrandPage extends State<BrandPage> with SingleTickerProviderStateMixin, A
                       banner(),
                       buildInfo(),
                       buildTab(),
-                      // Container(
-                      //   decoration: new BoxDecoration(
-                      //     border: Border(
-                      //         bottom: BorderSide(
-                      //             color: Colors.black, width: 0.0)),
-                      //     color: Colors.black,
-                      //   ),
-                      //   key: chiliGlobalKey,
-                      //   child: Image.asset(
-                      //     "assets/image/brand_store_cj.png",
-                      //     fit: BoxFit.fill,
-                      //     width: double.infinity,
-                      //   ),
-                      // ),
-                      // Container(
-                      //   decoration: new BoxDecoration(
-                      //     border: Border(
-                      //         bottom: BorderSide(
-                      //             color: Colors.black, width: 0.0)),
-                      //     color: Colors.black,
-                      //   ),
-                      //   padding:
-                      //   EdgeInsets.only(left: 79, right: 85, bottom: 19),
-                      //   child: Column(
-                      //     mainAxisAlignment: MainAxisAlignment.spaceAround,
-                      //     crossAxisAlignment: CrossAxisAlignment.start,
-                      //     children: [
-                      //       Padding(
-                      //         padding: EdgeInsets.only(bottom: 7),
-                      //         child: Text(
-                      //           "01  百年川椒(汉街店）",
-                      //           style: TextStyle(
-                      //               fontSize: 12, color: Color(0xffFFFCF5)),
-                      //         ),
-                      //       ),
-                      //       Row(
-                      //         mainAxisAlignment: MainAxisAlignment.start,
-                      //         crossAxisAlignment: CrossAxisAlignment.start,
-                      //         children: [
-                      //           Text(
-                      //             "地址:",
-                      //             style: TextStyle(
-                      //                 fontSize: 10, color: Colors.white),
-                      //           ),
-                      //           Padding(
-                      //             padding: EdgeInsets.only(bottom: 5),
-                      //             child: Text(
-                      //               "武昌区楚河汉街第一街区万达总部\n国际C座对面",
-                      //               style: TextStyle(
-                      //                   fontSize: 10, color: Colors.white),
-                      //             ),
-                      //           ),
-                      //         ],
-                      //       ),
-                      //       Row(
-                      //         mainAxisAlignment:
-                      //         MainAxisAlignment.spaceBetween,
-                      //         crossAxisAlignment: CrossAxisAlignment.center,
-                      //         children: [
-                      //           Expanded(
-                      //             flex: 1,
-                      //             child: Text(
-                      //               "时间:09:30-21:30",
-                      //               style: TextStyle(
-                      //                   fontSize: 10, color: Colors.white),
-                      //             ),
-                      //           ),
-                      //           Container(
-                      //             padding: EdgeInsets.only(
-                      //                 left: 7, right: 10, bottom: 2, top: 2),
-                      //             width: 43,
-                      //             height: 14,
-                      //             decoration: new BoxDecoration(
-                      //               image: new DecorationImage(
-                      //                 image: new AssetImage(
-                      //                     "assets/image/icon_look.png"),
-                      //               ),
-                      //             ),
-                      //             child: Text(
-                      //               "去逛逛",
-                      //               style: TextStyle(
-                      //                   fontSize: 8, color: Colors.white),
-                      //             ),
-                      //           ),
-                      //         ],
-                      //       )
-                      //     ],
-                      //   ),
-                      // ),
-                      // Container(
-                      //   decoration: new BoxDecoration(
-                      //     border: Border(
-                      //         bottom: BorderSide(
-                      //             color: Colors.black, width: 0.0)),
-                      //     color: Colors.black,
-                      //   ),
-                      //   padding:
-                      //   EdgeInsets.only(left: 79, right: 85, bottom: 34),
-                      //   child: Column(
-                      //     mainAxisAlignment: MainAxisAlignment.spaceAround,
-                      //     crossAxisAlignment: CrossAxisAlignment.start,
-                      //     children: [
-                      //       Padding(
-                      //         padding: EdgeInsets.only(bottom: 8),
-                      //         child: Text(
-                      //           "02  百年川椒(光谷店）",
-                      //           style: TextStyle(
-                      //               fontSize: 12, color: Color(0xffFFFCF5)),
-                      //         ),
-                      //       ),
-                      //       Row(
-                      //         mainAxisAlignment: MainAxisAlignment.start,
-                      //         crossAxisAlignment: CrossAxisAlignment.start,
-                      //         children: [
-                      //           Text(
-                      //             "地址:",
-                      //             style: TextStyle(
-                      //                 fontSize: 10, color: Colors.white),
-                      //           ),
-                      //           Padding(
-                      //             padding: EdgeInsets.only(bottom: 5),
-                      //             child: Text(
-                      //               "洪山区关山大道哈乐城2楼(保利时\n代)",
-                      //               style: TextStyle(
-                      //                   fontSize: 10, color: Colors.white),
-                      //             ),
-                      //           ),
-                      //         ],
-                      //       ),
-                      //       Row(
-                      //         mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      //         crossAxisAlignment: CrossAxisAlignment.center,
-                      //         children: [
-                      //           Expanded(
-                      //             flex: 1,
-                      //             child: Text(
-                      //               "时间:09:30-21:30",
-                      //               style: TextStyle(
-                      //                   fontSize: 10, color: Colors.white),
-                      //             ),
-                      //           ),
-                      //           Container(
-                      //             padding: EdgeInsets.only(
-                      //                 left: 7, right: 10, bottom: 2, top: 2),
-                      //             width: 43,
-                      //             height: 14,
-                      //             decoration: new BoxDecoration(
-                      //               image: new DecorationImage(
-                      //                 image: new AssetImage(
-                      //                     "assets/image/icon_look.png"),
-                      //               ),
-                      //             ),
-                      //             child: Text(
-                      //               "去逛逛",
-                      //               style: TextStyle(
-                      //                   fontSize: 8, color: Colors.white),
-                      //             ),
-                      //           ),
-                      //         ],
-                      //       )
-                      //     ],
-                      //   ),
-                      // ),
-                      // SizedBox(
-                      //   height: 16,
-                      // ),
-                      // Container(
-                      //   decoration: new BoxDecoration(
-                      //     border: Border(
-                      //         bottom: BorderSide(
-                      //             color: Colors.white, width: 0.0)),
-                      //     color: Colors.white,
-                      //   ),
-                      //   key: milkTeaGlobalKey,
-                      //   child: Image.asset(
-                      //     "assets/image/brand_store_hx.png",
-                      //     fit: BoxFit.fill,
-                      //     width: double.infinity,
-                      //   ),
-                      // ),
-                      // Container(
-                      //   decoration: new BoxDecoration(
-                      //     border: Border(
-                      //         bottom: BorderSide(
-                      //             color: Colors.white, width: 0.0)),
-                      //     color: Colors.white,
-                      //   ),
-                      //   padding:
-                      //   EdgeInsets.only(left: 32, right: 33, bottom: 18),
-                      //   child: Column(
-                      //     mainAxisAlignment: MainAxisAlignment.spaceAround,
-                      //     crossAxisAlignment: CrossAxisAlignment.start,
-                      //     children: [
-                      //       Row(
-                      //         mainAxisAlignment: MainAxisAlignment.start,
-                      //         crossAxisAlignment: CrossAxisAlignment.start,
-                      //         children: [
-                      //           Padding(
-                      //             padding: EdgeInsets.only(right: 12),
-                      //             child: Text(
-                      //               "●",
-                      //               style: TextStyle(
-                      //                   fontSize: 10,
-                      //                   color: Color(0xffE2BA83)),
-                      //             ),
-                      //           ),
-                      //           Padding(
-                      //             padding: EdgeInsets.only(bottom: 8),
-                      //             child: Text(
-                      //               "武昌区松竹路汉街总部国际C座正对面(肥肥虾庄旁)",
-                      //               style: TextStyle(
-                      //                   fontSize: 10,
-                      //                   color: Color(0xff604843)),
-                      //             ),
-                      //           ),
-                      //         ],
-                      //       ),
-                      //       Row(
-                      //         mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      //         crossAxisAlignment: CrossAxisAlignment.center,
-                      //         children: [
-                      //           Padding(
-                      //             padding: EdgeInsets.only(right: 12),
-                      //             child: Text(
-                      //               "●",
-                      //               style: TextStyle(
-                      //                   fontSize: 10,
-                      //                   color: Color(0xffE2BA83)),
-                      //             ),
-                      //           ),
-                      //           Expanded(
-                      //             flex: 1,
-                      //             child: Text(
-                      //               "10:00-21:00",
-                      //               style: TextStyle(
-                      //                   fontSize: 10,
-                      //                   color: Color(0xff604843)),
-                      //             ),
-                      //           ),
-                      //           Text(
-                      //             "去逛逛",
-                      //             style: TextStyle(
-                      //                 fontSize: 13, color: Color(0xff604843)),
-                      //           ),
-                      //           Image.asset("assets/image/icon_right_z.png"),
-                      //         ],
-                      //       )
-                      //     ],
-                      //   ),
-                      // ),
-                      // Container(
-                      //   decoration: new BoxDecoration(
-                      //     border: Border(
-                      //         bottom: BorderSide(
-                      //             color: Colors.white, width: 0.0)),
-                      //     color: Colors.white,
-                      //   ),
-                      //   padding:
-                      //   EdgeInsets.only(left: 32, right: 33, bottom: 18),
-                      //   child: Column(
-                      //     mainAxisAlignment: MainAxisAlignment.spaceAround,
-                      //     crossAxisAlignment: CrossAxisAlignment.start,
-                      //     children: [
-                      //       RoundButton(
-                      //         width: 142,
-                      //         height: 28,
-                      //         text: "海峡姐妹荟聚A店",
-                      //         textColor: Colors.white,
-                      //         fontSize: 14,
-                      //         padding: EdgeInsets.only(
-                      //             top: 4, bottom: 4, left: 14, right: 14),
-                      //         backgroup: Color(0xffE2BA83),
-                      //         fontWeight: FontWeight.bold,
-                      //       ),
-                      //       Row(
-                      //         mainAxisAlignment: MainAxisAlignment.start,
-                      //         crossAxisAlignment: CrossAxisAlignment.start,
-                      //         children: [
-                      //           Padding(
-                      //             padding:
-                      //             EdgeInsets.only(right: 12, top: 12),
-                      //             child: Text(
-                      //               "●",
-                      //               style: TextStyle(
-                      //                   fontSize: 10,
-                      //                   color: Color(0xffE2BA83)),
-                      //             ),
-                      //           ),
-                      //           Padding(
-                      //             padding:
-                      //             EdgeInsets.only(bottom: 8, top: 12),
-                      //             child: Text(
-                      //               "硚口区园博大道1号武汉荟聚购物中心2楼F区\n109-4号商铺",
-                      //               style: TextStyle(
-                      //                   fontSize: 10,
-                      //                   color: Color(0xff604843)),
-                      //             ),
-                      //           ),
-                      //         ],
-                      //       ),
-                      //       Row(
-                      //         mainAxisAlignment:
-                      //         MainAxisAlignment.spaceBetween,
-                      //         crossAxisAlignment: CrossAxisAlignment.center,
-                      //         children: [
-                      //           Padding(
-                      //             padding: EdgeInsets.only(right: 12),
-                      //             child: Text(
-                      //               "●",
-                      //               style: TextStyle(
-                      //                   fontSize: 10,
-                      //                   color: Color(0xffE2BA83)),
-                      //             ),
-                      //           ),
-                      //           Expanded(
-                      //             flex: 1,
-                      //             child: Text(
-                      //               "10:00-21:00",
-                      //               style: TextStyle(
-                      //                   fontSize: 10,
-                      //                   color: Color(0xff604843)),
-                      //             ),
-                      //           ),
-                      //           Text(
-                      //             "去逛逛",
-                      //             style: TextStyle(
-                      //                 fontSize: 13, color: Color(0xff604843)),
-                      //           ),
-                      //           Image.asset("assets/image/icon_right_z.png"),
-                      //         ],
-                      //       )
-                      //     ],
-                      //   ),
-                      // ),
-                      // SizedBox(
-                      //   height: 16,
-                      // ),
-                      // Container(
-                      //   decoration: new BoxDecoration(
-                      //     border: Border(
-                      //         bottom: BorderSide(
-                      //             color: Color(0xff052C4B), width: 0.0)),
-                      //     color: Color(0xff052C4B),
-                      //   ),
-                      //   key: breadGlobalKey,
-                      //   child: Image.asset(
-                      //     "assets/image/brand_store_bg.png",
-                      //     fit: BoxFit.fill,
-                      //     width: double.infinity,
-                      //   ),
-                      // ),
-                      // Container(
-                      //   decoration: new BoxDecoration(
-                      //     border: Border(
-                      //         bottom: BorderSide(
-                      //             color: Color(0xff052C4B), width: 0.0)),
-                      //     color: Color(0xff052C4B),
-                      //   ),
-                      //   padding:
-                      //   EdgeInsets.only(left: 46, right: 44, bottom: 21),
-                      //   child: Column(
-                      //     mainAxisAlignment: MainAxisAlignment.spaceAround,
-                      //     crossAxisAlignment: CrossAxisAlignment.start,
-                      //     children: [
-                      //       Padding(
-                      //         padding: EdgeInsets.only(bottom: 8),
-                      //         child: Text(
-                      //           "01  前进麦味(光谷店）",
-                      //           style: TextStyle(
-                      //               fontSize: 12, color: Color(0xffFFFCF5)),
-                      //         ),
-                      //       ),
-                      //       Padding(
-                      //         padding: EdgeInsets.only(bottom: 5),
-                      //         child: Text(
-                      //           "地址:洪山区关山大道328号附7号",
-                      //           style: TextStyle(
-                      //               fontSize: 10, color: Colors.white),
-                      //         ),
-                      //       ),
-                      //       Row(
-                      //         mainAxisAlignment:
-                      //         MainAxisAlignment.spaceBetween,
-                      //         crossAxisAlignment: CrossAxisAlignment.center,
-                      //         children: [
-                      //           Expanded(
-                      //             flex: 1,
-                      //             child: Text(
-                      //               "时间:09:00-20:30",
-                      //               style: TextStyle(
-                      //                   fontSize: 10, color: Colors.white),
-                      //             ),
-                      //           ),
-                      //           Text(
-                      //             "去了解",
-                      //             style: TextStyle(
-                      //                 fontSize: 13, color: Color(0xffFFFDF6)),
-                      //           ),
-                      //           Image.asset("assets/image/icon_right.png"),
-                      //         ],
-                      //       )
-                      //     ],
-                      //   ),
-                      // ),
-                      // Container(
-                      //   decoration: new BoxDecoration(
-                      //     border: Border(
-                      //         bottom: BorderSide(
-                      //             color: Color(0xff052C4B), width: 0.0)),
-                      //     color: Color(0xff052C4B),
-                      //   ),
-                      //   padding:
-                      //   EdgeInsets.only(left: 46, right: 44, bottom: 41),
-                      //   child: Column(
-                      //     mainAxisAlignment: MainAxisAlignment.spaceAround,
-                      //     crossAxisAlignment: CrossAxisAlignment.start,
-                      //     children: [
-                      //       Padding(
-                      //         padding: EdgeInsets.only(bottom: 8),
-                      //         child: Text(
-                      //           "02  前进麦味(哈乐城店）",
-                      //           style: TextStyle(
-                      //               fontSize: 12, color: Color(0xffFFFCF5)),
-                      //         ),
-                      //       ),
-                      //       Padding(
-                      //         padding: EdgeInsets.only(bottom: 5),
-                      //         child: Text(
-                      //           "地址:武昌区凯德1818蓝调步行街(蔡明纬店旁)",
-                      //           style: TextStyle(
-                      //               fontSize: 10, color: Colors.white),
-                      //         ),
-                      //       ),
-                      //       Row(
-                      //         mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      //         crossAxisAlignment: CrossAxisAlignment.center,
-                      //         children: [
-                      //           Expanded(
-                      //             flex: 1,
-                      //             child: Text(
-                      //               "时间:09:00-20:30",
-                      //               style: TextStyle(
-                      //                   fontSize: 10, color: Colors.white),
-                      //             ),
-                      //           ),
-                      //           Text(
-                      //             "去了解",
-                      //             style: TextStyle(
-                      //                 fontSize: 13, color: Color(0xffFFFDF6)),
-                      //           ),
-                      //           Image.asset("assets/image/icon_right.png"),
-                      //         ],
-                      //       )
-                      //     ],
-                      //   ),
-                      // ),
+                      Container(
+                        decoration: new BoxDecoration(
+                          border: Border(
+                              bottom:
+                                  BorderSide(color: Colors.black, width: 0.0)),
+                          color: Colors.black,
+                        ),
+                        key: chiliGlobalKey,
+                        child: Image.asset(
+                          "assets/image/brand_store_cj.png",
+                          fit: BoxFit.fill,
+                          width: double.infinity,
+                        ),
+                      ),
+                      Container(
+                        decoration: new BoxDecoration(
+                          border: Border(
+                              bottom:
+                                  BorderSide(color: Colors.black, width: 0.0)),
+                          color: Colors.black,
+                        ),
+                        padding:
+                            EdgeInsets.only(left: 79, right: 85, bottom: 34),
+                        child: Column(
+                          mainAxisAlignment: MainAxisAlignment.spaceAround,
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Padding(
+                              padding: EdgeInsets.only(bottom: 8),
+                              child: Text(
+                                "02  百年川椒(光谷店）",
+                                style: TextStyle(
+                                    fontSize: 12, color: Color(0xffFFFCF5)),
+                              ),
+                            ),
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.start,
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Text(
+                                  "地址:",
+                                  style: TextStyle(
+                                      fontSize: 10, color: Colors.white),
+                                ),
+                                Padding(
+                                  padding: EdgeInsets.only(bottom: 5),
+                                  child: Text(
+                                    "洪山区关山大道哈乐城2楼(保利时\n代)",
+                                    style: TextStyle(
+                                        fontSize: 10, color: Colors.white),
+                                  ),
+                                ),
+                              ],
+                            ),
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              crossAxisAlignment: CrossAxisAlignment.center,
+                              children: [
+                                Expanded(
+                                  flex: 1,
+                                  child: Text(
+                                    "时间:09:30-21:30",
+                                    style: TextStyle(
+                                        fontSize: 10, color: Colors.white),
+                                  ),
+                                ),
+                                Container(
+                                  padding: EdgeInsets.only(
+                                      left: 7, right: 10, bottom: 2, top: 2),
+                                  width: 43,
+                                  height: 14,
+                                  decoration: new BoxDecoration(
+                                    image: new DecorationImage(
+                                      image: new AssetImage(
+                                          "assets/image/icon_look.png"),
+                                    ),
+                                  ),
+                                  child: Text(
+                                    "去逛逛",
+                                    style: TextStyle(
+                                        fontSize: 8, color: Colors.white),
+                                  ),
+                                ),
+                              ],
+                            )
+                          ],
+                        ),
+                      ),
+                      SizedBox(
+                        height: 16,
+                      ),
+                      Container(
+                        decoration: new BoxDecoration(
+                          border: Border(
+                              bottom:
+                                  BorderSide(color: Colors.white, width: 0.0)),
+                          color: Colors.white,
+                        ),
+                        key: milkTeaGlobalKey,
+                        child: Image.asset(
+                          "assets/image/brand_store_hx.png",
+                          fit: BoxFit.fill,
+                          width: double.infinity,
+                        ),
+                      ),
+                      Container(
+                        decoration: new BoxDecoration(
+                          border: Border(
+                              bottom:
+                                  BorderSide(color: Colors.white, width: 0.0)),
+                          color: Colors.white,
+                        ),
+                        padding:
+                            EdgeInsets.only(left: 32, right: 33, bottom: 18),
+                        child: Column(
+                          mainAxisAlignment: MainAxisAlignment.spaceAround,
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.start,
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Padding(
+                                  padding: EdgeInsets.only(right: 12),
+                                  child: Text(
+                                    "●",
+                                    style: TextStyle(
+                                        fontSize: 10, color: Color(0xffE2BA83)),
+                                  ),
+                                ),
+                                Padding(
+                                  padding: EdgeInsets.only(bottom: 8),
+                                  child: Text(
+                                    "武昌区松竹路汉街总部国际C座正对面(肥肥虾庄旁)",
+                                    style: TextStyle(
+                                        fontSize: 10, color: Color(0xff604843)),
+                                  ),
+                                ),
+                              ],
+                            ),
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              crossAxisAlignment: CrossAxisAlignment.center,
+                              children: [
+                                Padding(
+                                  padding: EdgeInsets.only(right: 12),
+                                  child: Text(
+                                    "●",
+                                    style: TextStyle(
+                                        fontSize: 10, color: Color(0xffE2BA83)),
+                                  ),
+                                ),
+                                Expanded(
+                                  flex: 1,
+                                  child: Text(
+                                    "10:00-21:00",
+                                    style: TextStyle(
+                                        fontSize: 10, color: Color(0xff604843)),
+                                  ),
+                                ),
+                                Text(
+                                  "去逛逛",
+                                  style: TextStyle(
+                                      fontSize: 13, color: Color(0xff604843)),
+                                ),
+                                Image.asset("assets/image/icon_right_z.png"),
+                              ],
+                            )
+                          ],
+                        ),
+                      ),
+                      SizedBox(
+                        height: 16,
+                      ),
+                      Container(
+                        decoration: new BoxDecoration(
+                          border: Border(
+                              bottom: BorderSide(
+                                  color: Color(0xff052C4B), width: 0.0)),
+                          color: Color(0xff052C4B),
+                        ),
+                        key: breadGlobalKey,
+                        child: Image.asset(
+                          "assets/image/brand_store_bg.png",
+                          fit: BoxFit.fill,
+                          width: double.infinity,
+                        ),
+                      ),
+                      Container(
+                        decoration: new BoxDecoration(
+                          border: Border(
+                              bottom: BorderSide(
+                                  color: Color(0xff052C4B), width: 0.0)),
+                          color: Color(0xff052C4B),
+                        ),
+                        padding:
+                            EdgeInsets.only(left: 46, right: 44, bottom: 21),
+                        child: Column(
+                          mainAxisAlignment: MainAxisAlignment.spaceAround,
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Padding(
+                              padding: EdgeInsets.only(bottom: 8),
+                              child: Text(
+                                "01  前进麦味(光谷店）",
+                                style: TextStyle(
+                                    fontSize: 12, color: Color(0xffFFFCF5)),
+                              ),
+                            ),
+                            Padding(
+                              padding: EdgeInsets.only(bottom: 5),
+                              child: Text(
+                                "地址:洪山区关山大道328号附7号",
+                                style: TextStyle(
+                                    fontSize: 10, color: Colors.white),
+                              ),
+                            ),
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              crossAxisAlignment: CrossAxisAlignment.center,
+                              children: [
+                                Expanded(
+                                  flex: 1,
+                                  child: Text(
+                                    "时间:09:00-20:30",
+                                    style: TextStyle(
+                                        fontSize: 10, color: Colors.white),
+                                  ),
+                                ),
+                                Text(
+                                  "去了解",
+                                  style: TextStyle(
+                                      fontSize: 13, color: Color(0xffFFFDF6)),
+                                ),
+                                Image.asset("assets/image/icon_right.png"),
+                              ],
+                            )
+                          ],
+                        ),
+                      ),
                     ],
                   ),
                 ),
@@ -578,9 +363,8 @@ class _BrandPage extends State<BrandPage> with SingleTickerProviderStateMixin, A
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceAround,
                       crossAxisAlignment: CrossAxisAlignment.center,
-                      children: tabs
-                          .map((e) => item(e, selectedIndex == e))
-                          .toList(),
+                      children:
+                          tabs.map((e) => item(e, selectedIndex == e)).toList(),
                     ),
                   ),
                 ),
diff --git a/lib/retrofit/data/activity.g.dart b/lib/retrofit/data/activity.g.dart
new file mode 100644
index 00000000..de88e232
--- /dev/null
+++ b/lib/retrofit/data/activity.g.dart
@@ -0,0 +1,44 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'activity.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+Activity _$ActivityFromJson(Map<String, dynamic> json) {
+  return Activity()
+    ..id = json['id'] as String
+    ..createTime = json['createTime'] as String
+    ..createUser = json['createUser']
+    ..updateTime = json['updateTime'] as String
+    ..updateUser = json['updateUser']
+    ..storeId = json['storeId'] as String
+    ..mainTitle = json['mainTitle'] as String
+    ..viceTitle = json['viceTitle'] as String
+    ..content = json['content'] as String
+    ..coverImg = json['coverImg'] as String
+    ..startTime = json['startTime'] as String
+    ..endTime = json['endTime'] as String
+    ..state = json['state'] as int
+    ..isDelete = json['isDelete'] as int
+    ..storeName = json['storeName'] as String;
+}
+
+Map<String, dynamic> _$ActivityToJson(Activity instance) => <String, dynamic>{
+      'id': instance.id,
+      'createTime': instance.createTime,
+      'createUser': instance.createUser,
+      'updateTime': instance.updateTime,
+      'updateUser': instance.updateUser,
+      'storeId': instance.storeId,
+      'mainTitle': instance.mainTitle,
+      'viceTitle': instance.viceTitle,
+      'content': instance.content,
+      'coverImg': instance.coverImg,
+      'startTime': instance.startTime,
+      'endTime': instance.endTime,
+      'state': instance.state,
+      'isDelete': instance.isDelete,
+      'storeName': instance.storeName,
+    };
diff --git a/lib/retrofit/data/address.g.dart b/lib/retrofit/data/address.g.dart
new file mode 100644
index 00000000..392f0ad0
--- /dev/null
+++ b/lib/retrofit/data/address.g.dart
@@ -0,0 +1,40 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'address.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+Address _$AddressFromJson(Map<String, dynamic> json) {
+  return Address()
+    ..address = json['address'] as String
+    ..area = json['area'] as String
+    ..city = json['city'] as String
+    ..cityInfo = json['cityInfo'] as String
+    ..id = json['id'] as String
+    ..isDefault = json['isDefault'] as bool
+    ..latitude = json['latitude'] as String
+    ..longitude = json['longitude'] as String
+    ..mid = json['mid'] as String
+    ..phone = json['phone'] as String
+    ..province = json['province'] as String
+    ..tag = json['tag'] as String
+    ..username = json['username'] as String;
+}
+
+Map<String, dynamic> _$AddressToJson(Address instance) => <String, dynamic>{
+      'address': instance.address,
+      'area': instance.area,
+      'city': instance.city,
+      'cityInfo': instance.cityInfo,
+      'id': instance.id,
+      'isDefault': instance.isDefault,
+      'latitude': instance.latitude,
+      'longitude': instance.longitude,
+      'mid': instance.mid,
+      'phone': instance.phone,
+      'province': instance.province,
+      'tag': instance.tag,
+      'username': instance.username,
+    };
diff --git a/lib/retrofit/data/base_data.g.dart b/lib/retrofit/data/base_data.g.dart
new file mode 100644
index 00000000..a4422b59
--- /dev/null
+++ b/lib/retrofit/data/base_data.g.dart
@@ -0,0 +1,32 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'base_data.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+BaseData _$BaseDataFromJson(Map<String, dynamic> json) {
+  return BaseData()
+    ..code = json['code'] as int
+    ..data = json['data']
+    ..extra = json['extra'] == null
+        ? null
+        : BaseDataExtra.fromJson(json['extra'] as Map<String, dynamic>)
+    ..isError = json['isError'] as bool
+    ..isSuccess = json['isSuccess'] as bool
+    ..msg = json['msg'] as String
+    ..path = json['path'] as String
+    ..timestamp = json['timestamp'] as String;
+}
+
+Map<String, dynamic> _$BaseDataToJson(BaseData instance) => <String, dynamic>{
+      'code': instance.code,
+      'data': instance.data,
+      'extra': instance.extra,
+      'isError': instance.isError,
+      'isSuccess': instance.isSuccess,
+      'msg': instance.msg,
+      'path': instance.path,
+      'timestamp': instance.timestamp,
+    };
diff --git a/lib/retrofit/data/base_data_extra.g.dart b/lib/retrofit/data/base_data_extra.g.dart
new file mode 100644
index 00000000..ea48de2d
--- /dev/null
+++ b/lib/retrofit/data/base_data_extra.g.dart
@@ -0,0 +1,14 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'base_data_extra.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+BaseDataExtra _$BaseDataExtraFromJson(Map<String, dynamic> json) {
+  return BaseDataExtra();
+}
+
+Map<String, dynamic> _$BaseDataExtraToJson(BaseDataExtra instance) =>
+    <String, dynamic>{};
diff --git a/lib/retrofit/data/coupon.g.dart b/lib/retrofit/data/coupon.g.dart
new file mode 100644
index 00000000..2e658e18
--- /dev/null
+++ b/lib/retrofit/data/coupon.g.dart
@@ -0,0 +1,64 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'coupon.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+Coupon _$CouponFromJson(Map<String, dynamic> json) {
+  return Coupon()
+    ..id = json['id'] as String
+    ..createTime = json['createTime'] as String
+    ..createUser = json['createUser'] as String
+    ..updateTime = json['updateTime'] as String
+    ..updateUser = json['updateUser'] as String
+    ..bizType = json['bizType'] as int
+    ..fullAmount = json['fullAmount'] as String
+    ..discountAmount = json['discountAmount'] as String
+    ..discountPercent = json['discountPercent'] as int
+    ..bizId = json['bizId'] as String
+    ..publishStartTime = json['publishStartTime'] as String
+    ..publishEndTime = json['publishEndTime'] as String
+    ..useStartTime = json['useStartTime'] as String
+    ..useEndTime = json['useEndTime'] as String
+    ..promotionId = json['promotionId'] as String
+    ..centreDisplay = json['centreDisplay'] as bool
+    ..tenantCode = json['tenantCode'] as String
+    ..isDelete = json['isDelete'] as int
+    ..couponName = json['couponName'] as String
+    ..couponImg = json['couponImg'] as String
+    ..couponDescription = json['couponDescription'] as String
+    ..memberCouponId = json['memberCouponId'] as String
+    ..receiveTime = json['receiveTime'] as String
+    ..useTime = json['useTime']
+    ..status = json['status'] as int;
+}
+
+Map<String, dynamic> _$CouponToJson(Coupon instance) => <String, dynamic>{
+      'id': instance.id,
+      'createTime': instance.createTime,
+      'createUser': instance.createUser,
+      'updateTime': instance.updateTime,
+      'updateUser': instance.updateUser,
+      'bizType': instance.bizType,
+      'fullAmount': instance.fullAmount,
+      'discountAmount': instance.discountAmount,
+      'discountPercent': instance.discountPercent,
+      'bizId': instance.bizId,
+      'publishStartTime': instance.publishStartTime,
+      'publishEndTime': instance.publishEndTime,
+      'useStartTime': instance.useStartTime,
+      'useEndTime': instance.useEndTime,
+      'promotionId': instance.promotionId,
+      'centreDisplay': instance.centreDisplay,
+      'tenantCode': instance.tenantCode,
+      'isDelete': instance.isDelete,
+      'couponName': instance.couponName,
+      'couponImg': instance.couponImg,
+      'couponDescription': instance.couponDescription,
+      'memberCouponId': instance.memberCouponId,
+      'receiveTime': instance.receiveTime,
+      'useTime': instance.useTime,
+      'status': instance.status,
+    };
diff --git a/lib/retrofit/data/data_type.g.dart b/lib/retrofit/data/data_type.g.dart
new file mode 100644
index 00000000..1ea5414e
--- /dev/null
+++ b/lib/retrofit/data/data_type.g.dart
@@ -0,0 +1,18 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'data_type.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+DataType _$DataTypeFromJson(Map<String, dynamic> json) {
+  return DataType()
+    ..desc = json['desc'] as String
+    ..code = json['code'] as String;
+}
+
+Map<String, dynamic> _$DataTypeToJson(DataType instance) => <String, dynamic>{
+      'desc': instance.desc,
+      'code': instance.code,
+    };
diff --git a/lib/retrofit/data/exchange_order.g.dart b/lib/retrofit/data/exchange_order.g.dart
new file mode 100644
index 00000000..dfe5cd44
--- /dev/null
+++ b/lib/retrofit/data/exchange_order.g.dart
@@ -0,0 +1,45 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'exchange_order.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+ExchangeOrder _$ExchangeOrderFromJson(Map<String, dynamic> json) {
+  return ExchangeOrder()
+    ..id = json['id'] as String
+    ..createTime = json['createTime'] as String
+    ..createUser = json['createUser'] as String
+    ..updateTime = json['updateTime'] as String
+    ..updateUser = json['updateUser'] as String
+    ..storeId = json['storeId'] as String
+    ..mid = json['mid'] as String
+    ..orderCode = json['orderCode'] as String
+    ..amount = json['amount'] as String
+    ..state = json['state'] as int
+    ..useTyped = json['useTyped'] as int
+    ..isDelete = json['isDelete'] as int
+    ..creditOrderDetailList = (json['creditOrderDetailList'] as List)
+        ?.map((e) => e == null
+            ? null
+            : ExchangeOrderGoods.fromJson(e as Map<String, dynamic>))
+        ?.toList();
+}
+
+Map<String, dynamic> _$ExchangeOrderToJson(ExchangeOrder instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'createTime': instance.createTime,
+      'createUser': instance.createUser,
+      'updateTime': instance.updateTime,
+      'updateUser': instance.updateUser,
+      'storeId': instance.storeId,
+      'mid': instance.mid,
+      'orderCode': instance.orderCode,
+      'amount': instance.amount,
+      'state': instance.state,
+      'useTyped': instance.useTyped,
+      'isDelete': instance.isDelete,
+      'creditOrderDetailList': instance.creditOrderDetailList,
+    };
diff --git a/lib/retrofit/data/exchange_order_goods.g.dart b/lib/retrofit/data/exchange_order_goods.g.dart
new file mode 100644
index 00000000..8ffd8d2d
--- /dev/null
+++ b/lib/retrofit/data/exchange_order_goods.g.dart
@@ -0,0 +1,53 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'exchange_order_goods.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+ExchangeOrderGoods _$ExchangeOrderGoodsFromJson(Map<String, dynamic> json) {
+  return ExchangeOrderGoods()
+    ..id = json['id'] as String
+    ..createTime = json['createTime'] as String
+    ..createUser = json['createUser'] as String
+    ..updateTime = json['updateTime'] as String
+    ..updateUser = json['updateUser'] as String
+    ..orderId = json['orderId'] as String
+    ..goodsId = json['goodsId'] as String
+    ..categoryId = json['categoryId'] as String
+    ..name = json['name'] as String
+    ..description = json['description'] as String
+    ..worth = json['worth'] as String
+    ..price = json['price'] as String
+    ..couponId = json['couponId'] as String
+    ..canPick = json['canPick'] as bool
+    ..canDelivery = json['canDelivery'] as bool
+    ..goodsMainImg = json['goodsMainImg'] as String
+    ..goodsViceImg = json['goodsViceImg'] as String
+    ..goodsNumber = json['goodsNumber'] as int
+    ..isDelete = json['isDelete'] as int;
+}
+
+Map<String, dynamic> _$ExchangeOrderGoodsToJson(ExchangeOrderGoods instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'createTime': instance.createTime,
+      'createUser': instance.createUser,
+      'updateTime': instance.updateTime,
+      'updateUser': instance.updateUser,
+      'orderId': instance.orderId,
+      'goodsId': instance.goodsId,
+      'categoryId': instance.categoryId,
+      'name': instance.name,
+      'description': instance.description,
+      'worth': instance.worth,
+      'price': instance.price,
+      'couponId': instance.couponId,
+      'canPick': instance.canPick,
+      'canDelivery': instance.canDelivery,
+      'goodsMainImg': instance.goodsMainImg,
+      'goodsViceImg': instance.goodsViceImg,
+      'goodsNumber': instance.goodsNumber,
+      'isDelete': instance.isDelete,
+    };
diff --git a/lib/retrofit/data/goods.g.dart b/lib/retrofit/data/goods.g.dart
new file mode 100644
index 00000000..8923d6b2
--- /dev/null
+++ b/lib/retrofit/data/goods.g.dart
@@ -0,0 +1,61 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'goods.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+Goods _$GoodsFromJson(Map<String, dynamic> json) {
+  return Goods()
+    ..canDelivery = json['canDelivery'] as bool
+    ..canPick = json['canPick'] as bool
+    ..categoryId = json['categoryId'] as String
+    ..categoryName = json['categoryName'] as String
+    ..couponId = json['couponId'] as String
+    ..createTime = json['createTime'] as String
+    ..createUser = json['createUser']
+    ..description = json['description'] as String
+    ..id = json['id'] as String
+    ..isDelete = json['isDelete']
+    ..isHot = json['isHot'] as bool
+    ..mainImgPath = json['mainImgPath'] as String
+    ..name = json['name'] as String
+    ..price = json['price'] as String
+    ..sales = json['sales']
+    ..sortOrder = json['sortOrder']
+    ..state = json['state']
+    ..stock = json['stock']
+    ..storeId = json['storeId'] as String
+    ..updateTime = json['updateTime'] as String
+    ..updateUser = json['updateUser'] as String
+    ..viceImgPaths =
+        (json['viceImgPaths'] as List)?.map((e) => e as String)?.toList()
+    ..worth = json['worth'] as String;
+}
+
+Map<String, dynamic> _$GoodsToJson(Goods instance) => <String, dynamic>{
+      'canDelivery': instance.canDelivery,
+      'canPick': instance.canPick,
+      'categoryId': instance.categoryId,
+      'categoryName': instance.categoryName,
+      'couponId': instance.couponId,
+      'createTime': instance.createTime,
+      'createUser': instance.createUser,
+      'description': instance.description,
+      'id': instance.id,
+      'isDelete': instance.isDelete,
+      'isHot': instance.isHot,
+      'mainImgPath': instance.mainImgPath,
+      'name': instance.name,
+      'price': instance.price,
+      'sales': instance.sales,
+      'sortOrder': instance.sortOrder,
+      'state': instance.state,
+      'stock': instance.stock,
+      'storeId': instance.storeId,
+      'updateTime': instance.updateTime,
+      'updateUser': instance.updateUser,
+      'viceImgPaths': instance.viceImgPaths,
+      'worth': instance.worth,
+    };
diff --git a/lib/retrofit/data/member_rank.g.dart b/lib/retrofit/data/member_rank.g.dart
new file mode 100644
index 00000000..5971713a
--- /dev/null
+++ b/lib/retrofit/data/member_rank.g.dart
@@ -0,0 +1,33 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'member_rank.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+MemberRank _$MemberRankFromJson(Map<String, dynamic> json) {
+  return MemberRank()
+    ..id = json['id'] as String
+    ..nextId = json['nextId'] as String
+    ..nextName = json['nextName'] as String
+    ..nextOrigin = json['nextOrigin'] as int
+    ..rankContent = json['rankContent'] as String
+    ..rankImg = json['rankImg'] as String
+    ..rankName = json['rankName'] as String
+    ..rankOrigin = json['rankOrigin'] as int
+    ..status = json['status'] as bool;
+}
+
+Map<String, dynamic> _$MemberRankToJson(MemberRank instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'nextId': instance.nextId,
+      'nextName': instance.nextName,
+      'nextOrigin': instance.nextOrigin,
+      'rankContent': instance.rankContent,
+      'rankImg': instance.rankImg,
+      'rankName': instance.rankName,
+      'rankOrigin': instance.rankOrigin,
+      'status': instance.status,
+    };
diff --git a/lib/retrofit/data/page.g.dart b/lib/retrofit/data/page.g.dart
new file mode 100644
index 00000000..0eae5c04
--- /dev/null
+++ b/lib/retrofit/data/page.g.dart
@@ -0,0 +1,30 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'page.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+PageInfo _$PageInfoFromJson(Map<String, dynamic> json) {
+  return PageInfo()
+    ..pageNum = json['pageNum'] as int
+    ..pageSize = json['pageSize'] as int
+    ..size = json['size'] as int
+    ..pages = json['pages'] as int
+    ..hasPreviousPage = json['hasPreviousPage'] as bool
+    ..hasNextPage = json['hasNextPage'] as bool
+    ..total = json['total'] as String
+    ..list = json['list'] as List;
+}
+
+Map<String, dynamic> _$PageInfoToJson(PageInfo instance) => <String, dynamic>{
+      'pageNum': instance.pageNum,
+      'pageSize': instance.pageSize,
+      'size': instance.size,
+      'pages': instance.pages,
+      'hasPreviousPage': instance.hasPreviousPage,
+      'hasNextPage': instance.hasNextPage,
+      'total': instance.total,
+      'list': instance.list,
+    };
diff --git a/lib/retrofit/data/sign_in.g.dart b/lib/retrofit/data/sign_in.g.dart
new file mode 100644
index 00000000..5d4abcd0
--- /dev/null
+++ b/lib/retrofit/data/sign_in.g.dart
@@ -0,0 +1,46 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'sign_in.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+SignIn _$SignInFromJson(Map<String, dynamic> json) {
+  return SignIn()
+    ..balance = json['balance'] as String
+    ..category = json['category'] as String
+    ..createTime = json['createTime'] as String
+    ..createUser = json['createUser'] as String
+    ..id = json['id'] as String
+    ..isDeleted = json['isDeleted'] as bool
+    ..linkId = json['linkId'] as String
+    ..mark = json['mark'] as String
+    ..mid = json['mid'] as String
+    ..number = json['number'] as String
+    ..pm = json['pm'] as int
+    ..status = json['status'] as bool
+    ..title = json['title'] as String
+    ..type = json['type'] as String
+    ..updateTime = json['updateTime'] as String
+    ..updateUser = json['updateUser'] as String;
+}
+
+Map<String, dynamic> _$SignInToJson(SignIn instance) => <String, dynamic>{
+      'balance': instance.balance,
+      'category': instance.category,
+      'createTime': instance.createTime,
+      'createUser': instance.createUser,
+      'id': instance.id,
+      'isDeleted': instance.isDeleted,
+      'linkId': instance.linkId,
+      'mark': instance.mark,
+      'mid': instance.mid,
+      'number': instance.number,
+      'pm': instance.pm,
+      'status': instance.status,
+      'title': instance.title,
+      'type': instance.type,
+      'updateTime': instance.updateTime,
+      'updateUser': instance.updateUser,
+    };
diff --git a/lib/retrofit/data/sign_info.g.dart b/lib/retrofit/data/sign_info.g.dart
new file mode 100644
index 00000000..9b6e5f9c
--- /dev/null
+++ b/lib/retrofit/data/sign_info.g.dart
@@ -0,0 +1,32 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'sign_info.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+SignInfo _$SignInfoFromJson(Map<String, dynamic> json) {
+  return SignInfo()
+    ..point = json['point'] as String
+    ..rank = json['rank'] == null
+        ? null
+        : MemberRank.fromJson(json['rank'] as Map<String, dynamic>)
+    ..signInList = (json['signInList'] as List)
+        ?.map((e) =>
+            e == null ? null : SignIn.fromJson(e as Map<String, dynamic>))
+        ?.toList()
+    ..taskList = (json['taskList'] as List)
+        ?.map(
+            (e) => e == null ? null : Task.fromJson(e as Map<String, dynamic>))
+        ?.toList()
+    ..rewardList = (json['rewardList'] as List)?.map((e) => e as int)?.toList();
+}
+
+Map<String, dynamic> _$SignInfoToJson(SignInfo instance) => <String, dynamic>{
+      'point': instance.point,
+      'rank': instance.rank,
+      'signInList': instance.signInList,
+      'taskList': instance.taskList,
+      'rewardList': instance.rewardList,
+    };
diff --git a/lib/retrofit/data/store.g.dart b/lib/retrofit/data/store.g.dart
new file mode 100644
index 00000000..1371b5c7
--- /dev/null
+++ b/lib/retrofit/data/store.g.dart
@@ -0,0 +1,74 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'store.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+Store _$StoreFromJson(Map<String, dynamic> json) {
+  return Store()
+    ..id = json['id'] as String
+    ..createTime = json['createTime'] as String
+    ..createUser = json['createUser'] as String
+    ..updateTime = json['updateTime'] as String
+    ..updateUser = json['updateUser'] as String
+    ..tenantCode = json['tenantCode'] as String
+    ..useErp = json['useErp'] as bool
+    ..openStartTime = json['openStartTime'] as String
+    ..openEndTime = json['openEndTime'] as String
+    ..storeName = json['storeName'] as String
+    ..distance = (json['distance'] as num)?.toDouble()
+    ..logo = json['logo'] as String
+    ..shipAddress = json['shipAddress'] as String
+    ..remark = json['remark']
+    ..mobile = json['mobile'] as String
+    ..longitude = json['longitude'] as String
+    ..latitude = json['latitude'] as String
+    ..refundAddress = json['refundAddress']
+    ..refundTel = json['refundTel']
+    ..refundContact = json['refundContact']
+    ..isAutoSendRefundAddress = json['isAutoSendRefundAddress'] as int
+    ..province = json['province'] as String
+    ..city = json['city'] as String
+    ..district = json['district'] as String
+    ..address = json['address'] as String
+    ..headName = json['headName'] as String
+    ..headMobile = json['headMobile'] as String
+    ..deliveryInfo = json['deliveryInfo']
+    ..posType = json['posType'] == null
+        ? null
+        : StoreType.fromJson(json['posType'] as Map<String, dynamic>);
+}
+
+Map<String, dynamic> _$StoreToJson(Store instance) => <String, dynamic>{
+      'id': instance.id,
+      'createTime': instance.createTime,
+      'createUser': instance.createUser,
+      'updateTime': instance.updateTime,
+      'updateUser': instance.updateUser,
+      'tenantCode': instance.tenantCode,
+      'useErp': instance.useErp,
+      'openStartTime': instance.openStartTime,
+      'openEndTime': instance.openEndTime,
+      'storeName': instance.storeName,
+      'distance': instance.distance,
+      'logo': instance.logo,
+      'shipAddress': instance.shipAddress,
+      'remark': instance.remark,
+      'mobile': instance.mobile,
+      'longitude': instance.longitude,
+      'latitude': instance.latitude,
+      'refundAddress': instance.refundAddress,
+      'refundTel': instance.refundTel,
+      'refundContact': instance.refundContact,
+      'isAutoSendRefundAddress': instance.isAutoSendRefundAddress,
+      'province': instance.province,
+      'city': instance.city,
+      'district': instance.district,
+      'address': instance.address,
+      'headName': instance.headName,
+      'headMobile': instance.headMobile,
+      'deliveryInfo': instance.deliveryInfo,
+      'posType': instance.posType,
+    };
diff --git a/lib/retrofit/data/store_type.g.dart b/lib/retrofit/data/store_type.g.dart
new file mode 100644
index 00000000..7466837c
--- /dev/null
+++ b/lib/retrofit/data/store_type.g.dart
@@ -0,0 +1,18 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'store_type.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+StoreType _$StoreTypeFromJson(Map<String, dynamic> json) {
+  return StoreType()
+    ..desc = json['desc'] as String
+    ..code = json['code'] as String;
+}
+
+Map<String, dynamic> _$StoreTypeToJson(StoreType instance) => <String, dynamic>{
+      'desc': instance.desc,
+      'code': instance.code,
+    };
diff --git a/lib/retrofit/data/task.g.dart b/lib/retrofit/data/task.g.dart
new file mode 100644
index 00000000..d3e953c3
--- /dev/null
+++ b/lib/retrofit/data/task.g.dart
@@ -0,0 +1,42 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'task.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+Task _$TaskFromJson(Map<String, dynamic> json) {
+  return Task()
+    ..aspects = json['aspects'] as String
+    ..complateNum = json['complateNum'] as int
+    ..conplateNum = json['conplateNum'] as int
+    ..createTime = json['createTime'] as String
+    ..createUser = json['createUser'] as String
+    ..id = json['id'] as String
+    ..limitDay = json['limitDay'] as int
+    ..name = json['name'] as String
+    ..rewardType = json['rewardType'] as int
+    ..rewardValue = json['rewardValue'] as String
+    ..status = json['status'] as bool
+    ..type = json['type'] as String
+    ..updateTime = json['updateTime'] as String
+    ..updateUser = json['updateUser'] as String;
+}
+
+Map<String, dynamic> _$TaskToJson(Task instance) => <String, dynamic>{
+      'aspects': instance.aspects,
+      'complateNum': instance.complateNum,
+      'conplateNum': instance.conplateNum,
+      'createTime': instance.createTime,
+      'createUser': instance.createUser,
+      'id': instance.id,
+      'limitDay': instance.limitDay,
+      'name': instance.name,
+      'rewardType': instance.rewardType,
+      'rewardValue': instance.rewardValue,
+      'status': instance.status,
+      'type': instance.type,
+      'updateTime': instance.updateTime,
+      'updateUser': instance.updateUser,
+    };
diff --git a/lib/retrofit/data/upload_result.g.dart b/lib/retrofit/data/upload_result.g.dart
new file mode 100644
index 00000000..dcfe4bb9
--- /dev/null
+++ b/lib/retrofit/data/upload_result.g.dart
@@ -0,0 +1,67 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'upload_result.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+UploadResult _$UploadResultFromJson(Map<String, dynamic> json) {
+  return UploadResult()
+    ..id = json['id'] as String
+    ..createTime = json['createTime'] as String
+    ..createUser = json['createUser'] as String
+    ..updateTime = json['updateTime'] as String
+    ..updateUser = json['updateUser'] as String
+    ..dataType = json['dataType'] == null
+        ? null
+        : DataType.fromJson(json['dataType'] as Map<String, dynamic>)
+    ..submittedFileName = json['submittedFileName'] as String
+    ..treePath = json['treePath'] as String
+    ..grade = json['grade'] as int
+    ..isDelete = json['isDelete'] as bool
+    ..folderId = json['folderId'] as String
+    ..url = json['url'] as String
+    ..size = json['size'] as String
+    ..folderName = json['folderName'] as String
+    ..group = json['group']
+    ..path = json['path'] as String
+    ..relativePath = json['relativePath'] as String
+    ..fileMd5 = json['fileMd5']
+    ..contextType = json['contextType'] as String
+    ..filename = json['filename'] as String
+    ..ext = json['ext'] as String
+    ..icon = json['icon'] as String
+    ..createMonth = json['createMonth'] as String
+    ..createWeek = json['createWeek'] as String
+    ..createDay = json['createDay'] as String;
+}
+
+Map<String, dynamic> _$UploadResultToJson(UploadResult instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'createTime': instance.createTime,
+      'createUser': instance.createUser,
+      'updateTime': instance.updateTime,
+      'updateUser': instance.updateUser,
+      'dataType': instance.dataType,
+      'submittedFileName': instance.submittedFileName,
+      'treePath': instance.treePath,
+      'grade': instance.grade,
+      'isDelete': instance.isDelete,
+      'folderId': instance.folderId,
+      'url': instance.url,
+      'size': instance.size,
+      'folderName': instance.folderName,
+      'group': instance.group,
+      'path': instance.path,
+      'relativePath': instance.relativePath,
+      'fileMd5': instance.fileMd5,
+      'contextType': instance.contextType,
+      'filename': instance.filename,
+      'ext': instance.ext,
+      'icon': instance.icon,
+      'createMonth': instance.createMonth,
+      'createWeek': instance.createWeek,
+      'createDay': instance.createDay,
+    };
diff --git a/lib/retrofit/data/user_entity.g.dart b/lib/retrofit/data/user_entity.g.dart
new file mode 100644
index 00000000..7554c6ed
--- /dev/null
+++ b/lib/retrofit/data/user_entity.g.dart
@@ -0,0 +1,39 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'user_entity.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+UserEntity _$UserEntityFromJson(Map<String, dynamic> json) {
+  return UserEntity()
+    ..account = json['account'] as String
+    ..avatar = json['avatar'] as String
+    ..expiration = json['expiration'] as String
+    ..expire = json['expire'] as String
+    ..mobile = json['mobile'] as String
+    ..name = json['name'] as String
+    ..refreshToken = json['refreshToken'] as String
+    ..token = json['token'] as String
+    ..tokenType = json['tokenType'] as String
+    ..userId = json['userId'] as String
+    ..userType = json['userType'] as String
+    ..workDescribe = json['workDescribe'] as String;
+}
+
+Map<String, dynamic> _$UserEntityToJson(UserEntity instance) =>
+    <String, dynamic>{
+      'account': instance.account,
+      'avatar': instance.avatar,
+      'expiration': instance.expiration,
+      'expire': instance.expire,
+      'mobile': instance.mobile,
+      'name': instance.name,
+      'refreshToken': instance.refreshToken,
+      'token': instance.token,
+      'tokenType': instance.tokenType,
+      'userId': instance.userId,
+      'userType': instance.userType,
+      'workDescribe': instance.workDescribe,
+    };
diff --git a/lib/retrofit/data/user_info.g.dart b/lib/retrofit/data/user_info.g.dart
new file mode 100644
index 00000000..2b13dca0
--- /dev/null
+++ b/lib/retrofit/data/user_info.g.dart
@@ -0,0 +1,48 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'user_info.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+UserInfo _$UserInfoFromJson(Map<String, dynamic> json) {
+  return UserInfo()
+    ..vipNo = json['vipNo'] as String
+    ..nickname = json['nickname'] as String
+    ..headimg = json['headimg'] as String
+    ..userType = json['userType'] as bool
+    ..sex = json['sex'] as String
+    ..level = json['level'] as int
+    ..addressId = json['addressId'] as String
+    ..remark = json['remark'] as String
+    ..phone = json['phone'] as String
+    ..createTime = json['createTime'] as String
+    ..birth = json['birth'] as String
+    ..balance = json['balance']
+    ..money = json['money'] as String
+    ..points = json['points'] as String
+    ..isBind = json['isBind'] as bool
+    ..memberRankVo = json['memberRankVo'] == null
+        ? null
+        : MemberRank.fromJson(json['memberRankVo'] as Map<String, dynamic>);
+}
+
+Map<String, dynamic> _$UserInfoToJson(UserInfo instance) => <String, dynamic>{
+      'vipNo': instance.vipNo,
+      'nickname': instance.nickname,
+      'headimg': instance.headimg,
+      'userType': instance.userType,
+      'sex': instance.sex,
+      'level': instance.level,
+      'addressId': instance.addressId,
+      'remark': instance.remark,
+      'phone': instance.phone,
+      'createTime': instance.createTime,
+      'birth': instance.birth,
+      'balance': instance.balance,
+      'money': instance.money,
+      'points': instance.points,
+      'isBind': instance.isBind,
+      'memberRankVo': instance.memberRankVo,
+    };
diff --git a/lib/retrofit/data/verify_code.g.dart b/lib/retrofit/data/verify_code.g.dart
new file mode 100644
index 00000000..662a87e0
--- /dev/null
+++ b/lib/retrofit/data/verify_code.g.dart
@@ -0,0 +1,33 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'verify_code.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+VerifyCode _$VerifyCodeFromJson(Map<String, dynamic> json) {
+  return VerifyCode()
+    ..code = json['code'] as int
+    ..data = json['data'] as Map<String, dynamic>
+    ..extra = json['extra'] == null
+        ? null
+        : BaseDataExtra.fromJson(json['extra'] as Map<String, dynamic>)
+    ..isError = json['isError'] as bool
+    ..isSuccess = json['isSuccess'] as bool
+    ..msg = json['msg'] as String
+    ..path = json['path'] as String
+    ..timestamp = json['timestamp'] as String;
+}
+
+Map<String, dynamic> _$VerifyCodeToJson(VerifyCode instance) =>
+    <String, dynamic>{
+      'code': instance.code,
+      'data': instance.data,
+      'extra': instance.extra,
+      'isError': instance.isError,
+      'isSuccess': instance.isSuccess,
+      'msg': instance.msg,
+      'path': instance.path,
+      'timestamp': instance.timestamp,
+    };
diff --git a/lib/retrofit/retrofit_api.g.dart b/lib/retrofit/retrofit_api.g.dart
new file mode 100644
index 00000000..71c615fa
--- /dev/null
+++ b/lib/retrofit/retrofit_api.g.dart
@@ -0,0 +1,507 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'retrofit_api.dart';
+
+// **************************************************************************
+// RetrofitGenerator
+// **************************************************************************
+
+class _ApiService implements ApiService {
+  _ApiService(this._dio, {this.baseUrl}) {
+    ArgumentError.checkNotNull(_dio, '_dio');
+    baseUrl ??= 'http://192.168.10.236:8766/app';
+  }
+
+  final Dio _dio;
+
+  String baseUrl;
+
+  @override
+  Future<BaseData> upload(data, folderId) async {
+    ArgumentError.checkNotNull(data, 'data');
+    ArgumentError.checkNotNull(folderId, 'folderId');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = FormData();
+    _data.files.add(MapEntry(
+        'file',
+        MultipartFile.fromFileSync(data.path,
+            filename: data.path.split(Platform.pathSeparator).last)));
+    if (folderId != null) {
+      _data.fields.add(MapEntry('folderId', folderId.toString()));
+    }
+    final _result = await _dio.request<Map<String, dynamic>>('/file/upload',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData.fromJson(_result.data);
+    return value;
+  }
+
+  @override
+  Future<dynamic> searchPoi(lat, lng, keywords, size, page) async {
+    ArgumentError.checkNotNull(lat, 'lat');
+    ArgumentError.checkNotNull(lng, 'lng');
+    ArgumentError.checkNotNull(keywords, 'keywords');
+    ArgumentError.checkNotNull(size, 'size');
+    ArgumentError.checkNotNull(page, 'page');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    final _result = await _dio.request(
+        'https://restapi.amap.com/v3/place/around?key=542b46afa8e4b88fe1eb3c4d0ba0872f&location=$lat,$lng&keywords=$keywords&offset={size}&page={page}&extensions=all',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'GET',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = _result.data;
+    return value;
+  }
+
+  @override
+  Future<BaseData> memberLogin(param) async {
+    ArgumentError.checkNotNull(param, 'param');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(param ?? <String, dynamic>{});
+    final _result = await _dio.request<Map<String, dynamic>>(
+        '/auth/platform/memberLogin',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData.fromJson(_result.data);
+    return value;
+  }
+
+  @override
+  Future<BaseData> sendVerify(mobile) async {
+    ArgumentError.checkNotNull(mobile, 'mobile');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    final _result = await _dio.request<Map<String, dynamic>>(
+        '/auth/sendVerify/$mobile',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'GET',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData.fromJson(_result.data);
+    return value;
+  }
+
+  @override
+  Future<BaseData> creditGoods(param) async {
+    ArgumentError.checkNotNull(param, 'param');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(param ?? <String, dynamic>{});
+    final _result = await _dio.request<Map<String, dynamic>>(
+        '/creditGoods/list',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData.fromJson(_result.data);
+    return value;
+  }
+
+  @override
+  Future<BaseData> creditGoodsById(id) async {
+    ArgumentError.checkNotNull(id, 'id');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    final _result = await _dio.request<Map<String, dynamic>>('/creditGoods/$id',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'GET',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData.fromJson(_result.data);
+    return value;
+  }
+
+  @override
+  Future<BaseData> queryInfo() async {
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    final _result = await _dio.request<Map<String, dynamic>>('/member/info',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'GET',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData.fromJson(_result.data);
+    return value;
+  }
+
+  @override
+  Future<BaseData> editInfo(param) async {
+    ArgumentError.checkNotNull(param, 'param');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(param ?? <String, dynamic>{});
+    final _result = await _dio.request<Map<String, dynamic>>(
+        '/member/editMemberInfo',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData.fromJson(_result.data);
+    return value;
+  }
+
+  @override
+  Future<BaseData> signInInfo() async {
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    final _result = await _dio.request<Map<String, dynamic>>(
+        '/member/signInInfo',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'GET',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData.fromJson(_result.data);
+    return value;
+  }
+
+  @override
+  Future<BaseData> signIn() async {
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    final _result = await _dio.request<Map<String, dynamic>>('/member/signIn',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'GET',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData.fromJson(_result.data);
+    return value;
+  }
+
+  @override
+  Future<BaseData> recharge(param) async {
+    ArgumentError.checkNotNull(param, 'param');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(param ?? <String, dynamic>{});
+    final _result = await _dio.request<Map<String, dynamic>>('/member/recharge',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData.fromJson(_result.data);
+    return value;
+  }
+
+  @override
+  Future<BaseData> receiveCoupon(param) async {
+    ArgumentError.checkNotNull(param, 'param');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(param ?? <String, dynamic>{});
+    final _result = await _dio.request<Map<String, dynamic>>(
+        '/member/receiveCoupon',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData.fromJson(_result.data);
+    return value;
+  }
+
+  @override
+  Future<BaseData> creditOrderList(param) async {
+    ArgumentError.checkNotNull(param, 'param');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(param ?? <String, dynamic>{});
+    final _result = await _dio.request<Map<String, dynamic>>(
+        '/creditOrder/list',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData.fromJson(_result.data);
+    return value;
+  }
+
+  @override
+  Future<BaseData> creditOrder(param) async {
+    ArgumentError.checkNotNull(param, 'param');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(param ?? <String, dynamic>{});
+    final _result = await _dio.request<Map<String, dynamic>>(
+        '/creditOrder/create',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData.fromJson(_result.data);
+    return value;
+  }
+
+  @override
+  Future<BaseData> addAddress(param) async {
+    ArgumentError.checkNotNull(param, 'param');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(param ?? <String, dynamic>{});
+    final _result = await _dio.request<Map<String, dynamic>>('/address/add',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData.fromJson(_result.data);
+    return value;
+  }
+
+  @override
+  Future<BaseData> deleteAddress(param) async {
+    ArgumentError.checkNotNull(param, 'param');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(param ?? <String, dynamic>{});
+    final _result = await _dio.request<Map<String, dynamic>>('/address/delete',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData.fromJson(_result.data);
+    return value;
+  }
+
+  @override
+  Future<BaseData> queryAddress(id) async {
+    ArgumentError.checkNotNull(id, 'id');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    final _result = await _dio.request<Map<String, dynamic>>(
+        '/address/detail/$id',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'GET',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData.fromJson(_result.data);
+    return value;
+  }
+
+  @override
+  Future<BaseData> queryMemberAddress() async {
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    final _result = await _dio.request<Map<String, dynamic>>(
+        '/address/queryMemberAddress',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'GET',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData.fromJson(_result.data);
+    return value;
+  }
+
+  @override
+  Future<BaseData> updateAddress(param) async {
+    ArgumentError.checkNotNull(param, 'param');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(param ?? <String, dynamic>{});
+    final _result = await _dio.request<Map<String, dynamic>>('/address/update',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData.fromJson(_result.data);
+    return value;
+  }
+
+  @override
+  Future<BaseData> queryCoupon(param) async {
+    ArgumentError.checkNotNull(param, 'param');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(param ?? <String, dynamic>{});
+    final _result = await _dio.request<Map<String, dynamic>>(
+        '/coupon/centreList',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData.fromJson(_result.data);
+    return value;
+  }
+
+  @override
+  Future<BaseData> queryCard(param) async {
+    ArgumentError.checkNotNull(param, 'param');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(param ?? <String, dynamic>{});
+    final _result = await _dio.request<Map<String, dynamic>>(
+        '/coupon/packageList',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData.fromJson(_result.data);
+    return value;
+  }
+
+  @override
+  Future<BaseData> queryStore(param) async {
+    ArgumentError.checkNotNull(param, 'param');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(param ?? <String, dynamic>{});
+    final _result = await _dio.request<Map<String, dynamic>>('/store/list',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData.fromJson(_result.data);
+    return value;
+  }
+
+  @override
+  Future<BaseData> informationList(param) async {
+    ArgumentError.checkNotNull(param, 'param');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(param ?? <String, dynamic>{});
+    final _result = await _dio.request<Map<String, dynamic>>(
+        '/information/list',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData.fromJson(_result.data);
+    return value;
+  }
+
+  @override
+  Future<BaseData> informationInfo(param) async {
+    ArgumentError.checkNotNull(param, 'param');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(param ?? <String, dynamic>{});
+    final _result = await _dio.request<Map<String, dynamic>>(
+        '/information/{id}',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'POST',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData.fromJson(_result.data);
+    return value;
+  }
+
+  @override
+  Future<BaseData> creditOrderReceive(id) async {
+    ArgumentError.checkNotNull(id, 'id');
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    final _result = await _dio.request<Map<String, dynamic>>(
+        '/creditOrder/receive/$id',
+        queryParameters: queryParameters,
+        options: RequestOptions(
+            method: 'GET',
+            headers: <String, dynamic>{},
+            extra: _extra,
+            baseUrl: baseUrl),
+        data: _data);
+    final value = BaseData.fromJson(_result.data);
+    return value;
+  }
+}
diff --git a/pubspec.lock b/pubspec.lock
index e1ca4785..207ecca7 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,259 +5,259 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "14.0.0"
   amap_flutter_base:
     dependency: transitive
     description:
       name: amap_flutter_base
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.2"
   amap_flutter_location:
     dependency: "direct main"
     description:
       name: amap_flutter_location
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   amap_flutter_map:
     dependency: "direct main"
     description:
       name: amap_flutter_map
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.2"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.41.2"
   args:
     dependency: transitive
     description:
       name: args
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.1"
   async:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.6.1"
+    version: "2.5.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.0"
   bubble_tab_indicator:
     dependency: "direct main"
     description:
       name: bubble_tab_indicator
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.1.6"
   build:
     dependency: transitive
     description:
       name: build
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.6.2"
   build_config:
     dependency: transitive
     description:
       name: build_config
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.4.6"
   build_daemon:
     dependency: transitive
     description:
       name: build_daemon
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.10"
   build_resolvers:
     dependency: transitive
     description:
       name: build_resolvers
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.5.3"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.11.5"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "6.1.10"
   built_collection:
     dependency: transitive
     description:
       name: built_collection
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.3.2"
   built_value:
     dependency: transitive
     description:
       name: built_value
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "7.1.0"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
   checked_yaml:
     dependency: transitive
     description:
       name: checked_yaml
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.4"
   chewie:
     dependency: transitive
     description:
       name: chewie
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.12.2"
   chewie_audio:
     dependency: transitive
     description:
       name: chewie_audio
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.2"
   cli_util:
     dependency: transitive
     description:
       name: cli_util
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.3.1"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.0"
   code_builder:
     dependency: transitive
     description:
       name: code_builder
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.7.0"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.15.0"
   convert:
     dependency: transitive
     description:
       name: convert
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.1"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.1"
   css_colors:
     dependency: transitive
     description:
       name: css_colors
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.1"
   csslib:
     dependency: transitive
     description:
       name: csslib
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.16.2"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.3"
   dart_style:
     dependency: transitive
     description:
       name: dart_style
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.3.12"
   dio:
     dependency: "direct main"
     description:
       name: dio
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.10"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
   ffi:
     dependency: transitive
     description:
       name: ffi
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.2"
   file:
     dependency: transitive
     description:
       name: file
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "6.1.2"
   fixnum:
     dependency: transitive
     description:
       name: fixnum
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.10.11"
   flutter:
@@ -269,14 +269,14 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_html
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.3.0"
   flutter_layout_grid:
     dependency: transitive
     description:
       name: flutter_layout_grid
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.10.5"
   flutter_localizations:
@@ -288,35 +288,35 @@ packages:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.11"
   flutter_screenutil:
     dependency: "direct main"
     description:
       name: flutter_screenutil
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "5.0.0+2"
   flutter_staggered_grid_view:
     dependency: "direct main"
     description:
       name: flutter_staggered_grid_view
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.4.0"
   flutter_svg:
     dependency: transitive
     description:
       name: flutter_svg
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.20.0-nullsafety.3"
   flutter_swiper_null_safety:
     dependency: "direct main"
     description:
       name: flutter_swiper_null_safety
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.2"
   flutter_test:
@@ -333,364 +333,364 @@ packages:
     dependency: "direct main"
     description:
       name: fluttertoast
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "8.0.7"
   glob:
     dependency: transitive
     description:
       name: glob
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.1"
   graphs:
     dependency: transitive
     description:
       name: graphs
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.2.0"
   html:
     dependency: transitive
     description:
       name: html
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.14.0+4"
   http:
     dependency: transitive
     description:
       name: http
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.12.2"
   http_multi_server:
     dependency: transitive
     description:
       name: http_multi_server
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.2.0"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.1.4"
   image_cropper:
     dependency: "direct main"
     description:
       name: image_cropper
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.4.1"
   image_picker:
     dependency: transitive
     description:
       name: image_picker
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.6.7+22"
   image_picker_gallery_camera:
     dependency: "direct main"
     description:
       name: image_picker_gallery_camera
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.1.6"
   image_picker_platform_interface:
     dependency: transitive
     description:
       name: image_picker_platform_interface
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.6"
   import_js_library:
     dependency: transitive
     description:
       name: import_js_library
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.2"
   intl:
     dependency: "direct main"
     description:
       name: intl
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.17.0"
   io:
     dependency: transitive
     description:
       name: io
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.3.5"
   js:
     dependency: transitive
     description:
       name: js
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.6.3"
   json_annotation:
     dependency: "direct main"
     description:
       name: json_annotation
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.1.1"
   json_serializable:
     dependency: "direct dev"
     description:
       name: json_serializable
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.5.1"
   logger:
     dependency: "direct main"
     description:
       name: logger
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.0"
   logging:
     dependency: transitive
     description:
       name: logging
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.1"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.12.10"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.3.0"
   mime:
     dependency: transitive
     description:
       name: mime
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.0"
   package_config:
     dependency: transitive
     description:
       name: package_config
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.9.3"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.8.0"
   path_drawing:
     dependency: transitive
     description:
       name: path_drawing
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.5.1"
   path_parsing:
     dependency: transitive
     description:
       name: path_parsing
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.2.1"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.1"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.11.1"
   permission_handler:
     dependency: "direct main"
     description:
       name: permission_handler
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "5.1.0+2"
   permission_handler_platform_interface:
     dependency: transitive
     description:
       name: permission_handler_platform_interface
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.2"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.1.0"
   platform:
     dependency: transitive
     description:
       name: platform
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.0"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.3"
   pool:
     dependency: transitive
     description:
       name: pool
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.5.0"
   process:
     dependency: transitive
     description:
       name: process
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.2.1"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   pubspec_parse:
     dependency: transitive
     description:
       name: pubspec_parse
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.1.8"
   pull_to_refresh:
     dependency: "direct main"
     description:
       name: pull_to_refresh
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   quiver:
     dependency: transitive
     description:
       name: quiver
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.5"
   retrofit:
     dependency: "direct main"
     description:
       name: retrofit
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.3.4+1"
   retrofit_generator:
     dependency: "direct dev"
     description:
       name: retrofit_generator
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.4.1+3"
   rxdart:
     dependency: "direct main"
     description:
       name: rxdart
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.26.0"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.6"
   shared_preferences_linux:
     dependency: transitive
     description:
       name: shared_preferences_linux
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   shared_preferences_macos:
     dependency: transitive
     description:
       name: shared_preferences_macos
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   shared_preferences_web:
     dependency: transitive
     description:
       name: shared_preferences_web
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   shared_preferences_windows:
     dependency: transitive
     description:
       name: shared_preferences_windows
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   shelf:
     dependency: transitive
     description:
       name: shelf
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.7.9"
   shelf_web_socket:
     dependency: transitive
     description:
       name: shelf_web_socket
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.2.4+1"
   sky_engine:
@@ -702,177 +702,177 @@ packages:
     dependency: transitive
     description:
       name: source_gen
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.9.10+3"
   source_span:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.0"
   stream_transform:
     dependency: transitive
     description:
       name: stream_transform
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.3.0"
+    version: "0.2.19"
   timing:
     dependency: transitive
     description:
       name: timing
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.1.1+3"
   tuple:
     dependency: transitive
     description:
       name: tuple
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.3"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.3.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.0"
   video_player:
     dependency: transitive
     description:
       name: video_player
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.1"
   video_player_platform_interface:
     dependency: transitive
     description:
       name: video_player_platform_interface
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.2.0"
   video_player_web:
     dependency: transitive
     description:
       name: video_player_web
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.1.4+1"
   wakelock:
     dependency: transitive
     description:
       name: wakelock
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.2.1+1"
   wakelock_platform_interface:
     dependency: transitive
     description:
       name: wakelock_platform_interface
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.1.0+1"
   wakelock_web:
     dependency: transitive
     description:
       name: wakelock_web
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.1.0+3"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.0"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
   webview_flutter:
     dependency: transitive
     description:
       name: webview_flutter
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.7"
   win32:
     dependency: transitive
     description:
       name: win32
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.2.4"
+    version: "2.0.5"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.2.0"
   xml:
     dependency: transitive
     description:
       name: xml
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "5.1.2"
   yaml:
     dependency: transitive
     description:
       name: yaml
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.1.0"
 sdks:
-  dart: ">=2.13.0 <3.0.0"
+  dart: ">=2.12.0 <3.0.0"
   flutter: ">=2.0.0"

From 3620545de29ab774412bc791a8eff574979297e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=93=88=E5=93=88=E5=93=88?= <fengmeikan@hotmail.com>
Date: Mon, 5 Jul 2021 00:08:14 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E7=99=BB=E9=99=86=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/home/huixiang_brand_page.dart |  84 ++++----
 lib/login/login_page.dart         | 315 ++++++++++++++++++++++++------
 pubspec.yaml                      |   1 +
 3 files changed, 295 insertions(+), 105 deletions(-)

diff --git a/lib/home/huixiang_brand_page.dart b/lib/home/huixiang_brand_page.dart
index a7dabb7f..21df2d8f 100644
--- a/lib/home/huixiang_brand_page.dart
+++ b/lib/home/huixiang_brand_page.dart
@@ -105,20 +105,20 @@ class _BrandPage extends State<BrandPage>
                       banner(),
                       buildInfo(),
                       buildTab(),
-                      Container(
-                        decoration: new BoxDecoration(
-                          border: Border(
-                              bottom:
-                                  BorderSide(color: Colors.black, width: 0.0)),
-                          color: Colors.black,
-                        ),
-                        key: chiliGlobalKey,
-                        child: Image.asset(
-                          "assets/image/brand_store_cj.png",
-                          fit: BoxFit.fill,
-                          width: double.infinity,
-                        ),
-                      ),
+                      // Container(
+                      //   decoration: new BoxDecoration(
+                      //     border: Border(
+                      //         bottom:
+                      //             BorderSide(color: Colors.black, width: 0.0)),
+                      //     color: Colors.black,
+                      //   ),
+                      //   key: chiliGlobalKey,
+                      //   child: Image.asset(
+                      //     "assets/image/brand_store_cj.png",
+                      //     fit: BoxFit.fill,
+                      //     width: double.infinity,
+                      //   ),
+                      // ),
                       Container(
                         decoration: new BoxDecoration(
                           border: Border(
@@ -196,20 +196,20 @@ class _BrandPage extends State<BrandPage>
                       SizedBox(
                         height: 16,
                       ),
-                      Container(
-                        decoration: new BoxDecoration(
-                          border: Border(
-                              bottom:
-                                  BorderSide(color: Colors.white, width: 0.0)),
-                          color: Colors.white,
-                        ),
-                        key: milkTeaGlobalKey,
-                        child: Image.asset(
-                          "assets/image/brand_store_hx.png",
-                          fit: BoxFit.fill,
-                          width: double.infinity,
-                        ),
-                      ),
+                      // Container(
+                      //   decoration: new BoxDecoration(
+                      //     border: Border(
+                      //         bottom:
+                      //             BorderSide(color: Colors.white, width: 0.0)),
+                      //     color: Colors.white,
+                      //   ),
+                      //   key: milkTeaGlobalKey,
+                      //   child: Image.asset(
+                      //     "assets/image/brand_store_hx.png",
+                      //     fit: BoxFit.fill,
+                      //     width: double.infinity,
+                      //   ),
+                      // ),
                       Container(
                         decoration: new BoxDecoration(
                           border: Border(
@@ -279,20 +279,20 @@ class _BrandPage extends State<BrandPage>
                       SizedBox(
                         height: 16,
                       ),
-                      Container(
-                        decoration: new BoxDecoration(
-                          border: Border(
-                              bottom: BorderSide(
-                                  color: Color(0xff052C4B), width: 0.0)),
-                          color: Color(0xff052C4B),
-                        ),
-                        key: breadGlobalKey,
-                        child: Image.asset(
-                          "assets/image/brand_store_bg.png",
-                          fit: BoxFit.fill,
-                          width: double.infinity,
-                        ),
-                      ),
+                      // Container(
+                      //   decoration: new BoxDecoration(
+                      //     border: Border(
+                      //         bottom: BorderSide(
+                      //             color: Color(0xff052C4B), width: 0.0)),
+                      //     color: Color(0xff052C4B),
+                      //   ),
+                      //   key: breadGlobalKey,
+                      //   child: Image.asset(
+                      //     "assets/image/brand_store_bg.png",
+                      //     fit: BoxFit.fill,
+                      //     width: double.infinity,
+                      //   ),
+                      // ),
                       Container(
                         decoration: new BoxDecoration(
                           border: Border(
diff --git a/lib/login/login_page.dart b/lib/login/login_page.dart
index 2df5c9b7..d08e2138 100644
--- a/lib/login/login_page.dart
+++ b/lib/login/login_page.dart
@@ -14,6 +14,7 @@ import 'package:huixiang/generated/l10n.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:dio/dio.dart';
 import 'package:huixiang/view_widget/loading_view.dart';
+import 'package:photo_view/photo_view.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 class LoginPage extends StatefulWidget {
@@ -23,7 +24,7 @@ class LoginPage extends StatefulWidget {
   _MyLoginPageState createState() => _MyLoginPageState();
 }
 
-class _MyLoginPageState extends State<LoginPage> {
+class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
   var checkStatus = false;
   var mobileStatus = 0;
   var verifyStatus = 0;
@@ -42,6 +43,7 @@ class _MyLoginPageState extends State<LoginPage> {
   final int initAlpha = 89;
   int alpha = 89;
   int changeAlpha = 0;
+  Animation<Alignment> animation;
 
   @override
   void initState() {
@@ -50,9 +52,16 @@ class _MyLoginPageState extends State<LoginPage> {
     client = ApiService(dio);
     scrollController = ScrollController(keepScrollOffset: false);
 
+    alignmentBegin = Alignment.topCenter;
+    alignmentEnd = Alignment.bottomRight;
+    animationStart();
+
     scrollController.addListener(() {
       RenderBox renderBox = loginKey.currentContext.findRenderObject();
-      var screenHeight = MediaQuery.of(context).size.height;
+      var screenHeight = MediaQuery
+          .of(context)
+          .size
+          .height;
       var scrollHeight = screenHeight * 1.47;
       // var spaceHeight = screenHeight * 0.6244;
       var height = scrollHeight - renderBox.size.height;
@@ -67,9 +76,9 @@ class _MyLoginPageState extends State<LoginPage> {
       changeAlpha = (changeAlpha > 255 ? 255 : changeAlpha);
       changeAlpha = (changeAlpha < 0 ? 0 : changeAlpha);
       alpha = (initAlpha +
-              scrollController.offset /
-                  (height - chaHeight) *
-                  (255 - initAlpha))
+          scrollController.offset /
+              (height - chaHeight) *
+              (255 - initAlpha))
           .toInt();
       alpha = (alpha > 255 ? 255 : alpha);
       alpha = (alpha < 0 ? 0 : alpha);
@@ -83,30 +92,37 @@ class _MyLoginPageState extends State<LoginPage> {
 
   _sendCode() async {
     if (!checkStatus) {
-      Fluttertoast.showToast(msg: S.of(context).gouxuanxieyi);
+      Fluttertoast.showToast(msg: S
+          .of(context)
+          .gouxuanxieyi);
       return;
     }
     var mobile = _controllerPhone.text;
     if (mobile == "") {
       mobileStatus = 2;
-      mobileErrorText = S.of(context).qingshurushoujihao;
+      mobileErrorText = S
+          .of(context)
+          .qingshurushoujihao;
       setState(() {});
       return;
     }
     if (_sendCodeStatus == 0) {
       client
           .sendVerify(mobile)
-          .then((value) => {
-                if (value.isSuccess)
-                  {_sendCodeStatus = 1, countdown()}
-                else
-                  {
-                    btnText = S.of(context).send_code,
-                    _sendCodeStatus = 0,
-                    Fluttertoast.showToast(msg: "${value.msg}"),
-                    refresh()
-                  }
-              })
+          .then((value) =>
+      {
+        if (value.isSuccess)
+          {_sendCodeStatus = 1, countdown()}
+        else
+          {
+            btnText = S
+                .of(context)
+                .send_code,
+            _sendCodeStatus = 0,
+            Fluttertoast.showToast(msg: "${value.msg}"),
+            refresh()
+          }
+      })
           .catchError((error) {
         Fluttertoast.showToast(msg: "$error");
       });
@@ -121,7 +137,9 @@ class _MyLoginPageState extends State<LoginPage> {
     _timer = Timer.periodic(Duration(seconds: 1), (timer) {
       countdown--;
       if (countdown == 0) {
-        btnText = S.of(context).send_code;
+        btnText = S
+            .of(context)
+            .send_code;
         _sendCodeStatus = 0;
         _timer.cancel();
       } else {
@@ -138,48 +156,60 @@ class _MyLoginPageState extends State<LoginPage> {
   @override
   void dispose() {
     if (_timer != null) _timer.cancel();
+    if (animatedContainer != null) animatedContainer.dispose();
     super.dispose();
   }
 
   _login() async {
     // Navigator.of(context).popAndPushNamed('/router/main_page');
     // return;
+    return;
     if (alpha != 255) {
       scrollToTop();
       return;
     }
 
     if (!checkStatus) {
-      Fluttertoast.showToast(msg: S.of(context).gouxuanxieyi);
+      Fluttertoast.showToast(msg: S
+          .of(context)
+          .gouxuanxieyi);
       return;
     }
     var mobile = _controllerPhone.text;
     if (mobile == "") {
       mobileStatus = 2;
-      mobileErrorText = S.of(context).qingshurushoujihao;
+      mobileErrorText = S
+          .of(context)
+          .qingshurushoujihao;
       setState(() {});
       return;
     }
     if (mobile.length != 11) {
       mobileStatus = 2;
-      mobileErrorText = S.of(context).phone_error;
+      mobileErrorText = S
+          .of(context)
+          .phone_error;
       setState(() {});
       return;
     }
     var code = _controllerCode.text;
     if (code == "") {
       verifyStatus = 2;
-      codeErrorText = S.of(context).qingshuruyanzhengma;
+      codeErrorText = S
+          .of(context)
+          .qingshuruyanzhengma;
       setState(() {});
       return;
     }
     if (code.length != 6) {
       verifyStatus = 2;
-      codeErrorText = S.of(context).code_error;
+      codeErrorText = S
+          .of(context)
+          .code_error;
       setState(() {});
       return;
     }
-    var paramt = {
+    var param = {
       "capcha": code,
       "mobile": mobile,
     };
@@ -190,7 +220,7 @@ class _MyLoginPageState extends State<LoginPage> {
           dialogContext = context;
           return LoadingView();
         });
-    BaseData value = await client.memberLogin(paramt).catchError((error) {
+    BaseData value = await client.memberLogin(param).catchError((error) {
       print(error);
       Fluttertoast.showToast(msg: "$error");
     });
@@ -209,13 +239,69 @@ class _MyLoginPageState extends State<LoginPage> {
 
   saveUserJson(userJson) {
     var userEntity = UserEntity.fromJson(userJson);
-    SharedPreferences.getInstance().then((value) => {
-          value.setString('userJson', jsonEncode(userJson)),
-          value.setString('token', userEntity.token),
-          value.setString('userId', userEntity.userId),
-          value.setString('nick', userEntity.name),
-          value.setString('mobile', userEntity.mobile),
-        });
+    SharedPreferences.getInstance().then((value) =>
+    {
+      value.setString('userJson', jsonEncode(userJson)),
+      value.setString('token', userEntity.token),
+      value.setString('userId', userEntity.userId),
+      value.setString('nick', userEntity.name),
+      value.setString('mobile', userEntity.mobile),
+    });
+  }
+
+  AnimationController animatedContainer;
+
+  Alignment alignmentBegin;
+  Alignment alignmentEnd;
+  Alignment alignmentProgress;
+
+  Function listener() {
+    alignmentProgress = animation.value;
+    print("animation $animation");
+    setState(() {});
+  }
+
+  Function statusListener(status) {
+    if (status == AnimationStatus.completed) {
+      if (alignmentEnd == Alignment.bottomRight) {
+        alignmentBegin = Alignment.bottomRight;
+        alignmentEnd = Alignment.centerLeft;
+      } else if (alignmentEnd == Alignment.centerLeft) {
+        alignmentBegin = Alignment.centerLeft;
+        alignmentEnd = Alignment.topRight;
+      } else if (alignmentEnd == Alignment.topRight) {
+        alignmentBegin = Alignment.topRight;
+        alignmentEnd = Alignment.bottomLeft;
+      } else if (alignmentEnd == Alignment.bottomLeft) {
+        alignmentBegin = Alignment.bottomLeft;
+        alignmentEnd = Alignment.centerRight;
+      } else if (alignmentEnd == Alignment.centerRight) {
+        alignmentBegin = Alignment.centerRight;
+        alignmentEnd = Alignment.topLeft;
+      } else if (alignmentEnd == Alignment.topLeft) {
+        alignmentBegin = Alignment.topLeft;
+        alignmentEnd = Alignment.bottomRight;
+      }
+      animationStart();
+    }
+  }
+
+  animationStart() {
+    animatedContainer =
+        AnimationController(vsync: this, duration: Duration(seconds: 10));
+
+    animation =
+        AlignmentTween(begin: alignmentBegin, end: alignmentEnd).animate(
+            animatedContainer);
+
+    animation.removeListener(listener);
+    animation.addListener(listener);
+
+    animatedContainer.removeStatusListener(statusListener);
+    animatedContainer.addStatusListener(statusListener);
+
+    animatedContainer.forward();
+
   }
 
   @override
@@ -230,29 +316,93 @@ class _MyLoginPageState extends State<LoginPage> {
         child: Stack(
           children: [
             Container(
-              height: MediaQuery.of(context).size.height * 0.78,
+              height: MediaQuery
+                  .of(context)
+                  .size
+                  .height * 0.78,
               child: Stack(
                 alignment: Alignment.center,
                 children: [
-                  Column(
-                    mainAxisAlignment: MainAxisAlignment.end,
-                    crossAxisAlignment: CrossAxisAlignment.center,
-                    children: [
-                      Opacity(
-                        opacity: (255 - changeAlpha) / 255,
-                        child: Image.asset(
-                          "assets/image/laoban.png",
-                          width: MediaQuery.of(context).size.width,
-                          fit: BoxFit.fitWidth,
-                        ),
-                      ),
-                    ],
+                  // ShaderMask(
+                  //     shaderCallback: (bounds) {
+                  //       print("bounds: =============");
+                  //
+                  //       // print("bounds: $value");
+                  //       // if(value != null) {
+                  //       //   // var dx = value.x * 360.0;
+                  //       //   // var dy = value.y * 608.0;
+                  //       //
+                  //       //   var dx = (value.x > 123.0 ? value.x : 123.0);
+                  //       //   var dy = (value.y > 123.0 ? value.y : 123.0);
+                  //       //   if (value.x > 123.0 && value.y > 123.0) {
+                  //       //     dx = (value.x < bounds.right ? value.x : bounds.right);
+                  //       //     dy = (value.y < bounds.bottom ? value.y : bounds.bottom);
+                  //       //   }
+                  //       //   bounds = Rect.fromLTRB(dx - 123.0, dy - 123.0,
+                  //       //       value.x + 123.0, value.y + 123.0);
+                  //       // }
+                  //       print("bounds: $bounds");
+                  //
+                  //       return RadialGradient(
+                  //         radius: 0.5,
+                  //         focalRadius: 0.2,
+                  //         focal: Alignment.center,
+                  //         colors: <Color>[
+                  //           Color(0xFF6AC48F).withAlpha(0),
+                  //           Color(0xFF5AD48D).withAlpha(alpha),
+                  //         ],
+                  //       ).createShader(bounds);
+                  //     },
+                  //     blendMode: BlendMode.color,
+                  //     child: ,
+                  // ),
+
+                  PhotoView(
+                    imageProvider: AssetImage("assets/image/laoban.png"),
+                    initialScale: 1.02,
+                    basePosition: alignmentProgress,
                   ),
+
+                  // ScaleTransition(
+                  //   scale: animation,
+                  //   alignment: alignment,
+                  //   child: Column(
+                  //     mainAxisAlignment: MainAxisAlignment.end,
+                  //     crossAxisAlignment: CrossAxisAlignment.center,
+                  //     children: [
+                  //       Opacity(
+                  //         opacity: (255 - changeAlpha) / 255,
+                  //         child: Image.asset(
+                  //           "assets/image/laoban.png",
+                  //           width: MediaQuery.of(context).size.width,
+                  //           fit: BoxFit.fitWidth,
+                  //         ),
+                  //       ),
+                  //     ],
+                  //   ),
+                  // ),
+
+                  // Container(
+                  //   decoration: BoxDecoration(
+                  //     // color: Color(0xFF6AC48F).withAlpha(changeAlpha),
+                  //     gradient: RadialGradient(
+                  //       radius: 0.5,
+                  //       focalRadius: 0.2,
+                  //       focal: Alignment.center,
+                  //       colors: <Color>[
+                  //         Color(0xFF6AC48F).withAlpha(0),
+                  //         Color(0xFF5AD48D).withAlpha(alpha),
+                  //       ],
+                  //     ),
+                  //   ),
+                  // ),
                   Container(
                     decoration: BoxDecoration(
+                      // color: Color(0xFF6AC48F).withAlpha(changeAlpha),
                       gradient: LinearGradient(
                         colors: [
                           Color(0xFF6AC48F).withAlpha(alpha),
+                          Color(0xFF6AC48F).withAlpha(0),
                           if (alpha < 190) Colors.black.withAlpha(190 - alpha),
                           if (alpha >= 190) Color(0xFF5AD48D).withAlpha(alpha)
                         ],
@@ -262,7 +412,10 @@ class _MyLoginPageState extends State<LoginPage> {
                     ),
                   ),
                   Container(
-                    height: MediaQuery.of(context).size.height * 0.78,
+                    height: MediaQuery
+                        .of(context)
+                        .size
+                        .height * 0.78,
                     margin: EdgeInsets.only(top: 56),
                     alignment: Alignment.topCenter,
                     child: AspectRatio(
@@ -299,11 +452,17 @@ class _MyLoginPageState extends State<LoginPage> {
               controller: scrollController,
               physics: PageScrollPhysics().applyTo(ClampingScrollPhysics()),
               child: SizedBox(
-                height: MediaQuery.of(context).size.height * 1.47,
+                height: MediaQuery
+                    .of(context)
+                    .size
+                    .height * 1.47,
                 child: Column(
                   children: [
                     SizedBox(
-                      height: MediaQuery.of(context).size.height * 0.6244,
+                      height: MediaQuery
+                          .of(context)
+                          .size
+                          .height * 0.6244,
                     ),
                     Expanded(
                       child: Container(
@@ -321,7 +480,10 @@ class _MyLoginPageState extends State<LoginPage> {
                               child: Container(
                                 child: Image.asset(
                                   "assets/image/icon_login_bg_webp.webp",
-                                  width: MediaQuery.of(context).size.width,
+                                  width: MediaQuery
+                                      .of(context)
+                                      .size
+                                      .width,
                                   fit: BoxFit.cover,
                                 ),
                               ),
@@ -330,7 +492,10 @@ class _MyLoginPageState extends State<LoginPage> {
                               top: 0,
                             ),
                             Positioned(
-                              top: MediaQuery.of(context).size.height * 0.1039,
+                              top: MediaQuery
+                                  .of(context)
+                                  .size
+                                  .height * 0.1039,
                               bottom: 0,
                               child: Container(
                                 padding: EdgeInsets.symmetric(horizontal: 40),
@@ -436,7 +601,9 @@ class _MyLoginPageState extends State<LoginPage> {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           Text(
-            S.of(context).input_phone,
+            S
+                .of(context)
+                .input_phone,
             style: TextStyle(
               fontSize: 18.sp,
               color: Colors.black,
@@ -444,7 +611,10 @@ class _MyLoginPageState extends State<LoginPage> {
           ),
           Container(
             height: 50.h,
-            width: MediaQuery.of(context).size.width - 80,
+            width: MediaQuery
+                .of(context)
+                .size
+                .width - 80,
             child: TextField(
               style: TextStyle(),
               onChanged: (value) {
@@ -497,7 +667,9 @@ class _MyLoginPageState extends State<LoginPage> {
             height: 35,
           ),
           Text(
-            S.of(context).input_code,
+            S
+                .of(context)
+                .input_code,
             style: TextStyle(
               fontSize: 18.sp,
               color: Colors.black,
@@ -505,7 +677,10 @@ class _MyLoginPageState extends State<LoginPage> {
           ),
           Container(
             height: 50.h,
-            width: MediaQuery.of(context).size.width - 80,
+            width: MediaQuery
+                .of(context)
+                .size
+                .width - 80,
             child: Stack(
               children: [
                 TextField(
@@ -545,7 +720,7 @@ class _MyLoginPageState extends State<LoginPage> {
                     ),
                     hintText: "",
                     contentPadding:
-                        EdgeInsets.only(top: 12, bottom: 12, left: 12),
+                    EdgeInsets.only(top: 12, bottom: 12, left: 12),
                     hintStyle: TextStyle(
                       fontSize: 10,
                       color: Color(0xFFA29E9E),
@@ -579,7 +754,10 @@ class _MyLoginPageState extends State<LoginPage> {
           Expanded(
             flex: 1,
             child: Container(
-              width: MediaQuery.of(context).size.width - 80,
+              width: MediaQuery
+                  .of(context)
+                  .size
+                  .width - 80,
               alignment: Alignment.bottomCenter,
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.center,
@@ -598,19 +776,27 @@ class _MyLoginPageState extends State<LoginPage> {
                   Text.rich(
                     TextSpan(children: [
                       TextSpan(
-                          text: S.of(context).privacy_policy1,
+                          text: S
+                              .of(context)
+                              .privacy_policy1,
                           style: TextStyle(fontSize: 11, color: Colors.black)),
                       TextSpan(
-                          text: S.of(context).privacy_policy2,
+                          text: S
+                              .of(context)
+                              .privacy_policy2,
                           style: TextStyle(fontSize: 11, color: Colors.black)),
                       TextSpan(
                           text: "、\n",
                           style: TextStyle(fontSize: 11, color: Colors.black)),
                       TextSpan(
-                          text: S.of(context).privacy_policy3,
+                          text: S
+                              .of(context)
+                              .privacy_policy3,
                           style: TextStyle(fontSize: 11, color: Colors.black)),
                       TextSpan(
-                          text: S.of(context).privacy_policy4,
+                          text: S
+                              .of(context)
+                              .privacy_policy4,
                           style: TextStyle(fontSize: 11, color: Colors.black)),
                     ]),
                   ),
@@ -628,7 +814,10 @@ class _MyLoginPageState extends State<LoginPage> {
 
   scrollToTop() {
     RenderBox renderBox = loginKey.currentContext.findRenderObject();
-    var screenHeight = MediaQuery.of(context).size.height;
+    var screenHeight = MediaQuery
+        .of(context)
+        .size
+        .height;
     var scrollHeight = screenHeight * 1.47;
     var height = scrollHeight - renderBox.size.height;
     var chaHeight = screenHeight - renderBox.size.height;
diff --git a/pubspec.yaml b/pubspec.yaml
index 841a9efa..8ecc3da5 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -65,6 +65,7 @@ dependencies:
 #  azlistview: ^1.1.1
 
   flutter_html: ^1.3.0    #2.1.0
+  photo_view: ^0.11.1
 
 dev_dependencies:
   flutter_test: