Browse Source

首页更改

zyh
w-R 3 years ago
parent
commit
bea49daca0
  1. BIN
      assets/image/2x/home_lm.webp
  2. BIN
      assets/image/2x/home_recharge.webp
  3. BIN
      assets/image/2x/home_welfare.webp
  4. BIN
      assets/image/3x/home_lm.webp
  5. BIN
      assets/image/3x/home_recharge.webp
  6. BIN
      assets/image/3x/home_welfare.webp
  7. BIN
      assets/image/home_lm.webp
  8. BIN
      assets/image/home_recharge.webp
  9. BIN
      assets/image/home_welfare.webp
  10. 2
      lib/community/community_view/class_details_video.dart
  11. 2
      lib/home/home_view/discount_zone.dart
  12. 2
      lib/home/home_view/home_banner.dart
  13. 2
      lib/home/home_view/home_recommend_goods.dart
  14. 129
      lib/home/home_view/shortcut_operation.dart
  15. 2
      lib/home/home_view/top_selling_list.dart
  16. 61
      lib/home/home_view/union_entry.dart
  17. 2
      lib/home/home_view/welfare_core.dart
  18. 44
      lib/home/points_mall_view/points_goods_view.dart
  19. 220
      lib/home/welfare_exchange.dart
  20. 13
      lib/home/welfare_page.dart
  21. 32
      lib/mine/mine_page.dart
  22. 4
      lib/mine/mine_view/mine_calendar.dart
  23. 10
      lib/mine/mine_view/mine_item.dart
  24. 6
      lib/mine/mine_view/mine_order.dart
  25. 34
      lib/mine/mine_view/mine_view.dart
  26. 2
      lib/mine/recharge_page.dart
  27. 99
      lib/store/store_order.dart
  28. 7
      lib/union/union_list.dart
  29. 4
      lib/union/union_page.dart
  30. 14
      lib/view_widget/mine_vip_entry.dart
  31. 2
      pubspec.yaml

BIN
assets/image/2x/home_lm.webp

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
assets/image/2x/home_recharge.webp

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 746 B

BIN
assets/image/2x/home_welfare.webp

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
assets/image/3x/home_lm.webp

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
assets/image/3x/home_recharge.webp

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 778 B

BIN
assets/image/3x/home_welfare.webp

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
assets/image/home_lm.webp

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 936 B

BIN
assets/image/home_recharge.webp

Binary file not shown.

Before

Width:  |  Height:  |  Size: 956 B

After

Width:  |  Height:  |  Size: 664 B

BIN
assets/image/home_welfare.webp

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

2
lib/community/community_view/class_details_video.dart

