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

优化后台系统设置快递公司必填判断等

This commit is contained in:
pushuo 2023-01-05 17:47:10 +08:00
parent 9dbc004044
commit 8384db4911
5 changed files with 54 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
resources/beike/admin/css/_bootstrap-extra.scss vendored
View File

@ -40,6 +40,20 @@ hr.horizontal.dark {
color: #6c757d;
border: none;
padding: 0 .2rem 0.7rem;
&.error-invalid {
color: #dc3545 !important;
font-weight: bold;
position: relative;
padding-left: 17px;
&:before {
content: '\F333';
left: 0;
top: 1px;
font-family: 'bootstrap-icons';
position: absolute;
}
}
&.active {
// color: $primary;

14
resources/beike/admin/css/_global.scss vendored
View File

@ -454,3 +454,17 @@ table.table thead th, .fw-bold, h1,h2,h3, h4, h5, h6, b, strong, .card .card-hea
.swal2-confirm:focus {
box-shadow: none !important;
}
.order-top-info {
table {
tr {
td:first-of-type {
width: 40%;
html[lang="zh_cn"] &, html[lang="zh_hk"] &, html[lang="en"] &, html[lang="ja"] & {
width: 90px;
}
}
}
}
}

9
resources/beike/admin/js/bootstrap-validation.js vendored
View File

@ -21,6 +21,15 @@ $(function () {
}
form.classList.add("was-validated");
// 如果错误输入框在 tab 页面，则高亮显示对应的选项卡
$('.invalid-feedback').each(function(index, el) {
if ($(el).css('display') == 'block' && $(el).parents('.tab-pane')) {
const id = $(el).parents('.tab-pane').prop('id');
$(`a[href="#${id}"], button[data-bs-target="#${id}"]`).addClass('error-invalid');
}
});
},
false
);

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

@ -5,13 +5,13 @@
@section('content')
<div class="card mb-4">
<div class="card-header"><h6 class="card-title">{{ __('admin/common.order') }}</h6></div>
<div class="card-body">
<div class="card-body order-top-info">
<div class="row">
<div class="col-lg-4 col-12">
<table class="table table-borderless">
<tbody>
<tr>
<td style="width: 40%">{{ __('order.number') }}：</td>
<td>{{ __('order.number') }}：</td>
<td>{{ $order->number }}</td>
</tr>
<tr>
@ -29,17 +29,17 @@
<table class="table table-borderless">
<tbody>
<tr>
<td style="width: 40%">{{ __('order.customer_name') }}：</td>
<td>{{ __('order.customer_name') }}：</td>
<td>{{ $order->customer_name }}</td>
</tr>
<tr>
<td>{{ __('common.email') }}：</td>
<td>{{ $order->email }}</td>
</tr>
<tr>
<td>{{ __('order.created_at') }}：</td>
<td>{{ $order->created_at }}</td>
</tr>
<tr>
<td>{{ __('order.updated_at') }}：</td>
<td>{{ $order->updated_at }}</td>
</tr>
</tbody>
</table>
</div>
@ -47,8 +47,8 @@
<table class="table table-borderless">
<tbody>
<tr>
<td style="width: 20%">{{ __('common.email') }}：</td>
<td>{{ $order->email }}</td>
<td>{{ __('order.updated_at') }}：</td>
<td>{{ $order->updated_at }}</td>
</tr>
</tbody>
</table>

10
resources/beike/admin/views/pages/setting.blade.php
View File

@ -117,8 +117,14 @@
<thead><th>{{ __('order.express_company') }}</th><th>Code</th><th></th></thead>
<tbody>
<tr v-for="item, index in express_company" :key="index">
<td><input type="text" :name="'express_company['+ index +'][name]'" v-model="item.name" class="form-control"></td>
<td><input type="text" :name="'express_company['+ index +'][code]'" v-model="item.code" class="form-control"></td>
<td>
<input required placeholder="{{ __('order.express_company') }}" type="text" :name="'express_company['+ index +'][name]'" v-model="item.name" class="form-control">
<div class="invalid-feedback">{{ __('common.error_required', ['name' => __('order.express_company')]) }}</div>
</td>
<td>
<input required placeholder="Code" type="text" :name="'express_company['+ index +'][code]'" v-model="item.code" class="form-control">
<div class="invalid-feedback">{{ __('common.error_required', ['name' => 'Code']) }}</div>
</td>
<td><i @click="express_company.splice(index, 1)" class="bi bi-x-circle fs-4 text-danger cursor-pointer"></i></td>
</tr>
<tr>