@uxda/appkit 4.2.82 → 4.2.84

package/src/shared/http/types.ts

@@ -1,160 +1,163 @@
-/**
- * 由使用场景提供的配置
- * createHttp() 使用的配置
- */
-export type HttpClientConfig = {
-  vendor?: HttpVendor
-  baseUrl: string
-  /**
-   * 向 HTTP header 加入的数据
-   * 通常含有 JWT token 以及其他参数
-   */
-  headers?: HeaderParams
-  paging?: Paging
-  /**
-   * 拦截器组
-   * 请求返回异常时进行一定的操作
-   */
-  interceptors?: HttpInterceptor[]
-  translates?: HttpTranslates
-  transforms?: HttpTransforms
-}
-
-/**
- * HTTP 请求的底层实现
- * Axios/Taro.request
- */
-export type HttpVendor = {
-  request<T = ResponseData>(config: HttpRequestConfig): Promise<ResponseRaw<T>>
-}
-
-export type HttpInterceptor = (raw: ResponseRaw) => boolean
-
-/**
- * Request Config for request API
- * 沿用 Axios 的部分配置
- */
-export type HttpRequestConfig<D = RequestData> = {
-  url: string
-  method?: HttpMethod
-  baseUrl?: string
-  headers?: HeaderData
-  data?: D
-}
-
-/**
- * Request data for http get & post method
- */
-export type RequestData = Record<string, any>
-
-export type RequestHeaders = Record<string, any>
-
-/**
- * 接口请求返回的标准格式
- */
-export type ResponseRaw<T = ResponseData> = {
-  status: number
-  message: string
-  data: T
-}
-
-/**
- * 拆箱之后前端拿到的数据
- */
-export type ResponseData = Record<string, any> | any[]
-
-export type HttpInstance = {
-  request<T = ResponseData>(config: HttpRequestConfig): Promise<T>
-  get<T = ResponseData>(url: string, data?: RequestData): Promise<T>
-  post<T = ResponseData>(url: string, data?: RequestData, headers?: RequestHeaders): Promise<T>
-}
-
-/**
- *
- */
-export type HttpTranslates = Record<string, HttpTranslate | undefined>
-export type HttpTransforms = Record<string, HttpTransform | undefined>
-
-/**
- * 向 request header 加入参数
- * 多数是 token
- */
-export type HeaderParams = Record<string, string>
-
-export enum HttpMethod {
-  get = 'GET',
-  post = 'POST',
-  put = 'PUT',
-  delete = 'DELETE',
-}
-
-export enum HttpError {
-  auth = 'auth',
-  server = 'server',
-}
-
-export type HeaderData = Record<string, string>
-
-/**
- * 接口参数转换器
- */
-export type HttpTranslate = (data: RequestData) => RequestData
-
-/**
- * 接口数据转换器
- */
-export type HttpTransform = (data: ResponseData) => ResponseData
-
-/**
- * 接口设置
- */
-export type HttpEndpoint = {
-  path: string
-  translate?: HttpTranslate
-  transform?: HttpTransform
-}
-
-/**
- * 接口组
- */
-export type HttpEndpoints = {
-  [name: string]: HttpEndpoint
-}
-
-/**
- * 分页参数
- */
-export type PagingParams = {
-  /**
-   * 页数
-   */
-  page: number
-  /**
-   * 页数据条数
-   */
-  pageSize: number
-}
-
-export type PagingData = {
-  /**
-   * 页总数
-   */
-  totalPages: number
-}
-
-/**
- * Wrapped with Paging Data
- */
-export type WithPaging<T = ResponseData> = {
-  [K in keyof PagingData]: PagingData[K]
-} & {
-  data: T
-}
-
-/**
- * 分页设置
- */
-export type Paging = {
-  translate(params: PagingParams): any
-  transform(resonse: any): PagingData
-}
+/**
+ * 由使用场景提供的配置
+ * createHttp() 使用的配置
+ */
+export type HttpClientConfig = {
+  vendor?: HttpVendor
+  baseUrl: string
+  /**
+   * 向 HTTP header 加入的数据
+   * 通常含有 JWT token 以及其他参数
+   */
+  headers?: HeaderParams
+  paging?: Paging
+  /**
+   * 拦截器组
+   * 请求返回异常时进行一定的操作
+   */
+  interceptors?: HttpInterceptor[]
+  translates?: HttpTranslates
+  transforms?: HttpTransforms
+}
+
+/**
+ * HTTP 请求的底层实现
+ * Axios/Taro.request
+ */
+export type HttpVendor = {
+  request<T = ResponseData>(config: HttpRequestConfig): Promise<ResponseRaw<T>>
+}
+
+export type HttpInterceptor = (raw: ResponseRaw) => boolean
+
+/**
+ * Request Config for request API
+ * 沿用 Axios 的部分配置
+ */
+export type HttpRequestConfig<D = RequestData> = {
+  url: string
+  method?: HttpMethod
+  baseUrl?: string
+  headers?: HeaderData
+  data?: D
+}
+
+/**
+ * Request data for http get & post method
+ */
+export type RequestData = Record<string, any>
+
+export type RequestHeaders = Record<string, any>
+
+/**
+ * 接口请求返回的标准格式
+ */
+export type ResponseRaw<T = ResponseData> = {
+  status: number
+  message: string
+  data: T
+}
+
+/**
+ * 拆箱之后前端拿到的数据
+ */
+export type ResponseData = Record<string, any> | any[]
+
+export type HttpInstance = {
+  request<T = ResponseData>(config: HttpRequestConfig): Promise<T>
+  get<T = ResponseData>(url: string, data?: RequestData): Promise<T>
+  post<T = ResponseData>(url: string, data?: RequestData, headers?: RequestHeaders): Promise<T>
+}
+
+/**
+ *
+ */
+export type HttpTranslates = Record<string, HttpTranslate | undefined>
+export type HttpTransforms = Record<string, HttpTransform | undefined>
+
+/**
+ * 向 request header 加入参数
+ * 多数是 token
+ */
+export type HeaderParams = Record<string, string>
+
+export enum HttpMethod {
+  get = 'GET',
+  post = 'POST',
+  put = 'PUT',
+  delete = 'DELETE',
+}
+
+export enum HttpError {
+  auth = 'auth',
+  server = 'server',
+}
+
+export type HeaderData = Record<string, string>
+
+/**
+ * 接口参数转换器
+ */
+export type HttpTranslate = (data: RequestData) => RequestData
+
+/**
+ * 接口数据转换器
+ */
+export type HttpTransform = (data: ResponseData) => ResponseData
+
+/**
+ * 接口设置
+ */
+export type HttpEndpoint = {
+  path: string
+  translate?: HttpTranslate
+  transform?: HttpTransform
+}
+
+/**
+ * 接口组
+ */
+export type HttpEndpoints = {
+  [name: string]: HttpEndpoint
+}
+
+/**
+ * 分页参数
+ */
+export type PagingParams = {
+  /**
+   * 页数
+   */
+  page: number
+  /**
+   * 页数据条数
+   */
+  pageSize: number
+}
+
+export type PagingData = {
+  /**
+   * 页总数
+   */
+  totalPages?: number
+  total: number
+  totalRecords: number
+  isLastPage?: boolean
+}
+
+/**
+ * Wrapped with Paging Data
+ */
+export type WithPaging<T = ResponseData> = {
+  [K in keyof PagingData]: PagingData[K]
+} & {
+  data: T
+}
+
+/**
+ * 分页设置
+ */
+export type Paging = {
+  translate(params: PagingParams): any
+  transform(resonse: any): PagingData
+}

package/src/shared/index.ts

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

package/src/shared/weixin/index.ts

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

package/src/shared/weixin/jssdk.ts

@@ -1,103 +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 || 'cloudkitProMp',
-        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 }
+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 || 'cloudkitProMp',
+        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;
 }