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

zhengyiming

1 天以前 201ca4f20ce2dd1b2e4c5ec0a7f09f377e923195

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

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

@@ -15,6 +15,9 @@
        :age="item.age"
        :avatar="item.avatar"
        :educationalBackgroundContent="item.educationalBackgroundContent"
        :personalIdentityContent="item.personalIdentityContent"
        :workExperience="item.workExperience"
        :workSeniority="item.workSeniority"
        :taskCount="item.taskCount"
        :showFooterLeft="false"
      >

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

@@ -182,7 +182,7 @@
const { userDetail } = useUser();
const { findAreaNameFromCode } = useAllAreaList();
const router = Taro.useRouter();
const taskId = router.params?.taskId ?? '';
const taskId = router.params?.id ?? '';
const isEdit = !!taskId;
const isCopy = router.params?.isCopy === 'true';
console.log('isCopy: ', router.params?.isCopy);
@@ -272,7 +272,7 @@
      message: '请选择结束日期',
      validator(value) {
        if (!value) return Promise.reject('请选择结束日期');
        if (!dayjs(value).isAfter(dayjs(form.beginTime)))
        if (dayjs(value).isBefore(dayjs(form.beginTime)))
          return Promise.reject('结束日期需大于开始日期');
        return Promise.resolve(true);
      },
@@ -361,7 +361,7 @@
    }
    let res = await taskServices.saveTaskInfo(params);
    if (res) {
      Message.success(isEdit ? '编辑成功' : '发布成功', {
      Message.success(isEdit && !isCopy ? '编辑成功' : '发布成功', {
        onClosed() {
          goBack();
        },

 apps/cMiniApp/src/pages/mine/index.vue

@@ -132,7 +132,9 @@
const bgHeight = computed(() => 133 + systemStore.navHeight);

Taro.useDidShow(() => {
  updateUserInfo();
  if (isLogin.value) {
    updateUserInfo();
  }
});

function goLogin() {

 apps/cMiniApp/src/pages/task/InnerPage.vue

@@ -51,7 +51,10 @@
      url: `${RouterPath.taskSubmitCheck}?id=${item.id}&date=${queryState.date}`,
    });
  }
  if (Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.Completed) {
  if (
    Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.WaitCheckReceive ||
    Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.Completed
  ) {
    Taro.navigateTo({
      url: `${RouterPath.taskCheckDetail}?id=${item.id}`,
    });

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

@@ -9,7 +9,7 @@
        />
      </nut-form-item>
      <nut-form-item label="证书编号:" class="bole-form-item" prop="code">
        <nut-input v-model="form.code" type="text" placeholder="请输入"> </nut-input>
        <nut-input v-model="form.code" type="number" placeholder="请输入"> </nut-input>
      </nut-form-item>
      <nut-form-item
        label="永久证书:"

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

@@ -9,6 +9,7 @@
    title-scroll
  >
    <ProTabPane :title="`全部`" :pane-key="0"></ProTabPane>
    <ProTabPane :title="`待开始`" :pane-key="GetPersonalHireTaskInfosQueryStatus.Wait"></ProTabPane>
    <ProTabPane
      :title="`进行中`"
      :pane-key="GetPersonalHireTaskInfosQueryStatus.InProcess"

 packages/components/src/Calendar/Calendar.vue

@@ -1,7 +1,12 @@
<template>
  <div class="bole-calendar-wrapper">
    <div :class="['bole-calendar-inner', { isCollapse }]">
      <nut-calendar-card v-model="model" class="bole-calendar"></nut-calendar-card>
      <nut-calendar-card
        v-model="model"
        class="bole-calendar"
        ref="calendar"
        @change="handleChange"
      ></nut-calendar-card>
    </div>
    <div :class="['bole-calendar-arrow', { active: !isCollapse }]" @click="toggle">
      <DownArrow :size="12" :class="['bole-calendar-arrow-icon']" />
@@ -12,6 +17,7 @@
<script setup lang="ts">
import { DownArrow } from '@nutui/icons-vue-taro';
import { useToggle } from 'senin-mini/hooks';
import { ref, watch } from 'vue';

defineOptions({
  name: 'Calendar',
@@ -23,6 +29,12 @@
const model = defineModel<Date | Date[]>();

const { isCollapse, toggle } = useToggle(true);

const calendar = ref();
function handleChange(value) {
  console.log('value: ', value);
  console.log('calendar: ', calendar.value);
}
</script>

<style lang="scss">

 packages/components/src/Card/TaskCard.vue

@@ -41,6 +41,7 @@
            v-if="releaseStatus === EnumTaskReleaseStatus.InProcess"
            type="primary"
            @click="emit('apply', props.id)"
            :disabled="!!hireStatus"
            >报名</nut-button
          >
        </slot>
@@ -63,6 +64,7 @@
  EnumUserGenderText,
  EnumSettlementCycleText,
  BillingMethodEnumUnit,
  EnumTaskUserHireStatus,
} from '@12333/constants';
import TaskPrice from './TaskPrice.vue';
import { CommonTaskCardProps } from './card';
@@ -119,6 +121,7 @@
  recommendStatus?: EnumTaskRecommendStatus;
  /** 创建时间 */
  createdTime?: string;
  hireStatus?: EnumTaskUserHireStatus;
};

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

 packages/constants/task.ts

@@ -81,17 +81,20 @@
};

export const GetPersonalHireTaskInfosQueryStatusText = {
  [GetPersonalHireTaskInfosQueryStatus.Wait]: '待开始',
  [GetPersonalHireTaskInfosQueryStatus.InProcess]: '进行中',
  [GetPersonalHireTaskInfosQueryStatus.Completed]: '已完成',
};

export const GetPersonalHireTaskInfosQueryStatusColor = {
  [GetPersonalHireTaskInfosQueryStatus.Wait]: '#9FA4AC',
  [GetPersonalHireTaskInfosQueryStatus.InProcess]: '#2A9E1B',
  [GetPersonalHireTaskInfosQueryStatus.Completed]: '#9FA4AC',
};

export const GetTaskInfoQueryResultHireButtonText = {
  [GetTaskInfoQueryResultHireButton.ApplyCheckReceive]: '申请验收',
  [GetTaskInfoQueryResultHireButton.Wait]: '待开始',
  [GetTaskInfoQueryResultHireButton.InProcess]: '进行中',
  [GetTaskInfoQueryResultHireButton.Completed]: '已完成',
};

 packages/hooks/task.ts

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

      return taskCheckReceiveServices.getCheckReceiveTaskUserSubmits(params, {