@uxda/appkit 4.3.39 → 4.3.42

package/src/payment/components/recharge-amount.ts

@@ -1,67 +1,67 @@
-export const CUSTOM_RECHARGE_AMOUNT_MIN = 100
-export const CUSTOM_RECHARGE_AMOUNT_MAX = 10000
-
-export type RechargeAmountItem = {
-  token: number | string
-  amount: number | string
-  custom?: boolean
-}
-
-export type CustomAmountValidation =
-  | { valid: true; amount: number }
-  | { valid: false; message: string }
-
-export const CUSTOM_RECHARGE_AMOUNT_ITEM: RechargeAmountItem = {
-  token: '自定义',
-  amount: '100 起充',
-  custom: true,
-}
-
-export function appendCustomAmountOption(items: RechargeAmountItem[], shouldAppendCustom = true) {
-  if (!shouldAppendCustom) {
-    return [...items]
-  }
-
-  return [...items, CUSTOM_RECHARGE_AMOUNT_ITEM]
-}
-
-export function normalizeCustomRechargeAmountInput(value: string | number | undefined | null) {
-  return String(value ?? '').replace(/[^\d]/g, '')
-}
-
-export function validateCustomRechargeAmount(value: string | number | undefined | null): CustomAmountValidation {
-  const amount = Number(value)
-
-  if (!Number.isFinite(amount) || amount <= 0) {
-    return { valid: false, message: '请输入充值金额' }
-  }
-
-  if (!Number.isInteger(amount)) {
-    return { valid: false, message: '请输入整数充值金额' }
-  }
-
-  if (amount < CUSTOM_RECHARGE_AMOUNT_MIN) {
-    return { valid: false, message: '充值金额不能低于100元' }
-  }
-
-  if (amount > CUSTOM_RECHARGE_AMOUNT_MAX) {
-    return { valid: false, message: '充值金额不能高于10000元' }
-  }
-
-  return { valid: true, amount }
-}
-
-export function resolveRechargeAmount(
-  items: RechargeAmountItem[],
-  selected: number,
-  customAmount: string | number | undefined | null
-) {
-  const selectedItem = items[selected]
-
-  if (selectedItem?.custom) {
-    const validation = validateCustomRechargeAmount(customAmount)
-    return validation.valid ? validation.amount : 0
-  }
-
-  return Number(selectedItem?.amount || 0)
-}
+export const CUSTOM_RECHARGE_AMOUNT_MIN = 100
+export const CUSTOM_RECHARGE_AMOUNT_MAX = 10000
+
+export type RechargeAmountItem = {
+  token: number | string
+  amount: number | string
+  custom?: boolean
+}
+
+export type CustomAmountValidation =
+  | { valid: true; amount: number }
+  | { valid: false; message: string }
+
+export const CUSTOM_RECHARGE_AMOUNT_ITEM: RechargeAmountItem = {
+  token: '自定义',
+  amount: '100 起充',
+  custom: true,
+}
+
+export function appendCustomAmountOption(items: RechargeAmountItem[], shouldAppendCustom = true) {
+  if (!shouldAppendCustom) {
+    return [...items]
+  }
+
+  return [...items, CUSTOM_RECHARGE_AMOUNT_ITEM]
+}
+
+export function normalizeCustomRechargeAmountInput(value: string | number | undefined | null) {
+  return String(value ?? '').replace(/[^\d]/g, '')
+}
+
+export function validateCustomRechargeAmount(value: string | number | undefined | null): CustomAmountValidation {
+  const amount = Number(value)
+
+  if (!Number.isFinite(amount) || amount <= 0) {
+    return { valid: false, message: '请输入充值金额' }
+  }
+
+  if (!Number.isInteger(amount)) {
+    return { valid: false, message: '请输入整数充值金额' }
+  }
+
+  if (amount < CUSTOM_RECHARGE_AMOUNT_MIN) {
+    return { valid: false, message: '充值金额不能低于100元' }
+  }
+
+  if (amount > CUSTOM_RECHARGE_AMOUNT_MAX) {
+    return { valid: false, message: '充值金额不能高于10000元' }
+  }
+
+  return { valid: true, amount }
+}
+
+export function resolveRechargeAmount(
+  items: RechargeAmountItem[],
+  selected: number,
+  customAmount: string | number | undefined | null
+) {
+  const selectedItem = items[selected]
+
+  if (selectedItem?.custom) {
+    const validation = validateCustomRechargeAmount(customAmount)
+    return validation.valid ? validation.amount : 0
+  }
+
+  return Number(selectedItem?.amount || 0)
+}

