Skip to content

M
memberTag-web
Commit ec4d60bc by chenxin
Options

Merge branch 'dev' 

# Conflicts:
#	dist/index.html
#	dist/static/js/0.407fb5c48c34d8247062.js
#	dist/static/js/0.7b905854afaa7e4a0fb4.js
#	dist/static/js/0.ccebe39882bf184f9601.js
#	dist/static/js/2.0fea043107c233dc7f1c.js
#	dist/static/js/2.74e9c4e527cb42a6b5f1.js
#	dist/static/js/2.fd1cb20736c7c295dbf3.js
parents 112d987a bc3906a2
Showing with 12 additions and 12 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.628efe9d920680073b4dededa7fe1cef.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.11.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 src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.41219d4c17aa18c9e604.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.628efe9d920680073b4dededa7fe1cef.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.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.449f0ac1917cf75d633a.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
dist/static/js/0.407fb5c48c34d8247062.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.ccebe39882bf184f9601.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.41219d4c17aa18c9e604.js → dist/static/js/manifest.449f0ac1917cf75d633a.js
!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:"407fb5c48c34d8247062",1:"ff9a48317f8bf815760f",2:"74e9c4e527cb42a6b5f1",3:"4055418b88a9214bd546",4:"d17b0665c4456542e03d",5:"f8c399a3cc0b6cc01af5",6:"d84e83105075dbb7bb54",7:"87b4f4fd09a8d7935d8c",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:"df847e4be472ba46982c",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
!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:"ccebe39882bf184f9601",1:"ff9a48317f8bf815760f",2:"fd1cb20736c7c295dbf3",3:"4055418b88a9214bd546",4:"d17b0665c4456542e03d",5:"2827843056ab0544225e",6:"d84e83105075dbb7bb54",7:"87b4f4fd09a8d7935d8c",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:"df847e4be472ba46982c",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
index.html
......@@ -27,7 +27,7 @@
<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.1.95.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>
</body>
......
src/config/index.js
......@@ -5,13 +5,13 @@ export const baseUrl = host.indexOf('localhost') > '-1' ? 'http://gicdev.demogic
export const ERR_OK = 0;
export const aliasNames = [
{ name: '核心活跃', title: '会员近一年，消费次数≥3次，消费总额≥3倍商户去年会员平均客单价且消费休眠天数为0-90天'},
{ name: '核心活跃', title: '会员近一年，消费次数≥3次，消费总额≥3倍商户去年平均客单价且消费休眠天数为0-90天'},
{ name: '潜力活跃', title: '除核心会员、普通会员、未消费会员之外的其他会员且消费休眠天数为0-90天' },
{ name: '普通活跃', title: '会员历史累计消费，消费次数等于1且消费休眠天数为0-90天' },
{ name: '核心边缘', title: '会员近一年，消费次数≥3次，消费总额≥3倍商户去年会员平均客单价且消费休眠天数为91-180天'},
{ name: '核心边缘', title: '会员近一年，消费次数≥3次，消费总额≥3倍商户去年平均客单价且消费休眠天数为91-180天'},
{ name: '潜力边缘', title: '除核心会员、普通会员、未消费会员之外的其他会员且消费休眠天数为91-180天' },
{ name: '普通边缘', title: '会员历史累计消费，消费次数等于1且消费休眠天数为91-180天' },
{ name: '核心沉睡', title: '会员近一年，消费次数≥3次，消费总额≥3倍商户近一年会员平均客单价且消费休眠天数为181-366天'},
{ name: '核心沉睡', title: '会员近一年，消费次数≥3次，消费总额≥3倍商户近一年平均客单价且消费休眠天数为181-366天'},
{ name: '潜力沉睡', title: '除核心会员、普通会员、未消费会员之外的其他会员且消费休眠天数为181-366天' },
{ name: '普通沉睡', title: '会员历史累计消费，消费次数等于1且消费休眠天数为181-366天' },
{ name: '核心流失', title: '曾经是核心活跃、核心边缘、核心沉睡的会员，现在却流失为潜力会员的人群。'},
......@@ -19,7 +19,7 @@ export const aliasNames = [
{ name: '普通流失', title: '会员历史累计消费，消费次数等于1且消费休眠天数>366天' },
{ name: '有微信未消费会员', title: '会员历史累计消费，消费次数等于0' },
{ name: '有手机号未消费会员', title: '会员历史累计消费，消费次数等于0' },
{ name: '核心会员', title: '会员近一年，消费次数≥3次，消费总额≥3倍商户去年会员平均客单价' },
{ name: '核心会员', title: '会员近一年，消费次数≥3次，消费总额≥3倍商户去年平均客单价' },
{ name: '潜力会员', title: '除核心会员、普通会员、未消费会员之外的其他会员' },
{ name: '普通会员', title: '会员历史累计消费，消费次数等于1' },
{ name: '未消费会员', title: '会员历史累计消费，消费次数等于0' }
......
src/view/memberGroup/memberGroupList.vue
......@@ -196,14 +196,14 @@
<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 prop="createTime" label="创建时间">
<el-table-column prop="createTime" min-width="120px" label="创建时间">
<template slot-scope="scope">
<p class="h-18">{{ scope.row.createTime | formatTimeYMD }}</p>
<p class="h-18">{{ scope.row.createTime | formatTimeHMS }}</p>
</template>
</el-table-column>
<el-table-column prop="recentUpdateDate" label="到期时间">
<el-table-column prop="recentUpdateDate" min-width="120px" label="到期时间">
<template slot-scope="scope">
<p class="h-18">{{ scope.row.effectiveDate | formatTimeYMD }}</p>
<p class="h-18">{{ scope.row.effectiveDate | formatTimeHMS }}</p>
......@@ -592,7 +592,7 @@ export default {
if (tag) {
refershMemberCount(param).then(res => {
if (res.errorCode == 1) {
this._getTagLists();
this._gradeList(this.memberTagGradeId);
this.$message.success({message: '更新成功'});
}
});
......
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