首次提交

hmxc
章文轩 3 years ago
parent 0e9e9109d9
commit 026a47dc1e

@ -1,4 +1,4 @@
# aku_community # aku_new_community
## Getting Started ## Getting Started

@ -44,7 +44,7 @@ android {
defaultConfig { defaultConfig {
// Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). // Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.akuCommunity.app" applicationId "com.aku_new_community.app"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 28 targetSdkVersion 28
versionCode flutterVersionCode.toInteger() versionCode flutterVersionCode.toInteger()
@ -101,5 +101,5 @@ dependencies {
} }
apply plugin: 'com.google.gms.google-services' //apply plugin: 'com.google.gms.google-services'
//apply plugin: 'com.google.firebase.crashlytics' //apply plugin: 'com.google.firebase.crashlytics'

@ -9,7 +9,7 @@
"client_info": { "client_info": {
"mobilesdk_app_id": "1:767907767238:android:73ba965a47818e4d9cc8c7", "mobilesdk_app_id": "1:767907767238:android:73ba965a47818e4d9cc8c7",
"android_client_info": { "android_client_info": {
"package_name": "com.akuCommunity.app" "package_name": "com.aku_new_community.app"
} }
}, },
"oauth_client": [ "oauth_client": [

@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.akuCommunity.app"> package="com.aku_new_community.app">
<!-- Flutter needs it to communicate with the running application <!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc. to allow setting breakpoints, to provide hot reload, etc.
--> -->

@ -1,4 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.akuCommunity.app"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.aku_new_community.app">
<!-- io.flutter.app.FlutterApplication is an android.app.Application that <!-- io.flutter.app.FlutterApplication is an android.app.Application that
calls FlutterMain.startInitialization(this); in its onCreate method. calls FlutterMain.startInitialization(this); in its onCreate method.
In most cases you can leave this as-is, but you if you want to provide In most cases you can leave this as-is, but you if you want to provide

@ -1,4 +1,4 @@
package com.akuCommunity.app package com.aku_new_community.app
import io.flutter.embedding.android.FlutterActivity import io.flutter.embedding.android.FlutterActivity

@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.akuCommunity.app"> package="com.aku_new_community.app">
<!-- Flutter needs it to communicate with the running application <!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc. to allow setting breakpoints, to provide hot reload, etc.
--> -->

@ -399,7 +399,7 @@
"$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/Flutter",
); );
MARKETING_VERSION = 1.0.5; MARKETING_VERSION = 1.0.5;
PRODUCT_BUNDLE_IDENTIFIER = com.akuCommunity.bee; PRODUCT_BUNDLE_IDENTIFIER = "com.aku-new-community.bee";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@ -543,7 +543,7 @@
"$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/Flutter",
); );
MARKETING_VERSION = 1.0.5; MARKETING_VERSION = 1.0.5;
PRODUCT_BUNDLE_IDENTIFIER = com.akuCommunity.bee; PRODUCT_BUNDLE_IDENTIFIER = "com.aku-new-community.bee";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@ -581,7 +581,7 @@
"$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/Flutter",
); );
MARKETING_VERSION = 1.0.5; MARKETING_VERSION = 1.0.5;
PRODUCT_BUNDLE_IDENTIFIER = com.akuCommunity.bee; PRODUCT_BUNDLE_IDENTIFIER = "com.aku-new-community.bee";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

@ -1,68 +1,68 @@
{ {
"images" : [ "images": [
{ {
"filename" : "40x40.png", "filename": "40x40.png",
"idiom" : "iphone", "idiom": "iphone",
"scale" : "2x", "scale": "2x",
"size" : "20x20" "size": "20x20"
}, },
{ {
"filename" : "60x60.png", "filename": "60x60.png",
"idiom" : "iphone", "idiom": "iphone",
"scale" : "3x", "scale": "3x",
"size" : "20x20" "size": "20x20"
}, },
{ {
"filename" : "29x29.png", "filename": "29x29.png",
"idiom" : "iphone", "idiom": "iphone",
"scale" : "1x", "scale": "1x",
"size" : "29x29" "size": "29x29"
}, },
{ {
"filename" : "58x58.png", "filename": "58x58.png",
"idiom" : "iphone", "idiom": "iphone",
"scale" : "2x", "scale": "2x",
"size" : "29x29" "size": "29x29"
}, },
{ {
"filename" : "87x87.png", "filename": "87x87.png",
"idiom" : "iphone", "idiom": "iphone",
"scale" : "3x", "scale": "3x",
"size" : "29x29" "size": "29x29"
}, },
{ {
"filename" : "80x80.png", "filename": "80x80.png",
"idiom" : "iphone", "idiom": "iphone",
"scale" : "2x", "scale": "2x",
"size" : "40x40" "size": "40x40"
}, },
{ {
"filename" : "120x120.png", "filename": "120x120.png",
"idiom" : "iphone", "idiom": "iphone",
"scale" : "3x", "scale": "3x",
"size" : "40x40" "size": "40x40"
}, },
{ {
"filename" : "120x120-1.png", "filename": "120x120-1.png",
"idiom" : "iphone", "idiom": "iphone",
"scale" : "2x", "scale": "2x",
"size" : "60x60" "size": "60x60"
}, },
{ {
"filename" : "180x180.png", "filename": "180x180.png",
"idiom" : "iphone", "idiom": "iphone",
"scale" : "3x", "scale": "3x",
"size" : "60x60" "size": "60x60"
}, },
{ {
"filename" : "1024x1024.png", "filename": "1024x1024.png",
"idiom" : "ios-marketing", "idiom": "ios-marketing",
"scale" : "1x", "scale": "1x",
"size" : "1024x1024" "size": "1024x1024"
} }
], ],
"info" : { "info": {
"author" : "xcode", "author": "xcode",
"version" : 1 "version": 1
} }
} }

@ -1,52 +1,52 @@
{ {
"images" : [ "images": [
{ {
"filename" : "background.png", "filename": "background.png",
"idiom" : "universal", "idiom": "universal",
"scale" : "1x" "scale": "1x"
}, },
{ {
"appearances" : [ "appearances": [
{ {
"appearance" : "luminosity", "appearance": "luminosity",
"value" : "dark" "value": "dark"
} }
], ],
"filename" : "darkbackground.png", "filename": "darkbackground.png",
"idiom" : "universal", "idiom": "universal",
"scale" : "1x" "scale": "1x"
}, },
{ {
"idiom" : "universal", "idiom": "universal",
"scale" : "2x" "scale": "2x"
}, },
{ {
"appearances" : [ "appearances": [
{ {
"appearance" : "luminosity", "appearance": "luminosity",
"value" : "dark" "value": "dark"
} }
], ],
"idiom" : "universal", "idiom": "universal",
"scale" : "2x" "scale": "2x"
}, },
{ {
"idiom" : "universal", "idiom": "universal",
"scale" : "3x" "scale": "3x"
}, },
{ {
"appearances" : [ "appearances": [
{ {
"appearance" : "luminosity", "appearance": "luminosity",
"value" : "dark" "value": "dark"
} }
], ],
"idiom" : "universal", "idiom": "universal",
"scale" : "3x" "scale": "3x"
} }
], ],
"info" : { "info": {
"author" : "xcode", "author": "xcode",
"version" : 1 "version": 1
} }
} }

@ -1,23 +1,23 @@
{ {
"images" : [ "images": [
{ {
"filename" : "LaunchImage.png", "filename": "LaunchImage.png",
"idiom" : "universal", "idiom": "universal",
"scale" : "1x" "scale": "1x"
}, },
{ {
"filename" : "LaunchImage@2x.png", "filename": "LaunchImage@2x.png",
"idiom" : "universal", "idiom": "universal",
"scale" : "2x" "scale": "2x"
}, },
{ {
"filename" : "LaunchImage@3x.png", "filename": "LaunchImage@3x.png",
"idiom" : "universal", "idiom": "universal",
"scale" : "3x" "scale": "3x"
} }
], ],
"info" : { "info": {
"author" : "xcode", "author": "xcode",
"version" : 1 "version": 1
} }
} }

