xt / Flutter-ReserveApp · Commits

Go to a project

Commit cb9b86d8777b7d02adfac2c7861a7b72d01c5adb

Authored by wdn127929
1 parent 5c333693
build: skipped

桌位顺序完后刷新缓存&取消预订不能取消（订金）bug 修复

Inline Side-by-side
Showing 5 changed files with 69 additions and 34 deletions
... ... @@ -40,6 +40,8 @@ PODS:
- foundation_fluttify
- device_info (0.0.1):
- Flutter
- device_utils_my (0.0.1):
- Flutter
- easy_contact_picker (0.0.1):
- Flutter
- fijkplayer (0.11.0):
... ... @@ -55,6 +57,8 @@ PODS:
- Flutter
- flutter_downloader (0.0.1):
- Flutter
- flutter_filereader (0.0.1):
- Flutter
- flutter_image_compress (1.0.0):
- Flutter
- Mantle
... ... @@ -111,7 +115,7 @@ PODS:
- Mantle/extobjc (= 2.2.0)
- Mantle/extobjc (2.2.0)
- MTBBarcodeScanner (5.0.11)
- open_file (0.0.1):
- open_filex (0.0.2):
- Flutter
- OrderedSet (5.0.0)
- package_info (0.0.1):
... ... @@ -173,6 +177,7 @@ DEPENDENCIES:
- contacts_service (from `.symlinks/plugins/contacts_service/ios`)
- core_location_fluttify (from `.symlinks/plugins/core_location_fluttify/ios`)
- device_info (from `.symlinks/plugins/device_info/ios`)
- device_utils_my (from `.symlinks/plugins/device_utils_my/ios`)
- easy_contact_picker (from `.symlinks/plugins/easy_contact_picker/ios`)
- fijkplayer (from `.symlinks/plugins/fijkplayer/ios`)
- Flutter (from `Flutter`)
... ... @@ -180,6 +185,7 @@ DEPENDENCIES:
- flutter_app_update (from `.symlinks/plugins/flutter_app_update/ios`)
- flutter_bugly (from `.symlinks/plugins/flutter_bugly/ios`)
- flutter_downloader (from `.symlinks/plugins/flutter_downloader/ios`)
- flutter_filereader (from `.symlinks/plugins/flutter_filereader/ios`)
- flutter_image_compress (from `.symlinks/plugins/flutter_image_compress/ios`)
- flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
- flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`)
... ... @@ -193,7 +199,7 @@ DEPENDENCIES:
- image_gallery_saver (from `.symlinks/plugins/image_gallery_saver/ios`)
- image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
- install_plugin (from `.symlinks/plugins/install_plugin/ios`)
- open_file (from `.symlinks/plugins/open_file/ios`)
- open_filex (from `.symlinks/plugins/open_filex/ios`)
- package_info (from `.symlinks/plugins/package_info/ios`)
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`)
- permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
... ... @@ -253,6 +259,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/core_location_fluttify/ios"
device_info:
:path: ".symlinks/plugins/device_info/ios"
device_utils_my:
:path: ".symlinks/plugins/device_utils_my/ios"
easy_contact_picker:
:path: ".symlinks/plugins/easy_contact_picker/ios"
fijkplayer:
... ... @@ -267,6 +275,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/flutter_bugly/ios"
flutter_downloader:
:path: ".symlinks/plugins/flutter_downloader/ios"
flutter_filereader:
:path: ".symlinks/plugins/flutter_filereader/ios"
flutter_image_compress:
:path: ".symlinks/plugins/flutter_image_compress/ios"
flutter_inappwebview:
... ... @@ -293,8 +303,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/image_picker_ios/ios"
install_plugin:
:path: ".symlinks/plugins/install_plugin/ios"
open_file:
:path: ".symlinks/plugins/open_file/ios"
open_filex:
:path: ".symlinks/plugins/open_filex/ios"
package_info:
:path: ".symlinks/plugins/package_info/ios"
path_provider_foundation:
... ... @@ -343,6 +353,7 @@ SPEC CHECKSUMS:
contacts_service: 849e1f84281804c8bfbec1b4c3eedcb23c5d3eca
core_location_fluttify: 9466a411ea7d22c6349c7e6a767ae4623f01eb1d
device_info: d7d233b645a32c40dfdc212de5cf646ca482f175
device_utils_my: 984d86a5e28da5960661333915cc5d2bfec80f06
easy_contact_picker: 9ab9dc70e8ddde6e76a19ffc482d7bf899868730
fijkplayer: 8b6d864948dc28e6e07248ed4fce61a7467db4df
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
... ... @@ -350,6 +361,7 @@ SPEC CHECKSUMS:
flutter_app_update: 65f61da626cb111d1b24674abc4b01728d7723bc
flutter_bugly: c9800f4d5bc5bdc27ffdde3417a26ba44266e0c3
flutter_downloader: b7301ae057deadd4b1650dc7c05375f10ff12c39
flutter_filereader: 0caefb23b8c96deca7c3679d3e61bfd8111a7d11
flutter_image_compress: 5a5e9aee05b6553048b8df1c3bc456d0afaac433
flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721
flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
... ... @@ -367,7 +379,7 @@ SPEC CHECKSUMS:
libwebp: 33dc822fbbf4503668d09f7885bbfedc76c45e96
Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
open_file: 02eb5cb6b21264bd3a696876f5afbfb7ca4f4b7d
open_filex: 6e26e659846ec990262224a12ef1c528bb4edbe4
OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
... ...
... ... @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 50;
objects = {
/* Begin PBXBuildFile section */
... ... @@ -342,10 +342,12 @@
"${BUILT_PRODUCTS_DIR}/connectivity/connectivity.framework",
"${BUILT_PRODUCTS_DIR}/contacts_service/contacts_service.framework",
"${BUILT_PRODUCTS_DIR}/device_info/device_info.framework",
"${BUILT_PRODUCTS_DIR}/device_utils_my/device_utils_my.framework",
"${BUILT_PRODUCTS_DIR}/easy_contact_picker/easy_contact_picker.framework",
"${BUILT_PRODUCTS_DIR}/flutter_app_badger/flutter_app_badger.framework",
"${BUILT_PRODUCTS_DIR}/flutter_app_update/flutter_app_update.framework",
"${BUILT_PRODUCTS_DIR}/flutter_downloader/flutter_downloader.framework",
"${BUILT_PRODUCTS_DIR}/flutter_filereader/flutter_filereader.framework",
"${BUILT_PRODUCTS_DIR}/flutter_image_compress/flutter_image_compress.framework",
"${BUILT_PRODUCTS_DIR}/flutter_inappwebview/flutter_inappwebview.framework",
"${BUILT_PRODUCTS_DIR}/flutter_keyboard_visibility/flutter_keyboard_visibility.framework",
... ... @@ -358,7 +360,7 @@
"${BUILT_PRODUCTS_DIR}/image_picker_ios/image_picker_ios.framework",
"${BUILT_PRODUCTS_DIR}/install_plugin/install_plugin.framework",
"${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework",
"${BUILT_PRODUCTS_DIR}/open_file/open_file.framework",
"${BUILT_PRODUCTS_DIR}/open_filex/open_filex.framework",
"${BUILT_PRODUCTS_DIR}/package_info/package_info.framework",
"${BUILT_PRODUCTS_DIR}/path_provider_foundation/path_provider_foundation.framework",
"${BUILT_PRODUCTS_DIR}/photo_manager/photo_manager.framework",
... ... @@ -390,10 +392,12 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/contacts_service.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_utils_my.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/easy_contact_picker.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_app_badger.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_app_update.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_downloader.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_filereader.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_image_compress.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_inappwebview.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_keyboard_visibility.framework",
... ... @@ -406,7 +410,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_picker_ios.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/install_plugin.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libwebp.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/open_file.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/open_filex.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_foundation.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/photo_manager.framework",
... ... @@ -546,7 +550,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 519;
CURRENT_PROJECT_VERSION = 5200;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -556,7 +560,10 @@
);
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
... ... @@ -694,7 +701,7 @@
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 519;
CURRENT_PROJECT_VERSION = 5200;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -704,7 +711,10 @@
);
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
... ... @@ -730,7 +740,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 519;
CURRENT_PROJECT_VERSION = 5200;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -740,7 +750,10 @@
);
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
... ...
... ... @@ -977,23 +977,27 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
}
String desc2 = '';
for (var value in depositReasonList) {
if (value['select'] == true) {
desc2 = value['title'];
if (value['title'] == '其他原因') {
desc2 =
_depositController.text.trim();
if (desc2.isEmpty) {
Utils.showToast("请填写预订订金走向");
return;
if (detailModel
.reserveDepositList.length >
0) {
for (var value in depositReasonList) {
if (value['select'] == true) {
desc2 = value['title'];
if (value['title'] == '其他原因') {
desc2 = _depositController.text
.trim();
if (desc2.isEmpty) {
Utils.showToast("请填写预订订金走向");
return;
}
}
}
}
}
if (desc2 == '') {
Utils.showToast('请选择预订订金走向');
return;
if (desc2 == '') {
Utils.showToast('请选择预订订金走向');
return;
}
}
Navigator.of(context).pop();
... ... @@ -1002,13 +1006,17 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
setReserveStatus('4',
desc: desc, phone: phone);
Map<String, String> pramas = {
'rid': widget.rid,
'cancel': desc2
};
if (detailModel
.reserveDepositList.length >
0) {
Map<String, String> pramas = {
'rid': widget.rid,
'cancel': desc2
};
await detailModel.setReserveDeposit(
context, pramas);
await detailModel.setReserveDeposit(
context, pramas);
}
}),
],
),
... ...
... ... @@ -605,6 +605,8 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
};
bool success = await tableManagerModel.sortByTable(context, params);
if (success) {
await tableManagerModel.refreshTable(context);
Utils.showToast('设置成功');
return true;
} else {
return false;
... ...
... ... @@ -166,7 +166,7 @@ class MyTableManageHomeModel with ChangeNotifier {
for (TableOuter itemto in tableOuterList) {
if (itemto.name == itemarea.name) {
itemto.orderId = itemarea.orderO;
itemto.rid = itemarea.id;
itemto.rid = itemarea.id;
}
}
}
... ...