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) { @@ -12,14 +12,14 @@ if (flutterRoot == null) {
12 } 12 }
13 13
14 14
15 -def flutterVersionCode = "401" 15 +def flutterVersionCode = "402"
16 if (flutterVersionCode == null) { 16 if (flutterVersionCode == null) {
17 - flutterVersionCode = '401' 17 + flutterVersionCode = '402'
18 } 18 }
19 19
20 -def flutterVersionName = "4.0.1" 20 +def flutterVersionName = "4.0.2"
21 if (flutterVersionName == null) { 21 if (flutterVersionName == null) {
22 - flutterVersionName = '4.0.1' 22 + flutterVersionName = '4.0.2'
23 } 23 }
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
25 apply plugin: 'kotlin-android' 25 apply plugin: 'kotlin-android'
@@ -636,7 +636,7 @@ @@ -636,7 +636,7 @@
636 CURRENT_PROJECT_VERSION = 393; 636 CURRENT_PROJECT_VERSION = 393;
637 DEVELOPMENT_TEAM = 8J59HM8B82; 637 DEVELOPMENT_TEAM = 8J59HM8B82;
638 ENABLE_BITCODE = NO; 638 ENABLE_BITCODE = NO;
639 - FLUTTER_BUILD_MODE = release; 639 + FLUTTER_BUILD_MODE = debug;
640 FRAMEWORK_SEARCH_PATHS = ( 640 FRAMEWORK_SEARCH_PATHS = (
641 "$(inherited)", 641 "$(inherited)",
642 "$(PROJECT_DIR)/Flutter", 642 "$(PROJECT_DIR)/Flutter",
  1 + extern const unsigned char RunnerVersionString[];
  2 + extern const double RunnerVersionNumber;
  3 +
  4 + const unsigned char RunnerVersionString[] __attribute__ ((used)) = "@(#)PROGRAM:Runner PROJECT:Runner-393" "\n";
  5 + const double RunnerVersionNumber __attribute__ ((used)) = (double)393.;
  1 +{"":{"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"}}
  1 +version: "Apple Swift version 5.6.1 (swiftlang-5.6.0.323.66 clang-1316.0.20.12)"
  2 +options: "31d1359b39fa124baf9b86a743115137d852f39fd379aa67ceb7d199d1a118f3"
  3 +build_start_time: [1662690689, 518762111]
  4 +build_end_time: [1662690689, 623396873]
  5 +inputs:
  6 + "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift": !private [1626855519, 779936790]
  1 +version: "Apple Swift version 5.6.1 (swiftlang-5.6.0.323.66 clang-1316.0.20.12)"
  2 +options: "31d1359b39fa124baf9b86a743115137d852f39fd379aa67ceb7d199d1a118f3"
  3 +build_start_time: [1662690146, 218652009]
  4 +build_end_time: [1662690146, 534229040]
  5 +inputs:
  6 + "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift": !private [1626855519, 779936790]
  1 +/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift
  1 +{"":{"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"}}
  1 +version: "Apple Swift version 5.6.1 (swiftlang-5.6.0.323.66 clang-1316.0.20.12)"
  2 +options: "31d1359b39fa124baf9b86a743115137d852f39fd379aa67ceb7d199d1a118f3"
  3 +build_start_time: [1662690277, 307630062]
  4 +build_end_time: [1662690277, 474601030]
  5 +inputs:
  6 + "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift": !private [1626855519, 779936790]
  1 +/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift
  1 +#!/bin/sh
  2 +diff "${PODS_PODFILE_DIR_PATH}/Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
  3 +if [ $? != 0 ] ; then
  4 + # print error to STDERR
  5 + echo "error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation." >&2
  6 + exit 1
  7 +fi
  8 +# This output is used by Xcode 'outputs' to avoid re-running this script phase.
  9 +echo "SUCCESS" > "${SCRIPT_OUTPUT_FILE_0}"
  10 +
  1 +{"case-sensitive":"false","roots":[],"version":0}
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
  3 +<plist version="1.0">
  4 +<dict>
  5 + <key>application-identifier</key>
  6 + <string>8J59HM8B82.com.naji.reserveLine</string>
  7 + <key>aps-environment</key>
  8 + <string>development</string>
  9 + <key>com.apple.developer.applesignin</key>
  10 + <array>
  11 + <string>Default</string>
  12 + </array>
  13 + <key>com.apple.developer.associated-domains</key>
  14 + <array>
  15 + <string>applinks:xt04.colorcun.com</string>
  16 + </array>
  17 +</dict>
  18 +</plist>
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
  3 +<plist version="1.0">
  4 +<dict>
  5 + <key>com.apple.security.get-task-allow</key>
  6 + <true/>
  7 +</dict>
  8 +</plist>
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
  3 +<plist version="1.0">
  4 +<dict>
  5 + <key>application-identifier</key>
  6 + <string>8J59HM8B82.com.naji.reserveLine</string>
  7 + <key>aps-environment</key>
  8 + <string>development</string>
  9 + <key>com.apple.developer.applesignin</key>
  10 + <array>
  11 + <string>Default</string>
  12 + </array>
  13 + <key>com.apple.developer.associated-domains</key>
  14 + <array>
  15 + <string>applinks:xt04.colorcun.com</string>
  16 + </array>
  17 +</dict>
  18 +</plist>
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
  3 +<plist version="1.0">
  4 +<dict>
  5 + <key>com.apple.security.get-task-allow</key>
  6 + <true/>
  7 +</dict>
  8 +</plist>
  1 +#!/bin/sh
  2 +diff "${PODS_PODFILE_DIR_PATH}/Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
  3 +if [ $? != 0 ] ; then
  4 + # print error to STDERR
  5 + echo "error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation." >&2
  6 + exit 1
  7 +fi
  8 +# This output is used by Xcode 'outputs' to avoid re-running this script phase.
  9 +echo "SUCCESS" > "${SCRIPT_OUTPUT_FILE_0}"
  10 +
  1 +{
  2 + "_buildCommand2" : {
  3 + "command" : "prepareForIndexing",
  4 + "enableIndexBuildArena" : false,
  5 + "targets" : null
  6 + },
  7 + "buildCommand" : "build",
  8 + "configuredTargets" : [
  9 + {
  10 + "guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
  11 + }
  12 + ],
  13 + "containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
  14 + "continueBuildingAfterErrors" : true,
  15 + "enableIndexBuildArena" : false,
  16 + "hideShellScriptEnvironment" : false,
  17 + "parameters" : {
  18 + "action" : "build",
  19 + "activeArchitecture" : "arm64e",
  20 + "activeRunDestination" : {
  21 + "disableOnlyActiveArch" : true,
  22 + "platform" : "iphoneos",
  23 + "sdk" : "iphoneos15.5",
  24 + "sdkVariant" : "iphoneos",
  25 + "supportedArchitectures" : [
  26 + "armv4t",
  27 + "armv5",
  28 + "armv6",
  29 + "armv7",
  30 + "armv7f",
  31 + "armv7s",
  32 + "armv7k",
  33 + "arm64",
  34 + "arm64e"
  35 + ],
  36 + "targetArchitecture" : "arm64e"
  37 + },
  38 + "arenaInfo" : {
  39 + "buildIntermediatesPath" : "",
  40 + "buildProductsPath" : "",
  41 + "derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
  42 + "indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
  43 + "indexEnableDataStore" : true,
  44 + "indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
  45 + "pchPath" : ""
  46 + },
  47 + "configurationName" : "Debug",
  48 + "overrides" : {
  49 + "synthesized" : {
  50 + "table" : {
  51 + "ENABLE_PREVIEWS" : "NO"
  52 + }
  53 + }
  54 + }
  55 + },
  56 + "qos" : "default",
  57 + "schemeCommand" : "launch",
  58 + "schemeCommand2" : "launch",
  59 + "shouldCollectMetrics" : false,
  60 + "showNonLoggedProgress" : true,
  61 + "useDryRun" : true,
  62 + "useImplicitDependencies" : true,
  63 + "useLegacyBuildLocations" : false,
  64 + "useParallelTargets" : true
  65 +}
  1 +Target dependency graph (1 target)
  2 +Runner in Runner, no dependencies
  1 +{
  2 + "_buildCommand2" : {
  3 + "command" : "prepareForIndexing",
  4 + "enableIndexBuildArena" : false,
  5 + "targets" : null
  6 + },
  7 + "buildCommand" : "build",
  8 + "configuredTargets" : [
  9 + {
  10 + "guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
  11 + }
  12 + ],
  13 + "containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
  14 + "continueBuildingAfterErrors" : true,
  15 + "enableIndexBuildArena" : false,
  16 + "hideShellScriptEnvironment" : false,
  17 + "parameters" : {
  18 + "action" : "build",
  19 + "activeArchitecture" : "arm64",
  20 + "activeRunDestination" : {
  21 + "disableOnlyActiveArch" : false,
  22 + "platform" : "iphoneos",
  23 + "sdk" : "iphoneos15.5",
  24 + "sdkVariant" : "iphoneos",
  25 + "supportedArchitectures" : [
  26 + "arm64e",
  27 + "arm64v8",
  28 + "arm64",
  29 + "armv8"
  30 + ],
  31 + "targetArchitecture" : "arm64"
  32 + },
  33 + "arenaInfo" : {
  34 + "buildIntermediatesPath" : "",
  35 + "buildProductsPath" : "",
  36 + "derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
  37 + "indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
  38 + "indexEnableDataStore" : true,
  39 + "indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
  40 + "pchPath" : ""
  41 + },
  42 + "configurationName" : "Debug",
  43 + "overrides" : {
  44 + "synthesized" : {
  45 + "table" : {
  46 + "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL" : "iPhone12,8",
  47 + "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION" : "14.4.2",
  48 + "BUILD_ACTIVE_RESOURCES_ONLY" : "YES",
  49 + "ENABLE_PREVIEWS" : "NO",
  50 + "TARGET_DEVICE_IDENTIFIER" : "00008030-000640322103802E",
  51 + "TARGET_DEVICE_MODEL" : "iPhone12,8",
  52 + "TARGET_DEVICE_OS_VERSION" : "14.4.2",
  53 + "TARGET_DEVICE_PLATFORM_NAME" : "iphoneos"
  54 + }
  55 + }
  56 + }
  57 + },
  58 + "schemeCommand" : "launch",
  59 + "schemeCommand2" : "launch",
  60 + "shouldCollectMetrics" : false,
  61 + "showNonLoggedProgress" : true,
  62 + "useDryRun" : false,
  63 + "useImplicitDependencies" : true,
  64 + "useLegacyBuildLocations" : false,
  65 + "useParallelTargets" : true
  66 +}
  1 +Target dependency graph (1 target)
  2 +Runner in Runner, no dependencies
  1 +{
  2 + "_buildCommand2" : {
  3 + "command" : "prepareForIndexing",
  4 + "enableIndexBuildArena" : false,
  5 + "targets" : null
  6 + },
  7 + "buildCommand" : "build",
  8 + "configuredTargets" : [
  9 + {
  10 + "guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
  11 + }
  12 + ],
  13 + "containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
  14 + "continueBuildingAfterErrors" : true,
  15 + "enableIndexBuildArena" : false,
  16 + "hideShellScriptEnvironment" : false,
  17 + "parameters" : {
  18 + "action" : "build",
  19 + "activeArchitecture" : "arm64",
  20 + "activeRunDestination" : {
  21 + "disableOnlyActiveArch" : false,
  22 + "platform" : "iphoneos",
  23 + "sdk" : "iphoneos15.5",
  24 + "sdkVariant" : "iphoneos",
  25 + "supportedArchitectures" : [
  26 + "arm64e",
  27 + "arm64v8",
  28 + "arm64",
  29 + "armv8"
  30 + ],
  31 + "targetArchitecture" : "arm64"
  32 + },
  33 + "arenaInfo" : {
  34 + "buildIntermediatesPath" : "",
  35 + "buildProductsPath" : "",
  36 + "derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
  37 + "indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
  38 + "indexEnableDataStore" : true,
  39 + "indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
  40 + "pchPath" : ""
  41 + },
  42 + "configurationName" : "Debug",
  43 + "overrides" : {
  44 + "synthesized" : {
  45 + "table" : {
  46 + "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL" : "iPhone12,8",
  47 + "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION" : "14.4.2",
  48 + "BUILD_ACTIVE_RESOURCES_ONLY" : "YES",
  49 + "ENABLE_PREVIEWS" : "NO",
  50 + "TARGET_DEVICE_IDENTIFIER" : "00008030-000640322103802E",
  51 + "TARGET_DEVICE_MODEL" : "iPhone12,8",
  52 + "TARGET_DEVICE_OS_VERSION" : "14.4.2",
  53 + "TARGET_DEVICE_PLATFORM_NAME" : "iphoneos"
  54 + }
  55 + }
  56 + }
  57 + },
  58 + "qos" : "default",
  59 + "schemeCommand" : "launch",
  60 + "schemeCommand2" : "launch",
  61 + "shouldCollectMetrics" : false,
  62 + "showNonLoggedProgress" : true,
  63 + "useDryRun" : true,
  64 + "useImplicitDependencies" : true,
  65 + "useLegacyBuildLocations" : false,
  66 + "useParallelTargets" : true
  67 +}
  1 +Target dependency graph (1 target)
  2 +Runner in Runner, no dependencies
  1 +{
  2 + "_buildCommand2" : {
  3 + "command" : "prepareForIndexing",
  4 + "enableIndexBuildArena" : false,
  5 + "targets" : null
  6 + },
  7 + "buildCommand" : "build",
  8 + "configuredTargets" : [
  9 + {
  10 + "guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
  11 + }
  12 + ],
  13 + "containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
  14 + "continueBuildingAfterErrors" : true,
  15 + "enableIndexBuildArena" : false,
  16 + "hideShellScriptEnvironment" : false,
  17 + "parameters" : {
  18 + "action" : "build",
  19 + "activeArchitecture" : "arm64",
  20 + "activeRunDestination" : {
  21 + "disableOnlyActiveArch" : false,
  22 + "platform" : "iphoneos",
  23 + "sdk" : "iphoneos15.5",
  24 + "sdkVariant" : "iphoneos",
  25 + "supportedArchitectures" : [
  26 + "arm64e",
  27 + "arm64v8",
  28 + "arm64",
  29 + "armv8"
  30 + ],
  31 + "targetArchitecture" : "arm64"
  32 + },
  33 + "arenaInfo" : {
  34 + "buildIntermediatesPath" : "",
  35 + "buildProductsPath" : "",
  36 + "derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
  37 + "indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
  38 + "indexEnableDataStore" : true,
  39 + "indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
  40 + "pchPath" : ""
  41 + },
  42 + "configurationName" : "Debug",
  43 + "overrides" : {
  44 + "synthesized" : {
  45 + "table" : {
  46 + "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL" : "iPhone12,8",
  47 + "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION" : "14.4.2",
  48 + "BUILD_ACTIVE_RESOURCES_ONLY" : "YES",
  49 + "ENABLE_PREVIEWS" : "NO",
  50 + "TARGET_DEVICE_IDENTIFIER" : "00008030-000640322103802E",
  51 + "TARGET_DEVICE_MODEL" : "iPhone12,8",
  52 + "TARGET_DEVICE_OS_VERSION" : "14.4.2",
  53 + "TARGET_DEVICE_PLATFORM_NAME" : "iphoneos"
  54 + }
  55 + }
  56 + }
  57 + },
  58 + "qos" : "default",
  59 + "schemeCommand" : "launch",
  60 + "schemeCommand2" : "launch",
  61 + "shouldCollectMetrics" : false,
  62 + "showNonLoggedProgress" : true,
  63 + "useDryRun" : true,
  64 + "useImplicitDependencies" : true,
  65 + "useLegacyBuildLocations" : false,
  66 + "useParallelTargets" : true
  67 +}
  1 +Target dependency graph (1 target)
  2 +Runner in Runner, no dependencies
  1 +{
  2 + "_buildCommand2" : {
  3 + "command" : "prepareForIndexing",
  4 + "enableIndexBuildArena" : false,
  5 + "targets" : null
  6 + },
  7 + "buildCommand" : "build",
  8 + "configuredTargets" : [
  9 + {
  10 + "guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
  11 + }
  12 + ],
  13 + "containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
  14 + "continueBuildingAfterErrors" : true,
  15 + "enableIndexBuildArena" : false,
  16 + "hideShellScriptEnvironment" : false,
  17 + "parameters" : {
  18 + "action" : "build",
  19 + "activeArchitecture" : "arm64",
  20 + "activeRunDestination" : {
  21 + "disableOnlyActiveArch" : false,
  22 + "platform" : "iphoneos",
  23 + "sdk" : "iphoneos15.5",
  24 + "sdkVariant" : "iphoneos",
  25 + "supportedArchitectures" : [
  26 + "arm64v8",
  27 + "arm64",
  28 + "armv8"
  29 + ],
  30 + "targetArchitecture" : "arm64"
  31 + },
  32 + "arenaInfo" : {
  33 + "buildIntermediatesPath" : "",
  34 + "buildProductsPath" : "",
  35 + "derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
  36 + "indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
  37 + "indexEnableDataStore" : true,
  38 + "indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
  39 + "pchPath" : ""
  40 + },
  41 + "configurationName" : "Debug",
  42 + "overrides" : {
  43 + "synthesized" : {
  44 + "table" : {
  45 + "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL" : "iPhone10,2",
  46 + "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION" : "13.6",
  47 + "BUILD_ACTIVE_RESOURCES_ONLY" : "YES",
  48 + "ENABLE_PREVIEWS" : "NO",
  49 + "TARGET_DEVICE_IDENTIFIER" : "fe000909aeb9328b501332bf921126c213f1c4a4",
  50 + "TARGET_DEVICE_MODEL" : "iPhone10,2",
  51 + "TARGET_DEVICE_OS_VERSION" : "13.6",
  52 + "TARGET_DEVICE_PLATFORM_NAME" : "iphoneos"
  53 + }
  54 + }
  55 + }
  56 + },
  57 + "schemeCommand" : "launch",
  58 + "schemeCommand2" : "launch",
  59 + "shouldCollectMetrics" : false,
  60 + "showNonLoggedProgress" : true,
  61 + "useDryRun" : false,
  62 + "useImplicitDependencies" : true,
  63 + "useLegacyBuildLocations" : false,
  64 + "useParallelTargets" : true
  65 +}
This diff could not be displayed because it is too large.
  1 +Target dependency graph (1 target)
  2 +Runner in Runner, no dependencies
  1 +{
  2 + "_buildCommand2" : {
  3 + "command" : "prepareForIndexing",
  4 + "enableIndexBuildArena" : false,
  5 + "targets" : null
  6 + },
  7 + "buildCommand" : "build",
  8 + "configuredTargets" : [
  9 + {
  10 + "guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
  11 + }
  12 + ],
  13 + "containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
  14 + "continueBuildingAfterErrors" : true,
  15 + "enableIndexBuildArena" : false,
  16 + "hideShellScriptEnvironment" : false,
  17 + "parameters" : {
  18 + "action" : "build",
  19 + "activeArchitecture" : "arm64",
  20 + "activeRunDestination" : {
  21 + "disableOnlyActiveArch" : false,
  22 + "platform" : "iphoneos",
  23 + "sdk" : "iphoneos15.5",
  24 + "sdkVariant" : "iphoneos",
  25 + "supportedArchitectures" : [
  26 + "arm64v8",
  27 + "arm64",
  28 + "armv8"
  29 + ],
  30 + "targetArchitecture" : "arm64"
  31 + },
  32 + "arenaInfo" : {
  33 + "buildIntermediatesPath" : "",
  34 + "buildProductsPath" : "",
  35 + "derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
  36 + "indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
  37 + "indexEnableDataStore" : true,
  38 + "indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
  39 + "pchPath" : ""
  40 + },
  41 + "configurationName" : "Debug",
  42 + "overrides" : {
  43 + "synthesized" : {
  44 + "table" : {
  45 + "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL" : "iPhone10,2",
  46 + "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION" : "13.6",
  47 + "BUILD_ACTIVE_RESOURCES_ONLY" : "YES",
  48 + "ENABLE_PREVIEWS" : "NO",
  49 + "TARGET_DEVICE_IDENTIFIER" : "fe000909aeb9328b501332bf921126c213f1c4a4",
  50 + "TARGET_DEVICE_MODEL" : "iPhone10,2",
  51 + "TARGET_DEVICE_OS_VERSION" : "13.6",
  52 + "TARGET_DEVICE_PLATFORM_NAME" : "iphoneos"
  53 + }
  54 + }
  55 + }
  56 + },
  57 + "qos" : "default",
  58 + "schemeCommand" : "launch",
  59 + "schemeCommand2" : "launch",
  60 + "shouldCollectMetrics" : false,
  61 + "showNonLoggedProgress" : true,
  62 + "useDryRun" : true,
  63 + "useImplicitDependencies" : true,
  64 + "useLegacyBuildLocations" : false,
  65 + "useParallelTargets" : true
  66 +}
This diff could not be displayed because it is too large.
  1 +Target dependency graph (1 target)
  2 +Runner in Runner, no dependencies
  1 +{
  2 + "_buildCommand2" : {
  3 + "command" : "prepareForIndexing",
  4 + "enableIndexBuildArena" : false,
  5 + "targets" : null
  6 + },
  7 + "buildCommand" : "build",
  8 + "configuredTargets" : [
  9 + {
  10 + "guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
  11 + }
  12 + ],
  13 + "containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
  14 + "continueBuildingAfterErrors" : true,
  15 + "enableIndexBuildArena" : false,
  16 + "hideShellScriptEnvironment" : false,
  17 + "parameters" : {
  18 + "action" : "build",
  19 + "activeArchitecture" : "arm64e",
  20 + "activeRunDestination" : {
  21 + "disableOnlyActiveArch" : true,
  22 + "platform" : "iphoneos",
  23 + "sdk" : "iphoneos15.5",
  24 + "sdkVariant" : "iphoneos",
  25 + "supportedArchitectures" : [
  26 + "armv4t",
  27 + "armv5",
  28 + "armv6",
  29 + "armv7",
  30 + "armv7f",
  31 + "armv7s",
  32 + "armv7k",
  33 + "arm64",
  34 + "arm64e"
  35 + ],
  36 + "targetArchitecture" : "arm64e"
  37 + },
  38 + "arenaInfo" : {
  39 + "buildIntermediatesPath" : "",
  40 + "buildProductsPath" : "",
  41 + "derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
  42 + "indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
  43 + "indexEnableDataStore" : true,
  44 + "indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
  45 + "pchPath" : ""
  46 + },
  47 + "configurationName" : "Debug",
  48 + "overrides" : {
  49 + "synthesized" : {
  50 + "table" : {
  51 + "ENABLE_PREVIEWS" : "NO"
  52 + }
  53 + }
  54 + }
  55 + },
  56 + "qos" : "default",
  57 + "schemeCommand" : "launch",
  58 + "schemeCommand2" : "launch",
  59 + "shouldCollectMetrics" : false,
  60 + "showNonLoggedProgress" : true,
  61 + "useDryRun" : true,
  62 + "useImplicitDependencies" : true,
  63 + "useLegacyBuildLocations" : false,
  64 + "useParallelTargets" : true
  65 +}
  1 +Target dependency graph (1 target)
  2 +Runner in Runner, no dependencies
This diff could not be displayed because it is too large.
  1 +{
  2 + "_buildCommand2" : {
  3 + "command" : "build",
  4 + "skipDependencies" : false,
  5 + "style" : "buildOnly"
  6 + },
  7 + "buildCommand" : "build",
  8 + "configuredTargets" : [
  9 + {
  10 + "guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
  11 + }
  12 + ],
  13 + "containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
  14 + "continueBuildingAfterErrors" : false,
  15 + "enableIndexBuildArena" : false,
  16 + "hideShellScriptEnvironment" : false,
  17 + "parameters" : {
  18 + "action" : "build",
  19 + "activeArchitecture" : "x86_64",
  20 + "activeRunDestination" : {
  21 + "disableOnlyActiveArch" : false,
  22 + "platform" : "iphonesimulator",
  23 + "sdk" : "iphonesimulator15.5",
  24 + "sdkVariant" : "iphonesimulator",
  25 + "supportedArchitectures" : [
  26 + "x86_64"
  27 + ],
  28 + "targetArchitecture" : "x86_64"
  29 + },
  30 + "arenaInfo" : {
  31 + "buildIntermediatesPath" : "",
  32 + "buildProductsPath" : "",
  33 + "derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
  34 + "indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
  35 + "indexEnableDataStore" : true,
  36 + "indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
  37 + "pchPath" : ""
  38 + },
  39 + "configurationName" : "Debug",
  40 + "overrides" : {
  41 + "synthesized" : {
  42 + "table" : {
  43 + "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL" : "iPod9,1",
  44 + "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION" : "15.5",
  45 + "BUILD_ACTIVE_RESOURCES_ONLY" : "YES",
  46 + "ENABLE_PREVIEWS" : "NO",
  47 + "TARGET_DEVICE_IDENTIFIER" : "4F37EB2A-0B56-47DD-8C12-66109A28A224",
  48 + "TARGET_DEVICE_MODEL" : "iPod9,1",
  49 + "TARGET_DEVICE_OS_VERSION" : "15.5",
  50 + "TARGET_DEVICE_PLATFORM_NAME" : "iphonesimulator"
  51 + }
  52 + }
  53 + }
  54 + },
  55 + "schemeCommand" : "launch",
  56 + "schemeCommand2" : "launch",
  57 + "shouldCollectMetrics" : false,
  58 + "showNonLoggedProgress" : true,
  59 + "useDryRun" : false,
  60 + "useImplicitDependencies" : true,
  61 + "useLegacyBuildLocations" : false,
  62 + "useParallelTargets" : true
  63 +}
  1 +Target dependency graph (1 target)
  2 +Runner in Runner, no dependencies
  1 +{
  2 + "_buildCommand2" : {
  3 + "command" : "prepareForIndexing",
  4 + "enableIndexBuildArena" : false,
  5 + "targets" : null
  6 + },
  7 + "buildCommand" : "build",
  8 + "configuredTargets" : [
  9 + {
  10 + "guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
  11 + }
  12 + ],
  13 + "containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
  14 + "continueBuildingAfterErrors" : true,
  15 + "enableIndexBuildArena" : false,
  16 + "hideShellScriptEnvironment" : false,
  17 + "parameters" : {
  18 + "action" : "build",
  19 + "activeArchitecture" : "arm64",
  20 + "activeRunDestination" : {
  21 + "disableOnlyActiveArch" : false,
  22 + "platform" : "iphoneos",
  23 + "sdk" : "iphoneos15.5",
  24 + "sdkVariant" : "iphoneos",
  25 + "supportedArchitectures" : [
  26 + "arm64v8",
  27 + "arm64",
  28 + "armv8"
  29 + ],
  30 + "targetArchitecture" : "arm64"
  31 + },
  32 + "arenaInfo" : {
  33 + "buildIntermediatesPath" : "",
  34 + "buildProductsPath" : "",
  35 + "derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
  36 + "indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
  37 + "indexEnableDataStore" : true,
  38 + "indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
  39 + "pchPath" : ""
  40 + },
  41 + "configurationName" : "Debug",
  42 + "overrides" : {
  43 + "synthesized" : {
  44 + "table" : {
  45 + "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL" : "iPhone10,2",
  46 + "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION" : "13.6",
  47 + "BUILD_ACTIVE_RESOURCES_ONLY" : "YES",
  48 + "ENABLE_PREVIEWS" : "NO",
  49 + "TARGET_DEVICE_IDENTIFIER" : "fe000909aeb9328b501332bf921126c213f1c4a4",
  50 + "TARGET_DEVICE_MODEL" : "iPhone10,2",
  51 + "TARGET_DEVICE_OS_VERSION" : "13.6",
  52 + "TARGET_DEVICE_PLATFORM_NAME" : "iphoneos"
  53 + }
  54 + }
  55 + }
  56 + },
  57 + "qos" : "default",
  58 + "schemeCommand" : "launch",
  59 + "schemeCommand2" : "launch",
  60 + "shouldCollectMetrics" : false,
  61 + "showNonLoggedProgress" : true,
  62 + "useDryRun" : true,
  63 + "useImplicitDependencies" : true,
  64 + "useLegacyBuildLocations" : false,
  65 + "useParallelTargets" : true
  66 +}
This diff could not be displayed because it is too large.
  1 +Target dependency graph (1 target)
  2 +Runner in Runner, no dependencies
  1 +{
  2 + "_buildCommand2" : {
  3 + "command" : "prepareForIndexing",
  4 + "enableIndexBuildArena" : false,
  5 + "targets" : null
  6 + },
  7 + "buildCommand" : "build",
  8 + "configuredTargets" : [
  9 + {
  10 + "guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
  11 + }
  12 + ],
  13 + "containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
  14 + "continueBuildingAfterErrors" : true,
  15 + "enableIndexBuildArena" : false,
  16 + "hideShellScriptEnvironment" : false,
  17 + "parameters" : {
  18 + "action" : "build",
  19 + "activeArchitecture" : "arm64e",
  20 + "activeRunDestination" : {
  21 + "disableOnlyActiveArch" : true,
  22 + "platform" : "iphoneos",
  23 + "sdk" : "iphoneos15.5",
  24 + "sdkVariant" : "iphoneos",
  25 + "supportedArchitectures" : [
  26 + "armv4t",
  27 + "armv5",
  28 + "armv6",
  29 + "armv7",
  30 + "armv7f",
  31 + "armv7s",
  32 + "armv7k",
  33 + "arm64",
  34 + "arm64e"
  35 + ],
  36 + "targetArchitecture" : "arm64e"
  37 + },
  38 + "arenaInfo" : {
  39 + "buildIntermediatesPath" : "",
  40 + "buildProductsPath" : "",
  41 + "derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
  42 + "indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
  43 + "indexEnableDataStore" : true,
  44 + "indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
  45 + "pchPath" : ""
  46 + },
  47 + "configurationName" : "Debug",
  48 + "overrides" : {
  49 + "synthesized" : {
  50 + "table" : {
  51 + "ENABLE_PREVIEWS" : "NO"
  52 + }
  53 + }
  54 + }
  55 + },
  56 + "qos" : "default",
  57 + "schemeCommand" : "launch",
  58 + "schemeCommand2" : "launch",
  59 + "shouldCollectMetrics" : false,
  60 + "showNonLoggedProgress" : true,
  61 + "useDryRun" : true,
  62 + "useImplicitDependencies" : true,
  63 + "useLegacyBuildLocations" : false,
  64 + "useParallelTargets" : true
  65 +}
This diff could not be displayed because it is too large.
  1 +Target dependency graph (1 target)
  2 +Runner in Runner, no dependencies
  1 +{
  2 + "_buildCommand2" : {
  3 + "command" : "prepareForIndexing",
  4 + "enableIndexBuildArena" : false,
  5 + "targets" : null
  6 + },
  7 + "buildCommand" : "build",
  8 + "configuredTargets" : [
  9 + {
  10 + "guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
  11 + }
  12 + ],
  13 + "containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
  14 + "continueBuildingAfterErrors" : true,
  15 + "enableIndexBuildArena" : false,
  16 + "hideShellScriptEnvironment" : false,
  17 + "parameters" : {
  18 + "action" : "build",
  19 + "activeArchitecture" : "arm64",
  20 + "activeRunDestination" : {
  21 + "disableOnlyActiveArch" : false,
  22 + "platform" : "iphoneos",
  23 + "sdk" : "iphoneos15.5",
  24 + "sdkVariant" : "iphoneos",
  25 + "supportedArchitectures" : [
  26 + "arm64v8",
  27 + "arm64",
  28 + "armv8"
  29 + ],
  30 + "targetArchitecture" : "arm64"
  31 + },
  32 + "arenaInfo" : {
  33 + "buildIntermediatesPath" : "",
  34 + "buildProductsPath" : "",
  35 + "derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
  36 + "indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
  37 + "indexEnableDataStore" : true,
  38 + "indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
  39 + "pchPath" : ""
  40 + },
  41 + "configurationName" : "Debug",
  42 + "overrides" : {
  43 + "synthesized" : {
  44 + "table" : {
  45 + "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL" : "iPhone10,2",
  46 + "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION" : "13.6",
  47 + "BUILD_ACTIVE_RESOURCES_ONLY" : "YES",
  48 + "ENABLE_PREVIEWS" : "NO",
  49 + "TARGET_DEVICE_IDENTIFIER" : "fe000909aeb9328b501332bf921126c213f1c4a4",
  50 + "TARGET_DEVICE_MODEL" : "iPhone10,2",
  51 + "TARGET_DEVICE_OS_VERSION" : "13.6",
  52 + "TARGET_DEVICE_PLATFORM_NAME" : "iphoneos"
  53 + }
  54 + }
  55 + }
  56 + },
  57 + "schemeCommand" : "launch",
  58 + "schemeCommand2" : "launch",
  59 + "shouldCollectMetrics" : false,
  60 + "showNonLoggedProgress" : true,
  61 + "useDryRun" : false,
  62 + "useImplicitDependencies" : true,
  63 + "useLegacyBuildLocations" : false,
  64 + "useParallelTargets" : true
  65 +}
  1 +Target dependency graph (1 target)
  2 +Runner in Runner, no dependencies
  1 +{
  2 + "_buildCommand2" : {
  3 + "command" : "build",
  4 + "skipDependencies" : false,
  5 + "style" : "buildOnly"
  6 + },
  7 + "buildCommand" : "build",
  8 + "configuredTargets" : [
  9 + {
  10 + "guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
  11 + }
  12 + ],
  13 + "containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
  14 + "continueBuildingAfterErrors" : false,
  15 + "enableIndexBuildArena" : false,
  16 + "hideShellScriptEnvironment" : false,
  17 + "parameters" : {
  18 + "action" : "build",
  19 + "activeArchitecture" : "arm64e",
  20 + "activeRunDestination" : {
  21 + "disableOnlyActiveArch" : true,
  22 + "platform" : "iphoneos",
  23 + "sdk" : "iphoneos15.5",
  24 + "sdkVariant" : "iphoneos",
  25 + "supportedArchitectures" : [
  26 + "armv4t",
  27 + "armv5",
  28 + "armv6",
  29 + "armv7",
  30 + "armv7f",
  31 + "armv7s",
  32 + "armv7k",
  33 + "arm64",
  34 + "arm64e"
  35 + ],
  36 + "targetArchitecture" : "arm64e"
  37 + },
  38 + "arenaInfo" : {
  39 + "buildIntermediatesPath" : "",
  40 + "buildProductsPath" : "",
  41 + "derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
  42 + "indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
  43 + "indexEnableDataStore" : true,
  44 + "indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
  45 + "pchPath" : ""
  46 + },
  47 + "configurationName" : "Debug",
  48 + "overrides" : {
  49 + "synthesized" : {
  50 + "table" : {
  51 + "ENABLE_PREVIEWS" : "NO"
  52 + }
  53 + }
  54 + }
  55 + },
  56 + "schemeCommand" : "launch",
  57 + "schemeCommand2" : "launch",
  58 + "shouldCollectMetrics" : false,
  59 + "showNonLoggedProgress" : true,
  60 + "useDryRun" : false,
  61 + "useImplicitDependencies" : true,
  62 + "useLegacyBuildLocations" : false,
  63 + "useParallelTargets" : true
  64 +}
  1 +Target dependency graph (1 target)
  2 +Runner in Runner, no dependencies
  1 +{
  2 + "_buildCommand2" : {
  3 + "command" : "prepareForIndexing",
  4 + "enableIndexBuildArena" : false,
  5 + "targets" : null
  6 + },
  7 + "buildCommand" : "build",
  8 + "configuredTargets" : [
  9 + {
  10 + "guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
  11 + }
  12 + ],
  13 + "containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
  14 + "continueBuildingAfterErrors" : true,
  15 + "enableIndexBuildArena" : false,
  16 + "hideShellScriptEnvironment" : false,
  17 + "parameters" : {
  18 + "action" : "build",
  19 + "activeArchitecture" : "arm64e",
  20 + "activeRunDestination" : {
  21 + "disableOnlyActiveArch" : true,
  22 + "platform" : "iphoneos",
  23 + "sdk" : "iphoneos15.5",
  24 + "sdkVariant" : "iphoneos",
  25 + "supportedArchitectures" : [
  26 + "armv4t",
  27 + "armv5",
  28 + "armv6",
  29 + "armv7",
  30 + "armv7f",
  31 + "armv7s",
  32 + "armv7k",
  33 + "arm64",
  34 + "arm64e"
  35 + ],
  36 + "targetArchitecture" : "arm64e"
  37 + },
  38 + "arenaInfo" : {
  39 + "buildIntermediatesPath" : "",
  40 + "buildProductsPath" : "",
  41 + "derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
  42 + "indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
  43 + "indexEnableDataStore" : true,
  44 + "indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
  45 + "pchPath" : ""
  46 + },
  47 + "configurationName" : "Debug",
  48 + "overrides" : {
  49 + "synthesized" : {
  50 + "table" : {
  51 + "ENABLE_PREVIEWS" : "NO"
  52 + }
  53 + }
  54 + }
  55 + },
  56 + "schemeCommand" : "launch",
  57 + "schemeCommand2" : "launch",
  58 + "shouldCollectMetrics" : false,
  59 + "showNonLoggedProgress" : true,
  60 + "useDryRun" : false,
  61 + "useImplicitDependencies" : true,
  62 + "useLegacyBuildLocations" : false,
  63 + "useParallelTargets" : true
  64 +}
  1 +Target dependency graph (1 target)
  2 +Runner in Runner, no dependencies
This diff could not be displayed because it is too large.
@@ -463,7 +463,7 @@ class SetmealDetail { @@ -463,7 +463,7 @@ class SetmealDetail {
463 String pnum; 463 String pnum;
464 String min; 464 String min;
465 String spare; 465 String spare;
466 - List<CooklistByid> cooklist; 466 + List<Cooklist> cooklist;
467 String mealName; 467 String mealName;
468 468
469 SetmealDetail( 469 SetmealDetail(
@@ -483,10 +483,20 @@ class SetmealDetail { @@ -483,10 +483,20 @@ class SetmealDetail {
483 pnum = json['pnum']; 483 pnum = json['pnum'];
484 min = json['min']; 484 min = json['min'];
485 spare = json['spare']; 485 spare = json['spare'];
486 - if (json['cooklist'] != null) {  
487 - cooklist = <CooklistByid>[];  
488 - json['cooklist'].forEach((v) {  
489 - cooklist.add(new CooklistByid.fromJson(v)); 486 + // if (json['cooklist'] != null) {
  487 + // cooklist = <Cooklist>[];
  488 + // json['cooklist'].forEach((v) {
  489 + // cooklist.add(new Cooklist.fromJson(v));
  490 + // });
  491 + // }
  492 +
  493 + if (json['cooklist'] != null && json['cooklist'].length > 0) {
  494 + cooklist = <Cooklist>[];
  495 + Map map = json['cooklist'];
  496 + map.forEach((key, v) {
  497 + v.forEach((v1) {
  498 + cooklist.add(new Cooklist.fromJson(v1));
  499 + });
490 }); 500 });
491 } 501 }
492 mealName = json['meal_name']; 502 mealName = json['meal_name'];
@@ -508,21 +518,21 @@ class SetmealDetail { @@ -508,21 +518,21 @@ class SetmealDetail {
508 } 518 }
509 } 519 }
510 520
511 -class CooklistByid {  
512 - String cname; 521 +// class Cooklist {
  522 +// String cname;
513 523
514 - CooklistByid({this.cname}); 524 +// Cooklist({this.cname});
515 525
516 - CooklistByid.fromJson(Map<String, dynamic> json) {  
517 - cname = json['cname'];  
518 - } 526 +// Cooklist.fromJson(Map<String, dynamic> json) {
  527 +// cname = json['cname'];
  528 +// }
519 529
520 - Map<String, dynamic> toJson() {  
521 - final Map<String, dynamic> data = new Map<String, dynamic>();  
522 - data['cname'] = this.cname;  
523 - return data;  
524 - }  
525 -} 530 +// Map<String, dynamic> toJson() {
  531 +// final Map<String, dynamic> data = new Map<String, dynamic>();
  532 +// data['cname'] = this.cname;
  533 +// return data;
  534 +// }
  535 +// }
526 536
527 class WineDetail { 537 class WineDetail {
528 String wineName; 538 String wineName;
1 import 'package:flutter/material.dart'; 1 import 'package:flutter/material.dart';
2 import 'package:one_key/models/dsolt_xt.dart'; 2 import 'package:one_key/models/dsolt_xt.dart';
3 import 'package:one_key/models/setmeal_by_id_model.dart'; 3 import 'package:one_key/models/setmeal_by_id_model.dart';
  4 +import 'package:one_key/models/setmeal_model.dart';
4 import 'package:one_key/models/table_list.dart' as t; 5 import 'package:one_key/models/table_list.dart' as t;
5 import 'package:one_key/models/upload_img_model.dart'; 6 import 'package:one_key/models/upload_img_model.dart';
6 7
@@ -149,7 +150,7 @@ class Setmeal { @@ -149,7 +150,7 @@ class Setmeal {
149 TextEditingController minC; 150 TextEditingController minC;
150 TextEditingController spareC; 151 TextEditingController spareC;
151 List<Cooklist> cooklist; 152 List<Cooklist> cooklist;
152 - Map<String, List<CookByIdSetmeal>> dataMenu = {}; 153 + Map<String, List<Cook>> dataMenu = {};
153 154
154 Setmeal({ 155 Setmeal({
155 this.setmealId, 156 this.setmealId,
@@ -180,11 +181,26 @@ class Setmeal { @@ -180,11 +181,26 @@ class Setmeal {
180 name = json['name']; 181 name = json['name'];
181 select = json['select']; 182 select = json['select'];
182 bargaining = json['bargaining']; 183 bargaining = json['bargaining'];
183 - if (json['cooklist'] != null) { 184 + // if (json['cooklist'] != null) {
  185 + // cooklist = <Cooklist>[];
  186 + // json['cooklist'].forEach((v) {
  187 + // cooklist.add(new Cooklist.fromJson(v));
  188 + // });
  189 + // }
  190 + if (json['cooklist'] != null && json['cooklist'].length > 0) {
184 cooklist = <Cooklist>[]; 191 cooklist = <Cooklist>[];
185 - json['cooklist'].forEach((v) {  
186 - cooklist.add(new Cooklist.fromJson(v)); 192 + dataMenu = {};
  193 + Map map = json['cooklist'];
  194 +
  195 + map.forEach((key, v) {
  196 + List<Cook> cooktemp = [];
  197 + v.forEach((v1) {
  198 + cooklist.add(new Cooklist.fromJson(v1));
  199 + cooktemp.add(new Cook.fromJson(v1));
  200 + });
  201 + dataMenu[key] = cooktemp;
187 }); 202 });
  203 + print(dataMenu);
188 } 204 }
189 205
190 // finalPriceC = json['finalPriceC']; 206 // finalPriceC = json['finalPriceC'];
@@ -255,6 +271,7 @@ class Wine { @@ -255,6 +271,7 @@ class Wine {
255 finalPrice = json['final_price']; 271 finalPrice = json['final_price'];
256 numStr = json['num']; 272 numStr = json['num'];
257 name = json['name']; 273 name = json['name'];
  274 + spec = json['spec'];
258 } 275 }
259 276
260 Map<String, dynamic> toJson() { 277 Map<String, dynamic> toJson() {
@@ -264,7 +281,7 @@ class Wine { @@ -264,7 +281,7 @@ class Wine {
264 data['final_price'] = this.finalPrice; 281 data['final_price'] = this.finalPrice;
265 data['num'] = this.numStr; 282 data['num'] = this.numStr;
266 data['name'] = this.name; 283 data['name'] = this.name;
267 - 284 + data['spec'] = this.spec;
268 return data; 285 return data;
269 } 286 }
270 } 287 }
@@ -291,6 +308,7 @@ class Other { @@ -291,6 +308,7 @@ class Other {
291 finalPrice = json['final_price']; 308 finalPrice = json['final_price'];
292 numStr = json['num']; 309 numStr = json['num'];
293 name = json['name']; 310 name = json['name'];
  311 + spec = json['spec'];
294 } 312 }
295 313
296 Map<String, dynamic> toJson() { 314 Map<String, dynamic> toJson() {
@@ -300,7 +318,7 @@ class Other { @@ -300,7 +318,7 @@ class Other {
300 data['final_price'] = this.finalPrice; 318 data['final_price'] = this.finalPrice;
301 data['num'] = this.numStr; 319 data['num'] = this.numStr;
302 data['name'] = this.name; 320 data['name'] = this.name;
303 - 321 + data['spec'] = this.spec;
304 return data; 322 return data;
305 } 323 }
306 } 324 }
1 import 'package:flutter/material.dart'; 1 import 'package:flutter/material.dart';
  2 +import 'package:one_key/models/setmeal_model.dart';
2 3
3 class SetMeaByIdModel { 4 class SetMeaByIdModel {
4 int ret; 5 int ret;
@@ -36,7 +37,7 @@ class SetMeaByIdSunModel { @@ -36,7 +37,7 @@ class SetMeaByIdSunModel {
36 String status; 37 String status;
37 dynamic cdate; 38 dynamic cdate;
38 List<ClassifyById> classify; 39 List<ClassifyById> classify;
39 - List<CookByIdSetmeal> cook; 40 + List<Cook> cook;
40 41
41 SetMeaByIdSunModel( 42 SetMeaByIdSunModel(
42 {this.id, 43 {this.id,
@@ -64,9 +65,9 @@ class SetMeaByIdSunModel { @@ -64,9 +65,9 @@ class SetMeaByIdSunModel {
64 }); 65 });
65 } 66 }
66 if (json['cook'] != null) { 67 if (json['cook'] != null) {
67 - cook = <CookByIdSetmeal>[]; 68 + cook = <Cook>[];
68 json['cook'].forEach((v) { 69 json['cook'].forEach((v) {
69 - cook.add(new CookByIdSetmeal.fromJson(v)); 70 + cook.add(new Cook.fromJson(v));
70 }); 71 });
71 } 72 }
72 } 73 }
@@ -122,7 +123,7 @@ class ClassifyById { @@ -122,7 +123,7 @@ class ClassifyById {
122 } 123 }
123 } 124 }
124 125
125 -class CookByIdSetmeal { 126 +class Cook {
126 String id; 127 String id;
127 String sid; 128 String sid;
128 String cid; 129 String cid;
@@ -134,7 +135,7 @@ class CookByIdSetmeal { @@ -134,7 +135,7 @@ class CookByIdSetmeal {
134 TextEditingController numC = TextEditingController(); //数量 135 TextEditingController numC = TextEditingController(); //数量
135 TextEditingController nameC = TextEditingController(); //菜名 136 TextEditingController nameC = TextEditingController(); //菜名
136 137
137 - CookByIdSetmeal( 138 + Cook(
138 {this.id, 139 {this.id,
139 this.sid, 140 this.sid,
140 this.cid, 141 this.cid,
@@ -144,7 +145,7 @@ class CookByIdSetmeal { @@ -144,7 +145,7 @@ class CookByIdSetmeal {
144 this.isTrim, 145 this.isTrim,
145 this.status}); 146 this.status});
146 147
147 - CookByIdSetmeal.fromJson(Map<String, dynamic> json) { 148 + Cook.fromJson(Map<String, dynamic> json) {
148 id = json['id']; 149 id = json['id'];
149 sid = json['sid']; 150 sid = json['sid'];
150 cid = json['cid']; 151 cid = json['cid'];
  1 +import 'package:one_key/models/setmeal_by_id_model.dart';
  2 +
1 class SetMealModel { 3 class SetMealModel {
2 int ret; 4 int ret;
3 List<SetMealSunModel> data; 5 List<SetMealSunModel> data;
@@ -122,47 +124,47 @@ class Classify { @@ -122,47 +124,47 @@ class Classify {
122 } 124 }
123 } 125 }
124 126
125 -class Cook {  
126 - String id;  
127 - String sid;  
128 - String cid;  
129 - String mid;  
130 - String cname;  
131 - String spec;  
132 - String isTrim;  
133 - String status; 127 +// class Cook {
  128 +// String id;
  129 +// String sid;
  130 +// String cid;
  131 +// String mid;
  132 +// String cname;
  133 +// String spec;
  134 +// String isTrim;
  135 +// String status;
134 136
135 - Cook(  
136 - {this.id,  
137 - this.sid,  
138 - this.cid,  
139 - this.mid,  
140 - this.cname,  
141 - this.spec,  
142 - this.isTrim,  
143 - this.status});  
144 -  
145 - Cook.fromJson(Map<String, dynamic> json) {  
146 - id = json['id'];  
147 - sid = json['sid'];  
148 - cid = json['cid'];  
149 - mid = json['mid'];  
150 - cname = json['cname'];  
151 - spec = json['spec'];  
152 - isTrim = json['is_trim'];  
153 - status = json['status'];  
154 - } 137 +// Cook(
  138 +// {this.id,
  139 +// this.sid,
  140 +// this.cid,
  141 +// this.mid,
  142 +// this.cname,
  143 +// this.spec,
  144 +// this.isTrim,
  145 +// this.status});
155 146
156 - Map<String, dynamic> toJson() {  
157 - final Map<String, dynamic> data = new Map<String, dynamic>();  
158 - data['id'] = this.id;  
159 - data['sid'] = this.sid;  
160 - data['cid'] = this.cid;  
161 - data['mid'] = this.mid;  
162 - data['cname'] = this.cname;  
163 - data['spec'] = this.spec;  
164 - data['is_trim'] = this.isTrim;  
165 - data['status'] = this.status;  
166 - return data;  
167 - }  
168 -} 147 +// Cook.fromJson(Map<String, dynamic> json) {
  148 +// id = json['id'];
  149 +// sid = json['sid'];
  150 +// cid = json['cid'];
  151 +// mid = json['mid'];
  152 +// cname = json['cname'];
  153 +// spec = json['spec'];
  154 +// isTrim = json['is_trim'];
  155 +// status = json['status'];
  156 +// }
  157 +
  158 +// Map<String, dynamic> toJson() {
  159 +// final Map<String, dynamic> data = new Map<String, dynamic>();
  160 +// data['id'] = this.id;
  161 +// data['sid'] = this.sid;
  162 +// data['cid'] = this.cid;
  163 +// data['mid'] = this.mid;
  164 +// data['cname'] = this.cname;
  165 +// data['spec'] = this.spec;
  166 +// data['is_trim'] = this.isTrim;
  167 +// data['status'] = this.status;
  168 +// return data;
  169 +// }
  170 +// }
@@ -9,6 +9,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -9,6 +9,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
9 import 'package:one_key/models/cookbook_one_model.dart'; 9 import 'package:one_key/models/cookbook_one_model.dart';
10 import 'package:one_key/models/get_banquet_deposit_model.dart'; 10 import 'package:one_key/models/get_banquet_deposit_model.dart';
11 import 'package:one_key/models/sessions_model.dart'; 11 import 'package:one_key/models/sessions_model.dart';
  12 +import 'package:one_key/models/setmeal_model.dart';
12 import 'package:one_key/route/navigator_util.dart'; 13 import 'package:one_key/route/navigator_util.dart';
13 import 'package:one_key/widgets/MyDivider.dart'; 14 import 'package:one_key/widgets/MyDivider.dart';
14 import 'package:one_key/widgets/round_button.dart'; 15 import 'package:one_key/widgets/round_button.dart';
@@ -39,6 +40,7 @@ import '../../widgets/system_app_bar.dart'; @@ -39,6 +40,7 @@ import '../../widgets/system_app_bar.dart';
39 import '../online_check/img_picker_widget_f.dart'; 40 import '../online_check/img_picker_widget_f.dart';
40 import '../table/area_item_table.dart'; 41 import '../table/area_item_table.dart';
41 import 'package:one_key/models/table_list.dart' as t; 42 import 'package:one_key/models/table_list.dart' as t;
  43 +import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
42 44
43 class FeastCreatePage extends StatefulWidget { 45 class FeastCreatePage extends StatefulWidget {
44 final GetBanquetByIdNewSunModel banquetDetail; 46 final GetBanquetByIdNewSunModel banquetDetail;
@@ -84,7 +86,7 @@ class _FeastCreatePageState extends State<FeastCreatePage> { @@ -84,7 +86,7 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
84 int xuantaiSelIndex = 0; 86 int xuantaiSelIndex = 0;
85 List<DsoltXt> dsoltList = []; 87 List<DsoltXt> dsoltList = [];
86 UserModel userModel; 88 UserModel userModel;
87 - Map<String, List<CookByIdSetmeal>> dataMenu = {}; 89 + Map<String, List<Cook>> dataMenu = {};
88 Map<String, String> invoice; //发票 90 Map<String, String> invoice; //发票
89 String morning; 91 String morning;
90 String noon; 92 String noon;
@@ -109,6 +111,10 @@ class _FeastCreatePageState extends State<FeastCreatePage> { @@ -109,6 +111,10 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
109 _getData(); 111 _getData();
110 }); 112 });
111 bus.on("feast_deposit_list", (arg) { 113 bus.on("feast_deposit_list", (arg) {
  114 + if (widget.banquetDetail != null) {
  115 + bus.emit('feast_detail_page'); //编辑之后刷新宴会详情页面
  116 + bus.emit('feast_home_page'); //编辑之后刷新宴会首页
  117 + }
112 _getBanquetDeposit(); 118 _getBanquetDeposit();
113 }); 119 });
114 bus.on("feast_qy_list", (arg) { 120 bus.on("feast_qy_list", (arg) {
@@ -297,6 +303,11 @@ class _FeastCreatePageState extends State<FeastCreatePage> { @@ -297,6 +303,11 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
297 feastModel.rid = null; 303 feastModel.rid = null;
298 feastModel.type = null; 304 feastModel.type = null;
299 feastModel.reserve = null; 305 feastModel.reserve = null;
  306 + //清空图片,选台图片不常驻,不需要清空
  307 + _uploadImageProvider.feastRemarkImageList = []; //意向
  308 + _uploadImageProvider.feastRemarkDjImageList = []; //定金
  309 + _uploadImageProvider.feastRemarkContractImageList = []; //合同
  310 + _uploadImageProvider.feastRemarkInvoiceImageList = []; //发票
300 } 311 }
301 312
302 initSetXuanTaiModel({int index}) { 313 initSetXuanTaiModel({int index}) {
@@ -951,6 +962,10 @@ class _FeastCreatePageState extends State<FeastCreatePage> { @@ -951,6 +962,10 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
951 bool success = await feastModel.createBanquet(context, pramas); 962 bool success = await feastModel.createBanquet(context, pramas);
952 if (success) { 963 if (success) {
953 Utils.showToast('保存成功'); 964 Utils.showToast('保存成功');
  965 + if (widget.banquetDetail != null) {
  966 + bus.emit('feast_detail_page'); //编辑之后刷新宴会详情页面
  967 + bus.emit('feast_home_page'); //编辑之后刷新宴会首页
  968 + }
954 969
955 return true; 970 return true;
956 } else { 971 } else {
@@ -1254,27 +1269,79 @@ class _FeastCreatePageState extends State<FeastCreatePage> { @@ -1254,27 +1269,79 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
1254 'spare': mealValue.spare, 1269 'spare': mealValue.spare,
1255 'name': mealValue.name 1270 'name': mealValue.name
1256 }; 1271 };
1257 - List cooklist = []; //菜单数据 1272 + Map cooklist = {}; //菜单数据
1258 if (mealValue.dataMenu != null && mealValue.dataMenu.length > 0) { 1273 if (mealValue.dataMenu != null && mealValue.dataMenu.length > 0) {
1259 //修改过菜单的数据 1274 //修改过菜单的数据
1260 -  
1261 mealValue.dataMenu.forEach((key, value) { 1275 mealValue.dataMenu.forEach((key, value) {
  1276 + List<Map<String, String>> cooks = []; //菜品分类下面的多个菜品信息
1262 value.forEach((element) { 1277 value.forEach((element) {
1263 - Map mapMenu = {'cname': element.cname};  
1264 - cooklist.add(mapMenu); 1278 + Map<String, String> cook = {
  1279 + 'id': element.id,
  1280 + 'sid': element.sid,
  1281 + 'cid': element.cid,
  1282 + 'mid': element.mid,
  1283 + 'cname': element.cname,
  1284 + 'spec': element.spec,
  1285 + 'is_trim': element.isTrim,
  1286 + 'status': element.status,
  1287 + };
  1288 + cooks.add(cook);
1265 }); 1289 });
  1290 + cooklist[key] = cooks;
1266 }); 1291 });
  1292 +
  1293 + // Map tempMap = {};
  1294 + // mealValue.dataMenu.forEach((key, value) {
  1295 + // value.forEach((element) {
  1296 + // Map mapMenu = {'cname': element.cname};
  1297 + // cooklist.add(mapMenu);
  1298 + // });
  1299 + // });
1267 } else { 1300 } else {
1268 // 套餐菜单原数据 1301 // 套餐菜单原数据
  1302 + Map<String, List<Cook>> data = {}; //原始菜品数据
  1303 + List<String> classNames = [];
1269 feastModel.setmealData.forEach((element) { 1304 feastModel.setmealData.forEach((element) {
1270 if (element.id == mealValue.setmealId) { 1305 if (element.id == mealValue.setmealId) {
1271 //找到当前套餐map 1306 //找到当前套餐map
1272 - element.cook.forEach((element) {  
1273 - Map mapMenu = {'cname': element.cname};  
1274 - cooklist.add(mapMenu);  
1275 - }); 1307 + // element.cook.forEach((element) {
  1308 + // Map mapMenu = {'cname': element.cname};
  1309 + // cooklist.add(mapMenu);
  1310 + // });
  1311 + for (Classify item in element.classify) {
  1312 + // Map<String, List<CookByIdSetmeal>> map = {};
  1313 + String cid = item.id;
  1314 + String className = item.className;
  1315 +
  1316 + List<Cook> temp = [];
  1317 + for (Cook itemCook in element.cook) {
  1318 + if (cid == itemCook.cid) {
  1319 + temp.add(itemCook);
  1320 + }
  1321 + }
  1322 + classNames.add(className);
  1323 + data[className] = temp;
  1324 + }
1276 } 1325 }
1277 }); 1326 });
  1327 +
  1328 + data.forEach((key, value) {
  1329 + List<Map<String, String>> cooks = []; //菜品分类下面的多个菜品信息
  1330 + value.forEach((element) {
  1331 + Map<String, String> cook = {
  1332 + 'id': element.id,
  1333 + 'sid': element.sid,
  1334 + 'cid': element.cid,
  1335 + 'mid': element.mid,
  1336 + 'cname': element.cname,
  1337 + 'spec': element.spec,
  1338 + 'isTrim': element.isTrim,
  1339 + 'status': element.status,
  1340 + };
  1341 + cooks.add(cook);
  1342 + });
  1343 + cooklist[key] = cooks;
  1344 + });
1278 } 1345 }
1279 1346
1280 mapMeal['cooklist'] = cooklist; //菜单 1347 mapMeal['cooklist'] = cooklist; //菜单
@@ -1348,6 +1415,10 @@ class _FeastCreatePageState extends State<FeastCreatePage> { @@ -1348,6 +1415,10 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
1348 }); 1415 });
1349 print(xuantaiData); 1416 print(xuantaiData);
1350 Utils.showToast('保存成功'); 1417 Utils.showToast('保存成功');
  1418 + if (widget.banquetDetail != null) {
  1419 + bus.emit('feast_detail_page'); //编辑之后刷新宴会详情页面
  1420 + bus.emit('feast_home_page'); //编辑之后刷新宴会首页
  1421 + }
1351 return true; 1422 return true;
1352 } else { 1423 } else {
1353 return false; 1424 return false;
@@ -2465,7 +2536,7 @@ class _FeastCreatePageState extends State<FeastCreatePage> { @@ -2465,7 +2536,7 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
2465 ); 2536 );
2466 } 2537 }
2467 2538
2468 - /// 选台保存接口 2539 + /// 担保人保存接口
2469 Future<bool> dbSave() async { 2540 Future<bool> dbSave() async {
2470 if (djDBRIndex == null) { 2541 if (djDBRIndex == null) {
2471 Utils.showToast('请选择担保人'); 2542 Utils.showToast('请选择担保人');
@@ -2495,6 +2566,10 @@ class _FeastCreatePageState extends State<FeastCreatePage> { @@ -2495,6 +2566,10 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
2495 }; 2566 };
2496 bool success = await feastModel.setWarrant(context, pramas); 2567 bool success = await feastModel.setWarrant(context, pramas);
2497 if (success) { 2568 if (success) {
  2569 + if (widget.banquetDetail != null) {
  2570 + bus.emit('feast_detail_page'); //编辑之后刷新宴会详情页面
  2571 + bus.emit('feast_home_page'); //编辑之后刷新宴会首页
  2572 + }
2498 return true; 2573 return true;
2499 } else { 2574 } else {
2500 return false; 2575 return false;
@@ -4391,6 +4466,10 @@ class _FeastCreatePageState extends State<FeastCreatePage> { @@ -4391,6 +4466,10 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
4391 if (results[0] && results[1] && results[2]) { 4466 if (results[0] && results[1] && results[2]) {
4392 //成功 4467 //成功
4393 Utils.showToast('保存成功'); 4468 Utils.showToast('保存成功');
  4469 + if (widget.banquetDetail != null) {
  4470 + bus.emit('feast_detail_page'); //编辑之后刷新宴会详情页面
  4471 + }
  4472 + bus.emit('feast_home_page'); //编辑之后刷新宴会首页
4394 } else { 4473 } else {
4395 if (!results[0]) { 4474 if (!results[0]) {
4396 // Utils.showToast(''); 4475 // Utils.showToast('');
@@ -4522,7 +4601,8 @@ class _FeastCreatePageState extends State<FeastCreatePage> { @@ -4522,7 +4601,8 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
4522 userModel = Provider.of<UserModel>(context, listen: false); 4601 userModel = Provider.of<UserModel>(context, listen: false);
4523 _uploadImageProvider = 4602 _uploadImageProvider =
4524 Provider.of<UploadImageProvider>(context, listen: true); 4603 Provider.of<UploadImageProvider>(context, listen: true);
4525 - return Scaffold( 4604 + return KeyboardDismissOnTap(
  4605 + child: Scaffold(
4526 backgroundColor: MyColours.color_ffffff, 4606 backgroundColor: MyColours.color_ffffff,
4527 appBar: SystemAppBar( 4607 appBar: SystemAppBar(
4528 '新建宴会', 4608 '新建宴会',
@@ -4539,6 +4619,6 @@ class _FeastCreatePageState extends State<FeastCreatePage> { @@ -4539,6 +4619,6 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
4539 ? xtWidget() 4619 ? xtWidget()
4540 : selectMenu == '定金' 4620 : selectMenu == '定金'
4541 ? djWidget() 4621 ? djWidget()
4542 - : qyWidget()); 4622 + : qyWidget()));
4543 } 4623 }
4544 } 4624 }
@@ -180,6 +180,7 @@ class _FeastDepositPageState extends State<FeastDepositPage> { @@ -180,6 +180,7 @@ class _FeastDepositPageState extends State<FeastDepositPage> {
180 if (success) { 180 if (success) {
181 Navigator.pop(context); 181 Navigator.pop(context);
182 bus.emit('feast_deposit_list'); 182 bus.emit('feast_deposit_list');
  183 +
183 } 184 }
184 } 185 }
185 186
@@ -9,6 +9,7 @@ import '../../provider/feast_model.dart'; @@ -9,6 +9,7 @@ import '../../provider/feast_model.dart';
9 import '../../res/colors.dart'; 9 import '../../res/colors.dart';
10 import '../../route/navigator_util.dart'; 10 import '../../route/navigator_util.dart';
11 import '../../utils/ConvertNumberToChineseMoneyWords.dart'; 11 import '../../utils/ConvertNumberToChineseMoneyWords.dart';
  12 +import '../../utils/event_bus.dart';
12 import '../../utils/screen_util.dart'; 13 import '../../utils/screen_util.dart';
13 import '../../utils/utils.dart'; 14 import '../../utils/utils.dart';
14 import '../../widgets/MyDivider.dart'; 15 import '../../widgets/MyDivider.dart';
@@ -40,6 +41,15 @@ class _FeastDetailPageState extends State<FeastDetailPage> { @@ -40,6 +41,15 @@ class _FeastDetailPageState extends State<FeastDetailPage> {
40 WidgetsBinding.instance.addPostFrameCallback((_) { 41 WidgetsBinding.instance.addPostFrameCallback((_) {
41 _getBanquetById(); 42 _getBanquetById();
42 }); 43 });
  44 + bus.on("feast_detail_page", (arg) {
  45 + _getBanquetById();
  46 + });
  47 + }
  48 +
  49 + @override
  50 + void dispose() {
  51 + super.dispose();
  52 + bus.off('feast_detail_page');
43 } 53 }
44 54
45 ///获取宴会详情 55 ///获取宴会详情
@@ -71,6 +81,8 @@ class _FeastDetailPageState extends State<FeastDetailPage> { @@ -71,6 +81,8 @@ class _FeastDetailPageState extends State<FeastDetailPage> {
71 // _uploadImageProvider.feastRemarkContractImageList.add(uploadImgModel); 81 // _uploadImageProvider.feastRemarkContractImageList.add(uploadImgModel);
72 // }); 82 // });
73 // setState(() {}); 83 // setState(() {});
  84 + bus.emit('feast_home_page'); //编辑之后刷新宴会首页
  85 + Navigator.pop(context);
74 } 86 }
75 } 87 }
76 88
@@ -25,7 +25,7 @@ import '../../widgets/v_empty_view.dart'; @@ -25,7 +25,7 @@ import '../../widgets/v_empty_view.dart';
25 */ 25 */
26 class FeastMenuPage extends StatefulWidget { 26 class FeastMenuPage extends StatefulWidget {
27 final String setmealId; 27 final String setmealId;
28 - final Map<String, List<CookByIdSetmeal>> justSelData; 28 + final Map<String, List<Cook>> justSelData;
29 FeastMenuPage({Key key, this.setmealId, this.justSelData}) : super(key: key); 29 FeastMenuPage({Key key, this.setmealId, this.justSelData}) : super(key: key);
30 30
31 @override 31 @override
@@ -35,11 +35,11 @@ class FeastMenuPage extends StatefulWidget { @@ -35,11 +35,11 @@ class FeastMenuPage extends StatefulWidget {
35 class _FeastMenuPageState extends State<FeastMenuPage> { 35 class _FeastMenuPageState extends State<FeastMenuPage> {
36 ScrollController controller = ScrollController(); 36 ScrollController controller = ScrollController();
37 FeastModel feastModel; 37 FeastModel feastModel;
38 - Map<String, List<CookByIdSetmeal>> data = {}; 38 + Map<String, List<Cook>> data = {};
39 List<String> classNames = []; 39 List<String> classNames = [];
40 List<Map<String, String>> setModel = []; 40 List<Map<String, String>> setModel = [];
41 41
42 - Map<String, List<CookByIdSetmeal>> dataNew = {}; 42 + Map<String, List<Cook>> dataNew = {};
43 43
44 @override 44 @override
45 void initState() { 45 void initState() {
@@ -65,12 +65,12 @@ class _FeastMenuPageState extends State<FeastMenuPage> { @@ -65,12 +65,12 @@ class _FeastMenuPageState extends State<FeastMenuPage> {
65 }); 65 });
66 } else { 66 } else {
67 for (ClassifyById item in feastModel.setmealDetail.classify) { 67 for (ClassifyById item in feastModel.setmealDetail.classify) {
68 - // Map<String, List<CookByIdSetmeal>> map = {}; 68 + // Map<String, List<Cook>> map = {};
69 String cid = item.id; 69 String cid = item.id;
70 String className = item.className; 70 String className = item.className;
71 71
72 - List<CookByIdSetmeal> temp = [];  
73 - for (CookByIdSetmeal itemCook in feastModel.setmealDetail.cook) { 72 + List<Cook> temp = [];
  73 + for (Cook itemCook in feastModel.setmealDetail.cook) {
74 if (cid == itemCook.cid) { 74 if (cid == itemCook.cid) {
75 temp.add(itemCook); 75 temp.add(itemCook);
76 } 76 }
@@ -177,7 +177,7 @@ class _FeastMenuPageState extends State<FeastMenuPage> { @@ -177,7 +177,7 @@ class _FeastMenuPageState extends State<FeastMenuPage> {
177 } 177 }
178 178
179 Widget _itemBuildWidget(BuildContext context, int index1) { 179 Widget _itemBuildWidget(BuildContext context, int index1) {
180 - List<CookByIdSetmeal> cookList = data[classNames[index1]]; 180 + List<Cook> cookList = data[classNames[index1]];
181 return ListView.builder( 181 return ListView.builder(
182 shrinkWrap: true, 182 shrinkWrap: true,
183 controller: controller, 183 controller: controller,
@@ -188,7 +188,7 @@ class _FeastMenuPageState extends State<FeastMenuPage> { @@ -188,7 +188,7 @@ class _FeastMenuPageState extends State<FeastMenuPage> {
188 return _buildHeaderWidget(context, classNames[index1]); 188 return _buildHeaderWidget(context, classNames[index1]);
189 } else { 189 } else {
190 int itemIndex = index - 1; 190 int itemIndex = index - 1;
191 - CookByIdSetmeal setmeal = cookList[itemIndex]; 191 + Cook setmeal = cookList[itemIndex];
192 192
193 return Container( 193 return Container(
194 margin: new EdgeInsets.only(bottom: h(12)), 194 margin: new EdgeInsets.only(bottom: h(12)),
@@ -357,7 +357,7 @@ class _FeastMenuPageState extends State<FeastMenuPage> { @@ -357,7 +357,7 @@ class _FeastMenuPageState extends State<FeastMenuPage> {
357 FocusScope.of(context).requestFocus(FocusNode()); 357 FocusScope.of(context).requestFocus(FocusNode());
358 // setModel = []; 358 // setModel = [];
359 data.forEach((key, value) { 359 data.forEach((key, value) {
360 - List<CookByIdSetmeal> temp = []; 360 + List<Cook> temp = [];
361 value.forEach((element) { 361 value.forEach((element) {
362 if (element.nameC.text.trim().length > 0) { 362 if (element.nameC.text.trim().length > 0) {
363 //已调菜 363 //已调菜
@@ -29,7 +29,7 @@ class FeastMenuShowPage extends StatefulWidget { @@ -29,7 +29,7 @@ class FeastMenuShowPage extends StatefulWidget {
29 final String dateData; 29 final String dateData;
30 final String needtable; 30 final String needtable;
31 31
32 - final Map<String, List<CookByIdSetmeal>> justSelData; 32 + final Map<String, List<Cook>> justSelData;
33 FeastMenuShowPage( 33 FeastMenuShowPage(
34 {Key key, 34 {Key key,
35 this.setmealId, 35 this.setmealId,
@@ -46,11 +46,11 @@ class FeastMenuShowPage extends StatefulWidget { @@ -46,11 +46,11 @@ class FeastMenuShowPage extends StatefulWidget {
46 class _FeastMenuShowPageState extends State<FeastMenuShowPage> { 46 class _FeastMenuShowPageState extends State<FeastMenuShowPage> {
47 ScrollController controller = ScrollController(); 47 ScrollController controller = ScrollController();
48 FeastModel feastModel; 48 FeastModel feastModel;
49 - Map<String, List<CookByIdSetmeal>> data = {}; 49 + Map<String, List<Cook>> data = {};
50 List<String> classNames = []; 50 List<String> classNames = [];
51 List<Map<String, String>> setModel = []; 51 List<Map<String, String>> setModel = [];
52 52
53 - Map<String, List<CookByIdSetmeal>> dataNew = {}; 53 + Map<String, List<Cook>> dataNew = {};
54 54
55 @override 55 @override
56 void initState() { 56 void initState() {
@@ -76,12 +76,12 @@ class _FeastMenuShowPageState extends State<FeastMenuShowPage> { @@ -76,12 +76,12 @@ class _FeastMenuShowPageState extends State<FeastMenuShowPage> {
76 }); 76 });
77 } else { 77 } else {
78 for (ClassifyById item in feastModel.setmealDetail.classify) { 78 for (ClassifyById item in feastModel.setmealDetail.classify) {
79 - // Map<String, List<CookByIdSetmeal>> map = {}; 79 + // Map<String, List<Cook>> map = {};
80 String cid = item.id; 80 String cid = item.id;
81 String className = item.className; 81 String className = item.className;
82 82
83 - List<CookByIdSetmeal> temp = [];  
84 - for (CookByIdSetmeal itemCook in feastModel.setmealDetail.cook) { 83 + List<Cook> temp = [];
  84 + for (Cook itemCook in feastModel.setmealDetail.cook) {
85 if (cid == itemCook.cid) { 85 if (cid == itemCook.cid) {
86 temp.add(itemCook); 86 temp.add(itemCook);
87 } 87 }
@@ -188,7 +188,7 @@ class _FeastMenuShowPageState extends State<FeastMenuShowPage> { @@ -188,7 +188,7 @@ class _FeastMenuShowPageState extends State<FeastMenuShowPage> {
188 } 188 }
189 189
190 Widget _itemBuildWidget(BuildContext context, int index1) { 190 Widget _itemBuildWidget(BuildContext context, int index1) {
191 - List<CookByIdSetmeal> cookList = data[classNames[index1]]; 191 + List<Cook> cookList = data[classNames[index1]];
192 return ListView.builder( 192 return ListView.builder(
193 shrinkWrap: true, 193 shrinkWrap: true,
194 controller: controller, 194 controller: controller,
@@ -199,7 +199,7 @@ class _FeastMenuShowPageState extends State<FeastMenuShowPage> { @@ -199,7 +199,7 @@ class _FeastMenuShowPageState extends State<FeastMenuShowPage> {
199 return _buildHeaderWidget(context, classNames[index1]); 199 return _buildHeaderWidget(context, classNames[index1]);
200 } else { 200 } else {
201 int itemIndex = index - 1; 201 int itemIndex = index - 1;
202 - CookByIdSetmeal setmeal = cookList[itemIndex]; 202 + Cook setmeal = cookList[itemIndex];
203 203
204 return Container( 204 return Container(
205 margin: new EdgeInsets.only(bottom: h(12)), 205 margin: new EdgeInsets.only(bottom: h(12)),
@@ -15,6 +15,7 @@ import '../../constant/state.dart'; @@ -15,6 +15,7 @@ import '../../constant/state.dart';
15 import '../../provider/user_model.dart'; 15 import '../../provider/user_model.dart';
16 import '../../res/colors.dart'; 16 import '../../res/colors.dart';
17 17
  18 +import '../../utils/event_bus.dart';
18 import '../../widgets/page_exception.dart'; 19 import '../../widgets/page_exception.dart';
19 20
20 class FeastPage extends StatefulWidget { 21 class FeastPage extends StatefulWidget {
@@ -35,6 +36,16 @@ class _FeastPageState extends State<FeastPage> { @@ -35,6 +36,16 @@ class _FeastPageState extends State<FeastPage> {
35 _getBanquetByTime(); 36 _getBanquetByTime();
36 // scrollController.jumpTo(scrollController.position.minScrollExtent); 37 // scrollController.jumpTo(scrollController.position.minScrollExtent);
37 }); 38 });
  39 +
  40 + bus.on("feast_home_page", (arg) {
  41 + _getBanquetByTime();
  42 + });
  43 + }
  44 +
  45 + @override
  46 + void dispose() {
  47 + super.dispose();
  48 + bus.off('feast_home_page');
38 } 49 }
39 50
40 ///获取宴会详情 51 ///获取宴会详情
@@ -2,6 +2,8 @@ import 'package:flutter/material.dart'; @@ -2,6 +2,8 @@ import 'package:flutter/material.dart';
2 import 'package:flutter_screenutil/flutter_screenutil.dart'; 2 import 'package:flutter_screenutil/flutter_screenutil.dart';
3 3
4 import '../../models/get_banquet_by_id_new_model.dart'; 4 import '../../models/get_banquet_by_id_new_model.dart';
  5 +import '../../models/set_xuan_tai_model.dart';
  6 +import '../../models/setmeal_by_id_model.dart';
5 import '../../res/colors.dart'; 7 import '../../res/colors.dart';
6 import '../../utils/screen_util.dart'; 8 import '../../utils/screen_util.dart';
7 import '../../utils/utils.dart'; 9 import '../../utils/utils.dart';
@@ -9,7 +11,7 @@ import '../../widgets/h_empty_view.dart'; @@ -9,7 +11,7 @@ import '../../widgets/h_empty_view.dart';
9 import '../../widgets/system_app_bar.dart'; 11 import '../../widgets/system_app_bar.dart';
10 12
11 class FeastQYMenuPage extends StatefulWidget { 13 class FeastQYMenuPage extends StatefulWidget {
12 - final List<CooklistByid> cookListData; 14 + final List<Cooklist> cookListData;
13 FeastQYMenuPage({Key key, this.cookListData}) : super(key: key); 15 FeastQYMenuPage({Key key, this.cookListData}) : super(key: key);
14 16
15 @override 17 @override
@@ -118,7 +118,7 @@ class _FeastSetPageState extends State<FeastSetPage> { @@ -118,7 +118,7 @@ class _FeastSetPageState extends State<FeastSetPage> {
118 ///输入框 118 ///输入框
119 Widget _textfield(String hintText, TextEditingController editingController, 119 Widget _textfield(String hintText, TextEditingController editingController,
120 FocusNode focusNode, 120 FocusNode focusNode,
121 - {TextInputType inputType = TextInputType.text, double width}) { 121 + {TextInputType inputType = TextInputType.number, double width}) {
122 return Container( 122 return Container(
123 width: width, 123 width: width,
124 padding: EdgeInsets.symmetric(horizontal: w(6)), 124 padding: EdgeInsets.symmetric(horizontal: w(6)),
@@ -130,7 +130,7 @@ class _FeastSetmealPageState extends State<FeastSetmealPage> { @@ -130,7 +130,7 @@ class _FeastSetmealPageState extends State<FeastSetmealPage> {
130 ///输入框 130 ///输入框
131 Widget _textfield(String hintText, TextEditingController editingController, 131 Widget _textfield(String hintText, TextEditingController editingController,
132 FocusNode focusNode, 132 FocusNode focusNode,
133 - {TextInputType inputType = TextInputType.text, double width}) { 133 + {TextInputType inputType = TextInputType.number, double width}) {
134 return Container( 134 return Container(
135 width: width, 135 width: width,
136 padding: EdgeInsets.symmetric(horizontal: w(6)), 136 padding: EdgeInsets.symmetric(horizontal: w(6)),
@@ -1373,9 +1373,9 @@ var feastCreatePageHandle = new Handler( @@ -1373,9 +1373,9 @@ var feastCreatePageHandle = new Handler(
1373 Map<String, dynamic> temp = object['object']; 1373 Map<String, dynamic> temp = object['object'];
1374 1374
1375 // temp.forEach((key, value) { 1375 // temp.forEach((key, value) {
1376 - // List<CookByIdSetmeal> cook = []; 1376 + // List<Cook> cook = [];
1377 // for (var item in value) { 1377 // for (var item in value) {
1378 - // cook.add(CookByIdSetmeal.fromJson(item)); 1378 + // cook.add(Cook.fromJson(item));
1379 // } 1379 // }
1380 // justSelData[key] = cook; 1380 // justSelData[key] = cook;
1381 // }); 1381 // });
@@ -1417,15 +1417,15 @@ var feastMenuPageHandle = new Handler( @@ -1417,15 +1417,15 @@ var feastMenuPageHandle = new Handler(
1417 1417
1418 // bool onlyShow = FluroConvertUtils.string2bool(params["onlyShow"].first); 1418 // bool onlyShow = FluroConvertUtils.string2bool(params["onlyShow"].first);
1419 String setmealId = params["setmealId"].first; 1419 String setmealId = params["setmealId"].first;
1420 - Map<String, List<CookByIdSetmeal>> justSelData = {}; 1420 + Map<String, List<Cook>> justSelData = {};
1421 if (params.keys.contains('object')) { 1421 if (params.keys.contains('object')) {
1422 Map object = FluroConvertUtils.string2map(params["object"].first); 1422 Map object = FluroConvertUtils.string2map(params["object"].first);
1423 Map<String, dynamic> temp = object['object']; 1423 Map<String, dynamic> temp = object['object'];
1424 1424
1425 temp.forEach((key, value) { 1425 temp.forEach((key, value) {
1426 - List<CookByIdSetmeal> cook = []; 1426 + List<Cook> cook = [];
1427 for (var item in value) { 1427 for (var item in value) {
1428 - cook.add(CookByIdSetmeal.fromJson(item)); 1428 + cook.add(Cook.fromJson(item));
1429 } 1429 }
1430 justSelData[key] = cook; 1430 justSelData[key] = cook;
1431 }); 1431 });
@@ -1707,15 +1707,15 @@ var feastMenuShowPageHandle = new Handler( @@ -1707,15 +1707,15 @@ var feastMenuShowPageHandle = new Handler(
1707 String dateData = params["dateData"].first; 1707 String dateData = params["dateData"].first;
1708 String needtable = params["needtable"].first; 1708 String needtable = params["needtable"].first;
1709 1709
1710 - Map<String, List<CookByIdSetmeal>> justSelData = {}; 1710 + Map<String, List<Cook>> justSelData = {};
1711 if (params.keys.contains('object')) { 1711 if (params.keys.contains('object')) {
1712 Map object = FluroConvertUtils.string2map(params["object"].first); 1712 Map object = FluroConvertUtils.string2map(params["object"].first);
1713 Map<String, dynamic> temp = object['object']; 1713 Map<String, dynamic> temp = object['object'];
1714 1714
1715 temp.forEach((key, value) { 1715 temp.forEach((key, value) {
1716 - List<CookByIdSetmeal> cook = []; 1716 + List<Cook> cook = [];
1717 for (var item in value) { 1717 for (var item in value) {
1718 - cook.add(CookByIdSetmeal.fromJson(item)); 1718 + cook.add(Cook.fromJson(item));
1719 } 1719 }
1720 justSelData[key] = cook; 1720 justSelData[key] = cook;
1721 }); 1721 });
@@ -1734,14 +1734,14 @@ var feastMenuShowPageHandle = new Handler( @@ -1734,14 +1734,14 @@ var feastMenuShowPageHandle = new Handler(
1734 ///宴会----签约菜单信息 1734 ///宴会----签约菜单信息
1735 var feastQYMenuPageHandle = new Handler( 1735 var feastQYMenuPageHandle = new Handler(
1736 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) { 1736 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
1737 - List<CooklistByid> cook = []; 1737 + List<Cooklist> cook = [];
1738 if (params.keys.contains('object')) { 1738 if (params.keys.contains('object')) {
1739 Map object = FluroConvertUtils.string2map(params["object"].first); 1739 Map object = FluroConvertUtils.string2map(params["object"].first);
1740 1740
1741 List temp = object['object']; 1741 List temp = object['object'];
1742 1742
1743 for (var item in temp) { 1743 for (var item in temp) {
1744 - cook.add(CooklistByid.fromJson(item)); 1744 + cook.add(Cooklist.fromJson(item));
1745 } 1745 }
1746 } 1746 }
1747 1747
@@ -447,6 +447,27 @@ packages: @@ -447,6 +447,27 @@ packages:
447 url: "https://pub.flutter-io.cn" 447 url: "https://pub.flutter-io.cn"
448 source: hosted 448 source: hosted
449 version: "5.3.2" 449 version: "5.3.2"
  450 + flutter_keyboard_visibility:
  451 + dependency: "direct main"
  452 + description:
  453 + name: flutter_keyboard_visibility
  454 + url: "https://pub.flutter-io.cn"
  455 + source: hosted
  456 + version: "5.3.0"
  457 + flutter_keyboard_visibility_platform_interface:
  458 + dependency: transitive
  459 + description:
  460 + name: flutter_keyboard_visibility_platform_interface
  461 + url: "https://pub.flutter-io.cn"
  462 + source: hosted
  463 + version: "2.0.0"
  464 + flutter_keyboard_visibility_web:
  465 + dependency: transitive
  466 + description:
  467 + name: flutter_keyboard_visibility_web
  468 + url: "https://pub.flutter-io.cn"
  469 + source: hosted
  470 + version: "2.0.0"
450 flutter_native_image: 471 flutter_native_image:
451 dependency: "direct main" 472 dependency: "direct main"
452 description: 473 description:
@@ -164,6 +164,7 @@ dependencies: @@ -164,6 +164,7 @@ dependencies:
164 # sendsms: ^1.0.3 164 # sendsms: ^1.0.3
165 flutter_ex_widget: ^0.0.7 165 flutter_ex_widget: ^0.0.7
166 crypto: ^3.0.1 166 crypto: ^3.0.1
  167 + flutter_keyboard_visibility: ^5.3.0
167 168
168 169
169 170