circle_app/lib/app/circle/logic.dart

@@ -387,11 +387,11 @@ class VicinityItemBean {
       interests: interests,
       images: List<String>.from(json['images']),
       avatarThumb: json['avatar_thumb'],
-      genderName: json['gender_name'],
+      genderName: json['genderName'],
-      roleName: json['role_name'],
+      roleName: json['roleName'],
-      orientationName: json['orientation_name'],
+      orientationName: json['orientationName'],
-      bgPicUrl: json['bg_picUrl'],
+      bgPicUrl: json['bgPicUrl'],
-      onlineFlag: json['online_flag'],
+      onlineFlag: json['onlineFlag'],
       isOnline: json['isOnline'],
     );
   }

circle_app/lib/app/circle/view.dart

@@ -317,14 +317,18 @@ class _CirclePageState extends State<CirclePage>
                       _buildInfoRow(item),
                       const Spacer(),
                       Container(
-                          margin: EdgeInsets.only(right: 8.sp),
+                        margin: EdgeInsets.only(right: 8.sp),
-                          child: Text(
+                        child: item.isOnline == 1
-                            item.onlineFlag.toString(),
+                            ? Text(
-                            style: TextStyle(
+                                "当前在线",
-                              color: const Color.fromRGBO(247, 250, 250, 1.0),
+                                style: TextStyle(
-                              fontSize: 12.sp,
+                                  color:
-                            ),
+                                      const Color.fromRGBO(247, 250, 250, 1.0),
-                          )),
+                                  fontSize: 12.sp,
+                                ),
+                              )
+                            : Container(),
+                      ),
                     ],
                   ),
                 ),
@@ -487,13 +491,13 @@ class _CirclePageState extends State<CirclePage>
       child: Swiper(
         autoplay: logic.bannerList.length > 1,
         controller: logic.swiperController,
-        autoplayDelay: 6000,
         loop: logic.bannerList.length > 1 ? true : false,
         //  index:logic.index,
         itemBuilder: (BuildContext context, int index) {
+          print(logic.bannerList[index].picUrl);
           return GestureDetector(
             onTap: () async {
-              // print(logic.bannerList[index].param);
+             // print(logic.bannerList[index].param);
               navigateToCustomRoute(logic.bannerList[index]);
             },
             child: SizedBox(
@@ -513,10 +517,10 @@ class _CirclePageState extends State<CirclePage>
           margin: EdgeInsets.all(5.0.sp), // 设置外边距
           alignment: Alignment.bottomCenter,
           builder: DotSwiperPaginationBuilder(
-            color: Color(0x00FFFFFF), // 小圆点的颜色
+            color: Colors.white, // 小圆点的颜色
             activeColor: logic.bannerList.length == 1
                 ? Color(0x00FFFFFF)
-                : Color(0x00FFFFFF), // 当前索引小圆点的颜色
+                : Color(0xFFFF4D7C), // 当前索引小圆点的颜色
           ),
         ),
 //        control: new SwiperControl(),  //左右的那个箭头,在某模拟器中会出现蓝线

circle_app/lib/app/invite/view.dart

@@ -69,7 +69,7 @@ class InvitePage extends StatelessWidget {
                     12.sp,
                     searchContent: 'Tip：'));
                 allSpan.addAll(getTextSpanList(
-                    ' ${logic.homeData!.inviteCount! ?? 0} 位圈友，',
+                    ' ${logic.homeData!.inviteCount! ?? 0} 位同好，',
                     Color(0xFFDC5BFD),
                     12.sp,
                     searchContent: '${logic.homeData!.inviteCount! ?? 0}'));
@@ -78,21 +78,11 @@ class InvitePage extends StatelessWidget {
                     Color(0xFFDC5BFD),
                     12.sp,
                     searchContent: '${logic.homeData!.achieveRewardDay! ?? '0'} '));
-                int maxCount = logic.homeData!.inviteAwardConf!.last.inviteCount ?? 0;
+                allSpan.addAll(getTextSpanList(
-                if (logic.homeData!.inviteCount! >= maxCount) {
+                    ' 再邀请 ${logic.homeData!.diffAwardCount} 位同好可领取更多奖励~',
-                  allSpan.addAll(getTextSpanList(
+                    Color(0xFFDC5BFD),
-                      ' 再邀请可领取更多奖励~',
+                    12.sp,
-                      Color(0xFFDC5BFD),
+                    searchContent: '${logic.homeData!.diffAwardCount}'));
-                      12.sp,
-                      searchContent: ''));
-                } else {
-                  allSpan.addAll(getTextSpanList(
-                      ' 再邀请 ${logic.homeData!.diffAwardCount} 位圈友可领取更多奖励~',
-                      Color(0xFFDC5BFD),
-                      12.sp,
-                      searchContent: '${logic.homeData!.diffAwardCount}'));
-                }
-                
                 
               }
 
@@ -281,7 +271,7 @@ class InvitePage extends StatelessWidget {
                         child: Column(
                           children: [
                             Container(
-                              margin: EdgeInsets.only(top: 15.sp,left: 35.sp,right: 35.sp),
+                              margin: EdgeInsets.only(top: 15.sp),
                               alignment: Alignment.center,
                               child: Image.asset(getMineImage('invite_title'),height: 22.sp,),
                             ),
@@ -472,7 +462,7 @@ void showCodePicker(InviteLogic logic) {
                   Container(
                     margin: EdgeInsets.only(top: 20.sp, left: 20.sp),
                     child: Text(
-                      '请输入邀请您加入APP的圈友的邀请码',
+                      '请输入邀请您加入APP的同好的邀请码',
                       style: TextStyle(color: Colors.white, fontSize: 14.sp),
                     ),
                   ),

circle_app/lib/app/minefragment/logic.dart

@@ -29,7 +29,7 @@ class MinefragmentLogic extends GetxController {
 
   String enterHomeInfoMsg = "进入主页";
   String joinedCircle = "";
-  String vipMsg = "十几种专属特权等你领取";
+  String vipMsg = "九大专属特权等你领取";
 
   @override
   void onInit() async {

circle_app/lib/common/Widgets/open_vip_tip/view.dart

@@ -83,7 +83,7 @@ class Open_vip_tipPage extends StatelessWidget {
                   Positioned(
                       top: 24.sp,
                       child: Text(
-                        '十几种专属会员特权',
+                        '会员九大特权',
                         style: TextStyle(color: Colors.white, fontSize: 16.sp),
                       )),
                   Positioned(