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

zhengyiming

2 天以前 0e2cd06ac9a66da506a23002799cf2a398ff7c4c

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

 apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManage/InnerPage.vue

@@ -40,6 +40,7 @@
        :supplierEnterpriseName="item.supplierEnterpriseName"
        :address-detail="item.addressDetail"
        :appointmentStatus="item.appointmentStatus"
        :payAmount="item.payAmount"
        @click="goDetail(item)"
      >
        <template #serviceCustome>

 apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManageDetail/InnerPage.vue

@@ -21,16 +21,21 @@
      </template>
    </MineServiceDetailView>
  </ContentScrollView>
  <PageFooter
    v-if="
      detail?.appointmentStatus === EnumStandardOrderAppointmentStatus.WaitSure &&
      detail?.payStatus !== EnumStandardOrderPayStatus.Completed
    "
  >
    <PageFooterBtn class="business-card-btn" @click="cancelStandardOrderAppointment"
  <PageFooter>
    <PageFooterBtn
      v-if="detail?.appointmentStatus === EnumStandardOrderAppointmentStatus.WaitSure"
      class="business-card-btn"
      @click="cancelStandardOrderAppointment"
      >取消预约</PageFooterBtn
    >
    <PageFooterBtn type="primary" class="business-card-btn" @click="handleSubmit"
    <PageFooterBtn
      v-if="
        detail?.appointmentStatus === EnumStandardOrderAppointmentStatus.WaitSure &&
        detail?.payStatus === EnumStandardOrderPayStatus.Completed
      "
      type="primary"
      class="business-card-btn"
      @click="handleSubmit"
      >确认预约</PageFooterBtn
    >
  </PageFooter>

 apps/bStandardMiniApp/src/subpackages/orderManage/orderManage/InnerPage.vue

@@ -31,6 +31,7 @@
        :end-time="item.endTime"
        :supplierEnterpriseName="item.supplierEnterpriseName"
        :address-detail="item.addressDetail"
        :payAmount="item.payAmount"
        @click="goOrderDetail(item)"
      >
        <template #status>

 apps/cStandardMiniApp/src/app.config.ts

