Commit 5665d306 by hank

Merge branch 'develop' into test

parents adf3cf96 7ee23429
...@@ -25,8 +25,10 @@ ...@@ -25,8 +25,10 @@
"svg-sprite-loader": "^4.1.6", "svg-sprite-loader": "^4.1.6",
"uglifyjs-webpack-plugin": "^2.1.3", "uglifyjs-webpack-plugin": "^2.1.3",
"vant": "^2.0.0", "vant": "^2.0.0",
"vconsole": "^3.3.4",
"vue": "^2.6.10", "vue": "^2.6.10",
"vue-awesome-swiper": "^3.1.3", "vue-awesome-swiper": "^3.1.3",
"vue-cropper": "^0.4.9",
"vue-router": "^3.0.3", "vue-router": "^3.0.3",
"vuedraggable": "^2.23.0", "vuedraggable": "^2.23.0",
"vuex": "^3.0.1" "vuex": "^3.0.1"
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
<meta content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no" id="viewport" name="viewport"> <meta content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no" id="viewport" name="viewport">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<link rel="stylesheet" href="https://unpkg.com/vue2-animate/dist/vue2-animate.min.css"/> <link rel="stylesheet" href="https://unpkg.com/vue2-animate/dist/vue2-animate.min.css"/>
<script type="text/javascript" src="https://html2canvas.hertzen.com/dist/html2canvas.min.js"></script> <!-- <script type="text/javascript" src="https://html2canvas.hertzen.com/dist/html2canvas.min.js"></script> -->
<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script> <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
<title>Vmatrix</title> <title>编辑作品</title>
<script> <script>
window.jsbridge && window.jsbridge.init(); window.jsbridge && window.jsbridge.init();
......
...@@ -61,6 +61,7 @@ export default { ...@@ -61,6 +61,7 @@ export default {
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
text-align: center; text-align: center;
color: #2c3e50; color: #2c3e50;
min-height: 100%;
} }
#nav { #nav {
padding: 30px; padding: 30px;
...@@ -74,9 +75,13 @@ export default { ...@@ -74,9 +75,13 @@ export default {
} }
.child-view { .child-view {
transition: all 0.4s cubic-bezier(0.55, 0, 0.1, 1); transition: all 0.4s cubic-bezier(0.55, 0, 0.1, 1);
-webkit-overflow-scrolling: touch; // -webkit-overflow-scrolling: touch;
position: absolute; // position: absolute;
width: 100%; width: 100%;
min-height: 100vh;
}
html, body {
min-height: 100vh;
} }
.slide-left-enter, .slide-left-enter,
.slide-right-leave-active { .slide-right-leave-active {
......
...@@ -7,7 +7,7 @@ export function getTempalteList (page = 1, size = 10 ) { ...@@ -7,7 +7,7 @@ export function getTempalteList (page = 1, size = 10 ) {
}) })
} }
export function getTempalteFilmList (templateId, page = 1, size = 10 ) { export function getTempalteFilmList (templateId, page = 1, size = 10 ) {
// 获取模板下视片列表 // 获取模板下作品列表
return get(`/template/get/film/list/${templateId}`, { return get(`/template/get/film/list/${templateId}`, {
p: page, p: page,
c: size c: size
...@@ -57,7 +57,7 @@ export function createTempalte(data) { ...@@ -57,7 +57,7 @@ export function createTempalte(data) {
} }
export function createFilm(data) { export function createFilm(data) {
/** /**
* 添加视片 * 添加作品
* { * {
"clientId": "string", "clientId": "string",
"clientSecret": "string", "clientSecret": "string",
...@@ -71,24 +71,24 @@ export function createFilm(data) { ...@@ -71,24 +71,24 @@ export function createFilm(data) {
return post('/template/add/film', data) return post('/template/add/film', data)
} }
export function getFilmDetail(filmId) { export function getFilmDetail(filmId) {
// 获取视片详情 // 获取作品详情
return get(`/template/get/film/info/${filmId}`) return get(`/template/get/film/info/${filmId}`)
} }
export function getFilmList(page = 1, size = 10) { export function getFilmList(page = 1, size = 10) {
console.log(page,' page') console.log(page,' page')
// 获取所有视片 // 获取所有作品
return post(`/myfilm/get/list?p=${page}&c=${size}`, { return post(`/myfilm/get/list?p=${page}&c=${size}`, {
p: page, p: page,
c: size c: size
}) })
} }
export function getFilmDeviceIdList(filmId) { export function getFilmDeviceIdList(filmId) {
// 获取视片下使用的所有设备id // 获取作品下使用的所有设备id
return get(`/template/get/equipmentid/${filmId}`, { return get(`/template/get/equipmentid/${filmId}`, {
}) })
} }
export function getFilmDeviceList(filmId, page = 1, size = 10 ) { export function getFilmDeviceList(filmId, page = 1, size = 10 ) {
// 获取视片下使用的所有设备 // 获取作品下使用的所有设备
return get(`/template/get/equipment/list/${filmId}`, { return get(`/template/get/equipment/list/${filmId}`, {
p: page, p: page,
c: size c: size
...@@ -96,14 +96,14 @@ export function getFilmDeviceList(filmId, page = 1, size = 10 ) { ...@@ -96,14 +96,14 @@ export function getFilmDeviceList(filmId, page = 1, size = 10 ) {
} }
export function bindDeviceToFilm(equipmentId, filmId) { export function bindDeviceToFilm(equipmentId, filmId) {
// 根据设备标识以及视片id设置默认视片 // 根据设备标识以及作品id设置默认作品
return post(`/template/update/equipment/binding/filmid`, { return post(`/template/update/equipment/binding/filmid`, {
equipmentId, equipmentId,
filmId filmId
}) })
} }
export function setDeviceDefaltFilm(clientId = 'maxrocky',clientSecret = 'maxrocky', filmId) { export function setDeviceDefaltFilm(clientId = 'maxrocky',clientSecret = 'maxrocky', filmId) {
// 根据设备标识以及视片id设置默认视片 // 根据设备标识以及作品id设置默认作品
return post(`/myequipment/update/film/def/version`, { return post(`/myequipment/update/film/def/version`, {
clientId, clientId,
clientSecret, clientSecret,
...@@ -111,7 +111,7 @@ export function setDeviceDefaltFilm(clientId = 'maxrocky',clientSecret = 'maxroc ...@@ -111,7 +111,7 @@ export function setDeviceDefaltFilm(clientId = 'maxrocky',clientSecret = 'maxroc
}) })
} }
export function updateFilmInfo(filmId, filmData, filmName, filmDescribe) { export function updateFilmInfo(filmId, filmData, filmName, filmDescribe) {
// 更新视片信息 // 更新作品信息
return post('/template/update/film/info', { return post('/template/update/film/info', {
filmId, filmId,
filmData, filmData,
...@@ -120,7 +120,7 @@ export function updateFilmInfo(filmId, filmData, filmName, filmDescribe) { ...@@ -120,7 +120,7 @@ export function updateFilmInfo(filmId, filmData, filmName, filmDescribe) {
}) })
} }
export function updateBaseFilmInfo(filmId, filmName, filmDescribe) { export function updateBaseFilmInfo(filmId, filmName, filmDescribe) {
// 更新视片基本信息 // 更新作品基本信息
return post('/template/update/film/base/info', { return post('/template/update/film/base/info', {
filmId, filmId,
filmName, filmName,
...@@ -128,7 +128,7 @@ export function updateBaseFilmInfo(filmId, filmName, filmDescribe) { ...@@ -128,7 +128,7 @@ export function updateBaseFilmInfo(filmId, filmName, filmDescribe) {
}) })
} }
export function deleteFilm(filmId) { export function deleteFilm(filmId) {
// 删除视片 // 删除作品
return get(`/template/del/film/info/${filmId}`) return get(`/template/del/film/info/${filmId}`)
} }
......
...@@ -5,6 +5,14 @@ ...@@ -5,6 +5,14 @@
} }
.bgeee { .bgeee {
width: 100%; width: 100%;
background: #EEE; background: #eee;
height: 20px; height: 20px;
} }
\ No newline at end of file img {
-webkit-touch-callout: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
*{-webkit-touch-callout: none;}
\ No newline at end of file
...@@ -10,6 +10,9 @@ import '@/assets/app.scss' ...@@ -10,6 +10,9 @@ import '@/assets/app.scss'
Vue.config.productionTip = false Vue.config.productionTip = false
// import { Tabbar, TabbarItem } from 'vant'; // import { Tabbar, TabbarItem } from 'vant';
import Vant from 'vant'; import Vant from 'vant';
// import vconsole from 'vconsole'
// new vconsole()
console.log('hellow world')
Vue.use(Vant) Vue.use(Vant)
new Vue({ new Vue({
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</div> </div>
<div class="view-film"> <div class="view-film">
<div class="right-item-title"> <div class="right-item-title">
<span>正在播放的视片</span> <span>正在播放的作品</span>
<span>{{detail.filmName ? detail.filmName : '无'}}</span> <span>{{detail.filmName ? detail.filmName : '无'}}</span>
</div> </div>
......
<template> <template>
<div class="film-container"> <div class="film-container">
<div class="device-count"> <div class="device-count">
<div class="count">已创建视片: {{list.length}}</div> <div class="count">已创建作品: {{list.length}}</div>
</div> </div>
<van-pull-refresh v-model="isLoading" @refresh="onRefresh"> <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
<van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad"> <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="device-container"> <div class="device-container">
<!-- swipeable --> <!-- swipeable -->
<van-tabs v-model="active" sticky ellipsis color="#1989fa" @change="tabChange"> <van-tabs v-model="active" sticky ellipsis color="#1989fa" @change="tabChange">
<van-tab title="我的视片"> <van-tab title="我的作品">
<films></films> <films></films>
</van-tab> </van-tab>
<van-tab title="我的设备"> <van-tab title="我的设备">
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<van-tabbar-item :class="{ 'van-tabbar-item--active' : currentPath.includes('/device') }" replace :to="{ <van-tabbar-item :class="{ 'van-tabbar-item--active' : currentPath.includes('/device') }" replace :to="{
path: '/device', path: '/device',
exact: false exact: false
}" icon="setting-o">设备与视片</van-tabbar-item> }" icon="setting-o">设备与作品</van-tabbar-item>
<van-tabbar-item :class="{ 'van-tabbar-item--active' : currentPath.includes('/user') }" replace :to="{ <van-tabbar-item :class="{ 'van-tabbar-item--active' : currentPath.includes('/user') }" replace :to="{
path: '/user', path: '/user',
exact: false exact: false
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</div> </div>
<div class="bgeee"></div> <div class="bgeee"></div>
<div class="myfilms"> <div class="myfilms">
<div class="title">我的视片 ({{list.length}})</div> <div class="title">我的作品 ({{list.length}})</div>
<van-list v-model="loading" :finished="finished" finished-text @load="onLoad"> <van-list v-model="loading" :finished="finished" finished-text @load="onLoad">
<div class="film-list"> <div class="film-list">
<div class="film-item" @click="goFilm(item)" v-for="(item,index) in list" :key="index"> <div class="film-item" @click="goFilm(item)" v-for="(item,index) in list" :key="index">
...@@ -37,17 +37,17 @@ ...@@ -37,17 +37,17 @@
</van-list> </van-list>
</div> </div>
</div> </div>
<van-button type="info" class="createBtn" size="large" @click="showInput">创建视片</van-button> <van-button type="info" class="createBtn" size="large" @click="showInput">创建作品</van-button>
<van-dialog :before-close="beforeClose" v-model="show" title="视片信息" show-cancel-button> <van-dialog :before-close="beforeClose" v-model="show" title="作品信息" show-cancel-button>
<div class="tips"> <div class="tips">
*视片名称: *作品名称:
</div> </div>
<input placeholder="请输入视片名称" v-model="templateData.filmName" class="film-name" type="text" /> <input placeholder="请输入作品名称" v-model="templateData.filmName" class="film-name" type="text" />
<br /> <br />
<div class="tips"> <div class="tips">
视片描述: 作品描述:
</div> </div>
<input placeholder="请输入视片描述" v-model="templateData.filmDescribe" class="film-name" type="text" /> <input placeholder="请输入作品描述" v-model="templateData.filmDescribe" class="film-name" type="text" />
</van-dialog> </van-dialog>
</div> </div>
</template> </template>
...@@ -151,7 +151,7 @@ export default { ...@@ -151,7 +151,7 @@ export default {
console.log(action); console.log(action);
if (action === "confirm") { if (action === "confirm") {
if (!this.templateData.filmName) { if (!this.templateData.filmName) {
this.$toast("请输入视片名称"); this.$toast("请输入作品名称");
done(false); done(false);
} else { } else {
createFilm({ createFilm({
...@@ -166,13 +166,13 @@ export default { ...@@ -166,13 +166,13 @@ export default {
}).then(res => { }).then(res => {
done(); done();
this.$toast.success("添加成功"); this.$toast.success("添加成功");
console.log(res, "创建视片成功"); console.log(res, "创建作品成功");
this.show = false; this.show = false;
this.goFilm({ this.goFilm({
filmId: res.data.data filmId: res.data.data
}) })
// updateFilmInfo(res.data.filmId, "数据").then(res => { // updateFilmInfo(res.data.filmId, "数据").then(res => {
// console.log(res, "更新视片成功"); // console.log(res, "更新作品成功");
// this.$router.back(); // this.$router.back();
// }); // });
// this.$router.back(); // this.$router.back();
......
...@@ -249,7 +249,7 @@ export default { ...@@ -249,7 +249,7 @@ export default {
}, },
getFilmDetail() { getFilmDetail() {
getFilmDetail(this.$route.query.filmId).then(res => { getFilmDetail(this.$route.query.filmId).then(res => {
console.log(res.data, "视片详情"); console.log(res.data, "作品详情");
this.templateData.filmId = res.data.filmId; this.templateData.filmId = res.data.filmId;
this.name = res.data.filmName; this.name = res.data.filmName;
this.templateData.resourceUrl = res.data.resourceUrl; this.templateData.resourceUrl = res.data.resourceUrl;
...@@ -272,7 +272,7 @@ export default { ...@@ -272,7 +272,7 @@ export default {
).then(res => { ).then(res => {
this.show = false; this.show = false;
this.$toast.success("发布成功"); this.$toast.success("发布成功");
console.log(res, "更新视片成功"); console.log(res, "更新作品成功");
this.$router.back(); this.$router.back();
}); });
} }
...@@ -287,10 +287,10 @@ export default { ...@@ -287,10 +287,10 @@ export default {
filmName: this.name filmName: this.name
}).then(res => { }).then(res => {
this.$toast.success("发布成功"); this.$toast.success("发布成功");
console.log(res, "创建视片成功"); console.log(res, "创建作品成功");
this.show = false; this.show = false;
// updateFilmInfo(res.data.filmId, "数据").then(res => { // updateFilmInfo(res.data.filmId, "数据").then(res => {
// console.log(res, "更新视片成功"); // console.log(res, "更新作品成功");
// this.$router.back(); // this.$router.back();
// }); // });
this.$router.back(); this.$router.back();
......
...@@ -57,16 +57,16 @@ ...@@ -57,16 +57,16 @@
</div>--> </div>-->
</div> </div>
<div class="createBtn"> <div class="createBtn">
<van-button type="info" style="width:45%" @click="goEdit">修改视片</van-button> <van-button type="info" style="width:45%" @click="goEdit">修改作品</van-button>
<van-button type="info" @click="goDevices" style="width:45%">更新绑定设备</van-button> <van-button type="info" @click="goDevices" style="width:45%">更新绑定设备</van-button>
</div> </div>
<van-dialog :before-close="beforeClose" v-model="show" title="视片信息" show-cancel-button> <van-dialog :before-close="beforeClose" v-model="show" title="作品信息" show-cancel-button>
<div class="tips">*视片名称:</div> <div class="tips">*作品名称:</div>
<input placeholder="请输入视片名称" v-model="templateData.filmName" class="film-name" type="text" /> <input placeholder="请输入作品名称" v-model="templateData.filmName" class="film-name" type="text" />
<br /> <br />
<div class="tips">视片描述:</div> <div class="tips">作品描述:</div>
<input <input
placeholder="请输入视片描述" placeholder="请输入作品描述"
v-model="templateData.filmDescribe" v-model="templateData.filmDescribe"
class="film-name" class="film-name"
type="text" type="text"
...@@ -87,7 +87,7 @@ export default { ...@@ -87,7 +87,7 @@ export default {
data() { data() {
return { return {
show: false, show: false,
title: "视片详情", title: "作品详情",
current: 0, current: 0,
page: 1, page: 1,
list: [], list: [],
...@@ -130,7 +130,7 @@ export default { ...@@ -130,7 +130,7 @@ export default {
} }
}, },
mounted() { mounted() {
document.title = "视片详情"; document.title = "作品详情";
window.addEventListener("popstate", () => { window.addEventListener("popstate", () => {
window.wx.miniProgram.navigateBack(); window.wx.miniProgram.navigateBack();
console.log('wx.miniProgram.navigateBack()') console.log('wx.miniProgram.navigateBack()')
...@@ -153,7 +153,7 @@ export default { ...@@ -153,7 +153,7 @@ export default {
}, },
getFilmDetail() { getFilmDetail() {
getFilmDetail(this.$route.query.filmId).then(res => { getFilmDetail(this.$route.query.filmId).then(res => {
console.log(res.data, "视片详情"); console.log(res.data, "作品详情");
this.templateData.filmId = res.data.filmId; this.templateData.filmId = res.data.filmId;
this.templateData.templateUrl = res.data.templateUrl.split(","); this.templateData.templateUrl = res.data.templateUrl.split(",");
this.templateData.filmName = res.data.filmName; this.templateData.filmName = res.data.filmName;
...@@ -182,7 +182,7 @@ export default { ...@@ -182,7 +182,7 @@ export default {
console.log(action); console.log(action);
if (action === "confirm") { if (action === "confirm") {
if (!this.templateData.filmName) { if (!this.templateData.filmName) {
this.$toast("请输入视片名称"); this.$toast("请输入作品名称");
done(false); done(false);
} else { } else {
updateBaseFilmInfo( updateBaseFilmInfo(
...@@ -194,7 +194,7 @@ export default { ...@@ -194,7 +194,7 @@ export default {
this.$toast.success("更新成功"); this.$toast.success("更新成功");
this.show = false; this.show = false;
// updateFilmInfo(res.data.filmId, "数据").then(res => { // updateFilmInfo(res.data.filmId, "数据").then(res => {
// console.log(res, "更新视片成功"); // console.log(res, "更新作品成功");
// this.$router.back(); // this.$router.back();
// }); // });
// this.$router.back(); // this.$router.back();
......
<template> <template>
<div class="edit-container"> <div class="edit-container">
<NavBar title="视片设备列表" v-if="!is_mini_token" left-arrow></NavBar> <NavBar title="作品设备列表" v-if="!is_mini_token" left-arrow></NavBar>
<div class="content"> <div class="content">
<div class="myfilms"> <div class="myfilms">
<div class="title"> <div class="title">
...@@ -135,7 +135,7 @@ export default { ...@@ -135,7 +135,7 @@ export default {
} }
}, },
mounted() { mounted() {
document.title = "视片设备列表"; document.title = "作品设备列表";
}, },
methods: { methods: {
getScheduleDetail() { getScheduleDetail() {
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="content-left"> <div class="content-left">
<iframe <iframe
@load="getData" @load="getData"
class="iframe" class="iframe preview-iframe"
v-show="loaded" v-show="loaded"
scrolling="no" scrolling="no"
:src="templateData.frameUrl+'?isPreview=1'" :src="templateData.frameUrl+'?isPreview=1'"
...@@ -62,7 +62,7 @@ export default { ...@@ -62,7 +62,7 @@ export default {
}, },
methods: { methods: {
message(data) { message(data) {
window.frames[1].postMessage(data, "https://visual-clouds.bdideal.com"); window.frames[2].postMessage(data, "https://visual-clouds.bdideal.com");
// window.frames[1].postMessage(data, "https://localhost:8082"); // window.frames[1].postMessage(data, "https://localhost:8082");
}, },
getData() { getData() {
......
<template> <template>
<div> <div>
<NavBar title="我的视片" left-arrow></NavBar> <NavBar title="我的作品" left-arrow></NavBar>
<film></film> <film></film>
</div> </div>
</template> </template>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<!-- <div class="user-name"></div> --> <!-- <div class="user-name"></div> -->
</div> </div>
<div class="eee-bg"></div> <div class="eee-bg"></div>
<van-cell title="我的视片" icon="shop-o" is-link :to="{ <van-cell title="我的作品" icon="shop-o" is-link :to="{
path: '/user/films' path: '/user/films'
}"></van-cell> }"></van-cell>
<van-cell title="我的设备" icon="shop-o" is-link :to="{ <van-cell title="我的设备" icon="shop-o" is-link :to="{
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<van-tabbar-item :class="{ 'van-tabbar-item--active' : currentPath.includes('/device') }" replace :to="{ <van-tabbar-item :class="{ 'van-tabbar-item--active' : currentPath.includes('/device') }" replace :to="{
path: '/device', path: '/device',
exact: false exact: false
}" icon="setting-o">设备与视片</van-tabbar-item> }" icon="setting-o">设备与作品</van-tabbar-item>
<van-tabbar-item :class="{ 'van-tabbar-item--active' : currentPath.includes('/user') }" replace :to="{ <van-tabbar-item :class="{ 'van-tabbar-item--active' : currentPath.includes('/user') }" replace :to="{
path: '/user', path: '/user',
exact: false exact: false
......
...@@ -83,7 +83,7 @@ export default { ...@@ -83,7 +83,7 @@ export default {
}, },
getFilmDetail() { getFilmDetail() {
getFilmDetail(this.$route.query.filmId).then(res => { getFilmDetail(this.$route.query.filmId).then(res => {
console.log(res.data, "视片详情"); console.log(res.data, "作品详情");
this.templateData.filmId = res.data.filmId; this.templateData.filmId = res.data.filmId;
this.name = res.data.filmName this.name = res.data.filmName
this.templateData.resourceUrl = res.data.resourceUrl; this.templateData.resourceUrl = res.data.resourceUrl;
...@@ -99,7 +99,7 @@ export default { ...@@ -99,7 +99,7 @@ export default {
JSON.stringify(this.templateData.listData) JSON.stringify(this.templateData.listData)
).then(res => { ).then(res => {
this.show = false; this.show = false;
console.log(res, "更新视片成功"); console.log(res, "更新作品成功");
this.$router.back(); this.$router.back();
}); });
} }
...@@ -115,10 +115,10 @@ export default { ...@@ -115,10 +115,10 @@ export default {
filmName: '' filmName: ''
}).then(res => { }).then(res => {
this.$toast.success('添加成功'); this.$toast.success('添加成功');
console.log(res, "创建视片成功"); console.log(res, "创建作品成功");
this.show = false; this.show = false;
// updateFilmInfo(res.data.filmId, "数据").then(res => { // updateFilmInfo(res.data.filmId, "数据").then(res => {
// console.log(res, "更新视片成功"); // console.log(res, "更新作品成功");
// this.$router.back(); // this.$router.back();
// }); // });
// this.$router.back(); // this.$router.back();
......
...@@ -249,7 +249,7 @@ export default { ...@@ -249,7 +249,7 @@ export default {
}, },
getFilmDetail() { getFilmDetail() {
getFilmDetail(this.$route.query.filmId).then(res => { getFilmDetail(this.$route.query.filmId).then(res => {
console.log(res.data, "视片详情"); console.log(res.data, "作品详情");
this.templateData.filmId = res.data.filmId; this.templateData.filmId = res.data.filmId;
this.name = res.data.filmName; this.name = res.data.filmName;
this.templateData.resourceUrl = res.data.resourceUrl; this.templateData.resourceUrl = res.data.resourceUrl;
...@@ -272,7 +272,7 @@ export default { ...@@ -272,7 +272,7 @@ export default {
).then(res => { ).then(res => {
this.show = false; this.show = false;
this.$toast.success("发布成功"); this.$toast.success("发布成功");
console.log(res, "更新视片成功"); console.log(res, "更新作品成功");
this.$router.back(); this.$router.back();
}); });
} }
...@@ -287,10 +287,10 @@ export default { ...@@ -287,10 +287,10 @@ export default {
filmName: this.name filmName: this.name
}).then(res => { }).then(res => {
this.$toast.success("发布成功"); this.$toast.success("发布成功");
console.log(res, "创建视片成功"); console.log(res, "创建作品成功");
this.show = false; this.show = false;
// updateFilmInfo(res.data.filmId, "数据").then(res => { // updateFilmInfo(res.data.filmId, "数据").then(res => {
// console.log(res, "更新视片成功"); // console.log(res, "更新作品成功");
// this.$router.back(); // this.$router.back();
// }); // });
this.$router.back(); this.$router.back();
......
...@@ -384,7 +384,7 @@ export default { ...@@ -384,7 +384,7 @@ export default {
}, },
getFilmDetail() { getFilmDetail() {
getFilmDetail(this.$route.query.filmId).then(res => { getFilmDetail(this.$route.query.filmId).then(res => {
console.log(res.data, "视片详情"); console.log(res.data, "作品详情");
this.templateData.filmId = res.data.filmId; this.templateData.filmId = res.data.filmId;
this.name = res.data.filmName; this.name = res.data.filmName;
this.templateData.resourceUrl = res.data.resourceUrl; this.templateData.resourceUrl = res.data.resourceUrl;
...@@ -407,7 +407,7 @@ export default { ...@@ -407,7 +407,7 @@ export default {
).then(res => { ).then(res => {
this.show = false; this.show = false;
this.$toast.success("发布成功"); this.$toast.success("发布成功");
console.log(res, "更新视片成功"); console.log(res, "更新作品成功");
this.$router.back(); this.$router.back();
}); });
} }
...@@ -422,10 +422,10 @@ export default { ...@@ -422,10 +422,10 @@ export default {
filmName: this.name filmName: this.name
}).then(res => { }).then(res => {
this.$toast.success("发布成功"); this.$toast.success("发布成功");
console.log(res, "创建视片成功"); console.log(res, "创建作品成功");
this.show = false; this.show = false;
// updateFilmInfo(res.data.filmId, "数据").then(res => { // updateFilmInfo(res.data.filmId, "数据").then(res => {
// console.log(res, "更新视片成功"); // console.log(res, "更新作品成功");
// this.$router.back(); // this.$router.back();
// }); // });
this.$router.back(); this.$router.back();
......
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