Merge branch 'master' of 192.168.2.201:laiiihz/akuCommunity

* 'master' of 192.168.2.201:laiiihz/akuCommunity:
  update routers
  update routers
hmxc
小赖 4 years ago
commit 3afbe1860b

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
const ktextPrimary = Color(0xff333333);
const ktextSubColor = Color(0xff666666);

@ -0,0 +1,7 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
extension PageExt on Widget{
Function get to => (){Get.to(this);};
}

@ -20,7 +20,6 @@ import 'package:akuCommunity/provider/cart.dart';
import 'package:flutter_picker/flutter_picker.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:akuCommunity/routers/router_init.dart';
void main() async {
WidgetsFlutterBinding.ensureInitialized();
@ -44,7 +43,6 @@ class _MyAppState extends State<MyApp> {
@override
void initState() {
super.initState();
RouterInit.setupRouter();
registerWxApi(appId: 'wxd7bdef0d4849ddb8');
}
@ -57,16 +55,11 @@ class _MyAppState extends State<MyApp> {
],
child: GetMaterialApp(
title: '智慧社区',
// builder: BotToastInit(),
// navigatorObservers: [BotToastNavigatorObserver()],
navigatorKey: RouterInit.navigatorKey,
onGenerateRoute: RouterInit.router.generator,
debugShowCheckedModeBanner: false,
theme: ThemeData(
primarySwatch: Colors.yellow,
visualDensity: VisualDensity.adaptivePlatformDensity,
),
// home: TabNavigator(),
home: TabNavigator(),
//
localizationsDelegates: [

@ -1,9 +1,11 @@
import 'package:akuCommunity/pages/activities_page/member_list_page/member_list_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:get/get.dart';
import 'package:image_stack/image_stack.dart';
import 'package:flutter_html/flutter_html.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'package:akuCommunity/widget/cached_image_wrapper.dart';
import 'package:akuCommunity/widget/bottom_button.dart';
@ -107,7 +109,7 @@ class _ActivitiesDetailsPageState extends State<ActivitiesDetailsPage> {
),
),
onPressed: () {
Navigator.of(context).pop();
Get.back();
},
),
CupertinoDialogAction(
@ -120,7 +122,7 @@ class _ActivitiesDetailsPageState extends State<ActivitiesDetailsPage> {
),
),
onPressed: () {
Navigator.pop(context);
Get.back();
},
),
],
@ -215,7 +217,7 @@ class _ActivitiesDetailsPageState extends State<ActivitiesDetailsPage> {
Widget _inkWellEnterMember(List<String> memberList) {
return InkWell(
onTap: () {
Navigator.pushNamed(context, PageName.member_list_page.toString());
Get.to(MemberListPage());
},
child: Container(
padding: EdgeInsets.only(bottom: 24.w),

@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:get/get.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:akuCommunity/widget/activity_card.dart';
@ -104,16 +105,17 @@ class _ActivitiesPageState extends State<ActivitiesPage> {
void detailsRouter(String imagePath, title, bool isOver, isVote, isVoteOver,
List<String> memberList) {
Navigator.pushNamed(context, PageName.activities_details_page.toString(),
arguments: Bundle()
..putMap('details', {
'title': title,
'imagePath': imagePath,
'isOver': isOver,
'isVote': isVote,
'isVoteOver': isVoteOver,
'memberList': memberList
}));
Get.to(ActivitiesPage(
bundle: Bundle()
..putMap('details', {
'title': title,
'imagePath': imagePath,
'isOver': isOver,
'isVote': isVote,
'isVoteOver': isVoteOver,
'memberList': memberList
}),
));
}
@override

@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'package:akuCommunity/widget/cached_image_wrapper.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';
import 'widget/address_edit_item.dart';

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:flutter/services.dart';
class AddressEditItem extends StatefulWidget {

@ -1,9 +1,11 @@
import 'package:akuCommunity/pages/address_page/address_edit_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:extended_text/extended_text.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:get/get.dart';
class AddressItem extends StatelessWidget {
final String name, phone, address;
@ -67,8 +69,7 @@ class AddressItem extends StatelessWidget {
isDefualt
? ExtendedWidgetSpan(
child: Container(
margin:
EdgeInsets.only(right: 16.w),
margin: EdgeInsets.only(right: 16.w),
decoration: BoxDecoration(
color: Color(0xfffff7d2),
border: Border.all(
@ -92,9 +93,7 @@ class AddressItem extends StatelessWidget {
TextSpan(
text: address,
style: TextStyle(
fontSize: 24.sp,
color: Color(0xff999999),
height: 1.5),
fontSize: 24.sp, color: Color(0xff999999), height: 1.5),
)
],
),
@ -113,15 +112,18 @@ class AddressItem extends StatelessWidget {
top: 55.w,
child: InkWell(
onTap: () {
Navigator.pushNamed(context, PageName.address_edit_page.toString(),
arguments: Bundle()
Get.to(
AddressEditPage(
bundle: Bundle()
..putMap('details', {
'title': '编辑地址',
'name': name,
'phone': phone,
'address': address,
'isDelete': true
}));
}),
),
);
},
child: Row(
children: [

@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/base/assets_image.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/widget/common_input.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';
import 'package:akuCommunity/widget/single_image_up.dart';

@ -2,9 +2,10 @@ import 'package:akuCommunity/widget/search_bar_delegate.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'package:get/get.dart';
// import 'visitor_invitation/visitor_invitation.dart';
// import 'visitor_invitation/visitor_record.dart';
@ -122,20 +123,23 @@ class _CommonPageState extends State<CommonPage> {
// }
void recordRouter() {
Navigator.pushNamed(context, PageName.common_page.toString(),
arguments: Bundle()
..putMap('commentMap', {'title': '访客记录', 'isActions': false}));
Get.to(
CommonPage(
bundle: Bundle()
..putMap('commentMap', {'title': '访客记录', 'isActions': false})),
);
}
void evaluateRouter(bool isAlone, bool isPropose) {
Navigator.pushNamed(context, PageName.common_page.toString(),
arguments: Bundle()
..putMap('commentMap', {
'title': '评价',
'isActions': false,
'isAlone': isAlone,
'isPropose': isPropose
}));
Get.to(CommonPage(
bundle: Bundle()
..putMap('commentMap', {
'title': '评价',
'isActions': false,
'isAlone': isAlone,
'isPropose': isPropose
}),
));
}
InkWell _inkWellSearch() {
@ -174,7 +178,7 @@ class _CommonPageState extends State<CommonPage> {
elevation: 0,
backgroundColor: Color(0xffffffff),
leading: InkWell(
onTap: () => Navigator.pop(context),
onTap: () => Get.back(),
child: Icon(AntDesign.left, size: 40.sp),
),
centerTitle: true,
@ -214,28 +218,24 @@ class _CommonPageState extends State<CommonPage> {
);
break;
case '生活缴费':
Navigator.pushNamed(
context, PageName.common_page.toString(),
arguments: Bundle()
..putMap('commentMap',
{'title': '缴费记录', 'isActions': false}));
Get.to(CommonPage(
bundle: Bundle()
..putMap('commentMap',
{'title': '缴费记录', 'isActions': false}),
));
break;
case '借还管理':
Navigator.pushNamed(
context, PageName.common_page.toString(),
arguments: Bundle()
Get.to(CommonPage(bundle: Bundle()
..putMap('commentMap',
{'title': '我的借还物品', 'isActions': false}));
{'title': '我的借还物品', 'isActions': false}),));
break;
case '我的地址':
Navigator.pushNamed(
context, PageName.common_page.toString(),
arguments: Bundle()
Get.to(CommonPage(bundle: Bundle()
..putMap('commentMap', {
'title': '添加新地址',
'isActions': true,
'isNew': true
}));
}),));
break;
case '一键报警':
// showExplain();

@ -1,9 +1,11 @@
import 'package:akuCommunity/pages/community/note_create_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/widget/app_bar_action.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:get/get.dart';
import 'widget/tab_list.dart';
class CommunityIndex extends StatefulWidget {
@ -38,10 +40,7 @@ class _CommunityIndexState extends State<CommunityIndex>
}
void noteCreateRouter() {
Navigator.pushNamed(
context,
PageName.note_create_page.toString(),
);
Get.to(NoteCreatePage());
}
List<Widget> _listActions() {

@ -1,8 +1,9 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/assets_image.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:get/get.dart';
class NoteCreatePage extends StatefulWidget {
NoteCreatePage({Key key}) : super(key: key);
@ -39,7 +40,7 @@ class _NoteCreatePageState extends State<NoteCreatePage> {
),
),
leading: InkWell(
onTap: () => Navigator.pop(context),
onTap: () => Get.back(),
child: Container(
padding: EdgeInsets.only(left: 32.w),
alignment: Alignment.center,

@ -1,8 +1,10 @@
import 'package:akuCommunity/pages/community/note_create_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:get/get.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'widget/trend_card.dart';
@ -24,13 +26,6 @@ class _TopiceDetailPageState extends State<TopiceDetailPage> {
super.initState();
}
void noteCreateRouter() {
Navigator.pushNamed(
context,
PageName.note_create_page.toString(),
);
}
void _onRefresh() async {
await Future.delayed(Duration(milliseconds: 1500));
@ -60,7 +55,7 @@ class _TopiceDetailPageState extends State<TopiceDetailPage> {
leading: IconButton(
icon: Icon(AntDesign.left, size: 40.sp),
onPressed: () {
Navigator.pop(context);
Get.back();
},
),
flexibleSpace: FlexibleSpaceBar(
@ -73,19 +68,20 @@ class _TopiceDetailPageState extends State<TopiceDetailPage> {
);
}
Positioned _positionedFloatActionButton(){
Positioned _positionedFloatActionButton() {
return Positioned(
bottom: 124.w,
right: 32.w,
child: FloatingActionButton(
backgroundColor: Color(0xffffd000),
child: Icon(
Icons.add,
color: Colors.white,
size: 40.sp,
),
onPressed: noteCreateRouter,
));
bottom: 124.w,
right: 32.w,
child: FloatingActionButton(
backgroundColor: Color(0xffffd000),
child: Icon(
Icons.add,
color: Colors.white,
size: 40.sp,
),
onPressed: () {
Get.to(NoteCreatePage());
}));
}
@override

@ -1,4 +1,4 @@
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';

@ -1,8 +1,10 @@
import 'package:akuCommunity/pages/community/topice_detail_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:get/get.dart';
class TopicCard extends StatefulWidget {
final String title, subtitle, imagePath, hotNum;
@ -27,9 +29,7 @@ class _TopicCardState extends State<TopicCard> {
}
void topiceDetailRouter(String subtitle, String imagePath) {
Navigator.pushNamed(context, PageName.topice_detail_page.toString(),
arguments: Bundle()
..putMap('topicMap', {'subtitle': subtitle, 'imagePath': imagePath}));
Get.to(TopiceDetailPage());
}
Row _rowTopic(String title, String subtitle, String imagePath) {

@ -3,10 +3,11 @@ import 'dart:ui';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/widget/expandable_text.dart';
import 'package:akuCommunity/widget/image_grid.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
class TrendCard extends StatefulWidget {
final String name;
@ -50,7 +51,7 @@ class _TrendCardState extends State<TrendCard> {
),
),
onPressed: () {
Navigator.of(context).pop();
Get.back();
},
),
CupertinoDialogAction(
@ -63,7 +64,7 @@ class _TrendCardState extends State<TrendCard> {
),
),
onPressed: () {
Navigator.pop(context);
Get.back();
},
),
],
@ -94,7 +95,7 @@ class _TrendCardState extends State<TrendCard> {
itemBuilder: (BuildContext context, int index) {
return InkWell(
onTap: () {
Navigator.of(context).pop();
Get.back();
_showDialog(nameItems[index]['title']);
},
child: Container(
@ -136,7 +137,7 @@ class _TrendCardState extends State<TrendCard> {
bottom: 0,
child: InkWell(
onTap: () {
Navigator.of(context).pop();
Get.back();
},
child: Container(
width: MediaQuery.of(context).size.width,

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';
import 'widget/confirm_address.dart';

@ -1,8 +1,9 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:get/get.dart';
import 'package:rflutter_alert/rflutter_alert.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/assets_image.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';
@ -82,13 +83,12 @@ class PayOrderPage extends StatelessWidget {
"确认",
style: TextStyle(color: Colors.white, fontSize: 20),
),
onPressed: () => Navigator.pop(context),
onPressed: () => Get.back(),
color: Color(0xffffc40d),
radius: BorderRadius.circular(8.w),
),
],
).show();
// Navigator.pushNamed(context, PageName.pay_success_page.toString());
},
child: Container(
padding: EdgeInsets.only(

@ -1,9 +1,11 @@
import 'package:akuCommunity/pages/common/common_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/assets_image.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:get/get.dart';
class ConfirmAddress extends StatefulWidget {
ConfirmAddress({Key key}) : super(key: key);
@ -79,9 +81,10 @@ class _ConfirmAddressState extends State<ConfirmAddress> {
Widget build(BuildContext context) {
return InkWell(
onTap: () {
Navigator.pushNamed(context, PageName.common_page.toString(),
arguments: Bundle()
..putMap('commentMap', {'title': '我的地址', 'isActions': true}));
Get.to(CommonPage(
bundle: Bundle()
..putMap('commentMap', {'title': '我的地址', 'isActions': true}),
));
},
child: Container(
margin: EdgeInsets.symmetric(horizontal: 32.w),

@ -1,8 +1,10 @@
import 'package:akuCommunity/pages/confirm_order_page/pay_order_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:get/get.dart';
class ConfirmBottomBar extends StatelessWidget {
final Map cartMap;
@ -34,8 +36,7 @@ class ConfirmBottomBar extends StatelessWidget {
Widget _submit(BuildContext context) {
return InkWell(
onTap: () {
Navigator.pushNamed(context, PageName.pay_order_page.toString(),
arguments: Bundle()..putMap('cartMap', cartMap));
Get.to(PayOrderPage());
},
child: Container(
decoration: BoxDecoration(

@ -1,10 +1,12 @@
import 'package:akuCommunity/pages/invoice/invoice_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/routers/page_routers.dart';
// import 'package:akuCommunity/widget/cart_count.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/widget/cached_image_wrapper.dart';
import 'package:get/get.dart';
class ConfirmContent extends StatelessWidget {
final Map cartMap;
@ -160,15 +162,13 @@ class ConfirmContent extends StatelessWidget {
Text(
'配送方式',
style: TextStyle(
fontSize: 28.sp,
color: Color(0xff333333)),
fontSize: 28.sp, color: Color(0xff333333)),
),
SizedBox(width: 26.w),
Text(
'普通配送',
style: TextStyle(
fontSize: 28.sp,
color: Color(0xff999999)),
fontSize: 28.sp, color: Color(0xff999999)),
),
],
),
@ -183,15 +183,14 @@ class ConfirmContent extends StatelessWidget {
Text(
'开具发票',
style: TextStyle(
fontSize: 28.sp,
color: Color(0xff333333)),
fontSize: 28.sp, color: Color(0xff333333)),
),
InkWell(
onTap: () {
Navigator.pushNamed(
context, PageName.invoice_page.toString(),
arguments: Bundle()
..putString('title', '1123123123123'));
Get.to(InvoicePage(
bundle: Bundle()
..putString('title', '1123123123123'),
));
},
child: Row(
children: [
@ -230,15 +229,13 @@ class ConfirmContent extends StatelessWidget {
Text(
'订单备注',
style: TextStyle(
fontSize: 28.sp,
color: Color(0xff333333)),
fontSize: 28.sp, color: Color(0xff333333)),
),
SizedBox(width: 14.w),
Text(
'选填',
style: TextStyle(
fontSize: 28.sp,
color: Color(0xff999999)),
fontSize: 28.sp, color: Color(0xff999999)),
),
],
),

@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/widget/sliver_app_bar_delegate.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';
import 'package:akuCommunity/widget/search_bar_delegate.dart';

@ -1,6 +1,7 @@
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:get/get.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:akuCommunity/base/assets_image.dart';
@ -64,7 +65,7 @@ class _PhoneListState extends State<PhoneList> {
),
),
onPressed: () {
Navigator.of(context).pop();
Get.back();
},
),
CupertinoDialogAction(
@ -78,7 +79,7 @@ class _PhoneListState extends State<PhoneList> {
),
onPressed: () {
_phoneCall('tel:$url');
Navigator.pop(context);
Get.back();
},
),
],

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'package:akuCommunity/widget/sliver_app_bar_delegate.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';

@ -3,7 +3,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:flutter_picker/flutter_picker.dart';
import 'package:flutter_datetime_picker/flutter_datetime_picker.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/base_style.dart';
class CommonSelect extends StatefulWidget {

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'package:akuCommunity/base/assets_image.dart';
import 'package:akuCommunity/widget/common_input.dart';

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'package:akuCommunity/base/assets_image.dart';
import 'package:akuCommunity/widget/common_input.dart';

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/assets_image.dart';
import 'package:akuCommunity/base/base_style.dart';

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'package:akuCommunity/widget/bottom_button.dart';
import 'package:akuCommunity/widget/common_input.dart';

@ -1,10 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'package:akuCommunity/base/assets_image.dart';
import 'package:akuCommunity/widget/bottom_button.dart';
import 'package:get/get.dart';
class PayModelSheet extends StatefulWidget {
PayModelSheet({Key key}) : super(key: key);
@ -77,7 +78,7 @@ class _PayModelSheetState extends State<PayModelSheet> {
color: BaseStyle.color999999,
),
onPressed: () {
Navigator.pop(context);
Get.back();
},
),
Container(
@ -118,7 +119,7 @@ class _PayModelSheetState extends State<PayModelSheet> {
});
_listPay[index]['isCheck'] = true;
_currentindex = index;
Navigator.pop(context);
Get.back();
});
},
child: Container(

@ -1,8 +1,10 @@
import 'dart:convert';
import 'package:akuCommunity/pages/goods_details/view_comments_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:get/get.dart';
import 'widget/goods_app_bar.dart';
import 'widget/product_swiper.dart';
import 'widget/product_content.dart';
@ -55,10 +57,7 @@ class _GoodsDetailsPageState extends State<GoodsDetailsPage> {
// ProductSpecs(),
ProductEvaluate(
fun: () {
Navigator.pushNamed(
context,
PageName.view_comments_page.toString(),
);
Get.to(ViewCommentsPage());
},
),
ProductDetail(

@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'widget/goods_app_bar.dart';
import 'widget/goods_comments_card.dart';

@ -1,10 +1,11 @@
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:akuCommunity/pages/market/market_cart_page/market_cart_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:fluwx/fluwx.dart';
import 'package:get/get.dart';
class GoodsAppBar extends StatefulWidget {
final String shareImg;
@ -25,7 +26,7 @@ class _GoodsAppBarState extends State<GoodsAppBar> {
leading: IconButton(
icon: Icon(AntDesign.left, size: 40.sp),
onPressed: () {
Navigator.pop(context);
Get.back();
},
),
title: Container(
@ -84,7 +85,7 @@ class _GoodsAppBarState extends State<GoodsAppBar> {
color: Color(0xff666666),
),
onPressed: () {
Navigator.pushNamed(context, PageName.market_cart_page.toString());
Get.to(MarketCartPage());
},
),
],

@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'package:akuCommunity/widget/cached_image_wrapper.dart';
import 'package:akuCommunity/widget/expandable_text.dart';

@ -1,7 +1,9 @@
import 'package:akuCommunity/pages/market/market_cart_page/market_cart_page.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:get/get.dart';
import 'package:provider/provider.dart';
import 'package:akuCommunity/provider/cart.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
@ -110,8 +112,7 @@ class _GoodsDetailsBottomBarState extends State<GoodsDetailsBottomBar> {
],
),
onTap: () {
Navigator.pushNamed(
context, PageName.market_cart_page.toString());
Get.to(MarketCartPage());
},
),
SizedBox(width: 53.w),

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'package:akuCommunity/widget/cached_image_wrapper.dart';

@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:qr_flutter/qr_flutter.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/widget/dotted_line.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/assets_image.dart';
import 'package:akuCommunity/widget/common_image_picker.dart';
import 'package:akuCommunity/widget/bottom_button.dart';

@ -3,7 +3,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:flutter_picker/flutter_picker.dart';
import 'package:flutter_datetime_picker/flutter_datetime_picker.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
class CommonPicker extends StatefulWidget {
final String title;

@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
class CommonRadio extends StatefulWidget {
final List<Map<String, dynamic>> commonlist;

@ -1,6 +1,8 @@
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/pages/goods_deto_page/deto_create_page/deto_create_page.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:get/get.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:akuCommunity/widget/bottom_button.dart';
@ -56,7 +58,6 @@ class _GoodsDetoPageState extends State<GoodsDetoPage> {
}
];
RefreshController _refreshController =
RefreshController(initialRefresh: false);
@ -78,9 +79,7 @@ class _GoodsDetoPageState extends State<GoodsDetoPage> {
_refreshController.loadComplete();
}
void createRouter() {
Navigator.pushNamed(context, PageName.deto_create_page.toString());
}
@override
void dispose() {
@ -131,7 +130,9 @@ class _GoodsDetoPageState extends State<GoodsDetoPage> {
bottom: 0,
child: BottomButton(
title: '新增',
fun: createRouter,
fun: () {
Get.to(DetoCreatePage());
},
),
),
],

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'image_horizontal_list.dart';
import 'goods_info_card_button.dart';

@ -1,10 +1,11 @@
import 'package:akuCommunity/pages/goods_deto_page/deto_code_page/deto_code_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:get/get.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:akuCommunity/extensions/page_router.dart';
class GoodsInfoCardButton extends StatelessWidget {
GoodsInfoCardButton({Key key}) : super(key: key);
@ -42,7 +43,7 @@ class GoodsInfoCardButton extends StatelessWidget {
),
),
onPressed: () {
Navigator.of(context).pop();
Get.back();
},
),
CupertinoDialogAction(
@ -56,7 +57,7 @@ class GoodsInfoCardButton extends StatelessWidget {
),
onPressed: () {
_phoneCall('tel:$url');
Navigator.pop(context);
Get.back();
},
),
],
@ -85,8 +86,7 @@ class GoodsInfoCardButton extends StatelessWidget {
onTap: () {
switch (_listButton[index]['title']) {
case '查看二维码':
Navigator.pushNamed(
context, PageName.deto_code_page.toString());
DetoCodePage().to;
break;
case '搬家公司':
_showDialog(context, '0574-88467897');

@ -1,7 +1,7 @@
import 'dart:math';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/utils/fade_route.dart';
import 'package:akuCommunity/widget/gallery_photo_view_wrapper.dart';

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/widget/bottom_button.dart';
import 'package:akuCommunity/widget/cached_image_wrapper.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';

@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';
class MineGoodsPage extends StatefulWidget {

@ -2,6 +2,7 @@ import 'dart:async';
import 'dart:convert';
import 'package:akuCommunity/base/base_style.dart';
import 'package:akuCommunity/const/resource.dart';
import 'package:akuCommunity/pages/activities_page/activities_page.dart';
import 'package:akuCommunity/pages/convenient_phone/convenient_phone_page.dart';
import 'package:akuCommunity/pages/industry_committee/industry_committee_page.dart';
import 'package:akuCommunity/pages/life_pay/life_pay_page.dart';
@ -21,7 +22,7 @@ import 'package:flutter_icons/flutter_icons.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'widget/home_search.dart';
import 'widget/home_swiper.dart';
import 'widget/home_card.dart';
@ -33,6 +34,7 @@ import 'package:akuCommunity/model/aku_shop_model.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:velocity_x/velocity_x.dart';
import 'package:akuCommunity/extensions/page_router.dart';
class HomePage extends StatefulWidget {
HomePage({Key key}) : super(key: key);
@ -223,9 +225,7 @@ class _HomePageState extends State<HomePage>
tag: '活动',
isShowImage: false,
fun: () {
Navigator.pushNamed(
context, PageName.activities_page.toString(),
arguments: Bundle()..putBool('isVote', false));
ActivitiesPage(bundle: Bundle()..putBool('isVote', false),).to;
},
),
HomeCard(

@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/widget/app_bar_action.dart';
class HomeAppBar extends StatefulWidget {

@ -1,8 +1,10 @@
import 'dart:convert';
import 'package:akuCommunity/pages/activities_page/activities_details_page/activities_details_page.dart';
import 'package:akuCommunity/pages/goods_details/goods_details_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:image_stack/image_stack.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/widget/cached_image_wrapper.dart';
import 'package:akuCommunity/routers/page_routers.dart';
@ -32,29 +34,28 @@ class _HomeCardState extends State<HomeCard> {
"https://ss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=3604827221,1047385274&fm=26&gp=0.jpg",
];
Widget _button(String buttonName) {
return InkWell(
onTap: () {
switch (widget.isActivity) {
case true:
Navigator.pushNamed(
context, PageName.activities_details_page.toString(),
arguments: Bundle()
..putMap('details', {
'title': widget.title,
'imagePath': widget.imagePath,
'isOver': false,
'isVoteOver': false,
'isVote': false,
'memberList': images
}));
ActivitiesDetailsPage(
bundle: Bundle()
..putMap('details', {
'title': widget.title,
'imagePath': widget.imagePath,
'isOver': false,
'isVoteOver': false,
'isVote': false,
'memberList': images
}),
).to;
break;
case false:
var shopInfo;
shopInfo = {
'itemid': '1',
'itemtitle':widget.title,
'itemtitle': widget.title,
'taobao_image': "${widget.imagePath},${widget.imagePath}",
'itemprice': '69.9',
'itemshorttitle': widget.title,
@ -62,10 +63,10 @@ class _HomeCardState extends State<HomeCard> {
'itemdesc': widget.title,
'itempic': widget.imagePath
};
Navigator.pushNamed(context, PageName.goods_details_page.toString(),
arguments: Bundle()
..putString(
'shoplist', json.encode(shopInfo).toString()));
GoodsDetailsPage(
bundle: Bundle()
..putString('shoplist', json.encode(shopInfo).toString()),
).to;
break;
default:
}
@ -76,8 +77,7 @@ class _HomeCardState extends State<HomeCard> {
alignment: Alignment.center,
decoration: BoxDecoration(
color: Color(0xffffc40c),
borderRadius:
BorderRadius.all(Radius.circular(22.w)),
borderRadius: BorderRadius.all(Radius.circular(22.w)),
),
padding: EdgeInsets.symmetric(vertical: 8.w),
child: Text(
@ -107,8 +107,7 @@ class _HomeCardState extends State<HomeCard> {
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(Radius.circular(8.w)),
border:
Border.all(color: Color(0xffe8e8e8), width: 2.w),
border: Border.all(color: Color(0xffe8e8e8), width: 2.w),
),
padding: EdgeInsets.only(bottom: 24.w),
child: Column(

@ -2,7 +2,7 @@ import 'package:akuCommunity/widget/search_bar_delegate.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
class HomeSearch extends StatefulWidget {
HomeSearch({Key key}) : super(key: key);

@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_swiper/flutter_swiper.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/widget/cached_image_wrapper.dart';
class HomeSwiper extends StatefulWidget {

@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/assets_image.dart';
class HomeTagBar extends StatefulWidget {

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';
class CommitteeMailboxPage extends StatefulWidget {

@ -1,9 +1,10 @@
import 'package:akuCommunity/pages/industry_committee/committee_mailbox/committee_mailbox_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:get/get.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'widget/staff_list.dart';
class IndustryCommitteePage extends StatefulWidget {
@ -56,7 +57,7 @@ class _IndustryCommitteePageState extends State<IndustryCommitteePage> {
),
),
onPressed: () {
Navigator.of(context).pop();
Get.back();
},
),
CupertinoDialogAction(
@ -70,7 +71,7 @@ class _IndustryCommitteePageState extends State<IndustryCommitteePage> {
),
onPressed: () {
_phoneCall('tel:${'0574-88478909'}');
Navigator.pop(context);
Get.back();
},
),
],
@ -87,8 +88,7 @@ class _IndustryCommitteePageState extends State<IndustryCommitteePage> {
_showDialog();
break;
case '业委会信箱':
Navigator.pushNamed(
context, PageName.committee_mailbox_page.toString());
CommitteeMailboxPage().to;
break;
default:
}

@ -1,4 +1,4 @@
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';

@ -1,9 +1,10 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:akuCommunity/widget/round_check_box.dart';
import 'package:get/get.dart';
import 'widget/invoice_input.dart';
class InvoicePage extends StatefulWidget {
@ -39,7 +40,7 @@ class _InvoicePageState extends State<InvoicePage> {
leading: IconButton(
icon: Icon(AntDesign.left, size: 40.sp),
onPressed: () {
Navigator.pop(context);
Get.back();
},
),
centerTitle: true,

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
class InvoiceInput extends StatefulWidget {
final bool isEnterprise;

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';
import 'widget/bill_card.dart';

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/base_style.dart';
class BillCard extends StatelessWidget {

@ -1,6 +1,7 @@
import 'package:akuCommunity/pages/life_pay/life_pay_bill_page/life_pay_bill_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';
import 'widget/details_card.dart';
@ -15,9 +16,6 @@ class LifePayInfoPage extends StatefulWidget {
}
class _LifePayInfoPageState extends State<LifePayInfoPage> {
void billRouter() {
Navigator.pushNamed(context, PageName.life_pay_bill_page.toString());
}
@override
Widget build(BuildContext context) {
@ -33,7 +31,7 @@ class _LifePayInfoPageState extends State<LifePayInfoPage> {
ListView(
padding: EdgeInsets.only(bottom: 130.w),
children: [
DetailsCard(fun: billRouter),
DetailsCard(fun: LifePayBillPage().to),
],
),
Positioned(

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'package:flutter_icons/flutter_icons.dart';

@ -1,6 +1,7 @@
import 'package:akuCommunity/pages/life_pay/life_pay_info_page/life_pay_info_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';
import 'widget/order_card.dart';
@ -14,12 +15,6 @@ class LifePayPage extends StatefulWidget {
}
class _LifePayPageState extends State<LifePayPage> {
void detailsRouter() {
Navigator.pushNamed(context, PageName.life_pay_info_page.toString(),
arguments: Bundle()
..putMap('commentMap', {'title': '明细', 'isActions': false}));
}
@override
Widget build(BuildContext context) {
return Scaffold(
@ -43,9 +38,8 @@ class _LifePayPageState extends State<LifePayPage> {
),
child: RichText(
text: TextSpan(
style: TextStyle(
fontSize: 28.sp,
color: Color(0xff666666)),
style:
TextStyle(fontSize: 28.sp, color: Color(0xff666666)),
children: <InlineSpan>[
TextSpan(
text: '深圳华茂悦峰',
@ -57,7 +51,11 @@ class _LifePayPageState extends State<LifePayPage> {
]),
),
),
OrderCard(fun: detailsRouter),
OrderCard(
fun: LifePayInfoPage(
bundle: Bundle()
..putMap('commentMap', {'title': '明细', 'isActions': false}),
).to),
],
),
Positioned(

@ -1,7 +1,8 @@
import 'package:akuCommunity/pages/life_pay/life_pay_bill_page/life_pay_bill_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';
import 'widget/record_card.dart';
@ -35,9 +36,6 @@ class _LifePayRecordPageState extends State<LifePayRecordPage> {
_refreshController.loadComplete();
}
void billRouter() {
Navigator.pushNamed(context, PageName.life_pay_bill_page.toString());
}
@override
void dispose() {
@ -85,10 +83,10 @@ class _LifePayRecordPageState extends State<LifePayRecordPage> {
]),
),
),
RecordCard(fun: billRouter),
RecordCard(fun: billRouter),
RecordCard(fun: billRouter),
RecordCard(fun: billRouter),
RecordCard(fun: LifePayBillPage().to),
RecordCard(fun: LifePayBillPage().to),
RecordCard(fun: LifePayBillPage().to),
RecordCard(fun: LifePayBillPage().to),
],
),
),

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'package:flutter_icons/flutter_icons.dart';

@ -1,6 +1,7 @@
import 'package:akuCommunity/pages/life_pay/life_pay_info_page/life_pay_info_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'package:akuCommunity/routers/page_routers.dart';
@ -76,9 +77,8 @@ class _OrderCardState extends State<OrderCard> {
InkWell _checkInfo(Function fun) {
return InkWell(
onTap: (){
Navigator.pushNamed(context, PageName.life_pay_info_page.toString(),
arguments: Bundle()
..putMap('detailMap', {'title': '去年2019年'}));
LifePayInfoPage(bundle: Bundle()
..putMap('detailMap', {'title': '去年2019年'}),).to;
},
child: Container(
margin: EdgeInsets.only(top: 20.w),

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/base_style.dart';
class SubmitBar extends StatefulWidget {

@ -1,5 +1,5 @@
import 'package:akuCommunity/model/aku_shop_model.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/widget/cached_image_wrapper.dart';
import 'package:akuCommunity/widget/cart_count.dart';
import 'package:flutter/material.dart';

@ -1,7 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:get/get.dart';
class MarketCartAppBar extends StatelessWidget {
const MarketCartAppBar({Key key}) : super(key: key);
@ -16,7 +17,7 @@ class MarketCartAppBar extends StatelessWidget {
padding: EdgeInsets.all(0),
icon: Icon(AntDesign.left, size: 40.sp),
onPressed: () {
Navigator.pop(context);
Get.back();
},
),
centerTitle: false,

@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:provider/provider.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/provider/cart.dart';
class MarketCartBottomBar extends StatelessWidget {

@ -3,7 +3,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter_slidable/flutter_slidable.dart';
import 'package:akuCommunity/widget/cached_image_wrapper.dart';
import 'package:akuCommunity/widget/cart_count.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/model/aku_shop_model.dart';
import 'package:provider/provider.dart';
import 'package:akuCommunity/provider/cart.dart';

@ -1,7 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:get/get.dart';
class MarketDetailsAppBar extends StatefulWidget {
final String title;
@ -59,7 +60,7 @@ class _MarketDetailsAppBarState extends State<MarketDetailsAppBar> {
itemBuilder: (BuildContext context, int index) {
return InkWell(
onTap: () {
Navigator.pop(context);
Get.back();
},
child: Container(
decoration: BoxDecoration(
@ -131,7 +132,7 @@ class _MarketDetailsAppBarState extends State<MarketDetailsAppBar> {
padding: EdgeInsets.all(0),
icon: Icon(AntDesign.left, size: 37.sp),
onPressed: () {
Navigator.pop(context);
Get.back();
}),
title: InkWell(
onTap: _showModelTopSheet,

@ -1,14 +1,13 @@
import 'package:akuCommunity/widget/grid_buttons.dart';
import 'package:akuCommunity/widget/search_bar_delegate.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:akuCommunity/base/assets_image.dart';
import 'package:akuCommunity/widget/container_comment.dart';
import 'package:akuCommunity/widget/app_bar_action.dart';
import 'package:akuCommunity/widget/single_ad_space.dart';
import 'package:akuCommunity/widget/grid_button.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'widget/market_sticky_bar.dart';
import 'widget/market_list.dart';
@ -131,9 +130,9 @@ class _MarketPageState extends State<MarketPage>
),
ContainerComment(
radius: 8,
customWidget: GridButton(
gridList: AssetsImage.shopGridList,
count: 4,
customWidget: GridButtons(
gridList: [],
crossCount: 4,
),
),
],

@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'package:akuCommunity/widget/sliver_goods_card.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/widget/goods_card_skeleton.dart';
import 'package:akuCommunity/service/base_model.dart';
import 'package:akuCommunity/model/aku_shop_model.dart';

@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/widget/cached_image_wrapper.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
class SliverGoodsGroupCard extends StatefulWidget {
SliverGoodsGroupCard({Key key}) : super(key: key);

@ -2,7 +2,7 @@ import 'dart:async';
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'package:akuCommunity/widget/cached_image_wrapper.dart';
import 'package:akuCommunity/model/aku_shop_class_model.dart';

@ -1,8 +1,9 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/widget/search_bar_delegate.dart';
import 'package:get/get.dart';
class MarketClassBar extends StatelessWidget {
Widget _inkWellSearch(BuildContext context) {
@ -47,7 +48,7 @@ class MarketClassBar extends StatelessWidget {
titleSpacing: 0,
backgroundColor: Color(0xffffffff),
leading: InkWell(
onTap: () => Navigator.pop(context),
onTap: () => Get.back(),
child: Icon(AntDesign.left, size: 40.sp),
),
centerTitle: true,

@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';
class CommentMessagePage extends StatefulWidget {
@ -49,12 +49,7 @@ class _CommentMessagePageState extends State<CommentMessagePage> {
super.initState();
}
void noteCreateRouter() {
// Navigator.pushNamed(
// context,
// PageName.note_create_page.toString(),
// );
}
void _onRefresh() async {
await Future.delayed(Duration(milliseconds: 1500));

@ -1,6 +1,9 @@
import 'package:akuCommunity/pages/message_center_page/comment_message_page/comment_message_page.dart';
import 'package:akuCommunity/pages/message_center_page/shop_message_page/shop_message_page.dart';
import 'package:akuCommunity/pages/message_center_page/system_message_page/system_message_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/assets_image.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';
@ -65,13 +68,13 @@ class _MessageCenterPageState extends State<MessageCenterPage> {
onTap: () {
switch (_messageList[index]['title']) {
case '系统通知':
Navigator.pushNamed(context, PageName.system_message_page.toString());
SystemMessagePage().to;
break;
case '评论通知':
Navigator.pushNamed(context, PageName.comment_message_page.toString());
CommentMessagePage().to;
break;
case '商城通知':
Navigator.pushNamed(context, PageName.shop_message_page.toString());
ShopMessagePage().to;
break;
default:
}
@ -81,8 +84,7 @@ class _MessageCenterPageState extends State<MessageCenterPage> {
top: 36.w,
bottom: 19.w,
),
margin: EdgeInsets.symmetric(
horizontal: 32.w),
margin: EdgeInsets.symmetric(horizontal: 32.w),
decoration: BoxDecoration(
border: Border(
bottom: Divider.createBorderSide(context,

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/base_style.dart';
class RefundDetails extends StatelessWidget {

@ -1,8 +1,9 @@
import 'package:akuCommunity/pages/common/common_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';
@ -45,13 +46,6 @@ class _ShopMessagePageState extends State<ShopMessagePage> {
super.initState();
}
void noteCreateRouter() {
// Navigator.pushNamed(
// context,
// PageName.note_create_page.toString(),
// );
}
void _onRefresh() async {
await Future.delayed(Duration(milliseconds: 1500));
@ -66,12 +60,13 @@ class _ShopMessagePageState extends State<ShopMessagePage> {
}
void refundRouter() {
Navigator.pushNamed(context, PageName.common_page.toString(),
arguments: Bundle()
..putMap('commentMap', {
'title': '退款详情',
'isActions': false,
}));
CommonPage(
bundle: Bundle()
..putMap('commentMap', {
'title': '退款详情',
'isActions': false,
}),
).to;
}
void expressRouter() {}
@ -92,8 +87,7 @@ class _ShopMessagePageState extends State<ShopMessagePage> {
children: [
Text(
lookType,
style: TextStyle(
fontSize: 28.sp, color: Color(0xff333333)),
style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)),
),
Icon(AntDesign.right, size: 40.sp),
],
@ -108,11 +102,8 @@ class _ShopMessagePageState extends State<ShopMessagePage> {
left: 32.w,
right: 32.w,
),
padding: EdgeInsets.only(
top: 21.w,
bottom: 14.w,
left: 30.w,
right: 20.w),
padding:
EdgeInsets.only(top: 21.w, bottom: 14.w, left: 30.w, right: 20.w),
decoration: BoxDecoration(
color: Color(0xffffffff),
borderRadius: BorderRadius.all(Radius.circular(4)),
@ -143,17 +134,15 @@ class _ShopMessagePageState extends State<ShopMessagePage> {
),
Text(
status,
style: TextStyle(
fontSize: 32.sp,
color: Color(0xff999999)),
style:
TextStyle(fontSize: 32.sp, color: Color(0xff999999)),
),
],
),
SizedBox(height: 5.w),
Text(type,
style: TextStyle(
fontSize: 28.sp,
color: Color(0xff333333))),
style:
TextStyle(fontSize: 28.sp, color: Color(0xff333333))),
SizedBox(height: 8.w),
Row(
children: [
@ -170,8 +159,7 @@ class _ShopMessagePageState extends State<ShopMessagePage> {
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 28.sp,
color: Color(0xff999999)),
fontSize: 28.sp, color: Color(0xff999999)),
),
),
],

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';
import 'package:akuCommunity/routers/page_routers.dart';

@ -1,8 +1,9 @@
import 'package:akuCommunity/pages/message_center_page/system_message_page/system_details_page/system_details_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';
@ -35,13 +36,6 @@ class _SystemMessagePageState extends State<SystemMessagePage> {
super.initState();
}
void noteCreateRouter() {
// Navigator.pushNamed(
// context,
// PageName.note_create_page.toString(),
// );
}
void _onRefresh() async {
await Future.delayed(Duration(milliseconds: 1500));
@ -64,17 +58,17 @@ class _SystemMessagePageState extends State<SystemMessagePage> {
InkWell _inkWellLook(String type, String content) {
return InkWell(
onTap: () {
Navigator.pushNamed(context, PageName.system_details_page.toString(),
arguments: Bundle()
..putMap('detailsMap', {'type': type, 'content': content}));
SystemDetailsPage(
bundle: Bundle()
..putMap('detailsMap', {'type': type, 'content': content}),
).to;
},
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'查看详情',
style: TextStyle(
fontSize: 28.sp, color: Color(0xff333333)),
style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)),
),
Icon(AntDesign.right, size: 40.sp),
],
@ -89,11 +83,8 @@ class _SystemMessagePageState extends State<SystemMessagePage> {
left: 32.w,
right: 32.w,
),
padding: EdgeInsets.only(
top: 21.w,
bottom: 14.w,
left: 30.w,
right: 20.w),
padding:
EdgeInsets.only(top: 21.w, bottom: 14.w, left: 30.w, right: 20.w),
decoration: BoxDecoration(
color: Color(0xffffffff),
borderRadius: BorderRadius.all(Radius.circular(4)),
@ -124,25 +115,22 @@ class _SystemMessagePageState extends State<SystemMessagePage> {
),
Text(
status,
style: TextStyle(
fontSize: 32.sp,
color: Color(0xff999999)),
style:
TextStyle(fontSize: 32.sp, color: Color(0xff999999)),
),
],
),
SizedBox(height: 5.w),
Text(
type,
style: TextStyle(
fontSize: 28.sp, color: Color(0xff333333)),
style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)),
),
SizedBox(height: 8.w),
Text(
'驳回理由:$content',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 28.sp, color: Color(0xff333333)),
style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)),
),
],
),

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';
import 'package:akuCommunity/widget/common_input.dart';

@ -1,7 +1,9 @@
import 'package:akuCommunity/pages/mine_car_page/car_add_page/car_add_page.dart';
import 'package:akuCommunity/pages/mine_car_page/select_community_page/select_community_page.dart';
import 'package:akuCommunity/widget/bee_scaffold.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/assets_image.dart';
import 'package:akuCommunity/routers/page_routers.dart';
@ -76,11 +78,10 @@ class _MineCarPageState extends State<MineCarPage> {
onTap: () {
switch (type) {
case '':
Navigator.pushNamed(context, PageName.car_add_page.toString());
CarAddPage().to;
break;
case '车位':
Navigator.pushNamed(
context, PageName.select_community_page.toString());
SelectCommunityPage().to;
break;
default:
}

@ -1,7 +1,8 @@
import 'package:akuCommunity/pages/mine_car_page/select_parking_page/select_parking_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';
@ -30,9 +31,7 @@ class _SelectCommunityPageState extends State<SelectCommunityPage> {
width: MediaQuery.of(context).size.width,
color: Colors.white,
margin: EdgeInsets.only(top: 32.w),
padding: EdgeInsets.symmetric(
vertical: 28.w,
horizontal: 32.w),
padding: EdgeInsets.symmetric(vertical: 28.w, horizontal: 32.w),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
@ -78,17 +77,15 @@ class _SelectCommunityPageState extends State<SelectCommunityPage> {
_communityList.length,
(index) => InkWell(
onTap: () {
Navigator.pushNamed(
context, PageName.select_parking_page.toString(),
arguments: Bundle()
..putString('title', _communityList[index]));
SelectParkingPage(
bundle: Bundle()..putString('title', _communityList[index]),
).to;
},
child: Container(
width: MediaQuery.of(context).size.width,
color: Colors.white,
padding: EdgeInsets.symmetric(
vertical: 28.w,
horizontal: 32.w),
padding:
EdgeInsets.symmetric(vertical: 28.w, horizontal: 32.w),
child: Text(
_communityList[index],
style: TextStyle(

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';
import 'package:akuCommunity/widget/common_input.dart';

@ -1,7 +1,8 @@
import 'package:akuCommunity/pages/mine_house_page/house_authenticate_page/house_authenticate_page.dart';
import 'package:akuCommunity/widget/bee_scaffold.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/assets_image.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';
@ -74,8 +75,7 @@ class _MineHousePageState extends State<MineHousePage> {
Widget _inkWellCheck() {
return InkWell(
onTap: () {
Navigator.pushNamed(
context, PageName.house_authenticate_page.toString());
HouseAuthenticatePage().to;
},
child: Container(
padding: EdgeInsets.only(

@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_html/flutter_html.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:akuCommunity/widget/cached_image_wrapper.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';

@ -1,4 +1,4 @@
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';
import 'package:flutter/material.dart';
import 'package:amap_map_fluttify/amap_map_fluttify.dart';

@ -2,7 +2,7 @@ import 'dart:ui';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_beautiful_popup/main.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';

@ -1,9 +1,11 @@
import 'package:akuCommunity/pages/certification_page/certification_page.dart';
import 'package:akuCommunity/widget/bee_scaffold.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';
import 'package:get/get.dart';
class OpenDoorPage extends StatefulWidget {
OpenDoorPage({Key key}) : super(key: key);
@ -42,7 +44,7 @@ class _OpenDoorPageState extends State<OpenDoorPage> {
),
),
onPressed: () {
Navigator.of(context).pop();
Get.back();
},
),
CupertinoDialogAction(
@ -55,9 +57,8 @@ class _OpenDoorPageState extends State<OpenDoorPage> {
),
),
onPressed: () {
Navigator.of(context).pop();
Navigator.pushNamed(
context, PageName.certification_page.toString());
Get.back();
CertificationPage().to;
},
),
],

@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:qr_flutter/qr_flutter.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/widget/common_app_bar.dart';
class OpeningCodePage extends StatefulWidget {

@ -1,10 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/assets_image.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:get/get.dart';
import 'widget/refund_shop_card.dart';
class EvaluateGoodPage extends StatefulWidget {
@ -31,7 +32,7 @@ class _EvaluateGoodPageState extends State<EvaluateGoodPage> {
leading: IconButton(
icon: Icon(AntDesign.left, size: 40.sp),
onPressed: () {
Navigator.pop(context);
Get.back();
},
),
centerTitle: true,

@ -1,12 +1,13 @@
import 'dart:ui';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:get/get.dart';
import 'package:sliding_up_panel/sliding_up_panel.dart';
import 'package:flutter_map/flutter_map.dart';
import 'package:latlong/latlong.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'package:akuCommunity/widget/cached_image_wrapper.dart';
@ -64,7 +65,7 @@ class _LookLogisticsPageState extends State<LookLogisticsPage> {
alignment: Alignment.centerLeft,
icon: Icon(AntDesign.left, size: 40.sp),
onPressed: () {
Navigator.pop(context);
Get.back();
},
),
),

@ -1,11 +1,13 @@
import 'package:akuCommunity/pages/personal/refund_select_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:extended_text/extended_text.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/assets_image.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:get/get.dart';
class OrderDetailsPage extends StatefulWidget {
final Bundle bundle;
@ -23,7 +25,7 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
leading: IconButton(
icon: Icon(AntDesign.left, size: 40.sp),
onPressed: () {
Navigator.pop(context);
Get.back();
},
),
centerTitle: true,
@ -141,12 +143,13 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
List<Map<String, dynamic>> listContent, double payPrice) {
return InkWell(
onTap: () {
Navigator.pushNamed(context, PageName.refund_select_page.toString(),
arguments: Bundle()
..putMap('details', {
'listContent': listContent,
'payPrice': payPrice,
}));
RefundSelectPage(
bundle: Bundle()
..putMap('details', {
'listContent': listContent,
'payPrice': payPrice,
}),
).to;
},
child: Container(
alignment: Alignment.center,
@ -158,8 +161,7 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
),
child: Text(
'退款',
style: TextStyle(
fontSize: BaseStyle.fontSize28, color: ktextPrimary),
style: TextStyle(fontSize: BaseStyle.fontSize28, color: ktextPrimary),
),
),
);
@ -264,7 +266,7 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
Positioned(
top: 103.w,
right: 0,
child: _inkWellRefund(listContent,payPrice),
child: _inkWellRefund(listContent, payPrice),
),
],
),
@ -285,14 +287,13 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
child: Column(
children: listContent
.map((item) => _containerContent(
item['imagePath'],
item['content'],
item['specs'],
item['price'],
payPrice,
item['shopNum'],
listContent
))
item['imagePath'],
item['content'],
item['specs'],
item['price'],
payPrice,
item['shopNum'],
listContent))
.toList(),
),
);

@ -1,9 +1,10 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:get/get.dart';
import 'widget/order_list.dart';
class OrderPage extends StatefulWidget {
@ -108,7 +109,7 @@ class _OrderPageState extends State<OrderPage>
titleSpacing: 0,
backgroundColor: Color(0xffffffff),
leading: InkWell(
onTap: () => Navigator.pop(context),
onTap: () => Get.back(),
child: Icon(AntDesign.left, size: 40.sp),
),
centerTitle: false,

@ -4,6 +4,7 @@ import 'package:akuCommunity/pages/address_page/address_page.dart';
import 'package:akuCommunity/pages/life_pay/life_pay_page.dart';
import 'package:akuCommunity/pages/mine_car_page/mine_car_page.dart';
import 'package:akuCommunity/pages/mine_house_page/mine_house_page.dart';
import 'package:akuCommunity/pages/personal/order_page.dart';
import 'package:akuCommunity/pages/setting_page/settings_page.dart';
import 'package:akuCommunity/pages/sign/sign_in_page.dart';
import 'package:akuCommunity/pages/things_page/fixed_submit_page.dart';
@ -15,7 +16,7 @@ import 'package:ani_route/ani_route.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/assets_image.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'package:akuCommunity/widget/single_ad_space.dart';
@ -198,8 +199,7 @@ class _PersonalIndexState extends State<PersonalIndex>
? SizedBox()
: InkWell(
onTap: () {
Navigator.pushNamed(
context, PageName.order_page.toString());
OrderPage().to;
},
child: Row(
mainAxisAlignment: MainAxisAlignment.start,

@ -1,9 +1,10 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/utils/headers.dart';
import 'package:akuCommunity/base/base_style.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:get/get.dart';
import 'widget/refund_shop_card.dart';
import 'widget/refund_tile_card.dart';
@ -27,7 +28,7 @@ class _RefundApplyPageState extends State<RefundApplyPage> {
leading: IconButton(
icon: Icon(AntDesign.left, size: 40.sp),
onPressed: () {
Navigator.pop(context);
Get.back();
},
),
centerTitle: true,

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

Loading…
Cancel
Save