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

zhengyiming

昨天 ba52f84dac4284c4593c80d77595fd99664a7f7c

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

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

@@ -46,6 +46,7 @@
const { queryState, infiniteLoadingProps } = useCheckReceiveTasks();

function goSubmitTaskDetail(item: API.GetCheckReceiveTasksQueryResultItem) {
  console.log('queryState.date: ', queryState.date);
  if (Number(queryState.checkReceiveStatus) === EnumTaskCheckReceiveStatus.WaitSubmit) {
    Taro.navigateTo({
      url: `${RouterPath.taskSubmitCheck}?id=${item.id}&date=${queryState.date}`,

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

@@ -3,33 +3,32 @@
    <div v-if="isCertified" class="companyInfo-info-wrapper">
      <div class="companyInfo-info-item">
        <div class="companyInfo-info-item-label">企业名称</div>
        <div class="companyInfo-info-item-content">{{ enterpriseDetail.enterpriseName }}</div>
        <div class="companyInfo-info-item-content">{{ enterpriseDetail?.enterpriseName }}</div>
      </div>
      <div class="companyInfo-info-item">
        <div class="companyInfo-info-item-label">统一社会信用代码</div>
        <div class="companyInfo-info-item-content">{{ enterpriseDetail.societyCreditCode }}</div>
        <div class="companyInfo-info-item-content">{{ enterpriseDetail?.societyCreditCode }}</div>
      </div>
      <div class="companyInfo-info-item">
        <div class="companyInfo-info-item-label">注册资本</div>
        <div class="companyInfo-info-item-content">捌佰万元整</div>
        <div class="companyInfo-info-item-content">{{ enterpriseDetail?.registeredCapital }}</div>
      </div>
      <div class="companyInfo-info-item">
        <div class="companyInfo-info-item-label">企业类型</div>
        <div class="companyInfo-info-item-content">有限责任公司（自然人投资或控股 的法人独资）</div>
        <div class="companyInfo-info-item-content">{{ enterpriseDetail?.enterpriseType }}</div>
      </div>
      <div class="companyInfo-info-item">
        <div class="companyInfo-info-item-label">成立日期</div>
        <div class="companyInfo-info-item-content">2024年11月11日</div>
        <div class="companyInfo-info-item-content">{{ enterpriseDetail?.establishmentDate }}</div>
      </div>
      <div class="companyInfo-info-item">
        <div class="companyInfo-info-item-label">企业地址</div>
        <div class="companyInfo-info-item-content">江西省九江市共青城市xx路xx号xx xxxx</div>
        <div class="companyInfo-info-item-content">{{ enterpriseDetail?.address }}</div>
      </div>
      <div class="companyInfo-info-item">
        <div class="companyInfo-info-item-label">经营范围</div>
        <div class="companyInfo-info-item-content">
          我是营业执照上的经营范围信息我 是营业执照上的经营范围信息我是
          营业执照上的经营范围信息我是营 业执照上的经营范围信息我是营业 执照上的经营范围信息
          {{ enterpriseDetail?.mainBusiness }}
        </div>
      </div>
    </div>

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

@@ -41,7 +41,7 @@
            :unit="BillingMethodEnumUnit[detail.billingMethod]"
          />
        </div>
        <div class="taskDetail-address-wrapper">
        <div class="taskDetail-address-wrapper" @click="goMap">
          <div class="taskDetail-address-title-wrapper">
            <img :src="IconLocaltion" class="taskDetail-address-title-icon" />
            <div class="taskDetail-address-title">{{ detail?.addressName ?? '' }}</div>
@@ -275,4 +275,12 @@
    url: `${RouterPath.taskSubmitCheck}?id=${id}`,
  });
}

function goMap() {
  Taro.openLocation({
    latitude: detail.value?.latitude,
    longitude: detail.value?.longitude,
    scale: 18,
  });
}
</script>

 packages/components/src/Calendar/Calendar.vue

@@ -4,8 +4,6 @@
      <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">
@@ -29,12 +27,6 @@
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/hooks/enterprise.ts

@@ -1,5 +1,5 @@
import { useQuery, useQueryClient } from '@tanstack/vue-query';
import * as enterpriseServices from '@12333/services/apiV2/enterprise';
import * as taskServices from '@12333/services/apiV2/task';
import { MaybeRef, unref } from 'vue';

type UseEnterpriseDetailOptions = {
@@ -8,16 +8,16 @@

export function useEnterpriseDetail({ id }: UseEnterpriseDetailOptions) {
  const { data, refetch, isLoading, isError } = useQuery({
    queryKey: ['enterpriseServices/getEnterprise', id],
    queryKey: ['taskServices/getTaskEnterprise', id],
    queryFn: async () => {
      return await enterpriseServices.getEnterprise(
      return await taskServices.getTaskEnterprise(
        { id: unref(id) },
        {
          showLoading: false,
        }
      );
    },
    placeholderData: () => ({} as API.GetEnterpriseQueryResult),
    placeholderData: () => ({} as API.GetTaskEnterpriseQueryResult),
  });

  return {