@uxda/appkit 4.2.24 → 4.2.26

package/src/shared/components/OcrBusinessLicense.vue

@@ -1,130 +1,130 @@
-<template>
-  <div :class="['ocr-business-license', disabled ? 'disabled' : '']" class="ocr-icon" @click="onIconClick">
-    <ns-icon name="https://cdn.ddjf.com/static/images/beidouxing/ocr-icon.png" />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import Taro from '@tarojs/taro';
-import { NsIcon } from '@uxda/nutshell/taro';
-import { useAppKitOptions } from '../../Appkit';
-
-const appKitOptions = useAppKitOptions();
-
-const emits = defineEmits(['complete']);
-
-type OcrBusinessLicenseProps = {
-  disabled: boolean;
-};
-
-const props = defineProps<OcrBusinessLicenseProps>();
-
-export type OcrResult = {
-  companyName: string;
-  idCardNo: string;
-  legalPersonName: string;
-};
-
-async function taroImgCompress(src: string, quality = 80) {
-  return new Promise((resolve, reject) => {
-    Taro.compressImage({
-      src: src,
-      quality: quality,
-      success: (res) => {
-        resolve(res);
-      },
-      fail: (res) => {
-        reject(res);
-      },
-    });
-  });
-}
-
-function getCompressQuality(size: number) {
-  let quality = 100;
-  const curSize = size / (1024 * 1024);
-  if (curSize > 6) {
-    quality = quality - ((curSize - 6) / curSize) * 100;
-  }
-  return quality;
-}
-
-function allTrim(str: string) {
-  return str.replace(/\s+/g, '');
-}
-
-async function onIconClick() {
-  if (props.disabled) {
-    return;
-  }
-  console.log('===onIconClick');
-  let result: OcrResult | null = null;
-  try {
-    const csRes = await Taro.chooseImage({
-      count: 1,
-    });
-    let { path, size } = csRes.tempFiles[0];
-    const compressImg: any =
-      (await taroImgCompress(path, getCompressQuality(size))) || {};
-    const filePath = compressImg.tempFilePath || path;
-    Taro.showLoading({ title: '营业执照识别中..' });
-    const session = appKitOptions.token();
-    const baseUrl = appKitOptions.baseUrl();
-    const upRes: any = await Taro.uploadFile({
-      url: baseUrl + '/promoact/common/parseBusinessLicense',
-      filePath,
-      name: 'file',
-      formData: {
-        objectNo: `min${Date.now()}`,
-      },
-      header: {
-        token: session || '',
-      },
-    });
-    Taro.hideLoading();
-    const res = JSON.parse(upRes.data);
-    if (res.code === '200') {
-      const faceInfo = res.result || {};
-      result = {
-        companyName: allTrim(faceInfo.companyName || ''),
-        idCardNo: allTrim(faceInfo.idCardNo || ''),
-        legalPersonName: allTrim(faceInfo.legalPersonName || ''),
-        fileId: faceInfo.fileId,
-        originalUrl: faceInfo.originalUrl,
-        downloadUrl: faceInfo.downloadUrl,
-      };
-      console.log('===识别', result);
-      if (!result.companyName && !result.idCardNo) {
-        Taro.showToast({ title: '识别失败，请重试', icon: 'none' });
-      }
-    } else {
-      Taro.showToast({
-        title: res.msg,
-        icon: 'error',
-      });
-    }
-  } catch (err) {
-    Taro.hideLoading();
-    console.log(err);
-  }
-  emits('complete', result);
-}
-</script>
-
-<style lang="scss">
-.ocr-business-license {
-  width: 24px;
-  height: 24px;
-
-  .ns-icon {
-    width: 24px;
-    height: 24px;
-  }
-
-  &.disabled {
-    .ns-icon {
-      filter: brightness(1.5) grayscale(1);
-    }
-  }
-}
-</style>
+<template>
+  <div :class="['ocr-business-license', disabled ? 'disabled' : '']" class="ocr-icon" @click="onIconClick">
+    <ns-icon name="https://cdn.ddjf.com/static/images/beidouxing/ocr-icon.png" />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import Taro from '@tarojs/taro';
+import { NsIcon } from '@uxda/nutshell/taro';
+import { useAppKitOptions } from '../../Appkit';
+
+const appKitOptions = useAppKitOptions();
+
+const emits = defineEmits(['complete']);
+
+type OcrBusinessLicenseProps = {
+  disabled: boolean;
+};
+
+const props = defineProps<OcrBusinessLicenseProps>();
+
+export type OcrResult = {
+  companyName: string;
+  idCardNo: string;
+  legalPersonName: string;
+};
+
+async function taroImgCompress(src: string, quality = 80) {
+  return new Promise((resolve, reject) => {
+    Taro.compressImage({
+      src: src,
+      quality: quality,
+      success: (res) => {
+        resolve(res);
+      },
+      fail: (res) => {
+        reject(res);
+      },
+    });
+  });
+}
+
+function getCompressQuality(size: number) {
+  let quality = 100;
+  const curSize = size / (1024 * 1024);
+  if (curSize > 6) {
+    quality = quality - ((curSize - 6) / curSize) * 100;
+  }
+  return quality;
+}
+
+function allTrim(str: string) {
+  return str.replace(/\s+/g, '');
+}
+
+async function onIconClick() {
+  if (props.disabled) {
+    return;
+  }
+  console.log('===onIconClick');
+  let result: OcrResult | null = null;
+  try {
+    const csRes = await Taro.chooseImage({
+      count: 1,
+    });
+    let { path, size } = csRes.tempFiles[0];
+    const compressImg: any =
+      (await taroImgCompress(path, getCompressQuality(size))) || {};
+    const filePath = compressImg.tempFilePath || path;
+    Taro.showLoading({ title: '营业执照识别中..' });
+    const session = appKitOptions.token();
+    const baseUrl = appKitOptions.baseUrl();
+    const upRes: any = await Taro.uploadFile({
+      url: baseUrl + '/promoact/common/parseBusinessLicense',
+      filePath,
+      name: 'file',
+      formData: {
+        objectNo: `min${Date.now()}`,
+      },
+      header: {
+        token: session || '',
+      },
+    });
+    Taro.hideLoading();
+    const res = JSON.parse(upRes.data);
+    if (res.code === '200') {
+      const faceInfo = res.result || {};
+      result = {
+        companyName: allTrim(faceInfo.companyName || ''),
+        idCardNo: allTrim(faceInfo.idCardNo || ''),
+        legalPersonName: allTrim(faceInfo.legalPersonName || ''),
+        fileId: faceInfo.fileId,
+        originalUrl: faceInfo.originalUrl,
+        downloadUrl: faceInfo.downloadUrl,
+      };
+      console.log('===识别', result);
+      if (!result.companyName && !result.idCardNo) {
+        Taro.showToast({ title: '识别失败，请重试', icon: 'none' });
+      }
+    } else {
+      Taro.showToast({
+        title: res.msg,
+        icon: 'error',
+      });
+    }
+  } catch (err) {
+    Taro.hideLoading();
+    console.log(err);
+  }
+  emits('complete', result);
+}
+</script>
+
+<style lang="scss">
+.ocr-business-license {
+  width: 24px;
+  height: 24px;
+
+  .ns-icon {
+    width: 24px;
+    height: 24px;
+  }
+
+  &.disabled {
+    .ns-icon {
+      filter: brightness(1.5) grayscale(1);
+    }
+  }
+}
+</style>

