zhengyiming
3 天以前 e3d4c3426c86392e27df63300b601507b32f5c7e
fix: 灵工管理
5个文件已添加
15个文件已修改
200 ■■■■ 已修改文件
apps/bMiniApp/src/assets/icon-developing.png 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/components/Layout/PageLayout.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/components/Layout/PageLayoutWithBg.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/hooks/user.ts 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/pages/mine/index.vue 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/subpackages/authentication/authenticationHome/authenticationHome.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/subpackages/authentication/hooks/index.ts 56 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/subpackages/businessCard/businessCard/businessCard.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/subpackages/mine/mineContactRecord/mineContactRecord.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/assets/icon-developing.png 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/components/Layout/PageLayout.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/cMiniApp/src/components/Layout/PageLayoutWithBg.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/components/assets/icon-developing.png 补丁 | 查看 | 原始文档 | blame | 历史
packages/components/src/Layout/DevelopingLayout.vue 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/components/src/index.ts 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/hooks/setting.ts 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/utils/developing.ts 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/utils/index.ts 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/utils/link.ts 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
types/api.d.ts 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/assets/icon-developing.png
apps/bMiniApp/src/components/Layout/PageLayout.vue
@@ -16,6 +16,8 @@
      </slot>
      <div class="page-layout-scroll-view-wrapper" :style="{ height: scrollViewHeight }">
        <DevelopingLayout v-if="developing"></DevelopingLayout>
        <template v-else>
        <slot :scrollViewHeight="scrollViewHeight" v-if="isAuth"></slot>
        <!-- <template v-if="isAuth">
          <slot v-if="useView" :scrollViewHeight="scrollViewHeight"></slot>
@@ -28,6 +30,7 @@
            <slot :scrollViewHeight="scrollViewHeight"></slot>
          </scroll-view>
        </template> -->
        </template>
      </div>
      <div v-if="!pageHeightWithTabBar" class="safe-area-bottom"></div>
    </div>
