diff --git a/lib/settlement/settlement.dart b/lib/settlement/settlement.dart index 0a861987..f6e6ea94 100644 --- a/lib/settlement/settlement.dart +++ b/lib/settlement/settlement.dart @@ -50,8 +50,6 @@ class _Settlement extends State { MinApiService minService; Function(int type) callback; StoreInfo storeInfo; - - // ShoppingCart shopCarGoods; SettleOrderInfo settleOrderInfo; MinOrderInfo minOrderInfo; int selectedBtn = 0; diff --git a/lib/store/shopping/shopping_cart/shopping_cart_page.dart b/lib/store/shopping/shopping_cart/shopping_cart_page.dart index ae76d6fd..3baa5c48 100644 --- a/lib/store/shopping/shopping_cart/shopping_cart_page.dart +++ b/lib/store/shopping/shopping_cart/shopping_cart_page.dart @@ -64,25 +64,15 @@ class _ShoppingCartPage extends State ///去下单结算页面 toDownOrder() async { - // int num = count(); - - // if (num == 0) { - // SmartDialog.showToast("请先选择您要购买的商品！～"); - // return; - // } await Navigator.of(context).pushNamed( '/router/settlement', arguments: { "storeInfo": widget.storeInfo, "tableId": tableId, - // "parentCode": parentCode, - // "parentId": parentId, "pName":pName, "pid":pid, "cName":cName, "cid":cid, - "shoppingCart": shopCarGoods, - // "numberOfPeople": numberOfPeople, }, ); queryShopCar(); @@ -116,39 +106,6 @@ class _ShoppingCartPage extends State } } - ///查询购物车 - // Future queryShopCar() async { - // pName="";//活动 - // pid="";//活动 - // cName="";//优惠券 - // cid="";//优惠券 - // BaseData> baseDate = - // await minService.getShoppingCart(tableId); - // if (baseDate != null && - // baseDate.isSuccess && - // baseDate.data != null && - // baseDate.data.length > 0) { - // if( baseDate.data[0].selectDiscount ==1){ - // baseDate.data[0].couponList.forEach((element) { - // if(element.isMaxCoupon){ - // cName = element.promotionName; - // cid = element.id; - // } - // }); - // }else if(baseDate.data[0].selectDiscount==2){ - // baseDate.data[0].promotionInfoList.forEach((element) { - // if(element.isMaxPromotion){ - // pName=element.name; - // pid=element.id; - // } - // }); - // } - // return baseDate.data[0]; - // } else { - // return null; - // } - // } - ///购物车数量修改 shopCartAdd( ShoppingCartSkuItemListBean cartSkuItem,int count,int selected) async { diff --git a/lib/store/shopping/shopping_goods_details.dart b/lib/store/shopping/shopping_goods_details.dart index 617aaa34..f2749d18 100644 --- a/lib/store/shopping/shopping_goods_details.dart +++ b/lib/store/shopping/shopping_goods_details.dart @@ -80,7 +80,6 @@ class _ShoppingGoodsDetails extends State { int tempHour = 0; int tempM = 0; int tempS = 0; - LaunchJoinAct launchJoinAct; BargainType bargainType = BargainType.BargainZBug; String indexP; JoinActivity joinA = JoinActivity.GoJoin; @@ -251,51 +250,6 @@ class _ShoppingGoodsDetails extends State { } } - // ///发起活动 - // queryLaunchAct() async { - // if (minService == null) - // minService = MinApiService( - // Dio(), - // context: context, - // token: minToken, - // tenant: tenant, - // storeId: storeId, - // showLoading: false, - // ); - // BaseData baseData = await minService.launchAct({ - // "actProductId": pageType == null - // ? miNiDetail.productSkuVOList[0].id - // : activityDetails.actProduct.id, - // "actRecordId": 0, - // "actTemplateId": activityDetails.actProduct.templateId, - // "actTimeId": activityDetails.actProduct.timeId, - // "addressId": "", - // "isDirectBuy": (bargainType == BargainType.BargainBug || - // bargainType == BargainType.CollageBug) - // ? false - // : true, - // "getType": 3, - // "productId": - // pageType == null ? productId : activityDetails.actProduct.productId, - // "skuId": skuId1, - // "skuPrice": skuPrice1, - // "templateType": pageType - // }).catchError((error) { - // refreshController.refreshFailed(); - // }); - // if (baseData != null && baseData.isSuccess) { - // setState(() { - // launchJoinAct = baseData.data; - // toBargain(); - // refreshController.refreshCompleted(); - // }); - // } else { - // if ((activityDetails?.actProduct?.productStock ?? 0) == 0) - // SmartDialog.showToast("活动商品售罄", alignment: Alignment.center); - // refreshController.refreshFailed(); - // } - // } - ///选规格弹窗 showStoreSelector(MiNiDetail miNiDetail, String id, int count) async { if (miNiDetail.attrList != null && @@ -538,16 +492,6 @@ class _ShoppingGoodsDetails extends State { }); } - // ///去砍价详情页面 - // toBargain() async { - // await Navigator.of(context) - // .pushNamed('/router/bargain_details', arguments: { - // "actRecordId": launchJoinAct.actRecordId, - // "limitNumber": limitNumber, - // "storeInfo": storeInfo, - // }); - // } - @override Widget build(BuildContext context) { return Stack( @@ -1229,13 +1173,6 @@ class _ShoppingGoodsDetails extends State { alignment: Alignment.center, height: 50.h, padding: EdgeInsets.only(left: 16.w), - // decoration: BoxDecoration( - // // image: DecorationImage( - // // fit: BoxFit.fill, - // // image: NetworkImage(bannerImg), - // // ), - // color: Colors.green, - // ), decoration: BoxDecoration( gradient: LinearGradient( begin: Alignment.centerLeft, diff --git a/lib/store/shopping/shopping_home/bargain_details.dart b/lib/store/shopping/shopping_home/bargain_details.dart index bfa2f269..70cbc08e 100644 --- a/lib/store/shopping/shopping_home/bargain_details.dart +++ b/lib/store/shopping/shopping_home/bargain_details.dart @@ -44,7 +44,6 @@ class _BargainDetails extends State { final RefreshController refreshController = RefreshController(); int limitNumber = 0; double bargainNum = 0; - LaunchJoinAct launchJoinAct; StoreInfo storeInfo; @override diff --git a/lib/store/shopping/shopping_home/search_page.dart b/lib/store/shopping/shopping_home/search_page.dart index 0acde597..31785659 100644 --- a/lib/store/shopping/shopping_home/search_page.dart +++ b/lib/store/shopping/shopping_home/search_page.dart @@ -641,25 +641,25 @@ class _SearchPage extends State with AutomaticKeepAliveClientMixin, ], ), ), - GestureDetector( - onTap: () { - setState(() { - optionIndex = 3; - }); - }, - child: Text( - "专区", - style: TextStyle( - fontSize: optionIndex == 3 ? 15.sp : 14.sp, - fontWeight: optionIndex == 3 - ? MyFontWeight.semi_bold - : MyFontWeight.regular, - color: optionIndex == 3 - ? Color(0xFF181818) - : Color(0xFF4D4D4D), - ), - ), - ), + // GestureDetector( + // onTap: () { + // setState(() { + // optionIndex = 3; + // }); + // }, + // child: Text( + // "专区", + // style: TextStyle( + // fontSize: optionIndex == 3 ? 15.sp : 14.sp, + // fontWeight: optionIndex == 3 + // ? MyFontWeight.semi_bold + // : MyFontWeight.regular, + // color: optionIndex == 3 + // ? Color(0xFF181818) + // : Color(0xFF4D4D4D), + // ), + // ), + // ), ], ), SizedBox(height: 16.h), diff --git a/pubspec.lock b/pubspec.lock index 86ed9c52..aa938ef1 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -307,7 +307,7 @@ packages: name: fluwx url: "https://pub.flutter-io.cn" source: hosted - version: "3.8.1" + version: "3.8.1+1" font_awesome_flutter: dependency: "direct main" description: @@ -377,7 +377,7 @@ packages: name: keframe url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.3" + version: "2.0.4" like_button: dependency: "direct main" description: