Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp

zhengyiming

3 天以前 2a4b768f52d9556a18a3190c5e6390b86abb37d8

 apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue

@@ -107,19 +107,47 @@
        :isFlex="false"
        @click="handleCall"
      ></PageFooterAction>
      <PageFooterBtn
        v-if="detail.releaseStatus === EnumTaskReleaseStatus.InProcess"
        type="primary"
        @click="handleApply"
        :disabled="detail?.hireStatus === EnumTaskUserHireStatus.Wait"
        >{{ `报名（${detail?.applyCount ?? 0}人已报名）` }}</PageFooterBtn
      >
      <PageFooterBtn v-if="detail.hireStatus === EnumTaskUserHireStatus.Wait" color="#999999"
        >已停止</PageFooterBtn
      >
      <PageFooterBtn v-if="detail.releaseStatus === EnumTaskReleaseStatus.Stopped" color="#999999"
        >已停止</PageFooterBtn
      >
      <template v-if="from === 'mine'">
        <PageFooterBtn
          v-if="detail.applyButton === GetTaskInfoQueryResultApplyButton.WaitHire"
          color="#999999"
          disabled
          >待确认</PageFooterBtn
        >
        <!-- <PageFooterBtn
        v-if="detail.applyButton === GetTaskInfoQueryResultApplyButton.WaitSignContract"
        >去签约</PageFooterBtn
      > -->
        <PageFooterBtn
          v-if="detail.hireButton === GetTaskInfoQueryResultHireButton.InProcess"
          color="#999999"
          disabled
          >进行中</PageFooterBtn
        >
        <!-- <PageFooterBtn
        v-if="detail.hireButton === GetTaskInfoQueryResultHireButton.ApplyCheckReceive"
        >申请验收</PageFooterBtn
      > -->
        <PageFooterBtn
          v-if="detail.hireButton === GetTaskInfoQueryResultHireButton.Completed"
          color="#999999"
          disabled
          >已完成</PageFooterBtn
        >
      </template>
      <template v-else>
        <PageFooterBtn
          v-if="detail?.releaseStatus === EnumTaskReleaseStatus.InProcess"
          type="primary"
          @click="handleApply"
          :disabled="detail?.hireStatus"
          >{{ `报名（${detail?.applyCount ?? 0}人已报名）` }}</PageFooterBtn
        >

        <PageFooterBtn v-if="detail.releaseStatus === EnumTaskReleaseStatus.Stopped" color="#999999"
          >已停止</PageFooterBtn
        >
      </template>
    </PageFooter>
  </LoadingLayout>
</template>
@@ -147,6 +175,8 @@
  BillingMethodEnumUnit,
  EnumTaskReleaseStatus,
  EnumTaskUserHireStatus,
  GetTaskInfoQueryResultApplyButton,
  GetTaskInfoQueryResultHireButton,
} from '@12333/constants';
import { useAccessLogin } from '@/hooks';

@@ -159,7 +189,8 @@
 */

const router = Taro.useRouter();
const taskId = router.params?.id ?? '';
const id = router.params?.id ?? '';
const from = router.params?.from ?? '';

const {
  isLoading,
@@ -167,10 +198,10 @@
  data: detail,
  refetch,
} = useQuery({
  queryKey: ['taskServices/getTaskInfo', taskId],
  queryKey: ['taskServices/getTaskInfo', id],
  queryFn: async () => {
    return await taskServices.getTaskInfo(
      { id: taskId },
      { id: id },
      {
        showLoading: false,
      }
@@ -186,7 +217,7 @@

const goComplaint = useAccessLogin(() => {
  Taro.navigateTo({
    url: `${RouterPath.complaint}?id=${taskId}`,
    url: `${RouterPath.complaint}?id=${id}`,
  });
});

@@ -201,7 +232,7 @@
const handleApply = useAccessLogin(async () => {
  try {
    let params: API.ApplyTaskCommand = {
      ids: [taskId],
      ids: [id],
    };
    let res = await taskUserServices.applyTask(params);
    if (res) {
@@ -220,7 +251,7 @@
      message: `确定${detail.value?.isCollected ? '取消收藏' : '收藏'}吗？`,
    });
    let params: API.CollectTaskCommand = {
      ids: [taskId],
      ids: [id],
      isCollect: !detail.value?.isCollected,
    };
    let res = await taskUserServices.collectTask(params);