wupengfei
3 天以前 eac54dd9df883996ac052f77508aa35746e7cc9b
fix: bug
3个文件已添加
2 文件已重命名
8个文件已修改
141 ■■■■■ 已修改文件
apps/bMiniApp/src/subpackages/businessCard/components/BusinessCardDetailInfoView.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/subpackages/task/components/TaskCheckCard.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/app.config.ts 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/constants/router.ts 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/pages/task/InnerPage.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue 105 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/taskUserSubmitCheckHistories.config.ts 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/taskUserSubmitCheckHistories.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/components/src/Card/TaskCheckHistoryCard.vue 补丁 | 查看 | 原始文档 | blame | 历史
packages/components/src/Card/TaskCheckPersonalView.vue 补丁 | 查看 | 原始文档 | blame | 历史
packages/components/src/index.ts 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/subpackages/businessCard/components/BusinessCardDetailInfoView.vue
@@ -27,13 +27,13 @@
</template>
<script setup lang="ts">
import TaskCheckPersonalView from '../../task/components/TaskCheckPersonalView.vue';
import BusinessCardDetailItem from './BusinessCardDetailItem.vue';
import IconWechat from '@/assets/businessCard/icon-wechat.png';
import IconPosition from '@/assets/businessCard/icon-position.png';
import IconEmail from '@/assets/businessCard/icon-email.png';
import IconCompany from '@/assets/businessCard/icon-company.png';
import IconAddress from '@/assets/businessCard/icon-address.png';
import { TaskCheckPersonalView } from '@12333/components';
defineOptions({
  name: 'BusinessCardDetailInfoView',
apps/bMiniApp/src/subpackages/task/components/TaskCheckCard.vue
@@ -59,7 +59,6 @@
</template>
<script setup lang="ts">
import TaskCheckPersonalView from './TaskCheckPersonalView.vue';
import {
  Colors,
  EnumUserGender,
@@ -69,6 +68,7 @@
  EnumGetCheckReceiveTasksQueryResultItemCheckStatus,
  EnumTaskUserSubmitCheckReceiveStatus,
} from '@12333/constants';
import { TaskCheckPersonalView } from '@12333/components';
import { CheckInOrOutEventEnum } from '../constants';
import { Portal } from 'senin-mini/components';
import { ActionSheet } from '@nutui/nutui-taro';
apps/bMiniApp/src/subpackages/task/taskHandleCheckDetail/InnerPage.vue
@@ -36,8 +36,7 @@
import Taro from '@tarojs/taro';
import { useQuery } from '@tanstack/vue-query';
import * as taskCheckReceiveServices from '@12333/services/apiV2/taskCheckReceive';
import TaskCheckPersonalView from '../components/TaskCheckPersonalView.vue';
import { TaskCheckFileCard } from '@12333/components';
import { TaskCheckFileCard, TaskCheckPersonalView } from '@12333/components';
import { Colors, EnumTaskUserSubmitCheckReceiveStatus } from '@12333/constants';
import { Message, setOSSLink } from '@12333/utils';
import dayjs from 'dayjs';
apps/bMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue
@@ -57,8 +57,7 @@
import Taro from '@tarojs/taro';
import * as taskCheckReceiveServices from '@12333/services/apiV2/taskCheckReceive';
import { useInfiniteLoading } from '@12333/hooks';
import TaskCheckHistoryCard from '../components/TaskCheckHistoryCard.vue';
import { ProTabs, ProTabPane } from '@12333/components';
import { ProTabs, ProTabPane, TaskCheckHistoryCard } from '@12333/components';
import {
  EnumTaskUserSubmitCheckHistoryTypeText,
  EnumTaskUserSubmitCheckHistoryTypeColor,
apps/cMiniApp/src/app.config.ts
@@ -120,6 +120,7 @@
        'companyDetail/companyDetail',
        'taskSubmitCheck/taskSubmitCheck',
        'taskCheckDetail/taskCheckDetail',
        'taskUserSubmitCheckHistories/taskUserSubmitCheckHistories',
      ],
    },
    {
apps/cMiniApp/src/constants/router.ts
@@ -14,6 +14,7 @@
  companyDetail = '/subpackages/task/companyDetail/companyDetail',
  taskSubmitCheck = '/subpackages/task/taskSubmitCheck/taskSubmitCheck',
  taskCheckDetail = '/subpackages/task/taskCheckDetail/taskCheckDetail',
  taskUserSubmitCheckHistories = '/subpackages/task/taskUserSubmitCheckHistories/taskUserSubmitCheckHistories',
  // userInfo = '/subpackages/setting/userInfo/userInfo',
  // setting = '/subpackages/setting/setting/setting',
apps/cMiniApp/src/pages/task/InnerPage.vue
@@ -59,9 +59,9 @@
  }
  if (item.checkReceiveMethod === EnumTaskCheckReceiveMethod.CheckIn) {
    if (Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.Completed) {
      // Taro.navigateTo({
      //   url: `${RouterPath.taskUserSubmitCheckHistories}?id=${item.id}&date=${queryState.date}`,
      // });
      Taro.navigateTo({
        url: `${RouterPath.taskUserSubmitCheckHistories}?id=${item.id}&date=${queryState.date}`,
      });
    }
  } else {
    if (
apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/InnerPage.vue
New file
@@ -0,0 +1,105 @@
<template>
  <LoadingLayout>
    <ContentView>
      <ChunkTitle :title="title" />
    </ContentView>
    <ProTabs
      v-model="queryState.type"
      name="taskUserSubmitCheckHistories-tab"
      :showPaneContent="false"
      class="taskUserSubmitCheckHistories-tabs"
      isTransparent
      title-gutter="8"
      title-scroll
    >
      <ProTabPane :title="`全部`" :pane-key="0"></ProTabPane>
      <ProTabPane
        :title="EnumTaskUserSubmitCheckHistoryTypeText[EnumTaskUserSubmitCheckHistoryType.CheckIn]"
        :pane-key="EnumTaskUserSubmitCheckHistoryType.CheckIn"
      ></ProTabPane>
      <ProTabPane
        :title="EnumTaskUserSubmitCheckHistoryTypeText[EnumTaskUserSubmitCheckHistoryType.CheckOut]"
        :pane-key="EnumTaskUserSubmitCheckHistoryType.CheckOut"
      ></ProTabPane>
      <ProTabPane
        :title="
          EnumTaskUserSubmitCheckHistoryTypeText[EnumTaskUserSubmitCheckHistoryType.UnCheckIn]
        "
        :pane-key="EnumTaskUserSubmitCheckHistoryType.UnCheckIn"
      ></ProTabPane>
      <ProTabPane
        :title="
          EnumTaskUserSubmitCheckHistoryTypeText[EnumTaskUserSubmitCheckHistoryType.UnCheckOut]
        "
        :pane-key="EnumTaskUserSubmitCheckHistoryType.UnCheckOut"
      ></ProTabPane>
    </ProTabs>
    <InfiniteLoading
      scrollViewClassName="common-infinite-scroll-list"
      v-bind="infiniteLoadingProps"
    >
      <template #renderItem="{ item }">
        <TaskCheckHistoryCard
          :avatar="setOSSLink(item.avatar)"
          :name="item.name"
          :gender="item.gender"
          :isReal="item.isReal"
          :contactPhoneNumber="item.contactPhoneNumber"
          :type="item.type"
          :checkTime="item.checkTime"
        />
      </template>
    </InfiniteLoading>
  </LoadingLayout>
</template>
<script setup lang="ts">
import Taro from '@tarojs/taro';
import * as taskCheckReceiveServices from '@12333/services/apiV2/taskCheckReceive';
import { useInfiniteLoading } from '@12333/hooks';
import { ProTabs, ProTabPane, TaskCheckHistoryCard } from '@12333/components';
import {
  EnumTaskUserSubmitCheckHistoryTypeText,
  EnumTaskUserSubmitCheckHistoryTypeColor,
  EnumTaskUserSubmitCheckHistoryType,
  WeekCN,
} from '@12333/constants';
import { Message, setOSSLink } from '@12333/utils';
import dayjs from 'dayjs';
defineOptions({
  name: 'InnerPage',
});
const router = Taro.useRouter();
const id = router.params?.id ?? '';
const date = router.params?.date ?? '';
const title = `${dayjs(date).format('YYYY年MM月DD日')} 星期${WeekCN[dayjs(date).day()]}`;
const queryState = reactive({
  type: 0 as any as EnumTaskUserSubmitCheckHistoryType,
});
const { infiniteLoadingProps } = useInfiniteLoading(
  async ({ pageParam }) => {
    let params: API.GetCheckReceiveTaskUserSubmitCheckHistoriesQuery = {
      pageModel: {
        rows: 20,
        page: pageParam,
      },
      taskInfoId: id,
      date: dayjs(date).format('YYYY-MM-DD'),
      type: queryState.type,
    };
    let res = await taskCheckReceiveServices.getCheckReceiveTaskUserSubmitCheckHistories(params, {
      showLoading: false,
    });
    return res;
  },
  {
    queryKey: ['taskCheckReceiveServices/getCheckReceiveTaskUserSubmitCheckHistories', queryState],
  }
);
</script>
apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/taskUserSubmitCheckHistories.config.ts
New file
@@ -0,0 +1,3 @@
export default definePageConfig({
  disableScroll: true,
});
apps/cMiniApp/src/subpackages/task/taskUserSubmitCheckHistories/taskUserSubmitCheckHistories.vue
New file
@@ -0,0 +1,13 @@
<template>
  <PageLayoutWithBg class="taskUserSubmitCheckHistories-page-wrapper" title="验收详情">
    <InnerPage />
  </PageLayoutWithBg>
</template>
<script setup lang="ts">
import InnerPage from './InnerPage.vue';
defineOptions({
  name: 'taskUserSubmitCheckHistories',
});
</script>
packages/components/src/Card/TaskCheckHistoryCard.vue
packages/components/src/Card/TaskCheckPersonalView.vue
packages/components/src/index.ts
@@ -33,6 +33,8 @@
export { default as BindWalletView } from './Card/BindWalletView.vue';
export { default as TaskPrice } from './Card/TaskPrice.vue';
export { default as TaskDetailWelfareItem } from './Card/TaskDetailWelfareItem.vue';
export { default as TaskCheckPersonalView } from './Card/TaskCheckPersonalView.vue';
export { default as TaskCheckHistoryCard } from './Card/TaskCheckHistoryCard.vue';
export { default as FlexJobTopView } from './Card/FlexJobTopView.vue';
export { default as QueryMenuView } from './Menu/QueryMenuView.vue';
export { default as QueryMenuItem } from './Menu/QueryMenuItem.vue';