zhengyiming
3 天以前 05b114a7408b1cf2868db92185be3f6f3819bf55
fix: bug
6个文件已修改
71 ■■■■ 已修改文件
apps/cMiniApp/src/pages/task/InnerPage.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/components/src/Calendar/Calendar.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/components/src/Card/MyTaskCard.vue 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/constants/apiEnum.ts 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/services/apiV2/typings.d.ts 45 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/pages/task/InnerPage.vue
@@ -28,6 +28,7 @@
          :addressName="item.addressName"
          :begin-time="item.beginTime"
          :end-time="item.endTime"
          showActions
          @click="goSubmitTaskDetail(item)"
        />
      </template>
apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
@@ -97,12 +97,7 @@
          ></CompanyDesc>
        </CellChunk>
      </Cell>
      <Cell>
        <template #title>
          <div class="safe-cell-title-wrapper">
            <div class="safe-cell-title">任务描述</div>
          </div>
        </template>
      <Cell title="任务描述">
        <div class="safe-cell-content">{{ detail?.description ?? '' }}</div>
      </Cell>
      <Cell>
packages/components/src/Calendar/Calendar.vue
@@ -39,7 +39,6 @@
      scrollView?.scrollIntoView?.('.nut-calendarcard-day.current.active');
    }
  });
  console.log('222', 223);
});
</script>
packages/components/src/Card/MyTaskCard.vue
@@ -1,5 +1,5 @@
<template>
  <TaskCard v-bind="props" :show-actions="false" class="my-task-card-wrapper">
  <TaskCard v-bind="props" class="my-task-card-wrapper">
    <template #title-right>
      <RectRight :size="12" class="my-task-card-arrow" v-if="showMyTaskArrow" />
      <div v-else></div>
@@ -10,6 +10,10 @@
      }}
    </div>
    <div v-else></div>
    <template #actions>
      <div>已签到</div>
    </template>
  </TaskCard>
</template>
@@ -31,11 +35,14 @@
  beginTime?: string;
  endTime?: string;
  addressName?: string;
  showActions?: boolean;
};
const props = withDefaults(defineProps<Props>(), {
  showMyTaskArrow: true,
  showTime: true,
  showActions: false,
});
</script>
packages/constants/apiEnum.ts
@@ -533,6 +533,14 @@
  Complete = 20,
}
/** 任务用户报名状态 */
export enum EnumTaskUserApplyStatus {
  /**未报名 */
  None = 10,
  /**已报名 */
  Completed = 20,
}
/** 任务用户安排状态 */
export enum EnumTaskUserArrangeStatus {
  /**未安排 */
packages/services/apiV2/typings.d.ts
@@ -559,8 +559,16 @@
  interface EditTaskSettlementOrderRosterCommand {
    /** 名单Id */
    id?: string;
    /** 累计工时 */
    totalWorkHours?: number;
    /** 服务费(元) */
    serviceFee?: number;
    /** 超时(小时) */
    timeoutHours?: number;
    /** 超时费用(元) */
    timeoutFee?: number;
    /** 其他费用(元) */
    otherFee?: number;
    /** 备注 */
    remark?: string;
    /** 结算金额 */
    settlementAmount: number;
    /** 实发金额 */
@@ -1123,6 +1131,13 @@
    Wait = 10,
    /**已安排 */
    Complete = 20,
  }
  enum EnumTaskUserApplyStatus {
    /**未报名 */
    None = 10,
    /**已报名 */
    Completed = 20,
  }
  enum EnumTaskUserArrangeStatus {
@@ -4922,6 +4937,7 @@
    releaseStatus?: EnumTaskReleaseStatus;
    recommendStatus?: EnumTaskRecommendStatus;
    checkReceiveStatus?: EnumTaskCheckReceiveStatus;
    applyStatus?: EnumTaskUserApplyStatus;
    pageModel?: PagedListQueryPageModel;
  }
@@ -5849,14 +5865,22 @@
    /** 是否实名 */
    isReal?: boolean;
    realMethod?: EnumUserRealMethod;
    /** 累计工时 */
    totalWorkHours?: number;
    /** 所属银行 */
    bank?: string;
    /** 开户支行名称 */
    bankBranch?: string;
    /** 收款账户 */
    receiveAccount?: string;
    /** 服务费(元) */
    serviceFee?: number;
    /** 超时(小时) */
    timeoutHours?: number;
    /** 超时费用(元) */
    timeoutFee?: number;
    /** 其他费用(元) */
    otherFee?: number;
    /** 备注 */
    remark?: string;
    /** 结算金额 */
    settlementAmount?: number;
    /** 实发金额 */
@@ -6114,6 +6138,7 @@
    checkReceiveStatus?: EnumTaskCheckReceiveStatus;
    /** 是否收藏 */
    isCollected?: boolean;
    applyStatus?: EnumTaskUserApplyStatus;
    pageModel?: PagedListQueryPageModel;
  }
@@ -6717,18 +6742,26 @@
    identity?: string;
    /** 手机号 */
    contactPhoneNumber?: string;
    /** 累计工时 */
    totalWorkHours?: number;
    /** 所属银行 */
    bank?: string;
    /** 所属支行 */
    bankBranch?: string;
    /** 收款账户 */
    receiveAccount?: string;
    /** 服务费(元) */
    serviceFee?: number;
    /** 超时(小时) */
    timeoutHours?: number;
    /** 超时费用(元) */
    timeoutFee?: number;
    /** 其他费用(元) */
    otherFee?: number;
    /** 结算金额 */
    settlementAmount?: number;
    /** 实发金额 */
    actualSettlementAmount?: number;
    /** 备注 */
    remark?: string;
  }
  interface InviteElectronSignCommand {