版本更新

apps/web-antd/src/api/core/log.ts

@@ -1,4 +1,5 @@
 import { requestClient } from '#/api/request';
+
 export interface UserData {
   data: object[];
   total: number;
@@ -57,6 +58,8 @@ export interface UserOrder {
   PayTime: number;
   PayType: number;
   Param: string;
+  CreateTimeStr?: string;
+  PayTimeStr?: string;
 }
 
 export async function getUserLogAssetApi(data: UserLogAssetParam) {

apps/web-antd/src/store/recharge.ts

@@ -0,0 +1,102 @@
+export const rechargeData: Record<number, string> = {
+  1: '钻石商店挡位1',
+  2: '钻石商店挡位2',
+  3: '钻石商店挡位3',
+  4: '钻石商店挡位4',
+  5: '钻石商店挡位5',
+  6: '钻石商店挡位6',
+  7: '体力商店挡位1',
+  8: '体力商店挡位2',
+  9: '体力商店挡位3',
+  10: '体力商店挡位4',
+  11: '体力商店挡位5',
+  12: '体力商店挡位6',
+  13: '特惠礼包1',
+  14: '特惠礼包1',
+  15: '特惠礼包1',
+  16: '特惠礼包1',
+  17: '特惠礼包1',
+  18: '特惠礼包1',
+  19: '特惠礼包1',
+  20: '特惠礼包1',
+  21: '特惠礼包1',
+  22: '特惠礼包1',
+  23: '特惠礼包1',
+  24: '特惠礼包1',
+  25: '特惠礼包2',
+  26: '特惠礼包2',
+  27: '特惠礼包2',
+  28: '特惠礼包2',
+  29: '特惠礼包2',
+  30: '特惠礼包2',
+  31: '特惠礼包2',
+  32: '特惠礼包2',
+  33: '特惠礼包2',
+  34: '特惠礼包2',
+  35: '特惠礼包2',
+  36: '特惠礼包2',
+  37: '无尽礼包',
+  38: '无尽礼包',
+  39: '无尽礼包',
+  40: '无尽礼包',
+  41: '无尽礼包',
+  42: '无尽礼包',
+  43: '无尽礼包',
+  44: '无尽礼包',
+  45: '无尽礼包',
+  46: '无尽礼包',
+  47: '无尽礼包',
+  48: '无尽礼包',
+  49: '无尽礼包',
+  50: '无尽礼包',
+  51: '无尽礼包',
+  52: '无尽礼包',
+  53: '无尽礼包',
+  54: '无尽礼包',
+  55: '无尽礼包',
+  56: '无尽礼包',
+  57: '无尽礼包',
+  58: '无尽礼包',
+  59: '无尽礼包',
+  60: '无尽礼包',
+  61: '无尽礼包',
+  62: '无尽礼包',
+  63: '小猪存钱罐',
+  64: '免广告',
+  65: '新手礼包1',
+  66: '新手礼包2',
+  67: 'playroom打工道具',
+  68: '套餐优惠礼包1',
+  69: '套餐优惠礼包2',
+  70: '套餐优惠礼包3',
+  71: '套餐优惠礼包4',
+  72: '买一赠一礼包1',
+  73: '超值加购礼包1',
+  74: '超值加购礼包1+1',
+  75: '超值加购礼包1+2',
+  76: '超值加购礼包1+3',
+  77: '超值加购礼包I',
+  78: '超值加购礼包I+II',
+  79: '超值加购礼包I+III',
+  80: '超值加购礼包I+IV',
+  81: '超值加购礼包I+II+III',
+  82: '超值加购礼包I+II+IV',
+  83: '超值加购礼包I+III+IV',
+  84: '超值加购礼包I+II+III+IV',
+  85: '宠物币礼包1',
+  86: '宠物币礼包2',
+  87: '宠物币礼包3',
+  88: '宠物币礼包4',
+  89: '宠物币礼包5',
+  90: '宠物币礼包6',
+  91: '宠物币礼包7',
+  92: '宠物币礼包8',
+  93: '宠物币礼包9',
+  94: '宠物币礼包10',
+  95: '宠物币礼包11',
+  96: '宠物币礼包12',
+  97: '宠物币礼包13',
+  98: '宠物币礼包14',
+  99: '宠物币礼包15',
+  100: '宠物币礼包16',
+};

apps/web-antd/src/views/userlog/orderlog/event-table.vue

@@ -1,17 +1,19 @@
 <script setup lang="ts">
-
-import { getUserlogOrderApi } from '#/api/core/log';
-import { useVbenVxeGrid } from '#/adapter/vxe-table';
-import { onMounted, ref } from 'vue';
-import { inject } from 'vue';
-import { globalState } from '#/store/globalState';
-import type { VxeGridProps } from '#/adapter/vxe-table';
 import type { VbenFormProps } from '#/adapter/form';
-import { Page } from '@vben/common-ui';
+import type { VxeGridProps } from '#/adapter/vxe-table';
-const state = inject('globalState', globalState);
+import type { AppData } from '#/api/core/server';
-import type { AppData, ServerData } from '#/api/core/server';
-import { getServerListApi, getAppListApi } from '#/api/core/server';
 
+import { inject, onMounted, ref } from 'vue';
+
+import { Page } from '@vben/common-ui';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { getUserlogOrderApi } from '#/api/core/log';
+import { getAppListApi } from '#/api/core/server';
+import { globalState } from '#/store/globalState';
+import { rechargeData } from '#/store/recharge';
+
+const state = inject('globalState', globalState);
 
 interface RowType {
   Uid: string;
@@ -20,7 +22,7 @@ interface RowType {
   timestamp: string;
 }
 const appList = ref<AppData[]>([]);
-  
+
 const formOptions: VbenFormProps = {
   // 默认展开
   collapsed: false,
@@ -45,7 +47,7 @@ const formOptions: VbenFormProps = {
       },
       fieldName: 'AppId',
       label: 'APP：',
-    }
+    },
   ],
   // 控制表单是否显示折叠按钮
   showCollapseButton: true,
@@ -56,31 +58,52 @@ const formOptions: VbenFormProps = {
   submitOnChange: false,
   // 按下回车时是否提交表单
   submitOnEnter: false,
-
+};
-}
 const gridOptions: VxeGridProps<RowType> = {
   columns: [
     { field: 'Uid', title: 'id' },
     { field: 'OrderId', title: '订单号' },
     { field: 'PayChannelOrderId', title: '3th订单号' },
     { field: 'Price', title: '金额' },
-    { field: 'ProductId', title: 'chargeId' },
+    {
-    { field: 'CreateTime', title: '创建时间', formatter: ({ cellValue }) => new Date(cellValue * 1000).toLocaleString() },
+      field: 'ProductId',
-    { field: 'PayTime', title: '支付时间', formatter: ({ cellValue }) => new Date(cellValue * 1000).toLocaleString() },
+      title: 'chargeId',
-    { field: 'PayType', title: '支付类型' },
+      formatter: ({ cellValue }) => {
+        return rechargeData[cellValue] || cellValue;
+      },
+    },
+    { field: 'CreateTimeStr', title: '创建时间' },
+    { field: 'PayTimeStr', title: '支付时间' },
+    {
+      field: 'PayType',
+      title: '支付类型',
+      formatter: ({ cellValue }) => {
+        if (cellValue === 0) return '谷歌';
+        if (cellValue === 1) return '微信';
+        if (cellValue === 2) return '支付宝';
+        if (cellValue === 3) return '苹果内购';
+        return cellValue;
+      },
+    },
     { field: 'Param', title: '参数' },
   ],
+  toolbarConfig: {
+    custom: true,
+    export: true,
+    refresh: true,
+    zoom: true,
+  },
   stripe: true,
   height: 'auto',
   pagerConfig: {},
   proxyConfig: {
     response: {
-      total: "total",
+      total: 'total',
-      result: "data"
+      result: 'data',
     },
     ajax: {
       query: async ({ page }, formValues) => {
-        let Uid = parseInt(formValues.Uid, 10);
+        const Uid = Number.parseInt(formValues.Uid, 10);
         state.uid = Uid;
         state.Event = formValues.Event;
         return await getUserlogOrderApi({
@@ -118,16 +141,14 @@ onMounted(async () => {
         fieldName: 'AppId',
       },
     ]);
-    
+  } catch {
-  } catch (e) {
     appList.value = [];
-    //console.log(e);
+    // console.log(e);
   }
 });
 </script>
 
 <template>
-  <Page auto-content-height>
+   <Page auto-content-height> <Grid /> </Page>
-    <Grid />
+</template>
-  </Page>
+
-</template>

vben-admin.code-workspace

@@ -4,14 +4,6 @@
       "name": "@vben/web-antd",
       "path": "apps/web-antd",
     },
-    {
-      "name": "@vben/web-ele",
-      "path": "apps/web-ele",
-    },
-    {
-      "name": "@vben/web-naive",
-      "path": "apps/web-naive",
-    },
     {
       "name": "@vben/docs",
       "path": "docs",