@@ -45,6 +48,7 @@
import { useAuth } from '@/hooks';
import { Portal } from 'senin-mini/components';
import { usePickProps } from 'senin-mini/hooks';
import { DevelopingLayout } from '@12333/components';
defineOptions({
  name: 'PageLayout',
@@ -69,6 +73,10 @@
    type: Number,
    default: 388,
  },
  developing: {
    type: Boolean,
    default: false,
  },
});
const _commonNavigationBarProps = usePickProps(props, commonNavigationBarProps);
apps/bMiniApp/src/components/Layout/PageLayoutWithBg.vue
@@ -28,6 +28,7 @@
type Props = {
  title?: string;
  developing?: boolean;
};
const props = withDefaults(defineProps<Props>(), {});
apps/bMiniApp/src/hooks/user.ts
@@ -31,7 +31,7 @@
  // });
  const isCertified = computed(() => {
    return userDetail.value?.frontStatus === UserCertificationFrontStatus.Certified;
    return false;
  });
  return {
apps/bMiniApp/src/pages/mine/index.vue
@@ -26,16 +26,16 @@
              </div>
              <div class="user-info-item">
                <template v-if="isCertified">
                  <div class="user-info-unCertified-text">未认证</div>
                  <div class="user-info-unCertified-btn" @click.stop="goAuthentication">
                    立即认证
                  </div>
                </template>
                <template v-else>
                  <div class="user-info-certified-text">
                    {{ userDetail?.customerName ?? '123' }}
                  </div>
                  <div class="user-info-certified-btn">已认证</div>
                </template>
                <template v-else>
                  <div class="user-info-unCertified-text">未认证</div>
                  <div class="user-info-unCertified-btn" @click.stop="goAuthentication">
                    立即认证
                  </div>
                </template>
              </div>
            </div>
@@ -48,7 +48,7 @@
            <div class="mine-business-card-item-text">我的电子名片</div>
          </div>
          <div class="mine-business-card-btn">
            <nut-button type="info">递名片</nut-button>
            <nut-button type="info" @click="goBusinessCard">递名片</nut-button>
          </div>
        </div>
      </UserHomeTopView>
@@ -56,13 +56,13 @@
        <div class="mine-content-record">
          <div class="mine-content-record-item" @click="goMineFavorites">
            <img class="mine-content-record-item-icon" :src="IconCollect" alt="" />
            <nut-badge top="0" right="0" :value="8" color="#FF7D00">
            <nut-badge top="0" right="0" :value="8" color="#FF7D00" hidden>
              <div class="mine-content-record-item-text">我的收藏</div>
            </nut-badge>
          </div>
          <div class="mine-content-record-item" @click="goMineContactRecord">
            <img class="mine-content-record-item-icon" :src="IconRecord" alt="" />
            <nut-badge top="0" right="0" :value="8" color="#FF7D00">
            <nut-badge top="0" right="0" :value="8" color="#FF7D00" hidden>
              <div class="mine-content-record-item-text">联系记录</div>
            </nut-badge>
          </div>
@@ -70,7 +70,11 @@
        <Cell :title="'更多服务'" class="mine-content-service">
          <div class="mine-content-service-list">
            <TaskDetailWelfareItem :icon="IconFinance" text="财务管理"></TaskDetailWelfareItem>
            <TaskDetailWelfareItem :icon="IconRealName" text="企业实名"></TaskDetailWelfareItem>
            <TaskDetailWelfareItem
              :icon="IconRealName"
              text="企业实名"
              @click.stop="goAuthentication"
            ></TaskDetailWelfareItem>
            <TaskDetailWelfareItem
              :icon="IconSetting"
              text="设置"
apps/bMiniApp/src/subpackages/authentication/authenticationHome/authenticationHome.vue
@@ -1,5 +1,5 @@
<template>
  <PageLayout class="authenticationHome-page-wrapper">
  <PageLayout class="authenticationHome-page-wrapper" developing>
    <template #navigationBar>
      <TransparentNavigationBar title="实名认证" :is-absolute="false"></TransparentNavigationBar>
    </template>
apps/bMiniApp/src/subpackages/authentication/hooks/index.ts
@@ -10,7 +10,7 @@
  UserCertificationPayType,
} from '@12333/constants';
import { FormValidator, Message } from '@12333/utils';
// import { useUserCertificationSetting } from '@12333/hooks';
import { useUserCertificationSetting } from '@12333/hooks';
import Taro from '@tarojs/taro';
type UseAuthenticationFlowOptions = {
@@ -158,32 +158,32 @@
  };
}
// export function useDownloadPowerAttorneyTemplate() {
//   // const { userCertificationSetting } = useUserCertificationSetting();
export function useDownloadPowerAttorneyTemplate() {
  const { userCertificationSetting } = useUserCertificationSetting();
//   function downloadPowerAttorneyTemplate() {
//     Taro.showLoading({
//       title: '下载中',
//     });
//     Taro.downloadFile({
//       url: userCertificationSetting.value.enterprisePowerAttorneyTempPath,
//       success: function (res) {
//         Taro.hideLoading();
//         // Message.success('下载成功');
//         var filePath = res.tempFilePath;
//         Taro.openDocument({
//           filePath: filePath,
//           showMenu: true,
//         });
//       },
//       fail: function (error: any) {
//         Taro.hideLoading();
//         Message.error('下载失败');
//       },
//     });
//   }
  function downloadPowerAttorneyTemplate() {
    Taro.showLoading({
      title: '下载中',
    });
    Taro.downloadFile({
      url: userCertificationSetting.value.enterprisePowerAttorneyTempPath,
      success: function (res) {
        Taro.hideLoading();
        // Message.success('下载成功');
        var filePath = res.tempFilePath;
        Taro.openDocument({
          filePath: filePath,
          showMenu: true,
        });
      },
      fail: function (error: any) {
        Taro.hideLoading();
        Message.error('下载失败');
      },
    });
  }
//   return {
//     downloadPowerAttorneyTemplate,
//   };
// }
  return {
    downloadPowerAttorneyTemplate,
  };
}
apps/bMiniApp/src/subpackages/businessCard/businessCard/businessCard.vue
@@ -1,5 +1,5 @@
<template>
  <PageLayoutWithBg class="businessCard-page-wrapper" :title="'电子名片'">
  <PageLayoutWithBg class="businessCard-page-wrapper" :title="'电子名片'" developing>
    <InnerPage></InnerPage>
  </PageLayoutWithBg>
</template>
apps/bMiniApp/src/subpackages/mine/mineContactRecord/mineContactRecord.vue
@@ -1,5 +1,5 @@
<template>
  <PageLayoutWithBg class="mineContactRecord-page-wrapper" :title="'联系记录'">
  <PageLayoutWithBg class="mineContactRecord-page-wrapper" :title="'联系记录'" developing>
    <InnerPage></InnerPage>
  </PageLayoutWithBg>
</template>
apps/cMiniApp/src/assets/icon-developing.png
apps/cMiniApp/src/components/Layout/PageLayout.vue
@@ -16,6 +16,8 @@
      </slot>
      <div class="page-layout-scroll-view-wrapper" :style="{ height: scrollViewHeight }">
        <DevelopingLayout v-if="developing"></DevelopingLayout>
        <template v-else>
        <slot :scrollViewHeight="scrollViewHeight" v-if="isAuth"></slot>
        <!-- <template v-if="isAuth">
          <slot v-if="useView" :scrollViewHeight="scrollViewHeight"></slot>
