From f8e2cf155c7385c4c412e4b3c0eee2ea8070c693 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 14 八月 2025 13:25:28 +0800
Subject: [PATCH] feat: 接口对接
---
apps/bMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue | 2 +-
apps/cMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue | 9 ++++++---
apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue | 1 +
packages/components/src/Image/PreviewImage.vue | 1 +
apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue | 34 +++++++++++++++++++++-------------
packages/components/src/Card/TaskCheckFileCard.vue | 4 ++--
apps/cMiniApp/project.private.config.json | 3 ++-
apps/bMiniApp/src/subpackages/task/taskCheckedDetail/InnerPage.vue | 2 +-
8 files changed, 35 insertions(+), 21 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue
index 9793c3d..a755cef 100644
--- a/apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/batchTaskList/InnerPage.vue
@@ -13,6 +13,7 @@
:name="item.name"
:gender="item.gender"
:age="item.age"
+ :avatar="item.avatar"
:educationalBackgroundContent="item.educationalBackgroundContent"
:taskCount="item.taskCount"
:showFooterLeft="false"
diff --git a/apps/bMiniApp/src/subpackages/task/taskCheckedDetail/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskCheckedDetail/InnerPage.vue
index b52c25e..66b1137 100644
--- a/apps/bMiniApp/src/subpackages/task/taskCheckedDetail/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskCheckedDetail/InnerPage.vue
@@ -41,7 +41,7 @@
<TaskCheckFileCard
:created-time="item?.createdTime"
:checkReceiveStatus="item?.checkReceiveStatus"
- :files="item?.files"
+ :files="item?.files?.map((x) => setOSSLink(x))"
/>
</template>
</InfiniteLoading>
diff --git a/apps/bMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue
index 5a10229..dd7e95c 100644
--- a/apps/bMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue
@@ -12,7 +12,7 @@
<div class="taskCheckFileCard-status-title">楠屾敹鐓х墖</div>
<TaskCheckFileCard
:created-time="detail?.createdTime"
- :files="detail?.files"
+ :files="detail?.files?.map((x) => setOSSLink(x))"
></TaskCheckFileCard>
</ContentScrollView>
<PageFooter>
diff --git a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
index 0dcd380..a06d11c 100644
--- a/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/taskManage/InnerPage.vue
@@ -31,19 +31,21 @@
mode="taskManage"
>
<template #footer-actions>
- <nut-button
- type="primary"
- @click.stop="goBatchTaskList(item, EnumTaskUserArrangeStatus.Wait)"
- >浜哄憳瀹夋帓</nut-button
- >
- <nut-button
- v-if="item.status === EnumTaskStatus.Complete"
- type="primary"
- :color="Colors.Info"
- class="dark-btn"
- @click.stop="goBatchTaskList(item, EnumTaskUserArrangeStatus.Complete)"
- >璇︽儏</nut-button
- >
+ <div>
+ <nut-button
+ type="primary"
+ @click.stop="goBatchTaskList(item, EnumTaskUserArrangeStatus.Wait)"
+ >浜哄憳瀹夋帓</nut-button
+ >
+ <nut-button
+ v-if="item.status === EnumTaskStatus.Complete"
+ type="primary"
+ :color="Colors.Info"
+ class="dark-btn"
+ @click.stop="goBatchTaskList(item, EnumTaskUserArrangeStatus.Complete)"
+ >璇︽儏</nut-button
+ >
+ </div>
</template>
</JobApplicationCard>
</template>
@@ -94,4 +96,10 @@
<style lang="scss">
@import '@/styles/common.scss';
+
+.taskManage-page-wrapper {
+ .dark-btn {
+ margin-left: 12px;
+ }
+}
</style>
diff --git a/apps/cMiniApp/project.private.config.json b/apps/cMiniApp/project.private.config.json
index 02429d4..51fe64c 100644
--- a/apps/cMiniApp/project.private.config.json
+++ b/apps/cMiniApp/project.private.config.json
@@ -3,7 +3,8 @@
"projectname": "cMiniApp",
"setting": {
"compileHotReLoad": true,
- "bigPackageSizeSupport": true
+ "bigPackageSizeSupport": true,
+ "urlCheck": false
},
"condition": {
"miniprogram": {
diff --git a/apps/cMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
index 58aa1f6..b89e831 100644
--- a/apps/cMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue
@@ -1,8 +1,10 @@
<template>
<ContentScrollView style="background-color: transparent">
<MyTaskCard
- :name="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.taskInfo?.name"
- :addressName="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.taskInfo?.addressName"
+ :name="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.taskInfo?.name ?? ''"
+ :addressName="
+ infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.taskInfo?.addressName ?? ''
+ "
:beginTime="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.taskInfo?.beginTime"
:endTime="infiniteLoadingProps?.listData?.pages?.[0]?.objectData?.taskInfo?.endTime"
:showMyTaskArrow="false"
@@ -15,7 +17,7 @@
<template #renderItem="{ item }">
<TaskCheckFileCard
:created-time="item?.createdTime"
- :files="item?.files"
+ :files="item?.files?.map((x) => setOSSLink(x))"
></TaskCheckFileCard>
</template>
</InfiniteLoading>
@@ -30,6 +32,7 @@
import { MyTaskCard, TaskCheckFileCard } from '@12333/components';
import Taro from '@tarojs/taro';
import { useCheckReceiveTaskUserSubmits } from '@12333/hooks';
+import { setOSSLink } from '@12333/utils';
defineOptions({
name: 'InnerPage',
diff --git a/packages/components/src/Card/TaskCheckFileCard.vue b/packages/components/src/Card/TaskCheckFileCard.vue
index cc0fc5d..0a54b2a 100644
--- a/packages/components/src/Card/TaskCheckFileCard.vue
+++ b/packages/components/src/Card/TaskCheckFileCard.vue
@@ -23,13 +23,13 @@
class="taskCheckFileCard-img-grid"
>
<nut-grid-item
- v-for="(itema, index) in props.files"
+ v-for="(fileItem, index) in props.files"
:key="index"
class="publish-circle-friend-file-grid-item"
>
<div class="taskCheckFileCard-img-grid-item">
<PreviewImage
- :src="setOSSLink(itema)"
+ :src="setOSSLink(fileItem)"
class="taskCheckFileCard-img"
:urls="props.files"
/>
diff --git a/packages/components/src/Image/PreviewImage.vue b/packages/components/src/Image/PreviewImage.vue
index c388555..7104b41 100644
--- a/packages/components/src/Image/PreviewImage.vue
+++ b/packages/components/src/Image/PreviewImage.vue
@@ -29,6 +29,7 @@
() => props.src,
() => {
if (props.src) {
+ console.log('props.src: ', props.src);
Taro.getImageInfo({
src: props.src,
success(result) {
--
Gitblit v1.9.1