From 0bcdc4e2220f0f5a4e4ccd63df3da2ccf69f619d Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 18 Aug 2022 15:45:44 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E8=B4=A6?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E6=8F=90=E4=BA=A4=E8=AE=A2=E5=8D=95=20?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/default/account/account.blade.php | 2 +-
 themes/default/checkout.blade.php        | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/themes/default/account/account.blade.php b/themes/default/account/account.blade.php
index a4d4bda0..ddcab493 100644
--- a/themes/default/account/account.blade.php
+++ b/themes/default/account/account.blade.php
@@ -54,7 +54,7 @@
                   class="text-muted">{{ __('shop/account.after_sales') }}</span></a>
             </div>
             <div class="order-wrap">
-              @if (!$latest_orders)
+              @if (!count($latest_orders))
                 <div class="no-order d-flex flex-column align-items-center">
                   <div class="icon mb-2"><i class="iconfont">&#xe60b;</i></div>
                   <div class="text mb-3 text-muted">{{ __('shop/account.no_order') }}<a href="">{{ __('shop/account.to_buy') }}</a></div>
diff --git a/themes/default/checkout.blade.php b/themes/default/checkout.blade.php
index 075cf798..f002c309 100644
--- a/themes/default/checkout.blade.php
+++ b/themes/default/checkout.blade.php
@@ -107,7 +107,7 @@
               @endforeach
             </ul>
             <div class="d-grid gap-2 mt-3">
-              <button class="btn btn-primary" type="button" @click="checkedBtnCheckoutConfirm">提交订单</button>
+              <button class="btn btn-primary" type="button" :disabled="!isSubmit" @click="checkedBtnCheckoutConfirm">提交订单</button>
             </div>
           </div>
         </div>
