From fe702371676e18fc5da9350460c83fdbb00e4559 Mon Sep 17 00:00:00 2001 From: w-R <953969641@qq.com> Date: Wed, 23 Feb 2022 11:32:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/image/2x/icon_mine_edit.png | Bin 1152 -> 1463 bytes assets/image/3x/icon_mine_edit.png | Bin 2122 -> 2593 bytes assets/image/icon_mine_edit.png | Bin 576 -> 707 bytes lib/community/headlines/article_page.dart | 5 - lib/community/release_dynamic.dart | 99 ++++++++--- lib/home/home_page.dart | 12 +- lib/main.dart | 3 + lib/mine/mine_page.dart | 3 +- lib/mine/personal_page.dart | 193 ++++++++++++++++++++++ lib/retrofit/min_api.dart | 8 +- lib/retrofit/min_api.g.dart | 2 +- lib/retrofit/retrofit_api.dart | 8 +- lib/retrofit/retrofit_api.g.dart | 2 +- 13 files changed, 286 insertions(+), 49 deletions(-) create mode 100644 lib/mine/personal_page.dart diff --git a/assets/image/2x/icon_mine_edit.png b/assets/image/2x/icon_mine_edit.png index 876eac442dc4b3d1f520e96067336d295c5297ea..21dad93f7996e9ae81601d07167f174699dd67cb 100644 GIT binary patch delta 1433 zcmV;K1!nqy3AYQ7Fn<9`vgxQilTG`MgZP`3*ZRY8e9|u*?&MLa14kOLfmbtd(jj{ zMNwV@!hkmb%cj@>Rls2&TnKTZF&ncWilR6HUju&9QKi0$)SOJxaxZbEAe%eIc@#e^ zQ`fL<*@_ozJJGGZBcAp>=czH#7!+AO%O#O3Zn5&5t zR+KchId#6Rm46N6orf@~yAQT4TgxFCx|u?V9~*MeAc&$Up8%f%A|d-Ut4{sEz4D?a z0hlV;SwF*qes43>v9Fv`q+cP#a#Ou}AO?tKdPQN~g;+La{QOh^rbg4;{F&uG2Axos zTxtqa2gDGL?RrHKi;u4-{$~2W0%3IG&vllv{<6zbaWG*!(^2^NWHP)CjJ&g%m8$`yyPv*peV{04phvT#ML=T;hy-j;n zH@BpKS@Em6UEFx=Ac< zX(2)J;eTX5$ThnWnZU85KQ~s>K-p)EAP0bv8!qhQ+l%|nI&tsVmB=CUuz6IHROzb` z2rP6u_4mE9B4!<3&Gq|t%=&r1=bOxQ50E+sg%G2Jp>5|>>Z>e$V?xaKi2)9-gb)4z zYs;4EB8P9J@kSN^)C2_yT=k?|3->B$c4AVH=A zn^SIIAS5YL)6mD!gXIHf)O5@3mwsW*nVnb&9kSGg5Gss+mjS8|8Rp=GHDu&xY5I(K zeJ+DubeHpi5@a(lH9UPgyRIZOXf*cK!F=pFMXe4g>(B3HW5xkScl9Qu?^{&st67n{ zm4C!rXVm63&iQp!ue7q9xrq^+%e&T~-wEA@66P^k&TWw(r-43!aVyBkzh2KE(A7^Z zH@RcE^RLo(u=8pH)7?f9MRKX&CaVX}p}&KxSqS6g{y$RqEOjgXuXwSff1q04S%o=_ z-@il?q`}Y(ckD+WduM*SnnYgdeWHeh;L@RUlOT*rNw?0jC}llf4z5h;;meU5Y3#n1 zT;szuG-i{vt(7g``7Xq%t^E^07=M-1|GZ3aVnm&=8|O@u)ol6p?9hcxk23qIWq3>o z1!aZx>`lwpY(vumk;!XXl9RjpsMTUBS|FwkP2S8kTf7!XKjeyki6)FhC4 zEnZqFilTYwX@QK|6Gl#n%=5>h4Kj~{vIli^>m7Oq5cyna@EXvmjUBN8D}S-Jw5sE% zsUWwD@))~s5!H&mR<&qc0}L>l7bAHS>)5)TdfXc&yC_$^0@N0p7Oi-`&2u$F3JQ0M z@2Z`(wrF0A3?T9i^F&w0rzxXGuZjj3`Ic$k%d>HJ|BL5@2~6`ouxi0H|C6&8O!Gg& nYga_G|1Du!p8w?^HU9wcy6WX zPxs!zbKf4WwA=aX-shb2J)h@yelO=dib*uB^(-J4$OIMu34egiCD8|T106sUa6~C} z*{Zy^7Hm#H5Uq70@Bxq~LZf3&e(34o#BXOfd!?IS z`+Dgc88p_gMcu$`+ilFBnLyed$vhChfa@bX%ymGCQtF~VAip45>!*NfS)*@cfW1H0 zbKsYw{4v}g?0@Bq{+pwxlYh@cJbiB#wx}EBk!)R|Qfi+s0iPgR>sNu-0M*!ilC3{} z#?_%eEdiJZ#l_5^e91E`Pq<&YwCF0OwwT9xfw&-EAJdv$_CtK!{#8f-=1DIsT*1pJ ztB6p>lAFyi6F^+sv1d$cwW+y^`im`70^t_PN?c6EvVZjgBbHe+ew#cXF2`&WpV--Y zaLO#<%QD6HJ?ZwDMQ#Tk4KQch(zTyeGFD-hE!j#A5*_TSG zmCBX2dq&5ck&hhMXgN>#3e)QBGKQQZ6g9kKz&xLvLuqP0$9qmw(zs*76v;E+T0nr7~*GShV z0&)^aU3a8{c1P!=KmC4|8fwdMJZKEpNH$-diIZ7G>L&z#|F*X`jzb`+p2#9Q6blRr{hR0iJ;%EXfFLsXC z@Yde*ls4{QAb=&@lcYMIcy_n^9iB9ZKqWoLaeV}Cu_iA%h6PdmB{h(HnI3&!lMmcsX@=;_qw zze{AqbrUp0g%A;Q_*zP6c}Yvzl3p+YqQh~4Vprm_;^gKr=7c6E^PnmIjr0O?la?A< z1EWLKb~dx~)WLvxA`qNcikHD!>!3wXiq!4XZsB-OJI8w3jhb>T&8z6SK;*hGWmw06 zV1Ry)0WO#+I~WB6@p~|Gfyf;u{6|F>jNE0ydw6!6^M7%jFu{cPf;A2%{8!F#FyX(1 lj}O7Hf0i)kga7hF%|FC3QlmyNTe<)M002ovPDHLkV1lh8BOm|( diff --git a/assets/image/3x/icon_mine_edit.png b/assets/image/3x/icon_mine_edit.png index f636944cc315458daa3c51c0b8a869cb635aec86..0d95663f540027567af8bdfe714acd048b21d818 100644 GIT binary patch delta 2572 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 delta 2097 zcmV-12+sGR6v_~gFnh8r0~}ElrObop z+uZ6E7*$pK13w4m0DXZlZzo{&Tpe%?*aiGiQIrZ#$8;Nv9!?TUDZm@R!^X>6)D~_x z)>742P07u#$bY~71!YxNxKe$Cnx;A$n$3g;g%BPb#(*Auh>9FQ+_%0%Z0|>iH1#0D z)SUn&zfqb4(B=r|%ndsu^74Qx^r#i8pRg3*Dz3am5| zT*7GcnSZ?;y?hpn51w#^Fi;8L$${}K8$DeML*1l6yajA<1jrefSAgFL5EYdZ6~(-n zx1BFge-Ede5)Sa&Rg zoAttZ_t$!Ni(u`T`I@J6K$1s40e0FJg*IUH@_+jzupJmA)6T0XV(n+|{$GF?pG^R* z8@q(0{vs+gy9CSyj#`&(TQI$VbYO~jMRMfT+|Bnjv>f?eLTvg~Ii1p-zEN90|&?=U-nJvw1 zJh7eKrJuI*j_^=M%4^odnx-gcV* z;f`Ox^a|~%NtPOOJsE`uv`{hyhVXpsM3%%&y$h(K<_42@ud+J_8RPfkS1`J7w150B zu_y|DtAGgy{shbuef93yfAU`bKA*Ifqpu)e{uhbQF@5MbEf;qbAJX2}XfbPmX2*PZ`YH23zcqV(#=h_`g!gF!l6qdwKHPm({uw1|hpJW5WrGl)^d54o%OFG;u0%U3Y zG%eY6^3zne6q%hRpU`M&(%v~I_J3)@f=p~H{us0Vo4v_A)-RT{%m~FsWRnY81;8Fn_|Lny8%g;mcgDz3It#cJJ*LWa6bqXE8HILMzDOcmm|D zle_q+G}j}K7z6g}-kSrnWL2%%B>^M4zNcIz?_93ce_u?1EQ*`LPe-N@V3X{&p(T%WN^=km=8M_$jL$g}8W_U- zQIl8{H`%uT)n=~JKg%f0(s;!gA-W6DUe5Sb&BP0mBd&l*_@)=^C$lJ<+79aK*sEqf z@l0aBVcH5%mbQ*efPcJw>O=l^?yyIs=*mO(c*bi5AhIJhekzONMDW>f^a#6)RFTT% z3A?)jBLCY{0A6de2vaz(k4xIwQ3&Jqc7yL41E;97Q+ED61;xPGhZBcKrpy_%IH80LBffs^0C+$ackogKzk~JL8Sl zTy|%4@5t8PeShtnc?!nuzL^f_zIQY|0pxZ^QwP(fdd))PU1JwO_m1q4cK-bt>-bew zwe#8C z7K8c{*b8dqhh{00KIJq`3CgrIA*8}I%Ai2X6ij}^M z?B$-%uVcH%EcoF30yi^*s4xZA#I8b4LMnEz-sF@@q^AfWx94jG2*+_|yT?&k*55=% zC%-KeDD3soD{(Q)$Z3`8NVf!f!*V1JJMB6CTFLG0x6O33aBEM3kdP(rIBdO zEvKMER1u*)V1EOw?ck%TSg`_yEF5)NCy}yzEr!NNVCrwgEXxEbYTsj~pQfXbk}lg| zy?LNTNQerHz?Ge)h*!p;^W#hG(`UjqWk*S017_xYLSEIDW60H|l~Tx4V{hFy%lHU? z7$;ZZYPJbfN%=qvHfZ#C_u~_4GK(iUivODihU3*qv4VC=1fi}6Agu0-E~#-9}8-*~G~ z7T^MSxc>rZW1HXJNA=d@h>=r^{8=Q+=L-}f9r#gJ0Y1C9ZEfVDs)kOW=~D4AywO#R z^=&>ud($Sjf;@7C0$T?shNp$tEX{N~+!SO1S2(~#Do!jjS&X$WSwqly>al{v9sQjP zCcmY0koA^kdK_-%)YdVTP1AAT&+GVDIc|Pk0}u9H{C}h%-#1)6K1-dX9qSfZ>Dl4N zSX)m@0YZL;W4{0@)*uYLID9!bt;uTBGJ4z2`~+lhg#rx4B05v8i7qE+?MK;b-NKh_ zhK_K6p{O2EnG;=g0^2(Im`>0?66Rg { ), ), ), - child: TextField( - controller: textEditingController, - maxLines: 5, - style: TextStyle( - fontSize: 14.sp, - fontWeight: MyFontWeight.medium, - color: Color(0xFF4C4C4C), - ), - onChanged: (text) { - bool release = text != "" && text != null; - if (release != isRelease) { - isRelease = release; - setState(() {}); - } - }, - decoration: InputDecoration( - contentPadding: EdgeInsets.symmetric( - vertical: 18.h, + child: Column( + children: [ + TextField( + controller: textEditingController, + maxLines: 5, + style: TextStyle( + fontSize: 14.sp, + fontWeight: MyFontWeight.medium, + color: Color(0xFF4C4C4C), + ), + onChanged: (text) { + bool release = text != "" && text != null; + if (release != isRelease) { + isRelease = release; + setState(() {}); + } + }, + decoration: InputDecoration( + contentPadding: EdgeInsets.symmetric( + vertical: 18.h, + ), + errorBorder: InputBorder.none, + focusedBorder: InputBorder.none, + enabledBorder: InputBorder.none, + hintText: "此时此刻的想法~", + hintStyle: TextStyle( + fontSize: 14.sp, + color: Color(0xFFA29E9E), + ), + ), ), - errorBorder: InputBorder.none, - focusedBorder: InputBorder.none, - enabledBorder: InputBorder.none, - hintText: "此时此刻的想法~", - hintStyle: TextStyle( - fontSize: 14.sp, - color: Color(0xFFA29E9E), + Row( + children: [ + Container( + margin: EdgeInsets.only(top: 8, right: 8), + padding: EdgeInsets.only(left:10, right:8), + height: 21.h, + alignment: Alignment.center, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10.5), + color: Color(0xFFF2F2F2), + ), + child: Row( + children: [ + Image.asset( + "assets/image/icon_union_location_black.png", + color: Color(0xFFB3B2B2), + width: 16, + height: 16, + ), + SizedBox(width:2,), + Text( + "你在哪里呢？", + overflow:TextOverflow.ellipsis, + style: TextStyle( + fontSize: 11.sp, + fontWeight: MyFontWeight.medium, + color: Color(0xFFB3B2B2), + ), + ), + ], + ) + ), + Spacer(), + Align(alignment: Alignment.centerRight, + child:Icon( + Icons.close, + color: Colors.black, + size: 16, + ),) + ], ), - ), - ), + ], + ) ); } } diff --git a/lib/home/home_page.dart b/lib/home/home_page.dart index 52e69705..55ba4d15 100644 --- a/lib/home/home_page.dart +++ b/lib/home/home_page.dart @@ -321,12 +321,12 @@ class HomePageState extends State with AutomaticKeepAliveClientMixin { ), child: GestureDetector( onTap: () { - Navigator.of(context).pushNamed('/router/system_msg_page').then((value) { - setState(() { - totalMsg = 0; - }); - }); - // Navigator.of(context).pushNamed('/router/web_turntable_activity'); + // Navigator.of(context).pushNamed('/router/system_msg_page').then((value) { + // setState(() { + // totalMsg = 0; + // }); + // }); + Navigator.of(context).pushNamed('/router/web_turntable_activity'); }, child: Container( height: 24, diff --git a/lib/main.dart b/lib/main.dart index 2775f999..04807350 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -85,6 +85,7 @@ import 'mine/mine_vip/binding_assistant_card.dart'; import 'mine/mine_vip/legal_right_details.dart'; import 'mine/mine_vip/mine_attainment_page.dart'; import 'mine/mine_vip/mine_vip_core.dart'; +import 'mine/personal_page.dart'; import 'order/exchange_write_off_page.dart'; import 'mine/release_page.dart'; import 'mine/roll_center_page.dart'; @@ -346,4 +347,6 @@ Map routers = { SystemDetails(arguments: arguments), '/router/invitation_record': (context, {arguments}) => InvitationRecord(), + '/router/personal_page': (context, {arguments}) => + PersonalPage(), }; diff --git a/lib/mine/mine_page.dart b/lib/mine/mine_page.dart index 8bd6ed96..6a3ff2dd 100644 --- a/lib/mine/mine_page.dart +++ b/lib/mine/mine_page.dart @@ -46,7 +46,8 @@ class _MinePage extends State with AutomaticKeepAliveClientMixin { .pushNamed('/router/login_page', arguments: {"login": "login"}); return; } - await Navigator.of(context).pushNamed('/router/user_info_page'); + // await Navigator.of(context).pushNamed('/router/user_info_page'); + await Navigator.of(context).pushNamed('/router/personal_page'); setState(() {}); } diff --git a/lib/mine/personal_page.dart b/lib/mine/personal_page.dart new file mode 100644 index 00000000..b9f546be --- /dev/null +++ b/lib/mine/personal_page.dart @@ -0,0 +1,193 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:huixiang/retrofit/retrofit_api.dart'; +import 'package:flutter_screenutil/flutter_screenutil.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/my_footer.dart'; +import 'package:pull_to_refresh/pull_to_refresh.dart'; + +class PersonalPage extends StatefulWidget { + @override + State createState() { + return _PersonalPage(); + } +} + +class _PersonalPage extends State + with WidgetsBindingObserver { + ApiService apiService; + final RefreshController refreshController = RefreshController(); + final ScrollController scrollController = ScrollController(); + + @override + void initState() { + super.initState(); + WidgetsBinding.instance.addObserver(this); + _onRefresh(); + } + + _onRefresh() { + + } + + @override + Widget build(BuildContext context) { + return Stack( + children: [ + Positioned( + child: Container( + color: Colors.white, + child: SmartRefresher( + controller: refreshController, + enablePullDown: true, + enablePullUp: true, + header: MyHeader(), + footer: CustomFooter( + builder: (context, mode) { + return MyFooter(mode); + }, + ), + onRefresh: _onRefresh, + onLoading: () { + _onRefresh(); + }, + physics: BouncingScrollPhysics(), + scrollController: scrollController, + child: Container( + child: SingleChildScrollView( + physics: BouncingScrollPhysics(), + child: Container( + color: Color(0xFFF7F7F7), + child:Column( + children: [ + Stack( + alignment: Alignment.bottomLeft, + children: [ + Container( + // height: 286, + child: + Stack( + alignment: Alignment.bottomCenter, + children: [ + Stack( + children: [ + Positioned( + child: Container( + color: Colors.black, + child:Opacity( + opacity:0.9, + child: MImage( + "", + width: double.infinity, + height: 260.h, + fit: BoxFit.cover, + errorSrc: "assets/image/default_1.png", + fadeSrc: "assets/image/default_1.png", + ) + ) + ) + ), + Container( + margin: EdgeInsets.only( + top: 50.h, left: 16.w, right: 16.w), + decoration: BoxDecoration( + color: Colors.transparent, + ), + child: Column( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + crossAxisAlignment: + CrossAxisAlignment.center, + children: [ + GestureDetector( + child: Image.asset( + "assets/image/integral_return.png", + width: 24, + height: 24, + ), + onTap: () { + Navigator.of(context).pop(); + }, + ), + ], + ), + ), + ], + ), + Container( + child: Column( + children: [ + Padding(padding:EdgeInsets.only(right:16.w,bottom:16.h), + child: Row( + children: [ + Spacer(), + Container( + margin: EdgeInsets.only(top: 8, right: 8), + padding: EdgeInsets.only(left: 2, right: 2), + width: 59.w, + height: 21.h, + alignment: Alignment.center, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(2), + color: Color(0x80000000), + ), + child: Text( + "更换背景", + overflow:TextOverflow.ellipsis, + style: TextStyle( + fontSize: 12.sp, + fontWeight: MyFontWeight.regular, + color: Color(0xFFFFFFFF), + ), + ), + ), + ], + )), + + ], + ), + ), + ], + ), + ), + // homeInfo(), + ], + ), + ], + ), + ), + ), + ), + ), + ), + bottom: 0, + top: 0, + left: 0, + right: 0, + ), + ], + ); + } + + Widget homeInfo(){ + return Container( + margin: EdgeInsets.only(left: 16), + child: Row( + children: [ + MImage( + "", + isCircle: true, + width: 66, + height: 66, + fit: BoxFit.cover, + errorSrc: "assets/image/default_user.png", + fadeSrc: "assets/image/default_user.png", + ), + ], + ), + ); + } + +} diff --git a/lib/retrofit/min_api.dart b/lib/retrofit/min_api.dart index d27c7d0b..84461685 100644 --- a/lib/retrofit/min_api.dart +++ b/lib/retrofit/min_api.dart @@ -28,12 +28,12 @@ part 'min_api.g.dart'; // const base_url = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222 // const baseUrl = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222 -// const base_url = "http://192.168.10.236:8765/app/";///费韬 -// const baseUrl = "http://192.168.10.236:8765/app/";///费韬 +const base_url = "http://192.168.10.236:8765/app/";///费韬 +const baseUrl = "http://192.168.10.236:8765/app/";///费韬 -const base_url = "http://192.168.10.88:8765/app/";///詹云久 -const baseUrl = "http://192.168.10.88:8765/app/";///詹云久 +// const base_url = "http://192.168.10.88:8765/app/";///詹云久 +// const baseUrl = "http://192.168.10.88:8765/app/";///詹云久 // const base_url = "http://192.168.10.37:8766/app/"; diff --git a/lib/retrofit/min_api.g.dart b/lib/retrofit/min_api.g.dart index 856ae6e1..1c1cc751 100644 --- a/lib/retrofit/min_api.g.dart +++ b/lib/retrofit/min_api.g.dart @@ -9,7 +9,7 @@ part of 'min_api.dart'; class _MinApiService implements MinApiService { _MinApiService(this._dio, {this.baseUrl}) { ArgumentError.checkNotNull(_dio, '_dio'); - baseUrl ??= 'http://192.168.10.88:8765/app/'; + baseUrl ??= 'http://192.168.10.236:8765/app/'; } final Dio _dio; diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart index 7206d070..55730ee0 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -62,15 +62,15 @@ part 'retrofit_api.g.dart'; // const base_url = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222 // const baseUrl = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222 -// 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.236:8766/app/"; ///费韬 +const baseUrl = "http://192.168.10.236:8766/app/"; ///费韬 // const base_url = "http://192.168.10.37:8766/app/"; // const baseUrl = "http://192.168.10.37:8766/app/"; -const base_url = "http://192.168.10.88:8766/app/";///詹云久 -const baseUrl = "http://192.168.10.88:8766/app/";///詹云久 +// const base_url = "http://192.168.10.88:8766/app/";///詹云久 +// const baseUrl = "http://192.168.10.88:8766/app/";///詹云久 @RestApi(baseUrl: baseUrl) abstract class ApiService { diff --git a/lib/retrofit/retrofit_api.g.dart b/lib/retrofit/retrofit_api.g.dart index aac9c038..ad727613 100644 --- a/lib/retrofit/retrofit_api.g.dart +++ b/lib/retrofit/retrofit_api.g.dart @@ -9,7 +9,7 @@ part of 'retrofit_api.dart'; class _ApiService implements ApiService { _ApiService(this._dio, {this.baseUrl}) { ArgumentError.checkNotNull(_dio, '_dio'); - baseUrl ??= 'http://192.168.10.88:8766/app/'; + baseUrl ??= 'http://192.168.10.236:8766/app/'; } final Dio _dio;