diff --git a/app/Admin/Forms/Settings/App.php b/app/Admin/Forms/Settings/App.php
index 2719837b..60a74c2d 100644
--- a/app/Admin/Forms/Settings/App.php
+++ b/app/Admin/Forms/Settings/App.php
@@ -32,30 +32,31 @@ class App extends Form
      */
     public function form()
     {
-        $appSettings = Setting::where('key', 'app')->first();
+        $appSettings = (array) Setting::where('key', 'app')->value('value');
 
-        $this->text('app_name', 'APP名称')->value($appSettings?->value['app_name']);
+        $this->text('app_name', 'APP名称')->value($appSettings['app_name'] ?? '');
         $this->divider();
-        $this->text('search_hot_keys', '搜索热词（英文半角逗号隔开）')->value($appSettings?->value['search_hot_keys']);
+        $this->text('search_hot_keys', '搜索热词（英文半角逗号隔开）')->value($appSettings['search_hot_keys'] ?? '');
         $this->divider();
-        $this->number('order_payment_expires_at', '订单支付过期时间（秒）')->value($appSettings?->value['order_payment_expires_at']);
-        $this->number('sale_after_expire_days', '售后过期时间（天）')->value($appSettings?->value['sale_after_expire_days']);
+        $this->number('order_payment_expires_at', '订单支付过期时间（秒）')->value(['order_payment_expires_at'] ?? '');
+        $this->number('order_auto_complete_days', '订单自动完成时间（天）')->value($appSettings['order_auto_complete_days'] ?? '');
+        $this->number('sale_after_expire_days', '售后过期时间（天）')->value($appSettings['sale_after_expire_days'] ?? '');
         $this->divider();
 
-        $this->number('sign_click_points', '签到送积分（分）')->value($appSettings?->value['sign_click_points']);
-        $this->number('sign_click_continue', '每连续签到额外奖励（天）')->value($appSettings?->value['sign_click_continue']);
-        $this->number('sign_click_continue_points', '每连续签到额外奖励（分）')->value($appSettings?->value['sign_click_continue_points']);
+        $this->number('sign_click_points', '签到送积分（分）')->value($appSettings['sign_click_points'] ?? '');
+        $this->number('sign_click_continue', '每连续签到额外奖励（天）')->value($appSettings['sign_click_continue'] ?? '');
+        $this->number('sign_click_continue_points', '每连续签到额外奖励（分）')->value($appSettings['sign_click_continue_points'] ?? '');
         $this->divider();
 
-        $this->select('article_help', '帮助文章指定分类')->options(ArticleCategory::whereNull('parent_id')->pluck('name', 'id'))->value($appSettings?->value['article_help']);
-        $this->select('article_agreement', '协议文章指定分类')->options(ArticleCategory::whereNull('parent_id')->pluck('name', 'id'))->value($appSettings?->value['article_agreement']);
-        $this->select('article_health', '健康文章指定分类')->options(ArticleCategory::whereNull('parent_id')->pluck('name', 'id'))->value($appSettings?->value['article_health']);
+        $this->select('article_help', '帮助文章指定分类')->options(ArticleCategory::whereNull('parent_id')->pluck('name', 'id'))->value($appSettings['article_help'] ?? '');
+        $this->select('article_agreement', '协议文章指定分类')->options(ArticleCategory::whereNull('parent_id')->pluck('name', 'id'))->value($appSettings['article_agreement'] ?? '');
+        $this->select('article_health', '健康文章指定分类')->options(ArticleCategory::whereNull('parent_id')->pluck('name', 'id'))->value($appSettings['article_health'] ?? '');
 
-        $this->text('article_about_us', '关于我们文章指定（链接）')->value($appSettings?->value['article_about_us']);
-        $this->text('article_user_promotion_agreement', '服务协议文章指定（链接）')->value($appSettings?->value['article_user_promotion_agreement']);
-        $this->text('article_user_hide_agreement', '隐私协议文章指定（链接）')->value($appSettings?->value['article_user_hide_agreement']);
+        $this->text('article_about_us', '关于我们文章指定（链接）')->value($appSettings['article_about_us'] ?? '');
+        $this->text('article_user_promotion_agreement', '服务协议文章指定（链接）')->value($appSettings['article_user_promotion_agreement'] ?? '');
+        $this->text('article_user_hide_agreement', '隐私协议文章指定（链接）')->value($appSettings['article_user_hide_agreement'] ?? '');
         $this->divider();
 
-        $this->text('invite_uri', '分享邀请地址（链接）')->value($appSettings?->value['article_about_us']);
+        $this->text('invite_uri', '分享邀请地址（链接）')->value($appSettings['invite_uri'] ?? '');
     }
 }
