wuhui_zzw
/
wyyl
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!125 Optimize element path 

* Optimize order status modification
* Optimize element path
This commit is contained in:
pushuo 2023-06-13 09:02:47 +00:00 committed by Edward Yang
parent 2c460d696e
commit b074e2a6c1
26 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/vendor/element-ui/2.15.6/css.css vendored
View File

File diff suppressed because one or more lines are too long

1
public/vendor/element-ui/2.15.6/js.js vendored
View File

File diff suppressed because one or more lines are too long

BIN
public/vendor/element-ui/2.15.9/fonts/element-icons.ttf vendored
View File

Binary file not shown.

BIN
public/vendor/element-ui/2.15.9/fonts/element-icons.woff vendored
View File

Binary file not shown.

1
public/vendor/element-ui/2.15.9/index.css vendored
View File

File diff suppressed because one or more lines are too long

1
public/vendor/element-ui/2.15.9/index.js vendored
View File

File diff suppressed because one or more lines are too long

0
public/vendor/element-ui/2.15.6/fonts/element-icons.ttf → public/vendor/element-ui/fonts/element-icons.ttf vendored
View File

0
public/vendor/element-ui/2.15.6/fonts/element-icons.woff → public/vendor/element-ui/fonts/element-icons.woff vendored
View File

1
public/vendor/element-ui/index-blue.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
public/vendor/element-ui/index.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
public/vendor/element-ui/index.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

4
resources/beike/admin/views/layouts/master.blade.php
View File

@ -9,13 +9,13 @@
<meta name="asset" content="{{ asset('/') }}"> <meta name="asset" content="{{ asset('/') }}">
<meta name="editor_language" content="{{ locale() }}"> <meta name="editor_language" content="{{ locale() }}">
<script src="{{ asset('vendor/vue/2.7/vue' . (!config('app.debug') ? '.min' : '') . '.js') }}"></script> <script src="{{ asset('vendor/vue/2.7/vue' . (!config('app.debug') ? '.min' : '') . '.js') }}"></script>
<script src="{{ asset('vendor/element-ui/2.15.6/js.js') }}"></script> <script src="{{ asset('vendor/element-ui/index.js') }}"></script>
<script src="{{ asset('vendor/jquery/jquery-3.6.0.min.js') }}"></script> <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('vendor/layer/3.5.1/layer.js') }}"></script>
<script src="{{ asset('vendor/bootstrap/js/bootstrap.bundle.min.js') }}"></script> <script src="{{ asset('vendor/bootstrap/js/bootstrap.bundle.min.js') }}"></script>
<script src="{{ asset('vendor/cookie/js.cookie.min.js') }}"></script> <script src="{{ asset('vendor/cookie/js.cookie.min.js') }}"></script>
<link href="{{ mix('/build/beike/admin/css/bootstrap.css') }}" rel="stylesheet"> <link href="{{ mix('/build/beike/admin/css/bootstrap.css') }}" rel="stylesheet">
<link rel="stylesheet" href="{{ asset('vendor/element-ui/2.15.6/css.css') }}"> <link rel="stylesheet" href="{{ asset('vendor/element-ui/index.css') }}">
@if (locale() != 'zh_cn') @if (locale() != 'zh_cn')
<script src="{{ asset('vendor/element-ui/language/' . locale() . '.js') }}"></script> <script src="{{ asset('vendor/element-ui/language/' . locale() . '.js') }}"></script>
@endif @endif

2
resources/beike/admin/views/pages/admin_users/index.blade.php
View File

@ -67,7 +67,7 @@
</el-form-item> </el-form-item>
<el-form-item label="{{ __('shop/login.password') }}" :prop="dialog.form.id === null || dialog.form.id == '' ? 'password' : ''"> <el-form-item label="{{ __('shop/login.password') }}" :prop="dialog.form.id === null || dialog.form.id == '' ? 'password' : ''">
<el-input v-model="dialog.form.password" placeholder="{{ __('common.password') }}"></el-input> <el-input v-model="dialog.form.password" placeholder="{{ __('shop/login.password') }}"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="{{ __('common.language') }}"> <el-form-item label="{{ __('common.language') }}">

4
resources/beike/admin/views/pages/design/builder/footer.blade.php
View File

@ -17,8 +17,8 @@
<script src="{{ asset('vendor/vue/Sortable.min.js') }}"></script> <script src="{{ asset('vendor/vue/Sortable.min.js') }}"></script>
<script src="{{ asset('vendor/vue/vuedraggable.js') }}"></script> <script src="{{ asset('vendor/vue/vuedraggable.js') }}"></script>
<script src="{{ asset('vendor/tinymce/5.9.1/tinymce.min.js') }}"></script> <script src="{{ asset('vendor/tinymce/5.9.1/tinymce.min.js') }}"></script>
<script src="{{ asset('vendor/element-ui/2.15.6/js.js') }}"></script> <script src="{{ asset('vendor/element-ui/index.js') }}"></script>
<link rel="stylesheet" href="{{ asset('vendor/element-ui/2.15.6/css.css') }}"> <link rel="stylesheet" href="{{ asset('vendor/element-ui/index.css') }}">
<link rel="stylesheet" type="text/css" href="{{ asset('/build/beike/admin/css/design.css') }}"> <link rel="stylesheet" type="text/css" href="{{ asset('/build/beike/admin/css/design.css') }}">
@stack('header') @stack('header')
<script> <script>

4
resources/beike/admin/views/pages/design/builder/index.blade.php
View File

@ -18,8 +18,8 @@
<script src="{{ asset('vendor/vue/Sortable.min.js') }}"></script> <script src="{{ asset('vendor/vue/Sortable.min.js') }}"></script>
<script src="{{ asset('vendor/vue/vuedraggable.js') }}"></script> <script src="{{ asset('vendor/vue/vuedraggable.js') }}"></script>
<script src="{{ asset('vendor/tinymce/5.9.1/tinymce.min.js') }}"></script> <script src="{{ asset('vendor/tinymce/5.9.1/tinymce.min.js') }}"></script>
<script src="{{ asset('vendor/element-ui/2.15.6/js.js') }}"></script> <script src="{{ asset('vendor/element-ui/index.js') }}"></script>
<link rel="stylesheet" href="{{ asset('vendor/element-ui/2.15.6/css.css') }}"> <link rel="stylesheet" href="{{ asset('vendor/element-ui/index.css') }}">
@if (locale() != 'zh_cn') @if (locale() != 'zh_cn')
<script src="{{ asset('vendor/element-ui/language/' . locale() . '.js') }}"></script> <script src="{{ asset('vendor/element-ui/language/' . locale() . '.js') }}"></script>
@endif @endif

4
resources/beike/admin/views/pages/file_manager/index.blade.php
View File

@ -8,13 +8,13 @@
<meta name="csrf-token" content="{{ csrf_token() }}"> <meta name="csrf-token" content="{{ csrf_token() }}">
<meta name="asset" content="{{ asset('/') }}"> <meta name="asset" content="{{ asset('/') }}">
<script src="{{ asset('vendor/vue/2.7/vue.js') }}"></script> <script src="{{ asset('vendor/vue/2.7/vue.js') }}"></script>
<script src="{{ asset('vendor/element-ui/2.15.9/index.js') }}"></script> <script src="{{ asset('vendor/element-ui/index.js') }}"></script>
<script src="{{ asset('vendor/cookie/js.cookie.min.js') }}"></script> <script src="{{ asset('vendor/cookie/js.cookie.min.js') }}"></script>
<script src="{{ asset('vendor/jquery/jquery-3.6.0.min.js') }}"></script> <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('vendor/layer/3.5.1/layer.js') }}"></script>
<script src="{{ asset('vendor/vue/batch_select.js') }}"></script> <script src="{{ asset('vendor/vue/batch_select.js') }}"></script>
<link href="{{ mix('/build/beike/admin/css/bootstrap.css') }}" rel="stylesheet"> <link href="{{ mix('/build/beike/admin/css/bootstrap.css') }}" rel="stylesheet">
<link rel="stylesheet" href="{{ asset('vendor/element-ui/2.15.9/index.css') }}"> <link rel="stylesheet" href="{{ asset('vendor/element-ui/index-blue.css') }}">
<link href="{{ mix('build/beike/admin/css/filemanager.css') }}" rel="stylesheet"> <link href="{{ mix('build/beike/admin/css/filemanager.css') }}" rel="stylesheet">
<script src="{{ mix('build/beike/admin/js/app.js') }}"></script> <script src="{{ mix('build/beike/admin/js/app.js') }}"></script>
@if (locale() != 'zh_cn') @if (locale() != 'zh_cn')

2
resources/beike/admin/views/pages/marketing/show.blade.php
View File

@ -20,7 +20,7 @@ $data = $plugin['data'];
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="d-lg-flex plugin-info"> <div class="d-lg-flex plugin-info">
<div class="d-flex justify-content-between align-items-center plugin-icon-wrap"> <div class="d-flex justify-content-between align-items-center plugin-icon-wrap w-max-400">
<img src="{{ $data['icon_big'] }}" class="img-fluid plugin-icon"> <img src="{{ $data['icon_big'] }}" class="img-fluid plugin-icon">
<img src="{{ $data['icon_big'] }}" class="img-fluid plugin-icon-shadow"> <img src="{{ $data['icon_big'] }}" class="img-fluid plugin-icon-shadow">
</div> </div>

4
resources/beike/admin/views/pages/orders/form.blade.php
View File

@ -121,7 +121,7 @@
<el-form-item label="{{ __('order.current_status') }}"> <el-form-item label="{{ __('order.current_status') }}">
{{ $order->status_format }} {{ $order->status_format }}
</el-form-item> </el-form-item>
@if ($order->status != 'completed') @if (count($statuses))
<el-form-item label="{{ __('order.change_to_status') }}" prop="status"> <el-form-item label="{{ __('order.change_to_status') }}" prop="status">
<el-select class="wp-200" size="small" v-model="form.status" placeholder="{{ __('common.please_choose') }}"> <el-select class="wp-200" size="small" v-model="form.status" placeholder="{{ __('common.please_choose') }}">
<el-option <el-option
@ -184,7 +184,7 @@
<td>{{ $product->product_id }}</td> <td>{{ $product->product_id }}</td>
<td> <td>
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<div class="wh-60 me-2"><img src="{{ $product->image }}" class="img-fluid"></div>{{ $product->name }} <div class="wh-60 me-2"><img src="{{ $product->image }}" class="img-fluid max-h-100"></div>{{ $product->name }}
</div> </div>
</td> </td>
<td class="">{{ $product->product_sku }}</td> <td class="">{{ $product->product_sku }}</td>

2
resources/beike/admin/views/pages/products/index.blade.php
View File

@ -141,7 +141,7 @@
</td> </td>
@endif @endif
@hook('admin.product.list.column_value') @hook('admin.product.list.column_value')
<td class="text-end"> <td class="text-end text-nowrap">
@if ($product['deleted_at'] == '') @if ($product['deleted_at'] == '')
<a href="{{ admin_route('products.edit', [$product['id']]) }}" class="btn btn-outline-secondary btn-sm">{{ __('common.edit') }}</a> <a href="{{ admin_route('products.edit', [$product['id']]) }}" class="btn btn-outline-secondary btn-sm">{{ __('common.edit') }}</a>
<a href="javascript:void(0)" class="btn btn-outline-danger btn-sm" @click.prevent="deleteProduct({{ $loop->index }})">{{ __('common.delete') }}</a> <a href="javascript:void(0)" class="btn btn-outline-danger btn-sm" @click.prevent="deleteProduct({{ $loop->index }})">{{ __('common.delete') }}</a>

4
resources/beike/admin/views/pages/user/forgotten.blade.php
View File

@ -10,8 +10,8 @@
<script src="{{ asset('vendor/jquery/jquery-3.6.0.min.js') }}"></script> <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('vendor/layer/3.5.1/layer.js') }}"></script>
<script src="{{ asset('vendor/vue/2.7/vue' . (!config('app.debug') ? '.min' : '') . '.js') }}"></script> <script src="{{ asset('vendor/vue/2.7/vue' . (!config('app.debug') ? '.min' : '') . '.js') }}"></script>
<script src="{{ asset('vendor/element-ui/2.15.6/js.js') }}"></script> <script src="{{ asset('vendor/element-ui/index.js') }}"></script>
<link rel="stylesheet" href="{{ asset('vendor/element-ui/2.15.6/css.css') }}"> <link rel="stylesheet" href="{{ asset('vendor/element-ui/index.css') }}">
{{-- <link href="{{ mix('build/css/admin/login.css') }}" rel="stylesheet"> --}} {{-- <link href="{{ mix('build/css/admin/login.css') }}" rel="stylesheet"> --}}
<script src="{{ mix('build/beike/admin/js/app.js') }}"></script> <script src="{{ mix('build/beike/admin/js/app.js') }}"></script>
<link href="{{ mix('build/beike/admin/css/app.css') }}" rel="stylesheet"> <link href="{{ mix('build/beike/admin/css/app.css') }}" rel="stylesheet">

4
themes/default/account/address.blade.php
View File

@ -4,8 +4,8 @@
@push('header') @push('header')
<script src="{{ asset('vendor/vue/2.7/vue' . (!config('app.debug') ? '.min' : '') . '.js') }}"></script> <script src="{{ asset('vendor/vue/2.7/vue' . (!config('app.debug') ? '.min' : '') . '.js') }}"></script>
<script src="{{ asset('vendor/element-ui/2.15.6/js.js') }}"></script> <script src="{{ asset('vendor/element-ui/index.js') }}"></script>
<link rel="stylesheet" href="{{ asset('vendor/element-ui/2.15.6/css.css') }}"> <link rel="stylesheet" href="{{ asset('vendor/element-ui/index.css') }}">
@endpush @endpush
@section('content') @section('content')

4
themes/default/account/forgotten.blade.php
View File

@ -4,8 +4,8 @@
@push('header') @push('header')
<script src="{{ asset('vendor/vue/2.7/vue' . (!config('app.debug') ? '.min' : '') . '.js') }}"></script> <script src="{{ asset('vendor/vue/2.7/vue' . (!config('app.debug') ? '.min' : '') . '.js') }}"></script>
<script src="{{ asset('vendor/element-ui/2.15.6/js.js') }}"></script> <script src="{{ asset('vendor/element-ui/index.js') }}"></script>
<link rel="stylesheet" href="{{ asset('vendor/element-ui/2.15.6/css.css') }}"> <link rel="stylesheet" href="{{ asset('vendor/element-ui/index.css') }}">
@endpush @endpush

4
themes/default/account/login.blade.php
View File

@ -4,8 +4,8 @@
@push('header') @push('header')
<script src="{{ asset('vendor/vue/2.7/vue' . (!config('app.debug') ? '.min' : '') . '.js') }}"></script> <script src="{{ asset('vendor/vue/2.7/vue' . (!config('app.debug') ? '.min' : '') . '.js') }}"></script>
<script src="{{ asset('vendor/element-ui/2.15.6/js.js') }}"></script> <script src="{{ asset('vendor/element-ui/index.js') }}"></script>
<link rel="stylesheet" href="{{ asset('vendor/element-ui/2.15.6/css.css') }}"> <link rel="stylesheet" href="{{ asset('vendor/element-ui/index.css') }}">
@endpush @endpush

4
themes/default/cart/cart.blade.php
View File

