jd
/
app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

海外商品添加政策提醒

Browse Source
master
laiiihz 5 years ago
parent 767ef0bddb
commit 725a272816
7 changed files with 132 additions and 57 deletions
Show Stats Download Patch File Download Diff File

BIN
assets/order_alert.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

6
lib/models/order_preview_model.dart
Unescape View File

@ -190,6 +190,9 @@ class OrderDetail extends Object {
Addr addr;
List<Brands> brands;
CoinStatus coinStatus;
///海外订单
bool hasAuth;
// Balance balance;
OrderDetail(
@ -211,7 +214,8 @@ class OrderDetail extends Object {
this.addr,
this.brands,
this.userRole,
this.coinStatus);
this.coinStatus,
this.hasAuth);
factory OrderDetail.fromJson(Map<String, dynamic> srcJson) =>
_$OrderDetailFromJson(srcJson);

107
lib/models/order_preview_model.g.dart
Unescape View File

@ -24,38 +24,40 @@ Map<String, dynamic> _$OrderPreviewModelToJson(OrderPreviewModel instance) =>
OrderDetail _$OrderDetailFromJson(Map<String, dynamic> json) {
return OrderDetail(
json['id'] as int,
json['parentId'] as int,
json['userId'] as int,
json['isSubordinate'] as int,
(json['brandCouponTotalAmount'] as num)?.toDouble(),
(json['universeCouponTotalAmount'] as num)?.toDouble(),
(json['coinTotalAmount'] as num)?.toDouble(),
(json['expressTotalFee'] as num)?.toDouble(),
(json['goodsTotalAmount'] as num)?.toDouble(),
(json['goodsTotalCommission'] as num)?.toDouble(),
(json['actualTotalAmount'] as num)?.toDouble(),
json['shippingMethod'] as int,
json['buyerMessage'] as String,
json['totalGoodsCount'] as int,
json['coupon'] == null
? null
: Coupon.fromJson(json['coupon'] as Map<String, dynamic>),
json['addr'] == null
? null
: Addr.fromJson(json['addr'] as Map<String, dynamic>),
(json['brands'] as List)
?.map((e) =>
e == null ? null : Brands.fromJson(e as Map<String, dynamic>))
?.toList(),
json['userRole'] as num,
json['coinStatus'] == null
? null
: CoinStatus.fromJson(json['coinStatus'] as Map<String, dynamic>),
);
json['id'] as int,
json['parentId'] as int,
json['userId'] as int,
json['isSubordinate'] as int,
(json['brandCouponTotalAmount'] as num)?.toDouble(),
(json['universeCouponTotalAmount'] as num)?.toDouble(),
(json['coinTotalAmount'] as num)?.toDouble(),
(json['expressTotalFee'] as num)?.toDouble(),
(json['goodsTotalAmount'] as num)?.toDouble(),
(json['goodsTotalCommission'] as num)?.toDouble(),
(json['actualTotalAmount'] as num)?.toDouble(),
json['shippingMethod'] as int,
json['buyerMessage'] as String,
json['totalGoodsCount'] as int,
json['coupon'] == null
? null
: Coupon.fromJson(json['coupon'] as Map<String, dynamic>),
json['addr'] == null
? null
: Addr.fromJson(json['addr'] as Map<String, dynamic>),
(json['brands'] as List)
?.map((e) =>
e == null ? null : Brands.fromJson(e as Map<String, dynamic>))
?.toList(),
json['userRole'] as num,
json['coinStatus'] == null
? null
: CoinStatus.fromJson(json['coinStatus'] as Map<String, dynamic>),
json['hasAuth'] as bool,
);
}
Map<String, dynamic> _$OrderDetailToJson(OrderDetail instance) => <String, dynamic>{
Map<String, dynamic> _$OrderDetailToJson(OrderDetail instance) =>
<String, dynamic>{
'id': instance.id,
'parentId': instance.parentId,
'userId': instance.userId,
@ -83,11 +85,12 @@ CoinStatus _$CoinStatusFromJson(Map<String, dynamic> json) {
);
}
Map<String, dynamic> _$CoinStatusToJson(CoinStatus coinStatus) => <String, dynamic>{
"coin": coinStatus.coin,
"isUseCoin": coinStatus.isUseCoin,
"isEnable": coinStatus.isEnable
};
Map<String, dynamic> _$CoinStatusToJson(CoinStatus coinStatus) =>
<String, dynamic>{
"coin": coinStatus.coin,
"isUseCoin": coinStatus.isUseCoin,
"isEnable": coinStatus.isEnable
};
Coupon _$CouponFromJson(Map<String, dynamic> json) {
return Coupon(
@ -161,23 +164,23 @@ Map<String, dynamic> _$BrandsToJson(Brands instance) => <String, dynamic>{
OrderGoods _$OrderGoodsFromJson(Map<String, dynamic> json) {
return OrderGoods(
json['goodsId'] as int,
json['goodsName'] as String,
json['skuId'] as int,
json['skuName'] as String,
json['skuCode'] as String,
json['mainPhotoUrl'] as String,
json['quantity'] as int,
json['promotionName'] as String,
(json['unitPrice'] as num)?.toDouble(),
(json['totalCommission'] as num)?.toDouble(),
(json['brandCouponAmount'] as num)?.toDouble(),
(json['universeBrandCouponAmount'] as num)?.toDouble(),
(json['coinAmount'] as num)?.toDouble(),
(json['goodsAmount'] as num)?.toDouble(),
(json['expressFee'] as num)?.toDouble(),
(json['actualAmount'] as num)?.toDouble(),
);
json['goodsId'] as int,
json['goodsName'] as String,
json['skuId'] as int,
json['skuName'] as String,
json['skuCode'] as String,
json['mainPhotoUrl'] as String,
json['quantity'] as int,
json['promotionName'] as String,
(json['unitPrice'] as num)?.toDouble(),
(json['totalCommission'] as num)?.toDouble(),
(json['brandCouponAmount'] as num)?.toDouble(),
(json['universeBrandCouponAmount'] as num)?.toDouble(),
(json['coinAmount'] as num)?.toDouble(),
(json['goodsAmount'] as num)?.toDouble(),
(json['expressFee'] as num)?.toDouble(),
(json['actualAmount'] as num)?.toDouble(),
);
}
Map<String, dynamic> _$OrderGoodsToJson(OrderGoods instance) =>

63
lib/pages/home/classify/order_preview_page.dart
Unescape View File

@ -122,6 +122,62 @@ class _GoodsOrderPageState extends BaseStoreState<GoodsOrderPage> {
controller: _controller,
physics: AlwaysScrollableScrollPhysics(),
slivers: <Widget>[
SliverToBoxAdapter(
child: _orderModel.data.hasAuth
? UserManager.instance.user.info.realInfoStatus
? SizedBox()
: CustomImageButton(
onPressed: () {
AppRouter.push(
context,
RouteName.USER_VERIFY,
arguments: {},
).then((value) {
setState(() {});
});
},
child: Container(
decoration: BoxDecoration(
color: Color.fromRGBO(255, 243, 203, 1),
borderRadius: BorderRadius.all(
Radius.circular(10))),
margin: EdgeInsets.fromLTRB(
rSize(13), rSize(10), rSize(13), 0),
padding: EdgeInsets.symmetric(
horizontal: 8, vertical: 10),
child: Row(
children: [
Image.asset(
R.ASSETS_ORDER_ALERT_PNG,
width: rSize(20),
height: rSize(20),
),
rWBox(10),
Expanded(
child: Text(
'政策提醒：如果跨境订单订购人和支付人信息不一致，将会影响订单通关。',
style: TextStyle(
color:
Color.fromRGBO(210, 137, 64, 1),
fontSize: rSP(13),
),
),
),
rWBox(10),
Text(
'去认证 >',
style: TextStyle(
fontSize: rSP(13),
color:
Color.fromRGBO(210, 137, 64, 1),
),
),
],
),
),
)
: SizedBox(),
),
SliverToBoxAdapter(
child: _orderModel.data.shippingMethod == 1
? Container(
@ -903,8 +959,11 @@ class _GoodsOrderPageState extends BaseStoreState<GoodsOrderPage> {
_submit(BuildContext context) async {
GSDialog.of(context).showLoadingDialog(context, "");
HttpResultModel<OrderPrepayModel> resultModel = await _presenterImpl
.submitOrder(_orderModel.data.id, UserManager.instance.user.info.id);
GSDialog.of(context).dismiss(context);
.submitOrder(_orderModel.data.id, UserManager.instance.user.info.id)
.then((_) {
GSDialog.of(context).dismiss(context);
return;
});
if (!resultModel.result) {
GSDialog.of(context).showError(context, resultModel.msg);
return;

9
lib/utils/CommonLocalizationsDelegate.dart
Unescape View File

@ -152,4 +152,13 @@ class _DefaultCupertinoLocalizations extends CupertinoLocalizations {
String tabSemanticsLabel({int tabIndex, int tabCount}) {
return "";
}
@override
List<String> get timerPickerHourLabels => [];
@override
List<String> get timerPickerMinuteLabels => [];
@override
List<String> get timerPickerSecondLabels => [];
}

2
pubspec.lock
Unescape View File

@ -617,7 +617,7 @@ packages:
name: js
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.6.2"
version: "0.6.3-nullsafety.1"
json_annotation:
dependency: "direct main"
description:

2
pubspec.yaml
Unescape View File

@ -2,7 +2,7 @@ name: recook
description: Recook Market App.
publish_to: "none"
version: 1.3.6+196
version: 1.3.8+198
# sdk min version to 2.2.2
# to support ... feature

Write Preview
Loading…
Cancel
Save