0525bugFixed
This commit is contained in:
parent
be095ce94f
commit
997591479e
|
@ -436,7 +436,6 @@
|
||||||
},
|
},
|
||||||
//画布添加背景模板图
|
//画布添加背景模板图
|
||||||
draw() {
|
draw() {
|
||||||
debugger;
|
|
||||||
this.ctx = document.getElementById('canvas').getContext('2d');
|
this.ctx = document.getElementById('canvas').getContext('2d');
|
||||||
let canvasImg = document.getElementById("canvasImg");
|
let canvasImg = document.getElementById("canvasImg");
|
||||||
// canvasImg.setAttribute("crossOrigin", 'anonymous');
|
// canvasImg.setAttribute("crossOrigin", 'anonymous');
|
||||||
|
|
|
@ -329,8 +329,8 @@
|
||||||
});
|
});
|
||||||
that.img = new Image();
|
that.img = new Image();
|
||||||
that.img.crossOrigin = '';
|
that.img.crossOrigin = '';
|
||||||
that.img = imag[0].field_value;
|
that.img = process.env.VUE_APP_BASE_API.replace('/api','')+imag[0].field_value;
|
||||||
that.originImg = imag[0].origin_value;
|
that.originImg = process.env.VUE_APP_BASE_API.replace('/api','')+ imag[0].origin_value;
|
||||||
listJudge.forEach(item => {
|
listJudge.forEach(item => {
|
||||||
let obj = new Object();
|
let obj = new Object();
|
||||||
obj = item;
|
obj = item;
|
||||||
|
@ -383,7 +383,7 @@
|
||||||
let that = this;
|
let that = this;
|
||||||
if(rule!==''&&rule!==null&&rule!==undefined){
|
if(rule!==''&&rule!==null&&rule!==undefined){
|
||||||
let reg = /\{(.+?)\}/g;
|
let reg = /\{(.+?)\}/g;
|
||||||
debugger;
|
// debugger;
|
||||||
if(rule.indexOf('||')>-1||rule.indexOf('&&')>-1){
|
if(rule.indexOf('||')>-1||rule.indexOf('&&')>-1){
|
||||||
let tam = '', arr = [];
|
let tam = '', arr = [];
|
||||||
if(rule.indexOf('||')>-1){
|
if(rule.indexOf('||')>-1){
|
||||||
|
|
Loading…
Reference in New Issue