Skip to content

M
memberTag-web
Commit ef1bb1ef by liuchenxi
Options

Merge branch 'master' into feature/4月会员分组

parents 5463f673 1828b964
Showing with 12 additions and 9 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./static/img/favicon.ico><title></title><link rel=stylesheet href=//at.alicdn.com/t/font_688955_99jmfacmlpp.css><link rel=stylesheet href=//at.alicdn.com/t/font_3276801_mkhlaisq2aq.css><script src=//at.alicdn.com/t/font_3276801_w3vkjjmzzz.js></script><link rel="shortcut icon" href=./favicon.ico><link href=./static/css/app.158bc0a7f5cf4e1332dbd561f5ef4717.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./static/img/favicon.ico><title></title><link rel=stylesheet href=//at.alicdn.com/t/font_688955_99jmfacmlpp.css><link rel=stylesheet href=//at.alicdn.com/t/font_3276801_mkhlaisq2aq.css><script src=//at.alicdn.com/t/font_3276801_w3vkjjmzzz.js></script><link rel="shortcut icon" href=./favicon.ico><link href=./static/css/app.90aefd93a5af9fd111a7b0a697d9701c.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
var src = '/component/static/import-component.js?timestrap='+ new Date().getTime();
var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
document.write('<script src="//'+ host + src +'"><\/script>')
})()</script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.3b926c2fbe7384527597.js></script><script type=text/javascript src=./static/js/vendor.ecce21da6a46da8c2fc4.js></script><script type=text/javascript src=./static/js/app.d2b294503428f3d76dd9.js></script></body></html>
\ No newline at end of file
})()</script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.61219aab2da47cd7b339.js></script><script type=text/javascript src=./static/js/vendor.ecce21da6a46da8c2fc4.js></script><script type=text/javascript src=./static/js/app.d2b294503428f3d76dd9.js></script></body></html>
\ No newline at end of file
dist/static/js/manifest.3b926c2fbe7384527597.js → dist/static/js/manifest.61219aab2da47cd7b339.js
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,t){for(var b,d,o,i=0,u=[];i<a.length;i++)d=a[i],f[d]&&u.push(f[d][0]),f[d]=0;for(b in r)Object.prototype.hasOwnProperty.call(r,b)&&(e[b]=r[b]);for(c&&c(a,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)o=n(n.s=t[i]);return o};var a={},f={42: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:"ee8213667463b1cfa618",1:"a5b1143fb090193afa6f",2:"c2d5bc3d8ba5ba09479e",3:"74b4a435837319b8762f",4:"fad46d33156e6afeecbf",5:"0f395a886b33ffa77a9a",6:"84144a26d97167c03b89",7:"cbfb1c1422fe6c812024",8:"891bbc4365b8362d5195",9:"7cc1b38988e254182ad8",10:"1cbc7e505ef918253196",11:"cfa61640d1a3d8d26b48",12:"627b84a8deefd3515526",13:"a7457f18ef15d320b80c",14:"ea35b721a975949e21f9",15:"7f3864d659b15b05f7ea",16:"fd8e0aca022b16e268de",17:"edc3cc3dd7cd59974a35",18:"cfdc70af6a4d0ba00e02",19:"2b51bcd6bcb234699455",20:"98315f191344b8c65188",21:"1f6367e5dcf6de69a5bd",22:"4985a38ec89a12ab291d",23:"60311edadffd29177d1f",24:"ee5a8baed163b78150c1",25:"5ac24c863c71cc9e9d97",26:"6b02cfff60b50e5fc4f1",27:"739a35f148a9eb505125",28:"c1335f07037eb9226047",29:"14f81ba933c5f226b3e1",30:"b94d7e8d819f8d860023",31:"1b6daea2c89c92c8aa77",32:"0b93cbabeb545ac94ca1",33:"94cb64e271f6c931f454",34:"34bc9f66094e5019fbd6",35:"8ac5700a552e1de85952",36:"02247c7a9eccdb1b9dee",37:"fd86faa4c3c1209b3d18",38:"0fe6ac76000df142f343",39:"b99f2a7f59ecc2da15aa"}[e]+".js";var b=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(b);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 b,o,d,i=0,u=[];i<a.length;i++)o=a[i],f[o]&&u.push(f[o][0]),f[o]=0;for(b in r)Object.prototype.hasOwnProperty.call(r,b)&&(e[b]=r[b]);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={42: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:"ee8213667463b1cfa618",1:"a5b1143fb090193afa6f",2:"363b5142f0be0ffe6f9a",3:"455cb5dcc438275910ee",4:"fad46d33156e6afeecbf",5:"0f395a886b33ffa77a9a",6:"84144a26d97167c03b89",7:"cbfb1c1422fe6c812024",8:"891bbc4365b8362d5195",9:"7cc1b38988e254182ad8",10:"1cbc7e505ef918253196",11:"cfa61640d1a3d8d26b48",12:"627b84a8deefd3515526",13:"a7457f18ef15d320b80c",14:"ea35b721a975949e21f9",15:"7f3864d659b15b05f7ea",16:"fd8e0aca022b16e268de",17:"edc3cc3dd7cd59974a35",18:"cfdc70af6a4d0ba00e02",19:"2b51bcd6bcb234699455",20:"98315f191344b8c65188",21:"1f6367e5dcf6de69a5bd",22:"4985a38ec89a12ab291d",23:"60311edadffd29177d1f",24:"ee5a8baed163b78150c1",25:"5ac24c863c71cc9e9d97",26:"6b02cfff60b50e5fc4f1",27:"739a35f148a9eb505125",28:"c1335f07037eb9226047",29:"14f81ba933c5f226b3e1",30:"b94d7e8d819f8d860023",31:"1b6daea2c89c92c8aa77",32:"0b93cbabeb545ac94ca1",33:"94cb64e271f6c931f454",34:"34bc9f66094e5019fbd6",35:"8ac5700a552e1de85952",36:"02247c7a9eccdb1b9dee",37:"fd86faa4c3c1209b3d18",38:"4eb49e066fba130c61f9",39:"b99f2a7f59ecc2da15aa"}[e]+".js";var b=setTimeout(o,12e4);function o(){t.onerror=t.onload=null,clearTimeout(b);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=o,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/view/platformTag/member-tag.vue
......@@ -5,7 +5,7 @@
<div class="flex">
<el-tabs v-model="activeTag" @tab-click="handleClick">
<el-tab-pane label="系统标签" name="system" v-if="isShowSystem"></el-tab-pane>
<el-tab-pane label="手工标签" name="manual"></el-tab-pane>
<el-tab-pane label="手工标签" name="manual" ref="manualTab"></el-tab-pane>
<el-tab-pane label="活动标签" name="active"></el-tab-pane>
</el-tabs>
<a href="https://www.yuque.com/exnmlu/hpbb1c/cz27hs" target="_blank" class="help-doc">查看帮助文档</a>
......@@ -784,7 +784,9 @@ export default {
this.isShowSystem = res.result;
if(!res.result) {
this.activeTag='manual';
const manualTag = this.tagList.find(el => el.handTag == 1);
this.handTag = 1;
this.handleFristTag(manualTag);
};
})
}
......@@ -821,21 +823,22 @@ export default {
};
this.handTag = null;
this.groupId = '';
this.getTagList();
await this.getTagList();
await this.getShowSystem();
if (localStorage.getItem('groupId')) {
const hangObj = JSON.parse(localStorage.getItem('groupId'));
this.middleWareVariable = JSON.parse(JSON.stringify(hangObj));
if (!this.isShowSystem) return;
this.params.type = 1;
this.params.id = hangObj.id;
this.$store.commit('modiftTagName', this.tagName);
this.handTag = 1;
this.loadMemberTagList(this.params);
} else {
if (!this.isShowSystem) return;
this.loadMemberTagList(this.params);
this.$store.commit('modiftTagName', '我的用户');
}
this.getShowSystem()
},
mounted() {
this.$on('refersh-member-list', () => {
......
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