@uxda/appkit 4.3.2 → 4.3.3

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

@@ -1,132 +1,130 @@
-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) {
-          showToast({
-            title: response.message,
-            icon: 'none',
-          })
-          resolve(false)
-        } 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) {
-          showToast({
-            title: response.message,
-            icon: 'none',
-          })
-          resolve(false)
-        } 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) {
+          showToast({
+            title: response.message,
+            icon: 'none',
+          })
+          resolve(false)
+        } 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) {
+          showToast({
+            title: response.message,
+            icon: 'none',
+          })
+          resolve(false)
+        } else if (params.fromMini) {
+          resolve(response.json)
+        } else {
+          requestWxH5Pay(response.json).then((result) => {
+            if (result) {
+              resolve(true)
+            } else {
+              resolve(false)
+            }
+          })
+        }
+      })
+  })
+}
+
+export default {
+  install($app: DollarApp) {
+    $app.requestPayment = requestPayment
+  },
+}
+
+export { requestPayment, requestPaymentByBean, requestBrandWCPay, requestBrandWCPayByBean }

package/src/payment/types.ts

@@ -1,34 +1,33 @@
-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
+}
+
+export type RechargeParams = Pick<PaymentParams, 'app' | 'tenant'>