Showing
32 changed files
with
676 additions
and
63 deletions
assets/bjlx.png
100755 → 100644
assets/bjzm.png
100755 → 100644
assets/bjzm_un.png
100755 → 100644
assets/cdgl.png
100755 → 100644
assets/cdgl_un.png
100755 → 100644
assets/cybz.png
100755 → 100644
assets/dpxx.png
100755 → 100644
assets/dpxx_un.png
100755 → 100644
assets/f_delete_red_un.png
0 → 100644
1.75 KB
assets/grxx.png
100755 → 100644
assets/qdkq.png
100755 → 100644
assets/qdkq_un.png
100755 → 100644
assets/wdkq.png
100755 → 100644
assets/yggl.png
100755 → 100644
assets/yggl_un.png
100755 → 100644
assets/yhgl.png
0 → 100644
2.36 KB
assets/yhgl_un.png
0 → 100644
2.37 KB
assets/yhq.png
100755 → 100644
assets/zwgl.png
100755 → 100644
assets/zwgl_un.png
100755 → 100644
assets/zwzp.png
100755 → 100644
assets/zwzp_un.png
100755 → 100644
| 1 | +import 'package:flutter/material.dart'; | ||
| 2 | +import 'package:flutter_screenutil/flutter_screenutil.dart'; | ||
| 3 | +import 'package:one_key/route/navigator_util.dart'; | ||
| 4 | + | ||
| 5 | +import '../../../res/colors.dart'; | ||
| 6 | +import '../../../utils/screen_util.dart'; | ||
| 7 | +import '../../../utils/utils.dart'; | ||
| 8 | +import '../../../widgets/h_empty_view.dart'; | ||
| 9 | +import '../../../widgets/system_app_bar.dart'; | ||
| 10 | + | ||
| 11 | +/** | ||
| 12 | + * 宴会管理 | ||
| 13 | + */ | ||
| 14 | + | ||
| 15 | +class FeastManageHomePage extends StatefulWidget { | ||
| 16 | + FeastManageHomePage({Key key}) : super(key: key); | ||
| 17 | + | ||
| 18 | + @override | ||
| 19 | + _FeastManageHomePageState createState() => _FeastManageHomePageState(); | ||
| 20 | +} | ||
| 21 | + | ||
| 22 | +class _FeastManageHomePageState extends State<FeastManageHomePage> { | ||
| 23 | + @override | ||
| 24 | + void initState() { | ||
| 25 | + super.initState(); | ||
| 26 | + Utils.changeStatusColor(color: MyColours.color_438E93); | ||
| 27 | + } | ||
| 28 | + | ||
| 29 | + Widget feastManegeItem(String title, {GestureTapCallback onTap}) { | ||
| 30 | + return InkWell( | ||
| 31 | + onTap: onTap, | ||
| 32 | + child: Container( | ||
| 33 | + height: h(48), | ||
| 34 | + margin: EdgeInsets.only(top: w(12)), | ||
| 35 | + decoration: BoxDecoration( | ||
| 36 | + border: Border( | ||
| 37 | + bottom: | ||
| 38 | + BorderSide(width: w(1), color: MyColours.color_E7E7E7))), | ||
| 39 | + child: Row( | ||
| 40 | + children: [ | ||
| 41 | + Text( | ||
| 42 | + title, | ||
| 43 | + style: TextStyle( | ||
| 44 | + fontSize: font(16), color: MyColours.color_E5000000), | ||
| 45 | + ), | ||
| 46 | + Spacer(), | ||
| 47 | + Text( | ||
| 48 | + '修改/添加', | ||
| 49 | + style: TextStyle( | ||
| 50 | + fontSize: font(16), color: MyColours.color_66000000), | ||
| 51 | + ), | ||
| 52 | + HEmptyView(22), | ||
| 53 | + Image.asset( | ||
| 54 | + "assets/arrow_right_new.png", | ||
| 55 | + width: ScreenUtil().setWidth(9 * 2), | ||
| 56 | + height: ScreenUtil().setWidth(16 * 2), | ||
| 57 | + ), | ||
| 58 | + HEmptyView(48), | ||
| 59 | + ], | ||
| 60 | + ), | ||
| 61 | + )); | ||
| 62 | + } | ||
| 63 | + | ||
| 64 | + @override | ||
| 65 | + Widget build(BuildContext context) { | ||
| 66 | + return Scaffold( | ||
| 67 | + backgroundColor: MyColours.color_ffffff, | ||
| 68 | + appBar: SystemAppBar( | ||
| 69 | + '宴会管理', | ||
| 70 | + needWhite: true, | ||
| 71 | + bgColor: MyColours.color_438E93, | ||
| 72 | + titleColor: MyColours.color_F6F6F6, | ||
| 73 | + onTap: () { | ||
| 74 | + Navigator.pop(context); | ||
| 75 | + }, | ||
| 76 | + ), | ||
| 77 | + body: SingleChildScrollView( | ||
| 78 | + child: Padding( | ||
| 79 | + padding: EdgeInsets.only(left: w(16)), | ||
| 80 | + child: Column( | ||
| 81 | + children: [ | ||
| 82 | + feastManegeItem('宴会类型', onTap: () { | ||
| 83 | + NavigatorUtil.goFeasTypePage(context); | ||
| 84 | + }), | ||
| 85 | + feastManegeItem('宴会员工', onTap: () { | ||
| 86 | + NavigatorUtil.goFeastPersonalPage(context); | ||
| 87 | + }), | ||
| 88 | + feastManegeItem('套餐管理'), | ||
| 89 | + feastManegeItem('酒水管理'), | ||
| 90 | + feastManegeItem('其他配置管理'), | ||
| 91 | + feastManegeItem('定金设置'), | ||
| 92 | + ], | ||
| 93 | + ), | ||
| 94 | + ), | ||
| 95 | + )); | ||
| 96 | + } | ||
| 97 | +} |
| 1 | +import 'package:flutter/material.dart'; | ||
| 2 | +import 'package:flutter_screenutil/flutter_screenutil.dart'; | ||
| 3 | +import 'package:one_key/widgets/MyDivider.dart'; | ||
| 4 | + | ||
| 5 | +import '../../../res/colors.dart'; | ||
| 6 | +import '../../../utils/dialog_util.dart'; | ||
| 7 | +import '../../../utils/screen_util.dart'; | ||
| 8 | +import '../../../utils/utils.dart'; | ||
| 9 | +import '../../../widgets/h_empty_view.dart'; | ||
| 10 | +import '../../../widgets/round_button.dart'; | ||
| 11 | +import '../../../widgets/system_app_bar.dart'; | ||
| 12 | + | ||
| 13 | +/** | ||
| 14 | + * 宴会员工 | ||
| 15 | + */ | ||
| 16 | + | ||
| 17 | +class FeastPersonalPage extends StatefulWidget { | ||
| 18 | + FeastPersonalPage({Key key}) : super(key: key); | ||
| 19 | + | ||
| 20 | + @override | ||
| 21 | + _FeastPersonalPageState createState() => _FeastPersonalPageState(); | ||
| 22 | +} | ||
| 23 | + | ||
| 24 | +class _FeastPersonalPageState extends State<FeastPersonalPage> { | ||
| 25 | + @override | ||
| 26 | + void initState() { | ||
| 27 | + super.initState(); | ||
| 28 | + Utils.changeStatusColor(color: MyColours.color_438E93); | ||
| 29 | + } | ||
| 30 | + | ||
| 31 | + Widget buildFeastTypeHeader(bool select) { | ||
| 32 | + return RoundButton( | ||
| 33 | + onPressed: () async {}, | ||
| 34 | + text: '全选', | ||
| 35 | + fontSize: 32, | ||
| 36 | + isBold: false, | ||
| 37 | + height: h(32), | ||
| 38 | + width: w(48), | ||
| 39 | + margin: EdgeInsets.only(top: w(18), bottom: w(4)), | ||
| 40 | + textColor: select ? MyColours.color_ffffff : MyColours.color_438E93, | ||
| 41 | + gradientStart: select ? MyColours.color_438E93 : MyColours.color_ffffff, | ||
| 42 | + gradientEnd: select ? MyColours.color_438E93 : MyColours.color_ffffff, | ||
| 43 | + borderColor: select ? MyColours.color_438E93 : MyColours.color_ffffff, | ||
| 44 | + radius: r(6), | ||
| 45 | + ); | ||
| 46 | + } | ||
| 47 | + | ||
| 48 | + Widget buildFeastTypeItem() { | ||
| 49 | + return Column( | ||
| 50 | + children: [ | ||
| 51 | + Container( | ||
| 52 | + height: h(48), | ||
| 53 | + margin: EdgeInsets.only(top: w(12)), | ||
| 54 | + // decoration: BoxDecoration( | ||
| 55 | + // border: Border( | ||
| 56 | + // bottom: | ||
| 57 | + // BorderSide(width: w(1), color: MyColours.color_E7E7E7))), | ||
| 58 | + child: Row( | ||
| 59 | + children: [ | ||
| 60 | + InkWell( | ||
| 61 | + onTap: () {}, | ||
| 62 | + child: Image.asset( | ||
| 63 | + Utils.getImgPath(true ? 'select' : 'unselect'), | ||
| 64 | + width: w(24), | ||
| 65 | + height: w(24), | ||
| 66 | + )), | ||
| 67 | + HEmptyView(16), | ||
| 68 | + Text( | ||
| 69 | + '刘经理 15833517582', | ||
| 70 | + style: TextStyle( | ||
| 71 | + fontSize: font(16), color: MyColours.color_E6000000), | ||
| 72 | + ), | ||
| 73 | + Spacer(), | ||
| 74 | + Text( | ||
| 75 | + '管理员 0001', | ||
| 76 | + style: TextStyle( | ||
| 77 | + fontSize: font(14), color: MyColours.color_999999), | ||
| 78 | + ), | ||
| 79 | + HEmptyView(32), | ||
| 80 | + ], | ||
| 81 | + ), | ||
| 82 | + ), | ||
| 83 | + Padding( | ||
| 84 | + padding: EdgeInsets.only(left: w(32)), | ||
| 85 | + child: MyDivider( | ||
| 86 | + double.infinity, | ||
| 87 | + w(1), | ||
| 88 | + color: MyColours.color_E7E7E7, | ||
| 89 | + )) | ||
| 90 | + ], | ||
| 91 | + ); | ||
| 92 | + } | ||
| 93 | + | ||
| 94 | + Widget _callButton( | ||
| 95 | + {GestureTapCallback onPress, | ||
| 96 | + content, | ||
| 97 | + hasLeftBorder = true, | ||
| 98 | + isSelect = false}) { | ||
| 99 | + return InkWell( | ||
| 100 | + onTap: onPress, | ||
| 101 | + child: Container( | ||
| 102 | + height: h(48), | ||
| 103 | + decoration: BoxDecoration( | ||
| 104 | + color: isSelect ? MyColours.color_438E93 : MyColours.color_ffffff, | ||
| 105 | + border: Border( | ||
| 106 | + bottom: BorderSide( | ||
| 107 | + color: MyColours.color_438E93, | ||
| 108 | + width: ScreenUtil().setWidth(2)), | ||
| 109 | + top: BorderSide( | ||
| 110 | + color: MyColours.color_438E93, | ||
| 111 | + width: ScreenUtil().setWidth(2)), | ||
| 112 | + left: hasLeftBorder | ||
| 113 | + ? BorderSide( | ||
| 114 | + color: MyColours.color_438E93, | ||
| 115 | + width: ScreenUtil().setWidth(2)) | ||
| 116 | + : BorderSide.none, | ||
| 117 | + right: BorderSide( | ||
| 118 | + color: MyColours.color_438E93, | ||
| 119 | + width: ScreenUtil().setWidth(2)))), | ||
| 120 | + child: Align( | ||
| 121 | + alignment: Alignment.center, | ||
| 122 | + child: Text( | ||
| 123 | + content, | ||
| 124 | + style: TextStyle( | ||
| 125 | + color: | ||
| 126 | + isSelect ? MyColours.color_F6F6F6 : MyColours.color_438E93, | ||
| 127 | + fontSize: ScreenUtil().setSp(36)), | ||
| 128 | + ), | ||
| 129 | + ), | ||
| 130 | + ), | ||
| 131 | + ); | ||
| 132 | + } | ||
| 133 | + | ||
| 134 | + @override | ||
| 135 | + Widget build(BuildContext context) { | ||
| 136 | + return Scaffold( | ||
| 137 | + backgroundColor: MyColours.color_ffffff, | ||
| 138 | + appBar: SystemAppBar( | ||
| 139 | + '宴会员工', | ||
| 140 | + needWhite: true, | ||
| 141 | + bgColor: MyColours.color_438E93, | ||
| 142 | + titleColor: MyColours.color_F6F6F6, | ||
| 143 | + onTap: () { | ||
| 144 | + Navigator.pop(context); | ||
| 145 | + }, | ||
| 146 | + ), | ||
| 147 | + body: Column( | ||
| 148 | + children: [ | ||
| 149 | + Expanded( | ||
| 150 | + child: NestedScrollView( | ||
| 151 | + // controller: _scrollViewController, | ||
| 152 | + headerSliverBuilder: | ||
| 153 | + (BuildContext context, bool innerBoxIsScrolled) { | ||
| 154 | + return <Widget>[ | ||
| 155 | + SliverAppBar( | ||
| 156 | + pinned: true, | ||
| 157 | + floating: false, | ||
| 158 | + leading: null, | ||
| 159 | + backgroundColor: MyColours.color_ffffff, | ||
| 160 | + expandedHeight: ScreenUtil().setWidth(56 * 2), | ||
| 161 | + automaticallyImplyLeading: false, | ||
| 162 | + title: buildFeastTypeHeader(true), | ||
| 163 | + // flexibleSpace: FlexibleSpaceBar( | ||
| 164 | + // collapseMode: CollapseMode.pin, | ||
| 165 | + // title: buildFeastTypeHeader()) | ||
| 166 | + ) | ||
| 167 | + ]; | ||
| 168 | + }, | ||
| 169 | + body: ListView.builder( | ||
| 170 | + itemCount: 100, | ||
| 171 | + padding: EdgeInsets.only(left: w(16)), | ||
| 172 | + itemBuilder: (BuildContext context, int index) { | ||
| 173 | + return buildFeastTypeItem(); | ||
| 174 | + }), | ||
| 175 | + )), | ||
| 176 | + Row( | ||
| 177 | + children: [ | ||
| 178 | + Expanded( | ||
| 179 | + child: _callButton( | ||
| 180 | + onPress: () { | ||
| 181 | + Navigator.pop(context); | ||
| 182 | + }, | ||
| 183 | + content: '返回', | ||
| 184 | + hasLeftBorder: true, | ||
| 185 | + isSelect: false)), | ||
| 186 | + Expanded( | ||
| 187 | + child: _callButton( | ||
| 188 | + onPress: () {}, | ||
| 189 | + content: '保存', | ||
| 190 | + hasLeftBorder: true, | ||
| 191 | + isSelect: true)) | ||
| 192 | + ], | ||
| 193 | + ) | ||
| 194 | + ], | ||
| 195 | + ), | ||
| 196 | + ); | ||
| 197 | + } | ||
| 198 | +} |
| 1 | +import 'package:flutter/material.dart'; | ||
| 2 | +import 'package:flutter_screenutil/flutter_screenutil.dart'; | ||
| 3 | + | ||
| 4 | +import '../../../res/colors.dart'; | ||
| 5 | +import '../../../utils/dialog_util.dart'; | ||
| 6 | +import '../../../utils/screen_util.dart'; | ||
| 7 | +import '../../../utils/utils.dart'; | ||
| 8 | +import '../../../widgets/h_empty_view.dart'; | ||
| 9 | +import '../../../widgets/round_button.dart'; | ||
| 10 | +import '../../../widgets/system_app_bar.dart'; | ||
| 11 | + | ||
| 12 | +/** | ||
| 13 | + * 宴会类型 | ||
| 14 | + */ | ||
| 15 | + | ||
| 16 | +class FeastTypePage extends StatefulWidget { | ||
| 17 | + FeastTypePage({Key key}) : super(key: key); | ||
| 18 | + | ||
| 19 | + @override | ||
| 20 | + _FeastTypePageState createState() => _FeastTypePageState(); | ||
| 21 | +} | ||
| 22 | + | ||
| 23 | +class _FeastTypePageState extends State<FeastTypePage> { | ||
| 24 | + @override | ||
| 25 | + void initState() { | ||
| 26 | + super.initState(); | ||
| 27 | + Utils.changeStatusColor(color: MyColours.color_438E93); | ||
| 28 | + } | ||
| 29 | + | ||
| 30 | + Widget buildFeastTypeHeader() { | ||
| 31 | + return RoundButton( | ||
| 32 | + onPressed: () async { | ||
| 33 | + DialogUtil.textfeildAlertDialog(context, | ||
| 34 | + title: '输入类型名称', | ||
| 35 | + hintText: '请输入', | ||
| 36 | + text: '', | ||
| 37 | + lenghtLimit: false, | ||
| 38 | + toast: '请输入类型名称', rCallback: (name) { | ||
| 39 | + // _addCookbookClass(name, showLoading: true); | ||
| 40 | + }); | ||
| 41 | + }, | ||
| 42 | + text: '添加一项', | ||
| 43 | + fontSize: 32, | ||
| 44 | + isBold: false, | ||
| 45 | + height: h(32), | ||
| 46 | + width: w(80), | ||
| 47 | + margin: EdgeInsets.only(top: w(18), bottom: w(4)), | ||
| 48 | + textColor: MyColours.color_438E93, | ||
| 49 | + gradientStart: MyColours.color_ffffff, | ||
| 50 | + gradientEnd: MyColours.color_ffffff, | ||
| 51 | + borderColor: MyColours.color_438E93, | ||
| 52 | + radius: r(6), | ||
| 53 | + ); | ||
| 54 | + } | ||
| 55 | + | ||
| 56 | + Widget buildFeastTypeItem(String title) { | ||
| 57 | + return Container( | ||
| 58 | + height: h(48), | ||
| 59 | + margin: EdgeInsets.only(top: w(12)), | ||
| 60 | + decoration: BoxDecoration( | ||
| 61 | + border: Border( | ||
| 62 | + bottom: BorderSide(width: w(1), color: MyColours.color_E7E7E7))), | ||
| 63 | + child: Row( | ||
| 64 | + children: [ | ||
| 65 | + Text( | ||
| 66 | + title, | ||
| 67 | + style: | ||
| 68 | + TextStyle(fontSize: font(16), color: MyColours.color_E6000000), | ||
| 69 | + ), | ||
| 70 | + Spacer(), | ||
| 71 | + InkWell( | ||
| 72 | + onTap: () { | ||
| 73 | + DialogUtil.textfeildAlertDialog(context, | ||
| 74 | + title: '输入类型名称', | ||
| 75 | + hintText: '请输入', | ||
| 76 | + text: '原来的内容', | ||
| 77 | + lenghtLimit: true, | ||
| 78 | + toast: '请输入类型名称', rCallback: (name) { | ||
| 79 | + // _addCookbookClass(name, showLoading: true); | ||
| 80 | + }); | ||
| 81 | + }, | ||
| 82 | + child: Text( | ||
| 83 | + '修改', | ||
| 84 | + style: TextStyle( | ||
| 85 | + decoration: TextDecoration.underline, | ||
| 86 | + fontSize: font(16), | ||
| 87 | + color: MyColours.color_438E93), | ||
| 88 | + )), | ||
| 89 | + HEmptyView(32), | ||
| 90 | + InkWell( | ||
| 91 | + onTap: () { | ||
| 92 | + //已经传到服务器,弹提醒窗口,是否删除 | ||
| 93 | + //修改之前有内容,则弹框 | ||
| 94 | + DialogUtil.cupertinoAlertDialogFeast(context, | ||
| 95 | + rTitle: '删除', | ||
| 96 | + title: "是否确认删除", | ||
| 97 | + content: "满月宴", lCallback: () { | ||
| 98 | + print("取消"); | ||
| 99 | + }, rCallback: () { | ||
| 100 | + print("确定"); | ||
| 101 | + // widget.deleteCallback(index); | ||
| 102 | + }); | ||
| 103 | + }, | ||
| 104 | + child: Image.asset( | ||
| 105 | + Utils.getImgPath(true ? 'f_delete_red_un' : 'f_delete_red'), | ||
| 106 | + width: w(32), | ||
| 107 | + height: w(32), | ||
| 108 | + )), | ||
| 109 | + HEmptyView(32), | ||
| 110 | + ], | ||
| 111 | + ), | ||
| 112 | + ); | ||
| 113 | + } | ||
| 114 | + | ||
| 115 | + @override | ||
| 116 | + Widget build(BuildContext context) { | ||
| 117 | + return Scaffold( | ||
| 118 | + backgroundColor: MyColours.color_ffffff, | ||
| 119 | + appBar: SystemAppBar( | ||
| 120 | + '宴会类型', | ||
| 121 | + needWhite: true, | ||
| 122 | + bgColor: MyColours.color_438E93, | ||
| 123 | + titleColor: MyColours.color_F6F6F6, | ||
| 124 | + onTap: () { | ||
| 125 | + Navigator.pop(context); | ||
| 126 | + }, | ||
| 127 | + ), | ||
| 128 | + body: NestedScrollView( | ||
| 129 | + // controller: _scrollViewController, | ||
| 130 | + headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) { | ||
| 131 | + return <Widget>[ | ||
| 132 | + SliverAppBar( | ||
| 133 | + pinned: true, | ||
| 134 | + floating: false, | ||
| 135 | + leading: null, | ||
| 136 | + backgroundColor: MyColours.color_ffffff, | ||
| 137 | + expandedHeight: ScreenUtil().setWidth(56 * 2), | ||
| 138 | + automaticallyImplyLeading: false, | ||
| 139 | + title: buildFeastTypeHeader(), | ||
| 140 | + // flexibleSpace: FlexibleSpaceBar( | ||
| 141 | + // collapseMode: CollapseMode.pin, | ||
| 142 | + // title: buildFeastTypeHeader()) | ||
| 143 | + ) | ||
| 144 | + ]; | ||
| 145 | + }, | ||
| 146 | + body: ListView.builder( | ||
| 147 | + itemCount: 100, | ||
| 148 | + padding: EdgeInsets.only(left: w(16)), | ||
| 149 | + itemBuilder: (BuildContext context, int index) { | ||
| 150 | + return buildFeastTypeItem('公司年会'); | ||
| 151 | + }), | ||
| 152 | + ), | ||
| 153 | + ); | ||
| 154 | + } | ||
| 155 | +} |
| @@ -425,53 +425,54 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { | @@ -425,53 +425,54 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { | ||
| 425 | color: MyColours.color_f3f3f3, | 425 | color: MyColours.color_f3f3f3, |
| 426 | ), | 426 | ), |
| 427 | InkWell( | 427 | InkWell( |
| 428 | - onTap:(){ | ||
| 429 | - | ||
| 430 | - NavigatorUtil.goSmsManagePage(context, | ||
| 431 | - smsInfoData: smsInfoData); | ||
| 432 | - | ||
| 433 | - }, | 428 | + onTap: () { |
| 429 | + NavigatorUtil.goSmsManagePage(context, | ||
| 430 | + smsInfoData: smsInfoData); | ||
| 431 | + }, | ||
| 434 | child: Column( | 432 | child: Column( |
| 435 | - mainAxisAlignment: MainAxisAlignment.center, | ||
| 436 | - children: [ | ||
| 437 | - Row( | 433 | + mainAxisAlignment: MainAxisAlignment.center, |
| 438 | children: [ | 434 | children: [ |
| 439 | - Text( | ||
| 440 | - myModel.smsInfo.isNotEmpty | ||
| 441 | - ? '${myModel.smsInfo}' | ||
| 442 | - : '0', | ||
| 443 | - style: TextStyle( | ||
| 444 | - fontWeight: FontWeight.bold, | ||
| 445 | - color: MyColours.color_515151, | ||
| 446 | - fontSize: ScreenUtil().setSp(40)), | 435 | + Row( |
| 436 | + children: [ | ||
| 437 | + Text( | ||
| 438 | + myModel.smsInfo.isNotEmpty | ||
| 439 | + ? '${myModel.smsInfo}' | ||
| 440 | + : '0', | ||
| 441 | + style: TextStyle( | ||
| 442 | + fontWeight: FontWeight.bold, | ||
| 443 | + color: MyColours.color_515151, | ||
| 444 | + fontSize: | ||
| 445 | + ScreenUtil().setSp(40)), | ||
| 446 | + ), | ||
| 447 | + Text( | ||
| 448 | + '条', | ||
| 449 | + style: TextStyle( | ||
| 450 | + fontWeight: FontWeight.bold, | ||
| 451 | + color: MyColours.color_515151, | ||
| 452 | + fontSize: | ||
| 453 | + ScreenUtil().setSp(22)), | ||
| 454 | + ) | ||
| 455 | + ], | ||
| 447 | ), | 456 | ), |
| 448 | - Text( | ||
| 449 | - '条', | ||
| 450 | - style: TextStyle( | ||
| 451 | - fontWeight: FontWeight.bold, | ||
| 452 | - color: MyColours.color_515151, | ||
| 453 | - fontSize: ScreenUtil().setSp(22)), | ||
| 454 | - ) | 457 | + VEmptyView(8), |
| 458 | + RoundButton( | ||
| 459 | + text: '充值短信', | ||
| 460 | + gradientStart: MyColours.color_438E93, | ||
| 461 | + gradientEnd: MyColours.color_438E93, | ||
| 462 | + borderColor: MyColours.color_438E93, | ||
| 463 | + width: ScreenUtil().setWidth(48 * 2), | ||
| 464 | + height: ScreenUtil().setWidth(18 * 2), | ||
| 465 | + fontSize: 20, | ||
| 466 | + isBold: true, | ||
| 467 | + textColor: MyColours.color_ffffff, | ||
| 468 | + radius: ScreenUtil().setWidth(8), | ||
| 469 | + onPressed: () { | ||
| 470 | + NavigatorUtil.goSmsManagePage( | ||
| 471 | + context, | ||
| 472 | + smsInfoData: smsInfoData); | ||
| 473 | + }) | ||
| 455 | ], | 474 | ], |
| 456 | - ), | ||
| 457 | - VEmptyView(8), | ||
| 458 | - RoundButton( | ||
| 459 | - text: '充值短信', | ||
| 460 | - gradientStart: MyColours.color_438E93, | ||
| 461 | - gradientEnd: MyColours.color_438E93, | ||
| 462 | - borderColor: MyColours.color_438E93, | ||
| 463 | - width: ScreenUtil().setWidth(48 * 2), | ||
| 464 | - height: ScreenUtil().setWidth(18 * 2), | ||
| 465 | - fontSize: 20, | ||
| 466 | - isBold: true, | ||
| 467 | - textColor: MyColours.color_ffffff, | ||
| 468 | - radius: ScreenUtil().setWidth(8), | ||
| 469 | - onPressed: () { | ||
| 470 | - NavigatorUtil.goSmsManagePage(context, | ||
| 471 | - smsInfoData: smsInfoData); | ||
| 472 | - }) | ||
| 473 | - ], | ||
| 474 | - )), | 475 | + )), |
| 475 | MyDivider( | 476 | MyDivider( |
| 476 | ScreenUtil().setWidth(2), | 477 | ScreenUtil().setWidth(2), |
| 477 | ScreenUtil().setWidth(32 * 2), | 478 | ScreenUtil().setWidth(32 * 2), |
| @@ -656,6 +657,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { | @@ -656,6 +657,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { | ||
| 656 | vertical: ScreenUtil().setWidth(20)), | 657 | vertical: ScreenUtil().setWidth(20)), |
| 657 | child: Container( | 658 | child: Container( |
| 658 | padding: EdgeInsets.symmetric( | 659 | padding: EdgeInsets.symmetric( |
| 660 | + horizontal: ScreenUtil().setWidth(24 * 2), | ||
| 659 | vertical: ScreenUtil().setWidth(19 * 2)), | 661 | vertical: ScreenUtil().setWidth(19 * 2)), |
| 660 | decoration: BoxDecoration( | 662 | decoration: BoxDecoration( |
| 661 | color: MyColours.color_ffffff, | 663 | color: MyColours.color_ffffff, |
| @@ -665,7 +667,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { | @@ -665,7 +667,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { | ||
| 665 | children: [ | 667 | children: [ |
| 666 | Row( | 668 | Row( |
| 667 | mainAxisAlignment: | 669 | mainAxisAlignment: |
| 668 | - MainAxisAlignment.spaceEvenly, | 670 | + MainAxisAlignment.spaceBetween, |
| 669 | children: [ | 671 | children: [ |
| 670 | InkWell( | 672 | InkWell( |
| 671 | onTap: () async { | 673 | onTap: () async { |
| @@ -752,7 +754,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { | @@ -752,7 +754,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { | ||
| 752 | VEmptyView(68), | 754 | VEmptyView(68), |
| 753 | Row( | 755 | Row( |
| 754 | mainAxisAlignment: | 756 | mainAxisAlignment: |
| 755 | - MainAxisAlignment.spaceEvenly, | 757 | + MainAxisAlignment.spaceBetween, |
| 756 | children: [ | 758 | children: [ |
| 757 | InkWell( | 759 | InkWell( |
| 758 | onTap: () { | 760 | onTap: () { |
| @@ -808,6 +810,26 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { | @@ -808,6 +810,26 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { | ||
| 808 | '包间置满', | 810 | '包间置满', |
| 809 | isRowLow: isRoleLowNoManage)) | 811 | isRowLow: isRoleLowNoManage)) |
| 810 | ], | 812 | ], |
| 813 | + ), | ||
| 814 | + VEmptyView(68), | ||
| 815 | + Row( | ||
| 816 | + mainAxisAlignment: | ||
| 817 | + MainAxisAlignment.spaceBetween, | ||
| 818 | + children: [ | ||
| 819 | + InkWell( | ||
| 820 | + onTap: () { | ||
| 821 | + if (!isRoleLowNoManage) { | ||
| 822 | + NavigatorUtil.goFeastManageHomePage( | ||
| 823 | + context); | ||
| 824 | + } | ||
| 825 | + }, | ||
| 826 | + child: _item( | ||
| 827 | + isRoleLowNoManage | ||
| 828 | + ? Utils.getImgPath('yhgl_un') | ||
| 829 | + : Utils.getImgPath('yhgl'), | ||
| 830 | + '宴会管理', | ||
| 831 | + isRowLow: isRoleLowNoManage)), | ||
| 832 | + ], | ||
| 811 | ) | 833 | ) |
| 812 | ], | 834 | ], |
| 813 | ))), | 835 | ))), |
| @@ -528,14 +528,15 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> { | @@ -528,14 +528,15 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> { | ||
| 528 | '发票抬头', | 528 | '发票抬头', |
| 529 | _onlineCheckEditProvider.orderInfoSunModel != null | 529 | _onlineCheckEditProvider.orderInfoSunModel != null |
| 530 | ? _onlineCheckEditProvider | 530 | ? _onlineCheckEditProvider |
| 531 | - .orderInfoSunModel.invoice.title | 531 | + .orderInfoSunModel.invoice?.title ?? |
| 532 | + '' | ||
| 532 | : '', | 533 | : '', |
| 533 | fontsize: 20), | 534 | fontsize: 20), |
| 534 | Offstage( | 535 | Offstage( |
| 535 | offstage: _onlineCheckEditProvider.orderInfoSunModel != null | 536 | offstage: _onlineCheckEditProvider.orderInfoSunModel != null |
| 536 | ? _onlineCheckEditProvider | 537 | ? _onlineCheckEditProvider |
| 537 | - .orderInfoSunModel.invoice.taxnumber == | ||
| 538 | - '' | 538 | + .orderInfoSunModel.invoice?.taxnumber ?? |
| 539 | + '' == '' | ||
| 539 | : true, | 540 | : true, |
| 540 | child: Padding( | 541 | child: Padding( |
| 541 | padding: EdgeInsets.only(top: ScreenUtil().setWidth(24)), | 542 | padding: EdgeInsets.only(top: ScreenUtil().setWidth(24)), |
| @@ -543,7 +544,7 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> { | @@ -543,7 +544,7 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> { | ||
| 543 | '税号', | 544 | '税号', |
| 544 | _onlineCheckEditProvider.orderInfoSunModel != null | 545 | _onlineCheckEditProvider.orderInfoSunModel != null |
| 545 | ? _onlineCheckEditProvider | 546 | ? _onlineCheckEditProvider |
| 546 | - .orderInfoSunModel.invoice.taxnumber | 547 | + .orderInfoSunModel.invoice?.taxnumber ??'' |
| 547 | : '', | 548 | : '', |
| 548 | fontsize: 20), | 549 | fontsize: 20), |
| 549 | ), | 550 | ), |
| @@ -551,7 +552,7 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> { | @@ -551,7 +552,7 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> { | ||
| 551 | Offstage( | 552 | Offstage( |
| 552 | offstage: _onlineCheckEditProvider.orderInfoSunModel != null | 553 | offstage: _onlineCheckEditProvider.orderInfoSunModel != null |
| 553 | ? _onlineCheckEditProvider | 554 | ? _onlineCheckEditProvider |
| 554 | - .orderInfoSunModel.invoice.companyaddress == | 555 | + .orderInfoSunModel.invoice?.companyaddress ??'' == |
| 555 | '' | 556 | '' |
| 556 | : true, | 557 | : true, |
| 557 | child: Padding( | 558 | child: Padding( |
| @@ -560,7 +561,7 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> { | @@ -560,7 +561,7 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> { | ||
| 560 | '地址', | 561 | '地址', |
| 561 | _onlineCheckEditProvider.orderInfoSunModel != null | 562 | _onlineCheckEditProvider.orderInfoSunModel != null |
| 562 | ? _onlineCheckEditProvider | 563 | ? _onlineCheckEditProvider |
| 563 | - .orderInfoSunModel.invoice.companyaddress | 564 | + .orderInfoSunModel.invoice?.companyaddress ??'' |
| 564 | : '', | 565 | : '', |
| 565 | fontsize: 20), | 566 | fontsize: 20), |
| 566 | ), | 567 | ), |
| @@ -568,7 +569,7 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> { | @@ -568,7 +569,7 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> { | ||
| 568 | Offstage( | 569 | Offstage( |
| 569 | offstage: _onlineCheckEditProvider.orderInfoSunModel != null | 570 | offstage: _onlineCheckEditProvider.orderInfoSunModel != null |
| 570 | ? _onlineCheckEditProvider | 571 | ? _onlineCheckEditProvider |
| 571 | - .orderInfoSunModel.invoice.telephone == | 572 | + .orderInfoSunModel.invoice?.telephone ??'' == |
| 572 | '' | 573 | '' |
| 573 | : true, | 574 | : true, |
| 574 | child: Padding( | 575 | child: Padding( |
| @@ -577,7 +578,7 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> { | @@ -577,7 +578,7 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> { | ||
| 577 | '电话', | 578 | '电话', |
| 578 | _onlineCheckEditProvider.orderInfoSunModel != null | 579 | _onlineCheckEditProvider.orderInfoSunModel != null |
| 579 | ? _onlineCheckEditProvider | 580 | ? _onlineCheckEditProvider |
| 580 | - .orderInfoSunModel.invoice.telephone | 581 | + .orderInfoSunModel.invoice?.telephone ??'' |
| 581 | : '', | 582 | : '', |
| 582 | fontsize: 20), | 583 | fontsize: 20), |
| 583 | ), | 584 | ), |
| @@ -585,7 +586,7 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> { | @@ -585,7 +586,7 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> { | ||
| 585 | Offstage( | 586 | Offstage( |
| 586 | offstage: _onlineCheckEditProvider.orderInfoSunModel != null | 587 | offstage: _onlineCheckEditProvider.orderInfoSunModel != null |
| 587 | ? _onlineCheckEditProvider | 588 | ? _onlineCheckEditProvider |
| 588 | - .orderInfoSunModel.invoice.bankname == | 589 | + .orderInfoSunModel.invoice?.bankname ??'' == |
| 589 | '' | 590 | '' |
| 590 | : true, | 591 | : true, |
| 591 | child: Padding( | 592 | child: Padding( |
| @@ -594,7 +595,7 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> { | @@ -594,7 +595,7 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> { | ||
| 594 | '开户行', | 595 | '开户行', |
| 595 | _onlineCheckEditProvider.orderInfoSunModel != null | 596 | _onlineCheckEditProvider.orderInfoSunModel != null |
| 596 | ? _onlineCheckEditProvider | 597 | ? _onlineCheckEditProvider |
| 597 | - .orderInfoSunModel.invoice.bankname | 598 | + .orderInfoSunModel.invoice?.bankname ??'' |
| 598 | : '', | 599 | : '', |
| 599 | fontsize: 20), | 600 | fontsize: 20), |
| 600 | ), | 601 | ), |
| @@ -602,7 +603,7 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> { | @@ -602,7 +603,7 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> { | ||
| 602 | Offstage( | 603 | Offstage( |
| 603 | offstage: _onlineCheckEditProvider.orderInfoSunModel != null | 604 | offstage: _onlineCheckEditProvider.orderInfoSunModel != null |
| 604 | ? _onlineCheckEditProvider | 605 | ? _onlineCheckEditProvider |
| 605 | - .orderInfoSunModel.invoice.bankaccount == | 606 | + .orderInfoSunModel.invoice?.bankaccount ??'' == |
| 606 | '' | 607 | '' |
| 607 | : true, | 608 | : true, |
| 608 | child: Padding( | 609 | child: Padding( |
| @@ -611,7 +612,7 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> { | @@ -611,7 +612,7 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> { | ||
| 611 | '账号', | 612 | '账号', |
| 612 | _onlineCheckEditProvider.orderInfoSunModel != null | 613 | _onlineCheckEditProvider.orderInfoSunModel != null |
| 613 | ? _onlineCheckEditProvider | 614 | ? _onlineCheckEditProvider |
| 614 | - .orderInfoSunModel.invoice.bankaccount | 615 | + .orderInfoSunModel.invoice?.bankaccount ??'' |
| 615 | : '', | 616 | : '', |
| 616 | fontsize: 20), | 617 | fontsize: 20), |
| 617 | ), | 618 | ), |
| 1 | import 'package:flutter/material.dart'; | 1 | import 'package:flutter/material.dart'; |
| 2 | 2 | ||
| 3 | class MyColours { | 3 | class MyColours { |
| 4 | + static const Color color_66000000 = Color(0x66000000); | ||
| 4 | static const Color color_00A870 = Color(0xff00A870); | 5 | static const Color color_00A870 = Color(0xff00A870); |
| 5 | static const Color color_F6F6F6 = Color(0xffF6F6F6); | 6 | static const Color color_F6F6F6 = Color(0xffF6F6F6); |
| 6 | static const Color color_E6000000 = Color(0xE6000000); | 7 | static const Color color_E6000000 = Color(0xE6000000); |
| @@ -893,4 +893,24 @@ class NavigatorUtil { | @@ -893,4 +893,24 @@ class NavigatorUtil { | ||
| 893 | return _navigateTo(context, "${Routes.feast_invoice_page}", | 893 | return _navigateTo(context, "${Routes.feast_invoice_page}", |
| 894 | replace: replace); | 894 | replace: replace); |
| 895 | } | 895 | } |
| 896 | + | ||
| 897 | + ///宴会----宴会管理 | ||
| 898 | + static Future<dynamic> goFeastManageHomePage(BuildContext context, | ||
| 899 | + {replace = false, bool onlyShow = false}) { | ||
| 900 | + return _navigateTo(context, "${Routes.feast_manage_home_page}", | ||
| 901 | + replace: replace); | ||
| 902 | + } | ||
| 903 | + | ||
| 904 | + ///宴会----宴会管理 --- 宴会类型 | ||
| 905 | + static Future<dynamic> goFeasTypePage(BuildContext context, | ||
| 906 | + {replace = false, bool onlyShow = false}) { | ||
| 907 | + return _navigateTo(context, "${Routes.feast_type_page}", replace: replace); | ||
| 908 | + } | ||
| 909 | + | ||
| 910 | + ///宴会----宴会管理 --- 宴会员工 | ||
| 911 | + static Future<dynamic> goFeastPersonalPage(BuildContext context, | ||
| 912 | + {replace = false, bool onlyShow = false}) { | ||
| 913 | + return _navigateTo(context, "${Routes.feast_personal_page}", | ||
| 914 | + replace: replace); | ||
| 915 | + } | ||
| 896 | } | 916 | } |
| @@ -77,6 +77,7 @@ import 'package:one_key/pages/my/customer_type/store_customer/make_marking_page. | @@ -77,6 +77,7 @@ import 'package:one_key/pages/my/customer_type/store_customer/make_marking_page. | ||
| 77 | import 'package:one_key/pages/my/customer_type/store_customer/marketing_records_detail_page.dart'; | 77 | import 'package:one_key/pages/my/customer_type/store_customer/marketing_records_detail_page.dart'; |
| 78 | import 'package:one_key/pages/my/customer_type/store_customer/marketing_records_page.dart'; | 78 | import 'package:one_key/pages/my/customer_type/store_customer/marketing_records_page.dart'; |
| 79 | import 'package:one_key/pages/my/customer_type/store_customer/store_customer_page.dart'; | 79 | import 'package:one_key/pages/my/customer_type/store_customer/store_customer_page.dart'; |
| 80 | +import 'package:one_key/pages/my/feast_manage/feast_personal_page.dart'; | ||
| 80 | import 'package:one_key/pages/my/personnel_type/base_info_personnal_page.dart'; | 81 | import 'package:one_key/pages/my/personnel_type/base_info_personnal_page.dart'; |
| 81 | import 'package:one_key/pages/my/personnel_type/personnel_detail_page.dart'; | 82 | import 'package:one_key/pages/my/personnel_type/personnel_detail_page.dart'; |
| 82 | import 'package:one_key/pages/my/personnel_type/personnel_manage_page.dart'; | 83 | import 'package:one_key/pages/my/personnel_type/personnel_manage_page.dart'; |
| @@ -149,6 +150,8 @@ import '../pages/feast/feast_menu_page.dart'; | @@ -149,6 +150,8 @@ import '../pages/feast/feast_menu_page.dart'; | ||
| 149 | import '../pages/feast/feast_set_page.dart'; | 150 | import '../pages/feast/feast_set_page.dart'; |
| 150 | import '../pages/feast/feast_setmeal_page.dart'; | 151 | import '../pages/feast/feast_setmeal_page.dart'; |
| 151 | import '../pages/feast/feast_wine_page.dart'; | 152 | import '../pages/feast/feast_wine_page.dart'; |
| 153 | +import '../pages/my/feast_manage/feast_manage_home_page.dart'; | ||
| 154 | +import '../pages/my/feast_manage/feast_type_page.dart'; | ||
| 152 | import '../provider/feast_model.dart'; | 155 | import '../provider/feast_model.dart'; |
| 153 | 156 | ||
| 154 | // 登录页 | 157 | // 登录页 |
| @@ -1406,3 +1409,33 @@ var feastInvoicePageHandle = new Handler( | @@ -1406,3 +1409,33 @@ var feastInvoicePageHandle = new Handler( | ||
| 1406 | return ChangeNotifierProvider<FeastModel>( | 1409 | return ChangeNotifierProvider<FeastModel>( |
| 1407 | create: (_) => FeastModel(), child: FeastInvoicePage()); | 1410 | create: (_) => FeastModel(), child: FeastInvoicePage()); |
| 1408 | }); | 1411 | }); |
| 1412 | + | ||
| 1413 | +///宴会---宴会管理 | ||
| 1414 | +var feastManageHomePageHandle = new Handler( | ||
| 1415 | + handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) { | ||
| 1416 | + // String uids = params["uids"].first; | ||
| 1417 | + | ||
| 1418 | + // bool onlyShow = FluroConvertUtils.string2bool(params["onlyShow"].first); | ||
| 1419 | + return ChangeNotifierProvider<FeastModel>( | ||
| 1420 | + create: (_) => FeastModel(), child: FeastManageHomePage()); | ||
| 1421 | +}); | ||
| 1422 | + | ||
| 1423 | +///宴会---宴会类型 | ||
| 1424 | +var feastTypePageHandle = new Handler( | ||
| 1425 | + handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) { | ||
| 1426 | + // String uids = params["uids"].first; | ||
| 1427 | + | ||
| 1428 | + // bool onlyShow = FluroConvertUtils.string2bool(params["onlyShow"].first); | ||
| 1429 | + return ChangeNotifierProvider<FeastModel>( | ||
| 1430 | + create: (_) => FeastModel(), child: FeastTypePage()); | ||
| 1431 | +}); | ||
| 1432 | + | ||
| 1433 | +///宴会---宴会员工 | ||
| 1434 | +var feastPersonalPageHandle = new Handler( | ||
| 1435 | + handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) { | ||
| 1436 | + // String uids = params["uids"].first; | ||
| 1437 | + | ||
| 1438 | + // bool onlyShow = FluroConvertUtils.string2bool(params["onlyShow"].first); | ||
| 1439 | + return ChangeNotifierProvider<FeastModel>( | ||
| 1440 | + create: (_) => FeastModel(), child: FeastPersonalPage()); | ||
| 1441 | +}); |
| @@ -123,6 +123,12 @@ class Routes { | @@ -123,6 +123,12 @@ class Routes { | ||
| 123 | static String feast_wine_page = "/feast_wine_page"; //宴会----添加酒水 | 123 | static String feast_wine_page = "/feast_wine_page"; //宴会----添加酒水 |
| 124 | static String feast_set_page = "/feast_set_page"; //宴会----添加配置 | 124 | static String feast_set_page = "/feast_set_page"; //宴会----添加配置 |
| 125 | static String feast_invoice_page = "/feast_invoice_page"; //宴会----添加发票 | 125 | static String feast_invoice_page = "/feast_invoice_page"; //宴会----添加发票 |
| 126 | + static String feast_manage_home_page = "/feast_manage_home_page"; //宴会----宴会管理 | ||
| 127 | + static String feast_type_page = "/feast_type_page"; //宴会----宴会类型 | ||
| 128 | + static String feast_personal_page = "/feast_personal_page"; //宴会----宴会员工 | ||
| 129 | + | ||
| 130 | + | ||
| 131 | + | ||
| 126 | 132 | ||
| 127 | static void configureRoutes(FluroRouter router) { | 133 | static void configureRoutes(FluroRouter router) { |
| 128 | router.notFoundHandler = new Handler( | 134 | router.notFoundHandler = new Handler( |
| @@ -249,5 +255,13 @@ class Routes { | @@ -249,5 +255,13 @@ class Routes { | ||
| 249 | router.define(feast_wine_page, handler: feastWinePageHandle); | 255 | router.define(feast_wine_page, handler: feastWinePageHandle); |
| 250 | router.define(feast_set_page, handler: feastSetPageHandle); | 256 | router.define(feast_set_page, handler: feastSetPageHandle); |
| 251 | router.define(feast_invoice_page, handler: feastInvoicePageHandle); | 257 | router.define(feast_invoice_page, handler: feastInvoicePageHandle); |
| 258 | + router.define(feast_manage_home_page, handler: feastManageHomePageHandle); | ||
| 259 | + router.define(feast_type_page, handler: feastTypePageHandle); | ||
| 260 | +router.define(feast_personal_page, handler: feastPersonalPageHandle); | ||
| 261 | + | ||
| 262 | + | ||
| 263 | + | ||
| 264 | + | ||
| 265 | + | ||
| 252 | } | 266 | } |
| 253 | } | 267 | } |
| @@ -4698,6 +4698,78 @@ class DialogUtil { | @@ -4698,6 +4698,78 @@ class DialogUtil { | ||
| 4698 | } | 4698 | } |
| 4699 | } | 4699 | } |
| 4700 | 4700 | ||
| 4701 | + static Future cupertinoAlertDialogFeast(BuildContext context, | ||
| 4702 | + {String title = "", | ||
| 4703 | + String content = "内容", | ||
| 4704 | + String lTitle = "取消", | ||
| 4705 | + String rTitle = "确定", | ||
| 4706 | + Color rColor = MyColours.color_438E93, | ||
| 4707 | + bool isBold = false, | ||
| 4708 | + bool isBoldContent = false, | ||
| 4709 | + Color contentColor = MyColours.color_99000000, | ||
| 4710 | + VoidCallback lCallback, | ||
| 4711 | + VoidCallback rCallback}) { | ||
| 4712 | + showCupertinoDialog( | ||
| 4713 | + context: context, | ||
| 4714 | + builder: (context) { | ||
| 4715 | + return CupertinoAlertDialog( | ||
| 4716 | + title: title != '' | ||
| 4717 | + ? Text(title, | ||
| 4718 | + style: TextStyle( | ||
| 4719 | + fontWeight: FontWeight.bold, | ||
| 4720 | + fontSize: ScreenUtil().setSp(32), | ||
| 4721 | + color: MyColours.color_E6000000)) | ||
| 4722 | + : SizedBox(), | ||
| 4723 | + content: RichText( | ||
| 4724 | + textScaleFactor: 1, | ||
| 4725 | + overflow: TextOverflow.ellipsis, | ||
| 4726 | + // textDirection: TextDirection.ltr, | ||
| 4727 | + textAlign: TextAlign.center, | ||
| 4728 | + text: TextSpan( | ||
| 4729 | + children: [ | ||
| 4730 | + TextSpan( | ||
| 4731 | + text: content, | ||
| 4732 | + style: TextStyle( | ||
| 4733 | + fontWeight: FontWeight.bold, | ||
| 4734 | + fontSize: ScreenUtil().setSp(32), | ||
| 4735 | + color: MyColours.color_438E93)), | ||
| 4736 | + TextSpan( | ||
| 4737 | + text: ' ?', | ||
| 4738 | + style: TextStyle( | ||
| 4739 | + fontWeight: FontWeight.bold, | ||
| 4740 | + color: MyColours.color_E6000000, | ||
| 4741 | + fontSize: ScreenUtil().setSp(32)), | ||
| 4742 | + ), | ||
| 4743 | + ], | ||
| 4744 | + )), | ||
| 4745 | + actions: [ | ||
| 4746 | + CupertinoDialogAction( | ||
| 4747 | + child: Text(lTitle, | ||
| 4748 | + style: TextStyle( | ||
| 4749 | + fontSize: ScreenUtil().setSp(32), | ||
| 4750 | + color: MyColours.color_E6000000)), | ||
| 4751 | + onPressed: () { | ||
| 4752 | + Navigator.of(context).pop(); | ||
| 4753 | + lCallback(); | ||
| 4754 | + }, | ||
| 4755 | + ), | ||
| 4756 | + CupertinoDialogAction( | ||
| 4757 | + child: Text(rTitle, | ||
| 4758 | + style: TextStyle( | ||
| 4759 | + fontWeight: FontWeight.bold, | ||
| 4760 | + fontSize: ScreenUtil().setSp(32), | ||
| 4761 | + color: rColor)), | ||
| 4762 | + onPressed: () { | ||
| 4763 | + Navigator.of(context).pop(); | ||
| 4764 | + rCallback(); | ||
| 4765 | + }, | ||
| 4766 | + ), | ||
| 4767 | + ], | ||
| 4768 | + ); | ||
| 4769 | + }, | ||
| 4770 | + ); | ||
| 4771 | + } | ||
| 4772 | + | ||
| 4701 | static Future cupertinoAlertDialog(BuildContext context, | 4773 | static Future cupertinoAlertDialog(BuildContext context, |
| 4702 | {String title = "", | 4774 | {String title = "", |
| 4703 | String content = "内容", | 4775 | String content = "内容", |
| @@ -4725,8 +4797,7 @@ class DialogUtil { | @@ -4725,8 +4797,7 @@ class DialogUtil { | ||
| 4725 | fontWeight: | 4797 | fontWeight: |
| 4726 | isBoldContent ? FontWeight.bold : FontWeight.normal, | 4798 | isBoldContent ? FontWeight.bold : FontWeight.normal, |
| 4727 | fontSize: ScreenUtil().setSp(32), | 4799 | fontSize: ScreenUtil().setSp(32), |
| 4728 | - color: contentColor | ||
| 4729 | - )), | 4800 | + color: contentColor)), |
| 4730 | actions: [ | 4801 | actions: [ |
| 4731 | CupertinoDialogAction( | 4802 | CupertinoDialogAction( |
| 4732 | child: Text(lTitle, | 4803 | child: Text(lTitle, |
| @@ -5427,8 +5498,8 @@ class DialogUtil { | @@ -5427,8 +5498,8 @@ class DialogUtil { | ||
| 5427 | CupertinoDialogAction( | 5498 | CupertinoDialogAction( |
| 5428 | child: Text(lTitle, | 5499 | child: Text(lTitle, |
| 5429 | style: TextStyle( | 5500 | style: TextStyle( |
| 5430 | - fontSize: ScreenUtil().setSp(34), | ||
| 5431 | - color: MyColours.color_666666)), | 5501 | + fontSize: ScreenUtil().setSp(32), |
| 5502 | + color: MyColours.color_E6000000)), | ||
| 5432 | onPressed: () { | 5503 | onPressed: () { |
| 5433 | Navigator.of(context).pop(); | 5504 | Navigator.of(context).pop(); |
| 5434 | lCallback(); | 5505 | lCallback(); |
| @@ -5437,8 +5508,9 @@ class DialogUtil { | @@ -5437,8 +5508,9 @@ class DialogUtil { | ||
| 5437 | CupertinoDialogAction( | 5508 | CupertinoDialogAction( |
| 5438 | child: Text(rTitle, | 5509 | child: Text(rTitle, |
| 5439 | style: TextStyle( | 5510 | style: TextStyle( |
| 5440 | - fontSize: ScreenUtil().setSp(34), | ||
| 5441 | - color: MyColours.color_199095)), | 5511 | + fontWeight: FontWeight.bold, |
| 5512 | + fontSize: ScreenUtil().setSp(32), | ||
| 5513 | + color: MyColours.color_438E93)), | ||
| 5442 | onPressed: () { | 5514 | onPressed: () { |
| 5443 | if (name == '' || name.trim().length == 0) { | 5515 | if (name == '' || name.trim().length == 0) { |
| 5444 | Utils.showToast(toast); | 5516 | Utils.showToast(toast); |
-
Please register or login to post a comment