shenwu 5 months ago
parent
commit
c22c14d7e2
1 changed files with 61 additions and 35 deletions
  1. 61 35
      src/pages/MiniApp/EmsCnpl/Users/tableConfig.tsx

+ 61 - 35
src/pages/MiniApp/EmsCnpl/Users/tableConfig.tsx

@@ -1,5 +1,5 @@
 import { ProColumns } from "@ant-design/pro-components";
 import { ProColumns } from "@ant-design/pro-components";
-import { Avatar, Space, Typography } from 'antd';
+import { Avatar, Badge, Space, Typography } from 'antd';
 const { Paragraph } = Typography;
 const { Paragraph } = Typography;
 export const columns = (): ProColumns<any>[] => {
 export const columns = (): ProColumns<any>[] => {
     return [
     return [
@@ -9,8 +9,8 @@ export const columns = (): ProColumns<any>[] => {
             key: "nickname",
             key: "nickname",
             align: "center",
             align: "center",
             hideInSearch: true,
             hideInSearch: true,
-            render:(_,row)=>{
-                return <Space> <Avatar shape="square" size={34} src={row?.headimgurl} />{row?.nickname}</Space>
+            render: (_, row) => {
+                return <Space> <Avatar shape="square" size={34} src={row?.headimgurl || "https://test-book-content.oss-cn-hangzhou.aliyuncs.com/bookImageFE90FDA493CE46C694B423F4F4EA7BCB.jpg"} />{row?.nickname}</Space>
             }
             }
         },
         },
         {
         {
@@ -27,27 +27,17 @@ export const columns = (): ProColumns<any>[] => {
             align: "center",
             align: "center",
             hideInSearch: true,
             hideInSearch: true,
         },
         },
-        {
-            title: "公众号小程序用户ID",
-            dataIndex: 'appUserId',
-            key: "appUserId",
-            align: "center",
-            hideInSearch: true,
-        },
         {
         {
             title: "是否订阅",
             title: "是否订阅",
             dataIndex: 'subscribe',
             dataIndex: 'subscribe',
             key: "subscribe",
             key: "subscribe",
             align: "center",
             align: "center",
             hideInSearch: true,
             hideInSearch: true,
+            render:(_,row)=>{
+                return <Badge status={row.subscribe?'success':'default'} text={row.subscribe?"是":"否"} />
+            }
         },
         },
-        {
-            title: "关注时间",
-            dataIndex: 'subscribeTime',
-            key: "subscribeTime",
-            align: "center",
-            hideInSearch: true,
-        },
+       
         {
         {
             title: "关注场景",
             title: "关注场景",
             dataIndex: 'subscribeScene',
             dataIndex: 'subscribeScene',
@@ -69,24 +59,10 @@ export const columns = (): ProColumns<any>[] => {
             align: "center",
             align: "center",
             hideInSearch: true,
             hideInSearch: true,
         },
         },
-        // {
-        //     title: "所在的分组",
-        //     dataIndex: 'groupId',
-        //     key: "groupId",
-        //     align: "center",
-        //     hideInSearch: true,
-        // },
-        // {
-        //     title: "标签",
-        //     dataIndex: 'wxTagidList',
-        //     key: "wxTagidList",
-        //     align: "center",
-        //     hideInSearch: true,
-        // },
         {
         {
-            title: "创建时间",
-            dataIndex: 'createTime',
-            key: "createTime",
+            title: "关注时间",
+            dataIndex: 'subscribeTime',
+            key: "subscribeTime",
             align: "center",
             align: "center",
             hideInSearch: true,
             hideInSearch: true,
         },
         },
@@ -97,6 +73,56 @@ export const columns = (): ProColumns<any>[] => {
             align: "center",
             align: "center",
             hideInSearch: true,
             hideInSearch: true,
         },
         },
+        {
+            title: "公众号小程序用户ID",
+            dataIndex: 'openId',
+            key: "openId",
+            align: "center",
+            hideInSearch: true,
+            render: (_, row) => {
+                return row?.wechatMiniappUser?.openId || "-"
+            }
+        },
+        {
+            title: "登录设备",
+            dataIndex: 'osType',
+            key: "osType",
+            align: "center",
+            hideInSearch: true,
+            render: (_, row) => {
+                return row?.wechatMiniappUser?.osType || "-"
+            }
+        },
+        {
+            title: "最近登录IP",
+            dataIndex: 'lastLoginIp',
+            key: "lastLoginIp",
+            align: "center",
+            hideInSearch: true,
+            render: (_, row) => {
+                return row?.wechatMiniappUser?.lastLoginIp || "-"
+            }
+        },
+        {
+            title: "最近登录时间",
+            dataIndex: 'lastLoginTime',
+            key: "lastLoginTime",
+            align: "center",
+            hideInSearch: true,
+            render: (_, row) => {
+                return row?.wechatMiniappUser?.lastLoginTime || "-"
+            }
+        },
+        {
+            title: "注册时间",
+            dataIndex: 'createTime',
+            key: "createTime",
+            hideInSearch: true,
+            align: "center",
+            render: (_, row) => {
+                return row?.wechatMiniappUser?.createTime || "-"
+            }
+        },
         {
         {
             title: "备注",
             title: "备注",
             dataIndex: 'remark',
             dataIndex: 'remark',
@@ -104,6 +130,6 @@ export const columns = (): ProColumns<any>[] => {
             align: "center",
             align: "center",
             hideInSearch: true,
             hideInSearch: true,
         },
         },
-    
+
     ];
     ];
 }
 }