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

# Conflicts:
#	lib/store/shopping/shopping_home/bargain_details.dart

lib/settlement/settlement.dart

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

lib/store/shopping/shopping_home/bargain_details.dart

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