@ -4,9 +4,9 @@
@push('header') @push('header')
<script src="{{ asset('vendor/vue/2.7/vue' . (!config('app.debug') ? '.min' : '') . '.js') }}"></script> <script src="{{ asset('vendor/vue/2.7/vue' . (!config('app.debug') ? '.min' : '') . '.js') }}"></script>
<script src="{{ asset('vendor/element-ui/2.15.6/js.js') }}"></script> <script src="{{ asset('vendor/element-ui/index.js') }}"></script>
<script src="{{ asset('vendor/scrolltofixed/jquery-scrolltofixed-min.js') }}"></script> <script src="{{ asset('vendor/scrolltofixed/jquery-scrolltofixed-min.js') }}"></script>
<link rel="stylesheet" href="{{ asset('vendor/element-ui/2.15.6/css.css') }}"> <link rel="stylesheet" href="{{ asset('vendor/element-ui/index.css') }}">
@endpush @endpush
@section('content') @section('content')

4
themes/default/checkout.blade.php
View File

@ -5,8 +5,8 @@
@push('header') @push('header')
<script src="{{ asset('vendor/vue/2.7/vue' . (!config('app.debug') ? '.min' : '') . '.js') }}"></script> <script src="{{ asset('vendor/vue/2.7/vue' . (!config('app.debug') ? '.min' : '') . '.js') }}"></script>
<script src="{{ asset('vendor/scrolltofixed/jquery-scrolltofixed-min.js') }}"></script> <script src="{{ asset('vendor/scrolltofixed/jquery-scrolltofixed-min.js') }}"></script>
<script src="{{ asset('vendor/element-ui/2.15.6/js.js') }}"></script> <script src="{{ asset('vendor/element-ui/index.js') }}"></script>
<link rel="stylesheet" href="{{ asset('vendor/element-ui/2.15.6/css.css') }}"> <link rel="stylesheet" href="{{ asset('vendor/element-ui/index.css') }}">
@endpush @endpush
@section('content') @section('content')

6
webpack.mix.js vendored
View File

@ -26,7 +26,7 @@ mix.js('resources/beike/shop/fashion/js/app.js', 'public/build/beike/shop/fashio
*/ */
/* 如果开发新模版，编译需要开启下面代码, 将 themeFileName 的值修改为你的模版文件名 /* 如果开发新模版，编译需要开启下面代码, 将 themeFileName 的值修改为你的模版文件名
const themeFileName = 'Fashion2'; const themeFileName = 'Fashion';
const themeCode = themeFileName.toLowerCase(); const themeCode = themeFileName.toLowerCase();
// 拷贝模版 blade 文件 到 themes 目录下 // 拷贝模版 blade 文件 到 themes 目录下
@ -35,8 +35,8 @@ mix.copy(`plugins/${themeFileName}/Themes`, 'themes');
mix.sass(`plugins/${themeFileName}/Resources/beike/shop/${themeCode}/css/bootstrap/bootstrap.scss`, `public/build/beike/shop/${themeCode}/css/bootstrap.css`); mix.sass(`plugins/${themeFileName}/Resources/beike/shop/${themeCode}/css/bootstrap/bootstrap.scss`, `public/build/beike/shop/${themeCode}/css/bootstrap.css`);
mix.sass(`plugins/${themeFileName}/Resources/beike/shop/${themeCode}/css/app.scss`, `public/build/beike/shop/${themeCode}/css/app.css`); mix.sass(`plugins/${themeFileName}/Resources/beike/shop/${themeCode}/css/app.scss`, `public/build/beike/shop/${themeCode}/css/app.css`);
mix.js(`plugins/${themeFileName}/Resources/beike/shop/${themeCode}/js/app.js`, `public/build/beike/shop/${themeCode}/js/app.js`); mix.js(`plugins/${themeFileName}/Resources/beike/shop/${themeCode}/js/app.js`, `public/build/beike/shop/${themeCode}/js/app.js`);
*/
if (mix.inProduction()) { if (mix.inProduction()) {
mix.version(); mix.version();
} }
*/