1281228557
/
aku_new_community
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bugs

Browse Source
pull/1/head
张萌 3 years ago
parent bb487bb22d
commit 0df7dfb76c
8 changed files with 218 additions and 127 deletions
Show Stats Download Patch File Download Diff File

19
lib/pages/message_center_page/announce/announce_view.dart
Unescape View File

@ -107,13 +107,14 @@ class _AnnounceViewState extends State<AnnounceView> {
header: MaterialHeader(),
footer: MaterialFooter(),
scrollController: _autoScrollController,
controller: _refreshController,
onRefresh: () async {
_page = 1;
_modelLists.clear();
_innerModelList.clear();
var base =
await NetUtil().getList(SAASAPI.announce.list, params: {
'page': _page,
'pageNum': _page,
'size': _size,
});
_innerModelList =
@ -129,13 +130,19 @@ class _AnnounceViewState extends State<AnnounceView> {
_page++;
var base =
await NetUtil().getList(SAASAPI.announce.list, params: {
'page': _page,
'pageNum': _page,
'size': _size,
});
if (base.total > _innerModelList.length) {}
_innerModelList =
base.rows.map((e) => HomeAnnounceModel.fromJson(e)).toList();
monthListDepart(_innerModelList);
if (base.total > _modelLists.length) {
_innerModelList = base.rows
.map((e) => HomeAnnounceModel.fromJson(e))
.toList();
monthListDepart(_innerModelList);
setState(() {});
} else {
print('1111111');
_refreshController.finishLoadCallBack!(noMore: true);
}
},
child: _modelLists.isEmpty
? Container()

2
lib/pages/opening_code_page/opening_code_page.dart
Unescape View File

@ -237,7 +237,7 @@ class _OpeningCodePageState extends State<OpeningCodePage> {
? Get.off(() => CertificationPage())
: BotToast.showText(text: '已实名认证');
},
text: '开门记录',
text: '住户认证',
suffix: UserTool.userProvider.userInfoModel!
.idCard ==
null

5
lib/pages/personal/personal_page.dart
Unescape View File

@ -422,10 +422,7 @@ class _PersonalIndexState extends State<PersonalIndex>
// () => HouseOwnersPage(
// identify: 4,
// ),
'${UserTool.userProvider.defaultHouse?.communityName ?? ''} '
'${UserTool.userProvider.defaultHouse?.buildingName ?? ''}'
'${UserTool.userProvider.defaultHouse?.unitName ?? ''}'
'${UserTool.userProvider.defaultHouse?.estateName ?? ''}',
'${UserTool.userProvider.defaultHouseString}',
),
_function('我的家庭', Assets.newIcon.icWdjt.path, () {
Get.to(() => MyFamilyPage());

87
lib/ui/community/activity/activity_card.dart
Unescape View File

@ -9,7 +9,7 @@ import 'package:get/get.dart';
import 'activity_detail_page.dart';
class ActivityCard extends StatelessWidget {
final bool? home;
final bool home;
final HomeActivityModel? model;
const ActivityCard({
@ -22,10 +22,9 @@ class ActivityCard extends StatelessWidget {
Widget build(BuildContext context) {
return ConstrainedBox(
constraints: BoxConstraints(maxHeight: home! ? 450.w : 540.w),
constraints: BoxConstraints(maxHeight: home ? 450.w : 540.w),
child: MaterialButton(
clipBehavior: Clip.antiAlias,
color: Colors.white,
padding: EdgeInsets.zero,
onPressed: () => Get.to(() => ActivityDetailPage(id: model!.id)),
elevation: 0,
@ -46,7 +45,7 @@ class ActivityCard extends StatelessWidget {
child: BeeImageNetwork(
imgs: model!.imgList ?? [],
width: double.infinity,
height: home! ? 250.w : 340.w,
height: home ? 250.w : 340.w,
),
),
),
@ -78,54 +77,46 @@ class ActivityCard extends StatelessWidget {
],
),
24.hb,
Padding(
padding: EdgeInsets.symmetric(horizontal: 32.w),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
constraints: BoxConstraints(maxWidth: 340.w),
child: Text(
model == null ? '' : model!.title,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: Color(0xD9000000),
fontSize: 28.sp,
fontWeight: FontWeight.bold),
),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
constraints: BoxConstraints(maxWidth: 340.w),
child: Text(
model == null ? '' : model!.title,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: Color(0xD9000000),
fontSize: 28.sp,
fontWeight: FontWeight.bold),
),
Spacer(),
],
),
),
Spacer(),
],
),
Spacer(),
Padding(
padding: home!?EdgeInsets.only(left: 32.w,right: 32.w,): EdgeInsets.only(left: 32.w,right: 32.w,bottom: 32.w),
child: Row(
children: [
Flexible(
child: AvatarsParticipate(
avatars:
(model?.avatarImgList?.map((e) => e.url).toList() ?? []),
pNum: model?.registrationNum ?? 0,
hasIcon: false,
),
24.hb,
Row(
children: [
Flexible(
child: AvatarsParticipate(
avatars:
(model?.avatarImgList?.map((e) => e.url).toList() ??
[]),
pNum: model?.registrationNum ?? 0,
hasIcon: false,
),
// Spacer(),
Offstage(
offstage: ActivityFunc.dateCheck(model!.end) == '已结束',
child: ActivityFunc.dateCheck(model!.end)
.text
.size(24.sp)
.black
.make()),
],
),
),
// Spacer(),
Offstage(
offstage: ActivityFunc.dateCheck(model!.end) == '已结束',
child: ActivityFunc.dateCheck(model!.end)
.text
.size(24.sp)
.black
.make()),
],
)
],
),
),

12
lib/ui/community/activity/activity_list_page.dart
Unescape View File

@ -8,7 +8,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_easyrefresh/easy_refresh.dart';
class ActivityListPage extends StatefulWidget {
ActivityListPage({Key? key}) : super(key: key);
ActivityListPage({Key? key}) : super(key: key);
@override
_ActivityListPageState createState() => _ActivityListPageState();
@ -44,9 +44,15 @@ class _ActivityListPageState extends State<ActivityListPage> {
padding: EdgeInsets.symmetric(horizontal: 32.w, vertical: 20.w),
itemBuilder: (context, index) {
final HomeActivityModel model = items[index];
return ActivityCard(model: model);
return Container(
padding:
EdgeInsets.symmetric(vertical: 32.w, horizontal: 32.w),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(16.w)),
child: ActivityCard(model: model));
},
separatorBuilder: (_, __) => 20.hb,
separatorBuilder: (_, __) => 32.hb,
itemCount: items.length,
);
},

