Skip to content

M
memberTag-web
Commit 6300b11e by Kyle_Li
Options

Merge branch 'dev' of http://115.159.76.241/memberTag/memberTag-web

parents bb35dcf4 b57e31a5
Showing with 128 additions and 9 deletions
dist/index.html
<<<<<<< HEAD
<<<<<<< HEAD
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-会员标签</title><link href=./static/css/app.f316ee18d54228024c84577007cffc3f.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.30.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.51.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.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.1.95.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script type=text/javascript src=./static/js/manifest.9c6a6ddd5d09b5c2c391.js></script><script type=text/javascript src=./static/js/vendor.0f3101bbd902a62a341f.js></script><script type=text/javascript src=./static/js/app.e65aecd48d5decc618c0.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.f05053e18170d845f8f4280b2c0ca1a1.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.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.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.1.95.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script type=text/javascript src=./static/js/manifest.95e8dcdff7d649b71234.js></script><script type=text/javascript src=./static/js/vendor.4aa38b9b9bf3652c83db.js></script><script type=text/javascript src=./static/js/app.874fe4e33ce7ce37428d.js></script></body></html>
>>>>>>> ff0a1ca0c8978ec238590a893997259d378625a0
=======
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-会员标签</title><link href=./static/css/app.f78746411e6b392c1eae99acf93f0f8e.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.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.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.1.95.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script type=text/javascript src=./static/js/manifest.c74b41301119f53a679d.js></script><script type=text/javascript src=./static/js/vendor.4aa38b9b9bf3652c83db.js></script><script type=text/javascript src=./static/js/app.874fe4e33ce7ce37428d.js></script></body></html>
>>>>>>> b57e31a50e7c8b21321dffaefea6663594236a67
dist/static/js/0.78b447d5e0679fc9216a.js → dist/static/js/0.b97b0c7878d418739d15.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.95e8dcdff7d649b71234.js → dist/static/js/manifest.c74b41301119f53a679d.js
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,f){for(var o,b,d,i=0,u=[];i<a.length;i++)b=a[i],n[b]&&u.push(n[b][0]),n[b]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(c&&c(a,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)d=r(r.s=f[i]);return d};var a={},n={34: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 t=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,r.nc&&f.setAttribute("nonce",r.nc),f.src=r.p+"static/js/"+e+"."+{0:"78b447d5e0679fc9216a",1:"1a66f3452cb905b67755",2:"1e821bca0bf41785011d",3:"6d47633c055d15efc02c",4:"76c2c1a5d7c12ba68fc8",5:"8d932affff1c7e086979",6:"245e8fc8e7be2823799e",7:"463c410b570dea893bef",8:"00c99a671866c96c95b7",9:"d6e86c55d9ed30932539",10:"921af27f26a9d92cd622",11:"7696c743e78e8fa58ee3",12:"b9471a24276d301a1e38",13:"4cbb12cbf7a9b8c30ba8",14:"012b850d5f8cb0572383",15:"3917aa09ec184a6ec064",16:"8b5816be3cf77b0756a0",17:"b43a253e53779917cbec",18:"16936cf5d39aeb5c8313",19:"308e228686726571bdcf",20:"41af8655086750d6262e",21:"938961d07778dc041c56",22:"1f5fb7a3cf35a2d10b33",23:"5cd622ab4c1b1afa3f6f",24:"babff488cb202e2e3303",25:"75fb7d5b168203653102",26:"b708c6b0a0da9bd559cf",27:"a91f14144ead01b55416",28:"7e8ce9ee59e705c91770",29:"14583ddcefc3b8dbbad1",30:"6a5ee2a1c27c5a16c485",31:"4581161a7b4779f896f3"}[e]+".js";var o=setTimeout(b,12e4);function b(){f.onerror=f.onload=null,clearTimeout(o);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=b,t.appendChild(f),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
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,o){for(var f,b,d,i=0,u=[];i<a.length;i++)b=a[i],n[b]&&u.push(n[b][0]),n[b]=0;for(f in t)Object.prototype.hasOwnProperty.call(t,f)&&(e[f]=t[f]);for(c&&c(a,t,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)d=r(r.s=o[i]);return d};var a={},n={34: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 t=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,r.nc&&o.setAttribute("nonce",r.nc),o.src=r.p+"static/js/"+e+"."+{0:"b97b0c7878d418739d15",1:"1a66f3452cb905b67755",2:"1e821bca0bf41785011d",3:"6d47633c055d15efc02c",4:"8dfd6117e7c92ae426ab",5:"548f1789aef0bbd2892a",6:"29df07515498677ffca6",7:"463c410b570dea893bef",8:"00c99a671866c96c95b7",9:"d6e86c55d9ed30932539",10:"921af27f26a9d92cd622",11:"7696c743e78e8fa58ee3",12:"b9471a24276d301a1e38",13:"4cbb12cbf7a9b8c30ba8",14:"012b850d5f8cb0572383",15:"3917aa09ec184a6ec064",16:"8b5816be3cf77b0756a0",17:"b43a253e53779917cbec",18:"16936cf5d39aeb5c8313",19:"308e228686726571bdcf",20:"41af8655086750d6262e",21:"938961d07778dc041c56",22:"1f5fb7a3cf35a2d10b33",23:"5cd622ab4c1b1afa3f6f",24:"babff488cb202e2e3303",25:"75fb7d5b168203653102",26:"b708c6b0a0da9bd559cf",27:"a91f14144ead01b55416",28:"7e8ce9ee59e705c91770",29:"14583ddcefc3b8dbbad1",30:"6a5ee2a1c27c5a16c485",31:"4581161a7b4779f896f3"}[e]+".js";var f=setTimeout(b,12e4);function b(){o.onerror=o.onload=null,clearTimeout(f);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return o.onerror=o.onload=b,t.appendChild(o),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/tag-config-options.vue
......@@ -666,6 +666,38 @@
<vue-gic-goods-selector ref="selector" @changelist="changelist"></vue-gic-goods-selector>
<!-- <vue-gic-selector ref="selector" @changelist="changelist"></vue-gic-selector> -->
</div>
<!-- 标签值 / 固定时间 / 之后时间 tag024 -->
<template v-if="parent.templateCode == 'tag024'">
<div class="m-b-20" :key="'tag24' + pindex">
<div>
<el-radio v-model="parent.radio" label="1">固定时段</el-radio>
<el-radio v-model="parent.radio" label="2">之后时段</el-radio>
</div>
<!-- 固定时段 -->
<div class="m-t-18 w-500 h-80 fixed-date-picker border-box bg-f3f6f9">
<label class="inline-block middle label-unit m-r-8" v-if="parent.radio == 1">时间范围</label
><el-date-picker
v-model="parent.dateRangeValue"
v-if="parent.radio == 1"
type="daterange"
:editable="false"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
format="yyyy-MM-dd"
value-format="yyyyMMdd"
:picker-options="tag024Options"
><!-- :picker-options="pickerOptions" -->
</el-date-picker>
<div v-if="parent.radio == 2">
<label class="inline-block middle label-unit m-r-8">之后</label
><el-input v-model="parent.afterday" placeholder="请输入" class="w-90 m-r-8" @blur="value => toEditInput(value, 'afterday', parent)"></el-input
><label class="inline-block middle label-unit">天</label>
</div>
</div>
</div>
</template>
</div>
</div>
</template>
......@@ -678,7 +710,7 @@ import VueGicCard from '@/components/card/card';
import { getTagType, findWidget, findOndJson } from '@/request/tagConfig';
// 两个数字区间 numRange [0, 1]
const templateCode = ['tag001', 'tag002', 'tag003', 'tag004', 'tag005', 'tag006', 'tag007', 'tag008', 'tag009', 'tag010', 'tag011', 'tag012', 'tag013', 'tag014', 'tag015', 'tag016', 'tag017', 'tag018'];
const templateCode = ['tag001', 'tag002', 'tag003', 'tag004', 'tag005', 'tag006', 'tag007', 'tag008', 'tag009', 'tag010', 'tag011', 'tag012', 'tag013', 'tag014', 'tag015', 'tag016', 'tag017', 'tag018', 'tag024'];
/**
* checkeditems 多选框
......@@ -925,6 +957,16 @@ export default {
com023: {
},
tag024: {
radio: '1',
dateRangeValue: [],
afterday: ''
},
tag024Options: {
disabledDate(time) {
return time.getTime() < new Date(new Date().toLocaleDateString()).getTime();
}
},
cardListData: []
};
},
......
src/components/tagDetail/mixin/index.js
......@@ -914,6 +914,26 @@ export default {
});
that.postTemplateData.selectedVal.push(that.postTemplateData.selectedVal.join(','));
}
if (ele.templateCode === 'tag024') {
if (ele.radio == 1 && !ele.dateRangeValue.length) {
returnFlag = false;
}
if (ele.radio == 2 && !ele.afterday) {
returnFlag = false;
}
if (ele.radio == 1) {
tagValue.time[0].type = 'between';
tagValue.time[0].value = ele.dateRangeValue.join(',');
that.postTemplateData.selectedVal.push(`时间范围为${ele.dateRangeValue[0]} 至 ${ele.dateRangeValue[1]}`);
}
// tagValue.val[0].data.compute = ele.postCompute;
if (ele.radio == 2) {
tagValue.time[0].type = 'afterday';
tagValue.time[0].value = String(ele.afterday);
that.postTemplateData.selectedVal.push(`时间范围为之后 ${ele.afterday} 天`);
}
}
}
}
......
src/view/memberGroup/memberGroupDetail.vue
......@@ -10,7 +10,10 @@
<span>{{ separator(total) }}</span>
人
</span>
<el-button type="primary" class="down-member-list__btn" @click="downMemberListPop.show = true" v-if="downMemberListPop.canDown">人群导出</el-button>
<el-button type="primary" class="down-member-list__btn" @click="downMemberListPop.show = true" v-if="downMemberListPop.canDown && total < 1000000">人群导出</el-button>
<el-tooltip v-else-if="downMemberListPop.canDown" class="item" effect="dark" content="每张报表导出人数限制为100万，大于100万的人群会自动拆分为多张报表进行导出" placement="top">
<el-button type="primary" class="down-member-list__btn" @click="downMemberListPop.show = true" v-if="downMemberListPop.canDown">人群导出</el-button>
</el-tooltip>
</div>
<div class="memberGroupDetail-wrap__head">
<span class="tag-selected-title">筛选标签</span>
......@@ -18,6 +21,16 @@
</div>
<div class="memberGroupDetail-wrap__table">
<el-input
class="w-220 m-r-8"
placeholder="请输入会员卡号、手机号"
prefix-icon="el-icon-search"
v-model="tagSearch"
clearable
style="margin: 20px 0"
@clear="clearSearch"
@keyup.enter.native="enterSearch"
/>
<el-table v-loading="loading" @sort-change="sortChange" :data="memberGroupDetailData" style="width: 100%">
<div v-for="item in selectedFields" :key="item.code">
<el-table-column
......@@ -349,7 +362,8 @@ export default {
},
baseUrl: '',
sortFiled: '',
order: ''
order: '',
tagSearch: ''
};
},
computed: {
......@@ -533,7 +547,8 @@ export default {
pageNum: that.currentPage,
pageSize: that.pageSize,
sortColName: that.sortFiled,
sortType: that.order
sortType: that.order,
search: that.tagSearch
};
getRequest('/member-tag-member/findMemberList.json', params)
.then(res => {
......@@ -557,6 +572,15 @@ export default {
that.loading = false;
});
},
clearSearch() {
this.tagSearch = '';
this.currentPage = 1;
this.getGroupDetail();
},
enterSearch() {
this.currentPage = 1;
this.getGroupDetail();
},
/**
* 点击信息跳转分组详情
*/
......
src/view/memberGroup/memberGroupList.vue
......@@ -211,6 +211,11 @@
{{ (scope.row.memberCount || 0) | formatNum }} 人
</template>
</el-table-column>
<el-table-column prop="appStatus" label="好办展示" >
<template slot-scope="scope">
<el-switch :active-value="1" :inactive-value="0" v-model="scope.row.appStatus" active-color="#1890ff" @change="switchAppStatus(scope.row.appStatus, scope.row)"> </el-switch>
</template>
</el-table-column>
<el-table-column label="操作" width="150px">
<template slot-scope="scope">
<router-link
......
src/view/memberGroup/memberLevelDetail.vue
......@@ -11,9 +11,22 @@
<span>{{ separator(total) }}</span>
人
</span>
<el-button type="primary" class="down-member-list__btn" @click="downMemberListPop.show = true" v-if="downMemberListPop.canDown">人群导出</el-button>
<el-button type="primary" class="down-member-list__btn" @click="downMemberListPop.show = true" v-if="downMemberListPop.canDown && total < 1000000">人群导出</el-button>
<el-tooltip v-else-if="downMemberListPop.canDown" class="item" effect="dark" content="每张报表导出人数限制为100万，大于100万的人群会自动拆分为多张报表进行导出" placement="top">
<el-button type="primary" class="down-member-list__btn" @click="downMemberListPop.show = true" v-if="downMemberListPop.canDown">人群导出</el-button>
</el-tooltip>
</div>
<div class="memberGroupDetail-wrap__table">
<el-input
class="w-220 m-r-8"
placeholder="请输入会员卡号、手机号"
prefix-icon="el-icon-search"
v-model="tagSearch"
clearable
style="margin: 20px 0"
@clear="clearSearch"
@keyup.enter.native="enterSearch"
/>
<el-table v-loading="loading" @sort-change="sortChange" :data="memberGroupDetailData" style="width: 100%">
<div v-for="item in selectedFields" :key="item.code">
<el-table-column
......@@ -350,7 +363,8 @@ export default {
},
baseUrl: '',
sortFiled: '',
order: ''
order: '',
tagSearch: ''
};
},
computed: {
......@@ -542,7 +556,8 @@ export default {
pageSize: this.pageSize,
pageName: 'memberSign',
sortColName: that.sortFiled,
sortType: that.order
sortType: that.order,
search: that.tagSearch
};
getRequest('/member-tag-member/findMemberList.json', params)
.then(res => {
......@@ -563,6 +578,15 @@ export default {
that.loading = false;
});
},
clearSearch() {
this.tagSearch = '';
this.currentPage = 1;
this.getGroupDetail();
},
enterSearch() {
this.currentPage = 1;
this.getGroupDetail();
},
/**
* 点击信息跳转分组详情
*/
......
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