Merge branch 'goods_setting_1103'

app/Admin/Forms/v3/GoodsActivitySettingForm.php

@@ -144,9 +144,9 @@ class GoodsActivitySettingForm extends Form
             2 => isset($data['group_buy']) ? $data['group_buy']:0,
             3 => isset($data['new_product']) ? $data['new_product']:0,
         ];
-        
+        $type = $setting['index_activity_type'] ?? 'flash_sale';
         $settingData = [
-            'index_activity_type' => $indexOptionsKey[$setting['index_activity_type']] ?? 1,
+            'index_activity_type' => $indexOptionsKey[$type] ?? 1,
             1 => isset($setting['flash_sale']) ? json_decode($setting['flash_sale'],true) : [],
             2 => isset($setting['group_buy']) ? json_decode($setting['group_buy'],true) : [],
             3 => isset($setting['new_product']) ? json_decode($setting['new_product'],true) : [],