From bc1825b7ad3b81645c96257f237d7654b9c941ec Mon Sep 17 00:00:00 2001 From: fmk Date: Fri, 17 Sep 2021 18:51:12 +0800 Subject: [PATCH] safety --- assets/image/2x/icon_location_address.png | Bin 1672 -> 2132 bytes assets/image/2x/icon_mine_card.png | Bin 1705 -> 743 bytes assets/image/2x/icon_mine_edit.png | Bin 0 -> 1152 bytes .../image/2x/icon_mine_invoice_assistant.png | Bin 706 -> 5618 bytes assets/image/2x/icon_mine_order_dfk.png | Bin 0 -> 642 bytes assets/image/2x/icon_mine_order_qb.png | Bin 0 -> 1368 bytes assets/image/2x/icon_mine_order_wwc.png | Bin 0 -> 1211 bytes assets/image/2x/icon_mine_order_ywc.png | Bin 0 -> 1374 bytes .../2x/icon_mine_records_of_consumption.png | Bin 523 -> 637 bytes assets/image/2x/icon_mine_setting.png | Bin 1902 -> 1747 bytes assets/image/2x/icon_mine_wallet.png | Bin 559 -> 2551 bytes assets/image/2x/icon_scan_qr_code.png | Bin 432 -> 368 bytes assets/image/2x/icon_user.png | Bin 1472 -> 1944 bytes assets/image/3x/icon_location_address.png | Bin 3076 -> 3990 bytes assets/image/3x/icon_mine_card.png | Bin 3118 -> 1343 bytes assets/image/3x/icon_mine_edit.png | Bin 0 -> 2122 bytes .../image/3x/icon_mine_invoice_assistant.png | Bin 1287 -> 10289 bytes assets/image/3x/icon_mine_order_dfk.png | Bin 0 -> 1163 bytes assets/image/3x/icon_mine_order_qb.png | Bin 0 -> 2447 bytes assets/image/3x/icon_mine_order_wwc.png | Bin 0 -> 2261 bytes assets/image/3x/icon_mine_order_ywc.png | Bin 0 -> 2518 bytes .../3x/icon_mine_records_of_consumption.png | Bin 866 -> 1070 bytes assets/image/3x/icon_mine_setting.png | Bin 3528 -> 3177 bytes assets/image/3x/icon_mine_wallet.png | Bin 978 -> 4308 bytes assets/image/3x/icon_scan_qr_code.png | Bin 655 -> 588 bytes assets/image/3x/icon_user.png | Bin 2703 -> 3810 bytes assets/image/icon_location_address.png | Bin 706 -> 1022 bytes assets/image/icon_mine_card.png | Bin 875 -> 400 bytes assets/image/icon_mine_edit.png | Bin 0 -> 576 bytes assets/image/icon_mine_invoice_assistant.png | Bin 375 -> 2472 bytes assets/image/icon_mine_order_dfk.png | Bin 0 -> 311 bytes assets/image/icon_mine_order_qb.png | Bin 0 -> 706 bytes assets/image/icon_mine_order_wwc.png | Bin 0 -> 625 bytes assets/image/icon_mine_order_ywc.png | Bin 0 -> 700 bytes .../icon_mine_records_of_consumption.png | Bin 268 -> 318 bytes assets/image/icon_mine_setting.png | Bin 798 -> 820 bytes assets/image/icon_mine_wallet.png | Bin 275 -> 1222 bytes assets/image/icon_scan_qr_code.png | Bin 223 -> 206 bytes assets/image/icon_user.png | Bin 659 -> 865 bytes ios/Podfile.lock | 12 +- lib/generated/intl/messages_en.dart | 8 ++ lib/generated/intl/messages_zh_CN.dart | 8 ++ lib/generated/intl/messages_zh_Hans_CN.dart | 8 ++ lib/generated/intl/messages_zh_Hant_CN.dart | 8 ++ lib/generated/intl/messages_zh_TW.dart | 8 ++ lib/generated/l10n.dart | 80 +++++++++++ lib/home/home_page.dart | 3 +- lib/home/huixiang_view/origin_info.dart | 48 ++++--- lib/l10n/intl_en.arb | 8 ++ lib/l10n/intl_zh_CN.arb | 8 ++ lib/l10n/intl_zh_Hans_CN.arb | 8 ++ lib/l10n/intl_zh_Hant_CN.arb | 9 +- lib/l10n/intl_zh_TW.arb | 8 ++ lib/login/login_page.dart | 46 +++++- lib/main.dart | 2 +- lib/mine/mine_page.dart | 94 +++++++----- lib/mine/mine_view/mine_item.dart | 74 +++++----- lib/mine/mine_view/mine_order.dart | 134 ++++++++++++++++++ lib/mine/mine_view/mine_view.dart | 94 +++++++----- ...card_view.dart => wallet_coupon_view.dart} | 63 ++++---- lib/mine/user_info_page.dart | 3 +- lib/order/order_detail_page.dart | 2 +- lib/order/order_history_page.dart | 65 ++++++--- lib/retrofit/data/coupon.dart | 2 +- lib/retrofit/data/store.dart | 2 +- lib/retrofit/retrofit_api.dart | 23 ++- lib/setting/permission_setting_page.dart | 16 +-- lib/union/union_details_page.dart | 1 + lib/union/union_page.dart | 9 +- lib/utils/flutter_utils.dart | 2 +- lib/utils/min.dart | 1 + lib/view_widget/custom_image.dart | 2 +- lib/view_widget/hot_item.dart | 1 + lib/view_widget/mine_vip_view.dart | 67 +++++---- lib/view_widget/new_coupon_widget.dart | 62 ++++++-- lib/web/web_view/web_content.dart | 49 ++++--- 76 files changed, 754 insertions(+), 284 deletions(-) create mode 100644 assets/image/2x/icon_mine_edit.png create mode 100644 assets/image/2x/icon_mine_order_dfk.png create mode 100644 assets/image/2x/icon_mine_order_qb.png create mode 100644 assets/image/2x/icon_mine_order_wwc.png create mode 100644 assets/image/2x/icon_mine_order_ywc.png create mode 100644 assets/image/3x/icon_mine_edit.png create mode 100644 assets/image/3x/icon_mine_order_dfk.png create mode 100644 assets/image/3x/icon_mine_order_qb.png create mode 100644 assets/image/3x/icon_mine_order_wwc.png create mode 100644 assets/image/3x/icon_mine_order_ywc.png create mode 100644 assets/image/icon_mine_edit.png create mode 100644 assets/image/icon_mine_order_dfk.png create mode 100644 assets/image/icon_mine_order_qb.png create mode 100644 assets/image/icon_mine_order_wwc.png create mode 100644 assets/image/icon_mine_order_ywc.png create mode 100644 lib/mine/mine_view/mine_order.dart rename lib/mine/mine_view/{order_card_view.dart => wallet_coupon_view.dart} (66%) diff --git a/assets/image/2x/icon_location_address.png b/assets/image/2x/icon_location_address.png index ee1d4b81c248f005e5e700359f345ea33352d845..0d8c73d11871519f136e6bf2b1e2ce915eff70fb 100644 GIT binary patch delta 2120 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 Z{{R}j$Vl!zM27$X002ovPDHLkV1iYERPz7; literal 1705 zcmV;a23GlrP)Px*V@X6oRCr$PoLy`bRTRhnXLj1sQiz~63JQfZ79MEqmJl$Qs6i8mVq$Eg)OKgP zq{Rn<@#6&|DiKVK8X+2m(B0XV5-j>=Btm=C*qJ$I_^6;e zyEDE0*qzS2P3D|)&;K`PX71d3X9)f#M1X|6eP{Rp1&hE3=mQiaAn5K_pbrozk0}%G zmZU`n8w(}SLrjxr$$+c1S=0lEDq65JlCVA)(n;5ow~_ErpLe31;R?ZXi>Co9nEmP`Q@ z5S9@j4TsR%V=!PEhW0XI zS(krLv~0U33h#P8!x3aW$M69Po_!zSXacNiYnWAF$}ceCNifds;yySz?3%;_+{(H?lgFw+NBuunIY+GyBgcCX48-rV0CNL zGz#$709R)V=B?wDWP_egMxtjj>B+yPWW`vF?)Z8A>P@c~VVKk5>o@&_=oLrPB5&jGtLnxam32QVH^ zfmzOh3dTMIO;OXb@&P(LH$FgzpzO?ifIdJ$0)p;- z1^NI52?)B6%L-)RFNx4;LfS(loo3xQFHIX^FUHGl?_^h`1o-QyI1sGX+(66nK(5_??~iW`3q z0p!d5CGxD}b*&dN0jQ3K%V0_+b_1kt;90hw0mz`Xq!J6+0jP;L%wPm!U_5?ZH_=IE zX;o5b{mw14+wHvrP{NDJMs-&@7!_Mq7fqgY0}+ge zTfqFe4WzF$MSXtU10+UWBCPICdkODszQ-IGu%>A5T;)$-5G~ajW8eA!f!2hguCxR3 za7=m3dM^f0cGD(BptT7l_Q6o$d8`|Q3x#rO*5Q{rF57lxwl|EfO4pdG}#CjgwDSYCd19Kpnu4{*ED- zYc9GQnxdv%t(&PIcox8Yxu|9ga{5zK)cak&%7uOaXweuXn}bdAK~0IL9rm}az#28Q zoOqXB`1~uGY|c(iK3-JL)G-)(Z~-JU6E_jao8v;<7xj@MMN*f~?;Q&x zzw=_Y+#CVC6(ksMtO5n<$>gU@UyPteSm@l1l|1#^Z^PI5On_s%$Q+sgK%Q500000NkvXXu0mjf;@c9# diff --git a/assets/image/2x/icon_mine_edit.png b/assets/image/2x/icon_mine_edit.png new file mode 100644 index 0000000000000000000000000000000000000000..876eac442dc4b3d1f520e96067336d295c5297ea GIT binary patch literal 1152 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 diff --git a/assets/image/2x/icon_mine_order_dfk.png b/assets/image/2x/icon_mine_order_dfk.png new file mode 100644 index 0000000000000000000000000000000000000000..169e41e620bbfde9a2e8f00fd8351ad5a1571cbd GIT binary patch literal 642 zcmV-|0)737P)Px%JV``BRCr$PTD?jGK@k2Hxim?{C$JTwV46FGlxkzA&tM}cC{{j!l_)6K_zc?F zsAWKIn+O_6>l27cnjB$e#lR8N*)=(LVQ1Uho1bsLnVp*(fxwpt+5x_QpbpZ1Ks+J zW259B_YQ>+m%U!^u-$GCO!OK7pq($5%eMelO@w-|=b_*4Z zk|di-sq36=FH*{-Ndb7zUv;HYY1TFEe{x8N!(cGb_KsFpN;x|z04gs)N=dTDB|G9c zwz8LW##W$9=e2HIdl>-g#B33zqbXW`pJ$^QHp($%K-Rt60YoE2Dn1r7ro2?Urxf69n1h% c$or!A1AHoiQ1g*x&;S4c07*qoM6N<$f`0EE6#xJL literal 0 HcmV?d00001 diff --git a/assets/image/2x/icon_mine_order_qb.png b/assets/image/2x/icon_mine_order_qb.png new file mode 100644 index 0000000000000000000000000000000000000000..8e522c84f8e84239f5f81afd749ca57fb52c121b GIT binary patch literal 1368 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

