diff --git a/public/build/beike/shop/default/css/app.css b/public/build/beike/shop/default/css/app.css
index 93c073c8..31f252c8 100644
--- a/public/build/beike/shop/default/css/app.css
+++ b/public/build/beike/shop/default/css/app.css
@@ -1285,6 +1285,19 @@ body.page-account-address .addresses-wrap .item .address-bottom, body.page-check
body.page-account-address .addresses-wrap .item .address-bottom a, body.page-checkout .addresses-wrap .item .address-bottom a {
color: #2d68a8;
}
+@media (max-width: 768px) {
+ body.page-account-address .dialog-margin, body.page-checkout .dialog-margin {
+ margin-top: 10px;
+ }
+}
+body.page-account-address .dialog-address, body.page-checkout .dialog-address {
+ display: block;
+}
+@media (min-width: 768px) {
+ body.page-account-address .dialog-address, body.page-checkout .dialog-address {
+ display: flex;
+ }
+}
body.page-list .brand-item {
display: flex;
@@ -1312,6 +1325,7 @@ body.page-list .curser > li > a {
display: block;
color: #242424;
transition: all 0.5s;
+ margin: 0 auto;
}
body.page-list .curser > li > a:hover {
text-decoration: none;
diff --git a/resources/beike/shop/default/css/page-account-address.scss b/resources/beike/shop/default/css/page-account-address.scss
index 4672887c..c54744dd 100644
--- a/resources/beike/shop/default/css/page-account-address.scss
+++ b/resources/beike/shop/default/css/page-account-address.scss
@@ -70,4 +70,23 @@ body.page-account-address, body.page-checkout {
}
}
+ // .dialog-width {
+ // margin: 0 auto;
+ // width: 90%;
+ // }
+
+ .dialog-margin {
+ @media (max-width:768px) {
+ margin-top: 10px;
+ }
+
+ }
+ .dialog-address {
+ display: block;
+
+ @media (min-width:768px) {
+ display: flex;
+ }
+ }
+
}
\ No newline at end of file
diff --git a/resources/beike/shop/default/css/page-list.scss b/resources/beike/shop/default/css/page-list.scss
index 855be12a..3fc3ed92 100644
--- a/resources/beike/shop/default/css/page-list.scss
+++ b/resources/beike/shop/default/css/page-list.scss
@@ -17,6 +17,7 @@ body.page-list {
li {
list-style: none;
+
a{
color: #242424;
text-decoration: none;
@@ -30,6 +31,8 @@ body.page-list {
display: block;
color: #242424;
transition: all .5s;
+ margin: 0 auto;
+
&:hover {
text-decoration: none;
background-color: #eee;
diff --git a/themes/default/account/address.blade.php b/themes/default/account/address.blade.php
index 49a38dae..4fcafd27 100644
--- a/themes/default/account/address.blade.php
+++ b/themes/default/account/address.blade.php
@@ -83,6 +83,9 @@
default: false,
},
+ dialogWidth:'600px',
+ dialogcol:'col-4',
+
addresses: @json($addresses ?? []),
source: {
@@ -101,6 +104,12 @@
// 实例被挂载后调用
mounted () {
+ this.setDialogWidth();
+ window.onresize = () => {
+ return (() => {
+ this.setDialogWidth()
+ })()
+ }
},
beforeMount () {
@@ -108,6 +117,17 @@
},
methods: {
+ setDialogWidth() {
+ var val = document.body.clientWidth
+ if (val < 768) {
+ this.dialogWidth = '360px'
+ this.dialogcol = 'col-12'
+ } else {
+ this.dialogWidth = '600px'
+ this.dialogcol = 'col-4'
+ }
+ },
+
editAddress(index) {
if (typeof index == 'number') {
this.editIndex = index;
diff --git a/themes/default/brand/list.blade.php b/themes/default/brand/list.blade.php
index d88582ba..cf78cfaa 100644
--- a/themes/default/brand/list.blade.php
+++ b/themes/default/brand/list.blade.php
@@ -8,10 +8,10 @@
品牌列表
-
+
diff --git a/themes/default/layout/footer.blade.php b/themes/default/layout/footer.blade.php
index a5480296..eb786114 100644
--- a/themes/default/layout/footer.blade.php
+++ b/themes/default/layout/footer.blade.php
@@ -7,7 +7,7 @@
@foreach ($footer_content['services']['items'] as $item)
-
+
{{ $item['title'][locale()] ?? '' }}
diff --git a/themes/default/shared/address-form.blade.php b/themes/default/shared/address-form.blade.php
index 9a4596da..37601514 100644
--- a/themes/default/shared/address-form.blade.php
+++ b/themes/default/shared/address-form.blade.php
@@ -4,7 +4,7 @@
$address_form_rules = $address_form_rules ?? 'addressRules';
@endphp
-
+
@@ -13,8 +13,8 @@
-