Merge branch 'newHost' of https://git.oa00.com/1281228557/aku_new_community into newHost

lib/ui/community/activity/activity_detail_page.dart

@@ -152,7 +152,7 @@ class _ActivityDetailPageState extends State<ActivityDetailPage> {
               ),
       ),
       bottomNavi: BottomButton(
-        child: '立即报名'.text.size(32.sp).bold.make(),
+        child: btnText,
         onPressed: !canTap
             ? null
             : () async {
@@ -166,6 +166,16 @@ class _ActivityDetailPageState extends State<ActivityDetailPage> {
     );
   }
 
+  Widget get btnText{
+    if (_model?.regisEndTime?.isBefore(DateTime.now()) ?? true) {
+      return '报名截止'.text.size(32.sp).bold.make();
+    }else if(_model!.isRegistration==1){
+      return '已报名'.text.size(32.sp).bold.make();
+    }else{
+      return '立即报名'.text.size(32.sp).bold.make();
+    }
+  }
+
   bool get canTap {
     if ((_model?.regisEndTime?.isBefore(DateTime.now()) ?? true)  ||_model!.isRegistration==1) {
       return false;

lib/ui/community/community_views/widgets/chat_card.dart

@@ -174,6 +174,13 @@ class _ChatCardState extends State<ChatCard> {
     super.initState();
   }
 
+  @override
+  void didUpdateWidget(covariant ChatCard oldWidget) {
+    _isLiked = widget.model.isLike;
+    _likeNum = widget.model.likes;
+    super.didUpdateWidget(oldWidget);
+  }
+
   @override
   Widget build(BuildContext context) {
     return DecoratedBox(

lib/ui/function_and_service/task/publish_task_page.dart

@@ -321,7 +321,7 @@ class _PublishTaskPageState extends State<PublishTaskPage> {
                   .make(),
             ),
             '${_sex == 0 ? '请选择性别' : _sexStr[_sex - 1]}'
-                .text
+                  .text
                 .size(28.sp)
                 .color(Colors.black.withOpacity(_sex == 0 ? 0.25 : 0.85))
                 .make(),

lib/widget/others/user_tool.dart

@@ -12,4 +12,5 @@ class UserTool {
       Provider.of<AppProvider>(Get.context!, listen: false);
   static DataProvider get dataProvider =>
       Provider.of<DataProvider>(Get.context!, listen: false);
+  UserTool();
 }