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

wip

This commit is contained in:
pushuo 2022-07-01 14:08:04 +08:00
parent dd650e4fdc
commit 42ba3a0236
4 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
beike/Shop/Services/CheckoutService.php
View File

@ -32,7 +32,7 @@ class CheckoutService
'addresses' => $addresses, 'addresses' => $addresses,
'shipments' => $shipments, 'shipments' => $shipments,
'country_id' => setting('country_id'), 'country_id' => setting('country_id'),
'customer_id' => $customer->id, 'customer_id' => $customer->id ?? null,
'countries' => CountryRepo::all(), 'countries' => CountryRepo::all(),
'payments' => $payments, 'payments' => $payments,
'carts' => $carts 'carts' => $carts

2
resources/beike/admin/views/pages/customers/form.blade.php
View File

@ -3,7 +3,7 @@
@section('title', '顾客管理') @section('title', '顾客管理')
@section('content') @section('content')
<div id="customer-app-form" class="card"> <div id="customer-app-form" class="card" v-cloak>
<div class="card-body"> <div class="card-body">
<el-form :model="form" :rules="rules" ref="form" label-width="100px"> <el-form :model="form" :rules="rules" ref="form" label-width="100px">
<el-tabs v-model="customerTab"> <el-tabs v-model="customerTab">

48
resources/beike/admin/views/pages/plugins/index.blade.php
View File

@ -4,7 +4,7 @@
@section('content') @section('content')
<div id="plugins-app" class="card"> <div id="plugins-app" class="card" v-cloak>
<div class="card-body"> <div class="card-body">
<a href="{{ admin_route('categories.create') }}" class="btn btn-primary">创建插件</a> <a href="{{ admin_route('categories.create') }}" class="btn btn-primary">创建插件</a>
<div class="mt-4" style=""> <div class="mt-4" style="">
@ -19,31 +19,29 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach ($plugins as $plugin) <tr v-for="plugin, index in plugins" :key="index" v-if="plugins.length">
<tr v-for="plugin, index in plugins" :key="index" v-if="plugins.length"> <td>@{{ plugin->code }}</td>
<td>{{ $plugin->code }}</td> <td>@{{ plugin->type }}</td>
<td>{{ $plugin->type }}</td> <td>
<td> <div class="plugin-describe d-flex align-items-center">
<div class="plugin-describe d-flex align-items-center"> <div class="me-2" style="width: 50px;"><img src="@{{ plugin->icon }}" class="img-fluid"></div>
<div class="me-2" style="width: 50px;"><img src="{{ $plugin->icon }}" class="img-fluid"></div> <div>
<div> <h6>@{{ plugin->name }}</h6>
<h6>{{ $plugin->name }}</h6> <div class="" v-html="plugin->description"></div>
<div class="">{!! $plugin->description !!}</div>
</div>
</div> </div>
</td> </div>
<td> </td>
<div class="form-check form-switch"> <td>
<input class="form-check-input" type="checkbox" role="switch" id="switch-1" {{-- <div class="form-check form-switch">
{{ $plugin->getEnabled() ? 'checked' : '' }} data-code="{{ $plugin->code }}"> <input class="form-check-input" type="checkbox" role="switch" id="switch-1"
<label class="form-check-label" for="switch-1"></label> @{{ plugin->getEnabled() ? 'checked' : '' }} data-code="@{{ plugin->code }}">
</div> <label class="form-check-label" for="switch-1"></label>
</td> </div> --}}
<td> </td>
<a class="btn btn-outline-secondary btn-sm" href="{{ $plugin->getEditUrl() }}">编辑</a> <td>
</td> <a class="btn btn-outline-secondary btn-sm" href="">编辑</a>
</tr> </td>
@endforeach </tr>
</tbody> </tbody>
</table> </table>
</div> </div>

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

@ -207,6 +207,7 @@
}) })
} }
this.countryChange(this.dialogAddress.form.country_id);
this.dialogAddress.show = true this.dialogAddress.show = true
}, },