From bbadce27eabda1cd8428347a79b42ea51b42b494 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Fri, 8 Jul 2022 14:08:29 +0800
Subject: [PATCH] wip

---
 public/build/beike/admin/js/app.js            | 25 +++++++++++++++----
 .../beike/shop/default/css/design/app.css     |  3 +++
 .../beike/shop/default/css/design/app.scss    |  3 +++
 .../checkout/payment/bk_stripe.blade.php      |  4 +--
 themes/default/design/builder/index.blade.php | 22 ++++++++++++++++
 webpack.mix.js                                |  3 +++
 6 files changed, 53 insertions(+), 7 deletions(-)
 create mode 100644 public/build/beike/shop/default/css/design/app.css
 create mode 100644 resources/beike/shop/default/css/design/app.scss

diff --git a/public/build/beike/admin/js/app.js b/public/build/beike/admin/js/app.js
index 045db390..f76433a2 100644
--- a/public/build/beike/admin/js/app.js
+++ b/public/build/beike/admin/js/app.js
@@ -2286,6 +2286,19 @@ __webpack_require__.r(__webpack_exports__);
 // extracted by mini-css-extract-plugin
 
 
+/***/ }),
+
+/***/ "./resources/beike/shop/default/css/design/app.scss":
+/*!**********************************************************!*\
+  !*** ./resources/beike/shop/default/css/design/app.scss ***!
+  \**********************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+// extracted by mini-css-extract-plugin
+
+
 /***/ }),
 
 /***/ "./node_modules/process/browser.js":
@@ -2592,6 +2605,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.21.4","description":"P
 /******/ 		// [resolve, reject, Promise] = chunk loading, 0 = chunk loaded
 /******/ 		var installedChunks = {
 /******/ 			"/build/beike/admin/js/app": 0,
+/******/ 			"build/beike/shop/default/css/design/app": 0,
 /******/ 			"build/beike/shop/default/css/app": 0,
 /******/ 			"build/beike/shop/default/css/bootstrap": 0,
 /******/ 			"build/beike/admin/css/app": 0,
@@ -2645,11 +2659,12 @@ module.exports = JSON.parse('{"name":"axios","version":"0.21.4","description":"P
 /******/ 	// startup
 /******/ 	// Load entry module and return exports
 /******/ 	// This entry module depends on other loaded chunks and execution need to be delayed
-/******/ 	__webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/app","build/beike/admin/css/bootstrap"], () => (__webpack_require__("./resources/beike/admin/js/app.js")))
-/******/ 	__webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/app","build/beike/admin/css/bootstrap"], () => (__webpack_require__("./resources/beike/admin/css/bootstrap/bootstrap.scss")))
-/******/ 	__webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/app","build/beike/admin/css/bootstrap"], () => (__webpack_require__("./resources/beike/admin/css/app.scss")))
-/******/ 	__webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/app","build/beike/admin/css/bootstrap"], () => (__webpack_require__("./resources/beike/shop/default/css/bootstrap/bootstrap.scss")))
-/******/ 	var __webpack_exports__ = __webpack_require__.O(undefined, ["build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/app","build/beike/admin/css/bootstrap"], () => (__webpack_require__("./resources/beike/shop/default/css/app.scss")))
+/******/ 	__webpack_require__.O(undefined, ["build/beike/shop/default/css/design/app","build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/app","build/beike/admin/css/bootstrap"], () => (__webpack_require__("./resources/beike/admin/js/app.js")))
+/******/ 	__webpack_require__.O(undefined, ["build/beike/shop/default/css/design/app","build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/app","build/beike/admin/css/bootstrap"], () => (__webpack_require__("./resources/beike/admin/css/bootstrap/bootstrap.scss")))
+/******/ 	__webpack_require__.O(undefined, ["build/beike/shop/default/css/design/app","build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/app","build/beike/admin/css/bootstrap"], () => (__webpack_require__("./resources/beike/admin/css/app.scss")))
+/******/ 	__webpack_require__.O(undefined, ["build/beike/shop/default/css/design/app","build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/app","build/beike/admin/css/bootstrap"], () => (__webpack_require__("./resources/beike/shop/default/css/bootstrap/bootstrap.scss")))
+/******/ 	__webpack_require__.O(undefined, ["build/beike/shop/default/css/design/app","build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/app","build/beike/admin/css/bootstrap"], () => (__webpack_require__("./resources/beike/shop/default/css/app.scss")))
+/******/ 	var __webpack_exports__ = __webpack_require__.O(undefined, ["build/beike/shop/default/css/design/app","build/beike/shop/default/css/app","build/beike/shop/default/css/bootstrap","build/beike/admin/css/app","build/beike/admin/css/bootstrap"], () => (__webpack_require__("./resources/beike/shop/default/css/design/app.scss")))
 /******/ 	__webpack_exports__ = __webpack_require__.O(__webpack_exports__);
 /******/ 	
 /******/ })()
