Skip to content

M
memberTag-web
Commit a2974e2b by Kyle_Li
Options

Merge branch 'master' of http://115.159.76.241/memberTag/memberTag-web into bugfix

parents d19650c1 75f82545
Showing with 105 additions and 7 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.3d0825a4d0edd42e953a6bed6ebccc45.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/track.1.0.3.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.35.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.55.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.11.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.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.2.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.ef38904ba0f484283bb9.js></script><script type=text/javascript src=./static/js/vendor.4aa38b9b9bf3652c83db.js></script><script type=text/javascript src=./static/js/app.691c8f8ed94a31b20cb3.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.70ebcd8b08cdc43efccf274c62efd625.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/track.1.0.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.35.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.55.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.11.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.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.2.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.9ef05fa53773857d26d1.js></script><script type=text/javascript src=./static/js/vendor.4aa38b9b9bf3652c83db.js></script><script type=text/javascript src=./static/js/app.691c8f8ed94a31b20cb3.js></script></body></html>
dist/static/js/0.3a1c2bf6b61e77328553.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.4b29ba9c4e2102649dcc.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.ef38904ba0f484283bb9.js → dist/static/js/manifest.9ef05fa53773857d26d1.js
!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={34: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:"3a1c2bf6b61e77328553",1:"ff9a48317f8bf815760f",2:"4d84ab9d37131f010a80",3:"5da1d724dfccd39d2d98",4:"ced5fcaf9712644a24cc",5:"89043296be74bda1fbb9",6:"c0082e0760646e1b398f",7:"a0e2575a3cbd06cf747f",8:"03aacefe02ac1da31eec",9:"32877e1ab63375369274",10:"f554e888c1709956bad4",11:"c827777ffded659cfe9f",12:"91cd77fb402bcc20c476",13:"5e9fa2db703b47354a58",14:"fdf29b8ca338cce9942a",15:"999f87f7cd93f3f0f882",16:"65adc5156891f1b57717",17:"d0b5334e5282b4a8d1ac",18:"3ee77aca5a8e38a7ca47",19:"34e7b6016ac35b3b3bfb",20:"a2c75e6c2db8b72c0d78",21:"83a788ea16e7150c6503",22:"11cbc213457ffebe7ebf",23:"c24a9f56d0040598512c",24:"4ad2674933e6886df395",25:"7f79b0404f25fcd67f4f",26:"80e295efa02de6e5fb81",27:"ddb488688ceec6baa35c",28:"16762be5e95423ba5423",29:"1727f9e83db20ba57b45",30:"6a5ee2a1c27c5a16c485",31:"4581161a7b4779f896f3"}[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
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,t){for(var o,b,d,i=0,u=[];i<a.length;i++)b=a[i],f[b]&&u.push(f[b][0]),f[b]=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++)d=n(n.s=t[i]);return d};var a={},f={34: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:"4b29ba9c4e2102649dcc",1:"ff9a48317f8bf815760f",2:"eb5ff43372cfccd8a58b",3:"5da1d724dfccd39d2d98",4:"ced5fcaf9712644a24cc",5:"89043296be74bda1fbb9",6:"c0082e0760646e1b398f",7:"a0e2575a3cbd06cf747f",8:"03aacefe02ac1da31eec",9:"32877e1ab63375369274",10:"f554e888c1709956bad4",11:"c827777ffded659cfe9f",12:"91cd77fb402bcc20c476",13:"5e9fa2db703b47354a58",14:"fdf29b8ca338cce9942a",15:"999f87f7cd93f3f0f882",16:"65adc5156891f1b57717",17:"d0b5334e5282b4a8d1ac",18:"3ee77aca5a8e38a7ca47",19:"34e7b6016ac35b3b3bfb",20:"a2c75e6c2db8b72c0d78",21:"83a788ea16e7150c6503",22:"11cbc213457ffebe7ebf",23:"c24a9f56d0040598512c",24:"4ad2674933e6886df395",25:"7f79b0404f25fcd67f4f",26:"80e295efa02de6e5fb81",27:"ddb488688ceec6baa35c",28:"16762be5e95423ba5423",29:"1727f9e83db20ba57b45",30:"6a5ee2a1c27c5a16c485",31:"4581161a7b4779f896f3"}[e]+".js";var o=setTimeout(b,12e4);function b(){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=b,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
......@@ -686,6 +686,34 @@
<!-- <vue-gic-selector ref="selector" @changelist="changelist"></vue-gic-selector> -->
</div>
<!-- 单笔消费商品数量 -->
<div v-if="parent.templateCode == 'com025'">
<div class="m-b-20" :key="'tag2' + pindex">
商品数量
<el-select v-model="parent.symbol" placeholder="请选择" style="width: 100px;margin:0 10px">
<el-option
v-for="item in parent.options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<div style="display: inline-block" v-if="parent.symbol == '区间'">
<el-input :value="parent.numRange[0]" @input="v => $set(parent.numRange, 0, onInputNum(v))" @keyup.native="handleNumRangeEnd($event)" class="select-wrap-input" style="width: 100px;margin-right: 0;" placeholder="请输入数字"></el-input>
<label>-</label>
<el-input :value="parent.numRange[1]" @input="v => $set(parent.numRange, 1, onInputNum(v))" @keyup.native="handleNumRangeEnd($event)" class="select-wrap-input" style="width: 100px;margin-right: 10px;" placeholder="请输入数字"></el-input>
</div>
<div style="display: inline-block" v-if="parent.symbol != '区间'">
<el-input :value="parent.num" @input="v => $set(parent, 'num', onInputNum(v))" @keyup.native="handleNumRangeEnd($event)" class="select-wrap-input" style="width: 100px;margin-right: 10px;" placeholder="请输入数字"></el-input>
</div>
件
</div>
<p style="margin-bottom:15px">已选商品</p>
<vue-gic-goods-selector ref="selector" @changelist="changelist"></vue-gic-goods-selector>
</div>
<!-- 标签值 / 固定时间 / 之后时间 tag024 -->
<template v-if="parent.templateCode == 'tag024'">
<div class="m-b-20" :key="'tag24' + pindex">
......@@ -1023,6 +1051,7 @@ export default {
},
cardListData: [],
com024: {},
com025: {},
expiration: '1',
cardParams: {
startTime: '',
......@@ -1215,8 +1244,12 @@ export default {
for (let key in data) {
if (data.templateCode == 'com023') {
this[data.templateCode][key] = data[key];
} else if (data.templateCode == 'com025') {
this.com001[key] = data[key];
this.com022[key] = data[key];
} else {
this[data.templateCode][key] = data[key];
}
this[data.templateCode][key] = data[key];
}
// 如果是城市
if (data.templateCode === 'tag010') {
......@@ -1232,6 +1265,7 @@ export default {
data.widgetValues = JSON.parse(data.widgetValues);
// this[data.templateCode] = Object.create(null);
this[data.templateCode].options = data.widgetValues;
data.templateCode === 'com025' && (this.com001.options = data.widgetValues);
}
// 如果通过 url 获取
if (data.sourceFlag >> 0 === 1) {
......@@ -1252,6 +1286,8 @@ export default {
setTimeout(_ => {
this.templateData.push(this[data.templateCode]);
}, 200);
} else if (data.templateCode == 'com025') {
this.templateData.push({ ...this.com001, ...this.com022 });
} else {
this.templateData.push(this[data.templateCode]);
}
......@@ -1493,6 +1529,7 @@ export default {
// 回显数据
let tagValue = JSON.parse(this.templateDataList.tagValue);
let tagParams = JSON.parse(this.templateDataList.tagParams);
console.log(tagParams, tagValue)
let value = null;
let selectVal = null;
let checkedCount = null;
......@@ -1835,6 +1872,24 @@ export default {
}
break;
case 'com025':
if (tagParams.selectedVal[0].indexOf('区间') != -1) {
// 存在区间
this.templateData[0].symbol = '区间';
this.templateData[0].numRange = tagValue.val[0].data.value.split(',');
} else if (tagParams.template[0].symbol == void 0) {
this.templateData[0].symbol = '区间';
this.templateData[0].numRange = tagParams.template[0].numRange;
} else {
this.templateData[0].symbol = tagParams.template[0].symbol;
this.templateData[0].num = tagValue.val[0].data.value;
}
this.$nextTick(() => {
this.$refs.selector[0].conditions = JSON.parse(JSON.stringify(tagParams.conditionList));
})
break;
// case 'tag021':
// value = tagValue.val[0].data.value.split(' ');
// for (let i = 0; i < this.templateData.length; i++) {
......
src/components/tagDetail/mixin/index.js
......@@ -787,6 +787,50 @@ export default {
}
}
/* com025 单笔消费商品数量 */
if (code === 'com025') {
const { symbol, num, numRange } = that.templateData[0];
tagValue.val[0].data.compute = symbol == '区间' ? 'between' : symbol;
if (symbol != '区间') {
if (!num) {
this.$message.warning({
message: '请完善区间值！'
});
return false;
}
tagValue.val[0].data.value = num;
} else {
if (!numRange[0] || !numRange[1]) {
this.$message.warning({
message: '请完善区间值！'
});
return false;
}
tagValue.val[0].data.value = `${numRange[0]},${numRange[1]}`;
}
let computeSymbol = tagValue.val[0].data.compute == 'between' ? '区间' : tagValue.val[0].data.compute;
this.postTemplateData.selectedVal.push(`${computeSymbol}${tagValue.val[0].data.value}`);
await this.confirmSelector();
if (!this.com022.selectList || !this.com022.selectList.length) {
this.$message.warning('商品选择器未选择条件！')
return false;
}
console.log(this.com022.conditionsList);
tagValue.val.push({
type: 'data', //类型
data: {
key: this.currentKey,
compute: this[code].postCompute,
value: this.com022.finalId,
dealKey: 'goodsSeletor'
}
})
let abbr = this.translateAbbrinfo(this.com022.abbrInfo);
this.postTemplateData.selectedVal.push(abbr.join(' '));
this.postTemplateData.conditionList = this.com022.conditionsList;
}
/* 属于/不属于+ 选项 */
if (that.templateData.length == 2) {
......
src/config/index.js
......@@ -17,8 +17,8 @@ export const aliasNames = [
{ name: '核心流失', title: '曾经是核心活跃、核心边缘、核心沉睡的会员，现在却流失为潜力会员的人群。'},
{ name: '潜力流失', title: '除核心会员、普通会员、未消费会员之外的其他会员且消费休眠天数>366天' },
{ name: '普通流失', title: '会员历史累计消费，消费次数等于1且消费休眠天数>366天' },
{ name: '有微信未消费会员', title: '会员历史累计消费，消费次数等于0' },
{ name: '有手机号未消费会员', title: '会员历史累计消费，消费次数等于0' },
{ name: '微信会员中未消费会员', title: '会员历史累计消费，消费次数等于0' },
{ name: 'POS会员中未消费会员', title: '会员历史累计消费，消费次数等于0' },
{ name: '核心会员', title: '会员近一年，消费次数≥3次，消费总额≥3倍商户去年平均客单价' },
{ name: '潜力会员', title: '除核心会员、普通会员、未消费会员之外的其他会员' },
{ name: '普通会员', title: '会员历史累计消费，消费次数等于1' },
......
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