Skip to content

M
memberTag-web
Commit 53d28984 by 无尘
Options

fix: 修改标签模板判断

parent aa9dd73e
Showing with 30 additions and 26 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-会员标签</title><link href=./static/css/app.b3f9f4b7f239d755a0ca18268fcf48e3.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.e4eae689f1064be617e3.js></script><script type=text/javascript src=./static/js/vendor.274807a88ce08a681b75.js></script><script type=text/javascript src=./static/js/app.ba337f1a8f88b0fa95e1.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-会员标签</title><link href=./static/css/app.c740d76e166dc2507cdb5c894de636bd.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.e493efd4b90fd871080b.js></script><script type=text/javascript src=./static/js/vendor.274807a88ce08a681b75.js></script><script type=text/javascript src=./static/js/app.ba337f1a8f88b0fa95e1.js></script></body></html>
\ No newline at end of file
dist/static/js/6.147ea2f2a455a59e22d6.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/6.add9fbc88e70d95bb29e.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/7.d28fde8b05d6bee77f4c.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/7.e6ff886c1b75382113d6.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.e4eae689f1064be617e3.js → dist/static/js/manifest.e493efd4b90fd871080b.js
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,a){for(var f,d,i,u=0,b=[];u<r.length;u++)d=r[u],t[d]&&b.push(t[d][0]),t[d]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(n&&n(r,o,a);b.length;)b.shift()();if(a)for(u=0;u<a.length;u++)i=c(c.s=a[u]);return i};var r={},t={26:0};function c(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,c),t.l=!0,t.exports}c.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,c){n=t[e]=[r,c]});n[2]=r;var o=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,c.nc&&a.setAttribute("nonce",c.nc),a.src=c.p+"static/js/"+e+"."+{0:"603e24b6249496bff8d6",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"0106258f51de87a40b57",6:"add9fbc88e70d95bb29e",7:"e6ff886c1b75382113d6",8:"24eeef980ff8ffe24d42",9:"6284684f59ae2a7586a8",10:"c71c26ffe9e929740644",11:"e85b90356083e5b3e250",12:"dece2fedb495aa36c9a6",13:"e29aa5893a93a16c34bc",14:"92199267df3426ee7901",15:"9f61f06d1572f1265cc0",16:"843a47923cc77fa59466",17:"83e469d672229c638715",18:"6ed416399616407ccde9",19:"bfcaf83a5268b922dc57",20:"747937511d9761d173a2",21:"3dba0a38816e1f1717fb",22:"22f63d81db79c0c78098",25:"9ceafa4ee79176c87d81"}[e]+".js";var f=setTimeout(d,12e4);function d(){a.onerror=a.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=d,o.appendChild(a),r},c.m=e,c.c=r,c.d=function(e,n,r){c.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},c.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(n,"a",n),n},c.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},c.p="./",c.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.e4eae689f1064be617e3.js.map
\ No newline at end of file
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,o){for(var f,d,i,u=0,b=[];u<r.length;u++)d=r[u],t[d]&&b.push(t[d][0]),t[d]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,o);b.length;)b.shift()();if(o)for(u=0;u<o.length;u++)i=c(c.s=o[u]);return i};var r={},t={26:0};function c(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,c),t.l=!0,t.exports}c.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,c){n=t[e]=[r,c]});n[2]=r;var a=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,c.nc&&o.setAttribute("nonce",c.nc),o.src=c.p+"static/js/"+e+"."+{0:"603e24b6249496bff8d6",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"0106258f51de87a40b57",6:"147ea2f2a455a59e22d6",7:"d28fde8b05d6bee77f4c",8:"24eeef980ff8ffe24d42",9:"6284684f59ae2a7586a8",10:"c71c26ffe9e929740644",11:"e85b90356083e5b3e250",12:"dece2fedb495aa36c9a6",13:"e29aa5893a93a16c34bc",14:"92199267df3426ee7901",15:"9f61f06d1572f1265cc0",16:"843a47923cc77fa59466",17:"83e469d672229c638715",18:"6ed416399616407ccde9",19:"bfcaf83a5268b922dc57",20:"747937511d9761d173a2",21:"3dba0a38816e1f1717fb",22:"22f63d81db79c0c78098",25:"9ceafa4ee79176c87d81"}[e]+".js";var f=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=d,a.appendChild(o),r},c.m=e,c.c=r,c.d=function(e,n,r){c.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},c.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(n,"a",n),n},c.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},c.p="./",c.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.e493efd4b90fd871080b.js.map
\ No newline at end of file
src/components/tagShortDetail.vue
......@@ -1018,7 +1018,7 @@
}else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = 1;
tagValue.val[0].data.value = "1";
that.postTemplateData.selectedVal.push('当天');
}
// 最近/之后
......@@ -1032,7 +1032,7 @@
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = that.templateData[0].timeInput;
tagValue.val[0].data.value = String(that.templateData[0].timeInput);
that.postTemplateData.selectedVal.push(`最近 ${that.templateData[0].timeInput} 天`);
}else {
// 之后
......@@ -1041,7 +1041,7 @@
}else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = that.templateData[0].timeInput;
tagValue.val[0].data.value = String(that.templateData[0].timeInput);
that.postTemplateData.selectedVal.push(`之后 ${that.templateData[0].timeInput} 天`);
}
}
......@@ -1055,7 +1055,7 @@
}else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = 1;
tagValue.val[0].data.value = "1";
that.postTemplateData.selectedVal.push('当月');
}
// 最近/之后
......@@ -1068,7 +1068,7 @@
}else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = that.templateData[0].timeInput;
tagValue.val[0].data.value = String(that.templateData[0].timeInput);
that.postTemplateData.selectedVal.push(`最近 ${that.templateData[0].timeInput} 月`);
}else {
// 之后
......@@ -1077,7 +1077,7 @@
}else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = that.templateData[0].timeInput;
tagValue.val[0].data.value = String(that.templateData[0].timeInput);
that.postTemplateData.selectedVal.push(`之后 ${that.templateData[0].timeInput} 月`);
}
}
......@@ -1091,7 +1091,7 @@
}else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = 1;
tagValue.val[0].data.value = "1";
that.postTemplateData.selectedVal.push('当年');
}
// 最近/之后
......@@ -1104,7 +1104,7 @@
}else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = that.templateData[0].timeInput;
tagValue.val[0].data.value = String(that.templateData[0].timeInput);
that.postTemplateData.selectedVal.push(`最近 ${that.templateData[0].timeInput} 年`);
}else {
// 之后
......@@ -1113,7 +1113,7 @@
}else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = that.templateData[0].timeInput;
tagValue.val[0].data.value = String(that.templateData[0].timeInput);
that.postTemplateData.selectedVal.push(`之后 ${that.templateData[0].timeInput} 年`);
}
}
......@@ -1148,7 +1148,7 @@
}else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = 1;
tagValue.val[0].data.value = "1";
that.postTemplateData.selectedVal.push('当天');
}
// 最近/之后
......@@ -1161,7 +1161,7 @@
}else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = that.templateData[0].timeInput;
tagValue.val[0].data.value = String(that.templateData[0].timeInput);
that.postTemplateData.selectedVal.push(`最近 ${that.templateData[0].timeInput} 天`);
}else {
// 之后
......@@ -1170,7 +1170,7 @@
}else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = that.templateData[0].timeInput;
tagValue.val[0].data.value = String(that.templateData[0].timeInput);
that.postTemplateData.selectedVal.push(`之后 ${that.templateData[0].timeInput} 天`);
}
}
......@@ -1184,7 +1184,7 @@
}else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = 1;
tagValue.val[0].data.value = "1";
that.postTemplateData.selectedVal.push('当月');
}
// 最近/之后
......@@ -1197,7 +1197,7 @@
}else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = that.templateData[0].timeInput;
tagValue.val[0].data.value = String(that.templateData[0].timeInput);
that.postTemplateData.selectedVal.push(`最近 ${that.templateData[0].timeInput} 月`);
}else {
// 之后
......@@ -1206,7 +1206,7 @@
}else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = that.templateData[0].timeInput;
tagValue.val[0].data.value = String(that.templateData[0].timeInput);
that.postTemplateData.selectedVal.push(`之后 ${that.templateData[0].timeInput} 月`);
}
}
......@@ -1249,12 +1249,14 @@
if (ele.fixedRecentRadio == 1 && !ele.fixedRecentRangeValue.length) { returnFlag = false }
if (ele.fixedRecentRadio == 2 && !ele.fixedRecentTimeRecent) { returnFlag = false }
if (ele.fixedRecentRadio == 1) {
tagValue.val[0].data.value = ele.fixedRecentRangeValue.join(',')
tagValue.val[0].time.type = 'between';
tagValue.val[0].time.value = ele.fixedRecentRangeValue.join(',')
that.postTemplateData.selectedVal.push(ele.fixedRecentRangeValue);
}
tagValue.val[0].data.compute = ele.postCompute;
// tagValue.val[0].data.compute = ele.postCompute;
if (ele.fixedRecentRadio == 2) {
tagValue.val[0].data.value = ele.fixedRecentTimeRecent;
tagValue.val[0].time.type = 'lastday';
tagValue.val[0].time.value = ele.fixedRecentTimeRecent;
that.postTemplateData.selectedVal.push(`最近 ${ele.fixedRecentTimeRecent} 天`);
}
......@@ -1289,12 +1291,13 @@
}
// 门店
if (ele.templateCode === 'tag011') {
console.log(that.$refs.storeNew)
that.$refs.storeNew.isStoreSave().then(flag => {
console.log(that.$refs.storeNew[0])
that.$refs.storeNew[0].isStoreSave().then(flag => {
//do something
if (!flag) { returnFlag = false }
console.log(flag,returnFlag)
})
if (!ele.checkeditems.length) { returnFlag = false };
// if (!ele.checkeditems.length) { returnFlag = false };
tagValue.val[0].data.value = '';
tagValue.val[0].data.dealKey = 'storeWidget'
}
......@@ -1330,6 +1333,7 @@
//
})
}
console.log(returnFlag)
if (!returnFlag) {
that.$message.error({ message: '请完善标签值'})
return false;
......
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 to comment