diff --git a/mock/dashboard.js b/mock/dashboard.js
index 6dbe9f8..5f16526 100644
--- a/mock/dashboard.js
+++ b/mock/dashboard.js
@@ -5,9 +5,9 @@ import mockStorge from '../src/utils/mockStorge'
import {color} from '../src/utils/theme'
let dataKey = mockStorge('Dashboard', Mock.mock({
- 'sales|12': [
+ 'sales|8': [
{
- 'name|+1': 1,
+ 'name|+1': 2008,
'Clothes|200-500': 1,
'Food|180-700': 1,
'Electronics|300-850': 1
@@ -17,7 +17,7 @@ let dataKey = mockStorge('Dashboard', Mock.mock({
{
'id|+1': 1,
name: '@last',
- 'status|1-5': 1,
+ 'status|1-4': 1,
date:function(){
return Mock.Random.integer(2015, 2016)+'-'+Mock.Random.date('MM-dd')+' '+Mock.Random.time('HH:mm:ss')
},
diff --git a/src/components/dashboard/recentSales.js b/src/components/dashboard/recentSales.js
index 29c19d6..da2ade5 100644
--- a/src/components/dashboard/recentSales.js
+++ b/src/components/dashboard/recentSales.js
@@ -1,7 +1,27 @@
import React, {PropTypes} from 'react'
-import {Icon,Table} from 'antd'
+import {Icon,Table,Tag} from 'antd'
import styles from './recentSales.less'
-import {classnames} from '../../utils'
+import {classnames,color} from '../../utils'
+
+
+const status = {
+ 1:{
+ color:color.green,
+ text:'SALE'
+ },
+ 2:{
+ color:color.yellow,
+ text:'REJECT'
+ },
+ 3:{
+ color:color.red,
+ text:'TAX'
+ },
+ 4:{
+ color:color.blue,
+ text:'EXTENDED'
+ }
+}
function recentSales(props) {
const columns = [
@@ -11,17 +31,20 @@ function recentSales(props) {
}, {
title: 'STATUS',
dataIndex: 'status',
+ render:text =>