Browse Source

Merge branch 'master' into dev

master
w-R 3 years ago
parent
commit
4484dc40c3
  1. 20
      assets/svg/dingdan_waimai.svg
  2. 20
      assets/svg/dingdan_wuliu.svg
  3. 20
      assets/svg/dingdan_ziqu.svg
  4. 55
      lib/store/store_order.dart
  5. 219
      lib/store/store_view/settlement.dart
  6. 7
      lib/store/store_view/shop_car.dart

20
assets/svg/dingdan_waimai.svg

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="358px" height="149px" viewBox="0 0 358 149" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>矩形备份 20</title>
<defs>
<path d="M132.04384,5 L225.889633,5 C229.497242,5 232.658519,7.41457063 233.607744,10.8950608 L242.392256,43.1049392 C243.341481,46.5854294 246.502758,49 250.110367,49 L350,49 L350,49 L350,130 C350,134.418278 346.418278,138 342,138 L16,138 C11.581722,138 8,134.418278 8,130 L8,49 L8,49 L107.45616,49 C111.032457,49 114.174323,46.6263827 115.151643,43.1862167 L124.348357,10.8137833 C125.325677,7.37361731 128.467543,5 132.04384,5 Z" id="path-1"></path>
<filter x="-3.9%" y="-7.9%" width="107.9%" height="120.3%" filterUnits="objectBoundingBox" id="filter-2">
<feOffset dx="0" dy="3" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="4" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.03 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
</filter>
</defs>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="外卖" transform="translate(-8.000000, -99.000000)">
<g id="矩形备份-20" transform="translate(8.000000, 99.000000)">
<use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
<use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-1"></use>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.6 KiB

20
assets/svg/dingdan_wuliu.svg

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="358px" height="149px" viewBox="0 0 358 149" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>矩形备份 20</title>
<defs>
<path d="M250.110367,5 L342,5 C346.418278,5 350,8.581722 350,13 L350,49 L350,49 L350,130 C350,134.418278 346.418278,138 342,138 L16,138 C11.581722,138 8,134.418278 8,130 L8,49 L8,49 L225.889633,49 C229.497242,49 232.658519,46.5854294 233.607744,43.1049392 L242.392256,10.8950608 C243.341481,7.41457063 246.502758,5 250.110367,5 Z" id="path-1"></path>
<filter x="-3.9%" y="-7.9%" width="107.9%" height="120.3%" filterUnits="objectBoundingBox" id="filter-2">
<feOffset dx="0" dy="3" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="4" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.03 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
</filter>
</defs>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="物流" transform="translate(-8.000000, -99.000000)">
<g id="矩形备份-20" transform="translate(8.000000, 99.000000)">
<use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
<use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-1"></use>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

20
assets/svg/dingdan_ziqu.svg

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="358px" height="181px" viewBox="0 0 358 181" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>矩形备份 20</title>
<defs>
<path d="M16,7 L107.889633,7 C111.497242,7 114.658519,9.41457063 115.607744,12.8950608 L124.392256,45.1049392 C125.341481,48.5854294 128.502758,51 132.110367,51 L350,51 L350,51 L350,164 C350,168.418278 346.418278,172 342,172 L16,172 C11.581722,172 8,168.418278 8,164 L8,15 C8,10.581722 11.581722,7 16,7 Z" id="path-1"></path>
<filter x="-3.7%" y="-7.0%" width="107.3%" height="115.2%" filterUnits="objectBoundingBox" id="filter-2">
<feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="4" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.03 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
</filter>
</defs>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="1-自取" transform="translate(-8.000000, -97.000000)">
<g id="矩形备份-20" transform="translate(8.000000, 97.000000)">
<use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
<use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-1"></use>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

55
lib/store/store_order.dart

