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

更改

master
w-R 3 years ago
parent
ac96c74f00
commit
e2e2cb0f1b
3 changed files with 1109 additions and 384 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. 1059
      lib/store/store_order.dart
  2. 161
      lib/union/union_details_page.dart
  3. 273
      lib/union/union_view/store_activity.dart

1059
lib/store/store_order.dart
View File

File diff suppressed because it is too large Load Diff

161
lib/union/union_details_page.dart
Unescape View File

@ -21,7 +21,6 @@ import 'package:huixiang/union/union_view/vip.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/utils/min.dart';
import 'package:huixiang/view_widget/classic_header.dart';
import 'package:huixiang/view_widget/custom_image.dart';
import 'package:huixiang/view_widget/my_appbar.dart';
import 'package:huixiang/view_widget/receive_success.dart';
import 'package:path_provider/path_provider.dart';
@ -45,8 +44,6 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
@override
void dispose() {
SmartDialog.dismiss();
EasyLoading.dismiss();
super.dispose();
refreshController.dispose();
}
@ -83,105 +80,73 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
future: queryStoreInfo(),
builder: (context, snapshot) {
return Scaffold(
// appBar: MyAppBar(
// background: Color(0xFFF7F7F7),
// // title: storeInfo == null
// // ? (widget.arguments["storeName"] ?? "")
// // : storeInfo.storeName,
// title: "",
// titleColor: Colors.black87,
// titleSize: 18.sp,
// leadingColor: Colors.black,
// ),
body:
Stack(
children: [
MImage(
storeInfo != null && storeInfo.bannerList != null?
storeInfo.bannerList.first.imgUrl:"",
width: double.infinity,
height: 190.h,
fit: BoxFit.cover,
errorSrc: "assets/image/default_1.png",
fadeSrc: "assets/image/default_1.png",
),
Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(height:54.h,),
Padding(padding:EdgeInsets.only(left: 17.w),
child: GestureDetector(
onTap: () {
Navigator.of(context).pop();
},
child:Icon(
Icons.arrow_back_ios,
color: Colors.black,
size: 24,
)
),),
SizedBox(height:29.h,),
Expanded(
child: SmartRefresher(
controller: refreshController,
enablePullDown: true,
enablePullUp: false,
header: MyHeader(),
physics: BouncingScrollPhysics(),
onRefresh: () {
setState(() {});
},
child: SingleChildScrollView(
physics: NeverScrollableScrollPhysics(),
child: Column(
children: [
///门店信息
StoreInfos(storeInfo),
///门店对应优惠券
UnionCoupon(storeInfo, _receiveCoupon),
appBar: MyAppBar(
background: Color(0xFFF7F7F7),
title: storeInfo == null
? (widget.arguments["storeName"] ?? "")
: storeInfo.storeName,
titleColor: Colors.black87,
titleSize: 18.sp,
leadingColor: Colors.black,
),
body: Column(
children: [
Expanded(
child: SmartRefresher(
controller: refreshController,
enablePullDown: true,
enablePullUp: false,
header: MyHeader(),
physics: BouncingScrollPhysics(),
onRefresh: () {
setState(() {});
},
child: SingleChildScrollView(
physics: NeverScrollableScrollPhysics(),
child: Column(
children: [
///门店信息
StoreInfos(storeInfo),
///门店对应VIP信息
Vip(storeInfo, _receiveVip, isReceive),
///门店对应VIP信息
Vip(storeInfo, _receiveVip, isReceive),
/// 门店对应的活动
StoreActivity(widget.arguments, activitys),
///门店对应优惠券
UnionCoupon(storeInfo, _receiveCoupon),
],
),
),
),
// flex: 1,
),
// InkWell(
// onTap: _loginMin,
// child: Container(
// padding: EdgeInsets.only(top: 16.h, bottom: 16.h),
// decoration: BoxDecoration(
// color: isEnable() ? Color(0xFF32A060) : Color(0xFFD8D8D8),
// borderRadius: BorderRadius.vertical(
// top: Radius.circular(4),
// ),
// ),
// alignment: Alignment.center,
// child: Text(
// isEnable()
// ? S.of(context).jinrushangdian
// : S.of(context).zanwuxianshangjindian,
// style: TextStyle(
// fontSize: 16.sp,
// color: isEnable() ? Colors.white : Color(0xFFA0A0A0),
// fontWeight: MyFontWeight.semi_bold,
// ),
// ),
// ),
// ),
],
/// 门店对应的活动
StoreActivity(widget.arguments, activitys),
],
),
),
],
),
flex: 1,
),
InkWell(
onTap: _loginMin,
child: Container(
padding: EdgeInsets.only(top: 16.h, bottom: 16.h),
decoration: BoxDecoration(
color: isEnable() ? Color(0xFF32A060) : Color(0xFFD8D8D8),
borderRadius: BorderRadius.vertical(
top: Radius.circular(4),
),
),
alignment: Alignment.center,
child: Text(
isEnable()
? S.of(context).jinrushangdian
: S.of(context).zanwuxianshangjindian,
style: TextStyle(
fontSize: 16.sp,
color: isEnable() ? Colors.white : Color(0xFFA0A0A0),
fontWeight: MyFontWeight.semi_bold,
),
),
),
),
],
),
);
},
);
@ -339,7 +304,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
} else {
print("print 下载失败");
}
Future.delayed(Duration(seconds: 1), (){
Future.delayed(Duration(seconds: 1), () {
EasyLoading.dismiss();
});
}

273
lib/union/union_view/store_activity.dart
Unescape View File

@ -5,6 +5,7 @@ import 'package:huixiang/generated/l10n.dart';
import 'package:huixiang/retrofit/data/activity.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/view_widget/custom_image.dart';
import 'package:huixiang/view_widget/item_title.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:huixiang/view_widget/round_button.dart';
@ -23,51 +24,17 @@ class StoreActivity extends StatefulWidget {
}
class _StoreActivity extends State<StoreActivity> {
int page = 0;
int isSelected =0;
@override
Widget build(BuildContext context) {
return Column(
children: [
Container(
alignment:Alignment.centerLeft,
margin: EdgeInsets.only(top: 20.h, bottom: 20.h,left: 17.w),
child: Row(
children: [
GestureDetector(
onTap: (){setState(() {
page = 0;
});},
child: Text(
S.of(context).diandan,
textAlign: TextAlign.center,
style: TextStyle(
color: page==0?Colors.black:Colors.grey,
fontSize: page==0?16.sp:14.sp,
fontWeight: page==0?FontWeight.bold:FontWeight.normal,
),
),
),
Padding(padding: EdgeInsets.only(left: 10)),
GestureDetector(
onTap: (){setState(() {
page = 1;
});},
child: Text(
S.of(context).xindianhuodong,
textAlign: TextAlign.center,
style: TextStyle(
color: page==1?Colors.black:Colors.grey,
fontSize: page==1?16.sp:14.sp,
fontWeight: page==1?FontWeight.bold:FontWeight.normal,
),
),
),
],
margin: EdgeInsets.only(top: 20.h, bottom: 20.h),
child: ItemTitle(
text: S.of(context).xindianhuodong,
imgPath: "assets/image/icon_union_start_store.png",
),
),
page == 0 ? order():
(widget.activitys != null && widget.activitys.length > 0)
? Container(
margin: EdgeInsets.only(bottom: 30.h),
@ -94,45 +61,6 @@ class _StoreActivity extends State<StoreActivity> {
);
}
Widget order(){
return Container(
width: double.infinity,
child: Row(
children: [
Container(
// decoration: BoxDecoration(
// color: Color(0xFFFAFAFA),
// boxShadow: [
// BoxShadow(
// color: Color(0x0D000000),
// offset: Offset(0, 3),
// blurRadius: 14,
// spreadRadius: 0,
// )
// ],
// ),
width: 104.w,
child:ListView.builder(
itemCount:5,
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
itemBuilder: (context, position) {
return orderItem(position);
}),
),
Expanded(flex:1,child:Container(
child:ListView.builder(
itemCount:5,
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
itemBuilder: (context, position) {
return goodsItem();
}),
)),
],),
);
}
Widget buildSwiper2Bottom() {
return Container(
@ -263,195 +191,4 @@ class _StoreActivity extends State<StoreActivity> {
}
Widget orderItem(int index) {
return Container(
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
GestureDetector(
onTap: (){setState(() {
isSelected = index;
});},
child: Container(
color: isSelected != index ?Color(0xFFFAFAFA):Colors.white,
child: Padding(padding: EdgeInsets.only(left: 16,right: 28,top:8,bottom: 16),
child: Row(
children: [
Container(
color: isSelected != index ? Color(0xFFFAFAFA):Color(0xFF32A060),
width: 2.w,
height: 17.h,
),
SizedBox(width: 10.w,),
Text(
"人气推荐",
textAlign: TextAlign.center,
style: TextStyle(
color:isSelected != index ?Color(0xFF202020):Color(0xFF000000),
fontSize:12.sp,
fontWeight: MyFontWeight.medium,
),
),
],
),),
),
),
],
),
);
}
Widget goodsItem() {
return Container(
color: Colors.white,
padding: EdgeInsets.only(right: 16.w),
child: Row(
// mainAxisAlignment: MainAxisAlignment.spaceAround,
// crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(width: 12.w
),
MImage(
"assets/image/default_1.png",
width: 70,
height: 70,
fit: BoxFit.cover,
errorSrc: "assets/image/default_1.png",
fadeSrc: "assets/image/default_1.png",
),
SizedBox(width:10),
Expanded(child:
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
"手工啵啵奶茶",
style: TextStyle(
color:Colors.black,
fontSize:13.sp,
fontWeight: MyFontWeight.medium,
),
),
SizedBox(height:2),
Row(
children: [
Text(
"无香精",
style: TextStyle(
color:Color(0xFF4C4C4C),
fontSize:10.sp,
fontWeight: MyFontWeight.regular,
),
),
SizedBox(width:10),
Text(
"无香精",
style: TextStyle(
color:Color(0xFF4C4C4C),
fontSize:10.sp,
fontWeight: MyFontWeight.regular,
),
)
],
),
SizedBox(height:7),
Row(
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Text(
"会员价",
style: TextStyle(
color:Color(0xFFFF7A1A),
fontSize:10.sp,
fontWeight: MyFontWeight.medium,
),
),
Text(
"￥19.00",
style: TextStyle(
color:Color(0xFFFF7A1A),
fontSize:11.sp,
fontWeight: MyFontWeight.medium,
),
)
],
),
Row(
children: [
Text(
"原价",
style: TextStyle(
color:Color(0xFFA29E9E),
fontSize:9.sp,
fontWeight: MyFontWeight.regular,
),
),
SizedBox(width:10),
Text(
"￥19.00",
style: TextStyle(
color:Color(0xFFA29E9E),
fontSize:10.sp,
fontWeight: MyFontWeight.regular,
),
)
],
),
],
),
Spacer(),
true?RoundButton(
width: 49.w,
text: "选规格",
textColor: Colors.white,
fontWeight: MyFontWeight.medium,
radius: 11,
backgroup: Color(0xFF32A060),
fontSize: 11.sp,
padding: EdgeInsets.symmetric(vertical: 5.h),
):
InkWell(
onTap: () {
},
child: Image.asset(
"assets/image/reduce.png",
width: 22,
height: 22,
),
),
if(false)
Padding(padding: EdgeInsets.only(left: 8,right: 8),
child:Text(
"1",
style: TextStyle(
color:Colors.black,
fontSize:14.sp,
fontWeight: MyFontWeight.medium,
),
),),
if(false)
InkWell(
onTap: () {
},
child: Image.asset(
"assets/image/add.png",
width: 22,
height: 22,
),
),
],
),
],
),)
],
),
);
}
}
Write Preview
Loading…
Cancel
Save