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

# Conflicts:
#	lib/ui/home/application/all_application_new.dart

lib/pages/home/home_page.dart

@@ -533,7 +533,7 @@ class _HomePageState extends State<HomePage>
             getFunctionBtn(AO.fromRaw('报事报修')),
             getFunctionBtn(AO.fromRaw('设施预约')),
             getFunctionBtn(AO.fromRaw('生活缴费')),
-            getFunctionBtn(AO.fromRaw('智慧养老')),
+            getFunctionBtn(AO.fromRaw('活动投票')),
           ],
         ),
         24.hb,

lib/pages/sign/login/other_login_page.dart

@@ -112,8 +112,8 @@ class _OtherLoginPageState extends State<OtherLoginPage> {
                     UserTool.appProvider.pickedCityAndCommunity!.communityModel!
                         .id);
                 if (response.data['success']) {
-                  await UserTool.dataProvider.addHistories();
                   await UserTool.userProvider.setLogin(response.data['data']);
+                  await UserTool.dataProvider.addHistories();
                 } else {
                   BotToast.showText(text: response.data['msg']);
                   if (response.data['msg'] == '该账户未设置密码，请使用验证码登录') {

lib/ui/community/activity/activity_detail_page.dart

@@ -1,3 +1,4 @@
+import 'package:aku_new_community/base/base_style.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -299,7 +300,7 @@ class _ActivityDetailPageState extends State<ActivityDetailPage> {
                         .richText
                         .tap(() {})
                         .size(28.sp)
-                        .color(Colors.blue)
+                        .color(kBalckSubColor)
                         .make(),
                     Spacer(),
                   ],

lib/ui/community/facility/facility_appointment_page.dart

@@ -26,6 +26,7 @@ class _FacilityAppointmentPageState extends State<FacilityAppointmentPage>
     _tabController = TabController(length: 2, vsync: this);
   }
 
