Skip to content

Commit 0f2884d

Browse files
修改冲突
2 parents a2cee61 + c96f9b1 commit 0f2884d

20 files changed

+598
-32
lines changed

.eslintrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,10 @@
4444
"react/prop-types": 0,
4545
"react/jsx-uses-react": "error",
4646
"react/jsx-uses-vars": "error"
47+
},
48+
"globals": {
49+
"io": true,
50+
"__dirname": true,
51+
"process": true
4752
}
4853
}

index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<link rel='icon' href='https://reactjs.org/favicon.ico'>
99
<script src="./lib.dll.js"></script>
1010
<script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.8&key=61c862deb5927dba993ae57bc14250d6"></script>
11+
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.1.0/socket.io.js"></script> -->
1112
</head>
1213
<body>
1314
<div id="root"></div>

package-lock.json

Lines changed: 187 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@
4040
"react-dnd-html5-backend": "^5.0.1",
4141
"react-dom": "^16.4.1",
4242
"react-router": "^4.3.1",
43-
"react-router-dom": "^4.4.0-alpha.1"
43+
"react-router-dom": "^4.4.0-alpha.1",
44+
"socket.io-client": "^2.1.1"
4445
},
4546
"devDependencies": {
4647
"@types/clean-webpack-plugin": "^0.1.2",

src/component/Layout/myLayout.less

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
.width_height_100;
1010
padding: 20px;
1111
overflow: auto;
12+
.content{
13+
.width_height_100;
14+
}
1215
}
1316
}
1417

0 commit comments

Comments
 (0)