From dbb58ccaa6c52785705d7a4557889da73e623787 Mon Sep 17 00:00:00 2001
From: CYH <13923927013@163.com>
Date: Wed, 6 Dec 2023 09:15:35 +0800
Subject: [PATCH] =?UTF-8?q?1.3.6=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 circle_app/android/app/build.gradle           |   4 +-
 .../assets/images/circle/no_look_icon.png     | Bin 4668 -> 3162 bytes
 .../assets/images/circle/nor_like_icon.png    | Bin 2627 -> 1768 bytes
 .../lib/app/chat/widget/wish_dialog.dart      |  23 +-
 .../lib/app/circle/widgets/discover.dart      | 276 ++++++++++--------
 circle_app/lib/app/gift_shop/view.dart        |   6 +-
 circle_app/lib/app/likelist/view.dart         |   2 +-
 .../tim_uikit_conversation_item.dart          |   2 +-
 circle_app/lib/app/msg/logic.dart             |  21 +-
 circle_app/lib/app/myfeedbacklist/view.dart   |   2 +-
 circle_app/lib/app/swiper/view.dart           |  54 ++--
 circle_app/lib/app/userinfo/logic.dart        |  11 +-
 circle_app/lib/app/userinfo/view.dart         |  70 +++--
 .../app/userinfo/widgets/home_call_out.dart   |   4 +-
 circle_app/lib/network/api.dart               |   3 +
 circle_app/lib/network/dio_manager.dart       |   2 +-
 circle_app/lib/util/util.dart                 |  24 +-
 circle_app/lib/view/notice.dart               | 117 ++++----
 18 files changed, 373 insertions(+), 248 deletions(-)

diff --git a/circle_app/android/app/build.gradle b/circle_app/android/app/build.gradle
index f666db0..da58d98 100644
--- a/circle_app/android/app/build.gradle
+++ b/circle_app/android/app/build.gradle
@@ -71,8 +71,8 @@ android {
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         minSdkVersion 21
         targetSdkVersion flutter.targetSdkVersion
-        versionCode 27
-        versionName "1.3.5"
+        versionCode 28
+        versionName "1.3.6"
         manifestPlaceholders = [
                 vivo_APPID: "105669716",
                 vivo_APPKEY:"84f750207787376b310ca5b0d5969122",
diff --git a/circle_app/assets/images/circle/no_look_icon.png b/circle_app/assets/images/circle/no_look_icon.png
index 8b48b4cb1fcb270efb4acbfb059db3b981d1f450..e36b65666e8131ddaeec2090d50d4b7daf794c2b 100644
GIT binary patch
delta 3145
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

delta 4663
zcmV-763Fe^7`!BqFn<yDNkl<ZcwX&Y3y@URnLhuyeQ!TznnzeMS)f>=KzE<pJ%AGg
z0t!Y6QpV?sk6mMsxWTPj6O>KX-P&bzw>IlWag$0kv5-8>`XFYN?5?bq5lnm#9SJkt
z=guG`1BI0+q7L)u=e_rA{p0D>WbE#HZ_n+<shU&O1;ss&|9^bvKmY6e=Ky4~Gz9@@
z$|#eAkV&AM!~~N-PXgT}1e!F=Bu7sqpnH3Jqn2fDVT|3?B)TWuFurhfI-PD027|8^
z3WYVvWOCnxL!k)-`vvsoNF?$=KA-O+grpc_LrtK4LJi>y&_|9OnOP_l4u!+vY59Eq
z*<HJKUEI;pVSi63BpOVtFF+%W>2!K6rSyqNBofVLvpX4Mn;J~}gzDZmpmElm^RENI
z-w7c~mSx?RN~OL%q0nd`vAzN=!G2LuluuihHLNJgIk8ymPy^|oFkLqS=#LXZ_J=~D
zx%qtl7$IaCW9+R7gGhr2^&M!*)d>LTrj#nSZNL2X+kbDLzh=!Evq5v15ZyKeXq>rW
z7=J5-xElaK2=NWZ*w+XlVnU$O03sU(wB+n3HBGy`R4NhMwy)Q9{n7EvVb`u*ieVU{
zqoV^CY(gzsLxC1TfMFQN0)fCB%d&*3sw?KtpTFM;>;nf5oS|vjc|wTg0I(1M5`>U|
z{E-hfiGM&l9XHH72s(-=A;j~gQt8DdOP1ijeWXf5fyS90I&^53Wm!Fhkf;#ic(GVa
zEnd91zl_4(y?aAvo_XeU%d!yA>j2=!*4EY_?gGoQa3_rXsuh3_rl2Uw$WPNWGB`N+
zmJs3y0Ni8S_JQHy;Zw_&EgLwU$Tu8lDMG$P2!DBiQVO<h?_rFsKX~xqELBx65<+|q
z04@xN!&4B@VzEes7@t(2loI@f!(lQsG;|6V8l5TAG#_qjYddi|0B;J=QaL`RD9SaG
zOP>XRcI0wOsfxgk7hETfm;Jv>2ze%#%WZ9MZ~uKW0dE@666`ksU_So6mN;l604QE;
z+kdu9)4WsDwEu|3VuOtwuiST2f$r_?ooAZneoE=gMsctk&`_?USjlFyy(q`y@%Z-v
zprJvqrUH#1WHOnn0N@cqh~@^AM%F>V(Ru-Z{Qz)jJRV2U(vZ@0prvx$sVK@ul-D1H
zg5t!otRq5*KhNj$MtggE$#1$&3(%6YpMMF5!)x>Tyx()GtG}}BCWJf^kH^2@w<z%y
z=>7ZmPnkAt+KgB%h9@mGOK)%QpW3$lA|Yhn>6F)FiA1wd2(d4bNUU+1gO~5V0nIu8
z7$Ib5I2^ugU|?Y3qD70|a3aJojP*i@pAtesPIa64U5b)72_c{IEAr?I(42D&jekBB
ziA2uL<#NaoZ^>Bn@0<WK4CAgyB=V2L!^0J;qQX*Db>xSfpUq~`n}I1)rV!IKM}Fu<
z`n@ZpRkE8gcBLO;WZXa-hVcp9YLwCiW!qS4^QSdUyK?^g`2{DiIp<FVgTbo`g+H!}
z?sTzO927!4DTLS^3<eKov)PeKs(-46ZQD)}Lav~cUaM(Z0KG~-3yKljwqHOog7KB{
z^gS-1`}+Dq*=+U^MNzI8YeBTMw4nQYm#*vEoCxHcw+bP;D5al7&cubXZTo#f$laD@
zeY>r#tunjIj)f4EbG{V-zD6nin4iv&l-Vy73Wdu@$7r19H1_+rfKI2=4}Y|@v}{Ik
zQK^JNA(GGMZ()pm*NL!9Ci7_k*arYgC=`NRF1ML6_C2R|qrZ1{c1{h4!`lOaz)dJp
z{3^j<5O>z2M~@!exPJY5#~oT}+`56zWHL`sO0RMu8?yj#bs~{?+G*mMOlC_<OUw3b
zHj7nl+qN%GCX>%PwHy0AoqtYm2nK_XBiJtJbJacSh+?t$&$_PvldA?}D%AyaI-R}&
z03HGW)oD;EuMI^}E{ersj><8U$^0M~4BjZ^?T~4jskXK@M{{v39h~!X2_e4#0L?G3
z0l*SMe1S3cW2bqKTXb;F&nAQ%004|HyBZHgNTE=8As&xk;H1GZkAKg$ZRFx*lCAgk
z_xE4Aa^*_T!5_{!hG*|5giu$6I#iNO^R5u$GF{hS^3ta#j>aJU%$YO01A)MNuQE_-
z@F&q+aw3p(zLF5~93do#Th=tqZzd9nuQ;`<^qq75w4x{%`{nM-dAxt@*s)J|k=LGp
z&SWwVYMOR4+O72z<bP&L>6Tb5_ARIOhGA?{6lDi4sI*{i({=qmr*>n%cXoEF;c)m}
zN-6FXugxpg4+H|Z_zyD1aL2eRu7S>EGI-4NpXe;O>bXKCx%Gx^+rH9`k~0irdoUQ>
zQYaMgj1cA2C5*8>UdKnB(%RbkBdKJ)Hm_E{WZU)?$z<|>-G6lG3bezA4^Jr;iw6N<
z+;IuH_4+N#`eZ7VLR-0NLHn8zvYS$Rf#gOEWA<Xo8Ae>Q+3deBUApwR(?q+wyQeFP
zf{Iaht5=-*luUDA%9JT9=ggT?*}fgsi7TMf>GVA<EiJcKvzMKS8v7l=#&bLXSn8DG
z%Q;_62*IPTKYuAZGdM}?BNB;_fq{YVD~j@Er<0OQCi7JQxZ5kOwd$jrK0G|UGnq^}
zCUiOi-PP5#PSdnKe#y5{gb$QTrPYfTE&8?7<PF2PhEn=iC547=dZAEw*|My)wLHk4
zo}Q#_+rK1)Om!O1%XhS>a=F|(UDuzf)vhMcn6Sba!++zRv;Ep~qloz(V{De&Nue_n
zjYhW*4ShJrT`H&N7-JVXh@wLPu)xo`ND=Z|LP%S!-B}Z8!!Z6q2=Om&!Ejqoh9N!W
zP)pPDDFFCvC7{qU85kHiKb1=Tq8c5X^M@2gxydh6Z`3%Z5aP?auA|Lfu~Y>b9S74i
z50(QxZht{^Qx9VY`F#F5UDqFTQ@>nCI!ov%%pBWJCej>;$K&nQB5j=Wjlp1W=h!Hr
z7aA(nm0aBy2n3ccT)6OL#X8jnNvG4dL?V&<8*$WxN+g%dEoO`z^g2nrm^6L*^w$Ok
z2GHUg%P0euWnGX;rCzVpZ&z2>l4vygx?f6t^nV!0JcUBx?-^rX_X_munx-xB>H)d|
z4!8NqlP6o++uKK?M_x-NletY*)q5+@Run?qSZ$}EnX0PlscMG|Ug;QJAN543RC-<4
zbxaKUP^l_9dU|?Bd;~ugM|t$t)>bli?p#NUr`p72^5jo2dN|q|l3Vx=#@N4AYkTb2
zF@I4>p^gV+Y>Q*#FCLFqoLAM!9zT9u3=A|TFVG3-y?gftR<B-d)jHMa>+74A&1Sm^
zA#=(gNhNz1W31|7L!*F38m3O2N@mZV?G0$o`3Xwt84a+XM`9PRzWQol!-fqN6Fbn|
zR}|%ycszcz7N_;}^ene+`z4v|j#bf3|9=W&tYRz$&DEt#mzs?b9k|G*Y5qpnb&PJh
z7abTE4uwKD`mLdn0tEWK_uiXXEsvRV{+B|CTU%OM&YL%HUd_ahbUM9B)3lM`lPoWq
zrn#<?^K$s`;n{&e;JD8*kC9=eGJKdZ_IXc0qjpzS^|c1roCLk8p`oD*+uGWGUVn)w
z%=s`)lLJ5(V{COTuEyvbT1SMCFQPs{rDR#wbBRO(ofq83e+ZgmI$9_cdZH1`gB&e{
zSQwATE2ddgmC>AY4FG;f2)Wj8g@`fcLZNVHGMVhC1|sMD6#!T!gt(J2R<$0smpLV`
z0l>)NuH>%mjIrBC_n%Iuw*`a2j(>W?ywzxxfwG@yns!6AQ~#QpAGw-RirGZL@oMGK
z?U67-$n)`d{4>@1&15odm|jpU7V$8217qxGwP?Wl0PqT>6w?q!ssh006N$vb<#w4&
z=4DFha=#ge5Rz9EWmPN|>#Rnjqlv{izeiQo+x_MOLdfq22M1%dt~{V87k>_icjj_A
zyrVKVnM~FUiT3pLe2x(Evr!5h!?DX#sZ?)QSJ%uyAdn%1oZ%<a;O;DyO5bCQZLZa?
zBhc8`FpPcxnChnm0swgc_=|Wv{$JGyl&2%xg%F$ZQc$s2Ow`J)=;-L6S6_YgeE@JP
za;-G?`Wa)>Wx6mPT==#-Wq<$2PMkOqTeD_OO{MJ$XwLb?0PwV*TTaTgALnwpo1D^Q
z4a2xW2ywFz0`H?-TPqye+1VKhhr|06Mfnsea(U*s&$jI$MNuyCnORT)eugpjywfgm
z1+)y8-VXqO<tNzakeH@<b}E&^Fk{Vvr!AIc%`6s+$DJ0Yr>AFzZGYQu0YG3By=b#5
zPUE=!F1^qP6N$uMV;X`}J6AwsC+T$hEL4mD@NvJumbrDi7-QEs5$g4OcX#*lKp^l-
zA%t(>mT8bFYi|l6Rwt9m-?*X8HPF(Gx=c}&r~I_75$t?Ee{C|EeB2GeZtKW+2*%Ry
z7|(%nrSZ^Kw{82g@qc*SbrzK;pmESzCmn7<7+X&Wal*E34BGeB+ef8#Qsi~x&0D{A
zA;xJ22M0Z;K6nONo^(730PFlBUS@2*QYw`$_xr*niVnjt-l3FEAFm>ma{2#GoH%iX
zla(=c;XMN_&Aquoh*$9%+jxmD6NHBW`FwtVsZ_eYo?N?HJAZ+5zKRgC2LM{?We#a2
zoxqd(L?VIjka#L}0gWT{_VzBcEGvzPj`b2hmQp#HqX4irkw_f&G!uu)hGBeF2!U~G
z&vTZXTv8MzS?`NFo(CO0AHy&(7J-Q=zJZOCk|D=!#bWVWyLay%aC&h}D!vvMIU;CZ
zpYKJPmq7-A^M4YFgyYK$)z*7lKx3!f-Q8bORrR|gIa?n-!>gMqF*zoi&7#ZwH~_qq
z&1Qdf&N=6xZTyF5Tu)EWpOs3bIHhzgUhJ_f>xNolN9va@RaF<b2`S)M80#*TN}E%u
zl&7S4Uu5*yPB0-c8jbE49K`D;A389t8|?BE5kd%bZ+`~?0M7)=&H+ZI!uX?<MsN_!
zeqxO2wNir*9z3`}Rn=buK%|z)Ly)7<C=3n`eld|qJXH52WW#ZDbeRAQz*9<h$gMVB
zy6SE(g!oQApWjl;d*qz|4FKF%%bAgj><h>^8Q*}GHa6b#-a#py=9e|%6>*uhw23jc
zvsPQfFn=D=H0`>vhXCayOd-TAUh__Bjpr-SQf9|69EmT4c~LrE0j;WZK6sJFwk*r>
z{)=H48AVZ8`4~)c@hM8_x%FBX4O51dI+kg&y8&R8U#4Fj3o&e2R;pIOs;jGOwyLTb
zA;d`HqZE4sxm@n7_V)IQ8Ao-{G1A0$jxG}-bAOw+s;asT!EQt%POV8x5rFAq>uQ;O
zG6egha$hpWY!E_LF~;7j7ubea9kqzzoa1AIj|KvPlpB-EuZdwl^7P{ejIoUlG~TOe
z+HK{Vw=z2SQvkT0G3Lv4+=g-V*omdn>8*;Q-~+KUnrWHHJil#DueBS7(Mu^sZ+C?B
zXn!<HPMtcnHJMD_>&N0Z4QM1*K2g6FPu8Q+=mN~IXokYXz&zeJ(RKa5tAU0O2LM1P
z0L&^|OmdN2-TZZ0jHUuDiGjYpzNy2*!>cHz-_SH|go_#_!_nNsn0Gdt{kdtHm(@B3
ztMUxdkPzZhUDx+If!S2^&MPsPCO`<e8Giuq1baGqdWxcq96^;W7AMQ4>_L|Qv@FX6
z0KCBSz7XPngb>@^o`e{Nu|rXmP346z-?s?_0vEcu`P)?U&MVmE`ss9f1tBD+C<@-5
znk9rdix4s!0A>V(!2l-4ltD*O(b*^#i+FAL9ox1~Qc8ad0GI~bYuol4$z<~7dVgr)
zoIiyRyp;2(z1;kr5I~P6^6=rq!BeMBg{DrOs#%t$mP#0<RQ~9yv1M7ds;ZWvD5YF3
zXATVw<yWj&;dm9z34Hl~7T`+@@$$k-&fcx-`sGgTD}6s5GP)i*o8Cq~L$nKXGRF+=
zn4&fbw8!P*oZr#f+WN1<!^0y{Nq?yW@<NDfoKn=9?yz{A+efZC=X_@<6xvw6%Ok<I
z@zvl(ixzRW1W$?%2c){Xx>{6K{S_gEjj?{-EEbDNx6l7f0_}n&@mUL*5*IC3m$8&R
ziA3TOdFoU1@sdfPT>y<$IOn&{m@(s<qvO{YOX=_L-<e1x#(x*wB^{I1954`=<me``
t$RyB{KsO12CJi&m(UU+o34taJ^Z$OgsM92{-QxfN002ovPDHLkV1jdE_Hh6J

diff --git a/circle_app/assets/images/circle/nor_like_icon.png b/circle_app/assets/images/circle/nor_like_icon.png
index efc653055b3404ddd797fe95068331455d5487f1..beb5aae883c1db9990df7676da2c7dfb633e8284 100644
GIT binary patch
delta 1740
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

delta 2606
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
QrvLx|07*qoM6N<$f@_-nyZ`_I

diff --git a/circle_app/lib/app/chat/widget/wish_dialog.dart b/circle_app/lib/app/chat/widget/wish_dialog.dart
index 399fd7d..91f6725 100644
--- a/circle_app/lib/app/chat/widget/wish_dialog.dart
+++ b/circle_app/lib/app/chat/widget/wish_dialog.dart
@@ -25,6 +25,7 @@ class _WishDialogState extends State<WishDialog> {
   String giftId = '';
   String withStr = '';
   int selectedIndex = 1;
+  String tipStr = '';
 
   List<String> optionList = [
     '分享一张本人照片',
@@ -52,6 +53,7 @@ class _WishDialogState extends State<WishDialog> {
         if (info['name'] == '浪漫告白') {
           selectedIndex = i ;
           giftId = info['id'].toString();
+          tipStr = info['topHours'] != null ? info['topHours'].toString() : '';
         }
       }
       setState(() {});
@@ -84,7 +86,7 @@ class _WishDialogState extends State<WishDialog> {
       onTap: () {
         selectedIndex = index;
         giftId = info['id'].toString();
-        // tipStr = info['topHours'] != null ? info['topHours'].toString() : '';
+        tipStr = info['topHours'] != null ? info['topHours'].toString() : '';
         setState(() {});
       },
       child: Container(
@@ -148,13 +150,28 @@ class _WishDialogState extends State<WishDialog> {
                     style: TextStyle(color: Colors.white, fontSize: 15.sp),
                   ),
                   Container(
-                    height: 102.sp,
+                    height: tipStr.isNotEmpty ? 125.sp : 102.sp,
                     margin: EdgeInsets.only(top: 12.sp),
                     decoration: BoxDecoration(
                         borderRadius: BorderRadius.circular(10.sp),
                         gradient: LinearGradient(
                             colors: [Color(0xFF132B40), Color(0xFF251240)])),
-                    child: giftGridWidget(),
+                    child: Column(
+                      children: [
+                        if (tipStr.isNotEmpty)
+                        Padding(
+                          padding:  EdgeInsets.only(top:6.sp),
+                          child: Text(
+                            '礼物送出后，获得$tipStr小时的消息置顶',
+                            style: TextStyle(
+                                color: AppColor.mainColor,
+                                fontSize: 12.sp,
+                                fontWeight: FontWeight.w500),
+                          ),
+                        ),
+                        giftGridWidget(),
+                      ],
+                    ),
                   ),
                   GestureDetector(
                       onTap: () {
diff --git a/circle_app/lib/app/circle/widgets/discover.dart b/circle_app/lib/app/circle/widgets/discover.dart
index 2bbf21c..633bf2c 100644
--- a/circle_app/lib/app/circle/widgets/discover.dart
+++ b/circle_app/lib/app/circle/widgets/discover.dart
@@ -1,4 +1,3 @@
-
 import 'dart:io';
 
 import 'package:cached_network_image/cached_network_image.dart';
@@ -49,7 +48,9 @@ class _DiscoverState extends State<Discover>
   int index = 1;
   List tagList = [];
 
-  List<String> genderList = [];List<String> orientationList= [];List<String> roleList= [];
+  List<String> genderList = [];
+  List<String> orientationList = [];
+  List<String> roleList = [];
   bool isPop = false;
 //获取屏幕宽度
 
@@ -61,7 +62,6 @@ class _DiscoverState extends State<Discover>
 
   double screenHeight = 0;
 
-
   void animateToOffset(ScrollController controller, double offset,
       void Function() onScrollCompleted) {
     controller
@@ -100,7 +100,7 @@ class _DiscoverState extends State<Discover>
         // 手指从下向上滑动
         lastPage--;
         animateToOffset(
-            _scrollController, lastPage * (  screenHeight + 5.sp), () {});
+            _scrollController, lastPage * (screenHeight + 5.sp), () {});
       } else if (touchRangeY > 0 && lastPage < list.length - 1) {
         // 从上向下
         lastPage++;
@@ -137,7 +137,6 @@ class _DiscoverState extends State<Discover>
       });
     }
 
-
     sub = EventBusManager.on<DiscovrScrollTap>().listen((event) {
       pointerStart = Offset.zero;
       pointerEnd = Offset.zero;
@@ -195,9 +194,7 @@ class _DiscoverState extends State<Discover>
 
       list[initIndex] = result['data'];
       setState(() {});
-    } catch (e) {
-
-    }
+    } catch (e) {}
   }
 
   loadGiftListData() async {
@@ -264,12 +261,9 @@ class _DiscoverState extends State<Discover>
       if (screenHeight == 0 && list.isNotEmpty) {
         var size = context?.findRenderObject()?.paintBounds?.size;
         screenHeight = size!.height - 20.sp;
-        setState(() {
-
-        });
+        setState(() {});
         print(size.toString());
       }
-
     });
 
     return list.isEmpty
@@ -277,10 +271,10 @@ class _DiscoverState extends State<Discover>
             ? loaddingWidget(true)
             : noResultWidget(tip: '已解锁微信的圈友会展示在这里哦～')
         : Stack(
-      fit: StackFit.expand,
-          children: [
-            Container(color: Colors.transparent),
-            Listener(
+            fit: StackFit.expand,
+            children: [
+              Container(color: Colors.transparent),
+              Listener(
                 onPointerDown: getPointDownListenerInHorizontal(),
                 onPointerUp: getPointUpListenerInHorizontal(),
                 child: SmartRefresher(
@@ -289,7 +283,6 @@ class _DiscoverState extends State<Discover>
                   onLoading: _onLoading,
                   enablePullUp: true,
                   child: ListView.builder(
-
                     itemBuilder: (context, index) {
                       var user = Users.fromJson(list[index]);
 
@@ -333,9 +326,12 @@ class _DiscoverState extends State<Discover>
                                     child: Container(
                                       padding: EdgeInsets.all(2.sp),
                                       child: Swiper(
-                                        autoplay:
-                                            user.images!.length == 1 ? false : true,
-                                        loop: user.images!.length == 1 ? false : true,
+                                        autoplay: user.images!.length == 1
+                                            ? false
+                                            : true,
+                                        loop: user.images!.length == 1
+                                            ? false
+                                            : true,
                                         itemBuilder:
                                             (BuildContext context, int index) {
                                           //    print(index);
@@ -364,89 +360,127 @@ class _DiscoverState extends State<Discover>
                                     )),
                               ),
                               Positioned(
-                                  left: 16.sp,
-                                  top: 20.sp,
+                                  left: 5.sp,
+                                  top: 10.sp,
                                   child: Container(
                                     child: Column(
-                                      crossAxisAlignment: CrossAxisAlignment.start,
+                                      crossAxisAlignment:
+                                          CrossAxisAlignment.start,
                                       children: [
-                                        if (user.both_cities!.isNotEmpty)
-                                          Row(
-                                            children: [
-                                              Container(
-                                                width: 6.sp,
-                                                height: 6.sp,
-                                                margin:
-                                                    EdgeInsets.only(right: 4.sp),
-                                                decoration: BoxDecoration(
-                                                  borderRadius:
-                                                      BorderRadius.circular(3.sp),
-                                                  color: const Color(0xFFCE51FF),
+                                        if (onLineStr.isNotEmpty)
+                                          Container(
+                                            height: 24.sp,
+                                            padding: EdgeInsets.only(
+                                                left: 6.sp, right: 6.sp),
+                                            decoration: BoxDecoration(
+                                                color: Colors.black
+                                                    .withOpacity(0.35),
+                                                borderRadius:
+                                                    BorderRadius.circular(
+                                                        12.sp)),
+                                            child: Row(
+                                              children: [
+                                                Container(
+                                                  width: 6.sp,
+                                                  height: 6.sp,
+                                                  margin: EdgeInsets.only(
+                                                      right: 4.sp),
+                                                  decoration: BoxDecoration(
+                                                    borderRadius:
+                                                        BorderRadius.circular(
+                                                            3.sp),
+                                                    color:
+                                                        const Color(0xFFCE51FF),
+                                                  ),
                                                 ),
-                                              ),
-                                              // if (logic.online)
-                                              Text(
-                                                "你们都来过${user.both_cities!.first}",
-                                                style: TextStyle(
-                                                    color: Colors.white,
-                                                    fontSize: 16.sp),
-                                              ),
-                                            ],
+                                                // if (logic.online)
+                                                Text(
+                                                  onLineStr,
+                                                  style: TextStyle(
+                                                      color: Colors.white,
+                                                      fontSize: 16.sp),
+                                                ),
+                                              ],
+                                            ),
                                           ),
                                         if (user.both_interests!.isNotEmpty)
                                           SizedBox(
                                             height: 8.sp,
                                           ),
-                                        if (user.both_interests!.isNotEmpty)
-                                          Row(
-                                            children: [
-                                              Container(
-                                                width: 6.sp,
-                                                height: 6.sp,
-                                                margin:
-                                                EdgeInsets.only(right: 4.sp),
-                                                decoration: BoxDecoration(
-                                                  borderRadius:
-                                                  BorderRadius.circular(3.sp),
-                                                  color: const Color(0xFFCE51FF),
-                                                ),
-                                              ),
-                                              // if (logic.online)
-                                              Text(
-                                                "你们有共同的圈子:${user.both_interests!.first['title']}",
-                                                style: TextStyle(
-                                                    color: Colors.white,
-                                                    fontSize: 16.sp),
-                                              ),
-                                            ],
-                                          ),
                                         if (user.both_cities!.isNotEmpty)
-                                        SizedBox(
-                                          height: 8.sp,
-                                        ),
-                                        if (onLineStr.isNotEmpty)
-                                          Row(
-                                            children: [
-                                              Container(
-                                                width: 6.sp,
-                                                height: 6.sp,
-                                                margin:
-                                                    EdgeInsets.only(right: 4.sp),
-                                                decoration: BoxDecoration(
+                                          Container(
+                                              height: 24.sp,
+                                              padding: EdgeInsets.only(
+                                                  left: 6.sp, right: 6.sp),
+                                              decoration: BoxDecoration(
+                                                  color: Colors.black
+                                                      .withOpacity(0.35),
                                                   borderRadius:
-                                                      BorderRadius.circular(3.sp),
-                                                  color: const Color(0xFFCE51FF),
-                                                ),
-                                              ),
-                                              // if (logic.online)
-                                              Text(
-                                                onLineStr,
-                                                style: TextStyle(
-                                                    color: Colors.white,
-                                                    fontSize: 16.sp),
-                                              ),
-                                            ],
+                                                      BorderRadius.circular(
+                                                          12.sp)),
+                                              child: Row(
+                                                children: [
+                                                  Container(
+                                                    width: 6.sp,
+                                                    height: 6.sp,
+                                                    margin: EdgeInsets.only(
+                                                        right: 4.sp),
+                                                    decoration: BoxDecoration(
+                                                      borderRadius:
+                                                          BorderRadius.circular(
+                                                              3.sp),
+                                                      color: const Color(
+                                                          0xFFCE51FF),
+                                                    ),
+                                                  ),
+                                                  // if (logic.online)
+                                                  Text(
+                                                    "你们都来过${user.both_cities!.first}",
+                                                    style: TextStyle(
+                                                        color: Colors.white,
+                                                        fontSize: 16.sp),
+                                                  ),
+                                                ],
+                                              )),
+                                        if (user.both_cities!.isNotEmpty)
+                                          SizedBox(
+                                            height: 8.sp,
                                           ),
+                                        if (user.both_interests!.isNotEmpty)
+                                          Container(
+                                              height: 24.sp,
+                                              padding: EdgeInsets.only(
+                                                  left: 6.sp, right: 6.sp),
+                                              decoration: BoxDecoration(
+                                                  color: Colors.black
+                                                      .withOpacity(0.35),
+                                                  borderRadius:
+                                                      BorderRadius.circular(
+                                                          12.sp)),
+                                              child: Row(
+                                                children: [
+                                                  Container(
+                                                    width: 6.sp,
+                                                    height: 6.sp,
+                                                    margin: EdgeInsets.only(
+                                                        right: 4.sp),
+                                                    decoration: BoxDecoration(
+                                                      borderRadius:
+                                                          BorderRadius.circular(
+                                                              3.sp),
+                                                      color: const Color(
+                                                          0xFFCE51FF),
+                                                    ),
+                                                  ),
+                                                  // if (logic.online)
+                                                  Text(
+                                                    "你们有共同的圈子:${user.both_interests!.first['title']}",
+                                                    style: TextStyle(
+                                                        color: Colors.white,
+                                                        fontSize: 16.sp),
+                                                  ),
+                                                ],
+                                              )),
                                       ],
                                     ),
                                   )),
@@ -462,11 +496,13 @@ class _DiscoverState extends State<Discover>
                                       width: 73.sp,
                                       height: 25.sp,
                                       decoration: BoxDecoration(
-                                          gradient: AppColor.mainVerLinearGradient,
+                                          gradient:
+                                              AppColor.mainVerLinearGradient,
                                           borderRadius:
                                               BorderRadius.circular(12.5.sp)),
                                       child: Row(
-                                        mainAxisAlignment: MainAxisAlignment.center,
+                                        mainAxisAlignment:
+                                            MainAxisAlignment.center,
                                         children: [
                                           Container(
                                             margin: EdgeInsets.only(left: 5.sp),
@@ -495,7 +531,8 @@ class _DiscoverState extends State<Discover>
                                     width: Get.width - 32.sp,
                                     padding: EdgeInsets.only(right: 0.sp),
                                     child: Column(
-                                      crossAxisAlignment: CrossAxisAlignment.start,
+                                      crossAxisAlignment:
+                                          CrossAxisAlignment.start,
                                       children: [
                                         if (user.wxNum != null)
                                           wxStatusWidget(
@@ -519,18 +556,23 @@ class _DiscoverState extends State<Discover>
                                                   fontWeight: FontWeight.bold),
                                             ),
                                             Container(
-                                              margin: EdgeInsets.only(left: 5.sp),
+                                              margin:
+                                                  EdgeInsets.only(left: 5.sp),
                                               alignment: Alignment.center,
                                               height: 18.sp,
                                               padding: EdgeInsets.only(
                                                   left: 6.sp, right: 6.sp),
                                               decoration: BoxDecoration(
                                                   borderRadius:
-                                                      BorderRadius.circular(9.sp),
-                                                  gradient: const LinearGradient(
-                                                      begin: Alignment(0.25, 0.5),
-                                                      end: Alignment(0.75, 0.5),
-                                                      colors: [
+                                                      BorderRadius.circular(
+                                                          9.sp),
+                                                  gradient:
+                                                      const LinearGradient(
+                                                          begin: Alignment(
+                                                              0.25, 0.5),
+                                                          end: Alignment(
+                                                              0.75, 0.5),
+                                                          colors: [
                                                         Color(0xff8DFFF8),
                                                         Color(0xffB5D3FF)
                                                       ])),
@@ -562,11 +604,16 @@ class _DiscoverState extends State<Discover>
                                         ),
                                         Container(
                                           width: Get.width - 120.sp,
-                                          margin: EdgeInsets.only(top: 15.sp,bottom: 15.sp),
+                                          margin: EdgeInsets.only(
+                                              top: 15.sp, bottom: 15.sp),
                                           child: Text(
                                             user.signature! ?? '',
                                             overflow: TextOverflow.ellipsis,
-                                            maxLines: (user.signature! ?? '').length > 15 ? 2 : 1,
+                                            maxLines:
+                                                (user.signature! ?? '').length >
+                                                        15
+                                                    ? 2
+                                                    : 1,
                                             style: TextStyle(
                                                 fontSize: 16.sp,
                                                 color: const Color(0XFFF7FAFA)),
@@ -626,8 +673,8 @@ class _DiscoverState extends State<Discover>
                                         ),
                                         GestureDetector(
                                           onTap: () {
-                                            _showReportDialog(context,user.userId!.toString(),index);
-
+                                            _showReportDialog(context,
+                                                user.userId!.toString(), index);
                                           },
                                           child: Image.asset(
                                             getCircleImage(
@@ -648,8 +695,8 @@ class _DiscoverState extends State<Discover>
                   ),
                 ),
               ),
-          ],
-        );
+            ],
+          );
   }
 
   tagItem(List item) {
@@ -746,22 +793,20 @@ class _DiscoverState extends State<Discover>
       } else if (data['data']['user']['wxNum'].toString().isEmpty) {
         showAddWxPicker(false);
       }
-
     }
   }
 
-  void sendNoLookData(String userId,int index) async {
+  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(() {
-
-      });
+      setState(() {});
     }
   }
 
-  void _showReportDialog(BuildContext context,String userId,int currentIndex) {
+  void _showReportDialog(
+      BuildContext context, String userId, int currentIndex) {
     showDialog(
       context: context,
       builder: (BuildContext context) {
@@ -803,7 +848,7 @@ class _DiscoverState extends State<Discover>
                         child: Text(
                           "温馨提示",
                           style:
-                          TextStyle(color: Colors.white, fontSize: 16.sp),
+                              TextStyle(color: Colors.white, fontSize: 16.sp),
                         ),
                       ),
                       Container(
@@ -865,7 +910,7 @@ class _DiscoverState extends State<Discover>
                           GestureDetector(
                             onTap: () {
                               Get.back();
-                              sendNoLookData(userId,currentIndex);
+                              sendNoLookData(userId, currentIndex);
                             },
                             child: Container(
                               margin: EdgeInsets.only(top: 24.sp),
@@ -908,7 +953,6 @@ class _DiscoverState extends State<Discover>
   }
 }
 
-
 class DiscoverDataRefresh {
   String userId;
   DiscoverDataRefresh(this.userId);
@@ -976,7 +1020,7 @@ class Users {
       this.birthday,
       this.blacklist,
       this.city,
-        this.both_interests,
+      this.both_interests,
       this.distance,
       this.dust,
       this.email,
diff --git a/circle_app/lib/app/gift_shop/view.dart b/circle_app/lib/app/gift_shop/view.dart
index 80944f5..2df1591 100644
--- a/circle_app/lib/app/gift_shop/view.dart
+++ b/circle_app/lib/app/gift_shop/view.dart
@@ -32,7 +32,7 @@ class Gift_shopPage extends StatelessWidget {
                     Get.toNamed(AppRoutes.BillActivity,arguments: 2);
                   },
                   child: Text(
-                    '礼物收入',
+                    '账单',
                     style: TextStyle(color: Colors.white, fontSize: 14.sp),
                   ),
                 ),
@@ -288,14 +288,14 @@ class Gift_shopPage extends StatelessWidget {
       child: Container(
         height: 105.sp,
         decoration: BoxDecoration(
-          color: isGet ? Color(0xFF3E3D4C) : Color(0x292836FF),
+          color: isGet ? Color(0x8F3E3D4C) : Color(0x0f2836FF),
           borderRadius: BorderRadius.circular(4.sp),
         ),
         child: Column(
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
             Opacity(
-              opacity: isGet ? 1 : 0.5,
+              opacity: isGet ? 1 : 0.75,
               child: Image.network(
                 info['icon'],
                 width: 60.sp,
diff --git a/circle_app/lib/app/likelist/view.dart b/circle_app/lib/app/likelist/view.dart
index e618161..cd17a32 100644
--- a/circle_app/lib/app/likelist/view.dart
+++ b/circle_app/lib/app/likelist/view.dart
@@ -378,7 +378,7 @@ class _LikelistPageState extends State<LikelistPage> with RouteAware  {
                     borderRadius: BorderRadius.circular(14),
                   ),
                   child: Center(
-                    child: Text(item.isLike ? "互相关注" : "关注",
+                    child: Text(item.isLike ? "互相喜欢" : "喜欢",
                         style: TextStyle(fontSize: 14.sp, color: Colors.white)),
                   ),
                 ),
diff --git a/circle_app/lib/app/msg/TIMUIKitConversation/tim_uikit_conversation_item.dart b/circle_app/lib/app/msg/TIMUIKitConversation/tim_uikit_conversation_item.dart
index cb69624..8e61b2d 100644
--- a/circle_app/lib/app/msg/TIMUIKitConversation/tim_uikit_conversation_item.dart
+++ b/circle_app/lib/app/msg/TIMUIKitConversation/tim_uikit_conversation_item.dart
@@ -178,7 +178,7 @@ class TIMConversationItem extends TIMUIKitStatelessWidget {
                       ),
                     ),
                   if (userInfo != null)
-                  (userInfo!.role ?? 0) > 0
+                  (userInfo!.role ?? 0) > 0 && !(userInfo!.userID ?? '').contains('qz_prod_11_')
                   ?  Positioned(
                         bottom: 0,
                         right: 0,
diff --git a/circle_app/lib/app/msg/logic.dart b/circle_app/lib/app/msg/logic.dart
index b26b05e..8041d68 100644
--- a/circle_app/lib/app/msg/logic.dart
+++ b/circle_app/lib/app/msg/logic.dart
@@ -7,7 +7,9 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 import '../../common/Widgets/base_tip_widget.dart';
+import '../../util/SharedPreferencesHelper.dart';
 import '../circle/logic.dart';
+import '../minefragment/logic.dart';
 import 'state.dart';
 
 class MsgLogic extends GetxController {
@@ -25,6 +27,7 @@ class MsgLogic extends GetxController {
   void onInit() {
     // TODO: implement onInit
     super.onInit();
+    loadMyInfoData();
     loadChatData();
     loadLikeData();
     loadStatusData();
@@ -63,7 +66,7 @@ class MsgLogic extends GetxController {
     var data =
     await DioManager.getInstance().get(url: Api.queryQuickStart);
     if (data["code"] == 200) {
-      if (data["data"] == 0) {
+      if (data["data"] == 2 || data["data"] == 0) {
         var data = await DioManager.getInstance()
             .get(url: Api.startQuick);
         if (data["code"] == 200) {
@@ -157,7 +160,7 @@ class MsgLogic extends GetxController {
     var data =
     await DioManager.getInstance().get(url: Api.queryQuickStart);
     if (data["code"] == 200) {
-      if (data["data"] == 0) {
+      if (data["data"] == 0 || data["data"] == 2) {
         isStart = false;
       } else {
         isStart = true;
@@ -165,4 +168,18 @@ class MsgLogic extends GetxController {
     }
     update();
   }
+
+  void loadMyInfoData() async {
+    var data = await DioManager.instance.get(url: Api.getUserMine);
+    var bean = BaseResponse<MineResponseBean>.fromJson(
+        data, (data) => MineResponseBean.fromJson(data));
+    if (bean.isSuccess()) {
+      var userInfoBean = bean.data.user;
+      SharedPreferencesHelper.getInstance().then((sharedPreferences) {
+        sharedPreferences.setInt(SharedPreferencesHelper.VIP, userInfoBean.vip);
+        sharedPreferences.setInt(
+            SharedPreferencesHelper.USERID, userInfoBean!.id);
+      });
+    }
+  }
 }
diff --git a/circle_app/lib/app/myfeedbacklist/view.dart b/circle_app/lib/app/myfeedbacklist/view.dart
index 9422274..e63aea4 100644
--- a/circle_app/lib/app/myfeedbacklist/view.dart
+++ b/circle_app/lib/app/myfeedbacklist/view.dart
@@ -108,7 +108,7 @@ class MyfeedbacklistPage extends StatelessWidget {
             Container(
               margin: EdgeInsets.only(left: 16.sp,right: 16.sp,bottom: 16.sp),
               child: Text(
-                item.reply!=null?"反馈回复："+item.reply:"审核中",
+                item.reply!=null?"反馈回复："+item.reply:"待回复",
                 style: TextStyle(
                   color: Colors.grey,
                   fontSize: 12.0.sp,
diff --git a/circle_app/lib/app/swiper/view.dart b/circle_app/lib/app/swiper/view.dart
index c5db245..707887a 100644
--- a/circle_app/lib/app/swiper/view.dart
+++ b/circle_app/lib/app/swiper/view.dart
@@ -42,11 +42,11 @@ class _SwiperPageState extends State<SwiperPage> {
                     index: logic.index,
                     loop: false,
                     itemBuilder: (BuildContext context, int index) {
-                      if (logic.index == index) {
-                        return   RepaintBoundary(
-                            key: _globalKey,
-                            child:itemWidget(logic,index));
-                      }
+                      // if (logic.index == index) {
+                      //   return   RepaintBoundary(
+                      //       key: _globalKey,
+                      //       child:itemWidget(logic,index));
+                      // }
                       return itemWidget(logic,index);
                     },
 
@@ -60,26 +60,26 @@ class _SwiperPageState extends State<SwiperPage> {
                             activeColor: Color(0xFFD14CFF),
                             color: Colors.white)), //下面的分页小点
                   )),
-              Positioned(
-                  bottom: Get.bottomBarHeight,
-                  right: 15.sp,
-                  child: InkWell(
-                    onTap: () {
-                      _saveLocalImage();
-                    },
-                    child: Container(
-                      alignment: Alignment.center,
-                      padding: EdgeInsets.all(5.sp),
-                      decoration: BoxDecoration(
-                          color: Colors.black.withOpacity(0.5),
-                          borderRadius: BorderRadius.circular(17.5.sp)),
-                      child: Icon(
-                        Icons.download,
-                        color: Colors.white,
-                        size: 25.sp,
-                      ),
-                    ),
-                  ))
+              // Positioned(
+              //     bottom: Get.bottomBarHeight,
+              //     right: 15.sp,
+              //     child: InkWell(
+              //       onTap: () {
+              //         _saveLocalImage();
+              //       },
+              //       child: Container(
+              //         alignment: Alignment.center,
+              //         padding: EdgeInsets.all(5.sp),
+              //         decoration: BoxDecoration(
+              //             color: Colors.black.withOpacity(0.5),
+              //             borderRadius: BorderRadius.circular(17.5.sp)),
+              //         child: Icon(
+              //           Icons.download,
+              //           color: Colors.white,
+              //           size: 25.sp,
+              //         ),
+              //       ),
+              //     ))
             ],
           ),
         ),
@@ -98,9 +98,11 @@ class _SwiperPageState extends State<SwiperPage> {
               children: [
                 Container(
                   // color: Colors.red,
+
                   child: CachedNetworkImage(
                     imageUrl: logic.imgList[index].toString().contains('?') ? logic.imgList[index].toString().split('?').first : logic.imgList[index].toString(),
-                    fit: BoxFit.contain,
+                    fit: BoxFit.cover,
+                    width: double.infinity,
                   ),
                 ),
                 Positioned(
diff --git a/circle_app/lib/app/userinfo/logic.dart b/circle_app/lib/app/userinfo/logic.dart
index 23a851a..c62d14a 100644
--- a/circle_app/lib/app/userinfo/logic.dart
+++ b/circle_app/lib/app/userinfo/logic.dart
@@ -350,7 +350,7 @@ class UserinfoLogic extends GetxController {
       'num': 1,
       'toUserId': userId
     });
-    if (result['code'] == 10000) {
+    if (result['code'] == 200) {
       showOKToast('赠送成功');
       loadData();
     } else if (result['code'] == 31201) {
@@ -389,6 +389,15 @@ class UserinfoLogic extends GetxController {
       });
     } catch (_) {}
   }
+
+  void sendWhatToWx() async {
+    var result = await DioManager.instance.get(url: Api.noticeWxNum + userId,);
+    if (result['code'] == 200) {
+      showOKToast('已提醒对方填写');
+    } else {
+      showOKToast(result['msg']);
+    }
+  }
 }
 
 class UserBean {
diff --git a/circle_app/lib/app/userinfo/view.dart b/circle_app/lib/app/userinfo/view.dart
index 895d011..74f0bbc 100644
--- a/circle_app/lib/app/userinfo/view.dart
+++ b/circle_app/lib/app/userinfo/view.dart
@@ -29,7 +29,6 @@ class UserinfoPage extends StatefulWidget {
 class MyTabbedScreenState extends State<UserinfoPage>
     with SingleTickerProviderStateMixin, RouteAware {
   late TabController _tabController;
-  late PageController _pageController;
 
   ScrollController scrollController = ScrollController();
   bool isShowBlackTitle = false;
@@ -40,34 +39,35 @@ class MyTabbedScreenState extends State<UserinfoPage>
   void initState() {
     super.initState();
     sub = EventBusManager.on<ScrollViewScrollTop>().listen((event) {
-      scrollController.animateTo(0, duration: Duration(microseconds: 200), curve: Curves.easeIn);
+      if (isSetState) {
+        isSetState = false;
+        setState(() {
+
+        });
+      }
     });
     scrollController.addListener(() {
       if (scrollController.position.pixels ==
           scrollController.position.maxScrollExtent) {
         print('2222');
         isSetState = true;
+        EventBusManager.fire(ScrollViewIsEnd(true));
         setState(() {
 
         });
-        EventBusManager.fire(ScrollViewIsEnd(true));
+
       } else {
         EventBusManager.fire(ScrollViewIsEnd(false));
         if (isSetState) {
+          isSetState = false;
           setState(() {
 
           });
-          isSetState = false;
         }
-
-        print('111');
       }
     });
-    _pageController = PageController();
     _tabController = TabController(length: 2, vsync: this);
     _tabController.animation!.addListener(_handleTabChange);
-    //   _tabController.addListener(_handleTabChange);
-    // _tabController
   }
 
   @override
@@ -106,15 +106,6 @@ class MyTabbedScreenState extends State<UserinfoPage>
   @override
   void dispose() {
     _tabController.dispose();
-    OverlayState? overlayState = Overlay.of(Get.context!);
-    if (mainOverlayEntry != null) {
-      if (overlayState.debugIsVisible(mainOverlayEntry!)) {
-        mainOverlayEntry!.remove();
-      }
-    }
-
-    // overlayState.insert(entry);
-
     sub.cancel();
     routeObserver.unsubscribe(this);
     super.dispose();
@@ -210,7 +201,44 @@ class MyTabbedScreenState extends State<UserinfoPage>
                         //   ),
                         // ),
                       )
-                    : Container()),
+                    : logic.userInfoBean!= null ?  logic.userInfoBean!.wx_num.isEmpty ?  GestureDetector(
+                  onTap: () {
+                    logic.sendWhatToWx();
+                  },
+                      child: Stack(
+                  alignment: Alignment.center,
+                  children: [
+                      Container(
+                        width: 101.sp,
+                        height: 26.sp,
+                        decoration: BoxDecoration(
+                          borderRadius: BorderRadius.circular(12.sp),
+                          gradient: LinearGradient(
+                            colors: [
+                              Color(0xFF30FFD9),
+                              Color(0xFFDD3DF4)
+                            ],
+                            begin: Alignment.centerLeft,
+                            end: Alignment.centerRight,
+                          ),
+                        ),
+                      ),
+                      Container(
+                        width: 100.sp,
+                        decoration: BoxDecoration(
+                            borderRadius: BorderRadius.circular(11.sp),
+                            color: Color(0xFF240F3B)),
+                        alignment: Alignment.center,
+                        height: 24.sp,
+                        child: Text(
+                          '想要微信号',
+                          style: TextStyle(
+                              color: Colors.white, fontSize: 14.sp),
+                        ),
+                      )
+                  ],
+                ),
+                    ) : Container() : Container()),
             body: Stack(
               // fit: StackFit.expand,
               children: [
@@ -233,7 +261,7 @@ class MyTabbedScreenState extends State<UserinfoPage>
                                 toolbarHeight: 0,
                                 foregroundColor: Colors.transparent,
                               backgroundColor: Colors.transparent,
-                              expandedHeight:  372.sp + (logic.userInfoBean != null
+                              expandedHeight:  (!logic.isMe ? 372.sp : 312.sp) + (logic.userInfoBean != null
                                   ? logic.userInfoBean!.wx_num!.isNotEmpty
                                   ?  59.sp : 0 : 0),
                               bottom: PreferredSize(
@@ -622,7 +650,7 @@ class MyTabbedScreenState extends State<UserinfoPage>
                                   children: [
                                     Stack(children: [
                                       Opacity(
-                                        opacity: !isGet ? 0.5 : 1,
+                                        opacity: !isGet ? 0.6 : 1,
                                         child: Image.network(
                                           info['icon'],
                                           width: 50.sp,
diff --git a/circle_app/lib/app/userinfo/widgets/home_call_out.dart b/circle_app/lib/app/userinfo/widgets/home_call_out.dart
index 6850b55..5c5637e 100644
--- a/circle_app/lib/app/userinfo/widgets/home_call_out.dart
+++ b/circle_app/lib/app/userinfo/widgets/home_call_out.dart
@@ -55,7 +55,7 @@ class _HomeCallOutViewState extends State<HomeCallOutView> with AutomaticKeepAli
     listsLg?.loadCallOutListData(widget.userId);
 
     listsLg!.scrollController.addListener(() {
-      if (listsLg!.scrollController.offset < 0) {
+      if (listsLg!.scrollController.offset <= 0) {
         EventBusManager.fire(ScrollViewScrollTop());
         isEnd = false;
         setState(() {
@@ -91,7 +91,7 @@ class _HomeCallOutViewState extends State<HomeCallOutView> with AutomaticKeepAli
                 ? loaddingWidget(true)
                 : ListView.builder(
                 // physics: const AlwaysScrollableScrollPhysics(),
-                physics: isEnd ? AlwaysScrollableScrollPhysics() : NeverScrollableScrollPhysics(),
+                physics: isEnd ? BouncingScrollPhysics() : NeverScrollableScrollPhysics(),
                 // shrinkWrap:true,
               padding: EdgeInsets.only(
                   bottom: MediaQuery.of(context).padding.bottom + 56.sp),
diff --git a/circle_app/lib/network/api.dart b/circle_app/lib/network/api.dart
index 04a691a..5d4eb08 100644
--- a/circle_app/lib/network/api.dart
+++ b/circle_app/lib/network/api.dart
@@ -302,4 +302,7 @@ class Api {
   static const chatRecommendFriend = '/msg-service/im/chat/recommend';
   //是否显示送礼物
   static const isShow_give_gift = '/msg-service/message/show_give_gift/';
+
+  //想要微信
+  static const noticeWxNum = '/user-service/user/updateWxNum/notice/';
 }
\ No newline at end of file
diff --git a/circle_app/lib/network/dio_manager.dart b/circle_app/lib/network/dio_manager.dart
index ccd9ca7..2ee7edc 100644
--- a/circle_app/lib/network/dio_manager.dart
+++ b/circle_app/lib/network/dio_manager.dart
@@ -246,7 +246,7 @@ class DioManager {
             pushLoginPage();
             break;
         }
-        if (responseMap["code"] != 200 && responseMap["code"] != 10000 && !url.contains(Api.checkWxNumState)) {
+        if (responseMap["code"] != 200 && responseMap["code"] != 10000 && !url.contains(Api.checkWxNumState) && responseMap["code"] != 21201) {
           showOKToast(responseMap['msg']);
         }
       }
diff --git a/circle_app/lib/util/util.dart b/circle_app/lib/util/util.dart
index b828696..2148460 100644
--- a/circle_app/lib/util/util.dart
+++ b/circle_app/lib/util/util.dart
@@ -671,16 +671,20 @@ sendCircleCustomMsg(String userId, String data, String desc) async {
   );
   if (createCustomMessageRes.code == 0) {
     String? id = createCustomMessageRes.data?.id;
-    V2TimValueCallback<V2TimMessage> sendMessageRes = await TencentImSDKPlugin
-        .v2TIMManager
-        .getMessageManager()
-        .sendMessage(id: id!, receiver: userId, groupID: '');
-    if (sendMessageRes.code == 0) {
-      // 发送成功
-      showOKToast('发送成功');
-      sendMessageRes.data?.customElem?.data; //自定义data
-      sendMessageRes.data?.customElem?.desc; //自定义desc
-      sendMessageRes.data?.customElem?.extension; //自定义extension
+    if (Get.currentRoute == AppRoutes.Chat) {
+      EventBusManager.fire(SendCoustomMessage(createCustomMessageRes));
+    } else {
+      V2TimValueCallback<V2TimMessage> sendMessageRes = await TencentImSDKPlugin
+          .v2TIMManager
+          .getMessageManager()
+          .sendMessage(id: id!, receiver: userId, groupID: '');
+      if (sendMessageRes.code == 0) {
+        // 发送成功
+        showOKToast('发送成功');
+        sendMessageRes.data?.customElem?.data; //自定义data
+        sendMessageRes.data?.customElem?.desc; //自定义desc
+        sendMessageRes.data?.customElem?.extension; //自定义extension
+      }
     }
   }
 }
diff --git a/circle_app/lib/view/notice.dart b/circle_app/lib/view/notice.dart
index 79bebc8..7c83370 100644
--- a/circle_app/lib/view/notice.dart
+++ b/circle_app/lib/view/notice.dart
@@ -44,7 +44,7 @@ void showFloatingButtonOverlay(
               child: Container(
                 width: Get.width - 16,
                 // margin: EdgeInsets.only(top:10.sp),
-                padding: EdgeInsets.fromLTRB(16.sp, 16.sp, 16.sp, 0),
+                padding: EdgeInsets.fromLTRB(16.sp, 16.sp, 16.sp, 16.sp),
                 decoration: BoxDecoration(
                   borderRadius: BorderRadius.circular(10),
                   color: const Color(0xFF353443),
@@ -62,69 +62,70 @@ void showFloatingButtonOverlay(
                       ),
                     ),
                     const SizedBox(width: 8),
-                    Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Row(
-                          children: [
-                            Container(
-                              // width: 70.sp,
-                              child: Text(
-                                nickname,
-                                overflow: TextOverflow.ellipsis,
-                                style: TextStyle(
-                                  color: Color.fromRGBO(247, 250, 250, 1.0),
-                                  fontSize: 16.sp,
+                    Expanded(
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Row(
+                            children: [
+                              Container(
+                                // width: 70.sp,
+                                child: Text(
+                                  nickname,
+                                  overflow: TextOverflow.ellipsis,
+                                  style: TextStyle(
+                                    color: Color.fromRGBO(247, 250, 250, 1.0),
+                                    fontSize: 16.sp,
+                                  ),
                                 ),
                               ),
-                            ),
-                            SizedBox(width: 8.sp),
-                            Container(
-                              decoration: BoxDecoration(
-                                borderRadius: BorderRadius.circular(17),
-                                gradient: const LinearGradient(
-                                  colors: [
-                                    Color.fromRGBO(141, 255, 248, 1.0),
-                                    Color.fromRGBO(181, 211, 255, 1.0),
-                                  ],
-                                  begin: Alignment.centerLeft,
-                                  end: Alignment.centerRight,
+                              SizedBox(width: 8.sp),
+                              Container(
+                                decoration: BoxDecoration(
+                                  borderRadius: BorderRadius.circular(17),
+                                  gradient: const LinearGradient(
+                                    colors: [
+                                      Color.fromRGBO(141, 255, 248, 1.0),
+                                      Color.fromRGBO(181, 211, 255, 1.0),
+                                    ],
+                                    begin: Alignment.centerLeft,
+                                    end: Alignment.centerRight,
+                                  ),
+                                ),
+                                padding: EdgeInsets.only(
+                                  top: 2.sp,
+                                  // bottom: 2.sp,
+                                  left: 10.sp,
+                                  right: 10.sp,
+                                ),
+                                child: Text(
+                                  ageMsg,
+                                  style: const TextStyle(
+                                    color: Colors.black,
+                                    fontSize: 10,
+                                  ),
                                 ),
                               ),
-                              padding: EdgeInsets.only(
-                                top: 2.sp,
-                                bottom: 2.sp,
-                                left: 10.sp,
-                                right: 10.sp,
-                              ),
-                              child: Text(
-                                ageMsg,
-                                style: const TextStyle(
-                                  color: Colors.black,
-                                  fontSize: 10,
-                                ),
-                              ),
-                            ),
-                          ],
-                        ),
-                        const SizedBox(height: 8),
-                        Text(  event == 0
-                            ? "看了这么久，给我点个喜欢呗~"
-                            : event == 1
-                            ? "我喜欢了你，可以喜欢我一下吗？"
-                            : event == 2
-                            ? "你喜欢的人上线啦，赶紧找他聊天吧！"
-                            : "我也喜欢了你，一起聊聊呗～",
-                          style: TextStyle(
-                            color: Colors.grey,
-                            fontSize: 14.sp,
+                            ],
                           ),
-                          maxLines: 1,
-                          overflow: TextOverflow.ellipsis,
-                        ),
-                      ],
+                          const SizedBox(height: 4),
+                          Text(  event == 0
+                              ? "看了这么久，给我点个喜欢呗~"
+                              : event == 1
+                              ? "我喜欢了你，可以喜欢我一下吗？"
+                              : event == 2
+                              ? "你喜欢的人上线啦，赶紧找他聊天吧！"
+                              : "我也喜欢了你，一起聊聊呗～",
+                            style: TextStyle(
+                              color: Colors.grey,
+                              fontSize: 13.sp,
+                            ),
+                            maxLines: 1,
+                            overflow: TextOverflow.ellipsis,
+                          ),
+                        ],
+                      ),
                     ),
-                    const Spacer(),
                     GestureDetector(
                       onTap: () {
                         countdownTimer.cancel();