修复商品包含跨境商品时相关提示(实名认证和收款人及使用余额

master
zhangmeng 4 years ago
parent 2ff9c91046
commit 6178a69ae2

@ -203,29 +203,29 @@ class _OrderPrepayPageState extends BaseStoreState<OrderPrepayPage>
height: rSize(50), height: rSize(50),
), ),
_payTile( _payTile(
"", "",
SvgPicture.asset( SvgPicture.asset(
AppSvg.svg_balance_pay, AppSvg.svg_balance_pay,
width: rSize(30), width: rSize(30),
height: rSize(30), height: rSize(30),
), ),
0, 0,
widgetTitle: RichText( widgetTitle: RichText(
text: TextSpan( text: TextSpan(
text: "余额支付 ", text: "余额支付 ",
style: AppTextStyle.generate(17 * 2.sp), style: AppTextStyle.generate(17 * 2.sp),
children: [ children: [
TextSpan( TextSpan(
style: style: AppTextStyle.generate(14 * 2.sp,
AppTextStyle.generate(14 * 2.sp, color: Colors.grey), color: Colors.grey),
text: text:
"(可用余额: ¥${_recookFundModel == null ? "--" : _recookFundModel.data.amount})") "(可用余额: ¥${_recookFundModel == null ? "--" : _recookFundModel.data.amount})")
]), ]),
), ),
enable: _recookFundModel != null && enable: _recookFundModel != null &&
(_recookFundModel.data.amount >= _model.data.actualTotalAmount) && (_recookFundModel.data.amount >=
_canUseBalance, _model.data.actualTotalAmount) &&
), _canUseBalance),
_payTile( _payTile(
"微信支付", "微信支付",
Icon( Icon(
@ -329,7 +329,11 @@ class _OrderPrepayPageState extends BaseStoreState<OrderPrepayPage>
), ),
onPressed: !enable onPressed: !enable
? () { ? () {
ReToast.err(text: '订单含跨境商品,无法使用余额支付'); if (!_canUseBalance) {
ReToast.err(text: '订单含跨境商品,无法使用余额支付');
} else {
ReToast.err(text: '余额不足');
}
} }
: () { : () {
setState(() { setState(() {

@ -11,6 +11,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:recook/base/base_store_state.dart'; import 'package:recook/base/base_store_state.dart';
import 'package:recook/constants/header.dart'; import 'package:recook/constants/header.dart';
@ -25,6 +26,7 @@ import 'package:recook/pages/home/classify/order_prepay_page.dart';
import 'package:recook/pages/home/items/goods_item_order.dart'; import 'package:recook/pages/home/items/goods_item_order.dart';
import 'package:recook/pages/home/items/oversea_accept_license_page.dart'; import 'package:recook/pages/home/items/oversea_accept_license_page.dart';
import 'package:recook/pages/user/address/receiving_address_page.dart'; import 'package:recook/pages/user/address/receiving_address_page.dart';
import 'package:recook/pages/user/user_verify.dart';
import 'package:recook/pages/user/widget/recook_check_box.dart'; import 'package:recook/pages/user/widget/recook_check_box.dart';
import 'package:recook/utils/custom_route.dart'; import 'package:recook/utils/custom_route.dart';
import 'package:recook/widgets/bottom_sheet/bottom_list.dart'; import 'package:recook/widgets/bottom_sheet/bottom_list.dart';
@ -780,6 +782,10 @@ class _GoodsOrderPageState extends BaseStoreState<GoodsOrderPage> {
return reslut; return reslut;
} }
bool get identicalName =>
UserManager.instance.user.info.realName ==
_orderModel.data.addr.receiverName;
_allAmountTitle() { _allAmountTitle() {
return Container( return Container(
height: 55, height: 55,
@ -832,9 +838,8 @@ class _GoodsOrderPageState extends BaseStoreState<GoodsOrderPage> {
(_orderModel.data.shippingMethod == 1); (_orderModel.data.shippingMethod == 1);
if (isOversea) { if (isOversea) {
if (!_accept) canDeliver = false; if (!_accept) canDeliver = false;
if (_overseaNeedIdentifier &&
(!UserManager.instance.user.info.realInfoStatus)) canDeliver = false;
} }
double ruiCoin = 0; double ruiCoin = 0;
_orderModel.data.brands.forEach((brand) { _orderModel.data.brands.forEach((brand) {
brand.goods.forEach((good) { brand.goods.forEach((good) {
@ -916,10 +921,17 @@ class _GoodsOrderPageState extends BaseStoreState<GoodsOrderPage> {
onPressed: !canDeliver onPressed: !canDeliver
? null ? null
: () { : () {
if (UserManager.instance.user.info.realName != if (_overseaNeedIdentifier) {
_orderModel.data.addr.receiverName) { if (!UserManager
ReToast.err( .instance.user.info.realInfoStatus) {
text: '因订单含跨境商品,收货人联系方式需与当前账号实名认证姓名相同'); Get.to(() => VerifyPage());
} else if (!identicalName) {
ReToast.err(
text: '因订单含跨境商品,收货人联系方式需与当前账号实名认证姓名相同');
} else {
_submit(context);
}
// AppRouter.push( // AppRouter.push(
// context, // context,
// RouteName.USER_VERIFY, // RouteName.USER_VERIFY,

Loading…
Cancel
Save