diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 25bdb25f..d44282d3 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
   <application android:name="io.flutter.app.FlutterApplication" android:label="小蜜蜂智慧小区" android:icon="@mipmap/ic_launcher" android:networkSecurityConfig="@xml/network_security_config">
   <service android:name="com.amap.api.location.APSService"></service>
   <meta-data android:name="com.amap.api.v2.apikey"
-                 android:value="717cf8c606307809bcbd6661123b9837"/>
+                 android:value="f6361c0537bf2d6ddb898b10618d3726"/>
     <activity android:name=".MainActivity" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
       <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
diff --git a/assets/icons/community_comment.png b/assets/icons/community_comment.png
new file mode 100644
index 00000000..e55e4523
Binary files /dev/null and b/assets/icons/community_comment.png differ
diff --git a/assets/icons/community_comment_is.png b/assets/icons/community_comment_is.png
new file mode 100644
index 00000000..de77d99e
Binary files /dev/null and b/assets/icons/community_comment_is.png differ
diff --git a/assets/icons/community_like.png b/assets/icons/community_like.png
new file mode 100644
index 00000000..415b4a72
Binary files /dev/null and b/assets/icons/community_like.png differ
diff --git a/assets/icons/community_like_is.png b/assets/icons/community_like_is.png
new file mode 100644
index 00000000..49bbb89d
Binary files /dev/null and b/assets/icons/community_like_is.png differ
diff --git a/assets/icons/icon_more_black.png b/assets/icons/icon_more_black.png
new file mode 100644
index 00000000..33d8ab61
Binary files /dev/null and b/assets/icons/icon_more_black.png differ
diff --git a/assets/icons/icon_sort.png b/assets/icons/icon_sort.png
new file mode 100644
index 00000000..3d00b9e6
Binary files /dev/null and b/assets/icons/icon_sort.png differ
diff --git a/assets/images/community_my_bg.png b/assets/images/community_my_bg.png
new file mode 100644
index 00000000..56d9ff08
Binary files /dev/null and b/assets/images/community_my_bg.png differ
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 5973ae27..ad11d758 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -15,38 +15,6 @@ PODS:
     - AMapFoundation (~> 1.6.8)
   - device_info_plus (0.0.1):
     - Flutter
-  - Firebase/CoreOnly (8.3.0):
-    - FirebaseCore (= 8.3.0)
-  - Firebase/Crashlytics (8.3.0):
-    - Firebase/CoreOnly
-    - FirebaseCrashlytics (~> 8.3.0)
-  - firebase_core (1.4.0):
-    - Firebase/CoreOnly (= 8.3.0)
-    - Flutter
-  - firebase_crashlytics (2.1.1):
-    - Firebase/Crashlytics (= 8.3.0)
-    - firebase_core
-    - Flutter
-  - FirebaseCore (8.3.0):
-    - FirebaseCoreDiagnostics (~> 8.0)
-    - GoogleUtilities/Environment (~> 7.4)
-    - GoogleUtilities/Logger (~> 7.4)
-  - FirebaseCoreDiagnostics (8.6.0):
-    - GoogleDataTransport (~> 9.0)
-    - GoogleUtilities/Environment (~> 7.4)
-    - GoogleUtilities/Logger (~> 7.4)
-    - nanopb (~> 2.30908.0)
-  - FirebaseCrashlytics (8.3.0):
-    - FirebaseCore (~> 8.0)
-    - FirebaseInstallations (~> 8.0)
-    - GoogleDataTransport (~> 9.0)
-    - nanopb (~> 2.30908.0)
-    - PromisesObjC (~> 1.2)
-  - FirebaseInstallations (8.6.0):
-    - FirebaseCore (~> 8.0)
-    - GoogleUtilities/Environment (~> 7.4)
-    - GoogleUtilities/UserDefaults (~> 7.4)
-    - PromisesObjC (< 3.0, >= 1.2)
   - Flutter (1.0.0)
   - fluwx (0.0.1):
     - Flutter
@@ -54,16 +22,6 @@ PODS:
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
-  - GoogleDataTransport (9.1.0):
-    - GoogleUtilities/Environment (~> 7.2)
-    - nanopb (~> 2.30908.0)
-    - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/Environment (7.5.1):
-    - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/Logger (7.5.1):
-    - GoogleUtilities/Environment
-  - GoogleUtilities/UserDefaults (7.5.1):
-    - GoogleUtilities/Logger
   - image_picker (0.0.1):
     - Flutter
   - JCore (2.7.1)
@@ -74,11 +32,6 @@ PODS:
     - JCore (= 2.7.1)
     - JPush (= 3.7.0)
   - MTBBarcodeScanner (5.0.11)
-  - nanopb (2.30908.0):
-    - nanopb/decode (= 2.30908.0)
-    - nanopb/encode (= 2.30908.0)
-  - nanopb/decode (2.30908.0)
-  - nanopb/encode (2.30908.0)
   - open_file (0.0.1):
     - Flutter
   - package_info (0.0.1):
@@ -89,7 +42,6 @@ PODS:
     - Flutter
   - "permission_handler (5.1.0+2)":
     - Flutter
-  - PromisesObjC (1.2.12)
   - qr_code_scanner (0.2.0):
     - Flutter
     - MTBBarcodeScanner
@@ -112,8 +64,6 @@ DEPENDENCIES:
   - amap_flutter_location (from `.symlinks/plugins/amap_flutter_location/ios`)
   - amap_flutter_map (from `.symlinks/plugins/amap_flutter_map/ios`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
-  - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
-  - firebase_crashlytics (from `.symlinks/plugins/firebase_crashlytics/ios`)
   - Flutter (from `Flutter`)
   - fluwx (from `.symlinks/plugins/fluwx/ios`)
   - image_picker (from `.symlinks/plugins/image_picker/ios`)
@@ -136,19 +86,10 @@ SPEC REPOS:
     - AMap3DMap
     - AMapFoundation
     - AMapLocation
-    - Firebase
-    - FirebaseCore
-    - FirebaseCoreDiagnostics
-    - FirebaseCrashlytics
-    - FirebaseInstallations
     - FMDB
-    - GoogleDataTransport
-    - GoogleUtilities
     - JCore
     - JPush
     - MTBBarcodeScanner
-    - nanopb
-    - PromisesObjC
     - WechatOpenSDK
 
 EXTERNAL SOURCES:
@@ -160,10 +101,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/amap_flutter_map/ios"
   device_info_plus:
     :path: ".symlinks/plugins/device_info_plus/ios"
-  firebase_core:
-    :path: ".symlinks/plugins/firebase_core/ios"
-  firebase_crashlytics:
-    :path: ".symlinks/plugins/firebase_crashlytics/ios"
   Flutter:
     :path: Flutter
   fluwx:
@@ -204,30 +141,19 @@ SPEC CHECKSUMS:
   AMapFoundation: 32e9a0264ee62f5aa2aaf82bdafdda7985ce09c7
   AMapLocation: 3ec0e9bf53800b40cceb313cbd047743f75e2483
   device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
-  Firebase: 817b9171d0d51dccc458b94a5e8edff6b1dd323d
-  firebase_core: 72374607c8c6f5a0adc0559e5c5bf57deda975e3
-  firebase_crashlytics: f5c47b951fb9b494f2bc4212c8aa8de3ed8417cf
-  FirebaseCore: a6dba751680d7033b9d3831e1cfc95ead0605118
-  FirebaseCoreDiagnostics: 3721920bde3a9a6d5aa093c1d25e9d3e47f694af
-  FirebaseCrashlytics: 3d83f2e8a47f476f47c82ff4536b169df6781271
-  FirebaseInstallations: 0ede6ffcd215b8f93c19d9b06c1c54e2d4107e98
   Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
   fluwx: 07a55ed66bf3a4961e836a2a411b02dcada32902
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  GoogleDataTransport: 85fd18ff3019bb85d3f2c551d04c481dedf71fc9
-  GoogleUtilities: 3df19e3c24f7bbc291d8b5809aa6b0d41e642437
   image_picker: 50e7c7ff960e5f58faa4d1f4af84a771c671bc4a
   JCore: 9d5bda3a172c65bbe14f2806ab0f6246f8a06065
   JPush: 1fd7a326e7e6588eba517659ce1b79a144e54938
   jpush_flutter: d5fd523a73277ed66d453fc7ac1c981d1fa525e2
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
-  nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
   open_file: 02eb5cb6b21264bd3a696876f5afbfb7ca4f4b7d
   package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
   package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
   path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
   permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0
-  PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
   qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
   share: 0b2c3e82132f5888bccca3351c504d0003b3b410
   shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
diff --git a/lib/const/resource.dart b/lib/const/resource.dart
index de0aadc0..557fb287 100644
--- a/lib/const/resource.dart
+++ b/lib/const/resource.dart
@@ -180,6 +180,22 @@ class R {
   /// ![preview](file:///Users/datang/aku_new_community/assets/icons/commerc.png)
   static const String ASSETS_ICONS_COMMERC_PNG = 'assets/icons/commerc.png';
 
+  /// ![preview](file:///Users/datang/aku_new_community/assets/icons/community_comment.png)
+  static const String ASSETS_ICONS_COMMUNITY_COMMENT_PNG =
+      'assets/icons/community_comment.png';
+
+  /// ![preview](file:///Users/datang/aku_new_community/assets/icons/community_comment_is.png)
+  static const String ASSETS_ICONS_COMMUNITY_COMMENT_IS_PNG =
+      'assets/icons/community_comment_is.png';
+
+  /// ![preview](file:///Users/datang/aku_new_community/assets/icons/community_like.png)
+  static const String ASSETS_ICONS_COMMUNITY_LIKE_PNG =
+      'assets/icons/community_like.png';
+
+  /// ![preview](file:///Users/datang/aku_new_community/assets/icons/community_like_is.png)
+  static const String ASSETS_ICONS_COMMUNITY_LIKE_IS_PNG =
+      'assets/icons/community_like_is.png';
+
   /// ![preview](file:///Users/datang/aku_new_community/assets/icons/complaint.png)
   static const String ASSETS_ICONS_COMPLAINT_PNG = 'assets/icons/complaint.png';
 
@@ -425,6 +441,10 @@ class R {
   /// ![preview](file:///Users/datang/aku_new_community/assets/icons/icon_more.png)
   static const String ASSETS_ICONS_ICON_MORE_PNG = 'assets/icons/icon_more.png';
 
+  /// ![preview](file:///Users/datang/aku_new_community/assets/icons/icon_more_black.png)
+  static const String ASSETS_ICONS_ICON_MORE_BLACK_PNG =
+      'assets/icons/icon_more_black.png';
+
   /// ![preview](file:///Users/datang/aku_new_community/assets/icons/icon_my_car.png)
   static const String ASSETS_ICONS_ICON_MY_CAR_PNG =
       'assets/icons/icon_my_car.png';
@@ -489,6 +509,9 @@ class R {
   static const String ASSETS_ICONS_ICON_SETTING_PNG =
       'assets/icons/icon_setting.png';
 
+  /// ![preview](file:///Users/datang/aku_new_community/assets/icons/icon_sort.png)
+  static const String ASSETS_ICONS_ICON_SORT_PNG = 'assets/icons/icon_sort.png';
+
   /// ![preview](file:///Users/datang/aku_new_community/assets/icons/icon_thumbsUp.png)
   static const String ASSETS_ICONS_ICON_THUMBSUP_PNG =
       'assets/icons/icon_thumbsUp.png';
@@ -842,6 +865,10 @@ class R {
   static const String ASSETS_IMAGES_COMMITMENT_PNG =
       'assets/images/commitment.png';
 
+  /// ![preview](file:///Users/datang/aku_new_community/assets/images/community_my_bg.png)
+  static const String ASSETS_IMAGES_COMMUNITY_MY_BG_PNG =
+      'assets/images/community_my_bg.png';
+
   /// ![preview](file:///Users/datang/aku_new_community/assets/images/contact_manager.png)
   static const String ASSETS_IMAGES_CONTACT_MANAGER_PNG =
       'assets/images/contact_manager.png';
diff --git a/lib/constants/api.dart b/lib/constants/api.dart
index b9a1034f..42258def 100644
--- a/lib/constants/api.dart
+++ b/lib/constants/api.dart
@@ -1,9 +1,9 @@
 class API {
   ///HOST
-  static const String host = 'http://39.103.177.88:8804';
+  static const String host = 'http://shop.kaidalai.cn';
 
   ///接口基础地址
-  static const String baseURL = '$host/IntelligentCommunity/app';
+  static const String baseURL = '$host/api/app';
 
   ///静态资源路径
   static String get resource => '$host/static';
diff --git a/lib/main_initialize.dart b/lib/main_initialize.dart
index 550b5707..56827f80 100644
--- a/lib/main_initialize.dart
+++ b/lib/main_initialize.dart
@@ -64,7 +64,7 @@ class MainInitialize {
       });
     } on PlatformException {}
     jpush.setup(
-      appKey: "00e20fef79ee804d5c9abb54",
+      appKey: "5f42cbb15abcdda6f8aeb925",
       channel: "developer-default",
       production: false,
       debug: true,
diff --git a/lib/model/community/event_item_model.dart b/lib/model/community/event_item_model.dart
index 993c6fa0..412ee678 100644
--- a/lib/model/community/event_item_model.dart
+++ b/lib/model/community/event_item_model.dart
@@ -11,9 +11,12 @@ class EventItemModel {
   String? gambitTitle;
   String? createDate;
   List<LikeNames>? likeNames;
+  num? likeNamesNum;
   List<ImgModel>? imgUrls;
   List<ImgModel>? headSculptureImgUrl;
+  num? gambitThemeCommentNum;
   List<GambitThemeCommentVoList>? gambitThemeCommentVoList;
+  num? views;
 
   DateTime? get date => DateUtil.getDateTime(createDate!);
 
@@ -27,9 +30,10 @@ class EventItemModel {
       this.gambitTitle,
       this.createDate,
       this.likeNames,
+        this.likeNamesNum,
       this.imgUrls,
       this.headSculptureImgUrl,
-      this.gambitThemeCommentVoList});
+      this.gambitThemeCommentVoList,this.gambitThemeCommentNum,this.views});
 
   EventItemModel.fromJson(Map<String, dynamic> json) {
     id = json['id'];
@@ -40,6 +44,9 @@ class EventItemModel {
     content = json['content'];
     gambitTitle = json['gambitTitle'];
     createDate = json['createDate'];
+    likeNamesNum = json['likeNamesNum'];
+    views = json['views'];
+    gambitThemeCommentNum = json['gambitThemeCommentNum'];
     if (json['likeNames'] != null) {
       likeNames = [];
       json['likeNames'].forEach((v) {
@@ -80,6 +87,9 @@ class EventItemModel {
     data['content'] = this.content;
     data['gambitTitle'] = this.gambitTitle;
     data['createDate'] = this.createDate;
+    data['likeNamesNum'] = this.likeNamesNum;
+    data['views'] = this.views;
+    data['gambitThemeCommentNum'] = this.gambitThemeCommentNum;
     if (this.likeNames != null) {
       data['likeNames'] = this.likeNames!.map((v) => v.toJson()).toList();
     }
diff --git a/lib/pages/splash/splash_page.dart b/lib/pages/splash/splash_page.dart
index 60096310..6b81461a 100644
--- a/lib/pages/splash/splash_page.dart
+++ b/lib/pages/splash/splash_page.dart
@@ -90,14 +90,15 @@ class _SplashPageState extends State<SplashPage> {
 
           // ),
           actions: [
-            CupertinoDialogAction(
-              child: Text('同意'),
-              onPressed: () => Get.back(result: true),
-            ),
+
             CupertinoDialogAction(
               child: Text('拒绝'),
               onPressed: () => Get.back(result: false),
             ),
+            CupertinoDialogAction(
+              child: Text('同意'),
+              onPressed: () => Get.back(result: true),
+            ),
           ],
         );
       },
diff --git a/lib/ui/community/community_func.dart b/lib/ui/community/community_func.dart
index 8eee3f2e..94c6ccb2 100644
--- a/lib/ui/community/community_func.dart
+++ b/lib/ui/community/community_func.dart
@@ -3,6 +3,7 @@ import 'package:aku_new_community/model/community/activity_item_model.dart';
 import 'package:aku_new_community/model/community/board_model.dart';
 import 'package:aku_new_community/model/community/community_topic_model.dart';
 import 'package:aku_new_community/model/community/hot_news_model.dart';
+import 'package:aku_new_community/model/community/my_event_item_model.dart';
 import 'package:aku_new_community/model/community/swiper_model.dart';
 import 'package:aku_new_community/model/good/category_model.dart';
 import 'package:aku_new_community/model/good/market_swiper_model.dart';
@@ -26,6 +27,18 @@ class CommunityFunc {
         .toList();
   }
 
+  ///我的动态
+  static Future<List<MyEventItemModel>> getMyEventItem() async {
+    BaseListModel model = await NetUtil().getList(
+      API.community.myEvent,
+      params: {'pageNum': 1, 'size': 8},
+    );
+    if (model.tableList!.length == 0) return [];
+    return model.tableList!
+        .map((e) => MyEventItemModel.fromJson(e))
+        .toList();
+  }
+
   ///查询热门资讯
   static Future<List<HotNewsModel>> getHotNews() async {
     BaseListModel model = await NetUtil().getList(
diff --git a/lib/ui/community/community_views/community_page.dart b/lib/ui/community/community_views/community_page.dart
index 2562028d..1c15cac5 100644
--- a/lib/ui/community/community_views/community_page.dart
+++ b/lib/ui/community/community_views/community_page.dart
@@ -23,6 +23,7 @@ import 'package:aku_new_community/utils/login_util.dart';
 import 'package:aku_new_community/utils/network/base_list_model.dart';
 import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
+import 'package:aku_new_community/widget/tab_bar/bee_tab_bar.dart';
 import 'package:bot_toast/bot_toast.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -61,8 +62,8 @@ class _CommunityPageState extends State<CommunityPage>
     super.initState();
     _easyRefreshController = EasyRefreshController();
     final userProvider = Provider.of<UserProvider>(context, listen: false);
-    if (userProvider.isLogin) _tabs = ['最新', '话题', '我的'];
-    if (userProvider.isNotLogin) _tabs = ['最新', '话题'];
+    if (userProvider.isLogin) _tabs = ['附近社区', '我的动态'];
+    if (userProvider.isNotLogin) _tabs = ['附近社区'];
     _tabController = TabController(
       vsync: this,
       length: _tabs.length,
@@ -84,17 +85,41 @@ class _CommunityPageState extends State<CommunityPage>
     return Scaffold(
       appBar: AppBar(
         titleSpacing: 10.0,
-        title: Row(crossAxisAlignment: CrossAxisAlignment.center, children: [
-          Text(
-            '附近社区',
-            style: TextStyle(
-              fontWeight: FontWeight.bold,
-              fontSize: 32.sp,
-              color: Color(0xff333333),
-            ),
-            textAlign: TextAlign.center,
-          ),
-        ]),
+        title: Align(
+            alignment: Alignment.centerLeft,
+            child: Theme(
+              data: ThemeData(
+                splashColor: Colors.transparent,
+                highlightColor: Colors.transparent,
+              ),
+              child: TabBar(
+                onTap: (index) {
+                  setState(() {});
+                },
+                controller: _tabController,
+                indicatorColor: Color(0xffffc40c),
+                indicatorPadding: EdgeInsets.only(bottom: 15.w),
+                indicator: const BoxDecoration(),
+                tabs: _tabs.map((e) => Tab(text: e)).toList(),
+                labelStyle:
+                    TextStyle(fontSize: 32.sp, fontWeight: FontWeight.bold),
+                labelColor: Color(0xD9000000),
+                unselectedLabelStyle: TextStyle(fontSize: 32.sp),
+                unselectedLabelColor: Color(0x73000000),
+                isScrollable: true,
+              ),
+            )),
+        // Row(crossAxisAlignment: CrossAxisAlignment.center, children: [
+        //   Text(
+        //     '附近社区',
+        //     style: TextStyle(
+        //       fontWeight: FontWeight.bold,
+        //       fontSize: 32.sp,
+        //       color: Color(0xff333333),
+        //     ),
+        //     textAlign: TextAlign.center,
+        //   ),
+        // ]),
         backgroundColor: Colors.white,
         actions: [
           Padding(
@@ -106,12 +131,10 @@ class _CommunityPageState extends State<CommunityPage>
                 if (result == true) {
                   switch (_tabController!.index) {
                     case 0:
-                      newKey.currentState!.refresh();
+                      _easyRefreshController.callRefresh();
+
                       break;
                     case 1:
-                      // topicKey.currentState!.refresh();
-                      break;
-                    case 2:
                       myKey.currentState!.refresh();
                       break;
                   }
@@ -122,58 +145,100 @@ class _CommunityPageState extends State<CommunityPage>
             ),
           )
         ],
-        bottom: PreferredSize(
-            preferredSize: Size.fromHeight(90.w), child: _geSearch()),
+        // bottom: _tabController!.index==0?PreferredSize(
+        //     preferredSize: Size.fromHeight(90.w), child: _geSearch()):
+        // PreferredSize(
+        //     preferredSize: Size.fromHeight(311.w), child: Container(
+        //   child: Column(
+        //     crossAxisAlignment: CrossAxisAlignment.center,
+        //     children: [
+        //       Image.asset(R.ASSETS_ICONS_ICON_LOGISTICS_PNG,width: 132.w,height: 132.w,),
+        //       32.hb,
+        //       '吼姆拉'.text.size(32.sp).fontWeight(FontWeight.bold).color(Color(0xD9000000)).make(),
+        //       12.hb,
+        //       '当一个新时代的天之圣杯'.text.size(24.sp).color(Color(0x73000000)).make(),
+        //
+        //     ],
+        //   ),
+        // )),
       ),
-      // floatingActionButton:  FloatingActionButton(
-      //     onPressed: () async {
-      //       if (LoginUtil.isNotLogin) return;
-      //       bool? result = await Get.to(() => AddNewEventPage());
-      //       if (result == true) {
-      //         switch (_tabController!.index) {
-      //           case 0:
-      //             newKey.currentState!.refresh();
-      //             break;
-      //           case 1:
-      //             topicKey.currentState!.refresh();
-      //             break;
-      //           case 2:
-      //             myKey.currentState!.refresh();
-      //             break;
-      //         }
-      //       }
-      //     },
-      //     heroTag: 'event_add',
-      //     child: Icon(Icons.add),
-      //   ),
 
-      body: EasyRefresh(
-        firstRefresh: true,
-        header: MaterialHeader(),
-        controller: _easyRefreshController,
-        onRefresh: () async {
-          await (getNewInfo());
-          _gambitModels = await CommunityFunc.getListGambit();
-          _hotNewsModels = await CommunityFunc.getHotNews();
-          _onload = false;
-          setState(() {});
-        },
-        child: _onload
-            ? SizedBox()
-            : ListView(
-                children: [
-                  2.hb,
-                  _hotNewsModels.isEmpty ? SizedBox() : _getInfo(),
-                  16.hb,
-                  _gambitModels.isEmpty ? SizedBox() : _getNews(),
-                  16.hb,
-                  ..._newItems
-                      .map((e) => ChatCard(
-                            model: e,
-                          ))
-                      .toList()
-                ],
-              ),
+      body: TabBarView(
+        children: userProvider.isLogin
+            ? [
+                EasyRefresh(
+                  firstRefresh: true,
+                  header: MaterialHeader(),
+                  controller: _easyRefreshController,
+                  onRefresh: () async {
+                    await (getNewInfo());
+                    _gambitModels = await CommunityFunc.getListGambit();
+                    _hotNewsModels = await CommunityFunc.getHotNews();
+                    _onload = false;
+                    setState(() {});
+                  },
+                  child: _onload
+                      ? SizedBox()
+                      : ListView(
+                          children: [
+                            _geSearch(),
+                            2.hb,
+                            _hotNewsModels.isEmpty ? SizedBox() : _getInfo(),
+                            16.hb,
+                            _gambitModels.isEmpty ? SizedBox() : _getNews(),
+                            16.hb,
+                            ..._newItems
+                                .map((e) => ChatCard(
+                                      model: e,onDelete:(){
+                              _easyRefreshController.callRefresh();
+                              setState(() {
+
+                              });
+                              }
+                                    ))
+                                .toList()
+                          ],
+                        ),
+                ),
+                MyCommunityView(key: myKey),
+              ]
+            : [
+                EasyRefresh(
+                  firstRefresh: true,
+                  header: MaterialHeader(),
+                  controller: _easyRefreshController,
+                  onRefresh: () async {
+                    await (getNewInfo());
+                    _gambitModels = await CommunityFunc.getListGambit();
+                    _hotNewsModels = await CommunityFunc.getHotNews();
+                    _onload = false;
+                    setState(() {});
+                  },
+                  child: _onload
+                      ? SizedBox()
+                      : ListView(
+                          children: [
+                            _geSearch(),
+                            2.hb,
+                            _hotNewsModels.isEmpty ? SizedBox() : _getInfo(),
+                            16.hb,
+                            _gambitModels.isEmpty ? SizedBox() : _getNews(),
+                            16.hb,
+                            ..._newItems
+                                .map((e) => ChatCard(
+                                      model: e,onDelete:() {
+                              _easyRefreshController.callRefresh();
+                              setState(() {
+
+                              });
+                            }
+                                    ))
+                                .toList()
+                          ],
+                        ),
+                ),
+              ],
+        controller: _tabController,
       ),
 
       // ListView(
@@ -282,16 +347,19 @@ class _CommunityPageState extends State<CommunityPage>
         Spacer(),
         GestureDetector(
           onTap: onTap,
-          child: Row(
-            children: [
-              suffixTitle.text.size(24.sp).color(Color(0xFF999999)).make(),
-              8.wb,
-              Icon(
-                CupertinoIcons.chevron_forward,
-                size: 24.w,
-                color: Color(0xFF999999),
-              ),
-            ],
+          child: Container(
+            color: Colors.transparent,
+            child: Row(
+              children: [
+                suffixTitle.text.size(24.sp).color(Color(0xFF999999)).make(),
+                8.wb,
+                Icon(
+                  CupertinoIcons.chevron_forward,
+                  size: 24.w,
+                  color: Color(0xFF999999),
+                ),
+              ],
+            ),
           ),
         ),
         //24.wb,
@@ -427,8 +495,8 @@ class _CommunityPageState extends State<CommunityPage>
 
   _geSearch() {
     return Container(
-      margin: EdgeInsets.symmetric(horizontal: 32.w),
-      padding: EdgeInsets.only(bottom: 20.w),
+      padding: EdgeInsets.only(bottom: 20.w,left: 32.w,right: 32.w),
+      color: Colors.white,
       child: MaterialButton(
         materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
         height: 74.w,
diff --git a/lib/ui/community/community_views/event_detail_page.dart b/lib/ui/community/community_views/event_detail_page.dart
index de8aa8d1..80b6aca5 100644
--- a/lib/ui/community/community_views/event_detail_page.dart
+++ b/lib/ui/community/community_views/event_detail_page.dart
@@ -1,18 +1,32 @@
+import 'dart:math';
+
 import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/model/community/event_item_model.dart';
-import 'package:aku_new_community/ui/community/community_views/widgets/chat_card.dart';
+import 'package:aku_new_community/provider/user_provider.dart';
+import 'package:aku_new_community/ui/community/community_views/widgets/chat_card_detail.dart';
+import 'package:aku_new_community/ui/community/community_views/widgets/send_a_chat.dart';
+import 'package:aku_new_community/utils/login_util.dart';
 import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
+import 'package:bot_toast/bot_toast.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:aku_new_community/utils/headers.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:get/get.dart';
+import 'package:provider/provider.dart';
+import 'package:velocity_x/velocity_x.dart';
 
 class EventDetailPage extends StatefulWidget {
   final int? themeId;
+  final EventItemModel eventItemModel;
+  final VoidCallback? onDelete;
 
   EventDetailPage({
     Key? key,
     required this.themeId,
+    required this.eventItemModel, this.onDelete,
   }) : super(key: key);
 
   @override
@@ -23,10 +37,89 @@ class _EventDetailPageState extends State<EventDetailPage> {
   EasyRefreshController _refreshController = EasyRefreshController();
   EventItemModel? _model;
 
+  bool get _isMyself {
+    final userProvider = Provider.of<UserProvider>(context, listen: false);
+    return (userProvider.userInfoModel?.id ?? -1) ==
+        widget.eventItemModel.createId;
+  }
+
+  @override
+  void initState() {
+    // TODO: implement initState
+
+    super.initState();
+  }
+
   @override
   Widget build(BuildContext context) {
     return BeeScaffold(
       title: '详情',
+      bottomNavi: _bottomButton(),
+      actions: [
+        PopupMenuButton(
+          shape:
+              RoundedRectangleBorder(borderRadius: BorderRadius.circular(8.w)),
+          itemBuilder: (context) {
+            return [
+              _isMyself
+                  ? PopupMenuItem(
+                      child: '删除'.text.isIntrinsic.make(),
+                      value: 0,
+                    )
+                  : PopupMenuItem(
+                      child: '举报'.text.isIntrinsic.make(),
+                      value: 0,
+                    ),
+            ];
+          },
+          onSelected: (dynamic _) async {
+            if (LoginUtil.isNotLogin) return;
+            if (!_isMyself) {
+              VoidCallback cancel = BotToast.showLoading();
+              await Future.delayed(
+                  Duration(milliseconds: 500 + Random().nextInt(500)));
+              cancel();
+              BotToast.showText(text: '举报成功');
+            } else {
+              bool? result = await Get.dialog(CupertinoAlertDialog(
+                title: '你确定删除吗'.text.isIntrinsic.make(),
+                actions: [
+                  CupertinoDialogAction(
+                    child: '取消'.text.black.isIntrinsic.make(),
+                    onPressed: () => Get.back(),
+                  ),
+                  CupertinoDialogAction(
+                    child: '确定'.text.color(Colors.orange).isIntrinsic.make(),
+                    onPressed: () => Get.back(result: true),
+                  ),
+                ],
+              ));
+
+              if (result == true) {
+                await NetUtil().get(
+                  API.community.deleteMyEvent,
+                  params: {'themeId': widget.themeId},
+                  showMessage: true,
+                );
+                if (widget.onDelete != null) {
+                  widget.onDelete!();
+                  Get.back();
+                }
+              }
+            }
+          },
+          child: Container(
+              width: 40.w,
+              height: 32.w,
+              alignment: Alignment.center,
+              child: Image.asset(
+                R.ASSETS_ICONS_ICON_MORE_BLACK_PNG,
+                width: 40.w,
+                height: 32.w,
+                fit: BoxFit.fitHeight,
+              )),
+        ).paddingOnly(right: 32.w),
+      ],
       body: EasyRefresh(
         controller: _refreshController,
         header: MaterialHeader(),
@@ -43,7 +136,7 @@ class _EventDetailPageState extends State<EventDetailPage> {
             ? SizedBox()
             : ListView(
                 children: [
-                  ChatCard(
+                  ChatCardDetail(
                     model: _model,
                     hideLine: true,
                     canTap: false,
@@ -53,4 +146,104 @@ class _EventDetailPageState extends State<EventDetailPage> {
       ),
     );
   }
+
+  _bottomButton() {
+    final userProvider = Provider.of<UserProvider>(context);
+    return Container(
+        width: double.infinity,
+        height: 100.w,
+        decoration: BoxDecoration(color: Colors.white, boxShadow: [
+          BoxShadow(
+              color: Color(0x4D000000),
+              offset: Offset(0.0, -1), //阴影xy轴偏移量
+              blurRadius: 0, //阴影模糊程度
+              spreadRadius: 0 //阴影扩散程度
+              )
+        ]
+            ),
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          mainAxisSize: MainAxisSize.max,
+          children: [
+            Expanded(
+              child: GestureDetector(
+                onTap: (){
+                  if (widget.eventItemModel.isComment == 1)
+                    SendAChat.send(
+                      parentId: 0,
+                      themeId: widget.eventItemModel.id,
+                    );
+                  else
+                    BotToast.showText(text: '不可评论');
+                },
+                child: Container(
+                  color: Colors.transparent,
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.center,
+
+                    children: [
+                      Image.asset(R.ASSETS_ICONS_COMMUNITY_COMMENT_PNG,width: 50.w,height: 50.w,),
+                      //Image.asset(widget.model!.isComment!=1?R.ASSETS_ICONS_COMMUNITY_COMMENT_PNG:R.ASSETS_ICONS_COMMUNITY_COMMENT_IS_PNG,width: 32.w,height: 32.w,),
+                      5.wb,
+                      '评论'
+                          .text
+                          .size(30.sp)
+                          .color(Color(0xFF999999))
+                          .make(),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+
+            Expanded(
+              child: GestureDetector(
+                onTap: ()async{
+                  await NetUtil().get(
+                    API.community.like,
+                    params: {'themeId': widget.eventItemModel.id},
+                    showMessage: true,
+                  );
+                  setState(() {
+                    if (widget.eventItemModel.isLike == 0) {
+                      widget.eventItemModel.likeNames!.add(
+                        LikeNames(
+                          id: Random().nextInt(1000),
+                          name: userProvider.userInfoModel!.nickName,
+                        ),
+                      );
+                    } else {
+                      widget.eventItemModel.likeNames!.removeWhere(
+                              (element) =>
+                          element.name ==
+                              userProvider.userInfoModel!.nickName);
+                    }
+                    widget.eventItemModel.isLike =
+                    (widget.eventItemModel.isLike == 1) ? 0 : 1;
+                  });
+                },
+                child: Container(
+                  color: Colors.transparent,
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      Image.asset(widget.eventItemModel.isLike!=1? R.ASSETS_ICONS_COMMUNITY_LIKE_PNG:R.ASSETS_ICONS_COMMUNITY_LIKE_IS_PNG,width: 50.w,height: 50.w,),
+                      5.wb,
+                      '点赞'
+                          .text
+                          .size(30.sp)
+                          .color(Color(0xFF999999))
+                          .make(),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+
+          ],
+        )
+
+    );
+  }
+
 }
diff --git a/lib/ui/community/community_views/my_community_view.dart b/lib/ui/community/community_views/my_community_view.dart
index e69be581..2483bd6f 100644
--- a/lib/ui/community/community_views/my_community_view.dart
+++ b/lib/ui/community/community_views/my_community_view.dart
@@ -1,10 +1,21 @@
 import 'package:aku_new_community/constants/api.dart';
+import 'package:aku_new_community/main_initialize.dart';
+import 'package:aku_new_community/model/common/img_model.dart';
 import 'package:aku_new_community/model/community/my_event_item_model.dart';
 import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart';
 import 'package:aku_new_community/ui/community/community_views/widgets/my_event_card.dart';
 import 'package:aku_new_community/utils/headers.dart';
+import 'package:aku_new_community/utils/login_util.dart';
+import 'package:aku_new_community/utils/network/net_util.dart';
+import 'package:aku_new_community/widget/line/vertical_line_painter.dart';
+import 'package:aku_new_community/widget/picker/bee_image_preview.dart';
+import 'package:aku_new_community/widget/views/bee_grid_image_view.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:get/get.dart';
+
+import '../community_func.dart';
 
 class MyCommunityView extends StatefulWidget {
   MyCommunityView({Key? key}) : super(key: key);
@@ -16,6 +27,8 @@ class MyCommunityView extends StatefulWidget {
 class MyCommunityViewState extends State<MyCommunityView>
     with AutomaticKeepAliveClientMixin {
   EasyRefreshController _refreshController = EasyRefreshController();
+  bool _onload = true;
+  List<MyEventItemModel> _myEventItems = [];
 
   refresh() {
     _refreshController.callRefresh();
@@ -24,7 +37,93 @@ class MyCommunityViewState extends State<MyCommunityView>
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    return BeeListView<MyEventItemModel>(
+    return EasyRefresh(
+      firstRefresh: true,
+      header: MaterialHeader(),
+      controller: _refreshController,
+      onRefresh: () async {
+        // API.community.myEvent
+        _myEventItems = await CommunityFunc.getMyEventItem();
+        _onload = false;
+        setState(() {});
+      },
+      child: _onload
+          ? SizedBox()
+          : ListView(
+        children: [
+          Container(
+            width: double.infinity,
+            decoration: BoxDecoration(
+              image: new DecorationImage(
+                image: new AssetImage(R.ASSETS_IMAGES_COMMUNITY_MY_BG_PNG,),
+                fit: BoxFit.fitWidth
+              ),
+            ),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.center,
+              children: [
+                12.hb,
+                Image.asset(R.ASSETS_ICONS_ICON_LOGISTICS_PNG,width: 132.w,height: 132.w,),
+                32.hb,
+                '吼姆拉'.text.size(32.sp).fontWeight(FontWeight.bold).color(Color(0xD9000000)).make(),
+                12.hb,
+                '当一个新时代的天之圣杯'.text.size(24.sp).color(Color(0x73000000)).make(),
+                32.hb,
+              ],
+            ),
+          ),
+          Container(
+            width: double.infinity,
+            height: 156.w,
+            color: Colors.white,
+            child: Row(
+              crossAxisAlignment: CrossAxisAlignment.center,
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      '111'.text.size(40.sp).fontWeight(FontWeight.bold).color(Color(0xD9000000)).make(),
+                      '动态'.text.size(24.sp).color(Color(0x73000000)).make(),
+                    ],
+                  ),
+                ),
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      '111'.text.size(40.sp).fontWeight(FontWeight.bold).color(Color(0xD9000000)).make(),
+                      '动态'.text.size(24.sp).color(Color(0x73000000)).make(),
+                    ],
+                  ),
+                ),
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      '111'.text.size(40.sp).fontWeight(FontWeight.bold).color(Color(0xD9000000)).make(),
+                      '动态'.text.size(24.sp).color(Color(0x73000000)).make(),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ),
+          ..._myEventItems.map((e) =>   _getMoments(e),),
+
+           //_getMoments(),
+          // _getMoments(),
+
+        ],
+      ),
+    );
+
+
+      BeeListView<MyEventItemModel>(
       path: API.community.myEvent,
       controller: _refreshController,
       convert: (model) {
@@ -46,6 +145,160 @@ class MyCommunityViewState extends State<MyCommunityView>
         );
       },
     );
+
+  }
+  Widget _getMoments( MyEventItemModel item){
+    return Container(
+      padding: EdgeInsets.only(top: 32.w,left: 25.w,right: 32.w,bottom: 32.w),
+      color: Colors.white,
+      child: CustomPaint(
+        painter: VerticalLinePainter(
+            color: Color(0x0F000000),//最后一个调整为透明
+            width: 4.w,//根据UI调整即可
+            paddingTop: 100.w,//根据UI调整即可
+            paddingLeft: 0,//根据UI调整即可
+            paddingBottom: 100.w),//根据UI
+          child: Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Column(
+                mainAxisSize: MainAxisSize.max,
+                mainAxisAlignment: MainAxisAlignment.start,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  '11.15'.text.size(32.sp).color(Color(0xA6000000)).bold.isIntrinsic.make(),
+                  '2021'.text.size(24.sp).color(Color(0x73000000)).bold.isIntrinsic.make(),
+                ],
+              ),
+              50.wb,
+              Column(
+                children: [
+                  Container(
+                    width: 552.w,
+                    child: Row(
+                      mainAxisSize: MainAxisSize.max,
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        '25.61'.text.size(28.sp).color(Color(0xA6000000)).isIntrinsic.make(),
+
+                        PopupMenuButton(
+                          shape: RoundedRectangleBorder(
+                              borderRadius: BorderRadius.circular(8.w)),
+                          itemBuilder: (context) {
+                            return [
+                              PopupMenuItem(
+                                child: '删除'.text.isIntrinsic.make(),
+                                value: 0,
+                              )
+                            ];
+                          },
+                          onSelected: (dynamic _) async {
+                            if (LoginUtil.isNotLogin) return;
+                              bool? result =
+                              await Get.dialog(CupertinoAlertDialog(
+                                title: '你确定删除吗'.text.isIntrinsic.make(),
+                                actions: [
+                                  CupertinoDialogAction(
+                                    child: '取消'.text.black.isIntrinsic.make(),
+                                    onPressed: () => Get.back(),
+                                  ),
+                                  CupertinoDialogAction(
+                                    child: '确定'
+                                        .text
+                                        .color(Colors.orange)
+                                        .isIntrinsic
+                                        .make(),
+                                    onPressed: () => Get.back(result: true),
+                                  ),
+                                ],
+                              ));
+
+                              // if (result == true) {
+                              //   await NetUtil().get(
+                              //     API.community.deleteMyEvent,
+                              //     params: {'themeId': widget.model!.id},
+                              //     showMessage: true,
+                              //   );
+                              //
+                              // }
+
+
+
+                          },
+                          child: Container(
+                              width: 32.w,
+                              height: 32.w,
+                              child: Image.asset(
+                                R.ASSETS_ICONS_ICON_MORE_PNG,
+                                width: 32.w,
+                                height: 32.w,
+                                fit: BoxFit.fitHeight,
+                              )),
+                        ),
+                      ],
+                    ),
+                  ),
+                  32.hb,
+                  Container(
+                    width: 552.w,
+                    child: item.content!.text.size(28.sp).color(Color(0xA6000000)).isIntrinsic.black.make(),),
+                  40.hb,
+                  _renderImage(item)
+
+                ],
+              ),
+            ],
+          ),
+        ),
+    );
+  }
+
+
+  _renderImage(MyEventItemModel item) {
+    if (item.imgUrl!.isEmpty) return SizedBox();
+    if (item.imgUrl!.length == 1)
+      return MaterialButton(
+        materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+        padding: EdgeInsets.zero,
+        clipBehavior: Clip.antiAlias,
+        minWidth: 0,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(8.w),
+        ),
+        onPressed: () {
+          BeeImagePreview.toPath(
+            path: ImgModel.first(item.imgUrl),
+            tag: ImgModel.first(item.imgUrl),
+          );
+        },
+        child: ConstrainedBox(
+          constraints: BoxConstraints(
+            maxHeight: 300.w,
+            maxWidth: 300.w,
+          ),
+          child: Hero(
+            tag: ImgModel.first(item.imgUrl),
+            child: FadeInImage.assetNetwork(
+              placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP,
+              image: API.image(ImgModel.first(item.imgUrl)),
+              imageErrorBuilder: (context, error, stackTrace) {
+                return Image.asset(
+                  R.ASSETS_IMAGES_PLACEHOLDER_WEBP,
+                  height: 300.w,
+                  width: 300.w,
+                );
+              },
+            ),
+          ),
+        ),
+      );
+    else
+      return Container(
+        width: 552.w,
+
+        child: BeeGridImageView(
+            urls: item.imgUrl!.map((e) => e.url).toList()),
+      );
   }
 
   @override
diff --git a/lib/ui/community/community_views/widgets/chat_card.dart b/lib/ui/community/community_views/widgets/chat_card.dart
index 2ca9ce48..418b9f13 100644
--- a/lib/ui/community/community_views/widgets/chat_card.dart
+++ b/lib/ui/community/community_views/widgets/chat_card.dart
@@ -9,6 +9,7 @@ import 'package:aku_new_community/ui/community/community_views/widgets/send_a_ch
 import 'package:aku_new_community/utils/bee_date_util.dart';
 import 'package:aku_new_community/utils/headers.dart';
 import 'package:aku_new_community/utils/login_util.dart';
+import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
 import 'package:aku_new_community/widget/picker/bee_image_preview.dart';
 import 'package:aku_new_community/widget/views/bee_grid_image_view.dart';
@@ -21,9 +22,9 @@ import 'package:velocity_x/velocity_x.dart';
 
 class ChatCard extends StatefulWidget {
   final EventItemModel? model;
-
   final VoidCallback? onDelete;
 
+
   final bool hideLine;
   final bool canTap;
 
@@ -67,8 +68,6 @@ class _ChatCardState extends State<ChatCard> {
             maxHeight: 300.w,
             maxWidth: 300.w,
           ),
-          child: Hero(
-            tag: ImgModel.first(widget.model!.imgUrls),
             child: FadeInImage.assetNetwork(
               placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP,
               image: API.image(ImgModel.first(widget.model!.imgUrls)),
@@ -80,7 +79,7 @@ class _ChatCardState extends State<ChatCard> {
                 );
               },
             ),
-          ),
+
         ),
       );
     else
@@ -211,6 +210,38 @@ class _ChatCardState extends State<ChatCard> {
     });
   }
 
+  _buildLikeAndComment(){
+    return Row(
+      children: [
+        30.wb,
+        '${widget.model!.views}浏览'
+
+            .text
+            .size(24.sp)
+            .color(Color(0xFF999999))
+            .make(),
+        Spacer(),
+        Image.asset(R.ASSETS_ICONS_COMMUNITY_LIKE_PNG,width: 32.w,height: 32.w,),
+        //Image.asset(widget.model!.isLike!=1? R.ASSETS_ICONS_COMMUNITY_LIKE_PNG:R.ASSETS_ICONS_COMMUNITY_LIKE_IS_PNG,width: 32.w,height: 32.w,),
+        5.wb,
+        '${widget.model!.likeNamesNum}'
+            .text
+            .size(24.sp)
+            .color(Color(0xFF999999))
+            .make(),
+        20.wb,
+        Image.asset(R.ASSETS_ICONS_COMMUNITY_COMMENT_PNG,width: 32.w,height: 32.w,),
+        //Image.asset(widget.model!.isComment!=1?R.ASSETS_ICONS_COMMUNITY_COMMENT_PNG:R.ASSETS_ICONS_COMMUNITY_COMMENT_IS_PNG,width: 32.w,height: 32.w,),
+        5.wb,
+        '${widget.model!.gambitThemeCommentNum}'
+            .text
+            .size(24.sp)
+            .color(Color(0xFF999999))
+            .make(),
+        30.wb,
+      ],
+    );
+  }
   _renderLike() {
     return Padding(
       padding: EdgeInsets.symmetric(horizontal: 16.w),
@@ -291,8 +322,13 @@ class _ChatCardState extends State<ChatCard> {
       child: MaterialButton(
         padding: EdgeInsets.zero,
         onPressed: widget.canTap
-            ? () {
-                Get.to(() => EventDetailPage(themeId: widget.model!.id));
+            ? () async{
+                BaseModel model = await NetUtil().get(
+                  API.community.getEventDetail,
+                  params: {'themeId': widget.model!.id},
+                );
+                EventItemModel  models = EventItemModel.fromJson(model.data);
+                Get.to(() => EventDetailPage(themeId: widget.model!.id, eventItemModel: models,onDelete: widget.onDelete,));
               }
             : null,
         child: Column(
@@ -343,11 +379,16 @@ class _ChatCardState extends State<ChatCard> {
               ),
               Spacer(),
               PopupMenuButton(
+
                 shape: RoundedRectangleBorder(
                     borderRadius: BorderRadius.circular(8.w)),
                 itemBuilder: (context) {
                   return [
+                    _isMyself?
                     PopupMenuItem(
+                      child: '删除'.text.isIntrinsic.make(),
+                      value: 0,
+                    ):PopupMenuItem(
                       child: '举报'.text.isIntrinsic.make(),
                       value: 0,
                     ),
@@ -355,15 +396,48 @@ class _ChatCardState extends State<ChatCard> {
                 },
                 onSelected: (dynamic _) async {
                   if (LoginUtil.isNotLogin) return;
-                  VoidCallback cancel = BotToast.showLoading();
-                  await Future.delayed(
-                      Duration(milliseconds: 500 + Random().nextInt(500)));
-                  cancel();
-                  BotToast.showText(text: '举报成功');
+                  if(!_isMyself){
+                    VoidCallback cancel = BotToast.showLoading();
+                    await Future.delayed(
+                        Duration(milliseconds: 500 + Random().nextInt(500)));
+                    cancel();
+                    BotToast.showText(text: '举报成功');
+                  }else{
+                    bool? result =
+                    await Get.dialog(CupertinoAlertDialog(
+                      title: '你确定删除吗'.text.isIntrinsic.make(),
+                      actions: [
+                        CupertinoDialogAction(
+                          child: '取消'.text.black.isIntrinsic.make(),
+                          onPressed: () => Get.back(),
+                        ),
+                        CupertinoDialogAction(
+                          child: '确定'
+                              .text
+                              .color(Colors.orange)
+                              .isIntrinsic
+                              .make(),
+                          onPressed: () => Get.back(result: true),
+                        ),
+                      ],
+                    ));
+
+                    if (result == true) {
+                      await NetUtil().get(
+                        API.community.deleteMyEvent,
+                        params: {'themeId': widget.model!.id},
+                        showMessage: true,
+                      );
+                      if (widget.onDelete != null) widget.onDelete!();
+                    }
+                  }
+
+
                 },
                 child: Container(
-                    width: 40.w,
-                    height: 32.w,
+                    width: 80.w,
+                    height: 80.w,
+                    alignment: Alignment.center,
                     child: Image.asset(
                       R.ASSETS_ICONS_ICON_MORE_PNG,
                       width: 8.w,
@@ -372,6 +446,7 @@ class _ChatCardState extends State<ChatCard> {
                     )),
               ).paddingOnly(right: 32.w),
             ].row(),
+
             Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
@@ -406,53 +481,56 @@ class _ChatCardState extends State<ChatCard> {
 
                 Divider(height: 1.w, thickness: 1.w),
                 10.hb,
-                Row(
-                  children: [
-                    64.hb,
-                    _isMyself
-                        ? TextButton(
-                            onPressed: () async {
-                              bool? result =
-                                  await Get.dialog(CupertinoAlertDialog(
-                                title: '你确定删除吗'.text.isIntrinsic.make(),
-                                actions: [
-                                  CupertinoDialogAction(
-                                    child: '取消'.text.black.isIntrinsic.make(),
-                                    onPressed: () => Get.back(),
-                                  ),
-                                  CupertinoDialogAction(
-                                    child: '确定'
-                                        .text
-                                        .color(Colors.orange)
-                                        .isIntrinsic
-                                        .make(),
-                                    onPressed: () => Get.back(result: true),
-                                  ),
-                                ],
-                              ));
-
-                              if (result == true) {
-                                await NetUtil().get(
-                                  API.community.deleteMyEvent,
-                                  params: {'themeId': widget.model!.id},
-                                  showMessage: true,
-                                );
-                                if (widget.onDelete != null) widget.onDelete!();
-                              }
-                            },
-                            child: '删除'.text.black.size(28.sp).make(),
-                          )
-                        : SizedBox(),
-                    Spacer(),
-                    _buildMoreButton(),
-                    20.wb,
-                  ],
-                ),
-                // _renderLikeAndComment(),
+                // Row(
+                //   children: [
+                //     // 64.hb,
+                //     _isMyself
+                //         ? TextButton(
+                //             onPressed: () async {
+                //               bool? result =
+                //                   await Get.dialog(CupertinoAlertDialog(
+                //                 title: '你确定删除吗'.text.isIntrinsic.make(),
+                //                 actions: [
+                //                   CupertinoDialogAction(
+                //                     child: '取消'.text.black.isIntrinsic.make(),
+                //                     onPressed: () => Get.back(),
+                //                   ),
+                //                   CupertinoDialogAction(
+                //                     child: '确定'
+                //                         .text
+                //                         .color(Colors.orange)
+                //                         .isIntrinsic
+                //                         .make(),
+                //                     onPressed: () => Get.back(result: true),
+                //                   ),
+                //                 ],
+                //               ));
+                //
+                //               if (result == true) {
+                //                 await NetUtil().get(
+                //                   API.community.deleteMyEvent,
+                //                   params: {'themeId': widget.model!.id},
+                //                   showMessage: true,
+                //                 );
+                //                 if (widget.onDelete != null) widget.onDelete!();
+                //               }
+                //             },
+                //             child: '删除'.text.black.size(28.sp).make(),
+                //           )
+                //         : SizedBox(),
+                //     Spacer(),
+                //    // _buildLikeAndComment(),
+                //     //_buildMoreButton(),
+                //     20.wb,
+                //   ],
+                // ),
+                // 20.hb,
+                _buildLikeAndComment(),
+                 //_renderLikeAndComment(),
               ],
             ),
           ],
-        ).paddingOnly(top: 24.w, bottom: 32.w),
+        ).paddingOnly(top: 32.w, bottom: 32.w),
       ),
     ).paddingOnly(bottom: 16.w);
   }
diff --git a/lib/ui/community/community_views/widgets/chat_card_detail.dart b/lib/ui/community/community_views/widgets/chat_card_detail.dart
new file mode 100644
index 00000000..87ae811b
--- /dev/null
+++ b/lib/ui/community/community_views/widgets/chat_card_detail.dart
@@ -0,0 +1,569 @@
+import 'dart:math';
+
+import 'package:aku_new_community/base/base_style.dart';
+import 'package:aku_new_community/constants/api.dart';
+import 'package:aku_new_community/model/common/img_model.dart';
+import 'package:aku_new_community/model/community/event_item_model.dart';
+import 'package:aku_new_community/provider/user_provider.dart';
+import 'package:aku_new_community/ui/community/community_views/event_detail_page.dart';
+import 'package:aku_new_community/ui/community/community_views/widgets/send_a_chat.dart';
+import 'package:aku_new_community/utils/bee_date_util.dart';
+import 'package:aku_new_community/utils/headers.dart';
+import 'package:aku_new_community/utils/login_util.dart';
+import 'package:aku_new_community/utils/network/net_util.dart';
+import 'package:aku_new_community/widget/picker/bee_image_preview.dart';
+import 'package:aku_new_community/widget/views/bee_grid_image_view.dart';
+import 'package:bot_toast/bot_toast.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:provider/provider.dart';
+import 'package:velocity_x/velocity_x.dart';
+
+class ChatCardDetail extends StatefulWidget {
+  final EventItemModel? model;
+
+  final VoidCallback? onDelete;
+
+  final bool hideLine;
+  final bool canTap;
+
+  ChatCardDetail({
+    Key? key,
+    required this.model,
+    this.onDelete,
+    this.hideLine = false,
+    this.canTap = true,
+  }) : super(key: key);
+
+  @override
+  _ChatCardDetailState createState() => _ChatCardDetailState();
+}
+
+class _ChatCardDetailState extends State<ChatCardDetail> {
+  bool get _isMyself {
+    final userProvider = Provider.of<UserProvider>(context, listen: false);
+    return (userProvider.userInfoModel?.id ?? -1) == widget.model!.createId;
+  }
+
+  _renderImage() {
+    if (widget.model!.imgUrls!.isEmpty) return SizedBox();
+    if (widget.model!.imgUrls!.length == 1)
+      return MaterialButton(
+        materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+        padding: EdgeInsets.zero,
+        clipBehavior: Clip.antiAlias,
+        minWidth: 0,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(8.w),
+        ),
+        onPressed: () {
+          BeeImagePreview.toPath(
+            path: ImgModel.first(widget.model!.imgUrls),
+            tag: ImgModel.first(widget.model!.imgUrls),
+          );
+        },
+        child: ConstrainedBox(
+          constraints: BoxConstraints(
+            maxHeight: 300.w,
+            maxWidth: 300.w,
+          ),
+          child: Hero(
+            tag: ImgModel.first(widget.model!.imgUrls),
+            child: FadeInImage.assetNetwork(
+              placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP,
+              image: API.image(ImgModel.first(widget.model!.imgUrls)),
+              imageErrorBuilder: (context, error, stackTrace) {
+                return Image.asset(
+                  R.ASSETS_IMAGES_PLACEHOLDER_WEBP,
+                  height: 300.w,
+                  width: 300.w,
+                );
+              },
+            ),
+          ),
+        ),
+      );
+    else
+      return BeeGridImageView(
+          urls: widget.model!.imgUrls!.map((e) => e.url).toList());
+  }
+
+  _buildMoreButton() {
+    return Builder(builder: (context) {
+      final userProvider = Provider.of<UserProvider>(context);
+      return MaterialButton(
+        elevation: 0,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(6.w),
+        ),
+        padding: EdgeInsets.zero,
+        height: 40.w,
+        minWidth: 0,
+        color: Color(0xFFD8D8D8),
+        materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+        onPressed: () {
+          if (LoginUtil.isNotLogin) return;
+          BotToast.showAttachedWidget(
+            targetContext: context,
+            preferDirection: PreferDirection.leftCenter,
+            attachedBuilder: (cancel) {
+              return Padding(
+                padding: EdgeInsets.only(right: 10.w),
+                child: Material(
+                  color: Color(0xFFD8D8D8),
+                  borderRadius: BorderRadius.circular(8.w),
+                  clipBehavior: Clip.antiAlias,
+                  child: SizedBox(
+                    height: 78.w,
+                    child: Row(
+
+                      children: [
+                        MaterialButton(
+                          height: 78.w,
+                          materialTapTargetSize:
+                              MaterialTapTargetSize.shrinkWrap,
+                          onPressed: () async {
+                            cancel();
+                            await NetUtil().get(
+                              API.community.like,
+                              params: {'themeId': widget.model!.id},
+                              showMessage: true,
+                            );
+                            setState(() {
+                              if (widget.model!.isLike == 0) {
+                                widget.model!.likeNames!.add(
+                                  LikeNames(
+                                    id: Random().nextInt(1000),
+                                    name: userProvider.userInfoModel!.nickName,
+                                  ),
+                                );
+                              } else {
+                                widget.model!.likeNames!.removeWhere(
+                                    (element) =>
+                                        element.name ==
+                                        userProvider.userInfoModel!.nickName);
+                              }
+                              widget.model!.isLike =
+                                  (widget.model!.isLike == 1) ? 0 : 1;
+                            });
+                          },
+                          child: [
+                            widget.model!.isLike == 1
+                                ? Icon(Icons.favorite,
+                                    size: 30.w, color: Colors.red)
+                                : Icon(Icons.favorite_border, size: 30.w),
+                            10.wb,
+                            '赞'.text.make(),
+                          ].row(),
+                        ),
+                        VerticalDivider(width: 1.w, thickness: 1.w),
+                        MaterialButton(
+                          height: 78.w,
+                          materialTapTargetSize:
+                              MaterialTapTargetSize.shrinkWrap,
+                          onPressed: () {
+                            if (widget.model!.isComment == 1)
+                              SendAChat.send(
+                                parentId: 0,
+                                themeId: widget.model!.id,
+                              );
+                            else
+                              BotToast.showText(text: '不可评论');
+                          },
+                          child: [
+                            Icon(CupertinoIcons.bubble_right, size: 30.w),
+                            10.wb,
+                            '评论'.text.make(),
+                          ].row(),
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              );
+            },
+          );
+        },
+        child: Row(
+          children: [
+            20.wb,
+            Container(
+              height: 8.w,
+              width: 8.w,
+              decoration: BoxDecoration(
+                color: Colors.white,
+                borderRadius: BorderRadius.circular(4.w),
+              ),
+            ),
+            8.wb,
+            Container(
+              height: 8.w,
+              width: 8.w,
+              decoration: BoxDecoration(
+                color: Colors.white,
+                borderRadius: BorderRadius.circular(4.w),
+              ),
+            ),
+            20.wb,
+          ],
+        ),
+      );
+    });
+  }
+
+  _buildLikeAndComment(){
+    return Row(
+      children: [
+        30.wb,
+        '${widget.model!.views}浏览'
+
+            .text
+            .size(24.sp)
+            .color(Color(0xFF999999))
+            .make(),
+        Spacer(),
+        Image.asset(R.ASSETS_ICONS_COMMUNITY_LIKE_PNG,width: 32.w,height: 32.w,),
+        //Image.asset(widget.model!.isLike!=1? R.ASSETS_ICONS_COMMUNITY_LIKE_PNG:R.ASSETS_ICONS_COMMUNITY_LIKE_IS_PNG,width: 32.w,height: 32.w,),
+        5.wb,
+        '${widget.model!.likeNamesNum}'
+            .text
+            .size(24.sp)
+            .color(Color(0xFF999999))
+            .make(),
+        20.wb,
+        Image.asset(R.ASSETS_ICONS_COMMUNITY_COMMENT_PNG,width: 32.w,height: 32.w,),
+        //Image.asset(widget.model!.isComment!=1?R.ASSETS_ICONS_COMMUNITY_COMMENT_PNG:R.ASSETS_ICONS_COMMUNITY_COMMENT_IS_PNG,width: 32.w,height: 32.w,),
+        5.wb,
+        '${widget.model!.gambitThemeCommentNum}'
+            .text
+            .size(24.sp)
+            .color(Color(0xFF999999))
+            .make(),
+        30.wb,
+      ],
+    );
+  }
+  _renderLike() {
+    return Padding(
+      padding: EdgeInsets.symmetric(horizontal: 16.w),
+      child: Flex(
+        direction: Axis.horizontal,
+        children: [
+          Icon(Icons.favorite_border_rounded, size: 24.w),
+          14.wb,
+          ...widget.model!.likeNames!
+              .map((e) => Container(child: e.name!.text.make(),margin: EdgeInsets.only(right: 10.w),))
+              .toList()
+              .sepWidget(separate: ','.text.make()),
+        ],
+      ),
+    );
+  }
+
+  _renderComment() {
+    return Padding(
+      padding:  EdgeInsets.only(left: 20.w,right: 20.w),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: widget.model!.gambitThemeCommentVoList!.map((e) {
+
+          // StringBuffer buffer = StringBuffer();
+          // buffer.write(e.createName);
+          //
+          // if (e.parentName != null) buffer.write('  回复  ${e.parentName}');
+          // buffer.write(': ${e.content}');
+          return InkWell(
+            child:     e.createName!.richText.color(Color(0xFF5D98F9)).size(24.sp).withTextSpanChildren([
+
+              e.parentName != null ?' 回复'.textSpan.size(24.sp).color(ktextSubColor).make():
+              ''.textSpan.size(24.sp).color(Color(0xFF5D98F9)).make(),
+              e.parentName != null ?' ${e.parentName}'.textSpan.size(24.sp).color(Color(0xFF5D98F9)).make():
+              ''.textSpan.size(24.sp).color(ktextPrimary).make(),
+              ' : '.textSpan.size(24.sp).color(ktextPrimary).make(),
+              '${e.content}'.textSpan.size(24.sp).black.make(),
+            ]).make(),
+            onTap: () {
+              SendAChat.send(parentId: e.id, themeId: widget.model!.id);
+            },
+          );
+        }).toList(),
+      ),
+    );
+  }
+
+
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        Container(
+          color: Colors.white,
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              [
+                Material(
+                  color: Color(0xFFF5F5F5),
+                  borderRadius: BorderRadius.circular(48.w),
+                  clipBehavior: Clip.antiAlias,
+                  child: FadeInImage.assetNetwork(
+                    placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP,
+                    image: API
+                        .image(ImgModel.first(widget.model!.headSculptureImgUrl)),
+                    height: 96.w,
+                    width: 96.w,
+                    fit: BoxFit.cover,
+                    imageErrorBuilder: (context, error, stackTrace) {
+                      return Image.asset(
+                        R.ASSETS_IMAGES_PLACEHOLDER_WEBP,
+                        height: 86.w,
+                        width: 86.w,
+                      );
+                    },
+                  ),
+                ).paddingOnly(left: 32.w),
+                20.wb,
+                Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      widget.model!.createName!,
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                      style: TextStyle(
+                          color: Colors.black.withOpacity(0.85),
+                          fontSize: 30.sp,
+                          fontWeight: FontWeight.w500),
+                    ),
+                    12.hb,
+                    BeeDateUtil(widget.model!.date)
+                        .timeAgoWithHm
+                        .text
+                        .size(24.sp)
+                        .color(Color(0xFF999999))
+                        .make(),
+                  ],
+                ),
+                Spacer(),
+                Image.asset(R.ASSETS_ICONS_COMMUNITY_LIKE_PNG,width: 40.w,height: 40.w,),
+                //Image.asset(widget.model!.isLike!=1? R.ASSETS_ICONS_COMMUNITY_LIKE_PNG:R.ASSETS_ICONS_COMMUNITY_LIKE_IS_PNG,width: 32.w,height: 32.w,),
+                5.wb,
+                '${widget.model!.likeNamesNum}'
+                    .text
+                    .size(24.sp)
+                    .color(Color(0xFF999999))
+                    .make(),
+                32.wb,
+
+
+
+
+              ].row(),
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      32.hb,
+                      widget.model!.content!.text.size(28.sp).color(ktextSubColor).make(),
+                      32.hb,
+                      _renderImage(),
+                      Row(
+                        children: [
+                          widget.model!.gambitTitle?.isEmpty ?? true
+                              ? SizedBox()
+                              : Chip(
+                            label: '# ${widget.model!.gambitTitle}'
+                                .text
+                                .color(Color(0xFF547fc0))
+                                .size(28.sp)
+                                .make(),
+                            padding: EdgeInsets.symmetric(
+                                horizontal: 16.w, vertical: 5.w),
+                            labelPadding: EdgeInsets.zero,
+                            backgroundColor: Colors.transparent,
+                            materialTapTargetSize:
+                            MaterialTapTargetSize.shrinkWrap,
+                            // shape: StadiumBorder(
+                            //   side: BorderSide(),
+                            // ),
+                          ).pOnly(top: 20.w),
+
+                        ],
+                      ),
+
+                      20.hb,
+                    ],
+                  ).paddingOnly(right: 32.w, left: 32.w)
+                 ,
+
+                  // Divider(height: 1.w, thickness: 1.w),
+                  // 10.hb,
+                  // Row(
+                  //   children: [
+                  //     // 64.hb,
+                  //
+                  //     Spacer(),
+                  //     _buildMoreButton(),
+                  //     20.wb,
+                  //   ],
+                  // ),
+                  20.hb,
+                  //_buildLikeAndComment(),
+
+                ],
+              ),
+            ],
+          ).paddingOnly(top: 20.w),
+        ).marginOnly(top: 12.w, bottom: 12.w),
+        _renderLikeAndCommentWidget()
+      ]
+
+
+    ).paddingOnly(bottom: 16.w);
+  }
+
+  _renderLikeAndComment() {
+    if (widget.model!.likeNames!.isEmpty &&
+        widget.model!.gambitThemeCommentVoList!.isEmpty) return SizedBox();
+    return Material(
+      borderRadius: BorderRadius.circular(8.w),
+      color: Color(0xFFF7F7F7),
+      child: Padding(
+        padding: EdgeInsets.all(8.w),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            widget.model!.likeNames!.isEmpty ? SizedBox() : _renderLike(),
+            10.hb,
+            (widget.model!.likeNames!.isNotEmpty &&
+                widget.model!.gambitThemeCommentVoList!.isNotEmpty)
+                ? Divider(height: 1.w, thickness: 1.w)
+                : SizedBox(),
+            10.hb,
+            widget.model!.gambitThemeCommentVoList!.isEmpty
+                ? SizedBox()
+                : _renderComment(),
+          ],
+        ),
+      ),
+    );
+  }
+
+  _renderLikeAndCommentWidget(){
+    return Container(
+      padding: EdgeInsets.only(top: 22.w,bottom: 22.w),
+      color: Colors.white,
+      child: Column(
+        children: [
+          Row(
+            children: [
+              32.wb,
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.center,
+                children: [
+
+                  ('评论'+'${widget.model!.gambitThemeCommentNum!}').text.size(28.sp).black.make(),
+                  Container(
+                    width: 32.w,
+                    height: 2.w,
+                    color: Color(0xCCFFB634),
+                  )
+                ],
+              ),
+              Spacer(),
+              GestureDetector(
+                child: Container(
+                  child: Row(
+                    children: [
+                      Image.asset(R.ASSETS_ICONS_ICON_SORT_PNG,height: 40.w,width: 40.w,),
+                      8.wb,
+                      ('按时间').text.size(28.sp).color(ktextPrimary).make(),
+                    ],
+                  ),
+                ),
+              ),
+              32.wb,
+            ],
+          ),
+          _renderLikeAndComment(),
+
+
+        ],
+      ),
+    );
+  }
+
+  _commentWidget(List<ImgModel>? headSculptureImgUrl,String createName,DateTime? date,num? likeNamesNum){
+    return Container(
+      color: Colors.white,
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          [
+            Material(
+              color: Color(0xFFF5F5F5),
+              borderRadius: BorderRadius.circular(48.w),
+              clipBehavior: Clip.antiAlias,
+              child: FadeInImage.assetNetwork(
+                placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP,
+                image: API
+                    .image(ImgModel.first(headSculptureImgUrl)),
+                height: 96.w,
+                width: 96.w,
+                fit: BoxFit.cover,
+                imageErrorBuilder: (context, error, stackTrace) {
+                  return Image.asset(
+                    R.ASSETS_IMAGES_PLACEHOLDER_WEBP,
+                    height: 86.w,
+                    width: 86.w,
+                  );
+                },
+              ),
+            ).paddingOnly(left: 32.w),
+            20.wb,
+            Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  createName,
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                  style: TextStyle(
+                      color: Colors.black.withOpacity(0.85),
+                      fontSize: 30.sp,
+                      fontWeight: FontWeight.w500),
+                ),
+                12.hb,
+                BeeDateUtil(date)
+                    .timeAgoWithHm
+                    .text
+                    .size(24.sp)
+                    .color(Color(0xFF999999))
+                    .make(),
+              ],
+            ),
+            Spacer(),
+            Image.asset(R.ASSETS_ICONS_COMMUNITY_LIKE_PNG,width: 40.w,height: 40.w,),
+            //Image.asset(widget.model!.isLike!=1? R.ASSETS_ICONS_COMMUNITY_LIKE_PNG:R.ASSETS_ICONS_COMMUNITY_LIKE_IS_PNG,width: 32.w,height: 32.w,),
+            5.wb,
+            '${likeNamesNum}'
+                .text
+                .size(24.sp)
+                .color(Color(0xFF999999))
+                .make(),
+            32.wb,
+          ].row(),
+          20.hb,
+          widget.model!.content!.text.size(28.sp).color(ktextSubColor).make(),
+
+
+        ],
+      ).paddingOnly(top: 20.w),
+    ).marginOnly(top: 12.w, bottom: 12.w);
+  }
+
+}
diff --git a/lib/ui/community/community_views/widgets/my_event_card.dart b/lib/ui/community/community_views/widgets/my_event_card.dart
index 9084a966..90145c01 100644
--- a/lib/ui/community/community_views/widgets/my_event_card.dart
+++ b/lib/ui/community/community_views/widgets/my_event_card.dart
@@ -1,13 +1,18 @@
 import 'package:aku_new_community/const/resource.dart';
 import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/model/common/img_model.dart';
+import 'package:aku_new_community/model/community/event_item_model.dart';
 import 'package:aku_new_community/model/community/my_event_item_model.dart';
+import 'package:aku_new_community/provider/user_provider.dart';
 import 'package:aku_new_community/ui/community/community_views/event_detail_page.dart';
 import 'package:aku_new_community/utils/bee_date_util.dart';
 import 'package:aku_new_community/utils/headers.dart';
+import 'package:aku_new_community/utils/network/base_model.dart';
+import 'package:aku_new_community/utils/network/net_util.dart';
 import 'package:aku_new_community/widget/picker/bee_image_preview.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
+import 'package:provider/provider.dart';
 import 'package:velocity_x/velocity_x.dart';
 
 class MyEventCard extends StatelessWidget {
@@ -47,6 +52,7 @@ class MyEventCard extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final userProvider = Provider.of<UserProvider>(context);
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       mainAxisSize: MainAxisSize.min,
@@ -60,8 +66,13 @@ class MyEventCard extends StatelessWidget {
                 .paddingOnly(left: 32.w, top: isFirst ? 0 : 64.w, bottom: 32.w)
             : SizedBox(),
         MaterialButton(
-          onPressed: () {
-            Get.to(() => EventDetailPage(themeId: model.id));
+          onPressed: () async{
+            BaseModel models = await NetUtil().get(
+              API.community.getEventDetail,
+              params: {'themeId': model.id},
+            );
+            EventItemModel  eventItemModel = EventItemModel.fromJson(models.data);
+            Get.to(() => EventDetailPage(themeId: model.id, eventItemModel: eventItemModel,));
           },
           child: Row(
             crossAxisAlignment: CrossAxisAlignment.start,
diff --git a/lib/ui/community/community_views/widgets/send_a_chat.dart b/lib/ui/community/community_views/widgets/send_a_chat.dart
index a49982e7..7952e555 100644
--- a/lib/ui/community/community_views/widgets/send_a_chat.dart
+++ b/lib/ui/community/community_views/widgets/send_a_chat.dart
@@ -51,27 +51,66 @@ class _SendAChatState extends State<SendAChat> {
 
   @override
   Widget build(BuildContext context) {
-    return Row(
-      children: [
-        TextField(
-          focusNode: widget.node,
-          controller: _textEditingController,
-          decoration: InputDecoration(
-            border: OutlineInputBorder(),
-            isDense: true,
+    return Container(
+      height: 120.w,
+      child: Row(
+        children: [
+          TextField(
+            focusNode: widget.node,
+            controller: _textEditingController,
+            decoration: InputDecoration(
+              contentPadding: EdgeInsets.only(left: 20.w),
+              filled: true,
+              fillColor: Color(0x0F000000),
+              hintText: '参与评论',
+              hintStyle: TextStyle(
+                  color: Colors.grey.shade500,
+                  fontSize: 14,
+                  fontWeight: FontWeight.w300),
+
+              //
+              enabledBorder: OutlineInputBorder(
+               borderSide: BorderSide.none,
+                borderRadius: BorderRadius.circular(40.w),
+              ),
+              focusedBorder: OutlineInputBorder(
+                borderSide: BorderSide.none,
+                borderRadius: BorderRadius.circular(40.w),
+              ),
+            ),
+          ).p(16.w).expand(),
+          16.wb,
+          GestureDetector(
+            onTap: (){
+              Get.back(result: _textEditingController.text);
+            },
+            child: Container(
+              height: 55.w,
+              width: 120.w,
+              decoration: BoxDecoration(
+                color: Color(0xFFFAC058),
+                borderRadius: BorderRadius.all(Radius.circular(34.w)),
+              ),
+              alignment: Alignment.center,
+              child:   '发布'
+                  .text
+                  .size(28.sp)
+                  .color(Color(0xD9000000))
+                  .make(),
+            ),
           ),
-        ).p(16.w).expand(),
-        16.wb,
-        MaterialButton(
-          color: kPrimaryColor,
-          onPressed: () {
-            Get.back(result: _textEditingController.text);
-          },
-          minWidth: 64.w,
-          child: '发送'.text.make(),
-        ),
-        16.wb,
-      ],
-    ).material(color: Colors.white);
+          // MaterialButton(
+          //   color: kPrimaryColor,
+          //
+          //   onPressed: () {
+          //     Get.back(result: _textEditingController.text);
+          //   },
+          //   minWidth: 64.w,
+          //   child: '发送'.text.make(),
+          // ),
+          16.wb,
+        ],
+      ).material(color: Colors.white),
+    );
   }
 }
diff --git a/lib/widget/line/vertical_line_painter.dart b/lib/widget/line/vertical_line_painter.dart
new file mode 100644
index 00000000..d98c7b2b
--- /dev/null
+++ b/lib/widget/line/vertical_line_painter.dart
@@ -0,0 +1,46 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+/// 竖线
+class VerticalLinePainter extends CustomPainter {
+  ///线条颜色
+  final Color color;
+
+  ///线条宽度
+  final double width;
+
+  ///线条左边内边距
+  final double paddingLeft;
+
+  ///线条顶部内边距
+  final double paddingTop;
+
+  ///线条底部内边距
+  final double paddingBottom;
+
+  VerticalLinePainter({
+    this.color: Colors.grey,
+    this.width: 1,
+    this.paddingLeft: 0,
+    this.paddingTop: 0,
+    this.paddingBottom: 0,
+  });
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    Paint paint = Paint();
+    paint.style = PaintingStyle.fill;
+    paint.color = color;
+    Path path = new Path(); //使用轨迹画线条
+    path.moveTo(paddingLeft, paddingTop);//左上点
+    path.lineTo(paddingLeft, size.height + paddingTop - paddingBottom);//左下点
+    path.lineTo(width + paddingLeft, size.height + paddingTop - paddingBottom);//右下点
+    path.lineTo(width + paddingLeft, paddingTop);//右上点
+    path.close();
+    canvas.drawPath(path, paint);
+  }
+
+  ///有变化刷新
+  @override
+  bool shouldRepaint(covariant CustomPainter oldDelegate) => true;
+}
\ No newline at end of file