Merge branch 'fix/watch_video_time' into dev

.gitignore

@@ -91,3 +91,5 @@ dump.rdb
 ascle/rpcd.json
 .env
 jmanage.py
+
+sun/settings_local.py

sun/settings_local.py → sun/settings_local.py.bak

@@ -2,4 +2,3 @@
 # -*- coding: utf-8 -*-
 # __author__ = "chenwei"
 # Date: 2018/11/15
-

vu/src/views/topic/components/TopicDetail.vue

@@ -657,9 +657,9 @@
               let data = res.data
               this.uploading = false
               let duration = data.format.duration
-              if (Math.round(duration) > 60) {
+              if (Math.round(duration) > 1200) {
                 this.$message({
-                  message: '视频时长不能大于1分钟',
+                  message: '视频时长不能大于20分钟',
                   type: 'warning'
                 })
                 this.edit.video_url = ''