diff --git a/config/settings.php b/config/settings.php
deleted file mode 100644
index 0f3c2be3..00000000
--- a/config/settings.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-return [
-    // 应用名称
-    'app_name' => '子春生',
-
-    // 订单支付过期时间（秒）
-    'order_payment_expires_at' => 1800,
-
-    // 售后过期时间（天）
-    'sale_after_expire_days' => 7,
-
-    // 签到配置，每次积分、连续N天、连续奖励积分
-    'sign_click_points'=>5,
-    'sign_click_continue'=>7,
-    'sign_click_continue_points'=>10,
-
-    // 文章分类配置: 帮助、协议、健康
-    'article_help'=>1,
-    'article_agreement'=>2,
-    'article_health'=>3,
-    // 指定内容链接：关于我们，服务协议，隐私协议
-    'article_about_us'=>env('APP_URL', '').'/h5/articles/1',
-    'article_user_promotion_agreement'=>env('APP_URL', '').'/h5/articles/2',
-    'article_user_hide_agreement'=>env('APP_URL', '').'/h5/articles/3',
-
-    // 快递100是否开启
-    'kuaidi100_is_use' => true,
-    'kuaidi100_callback'=> env('APP_URL', '').'/callback/kuaidi100',
-    'kuaidi100_app_key'=> 'BTvgbjti4727',
-    'kuaidi100_customer'=> '064109188EC4D85DA655DFC342144C6A',
-    'kuaidi100_secret'=> '1bd287d1981749f2a30ea74cac0ab99c',
-    'kuaidi100_userid'=> 'ec0b6ec7729d4f22824cfd3c519dd45b',
-
-    //推送
-    'mall_push_app_id'=>'iikmCoESID8bC1LhOPG1r8',
-    'mall_push_app_key'=>'JX33P0wP8bAQprI953hpN6',
-    'mall_push_app_secret'=>'a3u3B6lXjq6fPTBlOGiOc9',
-    'mall_push_master_secret'=>'MAxmqomwo597xJeDuMCvx1',
-
-    'merchant_push_app_id'=>'',
-    'merchant_push_app_key'=>'',
-    'merchant_push_app_secret'=>'',
-    'merchant_push_master_secret'=>'',
-
-    //邀请路径
-    'invite_uri'=>'',
-
-    //app配置
-    'user_center_is_open'=>true,
-    'search_hot_keys' => '搜索热词,分词1,分词2,分词3',
-
-];
diff --git a/database/seeders/AppSettingSeeder.php b/database/seeders/AppSettingSeeder.php
index 50941e02..cc6a3755 100644
--- a/database/seeders/AppSettingSeeder.php
+++ b/database/seeders/AppSettingSeeder.php
@@ -19,6 +19,7 @@ class AppSettingSeeder extends Seeder
                 'value'=> [
                     'app_name' => '子春生',
                     'order_payment_expires_at' => 1800,
+                    'order_auto_complete_days' => 7,
                     'sale_after_expire_days' => 7,
                     'sign_click_points' => 5,
                     'sign_click_continue' => 7,