From 4f48b67a8ff539309ad13ae3dd52468aff9f7e58 Mon Sep 17 00:00:00 2001 From: w-R <953969641@qq.com> Date: Fri, 11 Mar 2022 14:34:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84,=E5=A2=9E=E5=8A=A0=E8=81=94?= =?UTF-8?q?=E7=B3=BB=E5=AE=A2=E6=9C=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/build.gradle | 17 ++-- assets/image/2x/icon_mine_online_service.png | Bin 1372 -> 2039 bytes assets/image/3x/icon_mine_online_service.png | Bin 2467 -> 3710 bytes assets/image/icon_mine_online_service.png | Bin 620 -> 1029 bytes lib/login/login_page.dart | 2 +- lib/main_page.dart | 2 +- lib/mine/mine_view/mine_item.dart | 92 +++++++++++-------- lib/order/bargain_group_order.dart | 5 - 8 files changed, 67 insertions(+), 51 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 7ac3760d..46e2d7b2 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -106,15 +106,10 @@ android { defaultConfig { applicationId "com.zsw.huixiang" minSdkVersion 21 - targetSdkVersion 31 + targetSdkVersion 30 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - ndk { - /// 选择要添加的对应.so 库。 - abiFilters 'armeabi-v7a', 'arm64-v8a','x86' - } - manifestPlaceholders = mfph } @@ -145,6 +140,11 @@ android { minifyEnabled false signingConfig signingConfigs.config proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + + ndk { + /// 选择要添加的对应.so 库。 + abiFilters 'armeabi-v7a' + } } debug { // debuggable true @@ -152,6 +152,11 @@ android { minifyEnabled false signingConfig signingConfigs.config proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + + ndk { + /// 选择要添加的对应.so 库。 + abiFilters 'armeabi-v7a', 'arm64-v8a','x86' + } } } diff --git a/assets/image/2x/icon_mine_online_service.png b/assets/image/2x/icon_mine_online_service.png index 20eee3be6b4ad8f26518b2eaf83759eb03c6489f..b2cd9aef69b42b6f03ccf3dd454c5fd35a617af8 100644 GIT binary patch literal 2039 zcmVPx+u}MThRCr$PT78UMRTcl8JNtoM5VqN91sXrtLQ2Eh^u7CLXG>*CDDCcSQ6WJ1 zqX|I*QHh#j8kCAjp$QGx$VX747-Eb;N+_lKVS$i^G&`Ml->YV8Bic%8+~{JhMPSx$ zJM#{?b!PJRvE99IX1kqa=lr)j=j;C7IrpA(?jrW_9ud6-U~dovFZjOy?{f*pIRn6P9GjUR0B{q4#tIj4nuvA-*zUTn zSD}s>#pWD*7QraWykvM?`66UOfXKzdd&B*quj@9zAKa${Cod24LmNm6tR%HNC>jYo@WI z9sFew1Ur1+|7#p)Ez7z>2(bykT>vhK$`aAOLZQ&-`~H99=>3?UYJ^j%)F<-!{A&R8 z*NV~*fcunE?^I($O8ErJP8*E92rMAQ=2&&-=W&(oW4Y^n%= z&d$!|g+k#E0Gdh`nRybx2G8?!O2nenV0tTcMj=Er#CIyCbh%q8QD=YpJ|Un(d?|qC02-!I_Uh%imfoGW z?JP(sUjT4xBo%Iq8-cL_kWvl4N7 zqz5-!mh~ASgbsOKM3v}GrBrtuKVku3+xAsN^ruMbY*kAAFpg1E-qpL;UdoM)yP08! zWbz0S*JL*Ad0R@k6+n3JU}j$KdETE*ZNvgVO8GE=EhXi8;}b$$=DO~2Q-g8&tUVjr znnb|`@cEJ~5j{WBJ8*~YG>K@8h?+xsA67~|WNIfa0Jq7 z3ADDfWx96$PfGbBfLlVpc}gj1q&UtgpiADy#zx(nCql|MDy4pHYOET*RDaK55Ve=1 zfT?e!Z(zW-?TtkAt58%1%)HpNL^h59$8pv$vmR8GNeHnto6U|@voKTH)KKr!2=L7i z|93L!!6%Z*q zG?O0up8i`(smtc@q{+A@F$O?NsW(5p36|*hN~u*9t)>E@&i?cbL|m>i8Tk7C^x&Df zfRxe)Q1*q0wz#gl&BTl`0Jd#!C!) zT6eTEW#%28=jmQ$Rx$=aO8Eo;-I0}ONGa7jtA%-BkWvmt+T|yeQr|W)T?fDfrDC2% zBR~Ool89QvI)Wew0E{#9n{zeNE*3nx{9Yo25Mg`FtT#X%nc=g4ULs&N>`noA=ER8; z4;(piM7PSZslC0uxwW};V>Sa#sRfg>hSuxiz+_Cz9aILzD7 z(6B6%$xJI>b9F!}m1@uD^TrE^f)ZE04nVC{f^olKJpv*K#09XP0`(M_hi=euoJW}X z!BDgw4uW8X@BhCi50m3Keax)i0+dMzvBdQ5Ael^lItYUCh}xT!Qd4y5-!02(6hi1a z;K~v|5p8o_w>-U`>FABq4(rDc&qtK$vp#z7uPZ@)T^@cVGOm=mG{);Ml2ZOdcYh&! zIcC<6ETTPy9+WPN_;tHdO5YsKO2zdH#h4-B<$3z1~fyQFH%zIIL#n8ctiHWX5hYo#c;!ufa#flXdE?Trm zUzuNHD#y%v7V%Zj^TKxsGm6IopacRD>6_VEBY~L*nEB312P4Hn$aDJ5kO2sK2y<_o z#h-~z1H~U>DW*f3h&q@#+KB~3G)_dXXR}#7t*x4p$)v^1H!!mXeMf#ehbjV~>J`-^fAthEA(*JT56N1h_O%=pR}={qCSZF(3idleJT{R zHtJJRO0-XIwA$Lx*lhOBE~!y$@i(ZgVnDGWNrQXm$i&^aE@?A!vkPmv^AgCOzwdl! z&N*`lm-wMe93NtU|96IC24eXA#Nn1&CI+Wz%2l- z2XI9p9}@t61aO*&1_2xng5Za0GtU6n$;^9lx!hk-f@*1LsUxE2iD(yqB>;k%nVI`X zM@N5)VsAE4Q56f|ju%Sutm8P{nM`Ils=ZP@-}l>;QilMn(2Xdc&u<(V85xgaI}$)$ zmXni{8k_*|g;MI?TrT%ZlmITIURu`iKP3^Sph`{1gBU z%9m39Wb1fcf7c*0>n3xCi3f??gXxYBj+QaGN+}f-nCz8O>U(Z=tN|9f<;MWd6Vb*X z2(nfl3&I6}dPe?xhz8)~x2Lxp{s$7r=K74Gn7s1_tt`juw*h`#Y8q)7u1eYmjh4zsO{vyMCod2oXIR1c8ph z=vV<1LVO0`P9l0T2!gkaJlF^^sI9-V?;nsfknT*~RaEyp?+Ipp6Tk^6<$p{2B0h`( z>fI86z8e!tsTHO}+yPfC8E`)yQ?uk&+~RL^XmW( zN-4M525uvNM}NmoFzsUE-r>#<=Q^hlLYJoY{j`+wH4~f00EG|-06YeuM@rdiVmzwM z`j75g8;0s6K&R7PDg6?eJwk}>0QLhoAfgui;8XAhc8=3^AW%QiXe}_6#8;UxG^-%jB zmr`DBV#@}gUX$vZnwk=QeSH;subBi{lxc2mzO134K`-@rDP^6Bt_?u_D20^LSjQv) zTNxpQRUF2_+8VYE+*IB+ju>D`i=HhFB6?3Lbq^6;S(bJEIpPQry%Ge$*QSh=%6Xo5 zGc&&mK!5(2>z-PMng4Jc=O{BjY;#qt8C)pvLLhCnAT>Cp)bKoso7bgjFR%uvAEB=6 z?#N^^KbLw=CX*{&*WFJ<`UBD-DP{LU$te9@2=P9EhYal-H#=*9`F#G`k&%(J^98S8 z;Yum}_&q13Ty6>QPhFOV_NxbQq0+GJa^-it()O(xtaJb|z_L2Gt&o_(YL`&8?Z*t3 zWO%lXJC1W*`3x+1&a6x%5@!}OCMs>;hQYZ(9EM>}`7G2kFbuM^R`100007snqqT9Hi}1l*L6Mn~vi)R2&n7$G1f4N5Z*Wgs!)2NI$*4jH8=NGTx- z0+NyvQlmloCm|s3-v8hCkLS7Po^zi#-*fIg-%spq11%P2USTW=yBO)I zJLN@?A~n$X8EdJ7^4<$80Gw0Q!K#_!@2*=v@-`jjP+4l4)Yk@dDn?qz+GQM?KD$%S zY_HU4bR2GynK{XKa*Qe-2aJ~vQtTYda31Jh#j9p$11rr^5(%QVRS>ToxUU@OS~kPw zs!^RUO!^Xi@BLS zjSa`-f1Peiv-jA zB3oua84Df5YJ5 z!-vV*mu-l%+3su1ptMxr3^2b$Ns3)I;%=fvZMq5OJ9ULEASrF}IC>J9|`7QdY({JvD`iBI5Nk^sz1g zyuH#myK3hUgrKmH-O2?^V1Zar{N@e+!A$k9~dCCA# zFMe14<(l=zr=+ED?ePGac%lIm$TAAb+0_vz7i%M zY4O(&)Um?z424tkJSS=-ao$N1nBwAM(F{c&iVyI<0-t0CN;np*4x$yR&X|~XPVuD% zMxccm7@{$Gn;};gPQZ*{{v}%^B_8|ltrnTRvo0~$foki+*kuQx7z!+}U>k%o^e~hm z)psd!o+hs#)le6riG4OSP<&liq%$wZ==FGGOMX-BM)p!KAM*=nj^;VT{WnftK^6)U@& zLoRP9J?7_1N<)~zPZqGtFnV0g)=!bNs!>{sOdL~+rXzSOS|=M6<W(sMBS%m>T;il5PoI_^1aJR`9 zrEPW(!)Vh4GhU9?`HgsTf ze_H0e)lt(qrr#8AtGD(s_}_dUnL;^*|%OC5kVlK|uRTaQUfy?$FosEixNE zUjh^Hs`~mpbsHNS>sbGYC}Xdm@D`c7e(JLh`0g<0rk!tfy?){IhOu@CU`ZWrG;w?d zAq&2)?kT0EcL6Y@X-?)8n7m_V7U+EW{H&v))jT7}BugSmBD=0T)>>Na$f89(bR!Gq z+ScR&5Qc6l($o%)mabl}IAa@N$F^tS>{jE zVL3Tl<5Hj<27fSFWX0`2Hr4nrtirK9vAo~TQ=Fgrhh7o&vMs!0)ys@Ctryu?P7tZZ zUC!?<8GUq=1eTEDqz+Di!{J0S$lv&98bWM!U3QK`&&#{7G%UvVX`Ae;_!+FhYKjsu zv)R~%0_CxRZsFaaF`XM&PdY+IVDB|gnx{HVUIs? zCQkvv+>ux$;Q>Quiu=9A&pVoTiSX^&UymWp=EUNak5j2yV$q&7w@pm02|d$obgIZ3 zjVGEfe{3Ri7v5aW+Unvmpf#E8F||?2U<`{JQP}lyXN^)vV4CK&T^-WzQ~M!ra$sO5 zu;Ru9B)_y&>|Um`gq0%FH{$@(A|uaPHmd!I>+Yj|x{LGBhNP7-BI5q~xUIZOg`Lok z%fBHqCc585Ld}NRrxngVX)G44q*E1T&y*~j|C8f6ULe}pU?IUNty>2FTkJmBkb0Zk zON%&{_KS}#Ny1`Gy1l@S_Xnr)19)5|IUw48>t@w|&r`L`am(!CObPPa2rn&a<2P79d@?^?Jvq zU>M3=!BD%9CH_`CuCl7C3T3bGHOo-3s27b!KOwvQR!i)?JwaO{gl$4a{ytb;{ zSk+6Gv3(Gba8479DsKJ>ZEABxeQaU6<)kZQ4sBjB*jnqFyG=*nS}y!p?l=3|YXG$# zh@=Ehn~i!Eb`;YC_=nX)NAa(*A!2Nb@tJH^F5_XY+|f86Q#FFOKULU=#({0=hu*bDV-A9c(&|N1YhFjX(bS`GrSjAO^lY7HDwweih`MmhN@wWbLz=34^G0B~os7 z0|&U~Z!?X05l;VSn(1%G>rHB#`F>GtVQH?F<&d5CEM_3EoCYHK*J);GWR`j7^ws3) zW7z~2si~b8%>x$hMzp;&GcW1KxUNC4z)Tav&CSwwn6Vr`o)a= zQ#MS1t7r2kwVx`te!e#*!OpDz%=mBDs-dP)dE8frFusUH7HsQ!<(c=2JPOL3@!LX) zq>gk3stX;|A4Ey$?j2lof+D3-jqhNfWYM^%#yc(g*5mgBs;lZ78jfA-4SDqPFpt#D z&AGVx?lg{k!95B(gSewVSfzBV*6IjmLcmO<{ik}TV-%SrTAFiVjXieP?Wg?jwn}HT%8Vn9(o$1O zam2wXn*B}8JB02$R5DMJL*uoFZ;BcO%}7*-c~Xav+S0mJGd4~>8t zCSX`y<92T5&g<>oWBPqVW{Dy0;+7=z8XLy5iMcnxj^XJtR|u-l~U_H&&#;3 zdjxv%k#@9*#bx955N zRaI58XBN7;x@4)Nsi{epf9%+?W0zZ&RaseCdBx!1U_F3VW^VDfh+%kx0QOpzbx$^% z72V?^;{lYC$>h~q>#qY?TC%jollqA0mjKr1a=C+HMl7DMl#=b^7CF>PCya=`OGImO zxtweRWj(;k4m6oe)@iN9E9Z!J`OuyvqMv!5_nUk^zt7+xsiC1^hUa-7W#-QSc$eQ_ z0l-t1Wi8KUv%AAg+-Pmf3bekyezsET7rw_xUj-t1jEL@=Hf`Fz&6_tDm$GSTZEdys z`ueVC=DV5sR(~Q{Rs?`Wj^jLIy3b*KWdYjO)}}f;JLfR-Bg}k_-`NRf-oVT&^7*`k zJ7t%KhK9;Qp>Q97&jYwpIwYc(h-h(3OUsjOZEeP*fU*EhCX*?x^^X9&$EWsJB3hkJ zr#F>j5dUjtWOCcv+ZPkjUCb;|fykdETyq?!$Mmck2inxsH09*UlRN#8M)V)DEbG?l z>gs38wZun*B3r=0g9qQ|d7f-P5^jm7K1W11pG631LBmh4OV7cQs4;itvL`g$?`Y?duz1jbS zG>D%i&~IZJn|97`|I7LMwQc(g09FH-?5D3QwASnL`TURxJBD3d8?RNCSSt1=PN2I znlqWq^CpZm1ym&xiS^9csxG8ySrP`$FfM>t|b*$9C_uM0rbyMMDw&p3y7xU zzmQMKLHMdQ^u4{!J5H7wQCC+tRVmdDpw|EY2G@1(Fp>Kk0ovHuXcr2Foy;s{Hc9zz za$R?OSx8<$Y17jSs|HUEeuM#;)TCdbDniY)w67lNsmWwAt+kfDT`F4ru~@9Br>941 z0HGu_P(O&?qP1QimPp`UQ&Y3(lAP#mP>puF8j9Aj=Au1P;!_rucHh{sp_G)^y?_7y zhne}4zTMl>>GVxu!@AHwZQHg1{0_iW0LNmn*av%hdU``mbI8W6+-kkB{nQrLJWo88 zfCDk6=8*?gDwUe$dEOuV1L_bFEpQxXSD5ZY0ri9CuK>8;FGg$~8XCIIWEc{3aE0)1yP^vcqZ$`A8?BBeyxs)%SsO-;?(FsmyR(3vx5R>kA-pEC180H=v) znd3M=Fj(ve$`d%V{6Eb^>xu^z;m;L=g&TJ++)-K|l`EGo0a)YjrLuM1me1#p2kkf% z&{Qfl-SfPs07%Gm$UltSpvIVPCkNHQsX-}(yc-}5MRR*vwu!xG#jl3_9>BE#_F0zo zp=>t$kD#`M1={3!-V=U2w|ih<;D)_>_ns4?1U1Z5yV;%THCkg?@!$ddFf*_Hi>12f z&Ye5y=+UEp1Ta(Xt1Qc!lg(zkg7zN@Xd;pL8Z&>}@BGKE>n;guNV(cIbhNx5OhrIM z)RRfKH;(Kpkw`qm%o2x+eARW`wL$F(3slN;i==a<)E&88PAW_jN}4)uzHWd|pV>DF z2Yb>T)guk8udiQ1MC*O%k2;Q145fldSfDO5%bkwMY}a)&L5wJ88_B3HJMzN6Buyp4 z(M-DIE$0C`n}}rDix=;597jUIKoS;cA2SzcyrQCFdM1;RJMsx9lKX4ur3&i%-Sf76 zYovj49|b_F`67L;>(&GvL|CB5nYmaA*IG{+uS$H-!Ct6cGMT(mYh4VLi0HKAIP%CM zkc0wi+qT>ZDe2jD-B7v$S#PM3pP-z*-wHF9P!Md}K6@n_#t1`PLa8w|mI$an4H3{# z{`lI)5zyB=P|LDz@jUN#BAUg_Z@s{H<wdrlP}{bjmS?1X#uL<@3A2YzbzN5;AdD&_a_1AS>&l~p&|=%R zq>sf^Snjw2+A}eLUhKYOD()+tg)ln9v@Ny4*eM?YJ%cp@>bqCuq379g!$1ksHd^wA zCnEwH0UcXJ6=vCnX&ZTH9%SYRFO)+M{~l9oEic|Ae>YlfvTgg4 z+Y<_C$ok_%tA`q~ClpZe%zzd0iB_>UW=~k4#d^S4?{NGdf=!q^rE=I~0_fOcnm5R| zBA|vRIszI2HB7*;y2wK#poR$;Ru_3_1k^AA!|Earjer^^U|3z`p%GBS1PrT-JTwAo hn1Eq*k%t-v`X7xWyOGCtw^INB002ovPDHLkV1kW-wiN&X diff --git a/assets/image/icon_mine_online_service.png b/assets/image/icon_mine_online_service.png index 2b591fe72c485d70e52f7a0ecd21279043576a40..be33bb5455174d602a0b2199874c8a89ea75c7e0 100644 GIT binary patch literal 1029 zcmV+g1p51lP)Px&zez+vR9HvtmR)FEMHI*XXYSqBO=xwaR4G!hMjx_%W$zu6l_K$>VuGL57qLaK z_(4_j;)5?WE%@L=A0*hKq6M|Sh?bJJiHgvm;HH_mNpX#k77<07SYvI{(#>}F&XI|C zacy?9yLqq(85p?C$2q?_bI$(`;R-jp!v3)W@c)f~l=21uw%azXl$u^nJ~b49R4Uae zgm{*Sddi%a{7y6TATz%k1i|roVd?^CZ*O1kILzLUP(IIC3AfL~Flg(!Tv<{NVWJ^3A-$X=DGxMWFBmkUY z=7+S_qf0?736M&q?rlo~A6O0o8xeU%S%$^Ic|9Z5k*z_d;55Os7 z%w0hcT&x696~OoXT}0GpLm3&Es$}4vFYaGwitYdbZ2;ETHOzQFzjNv}*LBCEtJ|%$ z-c>h1I-QOe3Wd`|bPY3a*IMtdl}ug7y4>8w)lUjIdn1sS3VmnhiRe9MJ{OC{)@L%A z+~syEM!@&|$BF1u0KYXiH{UosJY1{=P@3;J+VhA24gr|@{jHNXC1w&o1Gt`vdjQmp;;c3Pi0&m^;IrGrdIg41j*6RBv4XQpzC!4*=*@O7%Ai z(0Qc$AQ3&r#GAst86Uu#06terb=M2BKSTb#2d_f zTx;Fg5I_Y-zgVTyTHEqk)O_D>w@L|M!{w991qcD0i;Oh^hy(auDRp}#04Ze_z-<6* zxs`;+s;IkMfESfg`>Zo5&?JH?Z5CpbFYXjI77D5Q|95c5>nVq+CYK+-aO^mDv2_asw zGS18kLPSJojWPC}xXAg!e5I58mt!jcD-rk$AhzK!ga6J{00000NkvXXu0mjfW3SuP literal 620 zcmV-y0+aoTP)HX4Z_L{U`yLMaG=9I`XSDyU$gkYX>AlYfAS_kx1d-i&t<{{TfQf&^Oe zpr~MD^6uu4gNQ~^5fzIz6mn=}XJkuyNq4uKDmh5!`hNW0dFGjyFyKQ2=3xW)&lT@W zQl->k0LKCB>rV0oz#KDwh&x#yFd7gKdh?bbS7%gyIRW5otJNB5Hk(U9u;H1)dyvt_&>dvTH(l!(f;TCEgR69~*^v%8YXU&UM|-p*Nc@T58MUQOmNf60jfbg^^CFvy+J2 zPN$P;G#Wp8YXgBwsmsQg1CHZdT+0M2@nbWEdjQ_N8k@Z)rM%@EiJ7m*1-<|<#mrCQ z0#$i5lSqh%mBOPTrPLV!lgxZFF7Rg}kr=8}D!<|aFKq=+#&j-xBCkUvN`Uc=!PyWlkfW664G6%)_mh`^| z2E9qYZy1;#XqsNv0qD!6QTc!M*VeNbHh}9EgmdSba6fa0000 with TickerProviderStateMixin { EasyLoading.dismiss(); } else { - SmartDialog.showToast("${value?.msg ??""}", alignment: Alignment.center); + // SmartDialog.showToast("${value?.msg ??""}", alignment: Alignment.center); } }); } diff --git a/lib/main_page.dart b/lib/main_page.dart index 1098eaba..d958f7e3 100644 --- a/lib/main_page.dart +++ b/lib/main_page.dart @@ -306,7 +306,7 @@ class _MainPage extends State with WidgetsBindingObserver { // bottomNavigationBigItem(S.of(context).pinpai, 0), bottomNavigationItem(S.of(context).main_menu1, 0), bottomNavigationItem(S.of(context).main_menu2, 1), - bottomNavigationItem((Theme.of(context).platform == TargetPlatform.android) ? "订单" :S.of(context).main_menu3 , 2), + bottomNavigationItem(S.of(context).main_menu3, 2), bottomNavigationItem(S.of(context).main_menu4, 3), ], ), diff --git a/lib/mine/mine_view/mine_item.dart b/lib/mine/mine_view/mine_item.dart index a6db740e..978a9573 100644 --- a/lib/mine/mine_view/mine_item.dart +++ b/lib/mine/mine_view/mine_item.dart @@ -1,9 +1,11 @@ +import 'package:flutter/cupertino.dart'; import 'package:flutter/material.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'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:url_launcher/url_launcher.dart'; class MineItem extends StatefulWidget { @override @@ -33,22 +35,6 @@ 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", - // ), - // ), Container( padding: EdgeInsets.only(left: 16,top:16,bottom:4), child: Text( @@ -83,6 +69,8 @@ class _MineItem extends State { // ), // ), // ), + + ///兑换历史 Expanded(child: InkWell( onTap: () { SharedPreferences.getInstance().then((value) { @@ -100,6 +88,7 @@ class _MineItem extends State { "assets/image/icon_mine_records_of_consumption.png", ), ),), + ///我的卡券 Expanded(child: InkWell( onTap: () { SharedPreferences.getInstance().then((value) { @@ -116,6 +105,7 @@ class _MineItem extends State { "assets/image/icon_mine_card.png", ), ),), + ///管理地址 Expanded(child: InkWell( onTap: () { SharedPreferences.getInstance().then((value) { @@ -132,6 +122,16 @@ class _MineItem extends State { "assets/image/icon_location_address.png", ), ),), + ///联系客服 + Expanded(child: InkWell( + onTap: () { + showCallMobile(); + }, + child: mineItem( + "联系客服", + "assets/image/icon_mine_online_service.png", + ), + ),), ], ), SizedBox(height: 10.h,), @@ -168,20 +168,6 @@ class _MineItem extends State { "assets/image/pin_tuan.png", ), ),), - Expanded(child: Text("")), - ], - ), - Expanded(child:InkWell( - onTap: () { - Navigator.of(context).pushNamed('/router/qr_share', arguments: {}); - }, - child: mineItem( - S.of(context).tuiguangma, - "assets/image/icon_mine_promotion_code.png", - ), - ),), - Row( - children: [ Expanded(child:InkWell( onTap: () { Navigator.of(context).pushNamed('/router/invitation_record', arguments: {}); @@ -191,17 +177,11 @@ class _MineItem extends State { "assets/image/yao_q.png", ), ),), - Expanded(child:Container()), - Expanded(child:Container()), - Expanded(child:Container()) ], - ), + ), + SizedBox(height: 10.h,), ], ), - // mineItem( - // S.of(context).bangzhuyufankui, - // "assets/image/icon_mine_feedback.png", - // ), ); } @@ -235,5 +215,41 @@ class _MineItem extends State { ); } + showCallMobile() { + showCupertinoModalPopup( + context: context, + builder: (context) { + return CupertinoActionSheet( + title: Text(S.of(context).bodadianhua), + actions: [ + CupertinoActionSheetAction( + child: Text("15392949097"), + onPressed: () { + callMobile("15392949097"); + Navigator.of(context).pop(); + }, + isDefaultAction: true, + isDestructiveAction: false, + ), + ], + cancelButton: CupertinoActionSheetAction( + onPressed: () { + Navigator.of(context).pop(); + }, + child: Text(S.of(context).quxiao), + isDestructiveAction: true, + ), + ); + }); + } + + callMobile(mobile) async { + String url = "tel:$mobile"; + if (await canLaunch(url)) { + await launch(url); + } else { + throw 'Could not launch $url'; + } + } } diff --git a/lib/order/bargain_group_order.dart b/lib/order/bargain_group_order.dart index 3bb78a5d..e7ed1f7e 100644 --- a/lib/order/bargain_group_order.dart +++ b/lib/order/bargain_group_order.dart @@ -4,14 +4,10 @@ import 'package:flutter/material.dart'; import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/retrofit/data/activity_order_list.dart'; import 'package:huixiang/retrofit/data/base_data.dart'; -import 'package:huixiang/retrofit/data/exchange_order.dart'; -import 'package:huixiang/retrofit/data/page.dart'; import 'package:huixiang/retrofit/min_api.dart'; -import 'package:huixiang/retrofit/retrofit_api.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/icon_text.dart'; import 'package:huixiang/view_widget/my_appbar.dart'; import 'package:huixiang/view_widget/my_footer.dart'; import 'package:huixiang/view_widget/my_tab.dart'; @@ -20,7 +16,6 @@ import 'package:huixiang/view_widget/round_button.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:shared_preferences/shared_preferences.dart'; class BargainGroupOrder extends StatefulWidget { final Map arguments;