xt / Flutter-ReserveApp · Commits

Go to a project

Commit 9bed1699f920f3d1fb1c239642e7498857cc65da

Authored by weixin_45529955
2 parents 7581b97c 8661aa12

Merge branch 'v7.3.0+' into v6.1.0+

Inline Side-by-side
Showing 7 changed files with 32 additions and 16 deletions
... ... @@ -95,6 +95,16 @@ subprojects {
}
}
}
if (project.name == 'speech_to_text') {
plugins.withId('com.android.library') {
android.compileSdk = 34
}
afterEvaluate {
if (project.hasProperty('android')) {
project.android.compileSdk = 34
}
}
}
}
subprojects {
project.evaluationDependsOn(':app')
... ...
... ... @@ -977,7 +977,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
isShowTF = false;
// paddingBottom = ScreenUtil().screenHeight.ceil() - 138 - 340;
cancelReasonList = [
{'title': '顾客取消', 'select': false},
{'title': '顾客取消', 'select': true},
{'title': '顾客行程有变', 'select': false},
{'title': '操作失误', 'select': false},
{'title': '信息填写有误', 'select': false},
... ... @@ -1313,6 +1313,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
///取消预订弹框
_showCancelWidget(context, phone) {
BuildContext pageContext = context;
_scrollController = ScrollController();
showGeneralDialog(
context: context,
... ... @@ -1613,8 +1614,9 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
print(oldInfo);
Navigator.of(context).pop();
DialogUtil.cupertinoAlertDialogCancelReseve(
context,
pageContext,
title: '',
// content1:
// '确定要将${oldInfo}的预订 变更为 ${newInfo}？',
... ... @@ -1622,8 +1624,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
lTitle: '取消',
lCallback: () {},
rTitle: '确定', rCallback: () async {
Navigator.of(context).pop();
Loading.showLoading(context);
Loading.showLoading(pageContext);
await setReserveStatus('4',
desc: desc, phone: phone);
... ... @@ -1637,7 +1638,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
};
await detailModel!.setReserveDeposit(
context, pramas);
pageContext, pramas);
}
});
}),
... ...
... ... @@ -917,7 +917,7 @@ class NoteBookPageState extends State<NoteBookPage> {
_showCancelWidget(context, NoteBookOnlySunModel notebook,
List<ReserveDepositSunModel> reserveDepositList) {
List<Map<String, dynamic>> cancelReasonList = [
{'title': '顾客取消', 'select': false},
{'title': '顾客取消', 'select': true},
{'title': '顾客行程有变', 'select': false},
{'title': '操作失误', 'select': false},
{'title': '信息填写有误', 'select': false},
... ... @@ -937,6 +937,7 @@ class NoteBookPageState extends State<NoteBookPage> {
FocusNode _cancelNode = FocusNode();
TextEditingController _cancelController = TextEditingController();
String? desc2 = '';
BuildContext pageContext = context;
showGeneralDialog(
context: context,
barrierDismissible: false,
... ... @@ -1242,8 +1243,9 @@ class NoteBookPageState extends State<NoteBookPage> {
print(oldInfo);
Navigator.of(context).pop();
DialogUtil.cupertinoAlertDialogCancelReseve(
context,
pageContext,
title: '',
// content1:
// '确定要将${oldInfo}的预订 变更为 ${newInfo}？',
... ... @@ -1251,8 +1253,7 @@ class NoteBookPageState extends State<NoteBookPage> {
lTitle: '取消',
lCallback: () {},
rTitle: '确定', rCallback: () async {
Navigator.of(context).pop();
Loading.showLoading(context);
Loading.showLoading(pageContext);
await setReserveStatus(
'4',
... ... @@ -1269,7 +1270,7 @@ class NoteBookPageState extends State<NoteBookPage> {
};
await detailModel.setReserveDeposit(
context, pramas);
pageContext, pramas);
}
});
}),
... ...
... ... @@ -4464,6 +4464,8 @@ class TableManagerPageState extends State<TableManagerPage>
child: Container(
alignment: Alignment.center,
width: double.infinity,
height: (ScreenUtil().screenWidth - w(10) - w(18)) / 4 * 0.4 +
ScreenUtil().setWidth(20),
// width: width,
// padding: padding,
// height: ScreenUtil().setWidth(height),
... ... @@ -4477,6 +4479,7 @@ class TableManagerPageState extends State<TableManagerPage>
width: w(1),
))),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
element.mname ?? '',
... ... @@ -4607,8 +4610,9 @@ class TableManagerPageState extends State<TableManagerPage>
child: Container(
// height: w(35),
height: (ScreenUtil().screenWidth - w(10) - w(18)) /
4 *
0.6,
4 *
0.6 +
ScreenUtil().setWidth(10),
padding: EdgeInsets.symmetric(
horizontal: w(10),
// vertical: ScreenUtil().setWidth(20)
... ... @@ -4646,7 +4650,7 @@ class TableManagerPageState extends State<TableManagerPage>
],
)),
)),
VEmptyView(2),
VEmptyView(5),
if (storeBaseIndoProvider.dayDateData != null)
Container(
padding: EdgeInsets.symmetric(
... ...
... ... @@ -730,7 +730,7 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim>
isShowTF = false;
// paddingBottom = ScreenUtil().screenHeight.ceil() - 138 - 340;
cancelReasonList = [
{'title': '顾客取消', 'select': false},
{'title': '顾客取消', 'select': true},
{'title': '顾客行程有变', 'select': false},
{'title': '操作失误', 'select': false},
{'title': '信息填写有误', 'select': false},
... ...
... ... @@ -98,7 +98,7 @@ class NoteBookItemFSimState extends State<NoteBookItemFSim>
// isShowTF = false;
// paddingBottom = ScreenUtil().screenHeight.ceil() - 138 - 340;
cancelReasonList = [
{'title': '顾客取消', 'select': false},
{'title': '顾客取消', 'select': true},
{'title': '顾客行程有变', 'select': false},
{'title': '信息填写有误', 'select': false},
{'title': '操作失误', 'select': false},
... ...
... ... @@ -102,7 +102,7 @@ class NoteBookItemSimpleSimState extends State<NoteBookItemSimpleSim>
// isShowTF = false;
// paddingBottom = ScreenUtil().screenHeight.ceil() - 138 - 340;
cancelReasonList = [
{'title': '顾客取消', 'select': false},
{'title': '顾客取消', 'select': true},
{'title': '顾客行程有变', 'select': false},
{'title': '信息填写有误', 'select': false},
{'title': '操作失误', 'select': false},
... ...