From 8a1c2172ecb60ea48921e9793f09484b5ef82131 Mon Sep 17 00:00:00 2001 From: PH2 <1293456824@qq.com> Date: Thu, 24 Sep 2020 10:31:12 +0800 Subject: [PATCH] Merge branch 'master' of /Users/fnuoos/work_space/zhiying_space/zhiying_base_widget with conflicts. --- .dart_tool/package_config.json | 414 ++++++++++++++---- lib/register.dart | 98 ++--- .../goods_list/goods_list_widget.dart | 15 + .../goods_list/model/goods_list_model.dart | 66 +++ .../store/model/store_model.dart | 116 ++--- .../goods_details/store/store_widget.dart | 7 +- 6 files changed, 509 insertions(+), 207 deletions(-) create mode 100644 lib/widgets/goods_details/goods_list/goods_list_widget.dart create mode 100644 lib/widgets/goods_details/goods_list/model/goods_list_model.dart diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json index 3d0aa65..dd89085 100644 --- a/.dart_tool/package_config.json +++ b/.dart_tool/package_config.json @@ -1,552 +1,780 @@ { "configVersion": 2, "packages": [ + { + "name": "_fe_analyzer_shared", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/_fe_analyzer_shared-6.0.0", + "packageUri": "lib/", + "languageVersion": "2.2" + }, + { + "name": "analyzer", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/analyzer-0.39.14", + "packageUri": "lib/", + "languageVersion": "2.6" + }, { "name": "archive", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/archive-2.0.11", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/archive-2.0.11", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "args", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/args-1.5.2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/args-1.5.2", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "async", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/async-2.4.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/async-2.4.0", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "bloc", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/bloc-4.0.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/bloc-4.0.0", "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "boolean_selector", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/boolean_selector-1.0.5", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/boolean_selector-1.0.5", "packageUri": "lib/", "languageVersion": "2.0" }, + { + "name": "build", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/build-1.3.0", + "packageUri": "lib/", + "languageVersion": "2.7" + }, + { + "name": "build_config", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/build_config-0.4.2", + "packageUri": "lib/", + "languageVersion": "2.6" + }, + { + "name": "build_daemon", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/build_daemon-2.1.4", + "packageUri": "lib/", + "languageVersion": "2.6" + }, + { + "name": "build_resolvers", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/build_resolvers-1.3.11", + "packageUri": "lib/", + "languageVersion": "2.7" + }, + { + "name": "build_runner", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/build_runner-1.10.1", + "packageUri": "lib/", + "languageVersion": "2.6" + }, + { + "name": "build_runner_core", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/build_runner_core-6.0.1", + "packageUri": "lib/", + "languageVersion": "2.7" + }, + { + "name": "built_collection", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/built_collection-4.3.2", + "packageUri": "lib/", + "languageVersion": "2.6" + }, + { + "name": "built_value", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/built_value-7.1.0", + "packageUri": "lib/", + "languageVersion": "2.3" + }, { "name": "cached_network_image", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/cached_network_image-2.2.0+1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/cached_network_image-2.2.0+1", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "charcode", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/charcode-1.1.2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/charcode-1.1.2", "packageUri": "lib/", "languageVersion": "1.0" }, + { + "name": "checked_yaml", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/checked_yaml-1.0.2", + "packageUri": "lib/", + "languageVersion": "2.3" + }, + { + "name": "cli_util", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/cli_util-0.1.4", + "packageUri": "lib/", + "languageVersion": "2.0" + }, { "name": "clock", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/clock-1.0.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/clock-1.0.1", "packageUri": "lib/", "languageVersion": "2.0" }, + { + "name": "code_builder", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/code_builder-3.4.1", + "packageUri": "lib/", + "languageVersion": "2.7" + }, { "name": "collection", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/collection-1.14.11", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/collection-1.14.11", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "convert", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/convert-2.1.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/convert-2.1.1", "packageUri": "lib/", "languageVersion": "1.17" }, { "name": "crypto", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/crypto-2.1.3", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/crypto-2.1.3", "packageUri": "lib/", "languageVersion": "2.1" }, + { + "name": "csslib", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/csslib-0.16.2", + "packageUri": "lib/", + "languageVersion": "2.2" + }, + { + "name": "dart_style", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/dart_style-1.3.6", + "packageUri": "lib/", + "languageVersion": "2.7" + }, { "name": "device_info", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/device_info-0.4.2+7", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/device_info-0.4.2+7", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "device_info_platform_interface", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/device_info_platform_interface-1.0.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/device_info_platform_interface-1.0.1", "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "dio", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/dio-3.0.10", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/dio-3.0.10", "packageUri": "lib/", "languageVersion": "2.4" }, { "name": "equatable", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/equatable-1.2.5", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/equatable-1.2.5", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "event_bus", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/event_bus-1.1.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/event_bus-1.1.1", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "ffi", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/ffi-0.1.3", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/ffi-0.1.3", "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "file", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/file-5.2.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/file-5.2.1", "packageUri": "lib/", "languageVersion": "2.2" }, + { + "name": "fixnum", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/fixnum-0.10.11", + "packageUri": "lib/", + "languageVersion": "2.1" + }, { "name": "flutter", - "rootUri": "file:///Users/fnuser/Documents/flutter-sdk/packages/flutter", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/packages/flutter", "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "flutter_alibc", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/flutter_alibc-0.0.15", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_alibc-0.0.15", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "flutter_bloc", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/flutter_bloc-4.0.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_bloc-4.0.1", "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "flutter_cache_manager", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/flutter_cache_manager-1.4.2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_cache_manager-1.4.2", "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "flutter_cupertino_date_picker", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/flutter_cupertino_date_picker-1.0.26+2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_cupertino_date_picker-1.0.26+2", "packageUri": "lib/", "languageVersion": "1.19" }, { "name": "flutter_native_image", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/flutter_native_image-0.0.5+2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_native_image-0.0.5+2", "packageUri": "lib/", "languageVersion": "1.19" }, { "name": "flutter_page_indicator", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/flutter_page_indicator-0.0.3", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_page_indicator-0.0.3", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "flutter_plugin_android_lifecycle", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/flutter_plugin_android_lifecycle-1.0.9", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_plugin_android_lifecycle-1.0.9", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "flutter_screenutil", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/flutter_screenutil-1.1.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_screenutil-1.1.0", "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "flutter_swiper", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/flutter_swiper-1.1.6", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_swiper-1.1.6", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "flutter_test", - "rootUri": "file:///Users/fnuser/Documents/flutter-sdk/packages/flutter_test", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/packages/flutter_test", "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "flutter_web_plugins", - "rootUri": "file:///Users/fnuser/Documents/flutter-sdk/packages/flutter_web_plugins", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/packages/flutter_web_plugins", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "fluttertoast", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-4.0.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-4.0.1", "packageUri": "lib/", "languageVersion": "2.0" }, + { + "name": "glob", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/glob-1.2.0", + "packageUri": "lib/", + "languageVersion": "2.1" + }, + { + "name": "graphs", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/graphs-0.2.0", + "packageUri": "lib/", + "languageVersion": "2.0" + }, + { + "name": "html", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/html-0.14.0+3", + "packageUri": "lib/", + "languageVersion": "2.3" + }, { "name": "http", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/http-0.12.2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/http-0.12.2", "packageUri": "lib/", "languageVersion": "2.4" }, + { + "name": "http_multi_server", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/http_multi_server-2.2.0", + "packageUri": "lib/", + "languageVersion": "2.1" + }, { "name": "http_parser", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/http_parser-3.1.4", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/http_parser-3.1.4", "packageUri": "lib/", "languageVersion": "2.3" }, { "name": "image", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/image-2.1.4", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/image-2.1.4", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "image_cropper", - "rootUri": "file:///Users/fnuser/.pub-cache/git/Image_Cropper-e32f2264f86a27a2f5d7a7a5e26c6154eaf5798e/", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/git/Image_Cropper-e32f2264f86a27a2f5d7a7a5e26c6154eaf5798e/", "packageUri": "lib/", "languageVersion": "1.20" }, { "name": "image_picker", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/image_picker-0.6.7+10", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/image_picker-0.6.7+9", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "image_picker_platform_interface", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/image_picker_platform_interface-1.1.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/image_picker_platform_interface-1.1.1", "packageUri": "lib/", "languageVersion": "2.5" }, { "name": "intl", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/intl-0.16.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/intl-0.16.1", "packageUri": "lib/", "languageVersion": "2.5" }, + { + "name": "io", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/io-0.3.4", + "packageUri": "lib/", + "languageVersion": "2.0" + }, { "name": "jdsdk", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/jdsdk-0.0.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/jdsdk-0.0.1", "packageUri": "lib/", "languageVersion": "2.1" }, + { + "name": "js", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/js-0.6.2", + "packageUri": "lib/", + "languageVersion": "2.0" + }, + { + "name": "json_annotation", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/json_annotation-3.0.1", + "packageUri": "lib/", + "languageVersion": "2.6" + }, + { + "name": "json_serializable", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/json_serializable-3.4.1", + "packageUri": "lib/", + "languageVersion": "2.7" + }, + { + "name": "logging", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/logging-0.11.4", + "packageUri": "lib/", + "languageVersion": "2.0" + }, { "name": "matcher", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/matcher-0.12.6", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/matcher-0.12.6", "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "meta", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/meta-1.1.8", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/meta-1.1.8", "packageUri": "lib/", "languageVersion": "1.12" }, + { + "name": "mime", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/mime-0.9.7", + "packageUri": "lib/", + "languageVersion": "2.0" + }, { "name": "nested", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/nested-0.0.4", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/nested-0.0.4", "packageUri": "lib/", "languageVersion": "2.2" }, + { + "name": "node_interop", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/node_interop-1.1.1", + "packageUri": "lib/", + "languageVersion": "2.0" + }, + { + "name": "node_io", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/node_io-1.1.1", + "packageUri": "lib/", + "languageVersion": "2.2" + }, + { + "name": "package_config", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/package_config-1.9.3", + "packageUri": "lib/", + "languageVersion": "2.7" + }, { "name": "package_info", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/package_info-0.4.3", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/package_info-0.4.3", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "path", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/path-1.6.4", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path-1.6.4", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "path_provider", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.6.17", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.6.16", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "path_provider_linux", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/path_provider_linux-0.0.1+2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_linux-0.0.1+2", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "path_provider_macos", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/path_provider_macos-0.0.4+4", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_macos-0.0.4+4", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "path_provider_platform_interface", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/path_provider_platform_interface-1.0.3", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_platform_interface-1.0.3", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "path_provider_windows", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/path_provider_windows-0.0.4+1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_windows-0.0.3", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "pedantic", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/pedantic-1.8.0+1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/pedantic-1.8.0+1", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "petitparser", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/petitparser-2.4.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/petitparser-2.4.0", "packageUri": "lib/", "languageVersion": "2.4" }, { "name": "platform", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/platform-2.2.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/platform-2.2.1", "packageUri": "lib/", "languageVersion": "1.24" }, { "name": "platform_detect", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/platform_detect-1.4.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/platform_detect-1.4.0", "packageUri": "lib/", "languageVersion": "2.4" }, { "name": "plugin_platform_interface", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/plugin_platform_interface-1.0.2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/plugin_platform_interface-1.0.2", "packageUri": "lib/", "languageVersion": "2.1" }, + { + "name": "pool", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/pool-1.4.0", + "packageUri": "lib/", + "languageVersion": "2.0" + }, { "name": "process", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/process-3.0.13", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/process-3.0.13", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "provider", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/provider-4.0.5+1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/provider-4.0.5+1", "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "pub_semver", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/pub_semver-1.4.4", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/pub_semver-1.4.4", "packageUri": "lib/", "languageVersion": "2.0" }, + { + "name": "pubspec_parse", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/pubspec_parse-0.1.5", + "packageUri": "lib/", + "languageVersion": "2.2" + }, { "name": "pull_to_refresh", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/pull_to_refresh-1.6.2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/pull_to_refresh-1.6.1", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "quiver", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/quiver-2.0.5", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/quiver-2.0.5", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "rxdart", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/rxdart-0.24.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/rxdart-0.24.1", "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "shared_preferences", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.5.11", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.5.10", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "shared_preferences_linux", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_linux-0.0.2+2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_linux-0.0.2+2", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "shared_preferences_macos", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_macos-0.0.1+10", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_macos-0.0.1+10", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "shared_preferences_platform_interface", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_platform_interface-1.0.4", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_platform_interface-1.0.4", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "shared_preferences_web", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_web-0.1.2+7", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_web-0.1.2+7", "packageUri": "lib/", "languageVersion": "2.1" }, { - "name": "shared_preferences_windows", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_windows-0.0.1+1", + "name": "shelf", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shelf-0.7.9", "packageUri": "lib/", "languageVersion": "2.1" }, + { + "name": "shelf_web_socket", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shelf_web_socket-0.2.3", + "packageUri": "lib/", + "languageVersion": "2.0" + }, { "name": "shimmer", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/shimmer-1.1.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shimmer-1.1.1", "packageUri": "lib/", "languageVersion": "1.20" }, { "name": "sky_engine", - "rootUri": "file:///Users/fnuser/Documents/flutter-sdk/bin/cache/pkg/sky_engine", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/bin/cache/pkg/sky_engine", "packageUri": "lib/", "languageVersion": "1.11" }, + { + "name": "source_gen", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/source_gen-0.9.6", + "packageUri": "lib/", + "languageVersion": "2.7" + }, { "name": "source_span", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/source_span-1.5.5", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/source_span-1.5.5", "packageUri": "lib/", "languageVersion": "1.8" }, { "name": "sqflite", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.1+1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.1+1", "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "sqflite_common", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/sqflite_common-1.0.2+1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite_common-1.0.2+1", "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "stack_trace", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/stack_trace-1.9.3", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/stack_trace-1.9.3", "packageUri": "lib/", "languageVersion": "1.23" }, { "name": "stream_channel", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/stream_channel-2.0.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/stream_channel-2.0.0", "packageUri": "lib/", "languageVersion": "2.0" }, + { + "name": "stream_transform", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/stream_transform-1.2.0", + "packageUri": "lib/", + "languageVersion": "2.6" + }, { "name": "string_scanner", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/string_scanner-1.0.5", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/string_scanner-1.0.5", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "synchronized", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/synchronized-2.2.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/synchronized-2.2.0", "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "term_glyph", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/term_glyph-1.1.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/term_glyph-1.1.0", "packageUri": "lib/", "languageVersion": "1.8" }, { "name": "test_api", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/test_api-0.2.11", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/test_api-0.2.11", + "packageUri": "lib/", + "languageVersion": "2.2" + }, + { + "name": "timing", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/timing-0.1.1+2", "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "transformer_page_view", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/transformer_page_view-0.1.6", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/transformer_page_view-0.1.6", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "typed_data", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/typed_data-1.1.6", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/typed_data-1.1.6", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "url_launcher", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/url_launcher-5.7.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher-5.6.0", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "url_launcher_linux", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_linux-0.0.1+1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_linux-0.0.1+1", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "url_launcher_macos", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_macos-0.0.1+8", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_macos-0.0.1+8", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "url_launcher_platform_interface", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_platform_interface-1.0.8", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_platform_interface-1.0.8", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "url_launcher_web", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_web-0.1.3+2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_web-0.1.3+2", "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "url_launcher_windows", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_windows-0.0.1+1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_windows-0.0.1+1", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "uuid", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/uuid-2.2.2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/uuid-2.2.2", "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "vector_math", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/vector_math-2.0.8", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/vector_math-2.0.8", + "packageUri": "lib/", + "languageVersion": "2.0" + }, + { + "name": "watcher", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/watcher-0.9.7+15", + "packageUri": "lib/", + "languageVersion": "2.2" + }, + { + "name": "web_socket_channel", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/web_socket_channel-1.1.0", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "webview_flutter", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/webview_flutter-0.3.23", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/webview_flutter-0.3.22+1", "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "win32", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/win32-1.7.3", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/win32-1.7.3", "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "xdg_directories", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/xdg_directories-0.1.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/xdg_directories-0.1.0", "packageUri": "lib/", "languageVersion": "2.3" }, { "name": "xml", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/xml-3.5.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/xml-3.5.0", "packageUri": "lib/", "languageVersion": "2.3" }, + { + "name": "yaml", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/yaml-2.2.1", + "packageUri": "lib/", + "languageVersion": "2.4" + }, { "name": "zhiying_comm", "rootUri": "../../zhiying_comm", @@ -560,7 +788,7 @@ "languageVersion": "2.1" } ], - "generated": "2020-09-23T06:47:59.492879Z", + "generated": "2020-09-21T11:54:40.648119Z", "generator": "pub", "generatorVersion": "2.7.2" } diff --git a/lib/register.dart b/lib/register.dart index 03401e0..5fa1ebc 100644 --- a/lib/register.dart +++ b/lib/register.dart @@ -1,17 +1,16 @@ +import 'package:flutter/cupertino.dart'; import 'package:zhiying_base_widget/pages/goods_details_page/goods_details_page.dart'; import 'package:zhiying_base_widget/pages/home_page/home_page.dart'; import 'package:zhiying_base_widget/pages/main_page/main_page.dart'; import 'package:zhiying_base_widget/pages/mine_detail_page/mine_detail_page.dart'; import 'package:zhiying_base_widget/pages/orders_page/orders_page.dart'; -import 'package:zhiying_base_widget/pages/security_page/security_page.dart'; import 'package:zhiying_base_widget/pages/setting_page/setting_page.dart'; import 'package:zhiying_base_widget/pages/sreach_page/sreach_page.dart'; import 'package:zhiying_base_widget/pages/sreach_result_page/sreach_result_page.dart'; import 'package:zhiying_base_widget/pages/wallet_page/wallet_page.dart'; -import 'package:zhiying_base_widget/pages/webview/base_webview.dart'; import 'package:zhiying_base_widget/widgets/goods_details/footer/goods_details_footer_widget.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/goods_list/goods_list_widget.dart'; import 'package:zhiying_base_widget/widgets/goods_details/price/goods_details_price_widget.dart'; -import 'package:zhiying_base_widget/widgets/goods_details/recommend/goods_detail_commend_creater.dart'; import 'package:zhiying_base_widget/widgets/goods_details/slide_banner/goods_details_slide_banner_widget.dart'; import 'package:zhiying_base_widget/widgets/goods_details/store/store_widget.dart'; import 'package:zhiying_base_widget/widgets/goods_details/upgrade_tip/upgrade_tip_widget.dart'; @@ -19,8 +18,10 @@ import 'package:zhiying_base_widget/widgets/home/home_banner/home_banner_creater import 'package:zhiying_base_widget/widgets/home/home_banner/home_banner_widget.dart'; import 'package:zhiying_base_widget/widgets/home/home_goods/home_goods_creater.dart'; import 'package:zhiying_base_widget/widgets/home/home_notice/home_notice_widget.dart'; +import 'package:zhiying_base_widget/widgets/home/home_notice/model/home_notice_model.dart'; import 'package:zhiying_base_widget/widgets/home/home_slide_banner/home_slide_banner_creater.dart'; import 'package:zhiying_base_widget/widgets/home/home_sreach/home_sreach_creater.dart'; +import 'package:zhiying_base_widget/widgets/home/home_sreach/home_sreach_widget.dart'; import 'package:zhiying_base_widget/widgets/mine/mine_data/mine_data.dart'; import 'package:zhiying_base_widget/widgets/mine/mine_header/mine_header.dart'; import 'package:zhiying_base_widget/widgets/mine/mine_nav/mine_nav_bg.dart'; @@ -53,25 +54,18 @@ class BaseWidgetRegister { PageFactory.regist('profile', (model) => MainPage(model)); PageFactory.regist('category', (model) => WalletPage()); PageFactory.regist('goods_details', (model) => GoodsDetailsPage(model)); - PageFactory.regist('sreach', (model) => SreachPage()); - PageFactory.regist('sreach_result', (model) => SreachResultPage()); + PageFactory.regist('sreach', (model) => SreachPage() ); + PageFactory.regist('sreach_result', (model) => SreachResultPage() ); // PageFactory.regist('login', (model) => LoginPage(model)); // PageFactory.regist('login_quick', (model) => LoginQuickPage(model)); // PageFactory.regist('login_account', (model) => LoginAccountPage(model)); // PageFactory.regist('login_invite', (model) => LoginInvitePage()); - PageFactory.regist( - 'pub.flutter.profile_settings', (model) => MineDetailPage()); + PageFactory.regist('pub.flutter.profile_settings', (model) => MineDetailPage()); PageFactory.regist('pub.flutter.settings', (model) => SettingPage(model)); - PageFactory.regist('pub.flutter.my_order', (model) => OrdersPage(model)); - // webview - PageFactory.regist('pub.flutter.url', (model) => BaseWebview(model)); + PageFactory.regist('pub.flutter.my_orders', (model) => OrdersPage(model)); - // 钱包 - PageFactory.regist('pub.flutter.my_wallet', (model) => WalletPage()); - PageFactory.regist( - 'pub.flutter.account_security', (model) => SecurityPage(model)); } // 注册控件 @@ -83,86 +77,64 @@ class BaseWidgetRegister { // ==================== 首页 // WidgetFactory.regist('index_title', NormalNavCreater()); /// 首页搜索栏 - WidgetFactory.regist('index_search', HomeSreachCreater()); - // WidgetFactory.regist('index_search', - // DefaultWidgetCreater((model) => HomeSreachWidget(model))); - + // WidgetFactory.regist('index_search', HomeSreachCreater()); + WidgetFactory.regist('index_search', DefaultWidgetCreater((model) => HomeSreachWidget(model))); /// 可滚动banner WidgetFactory.regist('index_carousel', HomeSlideBannerCreater()); WidgetFactory.regist('index_recommend_list', GoodsListCreater()); /// 首页快速入口 - WidgetFactory.regist( - 'multi_nav', DefaultWidgetCreater((model) => HomeQuickEntry(model))); + WidgetFactory.regist('multi_nav', DefaultWidgetCreater((model) => HomeQuickEntry(model))); /// 滚动公告 - WidgetFactory.regist('index_placard', - DefaultWidgetCreater((model) => HomeNoticeWidget(model))); + WidgetFactory.regist('index_placard', DefaultWidgetCreater((model) => HomeNoticeWidget(model))); /// 不可以滚动banner WidgetFactory.regist('index_banner_one', HomeBannerCreater()); WidgetFactory.regist('index_banner_two', HomeBannerCreater()); + // WidgetFactory.regist('index_taobao_auth_tip', HomeAuthCreater()); /// ==================== 商品详情 ==================== /// // 商品详情轮播图 - WidgetFactory.regist('product_detail_carousel', - DefaultWidgetCreater((model) => GoodsDetailsSlideBannerWidget(model))); + WidgetFactory.regist('product_detail_carousel', DefaultWidgetCreater((model) => GoodsDetailsSlideBannerWidget(model))); // 商品详情下载APP提示 - WidgetFactory.regist('product_detail_download_tips', - DefaultWidgetCreater((model) => UpgradeTipWidget(model))); + WidgetFactory.regist('product_detail_download_tips', DefaultWidgetCreater((model) => UpgradeTipWidget(model))); // 商品详情价格显示 - WidgetFactory.regist('product_detail_price', - DefaultWidgetCreater((model) => GoodsDetailsPriceWidget(model))); + WidgetFactory.regist('product_detail_price', DefaultWidgetCreater((model) => GoodsDetailsPriceWidget(model))); // 商品详情标题 - WidgetFactory.regist('product_detail_title', - DefaultWidgetCreater((model) => GoodsDetailsTitleWidget(model))); + WidgetFactory.regist('product_detail_title', DefaultWidgetCreater((model) => GoodsDetailsTitleWidget(model))); // 商品详情优惠劵 - WidgetFactory.regist('product_detail_coupon', - DefaultWidgetCreater((model) => CounponWidget(model))); + WidgetFactory.regist('product_detail_coupon', DefaultWidgetCreater((model) => CounponWidget(model))); // 商品详情店铺 - WidgetFactory.regist('product_detail_shop', - DefaultWidgetCreater((model) => StoreWidget(model))); + WidgetFactory.regist('product_detail_shop', DefaultWidgetCreater((model) => StoreWidget(model))); // 商品详情宝贝评价 - WidgetFactory.regist('product_detail_comment', - DefaultWidgetCreater((model) => GoodsDetailsEvaluateWidget(model))); + WidgetFactory.regist('product_detail_comment', DefaultWidgetCreater((model) => GoodsDetailsEvaluateWidget(model))); // 商品详情图片 - WidgetFactory.regist('product_detail_img_list', - DefaultWidgetCreater((model) => GoodsDetailsImgWidget(model))); + WidgetFactory.regist('product_detail_img_list', DefaultWidgetCreater((model) => GoodsDetailsImgWidget(model))); // 商品详情底部推荐列表 - // WidgetFactory.regist('product_detail_bottom_rec', DefaultWidgetCreater((model) => GoodsListCreater(model))); - WidgetFactory.regist( - 'product_detail_bottom_rec', GoodsDetailCommendCreater()); + WidgetFactory.regist('product_detail_bottom_rec', DefaultWidgetCreater((model) => GoodsListWidget(model))); // 商品详情底部 - WidgetFactory.regist('product_detail_bottom', - DefaultWidgetCreater((model) => GoodsDetailsFooterWidget(model))); + WidgetFactory.regist('product_detail_bottom', DefaultWidgetCreater((model) => GoodsDetailsFooterWidget(model))); + // ==================== 个人中心 WidgetFactory.regist('profile_appbar', MineNavCreater()); - WidgetFactory.regist('profile_background', - DefaultWidgetCreater((model) => MineNavBg(model))); - WidgetFactory.regist( - 'profile_header', DefaultWidgetCreater((model) => MineHeader(model))); - WidgetFactory.regist( - 'profile_earning', DefaultWidgetCreater((model) => MineData(model))); - WidgetFactory.regist('profile_functions', - DefaultWidgetCreater((model) => MineQuickEntry(model))); - WidgetFactory.regist('profile_my_functions', - DefaultWidgetCreater((model) => MineQuickEntry(model))); - WidgetFactory.regist('profile_carousel', - DefaultWidgetCreater((model) => HomeBannerWidget(model))); + WidgetFactory.regist('profile_background', DefaultWidgetCreater((model) => MineNavBg(model))); + WidgetFactory.regist('profile_header', DefaultWidgetCreater((model) => MineHeader(model))); + WidgetFactory.regist('profile_earning', DefaultWidgetCreater((model) => MineData(model))); + WidgetFactory.regist('profile_functions', DefaultWidgetCreater((model) => MineQuickEntry(model))); + WidgetFactory.regist('profile_my_functions', DefaultWidgetCreater((model) => MineQuickEntry(model))); + WidgetFactory.regist('profile_carousel', DefaultWidgetCreater((model) => HomeBannerWidget(model))); // ==================== 钱包 WidgetFactory.regist( 'wallet_data', DefaultWidgetCreater((model) => WalletData())); - WidgetFactory.regist( - 'wallet_detail', DefaultWidgetCreater((model) => WalletDetail())); +// WidgetFactory.regist( +// 'wallet_detail', DefaultWidgetCreater((model) => WalletDetail())); // WidgetFactory.regist('wallet_detail', HomeAuthCreater()); - WidgetFactory.regist( - 'wallet_data', DefaultWidgetCreater((model) => WalletData())); - WidgetFactory.regist( - 'wallet_detail', DefaultWidgetCreater((model) => WalletDetail())); + WidgetFactory.regist('wallet_data', DefaultWidgetCreater((model) => WalletData())); + WidgetFactory.regist('wallet_detail', DefaultWidgetCreater((model) => WalletDetail())); - WidgetFactory.regist( - 'wallet_income', DefaultWidgetCreater((model) => WalletIncome())); + WidgetFactory.regist('wallet_income', DefaultWidgetCreater((model) => WalletIncome())); } } diff --git a/lib/widgets/goods_details/goods_list/goods_list_widget.dart b/lib/widgets/goods_details/goods_list/goods_list_widget.dart new file mode 100644 index 0000000..dc5b958 --- /dev/null +++ b/lib/widgets/goods_details/goods_list/goods_list_widget.dart @@ -0,0 +1,15 @@ +import 'package:flutter/material.dart'; + +/// +/// 商品列表 +/// +class GoodsListWidget extends StatelessWidget { + final Map model; + + const GoodsListWidget(@required this.model); + + @override + Widget build(BuildContext context) { + return Container(); + } +} diff --git a/lib/widgets/goods_details/goods_list/model/goods_list_model.dart b/lib/widgets/goods_details/goods_list/model/goods_list_model.dart new file mode 100644 index 0000000..52696a8 --- /dev/null +++ b/lib/widgets/goods_details/goods_list/model/goods_list_model.dart @@ -0,0 +1,66 @@ +class GoodsListModel { + String commission_bg_color; + String commission_text_color; + String coupon_bg_color; + String coupon_text_color; + String current_price_color; + String market_price_color; + String provider_bg_color; + String provider_name_color; + String shop_icon; + String shop_name_color; + String title_color; + String rec_list_icon; + String rec_list_text; + + GoodsListModel({ + this.commission_bg_color, + this.commission_text_color, + this.coupon_bg_color, + this.coupon_text_color, + this.current_price_color, + this.market_price_color, + this.provider_bg_color, + this.provider_name_color, + this.shop_icon, + this.shop_name_color, + this.title_color, + this.rec_list_icon, + this.rec_list_text, + }); + + factory GoodsListModel.fromJson(Map json) { + return GoodsListModel( + commission_bg_color: json['commission_bg_color'], + commission_text_color: json['commission_text_color'], + coupon_bg_color: json['coupon_bg_color'], + coupon_text_color: json['coupon_text_color'], + current_price_color: json['current_price_color'], + market_price_color: json['market_price_color'], + provider_bg_color: json['provider_bg_color'], + provider_name_color: json['provider_name_color'], + shop_icon: json['shop_icon'], + shop_name_color: json['shop_name_color'], + title_color: json['title_color'], + rec_list_icon: json['rec_list_icon'], + rec_list_text: json['rec_list_text']); + } + + Map toJson() { + final Map data = new Map(); + data['commission_bg_color'] = this.commission_bg_color; + data['commission_text_color'] = this.commission_text_color; + data['coupon_bg_color'] = this.coupon_bg_color; + data['coupon_text_color'] = this.coupon_text_color; + data['current_price_color'] = this.current_price_color; + data['market_price_color'] = this.market_price_color; + data['provider_bg_color'] = this.provider_bg_color; + data['provider_name_color'] = this.provider_name_color; + data['shop_icon'] = this.shop_icon; + data['shop_name_color'] = this.shop_name_color; + data['title_color'] = this.title_color; + data['rec_list_icon'] = this.rec_list_icon; + data['rec_list_text'] = this.rec_list_text; + return data; + } +} diff --git a/lib/widgets/goods_details/store/model/store_model.dart b/lib/widgets/goods_details/store/model/store_model.dart index a21cb72..74ccb9b 100644 --- a/lib/widgets/goods_details/store/model/store_model.dart +++ b/lib/widgets/goods_details/store/model/store_model.dart @@ -1,54 +1,70 @@ - class StoreModel { - String description; - String description_color; - String description_leve_icon; - String logistics; - String logistics_color; - String logistics_leve_icon; - String more; - String service; - String service_color; - String service_leve_icon; - String shop_id; - String shop_name; - String shop_name_color; + String description; + String description_color; + String description_leve_icon; + String logistics; + String logistics_color; + String logistics_leve_icon; + String more; + String service; + String service_color; + String service_leve_icon; + String shop_id; + String shop_name; + String shop_name_color; + String shop_avatar; - StoreModel({this.description, this.description_color, this.description_leve_icon, this.logistics, this.logistics_color, this.logistics_leve_icon, this.more, this.service, this.service_color, this.service_leve_icon, this.shop_id, this.shop_name, this.shop_name_color}); + StoreModel({ + this.description, + this.description_color, + this.description_leve_icon, + this.logistics, + this.logistics_color, + this.logistics_leve_icon, + this.more, + this.service, + this.service_color, + this.service_leve_icon, + this.shop_id, + this.shop_name, + this.shop_name_color, + this.shop_avatar, + }); - factory StoreModel.fromJson(Map json) { - return StoreModel( - description: json['description'], - description_color: json['description_color'], - description_leve_icon: json['description_leve_icon'], - logistics: json['logistics'], - logistics_color: json['logistics_color'], - logistics_leve_icon: json['logistics_leve_icon'], - more: json['more'], - service: json['service'], - service_color: json['service_color'], - service_leve_icon: json['service_leve_icon'], - shop_id: json['shop_id'], - shop_name: json['shop_name'], - shop_name_color: json['shop_name_color'], - ); - } + factory StoreModel.fromJson(Map json) { + return StoreModel( + description: json['description'], + description_color: json['description_color'], + description_leve_icon: json['description_leve_icon'], + logistics: json['logistics'], + logistics_color: json['logistics_color'], + logistics_leve_icon: json['logistics_leve_icon'], + more: json['more'], + service: json['service'], + service_color: json['service_color'], + service_leve_icon: json['service_leve_icon'], + shop_id: json['shop_id'], + shop_name: json['shop_name'], + shop_name_color: json['shop_name_color'], + shop_avatar: json['shop_avatar']); + } - Map toJson() { - final Map data = new Map(); - data['description'] = this.description; - data['description_color'] = this.description_color; - data['description_leve_icon'] = this.description_leve_icon; - data['logistics'] = this.logistics; - data['logistics_color'] = this.logistics_color; - data['logistics_leve_icon'] = this.logistics_leve_icon; - data['more'] = this.more; - data['service'] = this.service; - data['service_color'] = this.service_color; - data['service_leve_icon'] = this.service_leve_icon; - data['shop_id'] = this.shop_id; - data['shop_name'] = this.shop_name; - data['shop_name_color'] = this.shop_name_color; - return data; - } -} \ No newline at end of file + Map toJson() { + final Map data = new Map(); + data['description'] = this.description; + data['description_color'] = this.description_color; + data['description_leve_icon'] = this.description_leve_icon; + data['logistics'] = this.logistics; + data['logistics_color'] = this.logistics_color; + data['logistics_leve_icon'] = this.logistics_leve_icon; + data['more'] = this.more; + data['service'] = this.service; + data['service_color'] = this.service_color; + data['service_leve_icon'] = this.service_leve_icon; + data['shop_id'] = this.shop_id; + data['shop_name'] = this.shop_name; + data['shop_name_color'] = this.shop_name_color; + data['shop_avatar'] = this.shop_avatar; + return data; + } +} diff --git a/lib/widgets/goods_details/store/store_widget.dart b/lib/widgets/goods_details/store/store_widget.dart index af3f37e..393e5d7 100644 --- a/lib/widgets/goods_details/store/store_widget.dart +++ b/lib/widgets/goods_details/store/store_widget.dart @@ -3,6 +3,7 @@ import 'package:zhiying_base_widget/widgets/goods_details/store/bloc/bloc.dart'; import 'package:zhiying_base_widget/widgets/goods_details/store/bloc/store_repository.dart'; import 'package:zhiying_base_widget/widgets/goods_details/store/model/store_model.dart'; import 'package:cached_network_image/cached_network_image.dart'; +import 'package:zhiying_base_widget/widgets/home/home_quick_entry/cached_network_image_util.dart'; import 'package:zhiying_comm/zhiying_comm.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; @@ -91,7 +92,11 @@ class _StoreContainerState extends State { return Container( width: 50, height: 50, - color: Colors.red, + // color: Colors.red, + child: CachedNetworkImage( + imageUrl: model?.shop_avatar?? '', + fit: BoxFit.fill, + ), ); }