From 6e156b8350ef4ec717965c1781347ed4ade8c217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Thu, 26 Sep 2024 14:43:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy/diy.vue        |  2 +-
 components/diy/goods-tabs.vue | 13 +++++++++----
 components/diy/title.vue      | 33 +++++++++++++++++----------------
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/components/diy/diy.vue b/components/diy/diy.vue
index b73e7f7a..bec7c6c9 100644
--- a/components/diy/diy.vue
+++ b/components/diy/diy.vue
@@ -32,7 +32,7 @@
                         <componentDiyCoupon v-else-if="item.key == 'coupon'" :propValue="item.com_data"></componentDiyCoupon>
                         <!-- 工具组件 -->
                         <componentDiyFloatWindow v-else-if="item.key == 'float-window'" :propValue="item.com_data"></componentDiyFloatWindow>
-                        <componentDiyTitle v-else-if="item.key == 'text-title'" :propValue="item.com_data"></componentDiyTitle>
+                        <componentDiyTitle v-else-if="item.key == 'title'" :propValue="item.com_data"></componentDiyTitle>
                         <componentDiyAuxiliaryLine v-else-if="item.key == 'row-line'" :propValue="item.com_data"></componentDiyAuxiliaryLine>
                         <componentDiyRichText v-else-if="item.key == 'rich-text'" :propValue="item.com_data"></componentDiyRichText>
                         <componentDiyAuxiliaryBlank v-else-if="item.key == 'auxiliary-blank'" :propValue="item.com_data"></componentDiyAuxiliaryBlank>
diff --git a/components/diy/goods-tabs.vue b/components/diy/goods-tabs.vue
index 9922e966..7ae42f2a 100644
--- a/components/diy/goods-tabs.vue
+++ b/components/diy/goods-tabs.vue
@@ -2,13 +2,13 @@
     <view class="overflow-unset" :style="style_container">
         <componentDiyModulesTabsView :propValue="goods_tabs" :propIsTop="top_up == '1'" @tabs-click="tabs_click_event"></componentDiyModulesTabsView>
         <view class="padding-top oh">
-            <componentGoodsList :key="key" :propValue="goods_tabs" :propIsCommonStyle="false"></componentGoodsList>
+            <componentGoodsList v-if="hackReset" :propValue="goods_tabs" :propIsCommonStyle="false"></componentGoodsList>
         </view>
     </view>
 </template>
 
 <script>
-    import { common_styles_computer, get_math } from '@/common/js/common/common.js';
+    import { common_styles_computer } from '@/common/js/common/common.js';
     import componentDiyModulesTabsView from '@/components/diy/modules/tabs-view';
     import componentGoodsList from '@/components/diy/goods-list';
     export default {
@@ -27,8 +27,8 @@
         data() {
             return {
                 style_container: '',
+                hackReset: true,
                 goods_tabs: {},
-                key: 1,
                 top_up: '0',
             };
         },
@@ -67,8 +67,13 @@
                 new_data.content.data_auto_list = new_data.content.tabs_list[index].data_auto_list;
                 this.setData({
                     goods_tabs: new_data,
-                    key: get_math(),
+                    hackReset: false,
                 });
+                this.$nextTick(() => {
+                    this.setData({
+                        hackReset: true
+                    });
+                })
             },
         },
     };
diff --git a/components/diy/title.vue b/components/diy/title.vue
index 9cac038f..f8c35886 100644
--- a/components/diy/title.vue
+++ b/components/diy/title.vue
@@ -2,9 +2,9 @@
     <view :style="style_container">
         <view class="flex-col gap-10">
             <view class="pr flex-row" :class="title_center">
-                <view class="z-i flex-row align-c gap-10 title-img">
-                    <template v-if="!isEmpty(form.img_src)">
-                        <imageEmpty :propImageSrc="form.img_src[0]"></imageEmpty>
+                <view class="z-i flex-row align-c gap-10">
+                    <template v-if="!isEmpty(form.img_src) && !isEmpty(form.img_src[0].url)">
+                        <image :src="form.img_src[0].url" class="title-img" mode="heightFix"></image>
                     </template>
                     <template v-else-if="!isEmpty(form.icon_class)">
                         <iconfont :name="'icon-' + form.icon_class" :size="new_style.icon_size * 2 + 'rpx'" :color="new_style.icon_color"></iconfont>
@@ -13,12 +13,12 @@
                 </view>
                 <view class="flex-row gap-10 align-c right-0 pa">
                     <template v-if="form.keyword_show == '1'">
-                        <view v-for="item in keyword_list" :key="item.id" :style="keyword_style">
+                        <view v-for="item in keyword_list" :key="item.id" :style="keyword_style" :data-value="item.link.page" @tap="url_event">
                             {{ item.title }}
                         </view>
                     </template>
-                    <view v-if="form.right_show == '1'" class="nowrap" :style="right_style">{{ form.right_title }}
-                        <iconfont name="icon-arrow-right" :color="new_style.right_color || '#999'"></iconfont>
+                    <view v-if="form.right_show == '1'" class="nowrap flex-row align-c" :style="right_style" :data-value="form.right_link.page" @tap="url_event">{{ form.right_title }}
+                        <iconfont name="icon-arrow-right" :color="new_style.right_color" :size="new_style.right_size * 2 + 'rpx'"></iconfont>
                     </view>
                 </view>
             </view>
@@ -29,7 +29,7 @@
 
 <script>
 const app = getApp();
-import { common_styles_computer, is_obj_empty } from '@/common/js/common/common.js';
+import { common_styles_computer, isEmpty } from '@/common/js/common/common.js';
 export default {
     props: {
         propValue: {
@@ -57,9 +57,12 @@ export default {
             form: this.propValue.content,
             new_style: this.propValue.style,
         });
+        console.log(this.propValue);
+        
         this.init();
     },
     methods: {
+        isEmpty,
         init() {
             // 是否居中
             this.setData({
@@ -96,17 +99,15 @@ export default {
         },
         get_subtitle_style() {
             let common_styles = '';
-            if (new_style.value.subtitle_weight == 'italic') {
+            if (this.new_style.subtitle_weight == 'italic') {
                 common_styles += `font-style: italic`;
-            } else if (new_style.value.subtitle_weight == '500') {
+            } else if (this.new_style.subtitle_weight == '500') {
                 common_styles += `font-weight: 500`;
             }
-            return `color:${new_style.value.subtitle_color}; font-size: ${new_style.value.subtitle_size * 2}rpx; ${common_styles}`;
+            return `color:${this.new_style.subtitle_color}; font-size: ${this.new_style.subtitle_size * 2}rpx; ${common_styles}`;
         },
-        url_open_event(link) {
-            if (!is_obj_empty(link)) {
-                app.globalData.url_open(link.page);
-            }
+        url_event(e) {
+            app.globalData.url_event(e);
         },
     },
 };
@@ -125,7 +126,7 @@ export default {
 }
 
 .title-img {
-    max-width: 6rem;
-    max-height: 3rem;
+    max-width: 120rpx;
+    max-height: 60rpx;
 }
 </style>