Merge branch 'fix/watch_video_time' into dev

fe62c357 · Davve · 7d605184 · 38d9e669 · fe62c357 · fe62c357
Commit fe62c357 authored Dec 17, 2018 by Davve
13 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -91,3 +91,5 @@ dump.rdb
 ascle/rpcd.json
 .env
 jmanage.py
+
+sun/settings_local.py
--- a/sun/settings_local.py
+++ b/sun/settings_local.py
@@ -2,4 +2,3 @@
 # -*- coding: utf-8 -*-
 # __author__ = "chenwei"
 # Date: 2018/11/15
-
--- a/vu/dist/index.html
+++ b/vu/dist/index.html
--- a/vu/dist/static/css/chunk-8eb6.fa66c487.css
+++ b/vu/dist/static/css/chunk-8eb6.fa66c487.css
--- a/vu/dist/static/css/chunk-elementUI.8441406c.css
+++ b/vu/dist/static/css/chunk-elementUI.8441406c.css
--- a/vu/dist/static/css/chunk-elementUI.e8091cad.css
+++ b/vu/dist/static/css/chunk-elementUI.e8091cad.css
--- a/vu/dist/static/js/app.da4aa0e1.js
+++ b/vu/dist/static/js/app.da4aa0e1.js
--- a/vu/dist/static/js/chunk-6603.0e9a1526.js
+++ b/vu/dist/static/js/chunk-6603.0e9a1526.js
--- a/vu/dist/static/js/chunk-8eb6.8bff3d32.js
+++ b/vu/dist/static/js/chunk-8eb6.8bff3d32.js
--- a/vu/dist/static/js/chunk-elementUI.9e82bb46.js
+++ b/vu/dist/static/js/chunk-elementUI.9e82bb46.js
--- a/vu/dist/static/js/chunk-elementUI.befe8ef9.js
+++ b/vu/dist/static/js/chunk-elementUI.befe8ef9.js
--- a/vu/dist/static/js/chunk-libs.06d36ade.js
+++ b/vu/dist/static/js/chunk-libs.06d36ade.js
--- a/vu/src/views/topic/components/TopicDetail.vue
+++ b/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 = ''