diff --git a/.roadhogrc.mock.js b/.roadhogrc.mock.js index b025f74916b60784527cbad938572d36d3ac97f0..30d0a03859190e4a6796ea84dc8b51abd38af40c 100644 --- a/.roadhogrc.mock.js +++ b/.roadhogrc.mock.js @@ -24,7 +24,7 @@ const proxy = { }, $body: { name: 'Serati Ma', - avatar: 'https://gw.alipayobjects.com/zos/rmsportal/eHBsAsOrrJcnvFlnzNTT.png', + avatar: 'https://gw.alipayobjects.com/zos/rmsportal/keeYtvRpGFVVKOOiOZDS.png', userid: '00000001', notifyCount: 12, }, diff --git a/mock/api.js b/mock/api.js index b1cf1ecb7e9e1c8c5449b0415c7d87e610aa3bf2..3c1bc8bca534df2e77b3f18326fc610f19dd3bc4 100644 --- a/mock/api.js +++ b/mock/api.js @@ -20,6 +20,20 @@ const avatars = [ 'https://gw.alipayobjects.com/zos/rmsportal/ComBAopevLwENQdKWiIn.png', // Vue 'https://gw.alipayobjects.com/zos/rmsportal/nxkuOJlFJuAUhzlMTCEe.png', // Webpack ]; + +const avatars2 = [ + 'https://gw.alipayobjects.com/zos/rmsportal/keeYtvRpGFVVKOOiOZDS.png', + 'https://gw.alipayobjects.com/zos/rmsportal/HpGtMMahFSHCFrLHoRgp.png', + 'https://gw.alipayobjects.com/zos/rmsportal/vbkXPXkeyhWWEQKpTmyB.png', + 'https://gw.alipayobjects.com/zos/rmsportal/UXeAaBwlPaPqIVOjMqpK.png', + 'https://gw.alipayobjects.com/zos/rmsportal/lPPRIxHBXYiVglbTqzUM.png', + 'https://gw.alipayobjects.com/zos/rmsportal/gGbnPtZRDoBIzgnviJSd.png', + 'https://gw.alipayobjects.com/zos/rmsportal/uDbwqVZzLhaZeVaTDahw.png', + 'https://gw.alipayobjects.com/zos/rmsportal/HtgZoejyvBLuuRtmMfFh.png', + 'https://gw.alipayobjects.com/zos/rmsportal/XvQuAhIgggZWZEjWJsuu.png', + 'https://gw.alipayobjects.com/zos/rmsportal/RsKCNHXwelfBwCzjYfNb.png', +]; + const covers = [ 'https://gw.alipayobjects.com/zos/rmsportal/uMfMFlvUuceEyPpotzlq.png', 'https://gw.alipayobjects.com/zos/rmsportal/iZBVOIhGJiAnhplqjvZW.png', @@ -178,7 +192,7 @@ export const getActivities = [ updatedAt: new Date(), user: { name: '林东东', - avatar: avatars[0], + avatar: avatars2[0], }, group: { name: '高逼格设计天团', @@ -195,7 +209,7 @@ export const getActivities = [ updatedAt: new Date(), user: { name: '付小小', - avatar: avatars[1], + avatar: avatars2[1], }, group: { name: '高逼格设计天团', @@ -212,7 +226,7 @@ export const getActivities = [ updatedAt: new Date(), user: { name: '曲丽丽', - avatar: avatars[2], + avatar: avatars2[2], }, group: { name: '中二少女团', @@ -229,7 +243,7 @@ export const getActivities = [ updatedAt: new Date(), user: { name: '周星星', - avatar: avatars[3], + avatar: avatars2[3], }, project: { name: '5 月日常迭代', @@ -242,7 +256,7 @@ export const getActivities = [ updatedAt: new Date(), user: { name: '朱偏右', - avatar: avatars[4], + avatar: avatars2[4], }, project: { name: '工程效能', @@ -259,7 +273,7 @@ export const getActivities = [ updatedAt: new Date(), user: { name: '乐哥', - avatar: avatars[5], + avatar: avatars2[5], }, group: { name: '程序员日常', diff --git a/package.json b/package.json index 031c62611c702a8a62d41324320e7884bc4d391c..49c4c16563f6f39d43109593125dc922f986b291 100755 --- a/package.json +++ b/package.json @@ -96,8 +96,7 @@ }, "lint-staged": { "**/*.{js,jsx}": "lint-staged:js", - "**/*.less": "stylelint --syntax less", - "*.{js,jsx,less,json}": ["prettier --write", "git add"] + "**/*.less": "stylelint --syntax less" }, "browserslist": ["> 1%", "last 2 versions", "not ie <= 10"] } diff --git a/src/layouts/UserLayout.js b/src/layouts/UserLayout.js index 7f9ca2c9dc658d2baba3ceaffbff3c21bf8d01e7..742c9474339345b14b74d070035b0b3c612d534d 100644 --- a/src/layouts/UserLayout.js +++ b/src/layouts/UserLayout.js @@ -5,6 +5,7 @@ import DocumentTitle from 'react-document-title'; import { Icon } from 'antd'; import GlobalFooter from '../components/GlobalFooter'; import styles from './UserLayout.less'; +import logo from '../assets/logo.svg'; const links = [{ title: '帮助', @@ -47,7 +48,7 @@ class UserLayout extends React.PureComponent {
- + logo Ant Design
diff --git a/src/routes/Dashboard/Workplace.js b/src/routes/Dashboard/Workplace.js index 40e2c90449f99670350d39e9c6430cae512c86b0..c082c9df8b2179b2dfa58396a3e8d8ed2e6f4972 100644 --- a/src/routes/Dashboard/Workplace.js +++ b/src/routes/Dashboard/Workplace.js @@ -41,31 +41,31 @@ const members = [ { id: 'members-1', title: '科学搬砖组', - logo: 'https://gw.alipayobjects.com/zos/rmsportal/WdGqmHpayyMjiEhcKoVE.png', + logo: 'https://gw.alipayobjects.com/zos/rmsportal/keeYtvRpGFVVKOOiOZDS.png', link: '', }, { id: 'members-2', title: '程序员日常', - logo: 'https://gw.alipayobjects.com/zos/rmsportal/zOsKZmFRdUtvpqCImOVY.png', + logo: 'https://gw.alipayobjects.com/zos/rmsportal/HpGtMMahFSHCFrLHoRgp.png', link: '', }, { id: 'members-3', title: '设计天团', - logo: 'https://gw.alipayobjects.com/zos/rmsportal/dURIMkkrRFpPgTuzkwnB.png', + logo: 'https://gw.alipayobjects.com/zos/rmsportal/vbkXPXkeyhWWEQKpTmyB.png', link: '', }, { id: 'members-4', title: '中二少女团', - logo: 'https://gw.alipayobjects.com/zos/rmsportal/sfjbOqnsXXJgNCjCzDBL.png', + logo: 'https://gw.alipayobjects.com/zos/rmsportal/UXeAaBwlPaPqIVOjMqpK.png', link: '', }, { id: 'members-5', title: '骗你学计算机', - logo: 'https://gw.alipayobjects.com/zos/rmsportal/siCrBXXhmvTQGWPNLBow.png', + logo: 'https://gw.alipayobjects.com/zos/rmsportal/lPPRIxHBXYiVglbTqzUM.png', link: '', }, ]; @@ -139,7 +139,7 @@ export default class Workplace extends PureComponent { const pageHeaderContent = (
- +
早安,曲丽丽,祝你开心每一天!