diff --git a/lib/community/release_dynamic.dart b/lib/community/release_dynamic.dart index a015d5b5..5268345a 100644 --- a/lib/community/release_dynamic.dart +++ b/lib/community/release_dynamic.dart @@ -225,8 +225,7 @@ class _ReleaseDynamic extends State { child: Text("视频"), onPressed: () { getImageOrVideo(GalleryMode.video); - // Navigator.of(context).pop(); - Navigator.of(context).popAndPushNamed('/router/video_edit'); + Navigator.of(context).pop(); }, isDefaultAction: true, isDestructiveAction: false, diff --git a/lib/main.dart b/lib/main.dart index d6c35ebc..7412841c 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -73,7 +73,6 @@ import 'package:huixiang/store/store_view/product_meals_sku.dart'; import 'package:huixiang/test_page.dart'; import 'package:huixiang/union/location_map_page.dart'; import 'package:huixiang/utils/ImgCachePath.dart'; -import 'package:huixiang/utils/video_edit.dart'; import 'package:huixiang/vip/user_vip_service_page.dart'; import 'package:huixiang/web/web_page.dart'; @@ -428,8 +427,6 @@ Map routers = { VipPayCode(), '/router/system_notice': (context, {arguments}) => SystemNotice(), - '/router/video_edit': (context, {arguments}) => - VideoEdit(), '/router/store_html': (context, {arguments}) => StoreHtml(arguments:arguments), }; diff --git a/lib/retrofit/min_api.dart b/lib/retrofit/min_api.dart index f7e60731..dc0384e3 100644 --- a/lib/retrofit/min_api.dart +++ b/lib/retrofit/min_api.dart @@ -150,8 +150,8 @@ abstract class MinApiService { Future>> getShoppingCart(@Query("tableId") int tableId); ///清空购物车商品 - @GET("shoppingcart/delCart") - Future> clearShoppingCart(); + @GET("shoppingcart/delCart?storeId={storeId}") + Future> clearShoppingCart(@Query("storeId") String storeId); ///修改购物车 @PUT("shoppingcart") diff --git a/lib/retrofit/min_api.g.dart b/lib/retrofit/min_api.g.dart index 2e4cd7a2..b27f12ef 100644 --- a/lib/retrofit/min_api.g.dart +++ b/lib/retrofit/min_api.g.dart @@ -131,12 +131,13 @@ class _MinApiService implements MinApiService { } @override - Future> clearShoppingCart() async { + Future> clearShoppingCart(storeId) async { + ArgumentError.checkNotNull(storeId, 'storeId'); const _extra = {}; final queryParameters = {}; final _data = {}; final _result = await _dio.request>( - 'shoppingcart/delCart', + 'shoppingcart/delCart?storeId=$storeId', queryParameters: queryParameters, options: RequestOptions( method: 'GET', diff --git a/lib/store/shop_details_page.dart b/lib/store/shop_details_page.dart index 305216f7..5e9ae062 100644 --- a/lib/store/shop_details_page.dart +++ b/lib/store/shop_details_page.dart @@ -302,7 +302,7 @@ class _ShopDetailsPage extends State { ///清空购物车 clearShopCar() async { - BaseData baseData = await minService.clearShoppingCart(); + BaseData baseData = await minService.clearShoppingCart(storeId); if (baseData.isSuccess) { shopCarGoods = null; setState(() {}); diff --git a/lib/store/store_order.dart b/lib/store/store_order.dart index 5491a73b..25dfbf5a 100644 --- a/lib/store/store_order.dart +++ b/lib/store/store_order.dart @@ -727,7 +727,7 @@ class _StoreOrderPage extends State ///清空购物车 clearShopCar() async { - BaseData baseData = await minService.clearShoppingCart(); + BaseData baseData = await minService.clearShoppingCart(storeId); if (baseData.isSuccess) { shopCarGoods = null; setState(() {}); diff --git a/lib/utils/video_edit.dart b/lib/utils/video_edit.dart deleted file mode 100644 index 84ee72c5..00000000 --- a/lib/utils/video_edit.dart +++ /dev/null @@ -1,37 +0,0 @@ -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:huixiang/view_widget/my_appbar.dart'; - -class VideoEdit extends StatefulWidget { - @override - State createState() { - return _VideoEdit(); - } -} - -class _VideoEdit extends State with WidgetsBindingObserver { - - @override - void initState() { - super.initState(); - } - - @override - Widget build(BuildContext context) { - return Scaffold( - backgroundColor: Colors.black, - appBar: MyAppBar( - title:"视频编辑", - titleColor: Colors.black, - background: Color(0xFFFFFFFF), - leadingColor: Colors.black, - ), - body: Container( - width: MediaQuery.of(context).size.width, - height: MediaQuery.of(context).size.height, - alignment: Alignment.center, - child:Text("hdjhcd" - )), - ); - } -}