@@ -168,6 +168,10 @@
 
       // 计算属性
       computed: {
+        isSubmit() {
+          // source.addresses.length > 0 && source.payment_methods.length > 0 && source.shipping_methods.length > 0
+          return this.source.addresses.length > 0 && this.source.payment_methods.length > 0 && this.source.shipping_methods.length > 0;
+        },
         // isAddress: {
         //   this.form.shipping_address_id ==
         // }

From 0f27656ec095abcf0fba1a4dcad4307a5af40cf4 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 18 Aug 2022 15:56:09 +0800
Subject: [PATCH 02/13] https://guangdagit.com/beike/beikeshop/issues/114

---
 .../beike/admin/views/pages/customers/form.blade.php      | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/resources/beike/admin/views/pages/customers/form.blade.php b/resources/beike/admin/views/pages/customers/form.blade.php
index cfab7651..cb92cc15 100644
--- a/resources/beike/admin/views/pages/customers/form.blade.php
+++ b/resources/beike/admin/views/pages/customers/form.blade.php
@@ -41,18 +41,16 @@
                   <th>#</th>
                   <th>名称</th>
                   <th>电话</th>
-                  <th>注册来源</th>
-                  <th>状态</th>
+                  <th>创建时间</th>
                   <th>操作</th>
                 </tr>
               </thead>
               <tbody v-if="addresses.length">
                 <tr v-for="address, index in addresses" :key="index">
-                  <td>@{{ index }}</td>
+                  <td>@{{ index + 1}}</td>
                   <td>@{{ address.name }}</td>
                   <td>@{{ address.phone }}</td>
-                  <td>222</td>
-                  <td>222</td>
+                  <td>@{{ address.created_at }}</td>
                   <td>
                     <button class="btn btn-outline-secondary btn-sm" type="button"
                       @click="editAddress(index)">编辑</button>

From 6cbecf90e6b76bf2e14b99b5c5257159dc0a90bf Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 18 Aug 2022 15:59:02 +0800
Subject: [PATCH 03/13] https://guangdagit.com/beike/beikeshop/issues/112

---
 resources/beike/admin/views/pages/customers/form.blade.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/beike/admin/views/pages/customers/form.blade.php b/resources/beike/admin/views/pages/customers/form.blade.php
index cb92cc15..4e946271 100644
--- a/resources/beike/admin/views/pages/customers/form.blade.php
+++ b/resources/beike/admin/views/pages/customers/form.blade.php
@@ -281,6 +281,8 @@
 
         closeAddressDialog(form) {
           this.$refs[form].resetFields();
+          Object.keys(this.dialogAddress.form).forEach(key => this.dialogAddress.form[key] = '')
+          this.dialogAddress.form.country_id = @json((int)system_setting('base.country_id'));
           this.dialogAddress.show = false
           this.dialogAddress.index = null;
         },

From 822df952900d1f971fe3c532cfda87129b3bf99a Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 18 Aug 2022 16:08:20 +0800
Subject: [PATCH 04/13] https://guangdagit.com/beike/beikeshop/issues/104

---
 .../components/account/sidebar.blade.php      | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/themes/default/components/account/sidebar.blade.php b/themes/default/components/account/sidebar.blade.php
index ebfd7adc..78bbe6b1 100644
--- a/themes/default/components/account/sidebar.blade.php
+++ b/themes/default/components/account/sidebar.blade.php
@@ -5,18 +5,25 @@
       <div class="account-name">{{ $customer->name }}</div>
       <div class="account-email">{{ $customer->email }}</div>
     </div>
+
     <nav class="list-group account-links">
-      <a class="list-group-item d-flex justify-content-between align-items-center active" href="{{ shop_route('account.index') }}">
+      <a class="list-group-item d-flex justify-content-between align-items-center {{ equal_route('shop.account.index') ? 'active' : '' }}"
+        href="{{ shop_route('account.index') }}">
         <span>{{ __('shop/account.index') }}</span></a>
-      <a class="list-group-item d-flex justify-content-between align-items-center" href="{{ shop_route('account.edit.index') }}">
+      <a class="list-group-item d-flex justify-content-between align-items-center {{ equal_route('shop.account.edit.index') ? 'active' : '' }}"
+        href="{{ shop_route('account.edit.index') }}">
         <span>修改个人信息</span></a>
-      <a class="list-group-item d-flex justify-content-between align-items-center" href="{{ shop_route('account.order.index') }}">
+      <a class="list-group-item d-flex justify-content-between align-items-center {{ equal_route('shop.account.order.index') || equal_route('shop.account.order.show') ? 'active' : '' }}"
+        href="{{ shop_route('account.order.index') }}">
         <span>我的订单</span></a>
-      <a class="list-group-item d-flex justify-content-between align-items-center" href="{{ shop_route('account.addresses.index') }}">
+      <a class="list-group-item d-flex justify-content-between align-items-center {{ equal_route('shop.account.addresses.index') ? 'active' : '' }}"
+        href="{{ shop_route('account.addresses.index') }}">
         <span>我的地址</span></a>
-      <a class="list-group-item d-flex justify-content-between align-items-center" href="{{ shop_route('account.wishlist.index') }}">
+      <a class="list-group-item d-flex justify-content-between align-items-center {{ equal_route('shop.account.wishlist.index') ? 'active' : '' }}"
+        href="{{ shop_route('account.wishlist.index') }}">
         <span>我的收藏</span></a>
-      <a class="list-group-item d-flex justify-content-between align-items-center" href="{{ shop_route('account.rma.index') }}">
+      <a class="list-group-item d-flex justify-content-between align-items-center {{ equal_route('shop.account.rma.index') || equal_route('shop.account.rma.show') ? 'active' : '' }}"
+        href="{{ shop_route('account.rma.index') }}">
         <span>我的售后</span></a>
       <a class="list-group-item d-flex justify-content-between align-items-center" href="{{ shop_route('logout') }}">
         <span>退出登录</span></a>

From 4835250392d0498f4a637863b8a084b5314571f1 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 18 Aug 2022 16:09:38 +0800
Subject: [PATCH 05/13] https://guangdagit.com/beike/beikeshop/issues/103

---
 resources/beike/admin/views/pages/orders/form.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/beike/admin/views/pages/orders/form.blade.php b/resources/beike/admin/views/pages/orders/form.blade.php
index 6e00db22..68f5f248 100644
--- a/resources/beike/admin/views/pages/orders/form.blade.php
+++ b/resources/beike/admin/views/pages/orders/form.blade.php
@@ -162,7 +162,7 @@
         },
 
         rules: {
-          status: [{required: true, message: '请输入用户名', trigger: 'blur'}, ],
+          status: [{required: true, message: '请选择状态', trigger: 'blur'}, ],
         }
       },
 

