# Conflicts:
#	lib/pages/personal/clock_in/clock_in_page.dart
#	lib/pages/personal/personal_page.dart
#	lib/ui/community/community_views/my_community_view.dart
pull/1/head
章文轩 3 years ago
commit e526b1ff4f

@ -19,7 +19,6 @@
screen fades out. A splash screen is useful to avoid any visual
gap between the end of Android's launch screen and the painting of
Flutter's first frame. -->
<meta-data android:name="io.flutter.embedding.android.SplashScreenDrawable" android:resource="@drawable/launch_background" />
<intent-filter>
<action android:name="android.intent.action.MAIN"/>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 70 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 998 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 500 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 252 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 998 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

@ -26,7 +26,7 @@ flutter_native_splash:
# parameters from above. If the image_dark parameter is specified, color_dark or
# background_image_dark must be specified. color_dark and background_image_dark cannot both be
# set.
color_dark: "#333333"
color_dark: "#FBE541"
#background_image_dark: "assets/dark-background.png"
#image_dark: assets/splash-invert.png

@ -13,7 +13,6 @@ import 'package:aku_new_community/pages/goods_manage_page/select_borrow_return_p
import 'package:aku_new_community/pages/house_introduce/house_introduce.dart';
import 'package:aku_new_community/pages/industry_committee/industry_committee_page.dart';
import 'package:aku_new_community/pages/life_pay/life_pay_page_new.dart';
import 'package:aku_new_community/pages/one_alarm/widget/alarm_page.dart';
import 'package:aku_new_community/pages/opening_code_page/opening_code_page.dart';
import 'package:aku_new_community/pages/renovation_manage/new_renovation/new_renovation_page.dart';
import 'package:aku_new_community/pages/service_browse/service_browse_page.dart';
@ -27,24 +26,24 @@ import 'package:aku_new_community/ui/function_and_service/task/task_page.dart';
import 'package:aku_new_community/ui/function_and_service/work_order/work_order_page.dart';
import 'package:aku_new_community/ui/home/application/all_application.dart';
import 'package:aku_new_community/ui/manager/advice/advice_page.dart';
import 'package:aku_new_community/ui/manager/house_keeping/house_keeping_page.dart';
import 'package:aku_new_community/ui/manager/questionnaire/questionnaire_page.dart';
import 'package:aku_new_community/ui/profile/car/car_manage_page.dart';
import 'package:aku_new_community/ui/profile/car_parking/car_parking_page.dart';
import 'package:aku_new_community/ui/profile/house/house_owners_page.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
///
///Application Object
class AO {
String title = '';
String path = '';
dynamic page = () => Scaffold();
VoidCallback? callback = () {};
AO(
this.title,
this.path,
this.page,
this.callback,
);
AO.fromRaw(String raw, {String? replaceTitle}) {
@ -52,7 +51,7 @@ class AO {
if (element.title == raw) {
this.title = replaceTitle ?? element.title;
this.path = element.path;
this.page = element.page;
this.callback = element.callback;
}
});
}
@ -72,41 +71,54 @@ class AO {
List<AO> appObjects = [
// if (false) AO('一键开门', R.ASSETS_APPLICATIONS_OEPN_DOOR_PNG, () => Scaffold()),
AO('开门码', R.ASSETS_ICONS_FUNC_KMM_PNG, () => OpeningCodePage()),
AO('访客邀请', R.ASSETS_ICONS_FUNC_FKYQ_PNG, () => VisitorAccessPage()),
AO('报事报修', Assets.home.icBsbx.path, () => WorkOrderPage()),
AO('生活缴费', Assets.home.icShjf.path, () => LifePayPageNew()),
AO('业委会', R.ASSETS_ICONS_FUNC_YWH_PNG, () => IndustryCommitteePage()),
AO('建议咨询', R.ASSETS_ICONS_FUNC_JYZX_PNG,
() => AdvicePage(type: AdviceType.SUGGESTION)),
AO('便民电话', R.ASSETS_ICONS_FUNC_BMDH_PNG, () => ConvenientPhonePage()),
AO('活动投票', R.ASSETS_ICONS_FUNC_HDTP_PNG, () => EventVotingPage()),
AO('物品出门', R.ASSETS_ICONS_FUNC_WPCH_PNG, () => GoodsDetoPage()),
AO('投诉表扬', R.ASSETS_ICONS_FUNC_TSBY_PNG,
() => AdvicePage(type: AdviceType.COMPLAIN)),
AO('问卷调查', R.ASSETS_ICONS_FUNC_WJDC_PNG, () => QuestionnairePage()),
AO('装修管理', R.ASSETS_ICONS_FUNC_ZXGL_PNG, () => NewRenovationPage()),
AO('借还管理', R.ASSETS_ICONS_FUNC_JHGL_PNG, () => SelectBorrowReturnPage()),
AO('一键报警', R.ASSETS_ICONS_FUNC_YJBJ_PNG, () => AlarmPage()),
AO('开门码', Assets.newIcon.icKmm.path, () => Get.to(() => OpeningCodePage())),
// AO('访客邀请', R.ASSETS_ICONS_FUNC_FKYQ_PNG, () => Get.to(()=>VisitorAccessPage()),
AO('报事报修', Assets.home.icBsbx.path, () => Get.to(() => WorkOrderPage())),
AO('生活缴费', Assets.home.icShjf.path, () => Get.to(() => LifePayPageNew())),
AO('业委会', Assets.newIcon.icYwh.path,
() => Get.to(() => IndustryCommitteePage())),
// AO('建议咨询', R.ASSETS_ICONS_FUNC_JYZX_PNG,
// () => AdvicePage(type: AdviceType.SUGGESTION)),
AO('便民电话', Assets.newIcon.imgBmdh.path,
() => Get.to(() => ConvenientPhonePage())),
AO('活动投票', Assets.newIcon.icHdtp.path, () => Get.to(() => EventVotingPage())),
AO('物品出门', Assets.newIcon.imgWpcm.path, () => Get.to(() => GoodsDetoPage())),
AO('投诉表扬', Assets.newIcon.icTsby.path,
() => Get.to(() => AdvicePage(type: AdviceType.COMPLAIN))),
AO('问卷调查', Assets.newIcon.icWjdc.path,
() => Get.to(() => QuestionnairePage())),
AO('装修管理', Assets.newIcon.imgZxgl.path,
() => Get.to(() => NewRenovationPage())),
AO('借还管理', Assets.newIcon.icJhgl.path,
() => Get.to(SelectBorrowReturnPage())),
// AO('一键报警', Assets.newIcon.yj, () => AlarmPage()),
AO('设施预约', Assets.home.icSsyy.path, () => FacilityAppointmentPage()),
AO('快递包裹', R.ASSETS_ICONS_FUNC_KDBG_PNG, () => ExpressPackagePage()),
AO('电子商务', R.ASSETS_ICONS_FUNC_DZSW_PNG, () => ElectronicCommercPage()),
AO('服务浏览', R.ASSETS_ICONS_FUNC_FWLL_PNG, () => ServiceBrowsePage()),
AO('社区介绍', R.ASSETS_ICONS_FUNC_SQJS_PNG, () => CommunityIntroducePage()),
AO('家政服务', R.ASSETS_ICONS_FUNC_JZFW_PNG, () => HouseKeepingPage()),
AO('快递包裹', Assets.newIcon.icKdbg.path,
() => Get.to(() => ExpressPackagePage())),
AO('电子商务', Assets.newIcon.icDzsw.path,
() => Get.to(() => ElectronicCommercPage())),
AO('服务浏览', Assets.newIcon.icFwll.path,
() => Get.to(() => ServiceBrowsePage())),
AO('社区介绍', Assets.newIcon.icSqjs.path,
() => Get.to(() => CommunityIntroducePage())),
// AO('家政服务', R.ASSETS_ICONS_FUNC_JZFW_PNG, () => HouseKeepingPage()),
AO('地理信息', R.ASSETS_ICONS_FUNC_DLXX_PNG, () => GeographicInformationPage()),
AO('周边企业', R.ASSETS_ICONS_FUNC_ZBQY_PNG, () => SurroundingEnterprisesPage()),
AO('住房说明', R.ASSETS_ICONS_FUNC_ZFSM_PNG, () => HouseIntroducePage()),
AO('智慧养老', Assets.home.icZhyl.path, () => OldAgeSupportPageSimple()),
AO('地理信息', Assets.newIcon.icDlxx.path,
() => Get.to(() => GeographicInformationPage())),
AO('周边企业', Assets.newIcon.icZbqy.path,
() => Get.to(() => SurroundingEnterprisesPage())),
AO('住房说明', Assets.newIcon.icRwsm.path,
() => Get.to(() => HouseIntroducePage())),
AO('智慧养老', Assets.home.icZhyl.path,
() => Get.to(() => OldAgeSupportPageSimple())),
AO('周边服务', Assets.home.icZbfw.path, null),
AO('任务发布', Assets.home.icRwfb.path, () => TaskPage()),
AO('任务发布', Assets.home.icRwfb.path, () => Get.to(() => TaskPage())),
AO('自营商城', Assets.icons.shoppingMall.path, null),
AO('邻家宠物', Assets.home.icLjcw.path, null),
AO('共享停车', Assets.icons.sharePark.path, null),
AO('二手市场', Assets.icons.secondHandMarket.path, null),
AO('共享投屏', Assets.icons.projectionScreen.path, null),
AO('全部应用', Assets.home.icQbyy.path, () => AllApplicationPage()),
AO('全部应用', Assets.home.icQbyy.path, () => Get.to(() => AllApplicationPage())),
// AO(
// '小区教育',
@ -159,9 +171,7 @@ AO allApp =
///线 original value
List<String> _recommendApp = [
'访客邀请',
'业委会',
'建议咨询',
'便民电话',
'活动投票',
'物品出门',
@ -172,7 +182,6 @@ List<String> _recommendApp = [
'电子商务',
'服务浏览',
'社区介绍',
'家政服务',
'地理信息',
'周边企业',
'住房说明',
@ -193,7 +202,6 @@ List<String> _smartManagerApp = [
'开门码',
'报事报修',
'生活缴费',
'一键报警',
'任务发布',
];

@ -167,6 +167,9 @@ class _Community {
}
class _Task {
///
String get urgeService => '/app/user/taskRelease/urgeService';
///,
String get cancel => '/app/user/taskRelease/cancel';
@ -279,19 +282,19 @@ class _Pay {
String get createPrepaymentOrder => '/app/user/alipay/createPrepaymentOrder';
///
String get prepaymentOrderCheckAlipay => '/app/user/alipay/prepaymentOrderCheckAlipay';
String get prepaymentOrderCheckAlipay =>
'/app/user/alipay/prepaymentOrderCheckAlipay';
///
String get createLivingExpensesOrder => '/app/user/alipay/createLivingExpensesOrder';
String get createLivingExpensesOrder =>
'/app/user/alipay/createLivingExpensesOrder';
///
String get livingExpensesOrderCheckAlipay => '/app/user/alipay/livingExpensesOrderCheckAlipay';
String get livingExpensesOrderCheckAlipay =>
'/app/user/alipay/livingExpensesOrderCheckAlipay';
}
class _LifePay{
class _LifePay {
///
String get livingExpensesList => '/app/user/livingExpenses/list';
@ -300,6 +303,4 @@ class _LifePay{
///
String get findEstateBalance => '/app/user/livingExpenses/findEstateBalance';
}

@ -363,6 +363,10 @@ class $AssetsIconsGen {
AssetGenImage get identify =>
const AssetGenImage('assets/icons/identify.png');
AssetGenImage get imgAdd => const AssetGenImage('assets/icons/img_add.png');
AssetGenImage get imgQiandao =>
const AssetGenImage('assets/icons/img_qiandao.png');
AssetGenImage get imgShezhi =>
const AssetGenImage('assets/icons/img_shezhi.png');
AssetGenImage get intergral =>
const AssetGenImage('assets/icons/intergral.png');
AssetGenImage get introduce =>
@ -630,6 +634,64 @@ class $AssetsJsonGen {
const $AssetsJsonGen();
}
class $AssetsNewIconGen {
const $AssetsNewIconGen();
AssetGenImage get avatarPlaceholder =>
const AssetGenImage('assets/newIcon/avatar_placeholder.png');
AssetGenImage get icDaifuk =>
const AssetGenImage('assets/newIcon/ic_daifuk.png');
AssetGenImage get icDaishouh =>
const AssetGenImage('assets/newIcon/ic_daishouh.png');
AssetGenImage get icDlxx => const AssetGenImage('assets/newIcon/ic_dlxx.png');
AssetGenImage get icDzsw => const AssetGenImage('assets/newIcon/ic_dzsw.png');
AssetGenImage get icEssc => const AssetGenImage('assets/newIcon/ic_essc.png');
AssetGenImage get icFwll => const AssetGenImage('assets/newIcon/ic_fwll.png');
AssetGenImage get icGxtc => const AssetGenImage('assets/newIcon/ic_gxtc.png');
AssetGenImage get icGxtp => const AssetGenImage('assets/newIcon/ic_gxtp.png');
AssetGenImage get icHdtp => const AssetGenImage('assets/newIcon/ic_hdtp.png');
AssetGenImage get icJhgl => const AssetGenImage('assets/newIcon/ic_jhgl.png');
AssetGenImage get icJifen =>
const AssetGenImage('assets/newIcon/ic_jifen.png');
AssetGenImage get icKdbg => const AssetGenImage('assets/newIcon/ic_kdbg.png');
AssetGenImage get icKmm => const AssetGenImage('assets/newIcon/ic_kmm.png');
AssetGenImage get icRwsm => const AssetGenImage('assets/newIcon/ic_rwsm.png');
AssetGenImage get icShdz => const AssetGenImage('assets/newIcon/ic_shdz.png');
AssetGenImage get icSqjs => const AssetGenImage('assets/newIcon/ic_sqjs.png');
AssetGenImage get icTsby => const AssetGenImage('assets/newIcon/ic_tsby.png');
AssetGenImage get icWdfk => const AssetGenImage('assets/newIcon/ic_wdfk.png');
AssetGenImage get icWdfw => const AssetGenImage('assets/newIcon/ic_wdfw.png');
AssetGenImage get icWdjt => const AssetGenImage('assets/newIcon/ic_wdjt.png');
AssetGenImage get icWjdc => const AssetGenImage('assets/newIcon/ic_wjdc.png');
AssetGenImage get icXmfrw =>
const AssetGenImage('assets/newIcon/ic_xmfrw.png');
AssetGenImage get icYwh => const AssetGenImage('assets/newIcon/ic_ywh.png');
AssetGenImage get icZbqy => const AssetGenImage('assets/newIcon/ic_zbqy.png');
AssetGenImage get icZysc => const AssetGenImage('assets/newIcon/ic_zysc.png');
AssetGenImage get imgBg => const AssetGenImage('assets/newIcon/img_bg.png');
AssetGenImage get imgBmdh =>
const AssetGenImage('assets/newIcon/img_bmdh.png');
AssetGenImage get imgDaifah =>
const AssetGenImage('assets/newIcon/img_daifah.png');
AssetGenImage get imgDaipingj =>
const AssetGenImage('assets/newIcon/img_daipingj.png');
AssetGenImage get imgDengji =>
const AssetGenImage('assets/newIcon/img_dengji.png');
AssetGenImage get imgQiandao =>
const AssetGenImage('assets/newIcon/img_qiandao.png');
AssetGenImage get imgShezhi =>
const AssetGenImage('assets/newIcon/img_shezhi.png');
AssetGenImage get imgTxmr =>
const AssetGenImage('assets/newIcon/img_txmr.png');
AssetGenImage get imgVip => const AssetGenImage('assets/newIcon/img_vip.png');
AssetGenImage get imgVipbg =>
const AssetGenImage('assets/newIcon/img_vipbg.png');
AssetGenImage get imgWpcm =>
const AssetGenImage('assets/newIcon/img_wpcm.png');
AssetGenImage get imgZxgl =>
const AssetGenImage('assets/newIcon/img_zxgl.png');
}
class $AssetsStaticGen {
const $AssetsStaticGen();
@ -688,6 +750,7 @@ class Assets {
static const $AssetsIconsGen icons = $AssetsIconsGen();
static const $AssetsImagesGen images = $AssetsImagesGen();
static const $AssetsJsonGen json = $AssetsJsonGen();
static const $AssetsNewIconGen newIcon = $AssetsNewIconGen();
static const $AssetsStaticGen static = $AssetsStaticGen();
static const $AssetsTabGen tab = $AssetsTabGen();
}

@ -1,5 +1,6 @@
import 'package:aku_new_community/model/common/img_model.dart';
import 'package:aku_new_community/models/community/all_dynamic_list_model.dart';
import 'package:common_utils/common_utils.dart';
import 'package:json_annotation/json_annotation.dart';
part 'dynamic_my_list_body.g.dart';
@ -17,9 +18,12 @@ class DynamicMyListBody {
final List<ImgModel> dynamicImgList;
final List<TopicTag> topicTags;
final bool isLike;
factory DynamicMyListBody.fromJson(Map<String, dynamic> json) =>
_$DynamicMyListBodyFromJson(json);
DateTime? get createDT => DateUtil.getDateTime(createDate);
const DynamicMyListBody({
required this.id,
this.content,

@ -567,11 +567,11 @@ class _HomePageState extends State<HomePage>
onTap: () {
if (LoginUtil.isNotLogin) return;
// if (!LoginUtil.haveRoom(ao.title)) return;
if (ao.page == null) {
if (ao.callback == null) {
BotToast.showText(
text: '该功能正在准备上线中,敬请期待', align: Alignment(0, 0.5));
} else {
Get.to(ao.page);
ao.callback!();
}
},
child: Column(

@ -130,23 +130,23 @@ class _OpeningCodePageState extends State<OpeningCodePage> {
child: Column(
children: [
107.hb,
Container(
width: 192.w,
height: 42.w,
decoration: BoxDecoration(
color: Colors.black.withOpacity(0.06),
borderRadius:
BorderRadius.circular(45.w)),
alignment: Alignment.center,
child: Text(
UserTool.userProvider.userInfoModel!
.nickName ??
"",
style: TextStyle(
color: Colors.black, fontSize: 24.sp),
),
),
48.hb,
// Container(
// width: 192.w,
// height: 42.w,
// decoration: BoxDecoration(
// color: Colors.black.withOpacity(0.06),
// borderRadius:
// BorderRadius.circular(45.w)),
// alignment: Alignment.center,
// child: Text(
// UserTool.userProvider.userInfoModel!
// .nickName ??
// "",
// style: TextStyle(
// color: Colors.black, fontSize: 24.sp),
// ),
// ),
// 48.hb,
Text(
'2栋 1单元 1402室',
style: TextStyle(

@ -8,7 +8,7 @@ import 'package:aku_new_community/models/integral/clocked_record_list_model.dart
import 'package:aku_new_community/models/integral/integral_info_model.dart';
import 'package:aku_new_community/pages/personal/clock_in/clock_success_dialog.dart';
import 'package:aku_new_community/utils/network/net_util.dart';
import 'package:aku_new_community/widget/beeImageNetwork.dart';
import 'package:aku_new_community/widget/bee_avatar_widget.dart';
import 'package:aku_new_community/widget/bee_back_button.dart';
import 'package:aku_new_community/widget/others/user_tool.dart';
import 'package:bot_toast/bot_toast.dart';
@ -75,14 +75,10 @@ class _ClockInPageState extends State<ClockInPage> {
children: [
Hero(
tag: 'AVATAR',
child: ClipOval(
child: BeeImageNetwork(
height: 106.w,
width: 106.w,
imgs: UserTool.userProvider.userInfoModel
?.imgList ??
[],
),
child: BeeAvatarWidget(
width: 106.w,
height: 106.w,
imgs: UserTool.userProvider.userInfoModel!.imgList,
),
),
Container(

@ -7,18 +7,17 @@
* ====================================================
*/
import 'package:aku_new_community/base/base_style.dart';
import 'package:aku_new_community/model/user/adress_model.dart';
import 'package:aku_new_community/pages/personal/user_func.dart';
import 'package:aku_new_community/provider/app_provider.dart';
import 'package:aku_new_community/utils/headers.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_easyrefresh/easy_refresh.dart';
import 'package:get/get.dart';
import 'package:provider/provider.dart';
import 'package:aku_new_community/base/base_style.dart';
import 'package:aku_new_community/model/user/adress_model.dart';
import 'package:aku_new_community/pages/personal/user_func.dart';
import 'package:aku_new_community/provider/app_provider.dart';
import 'package:aku_new_community/utils/headers.dart';
import 'address/new_address_page.dart';
// ignore: must_be_immutable
@ -196,9 +195,7 @@ class _MyAddressItemState extends State<MyAddressItem> {
if (result == true) {
bool? result =
await Userfunc.deleteAddress(widget.addressModel.id!);
if (result != null) {
if (result) widget.refreshController!.callRefresh();
}
if (result) widget.refreshController!.callRefresh();
}
;
},

@ -1,17 +1,15 @@
import 'package:aku_new_community/constants/saas_api.dart';
import 'package:aku_new_community/gen/assets.gen.dart';
import 'package:aku_new_community/pages/personal/clock_in/clock_in_page.dart';
import 'package:aku_new_community/pages/personal/user_profile_page.dart';
import 'package:aku_new_community/pages/setting_page/settings_page.dart';
import 'package:aku_new_community/pages/sign/login/other_login_page.dart';
import 'package:aku_new_community/provider/user_provider.dart';
import 'package:aku_new_community/ui/market/order/order_page.dart';
import 'package:aku_new_community/ui/profile/car/car_manage_page.dart';
import 'package:aku_new_community/ui/profile/new_house/my_family_page.dart';
import 'package:aku_new_community/ui/profile/new_house/my_house_page.dart';
import 'package:aku_new_community/utils/headers.dart';
import 'package:aku_new_community/utils/network/net_util.dart';
import 'package:aku_new_community/widget/beeImageNetwork.dart';
import 'package:aku_new_community/widget/bee_avatar_widget.dart';
import 'package:aku_new_community/widget/others/user_tool.dart';
import 'package:bot_toast/bot_toast.dart';
import 'package:flutter/cupertino.dart';
@ -22,6 +20,7 @@ import 'package:get/get.dart';
import 'package:provider/provider.dart';
import 'address/address_list_page.dart';
import 'clock_in/clock_in_page.dart';
import 'clock_in/clock_success_dialog.dart';
import 'intergral/integral_center_page.dart';
@ -86,11 +85,11 @@ class _PersonalIndexState extends State<PersonalIndex>
children: [
Container(
width: double.infinity,
height: 441.w,
height: 512.w,
alignment: Alignment.topCenter,
decoration: BoxDecoration(
image: DecorationImage(
image: AssetImage(R.ASSETS_IMAGES_MY_BG_PNG),
image: Assets.newIcon.imgBg,
fit: BoxFit.cover,
),
),
@ -133,14 +132,9 @@ class _PersonalIndexState extends State<PersonalIndex>
children: [
Hero(
tag: 'AVATAR',
child: ClipOval(
child: BeeImageNetwork(
width: 106.w,
height: 106.w,
imgs: UserTool.userProvider.userInfoModel
?.imgList ??
[],
),
child: BeeAvatarWidget(
imgs: UserTool
.userProvider.userInfoModel?.imgList,
),
),
Container(
@ -195,17 +189,23 @@ class _PersonalIndexState extends State<PersonalIndex>
},
elevation: 0,
color: Colors.white,
minWidth: 112.w,
height: 58.w,
minWidth: 168.w,
height: 64.w,
shape: RoundedRectangleBorder(
borderRadius:
BorderRadius.circular(50.w)),
child:
'${UserTool.userProvider.userConfig.todayClocked ? '已签到' : '签到'}'
child: Row(
children: [
Assets.newIcon.imgQiandao
.image(width: 48.w, height: 48.w),
12.wb,
'${UserTool.userProvider.userInfoModel!.isSign ? '已签到' : '签到'}'
.text
.size(22.sp)
.black
.make(),
],
),
),
32.w.widthBox,
],
@ -215,26 +215,50 @@ class _PersonalIndexState extends State<PersonalIndex>
Spacer(),
Container(
width: 686.w,
height: 120.w,
height: 168.w,
alignment: Alignment.center,
padding: EdgeInsets.only(
left: 24.w, top: 24.w, bottom: 24.w),
decoration: BoxDecoration(
image: DecorationImage(
image: AssetImage(
Assets.static.vipBackground.path)),
color: Colors.black,
borderRadius: BorderRadius.only(
topLeft: Radius.circular(16.w),
topRight: Radius.circular(16.w))),
topLeft: Radius.circular(24.w),
topRight: Radius.circular(24.w))),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
32.wb,
Assets.icons.vipFont
.image(width: 60.w, height: 60.w),
24.wb,
'当前会员等级2级'
.text
.size(24.sp)
.color(Color(0xFFFFE0A9))
.make(),
Column(
mainAxisSize: MainAxisSize.min,
children: [
Row(
children: [
Assets.newIcon.imgVip
.image(width: 84.w, height: 32.w),
24.wb,
Container(
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(16.w),
gradient: LinearGradient(colors: [
Color(0xFFFEE8C0),
Color(0xFFFCCC8C),
])),
padding: EdgeInsets.symmetric(
horizontal: 14.w, vertical: 8.w),
child: Assets.newIcon.imgDengji
.image(width: 40.w, height: 16.w),
),
],
),
16.hb,
'尊享6大会员权益'
.text
.size(24.sp)
.color(Color(0xFFFCCC8C))
.make(),
],
),
Spacer(),
GestureDetector(
onTap: () => Get.to(() => integralCenterPage()),
@ -257,7 +281,7 @@ class _PersonalIndexState extends State<PersonalIndex>
),
),
Padding(
padding: EdgeInsets.only(top: 450.w),
padding: EdgeInsets.only(top: 600.w),
child: Column(
children: [
Container(
@ -289,22 +313,22 @@ class _PersonalIndexState extends State<PersonalIndex>
children: [
_orderButton(
name: '待付款',
path: R.ASSETS_ICONS_USER_ICON_DFK_PNG,
path: Assets.newIcon.icDaifuk.path,
index: 1,
),
_orderButton(
name: '待发货',
path: R.ASSETS_ICONS_USER_ICON_DSH_PNG,
path: Assets.newIcon.imgDaifah.path,
index: 2,
),
_orderButton(
name: '待收货',
path: R.ASSETS_ICONS_USER_ICON_DPJ_PNG,
path: Assets.newIcon.icDaishouh.path,
index: 3,
),
_orderButton(
name: '已完成',
path: R.ASSETS_ICONS_USER_ICON_SH_PNG,
path: Assets.newIcon.imgDaipingj.path,
index: 4,
),
],
@ -312,44 +336,43 @@ class _PersonalIndexState extends State<PersonalIndex>
],
),
),
24.w.heightBox,
Container(
width: double.infinity,
height: 100.w,
clipBehavior: Clip.antiAlias,
decoration: BoxDecoration(
// color: Colors.white,
borderRadius: BorderRadius.circular(16.w)),
margin: EdgeInsets.symmetric(horizontal: 32.w),
child: Material(
color: Colors.white,
child: InkWell(
onTap: () {
Get.to(() => ClockInPage());
},
borderRadius: BorderRadius.circular(16.w),
child: Padding(
padding: EdgeInsets.symmetric(
horizontal: 32.w, vertical: 24.w),
child: Row(
children: [
'我的积分'.text.size(30.sp).black.bold.make(),
Spacer(),
// Assets.icons.intergral
// .image(width: 32.w, height: 32.w),
// 16.w.widthBox,
// '123'.text.size(28.sp).black.make(),
// 16.w.widthBox,
Icon(
CupertinoIcons.right_chevron,
size: 24.w,
),
],
),
),
),
),
),
// Container(
// width: double.infinity,
// height: 100.w,
// clipBehavior: Clip.antiAlias,
// decoration: BoxDecoration(
// // color: Colors.white,
// borderRadius: BorderRadius.circular(16.w)),
// margin: EdgeInsets.symmetric(horizontal: 32.w),
// child: Material(
// color: Colors.white,
// child: InkWell(
// onTap: () {
// Get.to(() => ClockInPage());
// },
// borderRadius: BorderRadius.circular(16.w),
// child: Padding(
// padding: EdgeInsets.symmetric(
// horizontal: 32.w, vertical: 24.w),
// child: Row(
// children: [
// '我的积分'.text.size(30.sp).black.bold.make(),
// Spacer(),
// // Assets.icons.intergral
// // .image(width: 32.w, height: 32.w),
// // 16.w.widthBox,
// // '123'.text.size(28.sp).black.make(),
// // 16.w.widthBox,
// Icon(
// CupertinoIcons.right_chevron,
// size: 24.w,
// ),
// ],
// ),
// ),
// ),
// ),
// ),
Container(
decoration: BoxDecoration(
color: Color(0xffffffff),
@ -364,8 +387,22 @@ class _PersonalIndexState extends State<PersonalIndex>
margin: EdgeInsets.all(32.w),
padding: EdgeInsets.all(32.w),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Row(
children: [
22.wb,
'其他功能'
.text
.size(32.sp)
.color(Color(0xFF2B2B2B))
.bold
.make(),
Spacer(),
],
),
24.hb,
_function('我的积分', Assets.newIcon.icJifen.path,
() => ClockInPage(), ''),
_function(
'我的房屋',
R.ASSETS_ICONS_ICON_MY_HOUSE_PNG,
@ -408,13 +445,11 @@ class _PersonalIndexState extends State<PersonalIndex>
''),
36.hb,
_function(
'收货地址设置',
'收货地址',
R.ASSETS_ICONS_ICON_MY_LOCATION_PNG,
(){
Get.to(() => AddressListPage(
canBack: false,
),);
},
() => AddressListPage(
canBack: false,
),
''),
],
),
@ -462,6 +497,7 @@ class _PersonalIndexState extends State<PersonalIndex>
onTap: onTap,
child: Container(
color: Colors.transparent,
padding: EdgeInsets.symmetric(horizontal: 20.w, vertical: 20.w),
child: Row(
children: [
Image.asset(

@ -63,7 +63,7 @@ class Userfunc {
///
static Future<bool> deleteAddress(int addressId) async {
BaseModel model = await NetUtil().post(SAASAPI.market.address.delete,
BaseModel model = await NetUtil().get(SAASAPI.market.address.delete,
params: {'id': addressId}, showMessage: false);
if (model.success) {
BotToast.showText(text: '删除成功');

@ -62,7 +62,11 @@ class _ForgotPsdPageState extends State<ForgotPsdPage> {
],
),
144.w.heightBox,
TelTextField(controller: _telController),
TelTextField(
controller: _telController,
onChange: (content) {
setState(() {});
}),
100.w.heightBox,
LoginButtonWidget(
onTap: _telController.text.isNotEmpty
@ -83,6 +87,7 @@ class _ForgotPsdPageState extends State<ForgotPsdPage> {
} else {
BotToast.showText(text: base.msg);
}
setState(() {});
}
: null,
text: '下一步'),

@ -26,7 +26,7 @@ class OtherLoginPage extends StatefulWidget {
class _OtherLoginPageState extends State<OtherLoginPage> {
PageController _controller = PageController();
List<String> _tabs = ['账号登录', '验证码登录'];
List<String> _tabs = [ '验证码登录','账号登录'];
int _currentIndex = 0;
TextEditingController _tel = TextEditingController();
TextEditingController _psd = TextEditingController();
@ -66,7 +66,7 @@ class _OtherLoginPageState extends State<OtherLoginPage> {
Flexible(
child: PageView(
controller: _controller,
children: [_accountView(), _verificationView()],
children: [_verificationView(), _accountView()],
),
),
BottomTip(),
@ -86,6 +86,9 @@ class _OtherLoginPageState extends State<OtherLoginPage> {
40.w.heightBox,
TelTextField(
controller: _tel,
onChange: (String) {
setState(() {});
},
),
40.w.heightBox,
PsdTextField(
@ -110,7 +113,8 @@ class _OtherLoginPageState extends State<OtherLoginPage> {
await UserTool.dataProvider.addHistories();
await UserTool.userProvider.setLogin(response.data['data']);
} else {
BotToast.showText(text: response.data['message']);
// BotToast.showText(text: response.data['message']);
BotToast.showText(text: '账号尚未注册,请使用验证码登陆');
}
} catch (e) {
print(e.toString());
@ -156,7 +160,12 @@ class _OtherLoginPageState extends State<OtherLoginPage> {
align: MainAxisAlignment.start,
),
40.w.heightBox,
TelTextField(controller: _tel),
TelTextField(
controller: _tel,
onChange: (String) {
setState(() {});
},
),
100.w.heightBox,
LoginButtonWidget(
onTap: UserTool.appProvider.second < 60

@ -1,4 +1,5 @@
import 'package:aku_new_community/constants/saas_api.dart';
import 'package:aku_new_community/extensions/num_ext.dart';
import 'package:aku_new_community/saas_model/login/community_model.dart';
import 'package:aku_new_community/saas_model/login/history_login_model.dart';
import 'package:aku_new_community/utils/network/net_util.dart';
@ -12,6 +13,8 @@ import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:velocity_x/velocity_x.dart';
import '../../../base/base_style.dart';
class SelectCommunity extends StatefulWidget {
const SelectCommunity({
Key? key,
@ -159,6 +162,23 @@ class _SelectCommunityState extends State<SelectCommunity> {
},
child: BeeScaffold(
title: '选择登录小区',
actions: [
Hero(
tag: 'event_add',
child: MaterialButton(
elevation: 0,
minWidth: 116.w,
padding: EdgeInsets.zero,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(4.w),
),
color: kPrimaryColor,
onPressed: (){Navigator.pop(context);},
child: '提交'.text.size(34.sp).make(),
).centered(),
),
32.wb,
],
body: ListView(
children: [
selectCity,

@ -6,7 +6,8 @@ import 'package:velocity_x/velocity_x.dart';
class TelTextField extends StatefulWidget {
final TextEditingController controller;
const TelTextField({Key? key, required this.controller}) : super(key: key);
final Function(String) onChange;
const TelTextField({Key? key, required this.controller, required this.onChange}) : super(key: key);
@override
_TelTextFieldState createState() => _TelTextFieldState();
@ -26,6 +27,7 @@ class _TelTextFieldState extends State<TelTextField> {
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
keyboardType: TextInputType.number,
controller: widget.controller,
onChanged: widget.onChange,
decoration: InputDecoration(
isDense: true,
border: InputBorder.none,

@ -1,4 +1,3 @@
import 'package:aku_new_community/const/resource.dart';
import 'package:aku_new_community/gen/assets.gen.dart';
import 'package:aku_new_community/pages/sign/login/other_login_page.dart';
import 'package:aku_new_community/provider/app_provider.dart';
@ -6,6 +5,7 @@ import 'package:aku_new_community/ui/community/community_views/community_page.da
import 'package:aku_new_community/ui/market/market_page.dart';
import 'package:aku_new_community/utils/websocket/web_socket_util.dart';
import 'package:aku_new_community/widget/bee_scaffold.dart';
import 'package:aku_new_community/widget/dialog/certification_dialog.dart';
import 'package:aku_new_community/widget/others/user_tool.dart';
import 'package:bot_toast/bot_toast.dart';
import 'package:flutter/material.dart';
@ -14,6 +14,7 @@ import 'package:get/get.dart';
import 'package:provider/provider.dart';
import 'home/home_page.dart';
import 'opening_code_page/opening_code_page.dart';
import 'personal/personal_page.dart';
class TabNavigator extends StatefulWidget {
@ -48,6 +49,7 @@ class _TabNavigatorState extends State<TabNavigator>
HomePage(),
MarketPage(),
// PropertyPage(),
OpeningCodePage(),
CommunityPage(),
PersonalIndex()
];
@ -56,51 +58,123 @@ class _TabNavigatorState extends State<TabNavigator>
length: _pages.length, vsync: this, initialIndex: widget.index ?? 0);
}
_buildBottomBar(
Widget _buildBottomBar(
String title,
String unselected,
String selected,
int index,
) {
return BottomNavigationBarItem(
icon: Image.asset(
unselected,
height: 44.w,
width: 44.w,
color: Colors.black38,
),
activeIcon: Image.asset(
selected,
height: 44.w,
width: 44.w,
return Expanded(
child: GestureDetector(
onTap: () {
if (UserTool.userProvider.isLogin == false) {
//
Get.offAll(() => OtherLoginPage());
} else {
_tabController!.animateTo(index, curve: Curves.easeInOutCubic);
_currentIndex = index;
setState(() {});
}
},
child: Material(
color: Colors.transparent,
child: Container(
alignment: Alignment.center,
margin: EdgeInsets.only(top: 48.w),
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
children: [
_currentIndex != index
? Image.asset(
unselected,
height: 44.w,
width: 44.w,
color: Colors.black38,
)
: Image.asset(
selected,
height: 44.w,
width: 44.w,
),
Text(
title,
style: TextStyle(
color: _currentIndex != index
? Color(0xFFA6ABB1)
: Color(0xFF333333),
fontWeight: _currentIndex == index
? FontWeight.bold
: FontWeight.normal,
fontSize: 22.sp),
)
],
)),
),
),
label: title,
);
}
@override
Widget build(BuildContext context) {
//
List<BottomNavigationBarItem> _bottomNav = <BottomNavigationBarItem>[
List<Widget> _bottomNav = <Widget>[
_buildBottomBar(
'首页',
Assets.home.icShouyeNor.path,
Assets.home.icShouyeSel.path,
0,
),
_buildBottomBar(
'商城',
R.ASSETS_ICONS_TABBAR_MARKET_NO_PNG,
R.ASSETS_ICONS_TABBAR_MARKET_PNG,
Assets.home.icShangcNor.path,
Assets.home.icShangcSel.path,
1,
),
Expanded(
child: GestureDetector(
onTap: () {
if (UserTool.userProvider.isLogin == false) {
//
Get.offAll(() => OtherLoginPage());
} else {}
if (UserTool.userProvider.userInfoModel?.name == null) {
Get.dialog(CertificationDialog());
} else {
_tabController!.animateTo(2, curve: Curves.easeInOutCubic);
_currentIndex = 2;
setState(() {});
}
},
child: Material(
color: Colors.transparent,
child: Center(
child: Container(
width: 108.w,
height: 108.w,
margin: EdgeInsets.only(top: 26.w),
alignment: Alignment.center,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(54.w),
color: Color(0xFFFDE019),
),
child: Assets.home.icKaimen.image(width: 80.w, height: 80.w),
),
),
),
),
),
// BottomNavigationBarItem(icon: Container()),
_buildBottomBar(
'社区',
Assets.home.icShequNor.path,
Assets.home.icShequSel.path,
3,
),
_buildBottomBar(
'我的',
Assets.home.icWodeNor.path,
Assets.home.icWodeSel.path,
4,
),
];
return BeeScaffold(
@ -123,24 +197,21 @@ class _TabNavigatorState extends State<TabNavigator>
physics: NeverScrollableScrollPhysics(),
),
),
bottomNavi: StatefulBuilder(builder: (context, setFunc) {
return BottomNavigationBar(
items: _bottomNav,
backgroundColor: Colors.white,
currentIndex: _currentIndex,
selectedFontSize: 20.sp,
unselectedFontSize: 20.sp,
onTap: (index) {
if (UserTool.userProvider.isLogin == false) {
//
Get.offAll(() => OtherLoginPage());
} else {
_tabController!.animateTo(index, curve: Curves.easeInOutCubic);
setFunc(() => _currentIndex = index);
}
},
);
}),
bottomNavi: ConstrainedBox(
constraints: BoxConstraints(maxWidth: 750.w, maxHeight: 146.w),
child: Container(
margin:
EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom),
decoration: BoxDecoration(
image: DecorationImage(
image: Assets.home.imgTabdi, fit: BoxFit.fitWidth),
color: Colors.transparent),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: _bottomNav.cast<Widget>().toList(),
),
),
),
);
}
}

@ -1,7 +1,6 @@
import 'dart:math';
import 'package:aku_new_community/base/base_style.dart';
import 'package:aku_new_community/constants/api.dart';
import 'package:aku_new_community/constants/saas_api.dart';
import 'package:aku_new_community/model/common/img_model.dart';
import 'package:aku_new_community/models/community/all_dynamic_list_model.dart';
@ -145,14 +144,21 @@ class _CommunityPageState extends State<CommunityPage>
EasyRefresh(
firstRefresh: true,
header: MaterialHeader(),
footer: MaterialFooter(),
controller: _easyRefreshController,
onRefresh: () async {
_pageNum = 1;
await (getNewInfo());
_gambitModels = await CommunityFunc.getListGambit();
_hotNewsModels = await CommunityFunc.getHotNews();
_onload = false;
setState(() {});
},
onLoad: () async {
_pageNum++;
await loadNewInfo();
setState(() {});
},
child: _onload
? SizedBox()
: ListView(
@ -199,15 +205,15 @@ class _CommunityPageState extends State<CommunityPage>
}
Future loadNewInfo() async {
BaseListModel baseListModel =
await NetUtil().getList(API.market.hotTop, params: {
"pageNum": _pageNum,
"size": _size,
});
if (baseListModel.rows.isNotEmpty) {
BaseListModel baseListModel = await NetUtil().getList(
SAASAPI.community.dynamicList,
params: {"pageNum": _pageNum, "size": _size, 'type': 1});
if (baseListModel.total > _newItems.length) {
_newItems.addAll((baseListModel.rows)
.map((e) => AllDynamicListModel.fromJson(e))
.toList());
} else {
_easyRefreshController.finishLoadCallBack!(noMore: true);
}
}

@ -617,21 +617,26 @@ class _EventDetailPageState extends State<EventDetailPage> {
minWidth: 120.w,
height: 55.w,
onPressed: () async {
var res = await NetUtil()
.post(SAASAPI.community.commentInsert, params: params);
if (res.success) {
_textEditingController.clear();
if (_rootId == 0) {
_refreshController.callRefresh();
if (_textEditingController.text.trim().isEmptyOrNull) {
BotToast.showText(text: '请填写内容');
return;
}else{
var res = await NetUtil()
.post(SAASAPI.community.commentInsert, params: params);
if (res.success) {
_textEditingController.clear();
if (_rootId == 0) {
_refreshController.callRefresh();
} else {
await updateComments();
_focusNode.unfocus();
}
setState(() {});
} else {
await updateComments();
_focusNode.unfocus();
BotToast.showText(text: res.msg);
}
setState(() {});
} else {
BotToast.showText(text: res.msg);
FocusScope.of(context).requestFocus(FocusNode());
}
FocusScope.of(context).requestFocus(FocusNode());
},
child: Text(
'发布',

@ -8,8 +8,11 @@ import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart';
import 'package:aku_new_community/ui/community/community_views/widgets/my_event_card.dart';
import 'package:aku_new_community/utils/headers.dart';
import 'package:aku_new_community/utils/login_util.dart';
import 'package:aku_new_community/utils/network/base_list_model.dart';
import 'package:aku_new_community/utils/network/net_util.dart';
import 'package:aku_new_community/widget/bee_avatar_widget.dart';
import 'package:aku_new_community/widget/line/vertical_line_painter.dart';
import 'package:aku_new_community/widget/others/user_tool.dart';
import 'package:aku_new_community/widget/picker/bee_image_preview.dart';
import 'package:aku_new_community/widget/views/bee_grid_image_view.dart';
import 'package:flutter/cupertino.dart';
@ -17,8 +20,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_easyrefresh/easy_refresh.dart';
import 'package:get/get.dart';
import '../community_func.dart';
class MyCommunityView extends StatefulWidget {
MyCommunityView({Key? key}) : super(key: key);
@ -32,6 +33,8 @@ class MyCommunityViewState extends State<MyCommunityView>
bool _onload = true;
List<DynamicMyListBody> _myEventItems = [];
DynamicMyListHead? _head;
int _pageNum = 1;
int _size = 10;
refresh() {
_refreshController.callRefresh();
@ -53,10 +56,10 @@ class MyCommunityViewState extends State<MyCommunityView>
crossAxisAlignment: CrossAxisAlignment.center,
children: [
12.hb,
Image.asset(
R.ASSETS_ICONS_ICON_LOGISTICS_PNG,
BeeAvatarWidget(
width: 132.w,
height: 132.w,
imgs: UserTool.userProvider.userInfoModel!.imgList,
),
32.hb,
'${_head?.createName}'
@ -132,7 +135,12 @@ class MyCommunityViewState extends State<MyCommunityView>
header: MaterialHeader(),
controller: _refreshController,
onRefresh: () async {
_myEventItems = await CommunityFunc.getMyEventItem();
BaseListModel model = await NetUtil().getList(
SAASAPI.community.dynamicMyListL,
params: {'pageNum': _pageNum, 'size': _size},
);
_myEventItems =
model.rows.map((e) => DynamicMyListBody.fromJson(e)).toList();
var base = await NetUtil().get(SAASAPI.community.dynamicMyListH);
if (base.success) {
_head = DynamicMyListHead.fromJson(base.data);
@ -140,6 +148,19 @@ class MyCommunityViewState extends State<MyCommunityView>
_onload = false;
setState(() {});
},
onLoad: () async {
BaseListModel model = await NetUtil().getList(
SAASAPI.community.dynamicMyListL,
params: {'pageNum': _pageNum, 'size': _size},
);
if (model.total > _myEventItems.length) {
_myEventItems.addAll(
model.rows.map((e) => DynamicMyListBody.fromJson(e)).toList());
setState(() {});
} else {
_refreshController.finishLoadCallBack!(noMore: true);
}
},
child: _onload
? SizedBox()
: ListView(
@ -186,14 +207,14 @@ class MyCommunityViewState extends State<MyCommunityView>
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
item.createDate.substring(5,10)
'${item.createDT?.month ?? ''}.${item.createDT?.day ?? ''}'
.text
.size(28.sp)
.size(32.sp)
.color(Color(0xA6000000))
.bold
.isIntrinsic
.make(),
item.createDate.substring(0,4)
'${item.createDT?.year ?? ''}'
.text
.size(24.sp)
.color(Color(0x73000000))
@ -204,6 +225,7 @@ class MyCommunityViewState extends State<MyCommunityView>
),
50.wb,
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: 552.w,
@ -211,9 +233,9 @@ class MyCommunityViewState extends State<MyCommunityView>
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
item.createDate.substring(10,16)
'${item.createDT?.hour ?? ''}.${item.createDT?.second ?? ''}'
.text
.size(32.sp)
.size(28.sp)
.color(Color(0xA6000000))
.isIntrinsic
.make(),

@ -107,6 +107,8 @@ class _TopicDetailPageState extends State<TopicDetailPage> {
title: _detailModel?.title,
imgPath: ImgModel.first(_detailModel?.imgList),
subTitle: _detailModel?.content,
dynamicNum: _detailModel?.dynamicNum,
commentNum: _detailModel?.commentNum,
),
pinned: true,
floating: true,

@ -66,7 +66,7 @@ class _AddAppointmentAddressPageState extends State<AddAppointmentAddressPage> {
children: [
SizedBox(
width: 170.w,
child: '标志建筑'
child: '目标地点'
.text
.size(28.sp)
.color(Colors.black.withOpacity(0.65))
@ -78,7 +78,7 @@ class _AddAppointmentAddressPageState extends State<AddAppointmentAddressPage> {
controller: _tagController,
decoration: InputDecoration(
border: InputBorder.none,
hintText: '请输入标志建筑',
hintText: '请输入目标地点',
contentPadding: EdgeInsets.zero,
isDense: true,
hintStyle: TextStyle(

@ -11,6 +11,7 @@ import 'hall_card.dart';
class HallView extends StatefulWidget {
final EasyRefreshController refreshController;
final int type;
const HallView(
{Key? key, required this.refreshController, required this.type})
: super(key: key);
@ -32,7 +33,7 @@ class _HallViewState extends State<HallView> {
controller: widget.refreshController,
extraParams: {
'taskModel': 1,
'type': widget.type + 1,
'type': widget.type == 0 ? null : widget.type,
},
convert: (json) =>
json.rows.map((e) => HallListModel.fromJson(e)).toList(),

@ -32,7 +32,7 @@ class _MyTakeTaskViewState extends State<MyTakeTaskView> {
controller: widget.refreshController,
extraParams: {
'taskModel': 2,
'type': widget.type + 1,
'type': widget.type == 0 ? null : widget.type,
},
convert: (json) =>
json.rows.map((e) => MyTakeTaskListModel.fromJson(e)).toList(),

@ -70,8 +70,8 @@ class MyTaskCard extends StatelessWidget {
],
);
return GestureDetector(
onTap: () {
Get.to(() => MyTaskDetailPage(model: model));
onTap: () async {
await Get.to(() => MyTaskDetailPage(model: model));
},
child: Container(
width: double.infinity,

@ -1,8 +1,10 @@
import 'package:aku_new_community/base/base_style.dart';
import 'package:aku_new_community/constants/saas_api.dart';
import 'package:aku_new_community/gen/assets.gen.dart';
import 'package:aku_new_community/saas_model/task/my_task_list_model.dart';
import 'package:aku_new_community/ui/function_and_service/task/dialogs/task_cancel_dialog.dart';
import 'package:aku_new_community/ui/function_and_service/task/dialogs/task_evaluation_dialog.dart';
import 'package:aku_new_community/utils/network/net_util.dart';
import 'package:aku_new_community/widget/bee_divider.dart';
import 'package:aku_new_community/widget/bee_scaffold.dart';
import 'package:aku_new_community/widget/buttons/bee_long_button.dart';
@ -200,7 +202,13 @@ class _MyTaskDetailPageState extends State<MyTaskDetailPage> {
);
case 2:
return MaterialButton(
onPressed: () {},
onPressed: () async {
var base = await NetUtil().get(SAASAPI.task.urgeService,
params: {'taskId': widget.model.id}, showMessage: true);
if (base.success) {
Get.back();
}
},
minWidth: 330.w,
height: 80.w,
elevation: 0,

@ -32,7 +32,7 @@ class _MyTaskViewState extends State<MyTaskView> {
controller: widget.refreshController,
extraParams: {
'taskModel': 2,
'type': widget.type + 1,
'type': widget.type == 0 ? null : widget.type,
},
convert: (json) =>
json.rows.map((e) => MyTaskListModel.fromJson(e)).toList(),

@ -77,7 +77,7 @@ class _TaskPageState extends State<TaskPage> with TickerProviderStateMixin {
Padding(
padding: EdgeInsets.symmetric(vertical: 24.w, horizontal: 32.w),
child: Row(
children: TaskMap.taskType.values
children: <String>['全部', ...TaskMap.taskType.values]
.mapIndexed((currentValue, index) =>
_typeBar(currentValue, index))
.toList(),

@ -39,11 +39,11 @@ class _AllApplicationPageState extends State<AllApplicationPage> {
: () {
if (LoginUtil.isNotLogin) return;
if (!LoginUtil.haveRoom(object.title)) return;
if (object.page == null || !online) {
if (object.callback == null || !online) {
BotToast.showText(
text: '正在准备上线中,敬请期待', align: Alignment(0, 0.5));
} else {
Get.to(object.page);
object.callback!();
}
},
child: Column(
@ -262,14 +262,15 @@ class _AllApplicationPageState extends State<AllApplicationPage> {
),
body: Column(
children: [
_buildEditTile(),
Divider(
indent: 32.w,
endIndent: 32.w,
height: 1.w,
).material(color: Colors.white),
_buildMyApp(),
32.hb,
//
// _buildEditTile(),
// Divider(
// indent: 32.w,
// endIndent: 32.w,
// height: 1.w,
// ).material(color: Colors.white),
// _buildMyApp(),
// 32.hb,
_buildAppList().expand(),
],
),

@ -511,7 +511,9 @@ class _AddHousePageState extends State<AddHousePage> {
'${model.house == null ? '请选择楼层房号' : '${model.building!.name}-${model.unit!.name}-${model.floor!.name}-${model.house!.name}'}'
.text
.size(28.sp)
.color(Colors.black.withOpacity(0.25))
.color(model.house != null
? Colors.black.withOpacity(0.5)
: Colors.black.withOpacity(0.25))
.make(),
),
Icon(

@ -13,6 +13,7 @@ import 'package:aku_new_community/utils/login_util.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_back_button.dart';
import 'package:bot_toast/bot_toast.dart';
import 'package:flutter/material.dart';
import 'package:flutter_easyrefresh/easy_refresh.dart';
import 'package:get/get.dart';
@ -77,7 +78,11 @@ class _BeeSearchState extends State<BeeSearch> {
onPressed: () {
if (LoginUtil.isNotLogin) return;
if (!LoginUtil.haveRoom(e.title)) return;
Get.to(e.page);
if (e.callback == null) {
BotToast.showText(text: '该功能正在准备上线中,敬请期待', align: Alignment(0, 0.5));
} else {
e.callback!();
}
},
shape: StadiumBorder(),
child: Column(

@ -0,0 +1,46 @@
import 'package:aku_new_community/constants/saas_api.dart';
import 'package:aku_new_community/gen/assets.gen.dart';
import 'package:aku_new_community/model/common/img_model.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
class BeeAvatarWidget extends StatelessWidget {
final List<ImgModel>? imgs;
final List<String>? urls;
final double? width;
final double? height;
final BoxFit? fit;
const BeeAvatarWidget(
{Key? key,
this.imgs,
this.width,
this.height,
this.urls,
this.fit = BoxFit.cover})
: assert(imgs != null || urls != null),
super(key: key);
@override
Widget build(BuildContext context) {
return ClipOval(
child: FadeInImage.assetNetwork(
placeholder: Assets.images.placeholder.path,
image: imgs == null
? SAASAPI.image(urls!.isEmpty ? '' : urls!.first)
: SAASAPI.image(ImgModel.first(imgs)),
imageErrorBuilder: (context, obj, stackTrace) {
return Image.asset(
Assets.newIcon.avatarPlaceholder.path,
width: width ?? 128.w,
height: height ?? 128.w,
fit: fit,
);
},
height: height ?? 128.w,
width: width ?? 128.w,
fit: fit,
),
);
}
}

@ -1,14 +1,11 @@
import 'package:flutter/material.dart';
import 'package:bot_toast/bot_toast.dart';
import 'package:get/get.dart';
import 'package:provider/provider.dart';
import 'package:velocity_x/velocity_x.dart';
import 'package:aku_new_community/constants/application_objects.dart';
import 'package:aku_new_community/provider/app_provider.dart';
import 'package:aku_new_community/utils/headers.dart';
import 'package:aku_new_community/utils/login_util.dart';
import 'package:bot_toast/bot_toast.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:velocity_x/velocity_x.dart';
class ApplicationView extends StatefulWidget {
final List<AO>? items;
@ -38,10 +35,10 @@ class _ApplicationViewState extends State<ApplicationView> {
onPressed: () {
if (LoginUtil.isNotLogin) return;
if (!LoginUtil.haveRoom(object.title)) return;
if (object.page == null) {
if (object.callback == null) {
BotToast.showText(text: '该功能正在准备上线中,敬请期待', align: Alignment(0, 0.5));
} else {
Get.to(object.page);
object.callback!();
}
},
child: Column(

@ -477,13 +477,6 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
flutter_native_splash:
dependency: "direct dev"
description:
name: flutter_native_splash
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.3.2"
flutter_plugin_android_lifecycle:
dependency: transitive
description:
@ -584,7 +577,7 @@ packages:
name: grinder
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.9.0"
version: "0.9.1"
highlight:
dependency: transitive
description:
@ -829,14 +822,14 @@ packages:
name: package_info_plus
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.4.0"
version: "1.4.2"
package_info_plus_linux:
dependency: transitive
description:
name: package_info_plus_linux
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.3"
version: "1.0.5"
package_info_plus_macos:
dependency: transitive
description:
@ -857,14 +850,14 @@ packages:
name: package_info_plus_web
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.4"
version: "1.0.5"
package_info_plus_windows:
dependency: transitive
description:
name: package_info_plus_windows
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.4"
version: "1.0.5"
path:
dependency: transitive
description:
@ -1250,13 +1243,6 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.3.0"
universal_io:
dependency: transitive
description:
name: universal_io
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.4"
url_launcher:
dependency: "direct main"
description:

@ -131,7 +131,7 @@ dev_dependencies:
hive_generator: ^1.1.0
#脚本工具
grinder: ^0.9.0
flutter_native_splash: ^1.1.8+4
# flutter_native_splash: ^1.1.8+4
#model自动生成
json_serializable: ^6.1.3
build_runner: ^2.0.2
@ -153,6 +153,7 @@ flutter:
- assets/json/
- assets/bracelet/
- assets/home/
- assets/newIcon/
import_sorter:
emojis: true

Loading…
Cancel
Save