@uxda/appkit 4.1.4 → 4.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxda/appkit",
-  "version": "4.1.4",
+  "version": "4.1.6",
   "description": "小程序应用开发包",
   "main": "dist/index.js",
   "module": "dist/index.ts",
@@ -37,7 +37,7 @@
     "@uxda/nutshell": "^1.0.0",
     "dayjs": "^1.11.10",
     "validator": "^13.12.0",
-    "vue": "^3.3.0"
+    "vue": "^3.5.0"
   },
   "devDependencies": {
     "@babel/core": "^7.8.0",

package/src/shared/components/OcrBusinessLicense.vue

@@ -1,23 +1,30 @@
 <template>
-  <div class="ocr-icon" @click="onIconClick">
+  <div :class="['ocr-business-license', disabled ? 'disabled' : '']" class="ocr-icon" @click="onIconClick">
     <ns-icon name="https://simple.shensi.tech/icons/ocr.svg" />
   </div>
 </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'
 
-const appKitOptions = useAppKitOptions();
+const appKitOptions = useAppKitOptions()
 
-const emits = defineEmits(['complete']);
+const emits = defineEmits(['complete'])
+
+
+type OcrBusinessLicenseProps = {
+  disabled: boolean
+}
+
+defineProps<OcrBusinessLicenseProps>()
 
 export type OcrResult = {
-  companyName: string;
-  idCardNo: string;
-  legalPersonName: string;
-};
+  companyName: string
+  idCardNo: string
+  legalPersonName: string
+}
 
 async function taroImgCompress(src: string, quality = 80) {
   return new Promise((resolve, reject) => {
@@ -25,42 +32,45 @@ 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() {
-  console.log('===onIconClick');
-  let result: OcrResult | null = null;
+  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];
+    })
+    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();
+      (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,
@@ -72,11 +82,11 @@ async function onIconClick() {
         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 || {};
+      const faceInfo = res.result || {}
       result = {
         companyName: allTrim(faceInfo.companyName || ''),
         idCardNo: allTrim(faceInfo.idCardNo || ''),
@@ -84,32 +94,37 @@ async function onIconClick() {
         fileId: faceInfo.fileId,
         originalUrl: faceInfo.originalUrl,
         downloadUrl: faceInfo.downloadUrl,
-      };
-      console.log('===识别', result);
+      }
+      console.log('===识别', result)
       if (!result.companyName && !result.idCardNo) {
-        Taro.showToast({ title: '识别失败，请重试', icon: 'none' });
+        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)
 }
 </script>
 
 <style lang="scss">
-.ocr-icon {
+.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,5 +1,5 @@
 <template>
-  <div class="ocr-icon" @click="onIconClick">
+  <div :class="['ocr-icon', disabled ? 'disabled' : '']" @click="onIconClick">
     <ns-icon name="https://simple.shensi.tech/icons/ocr.svg"  />
 </div>
 </template>
@@ -13,6 +13,12 @@ const appKitOptions = useAppKitOptions()
 
 const emits = defineEmits(['complete'])
 
+type OcrIconProps = {
+  disabled: boolean
+}
+
+defineProps<OcrIconProps>()
+
 export type OcrResult = {
   name: string
   number: string
@@ -48,7 +54,9 @@ function allTrim(str: string) {
 }
 
 async function onIconClick() {
-  console.log('===onIconClick')
+  if (props.disabled) {
+    return
+  }
   let result: OcrResult | null = null
   try {
     const csRes = await Taro.chooseImage({
@@ -115,5 +123,10 @@ async function onIconClick() {
     width: 24px;
     height: 24px;
   }
+  &.disabled {
+    .ns-icon {
+      filter: brightness(1.5) grayscale(1);
+    }
+  }
 }
 </style>