@uxda/appkit 4.2.48 → 4.2.50

package/dist/index.js

@@ -4,7 +4,7 @@ import '@nutui/nutui-taro/dist/packages/checkbox/style/css';
 import { defineComponent, reactive, createBlock, openBlock, withCtx, createElementBlock, Fragment, renderList, normalizeClass, createElementVNode, toDisplayString, createTextVNode, ref, computed, onUnmounted, createCommentVNode, renderSlot, createVNode, normalizeStyle, unref, isRef, onMounted, createStaticVNode, watch, withDirectives, vShow, useModel, mergeModels, resolveComponent, vModelText, watchPostEffect, withModifiers } from 'vue';
 import '@nutui/nutui-taro/dist/packages/grid/style/css';
 import '@nutui/nutui-taro/dist/packages/griditem/style/css';
-import Taro, { getSystemInfoSync, getMenuButtonBoundingClientRect, request as request$1, showToast, showLoading, hideLoading, useDidShow, useRouter } from '@tarojs/taro';
+import Taro, { getSystemInfoSync, getMenuButtonBoundingClientRect, request as request$1, showToast, chooseMedia, chooseMessageFile, showLoading, uploadFile, hideLoading, useDidShow, useRouter } from '@tarojs/taro';
 import '@nutui/nutui-taro/dist/packages/popup/style/css';
 import isMobilePhone from 'validator/es/lib/isMobilePhone';
 import isIdentityCard from 'validator/es/lib/isIdentityCard';