package/src/payment/index.ts

@@ -1,6 +1,6 @@
-export * from './components'
-import services from './services'
-
-export {
-  services
+export * from './components'
+import services from './services'
+
+export {
+  services
 }

package/src/payment/services/index.ts

@@ -1,17 +1,17 @@
-import { DollarApp } from '../../Appkit'
-import invokeRecharge from './invoke-recharge'
-import requestPayment from './request-payment'
-
-export type Service = {
-  install ($app: DollarApp): void
-}
-
-const services: Service[] = [
-  requestPayment,
-  invokeRecharge,
-]
-
-export default services
-
-export * from './request-payment'
+import { DollarApp } from '../../Appkit'
+import invokeRecharge from './invoke-recharge'
+import requestPayment from './request-payment'
+
+export type Service = {
+  install ($app: DollarApp): void
+}
+
+const services: Service[] = [
+  requestPayment,
+  invokeRecharge,
+]
+
+export default services
+
+export * from './request-payment'
 export * from './invoke-recharge'

package/src/payment/services/invoke-recharge.ts

@@ -1,25 +1,25 @@
-import Taro from '@tarojs/taro'
-import { RechargeParams } from '../types'
-import { DollarApp } from 'src/Appkit'
-import { CASHIER_APP_ID } from '../consts'
-
-export const invokeRecharge = (options: RechargeParams) => {
-  const { app, tenant } = options
-  // 唤起支付中心小程序
-  Taro.navigateToMiniProgram({
-    appId: CASHIER_APP_ID,
-    path: `/pages/recharge/index?app=${app}&tenant=${tenant}`,
-    envVersion: 'trial',
-    success() {
-      console.log('唤起支付中心小程序')
-    },
-    complete() {
-    },
-  })
-}
-
-export default {
-  install ($app: DollarApp) {
-    $app.invokeRecharge = invokeRecharge
-  }
-}
+import Taro from '@tarojs/taro'
+import { RechargeParams } from '../types'
+import { DollarApp } from 'src/Appkit'
+import { CASHIER_APP_ID } from '../consts'
+
+export const invokeRecharge = (options: RechargeParams) => {
+  const { app, tenant } = options
+  // 唤起支付中心小程序
+  Taro.navigateToMiniProgram({
+    appId: CASHIER_APP_ID,
+    path: `/pages/recharge/index?app=${app}&tenant=${tenant}`,
+    envVersion: 'trial',
+    success() {
+      console.log('唤起支付中心小程序')
+    },
+    complete() {
+    },
+  })
+}
+
+export default {
+  install ($app: DollarApp) {
+    $app.invokeRecharge = invokeRecharge
+  }
+}

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

@@ -1,136 +1,136 @@
-import { PaymentParams } from '../types'
-import { DollarApp } from '../../Appkit'
-import { useHttp, endpoints } from '../../payment/api'
-import { requestWxH5Pay, requestPayment as weappRequestPayment } from '../../shared'
-import Taro, { showToast } from '@tarojs/taro'
-
-const requestPayment = (params: PaymentParams) => {
-  return new Promise<boolean>((resolve, reject) => {
-    const $http = useHttp({
-      Appcode: params.app !== 'cloudkitPro' ? params.app : '',
-      Tenant: params.tenant,
-    })
-    $http
-      .post(endpoints.获取微信支付参数包, {
-        ...params,
-        // amount: 0.01,
-      })
-      .then((response) => {
-        weappRequestPayment(response.json).then((result) => {
-          if (result) {
-            resolve(true)
-          } else {
-            resolve(false)
-          }
-        })
-      })
-  })
-}
-
-const requestPaymentByBean = (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 {
-          weappRequestPayment(response.json).then((result) => {
-            if (result) {
-              resolve(true)
-            } else {
-              resolve(false)
-            }
-          })
-        }
-      })
-  })
-}
-
-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 && !response.prePayStr) {
-          showToast({
-            title: response.message,
-            icon: 'none',
-          })
-          resolve(false)
-        } else if (!response.json && response.prePayStr) {
-          resolve(response)
-        }  else if (params.fromMini) {
-          resolve(response.json)
-        } else {
-          requestWxH5Pay(response.json).then((result) => {
-            if (result) {
-              resolve(true)
-            } else {
-              resolve(false)
-            }
-          })
-        }
-      })
-  })
-}
-
-const requestBrandWCPayByBean = (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 && !response.prePayStr) {
-          showToast({
-            title: response.message,
-            icon: 'none',
-          })
-          resolve(false)
-        } else if (!response.json && response.prePayStr) {
-          resolve(response)
-        } else if (params.fromMini) {
-          resolve(response.json)
-        } else {
-          requestWxH5Pay(response.json).then((result) => {
-            if (result) {
-              resolve(true)
-            } else {
-              resolve(false)
-            }
-          })
-        }
-      }).catch(() => {
-        resolve(false)
-      })
-  })
-}
-
-export default {
-  install($app: DollarApp) {
-    $app.requestPayment = requestPayment
-  },
-}
-
-export { requestPayment, requestPaymentByBean, requestBrandWCPay, requestBrandWCPayByBean }
+import { PaymentParams } from '../types'
+import { DollarApp } from '../../Appkit'
+import { useHttp, endpoints } from '../../payment/api'
+import { requestWxH5Pay, requestPayment as weappRequestPayment } from '../../shared'
+import Taro, { showToast } from '@tarojs/taro'
+
+const requestPayment = (params: PaymentParams) => {
+  return new Promise<boolean>((resolve, reject) => {
+    const $http = useHttp({
+      Appcode: params.app !== 'cloudkitPro' ? params.app : '',
+      Tenant: params.tenant,
+    })
+    $http
+      .post(endpoints.获取微信支付参数包, {
+        ...params,
+        // amount: 0.01,
+      })
+      .then((response) => {
+        weappRequestPayment(response.json).then((result) => {
+          if (result) {
+            resolve(true)
+          } else {
+            resolve(false)
+          }
+        })
+      })
+  })
+}
+
+const requestPaymentByBean = (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 {
+          weappRequestPayment(response.json).then((result) => {
+            if (result) {
+              resolve(true)
+            } else {
+              resolve(false)
+            }
+          })
+        }
+      })
+  })
+}
+
+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 && !response.prePayStr) {
+          showToast({
+            title: response.message,
+            icon: 'none',
+          })
+          resolve(false)
+        } else if (!response.json && response.prePayStr) {
+          resolve(response)
+        }  else if (params.fromMini) {
+          resolve(response.json)
+        } else {
+          requestWxH5Pay(response.json).then((result) => {
+            if (result) {
+              resolve(true)
+            } else {
+              resolve(false)
+            }
+          })
+        }
+      })
+  })
+}
+
+const requestBrandWCPayByBean = (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 && !response.prePayStr) {
+          showToast({
+            title: response.message,
+            icon: 'none',
+          })
+          resolve(false)
+        } else if (!response.json && response.prePayStr) {
+          resolve(response)
+        } else if (params.fromMini) {
+          resolve(response.json)
+        } else {
+          requestWxH5Pay(response.json).then((result) => {
+            if (result) {
+              resolve(true)
+            } else {
+              resolve(false)
+            }
+          })
+        }
+      }).catch(() => {
+        resolve(false)
+      })
+  })
+}
+
+export default {
+  install($app: DollarApp) {
+    $app.requestPayment = requestPayment
+  },
+}
+
+export { requestPayment, requestPaymentByBean, requestBrandWCPay, requestBrandWCPayByBean }

package/src/payment/types.ts

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