@uxda/appkit 4.3.3 → 4.3.5

package/src/shared/components/OcrInvoice.vue

@@ -0,0 +1,218 @@
+<template>
+  <div class="ocr-invoice" :class="[disabled ? 'disabled' : '', className]" v-track-click="'发票识别-点击'" @click="!customClick ? onUpload() : null">
+    <slot name="icon">
+      <ns-icon name="https://cdn.ddjf.com/static/images/beidouxing/ocr-icon.png"/>
+    </slot>
+  </div>
+
+  <nut-action-sheet v-model:visible="activeSheetVisible" :menu-items="actionSheetMenus" @choose="chooseImages"
+    cancel-txt="取消" />
+</template>
+
+<script lang="ts" setup>
+import Taro, { showToast, showLoading, hideLoading, chooseMedia, chooseMessageFile, uploadFile } from '@tarojs/taro'
+import { NsIcon, useNutshell } from '@uxda/nutshell/taro'
+import { useAppKitOptions } from '../../Appkit'
+import { ref } from 'vue';
+import { useHttp } from '../../balance/api'
+import { compressImage, getCompressQuality } from '../composables/useUpload'
+
+const appKitOptions = useAppKitOptions()
+const $http = useHttp(),
+$n = useNutshell()
+
+const emits = defineEmits(['complete'])
+
+type OcrProps = {
+  disabled?: boolean,
+  side?: 'face' | 'back',
+  className?: string
+  customUpload?: Function
+  uploadUrl?: string
+  customClick?: boolean
+}
+type FileType = {
+	"downloadUrl": string,
+	"fileId": string,
+	"fileName": string,
+	"fileSize": number,
+	"fileSuffix": string,
+	"fileType": string,
+	"originalUrl": string
+}
+
+const props = withDefaults(defineProps<OcrProps>(), {
+  disabled: false,
+  side: 'face',
+  className: '',
+  uploadUrl: '/hkbase/file/uploadFile',
+  customClick: false
+})
+
+async function onUploadFile(csRes: any) {
+  try {
+    let { path, size, tempFilePath } = csRes.tempFiles[0]
+    const compressImg: any = (await compressImage(path || tempFilePath, getCompressQuality(size))) || {}
+    const filePath = compressImg.tempFilePath || path
+
+    if (props.customUpload) {
+      props.customUpload(filePath)
+      return
+    }
+
+    showLoading({ title: '发票识别中..', mask: true })
+
+    const session = appKitOptions.token()
+    const baseUrl = appKitOptions.baseUrl()
+    const upRes: any = await uploadFile({
+      url: `${baseUrl}${props.uploadUrl}`,
+      filePath,
+      name: 'file',
+      formData: {
+        objectNo: `min${Date.now()}`,
+        appCode: appKitOptions.app(),
+      },
+      header: {
+        token: session || '',
+      },
+    })
+
+    const res = JSON.parse(upRes.data)
+    if (res.code === '200') {
+      await getOcrInfo(res.result)
+    } else {
+      hideLoading()
+      showToast({
+        title: res.msg,
+        icon: 'error',
+      })
+    }
+  } catch (err) {
+    hideLoading()
+    console.log(err)
+  }
+}
+
+// 根据证件路径获取证件信息
+async function getOcrInfo(file: string | FileType) {
+  try {
+    const res: any = await $http.get('/hkbase/common/vatInvoice', {
+      fileUrl: typeof file === 'string' ? file : file.originalUrl,
+      fileType: 'img'
+    })
+    hideLoading()
+
+    if (!res?.purchaserRegisterNum) {
+      $n.dialog({
+        title: '识别失败',
+        message: `您上传的图片可能不够清晰或与当前功能不符，请重新上传一张清晰、完整的图片。谢谢！`,
+        okText: '我知道了',
+        cancelText: '',
+      })
+      return
+    }
+
+    emits('complete', {
+      invoiceDate: res?.invoiceDate,  
+      invoiceNum: res?.invoiceNum,
+      invoiceNumConfirm: res?.invoiceNumConfirm,
+      invoiceType: res?.invoiceType,
+      noteDrawer: res?.noteDrawer,
+      purchaserBank: res?.purchaserBank,
+      purchaserName: res?.purchaserName,
+      purchaserRegisterNum: res?.purchaserRegisterNum,
+      remarks: res?.remarks,
+      sellerName: res?.sellerName,
+      sellerRegisterNum: res?.sellerRegisterNum,
+      serviceType: res?.serviceType,
+      totalAmount: res?.totalAmount,
+      totalTax: res?.totalTax,
+      fileUrl: typeof file === 'string' ? file : file.originalUrl,
+      fileKey: typeof file === 'string' ? file : file.fileId,
+    })
+  } catch (err) {
+    hideLoading()
+  }
+}
+
+// 上传图片操作面板
+const activeSheetVisible = ref(false)
+const actionSheetMenus = [
+  {
+    name: '拍摄',
+    type: 'camera',
+  },
+  {
+    name: '从相册选择',
+    type: 'album',
+  },
+  {
+    name: '从聊天会话选择',
+    type: 'message',
+  },
+]
+if (Taro.getEnv() === 'WEB') {
+  actionSheetMenus.pop()
+}
+
+// 选择图像上传
+async function chooseImages(item: any) {
+  if (['camera', 'album'].includes(item.type)) {
+    const csRes = await chooseMedia({
+      count: 1,
+      sourceType: [item.type], // "camera" | "album"
+      maxDuration: 60, // 使用duration属性判断是图片还是视频，图片没有该属性
+    })
+
+    onUploadFile(csRes)
+  } else {
+    const csRes = await chooseMessageFile({
+      count: 1,
+      type: 'image',
+    })
+
+    onUploadFile(csRes)
+  }
+}
+
+async function onUpload() {
+  if (props.disabled) return
+
+  if (Taro.getEnv() === 'WEB') {
+    const csRes = await chooseMedia({
+      count: 1,
+      sourceType: ['album'], // "camera" | "album"
+      maxDuration: 60, // 使用duration属性判断是图片还是视频，图片没有该属性
+    })
+
+    onUploadFile(csRes)
+    return
+  }
+
+  activeSheetVisible.value = true
+}
+
+defineExpose({
+  onUpload
+})
+</script>
+
+<style lang="scss">
+.ocr-invoice {
+  width: 24px;
+  height: 24px;
+  display: inline-flex;
+  align-items: center;
+
+  .ns-icon {
+    width: 24px;
+    height: 24px;
+  }
+
+  &.disabled {
+    .ns-icon {
+      filter: brightness(1.5) grayscale(1);
+    }
+  }
+}
+</style>

