Selaa lähdekoodia

feat: 排行榜图标

outaozhen 5 vuotta sitten
vanhempi
commit
5593fd69e9

+ 1 - 1
config/defaultSettings.js

@@ -10,7 +10,7 @@ const proSettings = {
   colorWeak: false,
   title: 'CLD.V2',
   pwa: false,
-  iconfontUrl: '//at.alicdn.com/t/font_2276974_9iy7wrna40d.js',
+  iconfontUrl: '//at.alicdn.com/t/font_2276974_ergd1ry0m0a.js',
   splitMenus: true
 }
 export default proSettings

+ 4 - 3
src/pages/Customer/Company/components/AddCompany/index.jsx

@@ -3,7 +3,7 @@ import { Form, Row, Col, Button } from 'antd'
 import { validCascaderRule } from '@/components/LazyCascader'
 import LazyCascader from '@/components/LazyCascader'
 import { ModalForm, ProFormText, ProFormCheckbox } from '@ant-design/pro-form'
-import { PlusOutlined } from '@ant-design/icons'
+import { Plus } from '@icon-park/react'
 import { connect } from 'dva'
 import { ChangeCompMap } from '../ChangeCompany'
 
@@ -55,8 +55,9 @@ const AddCompanyModal = ({ dataId, dataType, onConfirm, dispatch, natures }) =>
         ]
       }}
       trigger={
-        <Button prefix={<PlusOutlined />} type="primary">
-          添加新客户
+        <Button type="primary">
+          <Plus className="mr-1" />
+          客户
         </Button>
       }
       onFinish={async values => {

+ 23 - 12
src/pages/workbench/Dashboard/components/LeaderBoard.jsx

@@ -1,6 +1,7 @@
 import ProTable from '@ant-design/pro-table'
-import { Select, Space, Tag } from 'antd'
+import { Select } from 'antd'
 import { Trophy } from '@icon-park/react'
+import Iconfont from '@/components/SvgIcon'
 import React, { useState, useMemo } from 'react'
 
 const { Option } = Select
@@ -13,9 +14,19 @@ const opMap = {
   business: '新增商机',
   businessService: '商机服务'
 }
+const colorMap = {
+  1: {
+    color: '#fbbf24'
+  },
+  2: {
+    color: '#22c55e'
+  },
+  3: {
+    color: '#333'
+  }
+}
 const LeaderBoard = ({ dataList = [] }) => {
   const [activeOp, setActiveOp] = useState('customer')
-
   const columns = useMemo(() => {
     const oColumns = [
       {
@@ -24,16 +35,16 @@ const LeaderBoard = ({ dataList = [] }) => {
         valueType: 'indexBorder',
         align: 'center',
         width: '30%',
-        render: (_, record) => (
-          <Space>
-            {record.rank.map(({ name, color }) => (
-              <Tag color={color} key={name}>
-                <Trophy />
-                {name}
-              </Tag>
-            ))}
-          </Space>
-        )
+        render: (_, record) => {
+          if (record.rank === 1) {
+            return <Iconfont type="icon-trophy" style={{ color: '#fbbf24' }} />
+            // <Trophy fill={colorMap[1].color} />
+          }
+          if (record.rank === 2) {
+            return <Trophy fill={colorMap[2].color} />
+          }
+          return <Trophy fill={colorMap[3].color} />
+        }
       },
       {
         title: '姓名',

+ 1 - 1
src/pages/workbench/Dashboard/index.jsx

@@ -240,7 +240,7 @@ const Dashboard = () => {
       <div className="shadow-card">
         <ProTable
           bordered
-          rowKey={record => record.day15 + Date.now()}
+          rowKey={record => record.type + Date.now()}
           columns={columns}
           dataSource={state.reminderData}
           search={false}