*|Awt=*J3CilvfL}rJ~ zOfs36S$F1f?%eb7yXV|{=H4r?%pbAL{YL^IiGXEJAW4B`9stQC*l`LF(M13*1F#vu zYNga^LI|T5k))K8LWo}h%merYz=zEIag@5+2GDSPCxFo?4G1A?8o+%~foKPSFimrZ zl=A*wjdZ6FbYvKY@noS;cnE;%w7>KFKmfU1?r9;!-Q6hZRbQplGsR-@o^Is(0wAIr z0qk-qr~!CODfLFZUN4r*<=+6vZjA8hYmAJHoSI6dazcn309*&)IM??#G4t-Q`aJ=R zkB_gkZF@g}GaSO_4a2x5pU;0DR$({&EX&#?rF=(Ez79D*r_OMsD7yvy1HlKaWd`TERegF;vIJ+sdUax1Tr>DORqa^A+qobo6QmK?P62D{SwPE!5 z0r(R@x+zpjnJ$$|e}z#Jb)T`Zu@#14*bcciGanyDj~{?V>nk${E}3Br2-}Bq)!wdsK{jeTbRQN&vJV z5Ss{C_9+mQW4&sRO$7AH!63N_fTRwHNg>q5BYn7Dp6#!Se+8<=*C%mF4b^sc) zz21>N$zk*!X1=zKb3j2vZ@VBIsaC6Ny;g_V0U)BA0leCDUWa`ul{(LB5i)7-9< z8Wlq95<(Q~_4)xl=Qti!$;6}ljb zWEt$&1&Kx>^sVd9Z&4v+S=JgU<$5XQr=?Qqm?I@x6+(xr)#^DN7ef8KA`^>JxRFbJ zxg-^fpP^=0#rc|?&yuK{y89h==2hG-N(MNto4el-aVv?@Rarm(j{w*i$(ERxmjCjy zw2!BHzpr^;=_dgC!qnbKH$~eBv;V~>vAX!w526Wxeo&8-&LjfjG#dS|C5eE3P>++& gBm&|z8vU^4Z?}UGZV;B(xBvhE07*qoM6N<$g6W%hCjbBd literal 0 HcmV?d00001 diff --git a/assets/image/2x/icon_mine_records_of_consumption.png b/assets/image/2x/icon_mine_records_of_consumption.png index 865a504b2896d7dae28652b1323753ade8d2aef5..cf8407b76f0f846e6e204695fab27ebd9403316b 100644 GIT binary patch delta 613 zcmV-r0-F7c1pNe%BYyw^b5ch_0Itp)=>Px%H%UZ6RA@u(Svyh!K@jaGAOXFA;sG!~ zEe7-mSl+-u%Rmx6jV2ga7lEGwcVqnrx}ppVzN< zW~T=s;Xh0`KM;cdU13pB6kPHONQ*AHK)&gTg1#l10u+nI3V$NjoWF^v+G@2P=J_zi zo8}X^f=a130LXnO($iXR%uC7?A3DK&KA+BJv!_IK2mqS^uwok25Z?!YS46xW3_91hD|CD{Z^ zrP3J@U2rQGCVvhQ&zsHWB_{@(pi=4)0CruchZkn7E&@bWXq&Rqo(!tMvXn7h_PKaY zA!ZRaX;BtI(~X;pUmAj(wz0to!9S`Nc#GPo!?6(s!+%zA`{tyAGpdUWCr%+kP+HWdscc(h(Oz}!ZR5)}v1kQFL1qPF zZ&8DNaOOVe$1`?oceI5`6*czFUdD!VY=?iNYUy zCKE+6VZ;!EVN^9rpQ2!t)ea+;C>TanqxAU&!Su*T<0sQ*00000NkvXXu0mjfq&X3i delta 498 zcmVI0J`( zj;-hxA!6Tv7J9@Uz=JG-1kon;jFXj#X3O>b-n=(XVk6A_hcm|q3h=)(tPCoHg?B(D zS~x+`@|3}7i#i6zm{s`8T6@azmHNeUjLu+P*A$XE=UB0&et!xu)&cIilnJR{tUi{E zeu5ce4vFXn0L}nlCzd30eGLGQh(j^no4olQwR2fE@X7Y!zTnx0JzdW292y$Z?ac zH1B8(9xu;VM0Ao1B={rZ)AQot&)0|o)EP|FmQ*T<;d{-bc}JVUTmUhD1vvE#a(2;8 zyJYbU&K_Wlf!uYS!Kr63m!X)yGN=s3H1fSJl}ciGeQT59UJ2-{ntt%+4p*YTboM0@ z9X$9=te0iB?StRJqkC563C3GLx}W{!OKAG6ug?-xRg?*PlPRkDgklt6LX(O%Q3i{q oC!siHFri6Bn<#@t)00r#7kz?=NYQM(1poj507*qoM6N<$f=}1yZvX%Q diff --git a/assets/image/2x/icon_mine_setting.png b/assets/image/2x/icon_mine_setting.png index 8f8937c8001f51c995c9bf04dcfa6d8740009cd6..ba044c68babd3e57f752db069e16cbbf08def2e3 100644 GIT binary patch literal 1747 zcmV;^1}yoBP)Px*jY&j7RA@u(SZj=3RTci$zEkM5#Xz7+A^z|YLK6q%ypX+$UwTWLsX zR79c)2muoQ2rb|r6D5Eo%0u1_k;$$=A_w4808fg@eE?czbh9!u0uYAb@v8bbfHP;}w1dveM6@bNl8>s| zs|;XhXlQY()!G8!YkAI8H726i=c{T&L{XOm{-ai_t=zF=#~W2ZR00r1(F$wr9|0WO z#mR>N21MjNUxt}a1TY5Rgf6;!jWKKDIDWn?h|&P+_4;ZedK5rk#`ue>dOHz)8^9N= zwYR2e>JB=Mf*^3!=^6l^sOk$ubQOTJGJ;K2y|~e6{HY9xQUC@929BFMckVws-2C0v z+AGpDJzU0FRwf97ImVbf0bHKp?LBz#;8(}S#y&2xTM7U(Uj)FVPMcb)dR?Q@xUI-R z8GgN9znX}C4WQ=9uMv^Qiu6kX2*Yr_s&4R%Js=`KDl%S$&&>A&_+eXzh&Ciia#N9w zLIBKsJAj}2hKOi$k|Y-t7&lQAEp#$*9J`utyU8>2W&r19WbP0V_fB%DD}Z{vzKV!C zJ*Im_`~be5s?};6RdsnrcZ-N* zBQqsZ1mIl&i#&s8i^yMcZqViHjYT;-$-h}d*5}yyj*FJZ+btp|RgORq1Sc3{{DEs+ zL|jTtn^}S&7$hR;aPw{biMP-u7YSA6oOE(CmP@(*w!F1=VVb6{K~AIG2t-k|+*n24=gCa6j=Dhz6Gw<~tEQn}j`|xc!2SQcd4ArK6BH~7pY1N6D9{}(J zPxdMixuX(*FbsdIs#kbQ*NMn)vPPmP`jWNQpL_O*$QN@W^#OpXC>Uc-jN|zItSmEM z3&1tD2_m99lO(ya5`Yf%|FvebxgxuW^csL$jQaZe{tDo9@4&hJAomS0vn!vjjQaG7 zh-7zwo~95pzYO488NcU=h@XB_>~3Y0!Z6&Ts^@sdbpHJLM{V7@wdp%x=AJy_$>Hwb zE^EB>c{WKBcbWguH>UWV@~ZtGGvAe&6gx!#y)2{5{0e}ny_$&bN|NNKdFL!@WZM8N z^={*$BuO^qJkXvrvM>z4ud4nO`l^VG%m_djhEJ*L`5u5xNs>&}`;5_9jS_8JVHj?5 z^N;7V>)==vf$SdO@^HC`xQEt}TsqBUm~+OM*%b)au>3cW8}*42+wBcFJ~Qud&D4{7 zO+;Kr?m8X=s5DMHd1g)leADxlh{#ah11o+qM*jWL_IZ{I#%uh&Q1Vm|3?z56OXJUrZQtvz2=*Qx4? z%r_>t;XR?Mzi%`ee=mC(l>oGjGPB!<@6K`Z34pBtzUv*(jULYdSmr){<>*~5B5p6P zL^A>~S@PUhgmWu-%NKq|L|nrxD$Ua@%oG5YEnC*NfB*g;6VcByqi+>VyHxde3l=Q+ zLv}zcYh=a%d-RbWl@Bmm pg(CoFdxNvpKN5l2-r#KYKLaddzfW2XF%bX&002ovPDHLkV1oYANQeLc literal 1902 zcmV-!2a))RP)ibcI{@=MzBw~<9+&VMAM_gMhZTbV?;c+9;ED%dbzfh@E zt{WR0`&V~&_nJzjLO~FmX%^vT5hShk7XW+`z(oK?fw?TH2f$;-n71wjSZn=z0M`Sk zd9WM6e*oNLj1hg@DA9%qI*zkSDRltA%>s^@EfKYZz+S3UD$dy0*mDa3?ds}k&t|g$ zfXii`nP-Sdg`4z{wRUe11pjV?WJ3gddU~#`R4PXR6qtF6hz4e6W=3+k+;$?`P^nZ7 zFGj8gIwaZ8%%^8(XCH5AY1ziigGAH@pp?yKcMlH_|2-|q)C4`xbFH<9iRkqJo+YAP zzVAPq7D)X%&-1Qk=A!`Q_a92Be&6?tX>_L|C;+Ur0THbRaAJCT`kg0Fo}5YpV6iou zH*a3MYSpSi0B>RD^GYcv%?73-sI~q)fG-l!;cB%y5Cnld3{4-7<6M-4jE(K zlhkMud9C#!0PhBHn=xj8lC_BmdY-q1nZGIbBHWx*$0i9#*LCkEqFPKmQLR?*D3wZo zimM~G2R+ZboSFX$;1U4mi0DU?larr2b?VeiTw`hEHg4S5vUcs-FEjH8>ukT#_x+dR z=!;Fzb=}?ar~nwT*4_{|o$C12KhBB=Y%oWJ-d6YmD!jQObLc_uUS*-xqSP z%;vU@-}LL3>(^|3_#KyBoSPk)BT4Eb!#j`tAWEm}x?Mz60x)5WnLF-LBbEo{qPMlR zoflF|8 znfd8rvDgs>MCN-Q*?Cr8JyprB`9uGaa|^9`^Woi>*lb1Q&JEvqd`%p^uIo+^(X~Xh z)%X1;qShoL2;gOA-cc+T{V2stLC|$wkBA-xa9L9c3K^}n)O_y+aF&^SqwZm|kEr7~ z1*Ozb7z+;?WA;XEa-v6OU|=9~`t<380QL~k1HSLyav=lFeq^-P57cb8x3}*d92~4R zm0;*adFeh3V81a&^3g>{v%`evdHcg`=00Q0?QzH@@}T25>y%P|W9FQ-_PSE3^mLSw zW(N8~p>VBI>PaG+wbs5N2!a=*>?b1Vd7c!Wj{|tZ7_(Sr@;^44m8yj&XdJ*6BHHfz z{)wg%l$M^g_IUu36Ydxt9sOM#1I?1@?(Tk@wN_rxGfJteq%|2wcdRf`Q>3-N6M*D{ z6Zw38%h1qJC619sWqNyiv*mJGVxGj{yNogS#?_gKU`IzsE}zezlxC1r*~Xaf#WmE3 zoYwlI(mjyoR=Hg6oS2x1Re>bBgEfGj=kF8!_zMNp%u? zB=TV0QI)!E2Y{o@{D@NOg=)2WB5sWsg)Xf9wlnh;M06v7T>u_6#@rCKcK&=Sf{x={ zqm+_Ts6KyuetLR(YoqPM&d$!Z*49>eEw8Erd)8Xp9R$IjmxZ7haU7>JlgUUkXq}{P zVQsh181vJlAnN5^*WE`%KbA6!h$J<8v0AM@7zBab{lp`c2j^SST7L+@4*}e7jFEgb z_0U>NI(Tc^E?QHL=zJxGLSds)N_JfGLy1)f^7;Icp`oGan(T%R8(P<|UoRfVksdp+|*c1(o{kG75Nx{dFUlxLKfGm~F3c;n?+2zu^;=$$G>7}x> o;=!fb+2zu^;=$$G>7}ysU)72gW(tXi1^@s607*qoM6N<$f*Y)~_5c6? diff --git a/assets/image/2x/icon_mine_wallet.png b/assets/image/2x/icon_mine_wallet.png index 471ae2edfa658a96f35a6014ea8ed78c34841aa6..4182f7b88b2e882f108f2a5bc2b53a0a11d84a67 100644 GIT binary patch literal 2551 zcma);=|9v91I2%{k3l4|L_`u1nk?COF?N!XtxJ=A&C(^t=-RS1;o3sU7RH`SmJ!Ak z#=h^8C1lTJo5%eRo)_nwH|NcHb3We~6C+(_6b}jj0A{`WT4v|z@Sl+Ib6-pgls^xU zpP8-(K%(-l0RTg#o|d{rklkjMTN3*SM<=~7_-fPMxZDO9BS8>{M-YXDH5T)<;`KNx z|A1nzLyKee^4XFk(~|kCifPwwaFhu@(0f;l!d-;ulpaYeM0;?$60^$gA{EbHFNbnsb=$_uZ+xhbg6_(x!3vcZ`bjPDf*2Lyoe zQhaakD-Zb@EV)`lSg*;@{Nd+)(eAd{n_{<$gWyonm0ZY%;oWE{-h)6N19c-Mlb z8(mW`Ot&RXIwdq}V*&%mOU1%57qxOK$zl2KXf87H$I8e!V!r_&QGWNg$*u za7pBOQ&_S&rPA*LA1?%-IV#$~CR>pCTOEY3NAL?~uvhWn z(tQl(F&{+D&F&O~=Z}ASExcd`lEm9`c32Bm<}Wa+*~SRiYj3EIlHcvAjUDTKVsjRf zc>eg6aK7)-5*KjPnsFH?&eJvY2qlIkhMan-aw)c%^I8OO3f%Isf;`2O!fs&CWUUTp z>h%?89g^+}=|alr3+qVWggVJ)n^*%%(z%1QL!hXJ|D3JQGnRuw4)S57kpAKQ2>-$* zijek5Ww4v~t^1RCXdY!xkF8H`vi?s>ZBlu&K)Lm}{0k@2qJ@Kx)Uv2>BmhwCbI$xJ!T&-+4R<_enb_4NT%Vl1$!zZKgM^l8+JR-NEHH} zMfR%3skJDE=)@1AM}Ow(mjzyo)HMOVJ~QzNk(aU=PdnwR&b83(GE1rpqV0mc=S0-{ zDuWJyaVv{>&#pI?#m2Mr)km(*4gx6`*NHne6(*4(^V>%&RI9(0CeR|lW#wa&+S@+L zpe`04v;98{GIw@2ZY>|c;)R2AAxbA-EsGTqBV+R$B=1PBcXiJ1OZ*t0EfAn)0O~A;tW(U9CWOQ%p z>4t| z4U=*xQLFcy9suCoq*rIEIj3-&POw$Y!Q;S=gP}6z(!K+i%nlkA)?YPZD;;D9{0jtF z7T$aX#WQ_KOh*CSnB^sDH48P0yf(~9JiQ2DBt99_?jcl_Jf#dk@o~c4qzE9%RvDeJ zYy}+FD#^s>y;$kNwNv!vBs#{z%`B!5u~-LHE^Vjj_Au#W2W+A+dRLU@Wa{ z{TN~7SYJsMSqPd{W%LsJ9?cXfJ^t+^eB2bcs$_R44@yjj2}nCWUlsRcu2UCc2u{AU zVfwX|iRsxdjYL67sNtaR-j?&)o1B8+?6?~J(x2m+N7j)2`!SwnPg*1(6$`$OK_)YK zVAb-yez4-(zl9V*_+H!HI_k(}lc7KU8JTYhHb_8m!RG}T_6X?mK^HZ~Z>p!9rK=)9 znyEx3_#+rSpK7D$$>+*KWeLb&NExI^b4Z0fEL)*qWA|ny^r81ue{n++mo#ET_;M?N>sT%c!g$R)tOp7|zY>l%a;p8lu5uE+#0x(s(e-+JFbJ zr>|f3>R@78wlHLDjh8SFpYMNq-_LiopMGlby+P8NK}EFSU1&!XjH4?!u`F69!`SMf z@tBc)`nCsbZ=f3G&_S}TQuvmZv9>6_H&csS^Z9IQn!UY-aeJ(DF!+wYti+~;tUq1~ zmQwKEYPSBCsaUT#Bkq(Q#P87h!ho~0hY*(?>PPRBy<|REr`p*g&~r?FAH$eVTy;k%FIg^R^a-v5aRqMm zmI_rl&3WPc0`E~$Q)e^au1x~lHpgp&(7oMu@h%#?K&uJbup49hQr+tqGMl5Ke0rQZ zIddfG-> JBn=0`{{U#Kxn%$V literal 559 zcmV+~0?_@5P)rBdm-+wHz(0h@abMp1Og%qIYb zqtU227!01X02{~59Z)HC3!q6vyKx*}j1y^gc6I{Lsku+U?OyBZ$_985fMyv}4a0C@ za$0V6TKCLYHBdx&xM_9P1aJ-oig3{HDe8Tb@%}Sm%Es#t{kSi9{i`-d^RqT2_bzHJ z^Em?vpe%T0S8dK>$!OSbYS8Px$DoI2^RA@u(SlbbTFc3@%(JDw0R$@(7 zViBPVDI|V5gM6^rS#Fr<@_StF_CazXr@@~*c>l=&&Q{P0SOJlN-?z{-O}Cu$Bc*f^ z$zs!&*4llZ=jUD`RG^gdI-&Vb&r7ZKssd;%bw|EmYuzQeM}L9e0)QA%*)OGh5r*o~ z3ZMlIzzS?Uz%t)(fI}-OsiefCQ?vV zK%7?PO~C+$w-EAZbX>Mjbc1Mp2!K6UP(c)D>p=jUT}IwD5CFDb4*=?hgc?L~cKS5{ z#3&oL0$avdMo(DA)q4N;4X6yW`RF$etpMAA`u-6B#{Ri0Oq(kCT^Al`A+?L>d;^GP o7_Dyw5JS;%D-g{vT7P&2-VXrWG2TMllmGw#07*qoM6N<$f`q%2!2kdN delta 407 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 ap8OXx?m%)TCigS|0000Y diff --git a/assets/image/3x/icon_location_address.png b/assets/image/3x/icon_location_address.png index e7d5e94b9d0997a5c8f7b6d9756b07ced633be1e..52de0f020a8197d469b3dfba10692f1d30ae0895 100644 GIT binary patch literal 3990 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 delta 3071 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 N002ovPDHLkV1oH<;m-g7 diff --git a/assets/image/3x/icon_mine_card.png b/assets/image/3x/icon_mine_card.png index 64e99792eefec1e8689698430456403ed09e8c47..527ece33b376140f8d23d5dd907ee1b0750f057e 100644 GIT binary patch literal 1343 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 diff --git a/assets/image/3x/icon_mine_order_dfk.png b/assets/image/3x/icon_mine_order_dfk.png new file mode 100644 index 0000000000000000000000000000000000000000..3cee50adae8cc9bb71c8addee7f3e1632ce12150 GIT binary patch literal 1163 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 literal 0 HcmV?d00001 diff --git a/assets/image/3x/icon_mine_records_of_consumption.png b/assets/image/3x/icon_mine_records_of_consumption.png index bd3f8ef2ac127114d75253e97b811db62c3a4be2..399c1292946e1782c6f1be50a787deae2015c82a 100644 GIT binary patch delta 1050 zcmV+#1m*kU2CfK@BYyw^b5ch_0Itp)=>Px&=t)FDRCr$PoIP(7K@f Bd&MNe@!O z4?rMs@nXqMBqS<2M4ePIQYuoWAv7sN6$z(GYDAX`2`P;wv-Tl@_yNQc^r5hjjXh{X zA{_gi^LXdt55{FO_wMX-@9gc~-5!GeLt}6*hqaRezwu1cc?(p$b%(fUul8 zRDlW;5SCMiDo|kp!gA_R1u9HHSWX?PK!phi%Z<&UK@cp=&CP8PQPK4Y5liiMdoK*b zQ%)bHbU1BZ6+1Sd#+WT4+6I91d4erO+_u*4a5^WY!)bFOf#!0#698E3Nv>Y4R+l)P zlhWa|d0jv;2!DckM7*0yrJe%7BLKKVMDtR~O6VZsPXPD^03SM?&O0Ld8it|!8;R&k zh&YXWKL4=O>1-0w69C9c=_ahxK*Xa|Dz#gwR6a_yB{GH@V;sacM0CqtUnCN{Mh!y5 z9{}*&T6^T%u5aftpU<1~(z)%M%s7un#P4pXs#Gf0r+@stfSylT_KE1(6gso_{5hw- zZMWO&+^Ji)kQdP9<>dk*zMrBoGp-04MD(~;tCiyd2mRj*s4-@jh+ag9pCaO3I-M?+ z%jJ4h`R#`c5bqa;TVyo3E643?#EcE7vh_9`+o8todnTYO1B(;;xW?vp3 zAO9Yd7=IUpq|VC9%8f>&@rsDHB69y?t-U`kpr=vu%uFV;G{~73iH;Mf%fUId*=)MS z#igH{r&??KoI5OFR(bV``aqFd;rQtIXVSv8r(<6C;y29Ds`90M`xyh4m&0# z8K*#n=_*hKDoj9FP93U1g$W4DO}#^d()t43Y=3SbK#{2L@rNibM5q%$34dkw!s349 zgTJW<`rvSF3kbR&%!xvb5NiR#_NUc@$OnH@4>UMjJ4xD^{cCfmhpPvX5B?PB2!3{@ zKeIr!VO&gDJz4i%W#U%58_?|@3I<*!;wDo`$gvv=_aug$q~TJiu|^4+e{i;}M8xub~R z>)T0;LF^uQ9FRo*dUGV=gmB+c?UqoW3e=;t%3p^5=@TKW+eS)i=x%d7@VI&@YUvHGPzS-9eZ6=*yo zR)hj&;ffDdpz(}Y5ek%rD?V6(#xr6?C{Pxz_+SMZ&xjSFKv}rrgB55zBUZ#8ViR{5 Uf?j%dw<*z8eJWooGacRW~^v6aY+#VF16)SMsZ&o zli2Y$g@&^nZt&k@oc8&W(eE?n=l5)W!=KzDzk-o@si2w&7awD5kj4!LiQ_E(eCBc7`tKZudg4C0vDv~=D?{ocviqfz>%RT|D}3wF@~!0uuUy+|w$M@F zhUdma38z;D2bWy9!jLsdV~Ue&K<2Gus`)kd?cY}3GZoyatR(LGWJ%dgi@bUTC3)8; zkut~g7is*`Q>s7z{PZ{8pN1aY23w=f%J(1F72K({>Erv=LY?{CtxlV7zjf1CX|QnL z`}rSj-nVwd2u@5seeO$F-+xu5_m3?0iMn1icbRVhbi*ByiO(~QzV{mXcO89n*>Cyh z%BY2U=gK2ze69NXC&Oe{_S(JbO3N>$+~Yg^;psBYT79M7B^t>-t7G)+Gq&IUxJGF+ zPn`9EHD}xwKjdX=ZohUb?UuVW&*9Uz{w>?;u2xe2i8(}Ts@@r|XG=QPG+*ZlI_xva zN`}vV>7Ql;p2=JE{yK7n-u;=uHotUA)Us{0)2yzkT{&92ecH}Yr&t@wOGewhGNwI! zyorGcNlgm+z7AuH#yFkz>N*TMwm z1Q}tkh5w}^zHQ39*ShOk`8#2*T^r_CF06afVzjVJvwUNX$X)#_S6t8T+2FsN>1(?w z*U}5EVc)Mb?|4$E$M1>gw eLX9A`<9_X)x?;I5YhhsCVeoYIb6Mw<&;$U>WsWoe diff --git a/assets/image/3x/icon_mine_setting.png b/assets/image/3x/icon_mine_setting.png index 92f882b60a6e471d699edad9c1714583719954a5..33384e9a465c97efdd9876b7741c23e35dfac344 100644 GIT binary patch literal 3177 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

10; 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 SkGy_U09tCgsujvsq5lUR_7!OW literal 978 zcmeAS@N?(olHy`uVBq!ia0vp^At21b1|(&&1r9PWFwgXKaSW-5dwYAozi^@i`-k_{ z*B52-#FkuS`NQ1fsk^o}*6YvIj@cJIBV;6Il)O>W>&a6|I<&|~t#1Z{TG`6X>WSU; zOlvkc@B~KvnsHs`m_YJOIeqtb`#v_C5Z0b7Q!!@8sm=}oO>El#gv8kcRQfN1S6tAUs4jw!x(_np|{_>1%9jo`f50~zBd(rfYW!CAZ zdP{;7ikRd7x2wkKyN+B~=UK*5`k# zYE+r0KmD}w+p_8?mo$cy#VLNQjvKCI+pSwLpCKg2F!@Z3+T_Z()mN?dcB%iYSsLW| z_U+rf0u!@L`lAF`9`Akjglkvv4+be9uw8r7rYm*wuKoM>3;wM!=U|$BtzK^3g8lOg z90e@?`mGoDJN46Pp+NRKKa0X{HP+KltsbA7yTCSt^OewUiDV8b=F_Pfj1*Eh z-##wym{06bd9HFyg=tHKPSlZbrJ}+Mzt=SLWzD{J6sRE1MbA}tQ||fCVLgW3N}KNG znB_kIkZ>a8;t zoO&r!())Lq23BS#UEz85EV5npq+fh`kKCL) z_ug)3>R^5q(C5stY7S$QP)MZ1P8ngZfKPx%21!IgRCr$Pn=wwrFc3v;Mbz8?4iPz5 zqTmKpTX6#lt`sYWU~fQ;A|oW4-Oa}O_8%vaKJ}1Hp5Kg}33#WURRUgo)(Hqu#t;D# zpt>d^gJh5lsv{tS>iDS#$sie2M}Tcm-}jGQ*S)5cUYv7JrhnP-E`Ijjf6nv#F-_Aq za#^?s4a4x3QaU;39*`UDAoj<5e;UW}9mxd-6hinqkU7^Z&N0SkYd{IP!QNtHjF1#i z@ZZCR5Cmv#)deV16ZZh2>ROi`D^FU93DEzNvsOk1Srcf~3RGh3R}Ga|BXzASkhPF1 zF_qXQ0rWUhVt>%m%PRa5*r3EHdBT7e#vMgt1ZzO7JYhgr12b1Th_VL6$`b};{a|~$ zz5uazvAwOZbw1_>84dZ1hwvy+b3lee{wBMpIUwU9zxnw~fVOVZDzVH8s7a&S!olLr zd(gpn+@vc&>?X~63A8qgl_zWvYm8tGh?OS{=+42<{C~iP0%he{0%-A%7tm2A`oL(s zhW3rVzQ`cOtrVZxxRoXlVv* z^}y(T1t>$T1t9$^!rCGj4&l*iLF0?QqrpAMXb6u!EE-?@B^CyRW_I*=0b-wnj&1~+ zzYLN=s4X*>@iIsT$)Gv{GN_K9dXNl~L3IQ&zx@lu$9!1c$&_;d0000$5+ delta 631 zcmV--0*L+01dj!fBYy%`NklECO2ETG(l0BVr+niT(ytE2gxIik}RQxX8Lg&bi|{@NT>J%sKbD&&-~C?`#YD zG$ha>K8*K|X$3gJh5l@)3|hK7W2%gEAY`2J{1yz!%@O zsyzA(*aD7#JL~8kg94l%zyi=|Eg*B;Rjh9rxV7Z+02%^zKQNqU9s$xAaQNPU!d3Zh zN!o;%Rba-F*JIEI@Uu~F0%(-hMb zOaAg}4a&F%Eq?-YJX!b$=u2LX_dVbQ=mkQ(@A6p%4y6qp7s zfSPM0I&~y zs=DAe#=8MV;ybWPQ|1B`I@oW(AQ0Z4<@|(~g1>>a*wI&-D;JiE zzS+`;#Wck<#Wcktfu?N1D`^wwO5C!XH0JdI zo<+KpZE(PsaU1Zj|EA-7BwE5o@&G4nbPu+hcH4Ul3K!%f{}tgh{uSZa3MZVP7m&r; zqGALn^Ap9QY_Jq7gJh7!o0k|FB!gs-kAMvF@zWY4gJh78fDH2S(;AfE_Xvb~dP!J2 RXJY^W002ovPDHLkV1iuJBa8q5 diff --git a/assets/image/3x/icon_user.png b/assets/image/3x/icon_user.png index 76242a5eab0d3606b125f4b7615cbb2b02f94423..8239545311dff0f9e599943cff995811d493ccd5 100644 GIT binary patch literal 3810 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 Y|8$vj{WCpBMgRZ+07*qoM6N<$g4yX$DF6Tf literal 2703 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 JPDHLkV1lYB3?l#l diff --git a/assets/image/icon_location_address.png b/assets/image/icon_location_address.png index fc2d3c0ccc51d64857661b5a9fc66f1f549743f6..dcbd756e078df472f31473c2dfff240a24473f37 100644 GIT binary patch delta 1001 zcmVPx&xJg7oR7gwBm0xIFMHI%rZ+2sFOSBbV zq*??C5rbjfnJYdd)L5wx7JO(cT1~SN1btFOtr%?@HR2!opbsjd?ItKntD*=66)m9= zN@nhEGz5u%K&|*9D(%(~Nq3G+*e%qG3 z1fW|f6-IdPe+DoS$8i`FeTg#6<#IQqQmGLU=_PqijED%yqm@c!uvjb}Z$@njG{y{) z90rgAa1y|$0A{Pg9RRihxEMf1M24JmBaNU9fl(Aa3E-)!*mLD_`T5z|*>b&LM@L6n zTU*;6l8;q4wSU)I`}9iC6@gmoZj$39y@>2^&VAHq=f;@ZNWLc`N<=otaXhiy`W1o3 zm}4ZnMP%4Hx3AgVgn47kK9WNsGU1%-Net9lU!|1#4#1z@`zzu&o~s3C59W80vJJqg zGs4%W2MW`*Ijwa@DRlzC2Jd})9LGN_g)W<+*1BIQReunXcb#*0)`G4p^bZrCh+A=Bs8!0LA+(RM<;4UGK zl==&|)`X2Q&yXAxkwNF&vq^!EkbD8aerxT+At-xrSG(c`-wNcHQhsz(*MYw4(<&7* zn=a-HU4M1J{Ujd}kw=|#FD3vxv;R1otm2ZvC+{t%WyH)7_*yX=o+Cw zwpeS&!~ZCXHUs#)`bzX!Yu{=F3v-EpRp?=oI{=(Wr_d!l}dN1 zRB}nOTUCa2<_`UFvA+U%&|3RaQrMb+0F*H%Px7?2_RwlzYXz>BanAb0Rr;SOb;17t XqDzJ>#mif*00000NkvXXu0mjfM1|kM delta 683 zcmV;c0#yC}2f_uABYy&kNkl1lAL+>S}tnQ z!rW-IsGVStBtaMm5d=v>1hz3(WIjL!4({Jn_L` zIe(tw%DX$guWi^a1!PA{|78Lg1o6 zrPOUAsuq#90%EMS9sux7MD9ff2K};adl-Q7JTF&B$aUQqGt0`#N^_yU7OYTfeHXxY z5qT8AlFu(z#D5nnd%)DP+C$K@rOL&dlb2pB2eDG>Dl;E6#&m6Txq?8Y)EG0jhkZ*w zZS5tds^y&19tc*%{C)z>e!M(*BZ#%uhXC}8NJCU$#`pb(iHV6{fk0}obuO24lAqh2 z{0QRXkFV^H#r(-^>)_rXuC1-z?KsYB5jhzZI0B&4^MAZAr2y0E^ikWkdyFwnk$_t3 zTL6|sq&E;K!O~6umWVuv1Wct;`y9u4J3l{vYHDg~q0pmACX>4oiG%@g+Vi}hk$^#x z>$=yO`Iv~TK9r4?QmT)LW9e+NcN=5Q5YeB=A3scV zUH33EkADKFUvF1UP0gNoJpSIYtfukt@#$jowCHHdgSIpCIT5*#FRHa30x%X1hb;rH zO_C8JdL<$Q;bbAA#`Txjw56ed*7^W|4*(j8C}vsK5Hr_jGMTwzm4*8yTN)-PrOp#k z7c*B7(KTbtyHa7nxw3(4R<;0G@I3EjIk3pUawH-7=Ob0P1KhH2u^B7F+`keaA}rlb RZIJ)~002ovPDHLkV1iGULxcbT diff --git a/assets/image/icon_mine_card.png b/assets/image/icon_mine_card.png index fef2da7068ef6f96a070e840fb5f3c9f1d94477d..97b826e04e98022e30036acbd590e04ad2e9a88e 100644 GIT binary patch literal 400 zcmV;B0dM|^P)Px$N=ZaPR7gwhm9a|1KoEv!62z0#0qs%;ZQ?Fi=mQ91DZYUZU?*4!c0Rzpfmn** z185=annp>T&V$s!6G`US!v$~6K~|S7yxTH6J74~PW_J)gFZ9fVCD6I!3uY-}><|%$ z0I=@J%MlTsNGWf1z8On7=Wh;SnlTbWY|I0a+7LoGsV(RHM?O>Gf&c;FwP~7*JkM`_ z(>z(09fe_d4gi~GiDoQij6EY_rh{T zPID7cE~VV=Y#IQ-G)-5cC^`jzOQlo@v896h0y*a|U&_wvy1puk;!|x8R_er73TPx&B}qgjF5Nrew_0? zAMQEtp2H(-^F`a75C1vfK(peV_cVa15dt-kn3KezG1YvYZsxMKgWf)WEu_3kjJ+FS zm?hJ#QOy`m2hw%G!@aG$l+q#}h))YpLVYGIQDo(2_;ToTDoFPL0}w~6v?f8^27)J5 zU?xn@l+IoI-ZHqbnXM~;^>?}o?V{y?Ak?M;i+wK{y`!4(BnN;^9xkr9Af?z%LNWmo zOuQPHqPGIfOl#L`id0OqLJB5+ z+ITUk8H@40{{YsS{u2tzegOL%1=_mtlue>_%oltWE42Zz*6ci}uy_ZceCzQtQkb<# z9vkyL__Xf50kF>Sg#c>HNZKtY=7(X;Y)=U2HGICOQoMVX5YxWPp;Aoc@^v z%fyGlY^kP5l45o3?8@^BtH$5bi>tvMz_fCcmmTD2`vY`I@@~Om$vA*WB3fA(DT{4? zIZ1J}@R@`*>eJ1%wlKyhCx8Hl!m8O33wP+gzkK{sa5fciP5>Ev%2Lgjt1t}mn!Z5- zooB`yTd~i)@9djP2AUf{NtNq$btKqvyg(>#*MS(^YN_U`g^+^i0BlVb2!u{7@; zxia`G)khKkJ|}>y-v;4z#HNcM{rZ#>$eaPLLGc2Jo-%XNgBlQJma5;_85W$RG2S*W zz1RtGQb4b+E)t>GiJ05A%viECqa<++>gp&Q{vB`|5R9>~W*kij=rw%T3Do0yPzQnx z?zU9(c0xc5G%I!Uo*{tFI?!~{lplvZ^XJeqXeS1YJ`FS!c&qn!6UYysX0>N#cSQ%+ z2?htP$!|Rf46h{Z#o6V^Ox=~=Z<&Qo&uiNQ{sC2=JUF$2Rfhlo002ovPDHLkV1f(? BmofkV diff --git a/assets/image/icon_mine_edit.png b/assets/image/icon_mine_edit.png new file mode 100644 index 0000000000000000000000000000000000000000..9316ebca41375aecf53d6527176699569afb2356 GIT binary patch literal 576 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 VxgC#L>c;>8002ovPDHLkV1hs6ou2>z diff --git a/assets/image/icon_mine_order_dfk.png b/assets/image/icon_mine_order_dfk.png new file mode 100644 index 0000000000000000000000000000000000000000..46ca15000eec7d4173d378344474d432cf79500f GIT binary patch literal 311 zcmV-70m%M|P)Px#@kvBMR9Hvtmdy>qFbqaNr*{x1n1Bt^G5`Z0Sb`OpfE8E*!~hIH>kXIyPKe$c zqa2W+KOhm1k!a3|zo!=~F+q8eaz0vs-!u@%@lZsT0LB11fqjw#*b&hp%d$hcR>go1 zch2pJs23Rga9l*r#+XqVq5@#8T?3ek$To_id77rD5RfEE`bAN!h-d;}!_2e$dUXI7 zuiY3k2o1jlc?jp+5kSt&-B$qOH!$-@8`N4`Ter@@Zvcec`?IrUvyBGS0ooo=H=y1F z>Hz9j&;tCm0rl@#cOX$8$@~MPI+T9v1#GJO(Xs0t_!dCjz!h3k$RQ#Su^#{c002ov JPDHLkV1kpadPx%d`Uz>R9Hvtm(ObxK@`WoZ<1{eYb>J2-aHvJC7HJk3WEL%wj!QHFSZv!6i?#C zn+W2mA{7yYf|@_Tn;RM~0cEIyINrH?qJ!8`9`T{WXc_La6krEN@8>Uu7 zqd0~_p)ldP?v{vbTWfPY0n%DMC|I|3cNAeuIB0^j`aiGn-wV+1 z!AZO0mTur9=mwy*KCG0QilXRa5CmV71X^oHDRn|b)*Fq+d)IZ3M^W@G2!fT712D5s zL}dWaj4|ha0UT0Ftpa!xMbX)8Hv2_HURi5Tj})L>F6&GtW0FNhBy2XDQ$Y}{YOVJM zfSDJGXkJ9BM05tg4P(sRJpm{di*7ELOU`_4V`HO~&*wh__+*SZvL^t{e2Iu20eC4Q zOGI=NKrxDZBBGg(RQ%WUQ$_H?*RoNo4OhgC5 zFr0QA=fg;D0WPx%D@jB_R9HvtmOY5nP!Pxe6L!hsQ^ZC)wXs{4g}fAgbz))bfmXKOb#{VirHFQR zx3*RuoV6f!=ST4-uq@lzcy`)|oRJM1GV){(a=G10HuoSP_o~25-u&Kw=Dit0!;2b@ zk0XG&3WQ;JO+@Yy(M1tCMMRa95)mPypCa;^h+Y_D-j}6#-^N<&CjcH)4Z0|Rg#qxC znI9emu?IkFeUpebMI-_6Xfm0+8jr`{%TAHEce~v)olfTtfX77Si^vKyzge`$9)K_m zKLWUvW!YL3MT2Dm7kz^uSoJ(_9l$4J%;l;8F@R%9k{ln6M)te*>h*fc_x;}h{upCa zRREhe7-K3GT^U^%hNb%zQ?Ty`t@RcWT`3D@?IQAlnXm5p{vQBUPQJ*;i2{uS98?3v zoEKr8D9|{-vMK2I`{!G&)_njsi0JI>b_~)qeLfrxzZUl^y@tyG1VM1!^Sn&}C+7UO zlV#aT6h-gyHfI3#UzAc8Y+nIz3&75FI_>3^a0Z~Y9uU!802{`b z+j9!?wS^Fom(0AnYj+8-JE9LK&=>IZ<6 zIe=er9G_N7CAQTwb7v7i?QW>GcA`M-c|dEuPDD1hWi>Eh=C!#B9A+YNatkb#tC_IY zJCN(+wWi{HP!Y)hOaa)L@@<-?&q`myWnMj3zD`E3!@wK?G_Js3r4ey3n)*%u00000 LNkvXXu0mjf@qQL2 literal 0 HcmV?d00001 diff --git a/assets/image/icon_mine_order_ywc.png b/assets/image/icon_mine_order_ywc.png new file mode 100644 index 0000000000000000000000000000000000000000..c3581ff38b8af15b930c985a35a187bdcacdb80b GIT binary patch literal 700 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 diff --git a/assets/image/icon_mine_wallet.png b/assets/image/icon_mine_wallet.png index f655ddb397052e5575dd27928fd133bda3bfcd83..2f820f293e6aa7227b48858bfd7825c6d6de717c 100644 GIT binary patch literal 1222 zcmV;%1UdVOP)Px(fJsC_RA@u(m|bjBWf;f*&-t+H`nAlB4J;_cvTT7&gNh01X}b1%!hg|LkZK1HTs9#lBoWYQ!k9mm#gFvt@yI;%PBW1LV6^V4g+lev zoSfXgeg@pge-e~a3=Urh?u=IyNCg!?50C=B-3p8aaoSeY{gvyH z1|v?*eSHHL&s6&3^M%Q{gkl$JHY<#uVaBz1J4n&N{TG4gt#M7ZWuON)0wNCXI|+bM z=PpIN?nyK=BPbN(wIjX{&dvwIGCQf!@Hi-mV*$CzfQvI)lEuviH!}vq4z~c>K$^ zz9B+Y>VRLY8bi6A0q0tfy968!0{yLN{r;wV@UgozslDr3Cr0jslirb{+`P1>!7B}5 z!{NO#r`x4zx}G%VOCAH78HNW60WB9WCvYs7)^E4!K$qr7Y99;)!Gb5>F$!WwC$(;BG;Mhc(&+d*nacGX1^o=Ka`zYJ~F11eummCnM(v2BBp^RkrcD?a5kMpq1{*>) zg&cr4JLA|+qK74OqffGt0Mnl6(6JS@z!HpWIftkx@ zQWzhLBRVvke3p@eA}0e0E!mwoB_%{q)XDFGnG!}s0egY-MI{{jqp^H{+WNHiJs>#) zjsg#KRfA3%#zYJP|GAf(ZCbmpB3)H3J^&Hig?T7(d7+Yuh!Ms0;l8x9hKPC^eYMk; z@p}fA0bakL$vKS@kdyC%*IoddqGKo?!9UT#g$1Z+@oVdgmd9i)E@ruew5a8wq-3D_ z*fF)BG%)Y0kEA`20JdwE0YK>ee9b#6GMfW_zp`^H;?s6y>oO*KYO0FTl|IXs0;0dp zySpGW0033L_^$$3XW4UFj|5j?p7mh}e>eH|-MyEYZf0!~n*ePG)(`OLp;2bQx+H}EZJPkvsf(1 z_6WO~hp&&%9|=jxbRz=;kARce`v3m_pI`Uv%uHW{&jB?VSy{jS{Qv)7G5y>eOD|q- zpyD->l9Jcw*wsb}O>h10Ki|&xYJ!=msjH#z-FD?0PP)3fW_fw<^w`+iBG}m26oVc~ zSkCI;3knXt%n3ASdU{&gIg83qPrQ?KRjm1ZeSPm685(9b>TJI8s8S;3A?N(J+gfzw zg2XPFd%T>N!EsbnuX5Alf*TPY_Yci}cU5@jN0%@K WMt0BP-v@xcWbkzLb6Mw<&;$SpcWX2N diff --git a/assets/image/icon_scan_qr_code.png b/assets/image/icon_scan_qr_code.png index 86d05fe8c7e752901af00c7c6b375b87a94ef189..edb2edbabc807a35f77cd7be078f43b4718b5d93 100644 GIT binary patch delta 178 zcmV;j08Rhj0nP!CB!2;OQb$4nuFf3k0001pNkls$zQv<2@+%*6e9J(R=t2{YbzaQ(Qm$ z+5j``iPqhm9-$LO&i!8gbE9ps2&}ZjvOKFMw803&0N{di3?RG6 xf1?GXA|>o5%|z|`MOovzEGH*#6LNAg;03<#CK&`8Q$qj%002ovPDHLkV1kp5S%?4t diff --git a/assets/image/icon_user.png b/assets/image/icon_user.png index 5c3742da821c9da0fd7c61bf71648633792d36c5..a90520f945460d9d9d24cf149cba479abde0a63c 100644 GIT binary patch literal 865 zcmV-n1D^beP)Px&8%ab#R7gwRmR(2`Q547jcV|miO-t7(NeNq(h+fn{79k|*p(u>ag@WFqpdL&J z5_*|OeK0LbDG{uoU_~P6!NM?zhB7OIr0*;wD^0>(TXWrePRy(`yQ^km`qF(F?##XC zchCQP+!0vjA(q)b{$oJ!c~c2N++pHX%mii$BK=8Vk^qx62U9>1v@@ereK=F{IVBo< za>1o2HjS7vBL*XY$TI?nzPIKhVT9e;Wwq~OA+rGf-iuC~opj@Q@rGgn@xX{@hF5Qe z5_V^m)qgi3aezVXj3YfMu}c!UBPZqwiRG#f^n9v~>fK}BN ztXS)lBt7OvGNmwOnmLb^ZCW}VF2Ef*J?UPds$>EDedlXg@+srwOh_xLf)F-@etdxc zr4LNu_&6|Q&DKLmbQT!v2XCL8`Mqw_-sYMp;OV(ql4JoAH*81Z`eFzn5d8cIpSiRX}zyqJ|W3;~=h>01PJ97J4yh24(BK;(Kkds9y8e|62wj4ylnp{Jo z(Pym&%vpFC!e+p;t6o(F{WCx}p!q5tnMz6*F}cB{jq)!m*OvsK8+m>0fDP)Px%O-V#SR5(wql+SAuQ4q(!FPn7pyJ;FjBt{6fM6g&i#)G|hu@^<~q^I6gq)7h| z?;g~fR8aIHh{u8o7Qq&^)fUtUf!36y+uGeEo9wl^Fr)`0oOJ~R0&EcN9W5|}FOB6s}@m__$ET zR8=Kv)j*Y(AX5hmr6EN!Xm6EasOzrOq;ML6L>{{G9r{)o1PO!V*Aa;4x*%Si2UnJa zlYj6SA|n?;MhlyZ4`8$u5I5ip#E>dY!{-m8_TeG4^#x%c%uXO)xU#2+cVPT@4zB$a z9|uxnh>l(ois}pZM5?LcO$1_D)IU9fT6qg@8t})mNEWBTB)JQ+Dn^|K^skS>TZ(Xu z<|h%!okOGgQM5rgGmh=@95$DqieOAmV7N2`Nsf05-UC?|vsp)Tbr!s>!TOWQlT!$$ z3c|3l@fp>3cR^+ckYprFGYCX8c7wV=mb0-_LF3CTxTyoa0Mch~3*)sncVMMsJ~X8p;37)K;a`3NSwI#TZl)|eh?9dvUtB+_|rGQnD6gF tJ with AutomaticKeepAliveClientMixin { @override void dispose() { super.dispose(); - refreshController.dispose(); + if (refreshController != null) + refreshController.dispose(); } final RefreshController refreshController = RefreshController(); diff --git a/lib/home/huixiang_view/origin_info.dart b/lib/home/huixiang_view/origin_info.dart index ad3dcb18..ed16fa54 100644 --- a/lib/home/huixiang_view/origin_info.dart +++ b/lib/home/huixiang_view/origin_info.dart @@ -70,25 +70,27 @@ class _OriginInfo extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text.rich( - TextSpan(children: [ - TextSpan( - text: widget.brandData == null - ? "" - : widget.brandData.originator, - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 14.sp, - color: Colors.black, + TextSpan( + children: [ + TextSpan( + text: widget.brandData == null + ? "" + : widget.brandData.originator, + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 14.sp, + color: Colors.black, + ), ), - ), - TextSpan( - text: " ${S.of(context).jituanchuangbanren}", - style: TextStyle( - fontSize: 10.sp, - color: Colors.black, + TextSpan( + text: " ${S.of(context).jituanchuangbanren}", + style: TextStyle( + fontSize: 10.sp, + color: Colors.black, + ), ), - ), - ]), + ], + ), textDirection: TextDirection.ltr, ), Text( @@ -225,15 +227,21 @@ class _OriginInfo extends State { alignment: Alignment.center, children: [ Container( - width: 63.w, + width: 63.h, height: 63.h, child: Stack( alignment: Alignment.center, children: [ Align( child: CircleAvatar( - child: Image.asset(img), - radius: 100, + backgroundColor: Colors.white, + child: Image.asset( + img, + width: 63.h, + height: 63.h, + fit: BoxFit.fill, + ), + radius: 32.h, ), ), Text( diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 72c76bd7..2b7a1f27 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -267,6 +267,7 @@ "linian": "理念", "jingbilianmenghuiyuandian": "净弼联盟会员店", "kaquan": "卡券", + "wodekaquan": "我的卡券", "guanlidizhi": "管理地址", "lingquanzhongxin": "领券中心", "lianxishoujihao": "联系手机号", @@ -360,6 +361,12 @@ "nindingweigongnengweikaiqi": "您定位功能开关未开启,请点击去打開定位", "nindingweiquanxianweiyunxu": "您未开启位置权限,请点击确定申请权限", "weilexiangnintuijianfujindemendianxinxi": "为了向您推荐附近的门店信息,推荐您在使用期间让我们使用位置信息", + "ninxiaoxiquanxianweikaiqi": "您未开启消息通知权限,请点击开启", + "ninxiangjiquanxianweikaiqi": "您未开启相机权限,请点击开启", + "nincunchuquanxianweikaiqi": "您未开启存储权限,请点击开启", + "weilejishishoudaohuodongxiaoxi": "为了您可以及时收到我们的活动信息,请您开启消息通知权限", + "weilekaipaizhaoxuanzhetouxiang": "为了您可以在使用过程中更换头像,请您开启相机使用权限", + "weilexuanzhezhaopianhuancun": "为了获得照片使用,缓存等功能,推荐您在使用期间打开存储权限", "dengdaishangjiaqueren": "等待商家确认", "dingdandaifahuo": "订单待发货", "gengduo": "更多", @@ -402,6 +409,7 @@ "paizhao": "拍照", "xiangce": "相册", "xianxiashiyong": "线下使用", + "xianshangshiyong": "线上使用", "duihuanquan": "兑换券", "quhexiao": "去核销", "biaojiweiyidu": "标为已读", diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb index 00fc524e..32503bb4 100644 --- a/lib/l10n/intl_zh_CN.arb +++ b/lib/l10n/intl_zh_CN.arb @@ -267,6 +267,7 @@ "linian": "理念", "jingbilianmenghuiyuandian": "净弼联盟会员店", "kaquan": "卡券", + "wodekaquan": "我的卡券", "guanlidizhi": "管理地址", "lingquanzhongxin": "领券中心", "lianxishoujihao": "联系手机号", @@ -362,6 +363,12 @@ "nindingweigongnengweikaiqi": "您定位功能开关未开启,请点击去打開定位", "nindingweiquanxianweiyunxu": "您未开启位置权限,请点击确定申请权限", "weilexiangnintuijianfujindemendianxinxi": "为了向您推荐附近的门店信息,推荐您在使用期间让我们使用位置信息", + "ninxiaoxiquanxianweikaiqi": "您未开启消息通知权限,请点击开启", + "ninxiangjiquanxianweikaiqi": "您未开启相机权限,请点击开启", + "nincunchuquanxianweikaiqi": "您未开启存储权限,请点击开启", + "weilejishishoudaohuodongxiaoxi": "为了您可以及时收到我们的活动信息,请您开启消息通知权限", + "weilekaipaizhaoxuanzhetouxiang": "为了您可以在使用过程中更换头像,请您开启相机使用权限", + "weilexuanzhezhaopianhuancun": "为了获得照片使用,缓存等功能,推荐您在使用期间打开存储权限", "dengdaishangjiaqueren": "等待商家确认", "dingdandaifahuo": "订单待发货", "gengduo": "更多", @@ -403,6 +410,7 @@ "paizhao": "拍照", "xiangce": "相册", "xianxiashiyong": "线下使用", + "xianshangshiyong": "线上使用", "duihuanquan": "兑换券", "quhexiao": "去核销", "biaojiweiyidu": "标为已读", diff --git a/lib/l10n/intl_zh_Hans_CN.arb b/lib/l10n/intl_zh_Hans_CN.arb index 00fc524e..32503bb4 100644 --- a/lib/l10n/intl_zh_Hans_CN.arb +++ b/lib/l10n/intl_zh_Hans_CN.arb @@ -267,6 +267,7 @@ "linian": "理念", "jingbilianmenghuiyuandian": "净弼联盟会员店", "kaquan": "卡券", + "wodekaquan": "我的卡券", "guanlidizhi": "管理地址", "lingquanzhongxin": "领券中心", "lianxishoujihao": "联系手机号", @@ -362,6 +363,12 @@ "nindingweigongnengweikaiqi": "您定位功能开关未开启,请点击去打開定位", "nindingweiquanxianweiyunxu": "您未开启位置权限,请点击确定申请权限", "weilexiangnintuijianfujindemendianxinxi": "为了向您推荐附近的门店信息,推荐您在使用期间让我们使用位置信息", + "ninxiaoxiquanxianweikaiqi": "您未开启消息通知权限,请点击开启", + "ninxiangjiquanxianweikaiqi": "您未开启相机权限,请点击开启", + "nincunchuquanxianweikaiqi": "您未开启存储权限,请点击开启", + "weilejishishoudaohuodongxiaoxi": "为了您可以及时收到我们的活动信息,请您开启消息通知权限", + "weilekaipaizhaoxuanzhetouxiang": "为了您可以在使用过程中更换头像,请您开启相机使用权限", + "weilexuanzhezhaopianhuancun": "为了获得照片使用,缓存等功能,推荐您在使用期间打开存储权限", "dengdaishangjiaqueren": "等待商家确认", "dingdandaifahuo": "订单待发货", "gengduo": "更多", @@ -403,6 +410,7 @@ "paizhao": "拍照", "xiangce": "相册", "xianxiashiyong": "线下使用", + "xianshangshiyong": "线上使用", "duihuanquan": "兑换券", "quhexiao": "去核销", "biaojiweiyidu": "标为已读", diff --git a/lib/l10n/intl_zh_Hant_CN.arb b/lib/l10n/intl_zh_Hant_CN.arb index 22ef9890..22a3c64e 100644 --- a/lib/l10n/intl_zh_Hant_CN.arb +++ b/lib/l10n/intl_zh_Hant_CN.arb @@ -260,6 +260,7 @@ "linian": "理念", "jingbilianmenghuiyuandian": "淨弼聯盟會員店", "kaquan": "卡券", + "wodekaquan": "我的卡券", "guanlidizhi": "管理地址", "lingquanzhongxin": "領券中心", "lianxishoujihao": "聯繫手機號", @@ -354,6 +355,12 @@ "nindingweigongnengweikaiqi": "您定位功能開關未開啟,請點擊去開啟定位", "nindingweiquanxianweiyunxu": "您未开启位置权限,请点击确定申请权限", "weilexiangnintuijianfujindemendianxinxi": "為了向您推薦附近的門店信息,推薦您在使用期間讓我們使用位置信息", + "ninxiaoxiquanxianweikaiqi": "您未开启消息通知权限,请点击开启", + "ninxiangjiquanxianweikaiqi": "您未开启相机权限,请点击开启", + "nincunchuquanxianweikaiqi": "您未开启存储权限,请点击开启", + "weilejishishoudaohuodongxiaoxi": "为了您可以及时收到我们的活动信息,请您开启消息通知权限", + "weilekaipaizhaoxuanzhetouxiang": "为了您可以在使用过程中更换头像,请您开启相机使用权限", + "weilexuanzhezhaopianhuancun": "为了获得照片使用,缓存等功能,推荐您在使用期间打开存储权限", "dengdaishangjiaqueren": "等待商家確認", "dingdandaifahuo": "訂單待發貨", "gengduo": "更多", @@ -395,6 +402,7 @@ "paizhao": "拍照", "xiangce": "相冊", "xianxiashiyong": "線下使用", + "xianshangshiyong": "線上使用", "duihuanquan": "兌換券", "quhexiao": "去核銷", "biaojiweiyidu": "標為已讀", @@ -467,7 +475,6 @@ "ruhedihuanjifen1": "點擊淨弼,進入積分商城,點擊你想兌換的領商品,進入商品詳情後點擊下方兌換,即可兌換哦~", "ruheqiandao": "如何簽到?", "ruheqiandao1": "1.點擊淨弼,進入首頁,點擊上方的去簽到。\n2.點擊我的,進入我的頁面,點擊上方的積分詳情,進入後即可簽到。", - "youxiaoqixian": "有效期限:", "changqiyouxiao": "長期有效", "fasong": "發送", diff --git a/lib/l10n/intl_zh_TW.arb b/lib/l10n/intl_zh_TW.arb index ecb4cd2d..a6ecaa83 100644 --- a/lib/l10n/intl_zh_TW.arb +++ b/lib/l10n/intl_zh_TW.arb @@ -260,6 +260,7 @@ "linian": "理念", "jingbilianmenghuiyuandian": "淨弼聯盟會員店", "kaquan": "卡券", + "wodekaquan": "我的卡券", "guanlidizhi": "管理地址", "lingquanzhongxin": "領券中心", "lianxishoujihao": "聯繫手機號", @@ -354,6 +355,12 @@ "nindingweigongnengweikaiqi": "您定位功能開關未開啟,請點擊去開啟定位", "nindingweiquanxianweiyunxu": "您未开启位置权限,请点击确定申请权限", "weilexiangnintuijianfujindemendianxinxi": "為了向您推薦附近的門店信息,推薦您在使用期間讓我們使用位置信息", + "ninxiaoxiquanxianweikaiqi": "您未开启消息通知权限,请点击开启", + "ninxiangjiquanxianweikaiqi": "您未开启相机权限,请点击开启", + "nincunchuquanxianweikaiqi": "您未开启存储权限,请点击开启", + "weilejishishoudaohuodongxiaoxi": "为了您可以及时收到我们的活动信息,请您开启消息通知权限", + "weilekaipaizhaoxuanzhetouxiang": "为了您可以在使用过程中更换头像,请您开启相机使用权限", + "weilexuanzhezhaopianhuancun": "为了获得照片使用,缓存等功能,推荐您在使用期间打开存储权限", "dengdaishangjiaqueren": "等待商家確認", "dingdandaifahuo": "訂單待發貨", "gengduo": "更多", @@ -395,6 +402,7 @@ "paizhao": "拍照", "xiangce": "相冊", "xianxiashiyong": "線下使用", + "xianshangshiyong": "線上使用", "duihuanquan": "兌換券", "quhexiao": "去核銷", "biaojiweiyidu": "標為已讀", diff --git a/lib/login/login_page.dart b/lib/login/login_page.dart index 72ca940a..13a653c8 100644 --- a/lib/login/login_page.dart +++ b/lib/login/login_page.dart @@ -70,22 +70,53 @@ class _MyLoginPageState extends State with TickerProviderStateMixin { sharedPreferences.getString("token") != "") { Navigator.of(context).popAndPushNamed('/router/main_page'); } else { + initController(); + client = ApiService(Dio(), context: context); isShowLogin = true; setState(() {}); } } - TapGestureRecognizer tapGestureRecognizer = TapGestureRecognizer(); + final TapGestureRecognizer tapGestureRecognizer = TapGestureRecognizer(); double offsetBtn = 0; + double rota = 1.04; + Image image; + buildImageInfo(BuildContext context) async { + image = Image.asset("assets/image/laoban.png"); + image.image + .resolve(ImageConfiguration()) + .addListener(ImageStreamListener((ImageInfo info, bool _) { + double width = info.image.width.toDouble(); + double screenWidth = 375; + if ((width / screenWidth) < rota) { + rota = (screenWidth * 1.04) / width; + } + if (mounted) + setState(() {}); + })); + } + + @override + void didChangeDependencies() { + super.didChangeDependencies(); + + + } @override void initState() { super.initState(); isLogin(); + try { + buildImageInfo(this.context); + } catch(ex) {} + } + + initController() { tapGestureRecognizer.onTap = () { Navigator.of(context).pushNamed('/router/treaty_page'); }; @@ -108,9 +139,9 @@ class _MyLoginPageState extends State with TickerProviderStateMixin { 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); @@ -225,7 +256,7 @@ class _MyLoginPageState extends State with TickerProviderStateMixin { @override void dispose() { - if (_timer != null) _timer.cancel(); + if (_timer != null && _timer.isActive) _timer.cancel(); if (animatedContainer != null) animatedContainer.dispose(); super.dispose(); } @@ -358,7 +389,8 @@ class _MyLoginPageState extends State with TickerProviderStateMixin { @override Widget build(BuildContext context) { - if (!animatedContainer.isAnimating) { + + if (animatedContainer != null && !animatedContainer.isAnimating) { animatedContainer.forward(); } return AnimatedCrossFade( @@ -418,7 +450,7 @@ class _MyLoginPageState extends State with TickerProviderStateMixin { children: [ PhotoView( imageProvider: AssetImage("assets/image/laoban.png"), - initialScale: Platform.isAndroid ? 1.02 : 1.15, + initialScale: rota, basePosition: alignmentProgress, ), Positioned( diff --git a/lib/main.dart b/lib/main.dart index bb0e8cbd..b01f9a15 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -256,7 +256,7 @@ Map routers = { WriteOffPage(arguments: arguments), '/router/write_off_success_page': (context, {arguments}) => WriteOffSuccessPage(), - '/router/order_history_page': (context, {arguments}) => OrderHistoryPage(), + '/router/order_history_page': (context, {arguments}) => OrderHistoryPage(arguments: arguments), '/router/order_details': (context, {arguments}) => OrderDetailPage(arguments: arguments), '/router/recharge_page': (context, {arguments}) => RechargePage(), diff --git a/lib/mine/mine_page.dart b/lib/mine/mine_page.dart index 26bd9efc..605f74e6 100644 --- a/lib/mine/mine_page.dart +++ b/lib/mine/mine_page.dart @@ -3,20 +3,15 @@ import 'dart:convert'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; -import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/main.dart'; +import 'package:huixiang/mine/mine_view/mine_order.dart'; import 'package:huixiang/retrofit/data/base_data.dart'; import 'package:huixiang/retrofit/data/rank.dart'; import 'package:huixiang/retrofit/data/user_info.dart'; import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:huixiang/utils/event_type.dart'; -import 'package:huixiang/utils/flutter_utils.dart'; -import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/view_widget/classic_header.dart'; -import 'package:huixiang/view_widget/custom_image.dart'; -import 'package:huixiang/view_widget/login_tips.dart'; import 'package:huixiang/view_widget/login_tips_dialog.dart'; import 'package:huixiang/view_widget/mine_vip_view.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart'; @@ -26,7 +21,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'mine_view/mine_item.dart'; import 'mine_view/mine_view.dart'; -import 'mine_view/order_card_view.dart'; +import 'mine_view/wallet_coupon_view.dart'; class MinePage extends StatefulWidget { @override @@ -44,7 +39,8 @@ class _MinePage extends State with AutomaticKeepAliveClientMixin { _toUserInfo() async { SharedPreferences shared = await SharedPreferences.getInstance(); if (shared.getString("token") == null || shared.getString("token") == "") { - Navigator.of(context).pushNamed('/router/login_page', arguments: {"login": "login"}); + Navigator.of(context) + .pushNamed('/router/login_page', arguments: {"login": "login"}); return; } await Navigator.of(context).pushNamed('/router/user_info_page'); @@ -54,7 +50,8 @@ class _MinePage extends State with AutomaticKeepAliveClientMixin { @override void dispose() { super.dispose(); - _refreshController.dispose(); + if (_refreshController != null) + _refreshController.dispose(); } @override @@ -64,10 +61,12 @@ class _MinePage extends State with AutomaticKeepAliveClientMixin { eventBus.on().listen((event) { print("EventType: ${event.type}"); if (event.type < 3) { - setState(() {}); + if (mounted) + setState(() {}); } if (event.type == 3) { - setState(() {}); + if (mounted) + setState(() {}); } }); } @@ -127,7 +126,7 @@ class _MinePage extends State with AutomaticKeepAliveClientMixin { header: MyHeader(), physics: BouncingScrollPhysics(), onRefresh: () { - setState((){}); + setState(() {}); }, child: SingleChildScrollView( child: Container( @@ -139,36 +138,55 @@ class _MinePage extends State with AutomaticKeepAliveClientMixin { builder: (context, snapshot) { return Column( children: [ - SizedBox(height: 36,), + Container( + decoration: BoxDecoration( + gradient: LinearGradient( + begin: Alignment.bottomLeft, + end: Alignment.topRight, + colors: [ + Color(0xFFE5F7FF), + Color(0xFFE8F5E9), + ], + stops: [0.1, 0.8], + ), + ), + child: Column( + children: [ + ///我的 用户信息 + MineView( + userInfo, + () { + _toUserInfo(); + }, + () { + toIntegralPage(); + }, + ), - ///我的 用户信息 - MineView( - userInfo, - () { - _toUserInfo(); - }, - () { - toIntegralPage(); - }, + ///我的 VIP等级信息 + MineVipView( + tag: "vip", + ranks: ranks, + userInfo: userInfo, + rank: (userInfo != null) + ? int.tryParse(userInfo.points) + : 0, + rankMax: (userInfo != null && + userInfo.memberRankVo != null) + ? userInfo.memberRankVo.rankOrigin + : 0, + createTime: (userInfo != null) + ? userInfo.createTime + : "", + ), + ], + ), ), - ///我的 VIP等级信息 - MineVipView( - tag: "vip", - ranks: ranks, - userInfo: userInfo, - rank: (userInfo != null) - ? int.tryParse(userInfo.points) - : 0, - rankMax: (userInfo != null && - userInfo.memberRankVo != null) - ? userInfo.memberRankVo.rankOrigin - : 0, - createTime: (userInfo != null) ? userInfo.createTime : "", - ), + /// 钱包或领券中心 + WalletCoupon(), - /// 订单或会员卡 - OrderCard(), + MineOrderView(), ///我的 下面item MineItem(), diff --git a/lib/mine/mine_view/mine_item.dart b/lib/mine/mine_view/mine_item.dart index d4121b54..6bfb504d 100644 --- a/lib/mine/mine_view/mine_item.dart +++ b/lib/mine/mine_view/mine_item.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:huixiang/generated/l10n.dart'; -import 'package:huixiang/utils/flutter_utils.dart'; import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/view_widget/login_tips_dialog.dart'; import 'package:shared_preferences/shared_preferences.dart'; @@ -11,7 +10,6 @@ class MineItem extends StatefulWidget { State createState() { return _MineItem(); } - } class _MineItem extends State { @@ -33,21 +31,33 @@ class _MineItem extends State { ], ), child: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - InkWell( - onTap: () { - SharedPreferences.getInstance().then((value) { - if (value.getString("token") == null || - value.getString("token") == "") { - LoginTipsDialog().show(context); - return; - } - Navigator.of(context).pushNamed('/router/mine_wallet'); - }); - }, - child: mineItem( - S.of(context).wodeqianbao, - "assets/image/icon_mine_wallet.png", + // InkWell( + // onTap: () { + // SharedPreferences.getInstance().then((value) { + // if (value.getString("token") == null || + // value.getString("token") == "") { + // LoginTipsDialog().show(context); + // return; + // } + // Navigator.of(context).pushNamed('/router/mine_wallet'); + // }); + // }, + // child: mineItem( + // S.of(context).wodeqianbao, + // "assets/image/icon_mine_wallet.png", + // ), + // ), + Container( + padding: EdgeInsets.symmetric(vertical: 4.h), + child: Text( + "我的工具", + style: TextStyle( + color: Color(0xFF353535), + fontWeight: MyFontWeight.semi_bold, + fontSize: 16.sp, + ), ), ), InkWell( @@ -75,12 +85,12 @@ class _MineItem extends State { LoginTipsDialog().show(context); return; } - Navigator.of(context).pushNamed('/router/roll_center_page'); + Navigator.of(context).pushNamed('/router/mine_card'); }); }, child: mineItem( - S.of(context).lingquanzhongxin, - "assets/image/icon_mine_invoice_assistant.png", + S.of(context).wodekaquan, + "assets/image/icon_mine_card.png", ), ), InkWell( @@ -99,15 +109,15 @@ class _MineItem extends State { "assets/image/icon_location_address.png", ), ), - InkWell( - onTap: () { - Navigator.of(context).pushNamed('/router/setting_page'); - }, - child: mineItem( - S.of(context).shezhi, - "assets/image/icon_mine_setting.png", - ), - ), + // InkWell( + // onTap: () { + // Navigator.of(context).pushNamed('/router/setting_page'); + // }, + // child: mineItem( + // S.of(context).shezhi, + // "assets/image/icon_mine_setting.png", + // ), + // ), // mineItem( // S.of(context).bangzhuyufankui, // "assets/image/icon_mine_feedback.png", @@ -117,11 +127,11 @@ class _MineItem extends State { ); } - ///我的页面下面条目 Widget mineItem(text, icon) { return Container( - margin: EdgeInsets.only(top: 8.h, bottom: 8.h), + color: Colors.white, + margin: EdgeInsets.symmetric(vertical: 6.h), child: Row( mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, @@ -132,7 +142,7 @@ class _MineItem extends State { height: 28.h, ), SizedBox( - width: 12.w, + width: 8.w, ), Expanded( flex: 1, @@ -154,6 +164,4 @@ class _MineItem extends State { ), ); } - - } diff --git a/lib/mine/mine_view/mine_order.dart b/lib/mine/mine_view/mine_order.dart new file mode 100644 index 00000000..947758db --- /dev/null +++ b/lib/mine/mine_view/mine_order.dart @@ -0,0 +1,134 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:huixiang/generated/l10n.dart'; +import 'package:huixiang/utils/font_weight.dart'; +import 'package:huixiang/view_widget/login_tips_dialog.dart'; +import 'package:shared_preferences/shared_preferences.dart'; + +class MineOrderView extends StatefulWidget { + @override + State createState() { + return _MineOrderView(); + } +} + +class _MineOrderView extends State { + @override + Widget build(BuildContext context) { + return Container( + margin: EdgeInsets.fromLTRB(16.w, 10.h, 16.w, 6.h), + padding: EdgeInsets.fromLTRB(20.w, 12.h, 20.w, 12.h), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(8), + boxShadow: [ + BoxShadow( + color: Colors.black.withAlpha(12), + offset: Offset(0, 3), + blurRadius: 14, + spreadRadius: 0, + ), + ], + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + padding: EdgeInsets.symmetric(vertical: 4.h), + child: Text( + "我的订单", + style: TextStyle( + color: Color(0xFF353535), + fontWeight: MyFontWeight.semi_bold, + fontSize: 16.sp, + ), + ), + ), + SizedBox(height: 8.h,), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + InkWell( + onTap: (){ + toOrderHistory(1); + }, + child: orderStatusItem(1), + ), + InkWell( + onTap: (){ + toOrderHistory(2); + }, + child: orderStatusItem(2), + ), + InkWell( + onTap: (){ + toOrderHistory(3); + }, + child: orderStatusItem(3), + ), + InkWell( + onTap: (){ + toOrderHistory(0); + }, + child: orderStatusItem(0), + ), + ], + ), + ], + ), + ); + } + + toOrderHistory(int status) { + SharedPreferences.getInstance().then((value) { + if (value.getString("token") == null || + value.getString("token") == "") { + LoginTipsDialog().show(context); + return; + } + Navigator.of(context).pushNamed('/router/order_history_page', arguments: {"status":status}); + }); + } + + List orderStatusImg = [ + "assets/image/icon_mine_order_qb.png", + "assets/image/icon_mine_order_dfk.png", + "assets/image/icon_mine_order_wwc.png", + "assets/image/icon_mine_order_ywc.png", + ]; + + List orderStatusText = [ + S.current.quanbu, + S.current.daifukuan, + S.current.weiwancheng, + S.current.yiwancheng, + ]; + + Widget orderStatusItem(int status) { + return Container( + margin: EdgeInsets.symmetric(vertical: 4.h), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Image.asset( + orderStatusImg[status], + fit: BoxFit.contain, + width: 32.w, + height: 32.w, + ), + SizedBox(height: 4.h,), + Text( + orderStatusText[status], + style: TextStyle( + color: Color(0xFF353535), + fontSize: 12.sp, + fontWeight: MyFontWeight.medium, + ), + ), + ], + ), + ); + } +} diff --git a/lib/mine/mine_view/mine_view.dart b/lib/mine/mine_view/mine_view.dart index 28a83ced..273764e2 100644 --- a/lib/mine/mine_view/mine_view.dart +++ b/lib/mine/mine_view/mine_view.dart @@ -28,36 +28,49 @@ class _MineView extends State { return Column( children: [ Container( - // margin: EdgeInsets.only(right: 16.w), + margin: EdgeInsets.only(top: 28.w), alignment: Alignment.centerRight, - height: 20, - // child: Row( - // mainAxisAlignment: MainAxisAlignment.end, - // children: [ - // InkWell( - // onTap: (){ - // toScan(); - // }, - // child: Container( - // margin: EdgeInsets.all(8.h), - // child: Image.asset( - // "assets/image/icon_scan_qr_code.png", - // width: 24.w, - // height: 24.h, - // ), - // ), - // ), - // ], - // ), + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + InkWell( + onTap: () { + toScan(); + }, + child: Container( + padding: EdgeInsets.all(8.h), + child: Image.asset( + "assets/image/icon_scan_qr_code.png", + width: 24.w, + height: 24.h, + ), + ), + ), + InkWell( + onTap: () { + Navigator.of(context).pushNamed('/router/setting_page'); + }, + child: Container( + padding: EdgeInsets.all(8.h), + margin: EdgeInsets.only(right: 12.w), + child: Image.asset( + "assets/image/icon_mine_setting.png", + width: 24.w, + height: 24.h, + ), + ), + ), + ], + ), ), InkWell( - onTap: (){ + onTap: () { widget.toUserInfo(); }, child: mineView(), ), SizedBox( - height: 22.h, + height: 12.h, ), ], ); @@ -70,10 +83,10 @@ class _MineView extends State { builder: (context) { return RequestPermission( "assets/image/icon_camera_permission_tips.png", - "您未开启相机权限,请点击开启", - "为了您可以在使用过程中更换头像,请您开启相机使用权限", + S.of(context).ninxiangjiquanxianweikaiqi, + S.of(context).weilekaipaizhaoxuanzhetouxiang, S.of(context).kaiqiquanxian, - (result) async { + (result) async { if (result) { await openAppSettings(); } @@ -97,14 +110,27 @@ class _MineView extends State { mainAxisAlignment: MainAxisAlignment.spaceEvenly, crossAxisAlignment: CrossAxisAlignment.start, children: [ - MImage( - widget.userInfo == null ? "" : widget.userInfo.headimg, - isCircle: true, - width: 50, - height: 50, - fit: BoxFit.cover, - errorSrc: "assets/image/default_user.png", - fadeSrc: "assets/image/default_user.png", + Stack( + children: [ + MImage( + widget.userInfo == null ? "" : widget.userInfo.headimg, + isCircle: true, + width: 50, + height: 50, + fit: BoxFit.cover, + errorSrc: "assets/image/default_user.png", + fadeSrc: "assets/image/default_user.png", + ), + Positioned( + bottom: 0, + right: 2.w, + child: Image.asset( + "assets/image/icon_mine_edit.png", + width: 17.w, + height: 17.w, + ), + ), + ], ), SizedBox( width: 10.w, @@ -189,7 +215,7 @@ class _MineView extends State { alignment: Alignment.bottomRight, height: 50.h, child: GestureDetector( - onTap: (){ + onTap: () { widget.toIntegralPage(); }, child: Row( diff --git a/lib/mine/mine_view/order_card_view.dart b/lib/mine/mine_view/wallet_coupon_view.dart similarity index 66% rename from lib/mine/mine_view/order_card_view.dart rename to lib/mine/mine_view/wallet_coupon_view.dart index 44d0ff6d..0702b853 100644 --- a/lib/mine/mine_view/order_card_view.dart +++ b/lib/mine/mine_view/wallet_coupon_view.dart @@ -1,24 +1,22 @@ - import 'package:flutter/material.dart'; import 'package:huixiang/generated/l10n.dart'; -import 'package:huixiang/utils/flutter_utils.dart'; import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/view_widget/login_tips_dialog.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -class OrderCard extends StatefulWidget { +class WalletCoupon extends StatefulWidget { @override State createState() { - return _OrderCard(); + return _WalletCoupon(); } } -class _OrderCard extends State { +class _WalletCoupon extends State { @override Widget build(BuildContext context) { return Container( - margin: EdgeInsets.fromLTRB(16.w, 12.h, 16.w, 10.h), + margin: EdgeInsets.fromLTRB(16.w, 16.h, 16.w, 6.h), padding: EdgeInsets.fromLTRB(20.w, 12.h, 20.w, 12.h), decoration: BoxDecoration( color: Colors.white, @@ -29,7 +27,7 @@ class _OrderCard extends State { offset: Offset(0, 3), blurRadius: 14, spreadRadius: 0, - ) + ), ], ), child: Row( @@ -44,7 +42,7 @@ class _OrderCard extends State { LoginTipsDialog().show(context); return; } - Navigator.of(context).pushNamed('/router/mine_card'); + Navigator.of(context).pushNamed('/router/roll_center_page'); }); }, child: Row( @@ -52,21 +50,25 @@ class _OrderCard extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Image.asset( - "assets/image/icon_mine_card.png", - width: 32.w, - height: 32.h, + "assets/image/icon_mine_invoice_assistant.png", + width: 48.h, + height: 48.h, ), SizedBox( width: 12.w, ), - Text( - S.of(context).kaquan, - style: TextStyle( - fontWeight: MyFontWeight.medium, - fontSize: 16.sp, - color: Color(0xFF353535), + Expanded( + child: Text( + S.of(context).lingquanzhongxin, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontWeight: MyFontWeight.medium, + fontSize: 16.sp, + color: Color(0xFF353535), + ), ), - ) + flex: 1, + ), ], ), ), @@ -87,7 +89,7 @@ class _OrderCard extends State { LoginTipsDialog().show(context); return; } - Navigator.of(context).pushNamed('/router/order_history_page'); + Navigator.of(context).pushNamed('/router/mine_wallet'); }); }, child: Row( @@ -95,20 +97,24 @@ class _OrderCard extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Image.asset( - "assets/image/icon_mine_order.png", - width: 32.w, - height: 32.h, + "assets/image/icon_mine_wallet.png", + width: 48.h, + height: 48.h, ), SizedBox( width: 12.w, ), - Text( - S.of(context).dingdan, - style: TextStyle( - fontWeight: MyFontWeight.medium, - fontSize: 16.sp, - color: Color(0xFF353535), + Expanded( + child: Text( + S.of(context).wodeqianbao, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontWeight: MyFontWeight.medium, + fontSize: 16.sp, + color: Color(0xFF353535), + ), ), + flex: 1, ), ], ), @@ -118,5 +124,4 @@ class _OrderCard extends State { ), ); } - } diff --git a/lib/mine/user_info_page.dart b/lib/mine/user_info_page.dart index ceb0a162..bf9c94ea 100644 --- a/lib/mine/user_info_page.dart +++ b/lib/mine/user_info_page.dart @@ -350,6 +350,7 @@ class _UserInfoPage extends State { } Widget avatarItem(type, value) { + print("object: $value"); return Container( margin: EdgeInsets.only(top: 14.h, bottom: 14.h), child: Row( @@ -366,7 +367,7 @@ class _UserInfoPage extends State { flex: 1, ), buildValue(type, value), - if (type != 4 && type != 3) valueEnd(), + if (type != 4 && type != 3 && (((modifyInfo["birth"] == "")) || type != 2)) valueEnd(), ], ), ); diff --git a/lib/order/order_detail_page.dart b/lib/order/order_detail_page.dart index 9582ca60..0adc81a5 100644 --- a/lib/order/order_detail_page.dart +++ b/lib/order/order_detail_page.dart @@ -1225,7 +1225,7 @@ class _OrderDetailPage extends State { ), Expanded( child: Text( - condition, + condition ?? "", style: TextStyle( fontSize: 10.sp, color: Color(0xFFA29E9E), diff --git a/lib/order/order_history_page.dart b/lib/order/order_history_page.dart index 75f3e3c0..a78061cf 100644 --- a/lib/order/order_history_page.dart +++ b/lib/order/order_history_page.dart @@ -19,6 +19,11 @@ import 'package:shared_preferences/shared_preferences.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; class OrderHistoryPage extends StatefulWidget { + + final Map arguments; + + OrderHistoryPage({this.arguments}); + @override State createState() { return _OrderHistoryPage(); @@ -28,13 +33,13 @@ class OrderHistoryPage extends StatefulWidget { class _OrderHistoryPage extends State with SingleTickerProviderStateMixin { List _pages; - TabController tabcontroller; + TabController tabController; @override void didChangeDependencies() { super.didChangeDependencies(); - if (tabcontroller == null) - tabcontroller = TabController(length: 4, vsync: this); + if (tabController == null) + tabController = TabController(initialIndex: widget.arguments["status"], length: 4, vsync: this); _pages = [ OrderHistoryList(0), @@ -47,7 +52,7 @@ class _OrderHistoryPage extends State @override Widget build(BuildContext context) { return DefaultTabController( - length: 3, + length: 4, child: Scaffold( appBar: MyAppBar( title: S.of(context).dingdan, @@ -59,7 +64,7 @@ class _OrderHistoryPage extends State bottom: PreferredSize( preferredSize: Size(double.infinity, 38.h), child: TabBar( - controller: tabcontroller, + controller: tabController, isScrollable: false, indicatorWeight: 2.w, indicatorSize: TabBarIndicatorSize.label, @@ -94,7 +99,7 @@ class _OrderHistoryPage extends State ), body: TabBarView( children: _pages, - controller: tabcontroller, + controller: tabController, ), ), ); @@ -201,7 +206,8 @@ class _OrderHistoryList extends State super.initState(); SharedPreferences.getInstance().then((value) => { - apiService = ApiService(Dio(), context: context, token: value.getString("token")), + apiService = ApiService(Dio(), + context: context, token: value.getString("token")), queryOrder(), }); } @@ -445,21 +451,28 @@ class _OrderHistoryList extends State text: "暂不支持此功能", )); } else if (type == 2) { - SmartDialog.show( - widget: Tips( - () { - SmartDialog.dismiss(); - }, - text: "暂不支持此功能", - )); + orderCancel(orderInfo.id); } else if (type == 3) { SmartDialog.show( widget: Tips( - () { - SmartDialog.dismiss(); - }, - text: "暂不支持此功能", - )); + () { + SmartDialog.dismiss(); + }, + text: "暂不支持此功能", + )); + orderInfo.tenantCode; + orderInfo.id; + ///去支付 + // Map param = { + // "id": orderInfo.id, + // "orderProductVOList": orderInfo + // .orderDetail.orderProductList + // .map((e) => e.toJson()) + // .toList(), + // "payChannel": 1, + // "orderType": 0 + // }; + // toPay(param); } else if (type == 4) { Navigator.of(context).pushNamed( '/router/logistics_information_page', @@ -485,6 +498,20 @@ class _OrderHistoryList extends State ); } + toPay(Map param) async { + apiService.settlement(param).catchError((error) { + + }); + } + + orderCancel(String orderId) async { + BaseData baseData = await apiService.orderCancel(orderId); + if (baseData != null && baseData.isSuccess) { + SmartDialog.showToast("订单取消成功"); + _onRefresh(); + } + } + aginOrder(storeId) { Navigator.of(context) .pushNamed('/router/union_detail_page', arguments: {"id": storeId}); diff --git a/lib/retrofit/data/coupon.dart b/lib/retrofit/data/coupon.dart index 8cc6ec2b..462c33a8 100644 --- a/lib/retrofit/data/coupon.dart +++ b/lib/retrofit/data/coupon.dart @@ -89,6 +89,6 @@ class Coupon { 'receiveTime': this.receiveTime, 'useTime': this.useTime, 'status': this.status, - 'storeList': this.storeList.map((e) => e.toJson()).toList() + 'storeList': (this.storeList != null && this.storeList.length > 0) ? this.storeList.map((e) => e.toJson()).toList() : [] }; } \ No newline at end of file diff --git a/lib/retrofit/data/store.dart b/lib/retrofit/data/store.dart index aa19822a..289fc9ef 100644 --- a/lib/retrofit/data/store.dart +++ b/lib/retrofit/data/store.dart @@ -106,7 +106,7 @@ class Store { 'headMobile': this.headMobile, 'deliveryInfo': this.deliveryInfo, 'businessType': this.businessType, - 'couponVO': this.couponVO.toJson(), + 'couponVO': this.couponVO != null ? this.couponVO.toJson() : null, 'posType': this.posType, }; diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart index 70a5661a..5545e91d 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -13,11 +13,8 @@ import 'package:huixiang/retrofit/data/article.dart'; import 'package:huixiang/retrofit/data/base_data.dart'; import 'package:huixiang/retrofit/data/coupon.dart'; import 'package:huixiang/retrofit/data/order_info.dart'; -import 'package:huixiang/utils/flutter_utils.dart'; -import 'package:huixiang/view_widget/login_tips.dart'; import 'package:huixiang/view_widget/login_tips_dialog.dart'; import 'package:retrofit/retrofit.dart'; -import 'package:shared_preferences/shared_preferences.dart'; import 'data/address.dart'; import 'data/banner.dart'; @@ -46,12 +43,11 @@ const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式 // const base_url = "http://192.168.10.236:8766/app/"; ///费韬 // const baseUrl = "http://192.168.10.236:8766/app/"; ///费韬 -// const base_url = "http://192.168.10.74:8766/app/"; -// const baseUrl = "http://192.168.10.74:8766/app/"; +// const base_url = "http://192.168.10.37:8766/app/"; +// const baseUrl = "http://192.168.10.37:8766/app/"; @RestApi(baseUrl: baseUrl) abstract class ApiService { - factory ApiService(Dio dio, {String baseUrl, BuildContext context, @@ -64,10 +60,11 @@ abstract class ApiService { headers["Environment"] = "app"; } dio.options = BaseOptions( - connectTimeout: 60000, - receiveTimeout: 60000, - headers: headers, - responseType: ResponseType.json); + connectTimeout: 60000, + receiveTimeout: 60000, + headers: headers, + responseType: ResponseType.json, + ); dio.interceptors.add( InterceptorsWrapper(onRequest: (RequestOptions options) { debugPrint("\n======================= 请求数据 ======================="); @@ -85,10 +82,10 @@ abstract class ApiService { } debugPrint("params queryParameters = ${options.queryParameters}"); }, onResponse: (Response response) { + debugPrint("\n======================= 响应数据开始 ======================="); if (showLoading && EasyLoading.isShow) { EasyLoading.dismiss(); } - debugPrint("\n======================= 响应数据开始 ======================="); debugPrint("code = ${response.statusCode}"); p(jsonEncode(response.data)); Map map = response.data; @@ -357,5 +354,7 @@ abstract class ApiService { @GET("/order/orderCancel?id={id}") Future> orderCancel(@Path("id") String id); - + ///继续付款? + @POST("/order/settlement") + Future> settlement(@Body() Map map); } diff --git a/lib/setting/permission_setting_page.dart b/lib/setting/permission_setting_page.dart index 4dd6b050..56ec21dd 100644 --- a/lib/setting/permission_setting_page.dart +++ b/lib/setting/permission_setting_page.dart @@ -52,17 +52,17 @@ class _PermissionSettingPage extends State { ]; List titleTips = [ - "您未开启位置权限,请点击开启", - "您未开启消息通知权限,请点击开启", - "您未开启相机权限,请点击开启", - "您未开启存储权限,请点击开启", + S.current.nindingweiquanxianweiyunxu, + S.current.ninxiaoxiquanxianweikaiqi, + S.current.ninxiangjiquanxianweikaiqi, + S.current.nincunchuquanxianweikaiqi, ]; List contentTips = [ - "为了向您推荐附近的门店信息,推荐您在使用期间让我们使用位置信息", - "为了您可以及时收到我们的活动信息,请您开启消息通知权限", - "为了您可以在使用过程中更换头像,请您开启相机使用权限", - "为了获得照片使用,缓存等功能,推荐您在使用期间打开存储权限", + S.current.weilexiangnintuijianfujindemendianxinxi, + S.current.weilejishishoudaohuodongxiaoxi, + S.current.weilekaipaizhaoxuanzhetouxiang, + S.current.weilexuanzhezhaopianhuancun, ]; Map permissionSwitch = {}; diff --git a/lib/union/union_details_page.dart b/lib/union/union_details_page.dart index 4f41becf..9846ed31 100644 --- a/lib/union/union_details_page.dart +++ b/lib/union/union_details_page.dart @@ -266,6 +266,7 @@ class _UnionDetailsPage extends State { if (latitude != null && longitude != null) "position": "$latitude,$longitude", "baseURL": "https://pos.api.lotus-wallet.com/app/", + // "baseURL": "http://192.168.10.236:8765/app/", "uid": userId, "userInfo": { "nickname": nickname, diff --git a/lib/union/union_page.dart b/lib/union/union_page.dart index e7ea2960..612fb5ad 100644 --- a/lib/union/union_page.dart +++ b/lib/union/union_page.dart @@ -36,8 +36,7 @@ class UnionPage extends StatefulWidget { class _UnionPage extends State with AutomaticKeepAliveClientMixin, WidgetsBindingObserver { - final RefreshController refreshController = - RefreshController(initialRefresh: false); + final RefreshController refreshController = RefreshController(initialRefresh: false); ApiService apiService; bool isKeyBoardShow = false; BMFCoordinate latLng; @@ -46,9 +45,11 @@ class _UnionPage extends State void dispose() { super.dispose(); WidgetsBinding.instance.removeObserver(this); - Location.getInstance().aMapFlutterLocation.stopLocation(); + if (Location.getInstance() != null && Location.getInstance().aMapFlutterLocation != null) + Location.getInstance().aMapFlutterLocation.stopLocation(); - refreshController.dispose(); + if (refreshController != null) + refreshController.dispose(); } @override diff --git a/lib/utils/flutter_utils.dart b/lib/utils/flutter_utils.dart index 5866d9d9..494bd722 100644 --- a/lib/utils/flutter_utils.dart +++ b/lib/utils/flutter_utils.dart @@ -17,7 +17,7 @@ class AppUtils { static double textScale(context) { double textScaleFactor = MediaQuery.of(context).textScaleFactor; - print("textScaleFactor: $textScaleFactor"); + // print("textScaleFactor: $textScaleFactor"); return textScaleFactor > 1.15 ? 1.15 : textScaleFactor; } diff --git a/lib/utils/min.dart b/lib/utils/min.dart index 69b411b5..cf13d53a 100644 --- a/lib/utils/min.dart +++ b/lib/utils/min.dart @@ -59,6 +59,7 @@ class Min { } static startMin(appid, json) async { + print("startMin: $json"); _channel.invokeMethod( 'startMin', {"appid": appid, "json": json}); } diff --git a/lib/view_widget/custom_image.dart b/lib/view_widget/custom_image.dart index 1eccbb72..6fbd838b 100644 --- a/lib/view_widget/custom_image.dart +++ b/lib/view_widget/custom_image.dart @@ -33,7 +33,7 @@ class MImage extends StatelessWidget { String imageUrl = ""; if (src != null && src != "") { imageUrl = "$src?imageMogr2/thumbnail/${constraints.constrainWidth() * scaleIndex}" - "x${constraints.constrainHeight() * scaleIndex}/format/webp/blur/1x0/quality/75"; + "x${constraints.constrainHeight() * scaleIndex}/format/webp/quality/100"; } if (imageUrl == null || imageUrl == "") { return Image.asset( diff --git a/lib/view_widget/hot_item.dart b/lib/view_widget/hot_item.dart index a55f04fc..82bcbc64 100644 --- a/lib/view_widget/hot_item.dart +++ b/lib/view_widget/hot_item.dart @@ -282,6 +282,7 @@ class _HotArticleItem extends State { Positioned( child: Visibility( visible: (widget.article != null && + widget.article.coverImg != null && widget.article.coverImg != "" && widget.article.coverImg.endsWith(".mp4")), child: Center( diff --git a/lib/view_widget/mine_vip_view.dart b/lib/view_widget/mine_vip_view.dart index 622cd2b6..713572e8 100644 --- a/lib/view_widget/mine_vip_view.dart +++ b/lib/view_widget/mine_vip_view.dart @@ -47,9 +47,7 @@ class MineVipView extends StatelessWidget { userInfo.memberRankVo != null && ranks != null && ranks.length > 0) { - curLevel = (ranks - .indexWhere((element) => element.id == userInfo.memberRankVo.id) + - 1); + curLevel = (ranks.indexWhere((element) => element.id == userInfo.memberRankVo.id) + 1); vipLevel = curLevel; } @@ -115,19 +113,25 @@ class MineVipView extends StatelessWidget { } } + bool isUserVip = (userInfo == null); + Widget widget = Container( - margin: EdgeInsets.fromLTRB(padding.w, 16.h, padding.w, 8.h), + margin: isUserVip + ? EdgeInsets.fromLTRB(padding.w, 16.h, padding.w, 8.h) + : EdgeInsets.fromLTRB(padding.w, 16.h, padding.w, 0), width: MediaQuery.of(context).size.width - 32.w, - height: (MediaQuery.of(context).size.width - 32.w) / - 1.78 * - AppUtils.textScale(context), + height: ((MediaQuery.of(context).size.width - 32.w) / + (isUserVip ? 1.88 : 2.3) * + AppUtils.textScale(context)), decoration: BoxDecoration( gradient: LinearGradient( colors: linearColor, begin: Alignment.topLeft, end: Alignment.bottomRight, ), - borderRadius: BorderRadius.circular(8), + borderRadius: isUserVip + ? BorderRadius.circular(8) + : BorderRadius.vertical(top: Radius.circular(8)), boxShadow: [ BoxShadow( color: Colors.black.withAlpha(12), @@ -201,7 +205,7 @@ class MineVipView extends StatelessWidget { bottom: 12.h, ), child: Column( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, + mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -258,28 +262,29 @@ class MineVipView extends StatelessWidget { ), ), ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Text( - S.of(context).kaitongriqi( - (createTime != null && createTime != "") - ? createTime.split(" ")[0] - : "$createTime"), - style: TextStyle( - color: textColor, - fontWeight: MyFontWeight.regular, - fontSize: 12.sp, - ), - ), - Icon( - Icons.qr_code, - size: 24, - color: Colors.white, - ), - ], - ), + // if (isUserVip) + // Row( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // crossAxisAlignment: CrossAxisAlignment.center, + // children: [ + // Text( + // S.of(context).kaitongriqi( + // (createTime != null && createTime != "") + // ? createTime.split(" ")[0] + // : "$createTime"), + // style: TextStyle( + // color: textColor, + // fontWeight: MyFontWeight.regular, + // fontSize: 12.sp, + // ), + // ), + // Icon( + // Icons.qr_code, + // size: 24, + // color: Colors.white, + // ), + // ], + // ), ], ), ), diff --git a/lib/view_widget/new_coupon_widget.dart b/lib/view_widget/new_coupon_widget.dart index d754645b..01adfceb 100644 --- a/lib/view_widget/new_coupon_widget.dart +++ b/lib/view_widget/new_coupon_widget.dart @@ -22,21 +22,27 @@ class NewCouponWidget extends StatelessWidget { // if(coupon != null) { // coupon.isEx = fa; // } + + // if (coupon != null) { + // print("object: ${coupon.toJson()}"); + // } + return Container( height: (coupon != null && coupon.isEx) ? 152.h : 140.h, width: double.infinity, margin: EdgeInsets.fromLTRB(14.w, 6.h, 14.w, 6.h), decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(8), - boxShadow: [ - BoxShadow( - color: Colors.black.withAlpha(12), - offset: Offset(0, 3), - blurRadius: 14, - spreadRadius: 0, - ) - ]), + color: Colors.white, + borderRadius: BorderRadius.circular(8), + boxShadow: [ + BoxShadow( + color: Colors.black.withAlpha(12), + offset: Offset(0, 3), + blurRadius: 14, + spreadRadius: 0, + ) + ], + ), child: Column( mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, @@ -66,7 +72,7 @@ class NewCouponWidget extends StatelessWidget { padding: EdgeInsets.fromLTRB(4, 2, 4, 2), decoration: BoxDecoration( borderRadius: - BorderRadius.all(Radius.circular(2)), + BorderRadius.circular(2), border: Border.all( width: 1, color: Color(0xFFFF7A1A), @@ -87,7 +93,7 @@ class NewCouponWidget extends StatelessWidget { ), Expanded( child: Text( - coupon != null ? coupon.couponName ?? "" : "", + (coupon != null && coupon.storeList != null && coupon.storeList.length > 0) ? coupon.storeList[0].storeName ?? "" : "", overflow: TextOverflow.ellipsis, style: TextStyle( fontSize: 16.sp, @@ -100,7 +106,7 @@ class NewCouponWidget extends StatelessWidget { ], ), Text( - coupon != null ? coupon.couponDescription ?? "" : "", + coupon != null ? coupon.couponName ?? "" : "", overflow: TextOverflow.ellipsis, style: TextStyle( fontSize: 14.sp, @@ -259,6 +265,36 @@ class NewCouponWidget extends StatelessWidget { ), ], ); + } else if (coupon.bizType == 3) { + return Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Expanded( + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + S.of(context).duihuanquan, + style: TextStyle( + fontSize: 25.sp, + fontWeight: MyFontWeight.semi_bold, + color: Color(0xff32A060), + ), + ), + ], + ), + ), + Text( + S.of(context).xianshangshiyong, + style: TextStyle( + fontSize: 12.sp, + fontWeight: MyFontWeight.semi_bold, + color: Color(0xff32A060), + ), + ), + ], + ); } else if (coupon.bizType == 5) { return Column( mainAxisAlignment: MainAxisAlignment.center, diff --git a/lib/web/web_view/web_content.dart b/lib/web/web_view/web_content.dart index c4532193..5a5175b8 100644 --- a/lib/web/web_view/web_content.dart +++ b/lib/web/web_view/web_content.dart @@ -106,29 +106,34 @@ class _WebContent extends State { Widget videoWidget(double width, double height, src, sandboxMode) { print("src : $src"); - return Container( - width: MediaQuery.of(context).size.width, - height: (MediaQuery.of(context).size.width) / (width / height), - child: chewies = Chewie( - controller: chewieAudioController = ChewieController( - videoPlayerController: videoPlayerController = - VideoPlayerController.network( - src, - ), - aspectRatio: width / height, - //宽高比 - autoPlay: false, - //自动播放 - looping: false, - //循环播放 - // 拖动条样式颜色 - materialProgressColors: chewie.ChewieProgressColors( - playedColor: Colors.white, - handleColor: Colors.white, - backgroundColor: Colors.grey, - bufferedColor: Colors.transparent, + return MediaQuery( + data: MediaQuery.of(context).copyWith( + textScaleFactor: 0.9, + ), + child: Container( + width: MediaQuery.of(context).size.width - 17, + height: (MediaQuery.of(context).size.width) / (width / height), + child: chewies = Chewie( + controller: chewieAudioController = ChewieController( + videoPlayerController: videoPlayerController = + VideoPlayerController.network( + src, + ), + aspectRatio: width / height, + //宽高比 + autoPlay: false, + //自动播放 + looping: false, + //循环播放 + // 拖动条样式颜色 + materialProgressColors: chewie.ChewieProgressColors( + playedColor: Colors.white, + handleColor: Colors.white, + backgroundColor: Colors.grey, + bufferedColor: Colors.transparent, + ), + autoInitialize: true, ), - autoInitialize: true, ), ), );