package/src/shared/components/PageHeader.vue

@@ -1,85 +1,85 @@
-<template>
-  <div :class="[
-    'page-header',
-    `color-mode-${colorMode}`
-  ]" :style="cssVars">
-    <h1 class="page-title" v-if="title">{{ title }}</h1>
-    <view class="back-button" v-track-click="'页面头部-返回'" @click="onBackButtonClick"></view>
-    <slot></slot>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { useSafeArea } from '../composables'
-
-
-const safeArea = useSafeArea()
-
-const cssVars = {
-  '--top': `${safeArea.status}px`,
-  '--height': `${safeArea.nav}px`
-}
-
-export type PageHeaderColorMode = 'light' | 'dark'
-
-export interface PageHeaderProps {
-  title?: string,
-  colorMode?: PageHeaderColorMode
-}
-
-const emit = defineEmits<{
-  (event: 'close'): void
-}>()
-
-withDefaults(
-  defineProps<PageHeaderProps>(), {
-  title: '',
-  colorMode: 'light'
-}
-)
-
-const onBackButtonClick = () => {
-  emit('close')
-}
-</script>
-
-<style lang="scss">
-.page-header {
-  display: flex;
-  position: relative;
-  align-items: center;
-  padding-top: var(--top);
-  min-height: var(--height);
-
-  .page-title {
-    position: absolute;
-    font-size: 18px;
-    height: var(--height);
-    line-height: var(--height);
-    top: var(--top);
-    width: 100%;
-    text-align: center;
-    margin: 0;
-  }
-
-  .back-button {
-    position: absolute;
-    top: var(--top);
-    left: 10px;
-    width: var(--height);
-    height: var(--height);
-    background-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDIiIGhlaWdodD0iNDIiIHZpZXdCb3g9IjAgMCA0MiA0MiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggb3BhY2l0eT0iMC4wMSIgZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0wLjk5OTg3OCA0MUw0MC45OTk5IDQxTDQwLjk5OTkgMUwwLjk5OTg3OCAxTDAuOTk5ODc4IDQxWiIgZmlsbD0iI0Q4RDhEOCIgc3Ryb2tlPSJibGFjayIgc3Ryb2tlLW9wYWNpdHk9IjAuMDEiLz4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0xMi45OTMzIDE4Ljk0NzdDMTEuODYzMyAyMC4wMTQ1IDExLjgxMiAyMS43OTU0IDEyLjg3ODggMjIuOTI1NUwyNy45MTA1IDM3LjEzNDVDMjguNjkyNSAzNy44NzM0IDI5LjkyNTUgMzcuODM4NCAzMC42NjQ0IDM3LjA1NjRDMzEuMzY4MSAzNi4zMTE2IDMxLjM2OTkgMzUuMTU3OSAzMC42OTI5IDM0LjQxMTRMMTYuNTAxMiAyMC45OTM5TDMwLjU4NTcgNy42OTc4NUMzMS4zMzA4IDYuOTk0NDkgMzEuMjk4MiA1LjcyNzk1IDMwLjY2NDkgNC45NDQwMkMyOS45NjE2IDQuMTk4OTUgMjguODA5OCA0LjEzMTI5IDI4LjAyNTkgNC43NjQ1MkwxMi45OTMzIDE4Ljk0NzdaIiBmaWxsPSJibGFjayIgc3Ryb2tlPSJibGFjayIgc3Ryb2tlLW9wYWNpdHk9IjAuMDEiLz4KPC9zdmc+Cg==");
-    background-size: 50%;
-    background-repeat: no-repeat;
-    background-position: center center;
-  }
-
-  &.color-mode-dark {
-    color: var(--text-color-dark-mode, #fff);
-
-    .back-button {
-      background-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDIiIGhlaWdodD0iNDIiIHZpZXdCb3g9IjAgMCA0MiA0MiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggb3BhY2l0eT0iMC4wMSIgZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0wLjk5OTg0NyA0MUw0MC45OTk4IDQxTDQwLjk5OTggMUwwLjk5OTg0NyAxTDAuOTk5ODQ3IDQxWiIgZmlsbD0iI0Q4RDhEOCIgc3Ryb2tlPSJibGFjayIgc3Ryb2tlLW9wYWNpdHk9IjAuMDEiLz4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0xMi45OTM0IDE4Ljk0NzVDMTEuODYzNCAyMC4wMTQzIDExLjgxMjEgMjEuNzk1MiAxMi44Nzg5IDIyLjkyNTJMMjcuOTEwNiAzNy4xMzQzQzI4LjY5MjcgMzcuODczMSAyOS45MjU2IDM3LjgzODIgMzAuNjY0NSAzNy4wNTYyQzMxLjM2ODIgMzYuMzExNCAzMS4zNyAzNS4xNTc2IDMwLjY5MyAzNC40MTExTDE2LjUwMTMgMjAuOTkzNkwzMC41ODU4IDcuNjk3NjFDMzEuMzMwOSA2Ljk5NDI0IDMxLjI5ODMgNS43Mjc3MSAzMC42NjUxIDQuOTQzNzdDMjkuOTYxNyA0LjE5ODcxIDI4LjgwOTkgNC4xMzEwNCAyOC4wMjYgNC43NjQyN0wxMi45OTM0IDE4Ljk0NzVaIiBmaWxsPSJ3aGl0ZSIgc3Ryb2tlPSJibGFjayIgc3Ryb2tlLW9wYWNpdHk9IjAuMDEiLz4KPC9zdmc+Cg==");
-    }
-  }
-}
+<template>
+  <div :class="[
+    'page-header',
+    `color-mode-${colorMode}`
+  ]" :style="cssVars">
+    <h1 class="page-title" v-if="title">{{ title }}</h1>
+    <view class="back-button" v-track-click="'页面头部-返回'" @click="onBackButtonClick"></view>
+    <slot></slot>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { useSafeArea } from '../composables'
+
+
+const safeArea = useSafeArea()
+
+const cssVars = {
+  '--top': `${safeArea.status}px`,
+  '--height': `${safeArea.nav}px`
+}
+
+export type PageHeaderColorMode = 'light' | 'dark'
+
+export interface PageHeaderProps {
+  title?: string,
+  colorMode?: PageHeaderColorMode
+}
+
+const emit = defineEmits<{
+  (event: 'close'): void
+}>()
+
+withDefaults(
+  defineProps<PageHeaderProps>(), {
+  title: '',
+  colorMode: 'light'
+}
+)
+
+const onBackButtonClick = () => {
+  emit('close')
+}
+</script>
+
+<style lang="scss">
+.page-header {
+  display: flex;
+  position: relative;
+  align-items: center;
+  padding-top: var(--top);
+  min-height: var(--height);
+
+  .page-title {
+    position: absolute;
+    font-size: 18px;
+    height: var(--height);
+    line-height: var(--height);
+    top: var(--top);
+    width: 100%;
+    text-align: center;
+    margin: 0;
+  }
+
+  .back-button {
+    position: absolute;
+    top: var(--top);
+    left: 10px;
+    width: var(--height);
+    height: var(--height);
+    background-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDIiIGhlaWdodD0iNDIiIHZpZXdCb3g9IjAgMCA0MiA0MiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggb3BhY2l0eT0iMC4wMSIgZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0wLjk5OTg3OCA0MUw0MC45OTk5IDQxTDQwLjk5OTkgMUwwLjk5OTg3OCAxTDAuOTk5ODc4IDQxWiIgZmlsbD0iI0Q4RDhEOCIgc3Ryb2tlPSJibGFjayIgc3Ryb2tlLW9wYWNpdHk9IjAuMDEiLz4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0xMi45OTMzIDE4Ljk0NzdDMTEuODYzMyAyMC4wMTQ1IDExLjgxMiAyMS43OTU0IDEyLjg3ODggMjIuOTI1NUwyNy45MTA1IDM3LjEzNDVDMjguNjkyNSAzNy44NzM0IDI5LjkyNTUgMzcuODM4NCAzMC42NjQ0IDM3LjA1NjRDMzEuMzY4MSAzNi4zMTE2IDMxLjM2OTkgMzUuMTU3OSAzMC42OTI5IDM0LjQxMTRMMTYuNTAxMiAyMC45OTM5TDMwLjU4NTcgNy42OTc4NUMzMS4zMzA4IDYuOTk0NDkgMzEuMjk4MiA1LjcyNzk1IDMwLjY2NDkgNC45NDQwMkMyOS45NjE2IDQuMTk4OTUgMjguODA5OCA0LjEzMTI5IDI4LjAyNTkgNC43NjQ1MkwxMi45OTMzIDE4Ljk0NzdaIiBmaWxsPSJibGFjayIgc3Ryb2tlPSJibGFjayIgc3Ryb2tlLW9wYWNpdHk9IjAuMDEiLz4KPC9zdmc+Cg==");
+    background-size: 50%;
+    background-repeat: no-repeat;
+    background-position: center center;
+  }
+
+  &.color-mode-dark {
+    color: var(--text-color-dark-mode, #fff);
+
+    .back-button {
+      background-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDIiIGhlaWdodD0iNDIiIHZpZXdCb3g9IjAgMCA0MiA0MiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggb3BhY2l0eT0iMC4wMSIgZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0wLjk5OTg0NyA0MUw0MC45OTk4IDQxTDQwLjk5OTggMUwwLjk5OTg0NyAxTDAuOTk5ODQ3IDQxWiIgZmlsbD0iI0Q4RDhEOCIgc3Ryb2tlPSJibGFjayIgc3Ryb2tlLW9wYWNpdHk9IjAuMDEiLz4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0xMi45OTM0IDE4Ljk0NzVDMTEuODYzNCAyMC4wMTQzIDExLjgxMjEgMjEuNzk1MiAxMi44Nzg5IDIyLjkyNTJMMjcuOTEwNiAzNy4xMzQzQzI4LjY5MjcgMzcuODczMSAyOS45MjU2IDM3LjgzODIgMzAuNjY0NSAzNy4wNTYyQzMxLjM2ODIgMzYuMzExNCAzMS4zNyAzNS4xNTc2IDMwLjY5MyAzNC40MTExTDE2LjUwMTMgMjAuOTkzNkwzMC41ODU4IDcuNjk3NjFDMzEuMzMwOSA2Ljk5NDI0IDMxLjI5ODMgNS43Mjc3MSAzMC42NjUxIDQuOTQzNzdDMjkuOTYxNyA0LjE5ODcxIDI4LjgwOTkgNC4xMzEwNCAyOC4wMjYgNC43NjQyN0wxMi45OTM0IDE4Ljk0NzVaIiBmaWxsPSJ3aGl0ZSIgc3Ryb2tlPSJibGFjayIgc3Ryb2tlLW9wYWNpdHk9IjAuMDEiLz4KPC9zdmc+Cg==");
+    }
+  }
+}
 </style>

package/src/shared/components/index.ts

@@ -1,8 +1,10 @@
-import AppDrawer from './AppDrawer.vue'
-import PageHeader from './PageHeader.vue'
-import AppVerify from './AppVerify.vue'
-import DeviceVersion from './DeviceVersion.vue'
-import OcrIcon from './OcrIcon.vue'
-import OcrBusinessLicense from './OcrBusinessLicense.vue'
-
-export { AppDrawer, PageHeader, DeviceVersion, AppVerify, OcrIcon, OcrBusinessLicense }
+import AppDrawer from './AppDrawer.vue'
+import PageHeader from './PageHeader.vue'
+import AppVerify from './AppVerify.vue'
+import DeviceVersion from './DeviceVersion.vue'
+import OcrIcon from './OcrIcon.vue'
+import OcrBank from './OcrBank.vue'
+import OcrBusinessLicense from './OcrBusinessLicense.vue'
+import OcrInvoice from './OcrInvoice.vue'
+
+export { AppDrawer, PageHeader, DeviceVersion, AppVerify, OcrIcon, OcrBank,OcrBusinessLicense, OcrInvoice }

package/src/shared/composables/index.ts

@@ -1,9 +1,10 @@
-export * from './useSafeArea'
-export * from './useTabbar'
-export * from './useCountdown'
-export * from './useValidator'
-export * from './useEncode'
-export * from './useUpload'
-export * from './useCrypto'
-export * from './useLogger'
-export * from './useWxAuth'
+export * from './useSafeArea'
+export * from './useTabbar'
+export * from './useCountdown'
+export * from './useValidator'
+export * from './useEncode'
+export * from './useUpload'
+export * from './useCrypto'
+export * from './useLogger'
+export * from './useWxAuth'
+export * from './useCompress'

package/src/shared/composables/useAmount.ts

@@ -1,46 +1,46 @@
-/**
- * 金额通用方法
- */
-
-export function useAmount() {
-  /**
-   * 限制数字小数位
-   */
-  function limitDecimal(value, precision = 1) {
-    if (!value) return value
-
-    value = String(value)
-
-    // 限制最多precision位小数
-    if (value.includes('.')) {
-      value = value.slice(0, value.indexOf('.') + (precision + 1))
-    }
-
-    // 移除非数字字符
-    value = value.replace(/[^0-9.]/g, '')
-
-    // 防止出现多个小数点
-    value = value.replace(/\.{2,}/g, '.')
-
-    return value
-  }
-
-  /**
-   * 格式化金额
-   */
-  function formatAmount(value: string | number, digits = 2) {
-    if (!value) {
-      return '0'
-    }
-
-    return value.toLocaleString('en-US', {
-      minimumFractionDigits: 0,
-      maximumFractionDigits: digits,
-    })
-  }
-
-  return {
-    limitDecimal,
-    formatAmount,
-  }
-}
+/**
+ * 金额通用方法
+ */
+
+export function useAmount() {
+  /**
+   * 限制数字小数位
+   */
+  function limitDecimal(value, precision = 1) {
+    if (!value) return value
+
+    value = String(value)
+
+    // 限制最多precision位小数
+    if (value.includes('.')) {
+      value = value.slice(0, value.indexOf('.') + (precision + 1))
+    }
+
+    // 移除非数字字符
+    value = value.replace(/[^0-9.]/g, '')
+
+    // 防止出现多个小数点
+    value = value.replace(/\.{2,}/g, '.')
+
+    return value
+  }
+
+  /**
+   * 格式化金额
+   */
+  function formatAmount(value: string | number, digits = 2) {
+    if (!value) {
+      return '0'
+    }
+
+    return value.toLocaleString('en-US', {
+      minimumFractionDigits: 0,
+      maximumFractionDigits: digits,
+    })
+  }
+
+  return {
+    limitDecimal,
+    formatAmount,
+  }
+}

package/src/shared/composables/useCompress.ts

@@ -0,0 +1,64 @@
+import Taro, { uploadFile } from '@tarojs/taro'
+import { Media } from '@uxda/nutshell/taro'
+import { useAppKitOptions } from '../../Appkit'
+
+export type UploadConfig = {
+  baseUrl: string
+  name?: string
+  headers?: Record<string, string>
+}
+
+const mappings: { [x: string]: keyof Media } = {
+  downloadUrl: 'thrumb',
+  fileId: 'id',
+  fileName: 'name',
+  fileSize: 'size',
+  fileSuffix: 'ext',
+  fileType: 'type',
+  originalUrl: 'url',
+}
+
+const transformFields = (row: any) => {
+  return Object.fromEntries(Object.entries(row).map(([k, v]) => [mappings[k] || k, v]))
+}
+
+type UploadFunction = (url: string, file: Media) => Promise<Media>
+
+export const useUpload = (config: UploadConfig) => {
+  const appkitOptions = useAppKitOptions()
+
+  // 上传文件
+  const upload: UploadFunction = (url: string, file: Media) => {
+    return new Promise<Media>((resolve, reject) => {
+      uploadFile({
+        url: config.baseUrl + url,
+        filePath: file.path!,
+        name: 'file',
+        formData: {
+          objectNo: `min${Date.now()}`,
+          appCode: config.headers?.appcode || appkitOptions.app(),
+        },
+        header: {
+          ...config.headers,
+          token: appkitOptions.tempToken() || appkitOptions.token(),
+        },
+        success: (rsp: any) => {
+          const { data } = rsp
+          try {
+            const response = JSON.parse(data)
+            console.log('===response', response)
+            resolve(transformFields(response.result))
+          } catch (e) {
+            reject({
+              message: '文件上传异常',
+            })
+          }
+        },
+      })
+    })
+  }
+
+  return {
+    upload,
+  }
+}

package/src/shared/composables/useCountdown.ts

@@ -1,46 +1,46 @@
-/**
- * @description: 倒计时
- * @param {number} time
- * @return {*}
- */
-import { ref, onUnmounted, computed } from 'vue'
-
-export function useCountdown() {
-  let timer: any = null
-  const countdown = ref(60)
-  const countdownActive = computed(() => countdown.value > 0 && countdown.value < 60)
-
-  const startCountdown = () => {
-    countdown.value = 60
-    timer = setInterval(() => {
-      countdown.value--
-      if (countdown.value <= 0) {
-        stopCountdown()
-      }
-    }, 1000)
-  }
-
-  const stopCountdown = () => {
-    clearInterval(timer)
-    countdown.value = 60 // 重置倒计时
-  }
-
-  onUnmounted(() => {
-    // stopCountdown() // 组件卸载时确保清除定时器
-  })
-
-  const countdownText = computed(() => {
-    if (countdown.value === 60) {
-      return '获取验证码'
-    } else {
-      return `重新发送(${countdown.value}s)`
-    }
-  })
-
-  return {
-    countdownActive,
-    countdownText,
-    startCountdown,
-    stopCountdown,
-  }
-}
+/**
+ * @description: 倒计时
+ * @param {number} time
+ * @return {*}
+ */
+import { ref, onUnmounted, computed } from 'vue'
+
+export function useCountdown() {
+  let timer: any = null
+  const countdown = ref(60)
+  const countdownActive = computed(() => countdown.value > 0 && countdown.value < 60)
+
+  const startCountdown = () => {
+    countdown.value = 60
+    timer = setInterval(() => {
+      countdown.value--
+      if (countdown.value <= 0) {
+        stopCountdown()
+      }
+    }, 1000)
+  }
+
+  const stopCountdown = () => {
+    clearInterval(timer)
+    countdown.value = 60 // 重置倒计时
+  }
+
+  onUnmounted(() => {
+    // stopCountdown() // 组件卸载时确保清除定时器
+  })
+
+  const countdownText = computed(() => {
+    if (countdown.value === 60) {
+      return '获取验证码'
+    } else {
+      return `重新发送(${countdown.value}s)`
+    }
+  })
+
+  return {
+    countdownActive,
+    countdownText,
+    startCountdown,
+    stopCountdown,
+  }
+}