From 91aaa2296aa91df879a3901d662441ca09100148 Mon Sep 17 00:00:00 2001 From: pushuo <229102104@qq.com> Date: Mon, 25 Jul 2022 15:00:22 +0800 Subject: [PATCH] wip --- public/build/beike/admin/css/app.css | 84 ++++- public/build/beike/admin/css/bootstrap.css | 10 +- .../beike/admin/css/_bootstrap-extra.scss | 4 +- resources/beike/admin/css/_global.scss | 13 + .../beike/admin/css/bootstrap/bootstrap.scss | 3 +- .../components/form/input-locale.blade.php | 4 +- .../views/components/form/input.blade.php | 2 +- .../admin/views/components/form/row.blade.php | 10 +- .../admin/views/pages/plugins/index.blade.php | 24 +- .../views/pages/products/form/form.blade.php | 302 +++++++----------- 10 files changed, 250 insertions(+), 206 deletions(-) diff --git a/public/build/beike/admin/css/app.css b/public/build/beike/admin/css/app.css index 4c19ab1f..a53977e3 100644 --- a/public/build/beike/admin/css/app.css +++ b/public/build/beike/admin/css/app.css @@ -30,6 +30,86 @@ body { min-height: 600px; } +.wp-100 { + width: 100px; +} + +.wp-200 { + width: 200px; +} + +.wp-300 { + width: 300px; +} + +.wp-400 { + width: 400px; +} + +.wp-500 { + width: 500px; +} + +.wp-600 { + width: 600px; +} + +.wp-700 { + width: 700px; +} + +.wp-800 { + width: 800px; +} + +.wp-900 { + width: 900px; +} + +.wp-1000 { + width: 1000px; +} + +.wp-100- { + width: calc(100% - 100px); +} + +.wp-200- { + width: calc(100% - 200px); +} + +.wp-300- { + width: calc(100% - 300px); +} + +.wp-400- { + width: calc(100% - 400px); +} + +.wp-500- { + width: calc(100% - 500px); +} + +.wp-600- { + width: calc(100% - 600px); +} + +.wp-700- { + width: calc(100% - 700px); +} + +.wp-800- { + width: calc(100% - 800px); +} + +.wp-900- { + width: calc(100% - 900px); +} + +.wp-1000- { + width: calc(100% - 1000px); +} + .font-size-12 { font-size: 12px; } @@ -442,10 +522,6 @@ table.table.table-striped > tbody > tr:nth-of-type(2n) { } } -.form-control { - border-radius: 2px; - font-size: 0.7rem; -} .form-control:focus { box-shadow: none; } diff --git a/public/build/beike/admin/css/bootstrap.css b/public/build/beike/admin/css/bootstrap.css index 37da4b4d..769c31b5 100644 --- a/public/build/beike/admin/css/bootstrap.css +++ b/public/build/beike/admin/css/bootstrap.css @@ -8941,7 +8941,7 @@ progress { color: #212529; background-color: #fff; background-clip: padding-box; - border: 1px solid #ced4da; + border: 1px solid #e2e2e2; -webkit-appearance: none; -moz-appearance: none; appearance: none; @@ -9164,7 +9164,7 @@ textarea.form-control-lg { background-repeat: no-repeat; background-position: right 0.75rem center; background-size: 16px 12px; - border: 1px solid #ced4da; + border: 1px solid #e2e2e2; border-radius: 0; transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; -webkit-appearance: none; @@ -9417,7 +9417,7 @@ textarea.form-control-lg { top: 0; left: 0; height: 100%; - padding: 0.8rem 0.75rem; + padding: 0.9rem 0.75rem; pointer-events: none; border: 1px solid transparent; transform-origin: 0 0; @@ -9429,7 +9429,7 @@ textarea.form-control-lg { } } .form-floating > .form-control { - padding: 0.8rem 0.75rem; + padding: 0.9rem 0.75rem; } .form-floating > .form-control::-moz-placeholder { color: transparent; @@ -9516,7 +9516,7 @@ textarea.form-control-lg { text-align: center; white-space: nowrap; background-color: #e9ecef; - border: 1px solid #ced4da; + border: 1px solid #e2e2e2; border-radius: 0; } diff --git a/resources/beike/admin/css/_bootstrap-extra.scss b/resources/beike/admin/css/_bootstrap-extra.scss index 1a7817f5..1cadf55e 100644 --- a/resources/beike/admin/css/_bootstrap-extra.scss +++ b/resources/beike/admin/css/_bootstrap-extra.scss @@ -166,8 +166,8 @@ table.table { } .form-control { - border-radius: 2px; - font-size: 0.7rem; + // border-radius: 2px; + // font-size: 0.7rem; &:focus { box-shadow: none; diff --git a/resources/beike/admin/css/_global.scss b/resources/beike/admin/css/_global.scss index a59b4e97..df5bcf6b 100644 --- a/resources/beike/admin/css/_global.scss +++ b/resources/beike/admin/css/_global.scss @@ -23,6 +23,19 @@ body { } } +// 生成 100 200 300 ... 1000 的宽度 +@for $i from 1 through 10 { + .wp-#{$i}00 { + width: #{$i}00px; + } +} +// clac(100% - #{$i}00px) +@for $i from 1 through 10 { + .wp-#{$i}00- { + width: calc(100% - #{$i}00px); + } +} + .font-size-12 { font-size: 12px; } diff --git a/resources/beike/admin/css/bootstrap/bootstrap.scss b/resources/beike/admin/css/bootstrap/bootstrap.scss index 2fb83e66..3c1307bf 100644 --- a/resources/beike/admin/css/bootstrap/bootstrap.scss +++ b/resources/beike/admin/css/bootstrap/bootstrap.scss @@ -17,11 +17,12 @@ $link-decoration: none; $link-color: #1890ff; $form-floating-input-padding-t: 1.325rem; $form-floating-input-padding-b: .625rem; -$form-floating-padding-y: .8rem; +$form-floating-padding-y: .9rem; $form-floating-height: 50px; $btn-focus-width: 0; $table-border-color: #e9ecef; $border-color: #f3f3f3; +$input-border-color: #e2e2e2; @import './bootstrap-icons'; @import 'node_modules/bootstrap-5.1.3/scss/bootstrap'; diff --git a/resources/beike/admin/views/components/form/input-locale.blade.php b/resources/beike/admin/views/components/form/input-locale.blade.php index 564eef29..81f78f4d 100644 --- a/resources/beike/admin/views/components/form/input-locale.blade.php +++ b/resources/beike/admin/views/components/form/input-locale.blade.php @@ -1,8 +1,8 @@ @foreach (locales() as $index => $locale) -
+
+ {{ $locale['name'] }} - {{ $locale['name'] }}
@if ($attributes->has('required')) @error($errorKey($locale['code'])) diff --git a/resources/beike/admin/views/components/form/input.blade.php b/resources/beike/admin/views/components/form/input.blade.php index c24a89dd..62e1b337 100644 --- a/resources/beike/admin/views/components/form/input.blade.php +++ b/resources/beike/admin/views/components/form/input.blade.php @@ -1,3 +1,3 @@ - + diff --git a/resources/beike/admin/views/components/form/row.blade.php b/resources/beike/admin/views/components/form/row.blade.php index a2e0da19..75b46bde 100644 --- a/resources/beike/admin/views/components/form/row.blade.php +++ b/resources/beike/admin/views/components/form/row.blade.php @@ -1,9 +1,7 @@ -
-
- -
- {{ $slot }} -
+
+ +
+ {{ $slot }}
diff --git a/resources/beike/admin/views/pages/plugins/index.blade.php b/resources/beike/admin/views/pages/plugins/index.blade.php index 496aa304..1904050f 100644 --- a/resources/beike/admin/views/pages/plugins/index.blade.php +++ b/resources/beike/admin/views/pages/plugins/index.blade.php @@ -6,7 +6,17 @@
- 创建插件 + {{-- --}} + + 上传插件 (仅支持 zip 文件) +
@@ -73,6 +83,18 @@ }) }, + handleFileChange(e) { + console.log(e); + }, + + beforeFileUpload(e) { + console.log(e); + }, + + upload() { + + }, + installedPlugin(code, type, index) { const self = this; diff --git a/resources/beike/admin/views/pages/products/form/form.blade.php b/resources/beike/admin/views/pages/products/form/form.blade.php index 4d4922a6..a6c80ffa 100644 --- a/resources/beike/admin/views/pages/products/form/form.blade.php +++ b/resources/beike/admin/views/pages/products/form/form.blade.php @@ -43,215 +43,149 @@
商品库存
-
-
- -
- -
-
-
+ + + -
-
- -
-
-
-
-
-
- @{{ variant.name[current_language_code] }} - 编辑 - 移除 -
-
- 添加规格图片 - Add value -
+
+ +
+
+
+
+
+
+ @{{ variant.name[current_language_code] }} + 编辑 + 移除
- -
- {{--
--}} - {{-- --}} - {{-- --}} - {{-- --}} - {{--
--}} - -
-
- -
-
- - -
-
- @{{ value.name[current_language_code] }} -
-
- -
-
请添加 Value
+
+ 添加规格图片 + Add value
+ +
+ {{--
--}} + {{-- --}} + {{-- --}} + {{-- --}} + {{--
--}} - Add variant +
+
+ +
+
+ + +
+
+ @{{ value.name[current_language_code] }} +
+
+ +
+
请添加 Value
+
-
-
- - - - - - - - - - - - - - + + + + + + + + +
- @{{ variant.name[current_language_code] || 'No name' }} - imagemodelskupriceorgin pricecost pricequantity
-
-
- -
+ Add variant +
+ +
+ + + + + + + + + + + + + + + - - - - - - - - -
+ @{{ variant.name[current_language_code] || 'No name' }} + imagemodelskupriceorgin pricecost pricequantity
+
+
+
- +
+ - - - 		- -
-
+ + + 		+ +
-
-
-
-
-
-
+ + +