diff --git a/.gitignore b/.gitignore index 26112922..b301a2af 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,4 @@ yarn-error.log /.vscode mix-manifest.json package-lock.json -beike/node_modules +beike/node_modules \ No newline at end of file diff --git a/beike/Admin/Http/Controllers/DesignController.php b/beike/Admin/Http/Controllers/DesignController.php index 16a6eb56..7c734273 100644 --- a/beike/Admin/Http/Controllers/DesignController.php +++ b/beike/Admin/Http/Controllers/DesignController.php @@ -6,7 +6,6 @@ use Illuminate\View\View; use Illuminate\Http\Request; use Beike\Services\DesignService; use Beike\Repositories\SettingRepo; -use Beike\Repositories\LanguageRepo; class DesignController extends Controller { @@ -20,7 +19,6 @@ class DesignController extends Controller { $data = [ 'editors' => ['editor-slide_show', 'editor-image401', 'editor-tab_product', 'editor-image100', 'editor-brand'], - 'languages' => LanguageRepo::all(), 'design_settings' => system_setting('base.design_setting'), ]; return view('admin::pages.design.builder.index', $data); diff --git a/beike/Admin/Http/Controllers/DesignFooterController.php b/beike/Admin/Http/Controllers/DesignFooterController.php index 12b2a714..bfc7a5ec 100644 --- a/beike/Admin/Http/Controllers/DesignFooterController.php +++ b/beike/Admin/Http/Controllers/DesignFooterController.php @@ -6,7 +6,6 @@ use Illuminate\View\View; use Illuminate\Http\Request; use Beike\Services\DesignService; use Beike\Repositories\SettingRepo; -use Beike\Repositories\LanguageRepo; class DesignFooterController extends Controller { @@ -19,13 +18,11 @@ class DesignFooterController extends Controller public function index(Request $request): View { $data = [ - // 'languages' => LanguageRepo::all(), 'design_settings' => system_setting('base.footer_setting'), ]; return view('admin::pages.design.builder.footer', $data); } - /** * 预览模块显示结果 * @@ -36,20 +33,13 @@ class DesignFooterController extends Controller public function preview(Request $request): View { $module = json_decode($request->getContent(), true); - $moduleId = $module['module_id'] ?? ''; - $moduleCode = $module['code'] ?? ''; - $content = $module['content'] ?? ''; - $viewPath = "design.{$moduleCode}"; - $viewData = [ - 'code' => $moduleCode, - 'module_id' => $moduleId, - 'view_path' => $viewPath, - 'content' => DesignService::handleModuleContent($moduleCode, $content), - 'design' => (bool)$request->get('design') - ]; + // $viewData = [ + // 'content' => DesignService::handleModuleContent($moduleCode, $content), + // 'design' => (bool)$request->get('design') + // ]; - return view($viewPath, $viewData); + // return view($viewPath, $viewData); } @@ -63,12 +53,12 @@ class DesignFooterController extends Controller public function update(Request $request): array { $content = json_decode($request->getContent(), true); - $moduleData = DesignService::handleRequestModules($content); + $data = [ 'type' => 'system', 'space' => 'base', - 'name' => 'design_setting', - 'value' => json_encode($moduleData), + 'name' => 'footer_setting', + 'value' => json_encode($content), 'json' => 1 ]; SettingRepo::createOrUpdate($data); diff --git a/beike/Admin/Routes/admin.php b/beike/Admin/Routes/admin.php index 172047ae..5006f359 100644 --- a/beike/Admin/Routes/admin.php +++ b/beike/Admin/Routes/admin.php @@ -43,6 +43,7 @@ Route::prefix($adminName) Route::post('design/builder/preview', [Controllers\DesignController::class, 'preview'])->name('design.module.preview'); Route::get('design_footer/builder', [Controllers\DesignFooterController::class, 'index'])->name('design_footer.index'); + Route::put('design_footer/builder', [Controllers\designFooterController::class, 'update'])->name('design_footer.update'); Route::put('edit', [Controllers\EditController::class, 'update'])->name('edit'); Route::get('edit/locale', [Controllers\EditController::class, 'locale'])->name('edit.locale'); diff --git a/public/catalog/demo/.DS_Store b/public/catalog/demo/.DS_Store index b1b12fae..3912d0cf 100644 Binary files a/public/catalog/demo/.DS_Store and b/public/catalog/demo/.DS_Store differ diff --git a/public/catalog/demo/services-icon/1.png b/public/catalog/demo/services-icon/1.png new file mode 100644 index 00000000..f1534169 Binary files /dev/null and b/public/catalog/demo/services-icon/1.png differ diff --git a/public/catalog/demo/services-icon/2.png b/public/catalog/demo/services-icon/2.png new file mode 100644 index 00000000..57cfa0a7 Binary files /dev/null and b/public/catalog/demo/services-icon/2.png differ diff --git a/public/catalog/demo/services-icon/3.png b/public/catalog/demo/services-icon/3.png new file mode 100644 index 00000000..742d6b72 Binary files /dev/null and b/public/catalog/demo/services-icon/3.png differ diff --git a/public/catalog/demo/services-icon/4.png b/public/catalog/demo/services-icon/4.png new file mode 100644 index 00000000..c3d685bc Binary files /dev/null and b/public/catalog/demo/services-icon/4.png differ diff --git a/resources/beike/admin/views/pages/design/builder/footer.blade.php b/resources/beike/admin/views/pages/design/builder/footer.blade.php index 0280a72f..6d7de099 100644 --- a/resources/beike/admin/views/pages/design/builder/footer.blade.php +++ b/resources/beike/admin/views/pages/design/builder/footer.blade.php @@ -142,7 +142,7 @@
- 添加链接 + 添加链接
@@ -258,9 +258,9 @@ }, saveButtonClicked() { - // $http.put('design/builder', this.form).then((res) => { - // layer.msg(res.message) - // }) + $http.put('design_footer/builder', this.form).then((res) => { + layer.msg(res.message) + }) }, selectorShow(index) {