@uxda/appkit 4.3.13 → 4.3.15

package/src/shared/components/AppVerify.vue

@@ -17,8 +17,8 @@
       </div>
     </ns-form>
     <div class="row buttons">
-      <ns-button class="cancel-btn" v-track-click="'手机号验证-取消'" :r="20" @click="emits('cancel')">取消</ns-button>
-      <ns-button color="primary" v-track-click="'手机号验证-确认'" :r="20" @click="onOk">确认</ns-button>
+      <ns-button class="cancel-btn" v-track-click="'手机号验证-取消'" @click="emits('cancel')">取消</ns-button>
+      <ns-button color="primary" v-track-click="'手机号验证-确认'" @click="onOk">确认</ns-button>
     </div>
   </div>
 </template>
@@ -75,9 +75,9 @@ const props = defineProps<AppVerifyProps>();
   }
 
   .caption {
-    font-size: 14px !important;
-    color: #666;
-    margin-bottom: 5px;
+    font-size: 13px !important;
+    color: #ccc;
+    line-height: 21px;
   }
 
   .number {
@@ -97,20 +97,11 @@ const props = defineProps<AppVerifyProps>();
       border-radius: 5px;
       flex: 1;
       padding-left: 12px;
-      .input-text {
-        text-align: left !important;
-      }
     }
 
     .form-btn {
       margin-left: 12px;
-      width: 90px;
-
-      .caption {
-        font-size: 10px !important;
-        color: #ccc;
-        margin-bottom: 0;
-      }
+      width: 105px;
     }
   }
 

package/src/shared/components/OcrBusinessLicense.vue

@@ -1,8 +1,6 @@
 <template>
-  <div :class="['ocr-business-license', disabled ? 'disabled' : '']" class="ocr-icon" 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 :class="['ocr-business-license', disabled ? 'disabled' : '']" class="ocr-icon" v-track-click="'营业执照识别-点击'" @click="onIconClick">
+    <ns-icon name="https://cdn.ddjf.com/static/images/beidouxing/ocr-icon.png" />
   </div>
 </template>
 
@@ -10,7 +8,6 @@
 import Taro, { showToast, showLoading, hideLoading, uploadFile, chooseMedia } from '@tarojs/taro';
 import { NsIcon } from '@uxda/nutshell/taro';
 import { useAppKitOptions } from '../../Appkit';
-import { compressImage, getCompressQuality } from '../composables/useUpload';
 
 const appKitOptions = useAppKitOptions();
 
@@ -18,29 +15,49 @@ const emits = defineEmits(['complete']);
 
 type OcrBusinessLicenseProps = {
   disabled: boolean;
-  customClick?: boolean
 };
 
-const props = withDefaults(defineProps<OcrBusinessLicenseProps>(), {
-  disabled: false,
-  customClick: false
-});
+const props = defineProps<OcrBusinessLicenseProps>();
 
 export type OcrResult = {
   companyName: string;
   idCardNo: string;
   legalPersonName: string;
-  [x: string]: any;
 };
 
