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

zhengyiming

2025-02-19 df7c6af1c1cfd2e9bda249e381aecb5482120d14

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

 apps/cMiniApp/src/subpackages/curriculum/mineCertificateAddOrEdit/InnerPage.vue

@@ -11,12 +11,6 @@
      <nut-form-item label="证书编号:" class="bole-form-item" prop="certificateNumber">
        <nut-input v-model="form.certificateNumber" type="number" placeholder="请输入"> </nut-input>
      </nut-form-item>
      <nut-form-item label="开始日期:" class="bole-form-item" prop="startDate">
        <ChooseInputWithDatePicker v-model="form.startDate"></ChooseInputWithDatePicker>
      </nut-form-item>
      <nut-form-item label="结束日期:" class="bole-form-item" prop="endDate">
        <ChooseInputWithDatePicker v-model="form.endDate"></ChooseInputWithDatePicker>
      </nut-form-item>
      <nut-form-item
        label="永久证书:"
        class="bole-form-item permanent-certificate"
@@ -24,6 +18,12 @@
      >
        <nut-switch v-model="form.isPermanentCertificate" />
      </nut-form-item>
      <nut-form-item label="开始日期:" class="bole-form-item" prop="startDate">
        <ChooseInputWithDatePicker v-model="form.startDate"></ChooseInputWithDatePicker>
      </nut-form-item>
      <nut-form-item label="结束日期:" class="bole-form-item" prop="endDate">
        <ChooseInputWithDatePicker v-model="form.endDate"></ChooseInputWithDatePicker>
      </nut-form-item>
      <nut-form-item label="发证单位:" class="bole-form-item" prop="certificateNumber">
        <nut-input v-model="form.certificateNumber" placeholder="请输入"> </nut-input>
      </nut-form-item>

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

@@ -19,7 +19,7 @@
    :key="queryState.mineHireType"
  >
    <template #renderItem="{ item }">
      <TaskCard>
      <TaskCard @click="goTaskDetail(item)">
        <template #actions>
          <div class="task-card-actions-text" :style="{ color: TaskStatusColor[10] }">
            {{ TaskStatusText[10] }}
@@ -37,6 +37,7 @@
import { useInfiniteLoading } from '@12333/hooks';
import { OrderInputType } from '@12333/constants';
import * as orderServices from '@12333/services/api/Order';
import Taro from '@tarojs/taro';

defineOptions({
  name: 'InnerPage',
@@ -70,6 +71,12 @@
    queryKey: ['orderServices/getFrontOrderList', queryState],
  }
);

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

<style lang="scss">

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

@@ -18,7 +18,7 @@
    :key="queryState.mineSignType"
  >
    <template #renderItem="{ item }">
      <TaskCard>
      <TaskCard @click="goTaskDetail(item)">
        <template #actions>
          <div class="task-card-actions-text" :style="{ color: TaskStatusColor[10] }">
            {{ TaskStatusText[10] }}
@@ -36,6 +36,7 @@
import { useInfiniteLoading } from '@12333/hooks';
import { OrderInputType } from '@12333/constants';
import * as orderServices from '@12333/services/api/Order';
import Taro from '@tarojs/taro';

defineOptions({
  name: 'InnerPage',
@@ -69,6 +70,12 @@
    queryKey: ['orderServices/getFrontOrderList', queryState],
  }
);

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

<style lang="scss">

 packages/components/src/Card/TaskCard.vue

@@ -21,7 +21,7 @@
      </div>
      <div class="task-card-actions" v-if="showActions">
        <slot name="actions">
          <nut-button type="primary">报名</nut-button>
          <nut-button type="primary" @click.stop="handleSign">报名</nut-button>
        </slot>
      </div>
    </div>
@@ -43,6 +43,8 @@
const props = withDefaults(defineProps<Props>(), {
  showActions: true,
});

function handleSign() {}
</script>

<style lang="scss">