72
lib/ui/function_and_service/work_order/all_order/all_order_view.dart
Unescape View File

@ -1,15 +1,81 @@
import 'package:aku_new_community/constants/saas_api.dart';
import 'package:aku_new_community/saas_model/work_order/work_order_list_model.dart';
import 'package:aku_new_community/utils/network/net_util.dart';
import 'package:flutter/material.dart';
import 'package:flutter_easyrefresh/easy_refresh.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:power_logger/power_logger.dart';
import 'package:velocity_x/src/extensions/num_ext.dart';
import '../work_order_card.dart';
class AllOrderView extends StatefulWidget {
const AllOrderView({Key? key}) : super(key: key);
final EasyRefreshController refreshController;
final int index;
const AllOrderView(
{Key? key, required this.refreshController, required this.index})
: super(key: key);
@override
_AllOrderViewState createState() => _AllOrderViewState();
}
class _AllOrderViewState extends State<AllOrderView> {
class _AllOrderViewState extends State<AllOrderView>
with SingleTickerProviderStateMixin {
int _page = 1;
int _size = 10;
List<WorkOrderListModel> _models = [];
@override
Widget build(BuildContext context) {
return Container();
return EasyRefresh(
firstRefresh: true,
controller: widget.refreshController,
header: MaterialHeader(),
footer: MaterialFooter(),
onRefresh: () async {
_page = 1;
try {
var base = await NetUtil().getList(SAASAPI.workOrder.list, params: {
'pageNum': _page,
'size': _size,
'status': widget.index == 0 ? null : widget.index,
});
_models =
base.rows.map((e) => WorkOrderListModel.fromJson(e)).toList();
} catch (e) {
LoggerData.addData(e.toString());
}
setState(() {});
},
onLoad: () async {
_page++;
var base = await NetUtil().getList(SAASAPI.workOrder.list, params: {
'pageNum': _page,
'size': _size,
'status': widget.index == 0 ? null : widget.index,
});
if (_models.length < base.total) {
_models.addAll(
base.rows.map((e) => WorkOrderListModel.fromJson(e)).toList());
setState(() {});
} else {
widget.refreshController.finishLoad(noMore: true);
}
},
child: _models.isEmpty
? Container()
: ListView.separated(
padding: EdgeInsets.all(24.w),
itemBuilder: (context, index) {
return WorkOrderCard(
model: _models[index],
refresh: widget.refreshController.callRefresh,
);
},
separatorBuilder: (context, index) {
return 24.w.heightBox;
},
itemCount: _models.length));
;
}
}

69
lib/ui/function_and_service/work_order/work_order_page.dart
Unescape View File

@ -1,8 +1,6 @@
import 'package:aku_new_community/constants/saas_api.dart';
import 'package:aku_new_community/saas_model/work_order/work_order_list_model.dart';
import 'package:aku_new_community/ui/function_and_service/work_order/publish_work_order_page.dart';
import 'package:aku_new_community/ui/function_and_service/work_order/work_order_card.dart';
import 'package:aku_new_community/utils/network/net_util.dart';
import 'package:aku_new_community/ui/function_and_service/work_order/work_order_view.dart';
import 'package:aku_new_community/widget/bee_scaffold.dart';
import 'package:aku_new_community/widget/tab_bar/bee_tab_bar.dart';
import 'package:flutter/cupertino.dart';
@ -10,7 +8,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_easyrefresh/easy_refresh.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:power_logger/power_logger.dart';
import 'package:velocity_x/velocity_x.dart';
class WorkOrderPage extends StatefulWidget {
@ -62,68 +59,16 @@ class _WorkOrderPageState extends State<WorkOrderPage>
],
appBarBottom: BeeTabBar(
tabs: _tabs,
onTap: (index) {
_models.clear();
setState(() {});
},
controller: _tabController,
),
body: TabBarView(
controller: _tabController,
children:
_tabs.mapIndexed((e, index) => _getOrderView(index)).toList()),
children: _tabs
.mapIndexed((e, index) => WorkOrderView(
refreshController: _refreshControllers[index],
index: index,
))
.toList()),
);
}
Widget _getOrderView(int index) {
return EasyRefresh(
firstRefresh: true,
controller: _refreshControllers[index],
header: MaterialHeader(),
footer: MaterialFooter(),
onRefresh: () async {
_page = 1;
try {
var base = await NetUtil().getList(SAASAPI.workOrder.list, params: {
'pageNum': _page,
'size': _size,
'status': index == 0 ? null : index,
});
_models =
base.rows.map((e) => WorkOrderListModel.fromJson(e)).toList();
} catch (e) {
LoggerData.addData(e.toString());
}
setState(() {});
},
onLoad: () async {
_page++;
var base = await NetUtil().getList(SAASAPI.workOrder.list, params: {
'pageNum': _page,
'size': _size,
'status': index == 0 ? null : index,
});
if (_models.length < base.total) {
_models.addAll(
base.rows.map((e) => WorkOrderListModel.fromJson(e)).toList());
setState(() {});
} else {
_refreshControllers[index].finishLoad(noMore: true);
}
},
child: _models.isEmpty
? Container()
: ListView.separated(
padding: EdgeInsets.all(24.w),
itemBuilder: (context, index) {
return WorkOrderCard(
model: _models[index],
refresh: _refreshControllers[index].callRefresh,
);
},
separatorBuilder: (context, index) {
return 24.w.heightBox;
},
itemCount: _models.length));
}
}

