Skip to content

M
memberTag-web
Commit 1d188db6 by wangyusheng
Options

Merge branch 'feature/文案换行' into 'master' 

Feature/文案换行

See merge request !24
parents 69af140d aa2b79d5
Showing with 18 additions and 6 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.811d677c0b9b2fbf9d3bce246c0884f8.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.71.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.cd10bb6b4ae1b689edb4.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.811d677c0b9b2fbf9d3bce246c0884f8.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.71.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.078649c7dae9158c058a.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/manifest.cd10bb6b4ae1b689edb4.js → dist/static/js/manifest.078649c7dae9158c058a.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:"a7a7f4ae74e5efc3cdac",1:"8c70f0cb13618f18a13c",2:"d90ced7ebedb6550da74",3:"42bd10d121e1926b261c",4:"ecd6205873166f1df1af",5:"3d976675aae325af5173",6:"ba3cfcdf390125751ad3",7:"a3de6e99972868700eeb",8:"52f385701244b6096300",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:"8a6af65d31e07f05f60b",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:"a7a7f4ae74e5efc3cdac",1:"8c70f0cb13618f18a13c",2:"d90ced7ebedb6550da74",3:"42bd10d121e1926b261c",4:"ecd6205873166f1df1af",5:"3d976675aae325af5173",6:"0a0b05053c05de09cbe1",7:"a3de6e99972868700eeb",8:"52f385701244b6096300",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:"8a6af65d31e07f05f60b",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/view/memberGroup/memberGroupList.vue
......@@ -86,7 +86,13 @@
<el-table-column prop="state" label="状态" >
<template slot="header">
状态
<el-tooltip effect="dark" content="失效的实时分组仍然会更新人数，失效的非实时分组不再更新人数。新的营销活动无法选用失效的分组。如果某营销活动曾经选用了分组，分组失效后，实时分组不影响活动的投放执行，非实时分组的活动则投放人群数据会清空（手动失效的会立马清空，当天内手动恢复有效则投放人数保留，但到期失效的待次日清空）。另外失效后隔天手动恢复有效，需要等待次日更新投放人数。" placement="top">
<el-tooltip effect="dark" placement="top">
<div slot="content">
<p>失效的实时分组仍然会更新人数，失效的非实时分组不再更新人数。</p>
<p>新的营销活动无法选用失效的分组。</p>
<p>如果某营销活动曾经选用了分组，分组失效后，实时分组不影响活动的投放执行，非实时分组的活动则投放人群数据会清空（手动失效的会立马清空，当天内手动恢复有效则投放人数保留，但到期失效的待次日清空）。</p>
<p>另外失效后隔天手动恢复有效，需要等待次日更新投放人数。</p>
</div>
<i class="el-icon-info"></i>
</el-tooltip>
</template>
......@@ -206,7 +212,13 @@
<el-table-column prop="state" label="状态" >
<template slot="header">
状态
<el-tooltip effect="dark" content="失效的实时分组仍然会更新人数，失效的非实时分组不再更新人数。新的营销活动无法选用失效的分组。如果某营销活动曾经选用了分组，分组失效后，实时分组不影响活动的投放执行，非实时分组的活动则投放人群数据会清空（手动失效的会立马清空，当天内手动恢复有效则投放人数保留，但到期失效的待次日清空）。另外失效后隔天手动恢复有效，需要等待次日更新投放人数。" placement="top">
<el-tooltip effect="dark" placement="top">
<div slot="content">
<p>失效的实时分组仍然会更新人数，失效的非实时分组不再更新人数。</p>
<p>新的营销活动无法选用失效的分组。</p>
<p>如果某营销活动曾经选用了分组，分组失效后，实时分组不影响活动的投放执行，非实时分组的活动则投放人群数据会清空（手动失效的会立马清空，当天内手动恢复有效则投放人数保留，但到期失效的待次日清空）。</p>
<p>另外失效后隔天手动恢复有效，需要等待次日更新投放人数。</p>
</div>
<i class="el-icon-info"></i>
</el-tooltip>
</template>
......
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