diff --git a/lib/generated_plugin_registrant.dart b/lib/generated_plugin_registrant.dart index 222a4e7a..8e0b1cb0 100644 --- a/lib/generated_plugin_registrant.dart +++ b/lib/generated_plugin_registrant.dart @@ -6,13 +6,12 @@ import 'package:device_info_plus_web/device_info_plus_web.dart'; import 'package:firebase_core_web/firebase_core_web.dart'; +import 'package:flutter_web_plugins/flutter_web_plugins.dart'; import 'package:image_picker_for_web/image_picker_for_web.dart'; import 'package:package_info_plus_web/package_info_plus_web.dart'; import 'package:shared_preferences_web/shared_preferences_web.dart'; import 'package:url_launcher_web/url_launcher_web.dart'; -import 'package:flutter_web_plugins/flutter_web_plugins.dart'; - // ignore: public_member_api_docs void registerPlugins(Registrar registrar) { DeviceInfoPlusPlugin.registerWith(registrar); diff --git a/lib/models/market/market_category_model.dart b/lib/models/market/market_category_model.dart index 9be19759..a22b904b 100644 --- a/lib/models/market/market_category_model.dart +++ b/lib/models/market/market_category_model.dart @@ -1,7 +1,7 @@ import 'package:equatable/equatable.dart'; +import 'package:json_annotation/json_annotation.dart'; import 'package:aku_community/model/common/img_model.dart'; -import 'package:json_annotation/json_annotation.dart'; part 'market_category_model.g.dart'; diff --git a/lib/ui/market/category/category_card.dart b/lib/ui/market/category/category_card.dart index 3a9c6d9e..26378f62 100644 --- a/lib/ui/market/category/category_card.dart +++ b/lib/ui/market/category/category_card.dart @@ -1,11 +1,13 @@ +import 'package:flutter/material.dart'; + +import 'package:bot_toast/bot_toast.dart'; +import 'package:get/get.dart'; + import 'package:aku_community/constants/api.dart'; import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_community/models/market/display_category_model.dart'; import 'package:aku_community/models/market/market_category_model.dart'; import 'package:aku_community/ui/market/goods/goods_list_view.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; import 'package:aku_community/utils/headers.dart'; class CategoryCard extends StatelessWidget { diff --git a/lib/ui/market/category/category_page.dart b/lib/ui/market/category/category_page.dart index 426fc5c9..aed800a1 100644 --- a/lib/ui/market/category/category_page.dart +++ b/lib/ui/market/category/category_page.dart @@ -1,13 +1,14 @@ -import 'package:aku_community/models/market/market_category_model.dart'; -import 'package:aku_community/ui/market/category/category_sub_view.dart'; -import 'package:aku_community/ui/market/search/search_goods_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:get/get.dart'; + import 'package:aku_community/base/base_style.dart'; +import 'package:aku_community/models/market/market_category_model.dart'; +import 'package:aku_community/ui/market/category/category_sub_view.dart'; +import 'package:aku_community/ui/market/search/search_goods_page.dart'; import 'package:aku_community/utils/headers.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; -import 'package:get/get.dart'; class CategoryPage extends StatefulWidget { final List models; diff --git a/lib/ui/market/category/category_sub_card.dart b/lib/ui/market/category/category_sub_card.dart index e9efe7c9..a2829f90 100644 --- a/lib/ui/market/category/category_sub_card.dart +++ b/lib/ui/market/category/category_sub_card.dart @@ -1,9 +1,11 @@ +import 'package:flutter/material.dart'; + +import 'package:get/get.dart'; + import 'package:aku_community/constants/api.dart'; import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_community/models/market/market_category_model.dart'; import 'package:aku_community/ui/market/goods/goods_list_view.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; import 'package:aku_community/utils/headers.dart'; class CategorySubCard extends StatelessWidget { diff --git a/lib/ui/market/category/category_sub_view.dart b/lib/ui/market/category/category_sub_view.dart index 960f92af..ef5ef975 100644 --- a/lib/ui/market/category/category_sub_view.dart +++ b/lib/ui/market/category/category_sub_view.dart @@ -1,8 +1,10 @@ +import 'package:flutter/material.dart'; + +import 'package:flutter_easyrefresh/easy_refresh.dart'; + import 'package:aku_community/models/market/display_category_model.dart'; import 'package:aku_community/models/market/market_category_model.dart'; import 'package:aku_community/ui/market/category/category_sub_card.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; class CategorySubView extends StatefulWidget { final MarketCategoryModel model; diff --git a/lib/ui/market/goods/goods_list_view.dart b/lib/ui/market/goods/goods_list_view.dart index 4044a39b..1a9b98d2 100644 --- a/lib/ui/market/goods/goods_list_view.dart +++ b/lib/ui/market/goods/goods_list_view.dart @@ -1,13 +1,14 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +import 'package:get/get.dart'; + import 'package:aku_community/base/base_style.dart'; import 'package:aku_community/constants/api.dart'; import 'package:aku_community/model/common/img_model.dart'; import 'package:aku_community/models/market/market_category_model.dart'; import 'package:aku_community/ui/market/goods/goods_tab_list_view.dart'; import 'package:aku_community/ui/market/search/search_goods_page.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; - import 'package:aku_community/utils/headers.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; @@ -92,7 +93,8 @@ class _GoodsListViewState extends State preferredSize: Size.fromHeight(220.w), ), body: TabBarView( - children: widget.subModels.map((e) => GoodsTabListView(model: e)).toList(), + children: + widget.subModels.map((e) => GoodsTabListView(model: e)).toList(), controller: _tabController, physics: NeverScrollableScrollPhysics(), ), diff --git a/lib/ui/market/goods/goods_tab_list_view.dart b/lib/ui/market/goods/goods_tab_list_view.dart index 860cf57c..949e5f35 100644 --- a/lib/ui/market/goods/goods_tab_list_view.dart +++ b/lib/ui/market/goods/goods_tab_list_view.dart @@ -1,10 +1,12 @@ +import 'package:flutter/material.dart'; + +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:waterfall_flow/waterfall_flow.dart'; + import 'package:aku_community/constants/api.dart'; import 'package:aku_community/models/market/goods_item.dart'; import 'package:aku_community/models/market/market_category_model.dart'; import 'package:aku_community/pages/things_page/widget/bee_list_view.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:waterfall_flow/waterfall_flow.dart'; class GoodsTabListView extends StatefulWidget { final MarketCategoryModel model; diff --git a/lib/ui/market/market_page.dart b/lib/ui/market/market_page.dart index 9911acf6..cec1c244 100644 --- a/lib/ui/market/market_page.dart +++ b/lib/ui/market/market_page.dart @@ -1,13 +1,13 @@ -import 'package:aku_community/models/market/display_category_model.dart'; -import 'package:aku_community/models/market/market_category_model.dart'; -import 'package:aku_community/ui/market/category/category_card.dart'; -import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:bot_toast/bot_toast.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; +import 'package:aku_community/models/market/display_category_model.dart'; +import 'package:aku_community/models/market/market_category_model.dart'; +import 'package:aku_community/ui/market/category/category_card.dart'; import 'package:aku_community/ui/market/category/category_page.dart'; import 'package:aku_community/ui/market/search/search_goods_page.dart'; import 'package:aku_community/utils/headers.dart'; diff --git a/lib/utils/network/net_util.dart b/lib/utils/network/net_util.dart index 29b92c6e..8ee29a75 100644 --- a/lib/utils/network/net_util.dart +++ b/lib/utils/network/net_util.dart @@ -1,6 +1,5 @@ import 'dart:io'; -import 'package:aku_community/utils/developer_util.dart'; import 'package:bot_toast/bot_toast.dart'; import 'package:dio/dio.dart'; import 'package:flustars/flustars.dart'; @@ -11,6 +10,7 @@ import 'package:provider/provider.dart'; import 'package:aku_community/constants/api.dart'; import 'package:aku_community/pages/sign/sign_in_page.dart'; import 'package:aku_community/provider/user_provider.dart'; +import 'package:aku_community/utils/developer_util.dart'; import 'package:aku_community/utils/network/base_file_model.dart'; import 'package:aku_community/utils/network/base_list_model.dart'; import 'package:aku_community/utils/network/base_model.dart';