Commit fe62c357 authored by Davve's avatar Davve

Merge branch 'fix/watch_video_time' into dev

parents 7d605184 38d9e669
...@@ -91,3 +91,5 @@ dump.rdb ...@@ -91,3 +91,5 @@ dump.rdb
ascle/rpcd.json ascle/rpcd.json
.env .env
jmanage.py jmanage.py
sun/settings_local.py
...@@ -2,4 +2,3 @@ ...@@ -2,4 +2,3 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# __author__ = "chenwei" # __author__ = "chenwei"
# Date: 2018/11/15 # Date: 2018/11/15
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -657,9 +657,9 @@ ...@@ -657,9 +657,9 @@
let data = res.data let data = res.data
this.uploading = false this.uploading = false
let duration = data.format.duration let duration = data.format.duration
if (Math.round(duration) > 60) { if (Math.round(duration) > 1200) {
this.$message({ this.$message({
message: '视频时长不能大于1分钟', message: '视频时长不能大于20分钟',
type: 'warning' type: 'warning'
}) })
this.edit.video_url = '' this.edit.video_url = ''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment