fmk
/
huixiang_app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

safety

master
fmk 3 years ago
parent
ef30c85fe9
commit
af927986bb
2 changed files with 247 additions and 220 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 147
      lib/store/store_view/settlement.dart
  2. 2
      lib/store/store_view/shop_goods.dart

147
lib/store/store_view/settlement.dart
Unescape View File

@ -16,7 +16,7 @@ class Settlement extends StatefulWidget {
final arguments;
final OrderInfo orderInfo;
Settlement({this.arguments,this.orderInfo});
Settlement({this.arguments, this.orderInfo});
@override
State<StatefulWidget> createState() {
@ -51,7 +51,8 @@ class _Settlement extends State<Settlement> {
// String storeType = "NORMALSTORE"; //NORMALSTORE FASTSTORE RETAILSTORE
queryDetails() async {
BaseData<OrderInfo> baseData = await apiService.orderDetail(widget.arguments["id"]);
BaseData<OrderInfo> baseData =
await apiService.orderDetail(widget.arguments["id"]);
if (baseData != null && baseData.isSuccess) {
orderInfo = baseData.data;
payStatus = orderInfo.payStatus;
@ -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,
brightness: Brightness.dark,
titleSize: 18.sp,
@ -106,10 +107,11 @@ class _Settlement extends State<Settlement> {
child: Container(
child: Column(
children: [
distributionMode(),
SizedBox(height: 14,),
SizedBox(
height: 14,
),
///订单商品
OrderCommodity(orderInfo),
@ -120,7 +122,6 @@ class _Settlement extends State<Settlement> {
activityRemarks(),
payMethod(),
],
),
),
@ -136,8 +137,7 @@ class _Settlement extends State<Settlement> {
bottom: 0,
left: 0,
right: 0,
child:
Container(
child: Container(
height: 54.h,
color: Colors.white,
child: Row(
@ -160,11 +160,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,
@ -179,7 +179,7 @@ class _Settlement extends State<Settlement> {
],
),
),
)
),
],
);
}
@ -289,7 +289,11 @@ class _Settlement extends State<Settlement> {
borderRadius: BorderRadius.circular(8),
),
height: 175.h,
margin: EdgeInsets.only(left: 16, right: 16, top: 15),
margin: EdgeInsets.only(
left: 16,
right: 16,
top: 15,
),
child: Stack(
children: [
Column(
@ -314,13 +318,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(() {
@ -340,7 +346,8 @@ class _Settlement extends State<Settlement> {
),
],
),
)),
),
),
),
Expanded(
flex: 1,
@ -378,13 +385,15 @@ 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(() {
@ -404,7 +413,8 @@ class _Settlement extends State<Settlement> {
),
],
),
)),
),
),
),
],
),
@ -416,7 +426,8 @@ class _Settlement extends State<Settlement> {
children: [
Row(
children: [
Expanded(child:Column(
Expanded(
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@ -446,7 +457,8 @@ class _Settlement extends State<Settlement> {
height: 12,
),
],
),),
),
),
SizedBox(
width: 18,
),
@ -458,34 +470,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(
@ -493,7 +508,8 @@ class _Settlement extends State<Settlement> {
fontWeight: MyFontWeight.regular,
color: Color(0xFF4C4C4C),
),
)),
),
),
Text(
"12309090909",
style: TextStyle(
@ -504,8 +520,8 @@ class _Settlement extends State<Settlement> {
),
Image.asset(
"assets/image/pen.png",
height:14.h,
width:14.w,
height: 14.h,
width: 14.w,
),
],
)
@ -514,18 +530,12 @@ class _Settlement extends State<Settlement> {
),
],
),
// Image.asset(
// "assets/image/shadow.png",
// width: 24.w,
// height: 24.h,
// fit: BoxFit.contain,
// ),
],
),
);
}
Widget activityRemarks(){
Widget activityRemarks() {
return Container(
decoration: BoxDecoration(
color: Colors.white,
@ -540,29 +550,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,
),
),
Icon(
@ -571,27 +592,31 @@ class _Settlement extends State<Settlement> {
),
],
),
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(
@ -605,7 +630,7 @@ class _Settlement extends State<Settlement> {
);
}
Widget payMethod(){
Widget payMethod() {
return Container(
width: double.infinity,
margin: EdgeInsets.only(
@ -642,14 +667,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(
@ -662,17 +687,19 @@ 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(
@ -691,7 +718,9 @@ class _Settlement extends State<Settlement> {
],
),
),
SizedBox(height: 10,),
SizedBox(
height: 10,
),
GestureDetector(
onTap: () {
setState(() {

2
lib/store/store_view/shop_goods.dart
Unescape View File

@ -159,7 +159,6 @@ class _ShopGoods extends State<ShopGoods> {
: InkWell(
onTap: () {
setState(() {
{
if (widget.productListBeans[widget.position]
.buyNum >
0)
@ -173,7 +172,6 @@ class _ShopGoods extends State<ShopGoods> {
element.buyNum;
});
widget.fc(allCount, allPrice);
}
});
},
child: Image.asset(

Write Preview
Loading…
Cancel
Save