+
   @override
   void dispose() {
     _tabController.dispose();

lib/ui/community/facility/facility_preorder_page.dart

@@ -41,7 +41,7 @@ class _FacilityPreorderPageState extends State<FacilityPreorderPage> {
   List<int> dateList = [];
   DateTime? date;
 
-  bool get canTap => dateList.isNotEmpty;
+  bool get canTap => dateList.isNotEmpty&&UserTool.userProvider.defaultHouse!=null;
 
   @override
   Widget build(BuildContext context) {
@@ -63,7 +63,7 @@ class _FacilityPreorderPageState extends State<FacilityPreorderPage> {
               ),
               onTap: () => Get.to(() => AdviceHousePage()),
               title: Text(
-                UserTool.userProvider.userInfoModel!.name??'请先选择房屋',
+                UserTool.userProvider.userInfoModel!.name??'',
                 style: TextStyle(
                   fontSize: 30.sp,
                 ),
@@ -76,7 +76,13 @@ class _FacilityPreorderPageState extends State<FacilityPreorderPage> {
                   color: Colors.black.withOpacity(0.45),
                   fontSize: 26.sp,
                 ),
-              ):SizedBox(),
+              ):Text(
+                '请先绑定房屋',
+                style: TextStyle(
+                  color: Colors.black.withOpacity(0.45),
+                  fontSize: 26.sp,
+                ),
+              ),
               trailing: Icon(
                 CupertinoIcons.chevron_forward,
                 size: 35.w,

lib/ui/community/facility/facility_type_detail_card.dart

@@ -175,7 +175,7 @@ class MyPainter extends CustomPainter {
         ..color = dates!.contains(i)
             ? kPrimaryColor
             : i < getNum(start!) ||
-                    i > getNum(end!) ||
+                    i >= getNum(end!) ||
                     i < getNum(DateTime.now())
                 ? ktextThirdColor
                 : Colors.transparent

lib/ui/function_and_service/task/task_page.dart

@@ -1,4 +1,5 @@
 import 'package:aku_new_community/ui/function_and_service/task/dialogs/task_evaluation_dialog.dart';
+import 'package:bot_toast/bot_toast.dart';
 import 'package:flutter/material.dart';
 
 import 'package:flutter_easyrefresh/easy_refresh.dart';
@@ -40,6 +41,7 @@ class _TaskPageState extends State<TaskPage> with TickerProviderStateMixin {
     _refreshControllers.forEach((element) {
       element.dispose();
     });
+    _tabController.dispose();
     super.dispose();
   }
 
@@ -71,7 +73,7 @@ class _TaskPageState extends State<TaskPage> with TickerProviderStateMixin {
                   children: [
                     ...TaskMap.taskMode.values
                         .mapIndexed((currentValue, index) =>
-                        _tabCard(currentValue, index))
+                            _tabCard(currentValue, index))
                         .toList(),
                   ],
                 ),
@@ -81,14 +83,17 @@ class _TaskPageState extends State<TaskPage> with TickerProviderStateMixin {
                 child: Row(
                   children: <String>['全部', ...TaskMap.taskType.values]
                       .mapIndexed((currentValue, index) =>
-                      _typeBar(currentValue, index))
+                          _typeBar(currentValue, index))
                       .toList(),
                 ),
               )
             ],
           )),
       body: SafeArea(
-          child: TabBarView(controller: _tabController, children: [
+          child: TabBarView(
+              //physics: NeverScrollableScrollPhysics(),
+              controller: _tabController,
+              children: [
             HallView(
               refreshController: _refreshControllers[0],
               type: _currentType,
@@ -144,23 +149,23 @@ class _TaskPageState extends State<TaskPage> with TickerProviderStateMixin {
         color: Colors.transparent,
         child: _currentType == index
             ? Container(
-          padding: EdgeInsets.symmetric(vertical: 8.w, horizontal: 24.w),
-          decoration: BoxDecoration(
-            borderRadius: BorderRadius.circular(30.w),
-            color: Color(0xFFFAC058).withOpacity(0.5),
-          ),
-          child: text.text
-              .size(24.sp)
-              .color(Colors.black.withOpacity(0.65))
-              .make(),
-        )
+                padding: EdgeInsets.symmetric(vertical: 8.w, horizontal: 24.w),
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(30.w),
+                  color: Color(0xFFFAC058).withOpacity(0.5),
+                ),
+                child: text.text
+                    .size(24.sp)
+                    .color(Colors.black.withOpacity(0.65))
+                    .make(),
+              )
             : Container(
-          padding: EdgeInsets.symmetric(vertical: 8.w, horizontal: 24.w),
-          child: text.text
-              .size(24.sp)
-              .color(Colors.black.withOpacity(0.45))
-              .make(),
-        ),
+                padding: EdgeInsets.symmetric(vertical: 8.w, horizontal: 24.w),
+                child: text.text
+                    .size(24.sp)
+                    .color(Colors.black.withOpacity(0.45))
+                    .make(),
+              ),
       ),
     );
   }

lib/ui/home/application/all_application_new.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
 
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -35,7 +37,7 @@ class _AllApplicationNewPageState extends State<AllApplicationNewPage> {
       case 3:
         return ['服务浏览', '周边企业', '住房说明', '电子商务'];
       case 4:
-        return [ '任务发布', '周边服务', '共享投屏'];
+        return Platform.isIOS?['任务发布', '周边服务', '共享投屏']:['智慧养老', '任务发布', '周边服务', '共享投屏'];
       case 5:
         return ['自营商城', '邻家宠物', '共享停车', '二手市场'];
       default:

lib/ui/manager/advice/new_advice_page.dart

@@ -224,7 +224,10 @@ class _NewAdvicePageState extends State<NewAdvicePage> {
                 type = _type == 0 ? 3 : 4;
                 break;
             }
-            addAdvice(type, _files, _editingController.text);
+            if(userProvider.defaultHouse != null){
+              addAdvice(type, _files, _editingController.text);
+            }
+            BotToast.showText(text: '请选择房屋');
           }
           cancel();
         },

pubspec.yaml

@@ -2,7 +2,7 @@ name: aku_new_community
 description: A new Flutter project.
 publish_to: "none"
 
-version: 1.8.11-dev+51
+version: 1.8.12-dev+53
 
 environment:
   sdk: ">=2.17.0 <3.0.0"