diff --git a/app/Admin/Controllers/StoreController.php b/app/Admin/Controllers/StoreController.php index 2db5bb0d..28fc7a26 100644 --- a/app/Admin/Controllers/StoreController.php +++ b/app/Admin/Controllers/StoreController.php @@ -77,9 +77,8 @@ class StoreController extends AdminController ->removable(false) ->retainable() ->autoUpload(); - - $form->display('created_at'); - $form->display('updated_at'); + + $form->text('remarks'); }); } } diff --git a/app/Endpoint/Api/Http/Controllers/Order/OrderPreController.php b/app/Endpoint/Api/Http/Controllers/Order/OrderPreController.php index 88921165..35b671dc 100644 --- a/app/Endpoint/Api/Http/Controllers/Order/OrderPreController.php +++ b/app/Endpoint/Api/Http/Controllers/Order/OrderPreController.php @@ -61,7 +61,7 @@ class OrderPreController extends Controller $response = $app->app_code->getUnlimit($scene, [ 'page' => 'pages/welcome/index', 'check_path' => false, - 'env_version' => app()->isProduction() ? 'release' : 'trial', + 'env_version' => app()->isProduction() ? 'release' : 'develop', 'width' => $request->input('width', 200), ]); diff --git a/config/admin.php b/config/admin.php index b39fb861..a1d66031 100644 --- a/config/admin.php +++ b/config/admin.php @@ -264,7 +264,7 @@ return [ 'upload' => [ // Disk in `config/filesystem.php`. - 'disk' => 'aliyun', + 'disk' => env('FILESYSTEM_DRIVER'), // Image and file upload path under the disk above. 'directory' => [ diff --git a/database/migrations/2022_05_06_133819_add_role_to_user_infos.php b/database/migrations/2022_05_06_133819_add_role_to_user_infos.php index 6b5cd190..ccb51b84 100644 --- a/database/migrations/2022_05_06_133819_add_role_to_user_infos.php +++ b/database/migrations/2022_05_06_133819_add_role_to_user_infos.php @@ -15,7 +15,7 @@ class AddRoleToUserInfos extends Migration { Schema::table('user_infos', function (Blueprint $table) { $table->decimal('profit', 12, 2)->default(0)->comment('累计收益'); - // $table->tinyInteger('is_company')->default(0)->comment('是否员工'); + $table->tinyInteger('is_company')->default(0)->comment('是否员工'); }); } diff --git a/database/migrations/2022_05_06_161251_create_stores_table.php b/database/migrations/2022_05_06_161251_create_stores_table.php index 57781a21..ec8a05f6 100644 --- a/database/migrations/2022_05_06_161251_create_stores_table.php +++ b/database/migrations/2022_05_06_161251_create_stores_table.php @@ -17,10 +17,21 @@ class CreateStoresTable extends Migration $table->id(); $table->string('title')->comment('标题'); $table->string('image')->comment('封面图'); + $table->string('remarks')->nullable()->comment('备注'); $table->tinyInteger('status')->default(1)->comment('状态(1: 可用, 0: 不可用)'); $table->unsignedInteger('sort')->default(1)->comment('排序, 正序'); $table->timestamps(); }); + + Schema::create('store_admin_users', function (Blueprint $table) { + $table->unsignedInteger('store_id'); + $table->unsignedInteger('admin_user_id'); + }); + + Schema::create('store_products', function (Blueprint $table) { + $table->unsignedInteger('store_id'); + $table->unsignedInteger('product_id'); + }); } /** @@ -31,5 +42,7 @@ class CreateStoresTable extends Migration public function down() { Schema::dropIfExists('stores'); + Schema::dropIfExists('store_admin_users'); + Schema::dropIfExists('store_products'); } } diff --git a/database/migrations/2022_05_07_174547_add_slug_to_vips.php b/database/migrations/2022_05_07_174547_add_slug_to_vips.php index 85f2d5ba..d44af98d 100644 --- a/database/migrations/2022_05_07_174547_add_slug_to_vips.php +++ b/database/migrations/2022_05_07_174547_add_slug_to_vips.php @@ -28,7 +28,7 @@ class AddSlugToVips extends Migration public function down() { Schema::table('vips', function (Blueprint $table) { - $table->dropColumn(['slug', 'ratio']); + $table->dropColumn(['slug', 'ratio', 'sort']); }); } } diff --git a/resources/lang/zh_CN/store.php b/resources/lang/zh_CN/store.php index 3a3b1ece..931678ce 100644 --- a/resources/lang/zh_CN/store.php +++ b/resources/lang/zh_CN/store.php @@ -9,7 +9,8 @@ return [ 'title' => '名称', 'image' => '封面图', 'sort' => '排序', - 'status' => '状态' + 'status' => '状态', + 'remarks' => '备注', ], 'options' => [ ],