This commit is contained in:
BlackTeay 2021-03-20 16:08:07 +08:00
parent 633df638f9
commit bd96f1101b
2 changed files with 10 additions and 30 deletions

4
.gitignore vendored
View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
.DS_Store .DS_Store
node_modules node_modules
/dist /dist
@ -22,7 +21,7 @@ pnpm-debug.log*
*.njsproj *.njsproj
*.sln *.sln
*.sw? *.sw?
=======
# ---> Vue # ---> Vue
# gitignore template for Vue.js projects # gitignore template for Vue.js projects
# #
@ -34,4 +33,3 @@ docs/_book
# TODO: where does this rule come from? # TODO: where does this rule come from?
test/ test/
>>>>>>> cc73829d1ccba87b56bfd777b66614e1d855efb7

View File

@ -1,30 +1,12 @@
<<<<<<< HEAD <!--
# jlntv-board-vue * @Author: BlackTeay <i@iteay.top>
* @Date: 2021-03-20 15:30:44
## Project setup * @LastEditors: BlackTeay <i@iteay.top>
``` * @LastEditTime: 2021-03-20 16:07:57
yarn install * @Descripttion:
``` * @FilePath: \vue-with-vant\README.md
* Copyright 2021 Visual Studio, JLNTV
### Compiles and hot-reloads for development -->
```
yarn serve
```
### Compiles and minifies for production
```
yarn build
```
### Lints and fixes files
```
yarn lint
```
### Customize configuration
See [Configuration Reference](https://cli.vuejs.org/config/).
=======
# vue-with-vant # vue-with-vant
带有vant的Vue基础工程 带有vant的Vue基础工程
>>>>>>> cc73829d1ccba87b56bfd777b66614e1d855efb7