Skip to content

M
memberTag-web
Commit ab16ec42 by member
Options

修改bug完毕 发至生产

parent c3f577be
Showing with 9 additions and 8 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.c4234791308be60dfe8b2c52546d9857.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.b298bc832f32f69ce0de.js></script><script type=text/javascript src=./static/js/vendor.eb4fd5c01c3b98d7fcea.js></script><script type=text/javascript src=./static/js/app.183b608c36b1f53cda18.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.52878d2bcd8fbaae62f71508913ae523.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.1fc60301a7263045a40d.js></script><script type=text/javascript src=./static/js/vendor.eb4fd5c01c3b98d7fcea.js></script><script type=text/javascript src=./static/js/app.183b608c36b1f53cda18.js></script></body></html>
\ No newline at end of file
dist/static/js/0.4c75d68c472653c79bb4.js → dist/static/js/0.d3ed783ee873e23234cf.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.1fc60301a7263045a40d.js 0 → 100644
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,f,t){for(var o,d,b,i=0,u=[];i<c.length;i++)d=c[i],n[d]&&u.push(n[d][0]),n[d]=0;for(o in f)Object.prototype.hasOwnProperty.call(f,o)&&(e[o]=f[o]);for(a&&a(c,f,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=r(r.s=t[i]);return b};var c={},n={33:0};function r(a){if(c[a])return c[a].exports;var n=c[a]={i:a,l:!1,exports:{}};return e[a].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var a=n[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,r){a=n[e]=[c,r]});a[2]=c;var f=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,r.nc&&t.setAttribute("nonce",r.nc),t.src=r.p+"static/js/"+e+"."+{0:"d3ed783ee873e23234cf",1:"1a66f3452cb905b67755",2:"01784f338bb843f827f5",3:"6dcc16e58b29e739b68b",4:"8f38cbb49796452ed56b",5:"958c2a3450b3c47117f9",6:"31eb51419dea97959645",7:"f169140cbd6ad9f5611c",8:"fe61efcd1ccfc3412252",9:"ea583eedf0e8e01807bd",10:"f0730ab3ea2cc610aab4",11:"089121d042e2ea4d5934",12:"ff49b3face62ef7aef5f",13:"5ff52df0201b9234fa89",14:"698cfa21b2f783438c71",15:"45a78311835c4d786a28",16:"507fddf23cee64d7ade1",17:"3d781ba9b065c4046ffa",18:"9022ea0326694df97cda",19:"b15734a344b3a216e067",20:"0fef167461d750bfe493",21:"e39e3461a16359f1196b",22:"f24920a6257c85f352de",23:"24cd9b4a91da0814be19",24:"c9d5d98023a48e77bcbd",25:"6934db3f920c52113f90",26:"3aca132c47a1220d1d2f",27:"2c48b10d124016d57c0b",28:"3493abb67f82d7dbc1cb",29:"93394f129023c3e6e8fb",32:"a9aaa6e5d01423c1a780"}[e]+".js";var o=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(o);var a=n[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return t.onerror=t.onload=d,f.appendChild(t),c},r.m=e,r.c=c,r.d=function(e,a,c){r.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},r.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(a,"a",a),a},r.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},r.p="./",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/manifest.b298bc832f32f69ce0de.js deleted 100644 → 0
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,f,t){for(var o,d,b,i=0,u=[];i<a.length;i++)d=a[i],n[d]&&u.push(n[d][0]),n[d]=0;for(o in f)Object.prototype.hasOwnProperty.call(f,o)&&(e[o]=f[o]);for(c&&c(a,f,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=r(r.s=t[i]);return b};var a={},n={33:0};function r(c){if(a[c])return a[c].exports;var n=a[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,r){c=n[e]=[a,r]});c[2]=a;var f=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,r.nc&&t.setAttribute("nonce",r.nc),t.src=r.p+"static/js/"+e+"."+{0:"4c75d68c472653c79bb4",1:"1a66f3452cb905b67755",2:"01784f338bb843f827f5",3:"3011ed4b1807fd37f96d",4:"8f38cbb49796452ed56b",5:"68376ea1e7c54c12632c",6:"31eb51419dea97959645",7:"f169140cbd6ad9f5611c",8:"fe61efcd1ccfc3412252",9:"ea583eedf0e8e01807bd",10:"f0730ab3ea2cc610aab4",11:"089121d042e2ea4d5934",12:"ff49b3face62ef7aef5f",13:"5ff52df0201b9234fa89",14:"698cfa21b2f783438c71",15:"45a78311835c4d786a28",16:"507fddf23cee64d7ade1",17:"3d781ba9b065c4046ffa",18:"9022ea0326694df97cda",19:"b15734a344b3a216e067",20:"0fef167461d750bfe493",21:"e39e3461a16359f1196b",22:"f24920a6257c85f352de",23:"24cd9b4a91da0814be19",24:"c9d5d98023a48e77bcbd",25:"6934db3f920c52113f90",26:"3aca132c47a1220d1d2f",27:"2c48b10d124016d57c0b",28:"3493abb67f82d7dbc1cb",29:"93394f129023c3e6e8fb",32:"a9aaa6e5d01423c1a780"}[e]+".js";var o=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(o);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return t.onerror=t.onload=d,f.appendChild(t),a},r.m=e,r.c=a,r.d=function(e,c,a){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="./",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/tag/batch-list.vue
......@@ -144,13 +144,13 @@ export default {
},
created() {
this.getMemberGroupList();
this.selectionList = [];
},
watch: {
batchVisiable(newval) {
this.batchDialog = newval;
this.getMemberGroupList();
},
operateNumber(newval) {
this.operNum = newval;
......
src/components/tagDetail/mixin/index.js
......@@ -476,7 +476,7 @@ export default {
}
tagValue.val[0].data.value = that.templateData[0].dateRangeValue.join(',');
that.templateData[0].timeInput = '';
if (code === 'tag019') {
if (code === 'tag019' || code === 'tag020') {
tagValue.val[0].data.value = that.templateData[0].dateRangeValue
.join(',')
.replace(/-/g, '')
......@@ -872,7 +872,7 @@ export default {
tagValue.val[0].data.value = `${k.numRange[0]},${k.numRange[1]}`;
}
let computeSymbol = tagValue.val[0].data.compute == 'between' ? '区间' : tagValue.val[0].data.compute;
this.postTemplateData.selectedVal = computeSymbol + tagValue.val[0].data.value;
this.postTemplateData.selectedVal.push(`${computeSymbol}${tagValue.val[0].data.value}`);
}
}
}
......@@ -918,7 +918,6 @@ export default {
}
tagValue.val[0].data.compute = ele.postCompute;
tagValue.val[0].data.value = ele.numRange.join(',');
console.log(this.tagData);
that.postTemplateData.selectedVal.push(`${ele.numRange[0]} <= ${that.tagData.tagName} <= ${ele.numRange[1]}`);
}
// 固定/最近
......@@ -932,6 +931,7 @@ export default {
if (ele.fixedRecentRadio == 1) {
tagValue.time[0].type = 'between';
tagValue.time[0].value = ele.fixedRecentRangeValue.join(',');
console.log(that.postTemplateData);
that.postTemplateData.selectedVal.push(`时间范围为${ele.fixedRecentRangeValue[0]} 至 ${ele.fixedRecentRangeValue[1]}`);
}
// tagValue.val[0].data.compute = ele.postCompute;
......
src/view/memberGroup/memberGroupList.vue
......@@ -24,6 +24,7 @@
<el-option key="" label="全部" value=""> </el-option>
</el-select>
<div class="batch-option">
<!-- <el-cascader
placeholder="批量操作"
class="w-180 m-l-0"
......
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