From 2aeba25590cb00efbf5005f7e1cc216a400e5708 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Thu, 18 Aug 2022 16:10:06 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Repositories/CartRepo.php               |  8 ++---
 beike/Repositories/PluginRepo.php             | 26 ++++++++++++++++
 .../Http/Controllers/CheckoutController.php   |  6 +---
 beike/Shop/Services/CartService.php           | 10 ++++--
 beike/Shop/Services/CheckoutService.php       | 31 +++++++++++++++++++
 5 files changed, 70 insertions(+), 11 deletions(-)

diff --git a/beike/Repositories/CartRepo.php b/beike/Repositories/CartRepo.php
index fed1576d..716c4741 100644
--- a/beike/Repositories/CartRepo.php
+++ b/beike/Repositories/CartRepo.php
@@ -42,15 +42,15 @@ class CartRepo
             $cart = Cart::query()->create([
                 'customer_id' => $customerId,
                 'shipping_address_id' => $defaultAddressId,
-                'shipping_method_code' => $shippingMethod->code,
+                'shipping_method_code' => $shippingMethod->code ?? '',
                 'payment_address_id' => $defaultAddressId,
-                'payment_method_code' => $paymentMethod->code
+                'payment_method_code' => $paymentMethod->code ?? ''
             ]);
         } else {
-            if ($cart->shipping_address_id == 0) {
+            if ($cart->shipping_address_id == 0 || empty(AddressRepo::find($cart->shipping_address_id))) {
                 $cart->shipping_address_id = $defaultAddressId;
             }
-            if ($cart->payment_address_id == 0) {
+            if ($cart->payment_address_id == 0 || empty(AddressRepo::find($cart->payment_address_id))) {
                 $cart->payment_address_id = $defaultAddressId;
             }
             $cart->save();
diff --git a/beike/Repositories/PluginRepo.php b/beike/Repositories/PluginRepo.php
index cfb48915..30946e39 100644
--- a/beike/Repositories/PluginRepo.php
+++ b/beike/Repositories/PluginRepo.php
@@ -157,4 +157,30 @@ class PluginRepo
             return $plugin && $plugin->getEnabled();
         });
     }
+
+
+    /**
+     * 检测对应配送方式是否可用
+     *
+     * @param $code
+     * @return bool
+     */
+    public static function shippingEnabled($code): bool
+    {
+        $shippingMethods = self::getShippingMethods();
+        return $shippingMethods->where('code', $code)->count() > 0;
+    }
+
+
+    /**
+     * 检测对应支付方式是否可用
+     *
+     * @param $code
+     * @return bool
+     */
+    public static function paymentEnabled($code): bool
+    {
+        $paymentMethods = self::getPaymentMethods();
+        return $paymentMethods->where('code', $code)->count() > 0;
+    }
 }
diff --git a/beike/Shop/Http/Controllers/CheckoutController.php b/beike/Shop/Http/Controllers/CheckoutController.php
index 09d3e3a8..0794cdd0 100644
--- a/beike/Shop/Http/Controllers/CheckoutController.php
+++ b/beike/Shop/Http/Controllers/CheckoutController.php
@@ -53,10 +53,6 @@ class CheckoutController extends Controller
      */
     public function confirm()
     {
-        try {
-            return (new CheckoutService)->confirm();
-        } catch (\Exception $e) {
-            return json_fail($e->getMessage());
-        }
+        return (new CheckoutService)->confirm();
     }
 }
