afc163 8 лет назад
Родитель
Сommit
07dd3eb920
5 измененных файлов с 30 добавлено и 16 удалено
  1. 1 1
      .roadhogrc.mock.js
  2. 20 6
      mock/api.js
  3. 1 2
      package.json
  4. 2 1
      src/layouts/UserLayout.js
  5. 6 6
      src/routes/Dashboard/Workplace.js

+ 1 - 1
.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,
     },

+ 20 - 6
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: '程序员日常',

+ 1 - 2
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"]
 }

+ 2 - 1
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 {
           <div className={styles.top}>
             <div className={styles.header}>
               <Link to="/">
-                <img alt="" className={styles.logo} src="https://gw.alipayobjects.com/zos/rmsportal/NGCCBOENpgTXpBWUIPnI.svg" />
+                <img alt="logo" className={styles.logo} src={logo} />
                 <span className={styles.title}>Ant Design</span>
               </Link>
             </div>

+ 6 - 6
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 = (
       <div className={styles.pageHeaderContent}>
         <div className={styles.avatar}>
-          <Avatar size="large" src="https://gw.alipayobjects.com/zos/rmsportal/lctvVCLfRpYCkYxAsiVQ.png" />
+          <Avatar size="large" src="https://gw.alipayobjects.com/zos/rmsportal/keeYtvRpGFVVKOOiOZDS.png" />
         </div>
         <div className={styles.content}>
           <div className={styles.contentTitle}>早安,曲丽丽,祝你开心每一天!</div>