From eebaabe7d9e5b74797e33cf4b5dfda02c98ebd33 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Tue, 5 Jul 2022 10:48:37 +0800
Subject: [PATCH] wip

---
 public/build/beike/shop/default/css/app.css         | 3 ++-
 resources/beike/shop/default/css/page-checkout.scss | 4 +++-
 themes/default/checkout.blade.php                   | 8 ++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/public/build/beike/shop/default/css/app.css b/public/build/beike/shop/default/css/app.css
index 44776171..27c2b326 100644
--- a/public/build/beike/shop/default/css/app.css
+++ b/public/build/beike/shop/default/css/app.css
@@ -630,7 +630,8 @@ body.page-checkout .addresses-wrap .item .zipcode {
   margin-bottom: 0.3rem;
 }
 body.page-checkout .addresses-wrap .item .address-info {
-  margin-bottom: 0.9rem;
+  height: 32px;
+  line-height: 1.3;
 }
 body.page-checkout .addresses-wrap .item .address-bottom {
   display: flex;
diff --git a/resources/beike/shop/default/css/page-checkout.scss b/resources/beike/shop/default/css/page-checkout.scss
index 27ce3c70..1a78b4c1 100644
--- a/resources/beike/shop/default/css/page-checkout.scss
+++ b/resources/beike/shop/default/css/page-checkout.scss
@@ -181,7 +181,9 @@ body.page-checkout {
       }
 
       .address-info {
-        margin-bottom: .9rem;
+        // margin-bottom: .9rem;
+        height: 32px;
+        line-height: 1.3;
       }
 
       .address-bottom {
diff --git a/themes/default/checkout.blade.php b/themes/default/checkout.blade.php
index 4042e325..1e603590 100644
--- a/themes/default/checkout.blade.php
+++ b/themes/default/checkout.blade.php
@@ -145,8 +145,8 @@
               </el-form-item>
             </div>
             <div class="col-4">
-              <el-form-item prop="city_id">
-                <el-input v-model="dialogAddress.form.city_id" placeholder="输入 city"></el-input>
+              <el-form-item prop="city">
+                <el-input v-model="dialogAddress.form.city" placeholder="输入 city"></el-input>
               </el-form-item>
             </div>
           </div>
@@ -199,7 +199,7 @@
             country_id: @json($country_id),
             zipcode: '',
             zone_id: '',
-            city_id: '',
+            city: '',
             address_1: '',
             address_2: '',
           }
@@ -210,7 +210,7 @@
           phone: [{required: true, message: '请输入联系电话', trigger: 'blur'}, ],
           address_1: [{required: true, message: '请输入详细地址 1', trigger: 'blur'}, ],
           zone_id: [{required: true, message: '请选择省份', trigger: 'blur'}, ],
-          city_id: [{required: true, message: '请填写 city', trigger: 'blur'}, ],
+          city: [{required: true, message: '请填写 city', trigger: 'blur'}, ],
         }
       },