package/src/shared/components/OcrIcon.vue

@@ -1,202 +1,202 @@
-<template>
-  <div class="ocr-icon" :class="[disabled ? 'disabled' : '']" @click="onPhotograph">
-    <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 from '@tarojs/taro'
-import { NsIcon } from '@uxda/nutshell/taro'
-import { useAppKitOptions } from '../../Appkit'
-import { ref } from 'vue';
-
-const appKitOptions = useAppKitOptions()
-
-const emits = defineEmits(['complete'])
-
-type OcrIconProps = {
-  disabled?: boolean,
-  side?: 'face' | 'back',
-  class?: string
-}
-
-const props = withDefaults(defineProps<OcrIconProps>(), {
-  disabled: false,
-  side: 'face',
-  class: ''
-})
-
-type OcrResultType = {
-  faceInfo: {
-    name: string
-    certNo: string
-    address: string
-  }
-  backInfo: {
-    startDate: string
-    endDate: string
-  }
-  fileUploadVO: {
-    fileKey: string
-    fileUrl: string
-    objectNo: string
-    thumbnailUrl?: string
-  }
-}
-
-async function taroImgCompress(src: string, quality = 80) {
-  return new Promise((resolve, reject) => {
-    Taro.compressImage({
-      src: src,
-      quality: quality,
-      success: (res) => {
-        resolve(res)
-      },
-      fail: (res) => {
-        reject(res)
-      },
-    })
-  })
-}
-
-function getCompressQuality(size: number) {
-  let quality = 100
-  const curSize = size / (1024 * 1024)
-  if (curSize > 6) {
-    quality = quality - ((curSize - 6) / curSize) * 100
-  }
-  return quality
-}
-
-function allTrim(str: string) {
-  return str.replace(/\s+/g, '')
-}
-
-async function onUploadFile(csRes: any) {
-  let result: OcrResultType | null = null
-  try {
-    let { path, size, tempFilePath } = csRes.tempFiles[0]
-    const compressImg: any = (await taroImgCompress(path || tempFilePath, getCompressQuality(size))) || {}
-    const filePath = compressImg.tempFilePath || path
-    Taro.showLoading({ title: '身份证识别中..' })
-
-    const session = appKitOptions.token()
-    const baseUrl = appKitOptions.baseUrl()
-    const upRes: any = await Taro.uploadFile({
-      url: baseUrl + '/hkapprove/ocr/idcard',
-      filePath,
-      name: 'file',
-      formData: {
-        objectNo: `min${Date.now()}`,
-        side: props.side,
-      },
-      header: {
-        token: session || '',
-      },
-    })
-    Taro.hideLoading()
-
-    const res = JSON.parse(upRes.data)
-    if (res.code === '200') {
-      const faceInfo = res.result.faceInfo || {}
-      const backInfo = res.result.backInfo || {}
-      result = {
-        faceInfo: {
-          name: allTrim(faceInfo.name || ''),
-          certNo: allTrim(faceInfo.num || ''),
-          address: allTrim(faceInfo.address || ''),
-        },
-        backInfo: {
-          startDate: backInfo?.startDate || '',
-          endDate: backInfo?.endDate || ''
-        },
-        fileUploadVO: res.result.fileUploadVO || {},
-      }
-      console.log('===识别', result)
-      if (props.side === 'face' && !result.faceInfo.name && !result.faceInfo.certNo) {
-        Taro.showToast({ title: '识别失败，请重试', icon: 'none' })
-      }
-      if (props.side === 'back' && !result.backInfo?.startDate && !result.backInfo?.endDate) {
-        Taro.showToast({ title: '识别失败，请重试', icon: 'none' })
-      }
-    } else {
-      Taro.showToast({
-        title: res.msg,
-        icon: 'error',
-      })
-    }
-  } catch (err) {
-    Taro.hideLoading()
-    console.log(err)
-  }
-  emits('complete', result)
-}
-
-
-// 上传图片操作面板
-const activeSheetVisible = ref(false)
-const actionSheetMenus = [
-  {
-    name: '拍摄',
-    type: 'camera',
-  },
-  {
-    name: '从相册选择',
-    type: 'album',
-  },
-  {
-    name: '从聊天会话选择',
-    type: 'message',
-  },
-]
-// 选择图像上传
-async function chooseImages(item: any) {
-  if (['camera', 'album'].includes(item.type)) {
-    const csRes = await Taro.chooseMedia({
-      count: 1,
-      sourceType: [item.type], // "camera" | "album"
-      maxDuration: 60, // 使用duration属性判断是图片还是视频，图片没有该属性
-    })
-
-    onUploadFile(csRes)
-  } else {
-    const csRes = await Taro.chooseMessageFile({
-      count: 1,
-      type: 'image',
-    })
-
-    onUploadFile(csRes)
-  }
-}
-
-function onPhotograph() {
-  if (props.disabled) return
-
-  activeSheetVisible.value = true
-}
-</script>
-
-<style lang="scss">
-.ocr-icon {
-  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>
+<template>
+  <div class="ocr-icon" :class="[disabled ? 'disabled' : '']" @click="onPhotograph">
+    <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 from '@tarojs/taro'
+import { NsIcon } from '@uxda/nutshell/taro'
+import { useAppKitOptions } from '../../Appkit'
+import { ref } from 'vue';
+
+const appKitOptions = useAppKitOptions()
+
+const emits = defineEmits(['complete'])
+
+type OcrIconProps = {
+  disabled?: boolean,
+  side?: 'face' | 'back',
+  class?: string
+}
+
+const props = withDefaults(defineProps<OcrIconProps>(), {
+  disabled: false,
+  side: 'face',
+  class: ''
+})
+
+type OcrResultType = {
+  faceInfo: {
+    name: string
+    certNo: string
+    address: string
+  }
+  backInfo: {
+    startDate: string
+    endDate: string
+  }
+  fileUploadVO: {
+    fileKey: string
+    fileUrl: string
+    objectNo: string
+    thumbnailUrl?: string
+  }
+}
+
+async function taroImgCompress(src: string, quality = 80) {
+  return new Promise((resolve, reject) => {
+    Taro.compressImage({
+      src: src,
+      quality: quality,
+      success: (res) => {
+        resolve(res)
+      },
+      fail: (res) => {
+        reject(res)
+      },
+    })
+  })
+}
+
+function getCompressQuality(size: number) {
+  let quality = 100
+  const curSize = size / (1024 * 1024)
+  if (curSize > 6) {
+    quality = quality - ((curSize - 6) / curSize) * 100
+  }
+  return quality
+}
+
+function allTrim(str: string) {
+  return str.replace(/\s+/g, '')
+}
+
+async function onUploadFile(csRes: any) {
+  let result: OcrResultType | null = null
+  try {
+    let { path, size, tempFilePath } = csRes.tempFiles[0]
+    const compressImg: any = (await taroImgCompress(path || tempFilePath, getCompressQuality(size))) || {}
+    const filePath = compressImg.tempFilePath || path
+    Taro.showLoading({ title: '身份证识别中..' })
+
+    const session = appKitOptions.token()
+    const baseUrl = appKitOptions.baseUrl()
+    const upRes: any = await Taro.uploadFile({
+      url: baseUrl + '/hkapprove/ocr/idcard',
+      filePath,
+      name: 'file',
+      formData: {
+        objectNo: `min${Date.now()}`,
+        side: props.side,
+      },
+      header: {
+        token: session || '',
+      },
+    })
+    Taro.hideLoading()
+
+    const res = JSON.parse(upRes.data)
+    if (res.code === '200') {
+      const faceInfo = res.result.faceInfo || {}
+      const backInfo = res.result.backInfo || {}
+      result = {
+        faceInfo: {
+          name: allTrim(faceInfo.name || ''),
+          certNo: allTrim(faceInfo.num || ''),
+          address: allTrim(faceInfo.address || ''),
+        },
+        backInfo: {
+          startDate: backInfo?.startDate || '',
+          endDate: backInfo?.endDate || ''
+        },
+        fileUploadVO: res.result.fileUploadVO || {},
+      }
+      console.log('===识别', result)
+      if (props.side === 'face' && !result.faceInfo.name && !result.faceInfo.certNo) {
+        Taro.showToast({ title: '识别失败，请重试', icon: 'none' })
+      }
+      if (props.side === 'back' && !result.backInfo?.startDate && !result.backInfo?.endDate) {
+        Taro.showToast({ title: '识别失败，请重试', icon: 'none' })
+      }
+    } else {
+      Taro.showToast({
+        title: res.msg,
+        icon: 'error',
+      })
+    }
+  } catch (err) {
+    Taro.hideLoading()
+    console.log(err)
+  }
+  emits('complete', result)
+}
+
+
+// 上传图片操作面板
+const activeSheetVisible = ref(false)
+const actionSheetMenus = [
+  {
+    name: '拍摄',
+    type: 'camera',
+  },
+  {
+    name: '从相册选择',
+    type: 'album',
+  },
+  {
+    name: '从聊天会话选择',
+    type: 'message',
+  },
+]
+// 选择图像上传
+async function chooseImages(item: any) {
+  if (['camera', 'album'].includes(item.type)) {
+    const csRes = await Taro.chooseMedia({
+      count: 1,
+      sourceType: [item.type], // "camera" | "album"
+      maxDuration: 60, // 使用duration属性判断是图片还是视频，图片没有该属性
+    })
+
+    onUploadFile(csRes)
+  } else {
+    const csRes = await Taro.chooseMessageFile({
+      count: 1,
+      type: 'image',
+    })
+
+    onUploadFile(csRes)
+  }
+}
+
+function onPhotograph() {
+  if (props.disabled) return
+
+  activeSheetVisible.value = true
+}
+</script>
+
+<style lang="scss">
+.ocr-icon {
+  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>