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

zhengyiming

2 天以前 a4907e75088054574d7dce76c9995502779c5eeb

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

 apps/bMiniApp/src/subpackages/task/components/TaskCheckCard.vue

@@ -1,5 +1,5 @@
<template>
  <div class="task-check-card-wrapper" @click.stop="emit('taskChecked')">
  <div class="task-check-card-wrapper" @click.stop="emit('checkReceive')">
    <TaskCheckPersonalView
      class="task-check-card-view"
      :avatar="avatar"
@@ -13,7 +13,6 @@
          v-if="checkReceiveStatus === EnumTaskCheckReceiveStatus.WaitCheckReceive"
          type="primary"
          class="task-check-card-phone-btn"
          @click.stop="emit('checkReceive')"
          >验收</nut-button
        >
        <div v-else class="task-check-card-phone-status" :style="{ color: Colors.Success }">
@@ -50,7 +49,6 @@

const emit = defineEmits<{
  (e: 'checkReceive'): void;
  (e: 'taskChecked'): void;
}>();
</script>


 apps/bMiniApp/src/subpackages/task/taskCheckDetail/InnerPage.vue

@@ -21,8 +21,7 @@
          :isReal="item.isReal"
          :contactPhoneNumber="item.contactPhoneNumber"
          :checkReceiveStatus="item.checkReceiveStatus"
          @checkReceive="goHandleTaskDetail(item)"
          @taskChecked="goTaskCheckedDetail(item)"
          @checkReceive="goTaskDetail(item)"
        />
      </template>
    </InfiniteLoading>
@@ -35,6 +34,7 @@
import { useInfiniteLoading } from '@12333/hooks';
import TaskCheckCard from '../components/TaskCheckCard.vue';
import { MyTaskCard } from '@12333/components';
import { EnumTaskCheckReceiveStatus } from '@12333/constants';
import { setOSSLink } from '@12333/utils';
import dayjs from 'dayjs';

@@ -68,15 +68,16 @@
  }
);

function goHandleTaskDetail(item: API.GetCheckReceiveTaskQueryResultItem) {
  Taro.navigateTo({
    url: `${RouterPath.taskHandleCheckDetail}?id=${item.id}&date=${date}`,
  });
}

function goTaskCheckedDetail(item: API.GetCheckReceiveTaskQueryResultItem) {
  Taro.navigateTo({
    url: `${RouterPath.taskCheckedDetail}?id=${item.id}`,
  });
function goTaskDetail(item: API.GetCheckReceiveTaskQueryResultItem) {
  if (item.checkReceiveStatus === EnumTaskCheckReceiveStatus.Completed) {
    Taro.navigateTo({
      url: `${RouterPath.taskCheckedDetail}?id=${item.id}`,
    });
  }
  if (item.checkReceiveStatus === EnumTaskCheckReceiveStatus.WaitCheckReceive) {
    Taro.navigateTo({
      url: `${RouterPath.taskHandleCheckDetail}?id=${item.id}&date=${date}`,
    });
  }
}
</script>

 apps/cMiniApp/src/subpackages/mine/mineCancel/InnerPage.vue

@@ -13,6 +13,7 @@
        :service-fee="item.serviceFee"
        :settlement-cycle="item.settlementCycle"
        :address-name="item.addressName"
        @click="goTaskDetail(item)"
      >
        <template #actions>
          <div class="task-card-actions-text">{{ '已取消' }}</div>
@@ -27,6 +28,7 @@
import { useInfiniteLoading } from '@12333/hooks';
import { EnumPagedListOrder } from '@12333/constants';
import * as taskServices from '@12333/services/apiV2/task';
import Taro from '@tarojs/taro';

defineOptions({
  name: 'InnerPage',
@@ -49,6 +51,12 @@
    queryKey: ['taskServices/getPersonalCancelTaskInfos'],
  }
);

function goTaskDetail(item: API.GetPersonalHireTaskInfosQueryResultItem) {
  Taro.navigateTo({
    url: `${RouterPath.taskDetail}?id=${item.id}&from=cancel`,
  });
}
</script>

<style lang="scss">

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

@@ -1,6 +1,12 @@
<template>
  <ContentScrollView style="background-color: transparent">
    <MyTaskCard :showMyTaskArrow="false"></MyTaskCard>
    <MyTaskCard
      :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"
    ></MyTaskCard>
    <div class="taskCheckFileCard-status-title">验收照片</div>
    <InfiniteLoading
      scrollViewClassName="common-infinite-scroll-list task-list"

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

@@ -21,6 +21,7 @@
          >
            {{ GetTaskInfoQueryResultHireButtonText[detail.hireButton] }}
          </div>
          <div v-if="from === 'cancel'" :style="{ color: '#999999' }">已取消</div>
        </template>
        <div class="taskDetail-time">
          {{ dayjs(detail?.beginTime).format('YYYY年MM月DD日') }} 至
@@ -270,8 +271,8 @@
});

function handleHire() {
Taro.navigateTo({
  url: `${RouterPath.taskSubmitCheck}?id=${id}`,
})
  Taro.navigateTo({
    url: `${RouterPath.taskSubmitCheck}?id=${id}`,
  });
}
</script>

 packages/hooks/task.ts

@@ -161,7 +161,7 @@
          rows: 20,
          page: pageParam,
        },
        id: id,
        taskInfoId: id,
      };

      return taskCheckReceiveServices.getCheckReceiveTaskUserSubmits(params, {

 packages/services/apiV2/index.ts

@@ -7,10 +7,10 @@
import * as role from './role';
import * as enterprise from './enterprise';
import * as task from './task';
import * as taskCheckReceive from './taskCheckReceive';
import * as dictionary from './dictionary';
import * as userResume from './userResume';
import * as auth from './auth';
import * as taskCheckReceive from './taskCheckReceive';
import * as resource from './resource';
import * as taskUser from './taskUser';
import * as menu from './menu';
@@ -20,10 +20,10 @@
  role,
  enterprise,
  task,
  taskCheckReceive,
  dictionary,
  userResume,
  auth,
  taskCheckReceive,
  resource,
  taskUser,
  menu,