Merge branch 'develop' into 'master'

Develop

See merge request laihua-web/laihua-toolkit!1

.eslintignore

@@ -2,6 +2,7 @@ package.json
 package-lock.json
 yarn.lock
 !.eslintrc.js
+.eslintrc.js
 # 忽略有所md文件
 *.md
 assets/

.eslintrc.js

@@ -33,7 +33,7 @@ module.exports = {
                 SwitchCase: 1 // 针对switch case的缩进
             }
         ],
-        'linebreak-style': ['error', 'unix'],
+        'linebreak-style': ['warn', 'unix'],
         'no-irregular-whitespace': [
             1,
             { skipComments: true, skipTemplates: true, skipRegExps: true }

.prettierrc.js

@@ -31,5 +31,6 @@ module.exports = {
     // 箭头函数参数括号 默认avoid 可选 avoid| always
     // avoid 能省略括号的时候就省略 例如x => x
     // always 总是有括号
-    arrowParens: 'always'
+    arrowParens: 'always',
+    endOfline: "auto"
 }

README.md

@@ -10,31 +10,32 @@
 
 
 ## 运行
+安装依赖：
 ```
 npm install
 ```
 
-### 本地开发
+本地开发：
 ```
 npm run serve
 ```
 
-### 测试环境打包
+测试环境打包：
 ```
 npm run passports
 ```
 
-### 生产环境打包
+生产环境打包：
 ```
 npm run build
 ```
 
-### 打包后本地预览
+打包后本地预览：
 ```
 npm run start
 ```
 
-### 格式校验及自动修复
+格式校验及自动修复：
 修复eslint报错：
 ```
 npm run fix
@@ -49,6 +50,34 @@ npm run prettier
 ### 分支
 `develop`: 开发分支
 
+### 目录结构
+├── CHANGELOG.md    // 更新日志
+├── README.md
+├── babel.config.js
+├── config
+│   └── baseUrl.js
+├── package.json
+├── public
+│   ├── favicon.ico
+│   ├── img
+│   ├── index.html
+│   └── robots.txt
+├── src  // 源码目录
+│   ├── App.vue   // 入口文件
+│   ├── assets
+│   ├── components  // 组件目录
+│   ├── main.js
+│   ├── registerServiceWorker.js
+│   ├── router
+│   ├── store
+│   └── views    // 页面组件目录
+├── vue.config.js
+└── yarn.lock
+
+注意：
+1. 页面级组件（通俗理解为与路由对应的组件）统一放在`views`目录下。
+2. 页面组件内的小组件、功能组件统一放在`components`目录下。例如，页面组件`pageA.vue`中拆分出了`pageheader.vue`组件，那么在`components`目录下新建一个**与页面同名的`pageA`目录**，`pageA`的相关组件放进去即可。
 
 ## Customize configuration
 See [Configuration Reference](https://cli.vuejs.org/config/).
+****

src/components/sideNav/index.vue

@@ -2,7 +2,7 @@
     <div class="comp-sidenav">
         <router-link to="/">Home</router-link>
         <router-link to="/about">About</router-link>
-        <router-link to="/bao1">bao1</router-link>
+        <router-link to="/cutter">cutter</router-link>
         <router-link to="/bao2">bao2</router-link>
     </div>
 </template>

src/views/bao1.vue → src/components/videoCutter/videoPlayer.vue

 <template>
-    <div class="comp-bao1">
-        bao1
+    <div class="video-player">
+        <video></video>
     </div>
 </template>
-
 <script>
 export default {
     data() {
         return {}
-    },
-    created() {},
-    mounted() {}
+    }
 }
 </script>
-
-<style scoped lang="scss">
-/* @import url(); 引入css类 */
-</style>
+<style lang="scss" scoped></style>

src/router/index.js

@@ -19,9 +19,9 @@ const routes = [
         component: () => import(/* webpackChunkName: "about" */ '../views/About.vue')
     },
     {
-        path: '/bao1',
-        name: 'Bao1',
-        component: () => import(/* webpackChunkName: "bao1" */ '../views/bao1.vue')
+        path: '/cutter',
+        name: 'Cutter',
+        component: () => import(/* webpackChunkName: "bao1" */ '../views/videoCutter.vue')
     },
     {
         path: '/bao2',

src/views/videoCutter.vue

+<template>
+    <div class="video-cutter">
+        <div class="video-content">
+            <video-player></video-player>
+        </div>
+        <div></div>
+        <div></div>
+        <div></div>
+    </div>
+</template>
+
+<script>
+import VideoPlayer from '@/components/videoCutter/videoPlayer.vue'
+export default {
+    components: {
+        VideoPlayer
+    },
+    data() {
+        return {}
+    },
+    created() {},
+    mounted() {}
+}
+</script>
+
+<style scoped lang="scss">
+/* @import url(); 引入css类 */
+.video-cutter {
+    width: 100%;
+    height: 100%;
+}
+</style>