zhang 5 years ago
commit 58cf57898e

@ -12,53 +12,58 @@ part 'price_model.g.dart';
@JsonSerializable()
class Price extends Object {
Min min;
Max max;
Price(this.min,this.max,);
Price(
this.min,
this.max,
);
factory Price.fromJson(Map<String, dynamic> srcJson) => _$PriceFromJson(srcJson);
factory Price.fromJson(Map<String, dynamic> srcJson) =>
_$PriceFromJson(srcJson);
Map<String, dynamic> toJson() => _$PriceToJson(this);
}
@JsonSerializable()
class Min extends Object {
double originalPrice;
double discountPrice;
double commission;
Min(this.originalPrice,this.discountPrice,this.commission,);
double ferme;
Min(
this.originalPrice,
this.discountPrice,
this.commission,
this.ferme,
);
factory Min.fromJson(Map<String, dynamic> srcJson) => _$MinFromJson(srcJson);
Map<String, dynamic> toJson() => _$MinToJson(this);
}
@JsonSerializable()
class Max extends Object {
double originalPrice;
double discountPrice;
double commission;
Max(this.originalPrice,this.discountPrice,this.commission,);
Max(
this.originalPrice,
this.discountPrice,
this.commission,
);
factory Max.fromJson(Map<String, dynamic> srcJson) => _$MaxFromJson(srcJson);
Map<String, dynamic> toJson() => _$MaxToJson(this);
}

@ -21,9 +21,11 @@ Map<String, dynamic> _$PriceToJson(Price instance) =>
Min _$MinFromJson(Map<String, dynamic> json) {
return Min(
(json['originalPrice'] as num)?.toDouble(),
(json['discountPrice'] as num)?.toDouble(),
(json['commission'] as num)?.toDouble());
(json['originalPrice'] as num)?.toDouble(),
(json['discountPrice'] as num)?.toDouble(),
(json['commission'] as num)?.toDouble(),
(json['ferme'] as num)?.toDouble(),
);
}
Map<String, dynamic> _$MinToJson(Min instance) => <String, dynamic>{

@ -663,7 +663,7 @@ class _GoodsPageState extends BaseStoreState<GoodsPage> {
widget.goodsDetail.data.isFerme == 1 ? rWBox(10) : SizedBox(),
widget.goodsDetail.data.isFerme == 1
? Text(
'预计¥${(widget.goodsDetail.data.price.min.originalPrice * 1.2 * 0.091).toStringAsFixed(2)}由瑞库客承担',
'预计¥${widget.goodsDetail.data.price.min.ferme.toStringAsFixed(2)}由瑞库客承担',
style: TextStyle(
fontSize: rSP(13),
color: Color(0xFF535353),
@ -839,7 +839,7 @@ class _GoodsPageState extends BaseStoreState<GoodsPage> {
break;
}
return Image.asset(
_address?.city == null ? text : text2,
_address?.city == '' ? text : text2,
height: rSize(26),
width: rSize(26),
);
@ -891,7 +891,7 @@ class _GoodsPageState extends BaseStoreState<GoodsPage> {
Column(
children: [
Image.asset(
_address?.city == null
_address?.city == ''
? R.ASSETS_STATIC_OVERSEA_LOCATION_PNG
: R.ASSETS_STATIC_OVERSEA_LOCATION_ON_PNG,
height: rSize(26),

@ -778,10 +778,19 @@ class _GoodsOrderPageState extends BaseStoreState<GoodsOrderPage> {
}
Container _bottomBar(BuildContext context, int totalNum) {
bool isOversea = false;
for (var item in _orderModel.data.brands) {
for (var childItem in item.goods) {
if (childItem.isImport == 1) isOversea = true;
}
}
// bool canDeliver = _orderModel.data.addr?.isDeliveryArea == 1 ||
// (_orderModel.data.addr?.isDeliveryArea == 0 && _orderModel.data.shippingMethod == 1);
bool canDeliver = _orderModel.data.addr?.isDeliveryArea == 1 ||
(_orderModel.data.shippingMethod == 1);
if (isOversea) {
if (!_accept) canDeliver = false;
}
double ruiCoin = 0;
_orderModel.data.brands.forEach((brand) {
brand.goods.forEach((good) {

Loading…
Cancel
Save