Commit f2ec188f1dc4a0fbf8f7122f0ef4e475b2a7ccca

Authored by wdn127929
1 parent a328b404

宴会s首页列表+宴会详情+宴会编辑+详情页丢单

Showing 84 changed files with 1251 additions and 118 deletions
... ... @@ -12,14 +12,14 @@ if (flutterRoot == null) {
}
def flutterVersionCode = "401"
def flutterVersionCode = "402"
if (flutterVersionCode == null) {
flutterVersionCode = '401'
flutterVersionCode = '402'
}
def flutterVersionName = "4.0.1"
def flutterVersionName = "4.0.2"
if (flutterVersionName == null) {
flutterVersionName = '4.0.1'
flutterVersionName = '4.0.2'
}
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
... ...
... ... @@ -636,7 +636,7 @@
CURRENT_PROJECT_VERSION = 393;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
FLUTTER_BUILD_MODE = debug;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
... ...
extern const unsigned char RunnerVersionString[];
extern const double RunnerVersionNumber;
const unsigned char RunnerVersionString[] __attribute__ ((used)) = "@(#)PROGRAM:Runner PROJECT:Runner-393" "\n";
const double RunnerVersionNumber __attribute__ ((used)) = (double)393.;
... ...
{"":{"diagnostics":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/arm64/Runner-master.dia","swift-dependencies":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/arm64/Runner-master.swiftdeps"},"/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift":{"dependencies":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/arm64/AppDelegate.d","diagnostics":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/arm64/AppDelegate.dia","index-unit-output-path":"/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/arm64/AppDelegate.o","llvm-bc":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/arm64/AppDelegate.bc","object":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/arm64/AppDelegate.o","swift-dependencies":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/arm64/AppDelegate.swiftdeps","swiftmodule":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/arm64/AppDelegate~partial.swiftmodule"}}
\ No newline at end of file
... ...
version: "Apple Swift version 5.6.1 (swiftlang-5.6.0.323.66 clang-1316.0.20.12)"
options: "31d1359b39fa124baf9b86a743115137d852f39fd379aa67ceb7d199d1a118f3"
build_start_time: [1662690689, 518762111]
build_end_time: [1662690689, 623396873]
inputs:
"/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift": !private [1626855519, 779936790]
... ...
version: "Apple Swift version 5.6.1 (swiftlang-5.6.0.323.66 clang-1316.0.20.12)"
options: "31d1359b39fa124baf9b86a743115137d852f39fd379aa67ceb7d199d1a118f3"
build_start_time: [1662690146, 218652009]
build_end_time: [1662690146, 534229040]
inputs:
"/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift": !private [1626855519, 779936790]
... ...
/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift
... ...
{"":{"diagnostics":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/armv7/Runner-master.dia","swift-dependencies":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/armv7/Runner-master.swiftdeps"},"/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift":{"dependencies":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/armv7/AppDelegate.d","diagnostics":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/armv7/AppDelegate.dia","index-unit-output-path":"/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/armv7/AppDelegate.o","llvm-bc":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/armv7/AppDelegate.bc","object":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/armv7/AppDelegate.o","swift-dependencies":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/armv7/AppDelegate.swiftdeps","swiftmodule":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/armv7/AppDelegate~partial.swiftmodule"}}
\ No newline at end of file
... ...
version: "Apple Swift version 5.6.1 (swiftlang-5.6.0.323.66 clang-1316.0.20.12)"
options: "31d1359b39fa124baf9b86a743115137d852f39fd379aa67ceb7d199d1a118f3"
build_start_time: [1662690277, 307630062]
build_end_time: [1662690277, 474601030]
inputs:
"/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift": !private [1626855519, 779936790]
... ...
/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift
... ...
#!/bin/sh
diff "${PODS_PODFILE_DIR_PATH}/Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
if [ $? != 0 ] ; then
# print error to STDERR
echo "error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation." >&2
exit 1
fi
# This output is used by Xcode 'outputs' to avoid re-running this script phase.
echo "SUCCESS" > "${SCRIPT_OUTPUT_FILE_0}"
... ...
{"case-sensitive":"false","roots":[],"version":0}
\ No newline at end of file
... ...
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>application-identifier</key>
<string>8J59HM8B82.com.naji.reserveLine</string>
<key>aps-environment</key>
<string>development</string>
<key>com.apple.developer.applesignin</key>
<array>
<string>Default</string>
</array>
<key>com.apple.developer.associated-domains</key>
<array>
<string>applinks:xt04.colorcun.com</string>
</array>
</dict>
</plist>
... ...
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.get-task-allow</key>
<true/>
</dict>
</plist>
... ...
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>application-identifier</key>
<string>8J59HM8B82.com.naji.reserveLine</string>
<key>aps-environment</key>
<string>development</string>
<key>com.apple.developer.applesignin</key>
<array>
<string>Default</string>
</array>
<key>com.apple.developer.associated-domains</key>
<array>
<string>applinks:xt04.colorcun.com</string>
</array>
</dict>
</plist>
... ...
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.get-task-allow</key>
<true/>
</dict>
</plist>
... ...
#!/bin/sh
diff "${PODS_PODFILE_DIR_PATH}/Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
if [ $? != 0 ] ; then
# print error to STDERR
echo "error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation." >&2
exit 1
fi
# This output is used by Xcode 'outputs' to avoid re-running this script phase.
echo "SUCCESS" > "${SCRIPT_OUTPUT_FILE_0}"
... ...
{
"_buildCommand2" : {
"command" : "prepareForIndexing",
"enableIndexBuildArena" : false,
"targets" : null
},
"buildCommand" : "build",
"configuredTargets" : [
{
"guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
}
],
"containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
"continueBuildingAfterErrors" : true,
"enableIndexBuildArena" : false,
"hideShellScriptEnvironment" : false,
"parameters" : {
"action" : "build",
"activeArchitecture" : "arm64e",
"activeRunDestination" : {
"disableOnlyActiveArch" : true,
"platform" : "iphoneos",
"sdk" : "iphoneos15.5",
"sdkVariant" : "iphoneos",
"supportedArchitectures" : [
"armv4t",
"armv5",
"armv6",
"armv7",
"armv7f",
"armv7s",
"armv7k",
"arm64",
"arm64e"
],
"targetArchitecture" : "arm64e"
},
"arenaInfo" : {
"buildIntermediatesPath" : "",
"buildProductsPath" : "",
"derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
"indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
"indexEnableDataStore" : true,
"indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
"pchPath" : ""
},
"configurationName" : "Debug",
"overrides" : {
"synthesized" : {
"table" : {
"ENABLE_PREVIEWS" : "NO"
}
}
}
},
"qos" : "default",
"schemeCommand" : "launch",
"schemeCommand2" : "launch",
"shouldCollectMetrics" : false,
"showNonLoggedProgress" : true,
"useDryRun" : true,
"useImplicitDependencies" : true,
"useLegacyBuildLocations" : false,
"useParallelTargets" : true
}
\ No newline at end of file
... ...
Target dependency graph (1 target)
Runner in Runner, no dependencies
\ No newline at end of file
... ...
{
"_buildCommand2" : {
"command" : "prepareForIndexing",
"enableIndexBuildArena" : false,
"targets" : null
},
"buildCommand" : "build",
"configuredTargets" : [
{
"guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
}
],
"containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
"continueBuildingAfterErrors" : true,
"enableIndexBuildArena" : false,
"hideShellScriptEnvironment" : false,
"parameters" : {
"action" : "build",
"activeArchitecture" : "arm64",
"activeRunDestination" : {
"disableOnlyActiveArch" : false,
"platform" : "iphoneos",
"sdk" : "iphoneos15.5",
"sdkVariant" : "iphoneos",
"supportedArchitectures" : [
"arm64e",
"arm64v8",
"arm64",
"armv8"
],
"targetArchitecture" : "arm64"
},
"arenaInfo" : {
"buildIntermediatesPath" : "",
"buildProductsPath" : "",
"derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
"indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
"indexEnableDataStore" : true,
"indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
"pchPath" : ""
},
"configurationName" : "Debug",
"overrides" : {
"synthesized" : {
"table" : {
"ASSETCATALOG_FILTER_FOR_DEVICE_MODEL" : "iPhone12,8",
"ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION" : "14.4.2",
"BUILD_ACTIVE_RESOURCES_ONLY" : "YES",
"ENABLE_PREVIEWS" : "NO",
"TARGET_DEVICE_IDENTIFIER" : "00008030-000640322103802E",
"TARGET_DEVICE_MODEL" : "iPhone12,8",
"TARGET_DEVICE_OS_VERSION" : "14.4.2",
"TARGET_DEVICE_PLATFORM_NAME" : "iphoneos"
}
}
}
},
"schemeCommand" : "launch",
"schemeCommand2" : "launch",
"shouldCollectMetrics" : false,
"showNonLoggedProgress" : true,
"useDryRun" : false,
"useImplicitDependencies" : true,
"useLegacyBuildLocations" : false,
"useParallelTargets" : true
}
\ No newline at end of file
... ...
Target dependency graph (1 target)
Runner in Runner, no dependencies
\ No newline at end of file
... ...
{
"_buildCommand2" : {
"command" : "prepareForIndexing",
"enableIndexBuildArena" : false,
"targets" : null
},
"buildCommand" : "build",
"configuredTargets" : [
{
"guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
}
],
"containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
"continueBuildingAfterErrors" : true,
"enableIndexBuildArena" : false,
"hideShellScriptEnvironment" : false,
"parameters" : {
"action" : "build",
"activeArchitecture" : "arm64",
"activeRunDestination" : {
"disableOnlyActiveArch" : false,
"platform" : "iphoneos",
"sdk" : "iphoneos15.5",
"sdkVariant" : "iphoneos",
"supportedArchitectures" : [
"arm64e",
"arm64v8",
"arm64",
"armv8"
],
"targetArchitecture" : "arm64"
},
"arenaInfo" : {
"buildIntermediatesPath" : "",
"buildProductsPath" : "",
"derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
"indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
"indexEnableDataStore" : true,
"indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
"pchPath" : ""
},
"configurationName" : "Debug",
"overrides" : {
"synthesized" : {
"table" : {
"ASSETCATALOG_FILTER_FOR_DEVICE_MODEL" : "iPhone12,8",
"ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION" : "14.4.2",
"BUILD_ACTIVE_RESOURCES_ONLY" : "YES",
"ENABLE_PREVIEWS" : "NO",
"TARGET_DEVICE_IDENTIFIER" : "00008030-000640322103802E",
"TARGET_DEVICE_MODEL" : "iPhone12,8",
"TARGET_DEVICE_OS_VERSION" : "14.4.2",
"TARGET_DEVICE_PLATFORM_NAME" : "iphoneos"
}
}
}
},
"qos" : "default",
"schemeCommand" : "launch",
"schemeCommand2" : "launch",
"shouldCollectMetrics" : false,
"showNonLoggedProgress" : true,
"useDryRun" : true,
"useImplicitDependencies" : true,
"useLegacyBuildLocations" : false,
"useParallelTargets" : true
}
\ No newline at end of file
... ...
Target dependency graph (1 target)
Runner in Runner, no dependencies
\ No newline at end of file
... ...
{
"_buildCommand2" : {
"command" : "prepareForIndexing",
"enableIndexBuildArena" : false,
"targets" : null
},
"buildCommand" : "build",
"configuredTargets" : [
{
"guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
}
],
"containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
"continueBuildingAfterErrors" : true,
"enableIndexBuildArena" : false,
"hideShellScriptEnvironment" : false,
"parameters" : {
"action" : "build",
"activeArchitecture" : "arm64",
"activeRunDestination" : {
"disableOnlyActiveArch" : false,
"platform" : "iphoneos",
"sdk" : "iphoneos15.5",
"sdkVariant" : "iphoneos",
"supportedArchitectures" : [
"arm64e",
"arm64v8",
"arm64",
"armv8"
],
"targetArchitecture" : "arm64"
},
"arenaInfo" : {
"buildIntermediatesPath" : "",
"buildProductsPath" : "",
"derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
"indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
"indexEnableDataStore" : true,
"indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
"pchPath" : ""
},
"configurationName" : "Debug",
"overrides" : {
"synthesized" : {
"table" : {
"ASSETCATALOG_FILTER_FOR_DEVICE_MODEL" : "iPhone12,8",
"ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION" : "14.4.2",
"BUILD_ACTIVE_RESOURCES_ONLY" : "YES",
"ENABLE_PREVIEWS" : "NO",
"TARGET_DEVICE_IDENTIFIER" : "00008030-000640322103802E",
"TARGET_DEVICE_MODEL" : "iPhone12,8",
"TARGET_DEVICE_OS_VERSION" : "14.4.2",
"TARGET_DEVICE_PLATFORM_NAME" : "iphoneos"
}
}
}
},
"qos" : "default",
"schemeCommand" : "launch",
"schemeCommand2" : "launch",
"shouldCollectMetrics" : false,
"showNonLoggedProgress" : true,
"useDryRun" : true,
"useImplicitDependencies" : true,
"useLegacyBuildLocations" : false,
"useParallelTargets" : true
}
\ No newline at end of file
... ...
Target dependency graph (1 target)
Runner in Runner, no dependencies
\ No newline at end of file
... ...
{
"_buildCommand2" : {
"command" : "prepareForIndexing",
"enableIndexBuildArena" : false,
"targets" : null
},
"buildCommand" : "build",
"configuredTargets" : [
{
"guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
}
],
"containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
"continueBuildingAfterErrors" : true,
"enableIndexBuildArena" : false,
"hideShellScriptEnvironment" : false,
"parameters" : {
"action" : "build",
"activeArchitecture" : "arm64",
"activeRunDestination" : {
"disableOnlyActiveArch" : false,
"platform" : "iphoneos",
"sdk" : "iphoneos15.5",
"sdkVariant" : "iphoneos",
"supportedArchitectures" : [
"arm64v8",
"arm64",
"armv8"
],
"targetArchitecture" : "arm64"
},
"arenaInfo" : {
"buildIntermediatesPath" : "",
"buildProductsPath" : "",
"derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
"indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
"indexEnableDataStore" : true,
"indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
"pchPath" : ""
},
"configurationName" : "Debug",
"overrides" : {
"synthesized" : {
"table" : {
"ASSETCATALOG_FILTER_FOR_DEVICE_MODEL" : "iPhone10,2",
"ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION" : "13.6",
"BUILD_ACTIVE_RESOURCES_ONLY" : "YES",
"ENABLE_PREVIEWS" : "NO",
"TARGET_DEVICE_IDENTIFIER" : "fe000909aeb9328b501332bf921126c213f1c4a4",
"TARGET_DEVICE_MODEL" : "iPhone10,2",
"TARGET_DEVICE_OS_VERSION" : "13.6",
"TARGET_DEVICE_PLATFORM_NAME" : "iphoneos"
}
}
}
},
"schemeCommand" : "launch",
"schemeCommand2" : "launch",
"shouldCollectMetrics" : false,
"showNonLoggedProgress" : true,
"useDryRun" : false,
"useImplicitDependencies" : true,
"useLegacyBuildLocations" : false,
"useParallelTargets" : true
}
\ No newline at end of file
... ...
This diff could not be displayed because it is too large.
Target dependency graph (1 target)
Runner in Runner, no dependencies
\ No newline at end of file
... ...
{
"_buildCommand2" : {
"command" : "prepareForIndexing",
"enableIndexBuildArena" : false,
"targets" : null
},
"buildCommand" : "build",
"configuredTargets" : [
{
"guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
}
],
"containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
"continueBuildingAfterErrors" : true,
"enableIndexBuildArena" : false,
"hideShellScriptEnvironment" : false,
"parameters" : {
"action" : "build",
"activeArchitecture" : "arm64",
"activeRunDestination" : {
"disableOnlyActiveArch" : false,
"platform" : "iphoneos",
"sdk" : "iphoneos15.5",
"sdkVariant" : "iphoneos",
"supportedArchitectures" : [
"arm64v8",
"arm64",
"armv8"
],
"targetArchitecture" : "arm64"
},
"arenaInfo" : {
"buildIntermediatesPath" : "",
"buildProductsPath" : "",
"derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
"indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
"indexEnableDataStore" : true,
"indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
"pchPath" : ""
},
"configurationName" : "Debug",
"overrides" : {
"synthesized" : {
"table" : {
"ASSETCATALOG_FILTER_FOR_DEVICE_MODEL" : "iPhone10,2",
"ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION" : "13.6",
"BUILD_ACTIVE_RESOURCES_ONLY" : "YES",
"ENABLE_PREVIEWS" : "NO",
"TARGET_DEVICE_IDENTIFIER" : "fe000909aeb9328b501332bf921126c213f1c4a4",
"TARGET_DEVICE_MODEL" : "iPhone10,2",
"TARGET_DEVICE_OS_VERSION" : "13.6",
"TARGET_DEVICE_PLATFORM_NAME" : "iphoneos"
}
}
}
},
"qos" : "default",
"schemeCommand" : "launch",
"schemeCommand2" : "launch",
"shouldCollectMetrics" : false,
"showNonLoggedProgress" : true,
"useDryRun" : true,
"useImplicitDependencies" : true,
"useLegacyBuildLocations" : false,
"useParallelTargets" : true
}
\ No newline at end of file
... ...
This diff could not be displayed because it is too large.
Target dependency graph (1 target)
Runner in Runner, no dependencies
\ No newline at end of file
... ...
{
"_buildCommand2" : {
"command" : "prepareForIndexing",
"enableIndexBuildArena" : false,
"targets" : null
},
"buildCommand" : "build",
"configuredTargets" : [
{
"guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
}
],
"containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
"continueBuildingAfterErrors" : true,
"enableIndexBuildArena" : false,
"hideShellScriptEnvironment" : false,
"parameters" : {
"action" : "build",
"activeArchitecture" : "arm64e",
"activeRunDestination" : {
"disableOnlyActiveArch" : true,
"platform" : "iphoneos",
"sdk" : "iphoneos15.5",
"sdkVariant" : "iphoneos",
"supportedArchitectures" : [
"armv4t",
"armv5",
"armv6",
"armv7",
"armv7f",
"armv7s",
"armv7k",
"arm64",
"arm64e"
],
"targetArchitecture" : "arm64e"
},
"arenaInfo" : {
"buildIntermediatesPath" : "",
"buildProductsPath" : "",
"derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
"indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
"indexEnableDataStore" : true,
"indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
"pchPath" : ""
},
"configurationName" : "Debug",
"overrides" : {
"synthesized" : {
"table" : {
"ENABLE_PREVIEWS" : "NO"
}
}
}
},
"qos" : "default",
"schemeCommand" : "launch",
"schemeCommand2" : "launch",
"shouldCollectMetrics" : false,
"showNonLoggedProgress" : true,
"useDryRun" : true,
"useImplicitDependencies" : true,
"useLegacyBuildLocations" : false,
"useParallelTargets" : true
}
\ No newline at end of file
... ...
Target dependency graph (1 target)
Runner in Runner, no dependencies
\ No newline at end of file
... ...
This diff could not be displayed because it is too large.
{
"_buildCommand2" : {
"command" : "build",
"skipDependencies" : false,
"style" : "buildOnly"
},
"buildCommand" : "build",
"configuredTargets" : [
{
"guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
}
],
"containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
"continueBuildingAfterErrors" : false,
"enableIndexBuildArena" : false,
"hideShellScriptEnvironment" : false,
"parameters" : {
"action" : "build",
"activeArchitecture" : "x86_64",
"activeRunDestination" : {
"disableOnlyActiveArch" : false,
"platform" : "iphonesimulator",
"sdk" : "iphonesimulator15.5",
"sdkVariant" : "iphonesimulator",
"supportedArchitectures" : [
"x86_64"
],
"targetArchitecture" : "x86_64"
},
"arenaInfo" : {
"buildIntermediatesPath" : "",
"buildProductsPath" : "",
"derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
"indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
"indexEnableDataStore" : true,
"indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
"pchPath" : ""
},
"configurationName" : "Debug",
"overrides" : {
"synthesized" : {
"table" : {
"ASSETCATALOG_FILTER_FOR_DEVICE_MODEL" : "iPod9,1",
"ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION" : "15.5",
"BUILD_ACTIVE_RESOURCES_ONLY" : "YES",
"ENABLE_PREVIEWS" : "NO",
"TARGET_DEVICE_IDENTIFIER" : "4F37EB2A-0B56-47DD-8C12-66109A28A224",
"TARGET_DEVICE_MODEL" : "iPod9,1",
"TARGET_DEVICE_OS_VERSION" : "15.5",
"TARGET_DEVICE_PLATFORM_NAME" : "iphonesimulator"
}
}
}
},
"schemeCommand" : "launch",
"schemeCommand2" : "launch",
"shouldCollectMetrics" : false,
"showNonLoggedProgress" : true,
"useDryRun" : false,
"useImplicitDependencies" : true,
"useLegacyBuildLocations" : false,
"useParallelTargets" : true
}
\ No newline at end of file
... ...
Target dependency graph (1 target)
Runner in Runner, no dependencies
\ No newline at end of file
... ...
{
"_buildCommand2" : {
"command" : "prepareForIndexing",
"enableIndexBuildArena" : false,
"targets" : null
},
"buildCommand" : "build",
"configuredTargets" : [
{
"guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
}
],
"containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
"continueBuildingAfterErrors" : true,
"enableIndexBuildArena" : false,
"hideShellScriptEnvironment" : false,
"parameters" : {
"action" : "build",
"activeArchitecture" : "arm64",
"activeRunDestination" : {
"disableOnlyActiveArch" : false,
"platform" : "iphoneos",
"sdk" : "iphoneos15.5",
"sdkVariant" : "iphoneos",
"supportedArchitectures" : [
"arm64v8",
"arm64",
"armv8"
],
"targetArchitecture" : "arm64"
},
"arenaInfo" : {
"buildIntermediatesPath" : "",
"buildProductsPath" : "",
"derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
"indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
"indexEnableDataStore" : true,
"indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
"pchPath" : ""
},
"configurationName" : "Debug",
"overrides" : {
"synthesized" : {
"table" : {
"ASSETCATALOG_FILTER_FOR_DEVICE_MODEL" : "iPhone10,2",
"ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION" : "13.6",
"BUILD_ACTIVE_RESOURCES_ONLY" : "YES",
"ENABLE_PREVIEWS" : "NO",
"TARGET_DEVICE_IDENTIFIER" : "fe000909aeb9328b501332bf921126c213f1c4a4",
"TARGET_DEVICE_MODEL" : "iPhone10,2",
"TARGET_DEVICE_OS_VERSION" : "13.6",
"TARGET_DEVICE_PLATFORM_NAME" : "iphoneos"
}
}
}
},
"qos" : "default",
"schemeCommand" : "launch",
"schemeCommand2" : "launch",
"shouldCollectMetrics" : false,
"showNonLoggedProgress" : true,
"useDryRun" : true,
"useImplicitDependencies" : true,
"useLegacyBuildLocations" : false,
"useParallelTargets" : true
}
\ No newline at end of file
... ...
This diff could not be displayed because it is too large.
Target dependency graph (1 target)
Runner in Runner, no dependencies
\ No newline at end of file
... ...
{
"_buildCommand2" : {
"command" : "prepareForIndexing",
"enableIndexBuildArena" : false,
"targets" : null
},
"buildCommand" : "build",
"configuredTargets" : [
{
"guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
}
],
"containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
"continueBuildingAfterErrors" : true,
"enableIndexBuildArena" : false,
"hideShellScriptEnvironment" : false,
"parameters" : {
"action" : "build",
"activeArchitecture" : "arm64e",
"activeRunDestination" : {
"disableOnlyActiveArch" : true,
"platform" : "iphoneos",
"sdk" : "iphoneos15.5",
"sdkVariant" : "iphoneos",
"supportedArchitectures" : [
"armv4t",
"armv5",
"armv6",
"armv7",
"armv7f",
"armv7s",
"armv7k",
"arm64",
"arm64e"
],
"targetArchitecture" : "arm64e"
},
"arenaInfo" : {
"buildIntermediatesPath" : "",
"buildProductsPath" : "",
"derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
"indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
"indexEnableDataStore" : true,
"indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
"pchPath" : ""
},
"configurationName" : "Debug",
"overrides" : {
"synthesized" : {
"table" : {
"ENABLE_PREVIEWS" : "NO"
}
}
}
},
"qos" : "default",
"schemeCommand" : "launch",
"schemeCommand2" : "launch",
"shouldCollectMetrics" : false,
"showNonLoggedProgress" : true,
"useDryRun" : true,
"useImplicitDependencies" : true,
"useLegacyBuildLocations" : false,
"useParallelTargets" : true
}
\ No newline at end of file
... ...
This diff could not be displayed because it is too large.
Target dependency graph (1 target)
Runner in Runner, no dependencies
\ No newline at end of file
... ...
{
"_buildCommand2" : {
"command" : "prepareForIndexing",
"enableIndexBuildArena" : false,
"targets" : null
},
"buildCommand" : "build",
"configuredTargets" : [
{
"guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
}
],
"containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
"continueBuildingAfterErrors" : true,
"enableIndexBuildArena" : false,
"hideShellScriptEnvironment" : false,
"parameters" : {
"action" : "build",
"activeArchitecture" : "arm64",
"activeRunDestination" : {
"disableOnlyActiveArch" : false,
"platform" : "iphoneos",
"sdk" : "iphoneos15.5",
"sdkVariant" : "iphoneos",
"supportedArchitectures" : [
"arm64v8",
"arm64",
"armv8"
],
"targetArchitecture" : "arm64"
},
"arenaInfo" : {
"buildIntermediatesPath" : "",
"buildProductsPath" : "",
"derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
"indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
"indexEnableDataStore" : true,
"indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
"pchPath" : ""
},
"configurationName" : "Debug",
"overrides" : {
"synthesized" : {
"table" : {
"ASSETCATALOG_FILTER_FOR_DEVICE_MODEL" : "iPhone10,2",
"ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION" : "13.6",
"BUILD_ACTIVE_RESOURCES_ONLY" : "YES",
"ENABLE_PREVIEWS" : "NO",
"TARGET_DEVICE_IDENTIFIER" : "fe000909aeb9328b501332bf921126c213f1c4a4",
"TARGET_DEVICE_MODEL" : "iPhone10,2",
"TARGET_DEVICE_OS_VERSION" : "13.6",
"TARGET_DEVICE_PLATFORM_NAME" : "iphoneos"
}
}
}
},
"schemeCommand" : "launch",
"schemeCommand2" : "launch",
"shouldCollectMetrics" : false,
"showNonLoggedProgress" : true,
"useDryRun" : false,
"useImplicitDependencies" : true,
"useLegacyBuildLocations" : false,
"useParallelTargets" : true
}
\ No newline at end of file
... ...
Target dependency graph (1 target)
Runner in Runner, no dependencies
\ No newline at end of file
... ...
{
"_buildCommand2" : {
"command" : "build",
"skipDependencies" : false,
"style" : "buildOnly"
},
"buildCommand" : "build",
"configuredTargets" : [
{
"guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
}
],
"containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
"continueBuildingAfterErrors" : false,
"enableIndexBuildArena" : false,
"hideShellScriptEnvironment" : false,
"parameters" : {
"action" : "build",
"activeArchitecture" : "arm64e",
"activeRunDestination" : {
"disableOnlyActiveArch" : true,
"platform" : "iphoneos",
"sdk" : "iphoneos15.5",
"sdkVariant" : "iphoneos",
"supportedArchitectures" : [
"armv4t",
"armv5",
"armv6",
"armv7",
"armv7f",
"armv7s",
"armv7k",
"arm64",
"arm64e"
],
"targetArchitecture" : "arm64e"
},
"arenaInfo" : {
"buildIntermediatesPath" : "",
"buildProductsPath" : "",
"derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
"indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
"indexEnableDataStore" : true,
"indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
"pchPath" : ""
},
"configurationName" : "Debug",
"overrides" : {
"synthesized" : {
"table" : {
"ENABLE_PREVIEWS" : "NO"
}
}
}
},
"schemeCommand" : "launch",
"schemeCommand2" : "launch",
"shouldCollectMetrics" : false,
"showNonLoggedProgress" : true,
"useDryRun" : false,
"useImplicitDependencies" : true,
"useLegacyBuildLocations" : false,
"useParallelTargets" : true
}
\ No newline at end of file
... ...
Target dependency graph (1 target)
Runner in Runner, no dependencies
\ No newline at end of file
... ...
{
"_buildCommand2" : {
"command" : "prepareForIndexing",
"enableIndexBuildArena" : false,
"targets" : null
},
"buildCommand" : "build",
"configuredTargets" : [
{
"guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
}
],
"containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
"continueBuildingAfterErrors" : true,
"enableIndexBuildArena" : false,
"hideShellScriptEnvironment" : false,
"parameters" : {
"action" : "build",
"activeArchitecture" : "arm64e",
"activeRunDestination" : {
"disableOnlyActiveArch" : true,
"platform" : "iphoneos",
"sdk" : "iphoneos15.5",
"sdkVariant" : "iphoneos",
"supportedArchitectures" : [
"armv4t",
"armv5",
"armv6",
"armv7",
"armv7f",
"armv7s",
"armv7k",
"arm64",
"arm64e"
],
"targetArchitecture" : "arm64e"
},
"arenaInfo" : {
"buildIntermediatesPath" : "",
"buildProductsPath" : "",
"derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
"indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
"indexEnableDataStore" : true,
"indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
"pchPath" : ""
},
"configurationName" : "Debug",
"overrides" : {
"synthesized" : {
"table" : {
"ENABLE_PREVIEWS" : "NO"
}
}
}
},
"schemeCommand" : "launch",
"schemeCommand2" : "launch",
"shouldCollectMetrics" : false,
"showNonLoggedProgress" : true,
"useDryRun" : false,
"useImplicitDependencies" : true,
"useLegacyBuildLocations" : false,
"useParallelTargets" : true
}
\ No newline at end of file
... ...
Target dependency graph (1 target)
Runner in Runner, no dependencies
\ No newline at end of file
... ...
This diff could not be displayed because it is too large.
... ... @@ -463,7 +463,7 @@ class SetmealDetail {
String pnum;
String min;
String spare;
List<CooklistByid> cooklist;
List<Cooklist> cooklist;
String mealName;
SetmealDetail(
... ... @@ -483,10 +483,20 @@ class SetmealDetail {
pnum = json['pnum'];
min = json['min'];
spare = json['spare'];
if (json['cooklist'] != null) {
cooklist = <CooklistByid>[];
json['cooklist'].forEach((v) {
cooklist.add(new CooklistByid.fromJson(v));
// if (json['cooklist'] != null) {
// cooklist = <Cooklist>[];
// json['cooklist'].forEach((v) {
// cooklist.add(new Cooklist.fromJson(v));
// });
// }
if (json['cooklist'] != null && json['cooklist'].length > 0) {
cooklist = <Cooklist>[];
Map map = json['cooklist'];
map.forEach((key, v) {
v.forEach((v1) {
cooklist.add(new Cooklist.fromJson(v1));
});
});
}
mealName = json['meal_name'];
... ... @@ -508,21 +518,21 @@ class SetmealDetail {
}
}
class CooklistByid {
String cname;
// class Cooklist {
// String cname;
CooklistByid({this.cname});
// Cooklist({this.cname});
CooklistByid.fromJson(Map<String, dynamic> json) {
cname = json['cname'];
}
// Cooklist.fromJson(Map<String, dynamic> json) {
// cname = json['cname'];
// }
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['cname'] = this.cname;
return data;
}
}
// Map<String, dynamic> toJson() {
// final Map<String, dynamic> data = new Map<String, dynamic>();
// data['cname'] = this.cname;
// return data;
// }
// }
class WineDetail {
String wineName;
... ...
import 'package:flutter/material.dart';
import 'package:one_key/models/dsolt_xt.dart';
import 'package:one_key/models/setmeal_by_id_model.dart';
import 'package:one_key/models/setmeal_model.dart';
import 'package:one_key/models/table_list.dart' as t;
import 'package:one_key/models/upload_img_model.dart';
... ... @@ -149,7 +150,7 @@ class Setmeal {
TextEditingController minC;
TextEditingController spareC;
List<Cooklist> cooklist;
Map<String, List<CookByIdSetmeal>> dataMenu = {};
Map<String, List<Cook>> dataMenu = {};
Setmeal({
this.setmealId,
... ... @@ -180,11 +181,26 @@ class Setmeal {
name = json['name'];
select = json['select'];
bargaining = json['bargaining'];
if (json['cooklist'] != null) {
// if (json['cooklist'] != null) {
// cooklist = <Cooklist>[];
// json['cooklist'].forEach((v) {
// cooklist.add(new Cooklist.fromJson(v));
// });
// }
if (json['cooklist'] != null && json['cooklist'].length > 0) {
cooklist = <Cooklist>[];
json['cooklist'].forEach((v) {
cooklist.add(new Cooklist.fromJson(v));
dataMenu = {};
Map map = json['cooklist'];
map.forEach((key, v) {
List<Cook> cooktemp = [];
v.forEach((v1) {
cooklist.add(new Cooklist.fromJson(v1));
cooktemp.add(new Cook.fromJson(v1));
});
dataMenu[key] = cooktemp;
});
print(dataMenu);
}
// finalPriceC = json['finalPriceC'];
... ... @@ -255,6 +271,7 @@ class Wine {
finalPrice = json['final_price'];
numStr = json['num'];
name = json['name'];
spec = json['spec'];
}
Map<String, dynamic> toJson() {
... ... @@ -264,7 +281,7 @@ class Wine {
data['final_price'] = this.finalPrice;
data['num'] = this.numStr;
data['name'] = this.name;
data['spec'] = this.spec;
return data;
}
}
... ... @@ -291,6 +308,7 @@ class Other {
finalPrice = json['final_price'];
numStr = json['num'];
name = json['name'];
spec = json['spec'];
}
Map<String, dynamic> toJson() {
... ... @@ -300,7 +318,7 @@ class Other {
data['final_price'] = this.finalPrice;
data['num'] = this.numStr;
data['name'] = this.name;
data['spec'] = this.spec;
return data;
}
}
... ...
import 'package:flutter/material.dart';
import 'package:one_key/models/setmeal_model.dart';
class SetMeaByIdModel {
int ret;
... ... @@ -36,7 +37,7 @@ class SetMeaByIdSunModel {
String status;
dynamic cdate;
List<ClassifyById> classify;
List<CookByIdSetmeal> cook;
List<Cook> cook;
SetMeaByIdSunModel(
{this.id,
... ... @@ -64,9 +65,9 @@ class SetMeaByIdSunModel {
});
}
if (json['cook'] != null) {
cook = <CookByIdSetmeal>[];
cook = <Cook>[];
json['cook'].forEach((v) {
cook.add(new CookByIdSetmeal.fromJson(v));
cook.add(new Cook.fromJson(v));
});
}
}
... ... @@ -122,7 +123,7 @@ class ClassifyById {
}
}
class CookByIdSetmeal {
class Cook {
String id;
String sid;
String cid;
... ... @@ -134,7 +135,7 @@ class CookByIdSetmeal {
TextEditingController numC = TextEditingController(); //数量
TextEditingController nameC = TextEditingController(); //菜名
CookByIdSetmeal(
Cook(
{this.id,
this.sid,
this.cid,
... ... @@ -144,7 +145,7 @@ class CookByIdSetmeal {
this.isTrim,
this.status});
CookByIdSetmeal.fromJson(Map<String, dynamic> json) {
Cook.fromJson(Map<String, dynamic> json) {
id = json['id'];
sid = json['sid'];
cid = json['cid'];
... ...
import 'package:one_key/models/setmeal_by_id_model.dart';
class SetMealModel {
int ret;
List<SetMealSunModel> data;
... ... @@ -122,47 +124,47 @@ class Classify {
}
}
class Cook {
String id;
String sid;
String cid;
String mid;
String cname;
String spec;
String isTrim;
String status;
// class Cook {
// String id;
// String sid;
// String cid;
// String mid;
// String cname;
// String spec;
// String isTrim;
// String status;
Cook(
{this.id,
this.sid,
this.cid,
this.mid,
this.cname,
this.spec,
this.isTrim,
this.status});
Cook.fromJson(Map<String, dynamic> json) {
id = json['id'];
sid = json['sid'];
cid = json['cid'];
mid = json['mid'];
cname = json['cname'];
spec = json['spec'];
isTrim = json['is_trim'];
status = json['status'];
}
// Cook(
// {this.id,
// this.sid,
// this.cid,
// this.mid,
// this.cname,
// this.spec,
// this.isTrim,
// this.status});
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['sid'] = this.sid;
data['cid'] = this.cid;
data['mid'] = this.mid;
data['cname'] = this.cname;
data['spec'] = this.spec;
data['is_trim'] = this.isTrim;
data['status'] = this.status;
return data;
}
}
// Cook.fromJson(Map<String, dynamic> json) {
// id = json['id'];
// sid = json['sid'];
// cid = json['cid'];
// mid = json['mid'];
// cname = json['cname'];
// spec = json['spec'];
// isTrim = json['is_trim'];
// status = json['status'];
// }
// Map<String, dynamic> toJson() {
// final Map<String, dynamic> data = new Map<String, dynamic>();
// data['id'] = this.id;
// data['sid'] = this.sid;
// data['cid'] = this.cid;
// data['mid'] = this.mid;
// data['cname'] = this.cname;
// data['spec'] = this.spec;
// data['is_trim'] = this.isTrim;
// data['status'] = this.status;
// return data;
// }
// }
... ...
... ... @@ -9,6 +9,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:one_key/models/cookbook_one_model.dart';
import 'package:one_key/models/get_banquet_deposit_model.dart';
import 'package:one_key/models/sessions_model.dart';
import 'package:one_key/models/setmeal_model.dart';
import 'package:one_key/route/navigator_util.dart';
import 'package:one_key/widgets/MyDivider.dart';
import 'package:one_key/widgets/round_button.dart';
... ... @@ -39,6 +40,7 @@ import '../../widgets/system_app_bar.dart';
import '../online_check/img_picker_widget_f.dart';
import '../table/area_item_table.dart';
import 'package:one_key/models/table_list.dart' as t;
import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
class FeastCreatePage extends StatefulWidget {
final GetBanquetByIdNewSunModel banquetDetail;
... ... @@ -84,7 +86,7 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
int xuantaiSelIndex = 0;
List<DsoltXt> dsoltList = [];
UserModel userModel;
Map<String, List<CookByIdSetmeal>> dataMenu = {};
Map<String, List<Cook>> dataMenu = {};
Map<String, String> invoice; //发票
String morning;
String noon;
... ... @@ -109,6 +111,10 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
_getData();
});
bus.on("feast_deposit_list", (arg) {
if (widget.banquetDetail != null) {
bus.emit('feast_detail_page'); //编辑之后刷新宴会详情页面
bus.emit('feast_home_page'); //编辑之后刷新宴会首页
}
_getBanquetDeposit();
});
bus.on("feast_qy_list", (arg) {
... ... @@ -297,6 +303,11 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
feastModel.rid = null;
feastModel.type = null;
feastModel.reserve = null;
//清空图片,选台图片不常驻,不需要清空
_uploadImageProvider.feastRemarkImageList = []; //意向
_uploadImageProvider.feastRemarkDjImageList = []; //定金
_uploadImageProvider.feastRemarkContractImageList = []; //合同
_uploadImageProvider.feastRemarkInvoiceImageList = []; //发票
}
initSetXuanTaiModel({int index}) {
... ... @@ -951,6 +962,10 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
bool success = await feastModel.createBanquet(context, pramas);
if (success) {
Utils.showToast('保存成功');
if (widget.banquetDetail != null) {
bus.emit('feast_detail_page'); //编辑之后刷新宴会详情页面
bus.emit('feast_home_page'); //编辑之后刷新宴会首页
}
return true;
} else {
... ... @@ -1254,27 +1269,79 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
'spare': mealValue.spare,
'name': mealValue.name
};
List cooklist = []; //菜单数据
Map cooklist = {}; //菜单数据
if (mealValue.dataMenu != null && mealValue.dataMenu.length > 0) {
//修改过菜单的数据
mealValue.dataMenu.forEach((key, value) {
List<Map<String, String>> cooks = []; //菜品分类下面的多个菜品信息
value.forEach((element) {
Map mapMenu = {'cname': element.cname};
cooklist.add(mapMenu);
Map<String, String> cook = {
'id': element.id,
'sid': element.sid,
'cid': element.cid,
'mid': element.mid,
'cname': element.cname,
'spec': element.spec,
'is_trim': element.isTrim,
'status': element.status,
};
cooks.add(cook);
});
cooklist[key] = cooks;
});
// Map tempMap = {};
// mealValue.dataMenu.forEach((key, value) {
// value.forEach((element) {
// Map mapMenu = {'cname': element.cname};
// cooklist.add(mapMenu);
// });
// });
} else {
// 套餐菜单原数据
Map<String, List<Cook>> data = {}; //原始菜品数据
List<String> classNames = [];
feastModel.setmealData.forEach((element) {
if (element.id == mealValue.setmealId) {
//找到当前套餐map
element.cook.forEach((element) {
Map mapMenu = {'cname': element.cname};
cooklist.add(mapMenu);
});
// element.cook.forEach((element) {
// Map mapMenu = {'cname': element.cname};
// cooklist.add(mapMenu);
// });
for (Classify item in element.classify) {
// Map<String, List<CookByIdSetmeal>> map = {};
String cid = item.id;
String className = item.className;
List<Cook> temp = [];
for (Cook itemCook in element.cook) {
if (cid == itemCook.cid) {
temp.add(itemCook);
}
}
classNames.add(className);
data[className] = temp;
}
}
});
data.forEach((key, value) {
List<Map<String, String>> cooks = []; //菜品分类下面的多个菜品信息
value.forEach((element) {
Map<String, String> cook = {
'id': element.id,
'sid': element.sid,
'cid': element.cid,
'mid': element.mid,
'cname': element.cname,
'spec': element.spec,
'isTrim': element.isTrim,
'status': element.status,
};
cooks.add(cook);
});
cooklist[key] = cooks;
});
}
mapMeal['cooklist'] = cooklist; //菜单
... ... @@ -1348,6 +1415,10 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
});
print(xuantaiData);
Utils.showToast('保存成功');
if (widget.banquetDetail != null) {
bus.emit('feast_detail_page'); //编辑之后刷新宴会详情页面
bus.emit('feast_home_page'); //编辑之后刷新宴会首页
}
return true;
} else {
return false;
... ... @@ -2465,7 +2536,7 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
);
}
/// 选台保存接口
/// 担保人保存接口
Future<bool> dbSave() async {
if (djDBRIndex == null) {
Utils.showToast('请选择担保人');
... ... @@ -2495,6 +2566,10 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
};
bool success = await feastModel.setWarrant(context, pramas);
if (success) {
if (widget.banquetDetail != null) {
bus.emit('feast_detail_page'); //编辑之后刷新宴会详情页面
bus.emit('feast_home_page'); //编辑之后刷新宴会首页
}
return true;
} else {
return false;
... ... @@ -4391,6 +4466,10 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
if (results[0] && results[1] && results[2]) {
//成功
Utils.showToast('保存成功');
if (widget.banquetDetail != null) {
bus.emit('feast_detail_page'); //编辑之后刷新宴会详情页面
}
bus.emit('feast_home_page'); //编辑之后刷新宴会首页
} else {
if (!results[0]) {
// Utils.showToast('');
... ... @@ -4522,7 +4601,8 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
userModel = Provider.of<UserModel>(context, listen: false);
_uploadImageProvider =
Provider.of<UploadImageProvider>(context, listen: true);
return Scaffold(
return KeyboardDismissOnTap(
child: Scaffold(
backgroundColor: MyColours.color_ffffff,
appBar: SystemAppBar(
'新建宴会',
... ... @@ -4539,6 +4619,6 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
? xtWidget()
: selectMenu == '定金'
? djWidget()
: qyWidget());
: qyWidget()));
}
}
... ...
... ... @@ -180,6 +180,7 @@ class _FeastDepositPageState extends State<FeastDepositPage> {
if (success) {
Navigator.pop(context);
bus.emit('feast_deposit_list');
}
}
... ...
... ... @@ -9,6 +9,7 @@ import '../../provider/feast_model.dart';
import '../../res/colors.dart';
import '../../route/navigator_util.dart';
import '../../utils/ConvertNumberToChineseMoneyWords.dart';
import '../../utils/event_bus.dart';
import '../../utils/screen_util.dart';
import '../../utils/utils.dart';
import '../../widgets/MyDivider.dart';
... ... @@ -40,6 +41,15 @@ class _FeastDetailPageState extends State<FeastDetailPage> {
WidgetsBinding.instance.addPostFrameCallback((_) {
_getBanquetById();
});
bus.on("feast_detail_page", (arg) {
_getBanquetById();
});
}
@override
void dispose() {
super.dispose();
bus.off('feast_detail_page');
}
///获取宴会详情
... ... @@ -71,6 +81,8 @@ class _FeastDetailPageState extends State<FeastDetailPage> {
// _uploadImageProvider.feastRemarkContractImageList.add(uploadImgModel);
// });
// setState(() {});
bus.emit('feast_home_page'); //编辑之后刷新宴会首页
Navigator.pop(context);
}
}
... ...
... ... @@ -25,7 +25,7 @@ import '../../widgets/v_empty_view.dart';
*/
class FeastMenuPage extends StatefulWidget {
final String setmealId;
final Map<String, List<CookByIdSetmeal>> justSelData;
final Map<String, List<Cook>> justSelData;
FeastMenuPage({Key key, this.setmealId, this.justSelData}) : super(key: key);
@override
... ... @@ -35,11 +35,11 @@ class FeastMenuPage extends StatefulWidget {
class _FeastMenuPageState extends State<FeastMenuPage> {
ScrollController controller = ScrollController();
FeastModel feastModel;
Map<String, List<CookByIdSetmeal>> data = {};
Map<String, List<Cook>> data = {};
List<String> classNames = [];
List<Map<String, String>> setModel = [];
Map<String, List<CookByIdSetmeal>> dataNew = {};
Map<String, List<Cook>> dataNew = {};
@override
void initState() {
... ... @@ -65,12 +65,12 @@ class _FeastMenuPageState extends State<FeastMenuPage> {
});
} else {
for (ClassifyById item in feastModel.setmealDetail.classify) {
// Map<String, List<CookByIdSetmeal>> map = {};
// Map<String, List<Cook>> map = {};
String cid = item.id;
String className = item.className;
List<CookByIdSetmeal> temp = [];
for (CookByIdSetmeal itemCook in feastModel.setmealDetail.cook) {
List<Cook> temp = [];
for (Cook itemCook in feastModel.setmealDetail.cook) {
if (cid == itemCook.cid) {
temp.add(itemCook);
}
... ... @@ -177,7 +177,7 @@ class _FeastMenuPageState extends State<FeastMenuPage> {
}
Widget _itemBuildWidget(BuildContext context, int index1) {
List<CookByIdSetmeal> cookList = data[classNames[index1]];
List<Cook> cookList = data[classNames[index1]];
return ListView.builder(
shrinkWrap: true,
controller: controller,
... ... @@ -188,7 +188,7 @@ class _FeastMenuPageState extends State<FeastMenuPage> {
return _buildHeaderWidget(context, classNames[index1]);
} else {
int itemIndex = index - 1;
CookByIdSetmeal setmeal = cookList[itemIndex];
Cook setmeal = cookList[itemIndex];
return Container(
margin: new EdgeInsets.only(bottom: h(12)),
... ... @@ -357,7 +357,7 @@ class _FeastMenuPageState extends State<FeastMenuPage> {
FocusScope.of(context).requestFocus(FocusNode());
// setModel = [];
data.forEach((key, value) {
List<CookByIdSetmeal> temp = [];
List<Cook> temp = [];
value.forEach((element) {
if (element.nameC.text.trim().length > 0) {
//已调菜
... ...
... ... @@ -29,7 +29,7 @@ class FeastMenuShowPage extends StatefulWidget {
final String dateData;
final String needtable;
final Map<String, List<CookByIdSetmeal>> justSelData;
final Map<String, List<Cook>> justSelData;
FeastMenuShowPage(
{Key key,
this.setmealId,
... ... @@ -46,11 +46,11 @@ class FeastMenuShowPage extends StatefulWidget {
class _FeastMenuShowPageState extends State<FeastMenuShowPage> {
ScrollController controller = ScrollController();
FeastModel feastModel;
Map<String, List<CookByIdSetmeal>> data = {};
Map<String, List<Cook>> data = {};
List<String> classNames = [];
List<Map<String, String>> setModel = [];
Map<String, List<CookByIdSetmeal>> dataNew = {};
Map<String, List<Cook>> dataNew = {};
@override
void initState() {
... ... @@ -76,12 +76,12 @@ class _FeastMenuShowPageState extends State<FeastMenuShowPage> {
});
} else {
for (ClassifyById item in feastModel.setmealDetail.classify) {
// Map<String, List<CookByIdSetmeal>> map = {};
// Map<String, List<Cook>> map = {};
String cid = item.id;
String className = item.className;
List<CookByIdSetmeal> temp = [];
for (CookByIdSetmeal itemCook in feastModel.setmealDetail.cook) {
List<Cook> temp = [];
for (Cook itemCook in feastModel.setmealDetail.cook) {
if (cid == itemCook.cid) {
temp.add(itemCook);
}
... ... @@ -188,7 +188,7 @@ class _FeastMenuShowPageState extends State<FeastMenuShowPage> {
}
Widget _itemBuildWidget(BuildContext context, int index1) {
List<CookByIdSetmeal> cookList = data[classNames[index1]];
List<Cook> cookList = data[classNames[index1]];
return ListView.builder(
shrinkWrap: true,
controller: controller,
... ... @@ -199,7 +199,7 @@ class _FeastMenuShowPageState extends State<FeastMenuShowPage> {
return _buildHeaderWidget(context, classNames[index1]);
} else {
int itemIndex = index - 1;
CookByIdSetmeal setmeal = cookList[itemIndex];
Cook setmeal = cookList[itemIndex];
return Container(
margin: new EdgeInsets.only(bottom: h(12)),
... ...
... ... @@ -15,6 +15,7 @@ import '../../constant/state.dart';
import '../../provider/user_model.dart';
import '../../res/colors.dart';
import '../../utils/event_bus.dart';
import '../../widgets/page_exception.dart';
class FeastPage extends StatefulWidget {
... ... @@ -35,6 +36,16 @@ class _FeastPageState extends State<FeastPage> {
_getBanquetByTime();
// scrollController.jumpTo(scrollController.position.minScrollExtent);
});
bus.on("feast_home_page", (arg) {
_getBanquetByTime();
});
}
@override
void dispose() {
super.dispose();
bus.off('feast_home_page');
}
///获取宴会详情
... ...
... ... @@ -2,6 +2,8 @@ import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import '../../models/get_banquet_by_id_new_model.dart';
import '../../models/set_xuan_tai_model.dart';
import '../../models/setmeal_by_id_model.dart';
import '../../res/colors.dart';
import '../../utils/screen_util.dart';
import '../../utils/utils.dart';
... ... @@ -9,7 +11,7 @@ import '../../widgets/h_empty_view.dart';
import '../../widgets/system_app_bar.dart';
class FeastQYMenuPage extends StatefulWidget {
final List<CooklistByid> cookListData;
final List<Cooklist> cookListData;
FeastQYMenuPage({Key key, this.cookListData}) : super(key: key);
@override
... ...
... ... @@ -118,7 +118,7 @@ class _FeastSetPageState extends State<FeastSetPage> {
///输入框
Widget _textfield(String hintText, TextEditingController editingController,
FocusNode focusNode,
{TextInputType inputType = TextInputType.text, double width}) {
{TextInputType inputType = TextInputType.number, double width}) {
return Container(
width: width,
padding: EdgeInsets.symmetric(horizontal: w(6)),
... ...
... ... @@ -130,7 +130,7 @@ class _FeastSetmealPageState extends State<FeastSetmealPage> {
///输入框
Widget _textfield(String hintText, TextEditingController editingController,
FocusNode focusNode,
{TextInputType inputType = TextInputType.text, double width}) {
{TextInputType inputType = TextInputType.number, double width}) {
return Container(
width: width,
padding: EdgeInsets.symmetric(horizontal: w(6)),
... ...
... ... @@ -1373,9 +1373,9 @@ var feastCreatePageHandle = new Handler(
Map<String, dynamic> temp = object['object'];
// temp.forEach((key, value) {
// List<CookByIdSetmeal> cook = [];
// List<Cook> cook = [];
// for (var item in value) {
// cook.add(CookByIdSetmeal.fromJson(item));
// cook.add(Cook.fromJson(item));
// }
// justSelData[key] = cook;
// });
... ... @@ -1417,15 +1417,15 @@ var feastMenuPageHandle = new Handler(
// bool onlyShow = FluroConvertUtils.string2bool(params["onlyShow"].first);
String setmealId = params["setmealId"].first;
Map<String, List<CookByIdSetmeal>> justSelData = {};
Map<String, List<Cook>> justSelData = {};
if (params.keys.contains('object')) {
Map object = FluroConvertUtils.string2map(params["object"].first);
Map<String, dynamic> temp = object['object'];
temp.forEach((key, value) {
List<CookByIdSetmeal> cook = [];
List<Cook> cook = [];
for (var item in value) {
cook.add(CookByIdSetmeal.fromJson(item));
cook.add(Cook.fromJson(item));
}
justSelData[key] = cook;
});
... ... @@ -1707,15 +1707,15 @@ var feastMenuShowPageHandle = new Handler(
String dateData = params["dateData"].first;
String needtable = params["needtable"].first;
Map<String, List<CookByIdSetmeal>> justSelData = {};
Map<String, List<Cook>> justSelData = {};
if (params.keys.contains('object')) {
Map object = FluroConvertUtils.string2map(params["object"].first);
Map<String, dynamic> temp = object['object'];
temp.forEach((key, value) {
List<CookByIdSetmeal> cook = [];
List<Cook> cook = [];
for (var item in value) {
cook.add(CookByIdSetmeal.fromJson(item));
cook.add(Cook.fromJson(item));
}
justSelData[key] = cook;
});
... ... @@ -1734,14 +1734,14 @@ var feastMenuShowPageHandle = new Handler(
///宴会----签约菜单信息
var feastQYMenuPageHandle = new Handler(
handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
List<CooklistByid> cook = [];
List<Cooklist> cook = [];
if (params.keys.contains('object')) {
Map object = FluroConvertUtils.string2map(params["object"].first);
List temp = object['object'];
for (var item in temp) {
cook.add(CooklistByid.fromJson(item));
cook.add(Cooklist.fromJson(item));
}
}
... ...
... ... @@ -447,6 +447,27 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "5.3.2"
flutter_keyboard_visibility:
dependency: "direct main"
description:
name: flutter_keyboard_visibility
url: "https://pub.flutter-io.cn"
source: hosted
version: "5.3.0"
flutter_keyboard_visibility_platform_interface:
dependency: transitive
description:
name: flutter_keyboard_visibility_platform_interface
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.0"
flutter_keyboard_visibility_web:
dependency: transitive
description:
name: flutter_keyboard_visibility_web
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.0"
flutter_native_image:
dependency: "direct main"
description:
... ...
... ... @@ -164,6 +164,7 @@ dependencies:
# sendsms: ^1.0.3
flutter_ex_widget: ^0.0.7
crypto: ^3.0.1
flutter_keyboard_visibility: ^5.3.0
... ...