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] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E8=B4=A6=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=20=E6=8F=90=E4=BA=A4=E8=AE=A2=E5=8D=95=20=E6=8C=89?=
 =?UTF-8?q?=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 ==
         // }