@uxda/appkit 4.1.44 → 4.1.48

package/src/shared/components/OcrIcon.vue

@@ -1,29 +1,53 @@
 <template>
-  <div :class="['ocr-icon', disabled ? 'disabled' : '']" @click="onIconClick">
-    <ns-icon name="https://cdn.ddjf.com/static/images/beidouxing/ocr-icon.png"  />
-</div>
+  <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 Taro from '@tarojs/taro'
+import { NsIcon } from '@uxda/nutshell/taro'
+import { useAppKitOptions } from '../../Appkit'
+import { ref } from 'vue';
 
-const appKitOptions = useAppKitOptions();
+const appKitOptions = useAppKitOptions()
 
-const emits = defineEmits(['complete']);
+const emits = defineEmits(['complete'])
 
 type OcrIconProps = {
-  disabled: boolean;
-};
+  disabled?: boolean,
+  side?: 'face' | 'back',
+  class?: string
+}
 
-const props = defineProps<OcrIconProps>();
+const props = withDefaults(defineProps<OcrIconProps>(), {
+  disabled: false,
+  side: 'face',
+  class: ''
+})
 
-export type OcrResult = {
-  name: string;
-  number: string;
-  address: string;
-};
+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) => {
@@ -31,88 +55,129 @@ async function taroImgCompress(src: string, quality = 80) {
       src: src,
       quality: quality,
       success: (res) => {
-        resolve(res);
+        resolve(res)
       },
       fail: (res) => {
-        reject(res);
+        reject(res)
       },
-    });
-  });
+    })
+  })
 }
 
 function getCompressQuality(size: number) {
-  let quality = 100;
-  const curSize = size / (1024 * 1024);
+  let quality = 100
+  const curSize = size / (1024 * 1024)
   if (curSize > 6) {
-    quality = quality - ((curSize - 6) / curSize) * 100;
+    quality = quality - ((curSize - 6) / curSize) * 100
   }
-  return quality;
+  return quality
 }
 
 function allTrim(str: string) {
-  return str.replace(/\s+/g, '');
+  return str.replace(/\s+/g, '')
 }
 
-async function onIconClick() {
-  if (props.disabled) {
-    return;
-  }
-  let result: OcrResult | null = null;
+async function onUploadFile(csRes: any) {
+  let result: OcrResultType | 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();
+    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: 'face',
+        side: props.side,
       },
       header: {
-        sessionKey: session || '',
         token: session || '',
       },
-    });
-    Taro.hideLoading();
-    const res = JSON.parse(upRes.data);
+    })
+    Taro.hideLoading()
+
+    const res = JSON.parse(upRes.data)
     if (res.code === '200') {
-      const faceInfo = res.result.faceInfo || {},
-        file = res.result.fileUploadVO;
+      const faceInfo = res.result.faceInfo || {}
+      const backInfo = res.result.backInfo || {}
       result = {
-        name: allTrim(faceInfo.name || ''),
-        number: allTrim(faceInfo.num || ''),
-        address: allTrim(faceInfo.address || ''),
-        // file: {
-        //   key: file.fileKey,
-        //   url: file.fileUrl,
-        //   object: file.objectNo,
-        //   thumb: file.thumbnailUrl
-        // }
-      };
-      console.log('===识别', result);
-      if (!result.name && !result.number) {
-        Taro.showToast({ title: '识别失败，请重试', icon: 'none' });
+        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);
+    Taro.hideLoading()
+    console.log(err)
   }
-  emits('complete', result);
+  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>
 
@@ -120,10 +185,14 @@ async function onIconClick() {
 .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);

package/src/shared/composables/useAmount.ts

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

package/src/shared/composables/useValidator.ts

@@ -5,7 +5,7 @@ import { isMobilePhone, isIdentityCard } from 'validator'
 
 export function useValidator() {
   // 身份证号码校验
-  function certNoValidator(value: unknown) {
+  function certNoValidator(value: string) {
     if (!value) {
       return '请输入身份证号'
     } else if (!isIdentityCard(value, 'zh-CN')) {
@@ -15,7 +15,7 @@ export function useValidator() {
   }
 
   // 电话号码校验
-  function phoneValidator(value: unknown) {
+  function phoneValidator(value: string) {
     if (!value) {
       return '请输入手机号码'
     } else if (!isMobilePhone(value, 'zh-CN')) {

package/src/components/ocr-id/index.vue

@@ -1,114 +0,0 @@
-<script setup lang="ts">
-import Taro from '@tarojs/taro'
-import { OcrResultType } from './types'
-import { useAppKitOptions } from '../../Appkit'
-
-const emits = defineEmits(['ocr'])
-
-const appKitOptions = useAppKitOptions()
-
-// 压缩图片
-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 ocrIDCard() {
-  let ocrResult: OcrResultType = 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 + '/hkapprove/ocr/idcard',
-      filePath,
-      name: 'file',
-      formData: {
-        objectNo: `min${Date.now()}`,
-        side: 'face',
-      },
-      header: {
-        sessionKey: session || '',
-        token: session || '',
-      },
-    })
-    Taro.hideLoading()
-    const res = JSON.parse(upRes.data)
-    if (res.code === '200') {
-      const faceInfo = res.result.faceInfo || {}
-      ocrResult = {
-        faceInfo: {
-          name: allTrim(faceInfo.name || ''),
-          certNo: allTrim(faceInfo.num || ''),
-          address: allTrim(faceInfo.address || ''),
-        },
-        fileUploadVO: res.result.fileUploadVO || {},
-      }
-      if (!ocrResult.faceInfo.name && !ocrResult.faceInfo.certNo) {
-        Taro.showToast({ title: '识别失败，请重试', icon: 'none' })
-      }
-    } else {
-      Taro.showToast({
-        title: res.msg,
-        icon: 'error',
-      })
-    }
-  } catch (err) {
-    Taro.hideLoading()
-    console.log(err)
-  }
-  emits('ocr', ocrResult)
-}
-</script>
-
-<template>
-  <div class="ocr-id" @click="ocrIDCard">
-    <slot name="icon">
-      <img
-        class="ocr-id__img"
-        src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0MCIgaGVpZ2h0PSI0MCIgZmlsbD0ibm9uZSI+PHBhdGggb3BhY2l0eT0iLjAxIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGNsaXAtcnVsZT0iZXZlbm9kZCIgZD0iTTQwIDB2NDBIMFYwaDQweiIgZmlsbD0iI0M0QzRDNCIvPjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNMzMuMDQ0IDE3LjM2M2MuOTYgMCAxLjczOS0uNzkgMS43MzktMS43NjYgMC0uOTc1LS43NzktMS43NjYtMS43NC0xLjc2Ni0uOTYgMC0xLjczOC43OS0xLjczOCAxLjc2NnMuNzc4IDEuNzY2IDEuNzM5IDEuNzY2eiIgZmlsbD0iIzRCQ0I5MyIvPjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNMCAzMS44MTJWMTQuNzg4YzAtMi4yNTggMi4wNDktNC4wOTcgNC41NjQtNC4wOTdoMy44NDRsMS4xMzYtMy42NThDOS44ODggNS45MTMgMTEuMjM3IDUgMTIuNTQ4IDVIMjcuNDVjMS4zOSAwIDIuNjguODc2IDMuMDEgMi4wNDRsMS4xMzMgMy42NDdoMy44NDRjMi41MTUgMCA0LjU2NCAxLjgzOSA0LjU2NCA0LjA5N3YxLjczOWMwIC41MDMtLjQ1NC45MS0xLjAxNC45MXMtMS4wMTQtLjQwNy0xLjAxNC0uOTF2LTEuNzRjMC0xLjI1My0xLjEzOS0yLjI3NS0yLjUzNi0yLjI3NWgtMy44NDRjLS45MDcgMC0xLjcxMS0uNTQ5LTEuOTU1LTEuMzMybC0xLjEzNi0zLjY2YS4zNDIuMzQyIDAgMCAwLS4wMDctLjAyNWMtLjExLS4zOTYtLjYzOS0uNjc0LTEuMDQ1LS42NzRoLTE0LjljLS4zOTkgMC0uOTUuMzY2LTEuMDUzLjY5OWwtMS4xMzYgMy42NmMtLjI0Ny43ODYtMS4wNDUgMS4zMy0xLjk1NSAxLjMzMkg0LjU2NGMtMS4zOTcgMC0yLjUzNiAxLjAyMi0yLjUzNiAyLjI3NnYxNy4wMjRjMCAxLjI1NCAxLjEzOSAyLjI3NiAyLjUzNiAyLjI3NmgzMC44N2MxLjM5NyAwIDIuNTM1LTEuMDIyIDIuNTM1LTIuMjc2VjIxLjU5NmMwLS41MDMuNDU0LS45MSAxLjAxNC0uOTFzMS4wMTUuNDA3IDEuMDE1LjkxVjMxLjgxYy0uMDAzIDIuMjYtMi4wNSA0LjEtNC41NjcgNC4xSDQuNTY0QzIuMDQ5IDM1LjkxIDAgMzQuMDcgMCAzMS44MTF6IiBmaWxsPSIjNEJDQjkzIi8+PHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0xMi4xNzQgMjEuNzc4YzAtNC44NyAzLjcwNS04LjgzIDguMjYtOC44MyA0LjU1NiAwIDguMjYyIDMuOTYgOC4yNjIgOC44M3MtMy43MDYgOC44MzItOC4yNjEgOC44MzJjLTQuNTU2IDAtOC4yNjEtMy45NjItOC4yNjEtOC44MzJ6bTEuNzc5LjEzYzAgMy43OTYgMi45MDcgNi44ODMgNi40ODIgNi44ODMgMy41NzQgMCA2LjQ4MS0zLjA4NyA2LjQ4MS02Ljg4M3MtMi45MDctNi44ODMtNi40ODItNi44ODNjLTMuNTc0IDAtNi40ODEgMy4wODctNi40ODEgNi44ODN6IiBmaWxsPSIjNEJDQjkzIi8+PC9zdmc+"
-      />
-    </slot>
-  </div>
-</template>
-
-<style lang="scss">
-.ocr-id {
-  &__img {
-    width: 20px;
-    height: 20px;
-  }
-}
-</style>

package/src/components/ocr-id/types.d.ts

@@ -1,13 +0,0 @@
-export type OcrResultType = {
-  faceInfo: {
-    name: string
-    certNo: string
-    address: string
-  }
-  fileUploadVO: {
-    fileKey: string
-    fileUrl: string
-    objectNo: string
-    thumbnailUrl?: string
-  }
-} | null