Browse Source

Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	lib/store/shopping/shopping_home/bargain_details.dart
zyh
w-R 3 years ago
parent
commit
58ad6ddad4
  1. 2
      lib/settlement/settlement.dart
  2. 3
      lib/store/shopping/shopping_home/bargain_details.dart

2
lib/settlement/settlement.dart

@ -335,7 +335,7 @@ class _Settlement extends State<Settlement> {
baseData?.isSuccess ?? false baseData?.isSuccess ?? false
? SmartDialog.showToast("下单失败:订单实付金额不能为0", ? SmartDialog.showToast("下单失败:订单实付金额不能为0",
alignment: Alignment.center) alignment: Alignment.center)
: SmartDialog.showToast(baseData.msg, alignment: Alignment.center); : SmartDialog.showToast(baseData?.msg ?? "", alignment: Alignment.center);
} }
} else { } else {
/// ///

3
lib/store/shopping/shopping_home/bargain_details.dart

@ -57,14 +57,13 @@ class _BargainDetails extends State<BargainDetails> {
} }
} }
@override @override
void initState() { void initState() {
super.initState(); super.initState();
actRecordId = widget.arguments["actRecordId"]; actRecordId = widget.arguments["actRecordId"];
limitNumber = widget.arguments["limitNumber"]; limitNumber = widget.arguments["limitNumber"];
storeInfo = widget.arguments["storeInfo"]; storeInfo = widget.arguments["storeInfo"];
// skuId = widget.arguments["skuId"];
startCountdownTimer(); startCountdownTimer();
SharedPreferences.getInstance().then((value) { SharedPreferences.getInstance().then((value) {
String minToken = value.getString("minToken"); String minToken = value.getString("minToken");

Loading…
Cancel
Save