update

src/pages/index/index.vue

@@ -53,6 +53,15 @@ const saveM = () => {
             </view>
         </view>
 
+        <view class="block" v-if="detail.material_type?.desc_limit > 0 && detail.children?.material[current].content">
+            <view class="title">正文</view>
+            <view class="info">
+                {{ detail.children?.material[current].content }}
+
+                <view class="copy-button" @click="copy(detail.children?.material[current].content)">复制</view>
+            </view>
+        </view>
+
         <view class="block"
               v-if="detail.material_type?.tags_limit > 0 && detail.children?.material[current].tags_arr.length > 0">
             <view class="title">
@@ -71,15 +80,6 @@ const saveM = () => {
             </view>
         </view>
 
-        <view class="block" v-if="detail.material_type?.desc_limit > 0 && detail.children?.material[current].content">
-            <view class="title">正文</view>
-            <view class="info">
-                {{ detail.children?.material[current].content }}
-
-                <view class="copy-button" @click="copy(detail.children?.material[current].content)">复制</view>
-            </view>
-        </view>
-
         <view class="block">
             <view class="title">素材（请按顺序下载&发布）</view>
             <view class="info">

src/pages/taskDetails/components/CollectMaterials.vue

@@ -40,6 +40,14 @@ const list = computed(() => data.children.material[current.value].comment?.flatM
                 {{ data.children.material[current].title }}
             </view>
         </view>
+        <view class="block" v-if="data.material_type?.desc_limit > 0">
+            <view class="block-title">
+                正文:
+            </view>
+            <view class="block-info">
+                {{ data.children.material[current].content }}
+            </view>
+        </view>
         <view class="block"
               v-if="data.material_type?.tags_limit > 0 && data.children.material[current].tags_arr?.length > 0">
             <view class="block-title">
@@ -49,14 +57,6 @@ const list = computed(() => data.children.material[current.value].comment?.flatM
                 {{ data.children.material[current].tags_arr.map(item => `#${item}`).join(' ') }}
             </view>
         </view>
-        <view class="block" v-if="data.material_type?.desc_limit > 0">
-            <view class="block-title">
-                正文:
-            </view>
-            <view class="block-info">
-                {{ data.children.material[current].content }}
-            </view>
-        </view>
         <view class="block" v-if="data.children.material[current].material_arr?.length > 0">
             <view class="block-title">
                 素材:

src/pages/taskDetails/components/TaskDetails.vue

@@ -5,6 +5,7 @@ import XImage from "../../../components/XImage.vue";
 import XSquareCarouselImage from "../../../components/XSquareCarouselImage.vue";
 import HF_ICON from "../../../static/icons/icon-wrapper.png";
 import {copy} from "../../../utils/uils.js";
+import {computed} from "vue";
 
 const {data, home} = defineProps({
     data: {
@@ -16,6 +17,8 @@ const {data, home} = defineProps({
         default: false
     }
 });
+
+const list = computed(() => [data.comment_arr]?.flatMap(v => v.children ? [v, ...v.children] : [v]));
 </script>
 
 <template>
@@ -53,22 +56,30 @@ const {data, home} = defineProps({
         <view class="block">
             <view class="block-title">评论区案例:</view>
             <view class="test-24r text-[#4E5969]">
-                <view v-if="data.comment_arr">
+                <view v-for="(v, index) in list">
-                    评论1:
+                    <view>
-                    <text v-if="data.comment_arr.pid!==0" class="text-[#86909C]">
+                        评论{{ index + 1 }}:
+                        <text v-if="v.pid" class="text-[rgba(134,144,156)]">
                             <image class="!size-[20rpx]" src="/static/icons/msgback.png"></image>
-                        回复1:
+                            回复{{
-                    </text>
+                                list.findIndex(k => k.pid === v.pid)
-                    {{ data.comment_arr.intro }}
+                            }}
-                </view>
-                <view v-for="(v, index) in data.comment_arr.children">
-                    评论{{ index + 2 }}:
-                    <text class="text-[#86909C]">
-                        <image class="!size-[20rpx]" src="/static/icons/msgback.png"></image>
-                        回复1:
                         </text>
                         {{ v.intro }}
                     </view>
+                    <view class="!flex gap-[20rpx] flex-wrap !my-[10rpx]">
+                        <view class="!w-[96rpx] !h-[96rpx] !aspect-square" v-for="k in v.image_arr">
+                            <x-image
+                                :style="{
+                                    width: '96rpx',
+                                    height: '96rpx',
+                                }"
+                                :src="k"
+                                :list="v.image_arr">
+                            </x-image>
+                        </view>
+                    </view>
+                </view>
             </view>
         </view>
     </view>