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

ios 更改；

dart3_last
fmk 2 years ago
parent
5cdbe3fefc
commit
4d13a46eb5
7 changed files with 80 additions and 76 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. 4
      lib/home/home_view/discount_zone.dart
  2. 128
      lib/home/home_view/shortcut_operation.dart
  3. 6
      lib/order/order_detail_page.dart
  4. 2
      lib/order/order_view/order_pay_selected.dart
  5. 8
      lib/retrofit/data/vip_card_home.dart
  6. 2
      lib/vip/vip_view/vip_goods_discount.dart
  7. 6
      lib/vip/vip_view/vip_top.dart

4
lib/home/home_view/discount_zone.dart
Unescape View File

@ -62,7 +62,7 @@ class _DiscountZone extends State<DiscountZone> {
),),
if(widget.coupon.length != 0)
Container(
height: 120.h,
height: 108.h,
margin: EdgeInsets.only(top: 10.h),
child: ListView.builder(
scrollDirection: Axis.horizontal,
@ -87,7 +87,7 @@ class _DiscountZone extends State<DiscountZone> {
Widget discountItem(Coupon coupon) {
return Container(
width: 290.w,
height: 120.h,
height: 108.h,
decoration: BoxDecoration(
image: DecorationImage(
fit: BoxFit.fill,

128
lib/home/home_view/shortcut_operation.dart
Unescape View File

@ -60,7 +60,7 @@ class _ShortcutOperation extends State<ShortcutOperation> {
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Column(
Expanded(child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@ -82,15 +82,12 @@ class _ShortcutOperation extends State<ShortcutOperation> {
),
),
],
),
SizedBox(width:16.w),
Expanded(
child: Image.asset(
"assets/image/home_lm.webp",
width: 24.w,
height: 31.h,
fit: BoxFit.fill,
),
)),
Image.asset(
"assets/image/home_lm.webp",
width: 24.w,
height: 31.h,
fit: BoxFit.fill,
),
],
),
@ -121,38 +118,37 @@ class _ShortcutOperation extends State<ShortcutOperation> {
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
S.of(context).chongzhi,
style: TextStyle(
fontWeight: MyFontWeight.semi_bold,
fontSize: 14.sp,
color: Colors.black,
Expanded(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
S.of(context).chongzhi,
style: TextStyle(
fontWeight: MyFontWeight.semi_bold,
fontSize: 14.sp,
color: Colors.black,
),
),
),
SizedBox(height: 5.h),
Text(
S.of(context).chongzhifuliduo,
style: TextStyle(
fontWeight: MyFontWeight.regular,
fontSize: 12.sp,
color: Color(0xff4D4D4D),
SizedBox(height: 5.h),
Text(
S.of(context).chongzhifuliduo,
style: TextStyle(
fontWeight: MyFontWeight.regular,
fontSize: 12.sp,
color: Color(0xff4D4D4D),
),
),
),
],
),
SizedBox(width:16.w),
Expanded(
child: Image.asset(
"assets/image/home_recharge.webp",
width: 21.w,
height: 33.h,
fit: BoxFit.fill,
],
),
),
Image.asset(
"assets/image/home_recharge.webp",
width: 21.w,
height: 33.h,
fit: BoxFit.fill,
)
],
),
),
@ -184,38 +180,38 @@ class _ShortcutOperation extends State<ShortcutOperation> {
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
S.of(context).fulizhongxin,
style: TextStyle(
fontWeight: MyFontWeight.semi_bold,
fontSize: 14.sp,
color: Colors.black,
Expanded(
child:
Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
S.of(context).fulizhongxin,
style: TextStyle(
fontWeight: MyFontWeight.semi_bold,
fontSize: 14.sp,
color: Colors.black,
),
),
),
SizedBox(height: 5.h),
Text(
S.of(context).tiantiandefuli,
style: TextStyle(
fontWeight: MyFontWeight.regular,
fontSize: 12.sp,
color: Color(0xff4D4D4D),
SizedBox(height: 5.h),
Text(
S.of(context).tiantiandefuli,
style: TextStyle(
fontWeight: MyFontWeight.regular,
fontSize: 12.sp,
color: Color(0xff4D4D4D),
),
),
),
],
),
SizedBox(width: 16.w),
Expanded(
child: Image.asset(
"assets/image/home_welfare.webp",
width: 22.w,
height: 35.h,
fit: BoxFit.fill,
],
),
),
Image.asset(
"assets/image/home_welfare.webp",
width: 22.w,
height: 35.h,
// fit: BoxFit.fill,
)
],
),
),

6
lib/order/order_detail_page.dart
Unescape View File

