diff --git a/beike/Admin/Http/Controllers/DesignController.php b/beike/Admin/Http/Controllers/DesignController.php index 57bbfcaf..08a6f0ba 100644 --- a/beike/Admin/Http/Controllers/DesignController.php +++ b/beike/Admin/Http/Controllers/DesignController.php @@ -5,6 +5,7 @@ namespace Beike\Admin\Http\Controllers; use Illuminate\View\View; use Illuminate\Http\Request; use Beike\Repositories\SettingRepo; +use Beike\Repositories\LanguageRepo; class DesignController extends Controller { @@ -12,6 +13,7 @@ class DesignController extends Controller { $data = [ 'editors' => ['editor-slide_show'], + 'languages' => LanguageRepo::all(), 'design_settings' => system_setting('base.design_setting'), ]; return view('admin::pages.design.builder.index', $data); diff --git a/public/build/beike/admin/js/app.js b/public/build/beike/admin/js/app.js index da4c9aeb..a5f1e1bd 100644 --- a/public/build/beike/admin/js/app.js +++ b/public/build/beike/admin/js/app.js @@ -2065,17 +2065,6 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _js_http__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../js/http */ "./resources/js/http.js"); window.$http = _js_http__WEBPACK_IMPORTED_MODULE_0__["default"]; - -function randomString(length) { - var str = ''; - - for (; str.length < length; str += Math.random().toString(36).substr(2)) { - ; - } - - return str.substr(0, length); -} - $(document).ready(function ($) { $.ajaxSetup({ headers: { diff --git a/resources/beike/admin/js/app.js b/resources/beike/admin/js/app.js index d6e70acf..53374b4c 100644 --- a/resources/beike/admin/js/app.js +++ b/resources/beike/admin/js/app.js @@ -1,12 +1,6 @@ import http from "../../../js/http"; window.$http = http; -function randomString(length) { - let str = ''; - for (; str.length < length; str += Math.random().toString(36).substr(2)); - return str.substr(0, length); -} - $(document).ready(function ($) { $.ajaxSetup({ headers: {'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')}, diff --git a/resources/beike/admin/views/pages/design/builder/index.blade.php b/resources/beike/admin/views/pages/design/builder/index.blade.php index 32c7b99e..7a8cb353 100644 --- a/resources/beike/admin/views/pages/design/builder/index.blade.php +++ b/resources/beike/admin/views/pages/design/builder/index.blade.php @@ -58,9 +58,19 @@ @endforeach + + @include('admin::pages.design.builder.component.image_selector') + +