From a542c979a8209d4dfa38b5594f9b2f4315067414 Mon Sep 17 00:00:00 2001 From: CYH <13923927013@163.com> Date: Mon, 9 Oct 2023 15:30:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=88=E5=AD=90=E7=BB=86=E8=8A=82=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E7=BC=96=E8=BE=91=E8=B5=84=E6=96=99=EF=BC=8C?= =?UTF-8?q?=E5=8F=91=E7=8E=B0=E9=A1=B5=E9=9D=A2=E4=B8=8D=E6=84=9F=E5=85=B4?= =?UTF-8?q?=E8=B6=A3=EF=BC=8C=E9=82=80=E8=AF=B7=E5=BE=97=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E5=AD=97=E4=BD=93=EF=BC=8C=E9=99=84=E8=BF=91=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E5=BC=80=E9=80=9A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- circle_app/assets/images/circle/chat_icon.png | Bin 9546 -> 7108 bytes circle_app/assets/images/circle/like_icon.png | Bin 6742 -> 6142 bytes .../assets/images/circle/no_look_icon.png | Bin 6311 -> 4668 bytes .../assets/images/circle/no_look_icon_h.png | Bin 0 -> 7180 bytes .../assets/images/circle/nor_like_icon.png | Bin 2697 -> 2627 bytes .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- circle_app/lib/app/circle/logic.dart | 47 +++-- circle_app/lib/app/circle/view.dart | 15 +- .../lib/app/circle/widgets/discover.dart | 180 ++++++++++++++++-- .../lib/app/circle/widgets/vicinity.dart | 70 +++---- circle_app/lib/app/home/view.dart | 15 +- circle_app/lib/app/invite/view.dart | 17 +- .../lib/app/login/complete_material/view.dart | 35 +++- circle_app/lib/app/minefragment/view.dart | 2 +- circle_app/lib/common/Widgets/add_wx_tip.dart | 6 +- .../lib/common/Widgets/unlock_wx_tip.dart | 30 ++- circle_app/lib/common/colors/app_color.dart | 2 +- circle_app/lib/util/paymentUtil.dart | 1 + 18 files changed, 312 insertions(+), 110 deletions(-) create mode 100644 circle_app/assets/images/circle/no_look_icon_h.png diff --git a/circle_app/assets/images/circle/chat_icon.png b/circle_app/assets/images/circle/chat_icon.png index f7498a9c205f28b128a915575aa7c09fc2975371..ed83062131f624632ae3d40bc96b9f790b7b279d 100644 GIT binary patch literal 7108 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 diff --git a/circle_app/assets/images/circle/like_icon.png b/circle_app/assets/images/circle/like_icon.png index e8b1c9a93bb8a1d000d3b6553473233eb466b686..f91c91ffcb731a9c3c379d5f6a21f722234a0fff 100644 GIT binary patch literal 6142 zcmVPy1xJg7oRCr$PTnmt#Rh2&X{@p$A00J{T5mXS2AQbMxLKO>HR#*_(MMO{*&8Ch?%TCdXVVWUfTCx!H>;gOLyVXwW$wi|>0srK}gRc~5P4piC1-x;M300oCZ zM`sU|ilDL-%<#xdV4$kNJOcG>ZPKBi-#Rw7Wk$vq3z!|C4X6cwSbt^)$#F)T6QQfS z4~zk**8$QLAj`lg`v(+g4WJa5qyVa;1ZK;YF_pmsTEma(s(9b%9=on<74W|Gn|Cv{ z(T@X|Q;dcqps%kJCTaj_-Hq-3+LuxWlvbb>K#~A-b^^Tl<|dVy2LY1Xx4x0x0|%9d zTOGgI^)n9iPA_cugwg6t2GpKPtD*zg{dIUcfZfk-m4@b|>;-Nv_8paIfXvh(Gp{Rv zYu?^(J5uui4w z@;CSH|G{*}pX|CB1A6xtHe}0kj@V^6X)&}&H~WA$ zf`B4yMah1O(#8_aYV9Nt3>1qBCTg2iW7PRNFn95_MG%$Ui{WgGV&{93DEZx_&mPYr!cmGlpdb#OV!M4=>I zv@2n;_F{xU;5Al&+#{^LiPu1S?=--wcyBM5EyI=d9~fA%@R_0Is;{SFhKK1c=K;b7 zDl}g#$vhvrCX#OVS!`G6NxA9h1WYYEdBcGNceDa_+d%L6n+;2#SX=`(M6xD=fD9%< zU}i_j&|W(=M#YqNlMpxVL#wWNd+vVMZYZ~f%9x)Ut&UPQf*~uMUkq(7NjMv7GHGbu z$omOFaOf!tiiC+{vu0PJ6HsZkvu z7%;CvrvK*U5B5JX9k5#ldcY}*nl{l|T=b3ucTaU8y^P&m_!MjSD-dPdG09l8Iv5krnrtO=>t z@0l2{pStewJx8YkyJesk{i?dubd+u|6BAYfSeH413*!lCa^Oc2LJAQ9q4f+<2kc6?|kNoAa7%V-zP03|>K zir6#<92yqyh{<%==z^mi+Fd{r5fu)2!+$~( zMX-J5_|}Jk-qDdSU`K_k3GmPZy|DUmokWB%QW|xsWu#hU;f3oA&Vq~~M^kaKi<@`x z6N}4V*)E`uf8KO#dZqeZrIM2!d4Q7-p)QAaS%yxJI3x7wVxa^Of9^uAuwZ;1`}`n1 zxJ8~fp*%x`ivAfWx^{w|KglheB1PIU8{IgfE7guOMmdj z=+-lT|B-#io67uD-qL=4@XyxoR!G%zN~?GH>?v<+<%44NjP2f31Cp6BE}PHA!cLB5 zIOhW~)SG;E7eqXc>l^(<^m)iuISZ4lAJHI^R&Y0Dua}DO{)Z+pAJZ}&NBq~&F{-2c zfoyab88LQ7d2l%diMS2A$cKC6aL}Im75Gfi&4>g&N`lFtaJ(zVmW*IS2G8K5rN%fP z9e9*;^RGE~hogkKhuna<6xy_;yBE^2Er&jG%;2xumgplN*t9GumR6->aa=A;Z(}k^J-YDCQ|8|82>>Ry4aB-hT+dQvOJVi&g`b{Ses9}AAA9G9VNgjo=gQX3 zQPqvpVTwZpr@-M?u(N0j+~(kiwwglRo418dkdT}Zs^YUp&%}krFh?(VWRkzh84Joy zrXac8RICZ3=tM^K`3*s8G28mUN6UR}1AXFuj+)xYX3pFYB?_e)qkzDF5Ep_JsGBv~ z#n=PWJ2HeK*omy7LM{Pm!#AQ_8%zPO(1l(Zllqw4$Plgx66oaV#bq@AJj!mZkVJ89 zob?uZc7h)t*VR0wX|8ASyC>Z0mR_xy_fXa+bB%B(G_5cjda8{lN zVRdzU67mO_D3Zr!aS+mnrb3VntSyWJa)Q{bV4oW}=cp9IDJJpGzK4W~f6^Vy9!0s0 z%>p|JNy)Oer7%%4QB;$2Y)WA6M3lbrFI^3Ns-_lZkvu43QgTTeI}%||;UU+ufK%cRu zdU~O&_dB)Gtr*m^r860pfIKF_3rFvX&xOq;ZxgaYwt-aCv;2Ygk!WDq%r*)4a%^10 zfwLdwQX88!nH`F1yx$*=KALbStTt@t% z3A6$n!m)5Pi-qVJj_SpJ5Z6bRrP`56W5+bn< zYRlnK;0S!Q;=?wQQ(prRB_!Hb$=K!7aPDUEM3(i-n)*37bi|TuLuS{&;^q4D7_mrv zb0!Z{8mlu;L9t`;&1dcMM%zGJgRpe<&`PEBGP~s*B4vu~oiKRRq(W8i03PRhvJe{) z{URE1^Y-kT=$vcLR|FoyGit;NI*ASBQ7}I&2_hZ}AClF}c6~F;iNf+ds9Bvm?!$ z%~IaW`LRh#g*_)Sh_nOE28Z-$Mm%%p9X9#d5YJ0SDs;qBxT@8dQgHg$&!4<|Y1%;B zb)J7+_4lBlDQQB+6sb#!41}&uGLFlVO@{He+cN?(5=e#X;qAY=T~1;eqS?_k+(kEy2gKY!L>u@6^os#YZIf5A&*;y zry`L`rIHrEFRTG(8zfpj0Q%H z=+%ohka~?8*)vvqu4z$gI~oDsU53p(%n+gx7yZ#B9X^%yy(84X5)oob7a&X1N3OkW z;4i0=)Rs(#eb}Wd*Bw+ydY(*c!ez_*bSiJW6hakd_i5G4z`B-*H`nFhP*Y*AN+ zGwg<0i}INi$JE@tgsCHz$2rPDBN&+`d-Me|b6fY=z^5t|H8JBr+Xr5L)vNm@Y5h?H zuwa`5_;j3_AL(KrmNsw+;c3AxqhibcJOs3$8uBWRjr4K98;4YK5i-%s z5%m#M*K}DFzF}`kD8Noe_*)Z$oP`hN&_IW?Hz+4!$LLu}QUa6KF8jh21FNP)I44}w zy*|3G^7-ncN|z2x(}}o3jLs(_%^T?*R!6$bS!z!jaoiW38gL*?+8iSyYngpIV-z*& zg!X}0da<9b8o6|LHCIa9$azPdYS`;)AinAbu;Rb&dm!=FdHYl zRF3VRtCgkXU(2*Qv{D&(Va|ZI1O59IL!SX-u5xJ#Hg4hJH33KRjsU$97%gPQiVvtvJNu8bgU<#%p|^2pu7! zMs{wsbeSeKGKdxOecTDl3WR3^(9Ln}#%&6s?tUy3J7A(depjvZ+fyo)zivEZHwBI} z0<>N2)t3*wtdeBU%qB89A|kKSPC3!ulCYDR2z7Q;WnxrW&fIpO5Q=~S&4S*5I?~p>`wjxwz>xikqLdiHS*{9_j2qXfo1hDtVnDpaE7bd-a_rNuLIQota8y zFav0D%_AmC;ia zi&hRkI~AaleLiDA+X1dwHgt?qaGwE_P}1kZBMY=WX7AOXVid~F&|wmC^aGu)Xs~Up z%(AHJwVW6>8S!}K3R)#KiF`vaMc%jgjkM)xtv__h%Kl%p3-XNFXgPr|U;N6_o{pVw z7#-gd9Ds-z*z0(6+UO^Ujv{8;t3M^q(P>x-Ur1@#wT5t>EAgSY8hmGz8hK}HpV8UT zr-sMhIQx=o-#O)Bps6-tMkSgDTYb^casX9{2vGh~1LA9ZxRtk`lg!w61vp$d+Y`Y= zw3(q?Z}Hfd+RV(BpA%JA_gi>X5Fu@VdduR3J|0^H~Af4!ruGH&nFJ%jwiL z9nhlYa`I@Lc2T1h@jDdqy5C$4$H&p+MCmYp9A6U&6rHV+cAV=aZlB1dDnQDL$!2#w zZG2|Tiu1oVGa%23>5#j7^+-pNcA&O<`0m!ua1_e)#Y$GJ) zKv@V6N4UN`s-#B zXpB-pnVZiZx;|0*Uu=vWQfdtPSmnv?qIJk+i87^^Sz}O1pRRMN7Xjhh(Fi-zlt2x* zGe#P+%zX9JHw|3idk0&FbMhNz8R#(ZtxGoC*iq>D$BFuA;6LJQIR}nxYVrvRE4`=i z85H6=n&i4Ph_@f!;rTjHN1;oNrz1C=xn^+b3}Tz#?Ady>d@f4%_m*s^D3dIAEeq%n zg(>0F#=arRXDGQulR@Uw4$cmfrZ_F4?>+EYC&uvDxsxZqkQYs_`TJWIUOF3+%qYy6 zMDu{RpEl)<0LDKDJ*mjK6 zq$@sotBWpX)F$V}cg}&f6IgrNhDvv7!Sd1C7RmE?N>os!E`fH4pbGFI0Pe@}-)uui zn8JCw(EUZ{hFqT@cJdl!x{AGOxVCx4so$Tu5N=zx;Vl8$PUw!)s!O#|-?HkOQ8i8+ z)d>W%sFEUQ;X8z*@8RHxCZn$p!fhcPz*b#sV|4%7{mL#o>9&Q}%!T0$PJ6CK%Z+o_ zsnrt`FgF7vyHJOF#6^2DzR4lZZBN+(8;<7rqgMD`L2qc2o_)gFg>8M?SG!QXWfIL3 zzW3Bki=dW1ZMjGW8~r5HOdRh~2p32SL9dw2iy z?Si#E_w5is+XdWx!ppmK>W*8wlAaUB>LXZq!qYNTc?n00v0pD7vggxv%(n8`Wc!4! zLN|=0!}lhpe$LT%@A=C1fVDmM?l3^xMLc$}DQ+oOzu8mRX~}SHGrFzDU@cT|m}|{P zX5{+13wPw679r)aIfSB!Tc1WP@qJMd8b*VCNRZ*9Atz{FwQj)Kf`%)LR zF_u&jYNj@#6kK@t{pFix8^Gy4e}@IyF5r=)HtwT!dbd`|B4+=D*y4{Y-v*3UiONj+ zyPB$h^vIv?@xRjrVJ@!Qp@FslJaN>YcAhX3KT0$li6@3Bxf2aDNcXu^d%teat0*(;e$=1aw%^V}}pDw+mEX zVZ6R>(c=qWo$g}a%In^iK);oMwLA7a(Cs4E;(hZ#w+L9fm(K&;E^;m2HxG1+fVF%1 zJkaeT*W!KiK(`23yO+-c-7a!1-Zu|)i-5Iz`8?3=BG=-5^FX%OV literal 6742 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 diff --git a/circle_app/assets/images/circle/no_look_icon.png b/circle_app/assets/images/circle/no_look_icon.png index e5fff0d77cbdf77cfe78a089703fbb9d71c2bbc6..8b48b4cb1fcb270efb4acbfb059db3b981d1f450 100644 GIT binary patch delta 4663 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 E0MHLojQ{`u diff --git a/circle_app/assets/images/circle/no_look_icon_h.png b/circle_app/assets/images/circle/no_look_icon_h.png new file mode 100644 index 0000000000000000000000000000000000000000..9af64c59707c2d81fb71633a8387c781fefbc157 GIT binary patch literal 7180 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¯+hs5=HUZOvcf>2&(; zd_Mo%-hbX+PxkkD2D&tQP1E);#^3;|X63RAjIjq5MLAG)MqF&*IcU&b)3m)D$Nh5p zd8ICn>myy2&LK4n<6c>opK7G6a(y=iG$@ixCi~!^)kYr<2(m005Mthu1Ohv{y1F2F-?Xdgpe@)7bzO&VkQ?1fvs!zz|D@~sH)63^)sn47&p=Cno)VFq zV2ssusOuD;e_B=5E!(zjbN?9N8fK-XKwA+Boa3|~W4yrWO43^C<=`ABO6emt@MzdA zEq@0ZMw&{czRDOo1*gM1feoomLdd2_B=T~@h}GC}OM-^6T)1#S2?m2NLPb7mTEnP7jFW=G8@i0`emViT40d1!VjE;_eSJSjZt@6^FY4T^3|ptG~{T`w)OR#~$KbgctymHT|q9?gUg+6V0s0guG^7VU%fh=508 ie2ex$dqlt^G5-Y{hccHhEG7~F0000 ().listen((event) { myVip = event.vip; - // update(); + update(); }); } @@ -281,23 +281,36 @@ class CircleLogic extends GetxController { }); var bean = BaseResponse.fromJson( data, (data) => VicinityBean.fromJson(data)); - try { - offset = bean.data.offset; - deep = bean.data.deep; - } catch (Exception) {} - if (vicinityPage == 1) { - cityName = bean.data.city; - vicinityList.clear(); - } - try{ - vicinityList.addAll(bean.data.users); - } on Exception{} + if (bean.code == 200) { + try { + offset = bean.data.offset; + deep = bean.data.deep; + } catch (Exception) {} - if (vicinityPage == 1) { - refreshController.refreshCompleted(); - } else { + if (vicinityPage == 1) { + cityName = bean.data.city; + + vicinityList.clear(); + } + + + if (vicinityPage == 1) { + refreshController.refreshCompleted(); + } else { + refreshController.loadComplete(); + } + + try{ + + vicinityList.addAll(bean.data.users); + vicinityPage = vicinityPage + 1; + } on Exception{} + + } else if (bean.code == 21201) { + myVip = 0; refreshController.loadComplete(); + update(); } update(); diff --git a/circle_app/lib/app/circle/view.dart b/circle_app/lib/app/circle/view.dart index 290a20e..c4e7263 100644 --- a/circle_app/lib/app/circle/view.dart +++ b/circle_app/lib/app/circle/view.dart @@ -678,23 +678,20 @@ class _CirclePageState extends State indicator: UnderlineTabIndicator( borderSide: BorderSide( color: const Color(0xFF00FFF4), - width: 1.5.sp, ), - insets: EdgeInsets.symmetric(horizontal: 6.0.sp), - borderRadius: BorderRadius.circular(18.0), ), indicatorColor: const Color(0xFF00FFF4), - indicatorWeight: 1.sp, + indicatorWeight: 2.sp, labelColor: const Color(0xFF00FFF4), unselectedLabelColor: const Color(0xB3FFFFFF), indicatorSize: TabBarIndicatorSize.label, - indicatorPadding: EdgeInsets.only(left: 6.sp, right: 6.sp), + indicatorPadding: EdgeInsets.only(left: 12.sp, right: 12.sp), tabs: [ Tab( child: Text( '圈子', style: TextStyle( - fontSize: 18.sp, + fontSize: 20.sp, ), ), ), @@ -702,7 +699,7 @@ class _CirclePageState extends State child: Text( '附近', style: TextStyle( - fontSize: 18.sp, + fontSize: 20.sp, ), ), ), @@ -710,7 +707,7 @@ class _CirclePageState extends State child: Text( '发现', style: TextStyle( - fontSize: 18.sp, + fontSize: 20.sp, ), ), ), @@ -758,7 +755,7 @@ class _CirclePageState extends State ), Positioned( right: 0, - child: logic.isShowCircle + child: _tabController.index == 0 ? GestureDetector( onTap: () { Get.toNamed(AppRoutes.MyCircle, arguments: ''); diff --git a/circle_app/lib/app/circle/widgets/discover.dart b/circle_app/lib/app/circle/widgets/discover.dart index 235a826..7fe21a1 100644 --- a/circle_app/lib/app/circle/widgets/discover.dart +++ b/circle_app/lib/app/circle/widgets/discover.dart @@ -1,5 +1,6 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:circle_app/app/circle/view.dart'; +import 'package:circle_app/common/Widgets/base_tip_widget.dart'; import 'package:circle_app/common/Widgets/genderview.dart'; import 'package:circle_app/common/colors/app_color.dart'; import 'package:circle_app/common/const.dart'; @@ -547,7 +548,7 @@ class _DiscoverState extends State ), ), SizedBox( - height: 8.sp, + height: 15.sp, ), GestureDetector( onTap: () { @@ -567,9 +568,13 @@ class _DiscoverState extends State width: 40.sp, ), ), + SizedBox( + height: 8.sp, + ), GestureDetector( onTap: () { - sendNoLookData(user.userId!,index); + _showReportDialog(context,user.userId!.toString(),index); + }, child: Image.asset( getCircleImage( @@ -678,27 +683,174 @@ class _DiscoverState extends State } loadWxNumData() async { - // var data = await DioManager.instance.post(url: Api.myMainPage); - // - // if (data['code'] == 10000) { - // if (data['userBase']['wxNum'] == null) { - // showAddWxPicker(false); - // } else if (data['userBase']['wxNum'].toString().isEmpty) { - // showAddWxPicker(false); - // } - // - // } + var data = await DioManager.instance.get(url: Api.getUserInfo); + + if (data['code'] == 200) { + if (data['data']['user']['wxNum'] == null) { + showAddWxPicker(false); + } else if (data['data']['user']['wxNum'].toString().isEmpty) { + showAddWxPicker(false); + } + + } } - void sendNoLookData(int userId,int index) async { - var data = await DioManager.instance.post(url: Api.uninterested + userId.toString()); + void sendNoLookData(String userId,int index) async { + var data = await DioManager.instance.post(url: Api.uninterested + userId); if (data['code'] == 200) { + showOKToast('操作成功'); list.removeAt(index); setState(() { }); } } + + void _showReportDialog(BuildContext context,String userId,int currentIndex) { + showDialog( + context: context, + builder: (BuildContext context) { + return Dialog( + backgroundColor: Colors.transparent, + child: Container( + height: 277.sp, + padding: const EdgeInsets.all(1.0), + child: Stack( + children: [ + Container( + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(10.0), + gradient: const LinearGradient( + colors: [Color(0xFFDD3DF4), Color(0xFF30FFD9)], + begin: Alignment.topCenter, + end: Alignment.bottomCenter, + ), + ), + ), + Container( + margin: EdgeInsets.all(1.sp), + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(10.0), + gradient: const LinearGradient( + colors: [Color(0xFF4C3E5F), Color(0xFF324140)], + begin: Alignment.topCenter, + end: Alignment.bottomCenter, + ), + ), + ), + Container( + margin: EdgeInsets.only(top: 24.sp), + child: Column( + children: [ + Center( + child: Text( + "温馨提示", + style: + TextStyle(color: Colors.white, fontSize: 16.sp), + ), + ), + Container( + margin: EdgeInsets.only(top: 14.sp), + alignment: Alignment.center, + child: Image( + image: AssetImage(getCircleImage("no_look_icon_h")), + width: 70.sp, + height: 70.sp, + ), + ), + Container( + margin: EdgeInsets.only( + top: 12.sp, left: 14.sp, right: 14.sp), + alignment: Alignment.center, + child: Text( + "您确认对TA不感兴趣吗？确认之后在这个板块就看不见TA了。", + textAlign: TextAlign.center, + style: TextStyle( + color: const Color(0xCCF7FAFA), fontSize: 16.sp), + ), + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + GestureDetector( + onTap: () { + Navigator.pop(context); + }, + child: Container( + margin: EdgeInsets.only(top: 24.sp), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(17), + gradient: const LinearGradient( + colors: [ + Color(0x26FFFFFF), + Color(0x26FFFFFF), + ], + begin: Alignment.centerLeft, + end: Alignment.centerRight, + ), + ), + padding: EdgeInsets.only( + top: 10.sp, + bottom: 10.sp, + left: 27.sp, + right: 27.sp), + child: const Text( + "再考虑考虑", + style: TextStyle( + color: Colors.white, + fontSize: 12, + ), + ), + ), + ), + SizedBox(width: 24.sp), + GestureDetector( + onTap: () { + Get.back(); + sendNoLookData(userId,currentIndex); + }, + child: Container( + margin: EdgeInsets.only(top: 24.sp), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(17), + gradient: const LinearGradient( + colors: [ + Color(0xFF06F9FA), + Color(0xFFDC5BFD), + ], + begin: Alignment.centerLeft, + end: Alignment.centerRight, + ), + ), + padding: EdgeInsets.only( + top: 10.sp, + bottom: 10.sp, + left: 52.sp, + right: 52.sp), + child: const Text( + "确定", + style: TextStyle( + color: Colors.white, + fontSize: 12, + ), + ), + ), + ) + ], + ) + ], + ), + ) + ], + ), + ), + ); + }, + ); + } } diff --git a/circle_app/lib/app/circle/widgets/vicinity.dart b/circle_app/lib/app/circle/widgets/vicinity.dart index 11cfcfe..f5af8c4 100644 --- a/circle_app/lib/app/circle/widgets/vicinity.dart +++ b/circle_app/lib/app/circle/widgets/vicinity.dart @@ -46,29 +46,32 @@ class _VicinityState extends State with AutomaticKeepAliveClientMixin @override Widget build(BuildContext context) { // TODO: add widget build method - return widget.logic.vicinityList.isNotEmpty ? SmartRefresher( - controller: widget.logic.refreshController, - onRefresh: _onRefresh, - onLoading: _onLoading, - enablePullUp: widget.logic.myVip > 0, - child: ListView.builder( - controller: _scrollController, - padding: EdgeInsets.all(10.sp), - itemCount: widget.logic.myVip == 0 - ? widget.logic.vicinityList.length + 2 - : widget.logic.vicinityList.length + 1, - itemBuilder: (context, index) { - if (index == 0) { - return bannerView(widget.logic); - } else { - if (widget.logic.myVip == 0 && index == widget.logic.vicinityList.length + 1) { - return showVipView(); - } else { - return ListItem(widget.logic.vicinityList[index - 1], index - 1); - } - } - }, - ), + return widget.logic.vicinityList.isNotEmpty ? Stack( + fit: StackFit.expand, + children: [ + SmartRefresher( + controller: widget.logic.refreshController, + onRefresh: _onRefresh, + onLoading: _onLoading, + enablePullUp: true, + child: ListView.builder( + controller: _scrollController, + padding: EdgeInsets.all(10.sp), + itemCount: widget.logic.vicinityList.length + 1, + itemBuilder: (context, index) { + if (index == 0) { + return bannerView(widget.logic); + } else { + return ListItem(widget.logic.vicinityList[index - 1], index - 1); + } + }, + ), + ), + if (widget.logic.myVip == 0) + Positioned( + bottom: 0, + child: showVipView()) + ], ) : loaddingWidget(true); } @@ -143,7 +146,8 @@ class _VicinityState extends State with AutomaticKeepAliveClientMixin Widget showVipView() { return Container( - margin: EdgeInsets.only(top: 10.sp), + width: Get.width, + // margin: EdgeInsets.only(top: 10.sp), color: const Color(0xB30B011B), padding: EdgeInsets.symmetric(vertical: 14.sp, horizontal: 20.sp), child: Column( @@ -158,7 +162,7 @@ class _VicinityState extends State with AutomaticKeepAliveClientMixin padding: EdgeInsets.only(top: 18.sp), child: Text( "开通VIP后，才能查看更多附近的圈友，也可以根据您的喜好、属性、角色、取向等筛选出想要认识的人，还可以获得其他十几种会员特权，拥有更多不一样的体验", - style: TextStyle(color: Colors.white, fontSize: 12.sp), + style: TextStyle(color: Colors.white, fontSize: 14.sp), ), ), GestureDetector( @@ -312,7 +316,7 @@ class _VicinityState extends State with AutomaticKeepAliveClientMixin ), ), Container( - height: 50.sp, // 设置固定高度 + height: 38.sp, // 设置固定高度 width: Get.width, margin: EdgeInsets.symmetric(horizontal: 8.0), child: Align( @@ -326,7 +330,7 @@ class _VicinityState extends State with AutomaticKeepAliveClientMixin ), ), Container( - margin: EdgeInsets.only(left: 8.sp, right: 3.sp), + margin: EdgeInsets.only(left: 8.sp, right: 3.sp,bottom: 5.sp), child: _buildInterestsListView(item.interests)) ]), ], @@ -414,7 +418,7 @@ class _VicinityState extends State with AutomaticKeepAliveClientMixin color: const Color(0xFF392D53), ), child: Container( - margin: EdgeInsets.all(0.2.sp), + margin: EdgeInsets.all(1.sp), decoration: BoxDecoration( borderRadius: BorderRadius.circular(17.0), color: const Color(0xFF392D53), @@ -453,14 +457,14 @@ class _VicinityState extends State with AutomaticKeepAliveClientMixin } void _onLoading() async { - if (widget.logic.myVip > 0) { - widget.logic.vicinityPage = widget.logic.vicinityPage + 1; + // if (widget.logic.myVip > 0) { + // widget.logic.vicinityPage = widget.logic.vicinityPage + 1; // logic.offset = 0; // widget.logic.getNearByList(); - } else { - widget.logic.refreshController.loadComplete(); - } + // } else { + // widget.logic.refreshController.loadComplete(); + // } } @override diff --git a/circle_app/lib/app/home/view.dart b/circle_app/lib/app/home/view.dart index a7c6284..0b63f75 100644 --- a/circle_app/lib/app/home/view.dart +++ b/circle_app/lib/app/home/view.dart @@ -35,7 +35,7 @@ class _HomePageState extends State height: 49.sp + MediaQuery.of(context).padding.bottom, width: Get.width, // color: Colors.red, - padding: EdgeInsets.only(left: 50.sp, right: 50.sp), + padding: EdgeInsets.only(left: 40.sp, right: 40.sp), decoration: BoxDecoration( color: const Color(0xFF423055), image: DecorationImage( @@ -44,7 +44,7 @@ class _HomePageState extends State getTabbarImage('tabbar_bg'), ))), child: Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, + mainAxisAlignment: MainAxisAlignment.spaceAround, crossAxisAlignment: CrossAxisAlignment.start, children: [ funcItem(0, 'msg', 0 == controller.currentIndex, controller), @@ -78,7 +78,7 @@ class _HomePageState extends State funcItem(int index, String image, bool isSelected, HomeLogic controller) { return SizedBox( width: 80.sp, - height: 36.sp, + height: 50.sp, child: GestureDetector( behavior: HitTestBehavior.opaque, onTap: () { @@ -98,8 +98,9 @@ class _HomePageState extends State isSelected ? getTabbarImage('${image}_selected') : getTabbarImage('${image}_normal'), - width: 34.sp, - height: 34.sp, + width: 38.sp, + height: 38.sp, + fit: BoxFit.fill, excludeFromSemantics: true, gaplessPlayback: true, ))), @@ -108,7 +109,7 @@ class _HomePageState extends State visible: index == 0 && controller.unreadSIze != "0", child: Positioned( // right: 4.sp, - top: 4.sp, + top: 6.sp, child: Container( margin: EdgeInsets.only( left: int.parse(controller.unreadSIze.value) > 99 @@ -119,7 +120,7 @@ class _HomePageState extends State alignment: Alignment.center, decoration: BoxDecoration( color: Colors.red, - borderRadius: BorderRadius.circular(11.sp)), + borderRadius: BorderRadius.circular(10.sp)), child: Text( int.parse(controller.unreadSIze.value) > 99 ? '99+' diff --git a/circle_app/lib/app/invite/view.dart b/circle_app/lib/app/invite/view.dart index cf29d7f..a1e3027 100644 --- a/circle_app/lib/app/invite/view.dart +++ b/circle_app/lib/app/invite/view.dart @@ -37,7 +37,10 @@ class InvitePage extends StatelessWidget { alignment: Alignment.center, height: 22.sp, width: 62.sp, + child: Image.asset(getMineImage('invite_right_icon'), + width: 62.sp, + fit: BoxFit.fill, ), ), onPressed: (){ @@ -66,30 +69,30 @@ class InvitePage extends StatelessWidget { allSpan.addAll(getTextSpanList( 'Tip：您已成功邀请', Color(0xFF0DF5F7), - 12.sp, + 13.sp, searchContent: 'Tip：')); allSpan.addAll(getTextSpanList( ' ${logic.homeData!.inviteCount! ?? 0} 位圈友，', Color(0xFFDC5BFD), - 12.sp, + 13.sp, searchContent: '${logic.homeData!.inviteCount! ?? 0}')); allSpan.addAll(getTextSpanList( '免费获得会员 ${logic.homeData!.achieveRewardDay! ?? '0'} 天，', Color(0xFFDC5BFD), - 12.sp, + 13.sp, searchContent: '${logic.homeData!.achieveRewardDay! ?? '0'} ')); int maxCount = logic.homeData!.inviteAwardConf!.last.inviteCount ?? 0; if (logic.homeData!.inviteCount! >= maxCount) { allSpan.addAll(getTextSpanList( ' 再邀请可领取更多奖励~', Color(0xFFDC5BFD), - 12.sp, + 13.sp, searchContent: '')); } else { allSpan.addAll(getTextSpanList( ' 再邀请 ${logic.homeData!.diffAwardCount} 位圈友可领取更多奖励~', Color(0xFFDC5BFD), - 12.sp, + 13.sp, searchContent: '${logic.homeData!.diffAwardCount}')); } @@ -361,7 +364,7 @@ class InvitePage extends StatelessWidget { Expanded(child: Container()), Container( margin: EdgeInsets.only( - left: 15.sp, right: 15.sp,bottom: 15.sp), + left: 15.sp, right: 15.sp,bottom: 10.sp), child: RichText( text: TextSpan( children: allSpan @@ -439,7 +442,7 @@ class InvitePage extends StatelessWidget { timeWidget(String time) { return Text( time, - style: TextStyle(color: Colors.white, fontSize: 12.sp), + style: TextStyle(color: Colors.white, fontSize: 14.sp), ); } diff --git a/circle_app/lib/app/login/complete_material/view.dart b/circle_app/lib/app/login/complete_material/view.dart index ece378f..7179814 100644 --- a/circle_app/lib/app/login/complete_material/view.dart +++ b/circle_app/lib/app/login/complete_material/view.dart @@ -14,14 +14,21 @@ import 'package:get/get.dart'; import 'logic.dart'; -class Complete_materialPage extends StatelessWidget { +class Complete_materialPage extends StatefulWidget { Complete_materialPage({Key? key}) : super(key: key); + @override + State createState() => _Complete_materialPageState(); +} + +class _Complete_materialPageState extends State { // final logic = Get.put(Complete_materialLogic()); - // PickerStyle pickerStyle = PickerStyle(); + bool isShowWx = Get.arguments == 'user'; + @override Widget build(BuildContext context) { + return GetBuilder(builder: (Complete_materialLogic controller) { return Stack( children: [ @@ -34,7 +41,9 @@ class Complete_materialPage extends StatelessWidget { ), ), Scaffold( + resizeToAvoidBottomInset: false, appBar: MyAppBar( + centerTitle: '完善您的个人形象', isBack: true, isDiyBack: true, @@ -111,7 +120,7 @@ class Complete_materialPage extends StatelessWidget { ), () {}, img: 'edit'), - if (Get.arguments == 'user') + if (isShowWx) funcWidget( '微信', TextField( @@ -187,10 +196,12 @@ class Complete_materialPage extends StatelessWidget { }), funcWidget( '兴趣', - Row( - children: controller.numbers.isNotEmpty - ? [interestWdiget('JK圈', controller)] - : [], + Container( + child: Row( + children: controller.numbers.isNotEmpty + ? [interestWdiget('JK圈', controller)] + : [], + ), ), () async { var data = await Get.toNamed( AppRoutes.SelectCircleActivity, @@ -337,9 +348,11 @@ class Complete_materialPage extends StatelessWidget { } interestWdiget(String interest, Complete_materialLogic controller) { - return SizedBox( + + return Container( height: 59.sp, - width: 240.sp, + + width: Get.width - 140.sp, child: ListView.builder( itemCount: controller.numbers.length, scrollDirection: Axis.horizontal, @@ -387,6 +400,7 @@ class Complete_materialPage extends StatelessWidget { } showSexPiker(context, Complete_materialLogic controller) { + FocusManager.instance.primaryFocus?.unfocus(); Pickers.showSinglePicker(context, pickerStyle: DefaultPickerStyle.dark(), data: controller.genderList, @@ -401,6 +415,7 @@ class Complete_materialPage extends StatelessWidget { } showAgePiker(context, Complete_materialLogic controller) { + FocusManager.instance.primaryFocus?.unfocus(); var date = PDuration.now(); PDuration currentDur = PDuration(year: date.year! - 18, month: date.month, day: date.day); @@ -434,6 +449,7 @@ class Complete_materialPage extends StatelessWidget { } showRolePiker(context, Complete_materialLogic controller) { + FocusManager.instance.primaryFocus?.unfocus(); Pickers.showSinglePicker(context, pickerStyle: DefaultPickerStyle.dark(), data: controller.roleList, @@ -449,6 +465,7 @@ class Complete_materialPage extends StatelessWidget { // showOrientationPiker(context, Complete_materialLogic controller) { + FocusManager.instance.primaryFocus?.unfocus(); Pickers.showSinglePicker(context, pickerStyle: DefaultPickerStyle.dark(), data: controller.orientationList, diff --git a/circle_app/lib/app/minefragment/view.dart b/circle_app/lib/app/minefragment/view.dart index ffa75cd..6d15ec8 100644 --- a/circle_app/lib/app/minefragment/view.dart +++ b/circle_app/lib/app/minefragment/view.dart @@ -90,7 +90,7 @@ class MinefragmentPage extends StatelessWidget { Widget _circleLiveView(MinefragmentLogic logic) { return Column( - children: [_circleItemView(logic), _helpItemView(),_setUpItemView()], + children: [_circleItemView(logic),_invienItemView(), _helpItemView(),_setUpItemView()], ); } diff --git a/circle_app/lib/common/Widgets/add_wx_tip.dart b/circle_app/lib/common/Widgets/add_wx_tip.dart index eec81ff..610b358 100644 --- a/circle_app/lib/common/Widgets/add_wx_tip.dart +++ b/circle_app/lib/common/Widgets/add_wx_tip.dart @@ -78,7 +78,7 @@ class _AddWxTipState extends State { desc, style: TextStyle( color: Colors.white, - fontSize: 14.sp, + fontSize: 16.sp, fontWeight: FontWeight.w500, height: 2.0, ), @@ -90,7 +90,7 @@ class _AddWxTipState extends State { style: TextStyle( color: Colors.white, fontWeight: FontWeight.w500, - fontSize: 14.sp, + fontSize: 16.sp, height: 2.0, ), )) @@ -148,7 +148,7 @@ class _AddWxTipState extends State { // padding: EdgeInsets.only(left: 6.sp, right: 6.sp), alignment: Alignment.center, decoration: BoxDecoration( - color: AppColor.mainColor, + gradient: AppColor.mainLinearGradient, borderRadius: BorderRadius.circular(4.sp)), child: Text( widget.isHaveWx ? ' 更新微信 ':' 填写微信 ', diff --git a/circle_app/lib/common/Widgets/unlock_wx_tip.dart b/circle_app/lib/common/Widgets/unlock_wx_tip.dart index aa8bd91..5cd4569 100644 --- a/circle_app/lib/common/Widgets/unlock_wx_tip.dart +++ b/circle_app/lib/common/Widgets/unlock_wx_tip.dart @@ -1,6 +1,7 @@ import 'dart:io'; import 'package:circle_app/common/Widgets/open_vip_tip/logic.dart'; +import 'package:circle_app/common/colors/app_color.dart'; import 'package:circle_app/network/api.dart'; import 'package:circle_app/network/dio_manager.dart'; import 'package:circle_app/util/PaymentUtils.dart'; @@ -50,7 +51,7 @@ class _UnlockWxTipState extends State { Container( margin: EdgeInsets.only(left: 20.sp,right: 20.sp), padding: EdgeInsets.all(15.sp), - height: !Platform.isIOS ? 440.sp : 410.sp, + height: !Platform.isIOS ? 440.sp : 350.sp, decoration: BoxDecoration( color: const Color(0xFF393949), borderRadius: BorderRadius.circular(10.sp) @@ -257,18 +258,31 @@ class _UnlockWxTipState extends State { : const Color(0xFF464556), borderRadius: BorderRadius.circular(6), border: index == selectedIndex - ? Border.all(color: const Color(0xFF21BEAB), width: 1.sp) + ? Border.all(color: AppColor.mainColor, width: 1.sp) : null, ), child: Container( margin: EdgeInsets.only(left: 6.sp, right: 6.sp), child: Row( children: [ - Image.asset( - iconIv, // Replace this with the actual image path - width: 31.sp, - height: 29.sp, + Container( + width: 40.sp, + alignment: Alignment.center, + decoration: BoxDecoration( + shape: BoxShape.circle, + gradient: AppColor.mainLinearGradient + ), + child: Text( + 'VIP', + + style: TextStyle(color: Colors.white, fontSize: 12.sp,fontWeight: FontWeight.w500), + ), ), + // Image.asset( + // iconIv, // Replace this with the actual image path + // width: 31.sp, + // height: 29.sp, + // ), SizedBox(width: 8.sp), Column( mainAxisAlignment: MainAxisAlignment.center, @@ -282,7 +296,7 @@ class _UnlockWxTipState extends State { Text( - "同时对方可获得${price.bonus}跨豆", + "同时对方可获得${price.bonus == 30 ? '一个月' : price.bonus == 90 ? '三个月' : price.bonus == 365 ? '一年' : '3年' }会员时长", style: TextStyle( color: const Color(0xFFEFD84E), fontSize: 10.0.sp), ), @@ -290,7 +304,7 @@ class _UnlockWxTipState extends State { Expanded(child: Container()), // To push the next widget to the right edge Text( - '${price.curPrice}元', + '${price.curPrice!.toInt()}元', style: TextStyle(color: Colors.white, fontSize: 14.sp), ), ], diff --git a/circle_app/lib/common/colors/app_color.dart b/circle_app/lib/common/colors/app_color.dart index 2df2bf4..f627eab 100644 --- a/circle_app/lib/common/colors/app_color.dart +++ b/circle_app/lib/common/colors/app_color.dart @@ -3,7 +3,7 @@ import 'dart:ui'; import 'package:flutter/material.dart'; class AppColor { - static Color mainColor = Color(0xFFCE51FF); + static Color mainColor = Color(0xFF06F9FA); static Gradient mainLinearGradient = const LinearGradient( colors: [ diff --git a/circle_app/lib/util/paymentUtil.dart b/circle_app/lib/util/paymentUtil.dart index 0b0fbab..dd650bb 100644 --- a/circle_app/lib/util/paymentUtil.dart +++ b/circle_app/lib/util/paymentUtil.dart @@ -113,6 +113,7 @@ class IOSPayment { } } else if (type == 2) { showOKToast('开通会员成功'); + EventBusManager.fire(CommentVipEvent(1)); } else { showOKToast('解锁微信号成功'); unLockWxSuccessResult(target_id);