From a1c289e7dfc5d9a3b8dc7ca9b05857f276c05f8d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 09 七月 2025 18:03:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages/mine/activity/myActivity.vue | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/pages/mine/activity/myActivity.vue b/pages/mine/activity/myActivity.vue
index c977479..c451cc7 100644
--- a/pages/mine/activity/myActivity.vue
+++ b/pages/mine/activity/myActivity.vue
@@ -27,10 +27,10 @@
>
<!-- 灏侀潰鍖哄煙 -->
<view class="cover-container">
- <block v-if="item.coverType === '鍥剧墖' || item.coverType === '瑙嗛'">
- <image :src="getUrl(item.cover)" mode="aspectFill" class="activity-cover" />
+ <block v-if="item.coverType === 'image' || item.coverType === 'video'">
+ <image :src="item.url" mode="aspectFill" class="activity-cover" />
</block>
- <block v-if="item.coverType === '鏂囧瓧'">
+ <block v-if="item.coverType === 'text'">
<view class="activity-cover text-cover">{{ item.cover }}</view>
</block>
</view>
@@ -80,10 +80,10 @@
class="activity-item card"
>
<view class="cover-container">
- <block v-if="item.coverType === '鍥剧墖' || item.coverType === '瑙嗛'">
- <image :src="getUrl(item.cover)" mode="aspectFill" class="activity-cover" />
+ <block v-if="item.coverType === 'image' || item.coverType === 'video'">
+ <image :src="item.url" mode="aspectFill" class="activity-cover" />
</block>
- <block v-if="item.coverType === '鏂囧瓧'">
+ <block v-if="item.coverType === 'text'">
<view class="activity-cover text-cover">{{ item.cover }}</view>
</block>
</view>
@@ -123,10 +123,10 @@
class="activity-item card"
>
<view class="cover-container">
- <block v-if="item.coverType === '鍥剧墖' || item.coverType === '瑙嗛'">
- <image :src="getUrl(item.cover)" mode="aspectFill" class="activity-cover" />
+ <block v-if="item.coverType === 'image' || item.coverType === 'video'">
+ <image :src="item.url" mode="aspectFill" class="activity-cover" />
</block>
- <block v-if="item.coverType === '鏂囧瓧'">
+ <block v-if="item.coverType === 'text'">
<view class="activity-cover text-cover">{{ item.cover }}</view>
</block>
</view>
@@ -160,6 +160,7 @@
</template>
<script>
+import '@/components/uview-components/uview-ui';
import {getMyActivityList,collectCancel,activityCancel} from '@/api/activity.js'
import {getFilePreviewUrl} from '@/api/common.js'
export default {
--
Gitblit v1.8.0