From 6195daa49cf4ba32d47b3a30d3a862bd5b04f897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=90=8C?= <494089941@qq.com> Date: Wed, 20 Apr 2022 20:15:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E4=BB=8B=E7=BB=8D=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/constants/saas_api.dart | 12 +++++++++++ .../community_introduce_model.dart | 20 +++++++------------ .../community_introduce_model.g.dart | 2 -- .../community_introduce_page.dart | 2 +- .../task/publish_task_page.dart | 1 - lib/utils/application_utils.dart | 4 ++-- 6 files changed, 22 insertions(+), 19 deletions(-) diff --git a/lib/constants/saas_api.dart b/lib/constants/saas_api.dart index bbdd5708..e3110241 100644 --- a/lib/constants/saas_api.dart +++ b/lib/constants/saas_api.dart @@ -37,6 +37,8 @@ class SAASAPI { static _Pay pay = _Pay(); static _LifePay lifePay = _LifePay(); static _Balance balance = _Balance(); + static _CommunityIntroduce communityIntroduce = _CommunityIntroduce(); + static _ConveniencePhone conveniencePhone = _ConveniencePhone(); ///二级分类 static _ProfileApi profile = _ProfileApi(); @@ -340,3 +342,13 @@ class _Balance { ///app用户交易记录 String get tradeRecordList => '/app/user/tradeRecord/tradeRecordList'; } + +class _CommunityIntroduce { + ///社区介绍 + String get info => '/app/user/communityIntroduction/introductionInfo'; +} + +class _ConveniencePhone { + ///查询app便民电话 + String get list => '/app/user/conveniencePhone/list'; +} diff --git a/lib/models/community_introduce/community_introduce_model.dart b/lib/models/community_introduce/community_introduce_model.dart index d7cbc9bd..98f8f983 100644 --- a/lib/models/community_introduce/community_introduce_model.dart +++ b/lib/models/community_introduce/community_introduce_model.dart @@ -7,34 +7,28 @@ part 'community_introduce_model.g.dart'; @JsonSerializable() class CommunityIontroduceModel extends Equatable { - final int id; final String name; final String content; - final String createDate; final List? imgList; - CommunityIontroduceModel({ - required this.id, - required this.name, - required this.content, - required this.createDate, - this.imgList, - }); - factory CommunityIontroduceModel.fromJson(Map json) => _$CommunityIontroduceModelFromJson(json); factory CommunityIontroduceModel.init() => - CommunityIontroduceModel(id: -1, name: '', content: '', createDate: ''); + CommunityIontroduceModel(name: '', content: '', imgList: []); @override List get props { return [ - id, name, content, - createDate, imgList, ]; } + + const CommunityIontroduceModel({ + required this.name, + required this.content, + this.imgList, + }); } diff --git a/lib/models/community_introduce/community_introduce_model.g.dart b/lib/models/community_introduce/community_introduce_model.g.dart index 4b874e03..cb4e3805 100644 --- a/lib/models/community_introduce/community_introduce_model.g.dart +++ b/lib/models/community_introduce/community_introduce_model.g.dart @@ -9,10 +9,8 @@ part of 'community_introduce_model.dart'; CommunityIontroduceModel _$CommunityIontroduceModelFromJson( Map json) => CommunityIontroduceModel( - id: json['id'] as int, name: json['name'] as String, content: json['content'] as String, - createDate: json['createDate'] as String, imgList: (json['imgList'] as List?) ?.map((e) => ImgModel.fromJson(e as Map)) .toList(), diff --git a/lib/pages/community_introduce/community_introduce_page.dart b/lib/pages/community_introduce/community_introduce_page.dart index 05e95dbf..9e5a00d3 100644 --- a/lib/pages/community_introduce/community_introduce_page.dart +++ b/lib/pages/community_introduce/community_introduce_page.dart @@ -33,7 +33,7 @@ class _CommunityIntroducePageState extends State { header: MaterialHeader(), onRefresh: () async { BaseModel baseModel = - await NetUtil().get(API.manager.communityIntroduceInfo); + await NetUtil().get(SAASAPI.communityIntroduce.info); if (baseModel.success && baseModel.data != null) { _model = CommunityIontroduceModel.fromJson(baseModel.data); } diff --git a/lib/ui/function_and_service/task/publish_task_page.dart b/lib/ui/function_and_service/task/publish_task_page.dart index 90d959fc..ae2e9a86 100644 --- a/lib/ui/function_and_service/task/publish_task_page.dart +++ b/lib/ui/function_and_service/task/publish_task_page.dart @@ -130,7 +130,6 @@ class _PublishTaskPageState extends State { BotToast.showText(text: base.msg); } } catch (e) { - print(22222); print(e.toString()); } } diff --git a/lib/utils/application_utils.dart b/lib/utils/application_utils.dart index 92dd6e52..df6f6d29 100644 --- a/lib/utils/application_utils.dart +++ b/lib/utils/application_utils.dart @@ -170,8 +170,8 @@ class ApplicationUtil { title: '社区介绍', imgPath: Assets.newIcon.icSqjs.path, onTap: () { - BotToast.showText(text: '此功能升级中,敬请期待'); - return; + // BotToast.showText(text: '此功能升级中,敬请期待'); + // return; Get.to(() => CommunityIntroducePage()); }), // AppElement('家政服务', R.ASSETS_ICONS_FUNC_JZFW_PNG, () => HouseKeepingPage()),