diff --git a/beike/Shop/Services/CartService.php b/beike/Shop/Services/CartService.php
index 35698434..722c600d 100644
--- a/beike/Shop/Services/CartService.php
+++ b/beike/Shop/Services/CartService.php
@@ -11,9 +11,9 @@
 
 namespace Beike\Shop\Services;
 
-use Beike\Repositories\CartRepo;
 use Exception;
 use Beike\Models\CartProduct;
+use Beike\Repositories\CartRepo;
 use Beike\Shop\Http\Resources\CartDetail;
 
 class CartService
@@ -116,6 +116,12 @@ class CartService
     }
 
 
+    /**
+     * 删除购物车商品
+     *
+     * @param $customer
+     * @param $cartId
+     */
     public static function delete($customer, $cartId)
     {
         if (empty($cartId)) {
@@ -149,6 +155,6 @@ class CartService
             'amount' => $amount,
             'amount_format' => currency_format($amount),
         ];
-        return $data;
+        return hook_filter('cart.data', $data);
     }
 }
diff --git a/beike/Shop/Services/CheckoutService.php b/beike/Shop/Services/CheckoutService.php
index 922d5db3..e1a8b6e7 100644
--- a/beike/Shop/Services/CheckoutService.php
+++ b/beike/Shop/Services/CheckoutService.php
@@ -12,6 +12,7 @@
 namespace Beike\Shop\Services;
 
 use Beike\Models\Order;
+use Beike\Models\Address;
 use Beike\Models\Customer;
 use Beike\Repositories\CartRepo;
 use Beike\Repositories\OrderRepo;
@@ -88,6 +89,7 @@ class CheckoutService
         $customer = current_customer();
         $checkoutData = self::checkoutData();
         $checkoutData['customer'] = $customer;
+        $this->validateConfirm($checkoutData);
 
         try {
             DB::beginTransaction();
@@ -102,6 +104,35 @@ class CheckoutService
     }
 
 
