diff --git a/resources/beike/admin/views/pages/design/module/tab_product.blade.php b/resources/beike/admin/views/pages/design/module/tab_product.blade.php index a3a1aea8..19283b04 100644 --- a/resources/beike/admin/views/pages/design/module/tab_product.blade.php +++ b/resources/beike/admin/views/pages/design/module/tab_product.blade.php @@ -108,11 +108,12 @@ Vue.component('module-editor-tab-product', { tabsValueProductData() { var that = this; - if (!this.module.tabs[0].products.length) return; + if (!this.module.tabs[this.editableTabsValue].products.length) return; this.loading = true; $http.get('products/names?product_ids='+this.module.tabs[this.editableTabsValue].products.join(','), {hload: true}).then((res) => { this.loading = false; + this.module.tabs[this.editableTabsValue].products = res.data.map(e => e.id); that.productData = res.data; }) }, diff --git a/resources/beike/admin/views/pages/plugins/index.blade.php b/resources/beike/admin/views/pages/plugins/index.blade.php index 7aab0b08..128ba1cf 100644 --- a/resources/beike/admin/views/pages/plugins/index.blade.php +++ b/resources/beike/admin/views/pages/plugins/index.blade.php @@ -29,7 +29,7 @@ @{{ plugin.type_format }}
-
+
@{{ plugin.name }}
@@ -41,7 +41,9 @@
- {{ __('admin/common.edit') }} + + {{ __('admin/common.edit') }} + {{ __('admin/common.uninstall') }}
diff --git a/resources/beike/shop/default/css/page-checkout.scss b/resources/beike/shop/default/css/page-checkout.scss index 2e595633..48272ea9 100644 --- a/resources/beike/shop/default/css/page-checkout.scss +++ b/resources/beike/shop/default/css/page-checkout.scss @@ -53,6 +53,7 @@ body.page-checkout { .radio { position: relative; width: 18px; + flex: 0 0 18px; height: 18px; border: 1px solid #d4d4d4; border-radius: 50%; @@ -62,6 +63,7 @@ body.page-checkout { margin-right: 10px; display: flex; align-items: center; + flex: 0 0 88px; img { width: 60px; diff --git a/themes/default/checkout.blade.php b/themes/default/checkout.blade.php index 89f1f689..bcaad84d 100644 --- a/themes/default/checkout.blade.php +++ b/themes/default/checkout.blade.php @@ -33,7 +33,7 @@
-
+
{{ $payment['name'] }}
{!! $payment['description'] !!}
@@ -52,7 +52,7 @@
-
+
{{ $shipping['name'] }}
{!! $shipping['description'] !!}
{!! $shipping['html'] ?? '' !!}
diff --git a/themes/default/checkout/payment.blade.php b/themes/default/checkout/payment.blade.php index a3600b18..4ae147e9 100644 --- a/themes/default/checkout/payment.blade.php +++ b/themes/default/checkout/payment.blade.php @@ -17,7 +17,7 @@

{{ __('shop/checkout.payment.please_pay') }}

-
+