From fa53abc582f84c5fd97bbd52c22c13d11a13b965 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Thu, 10 Oct 2024 18:32:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=AE=BE=E7=BD=AE=E9=A1=B6=E9=83=A8=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E7=9A=84=E9=BB=98=E8=AE=A4=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy/coupon.vue | 6 +++---
 components/diy/diy.vue    | 7 ++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/components/diy/coupon.vue b/components/diy/coupon.vue
index d0a2c6d0..fc5dccdd 100644
--- a/components/diy/coupon.vue
+++ b/components/diy/coupon.vue
@@ -68,7 +68,7 @@
                                 <view v-for="(item, index) in data_list" :key="index" class="item" :style="'background: ' + theme_style.background_inside">
                                     <view class="type" :style="'background: ' + theme_style.type_background + ';color:' + theme_style.type_color">
                                         <view class="type-before" :style="'background: ' + theme_style.type_background"></view>
-                                        <text>通用券</text>
+                                        <text>{{ item.type_name }}</text>
                                         <view class="type-after" :style="'background: ' + theme_style.type_background"></view>
                                     </view>
                                     <view class="price" :style="'color:' + theme_style.price_color">
@@ -232,8 +232,8 @@
                     false
                 );
                 this.setData({
-                    content_title: new_content.content_title || '',
-                    content_desc: new_content.content_desc || '',
+                    content_title: new_content.title || '',
+                    content_desc: new_content.desc || '',
                     // 判断是自动还是手动
                     data_list: new_content.data_type == '1' ? new_content.data_list : new_content.data_auto_list,
                     theme: temp_theme,
diff --git a/components/diy/diy.vue b/components/diy/diy.vue
index 29b45328..06c8b8d0 100644
--- a/components/diy/diy.vue
+++ b/components/diy/diy.vue
@@ -279,10 +279,15 @@
                     page_style: common_styles_computer(this.propValue.header.com_data.style.common_style),
                     page_img_style: common_img_computer(this.propValue.header.com_data.style.common_style),
                     // 判断顶部导航是否置顶
-                    is_header_top: this.propValue.header.com_data.style.up_slide_display == '1' ? true : false,
+                    is_header_top: parseInt(this.propValue.header.com_data.style.up_slide_display) == 1 ? true : false,
                     temp_sticky_top: this.sticky_top,
                     temp_header_top: this.header_top,
                 });
+                // 设置顶部导航的默认颜色
+                uni.setNavigationBarColor({
+                    frontColor: parseInt(this.propValue.header.com_data.style.function_buttons_type) == 0 ? '#000000' : '#ffffff',
+                    backgroundColor: 'transparent',
+                });
                 uni.setStorageSync(this.cache_key + this.tabs_home_id, this.propValue.diy_data);
             },
             // 顶部导航沉浸模式回调