Merge branch 'master' into dev-1.1.2

wupengfei

9 小时以前 4ef86d8a1f494caa1e136ff78f9ea258d01164b1

 packages/components/src/Card/TaskCard.vue

@@ -4,6 +4,7 @@
      <div class="task-card-title">{{ name }}</div>
      <slot name="title-right">
        <TaskPrice
          v-if="releaseStatus !== EnumTaskReleaseStatus.Stopped"
          :value="toThousand(serviceFee ?? 0)"
          :unit="BillingMethodEnumUnit[billingMethod]"
        />
@@ -25,9 +26,7 @@
        </div>
      </div>
      <div class="task-card-time">
        {{ dayjs(beginTime).format('YYYY年MM月DD日') }}至{{
          dayjs(endTime).format('YYYY年MM月DD日')
        }}
        {{ dayjs(beginTime).format('YYYY年MM月D日') }}至{{ dayjs(endTime).format('YYYY年MM月D日') }}
      </div>
    </slot>
    <div class="task-card-footer">
@@ -37,7 +36,11 @@
      </div>
      <div class="task-card-actions" v-if="showActions">
        <slot name="actions">
          <nut-button v-if="releaseStatus === EnumTaskReleaseStatus.InProcess" type="primary"
          <nut-button
            v-if="releaseStatus === EnumTaskReleaseStatus.InProcess"
            type="primary"
            @click="emit('apply', props.id)"
            :disabled="!!hireStatus"
            >报名</nut-button
          >
        </slot>
@@ -60,6 +63,7 @@
  EnumUserGenderText,
  EnumSettlementCycleText,
  BillingMethodEnumUnit,
  EnumTaskUserHireStatus,
} from '@12333/constants';
import TaskPrice from './TaskPrice.vue';
import { CommonTaskCardProps } from './card';
@@ -116,6 +120,7 @@
  recommendStatus?: EnumTaskRecommendStatus;
  /** 创建时间 */
  createdTime?: string;
  hireStatus?: EnumTaskUserHireStatus;
};

const props = withDefaults(defineProps<Props>(), {