+    /**
+     * @throws \Exception
+     */
+    private function validateConfirm($checkoutData)
+    {
+        $current = $checkoutData['current'];
+
+        $shippingAddressId = $current['shipping_address_id'];
+        if (empty(Address::query()->find($shippingAddressId))) {
+            throw new \Exception('配送地址无效');
+        }
+
+        $paymentAddressId = $current['payment_address_id'];
+        if (empty(Address::query()->find($paymentAddressId))) {
+            throw new \Exception('账单地址无效');
+        }
+
+        $shippingMethodCode = $current['shipping_method_code'];
+        if (!PluginRepo::shippingEnabled($shippingMethodCode)) {
+            throw new \Exception('配送方式不可用');
+        }
+
+        $paymentMethodCode = $current['payment_method_code'];
+        if (!PluginRepo::paymentEnabled($paymentMethodCode)) {
+            throw new \Exception('支付方式不可用');
+        }
+    }
+
+
     private function updateShippingAddressId($shippingAddressId)
     {
         $this->cart->update(['shipping_address_id' => $shippingAddressId]);

From 773c01c4c586391b2cad27545ca53fa7a66dea40 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 18 Aug 2022 16:11:13 +0800
Subject: [PATCH 07/13] https://guangdagit.com/beike/beikeshop/issues/59

---
 .../beike/admin/views/pages/currencies/index.blade.php      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/beike/admin/views/pages/currencies/index.blade.php b/resources/beike/admin/views/pages/currencies/index.blade.php
index 02f18feb..54737ad1 100644
--- a/resources/beike/admin/views/pages/currencies/index.blade.php
+++ b/resources/beike/admin/views/pages/currencies/index.blade.php
@@ -59,15 +59,15 @@
         </el-form-item>
 
         <el-form-item label="右符号">
-          <el-input v-model="dialog.form.symbol_right" placeholder="左符号"></el-input>
+          <el-input v-model="dialog.form.symbol_right" placeholder="右符号"></el-input>
         </el-form-item>
 
         <el-form-item label="小数位数" prop="decimal_place">
-          <el-input v-model="dialog.form.decimal_place" placeholder="左符号"></el-input>
+          <el-input v-model="dialog.form.decimal_place" placeholder="小数位数"></el-input>
         </el-form-item>
 
         <el-form-item label="汇率值" prop="value">
-          <el-input v-model="dialog.form.value" placeholder="左符号"></el-input>
+          <el-input v-model="dialog.form.value" placeholder="汇率值"></el-input>
         </el-form-item>
 
         <el-form-item label=" 状态">

From c9ae8a56ecb79fce04af187b5fca3c06f0776033 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 18 Aug 2022 16:14:19 +0800
Subject: [PATCH 08/13] https://guangdagit.com/beike/beikeshop/issues/75

---
 resources/beike/admin/views/pages/customers/index.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/beike/admin/views/pages/customers/index.blade.php b/resources/beike/admin/views/pages/customers/index.blade.php
index d271aaf4..ce64bedb 100644
--- a/resources/beike/admin/views/pages/customers/index.blade.php
+++ b/resources/beike/admin/views/pages/customers/index.blade.php
@@ -143,7 +143,7 @@
 
             $http.post('customers', this.dialogCustomers.form).then((res) => {
               this.$message.success(res.message);
-              this.customers.push(res.data);
+              this.loadData();// this.customers.data.push(res.data);
               this.dialogCustomers.show = false
             })
           });

From 76475832e093f1b94b2b3b8d30ec404586d8c5f5 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Thu, 18 Aug 2022 16:18:37 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E6=8F=92=E4=BB=B6=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=AF=AD=E8=A8=80=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/lang/en/admin/plugin.php    | 2 +-
 resources/lang/zh_cn/admin/plugin.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/en/admin/plugin.php b/resources/lang/en/admin/plugin.php
