Merge remote-tracking branch 'origin/develop' into develop

config/baseUrl.js

@@ -3,17 +3,17 @@ console.log('process.env:', process.env)
 console.log('process.env.NODE_ENV:', process.env.NODE_ENV)
 //
 switch (process.env.NODE_ENV) {
-    case 'development':
-        baseUrl = 'http://localhost:3000/development' //开发环境url
-        break
+  case 'development':
+    baseUrl = 'http://localhost:3000/development' //开发环境url
+    break
 
-    case 'passports': // 注意这里的名字要和步骤二中设置的环境名字对应起来
-        baseUrl = 'http://localhost:3000/passports' //测试环境中的url
-        break
+  case 'passports': // 注意这里的名字要和步骤二中设置的环境名字对应起来
+    baseUrl = 'http://localhost:3000/passports' //测试环境中的url
+    break
 
-    case 'production':
-        baseUrl = 'http://106.13.94.82:3000/production' //生产环境url
-        break
+  case 'production':
+    baseUrl = 'http://106.13.94.82:3000/production' //生产环境url
+    break
 }
 
 export default baseUrl

src/components/videoCutter/videoChange.vue

@@ -17,13 +17,13 @@ export default {
 </script>
 <style lang="scss" scoped>
 .video-change {
-    width: 100px;
-    height: 30px;
-    line-height: 30px;
-    text-align: center;
-    border: 1px solid #dddddd;
-    border-radius: 4px;
-    user-select: none;
-    cursor: pointer;
+  width: 100px;
+  height: 30px;
+  line-height: 30px;
+  text-align: center;
+  border: 1px solid #dddddd;
+  border-radius: 4px;
+  user-select: none;
+  cursor: pointer;
 }
 </style>

src/components/videoCutter/videoControl.vue

@@ -32,7 +32,7 @@ export default {
       return min + ':' + sec
     }
   },
-    props: ['duration', 'nowTime'], // eslint-disable-line
+  props: ['duration', 'nowTime'], // eslint-disable-line
   data() {
     return {}
   },
@@ -45,27 +45,27 @@ export default {
 </script>
 <style lang="scss" scoped>
 .video-control {
-    display: flex;
-    justify-content: flex-start;
-    align-self: center;
-    width: 200px;
-    user-select: none;
+  display: flex;
+  justify-content: flex-start;
+  align-self: center;
+  width: 200px;
+  user-select: none;
 }
 .video-play-btn {
-    border: 1px solid #dddddd;
-    width: 30px;
-    height: 30px;
-    border-radius: 100%;
-    margin-right: 10px;
-    cursor: pointer;
+  border: 1px solid #dddddd;
+  width: 30px;
+  height: 30px;
+  border-radius: 100%;
+  margin-right: 10px;
+  cursor: pointer;
 }
 .video-time-content {
-    display: flex;
+  display: flex;
 
-    > div,
-    span {
-        line-height: 30px;
-        color: #474261;
-    }
+  > div,
+  span {
+    line-height: 30px;
+    color: #474261;
+  }
 }
 </style>

src/components/videoCutter/videoPlayer.vue

@@ -64,16 +64,16 @@ export default {
 </script>
 <style lang="scss" scoped>
 .video-player {
-    display: flex;
-    justify-content: space-around;
-    align-items: center;
-    width: 100%;
-    height: 100%;
-    background-color: beige;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  width: 100%;
+  height: 100%;
+  background-color: beige;
 
-    video {
-        max-width: 100%;
-        max-height: 100%;
-    }
+  video {
+    max-width: 100%;
+    max-height: 100%;
+  }
 }
 </style>

src/views/videoCutter.vue

@@ -81,15 +81,15 @@ export default {
 <style scoped lang="scss">
 /* @import url(); 引入css类 */
 .video-cutter {
-    width: 100%;
-    height: 100%;
+  width: 100%;
+  height: 100%;
 }
 .video-content {
-    width: 100%;
-    height: 700px;
+  width: 100%;
+  height: 700px;
 }
 .video-btn {
-    display: flex;
-    justify-content: space-between;
+  display: flex;
+  justify-content: space-between;
 }
 </style>

vue.config.js

-/*
- * @Date: 2020-08-27 09:05:54
- * @LastEditors: OBKoro1
- * @LastEditTime: 2020-08-27 15:30:17
- * @FilePath: /vue.config.js
- * @Description: 描述
- * @Author: huacong
- * @
- */
 // console.log(`process.env1:`, process.env);
 console.log('process.env.NODE_ENV1:', process.env.NODE_ENV)
 
 module.exports = {
-    // outputDir: process.env.outputDir,
-    // assetsDir: 'static',
-    publicPath: '/',
-    devServer: {
-        open: true,
-        // host: '0.0.0.0',
-        port: 3018,
-        https: false,
-        hotOnly: false,
-        proxy: {
-            webapi: {
-                target: 'https://test2.laihua.com/',
-                ws: true,
-                changeOrigin: true,
-                pathRewrite: { '^/webapi': '/' }
-            }
-        }
-    },
-    chainWebpack: (config) => {
-        config.module
-            .rule('eslint')
-            .use('eslint-loader')
-            .loader('eslint-loader')
-            .tap((options) => {
-                // 保存自动eslint修复
-                options.fix = true
-                return options
-            })
-    },
-    css: {
-        loaderOptions: {
-            sass: {
-                prependData: '@import "@/assets/style/index.scss";'
-            }
-        }
+  // outputDir: process.env.outputDir,
+  // assetsDir: 'static',
+  publicPath: '/',
+  devServer: {
+    open: true,
+    // host: '0.0.0.0',
+    port: 3018,
+    https: false,
+    hotOnly: false,
+    proxy: {
+      webapi: {
+        target: 'https://test2.laihua.com/',
+        ws: true,
+        changeOrigin: true,
+        pathRewrite: { '^/webapi': '/' }
+      }
     }
+  },
+  chainWebpack: (config) => {
+    config.module
+      .rule('eslint')
+      .use('eslint-loader')
+      .loader('eslint-loader')
+      .tap((options) => {
+        // 保存自动eslint修复
+        options.fix = true
+        return options
+      })
+  },
+  css: {
+    loaderOptions: {
+      sass: {
+        prependData: '@import "@/assets/style/index.scss";'
+      }
+    }
+  }
 }