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

aaf2c4cd · Jeff · 353734e8 · bf8c6248 · aaf2c4cd · aaf2c4cd
Commit aaf2c4cd authored Aug 27, 2020 by Jeff
6 changed files
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
--- a/src/components/videoCutter/videoChange.vue
+++ b/src/components/videoCutter/videoChange.vue
--- a/src/components/videoCutter/videoControl.vue
+++ b/src/components/videoCutter/videoControl.vue
--- a/src/components/videoCutter/videoPlayer.vue
+++ b/src/components/videoCutter/videoPlayer.vue
--- a/src/views/videoCutter.vue
+++ b/src/views/videoCutter.vue
--- a/vue.config.js
+++ b/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)