From b6cd12914a60f09260efdbc889015ddfda676de6 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期五, 22 八月 2025 09:41:40 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp --- apps/cMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue | 42 ++++++++++++++++++++++++++++++++++++------ 1 files changed, 36 insertions(+), 6 deletions(-) diff --git a/apps/cMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue index 58aa1f6..3c3f8db 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,21 +17,23 @@ <template #renderItem="{ item }"> <TaskCheckFileCard :created-time="item?.createdTime" - :files="item?.files" + :checkReceiveStatus="item?.checkReceiveStatus" + :files="item?.files?.map((x) => setOSSLink(x))" ></TaskCheckFileCard> </template> </InfiniteLoading> </ContentScrollView> - <!-- <div class="taskCheckDetail-tips-wrapper"> + <div class="taskCheckDetail-tips-wrapper" v-if="!isBindBankCard"> <div class="taskCheckDetail-tips-text">鎮ㄥ皻鏈粦瀹氶摱琛屽崱锛屾殏鏃舵棤娉曠粨绠楁湇鍔¤垂</div> - <div class="taskCheckDetail-tips-btn">绔嬪嵆缁戝畾閾惰鍗′俊鎭�</div> - </div> --> + <div class="taskCheckDetail-tips-btn" @click="goBindBankCard">绔嬪嵆缁戝畾閾惰鍗′俊鎭�</div> + </div> </template> <script setup lang="ts"> import { MyTaskCard, TaskCheckFileCard } from '@12333/components'; import Taro from '@tarojs/taro'; import { useCheckReceiveTaskUserSubmits } from '@12333/hooks'; +import { setOSSLink } from '@12333/utils'; defineOptions({ name: 'InnerPage', @@ -39,6 +43,18 @@ const id = route.params?.id as string; const { infiniteLoadingProps } = useCheckReceiveTaskUserSubmits({ id: id }); + +const isBindBankCard = computed( + () => + infiniteLoadingProps.value?.listData?.pages?.[0]?.objectData?.enterpriseEmployeeUser + ?.isBindBankCard +); + +function goBindBankCard() { + Taro.navigateTo({ + url: `${RouterPath.unboundBankCard}`, + }); +} </script> <style lang="scss"> @@ -52,5 +68,19 @@ margin-bottom: 16px; color: boleGetCssVar('text-color', 'primary'); } + + .taskCheckDetail-tips-wrapper { + text-align: center; + font-size: 24px; + line-height: 32px; + + .taskCheckDetail-tips-text { + color: boleGetCssVar('text-color', 'secondary'); + } + + .taskCheckDetail-tips-btn { + color: boleGetCssVar('color', 'primary'); + } + } } </style> -- Gitblit v1.9.1