xt / Flutter-ReserveApp · Commits

Go to a project

Commit 24d7aae51697ce8d5ce1a9a5ab571712120c20f9

Authored by wdn127929
1 parent a912a25e
build: skipped

nn

Inline Side-by-side
Showing 8 changed files with 71 additions and 21 deletions
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 archiveVersion = 1; 3 archiveVersion = 1;
4 classes = { 4 classes = {
5 }; 5 };
6 - objectVersion = 46; 6 + objectVersion = 50;
7 objects = { 7 objects = {
8 8
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
@@ -1219,6 +1219,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -1219,6 +1219,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
1219 print(widget.uid); 1219 print(widget.uid);
1220 return Scaffold( 1220 return Scaffold(
1221 resizeToAvoidBottomInset: false, 1221 resizeToAvoidBottomInset: false,
  1222 + backgroundColor: MyColours.color_ffffff,
1222 body: InkWell( 1223 body: InkWell(
1223 onTap: () { 1224 onTap: () {
1224 FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘 1225 FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘
@@ -1226,6 +1227,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -1226,6 +1227,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
1226 child: SafeArea( 1227 child: SafeArea(
1227 child: WillPopScope( 1228 child: WillPopScope(
1228 child: Scaffold( 1229 child: Scaffold(
  1230 + backgroundColor: MyColours.color_ffffff,
1229 appBar: SystemAppBar( 1231 appBar: SystemAppBar(
1230 "订座详情", 1232 "订座详情",
1231 onTap: () { 1233 onTap: () {
@@ -122,7 +122,7 @@ class SelectTableFPageState extends State<SelectTableFPage> { @@ -122,7 +122,7 @@ class SelectTableFPageState extends State<SelectTableFPage> {
122 int beginHour = int.parse(tempHour[0]); 122 int beginHour = int.parse(tempHour[0]);
123 /*获取开始分钟*/ 123 /*获取开始分钟*/
124 int beginMinute = int.parse(tempHour[1]); 124 int beginMinute = int.parse(tempHour[1]);
125 - if (beginMinute == 15) { 125 + if (beginMinute == 15) {
126 beginMinute = 30; 126 beginMinute = 30;
127 } else if (beginMinute == 45) { 127 } else if (beginMinute == 45) {
128 beginHour++; 128 beginHour++;
@@ -134,7 +134,6 @@ class SelectTableFPageState extends State<SelectTableFPage> { @@ -134,7 +134,6 @@ class SelectTableFPageState extends State<SelectTableFPage> {
134 /*获取结束分钟*/ 134 /*获取结束分钟*/
135 int endMinute = int.parse(endTemp[1]); 135 int endMinute = int.parse(endTemp[1]);
136 if (endMinute == 15) { 136 if (endMinute == 15) {
137 -  
138 endDate = '${endHour}:00'; 137 endDate = '${endHour}:00';
139 } else if (endMinute == 45) { 138 } else if (endMinute == 45) {
140 endDate = '${endHour}:30'; 139 endDate = '${endHour}:30';
@@ -187,6 +186,7 @@ class SelectTableFPageState extends State<SelectTableFPage> { @@ -187,6 +186,7 @@ class SelectTableFPageState extends State<SelectTableFPage> {
187 tableOuterList = await _chooseTableModel.getTableList(context, params, 186 tableOuterList = await _chooseTableModel.getTableList(context, params,
188 needLoading: needLoading); 187 needLoading: needLoading);
189 _chooseTableModel.tablesAll = []; 188 _chooseTableModel.tablesAll = [];
  189 + selectTables = [];
190 for (TableOuter item in tableOuterList) { 190 for (TableOuter item in tableOuterList) {
191 // if (item.name == "推荐") { 191 // if (item.name == "推荐") {
192 // itemModelList.remove(item); 192 // itemModelList.remove(item);
@@ -197,6 +197,7 @@ class SelectTableFPageState extends State<SelectTableFPage> { @@ -197,6 +197,7 @@ class SelectTableFPageState extends State<SelectTableFPage> {
197 if (item1.id == table.id) { 197 if (item1.id == table.id) {
198 item1.selected = true; 198 item1.selected = true;
199 selectNum++; 199 selectNum++;
  200 + selectTables.add(item1);
200 // if (!tableList.contains(item)) { 201 // if (!tableList.contains(item)) {
201 // tableList.add(item); 202 // tableList.add(item);
202 // } 203 // }
@@ -46,6 +46,7 @@ import '../../app.dart'; @@ -46,6 +46,7 @@ import '../../app.dart';
46 import '../../models/get_seller_info_model.dart'; 46 import '../../models/get_seller_info_model.dart';
47 import '../../provider/feast_model.dart'; 47 import '../../provider/feast_model.dart';
48 import '../../provider/store_base_info_provider.dart'; 48 import '../../provider/store_base_info_provider.dart';
  49 +import '../../utils/screen_util.dart';
49 import '../feast/feast_page.dart'; 50 import '../feast/feast_page.dart';
50 51
51 class HomePage extends StatefulWidget { 52 class HomePage extends StatefulWidget {
@@ -1077,7 +1078,9 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -1077,7 +1078,9 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
1077 right: -8, 1078 right: -8,
1078 child: _getUnMsgNumUI() 1079 child: _getUnMsgNumUI()
1079 ? Container( 1080 ? Container(
1080 - width: ScreenUtil().setWidth(36), 1081 + constraints: BoxConstraints(
  1082 + minWidth: ScreenUtil().setWidth(36)),
  1083 + padding: EdgeInsets.symmetric(horizontal: w(4)),
1081 height: ScreenUtil().setWidth(36), 1084 height: ScreenUtil().setWidth(36),
1082 margin: EdgeInsets.only( 1085 margin: EdgeInsets.only(
1083 left: ScreenUtil().setWidth(20)), 1086 left: ScreenUtil().setWidth(20)),
@@ -1120,7 +1123,9 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -1120,7 +1123,9 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
1120 right: -8, 1123 right: -8,
1121 child: _getUnMsgNumUI() 1124 child: _getUnMsgNumUI()
1122 ? Container( 1125 ? Container(
1123 - width: ScreenUtil().setWidth(36), 1126 + constraints: BoxConstraints(
  1127 + minWidth: ScreenUtil().setWidth(36)),
  1128 + padding: EdgeInsets.symmetric(horizontal: w(4)),
1124 height: ScreenUtil().setWidth(36), 1129 height: ScreenUtil().setWidth(36),
1125 margin: EdgeInsets.only( 1130 margin: EdgeInsets.only(
1126 left: ScreenUtil().setWidth(20)), 1131 left: ScreenUtil().setWidth(20)),
@@ -14,6 +14,7 @@ import 'package:one_key/utils/utils.dart'; @@ -14,6 +14,7 @@ import 'package:one_key/utils/utils.dart';
14 import 'package:one_key/widgets/app_bar.dart'; 14 import 'package:one_key/widgets/app_bar.dart';
15 import 'package:one_key/widgets/v_empty_view.dart'; 15 import 'package:one_key/widgets/v_empty_view.dart';
16 import 'package:provider/provider.dart'; 16 import 'package:provider/provider.dart';
  17 +import '../../utils/screen_util.dart';
17 import 'message_online_page.dart'; 18 import 'message_online_page.dart';
18 import 'message_order_page.dart'; 19 import 'message_order_page.dart';
19 20
@@ -45,14 +46,6 @@ class MessagePageState extends State<MessagePage> @@ -45,14 +46,6 @@ class MessagePageState extends State<MessagePage>
45 super.initState(); 46 super.initState();
46 tabController = TabController(length: 2, vsync: this); 47 tabController = TabController(length: 2, vsync: this);
47 48
48 - tabController.addListener(() {  
49 - //点击tab时或滑动tab回调一次  
50 - // if (tabController.index.toDouble() == tabController.animation.value) {  
51 - // getMessage(index: tabController.index);  
52 - // selectIndex = tabController.index;  
53 - setState(() {});  
54 - // }  
55 - });  
56 WidgetsBinding.instance.addPostFrameCallback((timeStamp) { 49 WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
57 // getMessage(index: 0); 50 // getMessage(index: 0);
58 }); 51 });
@@ -65,6 +58,14 @@ class MessagePageState extends State<MessagePage> @@ -65,6 +58,14 @@ class MessagePageState extends State<MessagePage>
65 messageModel.removeUntreatedMessageByMid(args.toString()); 58 messageModel.removeUntreatedMessageByMid(args.toString());
66 messageDialogModel.removeMessage(args.toString()); 59 messageDialogModel.removeMessage(args.toString());
67 }); 60 });
  61 + tabController.addListener(() {
  62 + //点击tab时或滑动tab回调一次
  63 + // if (tabController.index.toDouble() == tabController.animation.value) {
  64 + // getMessage(index: tabController.index);
  65 + // selectIndex = tabController.index;
  66 + setState(() {});
  67 + // }
  68 + });
68 } 69 }
69 70
70 //三种分类各自的未读消息数目 71 //三种分类各自的未读消息数目
@@ -214,8 +215,12 @@ class MessagePageState extends State<MessagePage> @@ -214,8 +215,12 @@ class MessagePageState extends State<MessagePage>
214 )), 215 )),
215 messageModel.allUnNum > 0 216 messageModel.allUnNum > 0
216 ? Container( 217 ? Container(
217 - width: ScreenUtil().setWidth(36), 218 + // width: ScreenUtil().setWidth(36),
  219 + constraints: BoxConstraints(
  220 + minWidth: ScreenUtil().setWidth(36)),
218 height: ScreenUtil().setWidth(36), 221 height: ScreenUtil().setWidth(36),
  222 + padding:
  223 + EdgeInsets.symmetric(horizontal: w(4)),
219 margin: EdgeInsets.only( 224 margin: EdgeInsets.only(
220 left: ScreenUtil().setWidth(20)), 225 left: ScreenUtil().setWidth(20)),
221 decoration: BoxDecoration( 226 decoration: BoxDecoration(
@@ -643,7 +643,40 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -643,7 +643,40 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
643 isBold: true, 643 isBold: true,
644 textColor: MyColours.color_ffffff, 644 textColor: MyColours.color_ffffff,
645 radius: ScreenUtil().setWidth(8), 645 radius: ScreenUtil().setWidth(8),
646 - onPressed: () {}) 646 + onPressed: () {
  647 + if (outDay != '') {
  648 + if (outDay == '0') {
  649 + DialogUtil
  650 + .cupertinoAlertSellerHasEdateDialog(
  651 + context,
  652 + title: '温馨提示',
  653 + isBold: true,
  654 + lCallback: () {
  655 + NavigatorUtil.goHomePage(
  656 + context,
  657 + initialIndex: 4);
  658 + },
  659 + rCallback: () {
  660 + //立即续费
  661 + },
  662 + );
  663 + } else {
  664 + DialogUtil
  665 + .cupertinoAlertSellerEdateDialog(
  666 + context,
  667 + title: '温馨提示',
  668 + isBold: true,
  669 + content: DateUtil.formatDate(
  670 + edate,
  671 + format: DateFormats.full,
  672 + ),
  673 + rCallback: () {
  674 + //立即续费
  675 + },
  676 + );
  677 + }
  678 + }
  679 + })
647 ], 680 ],
648 )) 681 ))
649 ], 682 ],
@@ -1272,7 +1272,7 @@ class Utils { @@ -1272,7 +1272,7 @@ class Utils {
1272 // "pack-cookbook/pages/success?rid=$rid&identity=2&hasOnlyShow=1"; 1272 // "pack-cookbook/pages/success?rid=$rid&identity=2&hasOnlyShow=1";
1273 print(data); 1273 print(data);
1274 String _path = 1274 String _path =
1275 - "pack-cookbook/pages/success_new?cookbooklist=${json.encode(data)}&hasSuccess=1&oid=$oid&rid=$rid&identity=2&hasOnlyShow=1&sellerName=${Provider.of<UserModel>(context, listen: false).user.sellername}&sid=${Provider.of<UserModel>(context, listen: false).user.sellerid}&type=2&priceSum=${priceSum}&memberPriceSum=${memberPriceSum}&planPriceSum=${planPriceSum}&remark=${remark}&name=${name}&address=${address}&service=${service}"; 1275 + "pack-cookbook/pages/success_new?cookbooklist=${json.encode(data)}&hasSuccess=1&oid=$oid&rid=$rid&identity=1&hasOnlyShow=1&sellerName=${Provider.of<UserModel>(context, listen: false).user.sellername}&sid=${Provider.of<UserModel>(context, listen: false).user.sellerid}&type=2&priceSum=${priceSum}&memberPriceSum=${memberPriceSum}&planPriceSum=${planPriceSum}&remark=${remark}&name=${name}&address=${address}&service=${service}";
1276 String _description = "OneKey"; 1276 String _description = "OneKey";
1277 // Uint8List source = await testComporessList(context, _thumbnail); 1277 // Uint8List source = await testComporessList(context, _thumbnail);
1278 print(_path); 1278 print(_path);
@@ -1350,7 +1350,7 @@ class Utils { @@ -1350,7 +1350,7 @@ class Utils {
1350 // String _path = 1350 // String _path =
1351 // "pack-cookbook/pages/success?rid=$rid&identity=2&hasOnlyShow=1"; 1351 // "pack-cookbook/pages/success?rid=$rid&identity=2&hasOnlyShow=1";
1352 String _path = 1352 String _path =
1353 - "pack-cookbook/pages/success_new?hasSuccess=1&oid=$oid&rid=$rid&identity=2&hasOnlyShow=1&sellerName=${Provider.of<UserModel>(context, listen: false).user.sellername}&sid=${Provider.of<UserModel>(context, listen: false).user.sellerid}&type=1"; 1353 + "pack-cookbook/pages/success_new?hasSuccess=1&oid=$oid&rid=$rid&identity=1&hasOnlyShow=1&sellerName=${Provider.of<UserModel>(context, listen: false).user.sellername}&sid=${Provider.of<UserModel>(context, listen: false).user.sellerid}&type=1";
1354 String _description = "OneKey"; 1354 String _description = "OneKey";
1355 // Uint8List source = await testComporessList(context, _thumbnail); 1355 // Uint8List source = await testComporessList(context, _thumbnail);
1356 var model = new WeChatShareMiniProgramModel( 1356 var model = new WeChatShareMiniProgramModel(
@@ -40,10 +40,14 @@ class SystemAppBar extends StatelessWidget implements PreferredSizeWidget { @@ -40,10 +40,14 @@ class SystemAppBar extends StatelessWidget implements PreferredSizeWidget {
40 () { 40 () {
41 Navigator.pop(context); 41 Navigator.pop(context);
42 }, 42 },
43 - child: Padding(  
44 - padding: EdgeInsets.symmetric(  
45 - horizontal: ScreenUtil().setWidth(40),  
46 - vertical: ScreenUtil().setWidth(15)), 43 + child: Container(
  44 + // color: Colors.red,
  45 + padding: EdgeInsets.only(
  46 + // horizontal: ScreenUtil().setWidth(40),
  47 + top: ScreenUtil().setWidth(15),
  48 + bottom: ScreenUtil().setWidth(15),
  49 + left: ScreenUtil().setWidth(40),
  50 + ),
47 child: Row( 51 child: Row(
48 children: <Widget>[ 52 children: <Widget>[
49 Image.asset( 53 Image.asset(