@ -225,7 +225,7 @@ class _OrderDetailPage extends State<OrderDetailPage> {
payResult(BaseData baseData) async{
await queryDetails();
Future.delayed(Duration(milliseconds: 350), () {
Future.delayed(Duration(milliseconds: 400), () {
EasyLoading.dismiss();
SmartDialog.showToast(baseData?.msg == "ok" ?"订单支付成功" :baseData?.msg,alignment: Alignment.center);
});
@ -516,9 +516,9 @@ class _OrderDetailPage extends State<OrderDetailPage> {
.catchError((onError) {});
if (baseData != null && baseData.isSuccess) {
SmartDialog.showToast("订单取消成功");
Future.delayed(Duration(milliseconds: 300), () {
// Future.delayed(Duration(milliseconds: 300), () {
queryDetails();
});
// });
}
}

2
lib/order/order_view/order_pay_selected.dart
Unescape View File

@ -19,7 +19,7 @@ class _OrderPaySelected extends State<OrderPaySelected> {
builder: (BuildContext context, StateSetter setState) {
return Container(
width: double.infinity,
height: 250.h,
height: 280.h,
padding: EdgeInsets.only(
left: 16.w,
right: 16.w,

8
lib/retrofit/data/vip_card_home.dart
Unescape View File

@ -150,6 +150,7 @@ class ProductVips {
dynamic materialId,
String details,
String thumbnailImg,
String image,
String info,
num buyCount,
num sellCountLimit,
@ -190,6 +191,7 @@ class ProductVips {
_materialId = materialId;
_details = details;
_thumbnailImg = thumbnailImg;
_image = image;
_info = info;
_buyCount = buyCount;
_sellCountLimit = sellCountLimit;
@ -233,6 +235,7 @@ class ProductVips {
_materialId = json['materialId'];
_details = json['details'];
_thumbnailImg = json['thumbnailImg'];
_image = json['image'];
_info = json['info'];
_buyCount = json['buyCount'];
_sellCountLimit = json['sellCountLimit'];
@ -274,6 +277,7 @@ class ProductVips {
dynamic _materialId;
String _details;
String _thumbnailImg;
String _image;
String _info;
num _buyCount;
num _sellCountLimit;
@ -314,6 +318,7 @@ ProductVips copyWith({ String id,
dynamic materialId,
String details,
String thumbnailImg,
String image,
String info,
num buyCount,
num sellCountLimit,
@ -354,6 +359,7 @@ ProductVips copyWith({ String id,
materialId: materialId ?? _materialId,
details: details ?? _details,
thumbnailImg: thumbnailImg ?? _thumbnailImg,
image: image ?? _image,
info: info ?? _info,
buyCount: buyCount ?? _buyCount,
sellCountLimit: sellCountLimit ?? _sellCountLimit,
@ -395,6 +401,7 @@ ProductVips copyWith({ String id,
dynamic get materialId => _materialId;
String get details => _details;
String get thumbnailImg => _thumbnailImg;
String get image => _image;
String get info => _info;
num get buyCount => _buyCount;
num get sellCountLimit => _sellCountLimit;
@ -438,6 +445,7 @@ ProductVips copyWith({ String id,
map['materialId'] = _materialId;
map['details'] = _details;
map['thumbnailImg'] = _thumbnailImg;
map['image'] = _image;
map['info'] = _info;
map['buyCount'] = _buyCount;
map['sellCountLimit'] = _sellCountLimit;

2
lib/vip/vip_view/vip_goods_discount.dart
Unescape View File

@ -166,7 +166,7 @@ class _VipGoodsDiscount extends State<VipGoodsDiscount> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
MImage(
productVips.thumbnailImg ?? "",
productVips.image ?? "",
width: 140.w,
height: 145.h,
fit: BoxFit.cover,

6
lib/vip/vip_view/vip_top.dart
Unescape View File

@ -258,7 +258,7 @@ class _VipTop extends State<VipTop> {
Widget vipCard() {
return Container(
margin: EdgeInsets.fromLTRB(
14.w,( MediaQuery.of(context).padding.top + 50.h), 14.w, 8.h),
14.w,( MediaQuery.of(context).padding.top + 30.h), 14.w, 8.h),
width: double.infinity,
height: 207.h,
decoration: BoxDecoration(
@ -688,7 +688,7 @@ class _VipTop extends State<VipTop> {
Widget buildBottomSheetWidget(BuildContext context, state) {
return Container(
padding: EdgeInsets.all(16),
padding: EdgeInsets.only(top: 16.h,left: 16.w,right: 16.w,bottom:35.h),
decoration: new BoxDecoration(
color: Colors.white,
borderRadius: new BorderRadius.only(
@ -893,7 +893,7 @@ class _VipTop extends State<VipTop> {
)
],
),
)
),
],
),
));

Write Preview
Loading…
Cancel
Save