Skip to content

M
memberTag-web
Commit 69e8a3ce by wangyusheng
Options

Merge branch 'feature/文案修改' into 'master' 

Feature/文案修改

See merge request !21
parents dc90976d 0d0ecc5b
Showing with 25 additions and 13 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.5a1a8f4d8f739433474885018f4cc903.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.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.45.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.68.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.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/selector.1.2.20.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.9b183ccb7336de5b51a3.js></script><script type=text/javascript src=./static/js/vendor.ef3a75f3bbf430dacbb6.js></script><script type=text/javascript src=./static/js/app.75184f1dbb4afaf5e201.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.bc6fc32fd0df84b01c227c258844795b.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.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.45.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.68.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.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/selector.1.2.20.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.aa54f00048c44a08eb05.js></script><script type=text/javascript src=./static/js/vendor.ef3a75f3bbf430dacbb6.js></script><script type=text/javascript src=./static/js/app.75184f1dbb4afaf5e201.js></script></body></html>
\ No newline at end of file
dist/static/js/0.16ad2ed55e53901b1130.js → dist/static/js/0.6a19099e20f74c315f70.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/6.1fc582ec2e4a4135428c.js → dist/static/js/6.b9498a7d60bde6f6c774.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.9b183ccb7336de5b51a3.js → dist/static/js/manifest.aa54f00048c44a08eb05.js
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var o,d,b,i=0,u=[];i<c.length;i++)d=c[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(a&&a(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var c={},f={35:0};function n(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,n){a=f[e]=[c,n]});a[2]=c;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:"16ad2ed55e53901b1130",1:"8c70f0cb13618f18a13c",2:"8e54e863fa59b8a90b83",3:"4931078e8dee7ab3e4fe",4:"ecd6205873166f1df1af",5:"3d976675aae325af5173",6:"1fc582ec2e4a4135428c",7:"b2dc0cfbf5e2155d58fd",8:"cc3d308cb216a2cc8825",9:"e611ead9d5f383177972",10:"4d21b3886413df436f13",11:"1f03e3ab23d0dc69df7a",12:"2c8b2a5bf5a744e3db15",13:"cf60e659a31b615c5ce4",14:"e1a80e4a4532c4e8be53",15:"dfc5a96030093c1ed00b",16:"0d04608b2f40775007aa",17:"793285aebe33c6cfc9d0",18:"b56c9a4ae3fb5c2ff116",19:"4ed3c0524c55a7705ec5",20:"ff4bd7e2a636521cba02",21:"28e4332ef636a22426ab",22:"a30b9dbfe469da4a5830",23:"cc37b778686574aec82d",24:"996db5330fea43229fdf",25:"30f87ad2f1079650b1bc",26:"a2c10f5bafd0a7aeddd8",27:"c12eb8f712389d519826",28:"902a4f428b0383037593",29:"82810bb45021ba93543e",30:"a24f03c1e1e1adb42779",31:"4368b6f52dbc4175ffdc",32:"4810ffec77506f40440c"}[e]+".js";var o=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(o);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),c},n.m=e,n.c=c,n.d=function(e,a,c){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var o,d,b,i=0,u=[];i<c.length;i++)d=c[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(a&&a(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var c={},f={35:0};function n(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,n){a=f[e]=[c,n]});a[2]=c;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:"6a19099e20f74c315f70",1:"8c70f0cb13618f18a13c",2:"8e54e863fa59b8a90b83",3:"5ea4e5622b76975cb67f",4:"ecd6205873166f1df1af",5:"3d976675aae325af5173",6:"b9498a7d60bde6f6c774",7:"b2dc0cfbf5e2155d58fd",8:"fc83f7cd57f1ce8f6158",9:"e611ead9d5f383177972",10:"4d21b3886413df436f13",11:"1f03e3ab23d0dc69df7a",12:"2c8b2a5bf5a744e3db15",13:"cf60e659a31b615c5ce4",14:"e1a80e4a4532c4e8be53",15:"dfc5a96030093c1ed00b",16:"0d04608b2f40775007aa",17:"793285aebe33c6cfc9d0",18:"b56c9a4ae3fb5c2ff116",19:"4ed3c0524c55a7705ec5",20:"ff4bd7e2a636521cba02",21:"28e4332ef636a22426ab",22:"a30b9dbfe469da4a5830",23:"cc37b778686574aec82d",24:"996db5330fea43229fdf",25:"30f87ad2f1079650b1bc",26:"a2c10f5bafd0a7aeddd8",27:"c12eb8f712389d519826",28:"902a4f428b0383037593",29:"82810bb45021ba93543e",30:"a24f03c1e1e1adb42779",31:"4368b6f52dbc4175ffdc",32:"4810ffec77506f40440c"}[e]+".js";var o=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(o);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),c},n.m=e,n.c=c,n.d=function(e,a,c){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/tag/tag-config-options.vue
......@@ -1295,7 +1295,7 @@ export default {
* 会员分层
*/
if (data.templateCode == 'tag021') {
this.axios.get(`${this.baseUrl}/gic-member-tag-web/memberTagGrade/gradeList?requestProject=gic-member-tag-web`).then(res => {
this.axios.get(`${this.baseUrl}/gic-member-tag-web/memberTagGrade/gradeList?requestProject=gic-member-tag-web&type=1`).then(res => {
if (res.data.errorCode === 1) {
this.templateData[0].options = res.data.result;
}
......
src/view/memberGroup/memberGroupEdit.vue
......@@ -41,7 +41,7 @@
>
<div class="effective label-title">
分组有效期
<el-tooltip content="分组有效期需早于所用标签的最早有效期，且最长不超过365天">
<el-tooltip content="分组有效期需早于所用标签的最早有效期，且最长不超过730天">
<i class="form-tip-icon">i</i>
</el-tooltip>
</div>
......@@ -291,7 +291,7 @@ export default {
effectiveStatus: 1,
fixedType: 0, // 是否固化人群
fixedTime: parseTime(fixBeginTime, '{y}-{m}-{d}'), // 期初固化时间
fixedEndTime: parseTime(fixBeginTime + 365 * 24 * 3600 * 1000, '{y}-{m}-{d}'), // 期末固化时间
fixedEndTime: parseTime(fixBeginTime + 2 * 365 * 24 * 3600 * 1000, '{y}-{m}-{d}'), // 期末固化时间
},
refreshList: {},
......@@ -304,7 +304,7 @@ export default {
pickerOptions: {
disabledDate(time) {
let curDate = new Date().getTime();
let oneYear = 365 * 24 * 3600 * 1000;
let oneYear = 2 * 365 * 24 * 3600 * 1000;
let y = curDate + oneYear;
return time.getTime() < Date.now() - 8.64e7 || time.getTime() > y;
}
......@@ -742,7 +742,7 @@ export default {
this.ruleForm.memberTagGroupId = memberTagGroupId;
this.getGroupData();
} else {
let date = new Date(new Date().getTime() + 365 * 24 * 3600 * 1000);
let date = new Date(new Date().getTime() + 2 * 365 * 24 * 3600 * 1000);
let Y = date.getFullYear() + '-';
let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
let D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' ';
......
src/view/memberGroup/memberGroupList.vue
......@@ -84,6 +84,12 @@
</el-table-column>
<el-table-column label="期末固化人数" prop="memberCount"></el-table-column>
<el-table-column prop="state" label="状态" >
<template slot="header">
状态
<el-tooltip effect="dark" content="失效的实时分组仍然会更新人数，失效的非实时分组不再更新人数。新的营销活动无法选用失效的分组。如果某营销活动曾经选用了分组，分组到达有效期失效后，实时分组不影响活动的投放执行，非实时分组的活动则投放人群数据会清空。" placement="top">
<i class="el-icon-info"></i>
</el-tooltip>
</template>
<template slot-scope="scope">
<span :class="scope.row.effectiveStatus == 1 ? 'dm-status--success' : 'dm-status--error'"></span>
{{ scope.row.effectiveStatus == 1 ? '有效' : '失效' }}
......@@ -198,6 +204,12 @@
</template>
</el-table-column>
<el-table-column prop="state" label="状态" >
<template slot="header">
状态
<el-tooltip effect="dark" content="失效的实时分组仍然会更新人数，失效的非实时分组不再更新人数。新的营销活动无法选用失效的分组。如果某营销活动曾经选用了分组，分组到达有效期失效后，实时分组不影响活动的投放执行，非实时分组的活动则投放人群数据会清空。" placement="top">
<i class="el-icon-info"></i>
</el-tooltip>
</template>
<template slot-scope="scope">
<span :class="scope.row.effectiveStatus == 1 ? 'dm-status--success' : 'dm-status--error'"></span>
{{ scope.row.effectiveStatus == 1 ? '有效' : '失效' }}
......
src/view/platformTag/member-tag.vue
......@@ -85,7 +85,7 @@
<div class="form-item" :class="{ 'margin-60': marginSixty }">
<label for="">
分组有效期
<el-tooltip content="分组有效期需早于所用标签的最早有效期，且最长不超过365天">
<el-tooltip content="分组有效期需早于所用标签的最早有效期，且最长不超过730天">
<i class="form-tip-icon">i</i>
</el-tooltip>
</label>
......@@ -193,7 +193,7 @@ export default {
effectiveStatus: 1, // 有效状态nage
fixedType: 0, // 是否固化人群
fixedTime: parseTime(fixBeginTime, '{y}-{m}-{d}'), // 期初固化时间
fixedEndTime: parseTime(fixBeginTime + 365 * 24 * 3600 * 1000, '{y}-{m}-{d}'), // 期末固化时间
fixedEndTime: parseTime(fixBeginTime + 2 * 365 * 24 * 3600 * 1000, '{y}-{m}-{d}'), // 期末固化时间
},
activeTagsGroupIndex: 0,
activeTagIndex: 0,
......@@ -203,7 +203,7 @@ export default {
pickerOptions: {
disabledDate(time) {
let curDate = new Date().getTime();
let oneYear = 365 * 24 * 3600 * 1000;
let oneYear = 2 * 365 * 24 * 3600 * 1000;
let y = curDate + oneYear;
return time.getTime() < Date.now() - 8.64e7 || time.getTime() > y;
}
......@@ -330,7 +330,7 @@ export default {
},
// 设置默认的分组有效期
defaultDate() {
let date = new Date(new Date().getTime() + 365 * 24 * 3600 * 1000);
let date = new Date(new Date().getTime() + 2 * 365 * 24 * 3600 * 1000);
let Y = date.getFullYear() + '-';
let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
let D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' ';
......
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