@@ -1,6 +1,6 @@
export default defineAppConfig({
  entryPagePath: 'pages/home/index',
  pages: ['pages/home/index', 'pages/task/task', 'pages/mine/index'],
  entryPagePath: 'pages/mine/index',
  pages: ['pages/task/task', 'pages/mine/index'],
  requiredPrivateInfos: ['getLocation', 'chooseLocation'],
  permission: {
    'scope.userLocation': {
@@ -19,12 +19,12 @@
  },
  tabBar: {
    list: [
      {
        pagePath: 'pages/home/index',
        iconPath: 'assets/tabbar/icon-home.png',
        selectedIconPath: 'assets/tabbar/icon-home-active.png',
        text: '首页',
      },
      // {
      //   pagePath: 'pages/home/index',
      //   iconPath: 'assets/tabbar/icon-home.png',
      //   selectedIconPath: 'assets/tabbar/icon-home-active.png',
      //   text: '首页',
      // },
      {
        pagePath: 'pages/task/task',
        iconPath: 'assets/tabbar/icon-task.png',

 apps/cStandardMiniApp/src/constants/router.ts

@@ -5,7 +5,7 @@
  privacyPolicy = '/subpackages/login/privacyPolicy/privacyPolicy',
  loginByForm = '/subpackages/login/loginByForm/loginByForm',
  registerForm = '/subpackages/login/registerForm/registerForm',
  home = '/pages/home/index',
  // home = '/pages/home/index',
  task = '/pages/task/task',
  mine = '/pages/mine/index',
  editRichContent = '/subpackages/editRichContent/editRichContent',

 apps/cStandardMiniApp/src/constants/tabBar.ts

@@ -1,11 +1,11 @@
export const TabBarPageRouter = {
  Home: '/pages/home/index',
  // Home: '/pages/home/index',
  Task: '/pages/task/task',
  Mine: '/pages/mine/index',
};

export const TabBarPageRouterList = [
  TabBarPageRouter.Home,
  // TabBarPageRouter.Home,
  TabBarPageRouter.Task,
  TabBarPageRouter.Mine,
];

 apps/cStandardMiniApp/src/custom-tab-bar/index.tsx

@@ -49,7 +49,7 @@
  click: (url: string, index: number) => typeof url === 'string',
};

const whitePageList = [RouterPath.home, RouterPath.mine];
const whitePageList = [RouterPath.task, RouterPath.mine];

export default {
  name: 'CustomTabBar',
@@ -104,7 +104,7 @@
          Message.confirm({ message: '请前往登录' })
            .then(() => {
              Taro.navigateTo({
                url: `${RouterPath.authorization}?redirect=${RouterPath.home}`,
                url: `${RouterPath.authorization}?redirect=${RouterPath.task}`,
              });
            })
            .finally(() => {
@@ -129,27 +129,15 @@
          }}
        >
          <TarBarItem
            text={'找工作'}
            icon="../assets/tabbar/icon-home.png"
            activeIcon="../assets/tabbar/icon-home-active.png"
            pagePath={TabBarPageRouter.Home}
            currentPath={_router.path}
            index={0}
            active={system.activeTab === 0}
            className="home"
            onClick={switchTab}
          ></TarBarItem>

          <TarBarItem
            text="任务"
            icon="../assets/tabbar/icon-task.png"
            activeIcon="../assets/tabbar/icon-task-active.png"
            pagePath={TabBarPageRouter.Task}
            currentPath={_router.path}
            active={system.activeTab === 1}
            active={system.activeTab === 0}
            className="task"
            onClick={switchTab}
            index={1}
            index={0}
          ></TarBarItem>
          <TarBarItem
            text="我的"
@@ -157,10 +145,10 @@
            activeIcon="../assets/tabbar/icon-mine-active.png"
            pagePath={TabBarPageRouter.Mine}
            currentPath={_router.path}
            active={system.activeTab === 2}
            active={system.activeTab === 1}
            className="mine"
            onClick={switchTab}
            index={2}
            index={1}
          ></TarBarItem>
        </View>
      );

 apps/cStandardMiniApp/src/stores/modules/system.ts

@@ -25,7 +25,7 @@
  state: () => ({
    options: {} as Options,

    activeTab: 0,
    activeTab: 1,

    info: {} as Taro.getSystemInfoSync.Result,


 apps/cStandardMiniApp/src/utils/page.ts

@@ -18,8 +18,8 @@

export function goHome() {
  const systemStore = useSystemStoreWithOut();
  systemStore.setTabIndex(0);
  systemStore.setTabIndex(1);
  Taro.switchTab({
    url: '/pages/home/index',
    url: '/pages/mine/index',
  });
}

 apps/housekeepingMiniApp/project.private.config.json

@@ -26,8 +26,8 @@
                    "name": "订单详情",
                    "pathName": "subpackages/mine/mineOrderDetail/mineOrderDetail",
                    "query": "id=d16809d3-e6b9-4b5f-2e87-08de443f2678",
                    "scene": null,
                    "launchMode": "default"
                    "launchMode": "default",
                    "scene": null
                },
                {
                    "name": "取消原因",

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

@@ -1,5 +1,5 @@
<template>
  <PageLayoutWithBg class="index-page-wrapper" :title="'首页'" :need-auth="false">
  <PageLayoutWithBg class="index-page-wrapper" :title="'淘闪工'" :need-auth="false">
    <!-- <template #left>
      <div class="menu-btn-wrapper menu-logo">
        <img :src="IconLogo" class="logo" />

 apps/housekeepingMiniApp/src/subpackages/mine/editAddress/InnerPage.vue

@@ -55,6 +55,7 @@
});

const router = Taro.useRouter();
const { userDetail } = useUser();
const id = router.params?.id ?? '';
const isCopy = router.params?.isCopy === 'true';
const isEdit = !!id;
@@ -73,7 +74,7 @@
});

const rules = reactive<FormRules>({
  // name: [{ required: true, message: '请输入姓名' }],
  name: [{ required: true, message: '请输入姓名' }],
  contactPhoneNumber: [
    { required: true, message: '请输入手机号' },
    { validator: FormValidator.validatorPhoneNumber, message: '请输入正确的手机号' },
@@ -113,6 +114,7 @@
      countyCode: data.areaCode,
      latitude: data.latitude,
      longitude: data.longitude,
      addressName: data.addressName,
      address: data.addressName,
    };
    form.addressDetail = data.addressDetail;

 apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue

@@ -313,7 +313,7 @@
  } catch (error) {
  } finally {
    Taro.redirectTo({
      url: `${RouterPath.mineOrderDetail}?id=${orderId}`,
      url: `${RouterPath.serciceDetail}?id=${id}`,
    });
  }
}

 apps/housekeepingMiniApp/src/subpackages/sercice/serciceDetail/serciceDetail.vue

@@ -237,5 +237,11 @@
  .serciceDetail-content-list {
    margin-bottom: 20px;
  }

  .serciceDetail-recommend-list {
    display: grid;
    grid-template-columns: repeat(2, 1fr);
    grid-gap: 20px;
  }
}
</style>

 packages/hooks/standardOrder.ts

@@ -124,16 +124,16 @@
        },
      };

      if (queryState.appointmentStatus) {
      if (Number(queryState.appointmentStatus)) {
        params.appointmentStatus = queryState.appointmentStatus;
      }
      if (queryState.payStatus) {
      if (Number(queryState.payStatus)) {
        params.payStatus = queryState.payStatus;
      }
      if (queryState.partAEnterpriseOrderStatus) {
      if (Number(queryState.partAEnterpriseOrderStatus)) {
        params.partAEnterpriseOrderStatus = queryState.partAEnterpriseOrderStatus;
      }
      if (queryState.supplierEnterpriseOrderStatus) {
      if (Number(queryState.supplierEnterpriseOrderStatus)) {
        params.supplierEnterpriseOrderStatus = queryState.supplierEnterpriseOrderStatus;
      }