+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 onUpload() {
+async function onIconClick() {
   if (props.disabled) {
     return;
   }
+  console.log('===onIconClick');
   let result: OcrResult | null = null;
   try {
     const csRes = await chooseMedia({
@@ -48,10 +65,15 @@ async function onUpload() {
       sourceType: ['album', 'camera']
     });
     let { size, tempFilePath } = csRes.tempFiles[0];
-    const compressImg: any = (await compressImage(tempFilePath, getCompressQuality(size))) || {}
-    const filePath = compressImg.tempFilePath
+    let filePath
+    if (Taro.getEnv() !== 'WEB') {
+      const compressImg: any = (await taroImgCompress(tempFilePath, getCompressQuality(size))) || {}
+      filePath = compressImg.tempFilePath
+    } else {
+      filePath = tempFilePath
+    }
 
-    showLoading({ title: '营业执照识别中..', mask: true });
+    showLoading({ title: '营业执照识别中..' });
 
     const session = appKitOptions.token();
     const baseUrl = appKitOptions.baseUrl();
@@ -61,7 +83,6 @@ async function onUpload() {
       name: 'file',
       formData: {
         objectNo: `min${Date.now()}`,
-        appCode: appKitOptions.app(),
       },
       header: {
         token: session || '',
@@ -95,10 +116,6 @@ async function onUpload() {
   }
   emits('complete', result);
 }
-
-defineExpose({
-  onUpload
-})
 </script>
 
 <style lang="scss">

package/src/shared/components/OcrIcon.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="ocr-icon" :class="[disabled ? 'disabled' : '', className]" v-track-click="'身份证识别-点击'" @click="!customClick ? onUpload() : null">
+  <div class="ocr-icon" :class="[disabled ? 'disabled' : '']" v-track-click="'身份证识别-点击'" @click="onPhotograph">
     <slot name="icon">
       <ns-icon name="https://cdn.ddjf.com/static/images/beidouxing/ocr-icon.png" />
     </slot>
@@ -11,44 +11,24 @@
 
 <script lang="ts" setup>
 import Taro, { showToast, showLoading, hideLoading, chooseMedia, chooseMessageFile, uploadFile } from '@tarojs/taro'
-import { NsIcon, useNutshell } from '@uxda/nutshell/taro'
+import { NsIcon } 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 = {
+type OcrIconProps = {
   disabled?: boolean,
   side?: 'face' | 'back',
-  className?: string
-  uploadUrl?: string
-  customUpload?: Function
-  hasUploadVo?: boolean
-  customClick?: boolean
-}
-type FileType = {
-	"downloadUrl": string,
-	"fileId": string,
-	"fileName": string,
-	"fileSize": number,
-	"fileSuffix": string,
-	"fileType": string,
-	"originalUrl": string
+  class?: string
 }
 
-const props = withDefaults(defineProps<OcrProps>(), {
+const props = withDefaults(defineProps<OcrIconProps>(), {
   disabled: false,
   side: 'face',
-  className: '',
-  hasUploadVo: true,
-  customClick: false,
-  uploadUrl: '/saas-base/file/uploadPublic',
+  class: ''
 })
 
 type OcrResultType = {
@@ -69,6 +49,34 @@ type OcrResultType = {
   }
 }
 
+async function taroImgCompress(src: string, quality = 80) {
+  if (Taro.getEnv() === 'WEB') {
+    return src;
+  } else {
+    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, '')
 }
@@ -76,62 +84,59 @@ function allTrim(str: string) {
 async function onUploadFile(csRes: any) {
   let result: OcrResultType | null = null
   try {
+    console.log('===上传', csRes)
     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
+    let filePath
+    if (Taro.getEnv() !== 'WEB') {
+      const compressImg: any = (await taroImgCompress(path || tempFilePath, getCompressQuality(size))) || {}
+      filePath = compressImg.tempFilePath || path
+    } else {
+      filePath = path || tempFilePath
     }
 
-    showLoading({ title: '身份证识别中..', mask: true })
+    console.log(filePath, 'filePath')
+    showLoading({ title: '身份证识别中..' })
 
     const session = appKitOptions.token()
     const baseUrl = appKitOptions.baseUrl()
     const upRes: any = await uploadFile({
-      url: `${baseUrl}${!props.hasUploadVo ? props.uploadUrl : '/hkapprove/ocr/idcard'}`,
+      url: baseUrl + '/hkapprove/ocr/idcard',
       filePath,
       name: 'file',
       formData: {
         objectNo: `min${Date.now()}`,
         side: props.side,
-        appCode: appKitOptions.app(),
       },
       header: {
         token: session || '',
       },
     })
+    hideLoading()
 
     const res = JSON.parse(upRes.data)
     if (res.code === '200') {
-      if (props.hasUploadVo) {
-        hideLoading()
-        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 || {},
-        }
-        if (props.side === 'face' && !result.faceInfo.name && !result.faceInfo.certNo) {
-          showToast({ title: '识别失败，请重试', icon: 'none' })
-        }
-        if (props.side === 'back' && !result.backInfo?.startDate && !result.backInfo?.endDate) {
-          showToast({ title: '识别失败，请重试', icon: 'none' })
-        }
-      } else {
-        await getOcrInfo(res.result)
+      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) {
+        showToast({ title: '识别失败，请重试', icon: 'none' })
+      }
+      if (props.side === 'back' && !result.backInfo?.startDate && !result.backInfo?.endDate) {
+        showToast({ title: '识别失败，请重试', icon: 'none' })
       }
     } else {
-      hideLoading()
       showToast({
         title: res.msg,
         icon: 'error',
@@ -141,48 +146,9 @@ async function onUploadFile(csRes: any) {
     hideLoading()
     console.log(err)
   }
-
-  props.hasUploadVo && (result?.faceInfo.name || result?.backInfo.startDate) && emits('complete', result)
+  emits('complete', result)
 }
 
-// 根据证件路径获取证件信息
-async function getOcrInfo(file: string | FileType) {
-  try {
-    const res: any = await $http.get('/hkbase/common/idCard', {
-      fileUrl: typeof file === 'string' ? file : file.originalUrl,
-      side: props.side,
-    })
-    hideLoading()
-
-    if ((props.side === 'face' && !res?.name) || (props.side === 'back' && !res?.signDate)) {
-      $n.dialog({
-        title: '识别失败',
-        message: `您上传的图片可能不够清晰或与当前功能不符，请重新上传一张清晰、完整的图片。谢谢！`,
-        okText: '我知道了',
-        cancelText: '',
-      })
-      return
-    }
-
-    emits('complete', {
-      faceInfo: {
-        name: allTrim(res?.name || ''),
-        certNo: allTrim(res?.cardNumber || ''),
-        address: allTrim(res?.address || ''),
-      },
-      backInfo: {
-        startDate: res?.expireDate || '',
-        endDate: res?.signDate || ''
-      },
-      fileUploadVO: {
-        fileUrl: typeof file === 'string' ? file : file.originalUrl,
-        fileKey: typeof file === 'string' ? file : file.fileId,
-      },
-    })
-  } catch (err) {
-    hideLoading()
-  }
-}
 
 // 上传图片操作面板
 const activeSheetVisible = ref(false)
@@ -224,7 +190,7 @@ async function chooseImages(item: any) {
   }
 }
 
-async function onUpload() {
+async function onPhotograph() {
   if (props.disabled) return
 
   if (Taro.getEnv() === 'WEB') {
@@ -240,10 +206,6 @@ async function onUpload() {
 
   activeSheetVisible.value = true
 }
-
-defineExpose({
-  onUpload
-})
 </script>
 
 <style lang="scss">

package/src/shared/components/index.ts

@@ -3,8 +3,6 @@ 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 }
+export { AppDrawer, PageHeader, DeviceVersion, AppVerify, OcrIcon, OcrBusinessLicense }

package/src/shared/composables/index.ts

@@ -7,4 +7,3 @@ export * from './useUpload'
 export * from './useCrypto'
 export * from './useLogger'
 export * from './useWxAuth'
-export * from './useCompress'

package/src/shared/composables/useDeviceEnv.ts

@@ -24,4 +24,38 @@ export const isAndroid = () => {
     return /Android/i.test(window.navigator.userAgent)
   }
   return false
-}
+}
+
+/** 浏览器类型 */
+export type BrowserType = 'safari' | 'chrome' | 'other'
+
+/**
+ * 获取当前浏览器类型
+ * @returns 'safari' | 'chrome' | 'other'
+ */
+export function getBrowser(): BrowserType {
+  if (typeof window === 'undefined') return 'other'
+  const ua = window.navigator.userAgent.toLowerCase()
+  // Edge、Opera 等基于 Chromium 的浏览器归为 other，优先判断
+  if (/edg\/|edge\//.test(ua) || /opr\/|opera/.test(ua)) return 'other'
+  // Chrome（含 iOS 端 CriOS）
+  if (/chrome\/|crios\//.test(ua)) return 'chrome'
+  // Safari：含 safari 且不含 chrome（Chrome 的 UA 同时包含两者）
+  if (/safari\//.test(ua) && !/chrome|crios/.test(ua)) return 'safari'
+  return 'other'
+}
+
+/** 是否 Safari 浏览器 */
+export function isSafari(): boolean {
+  return getBrowser() === 'safari'
+}
+
+/** 是否 Chrome 浏览器（含 iOS 端） */
+export function isChrome(): boolean {
+  return getBrowser() === 'chrome'
+}
+
+/** 是否其他浏览器（非 Safari、非 Chrome） */
+export function isOtherBrowser(): boolean {
+  return getBrowser() === 'other'
+}

package/src/shared/composables/useUpload.ts

@@ -1,106 +1,61 @@
-import Taro from "@tarojs/taro";
-
-/**
- * 使用 canvas 压缩图片（Web 端）
- */
-export const compressImageWithCanvas = (
-  src: string,
-  quality: number
-): Promise<string> => {
-  return new Promise((resolve, reject) => {
-    const img = new Image();
-    img.crossOrigin = "anonymous";
-
-    img.onload = () => {
-      try {
-        const canvas = document.createElement("canvas");
-        const ctx = canvas.getContext("2d");
-
-        if (!ctx) {
-          reject(new Error("无法获取 canvas 上下文"));
-          return;
-        }
-
-        // 设置画布尺寸（可以根据需要限制最大尺寸）
-        const maxWidth = 850;
-        const maxHeight = 850;
-        let width = img.width;
-        let height = img.height;
-
-        // 计算压缩后的尺寸
-        if (width > maxWidth || height > maxHeight) {
-          const ratio = Math.min(maxWidth / width, maxHeight / height);
-          width = width * ratio;
-          height = height * ratio;
-        }
-
-        canvas.width = width;
-        canvas.height = height;
+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>
+}
 
-        // 绘制图片到 canvas
-        ctx.drawImage(img, 0, 0, width, height);
+const mappings: { [x: string]: keyof Media } = {
+  downloadUrl: 'thrumb',
+  fileId: 'id',
+  fileName: 'name',
+  fileSize: 'size',
+  fileSuffix: 'ext',
+  fileType: 'type',
+  originalUrl: 'url',
+}
 
-        // 转换为 blob
-        canvas.toBlob(
-          (blob) => {
-            if (!blob) {
-              reject(new Error("图片压缩失败"));
-              return;
-            }
-            // 创建 blob URL
-            const compressedUrl = URL.createObjectURL(blob);
-            resolve(compressedUrl);
-          },
-          "image/jpeg",
-          quality / 100
-        );
-      } catch (error) {
-        reject(error);
-      }
-    };
+const transformFields = (row: any) => {
+  return Object.fromEntries(Object.entries(row).map(([k, v]) => [mappings[k] || k, v]))
+}
 
-    img.onerror = () => {
-      reject(new Error("图片加载失败"));
-    };
+type UploadFunction = (url: string, file: Media) => Promise<Media>
 
-    img.src = src;
-  });
-};
+export const useUpload = (config: UploadConfig) => {
+  const appkitOptions = useAppKitOptions()
 
-// 压缩图片
-export async function compressImage(src: string, quality = 80) {
-  if (Taro.getEnv() === "WEB") {
-    try {
-      const compressedUrl = await compressImageWithCanvas(src, quality);
-      // 返回格式与小程序端一致，包含 tempFilePath 属性
-      return { tempFilePath: compressedUrl };
-    } catch (error) {
-      console.error("图片压缩失败:", error);
-      // 压缩失败时返回原图
-      return { tempFilePath: src };
-    }
-  } else {
-    return new Promise((resolve, reject) => {
-      Taro.compressImage({
-        src: src,
-        quality: quality,
-        success: (res) => {
-          resolve(res);
+  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()}`,
         },
-        fail: (res) => {
-          reject(res);
+        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: '文件上传异常',
+            })
+          }
+        },
+      })
+    })
   }
-}
-
-// 获取压缩质量
-export function getCompressQuality(size: number) {
-  let quality = 100;
-  const curSize = size / (1024 * 1024);
-  if (curSize > 6) {
-    quality = quality - ((curSize - 6) / curSize) * 100;
+  return {
+    upload,
   }
-  return quality;
 }

package/src/shared/http/Http.ts

@@ -91,7 +91,6 @@ const request: HttpInstance['request'] = <T>(config: HttpRequestConfig) => {
         })
         .catch((e: any) => {
           console.log('request.catch===', e)
-          reject(e)
         })
   })
 }

package/src/shared/tracking/tracking-sdk.ts

@@ -697,6 +697,7 @@ class TrackingSDK {
    * 发送埋点数据
    */
   private async flush(): Promise<void> {
+    console.log(this.eventQueue.length, 'this.eventQueue.length')
     if (this.eventQueue.length === 0) return
 
     const events = [...this.eventQueue]

package/src/shared/weixin/jssdk.ts

@@ -51,7 +51,6 @@ function requestWxH5Pay(options: PrePayOptions) {
           title: '提示',
           content: '当前环境不支持微信支付，请在微信内置浏览器中打开',
           confirmText: '确定',
-          confirmColor: '#017fff',
           success: () => {},
         })
         return

package/src/user/api/index.ts

@@ -65,7 +65,7 @@ function useHttp() {
   const headers: any = {
     Token: appkitOptions.tempToken() || appkitOptions.token(),
     Appcode: appkitOptions.app(),
-    tid: appkitOptions.tenant(),
+    cookie: `tid=${appkitOptions.tenant()}`,
     gray: appkitOptions.gray ? appkitOptions.gray() : '0',
   }
 

package/src/user/components/UserAuth.vue

@@ -6,7 +6,7 @@
           <ns-input label="你的姓名" name="姓名" v-model="formData.姓名" placeholder="请输入或拍照识别" :maxlength="30" :disabled="已认证"
             :rules="['required']">
             <template #append>
-              <ocr-icon v-if="!已认证" :has-upload-vo="false" @complete="onOcrComplete" />
+              <ocr-icon v-if="!已认证" @complete="onOcrComplete" />
             </template>
           </ns-input>
           <ns-input label="身份证号码" name="身份证号码" placeholder="请输入身份证号码" :maxlength="30" v-model="formData.身份证号码"