From 8af4b8b9fcf2259ed7cb178a7823c5b64bead19e Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Mon, 24 Jan 2022 22:06:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=8D=9A=E5=AE=A2=E5=92=8C?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E9=85=8D=E7=BD=AE=E7=BB=84=E4=BB=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/activity-list/activity-list.vue | 2 +-
 components/blog-list/blog-list.vue         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/activity-list/activity-list.vue b/components/activity-list/activity-list.vue
index 8ece1f01..ea6daf05 100644
--- a/components/activity-list/activity-list.vue
+++ b/components/activity-list/activity-list.vue
@@ -1,6 +1,6 @@
 <template>
     <view>
-        <view v-if="(propData || []).length > 0">
+        <view v-if="(propData || null) != null && propData.length > 0">
             <block v-for="(floor, index) in propData" :key="index">
                 <block v-if="floor.goods_list.length > 0 && floor.home_data_location == propLocation">
                     <view class="spacing-nav-title">
diff --git a/components/blog-list/blog-list.vue b/components/blog-list/blog-list.vue
index d49b7290..d7a6f5cc 100644
--- a/components/blog-list/blog-list.vue
+++ b/components/blog-list/blog-list.vue
@@ -1,12 +1,12 @@
 <template>
     <view>
-        <view v-if="(propConfig || null) != null && (propData || []).length > 0">
+        <view v-if="(propConfig || null) != null && (propData || null) != null && propData.length > 0">
             <block v-for="(floor, index) in propData" :key="index">
                 <block v-if="floor.blog_list.length > 0 && floor.home_data_location == propLocation">
                     <view class="spacing-nav-title">
                         <text class="text-wrapper" :style="'color:'+(floor.color || '#333')+';'">{{floor.title}}</text>
                         <text v-if="(floor.vice_title || null) != null" class="vice-name margin-left-lg cr-gray">{{floor.vice_title}}</text>
-                        <navigator :url="'/pages/plugins/blog/search/search?id=' + floor.more_category_id" hover-class="none" class="arrow-right padding-right-xxxl cr-gray fr">更多</navigator>
+                        <navigator :url="floor.more_url" hover-class="none" class="arrow-right padding-right-xxxl cr-gray fr">更多</navigator>
                     </view>
                     <view class="wh-auto oh pr">
                         <view v-if="floor.keywords_arr.length > 0" class="word-list scroll-view-horizontal margin-bottom-lg">