@uxda/appkit 4.3.30 → 4.3.33

package/src/payment/api/endpoints.ts

@@ -1,112 +1,112 @@
-import { HttpEndpoints } from '../../shared/http'
-import { PaymentParams } from '../types'
-
-const endpointsList: HttpEndpoints = {
-  /**
-   * 获取充值套餐包列表
-   * (查询某应用某场景可充值的金额列表)
-   * http://ytech.dev.ddjf.info/payment/doc.html#/%E5%AE%A2%E6%88%B7%E5%9F%9FAPI/%E6%94%AF%E4%BB%98%E4%B8%AD%E5%BF%83-%E5%AF%B9%E5%A4%96%E6%8E%A5%E5%8F%A3/getRechargeListUsingGET
-   */
-  获取充值金额列表: {
-    path: '/payment/outer/payment/getRechargeList',
-    translate: (data: any) => ({
-      appCode: data.app,
-      // caseCode: 'recharge', // 这个参数可以不要
-      tenantId: data.tenant,
-      scene: data.scene,
-    }),
-    transform: (data: any) =>
-      data.amountList.map((d: any) => ({
-        token: d.desc,
-        amount: d.amount,
-      })),
-  },
-  /**
-   * 查询支付参数包
-   * (获取拉起微信支付用的JSON串)
-   * http://ytech.dev.ddjf.info/payment/doc.html#/%E5%AE%A2%E6%88%B7%E5%9F%9FAPI/%E6%94%AF%E4%BB%98%E4%B8%AD%E5%BF%83-%E5%AF%B9%E5%A4%96%E6%8E%A5%E5%8F%A3/rechargePayUsingPOST
-   */
-  获取微信支付参数包: {
-    path: '/payment/outer/payment/rechargePay',
-    translate: (params: PaymentParams) => ({
-      amount: params.amount,
-      appCode: params.app,
-      tenantId: params.tenant,
-      certificateNo: params.user,
-      accountAuthFlag: params.accountAuthFlag || false,
-      channelCode: params.channelCode || null,
-      payFinishJumpUrl: params.payFinishJumpUrl || null,
-      clientInfo: params.clientInfo || null,
-    }),
-    transform: (data: any) => {
-      let json = null
-      try {
-        json = JSON.parse(data.prePayStr)
-      } catch (e) {}
-      return {
-        json, // 拉起微信支付用的JSON串
-        paymentType: data.paymentType,
-        prePayStr: data.prePayStr,
-        thirdPayId: data.thirdPayId,
-        paymentId: data.payId, // 查询用支付ID
-      }
-    },
-  },
-  获取权益微信支付: {
-    path: '/payment/outer/payment/valueExchangePay',
-    translate: (params: PaymentParams) => ({
-      caseConfigId: params.caseConfigId,
-      appCode: params.app,
-      tenantId: params.tenant,
-      amount: params.amount,
-      certificateNo: params.user,
-      accountAuthFlag: params.accountAuthFlag || false,
-      channelCode: params.channelCode || null,
-      payFinishJumpUrl: params.payFinishJumpUrl || null,
-      useCloudBean: params.useCloudBean || false,
-    }),
-    transform: (data: any) => {
-      console.log(data, 'data-----')
-      let json = null
-      try {
-        json = JSON.parse(data.prePayStr)
-      } catch (e) {}
-      return {
-        json, // 拉起微信支付用的JSON串
-        paymentType: data.paymentType,
-        prePayStr: data.prePayStr,
-        thirdPayId: data.thirdPayId,
-        paymentId: data.payId, // 查询用支付ID
-      }
-    },
-  },
-  获取增值权益类目: {
-    path: '/payment/paymentCaseConfig/getBalanceAndRiskQueryPriceConfig',
-    transform: (data: any) => data,
-  },
-  获取支付结果: {
-    path: '/payment/outer/payment/getPayResult',
-    translate: (data: any) => ({
-      thirdPayId: data.thirdPayId,
-    }),
-    transform: (data: any) => data,
-  },
-} as const
-
-const keys = Object.keys(endpointsList as any)
-
-type Keys = (typeof keys)[number]
-
-const endpoints: Record<Keys, string> = Object.fromEntries(
-  Object.entries(endpointsList).map(([name, def]) => [name, def.path])
-)
-
-const translates = Object.fromEntries(
-  Object.entries(endpointsList).map(([, def]) => [def.path, def.translate])
-)
-
-const transforms = Object.fromEntries(
-  Object.entries(endpointsList).map(([, def]) => [def.path, def.transform])
-)
-
-export { endpoints, translates, transforms }
+import { HttpEndpoints } from '../../shared/http'
+import { PaymentParams } from '../types'
+
+const endpointsList: HttpEndpoints = {
+  /**
+   * 获取充值套餐包列表
+   * (查询某应用某场景可充值的金额列表)
+   * http://ytech.dev.ddjf.info/payment/doc.html#/%E5%AE%A2%E6%88%B7%E5%9F%9FAPI/%E6%94%AF%E4%BB%98%E4%B8%AD%E5%BF%83-%E5%AF%B9%E5%A4%96%E6%8E%A5%E5%8F%A3/getRechargeListUsingGET
+   */
+  获取充值金额列表: {
+    path: '/payment/outer/payment/getRechargeList',
+    translate: (data: any) => ({
+      appCode: data.app,
+      // caseCode: 'recharge', // 这个参数可以不要
+      tenantId: data.tenant,
+      scene: data.scene,
+    }),
+    transform: (data: any) =>
+      data.amountList.map((d: any) => ({
+        token: d.desc,
+        amount: d.amount,
+      })),
+  },
+  /**
+   * 查询支付参数包
+   * (获取拉起微信支付用的JSON串)
+   * http://ytech.dev.ddjf.info/payment/doc.html#/%E5%AE%A2%E6%88%B7%E5%9F%9FAPI/%E6%94%AF%E4%BB%98%E4%B8%AD%E5%BF%83-%E5%AF%B9%E5%A4%96%E6%8E%A5%E5%8F%A3/rechargePayUsingPOST
+   */
+  获取微信支付参数包: {
+    path: '/payment/outer/payment/rechargePay',
+    translate: (params: PaymentParams) => ({
+      amount: params.amount,
+      appCode: params.app,
+      tenantId: params.tenant,
+      certificateNo: params.user,
+      accountAuthFlag: params.accountAuthFlag || false,
+      channelCode: params.channelCode || null,
+      payFinishJumpUrl: params.payFinishJumpUrl || null,
+      clientInfo: params.clientInfo || null,
+    }),
+    transform: (data: any) => {
+      let json = null
+      try {
+        json = JSON.parse(data.prePayStr)
+      } catch (e) {}
+      return {
+        json, // 拉起微信支付用的JSON串
+        paymentType: data.paymentType,
+        prePayStr: data.prePayStr,
+        thirdPayId: data.thirdPayId,
+        paymentId: data.payId, // 查询用支付ID
+      }
+    },
+  },
+  获取权益微信支付: {
+    path: '/payment/outer/payment/valueExchangePay',
+    translate: (params: PaymentParams) => ({
+      caseConfigId: params.caseConfigId,
+      appCode: params.app,
+      tenantId: params.tenant,
+      amount: params.amount,
+      certificateNo: params.user,
+      accountAuthFlag: params.accountAuthFlag || false,
+      channelCode: params.channelCode || null,
+      payFinishJumpUrl: params.payFinishJumpUrl || null,
+      useCloudBean: params.useCloudBean || false,
+    }),
+    transform: (data: any) => {
+      console.log(data, 'data-----')
+      let json = null
+      try {
+        json = JSON.parse(data.prePayStr)
+      } catch (e) {}
+      return {
+        json, // 拉起微信支付用的JSON串
+        paymentType: data.paymentType,
+        prePayStr: data.prePayStr,
+        thirdPayId: data.thirdPayId,
+        paymentId: data.payId, // 查询用支付ID
+      }
+    },
+  },
+  获取增值权益类目: {
+    path: '/payment/paymentCaseConfig/getBalanceAndRiskQueryPriceConfig',
+    transform: (data: any) => data,
+  },
+  获取支付结果: {
+    path: '/payment/outer/payment/getPayResult',
+    translate: (data: any) => ({
+      thirdPayId: data.thirdPayId,
+    }),
+    transform: (data: any) => data,
+  },
+} as const
+
+const keys = Object.keys(endpointsList as any)
+
+type Keys = (typeof keys)[number]
+
+const endpoints: Record<Keys, string> = Object.fromEntries(
+  Object.entries(endpointsList).map(([name, def]) => [name, def.path])
+)
+
+const translates = Object.fromEntries(
+  Object.entries(endpointsList).map(([, def]) => [def.path, def.translate])
+)
+
+const transforms = Object.fromEntries(
+  Object.entries(endpointsList).map(([, def]) => [def.path, def.transform])
+)
+
+export { endpoints, translates, transforms }

package/src/payment/api/index.ts

@@ -1,108 +1,108 @@
-import Taro, { request as TaroRequest, showToast } from '@tarojs/taro'
-import { HttpRequestConfig, ResponseRaw, createHttp } from '../../shared'
-import { translates, transforms } from './endpoints'
-import { useAppKitOptions } from '../../Appkit'
-import { useLogger, generateUniqueId } from '../../shared/composables/useLogger'
-
-const logger = useLogger()
-/**
- * 小程序端 Http
- * 使用 Taro.request 实现
- */
-const vendor = {
-  async request<T>(config: HttpRequestConfig) {
-    return new Promise<ResponseRaw<T>>((resolve, reject) => {
-      const header = {
-        ...config.headers,
-        traceId: generateUniqueId('appkit'),
-      }
-      const startTime = new Date().getTime()
-
-      logger.info({
-        send: JSON.stringify({ url: config.url, data: config.data }),
-        receive: null,
-        traceId: header.traceId,
-        duration: 0,
-      })
-      TaroRequest({
-        url: config.url,
-        method: config.method,
-        header,
-        data: config.data,
-      })
-        .then(({ data }) => {
-          // 记录阿里日志
-          const endTime = new Date().getTime()
-          logger.info({
-            send: JSON.stringify({ url: config.url, data: config.data }),
-            receive: JSON.stringify(data),
-            traceId: header.traceId,
-            duration: endTime - startTime,
-          })
-
-          if (data.success || data.code === '401') {
-            resolve({
-              status: +data.code,
-              message: data.msg,
-              data: data.result as T,
-            })
-          } else if (data.code !== '401') {
-            showToast({
-              title: data.msg,
-              icon: 'none',
-            })
-            reject(data.msg)
-          }
-        })
-        .catch((e: any) => {
-          reject(e)
-        })
-    })
-  },
-}
-
-interface DefaultHeaderType {
-  Token?: string
-  Appcode?: string
-  Tenant?: string
-}
-function useHttp(defaultHeader?: DefaultHeaderType) {
-  const appkitOptions = useAppKitOptions()
-  const headers = {
-    Token: appkitOptions.tempToken() || appkitOptions.token(),
-    Appcode: defaultHeader?.Appcode || appkitOptions.app(),
-    tid: defaultHeader?.Tenant || appkitOptions.tenant(),
-    gray: appkitOptions.gray ? appkitOptions.gray() : '0',
-  }
-
-  /**
-   * 传入配置获取 Http instanse
-   */
-  const $http = createHttp({
-    vendor,
-    baseUrl: appkitOptions.baseUrl(),
-    headers,
-    interceptors: [
-      (raw) => {
-        if (raw.status == 401) {
-          appkitOptions[401]()
-          return true
-        }
-        return false
-      },
-      (raw) => {
-        if (raw.status > 500 && raw.status != 1100028) {
-          return true
-        }
-        return false
-      },
-    ],
-    translates,
-    transforms,
-  })
-  return $http
-}
-
-export { useHttp }
-
-export * from './endpoints'
+import Taro, { request as TaroRequest, showToast } from '@tarojs/taro'
+import { HttpRequestConfig, ResponseRaw, createHttp } from '../../shared'
+import { translates, transforms } from './endpoints'
+import { useAppKitOptions } from '../../Appkit'
+import { useLogger, generateUniqueId } from '../../shared/composables/useLogger'
+
+const logger = useLogger()
+/**
+ * 小程序端 Http
+ * 使用 Taro.request 实现
+ */
+const vendor = {
+  async request<T>(config: HttpRequestConfig) {
+    return new Promise<ResponseRaw<T>>((resolve, reject) => {
+      const header = {
+        ...config.headers,
+        traceId: generateUniqueId('appkit'),
+      }
+      const startTime = new Date().getTime()
+
+      logger.info({
+        send: JSON.stringify({ url: config.url, data: config.data }),
+        receive: null,
+        traceId: header.traceId,
+        duration: 0,
+      })
+      TaroRequest({
+        url: config.url,
+        method: config.method,
+        header,
+        data: config.data,
+      })
+        .then(({ data }) => {
+          // 记录阿里日志
+          const endTime = new Date().getTime()
+          logger.info({
+            send: JSON.stringify({ url: config.url, data: config.data }),
+            receive: JSON.stringify(data),
+            traceId: header.traceId,
+            duration: endTime - startTime,
+          })
+
+          if (data.success || data.code === '401') {
+            resolve({
+              status: +data.code,
+              message: data.msg,
+              data: data.result as T,
+            })
+          } else if (data.code !== '401') {
+            showToast({
+              title: data.msg,
+              icon: 'none',
+            })
+            reject(data.msg)
+          }
+        })
+        .catch((e: any) => {
+          reject(e)
+        })
+    })
+  },
+}
+
+interface DefaultHeaderType {
+  Token?: string
+  Appcode?: string
+  Tenant?: string
+}
+function useHttp(defaultHeader?: DefaultHeaderType) {
+  const appkitOptions = useAppKitOptions()
+  const headers = {
+    Token: appkitOptions.tempToken() || appkitOptions.token(),
+    Appcode: defaultHeader?.Appcode || appkitOptions.app(),
+    tid: defaultHeader?.Tenant || appkitOptions.tenant(),
+    gray: appkitOptions.gray ? appkitOptions.gray() : '0',
+  }
+
+  /**
+   * 传入配置获取 Http instanse
+   */
+  const $http = createHttp({
+    vendor,
+    baseUrl: appkitOptions.baseUrl(),
+    headers,
+    interceptors: [
+      (raw) => {
+        if (raw.status == 401) {
+          appkitOptions[401]()
+          return true
+        }
+        return false
+      },
+      (raw) => {
+        if (raw.status > 500 && raw.status != 1100028) {
+          return true
+        }
+        return false
+      },
+    ],
+    translates,
+    transforms,
+  })
+  return $http
+}
+
+export { useHttp }
+
+export * from './endpoints'