index c838e64e..0be4469c 100644
--- a/resources/lang/en/admin/plugin.php
+++ b/resources/lang/en/admin/plugin.php
@@ -14,7 +14,7 @@ return [
     'plugins_import' => 'Import',
     'plugins_show' => 'Detail',
     'plugins_update' => 'Update',
-    'plugins_update_status' => 'Delete',
+    'plugins_update_status' => 'Update Status',
     'plugins_install' => 'Install',
     'plugins_uninstall' => 'Uninstall',
 
diff --git a/resources/lang/zh_cn/admin/plugin.php b/resources/lang/zh_cn/admin/plugin.php
index 02a388d8..29d9c69e 100644
--- a/resources/lang/zh_cn/admin/plugin.php
+++ b/resources/lang/zh_cn/admin/plugin.php
@@ -14,7 +14,7 @@ return [
     'plugins_import' => '上传插件',
     'plugins_show' => '插件详情',
     'plugins_update' => '插件更新',
-    'plugins_update_status' => '删除插件',
+    'plugins_update_status' => '更新状态',
     'plugins_install' => '安装',
     'plugins_uninstall' => '卸载',
 

From 83bda1760b10a6440a34cb5074d26ccea942690d Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 18 Aug 2022 16:21:15 +0800
Subject: [PATCH 10/13] https://guangdagit.com/beike/beikeshop/issues/123

---
 resources/beike/admin/views/pages/plugins/index.blade.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/resources/beike/admin/views/pages/plugins/index.blade.php b/resources/beike/admin/views/pages/plugins/index.blade.php
index c42b2ae7..5296a811 100644
--- a/resources/beike/admin/views/pages/plugins/index.blade.php
+++ b/resources/beike/admin/views/pages/plugins/index.blade.php
@@ -41,7 +41,7 @@
                 </div>
               </td>
               <td>
-                <el-switch :disabled="!plugin.installed" v-model="plugin.status" @change="(e) => {pluginStatusChange(e, plugin.code)}"></el-switch>
+                <el-switch :disabled="!plugin.installed" v-model="plugin.status" @change="(e) => {pluginStatusChange(e, plugin.code, index)}"></el-switch>
               </td>
               <td>
                 <div v-if="plugin.installed">
@@ -74,12 +74,14 @@
       },
 
       methods: {
-        pluginStatusChange(e, code) {
+        pluginStatusChange(e, code, index) {
           const self = this;
 
           $http.put(`plugins/${code}/status`, {status: e * 1}).then((res) => {
             layer.msg(res.message)
-          })
+          }).catch((res) => {
+            this.plugins[index].status = !this.plugins[index].status;
+          });
         },
 
         uploadFile(file) {

From 8259973dc4e98ca9aeb8499b8973da80efd8ba8c Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Thu, 18 Aug 2022 16:22:54 +0800
Subject: [PATCH 11/13] fixed order complete
 https://guangdagit.com/beike/beikeshop/issues/118

---
 beike/Shop/Http/Controllers/Account/OrderController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/beike/Shop/Http/Controllers/Account/OrderController.php b/beike/Shop/Http/Controllers/Account/OrderController.php
index e1d49dc7..3969c274 100644
--- a/beike/Shop/Http/Controllers/Account/OrderController.php
+++ b/beike/Shop/Http/Controllers/Account/OrderController.php
@@ -96,6 +96,9 @@ class OrderController extends Controller
     {
         $customer = current_customer();
         $order = OrderRepo::getOrderByNumber($number, $customer);
+        if (empty($order)) {
+            throw new \Exception('无效的订单');
+        }
         StateMachineService::getInstance($order)->changeStatus(StateMachineService::COMPLETED);
         return json_success(trans('shop/account.order_completed'));
     }

From 7b4c1ab407c1ddde16838bab70a90cf865bded1b Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 18 Aug 2022 16:24:34 +0800
Subject: [PATCH 12/13] https://guangdagit.com/beike/beikeshop/issues/118

---
 themes/default/account/order_info.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/default/account/order_info.blade.php b/themes/default/account/order_info.blade.php
index 6a964188..7b425d32 100644
--- a/themes/default/account/order_info.blade.php
+++ b/themes/default/account/order_info.blade.php
@@ -144,7 +144,7 @@
 @push('add-scripts')
 <script>
   $('.shipped-ed').click(function(event) {
-    $http.post('orders/{{ $order->id }}/complete').then((res) => {
+    $http.post('orders/{{ $order->number }}/complete').then((res) => {
       layer.msg(res.message)
       window.location.reload()
     })

From b95cffb9ff74bb84dccfa7932447dabe79705ec5 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 18 Aug 2022 16:27:20 +0800
Subject: [PATCH 13/13] https://guangdagit.com/beike/beikeshop/issues/82

---
 resources/beike/admin/views/pages/setting.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/beike/admin/views/pages/setting.blade.php b/resources/beike/admin/views/pages/setting.blade.php
index 6279c34d..eca344ad 100644
--- a/resources/beike/admin/views/pages/setting.blade.php
+++ b/resources/beike/admin/views/pages/setting.blade.php
@@ -83,7 +83,7 @@
               <div class="help-text font-size-12 lh-base">网站前台显示 380*100</div>
             </x-admin-form-image>
 
-            <x-admin-form-image name="favicon" title="favicon" :value="old('web_icon', system_setting('base.web_icon', ''))">
+            <x-admin-form-image name="favicon" title="favicon" :value="old('favicon', system_setting('base.favicon', ''))">
               <div class="help-text font-size-12 lh-base">显示在浏览器选项卡上的小图标，必须为PNG格式大小为：32*32</div>
             </x-admin-form-image>