@ -2,4 +2,5 @@
You can customize the launch screen with your own desired assets by replacing the image files in this directory. You can customize the launch screen with your own desired assets by replacing the image files in this directory.
You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images. You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`,
selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images.

@ -1,8 +1,7 @@
import 'package:aku_new_community/utils/headers.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:aku_community/utils/headers.dart';
const ktextPrimary = Color(0xff333333); const ktextPrimary = Color(0xff333333);
const ktextSubColor = Color(0xff666666); const ktextSubColor = Color(0xff666666);
const ktextThirdColor = Color(0xff999999); const ktextThirdColor = Color(0xff999999);

File diff suppressed because it is too large Load Diff

@ -26,7 +26,6 @@ class API {
static _House house = _House(); static _House house = _House();
} }
class _Login { class _Login {
/// ///
String get sendSMSCode => '/login/sendMMSLogin'; String get sendSMSCode => '/login/sendMMSLogin';
@ -115,11 +114,11 @@ class _User {
String get insertAddress => '/user/jcookAddress/insert'; String get insertAddress => '/user/jcookAddress/insert';
/// ///
String get settingDefaultAddress => '/user/jcookAddress/settingDefaultAddress'; String get settingDefaultAddress =>
'/user/jcookAddress/settingDefaultAddress';
/// 10 APP /// 10 APP
String get findAllCityInfo => '/user/jcookAddress/findAllCityInfo'; String get findAllCityInfo => '/user/jcookAddress/findAllCityInfo';
} }
class _News { class _News {
@ -345,9 +344,7 @@ class _Manager {
String get surroundingEnterprises => '/user/surroundingEnterprises/list'; String get surroundingEnterprises => '/user/surroundingEnterprises/list';
///+ ///+
String get findUnpaidAmount => String get findUnpaidAmount => '/user/dailyPayment/findUnpaidAmount';
'/user/dailyPayment/findUnpaidAmount';
} }
class _Community { class _Community {
@ -417,9 +414,6 @@ class _Community {
/// ///
String get listByGambitId => '/user/gambit/listByGambitId'; String get listByGambitId => '/user/gambit/listByGambitId';
} }
class _Market { class _Market {
@ -526,8 +520,6 @@ class _Market {
///jcook 4 ///jcook 4
String get findAllCategoryInfo => '/user/jcookGoods/findAllCategoryInfo'; String get findAllCategoryInfo => '/user/jcookGoods/findAllCategoryInfo';
///jcook ///jcook
String get shopCarChangeNum => '/user/jcookShoppingCat/updateShoppingCartNum'; String get shopCarChangeNum => '/user/jcookShoppingCat/updateShoppingCartNum';
@ -551,9 +543,6 @@ class _Market {
///jcook ///jcook
String get findRotationList => '/user/jcookGoods/findRotationList'; String get findRotationList => '/user/jcookGoods/findRotationList';
} }
class _Upload { class _Upload {
@ -703,14 +692,10 @@ class _Pay {
'/user/alipay/meterReadingShareDetailsOrderCheckAlipay'; '/user/alipay/meterReadingShareDetailsOrderCheckAlipay';
///app jcook(APP) ///app jcook(APP)
String get jcookOrderCreateOrder => String get jcookOrderCreateOrder => '/user/alipay/jcookOrderCreateOrder';
'/user/alipay/jcookOrderCreateOrder';
///jcook ///jcook
String get jcookOrderCheckAlipay => String get jcookOrderCheckAlipay => '/user/alipay/jcookOrderCheckAlipay';
'/user/alipay/jcookOrderCheckAlipay';
} }
class _House { class _House {

@ -1,6 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
class AppTheme { class AppTheme {

@ -1,35 +1,35 @@
// import 'package:aku_community/widget/bee_scaffold.dart'; // import 'package:aku_new_community/widget/bee_scaffold.dart';
import 'package:aku_community/const/resource.dart'; import 'package:aku_new_community/const/resource.dart';
import 'package:aku_community/pages/community_introduce/community_introduce_page.dart'; import 'package:aku_new_community/pages/community_introduce/community_introduce_page.dart';
import 'package:aku_community/pages/convenient_phone/convenient_phone_page.dart'; import 'package:aku_new_community/pages/convenient_phone/convenient_phone_page.dart';
import 'package:aku_community/pages/electronic_commerc/electronic_commerc_page.dart'; import 'package:aku_new_community/pages/electronic_commerc/electronic_commerc_page.dart';
import 'package:aku_community/pages/event_activity/event_voting_page.dart'; import 'package:aku_new_community/pages/event_activity/event_voting_page.dart';
import 'package:aku_community/pages/express_packages/express_package_page.dart'; import 'package:aku_new_community/pages/express_packages/express_package_page.dart';
import 'package:aku_community/pages/geographic_information/geographic_information_page.dart'; import 'package:aku_new_community/pages/geographic_information/geographic_information_page.dart';
import 'package:aku_community/pages/goods_deto_page/goods_deto_page.dart'; import 'package:aku_new_community/pages/goods_deto_page/goods_deto_page.dart';
import 'package:aku_community/pages/goods_manage_page/select_borrow_return_page.dart'; import 'package:aku_new_community/pages/goods_manage_page/select_borrow_return_page.dart';
import 'package:aku_community/pages/house_introduce/house_introduce.dart'; import 'package:aku_new_community/pages/house_introduce/house_introduce.dart';
import 'package:aku_community/pages/industry_committee/industry_committee_page.dart'; import 'package:aku_new_community/pages/industry_committee/industry_committee_page.dart';
import 'package:aku_community/pages/life_pay/life_pay_choose_page.dart'; import 'package:aku_new_community/pages/life_pay/life_pay_choose_page.dart';
import 'package:aku_community/pages/one_alarm/widget/alarm_page.dart'; import 'package:aku_new_community/pages/one_alarm/widget/alarm_page.dart';
import 'package:aku_community/pages/opening_code_page/opening_code_page.dart'; import 'package:aku_new_community/pages/opening_code_page/opening_code_page.dart';
import 'package:aku_community/pages/renovation_manage/new_renovation/new_renovation_page.dart'; import 'package:aku_new_community/pages/renovation_manage/new_renovation/new_renovation_page.dart';
import 'package:aku_community/pages/service_browse/service_browse_page.dart'; import 'package:aku_new_community/pages/service_browse/service_browse_page.dart';
import 'package:aku_community/pages/setting_page/settings_page.dart'; import 'package:aku_new_community/pages/setting_page/settings_page.dart';
import 'package:aku_community/pages/surrounding_enterprises/Surrounding_enterprises_page.dart'; import 'package:aku_new_community/pages/surrounding_enterprises/Surrounding_enterprises_page.dart';
import 'package:aku_community/pages/things_page/fixed_submit_page.dart'; import 'package:aku_new_community/pages/things_page/fixed_submit_page.dart';
import 'package:aku_community/pages/visitor_access_page/visitor_access_page.dart'; import 'package:aku_new_community/pages/visitor_access_page/visitor_access_page.dart';
import 'package:aku_community/ui/community/activity/activity_list_page.dart'; import 'package:aku_new_community/ui/community/activity/activity_list_page.dart';
import 'package:aku_community/ui/community/facility/facility_appointment_page.dart'; import 'package:aku_new_community/ui/community/facility/facility_appointment_page.dart';
import 'package:aku_community/ui/home/application/all_application.dart'; import 'package:aku_new_community/ui/home/application/all_application.dart';
import 'package:aku_community/ui/manager/advice/advice_page.dart'; import 'package:aku_new_community/ui/manager/advice/advice_page.dart';
import 'package:aku_community/ui/manager/house_keeping/house_keeping_page.dart'; import 'package:aku_new_community/ui/manager/house_keeping/house_keeping_page.dart';
import 'package:aku_community/ui/manager/questionnaire/questionnaire_page.dart'; import 'package:aku_new_community/ui/manager/questionnaire/questionnaire_page.dart';
import 'package:aku_community/ui/profile/car/car_manage_page.dart'; import 'package:aku_new_community/ui/profile/car/car_manage_page.dart';
import 'package:aku_community/ui/profile/car_parking/car_parking_page.dart'; import 'package:aku_new_community/ui/profile/car_parking/car_parking_page.dart';
import 'package:aku_community/ui/profile/house/house_owners_page.dart'; import 'package:aku_new_community/ui/profile/house/house_owners_page.dart';
import 'package:aku_community/widget/others/user_tool.dart'; import 'package:aku_new_community/widget/others/user_tool.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
/// ///
@ -71,15 +71,13 @@ List<AO> appObjects = [
// if (false) AO('一键开门', R.ASSETS_APPLICATIONS_OEPN_DOOR_PNG, () => Scaffold()), // if (false) AO('一键开门', R.ASSETS_APPLICATIONS_OEPN_DOOR_PNG, () => Scaffold()),
AO('开门码', R.ASSETS_ICONS_FUNC_KMM_PNG, () => OpeningCodePage()), AO('开门码', R.ASSETS_ICONS_FUNC_KMM_PNG, () => OpeningCodePage()),
AO('访客邀请', R.ASSETS_ICONS_FUNC_FKYQ_PNG, AO('访客邀请', R.ASSETS_ICONS_FUNC_FKYQ_PNG, () => VisitorAccessPage()),
() => VisitorAccessPage()),
AO('报事报修', R.ASSETS_ICONS_FUNC_BSBX_PNG, () => FixedSubmitPage()), AO('报事报修', R.ASSETS_ICONS_FUNC_BSBX_PNG, () => FixedSubmitPage()),
AO('生活缴费', R.ASSETS_ICONS_FUNC_SHJF_PNG, () => LifePayChoosePage()), AO('生活缴费', R.ASSETS_ICONS_FUNC_SHJF_PNG, () => LifePayChoosePage()),
AO('业委会', R.ASSETS_ICONS_FUNC_YWH_PNG, () => IndustryCommitteePage()), AO('业委会', R.ASSETS_ICONS_FUNC_YWH_PNG, () => IndustryCommitteePage()),
AO('建议咨询', R.ASSETS_ICONS_FUNC_JYZX_PNG, AO('建议咨询', R.ASSETS_ICONS_FUNC_JYZX_PNG,
() => AdvicePage(type: AdviceType.SUGGESTION)), () => AdvicePage(type: AdviceType.SUGGESTION)),
AO('便民电话', R.ASSETS_ICONS_FUNC_BMDH_PNG, AO('便民电话', R.ASSETS_ICONS_FUNC_BMDH_PNG, () => ConvenientPhonePage()),
() => ConvenientPhonePage()),
AO('活动投票', R.ASSETS_ICONS_FUNC_HDTP_PNG, () => EventVotingPage()), AO('活动投票', R.ASSETS_ICONS_FUNC_HDTP_PNG, () => EventVotingPage()),
AO('物品出门', R.ASSETS_ICONS_FUNC_WPCH_PNG, () => GoodsDetoPage()), AO('物品出门', R.ASSETS_ICONS_FUNC_WPCH_PNG, () => GoodsDetoPage()),
AO('投诉表扬', R.ASSETS_ICONS_FUNC_TSBY_PNG, AO('投诉表扬', R.ASSETS_ICONS_FUNC_TSBY_PNG,
@ -187,8 +185,6 @@ List<String> _smartManagerApp = [
'周边企业', '周边企业',
'住房说明' '住房说明'
// '小区教育', // '小区教育',
// '健康运动', // '健康运动',
// '家政服务', // '家政服务',
@ -210,11 +206,7 @@ List<String> _getOutApp = [
]; ];
/// ///
List<AO> get getOutApp => List<AO> get getOutApp => _getOutApp.map((e) => AO.fromRaw(e)).toList();
_getOutApp.map((e) => AO.fromRaw(e)).toList();
/// ///
List<String> _propertyServicesApp = [ List<String> _propertyServicesApp = [
@ -229,7 +221,6 @@ List<String> _propertyServicesApp = [
List<AO> get propertyServicesApp => List<AO> get propertyServicesApp =>
_propertyServicesApp.map((e) => AO.fromRaw(e)).toList(); _propertyServicesApp.map((e) => AO.fromRaw(e)).toList();
/// ///
List<String> _residentLifeApp = [ List<String> _residentLifeApp = [
'便民电话', '便民电话',
@ -251,8 +242,6 @@ List<AO> get residentLifeApp =>
///About community ///About community
List<String> _aboutCommunityApp = [ List<String> _aboutCommunityApp = [
'服务浏览', '服务浏览',
'社区介绍', '社区介绍',
// '地理信息', // '地理信息',
@ -263,4 +252,4 @@ List<String> _aboutCommunityApp = [
/// ///
List<AO> get aboutCommunityApp => List<AO> get aboutCommunityApp =>
_aboutCommunityApp.map((e) => AO.fromRaw(e)).toList(); _aboutCommunityApp.map((e) => AO.fromRaw(e)).toList();

@ -1,8 +1,8 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
extension NumExt on num { extension NumExt on num {
Widget get wb => SizedBox(width: this.w); Widget get wb => SizedBox(width: this.w);
Widget get hb => SizedBox(height: this.w); Widget get hb => SizedBox(height: this.w);
} }

@ -1,10 +1,10 @@
{ {
"appName": "智慧小区", "appName": "智慧小区",
"@appName":{ "@appName": {
"description": "应用名称" "description": "应用名称"
}, },
"tempPlotName": "人才公寓智慧小区", "tempPlotName": "人才公寓智慧小区",
"@tempPlotName":{ "@tempPlotName": {
"description": "临时使用的小区名称" "description": "临时使用的小区名称"
} }
} }

@ -1,19 +1,17 @@
import 'package:aku_community/constants/app_theme.dart'; import 'package:aku_new_community/constants/app_theme.dart';
import 'package:aku_community/main_initialize.dart'; import 'package:aku_new_community/main_initialize.dart';
import 'package:aku_community/pages/splash/splash_page.dart'; import 'package:aku_new_community/pages/splash/splash_page.dart';
import 'package:aku_community/provider/app_provider.dart'; import 'package:aku_new_community/provider/app_provider.dart';
import 'package:aku_community/provider/sign_up_provider.dart'; import 'package:aku_new_community/provider/sign_up_provider.dart';
import 'package:aku_community/provider/user_provider.dart'; import 'package:aku_new_community/provider/user_provider.dart';
import 'package:aku_community/utils/developer_util.dart'; import 'package:aku_new_community/utils/developer_util.dart';
import 'package:aku_community/utils/headers.dart'; import 'package:aku_new_community/utils/headers.dart';
import 'package:bot_toast/bot_toast.dart'; import 'package:bot_toast/bot_toast.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:jpush_flutter/jpush_flutter.dart';
import 'package:power_logger/power_logger.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
void main() async { void main() async {
@ -78,7 +76,7 @@ class _MyAppState extends State<MyApp> {
return MediaQuery( return MediaQuery(
// //
data: MediaQuery.of(context).copyWith(textScaleFactor: 1.0), data: MediaQuery.of(context).copyWith(textScaleFactor: 1.0),
child: BotToastInit().call(context,child), child: BotToastInit().call(context, child),
); );
}, },
navigatorObservers: [BotToastNavigatorObserver()], navigatorObservers: [BotToastNavigatorObserver()],

@ -1,16 +1,12 @@
import 'dart:io'; import 'dart:io';
import 'package:aku_community/constants/app_theme.dart'; import 'package:aku_new_community/constants/app_theme.dart';
import 'package:aku_community/constants/config.dart'; import 'package:aku_new_community/constants/config.dart';
import 'package:aku_community/provider/app_provider.dart'; import 'package:aku_new_community/provider/app_provider.dart';
import 'package:aku_community/utils/message_parser.dart'; import 'package:aku_new_community/utils/message_parser.dart';
import 'package:aku_community/utils/websocket/fire_dialog.dart'; import 'package:aku_new_community/utils/websocket/fire_dialog.dart';
import 'package:aku_community/utils/websocket/web_socket_util.dart'; import 'package:aku_new_community/utils/websocket/web_socket_util.dart';
// import 'package:firebase_core/firebase_core.dart';
// import 'package:firebase_crashlytics/firebase_crashlytics.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:fluwx/fluwx.dart'; import 'package:fluwx/fluwx.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
@ -19,7 +15,6 @@ import 'package:power_logger/power_logger.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
class MainInitialize { class MainInitialize {
///firebase ///firebase
// static Future initFirebase() async { // static Future initFirebase() async {
// await Firebase.initializeApp(); // await Firebase.initializeApp();
@ -53,27 +48,21 @@ class MainInitialize {
// } // }
try { try {
jpush.addEventHandler( jpush.addEventHandler(onReceiveNotification: (message) async {
onReceiveNotification: (message) async {
LoggerData.addData(message, tag: 'onReceiveNotification'); LoggerData.addData(message, tag: 'onReceiveNotification');
await MessageParser(message).shot(); await MessageParser(message).shot();
final appProvider = final appProvider =
Provider.of<AppProvider>(Get.context!, listen: false); Provider.of<AppProvider>(Get.context!, listen: false);
appProvider.getMessageCenter(); appProvider.getMessageCenter();
}, }, onOpenNotification: (Map<String, dynamic>? message) async {
onOpenNotification: (Map<String, dynamic>? message) async {
LoggerData.addData(message, tag: 'onOpenNotification'); LoggerData.addData(message, tag: 'onOpenNotification');
}, }, onReceiveMessage: (Map<String, dynamic>? message) async {
onReceiveMessage: (Map<String, dynamic>? message) async {
LoggerData.addData(message, tag: 'onReceiveMessage'); LoggerData.addData(message, tag: 'onReceiveMessage');
}, onReceiveNotificationAuthorization: }, onReceiveNotificationAuthorization:
(Map<String, dynamic> message) async { (Map<String, dynamic> message) async {
print("flutter onReceiveNotificationAuthorization: $message"); print("flutter onReceiveNotificationAuthorization: $message");
} });
); } on PlatformException {}
} on PlatformException {
}
jpush.setup( jpush.setup(
appKey: "00e20fef79ee804d5c9abb54", appKey: "00e20fef79ee804d5c9abb54",
channel: "developer-default", channel: "developer-default",
@ -87,7 +76,6 @@ class MainInitialize {
rID = rid; rID = rid;
LoggerData.addData(rID, tag: 'RegistrationID'); LoggerData.addData(rID, tag: 'RegistrationID');
}); });
} }
static initWechat() { static initWechat() {

@ -4,6 +4,7 @@ class ImgModel {
double? longs; double? longs;
double? paragraph; double? paragraph;
int? sort; int? sort;
double get aspect => paragraph! / longs!; double get aspect => paragraph! / longs!;
ImgModel({this.url, this.size, this.longs, this.paragraph, this.sort}); ImgModel({this.url, this.size, this.longs, this.paragraph, this.sort});

@ -1,7 +1,6 @@
import 'package:aku_new_community/model/common/img_model.dart';
import 'package:flustars/flustars.dart'; import 'package:flustars/flustars.dart';
import 'package:aku_community/model/common/img_model.dart';
class ActivityDetailModel { class ActivityDetailModel {
int? id; int? id;
String? title; String? title;
@ -15,7 +14,9 @@ class ActivityDetailModel {
List<ImgModel>? headImgURls; List<ImgModel>? headImgURls;
DateTime? get startDate => DateUtil.getDateTime(activityStartTime!); DateTime? get startDate => DateUtil.getDateTime(activityStartTime!);
DateTime? get endDate => DateUtil.getDateTime(activityEndTime!); DateTime? get endDate => DateUtil.getDateTime(activityEndTime!);
DateTime? get registEndDate => DateUtil.getDateTime(registrationEndTime!); DateTime? get registEndDate => DateUtil.getDateTime(registrationEndTime!);
ActivityDetailModel( ActivityDetailModel(

@ -1,9 +1,7 @@
import 'package:flutter/material.dart'; import 'package:aku_new_community/base/base_style.dart';
import 'package:aku_new_community/model/common/img_model.dart';
import 'package:flustars/flustars.dart'; import 'package:flustars/flustars.dart';
import 'package:flutter/material.dart';
import 'package:aku_community/base/base_style.dart';
import 'package:aku_community/model/common/img_model.dart';
class ActivityItemModel { class ActivityItemModel {
int? id; int? id;
@ -16,6 +14,7 @@ class ActivityItemModel {
List<ImgModel>? headImgURls; List<ImgModel>? headImgURls;
DateTime? get begin => DateUtil.getDateTime(registrationStartTime!); DateTime? get begin => DateUtil.getDateTime(registrationStartTime!);
DateTime? get end => DateUtil.getDateTime(registrationEndTime!); DateTime? get end => DateUtil.getDateTime(registrationEndTime!);
ActivityItemModel( ActivityItemModel(

@ -1,4 +1,4 @@
import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_new_community/model/common/img_model.dart';
class ActivityPeopleModel { class ActivityPeopleModel {
int? id; int? id;

@ -1,4 +1,4 @@
import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_new_community/model/common/img_model.dart';
class BoardDetailModel { class BoardDetailModel {
int? id; int? id;

@ -1,7 +1,6 @@
import 'package:aku_new_community/model/common/img_model.dart';
import 'package:flustars/flustars.dart'; import 'package:flustars/flustars.dart';
import 'package:aku_community/model/common/img_model.dart';
class BoardItemModel { class BoardItemModel {
int? id; int? id;
String? title; String? title;

@ -1,4 +1,4 @@
import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_new_community/model/common/img_model.dart';
class CommunityTopicModel { class CommunityTopicModel {
int? id; int? id;

@ -1,7 +1,6 @@
import 'package:aku_new_community/model/common/img_model.dart';
import 'package:flustars/flustars.dart'; import 'package:flustars/flustars.dart';
import 'package:aku_community/model/common/img_model.dart';
class EventItemModel { class EventItemModel {
int? id; int? id;
int? createId; int? createId;
@ -15,7 +14,9 @@ class EventItemModel {
List<ImgModel>? imgUrls; List<ImgModel>? imgUrls;
List<ImgModel>? headSculptureImgUrl; List<ImgModel>? headSculptureImgUrl;
List<GambitThemeCommentVoList>? gambitThemeCommentVoList; List<GambitThemeCommentVoList>? gambitThemeCommentVoList;
DateTime? get date => DateUtil.getDateTime(createDate!); DateTime? get date => DateUtil.getDateTime(createDate!);
EventItemModel( EventItemModel(
{this.id, {this.id,
this.createId, this.createId,

@ -1,4 +1,4 @@
import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_new_community/model/common/img_model.dart';
class HotNewsModel { class HotNewsModel {
int? id; int? id;
@ -35,4 +35,4 @@ class HotNewsModel {
} }
return data; return data;
} }
} }

@ -1,7 +1,6 @@
import 'package:aku_new_community/model/common/img_model.dart';
import 'package:flustars/flustars.dart'; import 'package:flustars/flustars.dart';
import 'package:aku_community/model/common/img_model.dart';
class MyEventItemModel { class MyEventItemModel {
int? id; int? id;
String? content; String? content;

@ -1,4 +1,4 @@
import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_new_community/model/common/img_model.dart';
class SwiperModel { class SwiperModel {
int? newsId; int? newsId;
@ -25,8 +25,9 @@ class SwiperModel {
data['newsId'] = this.newsId; data['newsId'] = this.newsId;
data['title'] = this.title; data['title'] = this.title;
if (this.voResourcesImgList != null) { if (this.voResourcesImgList != null) {
data['voResourcesImgList'] = this.voResourcesImgList!.map((v) => v.toJson()).toList(); data['voResourcesImgList'] =
this.voResourcesImgList!.map((v) => v.toJson()).toList();
} }
return data; return data;
} }
} }

@ -4,19 +4,19 @@ class CategoryModel {
List<String>? imgUrls; List<String>? imgUrls;
List<CategoryList>? categoryList; List<CategoryList>? categoryList;
CategoryModel({this.id, this.name, this.categoryList,this.imgUrls}); CategoryModel({this.id, this.name, this.categoryList, this.imgUrls});
CategoryModel.fromJson(Map<String, dynamic> json) { CategoryModel.fromJson(Map<String, dynamic> json) {
id = json['id']; id = json['id'];
name = json['name']; name = json['name'];
if (json['imgUrls'] != null) { if (json['imgUrls'] != null) {
imgUrls = []; imgUrls = [];
json['imgUrls'].forEach((v) { json['imgUrls'].forEach((v) {
imgUrls!.add(v.toString()); imgUrls!.add(v.toString());
}); });
} }
if (json['categoryList'] != null) { if (json['categoryList'] != null) {
categoryList = []; categoryList = [];
json['categoryList'].forEach((v) { json['categoryList'].forEach((v) {
categoryList!.add(new CategoryList.fromJson(v)); categoryList!.add(new CategoryList.fromJson(v));
}); });
@ -55,7 +55,7 @@ class CategoryList {
}); });
} }
if (json['imgUrls'] != null) { if (json['imgUrls'] != null) {
imgUrls = []; imgUrls = [];
json['imgUrls'].forEach((v) { json['imgUrls'].forEach((v) {
imgUrls!.add(v.toString()); imgUrls!.add(v.toString());
}); });
@ -82,18 +82,20 @@ class CategoryListSecond {
String? name; String? name;
List<String>? imgUrls; List<String>? imgUrls;
CategoryListSecond({this.id, this.name,}); CategoryListSecond({
this.id,
this.name,
});
CategoryListSecond.fromJson(Map<String, dynamic> json) { CategoryListSecond.fromJson(Map<String, dynamic> json) {
id = json['id']; id = json['id'];
name = json['name']; name = json['name'];
if (json['imgUrls'] != null) { if (json['imgUrls'] != null) {
imgUrls = []; imgUrls = [];
json['imgUrls'].forEach((v) { json['imgUrls'].forEach((v) {
imgUrls!.add(v.toString()); imgUrls!.add(v.toString());
}); });
} }
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
@ -105,4 +107,4 @@ class CategoryListSecond {
} }
return data; return data;
} }
} }

@ -1,4 +1,4 @@
import 'package:aku_community/ui/market/shop_car/shop_car_func.dart'; import 'package:aku_new_community/ui/market/shop_car/shop_car_func.dart';
class GoodDetailModel { class GoodDetailModel {
int? id; int? id;
@ -18,33 +18,46 @@ class GoodDetailModel {
String? unit; String? unit;
double? weight; double? weight;
factory GoodDetailModel.fail() => GoodDetailModel(goodsDetailImageVos: [],sellPrice: 0,discountPrice: 0,skuName: '', factory GoodDetailModel.fail() => GoodDetailModel(
sellNum: 0,kind: 0,defaultLocation: '',defaultAddressDetail: '',stockStatus: 0,goodsDetailSpecificationVoList: [],isCollection: 0,unit:'',weight: 0 goodsDetailImageVos: [],
); sellPrice: 0,
GoodStatus get goodStatus => ShopCarFunc.getGoodsStatus(status??1, shopStatus??1); discountPrice: 0,
skuName: '',
sellNum: 0,
kind: 0,
defaultLocation: '',
defaultAddressDetail: '',
stockStatus: 0,
goodsDetailSpecificationVoList: [],
isCollection: 0,
unit: '',
weight: 0);
GoodStatus get goodStatus =>
ShopCarFunc.getGoodsStatus(status ?? 1, shopStatus ?? 1);
GoodDetailModel( GoodDetailModel(
{this.id, {this.id,
this.goodsDetailImageVos, this.goodsDetailImageVos,
this.sellPrice, this.sellPrice,
this.discountPrice, this.discountPrice,
this.skuName, this.skuName,
this.status, this.status,
this.shopStatus, this.shopStatus,
this.sellNum, this.sellNum,
this.kind, this.kind,
this.defaultLocation, this.defaultLocation,
this.defaultAddressDetail, this.defaultAddressDetail,
this.stockStatus, this.stockStatus,
this.goodsDetailSpecificationVoList, this.goodsDetailSpecificationVoList,
this.isCollection, this.isCollection,
this.unit, this.unit,
this.weight}); this.weight});
GoodDetailModel.fromJson(Map<String, dynamic> json) { GoodDetailModel.fromJson(Map<String, dynamic> json) {
id = json['id']; id = json['id'];
if (json['goodsDetailImageVos'] != null) { if (json['goodsDetailImageVos'] != null) {
goodsDetailImageVos =[]; goodsDetailImageVos = [];
json['goodsDetailImageVos'].forEach((v) { json['goodsDetailImageVos'].forEach((v) {
goodsDetailImageVos!.add(new GoodsDetailImageVos.fromJson(v)); goodsDetailImageVos!.add(new GoodsDetailImageVos.fromJson(v));
}); });
@ -60,8 +73,7 @@ class GoodDetailModel {
defaultAddressDetail = json['defaultAddressDetail']; defaultAddressDetail = json['defaultAddressDetail'];
stockStatus = json['stockStatus']; stockStatus = json['stockStatus'];
if (json['goodsDetailSpecificationVoList'] != null) { if (json['goodsDetailSpecificationVoList'] != null) {
goodsDetailSpecificationVoList = goodsDetailSpecificationVoList = [];
[];
json['goodsDetailSpecificationVoList'].forEach((v) { json['goodsDetailSpecificationVoList'].forEach((v) {
goodsDetailSpecificationVoList! goodsDetailSpecificationVoList!
.add(new GoodsDetailSpecificationVoList.fromJson(v)); .add(new GoodsDetailSpecificationVoList.fromJson(v));
@ -172,4 +184,4 @@ class Attribute {
data['value'] = this.value; data['value'] = this.value;
return data; return data;
} }
} }

@ -56,4 +56,4 @@ class ImgList {
data['sort'] = this.sort; data['sort'] = this.sort;
return data; return data;
} }
} }

@ -1,7 +1,6 @@
import 'package:aku_new_community/model/common/img_model.dart';
import 'package:flustars/flustars.dart'; import 'package:flustars/flustars.dart';
import 'package:aku_community/model/common/img_model.dart';
class AdviceDetailModel { class AdviceDetailModel {
AppAdviceDetailVo? appAdviceDetailVo; AppAdviceDetailVo? appAdviceDetailVo;

@ -1,4 +1,4 @@
import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_new_community/model/common/img_model.dart';
class ArticleBorrowDetailModel { class ArticleBorrowDetailModel {
int? id; int? id;
@ -6,6 +6,7 @@ class ArticleBorrowDetailModel {
String? code; String? code;
int? status; int? status;
List<ImgModel>? imgList; List<ImgModel>? imgList;
String get borrowStatus { String get borrowStatus {
switch (this.status) { switch (this.status) {
case 1: case 1:

@ -1,4 +1,4 @@
import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_new_community/model/common/img_model.dart';
class ArticleBorrowModel { class ArticleBorrowModel {
int? id; int? id;

@ -1,4 +1,4 @@
import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_new_community/model/common/img_model.dart';
class ArticleReturnListModel { class ArticleReturnListModel {
int? id; int? id;
@ -7,6 +7,7 @@ class ArticleReturnListModel {
String? beginDate; String? beginDate;
int? borrowTime; int? borrowTime;
List<ImgModel>? imgList; List<ImgModel>? imgList;
String get paraseBorrowTime { String get paraseBorrowTime {
if (this.borrowTime! > 24) { if (this.borrowTime! > 24) {
return '${this.borrowTime! ~/ 24}${this.borrowTime! % 24}小时'; return '${this.borrowTime! ~/ 24}${this.borrowTime! % 24}小时';

@ -1,4 +1,4 @@
import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_new_community/model/common/img_model.dart';
class ArticleReturnModel { class ArticleReturnModel {
int? id; int? id;

@ -1,4 +1,4 @@
import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_new_community/model/common/img_model.dart';
class EventVotingModel { class EventVotingModel {
int? id; int? id;

@ -1,4 +1,4 @@
import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_new_community/model/common/img_model.dart';
class QuestionnaireModel { class QuestionnaireModel {
int? id; int? id;

@ -1,4 +1,4 @@
import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_new_community/model/common/img_model.dart';
class QuestionnaireDetialModel { class QuestionnaireDetialModel {
int? id; int? id;

@ -1,7 +1,6 @@
import 'package:aku_new_community/model/common/img_model.dart';
import 'package:flustars/flustars.dart'; import 'package:flustars/flustars.dart';
import 'package:aku_community/model/common/img_model.dart';
class SuggestionOrComplainModel { class SuggestionOrComplainModel {
int? id; int? id;
int? type; int? type;

@ -1,4 +1,4 @@
import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_new_community/model/common/img_model.dart';
class VotingDetailModel { class VotingDetailModel {
int? id; int? id;

@ -1,4 +1,4 @@
import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_new_community/model/common/img_model.dart';
class CommentMessageModel { class CommentMessageModel {
int? id; int? id;

@ -6,8 +6,8 @@ class CreateOrderModel {
CreateOrderModel( CreateOrderModel(
{this.defaultAddressVo, this.myShoppingCartVoList, this.fee}); {this.defaultAddressVo, this.myShoppingCartVoList, this.fee});
factory CreateOrderModel.fail() => CreateOrderModel(defaultAddressVo: null,myShoppingCartVoList: [],fee: null factory CreateOrderModel.fail() => CreateOrderModel(
); defaultAddressVo: null, myShoppingCartVoList: [], fee: null);
CreateOrderModel.fromJson(Map<String, dynamic> json) { CreateOrderModel.fromJson(Map<String, dynamic> json) {
defaultAddressVo = json['defaultAddressVo'] != null defaultAddressVo = json['defaultAddressVo'] != null
@ -19,7 +19,7 @@ class CreateOrderModel {
json['myShoppingCartVoList'].forEach((v) { json['myShoppingCartVoList'].forEach((v) {
myShoppingCartVoList!.add(new MyShoppingCartVoList.fromJson(v)); myShoppingCartVoList!.add(new MyShoppingCartVoList.fromJson(v));
}); });
}else } else
myShoppingCartVoList = []; myShoppingCartVoList = [];
fee = json['fee']; fee = json['fee'];
} }
@ -83,16 +83,17 @@ class MyShoppingCartVoList {
MyShoppingCartVoList( MyShoppingCartVoList(
{this.id, {this.id,
this.skuName, this.skuName,
this.mainPhoto, this.mainPhoto,
this.status, this.status,
this.shopStatus, this.shopStatus,
this.sellPrice, this.sellPrice,
this.discountPrice, this.discountPrice,
this.unit, this.unit,
this.kind, this.kind,
this.weight, this.weight,
this.num,this.stockStatus}); this.num,
this.stockStatus});
MyShoppingCartVoList.fromJson(Map<String, dynamic> json) { MyShoppingCartVoList.fromJson(Map<String, dynamic> json) {
id = json['id']; id = json['id'];
@ -125,4 +126,4 @@ class MyShoppingCartVoList {
data['num'] = this.num; data['num'] = this.num;
return data; return data;
} }
} }

@ -38,11 +38,11 @@ class OperatorNodeList {
OperatorNodeList( OperatorNodeList(
{this.scanState, {this.scanState,
this.systemOperator, this.systemOperator,
this.msgTime, this.msgTime,
this.orderId, this.orderId,
this.content, this.content,
this.groupState}); this.groupState});
OperatorNodeList.fromJson(Map<String, dynamic> json) { OperatorNodeList.fromJson(Map<String, dynamic> json) {
scanState = json['scan_state']; scanState = json['scan_state'];
@ -63,4 +63,4 @@ class OperatorNodeList {
data['group_state'] = this.groupState; data['group_state'] = this.groupState;
return data; return data;
} }
} }

@ -15,17 +15,18 @@ class OrderListModel {
OrderListModel( OrderListModel(
{this.id, {this.id,
this.code, this.code,
this.tradeStatus, this.tradeStatus,
this.payType, this.payType,
this.payPrice, this.payPrice,
this.freightFee, this.freightFee,
this.receiverName, this.receiverName,
this.receiverTel, this.receiverTel,
this.locationName, this.locationName,
this.addressDetail, this.addressDetail,
this.createDate, this.createDate,
this.myOrderListVoList,this.jcookAddressId}); this.myOrderListVoList,
this.jcookAddressId});
OrderListModel.fromJson(Map<String, dynamic> json) { OrderListModel.fromJson(Map<String, dynamic> json) {
id = json['id']; id = json['id'];
@ -45,7 +46,7 @@ class OrderListModel {
json['myOrderListVoList'].forEach((v) { json['myOrderListVoList'].forEach((v) {
myOrderListVoList!.add(new MyOrderListVoList.fromJson(v)); myOrderListVoList!.add(new MyOrderListVoList.fromJson(v));
}); });
}else{ } else {
myOrderListVoList = []; myOrderListVoList = [];
} }
} }
@ -86,15 +87,15 @@ class MyOrderListVoList {
MyOrderListVoList( MyOrderListVoList(
{this.id, {this.id,
this.jcookGoodsId, this.jcookGoodsId,
this.skuName, this.skuName,
this.mainPhoto, this.mainPhoto,
this.sellPrice, this.sellPrice,
this.unit, this.unit,
this.kind, this.kind,
this.weight, this.weight,
this.num, this.num,
this.payPrice}); this.payPrice});
MyOrderListVoList.fromJson(Map<String, dynamic> json) { MyOrderListVoList.fromJson(Map<String, dynamic> json) {
id = json['id']; id = json['id'];
@ -123,4 +124,4 @@ class MyOrderListVoList {
data['payPrice'] = this.payPrice; data['payPrice'] = this.payPrice;
return data; return data;
} }
} }

@ -1,5 +1,5 @@
class AddressModel { class AddressModel {
int?id; int? id;
String? name; String? name;
String? tel; String? tel;
int? location; int? location;
@ -12,20 +12,18 @@ class AddressModel {
String? city; String? city;
String? district; String? district;
AddressModel({
this.id,
AddressModel( this.name,
{this.id, this.tel,
this.name, this.location,
this.tel, this.locationName,
this.location, this.addressDetail,
this.locationName, this.isDefault,
this.addressDetail, this.province = '',
this.isDefault, this.city = '',
this.province = '', this.district = '',
this.city = '', });
this.district = '',
});
AddressModel.fromJson(Map<String, dynamic> json) { AddressModel.fromJson(Map<String, dynamic> json) {
id = json['id']; id = json['id'];
@ -50,6 +48,13 @@ class AddressModel {
} }
factory AddressModel.empty() { factory AddressModel.empty() {
return AddressModel(id: null,name: '',tel: '',location: null,locationName: '',addressDetail: '',isDefault: null); return AddressModel(
id: null,
name: '',
tel: '',
location: null,
locationName: '',
addressDetail: '',
isDefault: null);
} }
} }

@ -1,6 +1,5 @@
import 'package:flutter/material.dart';
import 'package:flustars/flustars.dart'; import 'package:flustars/flustars.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
class CarParkingModel { class CarParkingModel {
@ -8,6 +7,7 @@ class CarParkingModel {
int? type; int? type;
int? status; int? status;
String? effectiveTimeEnd; String? effectiveTimeEnd;
String get typeName { String get typeName {
switch (type) { switch (type) {
case 1: case 1:

@ -1,4 +1,4 @@
import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_new_community/model/common/img_model.dart';
class CommitteeItemModel { class CommitteeItemModel {
int? id; int? id;

@ -1,4 +1,4 @@
import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_new_community/model/common/img_model.dart';
class FixedSubmitModel { class FixedSubmitModel {
int? id; int? id;

@ -1,10 +1,9 @@
import 'package:hive/hive.dart'; import 'package:hive/hive.dart';
part 'province_model.g.dart'; part 'province_model.g.dart';
@HiveType(typeId: 0) @HiveType(typeId: 0)
class ProvinceModel { class ProvinceModel {
@HiveField(0) @HiveField(0)
int? id; int? id;
@HiveField(1) @HiveField(1)
@ -19,9 +18,9 @@ class ProvinceModel {
name = json['name']; name = json['name'];
if (json['cityList'] != null) { if (json['cityList'] != null) {
cityList = (json['cityList'] as List).map((e) => City.fromJson(e)).toList(); cityList =
(json['cityList'] as List).map((e) => City.fromJson(e)).toList();
}else } else
cityList = []; cityList = [];
} }
@ -51,9 +50,9 @@ class City {
id = json['id']; id = json['id'];
name = json['name']; name = json['name'];
if (json['cityList'] != null) { if (json['cityList'] != null) {
districts = (json['cityList'] as List).map((e) => District.fromJson(e)).toList(); districts =
(json['cityList'] as List).map((e) => District.fromJson(e)).toList();
}else } else
districts = []; districts = [];
} }
@ -88,4 +87,4 @@ class District {
data['name'] = this.name; data['name'] = this.name;
return data; return data;
} }
} }

@ -15,6 +15,7 @@ class UserDetailModel {
String? nickName; String? nickName;
List<String>? estateNames; List<String>? estateNames;
int? nowEstateExamineId; int? nowEstateExamineId;
UserDetailModel( UserDetailModel(
{this.id, {this.id,
this.name, this.name,

@ -1,22 +1,22 @@
class CollectionGoodsModel { class CollectionGoodsModel {
int? id; int? id;
String? skuName; String? skuName;
String? mainPhoto; String? mainPhoto;
int? status; int? status;
int? shopStatus; int? shopStatus;
double? sellPrice; double? sellPrice;
double? discountPrice; double? discountPrice;
int? kind; int? kind;
CollectionGoodsModel( CollectionGoodsModel(
{this.id, {this.id,
this.skuName, this.skuName,
this.mainPhoto, this.mainPhoto,
this.status, this.status,
this.shopStatus, this.shopStatus,
this.sellPrice, this.sellPrice,
this.discountPrice, this.discountPrice,
this.kind}); this.kind});
CollectionGoodsModel.fromJson(Map<String, dynamic> json) { CollectionGoodsModel.fromJson(Map<String, dynamic> json) {
id = json['id']; id = json['id'];
@ -41,4 +41,4 @@ class CollectionGoodsModel {
data['kind'] = this.kind; data['kind'] = this.kind;
return data; return data;
} }
} }

@ -1,8 +1,7 @@
import 'package:aku_new_community/model/common/img_model.dart';
import 'package:equatable/equatable.dart'; import 'package:equatable/equatable.dart';
import 'package:json_annotation/json_annotation.dart'; import 'package:json_annotation/json_annotation.dart';
import 'package:aku_community/model/common/img_model.dart';
part 'community_introduce_model.g.dart'; part 'community_introduce_model.g.dart';
@JsonSerializable() @JsonSerializable()
@ -12,6 +11,7 @@ class CommunityIontroduceModel extends Equatable {
final String content; final String content;
final String createDate; final String createDate;
final List<ImgModel>? imgList; final List<ImgModel>? imgList;
CommunityIontroduceModel({ CommunityIontroduceModel({
required this.id, required this.id,
required this.name, required this.name,
@ -19,11 +19,13 @@ class CommunityIontroduceModel extends Equatable {
required this.createDate, required this.createDate,
this.imgList, this.imgList,
}); });
factory CommunityIontroduceModel.fromJson(Map<String, dynamic> json) => factory CommunityIontroduceModel.fromJson(Map<String, dynamic> json) =>
_$CommunityIontroduceModelFromJson(json); _$CommunityIontroduceModelFromJson(json);
factory CommunityIontroduceModel.init() => factory CommunityIontroduceModel.init() =>
CommunityIontroduceModel(id: -1, name: '', content: '', createDate: ''); CommunityIontroduceModel(id: -1, name: '', content: '', createDate: '');
@override @override
List<Object?> get props { List<Object?> get props {
return [ return [

@ -7,6 +7,7 @@ part 'electronic_commerc_category_model.g.dart';
class ElectronicCommercCategoryModel extends Equatable { class ElectronicCommercCategoryModel extends Equatable {
final int id; final int id;
final String name; final String name;
ElectronicCommercCategoryModel({ ElectronicCommercCategoryModel({
required this.id, required this.id,
required this.name, required this.name,

@ -12,6 +12,7 @@ class ElectronicCommercDetailModel extends Equatable {
final String electronicCommerceCategoryName; final String electronicCommerceCategoryName;
final String createName; final String createName;
final String createDate; final String createDate;
ElectronicCommercDetailModel({ ElectronicCommercDetailModel({
required this.id, required this.id,
required this.title, required this.title,
@ -21,8 +22,10 @@ class ElectronicCommercDetailModel extends Equatable {
required this.createName, required this.createName,
required this.createDate, required this.createDate,
}); });
factory ElectronicCommercDetailModel.fromJson(Map<String, dynamic> json) => factory ElectronicCommercDetailModel.fromJson(Map<String, dynamic> json) =>
_$ElectronicCommercDetailModelFromJson(json); _$ElectronicCommercDetailModelFromJson(json);
@override @override
List<Object> get props { List<Object> get props {
return [ return [

@ -1,8 +1,7 @@
import 'package:aku_new_community/model/common/img_model.dart';
import 'package:equatable/equatable.dart'; import 'package:equatable/equatable.dart';
import 'package:json_annotation/json_annotation.dart'; import 'package:json_annotation/json_annotation.dart';
import 'package:aku_community/model/common/img_model.dart';
part 'electronic_commerc_list_model.g.dart'; part 'electronic_commerc_list_model.g.dart';
@JsonSerializable() @JsonSerializable()
@ -11,12 +10,14 @@ class ElectronicCommercListModel extends Equatable {
final String title; final String title;
final String createDate; final String createDate;
final List<ImgModel> imgList; final List<ImgModel> imgList;
ElectronicCommercListModel({ ElectronicCommercListModel({
required this.id, required this.id,
required this.title, required this.title,
required this.createDate, required this.createDate,
required this.imgList, required this.imgList,
}); });
factory ElectronicCommercListModel.fromJson(Map<String, dynamic> json) => factory ElectronicCommercListModel.fromJson(Map<String, dynamic> json) =>
_$ElectronicCommercListModelFromJson(json); _$ElectronicCommercListModelFromJson(json);

@ -15,6 +15,7 @@ class ExpressPackageListModel extends Equatable {
final String? receiveDate; final String? receiveDate;
final String createDate; final String createDate;
final String placePosition; final String placePosition;
ExpressPackageListModel({ ExpressPackageListModel({
required this.id, required this.id,
required this.code, required this.code,
@ -26,8 +27,10 @@ class ExpressPackageListModel extends Equatable {
required this.createDate, required this.createDate,
required this.placePosition, required this.placePosition,
}); });
factory ExpressPackageListModel.fromJson(Map<String, dynamic> json) => factory ExpressPackageListModel.fromJson(Map<String, dynamic> json) =>
_$ExpressPackageListModelFromJson(json); _$ExpressPackageListModelFromJson(json);
String get createDateString => String get createDateString =>
DateUtil.formatDateStr(this.createDate, format: 'yyyy-MM-dd HH:mm'); DateUtil.formatDateStr(this.createDate, format: 'yyyy-MM-dd HH:mm');

@ -1,10 +1,8 @@
import 'package:flutter/material.dart'; import 'package:aku_new_community/base/base_style.dart';
import 'package:flustars/flustars.dart'; import 'package:flustars/flustars.dart';
import 'package:flutter/material.dart';
import 'package:json_annotation/json_annotation.dart'; import 'package:json_annotation/json_annotation.dart';
import 'package:aku_community/base/base_style.dart';
part 'facility_appointment_model.g.dart'; part 'facility_appointment_model.g.dart';
@JsonSerializable() @JsonSerializable()
@ -27,6 +25,7 @@ class FacilityAppointmentModel {
final String? useEndDate; final String? useEndDate;
DateTime? get appointmentStart => DateUtil.getDateTime(appointmentStartDate); DateTime? get appointmentStart => DateUtil.getDateTime(appointmentStartDate);
DateTime? get appointmentEnd => DateUtil.getDateTime(appointmentEndDate); DateTime? get appointmentEnd => DateUtil.getDateTime(appointmentEndDate);
String get displayDate { String get displayDate {

@ -10,21 +10,27 @@ class FacilityOrderDateListModel extends Equatable {
final String appointmentStartDate; final String appointmentStartDate;
final String appointmentEndDate; final String appointmentEndDate;
final String appointmentName; final String appointmentName;
FacilityOrderDateListModel({ FacilityOrderDateListModel({
required this.id, required this.id,
required this.appointmentStartDate, required this.appointmentStartDate,
required this.appointmentEndDate, required this.appointmentEndDate,
required this.appointmentName, required this.appointmentName,
}); });
factory FacilityOrderDateListModel.fromJson(Map<String, dynamic> json) => factory FacilityOrderDateListModel.fromJson(Map<String, dynamic> json) =>
_$FacilityOrderDateListModelFromJson(json); _$FacilityOrderDateListModelFromJson(json);
String get startDateString => String get startDateString =>
DateUtil.formatDateStr(this.appointmentStartDate, DateUtil.formatDateStr(this.appointmentStartDate,
format: 'yyyy-MM-dd HH:mm'); format: 'yyyy-MM-dd HH:mm');
String get endDateString => DateUtil.formatDateStr(this.appointmentEndDate, String get endDateString => DateUtil.formatDateStr(this.appointmentEndDate,
format: 'yyyy-MM-dd HH:mm'); format: 'yyyy-MM-dd HH:mm');
String get tiemSlot => String get tiemSlot =>
'${this.startDateString}-${DateUtil.formatDateStr(this.appointmentEndDate, format: 'HH:mm')}'; '${this.startDateString}-${DateUtil.formatDateStr(this.appointmentEndDate, format: 'HH:mm')}';
@override @override
List<Object> get props => List<Object> get props =>
[id, appointmentStartDate, appointmentEndDate, appointmentName]; [id, appointmentStartDate, appointmentEndDate, appointmentName];

@ -7,6 +7,7 @@ part 'facility_type_detail_model.g.dart';
class FacilityTypeDetailModel extends Equatable { class FacilityTypeDetailModel extends Equatable {
final int id; final int id;
final String name; final String name;
FacilityTypeDetailModel({ FacilityTypeDetailModel({
required this.id, required this.id,
required this.name, required this.name,

@ -1,7 +1,6 @@
import 'package:aku_new_community/model/common/img_model.dart';
import 'package:json_annotation/json_annotation.dart'; import 'package:json_annotation/json_annotation.dart';
import 'package:aku_community/model/common/img_model.dart';
part 'facility_type_model.g.dart'; part 'facility_type_model.g.dart';
@JsonSerializable() @JsonSerializable()
@ -12,11 +11,13 @@ class FacilityTypeModel {
final String openEndDate; final String openEndDate;
String get startDateStr => openStartDate.split(':').getRange(0, 2).join(':'); String get startDateStr => openStartDate.split(':').getRange(0, 2).join(':');
String get endDateStr => openEndDate.split(':').getRange(0, 2).join(':'); String get endDateStr => openEndDate.split(':').getRange(0, 2).join(':');
@JsonKey(name: 'num') @JsonKey(name: 'num')
final int num_; final int num_;
final List<ImgModel>? imgUrls; final List<ImgModel>? imgUrls;
FacilityTypeModel({ FacilityTypeModel({
required this.id, required this.id,
required this.name, required this.name,

@ -1,4 +1,4 @@
import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_new_community/model/common/img_model.dart';
import 'package:flustars/flustars.dart'; import 'package:flustars/flustars.dart';
class GeographicInformationModel { class GeographicInformationModel {
@ -39,5 +39,4 @@ class GeographicInformationModel {
factory GeographicInformationModel.init() => factory GeographicInformationModel.init() =>
GeographicInformationModel(id: -1, name: '', content: '', createDate: ''); GeographicInformationModel(id: -1, name: '', content: '', createDate: '');
} }

@ -1,8 +1,7 @@
import 'package:aku_new_community/model/common/img_model.dart';
import 'package:equatable/equatable.dart'; import 'package:equatable/equatable.dart';
import 'package:json_annotation/json_annotation.dart'; import 'package:json_annotation/json_annotation.dart';
import 'package:aku_community/model/common/img_model.dart';
part 'lease_detail_model.g.dart'; part 'lease_detail_model.g.dart';
@JsonSerializable() @JsonSerializable()
@ -39,6 +38,7 @@ class LeaseDetailModel extends Equatable {
final String? notMeterRentDate; final String? notMeterRentDate;
final num? requiredRent; final num? requiredRent;
final String? depositRefundReviewRemake; final String? depositRefundReviewRemake;
LeaseDetailModel({ LeaseDetailModel({
required this.id, required this.id,
required this.code, required this.code,
@ -76,6 +76,7 @@ class LeaseDetailModel extends Equatable {
factory LeaseDetailModel.fromJson(Map<String, dynamic> json) => factory LeaseDetailModel.fromJson(Map<String, dynamic> json) =>
_$LeaseDetailModelFromJson(json); _$LeaseDetailModelFromJson(json);
@override @override
List<Object?> get props { List<Object?> get props {
return [ return [

@ -9,12 +9,14 @@ class LeaseEchoModel extends Equatable {
final num? sex; final num? sex;
final String tel; final String tel;
final String? idNumber; final String? idNumber;
LeaseEchoModel({ LeaseEchoModel({
required this.name, required this.name,
required this.sex, required this.sex,
required this.tel, required this.tel,
required this.idNumber, required this.idNumber,
}); });
factory LeaseEchoModel.fromJson(Map<String, dynamic> json) => factory LeaseEchoModel.fromJson(Map<String, dynamic> json) =>
_$LeaseEchoModelFromJson(json); _$LeaseEchoModelFromJson(json);

@ -11,6 +11,7 @@ class LeaseFeeListModel extends Equatable {
final int payStatus; final int payStatus;
final String createDate; final String createDate;
final int type; final int type;
LeaseFeeListModel({ LeaseFeeListModel({
required this.id, required this.id,
required this.price, required this.price,
@ -18,8 +19,10 @@ class LeaseFeeListModel extends Equatable {
required this.createDate, required this.createDate,
required this.type, required this.type,
}); });
factory LeaseFeeListModel.fromJson(Map<String, dynamic> json) => factory LeaseFeeListModel.fromJson(Map<String, dynamic> json) =>
_$LeaseFeeListModelFromJson(json); _$LeaseFeeListModelFromJson(json);
@override @override
List<Object> get props { List<Object> get props {
return [ return [

@ -10,6 +10,7 @@ class LeaseListModel extends Equatable {
final int type; final int type;
final String estateType; final String estateType;
final int status; final int status;
LeaseListModel({ LeaseListModel({
required this.id, required this.id,
required this.roomName, required this.roomName,

@ -13,6 +13,7 @@ class SubmitModel {
List<String> idCardBackImgUrl; List<String> idCardBackImgUrl;
File? idCardFrontFile; File? idCardFrontFile;
File? idCardBackFile; File? idCardBackFile;
SubmitModel({ SubmitModel({
required this.id, required this.id,
required this.emergencyContact, required this.emergencyContact,

@ -1,4 +1,4 @@
import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_new_community/model/common/img_model.dart';
import 'package:flustars/flustars.dart'; import 'package:flustars/flustars.dart';
class HouseIntroduceModel { class HouseIntroduceModel {

@ -1,9 +1,8 @@
import 'package:aku_new_community/model/common/img_model.dart';
import 'package:equatable/equatable.dart'; import 'package:equatable/equatable.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:json_annotation/json_annotation.dart'; import 'package:json_annotation/json_annotation.dart';
import 'package:aku_community/model/common/img_model.dart';
part 'house_keeping_list_model.g.dart'; part 'house_keeping_list_model.g.dart';
@JsonSerializable() @JsonSerializable()
@ -28,6 +27,7 @@ class HouseKeepingListModel extends Equatable {
final List<ImgModel> evaluationImgList; final List<ImgModel> evaluationImgList;
final String createDate; final String createDate;
final List<ImgModel> submitImgList; final List<ImgModel> submitImgList;
HouseKeepingListModel({ HouseKeepingListModel({
required this.id, required this.id,
required this.proposerName, required this.proposerName,
@ -38,8 +38,8 @@ class HouseKeepingListModel extends Equatable {
required this.status, required this.status,
this.completion, this.completion,
this.processDescription, this.processDescription,
this.handlerName, this.handlerName,
this.handlerTel, this.handlerTel,
this.handlingTime, this.handlingTime,
required this.handlerImgList, required this.handlerImgList,
this.payFee, this.payFee,
@ -50,8 +50,10 @@ class HouseKeepingListModel extends Equatable {
required this.createDate, required this.createDate,
required this.submitImgList, required this.submitImgList,
}); });
factory HouseKeepingListModel.fromJson(Map<String, dynamic> json) => factory HouseKeepingListModel.fromJson(Map<String, dynamic> json) =>
_$HouseKeepingListModelFromJson(json); _$HouseKeepingListModelFromJson(json);
String get typeString { String get typeString {
switch (this.type) { switch (this.type) {
case 1: case 1:

@ -13,6 +13,7 @@ class HouseKeepingProcessModel extends Equatable {
final int opName; final int opName;
final int operatorType; final int operatorType;
final String operatorContent; final String operatorContent;
HouseKeepingProcessModel({ HouseKeepingProcessModel({
required this.id, required this.id,
required this.housekeepingServiceId, required this.housekeepingServiceId,
@ -22,8 +23,10 @@ class HouseKeepingProcessModel extends Equatable {
required this.operatorType, required this.operatorType,
required this.operatorContent, required this.operatorContent,
}); });
factory HouseKeepingProcessModel.fromJson(Map<String, dynamic> json) => factory HouseKeepingProcessModel.fromJson(Map<String, dynamic> json) =>
_$HouseKeepingProcessModelFromJson(json); _$HouseKeepingProcessModelFromJson(json);
factory HouseKeepingProcessModel.fail() => HouseKeepingProcessModel( factory HouseKeepingProcessModel.fail() => HouseKeepingProcessModel(
id: -1, id: -1,
housekeepingServiceId: -1, housekeepingServiceId: -1,
@ -32,6 +35,7 @@ class HouseKeepingProcessModel extends Equatable {
operationType: 0, operationType: 0,
operatorContent: '', operatorContent: '',
operatorType: 1); operatorType: 1);
@override @override
List<Object> get props { List<Object> get props {
return [ return [

@ -8,13 +8,16 @@ class LifePayListModel extends Equatable {
final int years; final int years;
final int paymentNum; final int paymentNum;
final List<DailyPaymentTypeVos> dailyPaymentTypeVos; final List<DailyPaymentTypeVos> dailyPaymentTypeVos;
LifePayListModel({ LifePayListModel({
required this.years, required this.years,
required this.paymentNum, required this.paymentNum,
required this.dailyPaymentTypeVos, required this.dailyPaymentTypeVos,
}); });
factory LifePayListModel.fromJson(Map<String, dynamic> json) => factory LifePayListModel.fromJson(Map<String, dynamic> json) =>
_$LifePayListModelFromJson(json); _$LifePayListModelFromJson(json);
// factory LifePayListModel.zero() => // factory LifePayListModel.zero() =>
// LifePayListModel(years: 0, paymentNum: 0, dailyPaymentTypeVos: [ // LifePayListModel(years: 0, paymentNum: 0, dailyPaymentTypeVos: [
// DailyPaymentTypeVos(id: 0, name: '', detailedVoList: [ // DailyPaymentTypeVos(id: 0, name: '', detailedVoList: [
@ -22,6 +25,7 @@ class LifePayListModel extends Equatable {
// ]) // ])
// ]); // ]);
Map<String, dynamic> toJson() => _$LifePayListModelToJson(this); Map<String, dynamic> toJson() => _$LifePayListModelToJson(this);
@override @override
List<Object?> get props => [years, paymentNum, dailyPaymentTypeVos]; List<Object?> get props => [years, paymentNum, dailyPaymentTypeVos];
} }
@ -31,14 +35,18 @@ class DailyPaymentTypeVos extends Equatable {
final int id; final int id;
final String name; final String name;
final List<DetailedVoList> detailedVoList; final List<DetailedVoList> detailedVoList;
DailyPaymentTypeVos({ DailyPaymentTypeVos({
required this.id, required this.id,
required this.name, required this.name,
required this.detailedVoList, required this.detailedVoList,
}); });
factory DailyPaymentTypeVos.fromJson(Map<String, dynamic> json) => factory DailyPaymentTypeVos.fromJson(Map<String, dynamic> json) =>
_$DailyPaymentTypeVosFromJson(json); _$DailyPaymentTypeVosFromJson(json);
Map<String, dynamic> toJson() => _$DailyPaymentTypeVosToJson(this); Map<String, dynamic> toJson() => _$DailyPaymentTypeVosToJson(this);
@override @override
List<Object> get props => [id, name, detailedVoList]; List<Object> get props => [id, name, detailedVoList];
} }
@ -49,15 +57,19 @@ class DetailedVoList extends Equatable {
final num paymentPrice; final num paymentPrice;
final num overdueFine; final num overdueFine;
final List<DetailsVoList> detailsVoList; final List<DetailsVoList> detailsVoList;
DetailedVoList({ DetailedVoList({
required this.groupId, required this.groupId,
required this.paymentPrice, required this.paymentPrice,
required this.overdueFine, required this.overdueFine,
required this.detailsVoList, required this.detailsVoList,
}); });
factory DetailedVoList.fromJson(Map<String, dynamic> json) => factory DetailedVoList.fromJson(Map<String, dynamic> json) =>
_$DetailedVoListFromJson(json); _$DetailedVoListFromJson(json);
Map<String, dynamic> toJson() => _$DetailedVoListToJson(this); Map<String, dynamic> toJson() => _$DetailedVoListToJson(this);
@override @override
List<Object> get props => [groupId, paymentPrice, overdueFine, detailsVoList]; List<Object> get props => [groupId, paymentPrice, overdueFine, detailsVoList];
} }
@ -79,6 +91,7 @@ class DetailsVoList extends Equatable {
final num rate; final num rate;
final String paymentTerm; final String paymentTerm;
final num overdueFine; final num overdueFine;
DetailsVoList({ DetailsVoList({
required this.id, required this.id,
required this.month, required this.month,
@ -95,9 +108,12 @@ class DetailsVoList extends Equatable {
required this.paymentTerm, required this.paymentTerm,
required this.overdueFine, required this.overdueFine,
}); });
factory DetailsVoList.fromJson(Map<String, dynamic> json) => factory DetailsVoList.fromJson(Map<String, dynamic> json) =>
_$DetailsVoListFromJson(json); _$DetailsVoListFromJson(json);
Map<String, dynamic> toJson() => _$DetailsVoListToJson(this); Map<String, dynamic> toJson() => _$DetailsVoListToJson(this);
@override @override
List<Object> get props { List<Object> get props {
return [ return [

@ -14,6 +14,7 @@ class LifePayRecordModel extends Equatable {
final String createDate; final String createDate;
final int payType; final int payType;
final String code; final String code;
LifePayRecordModel({ LifePayRecordModel({
required this.id, required this.id,
required this.chargesTemplateDetailName, required this.chargesTemplateDetailName,
@ -25,8 +26,10 @@ class LifePayRecordModel extends Equatable {
required this.payType, required this.payType,
required this.code, required this.code,
}); });
factory LifePayRecordModel.fromJson(Map<String, dynamic> json) => factory LifePayRecordModel.fromJson(Map<String, dynamic> json) =>
_$LifePayRecordModelFromJson(json); _$LifePayRecordModelFromJson(json);
@override @override
List<Object> get props { List<Object> get props {
return [ return [

@ -13,6 +13,7 @@ class SharePayRecordModel {
final String effectiveTimeEnd; final String effectiveTimeEnd;
final double shareUnitPrice; final double shareUnitPrice;
final double indoorArea; final double indoorArea;
factory SharePayRecordModel.fromJson(Map<String, dynamic> json) => factory SharePayRecordModel.fromJson(Map<String, dynamic> json) =>
_$SharePayRecordModelFromJson(json); _$SharePayRecordModelFromJson(json);

@ -1,8 +1,7 @@
import 'package:aku_new_community/model/common/img_model.dart';
import 'package:equatable/equatable.dart'; import 'package:equatable/equatable.dart';
import 'package:json_annotation/json_annotation.dart'; import 'package:json_annotation/json_annotation.dart';
import 'package:aku_community/model/common/img_model.dart';
part 'fix_detail_model.g.dart'; part 'fix_detail_model.g.dart';
@JsonSerializable() @JsonSerializable()
@ -12,14 +11,17 @@ class FixDetailModel extends Equatable {
final List<AppProcessRecordVo> appProcessRecordVo; final List<AppProcessRecordVo> appProcessRecordVo;
final AppMaintenanceResultVo? appMaintenanceResultVo; final AppMaintenanceResultVo? appMaintenanceResultVo;
final AppDispatchListVo? appDispatchListVo; final AppDispatchListVo? appDispatchListVo;
FixDetailModel({ FixDetailModel({
required this.appReportRepairVo, required this.appReportRepairVo,
required this.appProcessRecordVo, required this.appProcessRecordVo,
this.appMaintenanceResultVo, this.appMaintenanceResultVo,
required this.appDispatchListVo, required this.appDispatchListVo,
}); });
factory FixDetailModel.fromJson(Map<String, dynamic> json) => factory FixDetailModel.fromJson(Map<String, dynamic> json) =>
_$FixDetailModelFromJson(json); _$FixDetailModelFromJson(json);
@override @override
List<Object?> get props => [ List<Object?> get props => [
appReportRepairVo, appReportRepairVo,
@ -37,6 +39,7 @@ class AppReportRepairVo extends Equatable {
final int status; final int status;
final String reportDetail; final String reportDetail;
final List<ImgModel> imgUrls; final List<ImgModel> imgUrls;
AppReportRepairVo({ AppReportRepairVo({
required this.roomName, required this.roomName,
required this.id, required this.id,
@ -48,6 +51,7 @@ class AppReportRepairVo extends Equatable {
factory AppReportRepairVo.fromJson(Map<String, dynamic> json) => factory AppReportRepairVo.fromJson(Map<String, dynamic> json) =>
_$AppReportRepairVoFromJson(json); _$AppReportRepairVoFromJson(json);
@override @override
List<Object> get props { List<Object> get props {
return [ return [
@ -65,6 +69,7 @@ class AppReportRepairVo extends Equatable {
class AppProcessRecordVo extends Equatable { class AppProcessRecordVo extends Equatable {
final String operationDate; final String operationDate;
final int operationType; final int operationType;
AppProcessRecordVo({ AppProcessRecordVo({
required this.operationDate, required this.operationDate,
required this.operationType, required this.operationType,
@ -72,6 +77,7 @@ class AppProcessRecordVo extends Equatable {
factory AppProcessRecordVo.fromJson(Map<String, dynamic> json) => factory AppProcessRecordVo.fromJson(Map<String, dynamic> json) =>
_$AppProcessRecordVoFromJson(json); _$AppProcessRecordVoFromJson(json);
@override @override
List<Object> get props => [operationDate, operationType]; List<Object> get props => [operationDate, operationType];
} }
@ -83,6 +89,7 @@ class AppDispatchListVo extends Equatable {
final int type; final int type;
final String operatorName; final String operatorName;
final String distributorName; final String distributorName;
AppDispatchListVo({ AppDispatchListVo({
required this.code, required this.code,
required this.orderDate, required this.orderDate,
@ -93,6 +100,7 @@ class AppDispatchListVo extends Equatable {
factory AppDispatchListVo.fromJson(Map<String, dynamic> json) => factory AppDispatchListVo.fromJson(Map<String, dynamic> json) =>
_$AppDispatchListVoFromJson(json); _$AppDispatchListVoFromJson(json);
@override @override
List<Object> get props { List<Object> get props {
return [ return [
@ -112,6 +120,7 @@ class AppMaintenanceResultVo extends Equatable {
final num? materialCost; final num? materialCost;
final num? totalCost; final num? totalCost;
final List<ImgModel> imgUrls; final List<ImgModel> imgUrls;
AppMaintenanceResultVo({ AppMaintenanceResultVo({
required this.id, required this.id,
this.laborCost, this.laborCost,
@ -122,6 +131,7 @@ class AppMaintenanceResultVo extends Equatable {
factory AppMaintenanceResultVo.fromJson(Map<String, dynamic> json) => factory AppMaintenanceResultVo.fromJson(Map<String, dynamic> json) =>
_$AppMaintenanceResultVoFromJson(json); _$AppMaintenanceResultVoFromJson(json);
@override @override
List<Object?> get props { List<Object?> get props {
return [ return [

@ -1,11 +1,12 @@
import 'package:aku_community/constants/api.dart'; import 'package:aku_new_community/constants/api.dart';
import 'package:aku_community/models/market/market_category_model.dart'; import 'package:aku_new_community/models/market/market_category_model.dart';
import 'package:aku_community/utils/network/base_model.dart'; import 'package:aku_new_community/utils/network/base_model.dart';
import 'package:aku_community/utils/network/net_util.dart'; import 'package:aku_new_community/utils/network/net_util.dart';
class DisplayCategoryModel { class DisplayCategoryModel {
final MarketCategoryModel model; final MarketCategoryModel model;
final List<MarketCategoryModel> children; final List<MarketCategoryModel> children;
DisplayCategoryModel({ DisplayCategoryModel({
required this.model, required this.model,
required this.children, required this.children,

@ -1,4 +1,4 @@
import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_new_community/model/common/img_model.dart';
class GoodsClassification { class GoodsClassification {
int? id; int? id;
@ -30,4 +30,4 @@ class GoodsClassification {
} }
return data; return data;
} }
} }

@ -1,8 +1,7 @@
import 'package:aku_new_community/model/common/img_model.dart';
import 'package:equatable/equatable.dart'; import 'package:equatable/equatable.dart';
import 'package:json_annotation/json_annotation.dart'; import 'package:json_annotation/json_annotation.dart';
import 'package:aku_community/model/common/img_model.dart';
part 'goods_detail_model.g.dart'; part 'goods_detail_model.g.dart';
@JsonSerializable() @JsonSerializable()

@ -1,8 +1,7 @@
import 'package:aku_new_community/model/common/img_model.dart';
import 'package:equatable/equatable.dart'; import 'package:equatable/equatable.dart';
import 'package:json_annotation/json_annotation.dart'; import 'package:json_annotation/json_annotation.dart';
import 'package:aku_community/model/common/img_model.dart';
part 'goods_item.g.dart'; part 'goods_item.g.dart';
@JsonSerializable() @JsonSerializable()
@ -14,6 +13,7 @@ class GoodsItem extends Equatable {
final num markingPrice; final num markingPrice;
final int subscribeNum; final int subscribeNum;
final List<ImgModel> imgList; final List<ImgModel> imgList;
GoodsItem({ GoodsItem({
required this.id, required this.id,
required this.title, required this.title,
@ -32,6 +32,7 @@ class GoodsItem extends Equatable {
markingPrice: 2000, markingPrice: 2000,
subscribeNum: 0, subscribeNum: 0,
imgList: []); imgList: []);
@override @override
List<Object?> get props => throw UnimplementedError(); List<Object?> get props => throw UnimplementedError();

@ -21,4 +21,4 @@ class GoodsPopularModel {
data['viewsNum'] = this.viewsNum; data['viewsNum'] = this.viewsNum;
return data; return data;
} }
} }

@ -1,8 +1,7 @@
import 'package:aku_new_community/model/common/img_model.dart';
import 'package:equatable/equatable.dart'; import 'package:equatable/equatable.dart';
import 'package:json_annotation/json_annotation.dart'; import 'package:json_annotation/json_annotation.dart';
import 'package:aku_community/model/common/img_model.dart';
part 'market_category_model.g.dart'; part 'market_category_model.g.dart';
@JsonSerializable() @JsonSerializable()
@ -10,11 +9,13 @@ class MarketCategoryModel extends Equatable {
final int id; final int id;
final String name; final String name;
final List<ImgModel> imgList; final List<ImgModel> imgList;
MarketCategoryModel({ MarketCategoryModel({
required this.id, required this.id,
required this.name, required this.name,
required this.imgList, required this.imgList,
}); });
@override @override
List<Object?> get props => [id]; List<Object?> get props => [id];

@ -9,12 +9,12 @@ class GoodsHomeModel {
GoodsHomeModel( GoodsHomeModel(
{this.id, {this.id,
this.skuName, this.skuName,
this.mainPhoto, this.mainPhoto,
this.sellPrice, this.sellPrice,
this.discountPrice, this.discountPrice,
this.kind, this.kind,
this.isCollection}); this.isCollection});
GoodsHomeModel.fromJson(Map<String, dynamic> json) { GoodsHomeModel.fromJson(Map<String, dynamic> json) {
id = json['id']; id = json['id'];
@ -37,4 +37,4 @@ class GoodsHomeModel {
data['isCollection'] = this.isCollection; data['isCollection'] = this.isCollection;
return data; return data;
} }
} }

@ -1,11 +1,9 @@
import 'package:flutter/material.dart'; import 'package:aku_new_community/model/common/img_model.dart';
import 'package:equatable/equatable.dart'; import 'package:equatable/equatable.dart';
import 'package:flustars/flustars.dart'; import 'package:flustars/flustars.dart';
import 'package:flutter/material.dart';
import 'package:json_annotation/json_annotation.dart'; import 'package:json_annotation/json_annotation.dart';
import 'package:aku_community/model/common/img_model.dart';
part 'my_order_list_model.g.dart'; part 'my_order_list_model.g.dart';
@JsonSerializable() @JsonSerializable()
@ -35,6 +33,7 @@ class MyOrderListModel extends Equatable {
final String? evaluationReason; final String? evaluationReason;
final String? createDate; final String? createDate;
final String arrivalTime; final String arrivalTime;
MyOrderListModel({ MyOrderListModel({
required this.id, required this.id,
required this.code, required this.code,
@ -68,18 +67,24 @@ class MyOrderListModel extends Equatable {
String get sendDateString => String get sendDateString =>
DateUtil.formatDateStr(this.sendDate ?? '', format: 'yyyy-MM-dd HH:mm'); DateUtil.formatDateStr(this.sendDate ?? '', format: 'yyyy-MM-dd HH:mm');
String get arrivalDateString => DateUtil.formatDateStr(this.arrivalDate ?? '', String get arrivalDateString => DateUtil.formatDateStr(this.arrivalDate ?? '',
format: 'yyyy-MM-dd HH:mm'); format: 'yyyy-MM-dd HH:mm');
String get receiveDateString => String get receiveDateString =>
DateUtil.formatDateStr(this.receivingDate ?? '', DateUtil.formatDateStr(this.receivingDate ?? '',
format: 'yyyy-MM-dd HH:mm'); format: 'yyyy-MM-dd HH:mm');
String get backDateString => String get backDateString =>
DateUtil.formatDateStr(this.backDate ?? '', format: 'yyyy-MM-dd HH:mm'); DateUtil.formatDateStr(this.backDate ?? '', format: 'yyyy-MM-dd HH:mm');
String get evaluateDateString => String get evaluateDateString =>
DateUtil.formatDateStr(this.evaluationDate ?? '', DateUtil.formatDateStr(this.evaluationDate ?? '',
format: 'yyyy-MM-dd HH:mm'); format: 'yyyy-MM-dd HH:mm');
String get createDateString => String get createDateString =>
DateUtil.formatDateStr(this.createDate ?? '', format: 'yyyy-MM-dd HH:mm'); DateUtil.formatDateStr(this.createDate ?? '', format: 'yyyy-MM-dd HH:mm');
String get statusString { String get statusString {
switch (this.status) { switch (this.status) {
case 1: case 1:

@ -1,8 +1,7 @@
import 'package:aku_new_community/model/common/img_model.dart';
import 'package:equatable/equatable.dart'; import 'package:equatable/equatable.dart';
import 'package:json_annotation/json_annotation.dart'; import 'package:json_annotation/json_annotation.dart';
import 'package:aku_community/model/common/img_model.dart';
part 'order_detail_model.g.dart'; part 'order_detail_model.g.dart';
@JsonSerializable() @JsonSerializable()
@ -33,6 +32,7 @@ class OrderDetailModel extends Equatable {
final String? evaluationReason; final String? evaluationReason;
final String? arrivalTime; final String? arrivalTime;
final String? createDate; final String? createDate;
OrderDetailModel({ OrderDetailModel({
required this.id, required this.id,
required this.code, required this.code,

@ -1,4 +1,4 @@
import 'package:aku_community/ui/market/shop_car/shop_car_func.dart'; import 'package:aku_new_community/ui/market/shop_car/shop_car_func.dart';
import 'package:json_annotation/json_annotation.dart'; import 'package:json_annotation/json_annotation.dart';
part 'shop_car_list_model.g.dart'; part 'shop_car_list_model.g.dart';
@ -8,31 +8,38 @@ class ShopCarListModel {
final int? id; final int? id;
final String? skuName; final String? skuName;
final String? mainPhoto; final String? mainPhoto;
//0.1.() //0.1.()
final int? status; final int? status;
//0.1.jcook //0.1.jcook
final int? shopStatus; final int? shopStatus;
final double? sellPrice; final double? sellPrice;
final double? discountPrice; final double? discountPrice;
final String? unit; final String? unit;
// 0= 1= 2= , // 0= 1= 2= ,
final int? kind; final int? kind;
final double? weight; final double? weight;
final int? num; final int? num;
factory ShopCarListModel.fromJson(Map<String, dynamic> json) => factory ShopCarListModel.fromJson(Map<String, dynamic> json) =>
_$ShopCarListModelFromJson(json); _$ShopCarListModelFromJson(json);
GoodStatus get goodStatus => ShopCarFunc.getGoodsStatus(status??1, shopStatus??1);
GoodStatus get goodStatus =>
ShopCarFunc.getGoodsStatus(status ?? 1, shopStatus ?? 1);
const ShopCarListModel({ const ShopCarListModel({
this.id, this.id,
this.skuName, this.skuName,
this.mainPhoto, this.mainPhoto,
this.status, this.status,
this.shopStatus, this.shopStatus,
this.sellPrice, this.sellPrice,
this.discountPrice, this.discountPrice,
this.unit, this.unit,
this.kind, this.kind,
this.weight, this.weight,
this.num, this.num,
}); });
} }

@ -1,11 +1,9 @@
import 'package:flutter/material.dart'; import 'package:aku_new_community/base/base_style.dart';
import 'package:equatable/equatable.dart'; import 'package:equatable/equatable.dart';
import 'package:flustars/flustars.dart'; import 'package:flustars/flustars.dart';
import 'package:flutter/material.dart';
import 'package:json_annotation/json_annotation.dart'; import 'package:json_annotation/json_annotation.dart';
import 'package:aku_community/base/base_style.dart';
part 'new_renovation_list_model.g.dart'; part 'new_renovation_list_model.g.dart';
@JsonSerializable() @JsonSerializable()
@ -29,6 +27,7 @@ class NewRenovationListModel extends Equatable {
final String createName; final String createName;
final String createDate; final String createDate;
final List<CheckVoList?> checkVoList; final List<CheckVoList?> checkVoList;
NewRenovationListModel({ NewRenovationListModel({
required this.id, required this.id,
required this.roomName, required this.roomName,
@ -137,8 +136,10 @@ class NewRenovationListModel extends Equatable {
String get actualEndString => String get actualEndString =>
DateUtil.formatDateStr(this.actualEnd ?? '', format: 'yyyy-MM-dd HH:mm'); DateUtil.formatDateStr(this.actualEnd ?? '', format: 'yyyy-MM-dd HH:mm');
String get expectSlot => String get expectSlot =>
'${expectBginString}-${DateUtil.formatDateStr(this.expectedEnd, format: 'HH:mm')}'; '${expectBginString}-${DateUtil.formatDateStr(this.expectedEnd, format: 'HH:mm')}';
String get actualSlot => String get actualSlot =>
'${actualBginString}-${DateUtil.formatDateStr(this.actualEnd ?? '', format: 'HH:mm')}'; '${actualBginString}-${DateUtil.formatDateStr(this.actualEnd ?? '', format: 'HH:mm')}';
@ -162,6 +163,7 @@ class CheckVoList extends Equatable {
final int isQualified; final int isQualified;
final String createName; final String createName;
final String createDate; final String createDate;
CheckVoList({ CheckVoList({
required this.id, required this.id,
required this.decorationNewId, required this.decorationNewId,
@ -185,6 +187,7 @@ class CheckVoList extends Equatable {
factory CheckVoList.fromJson(Map<String, dynamic> json) => factory CheckVoList.fromJson(Map<String, dynamic> json) =>
_$CheckVoListFromJson(json); _$CheckVoListFromJson(json);
String get qualitfied { String get qualitfied {
switch (this.isQualified) { switch (this.isQualified) {
case 1: case 1:

@ -6,6 +6,7 @@ part 'news_category_model.g.dart';
class NewsCategoryModel { class NewsCategoryModel {
final int id; final int id;
final String name; final String name;
NewsCategoryModel({ NewsCategoryModel({
required this.id, required this.id,
required this.name, required this.name,

@ -12,6 +12,7 @@ class NewsDetailModel extends Equatable {
final String newsCategoryName; final String newsCategoryName;
final String createName; final String createName;
final String createDate; final String createDate;
NewsDetailModel({ NewsDetailModel({
required this.id, required this.id,
required this.code, required this.code,
@ -21,8 +22,10 @@ class NewsDetailModel extends Equatable {
required this.createName, required this.createName,
required this.createDate, required this.createDate,
}); });
factory NewsDetailModel.fromJson(Map<String, dynamic> json) => factory NewsDetailModel.fromJson(Map<String, dynamic> json) =>
_$NewsDetailModelFromJson(json); _$NewsDetailModelFromJson(json);
@override @override
List<Object> get props { List<Object> get props {
return [ return [

@ -1,8 +1,7 @@
import 'package:aku_new_community/model/common/img_model.dart';
import 'package:flustars/flustars.dart'; import 'package:flustars/flustars.dart';
import 'package:json_annotation/json_annotation.dart'; import 'package:json_annotation/json_annotation.dart';
import 'package:aku_community/model/common/img_model.dart';
part 'news_item_model.g.dart'; part 'news_item_model.g.dart';
@JsonSerializable() @JsonSerializable()
@ -11,7 +10,9 @@ class NewsItemModel {
final String title; final String title;
final String createDate; final String createDate;
final List<ImgModel> imgList; final List<ImgModel> imgList;
DateTime? get create => DateUtil.getDateTime(createDate); DateTime? get create => DateUtil.getDateTime(createDate);
NewsItemModel({ NewsItemModel({
required this.id, required this.id,
required this.title, required this.title,

@ -10,13 +10,16 @@ class PayModel extends Equatable {
final String sign; final String sign;
@JsonKey(name: 'sign_type') @JsonKey(name: 'sign_type')
final String signType; final String signType;
PayModel({ PayModel({
required this.aliPayTradeAppPayResponse, required this.aliPayTradeAppPayResponse,
required this.sign, required this.sign,
required this.signType, required this.signType,
}); });
factory PayModel.fromJson(Map<String, dynamic> json) => factory PayModel.fromJson(Map<String, dynamic> json) =>
_$PayModelFromJson(json); _$PayModelFromJson(json);
@override @override
List<Object> get props => [aliPayTradeAppPayResponse, sign, signType]; List<Object> get props => [aliPayTradeAppPayResponse, sign, signType];
} }
@ -37,6 +40,7 @@ class AliPayTradeAppPayResponse extends Equatable {
final String sellerId; final String sellerId;
final String charset; final String charset;
final String timestamp; final String timestamp;
AliPayTradeAppPayResponse({ AliPayTradeAppPayResponse({
required this.code, required this.code,
required this.msg, required this.msg,

@ -9,12 +9,12 @@ class SearchGoodsModel {
SearchGoodsModel( SearchGoodsModel(
{this.id, {this.id,
this.skuName, this.skuName,
this.mainPhoto, this.mainPhoto,
this.sellPrice, this.sellPrice,
this.discountPrice, this.discountPrice,
this.kind, this.kind,
this.isCollection}); this.isCollection});
SearchGoodsModel.fromJson(Map<String, dynamic> json) { SearchGoodsModel.fromJson(Map<String, dynamic> json) {
id = json['id']; id = json['id'];
@ -37,4 +37,4 @@ class SearchGoodsModel {
data['isCollection'] = this.isCollection; data['isCollection'] = this.isCollection;
return data; return data;
} }
} }

@ -1,23 +1,26 @@
import 'package:aku_new_community/model/community/activity_item_model.dart';
import 'package:aku_new_community/model/community/community_topic_model.dart';
import 'package:equatable/equatable.dart'; import 'package:equatable/equatable.dart';
import 'package:json_annotation/json_annotation.dart'; import 'package:json_annotation/json_annotation.dart';
import 'package:aku_community/model/community/activity_item_model.dart';
import 'package:aku_community/model/community/community_topic_model.dart';
part 'search_model.g.dart'; part 'search_model.g.dart';
@JsonSerializable() @JsonSerializable()
class SearchModel extends Equatable { class SearchModel extends Equatable {
final List<ActivityItemModel?> activityVoList; final List<ActivityItemModel?> activityVoList;
final List<CommunityTopicModel?> gambitVoList; final List<CommunityTopicModel?> gambitVoList;
SearchModel({ SearchModel({
required this.activityVoList, required this.activityVoList,
required this.gambitVoList, required this.gambitVoList,
}); });
factory SearchModel.fromJson(Map<String, dynamic> json) => factory SearchModel.fromJson(Map<String, dynamic> json) =>
_$SearchModelFromJson(json); _$SearchModelFromJson(json);
factory SearchModel.init() => factory SearchModel.init() =>
SearchModel(activityVoList: [], gambitVoList: []); SearchModel(activityVoList: [], gambitVoList: []);
@override @override
List<Object> get props => [activityVoList, gambitVoList]; List<Object> get props => [activityVoList, gambitVoList];
} }

@ -9,14 +9,17 @@ class ServiceBrowseListModel extends Equatable {
final String name; final String name;
final String content; final String content;
final String createDate; final String createDate;
ServiceBrowseListModel({ ServiceBrowseListModel({
required this.id, required this.id,
required this.name, required this.name,
required this.content, required this.content,
required this.createDate, required this.createDate,
}); });
factory ServiceBrowseListModel.fromJson(Map<String, dynamic> json) => factory ServiceBrowseListModel.fromJson(Map<String, dynamic> json) =>
_$ServiceBrowseListModelFromJson(json); _$ServiceBrowseListModelFromJson(json);
@override @override
List<Object> get props => [id, name, content, createDate]; List<Object> get props => [id, name, content, createDate];
} }

@ -1,4 +1,4 @@
import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_new_community/model/common/img_model.dart';
import 'package:flustars/flustars.dart'; import 'package:flustars/flustars.dart';
class SurroundingEnterprisesModel { class SurroundingEnterprisesModel {
@ -37,4 +37,4 @@ class SurroundingEnterprisesModel {
} }
return data; return data;
} }
} }

@ -14,6 +14,7 @@ class PassedHouseListModel extends Equatable {
final String? effectiveTimeStart; final String? effectiveTimeStart;
final String? effectiveTimeEnd; final String? effectiveTimeEnd;
final int? sysLeaseId; final int? sysLeaseId;
PassedHouseListModel({ PassedHouseListModel({
required this.id, required this.id,
required this.estateId, required this.estateId,
@ -40,6 +41,7 @@ class PassedHouseListModel extends Equatable {
_$PassedHouseListModelFromJson(json); _$PassedHouseListModelFromJson(json);
DateTime? get effectiveStartDate => DateUtil.getDateTime(effectiveTimeStart!); DateTime? get effectiveStartDate => DateUtil.getDateTime(effectiveTimeStart!);
DateTime? get effectiveEndDate => DateUtil.getDateTime(effectiveTimeEnd!); DateTime? get effectiveEndDate => DateUtil.getDateTime(effectiveTimeEnd!);
String get houseStatus { String get houseStatus {

@ -1,4 +1,4 @@
import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_new_community/model/common/img_model.dart';
import 'package:flustars/flustars.dart'; import 'package:flustars/flustars.dart';
import 'package:json_annotation/json_annotation.dart'; import 'package:json_annotation/json_annotation.dart';

@ -1,18 +1,16 @@
import 'package:aku_new_community/base/base_style.dart';
import 'package:aku_new_community/const/resource.dart';
import 'package:aku_new_community/constants/api.dart';
import 'package:aku_new_community/model/common/img_model.dart';
import 'package:aku_new_community/models/community_introduce/community_introduce_model.dart';
import 'package:aku_new_community/utils/network/base_model.dart';
import 'package:aku_new_community/utils/network/net_util.dart';
import 'package:aku_new_community/widget/bee_scaffold.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:velocity_x/velocity_x.dart'; import 'package:velocity_x/velocity_x.dart';
import 'package:aku_community/base/base_style.dart';
import 'package:aku_community/const/resource.dart';
import 'package:aku_community/constants/api.dart';
import 'package:aku_community/model/common/img_model.dart';
import 'package:aku_community/models/community_introduce/community_introduce_model.dart';
import 'package:aku_community/utils/network/base_model.dart';
import 'package:aku_community/utils/network/net_util.dart';
import 'package:aku_community/widget/bee_scaffold.dart';
class CommunityIntroducePage extends StatefulWidget { class CommunityIntroducePage extends StatefulWidget {
CommunityIntroducePage({Key? key}) : super(key: key); CommunityIntroducePage({Key? key}) : super(key: key);

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save