79
lib/ui/function_and_service/work_order/work_order_view.dart
Unescape View File

@ -0,0 +1,79 @@
import 'package:aku_new_community/constants/saas_api.dart';
import 'package:aku_new_community/saas_model/work_order/work_order_list_model.dart';
import 'package:aku_new_community/ui/function_and_service/work_order/work_order_card.dart';
import 'package:aku_new_community/utils/network/net_util.dart';
import 'package:flutter/material.dart';
import 'package:flutter_easyrefresh/easy_refresh.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:power_logger/power_logger.dart';
import 'package:velocity_x/src/extensions/num_ext.dart';
class WorkOrderView extends StatefulWidget {
final EasyRefreshController refreshController;
final int index;
const WorkOrderView(
{Key? key, required this.refreshController, required this.index})
: super(key: key);
@override
_WorkOrderViewState createState() => _WorkOrderViewState();
}
class _WorkOrderViewState extends State<WorkOrderView> {
int _page = 1;
int _size = 10;
List<WorkOrderListModel> _models = [];
@override
Widget build(BuildContext context) {
return EasyRefresh(
firstRefresh: true,
controller: widget.refreshController,
header: MaterialHeader(),
footer: MaterialFooter(),
onRefresh: () async {
_page = 1;
try {
var base = await NetUtil().getList(SAASAPI.workOrder.list, params: {
'pageNum': _page,
'size': _size,
'status': widget.index == 0 ? null : widget.index,
});
_models =
base.rows.map((e) => WorkOrderListModel.fromJson(e)).toList();
} catch (e) {
LoggerData.addData(e.toString());
}
setState(() {});
},
onLoad: () async {
_page++;
var base = await NetUtil().getList(SAASAPI.workOrder.list, params: {
'pageNum': _page,
'size': _size,
'status': widget.index == 0 ? null : widget.index,
});
if (_models.length < base.total) {
_models.addAll(
base.rows.map((e) => WorkOrderListModel.fromJson(e)).toList());
setState(() {});
} else {
widget.refreshController.finishLoad(noMore: true);
}
},
child: _models.isEmpty
? Container()
: ListView.separated(
padding: EdgeInsets.all(24.w),
itemBuilder: (context, index) {
return WorkOrderCard(
model: _models[index],
refresh: widget.refreshController.callRefresh,
);
},
separatorBuilder: (context, index) {
return 24.w.heightBox;
},
itemCount: _models.length));
;
}
}
Write Preview
Loading…
Cancel
Save