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 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 50;
objects = {
/* Begin PBXBuildFile section */
... ...
... ... @@ -1219,6 +1219,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
print(widget.uid);
return Scaffold(
resizeToAvoidBottomInset: false,
backgroundColor: MyColours.color_ffffff,
body: InkWell(
onTap: () {
FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘
... ... @@ -1226,6 +1227,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
child: SafeArea(
child: WillPopScope(
child: Scaffold(
backgroundColor: MyColours.color_ffffff,
appBar: SystemAppBar(
"订座详情",
onTap: () {
... ...
... ... @@ -122,7 +122,7 @@ class SelectTableFPageState extends State<SelectTableFPage> {
int beginHour = int.parse(tempHour[0]);
/*获取开始分钟*/
int beginMinute = int.parse(tempHour[1]);
if (beginMinute == 15) {
if (beginMinute == 15) {
beginMinute = 30;
} else if (beginMinute == 45) {
beginHour++;
... ... @@ -134,7 +134,6 @@ class SelectTableFPageState extends State<SelectTableFPage> {
/*获取结束分钟*/
int endMinute = int.parse(endTemp[1]);
if (endMinute == 15) {
endDate = '${endHour}:00';
} else if (endMinute == 45) {
endDate = '${endHour}:30';
... ... @@ -187,6 +186,7 @@ class SelectTableFPageState extends State<SelectTableFPage> {
tableOuterList = await _chooseTableModel.getTableList(context, params,
needLoading: needLoading);
_chooseTableModel.tablesAll = [];
selectTables = [];
for (TableOuter item in tableOuterList) {
// if (item.name == "推荐") {
// itemModelList.remove(item);
... ... @@ -197,6 +197,7 @@ class SelectTableFPageState extends State<SelectTableFPage> {
if (item1.id == table.id) {
item1.selected = true;
selectNum++;
selectTables.add(item1);
// if (!tableList.contains(item)) {
// tableList.add(item);
// }
... ...
... ... @@ -46,6 +46,7 @@ import '../../app.dart';
import '../../models/get_seller_info_model.dart';
import '../../provider/feast_model.dart';
import '../../provider/store_base_info_provider.dart';
import '../../utils/screen_util.dart';
import '../feast/feast_page.dart';
class HomePage extends StatefulWidget {
... ... @@ -1077,7 +1078,9 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
right: -8,
child: _getUnMsgNumUI()
? Container(
width: ScreenUtil().setWidth(36),
constraints: BoxConstraints(
minWidth: ScreenUtil().setWidth(36)),
padding: EdgeInsets.symmetric(horizontal: w(4)),
height: ScreenUtil().setWidth(36),
margin: EdgeInsets.only(
left: ScreenUtil().setWidth(20)),
... ... @@ -1120,7 +1123,9 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
right: -8,
child: _getUnMsgNumUI()
? Container(
width: ScreenUtil().setWidth(36),
constraints: BoxConstraints(
minWidth: ScreenUtil().setWidth(36)),
padding: EdgeInsets.symmetric(horizontal: w(4)),
height: ScreenUtil().setWidth(36),
margin: EdgeInsets.only(
left: ScreenUtil().setWidth(20)),
... ...
... ... @@ -14,6 +14,7 @@ import 'package:one_key/utils/utils.dart';
import 'package:one_key/widgets/app_bar.dart';
import 'package:one_key/widgets/v_empty_view.dart';
import 'package:provider/provider.dart';
import '../../utils/screen_util.dart';
import 'message_online_page.dart';
import 'message_order_page.dart';
... ... @@ -45,14 +46,6 @@ class MessagePageState extends State<MessagePage>
super.initState();
tabController = TabController(length: 2, vsync: this);
tabController.addListener(() {
//点击tab时或滑动tab回调一次
// if (tabController.index.toDouble() == tabController.animation.value) {
// getMessage(index: tabController.index);
// selectIndex = tabController.index;
setState(() {});
// }
});
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
// getMessage(index: 0);
});
... ... @@ -65,6 +58,14 @@ class MessagePageState extends State<MessagePage>
messageModel.removeUntreatedMessageByMid(args.toString());
messageDialogModel.removeMessage(args.toString());
});
tabController.addListener(() {
//点击tab时或滑动tab回调一次
// if (tabController.index.toDouble() == tabController.animation.value) {
// getMessage(index: tabController.index);
// selectIndex = tabController.index;
setState(() {});
// }
});
}
//三种分类各自的未读消息数目
... ... @@ -214,8 +215,12 @@ class MessagePageState extends State<MessagePage>
)),
messageModel.allUnNum > 0
? Container(
width: ScreenUtil().setWidth(36),
// width: ScreenUtil().setWidth(36),
constraints: BoxConstraints(
minWidth: ScreenUtil().setWidth(36)),
height: ScreenUtil().setWidth(36),
padding:
EdgeInsets.symmetric(horizontal: w(4)),
margin: EdgeInsets.only(
left: ScreenUtil().setWidth(20)),
decoration: BoxDecoration(
... ...
... ... @@ -643,7 +643,40 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
isBold: true,
textColor: MyColours.color_ffffff,
radius: ScreenUtil().setWidth(8),
onPressed: () {})
onPressed: () {
if (outDay != '') {
if (outDay == '0') {
DialogUtil
.cupertinoAlertSellerHasEdateDialog(
context,
title: '温馨提示',
isBold: true,
lCallback: () {
NavigatorUtil.goHomePage(
context,
initialIndex: 4);
},
rCallback: () {
//立即续费
},
);
} else {
DialogUtil
.cupertinoAlertSellerEdateDialog(
context,
title: '温馨提示',
isBold: true,
content: DateUtil.formatDate(
edate,
format: DateFormats.full,
),
rCallback: () {
//立即续费
},
);
}
}
})
],
))
],
... ...
... ... @@ -1272,7 +1272,7 @@ class Utils {
// "pack-cookbook/pages/success?rid=$rid&identity=2&hasOnlyShow=1";
print(data);
String _path =
"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}";
"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}";
String _description = "OneKey";
// Uint8List source = await testComporessList(context, _thumbnail);
print(_path);
... ... @@ -1350,7 +1350,7 @@ class Utils {
// String _path =
// "pack-cookbook/pages/success?rid=$rid&identity=2&hasOnlyShow=1";
String _path =
"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";
"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";
String _description = "OneKey";
// Uint8List source = await testComporessList(context, _thumbnail);
var model = new WeChatShareMiniProgramModel(
... ...
... ... @@ -40,10 +40,14 @@ class SystemAppBar extends StatelessWidget implements PreferredSizeWidget {
() {
Navigator.pop(context);
},
child: Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(40),
vertical: ScreenUtil().setWidth(15)),
child: Container(
// color: Colors.red,
padding: EdgeInsets.only(
// horizontal: ScreenUtil().setWidth(40),
top: ScreenUtil().setWidth(15),
bottom: ScreenUtil().setWidth(15),
left: ScreenUtil().setWidth(40),
),
child: Row(
children: <Widget>[
Image.asset(
... ...