@ -4,6 +4,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:flutter_swiper/flutter_swiper.dart';
import 'package:huixiang/generated/l10n.dart';
import 'package:huixiang/retrofit/data/activity.dart';
@ -39,7 +40,8 @@ class StoreOrderPage extends StatefulWidget {
}
}
class _StoreOrderPage extends State<StoreOrderPage> with TickerProviderStateMixin/*, AutomaticKeepAliveClientMixin*/ {
class _StoreOrderPage extends State<StoreOrderPage>
with TickerProviderStateMixin /*, AutomaticKeepAliveClientMixin*/ {
TabController tabcontroller;
ApiService apiService;
MinApiService minService;
@ -71,7 +73,8 @@ class _StoreOrderPage extends State<StoreOrderPage> with TickerProviderStateMixi
_fc(int count, String productId, int allCount, double allPrice) {
if (count == 0) {
int index = shopCarGoods.indexWhere((element) => element["id"] == productId);
int index =
shopCarGoods.indexWhere((element) => element["id"] == productId);
shopCarGoods.removeAt(index);
}
@ -239,7 +242,8 @@ class _StoreOrderPage extends State<StoreOrderPage> with TickerProviderStateMixi
coupon: true,
),
if (storeInfo == null || storeInfo.couponVOList == null)
if (storeInfo == null ||
storeInfo.couponVOList == null)
SizedBox(
height: 8,
),
@ -274,8 +278,10 @@ class _StoreOrderPage extends State<StoreOrderPage> with TickerProviderStateMixi
isScrollable: true,
indicatorWeight: 1,
indicatorColor: Color(0xFFFAFAFA),
labelPadding:
EdgeInsets.only(left: 8.w, right: 8.w),
labelPadding: EdgeInsets.only(
left: 8.w,
right: 8.w,
),
indicatorSize: TabBarIndicatorSize.label,
unselectedLabelStyle: TextStyle(
fontSize: 15.sp,
@ -288,8 +294,8 @@ class _StoreOrderPage extends State<StoreOrderPage> with TickerProviderStateMixi
),
labelColor: Colors.black,
tabs: [
MyTab(text: S.current.diancan),
MyTab(text: S.current.xindianhuodong),
MyTab(text: S.of(context).diancan),
MyTab(text: S.of(context).xindianhuodong),
],
),
),
@ -356,12 +362,7 @@ class _StoreOrderPage extends State<StoreOrderPage> with TickerProviderStateMixi
Spacer(),
GestureDetector(
onTap: () {
Navigator.of(context).pushNamed(
'/router/settlement',
arguments: {
"storeInfo": storeInfo,
},
);
toDownOrder();
},
child: RoundButton(
width: 103.w,
@ -414,6 +415,20 @@ class _StoreOrderPage extends State<StoreOrderPage> with TickerProviderStateMixi
);
}
toDownOrder() {
if (shopCarGoods == null || shopCarGoods.length == 0) {
SmartDialog.showToast("请选择要购买的商品~");
return ;
}
Navigator.of(context).pushNamed(
'/router/settlement',
arguments: {
"storeInfo": storeInfo,
"shopGoods": shopCarGoods,
},
);
}
Widget buildSwiper() {
return Container(
width: double.infinity,
@ -481,6 +496,7 @@ class _StoreOrderPage extends State<StoreOrderPage> with TickerProviderStateMixi
shopCar,
shopCarGoods,
clearShopCar,
toDownOrder,
(int count, String productId, allCount, allPrice) {
print("shopCarCount: $allCount allPrice: $allPrice ");
setState(() {
@ -495,8 +511,7 @@ class _StoreOrderPage extends State<StoreOrderPage> with TickerProviderStateMixi
///
clearShopCar() {
if (shopCarGoods != null)
shopCarGoods.clear();
if (shopCarGoods != null) shopCarGoods.clear();
calculatePrice();
setState(() {});
}
@ -542,7 +557,8 @@ class _StoreOrderPage extends State<StoreOrderPage> with TickerProviderStateMixi
}
});
if (map != null) {
int index = shopCarGoods.indexWhere((element) => element["id"] == result["id"]);
int index = shopCarGoods
.indexWhere((element) => element["id"] == result["id"]);
shopCarGoods.removeAt(index);
shopCarGoods.insert(index, result);
} else {
@ -561,7 +577,8 @@ class _StoreOrderPage extends State<StoreOrderPage> with TickerProviderStateMixi
double singlePrice = double.tryParse(element2["price"]);
allCount += element2["count"];
AiDecimalAccuracy aiDecimalAccuracy = AiDecimalAccuracy.fromInt(element2["count"]);
AiDecimalAccuracy aiDecimalAccuracy =
AiDecimalAccuracy.fromInt(element2["count"]);
AiDecimalAccuracy aiPrice = AiDecimalAccuracy.tryParse("$singlePrice");
allPriceDecimal += (aiPrice * aiDecimalAccuracy);
@ -572,8 +589,8 @@ class _StoreOrderPage extends State<StoreOrderPage> with TickerProviderStateMixi
setState(() {});
}
// @override
// bool get wantKeepAlive => true;
// @override
// bool get wantKeepAlive => true;
}
class Title extends StatefulWidget {

219
lib/store/store_view/settlement.dart

@ -3,8 +3,11 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:huixiang/generated/l10n.dart';
import 'package:huixiang/order/order_view/order_commodity.dart';
import 'package:huixiang/order/order_view/order_info.dart';
import 'package:huixiang/retrofit/data/base_data.dart';
import 'package:huixiang/retrofit/data/coupon.dart';
import 'package:huixiang/retrofit/data/order_info.dart';
import 'package:huixiang/retrofit/data/settleOrderInfo.dart';
import 'package:huixiang/retrofit/data/store_info.dart';
import 'package:huixiang/retrofit/min_api.dart';
@ -57,21 +60,19 @@ class _Settlement extends State<Settlement> {
StoreInfo storeInfo;
SettleOrderInfo settleOrderInfo;
///
queryOrderInfo() async {
BaseData<SettleOrderInfo> baseData = await minService.getOrderInfo({
"addressId":null,
"addressId": null,
"isTake": 0,
"memberCouponId": null,
// "orderId": widget.arguments["orderId"],
"orderId":"1449199929208602624",
"orderId": "1449199929208602624",
"promotionId": null
});
if (baseData != null && baseData.isSuccess) {
settleOrderInfo = baseData.data;
setState(() {
});
setState(() {});
}
}
@ -95,7 +96,7 @@ class _Settlement extends State<Settlement> {
appBar: MyAppBar(
background: Color(0xFF3A405A),
leadingColor: Colors.white,
title:S.of(context).dingdanjiesuan,
title: S.of(context).dingdanjiesuan,
titleColor: Colors.white,
titleSize: 18.sp,
),
@ -106,10 +107,12 @@ class _Settlement extends State<Settlement> {
child: Column(
children: [
distributionMode(),
SizedBox(height: 14,),
SizedBox(
height: 14,
),
///
SettlementOrderCommodity(settleOrderInfo,0),
SettlementOrderCommodity(settleOrderInfo, 0),
// if (payStatus == 0) couponRemarks(),
/*(payStatus == 0) ? paySelector() : */
@ -118,7 +121,6 @@ class _Settlement extends State<Settlement> {
///
payMethod(),
],
),
),
@ -134,8 +136,7 @@ class _Settlement extends State<Settlement> {
bottom: 0,
left: 0,
right: 0,
child:
Container(
child: Container(
height: 54.h,
color: Colors.white,
child: Row(
@ -158,11 +159,11 @@ class _Settlement extends State<Settlement> {
color: Color(0xFF32A060),
),
),
SizedBox(width: 28,),
SizedBox(
width: 28,
),
GestureDetector(
onTap: () {
},
onTap: () {},
child: RoundButton(
width: 103.w,
height: 54.h,
@ -186,7 +187,6 @@ class _Settlement extends State<Settlement> {
String center = "";
TextEditingController _vc = TextEditingController();
Widget distributionMode() {
return Container(
decoration: BoxDecoration(
@ -227,13 +227,15 @@ class _Settlement extends State<Settlement> {
decoration: BoxDecoration(
image: selectedBtn == 0
? DecorationImage(
image: AssetImage(
"assets/image/order_btn1.png"),
image:
AssetImage("assets/image/order_btn1.png"),
fit: BoxFit.fill,
)
: null,
borderRadius: BorderRadius.only(
topLeft: Radius.circular(8))),
topLeft: Radius.circular(8),
),
),
child: GestureDetector(
onTap: () {
setState(() {
@ -253,7 +255,8 @@ class _Settlement extends State<Settlement> {
),
],
),
)),
),
),
),
Expanded(
flex: 1,
@ -291,18 +294,21 @@ class _Settlement extends State<Settlement> {
decoration: BoxDecoration(
image: selectedBtn == 2
? DecorationImage(
image: AssetImage(
"assets/image/order_btn3.png"),
image:
AssetImage("assets/image/order_btn3.png"),
fit: BoxFit.fill,
)
: null,
borderRadius: BorderRadius.only(
topRight: Radius.circular(8))),
topRight: Radius.circular(8),
),
),
child: GestureDetector(
onTap: () {
setState(() {
// selectedBtn = 2;
SmartDialog.showToast("该功能暂未开放!", alignment: Alignment.center);
SmartDialog.showToast("该功能暂未开放!",
alignment: Alignment.center);
});
},
child: Stack(
@ -318,25 +324,30 @@ class _Settlement extends State<Settlement> {
),
],
),
)),
),
),
),
],
),
),
selectedBtn == 0 ?
Container(
selectedBtn == 0
? Container(
width: double.infinity,
padding: EdgeInsets.only(left: 16, right: 16, top: 15),
child: Column(
children: [
Row(
children: [
Expanded(child:Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
Expanded(
child: Column(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
storeInfo != null ? (storeInfo.storeName ?? "") : "",
storeInfo != null
? (storeInfo.storeName ?? "")
: "",
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 14.sp,
@ -348,7 +359,9 @@ class _Settlement extends State<Settlement> {
height: 4,
),
Text(
storeInfo != null ? storeInfo.address : "",
storeInfo != null
? storeInfo.address
: "",
overflow: TextOverflow.ellipsis,
maxLines: 2,
style: TextStyle(
@ -361,7 +374,8 @@ class _Settlement extends State<Settlement> {
height: 12,
),
],
),),
),
),
SizedBox(
width: 18,
),
@ -373,34 +387,37 @@ class _Settlement extends State<Settlement> {
Image.asset(
"assets/image/map.png",
height: 61.h,
width:61.w,
width: 61.w,
),
],
),
Column(children: [
Column(
children: [
RoundButton(
width: 41.w,
height: 13,
text: "距离您11m",
textColor:Color(0xFF34A262),
textColor: Color(0xFF34A262),
fontWeight: MyFontWeight.semi_bold,
radius:7.5,
backgroup:Colors.white,
fontSize:7.sp,
radius: 7.5,
backgroup: Colors.white,
fontSize: 7.sp,
),
Image.asset(
"assets/image/landmark.png",
height: 24.h,
width:24.w,
width: 24.w,
),
],
),
],),
],
)
],
),
Row(
children: [
Expanded(child: Text(
Expanded(
child: Text(
S.of(context).yuliudianhua,
overflow: TextOverflow.ellipsis,
style: TextStyle(
@ -408,9 +425,10 @@ class _Settlement extends State<Settlement> {
fontWeight: MyFontWeight.regular,
color: Color(0xFF4C4C4C),
),
)),
),
),
Text(
storeInfo != null ? storeInfo.headMobile:"",
storeInfo != null ? storeInfo.headMobile : "",
style: TextStyle(
fontSize: 14.sp,
fontWeight: MyFontWeight.medium,
@ -418,13 +436,13 @@ class _Settlement extends State<Settlement> {
),
),
GestureDetector(
onTap: (){
onTap: () {
showAlertDialog();
},
child:Image.asset(
child: Image.asset(
"assets/image/pen.png",
height:14.h,
width:14.w,
height: 14.h,
width: 14.w,
),
),
],
@ -443,9 +461,10 @@ class _Settlement extends State<Settlement> {
children: [
Image.asset(
"assets/image/icon_permission_location.png",
height:24.h,
width:24.w,
), Text(
height: 24.h,
width: 24.w,
),
Text(
"张先生",
overflow: TextOverflow.ellipsis,
style: TextStyle(
@ -457,7 +476,8 @@ class _Settlement extends State<Settlement> {
SizedBox(
width: 13,
),
Expanded(child: Text(
Expanded(
child: Text(
"12309090909",
overflow: TextOverflow.ellipsis,
maxLines: 2,
@ -466,14 +486,16 @@ class _Settlement extends State<Settlement> {
fontWeight: MyFontWeight.medium,
color: Color(0xFF4C4C4C),
),
),),
),
),
Icon(
Icons.keyboard_arrow_right,
size:24,
size: 24,
),
],
),
Padding(padding:EdgeInsets.only(top: 4,left:25),
Padding(
padding: EdgeInsets.only(top: 4, left: 25),
child: Text(
"武昌区中国铁建凯德1818蓝调步行街中北路109附33门牌号05",
overflow: TextOverflow.ellipsis,
@ -483,7 +505,8 @@ class _Settlement extends State<Settlement> {
fontWeight: MyFontWeight.regular,
color: Color(0xFF727272),
),
),),
),
),
],
),
),
@ -494,7 +517,7 @@ class _Settlement extends State<Settlement> {
);
}
Widget activityRemarks(){
Widget activityRemarks() {
return Container(
decoration: BoxDecoration(
color: Colors.white,
@ -509,29 +532,40 @@ class _Settlement extends State<Settlement> {
borderRadius: BorderRadius.circular(8),
),
height: 86.h,
margin: EdgeInsets.only(left: 16, right: 16, top: 15),
padding: EdgeInsets.only(left: 16, right: 16, top: 16),
margin: EdgeInsets.only(
left: 16,
right: 16,
top: 15,
),
padding: EdgeInsets.only(
left: 16,
right: 16,
top: 16,
),
child: Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(flex: 1,child:Text(
Expanded(
flex: 1,
child: Text(
S.of(context).youhuiquan,
style: TextStyle(
fontWeight: MyFontWeight.regular,
fontSize: 14.sp,
color: Color(0xFF353535),
),
)),
),
),
Text(
"满30减10",
textAlign: TextAlign.end,
style: TextStyle(
fontSize: 14.sp,
color: Color(0xFF32A060),
fontWeight: MyFontWeight.semi_bold
fontWeight: MyFontWeight.semi_bold,
),
),
InkWell(
@ -545,30 +579,33 @@ class _Settlement extends State<Settlement> {
size: 16,
),
),
],
),
SizedBox(height: 13,
SizedBox(
height: 13,
),
Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(flex: 1,child:Text(
Expanded(
flex: 1,
child: Text(
S.of(context).beizhu,
style: TextStyle(
fontWeight: MyFontWeight.regular,
fontSize: 14.sp,
color: Color(0xFF353535),
),
)),
),
),
Text(
"口味、面包硬度等",
textAlign: TextAlign.end,
style: TextStyle(
fontSize: 14.sp,
color: Color(0xFF353535),
fontWeight: MyFontWeight.semi_bold
fontWeight: MyFontWeight.semi_bold,
),
),
Icon(
@ -582,7 +619,7 @@ class _Settlement extends State<Settlement> {
);
}
Widget payMethod(){
Widget payMethod() {
return Container(
width: double.infinity,
margin: EdgeInsets.only(
@ -619,14 +656,14 @@ class _Settlement extends State<Settlement> {
style: TextStyle(
fontSize: 16.sp,
color: Colors.black,
fontWeight:MyFontWeight.regular,
fontWeight: MyFontWeight.regular,
),
),
),
GestureDetector(
onTap: () {
setState(() {
checkIndex =1;
checkIndex = 1;
});
},
child: Row(
@ -639,17 +676,18 @@ class _Settlement extends State<Settlement> {
style: TextStyle(
fontSize: 14.sp,
color: Color(0xff353535),
fontWeight: MyFontWeight.semi_bold
),
fontWeight: MyFontWeight.semi_bold),
),
],
),
),
SizedBox(height: 10,),
SizedBox(
height: 10,
),
GestureDetector(
onTap: () {
setState(() {
checkIndex =2;
checkIndex = 2;
});
},
child: Row(
@ -668,7 +706,9 @@ class _Settlement extends State<Settlement> {
],
),
),
SizedBox(height: 10,),
SizedBox(
height: 10,
),
GestureDetector(
onTap: () {
setState(() {
@ -764,15 +804,19 @@ class _Settlement extends State<Settlement> {
fontWeight: MyFontWeight.medium,
),
),
SizedBox(width: 4,),
Expanded(child: Text(
SizedBox(
width: 4,
),
Expanded(
child: Text(
"(1)",
style: TextStyle(
color: Color(0xFF000000),
fontSize: 14.sp,
fontWeight: MyFontWeight.medium,
),
),),
),
),
InkWell(
onTap: () {
Navigator.of(context).pop();
@ -794,13 +838,12 @@ class _Settlement extends State<Settlement> {
right: 16,
),
child: ListView.builder(
itemCount:5,
itemCount: 5,
physics: BouncingScrollPhysics(),
itemBuilder: (context, position) {
// return shoppGoodsItem();
return GestureDetector(
onTap: () {
},
onTap: () {},
child: couponItem(position),
);
},
@ -817,9 +860,9 @@ class _Settlement extends State<Settlement> {
///
Widget couponItem(int index) {
return StatefulBuilder(builder: (context1, state){
return StatefulBuilder(builder: (context1, state) {
return Container(
height:170,
height: 170,
width: double.infinity,
margin: EdgeInsets.fromLTRB(14.w, 6.h, 14.w, 6.h),
decoration: BoxDecoration(
@ -846,7 +889,7 @@ class _Settlement extends State<Settlement> {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(
child:Column(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
@ -901,8 +944,7 @@ class _Settlement extends State<Settlement> {
Container(
padding: EdgeInsets.fromLTRB(4, 2, 4, 2),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(2),
borderRadius: BorderRadius.circular(2),
border: Border.all(
width: 1,
color: Color(0xFFFF7A1A),
@ -956,13 +998,13 @@ class _Settlement extends State<Settlement> {
),
Container(
margin: EdgeInsets.only(right: 23.w),
child:GestureDetector(
onTap: (){
child: GestureDetector(
onTap: () {
state(() {
isSelected = index;
});
},
child:Image.asset(
child: Image.asset(
isSelected != index
? "assets/image/icon_radio_unselected.png"
: "assets/image/icon_radio_selected.png",
@ -1067,5 +1109,4 @@ class _Settlement extends State<Settlement> {
),
);
}
}

7
lib/store/store_view/shop_car.dart

@ -11,6 +11,7 @@ class ShopCar extends StatefulWidget {
final List<ProductListBean> productLists;
final Function(String id) queryMiNiDetail;
final Function() clearShopCar;
final Function() toDownOrder;
final List<Map<String, dynamic>> shopCarGoods;
final Function(int count, String productId, int allCount, double allPrice) fc;
@ -19,6 +20,7 @@ class ShopCar extends StatefulWidget {
this.productLists,
this.shopCarGoods,
this.clearShopCar,
this.toDownOrder,
this.fc, {
this.queryMiNiDetail,
});
@ -211,10 +213,7 @@ class _ShopCar extends State<ShopCar> {
Spacer(),
GestureDetector(
onTap: () {
Navigator.of(context).pushNamed(
'/router/settlement',
arguments: {},
);
widget.toDownOrder();
},
child: RoundButton(
width: 103.w,

Loading…
Cancel
Save