From b164168e8f70f2b716a0a308c7c087ca9032a1e6 Mon Sep 17 00:00:00 2001 From: w-R <953969641@qq.com> Date: Fri, 30 Jul 2021 15:45:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E5=BC=B9=E7=AA=97,vip?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/image/2x/icon_shop.png | Bin 0 -> 1753 bytes assets/image/3x/icon_shop.png | Bin 0 -> 3219 bytes assets/image/icon_shop.png | Bin 0 -> 785 bytes lib/generated/intl/messages_en.dart | 3 + lib/generated/intl/messages_zh_CN.dart | 3 + lib/generated/intl/messages_zh_Hans_CN.dart | 3 + lib/generated/intl/messages_zh_Hant_CN.dart | 3 + lib/generated/intl/messages_zh_TW.dart | 3 + lib/generated/l10n.dart | 30 ++ lib/home/huixiang_brand_page.dart | 183 +++++++++++- lib/home/points_mall_page.dart | 2 +- lib/l10n/intl_en.arb | 3 + lib/l10n/intl_zh_CN.arb | 3 + lib/l10n/intl_zh_Hans_CN.arb | 3 + lib/l10n/intl_zh_Hant_CN.arb | 3 + lib/l10n/intl_zh_TW.arb | 3 + lib/mine/vip_detail_page.dart | 276 ++++++------------ pubspec.lock | 292 ++++++++++---------- 18 files changed, 457 insertions(+), 356 deletions(-) create mode 100644 assets/image/2x/icon_shop.png create mode 100644 assets/image/3x/icon_shop.png create mode 100644 assets/image/icon_shop.png diff --git a/assets/image/2x/icon_shop.png b/assets/image/2x/icon_shop.png new file mode 100644 index 0000000000000000000000000000000000000000..f7d545db7703c248f77e734950441af6edbef24e GIT binary patch literal 1753 zcmV;~1}6E5P)Px*lSxEDRA@u(mV0PCEcmFlB`CcBmIE&XE5u)mlD-(!H}zPkqh~H2Iz`b3 z2MC*(K*Hmx9@nL3t#anN&Hyk1r-8vh98fVvk$;fjrj9D7=e+80kiX<}nyTst-+xF6U7Yy#x#KYk?A>30$7hw=@+?_?K;Xe504{i`bd`ydy~N) z``et&<(@+IgwTFqDli`SWy~gdo}{v&M>KabZK$Xr|GCfciypv;)w7VKW;IobM|0;Y z8#@9Z88`-HI{`3ule|+^xwj_)2;L{x?WgkS8HT+$o#3QsO`IgLD`&1Ut0Ms30iFWV zMfFM9_E3PWHs}Hn*wX+m=l;#9x4$E7(hw5nPj-o`^$V;S^mE#Fcb{l0go2%orO}zZ z^<$KIGbJ3mdRlocTChH{g}{5j>%cN`!ICL& zC|sR2ujYhT9(4*&P+}xW%kR|g7OdK%{T;sIE-zlLWR9CXp2*urG=EdsXiZlh)dRql zyw_<>EF;5UF&CXJd?hQgy8#rg-mB@8^wJD30JicfjxF0k$cPvcm)+s|R&Fga$B>cX z(DI@U^Hl&fK)g6}d8;b>^$hIePXxj2l{O}{>p`BQrU8h}55 zQCj#Y>1#pNLa8_D_vJgWl~pok!yFH>(rZ>Z^ZE7w6axc+P{3hPWKm9?f!I3`RENsZ zCqKm);KS%Q(>#S1SY<_&_%=i6GvHz1ZeWjPQ+gGuDk{?zBq~Pn=0n6jU~#wpt3ec1 zrDS_H@pDp;jBQWkm3bwceB+x|<|1mXvJ%uDfLnoYf!}}>iz0syjB8D?;!h57et!W$ z!=gxBdOHT6)~5_dlU-A&`gj=;sl$kuQ`}v)C0|FQox+v7sVlxj;tSIW8Q$E?1gUT& zS5_vp2S9w!6!Q=8P4de#4+O-8uksWmlB;BEHs`-BX!fNFAtPfj&!3D>Xn>bajg@s2 zeRPnj{8IPXh}1;lW>3KAXYx8L2D#H89?;GX9B*dG6H~mtOGwY;$eHW)01%^~DAK|k z7Y9upJ|HkY+$3CIUwWB~hfdRYu?FA4!3=$RD#8=hh37B?_z*VEOrSYJ>;JVy7r1n! z2uEEbqW;IvP2tq~?+|6uG%$eh2?_Ye4%C{Lu=u6Jr?J;I5S$dn(8bd*`in)-O*yu} znn}mfwu>U8YZ(!N`Vz3jnbdAhlF2~CEs4ZFXwf>Q2$Ax=$2hk)UsJ%7L?TAc7)8{K zQCf&K)z~<@BbN&YPoOs1z0U^vGI&}t(KD~dVEQi{C8S)VWWVjm+>b?x*GSJa>N+dD zA$)1}j~);k`_R}G!O1b00)4MY3jw6MpbXo&N-eDXq6QE=Ji67~u-7$Gb^I(17pjqb zjQ9->)`qv1c_c|Jst>4n-(~rZ01(+OcDpm4npzZDEa5#uBDX{+hK!6wGBn%RDl4rT zTaO2}0QUe9K)p-jo&-?7|2StpIn2;SQwhCMJb-i!z}LWSKsa!zHvp7n!lker6zf88$fAEh9{Uv$LtZV~@Vrz5VBQI2P%cG00000NkvXXu0mjf@mx_r literal 0 HcmV?d00001 diff --git a/assets/image/3x/icon_shop.png b/assets/image/3x/icon_shop.png new file mode 100644 index 0000000000000000000000000000000000000000..eb8f125ad7b5fb2d22df38d1b93e1b096b54237a GIT binary patch literal 3219 zcmV;E3~cj>P)Px>O-V#SRCr$Pn|XB9)fLA-?>9>(dk6_3EQw%(8&V*EC@zJ%pw_BXEH01)TJjU5+5)YLqM&G;2o@}aEi92hh#?zUCYjfBUnbj-Fk}Ww zJZJ7-$?x}j@7?!(_uY5z_r6g?uOz-HiIz<1%n6aGYEfL!1=eqh4Y=UBF{0iFY1 z04hT5INX(<2h0T${0cMy^~zE<<+MdBrEH-p7HT`6w*}qoYisVcoVK?|J~MrjJ;7z3 zDW!cHTbWb){=GKeT@q}ZZ~*!d@Hr4Ipa74ES*KlcW?IVRtfg9!sI&^F|6saz``*{m zLfw}A?0sh)-l}>*grPT1AoVAwwSKSAXd0DLTfuR;CwIZFBMlVl1nj`;z%_ta%?-d? zJo>1WbJEVm8a*qd*&V}1he|5g_S^>sq^N-jjQG{1I1*$nJ4B(DcuF$!dGyhClM7TK zRDi|;e+LEutAJ~P{W%3QGtl;rG4#3>G2dmL%{2`a zKfQv6(t|itKydF_@I znwnnIAn*H(?0xrZ_P)E`=reTIL{g_nsMgsJ@jg!H^`7e&95_}0i8)^F@9aEawfsHd zjhja_H+a_q{rU_#vT{}RY`Fg|w6_IUdLpMic@?Vb;aX{TIVOHNV`1^J0O%CpTR{Af z9P#J0bvmvf|5l&Yf9^}*wCS?*l{Hj+y2bpPb?=2Fj2hBKO-rfUzRF$va<~8qC<4IE zvM~OmeQ8^#IR*JEwbqmSB0#mp``G&I`}i80NgO?d;df3!*=0JdqLli`le>6IxB!Xu zEC+@GMZnMePMWg|W({uC)(*hY7XcDyz2l`-)O@=aM^X$Y-!p}nVJV$e^+qY*u+MXs z$e|PHqmF7y;>_;=o&lV|@BNXpSQ0q}v+vT{Cpk~w6s;-y=LYt^^R>}0ecBk(E*sg! z7b#`k?a5vAVyFO#<6Q#$6e#xxh94VnUcSYlUEURkN)Ak^{!eM=Jm|QA<>(hfQcfoJ zxF|D5b8RCB3rkGuoiy&G_UD}ysM~RX?azOR_h3Eor>8UQ_6xAbx8`U5eYR3HIHr1T zU0@cy{qa%GA_ova;{1{GB|xLJ9q-OP!-rbFao&4FCEh>_<8XY%ayb}s-FQ+i7-0rF z@NqGFUjNdBU*`FbTc39p-Qr{03oEH!zX!`{C;OqP#18M+W(sy&=t~Rp3O0rUkVMNu zX^2cWd6!>u3i5Nc*7Lue_g?G?187w-rEe4(jRw!?04@-us-j&6B$4#1$B=%dV$2vx<;xzt?5)^P6qba z)~y#PzD6(K-18>B1}|}^4P?ZFQ#(E}S-zT|HX!c)<(Iu^c8AE(M$%2NyVa- z`ay`~W9#pF!}y@stW-{!cX>AevC)&~9@$%f1kqpn8|4AU)91MJt2Md{f6yaRT2r-t z56WhdFmjNgLVG1zQ@wF7Esb81#$=$ZUbdHVM_~y&=9}=1^s7gcer5Y+Xjer+ohQ#N z;Y_c#*m&T5KM^JwyQCTAIqtj-8qNqhQ4I%+cCvHP8l1_oWZrxpF&W80n|1!6zO<5( z1*>V?Urk2t*(9GetXCjQy0QI*mDFz8k1fVY_S}mD(~VX@l-l6QU3_M50TPB#n8IoP z?ezrk^w@&@XVLo3U^A6uv1H+=G?mwyb2B=lKiT(R)HRYlLMJVCjcj@LeGct702%{w z#+*qcoFR;FaFHN!--?Zf$k)v+BuzMp%=}5%qPs~QmG!5h+(nXB^~!?eV{|30^?RhA*C8>(Q#k3SbBP+5*yDDQ0!`z-YIgo* zHFeu0!|4zq;xp$=B6e76m&`m6F3I34Jv-U`>RNpDUZngZ;|5Y5#(JRMvN4zDvc-Win|uk48~TI#(t?XNMQ$i5e_M3T=rnIYFtFbrSG zORL%~O5zb)ybEW)n0CInvAhOvI7svK#E;9AJ-J-yT6h(3Kbw} zC(A6`O{kA7f8j9DvRjq6S!R_}CZA$fO_D?r@hPQCJskAxGMRXf39eEmGfy0o!Qg9i z+Ou?DQw!xE{Fm~Tn+%X`i_o1C0*o^yp7g6mlQb@~yX~wMs?@UUX@xhsTNAoY()+Wr zqp=j3E(XpAq->djrIPJ2PM1BwWkn50FtJ9$$ic?^19)IVi^z#m^X+%WznB#_U}1o8 z_Kzd>O%xshsMCtI0Th*l1;LG9+U$QJ7f zr?xmKDlLKR2O>V`Fr2nLy@HxeW&A$@k_(#;_%)Ftcq=i}NyfVKgv9B%fOC|2(=q={ zYfK!pwYpg+dV@)O4Vh*z5re zziV>myV6^V^4y2tatIhB6oAI~??UHVcT{8P-d~zL6pD-&jME$Z2?0rv& zdY>WfgwYfR6O<22-BvVf(ZXPuhXRmLtqXvk`zy0j1`-NZtj1*au|xW~2HiOEc1L3L zOr>=9Hwl7i7Mw8YQFm`mgYEk-c2KdZ*nne;b~I$nIrqDM<1(e!I#BKetzY^$-`x;Q zjZgrRHgZ`(E*d;R8RT^)9Xm@<(`JzjB5L)&T`tH%z9*M zfh(h*H@U@DeKf$dDHcqTo+cn$M<`dx?B&+k3EN6REI@uYCI^cAcC7tMOE9bH{618G z+WL?UEw|5v#2*X@D<8Nyg8d(;Z?Nx==Dn0{iZgWThei zMF0wKGe;~aVnGoL3J-yZ1%-!S#0NzzC}Kh3ArPeX{{T2uXoYIyQndg8002ovPDHLk FV1g=)FSh^y literal 0 HcmV?d00001 diff --git a/assets/image/icon_shop.png b/assets/image/icon_shop.png new file mode 100644 index 0000000000000000000000000000000000000000..674ffd8d46ffdd344d579d56e349c8bd4e0beedc GIT binary patch literal 785 zcmV+s1Md8ZP)Px%%Sl8*R7gw3m0d`aQ5eU6ClT zyXYe5qAv(4C|@rOf(Yz;MIc007j4#bNtTLPw#`{)rK#$080>5RbQ0k#919CgZ71lJRZ|K5Mw@D#lz1IxMs(5Q6pRBucKcnBOUQI$Oc zs*?qb^bOK^wh8;uN)Y0rM^Sgj11tkB;H0d?ro0z0D_MZ_dv)v%)~Zs{^DTZ)w`#>n zI5tJ+f#%{%J3E5+TOWmo$0pS`mE_8FM9g3_Gw}EgpM8DUs#g*Yi}IFTbEK*Z3TL_H?G`by(IHM8u>>`1?5DgG1zO zUPjvNOulu8@Za*1w|@KGamvG#(F71Duv)?@*O!k0h?fXy^-{ zz3<3gy$H9W{?UyGkatRvO#i super.initState(); SharedPreferences.getInstance().then((value) => { - apiService = ApiService(Dio(), - context: context, token: value.getString('token')), - queryHome(), - }); + apiService = ApiService(Dio(), + context: context, token: value.getString('token')), + queryHome(), + if(value.getBool("isFristLogin")){ + showAlertDialog(), + }}); eventBus.on().listen((event) { - print("object: BrandPage"); - if (event.type < 3) { - setState(() {}); - } + print("object: BrandPage"); + if (event.type < 3) { + setState(() {}); + } }); } @@ -90,7 +95,10 @@ class _BrandPage extends State super.build(context); return Scaffold( appBar: AppBar( - toolbarHeight: 40.h - MediaQuery.of(context).padding.top, + toolbarHeight: 40.h - MediaQuery + .of(context) + .padding + .top, backgroundColor: Colors.white, elevation: 0, ), @@ -227,7 +235,7 @@ class _BrandPage extends State TextSpan(children: [ TextSpan( text: - brandData == null ? "" : brandData.originator, + brandData == null ? "" : brandData.originator, style: TextStyle( fontWeight: FontWeight.bold, fontSize: 14.sp, @@ -235,7 +243,9 @@ class _BrandPage extends State ), ), TextSpan( - text: " ${S.of(context).jituanchuangbanren}", + text: " ${S + .of(context) + .jituanchuangbanren}", style: TextStyle( fontSize: 10.sp, color: Colors.black, @@ -268,7 +278,9 @@ class _BrandPage extends State mainAxisSize: MainAxisSize.max, children: [ Text( - S.of(context).gengduo, + S + .of(context) + .gengduo, style: TextStyle( fontSize: 12.sp, color: Colors.black, @@ -328,7 +340,9 @@ class _BrandPage extends State height: 40.h, ), Text( - S.of(context).linian, + S + .of(context) + .linian, style: TextStyle( fontSize: 16.sp, fontWeight: FontWeight.bold, @@ -474,6 +488,149 @@ class _BrandPage extends State ); } + showAlertDialog() { + //显示对话框 + showDialog( + context: context, + builder: (BuildContext context) { + return SimpleDialog( + titlePadding: EdgeInsets.all(10), + backgroundColor: Colors.transparent, + elevation: 0, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.all(Radius.circular(6))), + children: [ + Stack( + alignment: Alignment.bottomCenter, + children: [ + Container( + alignment: Alignment.center, + width: double.infinity, + height: 305.h, + // margin: EdgeInsets.only(left: 40.w, right: 40.w), + padding: EdgeInsets.only(left: 16.w, right: 16.w), + decoration: new BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.all(Radius.circular(8))), + child: Column( + children: [ + Padding( + padding: EdgeInsets.only(top: 24.h, bottom: 10.h), + child: Text( + S + .of(context) + .xieyitanchuang, + style: TextStyle( + color: Color(0xff4D4D4D), + fontSize: 18.sp, + fontWeight: FontWeight.bold), + ), + ), + Text.rich( + TextSpan(children: [ + TextSpan( + text: + "     感谢您使用一心回乡APP。我们非常重视您的个人信息和隐私保护。为了更好地保证您的个人权益，在您使用我们的产品前，请务必仔细阅读一心回乡", + style: TextStyle( + fontWeight: FontWeight.w500, + fontSize: 14.sp, + height: 1.3.h, + color: Color(0xff727272)), + ), + TextSpan( + text: S + .of(context) + .yinsixieyi, + style: TextStyle( + fontWeight: FontWeight.w500, + fontSize: 14.sp, + color: Color(0xff32A060)), + recognizer: TapGestureRecognizer() + ..onTap = () { + debugPrint( + "${Navigator.of(context).popAndPushNamed( + '/router/treaty_page')}"); + }, + ), + ]), + ), + SizedBox( + height: 10.h, + ), + Text( + "     在您同意后，我们才会根据您的使用需求，收集部分可能涉及的数据(地理位置、相机、存储等信息)。", + style: TextStyle( + color: Color(0xff727272), + fontSize: 14.sp, + height: 1.3.h, + fontWeight: FontWeight.w500, + ), + ), + SizedBox( + height: 16.h, + ), + ], + ), + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + GestureDetector( + onTap: () { + Navigator.of(context).pop(); + }, + child: Container( + height: 40.h, + alignment: Alignment.bottomCenter, + margin: EdgeInsets.only(bottom: 20.h), + child: BorderText( + padding: EdgeInsets.only( + top: 10.h, bottom: 10.h, left: 36.w, right: 36.w), + text: "不同意", + fontSize: 12.sp, + textColor: Color(0xFF32A060), + borderColor: Color(0xFF32A060), + borderWidth: 1.w, + radius: 23, + ), + ), + ), + SizedBox( + width: 21.w, + ), + Container( + height: 40.h, + margin: EdgeInsets.only(bottom: 20.h), + alignment: Alignment.bottomCenter, + child: RoundButton( + text: "同意并继续", + textColor: Colors.white, + fontSize: 12, + callback: () { + Navigator.of(context).pop(); + }, + padding: EdgeInsets.only( + top: 10.h, + bottom: 10.h, + left: 21.5.w, + right: 21.5.w), + backgroup: Color(0xff32A060), + radius: 23, + ), + ), + SizedBox( + height: 20.h, + ), + ], + ), + ], + ) + ], + ); + }, + ); + } + /// contentType 跳转类型（0：不跳转，1：积分商品，2：活动，3：文章） bannerClick(BannerData bannerData) async { switch (bannerData.contentType) { diff --git a/lib/home/points_mall_page.dart b/lib/home/points_mall_page.dart index 19ecfb18..6cf6441e 100644 --- a/lib/home/points_mall_page.dart +++ b/lib/home/points_mall_page.dart @@ -555,7 +555,7 @@ class _PointsMallPage extends State banner() { return Container( - margin: EdgeInsets.only(top: 16, bottom: 16), + margin: EdgeInsets.only(top: 16), child: AspectRatio( aspectRatio: 2.0, child: Swiper( diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 03179852..7206604d 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -409,6 +409,9 @@ "lijichongzhi": "立即充值", "nihaimeiyouchongzhihuoxiaofeijilu": "你在这儿还没有消费或充值记录哦～", "haimeiyouxiaoxi": "还没有消息～", + "xieyitanchuang": "一心回乡用户隐私政策", + "yinsixieyi": "《隐私协议》", + "shiyongmendian": "适用门店", diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb index 4fd47281..4196f27d 100644 --- a/lib/l10n/intl_zh_CN.arb +++ b/lib/l10n/intl_zh_CN.arb @@ -410,6 +410,9 @@ "lijichongzhi": "立即充值", "nihaimeiyouchongzhihuoxiaofeijilu": "你在这儿还没有消费或充值记录哦～", "haimeiyouxiaoxi": "还没有消息～", + "xieyitanchuang": "一心回乡用户隐私政策", + "yinsixieyi": "《隐私协议》", + "shiyongmendian": "适用门店", diff --git a/lib/l10n/intl_zh_Hans_CN.arb b/lib/l10n/intl_zh_Hans_CN.arb index 71e188f3..218be14e 100644 --- a/lib/l10n/intl_zh_Hans_CN.arb +++ b/lib/l10n/intl_zh_Hans_CN.arb @@ -410,6 +410,9 @@ "lijichongzhi": "立即充值", "nihaimeiyouchongzhihuoxiaofeijilu": "你在这儿还没有消费或充值记录哦～", "haimeiyouxiaoxi": "还没有消息～", + "xieyitanchuang": "一心回乡用户隐私政策", + "yinsixieyi": "《隐私协议》", + "shiyongmendian": "适用门店", diff --git a/lib/l10n/intl_zh_Hant_CN.arb b/lib/l10n/intl_zh_Hant_CN.arb index a61408b8..c32eeb74 100644 --- a/lib/l10n/intl_zh_Hant_CN.arb +++ b/lib/l10n/intl_zh_Hant_CN.arb @@ -404,6 +404,9 @@ "lijichongzhi": "立即充值", "nihaimeiyouchongzhihuoxiaofeijilu": "你在這兒還沒有消費或充值紀錄喔～", "haimeiyouxiaoxi": "還沒有消息～", + "xieyitanchuang": "一心回鄉用戶隱私協議", + "yinsixieyi": "《隱私協議》", + "shiyongmendian": "適用門店", diff --git a/lib/l10n/intl_zh_TW.arb b/lib/l10n/intl_zh_TW.arb index 179f88e1..92b78408 100644 --- a/lib/l10n/intl_zh_TW.arb +++ b/lib/l10n/intl_zh_TW.arb @@ -402,6 +402,9 @@ "lijichongzhi": "立即充值", "nihaimeiyouchongzhihuoxiaofeijilu": "你在這兒還沒有消費或充值紀錄喔～", "haimeiyouxiaoxi": "還沒有消息～", + "xieyitanchuang": "一心回鄉用戶隱私協議", + "yinsixieyi": "《隱私協議》", + "shiyongmendian": "適用門店", diff --git a/lib/mine/vip_detail_page.dart b/lib/mine/vip_detail_page.dart index cbc94084..7eff8e74 100644 --- a/lib/mine/vip_detail_page.dart +++ b/lib/mine/vip_detail_page.dart @@ -5,6 +5,7 @@ import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/retrofit/data/base_data.dart'; import 'package:huixiang/retrofit/data/order_info.dart'; import 'package:huixiang/retrofit/data/page.dart'; +import 'package:huixiang/retrofit/data/store.dart'; import 'package:huixiang/retrofit/data/vip_card.dart'; import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:huixiang/utils/painter_bg.dart'; @@ -130,7 +131,7 @@ class _VipDetailPage extends State { child: Row( children: [ Text( - "历史订单", + S.of(context).shiyongmendian, overflow: TextOverflow.ellipsis, style: TextStyle( fontSize: 16.sp, @@ -142,7 +143,7 @@ class _VipDetailPage extends State { width: 8.w, ), Image.asset( - "assets/image/icon_history.png", + "assets/image/icon_shop.png", ), ], ), @@ -162,10 +163,10 @@ class _VipDetailPage extends State { itemBuilder: (context, position) { return GestureDetector( onTap: () {}, - child: historyItem(orderInfos[position]), + child: shopItem(), ); }, - itemCount: orderInfos != null ? orderInfos.length : 0, + // itemCount: orderInfos != null ? orderInfos.length : 0, ), ), ), @@ -295,8 +296,9 @@ class _VipDetailPage extends State { ), GestureDetector( onTap: () { - Navigator.of(context) - .pushNamed('/router/vip_balance', arguments: {"storeId":vipCard.id}); + Navigator.of(context).pushNamed( + '/router/vip_balance', + arguments: {"storeId": vipCard.id}); }, child: Row( children: [ @@ -405,7 +407,7 @@ class _VipDetailPage extends State { ); } - Widget historyItem(OrderInfo orderInfo) { + Widget shopItem() { return Container( margin: EdgeInsets.all(16.w), child: Column( @@ -413,212 +415,94 @@ class _VipDetailPage extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.start, children: [ - Container( - width: 19.w, - height: 19.h, - margin: EdgeInsets.only(left: 12.w, top: 12.h), - alignment: Alignment.center, - decoration: new BoxDecoration( - color: Color(0xff32A060), - borderRadius: BorderRadius.circular(2), - ), - child: Text( - (orderInfo != null && orderInfo.isTakeOut == 0) ? "自" : "外", - style: TextStyle( - fontSize: 12.sp, - fontWeight: FontWeight.bold, - color: Colors.white, - ), - ), - ), Expanded( - child: Container( - width: double.infinity, - margin: EdgeInsets.only(left: 6.w, top: 12.h), - alignment: Alignment.centerLeft, + flex: 1, child: Text( - (orderInfo != null) ? orderInfo.storeName : "", + "百年川椒重庆老火锅(汉街店)", style: TextStyle( - fontWeight: FontWeight.bold, fontSize: 14.sp, - color: Color(0xFF353535), + fontWeight: FontWeight.bold, + color: Colors.black, ), - ), - ), - flex: 1, - ), - Padding( - padding: EdgeInsets.only(top: 12.h, right: 12.w), - child: Text( - (orderInfo != null && - orderInfo.storeVO != null && - orderInfo.storeVO.posType != null) - ? StatusUtils.statusText( - context, - orderInfo.refundStatus, - orderInfo.orderStatus, - orderInfo.payStatus, - orderInfo.sendStatus, - orderInfo.isTakeOut) - : "", + )), + GestureDetector( + onTap: (){ + Navigator.of(context).pushNamed('/router/union_detail_page'); + }, + child:Text( + "查看", style: TextStyle( - fontSize: 14.sp, - fontWeight: FontWeight.bold, - color: (orderInfo == null) - ? Color(0xFF32A060) - : (orderInfo.refundStatus == 1 || - orderInfo.orderStatus >= 5) - ? Colors.grey - : (orderInfo.orderStatus == 4) - ? Color(0xFF32A060) - : Color(0xffFE951E), + fontSize: 12.sp, + fontWeight: FontWeight.w500, + color: Color(0xff32A060), ), ), ), + Icon( + Icons.chevron_right, + color: Color(0xff32A060), + size: 16, + ), ], ), - Container( - margin: EdgeInsets.only(left: 37.w), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Column( - mainAxisAlignment: MainAxisAlignment.spaceAround, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - S.of(context).xiadanshijian_( - (orderInfo != null) ? orderInfo.createTime : ""), - style: TextStyle( - fontSize: 10.sp, - color: Color(0xFF727272), - ), - ), - SizedBox( - height: 8.h, - ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - crossAxisAlignment: CrossAxisAlignment.start, - children: goodsItem( - (orderInfo != null && orderInfo.productList != null) - ? orderInfo.productList - : null), - ), - ], + SizedBox( + height: 8.h, + ), + Row( + children: [ + Text( + "地址:", + style: TextStyle( + fontSize: 12.sp, + fontWeight: FontWeight.w400, + color: Color(0xff353535), ), - Padding( - padding: EdgeInsets.only(right: 22.w), - child: Image.asset( - "assets/image/icon_more.png", - fit: BoxFit.fill, - alignment: Alignment.centerRight, - width: 24.w, - height: 24.h, - ), - ) - ], - ), + ), + Text( + "楚河汉街第一街区万达总部国际C座对面", + style: TextStyle( + fontSize: 12.sp, + fontWeight: FontWeight.w400, + color: Color(0xff353535), + ), + ), + ], ), SizedBox( - height: 12.h, + height: 4.h, ), - Container( - margin: EdgeInsets.only(right: 12.w, bottom: 12.h), - child: Directionality( - textDirection: TextDirection.rtl, - child: Column( - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text.rich( - TextSpan( - children: [ - TextSpan( - text: S.of(context).gong, - style: TextStyle( - fontSize: 12.sp, - color: Color(0xFF868686), - ), - ), - TextSpan( - text: (orderInfo != null && - orderInfo.productList != null) - ? "${orderInfo.productList.length}" - : "0", - style: TextStyle( - fontSize: 12.sp, - fontWeight: FontWeight.bold, - color: Colors.black, - ), - ), - TextSpan( - text: S.of(context).jian, - style: TextStyle( - fontSize: 12.sp, - color: Color(0xFF868686), - ), - ), - ], - ), - ), - SizedBox( - width: 4.w, - ), - Text.rich( - TextSpan( - children: [ - TextSpan( - text: S.of(context).heji, - style: TextStyle( - fontSize: 12.sp, - color: Color(0xFF868686), - ), - ), - TextSpan( - text: totalPrice(orderInfo), - style: TextStyle( - fontSize: 12.sp, - fontWeight: FontWeight.bold, - color: Colors.black, - ), - ), - TextSpan( - text: S.of(context).yuan, - style: TextStyle( - fontSize: 12.sp, - color: Color(0xFF868686), - ), - ), - ], - ), - ), - ], - ), - SizedBox( - height: 8.h, - ), - Row( - children: (orderInfo != null) - ? StatusUtils.statusBtn( - context, - orderInfo.payStatus, - orderInfo.orderStatus, - orderInfo.isTakeOut, - orderInfo.sendStatus, - orderInfo.refundStatus, - orderInfo.dayFlowCode) - : [], - ), - ], + Row( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Text( + "营业时间:", + style: TextStyle( + fontSize: 12.sp, + fontWeight: FontWeight.w400, + color: Color(0xff353535), + ), ), - ), + Expanded( + flex: 1, + child: Text( + "10:00-22:00", + style: TextStyle( + fontSize: 12.sp, + fontWeight: FontWeight.w400, + color: Color(0xff353535), + ), + )), + Text( + "3.9km", + style: TextStyle( + fontSize: 12.sp, + fontWeight: FontWeight.w400, + color: Color(0xff868686), + ), + ), + ], ), ], ), diff --git a/pubspec.lock b/pubspec.lock index 880e797c..b54bb6b1 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,294 +5,294 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "14.0.0" amap_flutter_base: dependency: transitive description: name: amap_flutter_base - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.2" amap_flutter_location: dependency: "direct main" description: name: amap_flutter_location - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.0" amap_flutter_map: dependency: "direct main" description: name: amap_flutter_map - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.2" analyzer: dependency: transitive description: name: analyzer - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.41.2" android_intent_plus: dependency: "direct main" description: name: android_intent_plus - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.2" args: dependency: transitive description: name: args - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.2.0" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.6.1" barcode: dependency: transitive description: name: barcode - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.0" barcode_widget: dependency: "direct main" description: name: barcode_widget - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.1" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.0" bubble_tab_indicator: dependency: "direct main" description: name: bubble_tab_indicator - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.1.6" build: dependency: transitive description: name: build - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.6.2" build_config: dependency: transitive description: name: build_config - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.4.6" build_daemon: dependency: transitive description: name: build_daemon - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.10" build_resolvers: dependency: transitive description: name: build_resolvers - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.5.3" build_runner: dependency: "direct dev" description: name: build_runner - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.11.5" build_runner_core: dependency: transitive description: name: build_runner_core - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "6.1.10" built_collection: dependency: transitive description: name: built_collection - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "4.3.2" built_value: dependency: transitive description: name: built_value - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "7.1.0" cached_network_image: dependency: "direct main" description: name: cached_network_image - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.0" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.0" charcode: dependency: transitive description: name: charcode - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.2.0" checked_yaml: dependency: transitive description: name: checked_yaml - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.4" chewie: dependency: "direct main" description: name: chewie - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.12.2" chewie_audio: dependency: transitive description: name: chewie_audio - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.2" cli_util: dependency: transitive description: name: cli_util - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.3.3" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.0" code_builder: dependency: transitive description: name: code_builder - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "3.7.0" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.15.0" convert: dependency: transitive description: name: convert - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.1" crypto: dependency: transitive description: name: crypto - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.5" css_colors: dependency: transitive description: name: css_colors - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.1" csslib: dependency: transitive description: name: csslib - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.16.2" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.3" dart_style: dependency: transitive description: name: dart_style - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.3.12" dio: dependency: "direct main" description: name: dio - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "3.0.10" event_bus: dependency: "direct main" description: name: event_bus - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.0" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.2.0" ffi: dependency: transitive description: name: ffi - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.2" file: dependency: transitive description: name: file - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "6.1.2" fixnum: dependency: transitive description: name: fixnum - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.10.11" flutter: @@ -304,21 +304,21 @@ packages: dependency: transitive description: name: flutter_cache_manager - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.3" flutter_html: dependency: "direct main" description: name: flutter_html - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.3.0" flutter_layout_grid: dependency: transitive description: name: flutter_layout_grid - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.10.5" flutter_localizations: @@ -330,49 +330,49 @@ packages: dependency: transitive description: name: flutter_page_indicator - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.0.3" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.11" flutter_screenutil: dependency: "direct main" description: name: flutter_screenutil - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "5.0.0+2" flutter_smart_dialog: dependency: "direct main" description: name: flutter_smart_dialog - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.6" flutter_staggered_grid_view: dependency: "direct main" description: name: flutter_staggered_grid_view - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.4.0" flutter_svg: dependency: transitive description: name: flutter_svg - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.20.0-nullsafety.3" flutter_swiper: dependency: "direct main" description: name: flutter_swiper - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.6" flutter_test: @@ -389,406 +389,406 @@ packages: dependency: "direct main" description: name: fluwx - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "3.5.0" glob: dependency: transitive description: name: glob - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.1" graphs: dependency: transitive description: name: graphs - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.2.0" html: dependency: transitive description: name: html - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.14.0+4" http: dependency: transitive description: name: http - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.12.2" http_multi_server: dependency: transitive description: name: http_multi_server - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.2.0" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "3.1.4" image_cropper: dependency: "direct main" description: name: image_cropper - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.4.1" image_picker: dependency: transitive description: name: image_picker - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.6.7+22" image_picker_gallery_camera: dependency: "direct main" description: name: image_picker_gallery_camera - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.1.6" image_picker_platform_interface: dependency: transitive description: name: image_picker_platform_interface - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.6" import_js_library: dependency: transitive description: name: import_js_library - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.2" intl: dependency: "direct main" description: name: intl - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.17.0" io: dependency: transitive description: name: io - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.3.5" js: dependency: transitive description: name: js - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.6.3" json_annotation: dependency: "direct main" description: name: json_annotation - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "3.1.1" json_serializable: dependency: "direct dev" description: name: json_serializable - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "3.5.1" keframe: dependency: "direct main" description: name: keframe - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.2" logger: dependency: "direct main" description: name: logger - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.0" logging: dependency: transitive description: name: logging - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.1" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.12.10" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.3.0" mime: dependency: transitive description: name: mime - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.0" package_config: dependency: transitive description: name: package_config - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.9.3" package_info: dependency: "direct main" description: name: package_info - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.2" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.8.0" path_drawing: dependency: transitive description: name: path_drawing - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.5.1" path_parsing: dependency: transitive description: name: path_parsing - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.2.1" path_provider: dependency: "direct main" description: name: path_provider - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.2.0" path_provider_linux: dependency: transitive description: name: path_provider_linux - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.2" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.0" path_provider_windows: dependency: transitive description: name: path_provider_windows - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.3" pedantic: dependency: transitive description: name: pedantic - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.11.1" permission_handler: dependency: "direct main" description: name: permission_handler - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "5.1.0+2" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.2" petitparser: dependency: transitive description: name: petitparser - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "4.1.0" photo_view: dependency: "direct main" description: name: photo_view - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.11.1" platform: dependency: transitive description: name: platform - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "3.0.0" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.3" pool: dependency: transitive description: name: pool - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.5.0" process: dependency: transitive description: name: process - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "4.2.3" pub_semver: dependency: transitive description: name: pub_semver - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.0" pubspec_parse: dependency: transitive description: name: pubspec_parse - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.1.8" pull_to_refresh: dependency: "direct main" description: name: pull_to_refresh - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.0" qr: dependency: transitive description: name: qr - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.0" quiver: dependency: transitive description: name: quiver - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.5" retrofit: dependency: "direct main" description: name: retrofit - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.3.4+1" retrofit_generator: dependency: "direct dev" description: name: retrofit_generator - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.4.1+3" rxdart: dependency: "direct main" description: name: rxdart - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.26.0" shared_preferences: dependency: "direct main" description: name: shared_preferences - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.6" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.2" shared_preferences_macos: dependency: transitive description: name: shared_preferences_macos - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.2" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.0" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.1" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.2" sharesdk_plugin: dependency: "direct main" description: name: sharesdk_plugin - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.3.0" shelf: dependency: transitive description: name: shelf - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.7.9" shelf_web_socket: dependency: transitive description: name: shelf_web_socket - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.2.4+1" sky_engine: @@ -800,84 +800,84 @@ packages: dependency: transitive description: name: source_gen - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.9.10+3" source_span: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.8.1" sqflite: dependency: transitive description: name: sqflite - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.3.2+4" sqflite_common: dependency: transitive description: name: sqflite_common - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.3+3" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.10.0" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.0" stream_transform: dependency: transitive description: name: stream_transform - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.2.0" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.0" synchronized: dependency: transitive description: name: synchronized - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.2.0+2" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.2.0" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.3.0" timing: dependency: transitive description: name: timing - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.1.1+3" tpns_flutter_plugin: @@ -893,168 +893,168 @@ packages: dependency: transitive description: name: transformer_page_view - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.1.6" tuple: dependency: transitive description: name: tuple - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.3" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.3.0" url_launcher: dependency: "direct main" description: name: url_launcher - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "6.0.5" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.1" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.1" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.1" url_launcher_web: dependency: transitive description: name: url_launcher_web - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.2" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.1" uuid: dependency: transitive description: name: uuid - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.2.2" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.0" video_player: dependency: "direct main" description: name: video_player - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.1" video_player_platform_interface: dependency: transitive description: name: video_player_platform_interface - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.2.0" video_player_web: dependency: transitive description: name: video_player_web - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.1.4+1" wakelock: dependency: transitive description: name: wakelock - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.2.1+1" wakelock_platform_interface: dependency: transitive description: name: wakelock_platform_interface - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.1.0+1" wakelock_web: dependency: transitive description: name: wakelock_web - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.1.0+3" watcher: dependency: transitive description: name: watcher - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.0" web_socket_channel: dependency: transitive description: name: web_socket_channel - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.2.0" webview_flutter: dependency: transitive description: name: webview_flutter - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.7" win32: dependency: transitive description: name: win32 - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.2.5" xdg_directories: dependency: transitive description: name: xdg_directories - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.2.0" xml: dependency: transitive description: name: xml - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "5.1.2" yaml: dependency: transitive description: name: yaml - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "3.1.0" sdks: From 8036db12004776a3dff8b7a8297007f0d05e7959 Mon Sep 17 00:00:00 2001 From: w-R <953969641@qq.com> Date: Fri, 30 Jul 2021 16:08:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/home/huixiang_brand_page.dart | 2 +- lib/home/points_mall_page.dart | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/home/huixiang_brand_page.dart b/lib/home/huixiang_brand_page.dart index d237689e..f729718a 100644 --- a/lib/home/huixiang_brand_page.dart +++ b/lib/home/huixiang_brand_page.dart @@ -586,7 +586,7 @@ class _BrandPage extends State child: BorderText( padding: EdgeInsets.only( top: 10.h, bottom: 10.h, left: 36.w, right: 36.w), - text: "不同意", + text: "拒绝", fontSize: 12.sp, textColor: Color(0xFF32A060), borderColor: Color(0xFF32A060), diff --git a/lib/home/points_mall_page.dart b/lib/home/points_mall_page.dart index 6cf6441e..d06879cc 100644 --- a/lib/home/points_mall_page.dart +++ b/lib/home/points_mall_page.dart @@ -74,7 +74,9 @@ class _PointsMallPage extends State refreshUserInfo() { SharedPreferences.getInstance().then((value) => { client = ApiService(Dio(), - context: context, token: value.getString('token'), showLoading: false), + context: context, + token: value.getString('token'), + showLoading: false), SmartDialog.showLoading(msg: S.current.zhengzaijiazai), creditGoods(categoryId), queryUser(), @@ -134,7 +136,8 @@ class _PointsMallPage extends State PageInfo pageInfo = PageInfo.fromJson(dataCategory.data); gooodsCategorys.clear(); gooodsCategorys.add(GoodsCategory(name: S.of(context).quanbu)); - gooodsCategorys.addAll(pageInfo.records.map((e) => GoodsCategory.fromJson(e)).toList()); + gooodsCategorys.addAll( + pageInfo.records.map((e) => GoodsCategory.fromJson(e)).toList()); } var param = { @@ -222,8 +225,7 @@ class _PointsMallPage extends State Container( alignment: Alignment.centerLeft, child: DefaultTabController( - length: gooodsCategorys == null - ? 0 : gooodsCategorys.length, + length: gooodsCategorys == null ? 0 : gooodsCategorys.length, child: TabBar( isScrollable: true, //可滚动 @@ -499,6 +501,9 @@ class _PointsMallPage extends State fontWeight: FontWeight.bold, color: Color(0xFF353535)), ), + SizedBox( + height: 8.h, + ), Row( children: [ Image.asset( @@ -537,6 +542,9 @@ class _PointsMallPage extends State fontWeight: FontWeight.bold, color: Color(0xFF4C4C4C)), ), + SizedBox( + height: 4.h, + ), Text( (userinfo != null) ? "${userinfo.points}" : "", style: TextStyle(