Commit 4a692ed1 by 肖翔宇

12.20

parent cf8108c0
...@@ -4,7 +4,7 @@ const prodEnv = require('./prod.env') ...@@ -4,7 +4,7 @@ const prodEnv = require('./prod.env')
module.exports = merge(prodEnv, { module.exports = merge(prodEnv, {
NODE_ENV: '"development"', NODE_ENV: '"development"',
BASE_API: '"http://gxgqs.com/sharePiano"', BASE_API: '"http://192.168.10.106:9001/sharePiano"',
}) })
//http://gxgqs.com/sharePiano //http://gxgqs.com/sharePiano
//http://192.168.10.105:9001/sharePiano //http://192.168.10.105:9001/sharePiano
No preview for this file type
...@@ -5,7 +5,7 @@ import 'nprogress/nprogress.css'// Progress 进度条样式 ...@@ -5,7 +5,7 @@ import 'nprogress/nprogress.css'// Progress 进度条样式
import { Message } from 'element-ui' import { Message } from 'element-ui'
import { getToken } from '@/utils/auth' // 验权 import { getToken } from '@/utils/auth' // 验权
const whiteList = ['/login','/courseList','/courseEdit','/bargainList','/bargainEdit'] // 不重定向白名单 const whiteList = ['/login','/courseList','/courseEdit','/bargainList','/bargainEdit','/pianoList','/pianoEdit','/code'] // 不重定向白名单
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
NProgress.start() NProgress.start()
if (getToken()) { if (getToken()) {
......
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
</el-upload> </el-upload>
<el-alert <el-alert
show-icon show-icon
title="请保证视频格式正确,且不超过20M。视频格式如mp4、ogg、flv、avi、wmv、rmvb" title="请保证视频格式正确,且不超过200M。视频格式如mp4、ogg、flv、avi、wmv、rmvb"
type="info" type="info"
:closable="false" :closable="false"
> >
...@@ -314,13 +314,13 @@ ...@@ -314,13 +314,13 @@
this.types.courseName=undefined; this.types.courseName=undefined;
}, },
beforeUploadVideo(file) { beforeUploadVideo(file) {
const isLt10M = file.size / 1024 / 1024 < 20 const isLt10M = file.size / 1024 / 1024 < 200
if (['video/mp4', 'video/ogg', 'video/flv', 'video/avi', 'video/wmv', 'video/rmvb'].indexOf(file.type) === -1) { if (['video/mp4', 'video/ogg', 'video/flv', 'video/avi', 'video/wmv', 'video/rmvb'].indexOf(file.type) === -1) {
this.$message.error('请上传正确的视频格式') this.$message.error('请上传正确的视频格式')
return false return false
} }
if (!isLt10M) { if (!isLt10M) {
this.$message.error('上传视频大小不能超过20MB哦!') this.$message.error('上传视频大小不能超过200MB哦!')
return false return false
} }
}, },
......
...@@ -177,16 +177,18 @@ ...@@ -177,16 +177,18 @@
// 返回 // 返回
saveId(e){ saveId(e){
console.log(e); console.log(e);
var index=this.bannerType.indexOf(this.painoId); var index=this.temp.abc.indexOf(this.painoId);
this.bannerType.splice(index,1); this.bannerType.splice(index,1);
this.temp.sysCodeForPianoId.push(this.painoId); this.temp.sysCodeForPianoId.push(this.painoId);
this.painoId=0; this.painoId=0;
this.temp.abc=this.bannerType;
}, },
deleteId(id){ deleteId(id){
console.log(id); console.log(id);
var index=this.temp.sysCodeForPianoId.indexOf(id); var index=this.temp.sysCodeForPianoId.indexOf(id);
this.temp.sysCodeForPianoId.splice(index,1); this.temp.sysCodeForPianoId.splice(index,1);
this.bannerType.push(id) this.bannerType.push(id);
this.temp.abc=this.bannerType;
}, },
backList() { backList() {
this.$confirm('是否放弃当前编辑信息?', '提示', { this.$confirm('是否放弃当前编辑信息?', '提示', {
......
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 sign in to comment