diff --git a/beike/Shop/Http/Requests/AddressRequest.php b/beike/Shop/Http/Requests/AddressRequest.php index 032ebdfe..8296d97d 100644 --- a/beike/Shop/Http/Requests/AddressRequest.php +++ b/beike/Shop/Http/Requests/AddressRequest.php @@ -25,7 +25,6 @@ class AddressRequest extends FormRequest { return [ 'name' => 'required|min:2|max:16', - 'phone' => 'required|min:6|max:16', 'country_id' => 'required|exists:countries,id', 'zone_id' => 'required|exists:zones,id', 'address_1' => 'required', @@ -36,7 +35,6 @@ class AddressRequest extends FormRequest { return [ 'name' => trans('address.name'), - 'phone' => trans('address.phone'), 'country_id' => trans('address.country_id'), 'zone_id' => trans('address.zone_id'), 'address_1' => trans('address.address_1'), diff --git a/resources/beike/shop/default/css/global.scss b/resources/beike/shop/default/css/global.scss index 52ea837a..bc3345a0 100644 --- a/resources/beike/shop/default/css/global.scss +++ b/resources/beike/shop/default/css/global.scss @@ -100,6 +100,7 @@ h1,h2,h3, h4, h5, h6, b, strong { img { max-width: 100%; + max-height: 100%; height: auto; } diff --git a/resources/beike/shop/default/css/page-account-address.scss b/resources/beike/shop/default/css/page-account-address.scss index 78f558eb..f1d9e547 100644 --- a/resources/beike/shop/default/css/page-account-address.scss +++ b/resources/beike/shop/default/css/page-account-address.scss @@ -12,14 +12,15 @@ body.page-account-address, body.page-checkout { .addresses-wrap { .item { position: relative; - padding: 14px 14px 14px 18px; + padding: 14px; margin-bottom: 1.3rem; - border: 1px solid #e8e8e8; - height: 130px; + border: 1px solid #e5e5e5; + height: 140px; cursor: pointer; @media (max-width: 768px) { - padding: 10px 10px 10px 14px; + padding: 10px; + height: auto; } &:hover { @@ -58,6 +59,7 @@ body.page-account-address, body.page-checkout { .zipcode { margin-bottom: .3rem; + min-height: 20px; } .address-info { @@ -67,13 +69,11 @@ body.page-account-address, body.page-checkout { } .address-bottom { + min-height: 28px; display: flex; align-items: center; // flex-start | center justify-content: space-between; // flex-end | center | space-between // flex-wrap: wrap; - a { - color: #2d68a8; - } } } } diff --git a/resources/beike/shop/default/css/page-checkout.scss b/resources/beike/shop/default/css/page-checkout.scss index 48272ea9..bd1efce2 100644 --- a/resources/beike/shop/default/css/page-checkout.scss +++ b/resources/beike/shop/default/css/page-checkout.scss @@ -170,9 +170,8 @@ body.page-checkout, body.page-bk-stripe { align-items: center; // flex-start | center padding-right: 4px; - img { - width: 40px; - margin-right: 10px; + .img { + flex: 0 0 40px; } .quantity { diff --git a/resources/lang/en/shop/account.php b/resources/lang/en/shop/account.php index 89fb68b2..83dda6b7 100644 --- a/resources/lang/en/shop/account.php +++ b/resources/lang/en/shop/account.php @@ -100,7 +100,7 @@ return [ 'addresses' => [ 'index' => 'Addresses', 'add_address' => 'Add New Address', - 'default_address' => 'Default Address', + 'default_address' => 'Default', 'delete' => 'Delete', 'edit' => 'Edit', 'enter_name' => 'Please type in your name', diff --git a/resources/lang/zh_cn/shop/account.php b/resources/lang/zh_cn/shop/account.php index b3518e3a..6ef60e53 100644 --- a/resources/lang/zh_cn/shop/account.php +++ b/resources/lang/zh_cn/shop/account.php @@ -37,7 +37,7 @@ return [ 'index' => '修改个人信息', 'modify_avatar' => '修改头像', 'suggest' => '上传JPG或PNG图片。建议300 x 300。', - 'name' => '名称', + 'name' => '昵称', 'email' => '邮箱', 'crop' => '裁剪', 'password_edit_success' => '密码修改成功', @@ -48,7 +48,7 @@ return [ 'index' => '我的收藏', 'product' => '商品', 'price' => '价格', - 'check_details' => '查看详情', + 'check_details' => '查看', ], 'order' => [ diff --git a/themes/default/account/address.blade.php b/themes/default/account/address.blade.php index d2bfcda8..062e1535 100644 --- a/themes/default/account/address.blade.php +++ b/themes/default/account/address.blade.php @@ -19,27 +19,27 @@