@uxda/appkit 4.3.13 → 4.3.15

package/src/user/components/UserFeedback.vue

@@ -202,7 +202,6 @@ function requestFeedback() {
 
   showLoading({
     title: '反馈中...',
-    mask: true
   })
 
   const attachment = JSON.parse(

package/src/user/components/UserInfo.vue

@@ -220,7 +220,6 @@ async function toUpload() {
 async function updateImage(filePath: string) {
   showLoading({
     title: "上传中...",
-    mask: true
   });
   const appkitOptions = useAppKitOptions();
   const $http = useHttp();
@@ -360,7 +359,6 @@ function toLogout() {
     title: "提示",
     content: "确定要退出登录吗？",
     confirmText: "确定",
-    confirmColor: '#017fff',
     success: async (e: any) => {
       if (e.confirm) {
         emits("logout");

package/types/global.d.ts

@@ -20,5 +20,3 @@ declare namespace NodeJS {
 declare module '@tarojs/components' {
   export * from '@tarojs/components/types/index.vue3'
 }
-
-declare module '@uxda/nutshell/taro'

package/src/shared/components/OcrBank.vue

@@ -1,202 +0,0 @@
-<template>
-  <div class="ocr-bank" :class="[disabled ? 'disabled' : '']" 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,
-  class?: string
-  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,
-  class: '',
-  uploadUrl: '/hkbase/file/uploadFile',
-  customClick: false
-})
-
-type BankCardType = {
-  bankCardNumber: string
-  bankCardType: string
-  bankName: string
-}
-
-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
-
-    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 getBankCardInfo(res.result)
-    } else {
-      hideLoading()
-      showToast({
-        title: res.msg,
-        icon: 'error',
-      })
-    }
-  } catch (err) {
-    hideLoading()
-    console.log(err)
-  }
-}
-
-// 根据银行卡路径获取银行卡信息
-async function getBankCardInfo(file: string | FileType) {
-  try {
-    const res: BankCardType = await $http.get('/hkbase/common/bankCard', {
-      fileUrl: typeof file === 'string' ? file : file.originalUrl,
-    })
-    hideLoading()
-
-    if (res && !res.bankCardNumber) {
-      $n.dialog({
-        title: '识别失败',
-        message: `您上传的图片可能不够清晰或与当前功能不符，请重新上传一张清晰、完整的图片。谢谢！`,
-        okText: '我知道了',
-        cancelText: '',
-      })
-      return
-    }
-
-    emits('complete', {
-      ...res,
-      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-bank {
-  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/OcrInvoice.vue

@@ -1,322 +0,0 @@
-<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
-})
-
-/**
- * 判断文件类型
- */
-function getFileType(filePath: string, fileName?: string): 'img' | 'pdf' {
-  const lowerPath = filePath.toLowerCase()
-  const lowerName = (fileName || '').toLowerCase()
-  
-  // 检查文件扩展名
-  if (lowerPath.endsWith('.pdf') || lowerName.endsWith('.pdf')) {
-    return 'pdf'
-  }
-  
-  // 检查是否为图片格式
-  const imageExtensions = ['.jpg', '.jpeg', '.png', '.gif', '.bmp', '.webp']
-  if (imageExtensions.some(ext => lowerPath.endsWith(ext) || lowerName.endsWith(ext))) {
-    return 'img'
-  }
-  
-  // 默认为图片
-  return 'img'
-}
-
-async function onUploadFile(csRes: any, fileType?: 'img' | 'pdf') {
-  try {
-    let { path, size, tempFilePath, name } = csRes.tempFiles[0]
-    const originalPath = path || tempFilePath
-    
-    // 判断文件类型
-    const detectedFileType = fileType || getFileType(originalPath, name)
-    
-    // 只有图片才进行压缩
-    let filePath = originalPath
-    if (detectedFileType === 'img') {
-      const compressImg: any = (await compressImage(originalPath, getCompressQuality(size))) || {}
-      filePath = compressImg.tempFilePath || originalPath
-    }
-
-    if (props.customUpload) {
-      props.customUpload(filePath, detectedFileType)
-      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, detectedFileType)
-    } else {
-      hideLoading()
-      showToast({
-        title: res.msg,
-        icon: 'error',
-      })
-    }
-  } catch (err) {
-    hideLoading()
-    console.log(err)
-  }
-}
-
-// 根据证件路径获取证件信息
-async function getOcrInfo(file: string | FileType, fileType: 'img' | 'pdf' = 'img') {
-  try {
-    const fileUrl = typeof file === 'string' ? file : file.originalUrl
-    const res: any = await $http.get('/hkbase/common/vatInvoice', {
-      fileUrl,
-      fileType: fileType
-    })
-    hideLoading()
-
-    if (!res?.purchaserRegisterNum) {
-      $n.dialog({
-        title: '识别失败',
-        message: `您上传的${fileType === 'pdf' ? '文件' : '图片'}可能不够清晰或与当前功能不符，请重新上传一张清晰、完整的${fileType === 'pdf' ? 'PDF文件' : '图片'}。谢谢！`,
-        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: fileUrl,
-      fileType: fileType,
-      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',
-  },
-  {
-    name: '选择文件',
-    type: 'file',
-  },
-]
-if (Taro.getEnv() === 'WEB') {
-  // Web 端移除"从聊天会话选择"，保留"选择文件"
-  actionSheetMenus.splice(2, 1)
-}
-
-// 选择图像上传
-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 if (item.type === 'message') {
-    const csRes = await chooseMessageFile({
-      count: 1,
-      type: 'image',
-    })
-
-    onUploadFile(csRes)
-  } else if (item.type === 'file') {
-    // 选择文件（包括PDF）
-    const csRes = await chooseMessageFile({
-      count: 1,
-      type: 'file',
-    })
-
-    // 不预先指定类型，让 onUploadFile 根据文件名自动判断
-    onUploadFile(csRes)
-  }
-}
-
-/**
- * Web 端选择文件（支持图片和PDF）
- */
-function chooseFileInWeb() {
-  return new Promise<void>((resolve, reject) => {
-    const input = document.createElement('input')
-    input.type = 'file'
-    input.accept = 'image/*,.pdf'
-    input.style.display = 'none'
-    
-    input.onchange = async (e: any) => {
-      const file = e.target?.files?.[0]
-      if (!file) {
-        document.body.removeChild(input)
-        resolve()
-        return
-      }
-
-      // 根据文件 MIME 类型和扩展名判断文件类型
-      let fileType: 'img' | 'pdf' = 'img'
-      if (file.type === 'application/pdf' || file.name.toLowerCase().endsWith('.pdf')) {
-        fileType = 'pdf'
-      }
-      
-      const filePath = URL.createObjectURL(file)
-
-      try {
-        // 构造类似 chooseMedia 返回的数据结构
-        const csRes = {
-          tempFiles: [{
-            path: filePath,
-            tempFilePath: filePath,
-            size: file.size,
-            name: file.name,
-          }]
-        }
-
-        await onUploadFile(csRes, fileType)
-        resolve()
-      } catch (error) {
-        reject(error)
-      } finally {
-        document.body.removeChild(input)
-        // 清理 blob URL
-        URL.revokeObjectURL(filePath)
-      }
-    }
-
-    input.oncancel = () => {
-      document.body.removeChild(input)
-      resolve()
-    }
-
-    document.body.appendChild(input)
-    input.click()
-  })
-}
-
-async function onUpload() {
-  if (props.disabled) return
-
-  if (Taro.getEnv() === 'WEB') {
-    // Web 端弹出选择：图片或PDF
-    try {
-      await chooseFileInWeb()
-    } catch (err) {
-      console.error('文件选择失败:', err)
-    }
-    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/composables/useCompress.ts

@@ -1,64 +0,0 @@
-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,
-  }
-}