Browse Source

Merge branch 'dev'

Conflicts:
	README.md
master
taylor 8 years ago
parent
commit
933053b550
  1. 21
      LICENSE
  2. 8
      README.md
  3. 2
      package.json
  4. BIN
      screenshots/edit.jpg
  5. BIN
      screenshots/login.png
  6. BIN
      screenshots/main.png

21
LICENSE

@ -0,0 +1,21 @@
MIT License
Copyright (c) 2016-present taylorchen709
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

8
README.md

@ -22,11 +22,13 @@ npm run build
Modern browsers and Internet Explorer 10+. Modern browsers and Internet Explorer 10+.
### snapshots ### snapshots
![image](https://github.com/taylorchen709/vueAdmin/blob/master/screenshots/login.png)
![image](https://github.com/taylorchen709/vueAdmin/blob/master/screenshots/main.png)
![image](https://github.com/taylorchen709/vueAdmin/blob/master/screenshots/edit.jpg)
![image](https://raw.githubusercontent.com/taylorchen709/markdown-images/master/vueadmin/login.png)
![image](https://raw.githubusercontent.com/taylorchen709/markdown-images/master/vueadmin/main.png)
![image](https://raw.githubusercontent.com/taylorchen709/markdown-images/master/vueadmin/edit.jpg)
### wechat group(加不进时请扫我) ### wechat group(加不进时请扫我)
![image](https://raw.githubusercontent.com/taylorchen709/markdown-images/master/vueadmin/code.jpg) ![image](https://raw.githubusercontent.com/taylorchen709/markdown-images/master/vueadmin/code.jpg)
![image](https://raw.githubusercontent.com/taylorchen709/markdown-images/master/mywechatid.jpg) ![image](https://raw.githubusercontent.com/taylorchen709/markdown-images/master/mywechatid.jpg)
### License
[MIT](http://opensource.org/licenses/MIT)

2
package.json

@ -29,7 +29,7 @@
"chalk": "^1.1.3", "chalk": "^1.1.3",
"connect-history-api-fallback": "^1.1.0", "connect-history-api-fallback": "^1.1.0",
"css-loader": "^0.26.1", "css-loader": "^0.26.1",
"element-ui": "^1.1.5",
"element-ui": "^1.1.6",
"eventsource-polyfill": "^0.9.6", "eventsource-polyfill": "^0.9.6",
"express": "^4.13.3", "express": "^4.13.3",
"extract-text-webpack-plugin": "^1.0.1", "extract-text-webpack-plugin": "^1.0.1",

BIN
screenshots/edit.jpg

Binary file not shown.

Before

Width: 1366  |  Height: 638  |  Size: 39 KiB

BIN
screenshots/login.png

Binary file not shown.

Before

Width: 1364  |  Height: 637  |  Size: 11 KiB

BIN
screenshots/main.png

Binary file not shown.

Before

Width: 1366  |  Height: 637  |  Size: 60 KiB

Loading…
Cancel
Save