@@ -1041,18 +1041,22 @@ var script$D = /* @__PURE__ */ defineComponent({
     const emits = __emit;
     const props = __props;
     async function taroImgCompress(src, quality = 80) {
-      return new Promise((resolve, reject) => {
-        Taro.compressImage({
-          src,
-          quality,
-          success: (res) => {
-            resolve(res);
-          },
-          fail: (res) => {
-            reject(res);
-          }
+      if (Taro.getEnv() === "WEB") {
+        return src;
+      } else {
+        return new Promise((resolve, reject) => {
+          Taro.compressImage({
+            src,
+            quality,
+            success: (res) => {
+              resolve(res);
+            },
+            fail: (res) => {
+              reject(res);
+            }
+          });
         });
-      });
+      }
     }
     function getCompressQuality(size) {
       let quality = 100;
@@ -1068,13 +1072,20 @@ var script$D = /* @__PURE__ */ defineComponent({
     async function onUploadFile(csRes) {
       let result = null;
       try {
+        console.log("===\u4E0A\u4F20", csRes);
         let { path, size, tempFilePath } = csRes.tempFiles[0];
-        const compressImg = await taroImgCompress(path || tempFilePath, getCompressQuality(size)) || {};
-        const filePath = compressImg.tempFilePath || path;
+        let filePath;
+        if (Taro.getEnv() !== "WEB") {
+          const compressImg = await taroImgCompress(path || tempFilePath, getCompressQuality(size)) || {};
+          filePath = compressImg.tempFilePath || path;
+        } else {
+          filePath = path || tempFilePath;
+        }
+        console.log(filePath, "filePath");
         showLoading({ title: "\u8EAB\u4EFD\u8BC1\u8BC6\u522B\u4E2D.." });
         const session = appKitOptions.token();
         const baseUrl = appKitOptions.baseUrl();
-        const upRes = await Taro.uploadFile({
+        const upRes = await uploadFile({
           url: baseUrl + "/hkapprove/ocr/idcard",
           filePath,
           name: "file",
@@ -1137,9 +1148,12 @@ var script$D = /* @__PURE__ */ defineComponent({
         type: "message"
       }
     ];
+    if (Taro.getEnv() === "WEB") {
+      actionSheetMenus.pop();
+    }
     async function chooseImages(item) {
       if (["camera", "album"].includes(item.type)) {
-        const csRes = await Taro.chooseMedia({
+        const csRes = await chooseMedia({
           count: 1,
           sourceType: [item.type],
           // "camera" | "album"
@@ -1148,7 +1162,7 @@ var script$D = /* @__PURE__ */ defineComponent({
         });
         onUploadFile(csRes);
       } else {
-        const csRes = await Taro.chooseMessageFile({
+        const csRes = await chooseMessageFile({
           count: 1,
           type: "image"
         });
@@ -1238,16 +1252,22 @@ var script$C = /* @__PURE__ */ defineComponent({
       console.log("===onIconClick");
       let result = null;
       try {
-        const csRes = await Taro.chooseImage({
-          count: 1
+        const csRes = await Taro.chooseMedia({
+          count: 1,
+          sourceType: ["album", "camera"]
         });
-        let { path, size } = csRes.tempFiles[0];
-        const compressImg = await taroImgCompress(path, getCompressQuality(size)) || {};
-        const filePath = compressImg.tempFilePath || path;
+        let { size, tempFilePath } = csRes.tempFiles[0];
+        let filePath;
+        if (Taro.getEnv() !== "WEB") {
+          const compressImg = await taroImgCompress(tempFilePath, getCompressQuality(size)) || {};
+          filePath = compressImg.tempFilePath;
+        } else {
+          filePath = tempFilePath;
+        }
         showLoading({ title: "\u8425\u4E1A\u6267\u7167\u8BC6\u522B\u4E2D.." });
         const session = appKitOptions.token();
         const baseUrl = appKitOptions.baseUrl();
-        const upRes = await Taro.uploadFile({
+        const upRes = await uploadFile({
           url: baseUrl + "/promoact/common/parseBusinessLicense",
           filePath,
           name: "file",
@@ -1664,7 +1684,8 @@ var script$B = /* @__PURE__ */ defineComponent({
   __name: "RechargeView",
   props: {
     app: { type: String, required: true },
-    tenant: { type: String, required: true }
+    tenant: { type: String, required: true },
+    payFinishJumpUrl: { type: String, required: false }
   },
   emits: ["complete", "agree"],
   setup(__props, { emit: __emit }) {
@@ -1709,7 +1730,8 @@ var script$B = /* @__PURE__ */ defineComponent({
           app: "loankitMp",
           tenant: props.tenant,
           accountAuthFlag: false,
-          channelCode: "centergzh"
+          channelCode: "centergzh",
+          payFinishJumpUrl: props.payFinishJumpUrl
         }).then((result) => {
           console.log(result);
         });
@@ -7737,7 +7759,7 @@ var script$4 = /* @__PURE__ */ defineComponent({
           icon: "none"
         });
       }
-      Taro.chooseMedia({
+      chooseMedia({
         count: 20 - formState.attachment.length,
         mediaType: ["mix"],
         maxDuration: 60,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxda/appkit",
-  "version": "4.2.48",
+  "version": "4.2.50",
   "description": "小程序应用开发包",
   "main": "dist/index.js",
   "module": "dist/index.ts",

package/src/payment/components/RechargeView.vue

@@ -20,7 +20,6 @@ import AmountPicker from './AmountPicker.vue'
 import { useHttp, endpoints } from '../api'
 import { requestBrandWCPay, requestPayment } from '../services'
 import Taro, { showToast } from '@tarojs/taro'
-import { getSdkConfig } from '../../shared'
 
 // 充值用户界面
 // 配置了必须的属性后
@@ -38,7 +37,11 @@ export interface RechargeViewProps {
   /**
    * 租户
    */
-  tenant: string
+  tenant: string,
+  /**
+   * h5支付完成后跳转地址
+   */
+  payFinishJumpUrl?: ''
 }
 
 const props = defineProps<RechargeViewProps>()
@@ -68,13 +71,7 @@ const onAmountSelect = (selected: number) => {
   state.selected = selected
 }
 
-// const 公众号配置 = ref<any>()
-
 onMounted(async () => {
-  // if (Taro.getEnv() === 'WEB') {
-  //   公众号配置.value = await getSdkConfig('loankitMp')
-  // }
-
   const $http = useHttp({ Appcode: props.app !== 'cloudkitPro' ? props.app : '', Tenant: props.tenant })
 
   $http.get<any[]>(endpoints.获取充值金额列表, {
@@ -102,6 +99,7 @@ const onPayClick = () => {
       tenant: props.tenant,
       accountAuthFlag: false,
       channelCode: 'centergzh',
+      payFinishJumpUrl: props.payFinishJumpUrl
     }).then(result => {
       console.log(result), 'result'
     })

package/src/payment/types.ts

@@ -25,6 +25,7 @@ export type PaymentParams = {
   caseConfigId?: string
   accountAuthFlag?: boolean
   channelCode?: string
+  payFinishJumpUrl?: string
 }
 
 export type RechargeParams = Pick<PaymentParams, 'app' | 'tenant'>

package/src/shared/components/OcrBusinessLicense.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script lang="ts" setup>
-import Taro, { showToast, showLoading, hideLoading } from '@tarojs/taro';
+import Taro, { showToast, showLoading, hideLoading, uploadFile } from '@tarojs/taro';
 import { NsIcon } from '@uxda/nutshell/taro';
 import { useAppKitOptions } from '../../Appkit';
 
@@ -31,13 +31,13 @@ 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) {
@@ -60,17 +60,24 @@ async function onIconClick() {
   console.log('===onIconClick');
   let result: OcrResult | null = null;
   try {
-    const csRes = await Taro.chooseImage({
+    const csRes = await Taro.chooseMedia({
       count: 1,
+      sourceType: ['album', 'camera']
     });
-    let { path, size } = csRes.tempFiles[0];
-    const compressImg: any =
-      (await taroImgCompress(path, getCompressQuality(size))) || {};
-    const filePath = compressImg.tempFilePath || path;
+    let { size, tempFilePath } = csRes.tempFiles[0];
+    let filePath
+    if (Taro.getEnv() !== 'WEB') {
+      const compressImg: any = (await taroImgCompress(tempFilePath, getCompressQuality(size))) || {}
+      filePath = compressImg.tempFilePath
+    } else {
+      filePath = tempFilePath
+    }
+
     showLoading({ title: '营业执照识别中..' });
+
     const session = appKitOptions.token();
     const baseUrl = appKitOptions.baseUrl();
-    const upRes: any = await Taro.uploadFile({
+    const upRes: any = await uploadFile({
       url: baseUrl + '/promoact/common/parseBusinessLicense',
       filePath,
       name: 'file',

package/src/shared/components/OcrIcon.vue

@@ -10,7 +10,7 @@
 </template>
 
 <script lang="ts" setup>
-import Taro, { showToast, showLoading, hideLoading } from '@tarojs/taro'
+import Taro, { showToast, showLoading, hideLoading, chooseMedia, chooseMessageFile, uploadFile } from '@tarojs/taro'
 import { NsIcon } from '@uxda/nutshell/taro'
 import { useAppKitOptions } from '../../Appkit'
 import { ref } from 'vue';
@@ -50,18 +50,22 @@ type OcrResultType = {
 }
 
 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)
-      },
+  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) {
@@ -80,14 +84,22 @@ 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 taroImgCompress(path || tempFilePath, getCompressQuality(size))) || {}
-    const filePath = compressImg.tempFilePath || path
+    let filePath
+    if (Taro.getEnv() !== 'WEB') {
+      const compressImg: any = (await taroImgCompress(path || tempFilePath, getCompressQuality(size))) || {}
+      filePath = compressImg.tempFilePath || path
+    } else {
+      filePath = path || tempFilePath
+    }
+
+    console.log(filePath, 'filePath')
     showLoading({ title: '身份证识别中..' })
 
     const session = appKitOptions.token()
     const baseUrl = appKitOptions.baseUrl()
-    const upRes: any = await Taro.uploadFile({
+    const upRes: any = await uploadFile({
       url: baseUrl + '/hkapprove/ocr/idcard',
       filePath,
       name: 'file',
@@ -154,10 +166,14 @@ const actionSheetMenus = [
     type: 'message',
   },
 ]
+if (Taro.getEnv() === 'WEB') {
+  actionSheetMenus.pop()
+}
+
 // 选择图像上传
 async function chooseImages(item: any) {
   if (['camera', 'album'].includes(item.type)) {
-    const csRes = await Taro.chooseMedia({
+    const csRes = await chooseMedia({
       count: 1,
       sourceType: [item.type], // "camera" | "album"
       maxDuration: 60, // 使用duration属性判断是图片还是视频，图片没有该属性
@@ -165,7 +181,7 @@ async function chooseImages(item: any) {
 
     onUploadFile(csRes)
   } else {
-    const csRes = await Taro.chooseMessageFile({
+    const csRes = await chooseMessageFile({
       count: 1,
       type: 'image',
     })

package/src/user/components/UserFeedback.vue

@@ -38,7 +38,7 @@
 </template>
 
 <script lang="ts" setup>
-import Taro, { showToast, showLoading } from '@tarojs/taro'
+import Taro, { showToast, showLoading, chooseMedia } from '@tarojs/taro'
 import { onMounted, reactive, ref } from 'vue'
 import { useAppKitOptions } from '../../Appkit'
 import { useHttp } from '../api'
@@ -107,7 +107,7 @@ function toUpload() {
       icon: 'none',
     })
   }
-  Taro.chooseMedia({
+  chooseMedia({
     count: 20 - formState.attachment.length,
     mediaType: ['mix'],
     maxDuration: 60,