Commit 413afeb1 by hank

https

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