@uxda/appkit 4.2.47 → 4.2.50

package/src/payment/services/request-payment.ts

@@ -1,8 +1,8 @@
 import { PaymentParams } from '../types'
 import { DollarApp } from '../../Appkit'
 import { useHttp, endpoints } from '../../payment/api'
-import { requestPayment as weappRequestPayment } from '../../shared'
-import Taro from '@tarojs/taro'
+import { requestWxH5Pay, requestPayment as weappRequestPayment } from '../../shared'
+import Taro, { showToast } from '@tarojs/taro'
 
 const requestPayment = (params: PaymentParams) => {
   return new Promise<boolean>((resolve, reject) => {
@@ -39,7 +39,7 @@ const requestPaymentByBean = (params: PaymentParams, Appcode = '') => {
       })
       .then((response: any) => {
         if (!response.json) {
-          Taro.showToast({
+          showToast({
             title: response.message,
             icon: 'none',
           })
@@ -57,10 +57,40 @@ const requestPaymentByBean = (params: PaymentParams, Appcode = '') => {
   })
 }
 
+const requestBrandWCPay = (params: PaymentParams, Appcode = '') => {
+  return new Promise<boolean>((resolve, reject) => {
+    const $http = useHttp({
+      Appcode: Appcode,
+      Tenant: params.tenant,
+    })
+    $http
+      .post(endpoints.获取微信支付参数包, {
+        ...params,
+      })
+      .then((response: any) => {
+        if (!response.json) {
+          showToast({
+            title: response.message,
+            icon: 'none',
+          })
+          resolve(false)
+        } else {
+          requestWxH5Pay(response.json).then((result) => {
+            if (result) {
+              resolve(true)
+            } else {
+              resolve(false)
+            }
+          })
+        }
+      })
+  })
+}
+
 export default {
   install($app: DollarApp) {
     $app.requestPayment = requestPayment
   },
 }
 
-export { requestPayment, requestPaymentByBean }
+export { requestPayment, requestPaymentByBean, requestBrandWCPay }

package/src/payment/types.ts

@@ -2,11 +2,11 @@ export type PaymentParams = {
   /**
    * 支付金额
    */
-  amount?: number,
+  amount?: number
   /**
    * 应用
    */
-  app: string,
+  app: string
   /**
    * 支付场景
    */
@@ -14,16 +14,18 @@ export type PaymentParams = {
   /**
    * 租户
    */
-  tenant: string,
+  tenant: string
   /**
    * 支付用户(微信登录的凭证 code)
    */
-  user: string,
-  caseConfigId?: string,
+  user?: string
   /**
    * 权益ID
    */
-
+  caseConfigId?: string
+  accountAuthFlag?: boolean
+  channelCode?: string
+  payFinishJumpUrl?: string
 }
 
-export type RechargeParams = Pick<PaymentParams, 'app' | 'tenant'>
+export type RechargeParams = Pick<PaymentParams, 'app' | 'tenant'>

package/src/register/components/SelfRegistration.vue

@@ -3,7 +3,7 @@ import { reactive } from 'vue'
 import OcrIcon from '../../shared/components/OcrIcon.vue'
 import DdArea from './../../components/dd-area/index.vue'
 import DdSelector from './../../components/dd-selector/index.vue'
-import Taro from '@tarojs/taro'
+import Taro, { showToast } from '@tarojs/taro'
 
 const props = withDefaults(
   defineProps<{
@@ -53,7 +53,7 @@ function onOCRInfo(payload: any) {
 
 function showVerifyToast(tip: string, duration = 1500) {
   if (!tip) return
-  Taro.showToast({
+  showToast({
     title: tip,
     icon: 'none',
     duration,

package/src/shared/components/AppDrawer.vue

@@ -1,19 +1,16 @@
 <template>
-  <nut-popup
-    :pop-class="`app-drawer ${modelValue ? 'open' : ''}`"
-    position="right"
-    :visible="modelValue"
+  <nut-popup :pop-class="`app-drawer ${modelValue ? 'open' : ''}`" position="right" :visible="modelValue"
     @update:visible="onVisibleChange">
-    <page-header
-      :title="title"
-      @close="onPageHeaderClose" />
-      <div class="drawer-body">
-        <slot></slot>
-      </div>
+    <page-header :title="title" :style="Taro.getEnv() !== 'WEB' ? '' : '--height: 40px'" @close="onPageHeaderClose" />
+    <div class="drawer-body">
+      <slot></slot>
+    </div>
   </nut-popup>
 </template>
 
 <script lang="ts" setup>
+import Taro from '@tarojs/taro'
+
 // 右侧页面
 // 模仿页面打开
 // 假的标题栏和返回按钮
@@ -44,9 +41,11 @@ const onPageHeaderClose = () => {
   position: absolute;
   display: flex;
   flex-direction: column;
+
   &.open {
     height: 100vh;
   }
+
   .drawer-body {
     flex-grow: 1;
     overflow: scroll;

package/src/shared/components/OcrBusinessLicense.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script lang="ts" setup>
-import Taro 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;
-    Taro.showLoading({ title: '营业执照识别中..' });
+    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',
@@ -81,7 +88,7 @@ async function onIconClick() {
         token: session || '',
       },
     });
-    Taro.hideLoading();
+    hideLoading();
     const res = JSON.parse(upRes.data);
     if (res.code === '200') {
       const faceInfo = res.result || {};
@@ -95,16 +102,16 @@ async function onIconClick() {
       };
       console.log('===识别', result);
       if (!result.companyName && !result.idCardNo) {
-        Taro.showToast({ title: '识别失败，请重试', icon: 'none' });
+        showToast({ title: '识别失败，请重试', icon: 'none' });
       }
     } else {
-      Taro.showToast({
+      showToast({
         title: res.msg,
         icon: 'error',
       });
     }
   } catch (err) {
-    Taro.hideLoading();
+    hideLoading();
     console.log(err);
   }
   emits('complete', result);

package/src/shared/components/OcrIcon.vue

@@ -10,7 +10,7 @@
 </template>
 
 <script lang="ts" setup>
-import Taro 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
-    Taro.showLoading({ title: '身份证识别中..' })
+    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',
@@ -99,7 +111,7 @@ async function onUploadFile(csRes: any) {
         token: session || '',
       },
     })
-    Taro.hideLoading()
+    hideLoading()
 
     const res = JSON.parse(upRes.data)
     if (res.code === '200') {
@@ -119,19 +131,19 @@ async function onUploadFile(csRes: any) {
       }
       console.log('===识别', result)
       if (props.side === 'face' && !result.faceInfo.name && !result.faceInfo.certNo) {
-        Taro.showToast({ title: '识别失败，请重试', icon: 'none' })
+        showToast({ title: '识别失败，请重试', icon: 'none' })
       }
       if (props.side === 'back' && !result.backInfo?.startDate && !result.backInfo?.endDate) {
-        Taro.showToast({ title: '识别失败，请重试', icon: 'none' })
+        showToast({ title: '识别失败，请重试', icon: 'none' })
       }
     } else {
-      Taro.showToast({
+      showToast({
         title: res.msg,
         icon: 'error',
       })
     }
   } catch (err) {
-    Taro.hideLoading()
+    hideLoading()
     console.log(err)
   }
   emits('complete', result)
@@ -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/shared/index.ts

@@ -1,4 +1,8 @@
 export * from './weixin'
 export * from './components'
 export * from './composables'
-export * from './http'
+export * from './http'
+
+import services from './weixin'
+
+export { services }

package/src/shared/weixin/index.ts

@@ -1 +1,9 @@
-export * from './payment'
+import { Service } from '../../payment/services'
+import getSdkConfig from './jssdk'
+
+const services: Service[] = [getSdkConfig]
+
+export default services
+
+export * from './payment'
+export * from './jssdk'

package/src/shared/weixin/jssdk.ts

@@ -0,0 +1,91 @@
+import { DollarApp } from '../../Appkit'
+import { useHttp } from '../../payment/api'
+
+interface JssdkConfig {
+  appId: string
+  nonceStr: string
+  signature: string
+  timeTicket: string
+  timestamp: string
+}
+
+interface PrePayOptions {
+  appId: string
+  nonceStr: string
+  package: string
+  paySign: string
+  signType: string
+  timeStamp: string
+}
+
+/**
+ * jssdk 初始化配置
+ * @param appCode
+ */
+const getSdkConfig = (appCode?: string): Promise<JssdkConfig> => {
+  return new Promise<JssdkConfig>((resolve, reject) => {
+    const $http = useHttp()
+
+    $http
+      .get('/wecom/config/getConfig', {
+        appCode: appCode || 'loankitMp',
+        callbackUrl: location.href,
+      })
+      .then((response: JssdkConfig) => {
+        resolve(response)
+      })
+  })
+}
+
+/**
+ * 唤起微信支付
+ * @param options
+ */
+function requestWxH5Pay(options: PrePayOptions) {
+  return new Promise<boolean>((resolve, reject) => {
+    function onBridgeReady() {
+      // @ts-ignore
+      WeixinJSBridge.invoke(
+        'getBrandWCPayRequest',
+        {
+          appId: options.appId,
+          nonceStr: options.nonceStr,
+          package: options.package,
+          paySign: options.paySign,
+          signType: options.signType,
+          timeStamp: options.timeStamp,
+        },
+        function (res) {
+          console.log(res, 'res')
+          if (res.err_msg == 'get_brand_wcpay_request:ok') {
+            resolve(res)
+            //res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠，商户需进一步调用后端查单确认支付结果。
+          }
+        }
+      )
+    }
+    // @ts-ignore
+    if (typeof WeixinJSBridge == 'undefined') {
+      if (document.addEventListener) {
+        // @ts-ignore
+        document.addEventListener('WeixinJSBridgeReady', onBridgeReady, false)
+        // @ts-ignore
+      } else if (document.attachEvent) {
+        // @ts-ignore
+        document.attachEvent('WeixinJSBridgeReady', onBridgeReady)
+        // @ts-ignore
+        document.attachEvent('onWeixinJSBridgeReady', onBridgeReady)
+      }
+    } else {
+      onBridgeReady()
+    }
+  })
+}
+
+export default {
+  install($app: DollarApp) {
+    $app.getSdkConfig = getSdkConfig
+  },
+}
+
+export { getSdkConfig, requestWxH5Pay }

package/src/user/api/index.ts

@@ -1,4 +1,4 @@
-import Taro, { request as TaroRequest } from '@tarojs/taro'
+import Taro, { request as TaroRequest, showToast } from '@tarojs/taro'
 import { HttpRequestConfig, PagingData, PagingParams, ResponseRaw, createHttp } from '../../shared'
 import { translates, transforms } from './endpoints'
 import { useAppKitOptions } from '../../Appkit'
@@ -32,7 +32,7 @@ const vendor = {
               data: data.result as T,
             })
           } else if (data.code !== '401') {
-            Taro.showToast({
+            showToast({
               title: data.msg,
               icon: 'none',
             })
@@ -80,7 +80,7 @@ function useHttp() {
       },
       (raw) => {
         if (raw.status > 500 && raw.status != 51015 && raw.status != 51014) {
-          Taro.showToast({
+          showToast({
             title: raw.message,
             icon: 'none',
           })

package/src/user/components/UserAuth.vue

@@ -3,76 +3,39 @@
     <ns-page-content>
       <ns-card fill="#fff">
         <ns-form ref="formRef" v-model="formData">
-          <ns-input
-            label="你的姓名"
-            name="姓名"
-            v-model="formData.姓名"
-            placeholder="请输入或拍照识别"
-            :maxlength="30"
-            :disabled="已认证"
-            :rules="['required']"
-          >
+          <ns-input label="你的姓名" name="姓名" v-model="formData.姓名" placeholder="请输入或拍照识别" :maxlength="30" :disabled="已认证"
+            :rules="['required']">
             <template #append>
               <ocr-icon v-if="!已认证" @complete="onOcrComplete" />
             </template>
           </ns-input>
-          <ns-input
-            label="身份证号码"
-            name="身份证号码"
-            placeholder="请输入身份证号码"
-            :maxlength="30"
-            v-model="formData.身份证号码"
-            :disabled="已认证"
-            :rules="[
-            'required',
-            {
-              name: 'function',
-              message: '请输入正确格式的证件号码',
-              method: (value: string) => isIdentityCard(value, 'zh-CN')
-            }
-          ]"
-          />
-          <ns-input
-            label="电话号码"
-            name="电话号码"
-            placeholder="请输入电话号码"
-            :maxlength="11"
-            v-model="formData.电话号码"
-            :disabled="true"
-            :rules="[
-            {
-              name: 'function',
-              message: '请输入正确格式的电话号码',
-              method: (value: string) => isMobilePhone(value, 'zh-CN')
-            }
-          ]"
-          />
+          <ns-input label="身份证号码" name="身份证号码" placeholder="请输入身份证号码" :maxlength="30" v-model="formData.身份证号码"
+            :disabled="已认证" :rules="[
+              'required',
+              {
+                name: 'function',
+                message: '请输入正确格式的证件号码',
+                method: (value: string) => isIdentityCard(value, 'zh-CN')
+              }
+            ]" />
+          <ns-input label="电话号码" name="电话号码" placeholder="请输入电话号码" :maxlength="11" v-model="formData.电话号码"
+            :disabled="true" :rules="[
+              {
+                name: 'function',
+                message: '请输入正确格式的电话号码',
+                method: (value: string) => isMobilePhone(value, 'zh-CN')
+              }
+            ]" />
         </ns-form>
       </ns-card>
 
       <div class="user-auth-footer">
         <div v-if="!已认证" class="checkbox-row">
-          <ns-checkbox style="font-size: 11px" v-model="formData.同意"
-            >我已阅读并同意</ns-checkbox
-          >
+          <ns-checkbox style="font-size: 11px" v-model="formData.同意">我已阅读并同意</ns-checkbox>
           <span @click="showAgreement" class="book">《个人信息授权协议》</span>
         </div>
-        <ns-button
-          v-if="!已认证"
-          class="btn"
-          color="#163391"
-          type="primary"
-          @click="toSubmit"
-          >立即认证</ns-button
-        >
-        <ns-button
-          v-else
-          class="btn"
-          color="#163391"
-          type="primary"
-          @click="toBack"
-          >返回</ns-button
-        >
+        <ns-button v-if="!已认证" class="btn" color="#163391" type="primary" @click="toSubmit">立即认证</ns-button>
+        <ns-button v-else class="btn" color="#163391" type="primary" @click="toBack">返回</ns-button>
       </div>
     </ns-page-content>
   </ns-page>
@@ -90,7 +53,7 @@ import {
   NsCheckbox,
 } from "@uxda/nutshell/taro";
 import { OcrIcon } from "../../shared/components";
-import Taro from "@tarojs/taro";
+import Taro, { showToast } from "@tarojs/taro";
 import { useNutshell } from "@uxda/nutshell/taro";
 import isMobilePhone from "validator/es/lib/isMobilePhone";
 import isIdentityCard from "validator/es/lib/isIdentityCard";
@@ -158,17 +121,17 @@ async function toSubmit() {
     })
     .then((res: any) => {
       if (res?.status) {
-        Taro.showToast({ title: "已提交认证信息", icon: "none" });
+        showToast({ title: "已提交认证信息", icon: "none" });
         // 提交认证信息，成功后返回
         setTimeout(() => {
           toBack();
         }, 500);
       } else {
-        Taro.showToast({ title: "认证失败", icon: "none" });
+        showToast({ title: "认证失败", icon: "none" });
       }
     })
     .catch((err) => {
-      Taro.showToast({ title: err?.errMsg || "认证失败", icon: "none" });
+      showToast({ title: err?.errMsg || "认证失败", icon: "none" });
     });
 }
 watch(