@uxda/appkit 4.3.6 → 4.3.8

package/src/shared/weixin/jssdk.ts

@@ -1,104 +1,103 @@
-import { DollarApp } from '../../Appkit'
-import { useHttp } from '../../payment/api'
-import { showModal } from '@tarojs/taro'
-
-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, url?: string): Promise<JssdkConfig> => {
-  return new Promise<JssdkConfig>((resolve, reject) => {
-    const $http = useHttp()
-
-    $http
-      .get('/wecom/config/getConfig', {
-        appCode: appCode || 'loankitMp',
-        callbackUrl: url || encodeURIComponent(location.href.split('#')[0]),
-      })
-      .then((response: JssdkConfig) => {
-        resolve(response)
-      })
-  })
-}
-
-/**
- * 唤起微信支付
- * @param options
- */
-function requestWxH5Pay(options: PrePayOptions) {
-  return new Promise<boolean>((resolve, reject) => {
-    function onBridgeReady() {
-      // @ts-ignore
-      if (typeof WeixinJSBridge === 'undefined') {
-        showModal({
-          title: '提示',
-          content: '当前环境不支持微信支付，请在微信内置浏览器中打开',
-          confirmText: '确定',
-          confirmColor: '#017fff',
-          success: () => {},
-        })
-        return
-      }
-      // @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) {
-          if (res.err_msg == 'get_brand_wcpay_request:ok') {
-            //res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠，商户需进一步调用后端查单确认支付结果。
-            resolve(true)
-          } else {
-            resolve(false)
-          }
-        }
-      )
-    }
-    // @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 }
+import { DollarApp } from '../../Appkit'
+import { useHttp } from '../../payment/api'
+import { showModal } from '@tarojs/taro'
+
+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, url?: string): Promise<JssdkConfig> => {
+  return new Promise<JssdkConfig>((resolve, reject) => {
+    const $http = useHttp()
+
+    $http
+      .get('/wecom/config/getConfig', {
+        appCode: appCode || 'loankitMp',
+        callbackUrl: url || encodeURIComponent(location.href.split('#')[0]),
+      })
+      .then((response: JssdkConfig) => {
+        resolve(response)
+      })
+  })
+}
+
+/**
+ * 唤起微信支付
+ * @param options
+ */
+function requestWxH5Pay(options: PrePayOptions) {
+  return new Promise<boolean>((resolve, reject) => {
+    function onBridgeReady() {
+      // @ts-ignore
+      if (typeof WeixinJSBridge === 'undefined') {
+        showModal({
+          title: '提示',
+          content: '当前环境不支持微信支付，请在微信内置浏览器中打开',
+          confirmText: '确定',
+          success: () => {},
+        })
+        return
+      }
+      // @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) {
+          if (res.err_msg == 'get_brand_wcpay_request:ok') {
+            //res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠，商户需进一步调用后端查单确认支付结果。
+            resolve(true)
+          } else {
+            resolve(false)
+          }
+        }
+      )
+    }
+    // @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/shared/weixin/payment.ts

@@ -1,38 +1,38 @@
-export type PaymentOptions = {}
-
-/**
- * 发起微信支付
- * @param options 
- */
-export function requestPayment(json: any): Promise<boolean> {
-  /** 时间戳从1970年1月1日00:00:00至今的秒数,即当前的时间 */
-  // const timeStamp: string = '',
-  //   /** 随机字符串，长度为32个字符以下 */
-  //   nonceStr: string = '',
-  //   /** 统一下单接口返回的prepay_id参数值，提交格式如：prepay_id=* */
-  //   pack: string = '',
-  //   /** 签名算法，暂支持MD5 */
-  //   signType: string = 'MD5',
-  //   /** 签名,具体签名方案参见微信公众号支付帮助文档(https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=4_3&t=1474537654457); */
-  //   paySign: string = ''
-  // /** 接口调用成功的回调函数 */
-  // const success = (res: {}) => {},
-  //   /**接口调用失败的回调函数*/
-  //   fail = () => {},
-  //   /**接口调用结束的回调函数（调用成功、失败都会执行）*/
-  //   complete = () => {}
-  return new Promise<boolean>((resolve, reject) => {
-    const success = (res) => {
-      resolve(true)
-    }
-    const fail = (res) => {
-      console.log('wx.requestPayment FAIL:', res)
-      resolve(false)
-    }
-    wx.requestPayment({
-      ...json,
-      success,
-      fail
-    })
-  })
-}
+export type PaymentOptions = {}
+
+/**
+ * 发起微信支付
+ * @param options 
+ */
+export function requestPayment(json: any): Promise<boolean> {
+  /** 时间戳从1970年1月1日00:00:00至今的秒数,即当前的时间 */
+  // const timeStamp: string = '',
+  //   /** 随机字符串，长度为32个字符以下 */
+  //   nonceStr: string = '',
+  //   /** 统一下单接口返回的prepay_id参数值，提交格式如：prepay_id=* */
+  //   pack: string = '',
+  //   /** 签名算法，暂支持MD5 */
+  //   signType: string = 'MD5',
+  //   /** 签名,具体签名方案参见微信公众号支付帮助文档(https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=4_3&t=1474537654457); */
+  //   paySign: string = ''
+  // /** 接口调用成功的回调函数 */
+  // const success = (res: {}) => {},
+  //   /**接口调用失败的回调函数*/
+  //   fail = () => {},
+  //   /**接口调用结束的回调函数（调用成功、失败都会执行）*/
+  //   complete = () => {}
+  return new Promise<boolean>((resolve, reject) => {
+    const success = (res) => {
+      resolve(true)
+    }
+    const fail = (res) => {
+      console.log('wx.requestPayment FAIL:', res)
+      resolve(false)
+    }
+    wx.requestPayment({
+      ...json,
+      success,
+      fail
+    })
+  })
+}

package/src/styles/vars.scss

@@ -1,4 +1,4 @@
-page {
-  --text-color: #333;
-  --text-color-dark-mode: #eee;
+page {
+  --text-color: #333;
+  --text-color-dark-mode: #eee;
 }

package/src/user/api/endpoints.ts

@@ -1,17 +1,17 @@
-import { HttpEndpoints } from '../../shared/http'
-
-const endpointsList: HttpEndpoints = {}
-
-const endpoints = 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'
+
+const endpointsList: HttpEndpoints = {}
+
+const endpoints = 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/user/api/index.ts

@@ -1,123 +1,123 @@
-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'
-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) {
-            resolve({
-              status: +data.code,
-              message: data.msg,
-              data: data.result as T,
-            })
-          } else if (data.code !== '401') {
-            showToast({
-              title: data.msg,
-              icon: 'none',
-            })
-          }
-        })
-        .catch((e: any) => {
-          reject(e)
-        })
-    })
-  },
-}
-
-function useHttp() {
-  const appkitOptions = useAppKitOptions()
-  const headers: any = {
-    Token: appkitOptions.tempToken() || appkitOptions.token(),
-    Appcode: appkitOptions.app(),
-    cookie: `tid=${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 != 51015 && raw.status != 51014) {
-          showToast({
-            title: raw.message,
-            icon: 'none',
-          })
-          return true
-        }
-        return false
-      },
-    ],
-    paging: {
-      translate: (params: PagingParams) => ({
-        pageNum: params.page,
-        pageSize: params.pageSize || 10,
-      }),
-      transform(data: any): PagingData {
-        const totalRecords = +data.total || 0,
-          pageSize = +data.pageSize || 10,
-          total = data.pages || Math.ceil(totalRecords / pageSize),
-          isLastPage = data.pages === data.pageNum
-        return {
-          total,
-          totalRecords,
-          isLastPage,
-        }
-      },
-    },
-    translates,
-    transforms,
-  })
-  return $http
-}
-
-export { useHttp }
-
-export * from './endpoints'
+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'
+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) {
+            resolve({
+              status: +data.code,
+              message: data.msg,
+              data: data.result as T,
+            })
+          } else if (data.code !== '401') {
+            showToast({
+              title: data.msg,
+              icon: 'none',
+            })
+          }
+        })
+        .catch((e: any) => {
+          reject(e)
+        })
+    })
+  },
+}
+
+function useHttp() {
+  const appkitOptions = useAppKitOptions()
+  const headers: any = {
+    Token: appkitOptions.tempToken() || appkitOptions.token(),
+    Appcode: appkitOptions.app(),
+    cookie: `tid=${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 != 51015 && raw.status != 51014) {
+          showToast({
+            title: raw.message,
+            icon: 'none',
+          })
+          return true
+        }
+        return false
+      },
+    ],
+    paging: {
+      translate: (params: PagingParams) => ({
+        pageNum: params.page,
+        pageSize: params.pageSize || 10,
+      }),
+      transform(data: any): PagingData {
+        const totalRecords = +data.total || 0,
+          pageSize = +data.pageSize || 10,
+          total = data.pages || Math.ceil(totalRecords / pageSize),
+          isLastPage = data.pages === data.pageNum
+        return {
+          total,
+          totalRecords,
+          isLastPage,
+        }
+      },
+    },
+    translates,
+    transforms,
+  })
+  return $http
+}
+
+export { useHttp }
+
+export * from './endpoints'