Merge branch 'master' of http://192.168.2.201:8099/laiiihz/akuCommunity

lib/pages/life_pay/life_pay_page.dart

@@ -209,16 +209,17 @@ class _LifePayPageState extends State<LifePayPage> {
     return BeeScaffold(
       title: '生活缴费',
       actions: [
-        InkWell(
+        //TODO 缴费记录 无接口
-          onTap: () {
+        // InkWell(
-            LifePayRecordPage().to();
+        //   onTap: () {
-          },
+        //     LifePayRecordPage().to();
-          child: Container(
+        //   },
-            padding: EdgeInsets.fromLTRB(32.w, 28.w, 32.w, 20.w),
+        //   child: Container(
-            alignment: Alignment.center,
+        //     padding: EdgeInsets.fromLTRB(32.w, 28.w, 32.w, 20.w),
-            child: '缴费记录'.text.black.size(28.sp).make(),
+        //     alignment: Alignment.center,
-          ),
+        //     child: '缴费记录'.text.black.size(28.sp).make(),
-        ),
+        //   ),
+        // ),
       ],
       body: BeeListView(
           path: API.manager.dailyPaymentList,

lib/pages/life_pay/widget/my_house_page.dart

@@ -56,7 +56,9 @@ class _MyHousePageState extends State<MyHousePage> {
     super.initState();
     if (widget.needFindPayTag) {
       ManagerFunc.findEstatelsPayment().then((value) {
-        _list = value.data;
+        _list = (value.data as List)
+            .map((e) => EstatePaymentModel.fromJson(e))
+            .toList();
         return _list;
       });
     }

lib/pages/manager_func.dart

@@ -167,7 +167,7 @@ class ManagerFunc {
       API.manager.findEstatelsPament,
       showMessage: false,
     );
-    return baseModel.data;
+    return baseModel;
   }
 
   static Future<VotingDetailModel> voteDetail(int id) async {
@@ -204,7 +204,7 @@ class ManagerFunc {
       API.manager.questionnaireSubmit,
       params: {
         'id': id,
-        'appQuestionnaireAnswerSubmits':model,
+        'appQuestionnaireAnswerSubmits': model,
       },
       showMessage: true,
     );

lib/pages/personal/user_profile_page.dart

@@ -2,6 +2,7 @@
 import 'dart:io';
 
 // Flutter imports:
+import 'package:akuCommunity/widget/picker/bee_custom_picker.dart';
 import 'package:akuCommunity/widget/picker/bee_date_picker.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -130,42 +131,24 @@ class _UserProfilePageState extends State<UserProfilePage> {
           _buildTile(
             '性别',
             userProvider.userInfoModel.sexValue.text.make(),
-            onPressed: () {
+            onPressed: () async {
-              showCupertinoDialog(
+              int result = await Get.bottomSheet(BeeCustomPicker(
-                context: context,
+                onPressed: () => Get.back(result: _sex),
-                builder: (context) {
+                body: CupertinoPicker(
-                  return CupertinoAlertDialog(
+                  itemExtent: 50,
-                    title: '请选择'.text.isIntrinsic.make(),
+                  onSelectedItemChanged: (index) {
-                    content: SizedBox(
+                    _sex = index + 1;
-                      child: CupertinoPicker(
+                  },
-                        itemExtent: 50,
+                  children: [
-                        onSelectedItemChanged: (index) {
+                    '男'.text.isIntrinsic.make().centered(),
-                          _sex = index + 1;
+                    '女'.text.isIntrinsic.make().centered(),
-                        },
+                  ],
-                        children: [
+                  useMagnifier: true,
-                          '男'.text.isIntrinsic.make().centered(),
+                ).expand(),
-                          '女'.text.isIntrinsic.make().centered(),
+              ));
-                        ],
+              if (result != null) {
-                        useMagnifier: true,
+                userProvider.setSex(_sex);
-                      ),
+              }
-                      height: 300.w,
-                    ),
-                    actions: [
-                      CupertinoDialogAction(
-                        child: '取消'.text.isIntrinsic.make(),
-                        onPressed: Get.back,
-                      ),
-                      CupertinoDialogAction(
-                        child: '确定'.text.isIntrinsic.make(),
-                        onPressed: () {
-                          userProvider.setSex(_sex);
-                          Get.back();
-                        },
-                      ),
-                    ],
-                  );
-                },
-              );
             },
           ),
           _buildTile(

lib/pages/sign/sign_in_page.dart

@@ -270,6 +270,7 @@ class _SignInPageState extends State<SignInPage> {
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
                     FlatButton(
+                        shape: StadiumBorder(),
                         padding: EdgeInsets.zero,
                         onPressed: AgreementPage().to,
                         child: Text(
@@ -280,6 +281,7 @@ class _SignInPageState extends State<SignInPage> {
                         )),
                     SizedBox(width: 15.w),
                     FlatButton(
+                        shape: StadiumBorder(),
                         padding: EdgeInsets.zero,
                         onPressed: PrivacyPage().to,
                         child: Text(