From 77bf0bca1ae308880b551bb590b7b4547475f21f Mon Sep 17 00:00:00 2001 From: pushuo Date: Mon, 8 May 2023 10:57:21 +0800 Subject: [PATCH] Change plugin purchase process wip wip wip wip admin ui optimization Optimize file manager --- .../beike/admin/css/_bootstrap-extra.scss | 61 ++++++- resources/beike/admin/css/_header.scss | 36 ++-- resources/beike/admin/css/_sidebar.scss | 21 +-- .../beike/admin/css/bootstrap/bootstrap.scss | 17 ++ .../components/form/input-locale.blade.php | 2 + .../admin/views/components/header.blade.php | 2 +- .../pages/attribute_group/index.blade.php | 2 +- .../views/pages/attributes/index.blade.php | 2 +- .../admin/views/pages/brands/index.blade.php | 2 +- .../views/pages/categories/form-vue.blade.php | 92 ---------- .../views/pages/categories/index.blade.php | 2 +- .../pages/customer_groups/index.blade.php | 2 +- .../views/pages/customers/index.blade.php | 6 +- .../views/pages/design/builder/menu.blade.php | 2 +- .../views/pages/file_manager/index.blade.php | 22 ++- .../views/pages/marketing/show.blade.php | 161 +++++++++--------- .../views/pages/products/form/form.blade.php | 33 ++-- .../views/pages/products/index.blade.php | 4 +- .../vendor/pagination/bootstrap-4.blade.php | 8 +- .../shop/default/css/bootstrap/bootstrap.scss | 23 +++ resources/lang/en/admin/marketing.php | 3 + resources/lang/ja/admin/common.php | 32 ++-- resources/lang/zh_cn/admin/marketing.php | 3 + themes/default/brand/info.blade.php | 4 + .../shared/pagination/bootstrap-4.blade.php | 8 +- 25 files changed, 300 insertions(+), 250 deletions(-) delete mode 100644 resources/beike/admin/views/pages/categories/form-vue.blade.php diff --git a/resources/beike/admin/css/_bootstrap-extra.scss b/resources/beike/admin/css/_bootstrap-extra.scss index 6c2966e7..89ea79ff 100644 --- a/resources/beike/admin/css/_bootstrap-extra.scss +++ b/resources/beike/admin/css/_bootstrap-extra.scss @@ -46,8 +46,8 @@ hr.horizontal.dark { // border-width: 2px; .nav-item { - margin-left: 0.75rem; - margin-right: 0.75rem; + margin-left: 0.65rem; + margin-right: 0.65rem; &:first-child { margin-left: 0; @@ -60,7 +60,7 @@ hr.horizontal.dark { .nav-link { color: #6c757d; border: none; - padding: 0 .6rem 0.7rem; + padding: 0 1rem 0.7rem; &.active { color: $primary; @@ -107,8 +107,11 @@ hr.horizontal.dark { table.table { thead { th { - background-color: #f9fbfd; + // background-color: #f9fbfd; + background-color: #f5f7f8; // color: #74859e; + padding-top: .7rem; + padding-bottom: .7rem; font-size: .825rem; border-top-width: 0; border-bottom: none; @@ -253,4 +256,54 @@ table.table { border-bottom-left-radius: 0 !important; margin-left: -1px; } +} + +.pagination { + > li { + margin: 0 5px; + font-weight: bold; + a, span { + text-align: center; + border-radius: 2px !important; + min-width: 30px; + } + } +} + +.dropdown-menu { + box-shadow: 0 .5rem 2rem 0.125rem rgba(140, 152, 164, 0.286); +} + +.input-locale-wrap { + > .input-for-group, .input-group { + & + .input-for-group, & + .input-group { + margin-top: -1px; + } + + input, span, textarea { + border-radius: 0; + } + + // 选择第一个 + &:first-child { + input, textarea { + border-top-right-radius: 0.2rem; + } + + span { + border-top-left-radius: 0.2rem; + } + } + + // 选择最后一个 + &:last-child { + input, textarea { + border-bottom-right-radius: 0.2rem; + } + + span { + border-bottom-left-radius: 0.2rem; + } + } + } } \ No newline at end of file diff --git a/resources/beike/admin/css/_header.scss b/resources/beike/admin/css/_header.scss index 293e89b6..da9596c7 100644 --- a/resources/beike/admin/css/_header.scss +++ b/resources/beike/admin/css/_header.scss @@ -49,9 +49,15 @@ &:hover { .input-wrap { - background-color: #f0f3f8; + background-color: #f1f3f8; .search-icon { - color: #4f5b68; + color: #2a343f; + } + } + + input#header-search-input { + &::-webkit-input-placeholder { + color: #546371; } } } @@ -65,20 +71,25 @@ width: 330px; border-radius: 6px; font-size: 16px; - background-color: #f6f7fa; + background-color: #f2f4f7; .search-icon { - // color: #8c98a4; - // color: #798591; - color: #626f7c; + color: #52606f; } &.active { // background-color: #f6f7fa; - background-color: #f0f3f8; + background-color: #ebeff5; + border-radius: 8px; height: 40px; .search-icon { - color: #4f5b68; + color: #2a343f; + } + + input#header-search-input { + &::-webkit-input-placeholder { + color: #546371; + } } .close-icon { @@ -117,7 +128,7 @@ height: 40px; // 设置 placeholder 颜色 &::-webkit-input-placeholder { - color: #8c98a4; + color: #7b8996; } } } @@ -274,6 +285,7 @@ &:hover { .nav-link { background-color: #eee; + color: #333 !important; } .dropdown-menu { @@ -330,7 +342,11 @@ } a.nav-link { - padding: 0 14px; + padding: 0 20px; + + &:hover { + color: $primary; + } } &.update-btn a { diff --git a/resources/beike/admin/css/_sidebar.scss b/resources/beike/admin/css/_sidebar.scss index dd8bf4bb..90e4322f 100644 --- a/resources/beike/admin/css/_sidebar.scss +++ b/resources/beike/admin/css/_sidebar.scss @@ -50,7 +50,10 @@ > .left { padding-top: 8px; min-width: 92px; - background-color: #eff3f7; + // background-color: #eff3f7; + // background-color: #dce5ee; + // background-color: #e4ebf2; + background-color: #ebf1f6; max-width: 130px; // 背景图 @@ -68,26 +71,20 @@ color: #333; display: flex; text-decoration: none; - &::after { - content: ''; - display: inline-block; - width: 3px; - height: 3px; - } i { margin-right: 7px; } } - &.active, &:hover { - background-color: #fff; + &.active { a { font-weight: bold; - &::after { - display: none; - } } + } + + &.active, &:hover { + background-color: #fff; body.admin-home & { background-color: #f9fbfd; diff --git a/resources/beike/admin/css/bootstrap/bootstrap.scss b/resources/beike/admin/css/bootstrap/bootstrap.scss index 82ef2389..6db3cff2 100644 --- a/resources/beike/admin/css/bootstrap/bootstrap.scss +++ b/resources/beike/admin/css/bootstrap/bootstrap.scss @@ -54,6 +54,23 @@ $nav-link-color: #555; $nav-link-hover-color: #555; $nav-tabs-link-active-color: #222; +$pagination-border-width: 0; +$pagination-bg: #f4f4f5; +$pagination-color: #606266; +$pagination-border-radius: 2px; +$pagination-disabled-bg: $pagination-bg; +$pagination-disabled-color: #c0c4cc; +$pagination-hover-color: $primary; +$pagination-padding-x: 4px; +$pagination-padding-y: .3rem; +$pagination-focus-color: #606266; + +$dropdown-box-shadow: 0 0.8rem 2.5rem 0.6125rem rgba(140, 152, 164, 0.286); +$dropdown-item-padding-y: 0.45rem; +$dropdown-border-color: rgba(0, 0, 0, 0.064); +// $dropdown-border-color: transparent; +$dropdown-border-radius: 0.4rem; + @import './bootstrap-icons'; @import 'node_modules/bootstrap/scss/bootstrap'; // @import 'node_modules/bootstrap/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 2cdafa09..ae2e8bfc 100644 --- a/resources/beike/admin/views/components/form/input-locale.blade.php +++ b/resources/beike/admin/views/components/form/input-locale.blade.php @@ -1,4 +1,5 @@ +
@foreach (locales() as $index => $locale)
{{ $locale['name'] }} @@ -13,4 +14,5 @@ @enderror @endif @endforeach +
diff --git a/resources/beike/admin/views/components/header.blade.php b/resources/beike/admin/views/components/header.blade.php index 26ef123a..b76030a0 100644 --- a/resources/beike/admin/views/components/header.blade.php +++ b/resources/beike/admin/views/components/header.blade.php @@ -93,7 +93,7 @@
  • - {{ current_user()->name }} + {{ current_user()->name }}
      diff --git a/resources/beike/admin/views/pages/attribute_group/index.blade.php b/resources/beike/admin/views/pages/attribute_group/index.blade.php index d694a879..1f978115 100644 --- a/resources/beike/admin/views/pages/attribute_group/index.blade.php +++ b/resources/beike/admin/views/pages/attribute_group/index.blade.php @@ -3,7 +3,7 @@ @section('title', __('admin/attribute_group.index')) @section('content') -
      +
      diff --git a/resources/beike/admin/views/pages/attributes/index.blade.php b/resources/beike/admin/views/pages/attributes/index.blade.php index e3a05ff6..aa5368b0 100644 --- a/resources/beike/admin/views/pages/attributes/index.blade.php +++ b/resources/beike/admin/views/pages/attributes/index.blade.php @@ -35,7 +35,7 @@
      -
      diff --git a/resources/beike/admin/views/pages/brands/index.blade.php b/resources/beike/admin/views/pages/brands/index.blade.php index b69c01c9..2af15186 100644 --- a/resources/beike/admin/views/pages/brands/index.blade.php +++ b/resources/beike/admin/views/pages/brands/index.blade.php @@ -25,7 +25,7 @@ @{{ brand.id }} @{{ brand.name }} -
      +
      @{{ brand.sort_order }} @{{ brand.first }} diff --git a/resources/beike/admin/views/pages/categories/form-vue.blade.php b/resources/beike/admin/views/pages/categories/form-vue.blade.php deleted file mode 100644 index dc54c821..00000000 --- a/resources/beike/admin/views/pages/categories/form-vue.blade.php +++ /dev/null @@ -1,92 +0,0 @@ -@extends('admin::admin.layouts.master') - -@section('title', '分类管理') - -@section('content') -
      - -
      - 编辑分类 -
      - - - - -
      - @foreach (locales() as $locale) - - - - @endforeach -
      -       - - -
      - @foreach (locales() as $locale) - - - - @endforeach -
      -       - - - - @foreach ($categories as $_category) - - @endforeach - - - - - - 启用 - 禁用 - - - - - 立即创建 - 取消 - -       -       -
      -@endsection - -@push('footer') - -@endpush diff --git a/resources/beike/admin/views/pages/categories/index.blade.php b/resources/beike/admin/views/pages/categories/index.blade.php index 09b6f822..9fc1895c 100644 --- a/resources/beike/admin/views/pages/categories/index.blade.php +++ b/resources/beike/admin/views/pages/categories/index.blade.php @@ -5,7 +5,7 @@ @section('body-class', 'page-categories') @section('content') -
      +
      {{ __('admin/category.categories_create') }}
      diff --git a/resources/beike/admin/views/pages/customer_groups/index.blade.php b/resources/beike/admin/views/pages/customer_groups/index.blade.php index ce251d50..48c40689 100644 --- a/resources/beike/admin/views/pages/customer_groups/index.blade.php +++ b/resources/beike/admin/views/pages/customer_groups/index.blade.php @@ -3,7 +3,7 @@ @section('title', __('admin/common.customer_groups_index')) @section('content') -
      +
      diff --git a/resources/beike/admin/views/pages/customers/index.blade.php b/resources/beike/admin/views/pages/customers/index.blade.php index cd98648b..97c3392c 100644 --- a/resources/beike/admin/views/pages/customers/index.blade.php +++ b/resources/beike/admin/views/pages/customers/index.blade.php @@ -3,10 +3,10 @@ @section('title', __('admin/common.customer')) @section('content') -
      +
      - +
      @@ -34,7 +34,7 @@
      - +
      diff --git a/resources/beike/admin/views/pages/design/builder/menu.blade.php b/resources/beike/admin/views/pages/design/builder/menu.blade.php index 36eb0e93..e7b90209 100644 --- a/resources/beike/admin/views/pages/design/builder/menu.blade.php +++ b/resources/beike/admin/views/pages/design/builder/menu.blade.php @@ -84,7 +84,7 @@
      -
      diff --git a/resources/beike/admin/views/pages/file_manager/index.blade.php b/resources/beike/admin/views/pages/file_manager/index.blade.php index 450f8c64..05f093ce 100644 --- a/resources/beike/admin/views/pages/file_manager/index.blade.php +++ b/resources/beike/admin/views/pages/file_manager/index.blade.php @@ -489,7 +489,7 @@ type: 'warning' }).then(() => { $http.delete(`file_manager/directories`, { - name: this.folderCurrent + name: data.path }).then((res) => { layer.msg(res.message) this.$refs.tree.setCurrentKey(node.parent.data.path) @@ -522,13 +522,22 @@ }, openInputBox(type, node, data) { + let fileSuffix, fileName = ''; + + if (type == 'image') { + const image = this.images[this.selectImageIndex].name; + // 获取文件后缀 + fileSuffix = image.substring(image.lastIndexOf('.') + 1); + // 获取文件名 + fileName = image.substring(0, image.lastIndexOf('.')); + } + this.$prompt('', type == 'addFolder' ? '{{ __('admin/file_manager.new_folder') }}' : '{{ __('admin/file_manager.rename') }}', { confirmButtonText: '{{ __('common.confirm') }}', cancelButtonText: '{{ __('common.cancel') }}', inputPattern: /^.+$/, closeOnClickModal: false, - inputValue: type == 'image' ? this.images[this.selectImageIndex].name : (type == 'renameFolder' ? data - .name : '{{ __('admin/file_manager.new_folder') }}'), + inputValue: type == 'image' ? fileName : (type == 'renameFolder' ? data.name : '{{ __('admin/file_manager.new_folder') }}'), inputErrorMessage: '{{ __('admin/file_manager.can_empty') }}' }).then(({ value @@ -555,8 +564,10 @@ } if (type == 'renameFolder') { + this.folderCurrent = data.path; + $http.post(`file_manager/rename`, { - origin_name: this.folderCurrent, + origin_name: data.path, new_name: value }).then((res) => { layer.msg(res.message) @@ -574,8 +585,9 @@ $http.post(`file_manager/rename`, { origin_name: origin_name, - new_name: value + new_name: value + '.' + fileSuffix }).then((res) => { + this.images[this.selectImageIndex].name = value + '.' + fileSuffix; layer.msg(res.message) }) } diff --git a/resources/beike/admin/views/pages/marketing/show.blade.php b/resources/beike/admin/views/pages/marketing/show.blade.php index 9a51f499..354f9713 100644 --- a/resources/beike/admin/views/pages/marketing/show.blade.php +++ b/resources/beike/admin/views/pages/marketing/show.blade.php @@ -24,7 +24,7 @@ $data = $plugin['data'];
      -
      +

      {{ $data['name'] }}

      {{ __('admin/marketing.download_count') }}：{{ $data['downloaded'] }}
      -
      -
      {{ __('product.price') }}：
      -
      {{ $data['price_format'] }}
      +
      +
      {{ __('product.price') }}：
      +
      {{ $data['price_format'] }}
      -
      -
      {{ __('admin/marketing.text_version') }}：
      +
      +
      {{ __('admin/marketing.text_version') }}：
      {{ $data['version'] }}
      -
      -
      {{ __('admin/marketing.text_compatibility') }}：
      +
      +
      {{ __('admin/marketing.text_compatibility') }}：
      {{ $data['version_name_format'] }}
      -
      -
      {{ __('admin/marketing.text_author') }}：
      +
      +
      {{ __('admin/marketing.text_author') }}：
      @@ -101,26 +101,25 @@ $data = $plugin['data'];
      - - {{-- - -
      {{ __('admin/marketing.get_token_text') }} {{ __('admin/marketing.get_token') }}
      -
      - - {{ __('common.cancel') }} - {{ __('common.confirm') }} - -
      --}} -