From 2dc7b8deaffb6f99369591f087ddfb7cf9ef789e Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Tue, 22 Oct 2024 12:00:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0=E8=AF=84=E4=BB=B7=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/goods-comments/goods-comments.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/goods-comments/goods-comments.vue b/components/goods-comments/goods-comments.vue
index 83686aa3..88b49fdd 100644
--- a/components/goods-comments/goods-comments.vue
+++ b/components/goods-comments/goods-comments.vue
@@ -34,8 +34,10 @@
             </view>
         </block>
         <block v-else>
-            <view class="cr-grey-d tc spacing-mb flex-row jc-c align-c">
-                <image :src="common_static_url + 'no-comment.png'" mode="widthFix" class="no-comment margin-right-main" />{{$t('goods-comments.goods-comments.1p1r2e')}}</view>
+            <view class="tc spacing-mb flex-row jc-c align-c margin-top-xxxxl">
+                <image :src="common_static_url + 'no-comment.png'" mode="widthFix" class="no-comment margin-right-main" />
+                <view class="cr-grey-d">{{$t('goods-comments.goods-comments.1p1r2e')}}</view>
+            </view>
         </block>
     </view>
 </template>

From 15b12f57e1020ab47de8cb369e8ab94f671e92d5 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Tue, 22 Oct 2024 14:02:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=8D=A1=E9=A1=BF=E4=BF=AE=E5=A4=8D=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E8=83=B6=E5=9B=8A=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/common/common.vue                    | 4 ++--
 components/diy/footer.vue                       | 4 ----
 components/diy/header.vue                       | 8 +++++++-
 pages/cart-page/cart-page.vue                   | 2 +-
 pages/cart/cart.vue                             | 2 +-
 pages/goods-category/goods-category.vue         | 2 +-
 pages/goods-search-start/goods-search-start.vue | 2 +-
 pages/plugins/realstore/detail/detail.vue       | 2 +-
 8 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/components/common/common.vue b/components/common/common.vue
index 47730576..5821dd05 100644
--- a/components/common/common.vue
+++ b/components/common/common.vue
@@ -157,11 +157,11 @@
             },
 
             // 底部菜单高度回调事件
