Commit 413afeb1 by hank

https

parent bf234785
NODE_ENV='development'
VUE_APP_BASE_API='http://server.bdideal.com'
\ No newline at end of file
VUE_APP_BASE_API='https://server.bdideal.com'
\ No newline at end of file
NODE_ENV='production'
VUE_APP_BASE_API='http://server.bdideal.com'
\ No newline at end of file
VUE_APP_BASE_API='//server.bdideal.com'
\ No newline at end of file
......@@ -7,7 +7,7 @@
<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="stylesheet" href="https://unpkg.com/vue2-animate/dist/vue2-animate.min.css"/>
<script type="text/javascript" src="http://html2canvas.hertzen.com/dist/html2canvas.min.js"></script>
<script type="text/javascript" src="https://html2canvas.hertzen.com/dist/html2canvas.min.js"></script>
<title>Vmatrix</title>
<script>
window.jsbridge && window.jsbridge.init()
......
......@@ -15,7 +15,7 @@
<style>
@font-face {
font-family: Pingfang;
src: url('http://visual-clouds.bdideal.com/html/156170435921582b04ee33fce4589808130a0b0d0e8e1.ttf'), url('http://visual-clouds.bdideal.com/html/156170435921582b04ee33fce4589808130a0b0d0e8e1.ttf');
src: url('https://visual-clouds.bdideal.com/html/156170435921582b04ee33fce4589808130a0b0d0e8e1.ttf'), url('https://visual-clouds.bdideal.com/html/156170435921582b04ee33fce4589808130a0b0d0e8e1.ttf');
}
.delay100 {
animation-delay: 100ms;
......@@ -318,8 +318,8 @@
return theRequest;
}
}
// http://visual-clouds.bdideal.com/html/156050648981560a2f35feda34d66afe6765526670da2.html
// http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg
// https://visual-clouds.bdideal.com/html/156050648981560a2f35feda34d66afe6765526670da2.html
// https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg
window.myApp = new Vue({
el: "#myApp",
computed() {
......@@ -393,7 +393,7 @@
if(!this.isEditMode) {
this.timer2 = setInterval(() => {
if (getQuery('filmId')) {
$.get('http://39.105.231.218:8090/myequipment/get/film/info/' + getQuery('filmId'), function (result) {
$.get('https://39.105.231.218:8090/myequipment/get/film/info/' + getQuery('filmId'), function (result) {
console.log(result)
_this.list = JSON.parse(result.filmData)
_this.filmId = result.filmId
......@@ -446,7 +446,7 @@
this.isEditMode = false
}
if (getQuery('filmId')) {
$.get('http://39.105.231.218:8090/myequipment/get/film/info/' + getQuery('filmId'), function (result) {
$.get('https://39.105.231.218:8090/myequipment/get/film/info/' + getQuery('filmId'), function (result) {
console.log(result)
vm.list = JSON.parse(result.filmData)
vm.filmId = result.filmId
......@@ -457,7 +457,7 @@
} else {
vm.getDefaulted()
$.get("http://visual-clouds.bdideal.com/html/15613603741264cbf7bca249642b599701590785ff808.txt", function (result) {
$.get("https://visual-clouds.bdideal.com/html/15613603741264cbf7bca249642b599701590785ff808.txt", function (result) {
// console.log(result)
console.log('模板数据加载成功')
vm.list = JSON.parse(result)
......
......@@ -17,7 +17,7 @@
<style>
@font-face {
font-family: Pingfang;
src: url('http://visual-clouds.bdideal.com/html/156170435921582b04ee33fce4589808130a0b0d0e8e1.ttf'), url('http://visual-clouds.bdideal.com/html/156170435921582b04ee33fce4589808130a0b0d0e8e1.ttf');
src: url('https://visual-clouds.bdideal.com/html/156170435921582b04ee33fce4589808130a0b0d0e8e1.ttf'), url('https://visual-clouds.bdideal.com/html/156170435921582b04ee33fce4589808130a0b0d0e8e1.ttf');
}
.delay100 {
......@@ -333,8 +333,8 @@
return theRequest;
}
}
// http://visual-clouds.bdideal.com/html/156050648981560a2f35feda34d66afe6765526670da2.html
// http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg
// https://visual-clouds.bdideal.com/html/156050648981560a2f35feda34d66afe6765526670da2.html
// https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg
window.myApp = new Vue({
el: "#myApp",
computed() {
......@@ -408,7 +408,7 @@
if (!this.isEditMode) {
this.timer2 = setInterval(() => {
if (getQuery('filmId')) {
$.get('http://39.105.231.218:8090/myequipment/get/film/info/' + getQuery('filmId'), function (result) {
$.get('https://39.105.231.218:8090/myequipment/get/film/info/' + getQuery('filmId'), function (result) {
console.log(result)
_this.list = JSON.parse(result.filmData)
_this.filmId = result.filmId
......@@ -461,7 +461,7 @@
this.isEditMode = false
}
if (getQuery('filmId')) {
$.get('http://39.105.231.218:8090/myequipment/get/film/info/' + getQuery('filmId'), function (result) {
$.get('https://39.105.231.218:8090/myequipment/get/film/info/' + getQuery('filmId'), function (result) {
console.log(result)
vm.list = JSON.parse(result.filmData)
vm.filmId = result.filmId
......@@ -472,7 +472,7 @@
} else {
vm.getDefaulted()
$.get("http://visual-clouds.bdideal.com/html/15613603741264cbf7bca249642b599701590785ff808.txt", function (result) {
$.get("https://visual-clouds.bdideal.com/html/15613603741264cbf7bca249642b599701590785ff808.txt", function (result) {
// console.log(result)
console.log('模板数据加载成功')
vm.list = JSON.parse(result)
......
......@@ -124,6 +124,9 @@ export function upload(file) {
// 上传文件
let formData = new FormData()
formData.append('resource', file)
console.log(formData.get('resource').size)
alert(formData.get('resource').size)
return post(`/common/upload/resource`,formData, {
'Content-Type': 'multipart/form-data'
} )
......
......@@ -29,7 +29,7 @@ export default {
templateData: {
height: 450,
width: 800,
originUrl: "http://localhost:9000/template.html",
originUrl: "https://localhost:9000/template.html",
listData: []
},
editObj: {},
......@@ -57,12 +57,12 @@ export default {
mounted() {
window.onload = function() {
console.log(window.frames[0])
window.frames[0].postMessage("getcolor", "http://localhost:9000");
window.frames[0].postMessage("getcolor", "https://localhost:9000");
}
},
methods: {
message(data) {
window.frames[0].postMessage(data, "http://localhost:9000")
window.frames[0].postMessage(data, "https://localhost:9000")
},
valueChange() {
this.message({
......
import axios from 'axios'
import axios from "axios";
// import store from '../store'
import {
getToken,
removeToken
} from '@/utils/auth'
import { getToken, removeToken } from "@/utils/auth";
// 创建axios实例
// console.log(process.env)
const service = axios.create({
baseURL: process.env.VUE_APP_BASE_API, // api 的 base_url
timeout: 10 * 1000, // 请求超时时间, 10秒
timeout: 30 * 1000, // 请求超时时间, 30秒
withCredentials: true
})
});
// request拦截器
service.interceptors.request.use(
config => {
if (getToken()) {
config.headers['visualToken'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
config.headers["visualToken"] = getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
}
return config
return config;
},
error => {
// Do something with request error
return Promise.reject(error)
return Promise.reject(error);
}
)
);
// response 拦截器
service.interceptors.response.use(
response => {
return response
return response;
},
/**
* 下面的注释为通过response自定义code来标示请求状态,当code返回如下情况为权限有问题,登出并返回到登录页
......@@ -62,81 +59,80 @@ service.interceptors.response.use(
// return response.data;
// }
err => {
// console.dir(err);
if (err && err.response) {
switch (err.response.status) {
case 400:
err.message = `${err.response.data.message}`
break
err.message = `${err.response.data.message}`;
break;
case 401:
//重新登录
removeToken();
err.message = `${err.response.data.message}`
break
err.message = `${err.response.data.message}`;
break;
case 403: //没有权限
err.message = `${err.response.data.message}`
break
err.message = `${err.response.data.message}`;
break;
case 404:
if (err.response.data.message) {
err.message = `${err.response.data.message},请检查!`;
} else {
err.message = `请求地址出错: ${err.response.config.url}`
err.message = `请求地址出错: ${err.response.config.url}`;
}
break
break;
case 405:
err.message = `方法错误: ${err.response.data.message}`
break
err.message = `方法错误: ${err.response.data.message}`;
break;
case 406: //请求格式错误
err.message = '请求超时'
break
err.message = "请求超时";
break;
case 408:
err.message = '请求超时'
break
err.message = "请求超时";
break;
case 410:
//用户请求的资源被永久删除,且不会再得到的
err.message = '请求超时'
break
err.message = "请求超时";
break;
case 422:
//当创建一个对象时,发生一个验证错误。
err.message = '请求超时'
break
err.message = "请求超时";
break;
case 500:
err.message = `${err.response.data.message}`
break
err.message = `${err.response.data.message}`;
break;
case 501:
err.message = '服务未实现'
break
err.message = "服务未实现";
break;
case 502:
err.message = '网关错误'
break
err.message = "网关错误";
break;
case 503:
err.message = '服务不可用'
break
err.message = "服务不可用";
break;
case 504:
err.message = '网关超时'
break
err.message = "网关超时";
break;
case 505:
err.message = 'HTTP版本不受支持'
break
err.message = "HTTP版本不受支持";
break;
}
}
// console.log(err.message)
return Promise.reject(err.response)
return Promise.reject(err.response);
}
)
export default service
);
export default service;
......@@ -53,12 +53,12 @@ export default {
{
deviceName: "Maxrocky",
templateUrl:
"http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg"
"https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg"
},
{
deviceName: "MaxrockyB",
templateUrl:
"http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg"
"https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg"
}
]
};
......
......@@ -59,15 +59,15 @@ export default {
return {
activeIndex: 0,
list: [
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
]
};
},
......
......@@ -79,7 +79,7 @@ export default {
templateName: "企业文化",
templateDes: "该模板可用于展示企业文化,包括企业简介,照片墙等",
frameUrl:
"http://visual-clouds.bdideal.com/html/156050648981560a2f35feda34d66afe6765526670da2.html",
"https://visual-clouds.bdideal.com/html/156050648981560a2f35feda34d66afe6765526670da2.html",
listData: []
}
};
......
......@@ -33,7 +33,7 @@
frameborder="0"
></iframe>
<!--
:src="'http://127.0.0.1:9000/template.html' + '?isEdit=1&filmId='+templateData.filmId + '&now=' + date"
:src="'https://127.0.0.1:9000/template.html' + '?isEdit=1&filmId='+templateData.filmId + '&now=' + date"
:src="templateData.frameUrl+'?isEdit=1&filmId='+templateData.filmId + '&now=' + date" -->
</div>
<div class="content-right">
......@@ -193,14 +193,14 @@ export default {
console.log(window.frames[0]);
window.frames[0].postMessage(
"getcolor",
"http://visual-clouds.bdideal.com"
"https://visual-clouds.bdideal.com"
);
};
},
methods: {
message(data) {
window.frames[0].postMessage(data, "http://visual-clouds.bdideal.com");
// window.frames[0].postMessage(data, "http://127.0.0.1:9000");
window.frames[0].postMessage(data, "https://visual-clouds.bdideal.com");
// window.frames[0].postMessage(data, "https://127.0.0.1:9000");
},
valueChange() {
this.message({
......@@ -237,7 +237,7 @@ export default {
this.templateData.resourceUrl = res.data.resourceUrl;
this.templateData.resourceId = res.data.resourceId;
this.templateData.frameUrl = res.data.frameUrl;
// this.templateData.frameUrl = 'http://127.0.0.1:9000/template.html';
// this.templateData.frameUrl = 'https://127.0.0.1:9000/template.html';
console.log("模板详情");
axios.get(res.data.resourceUrl).then(res => {
this.templateData.listData = res.data;
......
......@@ -96,7 +96,7 @@ export default {
this.$emit("setList", this.schemaData);
},
uploadItem(key) {
alert(key);
// alert(key);
this.dataKey = key;
},
isSchemaIndex(item) {
......@@ -120,16 +120,14 @@ export default {
console.log(item);
},
uploadAfter(file) {
// console.log(file, upload);
upload(file.file)
.then(res => {
console.log(res.data);
console.log(this.dataKey);
this.schemaData[this.dataKey].value = res.data.data;
this.valueChange2();
})
.catch(e => {
console.log(e);
alert(JSON.stringify(e))
this.$toast("上传失败");
});
},
......
......@@ -39,7 +39,7 @@
frameborder="0"
></iframe>
<!--
:src="'http://127.0.0.1:9000/template.html' + '?isEdit=1&filmId='+templateData.filmId + '&now=' + date"
:src="'https://127.0.0.1:9000/template.html' + '?isEdit=1&filmId='+templateData.filmId + '&now=' + date"
:src="templateData.frameUrl+'?isEdit=1&filmId='+templateData.filmId + '&now=' + date"-->
</div>
<div class="content-menu">
......@@ -320,8 +320,8 @@ export default {
mounted() {},
methods: {
message(data) {
window.frames[0].postMessage(data, "http://visual-clouds.bdideal.com");
// window.frames[0].postMessage(data, "http://localhost:8082");
window.frames[0].postMessage(data, "https://visual-clouds.bdideal.com");
// window.frames[0].postMessage(data, "https://localhost:8082");
},
htmltoImg() {
window
......
......@@ -73,7 +73,7 @@ export default {
templateName: "企业文化",
filmDescribe: "该模板可用于展示企业文化,包括企业简介,照片墙等",
frameUrl:
"http://visual-clouds.bdideal.com/html/156050648981560a2f35feda34d66afe6765526670da2.html",
"https://visual-clouds.bdideal.com/html/156050648981560a2f35feda34d66afe6765526670da2.html",
listData: []
}
};
......
......@@ -30,7 +30,7 @@ export default {
frameId: "string",
filmId: "",
frameUrl:
"http://visual-clouds.bdideal.com/html/156050648981560a2f35feda34d66afe6765526670da2.html",
"https://visual-clouds.bdideal.com/html/156050648981560a2f35feda34d66afe6765526670da2.html",
listData: []
},
editObj: {},
......@@ -62,8 +62,8 @@ export default {
},
methods: {
message(data) {
window.frames[1].postMessage(data, "http://visual-clouds.bdideal.com");
// window.frames[1].postMessage(data, "http://localhost:8082");
window.frames[1].postMessage(data, "https://visual-clouds.bdideal.com");
// window.frames[1].postMessage(data, "https://localhost:8082");
},
getData() {
this.loaded = true
......
......@@ -45,12 +45,12 @@ export default {
{
templateName: "1",
templateUrl:
"http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg"
"https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg"
},
{
templateName: "1",
templateUrl:
"http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg"
"https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg"
}
]
};
......
......@@ -53,12 +53,12 @@ export default {
{
deviceName: "Maxrocky",
templateUrl:
"http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg"
"https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg"
},
{
deviceName: "MaxrockyB",
templateUrl:
"http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg"
"https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg"
}
]
};
......
......@@ -59,15 +59,15 @@ export default {
return {
activeIndex: 0,
list: [
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
]
};
},
......
......@@ -49,7 +49,7 @@ export default {
filmId: "",
templateUrl: '',
frameUrl:
"http://visual-clouds.bdideal.com/html/156050648981560a2f35feda34d66afe6765526670da2.html",
"https://visual-clouds.bdideal.com/html/156050648981560a2f35feda34d66afe6765526670da2.html",
listData: []
}
};
......
......@@ -33,7 +33,7 @@
frameborder="0"
></iframe>
<!--
:src="'http://127.0.0.1:9000/template.html' + '?isEdit=1&filmId='+templateData.filmId + '&now=' + date"
:src="'https://127.0.0.1:9000/template.html' + '?isEdit=1&filmId='+templateData.filmId + '&now=' + date"
:src="templateData.frameUrl+'?isEdit=1&filmId='+templateData.filmId + '&now=' + date" -->
</div>
<div class="content-right">
......@@ -193,14 +193,14 @@ export default {
console.log(window.frames[0]);
window.frames[0].postMessage(
"getcolor",
"http://visual-clouds.bdideal.com"
"https://visual-clouds.bdideal.com"
);
};
},
methods: {
message(data) {
window.frames[0].postMessage(data, "http://visual-clouds.bdideal.com");
// window.frames[0].postMessage(data, "http://127.0.0.1:9000");
window.frames[0].postMessage(data, "https://visual-clouds.bdideal.com");
// window.frames[0].postMessage(data, "https://127.0.0.1:9000");
},
valueChange() {
this.message({
......@@ -237,7 +237,7 @@ export default {
this.templateData.resourceUrl = res.data.resourceUrl;
this.templateData.resourceId = res.data.resourceId;
this.templateData.frameUrl = res.data.frameUrl;
// this.templateData.frameUrl = 'http://127.0.0.1:9000/template.html';
// this.templateData.frameUrl = 'https://127.0.0.1:9000/template.html';
console.log("模板详情");
axios.get(res.data.resourceUrl).then(res => {
this.templateData.listData = res.data;
......
......@@ -57,7 +57,7 @@
frameborder="0"
></iframe>
<!--
:src="'http://127.0.0.1:9000/template.html' + '?isEdit=1&filmId='+templateData.filmId + '&now=' + date"
:src="'https://127.0.0.1:9000/template.html' + '?isEdit=1&filmId='+templateData.filmId + '&now=' + date"
:src="templateData.frameUrl+'?isEdit=1&filmId='+templateData.filmId + '&now=' + date"-->
</div>
<div class="content-right">
......@@ -246,14 +246,14 @@ export default {
console.log(window.frames[0]);
// window.frames[0].postMessage(
// "getcolor",
// "http://visual-clouds.bdideal.com"
// "https://visual-clouds.bdideal.com"
// );
};
},
methods: {
message(data) {
// window.frames[0].postMessage(data, "http://visual-clouds.bdideal.com");
window.frames[0].postMessage(data, "http://localhost:8082");
// window.frames[0].postMessage(data, "https://visual-clouds.bdideal.com");
window.frames[0].postMessage(data, "https://localhost:8082");
},
htmltoImg() {
window
......@@ -363,7 +363,7 @@ export default {
this.templateData.resourceUrl = res.data.resourceUrl;
this.templateData.resourceId = res.data.resourceId;
this.templateData.frameUrl = res.data.frameUrl;
this.templateData.frameUrl = "http://localhost:8082";
this.templateData.frameUrl = "https://localhost:8082";
console.log("模板详情");
axios
.get(
......
......@@ -237,15 +237,15 @@ export default {
show: false,
activeIndex: 0,
list: [
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "http://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
// { templateName: '1', templateUrl: "https://visual-clouds.bdideal.com/html/1560506687401a2e66e46b6ac4f71bae6429994fd1a99.jpg" },
],
bannerList: [
{
......
......@@ -29,7 +29,7 @@ export default {
frameId: "string",
filmId: "",
frameUrl:
"http://visual-clouds.bdideal.com/html/156050648981560a2f35feda34d66afe6765526670da2.html",
"https://visual-clouds.bdideal.com/html/156050648981560a2f35feda34d66afe6765526670da2.html",
listData: []
},
editObj: {},
......@@ -61,8 +61,8 @@ export default {
},
methods: {
message(data) {
// window.frames[1].postMessage(data, "http://visual-clouds.bdideal.com");
window.frames[1].postMessage(data, "http://localhost:8082");
// window.frames[1].postMessage(data, "https://visual-clouds.bdideal.com");
window.frames[1].postMessage(data, "https://localhost:8082");
},
getData() {
this.loaded = true
......
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