From 3175ebdec64b2cfd51fc3f98e6b6fa4c8ea312e8 Mon Sep 17 00:00:00 2001
From: w-R <953969641@qq.com>
Date: Thu, 5 Aug 2021 18:43:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/image/2x/icon_mine_card.png            | Bin 1657 -> 1705 bytes
 assets/image/2x/icon_mine_order.png           | Bin 1182 -> 966 bytes
 assets/image/3x/icon_mine_card.png            | Bin 3110 -> 3118 bytes
 assets/image/3x/icon_mine_order.png           | Bin 2176 -> 1752 bytes
 assets/image/icon_mine_card.png               | Bin 866 -> 875 bytes
 assets/image/icon_mine_order.png              | Bin 605 -> 510 bytes
 lib/home/points_mall_page.dart                |   1 +
 lib/integral/integral_page.dart               |  32 ++++--
 .../integral_store_details_page.dart          |  21 ++--
 lib/mine/mine_page.dart                       |   4 +-
 lib/mine/mine_vip_level_page.dart             |   5 +
 lib/mine/vip_detail_page.dart                 |  97 +++++++++---------
 lib/union/union_details_page.dart             |   6 +-
 lib/union/union_page.dart                     |  42 ++++----
 pubspec.lock                                  |   8 +-
 15 files changed, 118 insertions(+), 98 deletions(-)

diff --git a/assets/image/2x/icon_mine_card.png b/assets/image/2x/icon_mine_card.png
index 37288409a3884598df7cd502dd2b51dd2cadf405..be0cc3594dc9bf1982a2050ba17383a57aa051c6 100644
GIT binary patch
delta 1690
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

delta 1641
zcmV-v2A27$4fza^BYy@!Nkl<ZcwX(Ce~1)i7{|ZQ%--4kz*0Ib1xqpHqJ+}!Zcl}c
z)Z3leONx|AB7!LUOaJIEr7S6>C`bzWg&2__Ck1vpvv(dPq_?xDsAPl)W+rIKiIqR@
zymse(VlEBSo!yyx_i}G;-hbcc`@HY>GY@<3z3)3i2%8iEl7CW%VuS!Ciy#CT0+b{m
zDGw_!1PILSURqb5t9p!qWgu<>a0h^kVEPt{*l20#Lz0|a<zu=6qg`#2VXH3#SOs8`
zi_1KiR#{17%V<CxlK^A8W09f3x-}5I4usoEfnh)>z~dR++*vBtZ~vGB*kWkS1bhnM
zexGJ9D5@RpjemFl=u=lTe9Qoh?T*zC4c4s(^BMq=5kmM0s@-J8yU&eKe}k;@0Wv6>
zPCNr(6PTvS8YiG9qcz1ruL;>)j=rJ+HmCG?ih}pS94&|0t2r2WBdeRQlp|+F0=%~)
zR)1@4-6jyf1VAl^(d%;9P?c6Ip4umyyW#-0cI)?Xo`1graF49HVtNL8vbwocc8rPw
z*piOlO+q<XWKAdQ_ga0wrJGY^6IK+!W;4;EFm(f%C~K^Qeu$aZXOro-WXGu}fR35i
z*4QmWQ)?O_lqsx;Y9`f&5IL3D7NiQ~udy5fRGWuAup)>_B_<|C2!(}0pnv*?`-zE!
zBAECOCVxKCr=`!!!mIed!sReH+Bqt&0!Q0$x$}nrC5ie1*wo!VQ_b5?GO&bz82~0r
zj$bMAa}1nx{!6hV>h^tYoj-e>m?wbFep_umvXS5{Y^lm?^067mIR<?=5XrAS+_vjd
zDGwz9F4(zbnut`T06b7CS-|=aDfwKocUjNrVt>Ah0*rPnuR;C5UNAoxFgV`q5FNzD
z+J)AN9fNLy;s6cpJpik{jTYFb&6aLDTWAHFE5KGmyNiLN044+$jW=UM1kB0k<}Zc9
zT>-Y3iM7P^rnfPI9mUM+vdQ#DUjSQE`W_};7;H4&+!52>Oww573t-etoGQl-u(v5z
zcz+b}X-i8__Xp6>auR0`6;8zW^zxQ&7F_?j{su-3jeQRjV1cEZ1zCjvJwEghphr+{
zVIjZ}pd<lFd02rVKuH3U^6^@MXNb5%0BH#2M3o}W4%iW2%d@)bp_;$)k!e}o?DM;j
z_BD{?11_(ekOO$rCDnf0%ciKz;6Ypm{(mWe<$b!@BLl{(HfR8CCT`Da>9kh>vT=a|
z$VBgEHN&~``@gjy0Xz@Yo>}Vh<RUZCU^CUaZIJpU9~^*$&n?Y-)(yaduah%`Dz*Z6
zc=%o<(J>IMvJ$Cp{6f1nJ}>}Dp{FtlV|yVOv(3bW2Bz-;%(<@rGJqyaH-8u@#D4$*
z6it~#*Zx8vqK5V~fNh2P82Bu!o6n7VfObTk<#wYWYU&%nT=+^ak!5K{>$nFfA~e6R
z%{bsvfiD91$fW|m%<AS7;~pSbtgw<@I|_lA*V%r1wPHI*wEw-!Ltqdktc2lQ>KsuE
z%x@q-TP)pp-i<;_IvyjTbO2}=j(;J}0m@oSGu{~yxhtXo0mL~$JhRx%(|MikwN(+Z
zSOIFen)X<aq)y4e8-5OM3C7}~QaRuM@Cr6i00GVsXmLh2zw-(}HZEWQhjH{Pq(0iK
zb!KJZc+m$DpyPXxfpxj5XFfPE|A2ErVANVr0bT`m97JCTh;$9p3DgdpZGY%*@U>Cg
z-+-Fj<qOk$6J5?S=!O<_fMu(^@p>i_0xTN=$wXlVh5#iANXo+s3;{|Kkd%+40-YC2
zN8@#SNh>!+Zd<xp@Jk`Z)`7oX`GnF<nQ?^;`kSSjclujMn|h|)U(2X4DBh=2WZU1p
z0!{r@Fu(47lmJH(t+zB|gMYsY>}s10TRjrq)JGnw-Dt(TkNE=V1V_!p$6$IPz_nG{
z8u2HVmUa%M3bvvz8#bGXi3*dmuhv+4q(DX-5yUOUjtNS>FZ@tSpA}Kq1mAF~A4p>V
znj##{3)1!{jpN0PmIUaC7pC+{Ht}W#RuZ5DnVj>jK?1g^Osn@Mjbh(RdG!SFYLe!3
ze6GsMN@h5pOqv10B<Ezc)F2hz@0<-Y98f2Tu*)W~tuN7a*z26fwt25EM=>r0C<!+N
n7y^_eASn+kFa#(`KvMoUqyI#2YQuFh00000NkvXXu0mjfCx8CC

diff --git a/assets/image/2x/icon_mine_order.png b/assets/image/2x/icon_mine_order.png
index 7514b1278cc4161805b1983792c84da1bc3cf712..5752cefa8d755935a00d7740ff39c14930e55dad 100644
GIT binary patch
delta 945
zcmbQod5nF6ay<iMage(c!@6@aFBuq^8$4YcLn`9l&hhjYNfc<iKP%DGAta35B4bgU
zN>@YYqI(}Q7L|*#`P%Gks6X(LpJS1_@J9AWcbnaJuFP1Z<F;o-r(A@KnCQ%w)MY;I
zz6Oa8Uax!Ey5w0*zV7+&W#4sXD!uS_X>iFBb!O!9UBDo^U_yOEz&gH=1}7$`omK^_
z8GL$Fxt=XAi%UCZDR8|pQ0dLzddoycpJbPc5UJmF_JPwQ&Sn17IayPf@ch8rTPBx<
z8QT9!a2@cN@}ngDbZ_DM*Oh!1%I@8H(id)b==brQC2M{i4_rU@h2??Q%y+|Q{9Je4
zFGAm5Fm~_dONHl8-<rp~r~ccPYJmsIaeNbP&G){syn69XYVLbRzLLLZelj1P!jZUe
z`O@OunLB1%gfmE2-PYDT#c6Pkp`%gYWZ0ga&lDDk6owu@>yT~w(nqRU`2D73i3-jK
zL^%4xHEUnzX8+%Ec~&2L_AC4NvorTN8kEfzS-t*F|D;1olP}CUuA{Tm;Md#c`pCFL
z;&Ht)^82n>C#wArekzl&>2A_9v&%|XkBZ)ij>?vrcX@~Z=f^W*<`|yyT(HmlWBakq
zJDF}I98KrcFn-(Ru;Tt!{@b7amOflRRm5$79ZR!s^j78PZI8otZamP-EIs)n&yAVI
z+>3r%1Z+HR-eI=qyYc*ubK(jQ9oi>Xx#H}p`YQYQ?`tP*=5kmpYHokY^klC3v98mB
zp&?z1{y4cP2QFV~-m_g^V&zm-pXJXCw_3bDQJF2we^l3fyQ%xZGR5r-#a^cmr*H*u
zgfnV6C^9aLkzK*i%F<F)x`0VUNZ{1fMy>!42Mzu^je;LeUjO){_@RvDRQZj!{8Ajw
z`%Kb0P+G5%tJ$EoT;|z~1F{ln7HWGn9fZB4k7zisYN#koS<MVgB1kDDfRT%n<LRpd
zYxx59_uhQMV*WcZmXV8*YyE-)PpkMv<QkcvNeQYD#T2<6%zOW6Jb%Jov|UDYL3B}l
zX(O{p{Wtj?F^pXO4)~lO&fX@spnLxx?(|Ro?~cd+o2xhXLw;4IYWy@mlgPK8Y}-%W
z=8b2ozc$ZiM}%|bOz~yi<%ilez1{0{?`=FS|7v%@)Z-UtC(KDza67T@m*yD;=E%Py
vX$p>Co>jcn@)YoG+qsNMWL_WK?HnJ>b(%ILgfwaSG5~?6tDnm{r-UW|;)bWN

delta 1163
zcmV;61a$kx2c8L#BYy;CNkl<ZcwX(CPiP!<6vw}Bb~n}fr<Z^^n6g$7Q9PIk$s}H?
zmasG1_7v1ZwFU7ch!>%H>80S&ljudLptL!ekeMyD+8}l}Aw8&QFTGSMlGZ~F*jRP<
z_hg_4Q`U8VzxUhBB)q-u@AKZg&wOXuVP}5?eTfW^h*lUXP=6Q#6{rG*286gKa3=|T
zb}`=94)8j`9AKtL3AhKq8Z);L;IrjgV-W-v&g>O0L;|0fn;qJ7|Her$zXhPwW5QKK
zd~_vhT=r@~P%L+W;oR)KxNl<t;1~LtgTd<{#LH3RVn6E#y(WKwX><yVS1bqp)ew)Z
zM2(*<Iq%DJ6@NH!Hr^j}_$!yG2sqP>)0bRWpG>X-r_wlK=E!9r2Fy^oQvG^n{+bK#
zi^)yk#QdR$g7V+j0IE0-6X1BOmcHlAdjRth$e^h-`j~;Ek{K9S3xLUHoc<)KBVnBd
zPNcO5VS+;?;;QNW)nn7~1%%zqH~`@3E(d-IObsUP+<*NZ0iyt31yH{0y>$?sVdh_K
zL=f>hnc#f0p8R0LbvZ73JZ#jTXJbwiFl<kEC$i79GSl!k_2lM%)eMv9697ki^#s7g
z^kMT-@&-=8xYV^y;PgU$uPK@AtUch;um{5gJkslO43lU9z(LP_vvS8<vD;^<wZN&x
z_#_j*Gk<^~vU{{O5H1qBq`~mRAPNW37la$FS~}u#n`kXCOrp;L93IFZITkhTKSx#$
ze|g>Z5L^VN0BW|4ioU*GZtq>4IcNQyQU%^Qvno&+aTTZng$9JUCQt<m4G3{fpb8Wk
z5aOCZ6(}?y#EX=`4gwtci#kg|r<D6|xD}>h4u5b8%wxSA7fImdR-8U541`xaOrkdd
zyuV!pwuyq5+e3d`D7DMEC$Q8h4R?S~0X(x^1bR)+RuwDKCA?KLd+nnFg*sKB3KSX;
z;+jAeC^R6%HGwKnXh4V;EP;F*OjligsCM>1RAJ_Q1OzTMiX)KucP{Z$%eAvtT?Uab
z(|>9GMZ@N_OO4_P1g^B=^f8wqq|BY?cAOq{E0VzM8J7<N;tSccPf{uU@(c_Ccn!dF
z{WAYvS15rl1LV!9K;aosfhtgFK!|GsRiMy-5Z45%K%oI4t_j>p0vY%Y%uUc>?nDB@
z7&9h?&NksiO5pWfyEm#!`<HI}9B@-DK7SE}>FSRFKklnXu>{`Os4g8-fn85-m_+^j
z&EZ=HnuNjZZ@|DfVdq}LzOJe*ty82+cuNQO)l3BnO{zc@C^R6%HGwKnXh4W-0#%^U
zfDqRNZWn=*X)Pfpr`?8xGY%9t#G@{IaoPW4-EFh5fe!DXc;{BRz32OxbGK}3*?$Xc
z#IrCwXWOXY>(961G}{cw`eiK;3<?|3Ja{1cw^$G00r<@jPrGjFXfF`J_($WFU85s!
zGxIS3)&JRb(!-3NOJv)KGO{hBzAznncje&X71s_<0$rQ!L{0??&#DSkfkFd9Tob4Q
dg$9K9KVDdgZ|4H@4*&oF07*qoL<FuvV1oRt97q5F

diff --git a/assets/image/3x/icon_mine_card.png b/assets/image/3x/icon_mine_card.png
index 1eb7adb3c0cfce080bb99b70dbc1649d99b8e12e..64e99792eefec1e8689698430456403ed09e8c47 100644
GIT binary patch
delta 3114
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
Eg6e(RkN^Mx

delta 3106
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

diff --git a/assets/image/3x/icon_mine_order.png b/assets/image/3x/icon_mine_order.png
index 5692ca31016cb7945b731f26390641da6a4fdf45..edabd9176448b9332c7161160b7d5075bc7d1e39 100644
GIT binary patch
literal 1752
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
aOrZ5ojFp?No_w<LssMKvFAT$p2>uP13RWio

literal 2176
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
M-qsmWYwe%%A62e7IsgCw

diff --git a/assets/image/icon_mine_card.png b/assets/image/icon_mine_card.png
index 3ca94d36e7dbe3e4f92fa6e6b7d5bfb2d794e1b9..fef2da7068ef6f96a070e840fb5f3c9f1d94477d 100644
GIT binary patch
delta 853
zcmV-b1FHPu2I~fpBYyw^b5ch_0Itp)=>Px&B}qg<R9Hvtn9oa8Q546&=RSXqxX8dZ
zWkOi1veBSTln}N`h(HT}&3jWALF6WAJO4lnTL=}+doL#g-MEON+DJsT$az|A%qYV)
zCIlt^9N#@LiZM<z&b;x>jF5Nrew_0?AMQEtp2H(-^F`a74}bqT;6StDo%b|=sSyG-
zkeHLip)u8bo^Ix{wu9b2e=VfEN{qc5VVEV;tx?SwP6yI;z{9<*yOh!*ABay2P(pns
zEKy|TX83aGb1F#p00R(5tF$IT+y;UtRbVDe&y>zx``$9Ru$iqZfc1B}3hkohfFRVS
z0*iew8NH*L@qZ)-fK47QuDBqj*iAw*0TN8S8knND0?bTn*K3QJeiPG><=1Dj4(Mdp
zoZ2Q#akZ|NR48a<8#NFpbSmn|ULryYCVtv@F{v4g@xK26)|&nk3d?=~`y2(@y781v
zqIJv{d=)FT0kGEWJgBgE2cUfG@iJ1FwMiZu^F8>q?ti@ju+H#>0BXxf+ASyMhhfcZ
zPYCEWeA5J~bSqXSIt>0{spg(!fRd7&{+R^J#D~FbsisJhVs-88%JT}V#^2J5tHB+>
zv~rV|9pq^H19VC9Zoy*7IDkkZT3Hw=i*0{7NpZCBnS?g#)6KNDFvch+fB=WWs@V|>
zcj&&qe1H5>a5fciP5>Ev%2Lgjt1t}mn!Z5-ooB`yTd~i)@9djP2AUf{NtNq$btKqv
zyg(>#*MS(^YN_U<yaGn#@_`Tj{x4C8db6X7S&5GNg&;6NoE(W85RwiHbw-xXL4mGt
zr*UsRaGkC;fw-NSo>`g^+^i0BlVb2!u{7@;xqmYFE7eC4|2`*xtKSCUb;PENAN~52
z6Udwau0invh@LWY(t{chWtOVn*cld_q%qz$FTL0aa8f|8t}YUx*om0iw#-<vG@~SO
z4eIJB9R3|}8xV}Kux1=h2<SC@*9p|)dQb;~4DPm6^L9c&3^Xfs^PVAq&N|R^(Uc#D
zJx=rI&@yNz28=!pG!%HN_jeP>51?kXXJ&Ur2iFM(2d&9(JqQf1B<;o7<;YCkmEUif
fg-*|F+XMaqRi8XKwSrZL00000NkvXXu0mjf@phLS

delta 844
zcmV-S1GD_=2I2;gBYy)aNkl<ZSV!%cTSydP6vzK(*2`{Uy=eu75Y}54y6i4?QN(n2
zMvR~cFHk=85R@-HM)cNOU=Tr(5@><Gl)5u!h7#$Hnsj+HqXb{NL4+*3y1R2?mo|27
zR(IB&U8BC2c{%6&e{;_H&iBm_*7>4!&WC>+uyUj_FA%Uck$)z%f^iVw?|^XCD|zmv
zS~=4)=<KhnhCsIf+7%DOV1|YkwO;8?1v2A+_TlPMS}ME_=CcISkI(RHpd%BKXL>cr
z%mMbm;@sf6$O2s>#-`PT89ZkR<?kMA=v!FHHY0##ot4%trM3YuRj&q?P;TZ6s-)aD
z9ndbjHVRBvn16XIh$3wkjy?epGeH2rBrt<wbAy?`Y5CzBQ?*0$rUM$uno(Qb5|@os
zS~vS`HDD?SbH34_hU|%gAfEkX^FN)d8VxM>{R7ah)Ey>`9uR1oA)z%IGkBf_Zk%up
zzK9Q%0C>pb-f00|0w`XiUb^lJVc@`|D8GvZNC0#UxPQ8cs43m(neb!gZdFp6bpf3o
z*JprAG9i?H4F2L3l~Vl-dR$u4>7Tx$A<xK+Qbi>)n4&A8#7>VpI=gbcyrTS@>px&R
z)yPQ(8PEvmge81u$r7GHz!ubl*DRr;S8nBNR(mjd2V_2{N`v=}W;823$Uv7W$}RD5
z6^|>5$A22eR=jFuZ5I=8Y+RI|M*$h+klnomoCM(Y<%N#FtsU|u%WPIM7$7c*^_9cp
zwiBSnfWkoIq$oekDPV{fcT7poK13k)_et9eEaCS6<%7T)X-Ah|5aMC8l0hauuez1H
zF=0o)s~!S16Y&$TTj^M7<75XA_!ul$+BaP@{C{Iz?&4oi<DtCJnbofN%U>WX8H^M4
zGoTPK17_Vp%|MYVDVMW4sEw92Cr6zT$iEse@>Nx6<ZVr`UG$2wRksHn9`|bk_Lv}=
za!3Z=sG__#31HnNg3z9FG!qONTAL~k-qZy|&nb(u$oB|<WP)}oAqTv^q7yjX8`cK|
z5Jmav==a;&h^dvp<<T?K)Wtyt%`$O^&E{_(tr`s_J&R4{NHcgwe!r!uos!$S2mA>r
W>^?XtCeK3v0000<MNUMnLSTY6Ba2o5

diff --git a/assets/image/icon_mine_order.png b/assets/image/icon_mine_order.png
index bdac70dce1a76476795b1942682c4141f9c15cc5..2403043515b3fdefc77754720f197b186cce87dd 100644
GIT binary patch
delta 485
zcmV<B0UG|@1pWh%BYyw^b5ch_0Itp)=>Px$xJg7oR9Hvtm_JVfF&u{9-$5Kql!!3~
z6$7&_keIm3*HBIdNB<4ZH#_);kpU0=8hii~6PTDGq7q}opoxP4YR&=hIOz3?hLCpc
z?`@xZ+FtHT81qJB&Ibi3yF$VSjgm1{ug#tUv<)EW5}*#Sn}1;F{lr)^zFcO0%7g*;
z^Jf<T9f(ZQt!0<##POj>)&t=AtAIH>OFf-9njZ;Z%uH?(D8s;_MBV4u46Vbj`Gg<L
zf@-#!xUH2sd<={MsG!aEimB_o6ZpW1;--ENAZ!ms14~$*SrC!XseSx-LAmkNmt|lN
zMLpLy*U&u}&wuG{u>L(tAVdNoEKbkC@AJC?wah(#zM;~nfx(hyYXnwEnwqFVhml<I
zcq%IBrsHZ3TVe&+t6CZKwDEdE(guBPTD?nMRb@dovb*7y#;jM^uO<yB3&zVUK%OC9
zzcR=(#Ot4YgX%S-J{EYVfYU$uheT2kH!f{Z<P;D3AYK?oDGkU~AX%UQB?Uqm{C|T3
ze%xh29P?g&++$|4N}!cL0kRG1>FOhv-AO>B41frs=k{oX#8Q_>Bjk`8%F{KP)Qp1R
bu?PGH|LNB$#rRgB00000NkvXXu0mjfT=(M*

delta 581
zcmV-L0=oVF1Kk9WBYy%UNkl<ZSV!%cKWGzS9ERWb+CltR2X*dXg*Zq-u*u+39NIf<
zMVuTR1iKYn+(aly1#xi@9F-zYwY^*y5i1%hxQVt!99$|Yg{m!7n|me2IM{sVyZbI0
z^ll4z-~68M`HuS&qRkJsIUoK5K!JT>aNhIc5s5t%-pSMLZ-3R!vF9hI)?9bU*<fjU
z@FvJ}zk*13`q5MWYd>0dfph{qIuji0sA|>-K#f-X==xs+EKLvI19|#40P`QHUKfi-
zgS`(=?%B5bbqquS($*ZgpTMCSoS+D?#@Rt_einxbjQ#+BE9p(6MUY&ouH(|PQ{_d|
zB8`Bh(7yxVjDO|!Jc1YBK((Ic0LZhJ-T6vTE+hslhW-M9gO)>_V#^yVyBCI^d~Rsj
z^vk8tuW9dbnrvB)sjfLc`ji7&3fmIP4W>0$?`381>dNZcWmlN49ovTh)GlE^kE{S+
zhzeZ+DINiEycK}1Y{q_826MoF{6Z}}25~plK2zNgFMpW2nVf?HZb7`33Q+L@dc5CK
zz*JzCrA!Q3&Po-_0aIzq{8lG@0rAQnhC2ZmALUzctBWsIf|)DUfC7tU|2=`d%{tkf
zgPR8Vve~fu_X2kD&l<EvOP<TdVDh=vjU3Qgl_8kQU@`O;+2-%X4*>ML+G*a`a>bAK
zfrt}54?gxy4jg8uHvy<X(CKfwhLD5+Eyd!<Tu`1gEhPKF&6Ooe<ba8EH3)wPQeitd
T9ZII=00000NkvXXu0mjf6HgT4

diff --git a/lib/home/points_mall_page.dart b/lib/home/points_mall_page.dart
index 98ed695e..8b7b0a08 100644
--- a/lib/home/points_mall_page.dart
+++ b/lib/home/points_mall_page.dart
@@ -442,6 +442,7 @@ class _PointsMallPage extends State<PointsMallPage>
                 "assets/image/icon_hot_right_top.png",
                 width: 36.w,
                 height: 36.h,
+                fit: BoxFit.cover,
               ),
             ),
           ),
diff --git a/lib/integral/integral_page.dart b/lib/integral/integral_page.dart
index 7a1e3a5d..6e6aaa60 100644
--- a/lib/integral/integral_page.dart
+++ b/lib/integral/integral_page.dart
@@ -249,11 +249,12 @@ class _IntegralPage extends State<IntegralPage> {
                   task.name,
                   style: TextStyle(
                     fontSize: 14.sp,
+                    fontWeight: FontWeight.w400,
                     color: Color(0xFF353535),
                   ),
                 ),
                 SizedBox(
-                  width: 7,
+                  height: 7.h,
                 ),
                 Row(
                   children: [
@@ -272,6 +273,7 @@ class _IntegralPage extends State<IntegralPage> {
                           "${task.complateNum ?? task.conplateNum}/${task.limitDay}"),
                       style: TextStyle(
                         fontSize: 12.sp,
+                        fontWeight: FontWeight.w400,
                         color: Color(0xFF727272),
                       ),
                     ),
@@ -291,7 +293,7 @@ class _IntegralPage extends State<IntegralPage> {
             radius: 12,
             fontSize: 14.sp,
             fontWeight: FontWeight.bold,
-            padding: EdgeInsets.fromLTRB(12.w, 2.h, 12.w, 2.h),
+            padding: EdgeInsets.fromLTRB(12.w, 4.h, 12.w, 4.h),
           )
         ],
       ),
@@ -320,7 +322,7 @@ class _IntegralPage extends State<IntegralPage> {
                     style: TextStyle(
                         color: Color(0xFF353535),
                         fontSize: 14.sp,
-                        fontWeight: FontWeight.bold),
+                        fontWeight: FontWeight.w500),
                   ),
                   SizedBox(
                     height: 10.h,
@@ -331,7 +333,8 @@ class _IntegralPage extends State<IntegralPage> {
                       S.of(context).shenmijifendali,
                       style: TextStyle(
                         color: Color(0xFF727272),
-                        fontSize: 12.sp,
+                        fontWeight: FontWeight.bold,
+                        fontSize: 10.sp,
                       ),
                     ),
                   ),
@@ -374,7 +377,7 @@ class _IntegralPage extends State<IntegralPage> {
                     ? Colors.white
                     : Color(0xFF353535),
                 fontSize: 14.sp,
-                fontWeight: FontWeight.bold,
+                fontWeight: FontWeight.w500,
               ),
             ),
             Container(
@@ -441,6 +444,9 @@ class _IntegralPage extends State<IntegralPage> {
                 fontSize: 16.sp,
                 color: Color(0xFF353535)),
           ),
+          SizedBox(
+            height: 10.h,
+          ),
           Text(
             S.of(context).lianxuqiandaolingqushuangbeijifen,
             style: TextStyle(
@@ -471,6 +477,8 @@ class _IntegralPage extends State<IntegralPage> {
             child: Container(
               alignment: Alignment.center,
               child: RoundButton(
+                width: 106,
+                height: 34,
                 text: (signInfo != null && signInfo.todayHasSignin)
                     ? S.of(context).yiqiandao
                     : S.of(context).lijiqiandao,
@@ -479,6 +487,7 @@ class _IntegralPage extends State<IntegralPage> {
                     ? Colors.grey
                     : Color(0xFF32A060),
                 fontSize: 16.sp,
+                fontWeight: FontWeight.w400,
                 padding: EdgeInsets.fromLTRB(16.w, 6.h, 16.w, 6.h),
                 radius: 4,
               ),
@@ -499,7 +508,9 @@ class _IntegralPage extends State<IntegralPage> {
     BaseData baseData = await apiService.signIn();
     if (baseData != null && baseData.isSuccess) {
       querySignInfo();
-      SmartDialog.show(widget: SignInWidget("${signInfo.signInList.length + 1}", "${signInfo.rewardList[signInfo.signInList.length]}"));
+      SmartDialog.show(
+          widget: SignInWidget("${signInfo.signInList.length + 1}",
+              "${signInfo.rewardList[signInfo.signInList.length]}"));
     }
   }
 
@@ -519,7 +530,7 @@ class _IntegralPage extends State<IntegralPage> {
                   Text(
                     signInfo != null ? "${signInfo.point}" : "0",
                     style: TextStyle(
-                      fontWeight: FontWeight.bold,
+                      fontWeight: FontWeight.w500,
                       fontSize: 21.sp,
                       color: Colors.white,
                     ),
@@ -531,6 +542,7 @@ class _IntegralPage extends State<IntegralPage> {
                     S.of(context).wodejifenzhi,
                     style: TextStyle(
                       fontSize: 12.sp,
+                      fontWeight: FontWeight.w400,
                       color: Color(0xFFF2F2F2),
                     ),
                   )
@@ -548,7 +560,8 @@ class _IntegralPage extends State<IntegralPage> {
                 Navigator.of(context)
                     .pushNamed('/router/mine_vip_level_page', arguments: {
                   "rankLevel": rankLevel,
-                  "createTime": (userinfo != null) ? "${userinfo.createTime}" : "",
+                  "createTime":
+                      (userinfo != null) ? "${userinfo.createTime}" : "",
                   "points":
                       (userinfo != null) ? int.tryParse(userinfo.points) : 0,
                 });
@@ -562,7 +575,7 @@ class _IntegralPage extends State<IntegralPage> {
                         ? "${signInfo.rank.rankName.replaceAll("会员", "")}"
                         : "",
                     style: TextStyle(
-                      fontWeight: FontWeight.bold,
+                      fontWeight: FontWeight.w500,
                       fontSize: 21.sp,
                       color: Colors.white,
                     ),
@@ -578,6 +591,7 @@ class _IntegralPage extends State<IntegralPage> {
                         S.of(context).wodehuiyuandengji,
                         style: TextStyle(
                           fontSize: 12.sp,
+                          fontWeight: FontWeight.w400,
                           color: Color(0xFFF2F2F2),
                         ),
                       ),
diff --git a/lib/integral_store/integral_store_details_page.dart b/lib/integral_store/integral_store_details_page.dart
index f5e665ca..927c67b2 100644
--- a/lib/integral_store/integral_store_details_page.dart
+++ b/lib/integral_store/integral_store_details_page.dart
@@ -102,16 +102,15 @@ class _IntegralStoreDetailsPage extends State {
                             assetUriMatcher(): assetImageRender(),
                             networkSourceMatcher(extension: "svg"):
                                 svgNetworkImageRender(),
-                            networkSourceMatcher():
-                                networkImageRender(
-                                    loadingWidget: () {
-                              // return Image.asset("assets/image/default_1.png",);
-                              return Container();
-                            },
-                                  // mapUrl: (url) {
-                                  //     print("objectUrl: $url");
-                                  //     return "$url?imageMogr2/format/webp/blur/1x0/quality/75";
-                                  // }
+                            networkSourceMatcher(): networkImageRender(
+                              loadingWidget: () {
+                                // return Image.asset("assets/image/default_1.png",);
+                                return Container();
+                              },
+                              // mapUrl: (url) {
+                              //     print("objectUrl: $url");
+                              //     return "$url?imageMogr2/format/webp/blur/1x0/quality/75";
+                              // }
                             ),
                           },
                         ),
@@ -225,6 +224,7 @@ class _IntegralStoreDetailsPage extends State {
                           : S.of(context).yiduihuanjian("${goods.sales}"),
                       style: TextStyle(
                         fontSize: 10.sp,
+                        fontWeight: FontWeight.w400,
                         color: Color(0xFFA29E9E),
                       ),
                     ),
@@ -242,6 +242,7 @@ class _IntegralStoreDetailsPage extends State {
                         goods == null ? "" : goods.description,
                         style: TextStyle(
                           fontSize: 12.sp,
+                          fontWeight: FontWeight.w400,
                           color: Color(0xFF727272),
                         ),
                       ),
diff --git a/lib/mine/mine_page.dart b/lib/mine/mine_page.dart
index acaa4207..5ebb9213 100644
--- a/lib/mine/mine_page.dart
+++ b/lib/mine/mine_page.dart
@@ -499,7 +499,7 @@ class _MinePage extends State<MinePage> with AutomaticKeepAliveClientMixin {
                   Text(
                     S.of(context).kaquan,
                     style: TextStyle(
-                      fontWeight: FontWeight.w600,
+                      fontWeight: FontWeight.bold,
                       fontSize: 16.sp,
                       color: Color(0xFF353535),
                     ),
@@ -512,7 +512,7 @@ class _MinePage extends State<MinePage> with AutomaticKeepAliveClientMixin {
             width: 2.w,
             height: 32.h,
             margin: EdgeInsets.only(left: 20.w, right: 20.w),
-            color: Color(0xFFABABAB),
+            color: Color(0xFFF7F7F7),
           ),
           Expanded(
             flex: 1,
diff --git a/lib/mine/mine_vip_level_page.dart b/lib/mine/mine_vip_level_page.dart
index ac4873ad..f86c955b 100644
--- a/lib/mine/mine_vip_level_page.dart
+++ b/lib/mine/mine_vip_level_page.dart
@@ -135,6 +135,7 @@ class _MineVipLevelPage extends State<MineVipLevelPage> {
                           style: TextStyle(
                             textBaseline: TextBaseline.alphabetic,
                             fontSize: 14.sp,
+                            fontWeight: FontWeight.w400,
                             color: Color(0xFF353535),
                           ),
                         ),
@@ -222,6 +223,7 @@ class _MineVipLevelPage extends State<MineVipLevelPage> {
                         style: TextStyle(
                           textBaseline: TextBaseline.alphabetic,
                           fontSize: 14.sp,
+                          fontWeight: FontWeight.w400,
                           color: Color(0xFF353535),
                         ),
                       ),
@@ -249,6 +251,7 @@ class _MineVipLevelPage extends State<MineVipLevelPage> {
                           S.of(context).youhuiquanwufajileijifen,
                           style: TextStyle(
                             fontSize: 14.sp,
+                            fontWeight: FontWeight.w400,
                             color: Color(0xFF353535),
                           ),
                         ),
@@ -278,6 +281,7 @@ class _MineVipLevelPage extends State<MineVipLevelPage> {
               textAlign: TextAlign.center,
               style: TextStyle(
                 fontSize: 14.sp,
+                fontWeight: FontWeight.w400,
                 color: Color(0xFF353535),
               ),
             ),
@@ -289,6 +293,7 @@ class _MineVipLevelPage extends State<MineVipLevelPage> {
               textAlign: TextAlign.center,
               style: TextStyle(
                 fontSize: 14.sp,
+                fontWeight: FontWeight.w400,
                 color: Color(0xFF353535),
               ),
             ),
diff --git a/lib/mine/vip_detail_page.dart b/lib/mine/vip_detail_page.dart
index e2f63fe3..352a8076 100644
--- a/lib/mine/vip_detail_page.dart
+++ b/lib/mine/vip_detail_page.dart
@@ -194,7 +194,7 @@ class _VipDetailPage extends State<VipDetailPage> {
                       fadeSrc: "assets/image/default_1.png",
                     ),
                     SizedBox(
-                      width: 12.w,
+                      width: 8.w,
                     ),
                     Expanded(
                       child: Container(
@@ -212,7 +212,7 @@ class _VipDetailPage extends State<VipDetailPage> {
                                     vipCard != null ? vipCard.storeName : "",
                                     overflow: TextOverflow.ellipsis,
                                     style: TextStyle(
-                                      fontSize: 20.sp,
+                                      fontSize: 14.sp,
                                       fontWeight: FontWeight.bold,
                                       color: Colors.black,
                                     ),
@@ -228,10 +228,10 @@ class _VipDetailPage extends State<VipDetailPage> {
                               TextSpan(
                                 children: [
                                   TextSpan(
-                                    text: "会员卡",
+                                    text: S.of(context).huiyuanka,
                                     style: TextStyle(
                                       fontSize: 12.sp,
-                                      fontWeight: FontWeight.bold,
+                                      fontWeight: FontWeight.w400,
                                       color: Colors.black,
                                     ),
                                   ),
@@ -263,7 +263,7 @@ class _VipDetailPage extends State<VipDetailPage> {
                               children: [
                                 TextSpan(
                                   text:
-                                  "¥${vipCard != null ? vipCard.balance : ""}",
+                                      "¥ ${vipCard != null ? vipCard.balance : ""}",
                                   style: TextStyle(
                                     fontSize: 24.sp,
                                     fontWeight: FontWeight.w500,
@@ -348,10 +348,10 @@ class _VipDetailPage extends State<VipDetailPage> {
                       child: Text(
                         vipCard != null
                             ? "${vipCard.id.substring(0, 4)} "
-                            "${vipCard.id.substring(4, 8)} "
-                            "${vipCard.id.substring(8, 12)} "
-                            "${vipCard.id.substring(12, 16)} "
-                            "${vipCard.id.substring(16, vipCard.id.length)}"
+                                "${vipCard.id.substring(4, 8)} "
+                                "${vipCard.id.substring(8, 12)} "
+                                "${vipCard.id.substring(12, 16)} "
+                                "${vipCard.id.substring(16, vipCard.id.length)}"
                             : "",
                         maxLines: 1,
                         textAlign: TextAlign.center,
@@ -361,11 +361,11 @@ class _VipDetailPage extends State<VipDetailPage> {
                           wordSpacing: vipCard == null
                               ? 10
                               : (MediaQuery.of(context).size.width - 64.w) /
-                              (((vipCard.id.length) * 4)),
+                                  (((vipCard.id.length) * 4)),
                           letterSpacing: vipCard == null
                               ? 8
                               : (MediaQuery.of(context).size.width - 64.w) /
-                              (((vipCard.id.length) * 4)),
+                                  (((vipCard.id.length) * 4)),
                         ),
                       ),
                     ),
@@ -407,10 +407,11 @@ class _VipDetailPage extends State<VipDetailPage> {
                     ),
                   )),
               GestureDetector(
-                onTap: (){
-                  Navigator.of(context).pushNamed('/router/union_detail_page',arguments: {"id": orderInfo.storeId});
+                onTap: () {
+                  Navigator.of(context).pushNamed('/router/union_detail_page',
+                      arguments: {"id": orderInfo.storeId});
                 },
-                child:Text(
+                child: Text(
                   "查看",
                   style: TextStyle(
                     fontSize: 12.sp,
@@ -469,7 +470,7 @@ class _VipDetailPage extends State<VipDetailPage> {
                   flex: 1,
                   child: Text(
                     (orderInfo.storeVO.openStartTime == null &&
-                        orderInfo.storeVO.openEndTime == null)
+                            orderInfo.storeVO.openEndTime == null)
                         ? S.of(context).quantian
                         : "${orderInfo.storeVO.openStartTime.substring(0, orderInfo.storeVO.openStartTime.lastIndexOf(":"))}-${orderInfo.storeVO.openEndTime.substring(0, orderInfo.storeVO.openEndTime.lastIndexOf(":"))}",
                     style: TextStyle(
@@ -514,40 +515,40 @@ class _VipDetailPage extends State<VipDetailPage> {
     return products
         .map(
           (e) => Container(
-        margin: EdgeInsets.symmetric(horizontal: 2.w),
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.spaceAround,
-          crossAxisAlignment: CrossAxisAlignment.center,
-          children: [
-            MImage(
-              e.skuImg,
-              width: 75.w,
-              height: 75.h,
-              fit: BoxFit.contain,
-              errorSrc: "assets/image/default_1.png",
-              fadeSrc: "assets/image/default_1.png",
-            ),
-            SizedBox(
-              height: 4.h,
-            ),
-            if (isRemake)
-              Container(
-                width: 75.w,
-                child: Text(
-                  e.productName,
-                  maxLines: 1,
-                  textAlign: TextAlign.center,
-                  overflow: TextOverflow.ellipsis,
-                  style: TextStyle(
-                    fontSize: 10.sp,
-                    color: Color(0xFF353535),
-                  ),
+            margin: EdgeInsets.symmetric(horizontal: 2.w),
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.spaceAround,
+              crossAxisAlignment: CrossAxisAlignment.center,
+              children: [
+                MImage(
+                  e.skuImg,
+                  width: 75.w,
+                  height: 75.h,
+                  fit: BoxFit.contain,
+                  errorSrc: "assets/image/default_1.png",
+                  fadeSrc: "assets/image/default_1.png",
                 ),
-              ),
-          ],
-        ),
-      ),
-    )
+                SizedBox(
+                  height: 4.h,
+                ),
+                if (isRemake)
+                  Container(
+                    width: 75.w,
+                    child: Text(
+                      e.productName,
+                      maxLines: 1,
+                      textAlign: TextAlign.center,
+                      overflow: TextOverflow.ellipsis,
+                      style: TextStyle(
+                        fontSize: 10.sp,
+                        color: Color(0xFF353535),
+                      ),
+                    ),
+                  ),
+              ],
+            ),
+          ),
+        )
         .toList();
   }
 }
diff --git a/lib/union/union_details_page.dart b/lib/union/union_details_page.dart
index 3e116642..30b045d5 100644
--- a/lib/union/union_details_page.dart
+++ b/lib/union/union_details_page.dart
@@ -721,7 +721,8 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
   receiveVip() async {
     BaseData baseData = await apiService.minLogin(storeInfo.id);
     if (baseData != null && baseData.isSuccess) {
-      SmartDialog.showToast(S.of(context).lingquchenggong, alignment: Alignment.center);
+      SmartDialog.showToast(S.of(context).lingquchenggong,
+          alignment: Alignment.center);
       setState(() {
         isReceive = false;
       });
@@ -909,7 +910,8 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
   _loginMin() async {
     if (storeInfo == null) return;
     if (!isEnable()) {
-      SmartDialog.showToast(S.of(context).zanbuzhichixianshangdiancan, alignment: Alignment.center);
+      SmartDialog.showToast(S.of(context).zanbuzhichixianshangdiancan,
+          alignment: Alignment.center);
       return;
     }
     BaseData baseData = await apiService.minLogin(storeInfo.id);
diff --git a/lib/union/union_page.dart b/lib/union/union_page.dart
index 48045a58..586b1c7c 100644
--- a/lib/union/union_page.dart
+++ b/lib/union/union_page.dart
@@ -290,7 +290,7 @@ class _UnionPage extends State<UnionPage>
             PreferredSize(
               preferredSize: Size(double.infinity, 52.h),
               child: Container(
-                padding: EdgeInsets.only(top: 6.h),
+                padding: EdgeInsets.only(top: 26.5.h),
                 color: Color(0xFFFAFAFA),
                 child: ItemTitle(
                   text: S.of(context).jingbilianmenghuiyuandian,
@@ -368,7 +368,7 @@ class _UnionPage extends State<UnionPage>
             itemCount: storeList == null ? 0 : storeList.length,
             // padding: EdgeInsets.only(top: 8.h, bottom: 84.h + (375.h - 88.h) + 4.h),
             padding: EdgeInsets.only(
-                top: 8.h, bottom: 84.h /* + (375.h - 88.h) + 4.h*/),
+                top: 17.h, bottom: 84.h /* + (375.h - 88.h) + 4.h*/),
             physics: NeverScrollableScrollPhysics(),
             itemBuilder: (context, position) {
               return GestureDetector(
@@ -587,7 +587,7 @@ class _UnionPage extends State<UnionPage>
 
   Widget buildStoreItem(Store store, position) {
     return Container(
-      margin: EdgeInsets.fromLTRB(16.w, 8.h, 16.w, 8.h),
+      margin: EdgeInsets.fromLTRB(16.w, 8.h, 16.w, 16.h),
       padding: EdgeInsets.fromLTRB(20.w, 20.h, 20.w, 20.h),
       decoration: BoxDecoration(
           color: Colors.white,
@@ -613,12 +613,12 @@ class _UnionPage extends State<UnionPage>
             fadeSrc: "assets/image/default_1.png",
           ),
           SizedBox(
-            width:8.w,
+            width: 8.w,
           ),
           Expanded(
             flex: 1,
             child: Container(
-              height:100.h,
+              height: 100.h,
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.spaceAround,
                 crossAxisAlignment: CrossAxisAlignment.end,
@@ -651,9 +651,6 @@ class _UnionPage extends State<UnionPage>
                       ),
                     ],
                   ),
-                  SizedBox(
-                    height: 4.h,
-                  ),
                   Row(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     crossAxisAlignment: CrossAxisAlignment.center,
@@ -692,11 +689,7 @@ class _UnionPage extends State<UnionPage>
                       ),
                     ],
                   ),
-                  // Expanded(
-                  //   child: Container(),
-                  //   flex: 1,
-                  // ),
-                 Row(
+                  Row(
                     mainAxisAlignment: MainAxisAlignment.spaceAround,
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
@@ -705,17 +698,20 @@ class _UnionPage extends State<UnionPage>
                         width: 14.w,
                         height: 14.h,
                       ),
-                      Expanded(flex: 1,child:Text(
-                        store.address,
-                        overflow: TextOverflow.ellipsis,
-                        maxLines: 2,
-                        style: TextStyle(
-                          color: Color(0xFF727272),
-                          fontWeight: FontWeight.w400,
-                          fontSize: 12.sp,
-                          // height: 1.3.h,
+                      Expanded(
+                        flex: 1,
+                        child: Text(
+                          store.address,
+                          overflow: TextOverflow.ellipsis,
+                          maxLines: 2,
+                          style: TextStyle(
+                            color: Color(0xFF727272),
+                            fontWeight: FontWeight.w400,
+                            fontSize: 12.sp,
+                            // height: 1.3.h,
+                          ),
                         ),
-                      ), ),
+                      ),
                     ],
                   ),
                   Row(
diff --git a/pubspec.lock b/pubspec.lock
index 00e92515..f02aa419 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -56,7 +56,7 @@ packages:
       name: async
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.5.0"
+    version: "2.6.1"
   barcode:
     dependency: transitive
     description:
@@ -879,7 +879,7 @@ packages:
       name: test_api
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.2.19"
+    version: "0.3.0"
   timing:
     dependency: transitive
     description:
@@ -1042,7 +1042,7 @@ packages:
       name: win32
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.5"
+    version: "2.2.5"
   xdg_directories:
     dependency: transitive
     description:
@@ -1065,5 +1065,5 @@ packages:
     source: hosted
     version: "3.1.0"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=2.13.0 <3.0.0"
   flutter: ">=2.0.0"