From 42ba3a023677fc83fe925fd81881e58c9e2e2759 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Fri, 1 Jul 2022 14:08:04 +0800
Subject: [PATCH] wip

---
 beike/Shop/Services/CheckoutService.php       |  2 +-
 .../views/pages/customers/form.blade.php      |  2 +-
 .../admin/views/pages/plugins/index.blade.php | 48 +++++++++----------
 themes/default/checkout.blade.php             |  1 +
 4 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/beike/Shop/Services/CheckoutService.php b/beike/Shop/Services/CheckoutService.php
index 8087cc53..116bce7a 100644
--- a/beike/Shop/Services/CheckoutService.php
+++ b/beike/Shop/Services/CheckoutService.php
@@ -32,7 +32,7 @@ class CheckoutService
             'addresses' => $addresses,
             'shipments' => $shipments,
             'country_id' => setting('country_id'),
-            'customer_id' => $customer->id,
+            'customer_id' => $customer->id ?? null,
             'countries' => CountryRepo::all(),
             'payments' => $payments,
             'carts' => $carts
diff --git a/resources/beike/admin/views/pages/customers/form.blade.php b/resources/beike/admin/views/pages/customers/form.blade.php
index 1dd22676..e3112ffa 100644
--- a/resources/beike/admin/views/pages/customers/form.blade.php
+++ b/resources/beike/admin/views/pages/customers/form.blade.php
@@ -3,7 +3,7 @@
 @section('title', '顾客管理')
 
 @section('content')
-  <div id="customer-app-form" class="card">
+  <div id="customer-app-form" class="card" v-cloak>
     <div class="card-body">
       <el-form :model="form" :rules="rules" ref="form" label-width="100px">
         <el-tabs v-model="customerTab">
diff --git a/resources/beike/admin/views/pages/plugins/index.blade.php b/resources/beike/admin/views/pages/plugins/index.blade.php
index b0969236..d335b4f1 100644
--- a/resources/beike/admin/views/pages/plugins/index.blade.php
+++ b/resources/beike/admin/views/pages/plugins/index.blade.php
@@ -4,7 +4,7 @@
 
 @section('content')
 
-  <div id="plugins-app" class="card">
+  <div id="plugins-app" class="card" v-cloak>
     <div class="card-body">
       <a href="{{ admin_route('categories.create') }}" class="btn btn-primary">创建插件</a>
       <div class="mt-4" style="">
@@ -19,31 +19,29 @@
             </tr>
           </thead>
           <tbody>
-            @foreach ($plugins as $plugin)
-              <tr v-for="plugin, index in plugins" :key="index" v-if="plugins.length">
-                <td>{{ $plugin->code }}</td>
-                <td>{{ $plugin->type }}</td>
-                <td>
-                  <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>
-                      <h6>{{ $plugin->name }}</h6>
-                      <div class="">{!! $plugin->description !!}</div>
-                    </div>
+            <tr v-for="plugin, index in plugins" :key="index" v-if="plugins.length">
+              <td>@{{ plugin->code }}</td>
+              <td>@{{ plugin->type }}</td>
+              <td>
+                <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>
+                    <h6>@{{ plugin->name }}</h6>
+                    <div class="" v-html="plugin->description"></div>
                   </div>
-                </td>
-                <td>
-                  <div class="form-check form-switch">
-                    <input class="form-check-input" type="checkbox" role="switch" id="switch-1"
-                      {{ $plugin->getEnabled() ? 'checked' : '' }} data-code="{{ $plugin->code }}">
-                    <label class="form-check-label" for="switch-1"></label>
-                  </div>
-                </td>
-                <td>
-                  <a class="btn btn-outline-secondary btn-sm" href="{{ $plugin->getEditUrl() }}">编辑</a>
-                </td>
-              </tr>
-            @endforeach
+                </div>
+              </td>
+              <td>
+{{--                 <div class="form-check form-switch">
+                  <input class="form-check-input" type="checkbox" role="switch" id="switch-1"
+                    @{{ plugin->getEnabled() ? 'checked' : '' }} data-code="@{{ plugin->code }}">
+                  <label class="form-check-label" for="switch-1"></label>
+                </div> --}}
+              </td>
+              <td>
+                <a class="btn btn-outline-secondary btn-sm" href="">编辑</a>
+              </td>
+            </tr>
           </tbody>
         </table>
       </div>
diff --git a/themes/default/checkout.blade.php b/themes/default/checkout.blade.php
index 1df710eb..d10d3d6e 100644
--- a/themes/default/checkout.blade.php
+++ b/themes/default/checkout.blade.php
@@ -207,6 +207,7 @@
             })
           }
 
+          this.countryChange(this.dialogAddress.form.country_id);
           this.dialogAddress.show = true
         },