package/src/payment/components/AmountPicker.vue

@@ -1,33 +1,33 @@
-<template>
-  <nut-grid class="amount-picker" :column-num="3" :gutter="10" :border="false">
+<template>
+  <nut-grid class="amount-picker" :column-num="3" :gutter="10" :border="false">
     <nut-grid-item class="tile" v-for="(amount, index) in items" :class="{ selected: props.selected === index, custom: amount.custom }"
       @click="() => onGridItemClick(index)" :key="index">
       <h4 class="token-line number">{{ amount.token }}</h4>
       <h5 v-if="amount.custom"><span class="number">{{ amount.amount }}</span></h5>
       <h5 v-else>¥<span class="number">{{ amount.amount }}</span></h5>
-    </nut-grid-item>
-  </nut-grid>
-</template>
-
+    </nut-grid-item>
+  </nut-grid>
+</template>
+
 <script lang="ts" setup>
-
-// 充值金额选取
-
+
+// 充值金额选取
+
 export type Amount = {
   token: number | string,
   amount: number | string,
   custom?: boolean
 }
-
-interface AmountPickerProps {
-  items: Amount[],
-  selected?: number
-}
-
-const emit = defineEmits<{
-  (event: 'change', selected: number): void
-}>()
-
+
+interface AmountPickerProps {
+  items: Amount[],
+  selected?: number
+}
+
+const emit = defineEmits<{
+  (event: 'change', selected: number): void
+}>()
+
 const props = withDefaults(
   defineProps<AmountPickerProps>(),
   {
@@ -40,21 +40,21 @@ const onGridItemClick = (index: number) => {
   emit('change', index)
 }
 </script>
-
-<style lang="scss">
-.amount-picker {
-  padding: 14px 0 14px 14px;
-
-  .nut-grid-item__content {
-    border: solid 1px transparent;
-    background: linear-gradient(#f5f5f5, #f5f5f5) padding-box,
-      linear-gradient(to bottom, #cccccc88, #cccccc88) border-box;
-    border-radius: 5px;
-  }
-
-  .tile {
-    height: 80px;
-
+
+<style lang="scss">
+.amount-picker {
+  padding: 14px 0 14px 14px;
+
+  .nut-grid-item__content {
+    border: solid 1px transparent;
+    background: linear-gradient(#f5f5f5, #f5f5f5) padding-box,
+      linear-gradient(to bottom, #cccccc88, #cccccc88) border-box;
+    border-radius: 5px;
+  }
+
+  .tile {
+    height: 80px;
+
     &.selected {
       .nut-grid-item__content {
         background: linear-gradient(#FFF7E3, #FEFDE6) padding-box,
@@ -75,26 +75,26 @@ const onGridItemClick = (index: number) => {
       }
     }
   }
-
-  h4.token-line {
-    background-image: url("https://cdn.ddjf.com/static/images/appkit/yundou.png");
-    background-size: 20px;
-    background-repeat: no-repeat;
-    background-position: left center;
-    padding-left: 24px;
-    color: #FD6701;
-    font-weight: 600;
-    line-height: 25px;
-    font-size: 18px;
-  }
-
-  h5 {
-    line-height: 18px;
-    color: #353535;
-    font-weight: 600;
-    opacity: 0.6;
-    margin-top: 4px;
-    font-size: 12px;
-  }
-}
+
+  h4.token-line {
+    background-image: url("https://cdn.ddjf.com/static/images/appkit/yundou.png");
+    background-size: 20px;
+    background-repeat: no-repeat;
+    background-position: left center;
+    padding-left: 24px;
+    color: #FD6701;
+    font-weight: 600;
+    line-height: 25px;
+    font-size: 18px;
+  }
+
+  h5 {
+    line-height: 18px;
+    color: #353535;
+    font-weight: 600;
+    opacity: 0.6;
+    margin-top: 4px;
+    font-size: 12px;
+  }
+}
 </style>