-            footer_height_value_event(value) {  
+            footer_height_value_event(value) {
                 this.setData({
                     footer_height_value: (value*2)+20
                 });
-                this.$emit('footer-height', value);
+                this.$emit('onFooterHeight', value);
 
                 // 存储底部菜单高度
                 app.globalData.app_tabbar_height_save(value);
diff --git a/components/diy/footer.vue b/components/diy/footer.vue
index 231a7d65..17b4949b 100644
--- a/components/diy/footer.vue
+++ b/components/diy/footer.vue
@@ -69,10 +69,6 @@
             propKey(value, old_value) {
                 this.init();
             },
-            // 菜单数据
-            propValue(value, old_value) {
-                this.init();
-            },
             // 选中索引
             propFooterActiveIndex(value, old_value) {
                 this.init();
diff --git a/components/diy/header.vue b/components/diy/header.vue
index 31f8ac08..d0ab51b6 100644
--- a/components/diy/header.vue
+++ b/components/diy/header.vue
@@ -12,9 +12,15 @@
                                 <view class="model-head pr padding-left-main padding-right-main" style="box-sizing: border-box">
                                     <view class="flex-col" :style="'gap:' + data_alone_row_space">
                                         <view class="model-head-content flex-row align-c jc-sb gap-16 wh-auto pr" :style="header_style">
+                                            <!-- 支付宝小程序自带返回按钮，这里就不给返回按钮了，这里给留出一点空间就行 -->
+                                            <!-- #ifndef MP-ALIPAY -->
                                             <view v-if="!is_tabbar_pages" class="z-i dis-inline-block margin-top-xs" @tap="top_nav_left_back_event">
                                                 <iconfont name="icon-arrow-left" size="40rpx" propContainerDisplay="flex" :color="form.style.left_back_btn_color || '#333'"></iconfont>
                                             </view>
+                                            <!-- #endif -->
+                                            <!-- #ifdef MP-ALIPAY -->
+                                            <view class="dis-inline-block padding-left-sm"></view>
+                                            <!-- #endif -->
                                             <view v-if="['1', '2', '3'].includes(form.content.theme)" class="flex-1">
                                                 <view class="flex-row align-c jc-c ht-auto gap-16" :class="position_class" :style="text_style + 'justify-content:' + form.content.indicator_location || 'center'">
                                                     <template v-if="['2', '3'].includes(form.content.theme)">
@@ -209,7 +215,7 @@
                 // 小程序下，获取小程序胶囊的宽度
                 let menu_button_info = 'max-width:100%';
                 let new_text_style = `font-weight:${new_style.header_background_title_typeface}; font-size: ${new_style.header_background_title_size * 2}rpx; color: ${new_style.header_background_title_color};`;
-                // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU
+                // #ifdef MP
                 const custom = uni.getMenuButtonBoundingClientRect();
                 menu_button_info = `max-width:calc(100% - ${custom.width + 10}px);`;
                 new_text_style += `right:-${custom.width + 10}px;`;
diff --git a/pages/cart-page/cart-page.vue b/pages/cart-page/cart-page.vue
index 2d93606a..134a4bb3 100644
--- a/pages/cart-page/cart-page.vue
+++ b/pages/cart-page/cart-page.vue
@@ -7,7 +7,7 @@
         <component-quick-nav :propIsBar="true"></component-quick-nav>
 
         <!-- 公共 -->
-        <component-common ref="common" @footer-height="footer_height_value_event" :propIsFooterSeat="false"></component-common>
+        <component-common ref="common" @onFooterHeight="footer_height_value_event" :propIsFooterSeat="false"></component-common>
     </view>
 </template>
 <script>
diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue
index 41632ff0..e8d80a84 100644
--- a/pages/cart/cart.vue
+++ b/pages/cart/cart.vue
@@ -4,7 +4,7 @@
         <component-cart ref="cart" :propCartNavBottomValue="footer_height_value"></component-cart>
 
         <!-- 公共 -->
-        <component-common ref="common" @footer-height="footer_height_value_event" :propIsFooterSeat="false"></component-common>
+        <component-common ref="common" @onFooterHeight="footer_height_value_event" :propIsFooterSeat="false"></component-common>
     </view>
 </template>
 <script>
diff --git a/pages/goods-category/goods-category.vue b/pages/goods-category/goods-category.vue
index f8f2c3ab..01941f61 100644
--- a/pages/goods-category/goods-category.vue
+++ b/pages/goods-category/goods-category.vue
@@ -362,7 +362,7 @@
         </view>
 
         <!-- 公共 -->
-        <component-common ref="common" @footer-height="footer_height_value_event" :propIsFooterSeat="false"></component-common>
+        <component-common ref="common" @onFooterHeight="footer_height_value_event" :propIsFooterSeat="false"></component-common>
     </view>
 </template>
 
diff --git a/pages/goods-search-start/goods-search-start.vue b/pages/goods-search-start/goods-search-start.vue
index 061c091f..87a99b7d 100644
--- a/pages/goods-search-start/goods-search-start.vue
+++ b/pages/goods-search-start/goods-search-start.vue
@@ -69,7 +69,7 @@
         </view>
 
         <!-- 公共 -->
-        <component-common ref="common" @footer-height="footer_height_value_event" :propIsFooterSeat="false"></component-common>
+        <component-common ref="common" @onFooterHeight="footer_height_value_event" :propIsFooterSeat="false"></component-common>
     </view>
 </template>
 <script>
diff --git a/pages/plugins/realstore/detail/detail.vue b/pages/plugins/realstore/detail/detail.vue
index 7977ec40..51ec8c03 100644
--- a/pages/plugins/realstore/detail/detail.vue
+++ b/pages/plugins/realstore/detail/detail.vue
@@ -284,7 +284,7 @@
         <component-share-popup ref="share"></component-share-popup>
 
         <!-- 公共 -->
-        <component-common ref="common" @footer-height="footer_height_value_event" :propIsFooterSeat="false"></component-common>
+        <component-common ref="common" @onFooterHeight="footer_height_value_event" :propIsFooterSeat="false"></component-common>
     </view>
 </template>
 <script>