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

zhengyiming

3 天以前 5583271e6f5bb7a0dcc8e4876513f23a21a7b25f

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

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

@@ -113,7 +113,7 @@

function goTaskDetail(item: API.GetTaskInfosQueryResultItem) {
  Taro.navigateTo({
    url: `${RouterPath.taskDetail}?id=${item.id}`,
    url: `${RouterPath.taskDetail}?id=${item.id}&from=apply`,
  });
}


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

@@ -44,7 +44,7 @@

function goTaskDetail(id: string) {
  Taro.navigateTo({
    url: `${RouterPath.taskDetail}?id=${id}`,
    url: `${RouterPath.taskDetail}?id=${id}&from=apply`,
  });
}


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

@@ -91,7 +91,7 @@

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

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

@@ -94,7 +94,7 @@

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

 apps/cMiniApp/src/subpackages/task/components/CompanyTaskList.vue

@@ -29,7 +29,7 @@

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

 apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue

@@ -4,10 +4,23 @@
      <Cell :title="detail?.name ?? ''" titleSize="large">
        <template #title-right>
          <img
            v-if="from === 'apply'"
            :src="detail.isCollected ? IconAttentioActive : IconAttention"
            class="taskDetail-attention-icon"
            @click="handleAttention"
          />
          <div
            v-if="from === 'sign'"
            :style="{ color: GetPersonalApplyTaskInfosQueryStatusColor[detail.applyButton] }"
          >
            {{ GetTaskInfoQueryResultApplyButtonText[detail.applyButton] }}
          </div>
          <div
            v-if="from === 'hire'"
            :style="{ color: GetPersonalHireTaskInfosQueryStatusColor[detail.hireButton] }"
          >
            {{ GetTaskInfoQueryResultHireButtonText[detail.hireButton] }}
          </div>
        </template>
        <div class="taskDetail-time">
          {{ dayjs(detail?.beginTime).format('YYYY年MM月DD日') }} 至
@@ -107,40 +120,23 @@
        :isFlex="false"
        @click="handleCall"
      ></PageFooterAction>
      <template v-if="from === 'mine'">
      <PageFooterBtn v-if="from === 'sign'" type="primary" disabled>
        {{ GetTaskInfoQueryResultApplyButtonText[detail.applyButton] }}
      </PageFooterBtn>
        <PageFooterBtn
          v-if="detail.applyButton === GetTaskInfoQueryResultApplyButton.WaitHire"
          color="#999999"
          disabled
          >待确认</PageFooterBtn
        v-if="from === 'hire'"
        type="primary"
        :disabled="detail?.hireButton !== GetTaskInfoQueryResultHireButton.ApplyCheckReceive"
        @click="handleHire"
        >
        <!-- <PageFooterBtn
        v-if="detail.applyButton === GetTaskInfoQueryResultApplyButton.WaitSignContract"
        >去签约</PageFooterBtn
      > -->
        <PageFooterBtn
          v-if="detail.hireButton === GetTaskInfoQueryResultHireButton.InProcess"
          color="#999999"
          disabled
          >进行中</PageFooterBtn
        >
        <!-- <PageFooterBtn
        v-if="detail.hireButton === GetTaskInfoQueryResultHireButton.ApplyCheckReceive"
        >申请验收</PageFooterBtn
      > -->
        <PageFooterBtn
          v-if="detail.hireButton === GetTaskInfoQueryResultHireButton.Completed"
          color="#999999"
          disabled
          >已完成</PageFooterBtn
        >
      </template>
      <template v-else>
        {{ GetTaskInfoQueryResultHireButtonText[detail.hireButton] }}
      </PageFooterBtn>
      <template v-if="from === 'apply'">
        <PageFooterBtn
          v-if="detail?.releaseStatus === EnumTaskReleaseStatus.InProcess"
          type="primary"
          @click="handleApply"
          :disabled="detail?.hireStatus"
          :disabled="!!detail?.hireStatus"
          >{{ `报名（${detail?.applyCount ?? 0}人已报名）` }}</PageFooterBtn
        >

@@ -174,8 +170,10 @@
  EnumSettlementCycleText,
  BillingMethodEnumUnit,
  EnumTaskReleaseStatus,
  EnumTaskUserHireStatus,
  GetTaskInfoQueryResultApplyButton,
  GetPersonalApplyTaskInfosQueryStatusColor,
  GetTaskInfoQueryResultApplyButtonText,
  GetPersonalHireTaskInfosQueryStatusColor,
  GetTaskInfoQueryResultHireButtonText,
  GetTaskInfoQueryResultHireButton,
} from '@12333/constants';
import { useAccessLogin } from '@/hooks';
@@ -270,4 +268,10 @@
    });
  }
});

function handleHire() {
Taro.navigateTo({
  url: `${RouterPath.taskSubmitCheck}?id=${id}`,
})
}
</script>

 packages/constants/task.ts

@@ -10,6 +10,8 @@
  EnumTaskUserHireStatus,
  GetPersonalApplyTaskInfosQueryStatus,
  GetPersonalHireTaskInfosQueryStatus,
  GetTaskInfoQueryResultHireButton,
  GetTaskInfoQueryResultApplyButton,
} from './apiEnum';

export const EnumBillingMethodText = {
@@ -98,3 +100,14 @@
  [GetPersonalHireTaskInfosQueryStatus.InProcess]: '#2A9E1B',
  [GetPersonalHireTaskInfosQueryStatus.Completed]: '#9FA4AC',
};

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

export const GetTaskInfoQueryResultApplyButtonText = {
  [GetTaskInfoQueryResultApplyButton.WaitHire]: '待确认',
  [GetTaskInfoQueryResultApplyButton.WaitSignContract]: '去签约',
};