@@ -28,6 +30,7 @@
            <slot :scrollViewHeight="scrollViewHeight"></slot>
          </scroll-view>
        </template> -->
        </template>
      </div>
      <div v-if="!pageHeightWithTabBar" class="safe-area-bottom"></div>
    </div>
@@ -45,6 +48,7 @@
import { useAuth } from '@/hooks';
import { Portal } from 'senin-mini/components';
import { usePickProps } from 'senin-mini/hooks';
import { DevelopingLayout } from '@12333/components';
defineOptions({
  name: 'PageLayout',
@@ -69,6 +73,10 @@
    type: Number,
    default: 388,
  },
  developing: {
    type: Boolean,
    default: false,
  },
});
const _commonNavigationBarProps = usePickProps(props, commonNavigationBarProps);
apps/cMiniApp/src/components/Layout/PageLayoutWithBg.vue
@@ -28,6 +28,7 @@
type Props = {
  title?: string;
  developing?: boolean;
};
const props = withDefaults(defineProps<Props>(), {});
packages/components/assets/icon-developing.png
packages/components/src/Layout/DevelopingLayout.vue
New file
@@ -0,0 +1,48 @@
<template>
  <div class="developing-layout">
    <div class="developing-layout-inner">
      <img :src="IconDeveloping" class="developing-layout-icon" />
      <div class="developing-layout-text">功能开发中...</div>
    </div>
  </div>
</template>
<script setup lang="ts">
import IconDeveloping from '@/assets/icon-developing.png';
defineOptions({
  name: 'DevelopingLayout',
});
// type Props = {};
// const props = withDefaults(defineProps<Props>(), {});
</script>
<style lang="scss">
@import '@/styles/common.scss';
.developing-layout {
  height: 100%;
  display: flex;
  align-items: center;
  justify-content: center;
  .developing-layout-inner {
    display: flex;
    flex-direction: column;
    align-items: center;
    .developing-layout-icon {
      width: 240px;
      height: 240px;
      margin-bottom: 26px;
    }
    .developing-layout-text {
      font-size: 32px;
      color: boleGetCssVar('text-color', 'primary');
    }
  }
}
</style>
packages/components/src/index.ts
@@ -38,3 +38,4 @@
export { default as JobTagList } from './Tag/JobTagList.vue';
export { default as CommonInputField } from './Input/CommonInputField.vue';
export { default as PositionSelectView } from './AreaTreeSelect/PositionSelectView.vue';
export { default as DevelopingLayout } from './Layout/DevelopingLayout.vue';
packages/hooks/setting.ts
@@ -1,5 +1,5 @@
import { useQuery } from '@tanstack/vue-query';
import { MaybeRef, Ref, unref } from 'vue';
import { MaybeRef, Ref, unref, ref } from 'vue';
import { BusinessSettingType, TempFolderPath } from '@12333/constants';
type UseBusinessSettingByTypeOptions<T extends object = object, TData = T> = {
@@ -44,7 +44,7 @@
  offlinePayEndDays: number;
};
// export function useUserCertificationSetting() {
export function useUserCertificationSetting() {
//   const { businessSetting } = useBusinessSettingByType<UserCertificationSetting>({
//     type: BusinessSettingType.UserCertification,
//     select(data: any) {
@@ -56,7 +56,20 @@
//       };
//     },
//   });
//   return {
//     userCertificationSetting: businessSetting,
//   };
// }
  const businessSetting = ref({
    authenticationHelpUrl: '',
    receivingAccount: '',
    receivingCompanyName: '',
    receivingBankName: '',
    offlinePayEndTime: '',
    offlinePayEndDays: 1,
    enterprisePowerAttorneyTempPath: `${TempFolderPath}`,
    idPhoteTempPath: `${TempFolderPath}`,
    payAmount: 123,
  });
  return {
    userCertificationSetting: businessSetting,
  };
}
packages/utils/developing.ts
New file
@@ -0,0 +1,5 @@
import { Message } from './message';
export function hanldeDeveloping() {
  Message.warning('该功能正在开发中,敬请期待~');
}
packages/utils/index.ts
@@ -15,3 +15,4 @@
export * from './location';
export * from './encrypt';
export * from './task';
export * from './developing';
packages/utils/link.ts
@@ -11,7 +11,6 @@
};
export function setOSSLink(url: string) {
  console.log('url: ', url, OSSBaseURL);
  if (!url) {
    return '';
  }
types/api.d.ts
@@ -61,4 +61,17 @@
  interface GetTaskInfoQueryResult{
    enterpriseName?:string
  }
  interface IntroInfo {
    /** 类型:0为文本,1为图片,2为视频;默认为文本 */
    type?: number;
    /** 摘要 */
    contentSummary?: string;
    /** 文本内容 */
    content?: string;
    /** 图片/视频路径 */
    path?: string;
    /** 排序 */
    sequence?: number;
  }
}