diff --git a/public/build/beike/shop/default/css/design/app.css b/public/build/beike/shop/default/css/design/app.css
new file mode 100644
index 00000000..12035a31
--- /dev/null
+++ b/public/build/beike/shop/default/css/design/app.css
@@ -0,0 +1,3 @@
+body.page-design {
+  background-color: #fff;
+}
diff --git a/resources/beike/shop/default/css/design/app.scss b/resources/beike/shop/default/css/design/app.scss
new file mode 100644
index 00000000..d7b310c6
--- /dev/null
+++ b/resources/beike/shop/default/css/design/app.scss
@@ -0,0 +1,3 @@
+body.page-design {
+  background-color: #fff;
+}
\ No newline at end of file
diff --git a/themes/default/checkout/payment/bk_stripe.blade.php b/themes/default/checkout/payment/bk_stripe.blade.php
index af48d222..47595b2e 100644
--- a/themes/default/checkout/payment/bk_stripe.blade.php
+++ b/themes/default/checkout/payment/bk_stripe.blade.php
@@ -1,5 +1,5 @@
-<script src="{{ asset('bk_stripe/vue/2.6.14/vue.js') }}"></script>
-<script src="{{ asset('bk_stripe/element-ui/2.15.6/js.js') }}"></script>
+<script src="{{ asset('vendor/vue/2.6.14/vue.js') }}"></script>
+<script src="{{ asset('vendor/element-ui/2.15.6/js.js') }}"></script>
 <link rel="stylesheet" href="{{ asset('vendor/element-ui/2.15.6/css.css') }}">
 
 <div class="row mt-5" id="bk-stripe-app" v-cloak>
diff --git a/themes/default/design/builder/index.blade.php b/themes/default/design/builder/index.blade.php
index e69de29b..39fd3232 100644
--- a/themes/default/design/builder/index.blade.php
+++ b/themes/default/design/builder/index.blade.php
@@ -0,0 +1,22 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+  <meta http-equiv="X-UA-Compatible" content="ie=edge">
+  <meta name="csrf-token" content="{{ csrf_token() }}">
+  <title>首页编辑器</title>
+  {{-- <link rel="stylesheet" type="text/css" href="{{ asset('/build/beike/shop/default/css/bootstrap.css') }}"> --}}
+  <script src="{{ asset('vendor/jquery/jquery-3.6.0.min.js') }}"></script>
+  <script src="{{ asset('vendor/layer/3.5.1/layer.js') }}"></script>
+  <script src="{{ asset('/build/beike/shop/default/js/app.js') }}"></script>
+  <script src="{{ asset('vendor/vue/2.6.14/vue.js') }}"></script>
+  <script src="{{ asset('vendor/element-ui/2.15.6/js.js') }}"></script>
+  <link rel="stylesheet" href="{{ asset('vendor/element-ui/2.15.6/css.css') }}">
+  <link rel="stylesheet" type="text/css" href="{{ asset('/build/beike/shop/default/css/design/app.css') }}">
+  @stack('header')
+</head>
+<body class="page-design">
+
+</body>
+</html>
diff --git a/webpack.mix.js b/webpack.mix.js
index 9fb03c8e..8e1cccd7 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -28,6 +28,9 @@ mix.sass('resources/beike/shop/default/css/bootstrap/bootstrap.scss', 'public/bu
 mix.sass('resources/beike/shop/default/css/app.scss', 'public/build/beike/shop/default/css/app.css');
 mix.js('resources/beike/shop/default/js/app.js', 'public/build/beike/shop/default/js/app.js');
 
+// design
+mix.sass('resources/beike/shop/default/css/design/app.scss', 'public/build/beike/shop/default/css/design/app.css');
+
 if (mix.inProduction()) {
     mix.version();
 }