Skip to content

M
memberTag-web
Commit 4e92c2c8 by member
Options

修改老数据问题

parent 54fb30c4
Showing with 188 additions and 46 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.0a25d66a0338e270dc5da1b541120c63.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.f83329ede00bf1dbf3c4.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.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
dist/static/js/0.4c75d68c472653c79bb4.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.f4a0522e3e2bf5dc6bbb.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/manifest.b298bc832f32f69ce0de.js 0 → 100644
!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
dist/static/js/manifest.f83329ede00bf1dbf3c4.js deleted 100644 → 0
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,t){for(var o,d,b,i=0,u=[];i<a.length;i++)d=a[i],f[d]&&u.push(f[d][0]),f[d]=0;for(o in r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(c&&c(a,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var a={},f={33:0};function n(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,n){c=f[e]=[a,n]});c[2]=a;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"f4a0522e3e2bf5dc6bbb",1:"1a66f3452cb905b67755",2:"01784f338bb843f827f5",3:"7b0fead7687002e5c6ba",4:"8f38cbb49796452ed56b",5:"ad2e2d6bb9d4247c0382",6:"31eb51419dea97959645",7:"f169140cbd6ad9f5611c",8:"fe61efcd1ccfc3412252",9:"ea583eedf0e8e01807bd",10:"f0730ab3ea2cc610aab4",11:"74e7bd2cd2b7ccb74804",12:"ff49b3face62ef7aef5f",13:"5ff52df0201b9234fa89",14:"698cfa21b2f783438c71",15:"45a78311835c4d786a28",16:"507fddf23cee64d7ade1",17:"3d781ba9b065c4046ffa",18:"9022ea0326694df97cda",19:"b3eacaef0b9544a3c6fc",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=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),a},n.m=e,n.c=a,n.d=function(e,c,a){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/tag/tag-config-options.vue
......@@ -501,6 +501,75 @@
</div>
</div>
</template>
<template v-if="parent.templateCode == 'tag020'">
<div class="m-b-20" :key="'tag17' + pindex">
<el-radio v-model="parent.radio" label="1">固定时段</el-radio>
<el-radio v-model="parent.radio" label="2">相对时段</el-radio>
<!-- 固定时段 -->
<div class="m-t-18 w-438 p-20 border-box bg-f3f6f9" v-if="parent.radio == 1">
<el-date-picker
v-model="parent.dateRangeValue"
type="daterange"
:editable="false"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</div>
<!-- 相对时段 -->
<div class="relative-range m-t-18 border-box" v-if="parent.radio != 1">
<div>
<div>
<label class="inline-block w-98 label-unit">时间精度</label>
<el-radio-group v-model="parent.timeRadio" @change="timeRadioChange($event, parent)">
<el-radio label="1">天</el-radio>
<el-radio label="2">月</el-radio>
<el-radio label="3">年</el-radio>
</el-radio-group>
</div>
<div class="m-t-20">
<label class="inline-block w-98"></label>
<el-checkbox v-model="parent.timeChecked" @change="currentDayChange($event, parent)">
当{{ parent.timeRadio == 1 ? '天' : parent.timeRadio == 2 ? '月' : '年' }}
</el-checkbox>
</div>
<div class="m-t-20">
<label class="inline-block w-98"></label>
<el-checkbox v-model="parent.timeAfterChecked">
</el-checkbox>
<el-select v-model="parent.timeSelect" placeholder="请选择" class="w-86 m-l-8">
<el-option label="最近" value="1"></el-option>
</el-select>
<el-input
v-model="parent.timeInput"
placeholder="请输入"
class="w-90"
@blur="value => toEditDateInput(value, parent.timeRadio, parent)"
></el-input>
<template v-if="parent.timeRadio == 1">
<label class="inline-block middle label-unit m-l-8">天</label>
<label class="inline-block middle label-tip">正整数，最大365</label>
</template>
<template v-if="parent.timeRadio == 2">
<label class="inline-block middle label-unit m-l-8">月</label>
<label class="inline-block middle label-tip">正整数，最大24</label>
</template>
<template v-if="parent.timeRadio == 3">
<label class="inline-block middle label-unit m-l-8">年</label>
<label class="inline-block middle label-tip">正整数，最大2</label>
</template>
</div>
</div>
</div>
</div>
</template>
<!-- 17.时间属性(年月日-年月日 + 最近) -->
<template v-if="parent.templateCode == 'tag017'">
<div class="m-b-20" :key="'tag18' + pindex">
......@@ -798,6 +867,19 @@ export default {
timeSelect: '1', // 最近/之后
timeInput: ''
},
tag020: {
radio: '1',
dateRangeValue: [],
// 相对时间
timeRadio: '1', // 年月日
timeChecked: false,
timeAfterChecked: false,
// timeCheckedTwo: false,
timeSelect: '1', // 最近/之后
timeInput: ''
},
com023: {
},
......@@ -926,6 +1008,8 @@ export default {
if (this.currentComputeType === 1) {
this.postCompute = templateVal.compute.compute;
}
// 门店
if (!!templateVal.valWidgetId) {
setTimeout(_ => {
this.getTemplateCodeById(templateVal.valWidgetId);
......@@ -939,14 +1023,16 @@ export default {
this.getTemplateCodeById(ele.timeWidgetId);
}
});
}, 60);
return;
}, 200);
} else {
setTimeout(_ => {
newTime.forEach((ele, index) => {
if (!!ele.timeWidgetId) {
this.getTemplateCodeById(ele.timeWidgetId);
}
});
}, 200);
}
newTime.forEach((ele, index) => {
if (!!ele.timeWidgetId) {
this.getTemplateCodeById(ele.timeWidgetId);
}
});
}
}
console.log();
......@@ -961,6 +1047,7 @@ export default {
};
findWidget(param)
.then(res => {
console.log('sy');
if (res.errorCode == 1) {
let data = res.result;
// this.templateCode = data.templateCode;
......@@ -1251,8 +1338,13 @@ export default {
break;
// 属于不属于 从newTagVal里面比较
case 'tag002':
this.templateData[0].computeRadio = tagParams.template[0].computeRadio;
if (tagParams.template[0].selectTwo) {
this.templateData[0].computeRadio = tagParams.template[0].selectTwo;
} else {
this.templateData[0].computeRadio = tagParams.template[0].computeRadio;
}
break;
case 'tag015':
radio = tagParams.template[0].radio;
value = tagValue.val[0].data.value.split(',');
......@@ -1347,7 +1439,32 @@ export default {
this.templateData[i].timeRadio = templateDate.timeRadio; // 天 月 年
this.templateData[i].timeAfterChecked = templateDate.timeAfterChecked;
this.templateData[i].timeChecked = templateDate.timeChecked;
this.templateData[i].dateRangeValue = templateDate.dateRangeValue;
if (templateDate.dateRangeValue.length) {
this.templateData[i].dateRangeValue = templateDate.dateRangeValue;
} else {
this.templateData[i].dateRangeValue = tagValue.val[0].data.value.split(',');
}
// 如果有最近选项必有 timeInput
if (this.templateData[i].timeAfterChecked) {
this.templateData[i].timeInput = tagValue.val[0].data.value;
}
}
}
break;
case 'tag020':
for (let i = 0; i < this.templateData.length; i++) {
if (this.templateData[i].templateCode === 'tag020') {
let templateDate = tagParams.template[0];
this.templateData[i].radio = templateDate.radio; // 时段
this.templateData[i].timeRadio = templateDate.timeRadio; // 天 月 年
this.templateData[i].timeAfterChecked = templateDate.timeAfterChecked;
this.templateData[i].timeChecked = templateDate.timeChecked;
if (templateDate.dateRangeValue.length) {
this.templateData[i].dateRangeValue = templateDate.dateRangeValue;
} else {
this.templateData[i].dateRangeValue = tagValue.val[0].data.value.split(',');
}
// 如果有最近选项必有 timeInput
if (this.templateData[i].timeAfterChecked) {
this.templateData[i].timeInput = tagValue.val[0].data.value;
......@@ -1402,10 +1519,14 @@ export default {
case 'com001':
for (let i = 0; i < this.templateData.length; i++) {
if (this.templateData[i].templateCode === 'com001') {
// 老数据是按照两个区间值来做的 所以强行当成老数据来做
if (tagParams.selectedVal.indexOf('区间') != -1) {
// 存在区间
this.templateData[i].symbol = '区间';
this.templateData[i].numRange = tagValue.val[0].data.value.split(',')
} else if (tagParams.template[0].symbol == void 0) {
this.templateData[i].symbol = '区间';
this.templateData[i].numRange = tagParams.template[0].numRange;
} else {
this.templateData[i].symbol = tagParams.selectedVal.slice(0, 1);
this.templateData[i].num = tagValue.val[0].data.value;
......
src/components/tagDetail/mixin/index.js
......@@ -211,6 +211,18 @@ export default {
timeAfterChecked: false,
timeSelect: '1', // 最近/之后
timeInput: ''
},
tag020: {
radio: '1',
dateRangeValue: [],
// 相对时间
timeRadio: '1', // 年月日
timeChecked: false,
timeAfterChecked: false,
// timeCheckedTwo: false,
timeSelect: '1', // 最近/之后
timeInput: ''
}
};
},
......@@ -429,11 +441,11 @@ export default {
}
/* 固定/相对 年月日+最近+之后 年月日+最近 年月日时分秒-年月日时分秒 */
if ((code === 'tag014' || code === 'tag017' || code === 'tag019') && that.templateData[0].radio == 1 && !that.templateData[0].dateRangeValue.length) {
if ((code === 'tag014' || code === 'tag017' || code === 'tag019' || code === 'tag020') && that.templateData[0].radio == 1 && !that.templateData[0].dateRangeValue.length) {
that.$message.error({ message: '请选择值' });
return false;
}
if ((code === 'tag014' || code === 'tag017' || code === 'tag019')) {
if ((code === 'tag014' || code === 'tag017' || code === 'tag019' || code === 'tag020')) {
for (let k of this.templateData) {
if (!k.timeChecked && !k.timeAfterChecked && k.radio == 2) {
let tips = k.timeRadio == 1 ? '天' : k.timeRadio == 2 ? '月' : '年';
......@@ -456,7 +468,7 @@ export default {
}
}
if ((code === 'tag014' || code === 'tag017' || code === 'tag019') && that.templateData.length === 1 && that.templateData[0].radio == 1) {
if ((code === 'tag014' || code === 'tag017' || code === 'tag019' || code === 'tag020') && that.templateData.length === 1 && that.templateData[0].radio == 1) {
if (that.currentComputeType == 2) {
tagValue.val[0].data.compute = 'between';
} else {
......@@ -474,7 +486,7 @@ export default {
that.postTemplateData.selectedVal.push(that.templateData[0].dateRangeValue[0].split(' ')[0] + '至' + that.templateData[0].dateRangeValue[1].split(' ')[0]);
}
if ((code === 'tag014' || code === 'tag017' || code === 'tag019') && that.templateData.length === 1 && that.templateData[0].radio == 2) {
if ((code === 'tag014' || code === 'tag017' || code === 'tag019' || code === 'tag020') && that.templateData.length === 1 && that.templateData[0].radio == 2) {
// 天
// timeAfterChecked 最近/之后
// timeChecked 当天/年/月
......
src/view/platformTag/member-tag.vue
......@@ -458,6 +458,7 @@ export default {
} else {
this.tagName = '全部标签';
}
this.handTag = false;
this.loadMemberTagList({
searchName: this.memberTag
......
src/view/platformTag/second-tag.vue
......@@ -25,8 +25,8 @@
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button :disabled="scope.row.levelName == '未分类'" @click="handleEdit(scope.row, scope.$index)" type="text">{{ scope.row.editText }}</el-button>
<el-button :disabled="scope.row.levelName == '未分类'" type="text" @click="handleDelete(scope.row, scope.$index)">取消</el-button>
<el-button :disabled="scope.row.levelName.indexOf('未分类') > -1" @click="handleEdit(scope.row, scope.$index)" type="text">{{ scope.row.editText }}</el-button>
<el-button :disabled="scope.row.levelName.indexOf('未分类') > -1" type="text" @click="handleDelete(scope.row, scope.$index)"> {{ scope.row.deleteText }} </el-button>
</template>
</el-table-column>
</el-table>
......@@ -52,8 +52,7 @@
<script>
import Emitter from '@/mixins/emitter';
import { mapState } from 'vuex';
// deleteThirdTag
import { newHandTag, thirdHandTagList, editThirdTag } from '@/request/api';
import { newHandTag, thirdHandTagList, deleteThirdTag, editThirdTag } from '@/request/api';
export default {
mixins: [Emitter],
......@@ -84,7 +83,7 @@ export default {
list: {
immediate: true,
handler(newval) {
let noClassIndex = newval.children.findIndex(el => el.name == '未分类');
let noClassIndex = newval.children.findIndex(el => el.name.indexOf('未分类') > -1);
if (noClassIndex > -1) {
let noClassData = newval.children.splice(noClassIndex, 1);
newval.children.unshift(noClassData[0]);
......@@ -122,7 +121,8 @@ export default {
this.editData = res.result.map(el => ({
...el,
editName: false,
editText: '编辑'
editText: '编辑',
deleteText: '删除'
}));
} else {
this.editData = [];
......@@ -137,10 +137,12 @@ export default {
this.editData = this.editData.map(el => ({
...el,
editName: false,
editText: '编辑'
editText: '编辑',
deleteText: '删除'
}));
this.editData[i].editName = true;
this.editData[i].editText = '确认';
this.editData[i].deleteText = '取消';
} else {
/** 提交修改的标签名
* 不能为空
......@@ -182,28 +184,34 @@ export default {
},
// 删除子分类
handleDelete(list, i) {
list.editName = false;
list.editText = '编辑';
// const param = {
// tagLevelGroupId: list.tagLevelGroupId,
// requestProject: 'gic-member-tag-web'
// };
// deleteThirdTag(param)
// .then(res => {
// if (res.errorCode == 1) {
// this.$message({
// message: '删除成功',
// type: 'success',
// duration: 1000
// });
// this.getThirdTag();
// this.dispatch('member-tag', 'refersh-member-list');
// // this.editVisiable = false;
// }
// })
// .catch(err => {
// console.log(err);
// });
// list.editName = false;
// list.editText = '编辑';
if (list.deleteText == '取消') {
this.editData[i].editName = false;
this.editData[i].editText = '编辑';
this.editData[i].deleteText = '删除';
return;
}
const param = {
tagLevelGroupId: list.tagLevelGroupId,
requestProject: 'gic-member-tag-web'
};
deleteThirdTag(param)
.then(res => {
if (res.errorCode == 1) {
this.$message({
message: '删除成功',
type: 'success',
duration: 1000
});
this.getThirdTag();
this.dispatch('member-tag', 'refersh-member-list');
// this.editVisiable = false;
}
})
.catch(err => {
console.log(err);
});
},
/**
* 添加手工标签
......
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