@uxda/appkit 1.0.66 → 1.0.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxda/appkit",
-  "version": "1.0.66",
+  "version": "1.0.70",
   "description": "小程序应用开发包",
   "main": "dist/index.js",
   "module": "dist/index.ts",
@@ -39,6 +39,7 @@
     "@tarojs/taro": "^3.5.6",
     "@tarojs/taro-h5": "^3.5.6",
     "@types/wechat-miniprogram": "^3.4.7",
+    "dayjs": "^1.11.10",
     "vue": "^3.3.0"
   },
   "devDependencies": {

package/src/balance/api/endpoints.ts

@@ -1,6 +1,9 @@
 import { HttpEndpoints } from '../../shared/http'
-import { ConsumptionFiltering, ConsumptionGroups, ConsumptionType } from '../types'
+import { 账户流水筛选项, ConsumptionType } from '../types'
 
+/**
+ * 流水交易类型映射
+ */
 const typeMappings: Record<string, ConsumptionType> = {
   'CZ': '充值',
   'JF': '缴费',
@@ -11,6 +14,9 @@ const typeMappings: Record<string, ConsumptionType> = {
   'TH': '退回',
 }
 
+/**
+ * 映射还能反过来
+ */
 const typeMappingsReversed = Object.fromEntries(
   Object.entries(typeMappings).map(([x, y]) => [y, x])
 )
@@ -34,56 +40,54 @@ const directionMappingsReversed = Object.fromEntries(
 )
 
 const endpointsList: HttpEndpoints = {
-  /**
-   * 余额明细
-   */
-  getBalance: {
+  获取余额明细: {
     path: '/ac-app/account/info/detail/app', // /app
-    translate: (data: any) => ({
-    }),
     transform (result: any) {
       return {
         total: result.commonAccount,
         privileges: result.rightsAccountBalList.map((r: any) => ({
           title: r.rightsName,
-          amount: r.rightsAccount
+          count: r.rightsAccount
         }))
       }
     }
   },
-  /**
-   * 账户流水明细
-   */
-  getOperations: {
+  获取账户流水: {
     path: '/ac-app/account/record/detail/mobile',
-    translate: (data: ConsumptionFiltering) => {
+    translate: (data: 账户流水筛选项) => {
       return {
-        accountType: positionMappingsReversed[data.position] || '',
-        inOrOut: directionMappingsReversed[data.direction] || '',
-        changeType: typeMappingsReversed[data.type] || '',
+        accountType: positionMappingsReversed[data.账户类型] || '',
+        inOrOut: directionMappingsReversed[data.收入还是支出] || '',
+        changeType: typeMappingsReversed[data.交易类型] || '',
         operateTimeStart: data.dateFrom || '',
         operateTimeEnd: data.dateTo || '',
+        rightsCode: data.权益类目,
+        pageNum: data.page,
+        pageSize: 10,
       }
     },
-    transform (result: any) {
-      if (!result.accountRecordDetailDailyList) return []
-      const data: ConsumptionGroups = {
-        from: result.operateTimeStart,
-        to: result.operateTimeEnd,
-        list: result.accountRecordDetailDailyList.map((r: any) => ({
-          date: r.operateTime,
-          consumptions: r.accountRecordDetailList.map((d: any) => ({
-            position: positionMappings[d.accountType],
-            type: typeMappings[d.changeType],
-            direction: directionMappings[d.inOrOut],
-            amount: d.changeValue,
-            title: d.rightsName,
-            description: d.remark,
-          }))
-        }))
-      }
+    transform (response: any) {
+      const data = response.list.map((d: any) => ({
+        账户类型: positionMappings[d.accountType],
+        交易类型: typeMappings[d.changeType],
+        收入还是支出: directionMappings[d.inOrOut],
+        amount: d.changeValue,
+        title: d.rightsName,
+        time: Date.parse(d.operateTime), // 后台返回的是日期字符串，这里格式化成 timestamp
+        description: d.remark,
+      }))
       return data
     }
+  },
+  获取权益类目: {
+    path: '/ac-app/rights/item/list',
+    // translate (data: ConsumptionFiltering) {
+    //   // return { appCode: data.appCode }
+    // },
+    transform: (data: any[]) => data.map(d => ({
+      name: d.rightsName,
+      code: d.rightsCode,
+    }))
   }
 }
 
@@ -103,4 +107,4 @@ export {
   endpoints,
   translates,
   transforms,
-}
+}

package/src/balance/api/index.ts

@@ -1,21 +1,73 @@
-import { useHttp } from '../../shared'
+import Taro from '@tarojs/taro'
+import { HttpRequestConfig, PagingData, PagingParams, ResponseRaw, createHttp } from '../../shared'
 import { translates, transforms } from './endpoints'
 import { useAppKitOptions } from '../../Appkit'
 
-const makeHttp = () => {
-  const appkitOptions = useAppKitOptions()
 
-  const header = {
+/**
+ * 小程序端 Http
+ * 使用 Taro.request 实现
+ */
+const vendor = {
+  async request <T>(config: HttpRequestConfig) {
+    return new Promise<ResponseRaw<T>>((resolve, reject) => {
+      Taro.request({
+        url: config.url,
+        method: config.method,
+        header: config.headers,
+        data: config.data
+      }).then(({data}) => {
+        resolve({
+          status: +data.code,
+          message: data.msg,
+          data: data.result as T
+        })
+      }).catch((e: any) => {
+        reject(e)
+      })
+    })
+  }
+}
+
+function useHttp () {
+  const appkitOptions = useAppKitOptions()
+  const headers = {
     Token: appkitOptions.token(),
     Appcode: appkitOptions.app(),
     cookie: `tid=${appkitOptions.tenant()}`
   }
-
-  const $http = useHttp({
+  /**
+   * 传入配置获取 Http instanse
+   */
+  const $http = createHttp({
+    vendor,
     baseUrl: appkitOptions.baseUrl(),
-    header,
-    onAuthError () {
-      appkitOptions[401]()
+    headers,
+    interceptors: [
+      raw => {
+        if (raw.status == 401) {
+          appkitOptions[401]()
+          return true
+        }
+        return false
+      },
+      raw => {
+        if (raw.status > 500) {
+          return true
+        }
+        return false
+      }
+    ],
+    paging: {
+      translate: (params: PagingParams) => ({
+        pageNum: params.page,
+        pageSize: params.pageSize
+      }),
+      transform (data: any): PagingData {
+        return {
+          totalPages: data.pages
+        }
+      }
     },
     translates,
     transforms,
@@ -24,7 +76,7 @@ const makeHttp = () => {
 }
 
 export {
-  makeHttp
+  useHttp
 }
 
 export * from './endpoints'