@ -96,7 +96,7 @@ class ClassDetailsVideoState extends State<ClassDetailsVideo> {
@override
Widget build(BuildContext context) {
return Container(
key: globalKey,child:(videoPlayerController?.value?.isInitialized ?? false) ?videoWidget(
key: globalKey,child:(videoPlayerController?.value?.isInitialized ?? false) ? videoWidget(
MediaQuery.of(context).size.height,
(MediaQuery.of(context).size.height/videoPlayerController.value.aspectRatio)-43,
widget.coverImg,

2
lib/home/home_view/discount_zone.dart

@ -35,7 +35,7 @@ class _DiscountZone extends State<DiscountZone> {
Widget build(BuildContext context) {
return Container(
width: double.infinity,
margin: EdgeInsets.only(top: 24.h),
margin: EdgeInsets.only(top: 14.h),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,

2
lib/home/home_view/home_banner.dart

@ -23,7 +23,7 @@ class _HomeBanner extends State<HomeBanner> {
Widget build(BuildContext context) {
return Container(
child: AspectRatio(
aspectRatio: 375/230,
aspectRatio: 375/300,
child: Swiper(
pagination: SwiperPagination(
margin: EdgeInsets.only(bottom: 12.h),

2
lib/home/home_view/home_recommend_goods.dart

@ -47,7 +47,7 @@ class _HomeRecommendGoods extends State<HomeRecommendGoods> {
color: Colors.white,
),
margin: EdgeInsets.only(
left: 14.w, right: 14.w, top: 14.h, bottom: 24.h),
left: 14.w, right: 14.w, top: 14.h, bottom: 14.h),
child: ListView.builder(
scrollDirection: Axis.horizontal,
physics: BouncingScrollPhysics(),

129
lib/home/home_view/shortcut_operation.dart

@ -24,36 +24,42 @@ class _ShortcutOperation extends State<ShortcutOperation> {
super.initState();
}
@override
Widget build(BuildContext context) {
return Container(
height: 80.h,
height: 70.h,
width: double.infinity,
margin: EdgeInsets.only(bottom:15.h,left: 10.w,right: 10.w),
margin: EdgeInsets.only(bottom: 15.h, left: 9.w, right: 9.w),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Expanded(child:GestureDetector(
onTap: (){
Expanded(
child: GestureDetector(
onTap: () {
widget.goToOrder(0);
},
child: Container(
width: double.infinity,
margin: EdgeInsets.symmetric(horizontal:5),
margin: EdgeInsets.symmetric(horizontal: 5),
padding: EdgeInsets.all(10.h),
decoration: BoxDecoration(
color: Colors.white,
gradient: new LinearGradient(
begin: Alignment.centerLeft,
end: Alignment.centerRight,
colors: [
Color(0xFFD1E8D9),
Color(0xFFE4F7EA),
]),
boxShadow: [
BoxShadow(
color: Colors.black.withAlpha(12),
offset: Offset(0, 3),
blurRadius: 14,
spreadRadius: 0,
offset: Offset(0, 2),
blurRadius: 4,
spreadRadius: 1,
)
],
borderRadius: BorderRadius.circular(4),
borderRadius: BorderRadius.circular(6),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
@ -68,49 +74,58 @@ class _ShortcutOperation extends State<ShortcutOperation> {
style: TextStyle(
fontWeight: MyFontWeight.semi_bold,
fontSize: 14.sp,
color: Color(0xFF0D0D0D),
color: Color(0xFF32A060),
),
),
SizedBox(height:5.h),
SizedBox(height: 5.h),
Text(
"下单赚积分",
style: TextStyle(
fontWeight: MyFontWeight.regular,
fontSize: 12.sp,
color: Color(0xFF4D4D4D),
color: Color(0xFF61836F),
),
),
],
),
SizedBox(width: 3.w),
Expanded(child: Image.asset(
Expanded(
child: Image.asset(
"assets/image/home_lm.webp",
width:36.w,
height:36.h,
),),
width: 36.w,
height: 36.h,
),
),
],
),
),
) ),
Expanded(child:GestureDetector(
onTap: (){
)),
Expanded(
child: GestureDetector(
onTap: () {
Navigator.of(context).pushNamed('/router/recharge_page');
},
child: Container(
width: double.infinity,
margin: EdgeInsets.symmetric(horizontal:5.w),
margin: EdgeInsets.symmetric(horizontal: 5.w),
padding: EdgeInsets.all(10.h),
decoration: BoxDecoration(
color: Colors.white,
gradient: new LinearGradient(
begin: Alignment.centerLeft,
end: Alignment.centerRight,
colors: [
Color(0xFFFAEDCB),
Color(0xFFFAF4E2),
]),
boxShadow: [
BoxShadow(
color: Colors.black.withAlpha(12),
offset: Offset(0, 3),
blurRadius: 14,
spreadRadius: 0,
offset: Offset(0, 2),
blurRadius: 4,
spreadRadius: 1,
)
],
borderRadius: BorderRadius.circular(4.r),
borderRadius: BorderRadius.circular(6.r),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
@ -125,7 +140,7 @@ class _ShortcutOperation extends State<ShortcutOperation> {
style: TextStyle(
fontWeight: MyFontWeight.semi_bold,
fontSize: 14.sp,
color: Color(0xFF0D0D0D),
color: Color(0xFFFFBA1B),
),
),
SizedBox(height: 5.h),
@ -134,41 +149,51 @@ class _ShortcutOperation extends State<ShortcutOperation> {
style: TextStyle(
fontWeight: MyFontWeight.regular,
fontSize: 12.sp,
color: Color(0xFF4D4D4D),
color: Color(0xFFA59162),
),
),
],
),
SizedBox(width: 3.w),
Expanded(child: Image.asset(
Expanded(
child: Image.asset(
"assets/image/home_recharge.webp",
width:36.w,
height:36.h,
),),
width: 36.w,
height: 36.h,
),
),
],
),
),
), ),
Expanded(child: GestureDetector(
onTap: (){
),
),
Expanded(
child: GestureDetector(
onTap: () {
// Navigator.of(context).pushNamed('/router/roll_center_page');
Navigator.of(context).pushNamed('/router/welfare_page');
},
child:Container(
child: Container(
width: double.infinity,
margin: EdgeInsets.symmetric(horizontal:5.w),
margin: EdgeInsets.symmetric(horizontal: 5.w),
padding: EdgeInsets.all(10.h),
decoration: BoxDecoration(
color: Colors.white,
gradient: new LinearGradient(
begin: Alignment.centerLeft,
end: Alignment.centerRight,
colors: [
Color(0xFFFAE5CB),
Color(0xFFFAF1E4),
]),
boxShadow: [
BoxShadow(
color: Colors.black.withAlpha(12),
offset: Offset(0, 3),
blurRadius: 14,
spreadRadius: 0,
offset: Offset(0, 2),
blurRadius: 4,
spreadRadius: 1,
)
],
borderRadius: BorderRadius.circular(4.r),
borderRadius: BorderRadius.circular(6.r),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
@ -183,7 +208,7 @@ class _ShortcutOperation extends State<ShortcutOperation> {
style: TextStyle(
fontWeight: MyFontWeight.semi_bold,
fontSize: 14.sp,
color: Color(0xFF0D0D0D),
color: Color(0xFFFF910F),
),
),
SizedBox(height: 5.h),
@ -192,24 +217,26 @@ class _ShortcutOperation extends State<ShortcutOperation> {
style: TextStyle(
fontWeight: MyFontWeight.regular,
fontSize: 12.sp,
color: Color(0xFF4D4D4D),
color: Color(0xFF89755D),
),
),
],
),
SizedBox(width: 3.w),
Expanded(child: Image.asset(
Expanded(
child: Image.asset(
"assets/image/home_welfare.webp",
width:36.w,
height:36.h,
),),
width: 36.w,
height: 36.h,
),
),
],
),
),
),),
),
),
],
),
);
}
}

2
lib/home/home_view/top_selling_list.dart

@ -44,7 +44,7 @@ class _TopSellingList extends State<TopSellingList> {
fit: BoxFit.cover,
),
),
margin: EdgeInsets.only(left: 14.w,right: 14.w,top: 12.h,bottom: 23.h),
margin: EdgeInsets.only(left: 14.w,right: 14.w,bottom: 14.h),
padding: EdgeInsets.only(left: 12.w,top: 16.h),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,

61
lib/home/home_view/union_entry.dart

@ -30,21 +30,9 @@ class _UnionEntry extends State<UnionEntry> {
return Container(
height: 130.h,
width: double.infinity,
margin: EdgeInsets.only(bottom:10.h,left: 10.w,right: 10.w,top: 14.h),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Expanded(child:GestureDetector(
onTap: (){
widget.goToOrder(1);
},
child: Container(
width: double.infinity,
margin: EdgeInsets.symmetric(horizontal:5.w),
padding: EdgeInsets.symmetric(vertical:12.h),
margin: EdgeInsets.all(14.h),
decoration: BoxDecoration(
color: Colors.white,
color: Color(0xFFFFFFFF),
boxShadow: [
BoxShadow(
color: Colors.black.withAlpha(12),
@ -55,6 +43,14 @@ class _UnionEntry extends State<UnionEntry> {
],
borderRadius: BorderRadius.circular(6.r),
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Expanded(child:GestureDetector(
onTap: (){
widget.goToOrder(1);
},
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
@ -76,28 +72,11 @@ class _UnionEntry extends State<UnionEntry> {
),
],
),
),
) ),
Expanded(child:GestureDetector(
onTap: (){
widget.goToOrder(2);
},
child: Container(
width: double.infinity,
margin: EdgeInsets.symmetric(horizontal:5.w),
// padding: EdgeInsets.symmetric(vertical:12.h),
decoration: BoxDecoration(
color: Colors.white,
boxShadow: [
BoxShadow(
color: Colors.black.withAlpha(12),
offset: Offset(0, 3),
blurRadius: 14,
spreadRadius: 0,
)
],
borderRadius: BorderRadius.circular(6.r),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
@ -119,29 +98,12 @@ class _UnionEntry extends State<UnionEntry> {
),
],
),
),
) ),
Expanded(child: GestureDetector(
onTap: (){
widget.goToOrder(3);
},
child: Container(
width: double.infinity,
margin: EdgeInsets.symmetric(horizontal:5.w),
padding: EdgeInsets.symmetric(vertical:12.h),
decoration: BoxDecoration(
color: Colors.white,
boxShadow: [
BoxShadow(
color: Colors.black.withAlpha(12),
offset: Offset(0, 3),
blurRadius: 14,
spreadRadius: 0,
)
],
borderRadius: BorderRadius.circular(6.r),
),
child: Column(
child:Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
@ -162,7 +124,6 @@ class _UnionEntry extends State<UnionEntry> {
),
],
),
),
)),
],
),

2
lib/home/home_view/welfare_core.dart

@ -60,7 +60,7 @@ class _WelfareCore extends State<WelfareCore> {
),),
Container(
width: double.infinity,
margin: EdgeInsets.only(left:9.w,right: 9.w,top: 16.h,bottom: 12.h),
margin: EdgeInsets.only(left:10.w,right: 10.w,top: 14.h,bottom: 14.h),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,

44
lib/home/points_mall_view/points_goods_view.dart

@ -5,6 +5,7 @@ import 'package:huixiang/utils/flutter_utils.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/view_widget/custom_image.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:huixiang/view_widget/no_data_view.dart';
class PointGoods extends StatefulWidget {
final List<Goods> goods;
@ -19,21 +20,35 @@ class PointGoods extends StatefulWidget {
}
class _PointGoods extends State<PointGoods> {
String pointPrice(Goods goods){
if(goods == null)
return "";
if(goods?.onePrice!=null && goods?.onePrice!="0"){
String pointPrice(Goods goods) {
if (goods == null) return "";
if (goods?.onePrice != null && goods?.onePrice != "0") {
return S.of(context).jifen_(goods?.onePrice);
}else if((goods?.onePrice == null || goods?.onePrice == "0") && ((goods?.price != null && goods?.price != "0") || (goods?.money != null && goods?.money != "0.00"))){
return (goods?.price== "0"|| goods?.price == null ? "" : S.of(context).jifen_(goods?.price)) + (goods?.money== "0"|| goods?.money == null ? "" : " + ${AppUtils.calculateDouble(double.tryParse(goods?.money) ?? 0)}");
}else if(goods.oneMoney != null && goods.oneMoney != "0.00"){
} else if ((goods?.onePrice == null || goods?.onePrice == "0") &&
((goods?.price != null && goods?.price != "0") ||
(goods?.money != null && goods?.money != "0.00"))) {
return (goods?.price == "0" || goods?.price == null
? ""
: S.of(context).jifen_(goods?.price)) +
(goods?.money == "0" || goods?.money == null
? ""
: " + ${AppUtils.calculateDouble(double.tryParse(goods?.money) ?? 0)}");
} else if (goods.oneMoney != null && goods.oneMoney != "0.00") {
return "${AppUtils.calculateDouble(double.tryParse(goods.oneMoney) ?? 0)}";
}
}
@override
Widget build(BuildContext context) {
return GridView.builder(
return (widget.goods == null || widget.goods.length == 0)
? NoDataView(
src: "assets/image/xiao_fei.webp",
isShowBtn: false,
text: "当前分类暂无商品",
fontSize: 16.sp,
margin: EdgeInsets.all(60.h),
)
: GridView.builder(
itemCount: widget.goods == null ? 0 : widget.goods.length,
padding: EdgeInsets.only(
left: 16.w,
@ -52,7 +67,7 @@ class _PointGoods extends State<PointGoods> {
mainAxisSpacing: 16.w,
//Widget宽高比例 0.59
childAspectRatio:
200 / (286 / 2 + (286 / 2) * AppUtils.textScale(context)),
200 / (266 / 2 + (266 / 2) * AppUtils.textScale(context)),
),
itemBuilder: (context, index) {
return GestureDetector(
@ -91,7 +106,7 @@ class _PointGoods extends State<PointGoods> {
children: [
MImage(
goods.mainImgPath,
aspectRatio: 158/158,
aspectRatio: 158 / 158,
radius: BorderRadius.only(
topLeft: Radius.circular(6),
topRight: Radius.circular(6),
@ -111,17 +126,20 @@ class _PointGoods extends State<PointGoods> {
mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(child: Text(
Expanded(
child: Text(
goods.name,
overflow: TextOverflow.ellipsis,
maxLines: 2,
maxLines: 1,
style: TextStyle(
color: Color(0xff353535),
fontWeight: MyFontWeight.medium,
fontSize: 15.sp,
),
)),
SizedBox(height: 5.h,),
SizedBox(
height: 5.h,
),
Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,

220
lib/home/welfare_exchange.dart

@ -16,8 +16,10 @@ import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/view_widget/classic_header.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:huixiang/view_widget/custom_image.dart';
import 'package:huixiang/view_widget/item_title.dart';
import 'package:huixiang/view_widget/my_appbar.dart';
import 'package:huixiang/view_widget/my_footer.dart';
import 'package:huixiang/view_widget/my_tab.dart';
import 'package:huixiang/view_widget/no_data_view.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'package:shared_preferences/shared_preferences.dart';
@ -34,8 +36,10 @@ class _WelfareExchange extends State<WelfareExchange> {
final ScrollController scrollController = ScrollController();
final RefreshController refreshController = RefreshController();
int pageNum = 1;
//1-2-3-
int orderType = 1;
//
bool orderDesc = true;
List<Goods> goods = [];
@ -43,6 +47,12 @@ class _WelfareExchange extends State<WelfareExchange> {
List<GoodsCategory> gooodsCategorys = [];
UserInfo userInfo;
String categoryId;
var _itemText = S.current.morenpaixu;
List<String> sortString = [
S.current.morenpaixu,
S.current.jifengaodaodi,
S.current.jifendidaogao,
];
@override
void dispose() {
@ -65,6 +75,7 @@ class _WelfareExchange extends State<WelfareExchange> {
await apiService.queryInfo().catchError((onError) {});
if (baseData != null && baseData.isSuccess) {
userInfo = baseData.data;
setState(() {});
SharedPreferences.getInstance().then((value) => {
value.setString('user', jsonEncode(baseData.data)),
});
@ -147,6 +158,7 @@ class _WelfareExchange extends State<WelfareExchange> {
refreshController.loadFailed();
refreshController.refreshFailed();
}
setState(() {});
}
_onRefresh() {
@ -155,9 +167,38 @@ class _WelfareExchange extends State<WelfareExchange> {
@override
Widget build(BuildContext context) {
return Container(
color: Color(0xFFF7F7F7),
child: Stack(
return Scaffold(
backgroundColor: Colors.transparent,
body: NestedScrollView(
headerSliverBuilder: (context, inner) {
return [
SliverAppBar(
pinned: true,
backgroundColor: Colors.white,
elevation: 0,
title: Text(
"福利兑换",
style:
TextStyle(fontWeight: FontWeight.w500, color: Colors.white),
),
centerTitle: true,
leading: GestureDetector(
onTap: () {
Navigator.of(context).pop();
},
child: Container(
alignment: Alignment.centerRight,
margin: EdgeInsets.only(left: 10),
padding: EdgeInsets.all(6),
child: Icon(
Icons.arrow_back_ios,
color: Colors.white,
size: 24,
),
),
),
flexibleSpace: FlexibleSpaceBar(
background: Stack(
children: [
Container(
// padding: EdgeInsets.only(top: 40.h),
@ -171,86 +212,74 @@ class _WelfareExchange extends State<WelfareExchange> {
bottomLeft: Radius.circular(40),
),
),
// child: ClipPath(
//
// clipper: BottonClipper(),
// child: Container(
// color: Colors.deepOrange,
// height: 300,
// ),
// ),
),
Scaffold(
backgroundColor: Colors.transparent,
appBar: MyAppBar(
background: Colors.transparent,
leadingColor: Colors.white,
title: "福利兑换",
titleColor: Colors.white,
titleSize: 18.sp,
brightness: Brightness.dark,
),
body: SmartRefresher(
controller: refreshController,
enablePullDown: true,
enablePullUp: false,
header: MyHeader(),
footer: CustomFooter(
builder: (context, mode) {
return MyFooter(mode);
},
Container(
alignment: Alignment.topCenter,
margin: EdgeInsets.only(top: 106.h),
child: pointUser(),
),
onRefresh: () {
setState(() {
_onRefresh();
});
},
physics: BouncingScrollPhysics(),
scrollController: scrollController,
],
)),
expandedHeight: 258.h,
bottom: PreferredSize(
preferredSize: Size(double.infinity, 0),
child: DefaultTabController(
length: gooodsCategorys == null ? 0 : gooodsCategorys.length,
child: Container(
child: SingleChildScrollView(
physics: BouncingScrollPhysics(),
child: FutureBuilder(
future: creditGoods(),
builder: (context, snap) {
return Column(
children: [
///
pointUser(),
Container(
color: Colors.white,
child: Column(
children: [
///Tab
PointsGoodsTitle(
gooodsCategorys,
(orderType, orderDesc) {
this.orderType = orderType;
this.orderDesc = orderDesc;
setState(() {});
},
(index) {
child: TabBar(
isScrollable: true,
//
indicatorColor: Color(0xff39B54A),
labelColor: Color(0xff32A060),
labelStyle: TextStyle(
fontSize: 14.sp,
fontWeight: FontWeight.bold,
),
unselectedLabelStyle: TextStyle(
fontSize: 14.sp,
fontWeight: MyFontWeight.regular,
),
// controller: tabController,
//
unselectedLabelColor: Color(0xff4D4D4D),
indicatorSize: TabBarIndicatorSize.label,
//
tabs: gooodsCategorys == null
? []
: gooodsCategorys
.map((e) => MyTab(text: e.name))
.toList(),
onTap: (index) {
categoryId = gooodsCategorys[index].id;
pageNum = 1;
creditGoods();
setState(() {});
},
),
///,
pointList()
],
),
)
],
);
},
),
),
),
),
];
},
body: SmartRefresher(
controller: refreshController,
enablePullDown: true,
enablePullUp: true,
physics: ClampingScrollPhysics(),
header: MyHeader(),
footer: CustomFooter(
builder: (context, mode) {
return MyFooter(mode);
},
),
],
onRefresh: _onRefresh,
child: Container(
color: Colors.white,
padding: EdgeInsets.only(top: 19.h),
child: pointList(),
)),
),
);
}
@ -347,8 +376,9 @@ class _WelfareExchange extends State<WelfareExchange> {
crossAxisAlignment: CrossAxisAlignment.end,
children: [
GestureDetector(
onTap: (){
Navigator.of(context).pushNamed('/router/integral_detailed_page');
onTap: () {
Navigator.of(context)
.pushNamed('/router/integral_detailed_page');
},
child: Row(
children: [
@ -368,7 +398,7 @@ class _WelfareExchange extends State<WelfareExchange> {
color: Color(0xFF32A060),
borderRadius: BorderRadius.circular(10),
),
child:Icon(
child: Icon(
Icons.keyboard_arrow_right,
size: 20,
color: Colors.white,
@ -390,7 +420,9 @@ class _WelfareExchange extends State<WelfareExchange> {
fontWeight: MyFontWeight.medium,
),
),
SizedBox(width: 6,),
SizedBox(
width: 6,
),
Image.asset(
"assets/image/icon_gold_coin.webp",
width: 18,
@ -406,16 +438,18 @@ class _WelfareExchange extends State<WelfareExchange> {
);
}
Widget pointList(){
Widget pointList() {
return Container(
child: (goods == null || goods.length == 0)? NoDataView(
child: (goods == null || goods.length == 0)
? NoDataView(
src: "assets/image/xiao_fei.webp",
isShowBtn: false,
text: "当前分类暂无商品",
fontSize: 16.sp,
margin: EdgeInsets.only(top: 120.h,left: 60.w,right: 60.w),
):GridView.builder(
itemCount:goods == null ? 0 : goods.length,
margin: EdgeInsets.only(top: 120.h, left: 60.w, right: 60.w),
)
: GridView.builder(
itemCount: goods == null ? 0 : goods.length,
padding: EdgeInsets.only(
left: 16.w,
right: 16.w,
@ -433,7 +467,7 @@ class _WelfareExchange extends State<WelfareExchange> {
mainAxisSpacing: 16.w,
//Widget宽高比例 0.59
childAspectRatio:
200 / (285 / 2 + (285 / 2) * AppUtils.textScale(context)),
200 / (266 / 2 + (266 / 2) * AppUtils.textScale(context)),
),
itemBuilder: (context, index) {
return GestureDetector(
@ -490,10 +524,8 @@ class _WelfareExchange extends State<WelfareExchange> {
margin: EdgeInsets.only(
right: 12.w,
top: 10.h,
),padding: EdgeInsets.only(
bottom: 8.h,
left: 8.w
),
padding: EdgeInsets.only(bottom: 8.h, left: 8.w),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.start,
@ -501,7 +533,7 @@ class _WelfareExchange extends State<WelfareExchange> {
Text(
goods.name,
overflow: TextOverflow.ellipsis,
maxLines: 2,
maxLines: 1,
style: TextStyle(
color: Color(0xFF0D0D0D),
height: 1.2,
@ -532,17 +564,21 @@ class _WelfareExchange extends State<WelfareExchange> {
);
}
String pointPrice(Goods goods){
if(goods == null)
return "";
if(goods?.onePrice!=null && goods?.onePrice!="0"){
String pointPrice(Goods goods) {
if (goods == null) return "";
if (goods?.onePrice != null && goods?.onePrice != "0") {
return S.of(context).jifen_(goods?.onePrice);
}else if((goods?.onePrice == null || goods?.onePrice == "0") && ((goods?.price != null && goods?.price != "0") || (goods?.money != null && goods?.money != "0.00"))){
return (goods?.price== "0"|| goods?.price == null ? "" : S.of(context).jifen_(goods?.price)) + (goods?.money== "0"|| goods?.money == null ? "" : " + ${AppUtils.calculateDouble(double.tryParse(goods?.money) ?? 0)}");
}else if(goods.oneMoney != null && goods.oneMoney != "0.00"){
} else if ((goods?.onePrice == null || goods?.onePrice == "0") &&
((goods?.price != null && goods?.price != "0") ||
(goods?.money != null && goods?.money != "0.00"))) {
return (goods?.price == "0" || goods?.price == null
? ""
: S.of(context).jifen_(goods?.price)) +
(goods?.money == "0" || goods?.money == null
? ""
: " + ${AppUtils.calculateDouble(double.tryParse(goods?.money) ?? 0)}");
} else if (goods.oneMoney != null && goods.oneMoney != "0.00") {
return "${AppUtils.calculateDouble(double.tryParse(goods.oneMoney) ?? 0)}";
}
}
}

13
lib/home/welfare_page.dart

@ -755,7 +755,14 @@ class _WelfarePage extends State<WelfarePage> {
),
),
SizedBox(height: 12,),
GridView.builder(
(goods == null || goods.length == 0)? NoDataView(
src: "assets/image/xiao_fei.webp",
isShowBtn: false,
text: "暂无商品可兑换",
fontSize: 16.sp,
margin: EdgeInsets.all(60.h),
)
:GridView.builder(
itemCount:goods.length>6?6:goods.length,
padding: EdgeInsets.only(
// left: 16.w,
@ -774,7 +781,7 @@ class _WelfarePage extends State<WelfarePage> {
mainAxisSpacing: 16.w,
//Widget宽高比例 0.59
childAspectRatio:
200 / (286 / 2 + (286 / 2) * AppUtils.textScale(context)),
200 / (266 / 2 + (266 / 2) * AppUtils.textScale(context)),
),
itemBuilder: (context, index) {
return GestureDetector(
@ -844,7 +851,7 @@ class _WelfarePage extends State<WelfarePage> {
Text(
goods.name,
overflow: TextOverflow.ellipsis,
maxLines: 2,
maxLines: 1,
style: TextStyle(
color: Color(0xFF0D0D0D),
height: 1.2,

32
lib/mine/mine_page.dart

@ -195,9 +195,13 @@ class MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin {
// alignment: Alignment.centerRight,
children: [
Container(
height: 317,
height: 502.h,
decoration: BoxDecoration(
color: Color(0xFF32A060)
// color: Color(0xFF32A060)
image: DecorationImage(
fit: BoxFit.cover,
image: AssetImage("assets/image/settlement_bg.webp"),
),
),
),
FutureBuilder(
@ -205,11 +209,7 @@ class MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin {
builder: (context, snapshot) {
return Column(
children: [
Stack(
children: [
Container(
child: Column(
children: [
///
MineView(
userInfo,
@ -241,13 +241,6 @@ class MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin {
createTime: userInfo?.createTime ?? "",
),
],
),
),
Container(
margin: EdgeInsets.only(top: 258.h),
child: Column(
children: [
///
MineOrderView(),
@ -262,11 +255,6 @@ class MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin {
///绿
MineCalendar()
],
),
)
],
)
// /////
// attention(),
@ -298,8 +286,8 @@ class MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin {
);
},
child:Container(
margin: EdgeInsets.only(left:14,right:14,bottom:10),
padding: EdgeInsets.only(left:12, top:12, right:10,bottom: 12),
margin: EdgeInsets.only(left:16.w,right:16.w,bottom:15.h),
padding: EdgeInsets.only(left:12.w, top:12.h, right:10.w,bottom: 17.h),
width: double.infinity,
decoration: BoxDecoration(
color: Colors.white,
@ -395,7 +383,7 @@ class MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin {
///广
Widget spreadImage() {
return Container(
margin: EdgeInsets.only(right:14.w,bottom:10.h,left: 14.w),
margin: EdgeInsets.only(right:14.w,bottom:15.h,left: 14.w),
child: GestureDetector(
onTap: (){
Navigator.of(context).pushNamed('/router/invite_friends');

4
lib/mine/mine_view/mine_calendar.dart

@ -15,7 +15,7 @@ class _MineCalendar extends State<MineCalendar> {
@override
Widget build(BuildContext context) {
return Container(
margin: EdgeInsets.fromLTRB(14.w, 20.h, 14.w, 30.h),
margin: EdgeInsets.fromLTRB(14.w, 0.h, 14.w, 30.h),
padding: EdgeInsets.only(top: 12.h,left: 12,),
decoration: BoxDecoration(
// color: Colors.white,
@ -41,7 +41,7 @@ class _MineCalendar extends State<MineCalendar> {
children: [
GestureDetector(
onTap: (){
Navigator.of(context).pushNamed('/router/mine_greenery');
// Navigator.of(context).pushNamed('/router/mine_greenery');
},
child: Row(
children: [

10
lib/mine/mine_view/mine_item.dart

@ -20,7 +20,7 @@ class _MineItem extends State<MineItem> {
@override
Widget build(BuildContext context) {
return Container(
margin: EdgeInsets.fromLTRB(16.w, 20.h, 16.w, 30.h),
margin: EdgeInsets.fromLTRB(16.w,0.h, 16.w, 15.h),
// padding: EdgeInsets.fromLTRB(20.w, 12.h, 20.w, 12.h),
decoration: BoxDecoration(
color: Colors.white,
@ -38,13 +38,13 @@ class _MineItem extends State<MineItem> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
padding: EdgeInsets.only(left: 16,top:16,bottom:4,right: 16),
padding: EdgeInsets.only(left: 16,top:16,bottom:13,right: 16),
child:Text(
"其他",
style: TextStyle(
color: Color(0xFF353535),
fontWeight: MyFontWeight.semi_bold,
fontSize: 16.sp,
fontSize: 15.sp,
),
),
),
@ -223,7 +223,7 @@ class _MineItem extends State<MineItem> {
// ),),
],
),
SizedBox(height: 10.h,),
SizedBox(height: 12.h,),
if(isShowMore)
Row(
children: [
@ -314,7 +314,7 @@ class _MineItem extends State<MineItem> {
],
),
if(isShowMore)
SizedBox(height: 10.h,),
SizedBox(height: 12.h,),
if(isShowMore)
Row(
children: [

6
lib/mine/mine_view/mine_order.dart

@ -16,7 +16,7 @@ class _MineOrderView extends State<MineOrderView> {
@override
Widget build(BuildContext context) {
return Container(
margin: EdgeInsets.only(left:14, bottom:30, right:14),
margin: EdgeInsets.only(left:14, bottom:15, right:14),
padding: EdgeInsets.fromLTRB(20.w, 12.h, 20.w, 12.h),
decoration: BoxDecoration(
color: Colors.white,
@ -40,11 +40,11 @@ class _MineOrderView extends State<MineOrderView> {
style: TextStyle(
color: Color(0xFF353535),
fontWeight: MyFontWeight.semi_bold,
fontSize: 16.sp,
fontSize: 15.sp,
),
),
),
SizedBox(height: 8.h,),
SizedBox(height: 10.h,),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,

34
lib/mine/mine_view/mine_view.dart

@ -67,13 +67,13 @@ class _MineView extends State<MineView> {
return Column(
children: [
Container(
margin: EdgeInsets.only(top: 28.w),
margin: EdgeInsets.only(top: 29.h),
alignment: Alignment.centerRight,
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Container(
height: 24,
height: 24.h,
alignment: Alignment.center,
child: GestureDetector(
onTap: () {
@ -82,23 +82,23 @@ class _MineView extends State<MineView> {
});
},
child: Container(
height: 24,
height: 24.h,
alignment:Alignment.center,
child:Stack(
children: [
Image.asset(
"assets/image/icon_notices.webp",
width:32.w,
height: 32.h,
width:32,
height: 32,
color: Colors.white,
),
if(widget.totalMsg != 0)
Container(
width:36,
width:36.w,
alignment: Alignment.topRight,
child:Container(
width:22,
height:14,
width:22.w,
height:14.h,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(100),
border: Border.all(
@ -131,8 +131,8 @@ class _MineView extends State<MineView> {
padding: EdgeInsets.all(8.h),
child: Image.asset(
"assets/image/icon_scan_qr_code.webp",
width:32.w,
height: 32.h,
width:32,
height: 32,
color: Colors.white,
),
),
@ -146,8 +146,8 @@ class _MineView extends State<MineView> {
margin: EdgeInsets.only(right: 12.w),
child: Image.asset(
"assets/image/icon_mine_setting.webp",
width: 32.w,
height: 32.h,
width: 32,
height: 32,
color: Colors.white,
),
),
@ -259,8 +259,8 @@ class _MineView extends State<MineView> {
right: 2.w,
child: Image.asset(
"assets/image/icon_mine_edit.webp",
width: 17.w,
height: 17.w,
width: 17,
height: 17,
),
),
],
@ -373,7 +373,7 @@ class _MineView extends State<MineView> {
widget.toIntegralPage();
},
child: Container(
padding: EdgeInsets.only(top: 4, bottom: 4, right: 16,left: 7),
padding: EdgeInsets.only(top: 4.h, bottom: 4.h, right: 16.w,left: 7.w),
margin: EdgeInsets.only(right: 14.w),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12),
@ -384,8 +384,8 @@ class _MineView extends State<MineView> {
children: [
Image.asset(
"assets/image/icon_gold_coin.webp",
width: 16.w,
height: 16.h,
width: 16,
height: 16,
),
Text(
"天天领积分",

2
lib/mine/recharge_page.dart

@ -558,7 +558,7 @@ class _RechargePage extends State<RechargePage> {
},
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
"充值说明",

99
lib/store/store_order.dart

@ -22,9 +22,8 @@ import 'package:huixiang/store/store_view/shop_car.dart';
import 'package:huixiang/store/store_view/store_activity.dart';
import 'package:huixiang/store/store_view/store_info.dart';
import 'package:huixiang/store/store_view/store_order_list.dart';
import 'package:huixiang/union/union_view/union_coupon.dart';
import 'package:huixiang/union/union_view/vip.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/view_widget/classic_header.dart';
import 'package:huixiang/view_widget/custom_image.dart';
import 'package:huixiang/view_widget/my_tab.dart';
import 'package:huixiang/view_widget/receive_success.dart';
@ -60,6 +59,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
String tenant = "";
String storeId = "";
int numberOfPeople = 0;
///token
String minToken;
String pName;
@ -138,8 +138,9 @@ class _StoreOrderPage extends State<StoreOrderPage>
///
queryMemberInfo() async {
BaseData baseData = await minService.memberInfo()
.catchError((error){debugPrint(error);});
BaseData baseData = await minService.memberInfo().catchError((error) {
debugPrint(error);
});
if (baseData != null && baseData.isSuccess) {
SharedPreferences.getInstance().then(
(value) => {
@ -151,8 +152,10 @@ class _StoreOrderPage extends State<StoreOrderPage>
///
getParentInfo() async {
BaseData baseData = await minService.getParentInfo("$tableId")
.catchError((error) {debugPrint(error);});
BaseData baseData =
await minService.getParentInfo("$tableId").catchError((error) {
debugPrint(error);
});
if (baseData != null && baseData.isSuccess) {
if (baseData.data != null) {
parentId = baseData.data["id"];
@ -183,7 +186,8 @@ class _StoreOrderPage extends State<StoreOrderPage>
///
queryStoreInfo() async {
BaseData baseData = await apiService.queryStoreInfo(storeId).catchError((error) {
BaseData baseData =
await apiService.queryStoreInfo(storeId).catchError((error) {
debugPrint(error);
});
if (baseData != null && baseData.isSuccess) {
@ -203,7 +207,17 @@ class _StoreOrderPage extends State<StoreOrderPage>
@override
Widget build(BuildContext context) {
return Container(
return WillPopScope(
onWillPop: () async {
if (dialogShowing) {
debugPrint("ssssasdadsasdadasd");
SmartDialog.dismiss();
return false;
} else {
return true;
}
},
child:Container(
color: Colors.white,
child: Stack(
children: [
@ -216,11 +230,12 @@ class _StoreOrderPage extends State<StoreOrderPage>
controller: controller,
dragStartBehavior: DragStartBehavior.start,
physics: BouncingScrollPhysics(),
headerSliverBuilder: (BuildContext context, bool innerScrolled) {
headerSliverBuilder:
(BuildContext context, bool innerScrolled) {
return [
SliverOverlapAbsorber(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(
context),
handle: NestedScrollView
.sliverOverlapAbsorberHandleFor(context),
sliver: SliverAppBar(
expandedHeight: (storeInfo != null &&
storeInfo.couponVOList != null)
@ -251,8 +266,11 @@ class _StoreOrderPage extends State<StoreOrderPage>
),
),
flexibleSpace: FlexibleSpaceBar(
title: Title(controller,
storeInfo != null ? storeInfo.storeName : ''),
title: Title(
controller,
storeInfo != null
? storeInfo.storeName
: ''),
collapseMode: CollapseMode.pin,
stretchModes: [
StretchMode.zoomBackground,
@ -287,11 +305,14 @@ class _StoreOrderPage extends State<StoreOrderPage>
child: Container(
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(8.w),
borderRadius:
BorderRadius.circular(8.w),
),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment:
MainAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
///
StoreInfoView(storeInfo),
@ -330,7 +351,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
],
),
),
top:233.h,
top: 233.h,
bottom: 0,
left: 0,
right: 0,
@ -348,7 +369,8 @@ class _StoreOrderPage extends State<StoreOrderPage>
38.h,
),
child: Container(
padding: EdgeInsets.symmetric(horizontal: 10.w),
padding:
EdgeInsets.symmetric(horizontal: 10.w),
width: MediaQuery.of(context).size.width,
child: TabBar(
controller: tabcontroller,
@ -396,14 +418,12 @@ class _StoreOrderPage extends State<StoreOrderPage>
controller,
minToken,
tenant,
_queryMiNiDetail,
(){
_queryMiNiDetail, () {
queryShopCar().then((value) {
this.shopCarGoods = value;
setState(() {});
});
}
),
}),
///,
// StoreActivity(
@ -446,7 +466,9 @@ class _StoreOrderPage extends State<StoreOrderPage>
mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(width:45.w,),
SizedBox(
width: 45.w,
),
Text.rich(
TextSpan(children: [
TextSpan(
@ -457,8 +479,9 @@ class _StoreOrderPage extends State<StoreOrderPage>
fontWeight: MyFontWeight.bold),
),
TextSpan(
text:
shopCarGoods != null ? shopCarGoods.cartSum : "0.0",
text: shopCarGoods != null
? shopCarGoods.cartSum
: "0.0",
style: TextStyle(
fontSize: 20.sp,
color: Color(0xFFFFFFFF),
@ -480,7 +503,8 @@ class _StoreOrderPage extends State<StoreOrderPage>
backgroup: Color(0xFF32A060),
radius: 100,
fontSize: 16.sp,
padding: EdgeInsets.symmetric(vertical: 5.h),
padding:
EdgeInsets.symmetric(vertical: 5.h),
),
),
],
@ -490,8 +514,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
children: [
InkWell(
onTap: () {
if(count() != 0)
showShoppingCart();
if (count() != 0) showShoppingCart();
},
child: Image.asset(
"assets/image/shopping_bag.webp",
@ -500,7 +523,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
fit: BoxFit.fitWidth,
),
),
if(count() != 0)
if (count() != 0)
Positioned(
right: 5,
// top: 14,
@ -521,8 +544,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
),
),
],
),
);
)));
}
///
@ -635,7 +657,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
? storeInfo.bannerList[position].imgUrl
: "",
height: 230.h,
width:double.infinity,
width: double.infinity,
fit: BoxFit.cover,
radius: BorderRadius.zero,
errorSrc: "assets/image/default_2_1.webp",
@ -687,12 +709,11 @@ class _StoreOrderPage extends State<StoreOrderPage>
///
_queryMiNiDetail(String id, int count) async {
EasyLoading.show(status: S.current.zhengzaijiazai);
if(count < 0){
if (count < 0) {
shopCarGoods.shoppingCartSkuItemList.forEach((element) {
if(element.productId == id){
if (element.productId == id) {
shopCartReduce(element);
setState(() {
});
setState(() {});
}
});
return;
@ -782,8 +803,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
this.shopCarGoods = value;
setState(() {});
});
}
else {
} else {
SmartDialog.showToast(baseDate?.msg, alignment: Alignment.center);
}
}
@ -854,8 +874,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
if (shopCartKey?.currentState != null) {
shopCartKey.currentState.setState(() {});
}
setState(() {
});
setState(() {});
}
return this.shopCarGoods;
}

7
lib/union/union_list.dart

@ -49,7 +49,7 @@ class _UnionList extends State<UnionList> {
itemCount:widget.storeList == null ? 0 : widget.storeList.length,
padding: EdgeInsets.only(
top: 8.h,
bottom: 84.h, /* + (375.h - 88.h) + 4.h*/
bottom: 100.h, /* + (375.h - 88.h) + 4.h*/
),
physics: NeverScrollableScrollPhysics(),
itemBuilder: (context, position) {
@ -142,8 +142,7 @@ class _UnionList extends State<UnionList> {
Widget buildStoreItem(Store store, position) {
return Container(
margin: EdgeInsets.fromLTRB(16.w, 8.h, 16.w, 8.h),
// padding: EdgeInsets.fromLTRB(20.w, 20.h, 20.w, 20.h),
margin: EdgeInsets.fromLTRB(16.w, 8.h, 16.w, 12.h),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(Radius.circular(8)),
@ -186,7 +185,7 @@ class _UnionList extends State<UnionList> {
Positioned(
bottom: 16.h,
left: 12.w,
right: 0,
right: 12.w,
child: Container(
height: 100.h,
child: Row(

4
lib/union/union_page.dart

@ -242,10 +242,10 @@ class UnionPageState extends State<UnionPage>
);
}
BaseData<List<Store>> baseData = await apiService.queryStore({
"city": city,
// "city": city,
// "district": district,
// "province": province,
// "latitude": latitude,
"latitude": latitude,
"longitude": longitude,
"searchKey": searchKey,
"serviceType": (tabController.index == 0 && index == -1) || index == 0

14
lib/view_widget/mine_vip_entry.dart

@ -70,15 +70,11 @@ class MineVipEntry extends StatelessWidget {
Widget widget = Container(
width: double.infinity,
padding: EdgeInsets.only(top: 12.h, bottom: 35.h, left: 12.w, right: 12.w),
// margin: EdgeInsets.symmetric(horizontal: 14),
margin: EdgeInsets.only(top: 15.h,left: 14.w,right: 14.w,bottom:15.h),
padding: EdgeInsets.only(top: 12.h, bottom: 22.h, left: 12.w, right: 12.w),
margin: EdgeInsets.only(top: 23.h,left: 16.w,right: 16.w,bottom:15.h),
decoration: BoxDecoration(
color: Color(0xFF3D3D5D),
borderRadius: BorderRadius.only(
topLeft: Radius.circular(6),
topRight: Radius.circular(6),
),
borderRadius: BorderRadius.circular(6),
boxShadow: [
BoxShadow(
color: Colors.black.withAlpha(12),
@ -100,7 +96,7 @@ class MineVipEntry extends StatelessWidget {
height: 24,
),
SizedBox(
width: 4.w,
width: 5.w,
),
Expanded(
child: Text(
@ -128,7 +124,7 @@ class MineVipEntry extends StatelessWidget {
],
),
SizedBox(
height: 14.h,
height: 16.h,
),
Container(
height: 4.h,

2
pubspec.yaml

@ -3,7 +3,7 @@ description: 一心回乡.
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 2.0.8+7
version: 2.0.9+8
environment:
sdk: ">=2.7.0 <3.0.0"

Loading…
Cancel
Save