Skip to content

M
memberTag-web
Commit b7afaa35 by member
Options

会员标签生日leix

parent 69da4cf0
Showing with 13 additions and 167 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.52ccb8ab40f86c26c8a5e7c67a3c8632.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.bd37f8bf11abdfcd6adf.js></script><script type=text/javascript src=./static/js/vendor.eb4fd5c01c3b98d7fcea.js></script><script type=text/javascript src=./static/js/app.b7d422efb3e56dbd098d.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-会员标签</title><link href=./static/css/app.8b18a8f9d4d68eaf59b7f3327084ef57.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.20.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.37522bbde96fd1ef6746.js></script><script type=text/javascript src=./static/js/vendor.eb4fd5c01c3b98d7fcea.js></script><script type=text/javascript src=./static/js/app.b7d422efb3e56dbd098d.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/0.2760c972300cba7569bc.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.faa12153c51329dd9b31.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.37522bbde96fd1ef6746.js 0 → 100644
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(n,t,f){for(var o,d,b,i=0,u=[];i<n.length;i++)d=n[i],r[d]&&u.push(r[d][0]),r[d]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(c&&c(n,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=a(a.s=f[i]);return b};var n={},r={33:0};function a(c){if(n[c])return n[c].exports;var r=n[c]={i:c,l:!1,exports:{}};return e[c].call(r.exports,r,r.exports,a),r.l=!0,r.exports}a.e=function(e){var c=r[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var n=new Promise(function(n,a){c=r[e]=[n,a]});c[2]=n;var t=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,a.nc&&f.setAttribute("nonce",a.nc),f.src=a.p+"static/js/"+e+"."+{0:"faa12153c51329dd9b31",1:"1a66f3452cb905b67755",2:"01784f338bb843f827f5",3:"a1d23b8276ed0dc5689a",4:"5346be35fdb53a222936",5:"5a523b4d63b337052d7b",6:"31eb51419dea97959645",7:"f169140cbd6ad9f5611c",8:"fe61efcd1ccfc3412252",9:"ea583eedf0e8e01807bd",10:"49dc4ce10dca172e66e9",11:"089121d042e2ea4d5934",12:"ff49b3face62ef7aef5f",13:"5ff52df0201b9234fa89",14:"698cfa21b2f783438c71",15:"d92460353eb3e0bb9bf6",16:"77043b18784ab0e7f74a",17:"b43a253e53779917cbec",18:"9022ea0326694df97cda",19:"b15734a344b3a216e067",20:"0fef167461d750bfe493",21:"9552d108595ed6cf8df5",22:"61bb63c1296b6c9972a5",23:"c24a9f56d0040598512c",24:"590887b93345814f00ef",25:"fbc9d87dd52c837c39be",26:"c5f9e5a4bc2c63938b70",27:"2c48b10d124016d57c0b",28:"3493abb67f82d7dbc1cb",29:"a847856eb9171d0ce268",32:"a9aaa6e5d01423c1a780"}[e]+".js";var o=setTimeout(d,12e4);function d(){f.onerror=f.onload=null,clearTimeout(o);var c=r[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),r[e]=void 0)}return f.onerror=f.onload=d,t.appendChild(f),n},a.m=e,a.c=n,a.d=function(e,c,n){a.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:n})},a.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(c,"a",c),c},a.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},a.p="./",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/manifest.bd37f8bf11abdfcd6adf.js deleted 100644 → 0
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(n,a,f){for(var o,b,d,i=0,u=[];i<n.length;i++)b=n[i],r[b]&&u.push(r[b][0]),r[b]=0;for(o in a)Object.prototype.hasOwnProperty.call(a,o)&&(e[o]=a[o]);for(c&&c(n,a,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)d=t(t.s=f[i]);return d};var n={},r={33:0};function t(c){if(n[c])return n[c].exports;var r=n[c]={i:c,l:!1,exports:{}};return e[c].call(r.exports,r,r.exports,t),r.l=!0,r.exports}t.e=function(e){var c=r[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var n=new Promise(function(n,t){c=r[e]=[n,t]});c[2]=n;var a=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,t.nc&&f.setAttribute("nonce",t.nc),f.src=t.p+"static/js/"+e+"."+{0:"2760c972300cba7569bc",1:"1a66f3452cb905b67755",2:"01784f338bb843f827f5",3:"a1d23b8276ed0dc5689a",4:"5346be35fdb53a222936",5:"5a523b4d63b337052d7b",6:"31eb51419dea97959645",7:"f169140cbd6ad9f5611c",8:"fe61efcd1ccfc3412252",9:"ea583eedf0e8e01807bd",10:"49dc4ce10dca172e66e9",11:"089121d042e2ea4d5934",12:"ff49b3face62ef7aef5f",13:"5ff52df0201b9234fa89",14:"698cfa21b2f783438c71",15:"d92460353eb3e0bb9bf6",16:"77043b18784ab0e7f74a",17:"b43a253e53779917cbec",18:"9022ea0326694df97cda",19:"b15734a344b3a216e067",20:"0fef167461d750bfe493",21:"9552d108595ed6cf8df5",22:"61bb63c1296b6c9972a5",23:"c24a9f56d0040598512c",24:"590887b93345814f00ef",25:"fbc9d87dd52c837c39be",26:"c5f9e5a4bc2c63938b70",27:"2c48b10d124016d57c0b",28:"3493abb67f82d7dbc1cb",29:"a847856eb9171d0ce268",32:"a9aaa6e5d01423c1a780"}[e]+".js";var o=setTimeout(b,12e4);function b(){f.onerror=f.onload=null,clearTimeout(o);var c=r[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),r[e]=void 0)}return f.onerror=f.onload=b,a.appendChild(f),n},t.m=e,t.c=n,t.d=function(e,c,n){t.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:n})},t.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(c,"a",c),c},t.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},t.p="./",t.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
index.html
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<script src="//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.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/lib/elementUI/index.2.5.4.js"></script>
<!-- 公共组件引用 cdn --> <!-- 公共组件引用 cdn -->
<script src="//web-1251519181.file.myqcloud.com/components/header.2.0.18.js"></script> <script src="//web-1251519181.file.myqcloud.com/components/header.2.0.20.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/footer.2.0.02.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/store-new.2.0.12.js"></script>
<!-- <script src="//web-1251519181.file.myqcloud.com/components/datepicker.2.0.00.js"></script> --> <!-- <script src="//web-1251519181.file.myqcloud.com/components/datepicker.2.0.00.js"></script> -->
......
src/components/tag/tag-config-options.vue
...@@ -361,7 +361,7 @@ ...@@ -361,7 +361,7 @@
<!-- 固定时段 --> <!-- 固定时段 -->
<div class="m-t-18 w-438 p-20 border-box bg-f3f6f9" v-if="parent.radio == 1"> <div class="m-t-18 w-438 p-20 border-box bg-f3f6f9" v-if="parent.radio == 1">
<vue-gic-datepicker <vue-gic-datepicker
v-model="parent.monthDayRange" v-model="parent.dateRangeValue"
type="daterange" type="daterange"
:editable="false" :editable="false"
range-separator="至" range-separator="至"
......
src/components/tagDetail/mixin/index.js
...@@ -175,7 +175,7 @@ export default { ...@@ -175,7 +175,7 @@ export default {
// 时间属性- 月日-月日+最近+之后 // 时间属性- 月日-月日+最近+之后
tag015: { tag015: {
radio: '1', radio: '1',
monthDayRange: [], dateRangeValue: [],
// 相对时间 // 相对时间
timeRadio: '1', // 月日 timeRadio: '1', // 月日
timeChecked: '1', //当 月日 / 最近/之后 timeChecked: '1', //当 月日 / 最近/之后
...@@ -440,9 +440,11 @@ export default { ...@@ -440,9 +440,11 @@ export default {
} }
/* 固定/相对 年月日+最近+之后 年月日+最近 年月日时分秒-年月日时分秒 */ /* 固定/相对 年月日+最近+之后 年月日+最近 年月日时分秒-年月日时分秒 */
if ((code === 'tag014' || code === 'tag017' || code === 'tag019' || code === 'tag020' || code === 'tag015') && that.templateData[0].radio == 1 && !that.templateData[0].dateRangeValue.length) { if ((code === 'tag014' || code === 'tag017' || code === 'tag019' || code === 'tag020' || code === 'tag015') && that.templateData[0].radio == 1) {
that.$message.error({ message: '请选择值' }); if (!that.templateData[0].dateRangeValue || !that.templateData[0].dateRangeValue.length) {
return false; that.$message.error({ message: '请选择值' });
return false;
}
} }
if ((code === 'tag014' || code === 'tag017' || code === 'tag019' || code === 'tag020' || code === 'tag015')) { if ((code === 'tag014' || code === 'tag017' || code === 'tag019' || code === 'tag020' || code === 'tag015')) {
for (let k of this.templateData) { for (let k of this.templateData) {
...@@ -689,163 +691,7 @@ export default { ...@@ -689,163 +691,7 @@ export default {
} }
} }
} }
/* 时间属性- 月日-月日+最近+之后 */
if (code === 'tag015' && that.templateData[0].radio == 1 && !that.templateData[0].monthDayRange.length) {
that.$message.error({ message: '请选择值' });
return false;
}
if (code === 'tag015' && that.templateData[0].radio == 1 && Number.parseInt(that.templateData[0].monthDayRange[0]) > Number.parseInt(that.templateData[0].monthDayRange[1])) {
that.$message.error({ message: '生日区间格式不正确' });
return false;
}
if (code === 'tag015' && that.templateData[0].radio == 2 && that.templateData[0].timeChecked == 2 && !that.templateData[0].timeInput) {
that.$message.error({ message: '请填写值' });
return false;
}
if (code === 'tag015' && that.templateData.length === 1 && that.templateData[0].radio == 1) {
if (that.currentComputeType == 2) {
tagValue.val[0].data.compute = 'between';
} else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = that.templateData[0].monthDayRange.join(',');
that.templateData[0].timeInput = '';
that.postTemplateData.selectedVal.push(`${that.templateData[0].monthDayRange[0]} 至 ${that.templateData[0].monthDayRange[1]}`);
}
if (code === 'tag015' && that.templateData.length === 1 && that.templateData[0].radio == 2) {
// 天
if (that.templateData[0].timeRadio == 1) {
/** 同时选择
* lastdayHasToday 最近几天包含今天
* afterdayHasToday 之后几天包含今天
*/
if (that.templateData[0].timeChecked && that.templateData[0].timeAfterChecked) {
if (that.templateData[0].timeSelect == 1) {
if (that.currentComputeType == 2) {
tagValue.val[0].data.compute = 'lastdayHasToday';
} else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = String(that.templateData[0].timeInput);
that.postTemplateData.selectedVal.push(`最近 ${that.templateData[0].timeInput}天包含当天`);
that.templateData[0].timeInput = '';
} else {
if (that.currentComputeType == 2) {
tagValue.val[0].data.compute = 'afterdayHasToday';
} else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = String(that.templateData[0].timeInput);
that.postTemplateData.selectedVal.push(`之后 ${that.templateData[0].timeInput} 天包含当天`);
that.templateData[0].timeInput = '';
}
that.postTemplateData.template = that.templateData;
tagParams = that.postTemplateData;
await this.addToTemp(tagValue, tagParams);
return true;
}
//天 当天
if (that.templateData[0].timeChecked == 1) {
if (that.currentComputeType == 2) {
tagValue.val[0].data.compute = 'today';
} else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = '1';
that.postTemplateData.selectedVal.push('当天');
that.templateData[0].timeInput = '';
}
// 最近/之后
if (that.templateData[0].timeChecked == 2) {
if (that.templateData[0].timeSelect == 1) {
// 最近
if (that.currentComputeType == 2) {
tagValue.val[0].data.compute = 'lastday';
} else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = String(that.templateData[0].timeInput);
that.postTemplateData.selectedVal.push(`最近 ${that.templateData[0].timeInput} 天`);
} else {
// 之后
if (that.currentComputeType == 2) {
tagValue.val[0].data.compute = 'afterday';
} else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = String(that.templateData[0].timeInput);
that.postTemplateData.selectedVal.push(`之后 ${that.templateData[0].timeInput} 天`);
}
}
}
// 月
if (that.templateData[0].timeRadio == 2) {
/** 同时选择
* lastdayHasToday 最近几天包含今天
* afterdayHasToday 之后几天包含今天
*/
if (that.templateData[0].timeChecked && that.templateData[0].timeAfterChecked) {
if (that.templateData[0].timeSelect == 1) {
if (that.currentComputeType == 2) {
tagValue.val[0].data.compute = 'lastmonthHasCurrentMonth';
} else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = String(that.templateData[0].timeInput);
that.postTemplateData.selectedVal.push(`最近 ${that.templateData[0].timeInput}天包含当月`);
that.templateData[0].timeInput = '';
} else {
if (that.currentComputeType == 2) {
tagValue.val[0].data.compute = 'aftermonthHasCurrentMonth';
} else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = String(that.templateData[0].timeInput);
that.postTemplateData.selectedVal.push(`之后 ${that.templateData[0].timeInput} 天包含当月`);
that.templateData[0].timeInput = '';
}
that.postTemplateData.template = that.templateData;
tagParams = that.postTemplateData;
await this.addToTemp(tagValue, tagParams);
return true;
}
//月 当月
if (that.templateData[0].timeChecked == 1) {
if (that.currentComputeType == 2) {
tagValue.val[0].data.compute = 'currentMonth';
} else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = '1';
that.postTemplateData.selectedVal.push('当月');
that.templateData[0].timeInput = '';
}
// 最近/之后
if (that.templateData[0].timeChecked == 2) {
if (that.templateData[0].timeSelect == 1) {
// 最近
if (that.currentComputeType == 2) {
tagValue.val[0].data.compute = 'lastmonth';
} else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = String(that.templateData[0].timeInput);
that.postTemplateData.selectedVal.push(`最近 ${that.templateData[0].timeInput} 月`);
} else {
// 之后
if (that.currentComputeType == 2) {
tagValue.val[0].data.compute = 'aftermonth';
} else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = String(that.templateData[0].timeInput);
that.postTemplateData.selectedVal.push(`之后 ${that.templateData[0].timeInput} 月`);
}
}
}
}
// 数字区间 = >= <= qu区间 // 数字区间 = >= <= qu区间
if (code == 'com001') { if (code == 'com001') {
for (let k of this.templateData) { for (let k of this.templateData) {
......
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