Skip to content

M
memberTag-web
Commit 5244bacc by caoyanzhi
Options

Merge branch 'bugfix/分组分类重复展示' into dev 

# Conflicts:
#	dist/index.html
#	dist/static/js/0.48d78dea395a5031ca51.js
#	dist/static/js/0.6b4fde95cab49ecdf424.js
#	dist/static/js/0.c4b6d6cb755f46a93f77.js
#	dist/static/js/16.39377a8da57579f55943.js
#	dist/static/js/18.04fef63821c104201b24.js
#	dist/static/js/19.2ceeb8623a25f9763541.js
#	dist/static/js/19.ae3b181f6954fec125b1.js
#	dist/static/js/20.b2ba64154f555459cc42.js
#	dist/static/js/21.1f6367e5dcf6de69a5bd.js
#	dist/static/js/21.9c7b0847654fea50f3ce.js
#	dist/static/js/22.02d8f41c5b349b9bc2fe.js
#	dist/static/js/22.4985a38ec89a12ab291d.js
#	dist/static/js/23.1e9aeacb85a469484d6e.js
#	dist/static/js/23.6db5fe3e35a647ae1bce.js
#	dist/static/js/23.f9901700d68e8164c0cf.js
#	dist/static/js/24.3127dcc0e9fe7ec479c1.js
#	dist/static/js/27.1c6697b57efbfbecc2af.js
#	dist/static/js/30.0485dd326e9d8731668e.js
#	dist/static/js/31.432001f131a2901f1cff.js
#	dist/static/js/31.8bb65ed0025e229ed6a6.js
#	dist/static/js/32.b6ac2827a57d12878f97.js
#	dist/static/js/34.89f7a562ee8c90e92752.js
#	dist/static/js/35.b78786dc240aad86aadf.js
#	dist/static/js/35.f6c7eb27d91ddb250e6d.js
#	dist/static/js/36.9de99ecb4d9b9240a7fb.js
#	dist/static/js/37.3f1678e0daa6df26e6b3.js
#	dist/static/js/38.b71e1f4f3b700ad59435.js
#	dist/static/js/38.e75f6177dda58cb3bf7c.js
#	dist/static/js/app.85e7bfa946248dbfe008.js
parents f0f6f77b 13a28176
Showing with 63 additions and 10 deletions
dist/index.html
<<<<<<< HEAD
<!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_2dxzdzrb3a7.css><link rel=stylesheet href=//at.alicdn.com/t/font_3276801_5bjk41qthxj.css><script src=//at.alicdn.com/t/font_3276801_5bjk41qthxj.js></script><link rel="shortcut icon" href=./favicon.ico><link href=./static/css/app.9c2a34ee46e833abdd8eab111cfc1e67.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_2dxzdzrb3a7.css><link rel=stylesheet href=//at.alicdn.com/t/font_3276801_5bjk41qthxj.css><script src=//at.alicdn.com/t/font_3276801_5bjk41qthxj.js></script><link rel="shortcut icon" href=./favicon.ico><link href=./static/css/app.060de8243467a29757f5063b5d3fcd6f.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() {
>>>>>>> bugfix/分组分类重复展示
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.e98a6661f9c448c30655.js></script><script type=text/javascript src=./static/js/vendor.42f883472a1fc4925cbd.js></script><script type=text/javascript src=./static/js/app.75c5f1f55153695d26a6.js></script></body></html>
\ No newline at end of file
<<<<<<< HEAD
})()</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.e98a6661f9c448c30655.js></script><script type=text/javascript src=./static/js/vendor.42f883472a1fc4925cbd.js></script><script type=text/javascript src=./static/js/app.75c5f1f55153695d26a6.js></script></body></html>
=======
})()</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.631ddd5d222abceceabf.js></script><script type=text/javascript src=./static/js/vendor.42f883472a1fc4925cbd.js></script><script type=text/javascript src=./static/js/app.85e7bfa946248dbfe008.js></script></body></html>
>>>>>>> bugfix/分组分类重复展示
dist/static/css/app.060de8243467a29757f5063b5d3fcd6f.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.48d78dea395a5031ca51.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.c4b6d6cb755f46a93f77.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/17.7fc06d9a260a3731587e.js → dist/static/js/16.fd8e0aca022b16e268de.js
webpackJsonp([17],{iHP3:function(t,a,e){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var i=e("Dd8w"),s=e.n(i),n=e("lRwf"),l=e.n(n),c=e("l6IN"),r=e("CUHN"),o=e("SJI6");l.a.component(c.CollapseTransition.name,c.CollapseTransition);var d={name:"tag-type",components:{SecondTag:r.default},props:{tagList:Object,activeTag:String},data:function(){return{list:{},typeName:"",editData:[]}},computed:s()({},Object(o.mapState)(["tagRealName"]),{tagName:function(){var t=this.activeTag;return"system"==t?"系统标签":"manual"==t?"手工标签":"活动标签"},isOtherTag:function(){return!["手工标签","活动标签"].includes(this.list.name)}}),methods:{handleFirstTag:function(){localStorage.setItem("jumpTag",""),this.$emit("handleFristTag",this.list)}},watch:{tagList:{immediate:!0,handler:function(t){this.list=t}}}},g={render:function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("div",{staticClass:"list"},[e("div",{staticClass:"first-tag"},[t.isOtherTag?e("div",{staticClass:"mb16"},[e("svg",{staticClass:"menu-icon",class:[{"icon-tag-light":t.list.name===t.tagRealName}],attrs:{"aria-hidden":"true"}},[e("use",{attrs:{"xlink:href":"#"+t.list.icon}})]),t._v(" "),e("span",{staticClass:"tag-name",class:{"icon-tag-light":t.list.name===t.tagRealName},on:{click:t.handleFirstTag}},[t._v(t._s(t.list.name))])]):t._e(),t._v(" "),e("el-collapseTransition",[e("div",{staticClass:"second-tag"},t._l(t.list.children,function(a,i){return e("second-tag",{key:i,attrs:{type:t.activeTag,list:a,"tag-name":t.tagName}})}),1)])],1)])},staticRenderFns:[]};var m=e("VU/8")(d,g,!1,function(t){e("ihKY")},"data-v-dbd83472",null);a.default=m.exports},ihKY:function(t,a){}});
\ No newline at end of file
webpackJsonp([16],{iHP3:function(t,a,e){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var i=e("Dd8w"),s=e.n(i),n=e("lRwf"),l=e.n(n),c=e("l6IN"),r=e("CUHN"),o=e("SJI6");l.a.component(c.CollapseTransition.name,c.CollapseTransition);var d={name:"tag-type",components:{SecondTag:r.default},props:{tagList:Object,activeTag:String},data:function(){return{list:{},typeName:"",editData:[]}},computed:s()({},Object(o.mapState)(["tagRealName"]),{tagName:function(){var t=this.activeTag;return"system"==t?"系统标签":"manual"==t?"手工标签":"活动标签"},isOtherTag:function(){return!["手工标签","活动标签"].includes(this.list.name)}}),methods:{handleFirstTag:function(){localStorage.setItem("jumpTag",""),this.$emit("handleFristTag",this.list)}},watch:{tagList:{immediate:!0,handler:function(t){this.list=t}}}},g={render:function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("div",{staticClass:"list"},[e("div",{staticClass:"first-tag"},[t.isOtherTag?e("div",{staticClass:"mb16"},[e("svg",{staticClass:"menu-icon",class:[{"icon-tag-light":t.list.name===t.tagRealName}],attrs:{"aria-hidden":"true"}},[e("use",{attrs:{"xlink:href":"#"+t.list.icon}})]),t._v(" "),e("span",{staticClass:"tag-name",class:{"icon-tag-light":t.list.name===t.tagRealName},on:{click:t.handleFirstTag}},[t._v(t._s(t.list.name))])]):t._e(),t._v(" "),e("el-collapseTransition",[e("div",{staticClass:"second-tag"},t._l(t.list.children,function(a,i){return e("second-tag",{key:i,attrs:{type:t.activeTag,list:a,"tag-name":t.tagName}})}),1)])],1)])},staticRenderFns:[]};var m=e("VU/8")(d,g,!1,function(t){e("ihKY")},"data-v-dbd83472",null);a.default=m.exports},ihKY:function(t,a){}});
\ No newline at end of file
dist/static/js/18.fc7b39b639440f1e05d3.js → dist/static/js/17.ee4ff30e9c5028d2ab9a.js
webpackJsonp([18],{BtI9:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=a("QOex"),r={name:"tag-container",mixins:[a("DMDI").a,n.a],props:{data:{type:Array,default:function(){return[]}},type:String,refersh:Object},data:function(){return{tableData:[],tagData:{}}},methods:{addTag:function(t){this.$emit("addTag",t)},handleTrackParam:function(t,e){var a={addTag:function(){return{data:{id:e.tagId,name:e.tagName}}}}[t];return{fn:function(){},data:a?a():{}}}},watch:{data:{immediate:!0,handler:function(t){this.tableData=t}},refersh:{immediate:!0,handler:function(t){if(t.changeRefersh){var e=this.tableData.findIndex(function(e){return t.tagId===e.tagId});this.tableData[e].refersh=!0}}}},computed:{getCodeAuth:function(){return this.$getButtonLimit(this.$buttonCode.memberTagCreateGroup)},getCode:function(){return this.$buttonCode.memberTagCreateGroup}}},o={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"tag-some-list"},[a("el-table",{attrs:{data:t.tableData}},[a("el-table-column",{attrs:{label:"标签名称",prop:"tagName","min-width":"120"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("span",{staticClass:"tag-name"},[t._v(t._s(e.row.tagName))]),t._v(" "),a("el-tooltip",{staticClass:"item",attrs:{effect:"dark",content:"添加标签",placement:"top"}},[t.getCodeAuth?a("i",{directives:[{name:"track",rawName:"v-track:common.click",value:t.handleTrackParam("addTag",e.row),expression:"handleTrackParam('addTag', scope.row)",arg:"common",modifiers:{click:!0}}],staticClass:"iconfont icon-tag-name icon-PlusOutlined",attrs:{"limit-code":t.getCode},on:{click:function(a){return t.addTag(e.row)}}}):t._e()])]}}])}),t._v(" "),"system"!=t.type?a("el-table-column",{attrs:{label:"覆盖人数",prop:"memberCount","min-width":"140","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[t._v("\n "+t._s(e.row.memberCount?(e.row.memberCount|t.formatNum)+"人":"--")+"\n ")]}}])},[a("template",{slot:"header"},[t._v("\n 覆盖人数\n "),a("el-popover",{attrs:{width:"260",trigger:"hover",placement:"top"}},[a("div",{staticStyle:{color:"#303133"}},[t._v("\n 标签下不同标签值可能覆盖相同的会员，因此此处“标签”覆盖人数去重显示（如“喜欢的颜色-白、红、黑、蓝”，某会员身上可能同时具备“白、黑”二种标签值）\n ")]),t._v(" "),a("i",{staticClass:"iconfont icon-QuestionCircleOutlined refresh",attrs:{slot:"reference"},slot:"reference"})])],1)],2):a("el-table-column",{attrs:{label:"是否实时",prop:"isActive","min-width":"40"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("span",[t._v(" "+t._s(1==e.row.isActive?"实时":"非实时")+" ")])]}}])}),t._v(" "),a("el-table-column",{attrs:{"min-width":"200",label:"标签描述",prop:"tagDescribe","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[t._v("\n "+t._s(e.row.tagDescribe||"--")+"\n ")]}}])})],1)],1)},staticRenderFns:[]};var i=a("VU/8")(r,o,!1,function(t){a("Qtbd")},"data-v-d555680c",null);e.default=i.exports},Qtbd:function(t,e){}});
\ No newline at end of file
webpackJsonp([17],{BtI9:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=a("QOex"),r={name:"tag-container",mixins:[a("DMDI").a,n.a],props:{data:{type:Array,default:function(){return[]}},type:String,refersh:Object},data:function(){return{tableData:[],tagData:{}}},methods:{addTag:function(t){this.$emit("addTag",t)},handleTrackParam:function(t,e){var a={addTag:function(){return{data:{id:e.tagId,name:e.tagName}}}}[t];return{fn:function(){},data:a?a():{}}}},watch:{data:{immediate:!0,handler:function(t){this.tableData=t}},refersh:{immediate:!0,handler:function(t){if(t.changeRefersh){var e=this.tableData.findIndex(function(e){return t.tagId===e.tagId});this.tableData[e].refersh=!0}}}},computed:{getCodeAuth:function(){return this.$getButtonLimit(this.$buttonCode.memberTagCreateGroup)},getCode:function(){return this.$buttonCode.memberTagCreateGroup}}},o={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"tag-some-list"},[a("el-table",{attrs:{data:t.tableData}},[a("el-table-column",{attrs:{label:"标签名称",prop:"tagName","min-width":"120"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("span",{staticClass:"tag-name"},[t._v(t._s(e.row.tagName))]),t._v(" "),a("el-tooltip",{staticClass:"item",attrs:{effect:"dark",content:"添加标签",placement:"top"}},[t.getCodeAuth?a("i",{directives:[{name:"track",rawName:"v-track:common.click",value:t.handleTrackParam("addTag",e.row),expression:"handleTrackParam('addTag', scope.row)",arg:"common",modifiers:{click:!0}}],staticClass:"iconfont icon-tag-name icon-PlusOutlined",attrs:{"limit-code":t.getCode},on:{click:function(a){return t.addTag(e.row)}}}):t._e()])]}}])}),t._v(" "),"system"!=t.type?a("el-table-column",{attrs:{label:"覆盖人数",prop:"memberCount","min-width":"140","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[t._v("\n "+t._s(e.row.memberCount?(e.row.memberCount|t.formatNum)+"人":"--")+"\n ")]}}])},[a("template",{slot:"header"},[t._v("\n 覆盖人数\n "),a("el-popover",{attrs:{width:"260",trigger:"hover",placement:"top"}},[a("div",{staticStyle:{color:"#303133"}},[t._v("\n 标签下不同标签值可能覆盖相同的会员，因此此处“标签”覆盖人数去重显示（如“喜欢的颜色-白、红、黑、蓝”，某会员身上可能同时具备“白、黑”二种标签值）\n ")]),t._v(" "),a("i",{staticClass:"iconfont icon-QuestionCircleOutlined refresh",attrs:{slot:"reference"},slot:"reference"})])],1)],2):a("el-table-column",{attrs:{label:"是否实时",prop:"isActive","min-width":"40"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("span",[t._v(" "+t._s(1==e.row.isActive?"实时":"非实时")+" ")])]}}])}),t._v(" "),a("el-table-column",{attrs:{"min-width":"200",label:"标签描述",prop:"tagDescribe","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[t._v("\n "+t._s(e.row.tagDescribe||"--")+"\n ")]}}])})],1)],1)},staticRenderFns:[]};var i=a("VU/8")(r,o,!1,function(t){a("Qtbd")},"data-v-d555680c",null);e.default=i.exports},Qtbd:function(t,e){}});
\ No newline at end of file
dist/static/js/19.4fcd3f0652be046eae2b.js 0 → 100644
webpackJsonp([19],{d5y4:function(t,e){},mmLS:function(t,e,i){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=i("Ch4/"),s=i("2CGT"),a={props:{visible:Boolean,data:{type:Object,default:function(){return{}}},type:String,title:String},data:function(){return{list:[],isOpenPage:!1,loading:!0}},computed:{desc:function(){return"deactive"==this.type?this.list.length?"当前分组正在被以下模块使用，失效后使用该分组的活动将匹配不到分组下的人群并且分组客户数据将同步清空，是否继续处理为失效？":"失效后非实时分组客户数据将同步清空，是否继续处理为失效？":this.list.length?"当前分组正在被以下模块使用，请先删除对应的内容后再来删除分组。":"删除后无法恢复，确认要删除该分组吗？"}},methods:{checkGroup:function(){var t=this;this.loading=!0;var e={memberTagGroupIds:this.data.memberTagGroupId,requestProject:"gic-member-tag-web",operateType:"deactive"==this.type?1:2};Object(s.n)(e).then(function(e){var i=e.errorCode,s=e.result;0!=i?n.a.errorMsg(e.data):t.list=s||[]}).finally(function(){return t.loading=!1})},onClose:function(){this.$emit("update:visible",!1),this.$emit("close")},onSubmit:function(){this.$emit("update:visible",!1),this.$emit("submit",this.data,this.type)},subWindowChange:function(){addEventListener("visibilitychange",this.visibleityWindowFn)},visibleityWindowFn:function(){!document.hidden&&this.isOpenPage&&this.checkGroup()}},watch:{visible:function(t){t&&this.checkGroup(),this.subWindowChange(),t||(removeEventListener("visibilitychange",this.visibleityWindowFn),this.isOpenPage=!1)}}},o={render:function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("el-dialog",{attrs:{visible:t.visible,"custom-class":"delete-dialog",width:"416px"},on:{"update:visible":function(e){t.visible=e},close:t.onClose}},[i("div",{staticClass:"dialog-content"},[i("i",{staticClass:"el-alert__icon el-icon-warning is-big icon"}),t._v(" "),i("h2",[t._v(t._s(t.title))]),t._v(" "),i("div",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}]},[i("p",{staticClass:"desc"},[t._v(t._s(t.desc))]),t._v(" "),t._l(t.list,function(e,n){return i("p",{key:n,staticClass:"item"},[i("a",{attrs:{href:e.businessLink,target:"_blank"},on:{click:function(e){t.isOpenPage=!0}}},[t._v(t._s(e.businessModuleName)+"-"+t._s(e.businessName))])])}),t._v(" "),"delete"==t.type&&t.list.length?t._e():i("footer",{staticClass:"footer"},[i("el-button",{staticClass:"ml10",on:{click:function(e){return t.$emit("update:visible",!1)}}},[t._v("取消")]),t._v(" "),i("el-button",{attrs:{type:"primary"},on:{click:t.onSubmit}},[t._v(t._s("deactive"==t.type?"失效":"删除"))])],1)],2)])])},staticRenderFns:[]};var l=i("VU/8")(a,o,!1,function(t){i("d5y4")},"data-v-8aaf1ac8",null);e.default=l.exports}});
\ No newline at end of file
dist/static/js/20.b2ba64154f555459cc42.js 0 → 100644
<<<<<<< HEAD:dist/static/js/21.1f6367e5dcf6de69a5bd.js
webpackJsonp([21],{"6Qob":function(t,e,i){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var s=i("mvHQ"),n=i.n(s),o=i("5reh"),a=i("l6IN");function r(t){return t?(a.Message.warning(t),!1):(a.Message.warning("操作失败"),!1)}function l(t){return"cancel"==t?(a.Message.info(t||"cancel"),!1):!!t.hasOwnProperty("response")&&(401==t.response.status?(a.Message.error("登录过期"),!1):500==t.response.status?(a.Message.error("服务器错误500"),!1):void 0)}var c=i("mw3O"),u={name:"login",data:function(){return{redirect:this.$route.query.redirect,token:"",form:{loginName:"HAZZYS",password:"EA48576F30BE1669971699C09AD05C94",eid:"ff8080816494494b0164a76b553a00e5"}}},computed:{imgHeight:function(){return document.body.clientHeight},imgWidth:function(){return document.body.clientWidth}},methods:{loginAnimate:function(){new LoginAnimate(loginwrap,{length:90,LineWeight:.1,clicked:!0,moveon:!0}).Run()},submitLogin:function(){var t=this;this.axios.post("/api-auth/do-login",c.stringify({loginName:this.form.loginName,password:this.form.password,eid:"ff8080816494494b0164a76b553a00e5"})).then(function(e){if(e.data.success){(s=e.data.message)?a.Message.success(s):a.Message.success("操作成功");var i=decodeURIComponent(t.$route.query.redirect||"/index");t.$router.push({path:i})}else r(e.data.message);var s}).catch(function(t){l(t)})},getMenu:function(){var t=this;this.axios.get("/gic/get-menu").then(function(e){if(e.data.success){t.menuList=e.data.list,sessionStorage.setItem("menuList",n()(t.menuList));var i=t.$route.query.redirect||"/index";t.$router.push({path:i})}else r(e.data.errorMessage)}).catch(function(t){l(t)})}},mounted:function(){this.$store.commit(o.d,"login"),document.title=this.$store.state.title,this.loginAnimate()}},m={render:function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{staticClass:"loginwrap",style:{height:t.imgHeight+"px"}},[i("div",{staticStyle:{position:"absolute",left:"0",height:"0",width:"100%"}},[i("canvas",{attrs:{id:"loginwrap",width:t.imgWidth,height:t.imgHeight}})]),t._v(" "),t._m(0),t._v(" "),i("div",{staticClass:"login_contetnt"},[i("h3",{staticClass:"login-top"},[t._v("让信息连接一切")]),t._v(" "),i("h4",{staticClass:"login-bottom"},[t._v("GIC商户后台")]),t._v(" "),i("div",{staticClass:"formlogin"},[i("el-form",{ref:"form",attrs:{model:t.form,"label-width":""}},[i("el-form-item",{attrs:{label:""}},[i("el-input",{staticClass:"forminput",attrs:{placeholder:"账号"},model:{value:t.form.loginName,callback:function(e){t.$set(t.form,"loginName",e)},expression:"form.loginName"}})],1),t._v(" "),i("el-form-item",{attrs:{label:""}},[i("el-input",{attrs:{type:"password",placeholder:"密码"},nativeOn:{keyup:function(e){return!e.type.indexOf("key")&&t._k(e.keyCode,"enter",13,e.key,"Enter")?null:t.submitLogin("form")}},model:{value:t.form.password,callback:function(e){t.$set(t.form,"password",e)},expression:"form.password"}})],1),t._v(" "),i("el-form-item",[i("button",{staticClass:"submit",on:{click:function(e){return e.preventDefault(),t.submitLogin("form")}}},[t._v("立即登录")])])],1)],1)])])},staticRenderFns:[function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"logintop"},[e("div",{staticClass:"fl loginlogo"},[e("a",{staticClass:"fr logo",attrs:{href:"#"}},[this._v("login_logo.png")])]),this._v(" "),e("a",{staticClass:"home-link fr",attrs:{href:"http://www.demogic.com/"}},[this._v("返回首页")])])}]};var d=i("VU/8")(u,m,!1,function(t){i("i8uS")},null,null);e.default=d.exports},i8uS:function(t,e){}});
=======
webpackJsonp([20],{"6Qob":function(t,e,i){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var s=i("mvHQ"),n=i.n(s),o=i("5reh"),a=i("l6IN");function r(t){return t?(a.Message.warning(t),!1):(a.Message.warning("操作失败"),!1)}function l(t){return"cancel"==t?(a.Message.info(t||"cancel"),!1):!!t.hasOwnProperty("response")&&(401==t.response.status?(a.Message.error("登录过期"),!1):500==t.response.status?(a.Message.error("服务器错误500"),!1):void 0)}var c=i("mw3O"),u={name:"login",data:function(){return{redirect:this.$route.query.redirect,token:"",form:{loginName:"HAZZYS",password:"EA48576F30BE1669971699C09AD05C94",eid:"ff8080816494494b0164a76b553a00e5"}}},computed:{imgHeight:function(){return document.body.clientHeight},imgWidth:function(){return document.body.clientWidth}},methods:{loginAnimate:function(){new LoginAnimate(loginwrap,{length:90,LineWeight:.1,clicked:!0,moveon:!0}).Run()},submitLogin:function(){var t=this;this.axios.post("/api-auth/do-login",c.stringify({loginName:this.form.loginName,password:this.form.password,eid:"ff8080816494494b0164a76b553a00e5"})).then(function(e){if(e.data.success){(s=e.data.message)?a.Message.success(s):a.Message.success("操作成功");var i=decodeURIComponent(t.$route.query.redirect||"/index");t.$router.push({path:i})}else r(e.data.message);var s}).catch(function(t){l(t)})},getMenu:function(){var t=this;this.axios.get("/gic/get-menu").then(function(e){if(e.data.success){t.menuList=e.data.list,sessionStorage.setItem("menuList",n()(t.menuList));var i=t.$route.query.redirect||"/index";t.$router.push({path:i})}else r(e.data.errorMessage)}).catch(function(t){l(t)})}},mounted:function(){this.$store.commit(o.d,"login"),document.title=this.$store.state.title,this.loginAnimate()}},m={render:function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{staticClass:"loginwrap",style:{height:t.imgHeight+"px"}},[i("div",{staticStyle:{position:"absolute",left:"0",height:"0",width:"100%"}},[i("canvas",{attrs:{id:"loginwrap",width:t.imgWidth,height:t.imgHeight}})]),t._v(" "),t._m(0),t._v(" "),i("div",{staticClass:"login_contetnt"},[i("h3",{staticClass:"login-top"},[t._v("让信息连接一切")]),t._v(" "),i("h4",{staticClass:"login-bottom"},[t._v("GIC商户后台")]),t._v(" "),i("div",{staticClass:"formlogin"},[i("el-form",{ref:"form",attrs:{model:t.form,"label-width":""}},[i("el-form-item",{attrs:{label:""}},[i("el-input",{staticClass:"forminput",attrs:{placeholder:"账号"},model:{value:t.form.loginName,callback:function(e){t.$set(t.form,"loginName",e)},expression:"form.loginName"}})],1),t._v(" "),i("el-form-item",{attrs:{label:""}},[i("el-input",{attrs:{type:"password",placeholder:"密码"},nativeOn:{keyup:function(e){return!e.type.indexOf("key")&&t._k(e.keyCode,"enter",13,e.key,"Enter")?null:t.submitLogin("form")}},model:{value:t.form.password,callback:function(e){t.$set(t.form,"password",e)},expression:"form.password"}})],1),t._v(" "),i("el-form-item",[i("button",{staticClass:"submit",on:{click:function(e){return e.preventDefault(),t.submitLogin("form")}}},[t._v("立即登录")])])],1)],1)])])},staticRenderFns:[function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"logintop"},[e("div",{staticClass:"fl loginlogo"},[e("a",{staticClass:"fr logo",attrs:{href:"#"}},[this._v("login_logo.png")])]),this._v(" "),e("a",{staticClass:"home-link fr",attrs:{href:"http://www.demogic.com/"}},[this._v("返回首页")])])}]};var d=i("VU/8")(u,m,!1,function(t){i("i8uS")},null,null);e.default=d.exports},i8uS:function(t,e){}});
>>>>>>> bugfix/分组分类重复展示:dist/static/js/20.b2ba64154f555459cc42.js
dist/static/js/22.02d8f41c5b349b9bc2fe.js 0 → 100644
<<<<<<< HEAD:dist/static/js/23.1e9aeacb85a469484d6e.js
webpackJsonp([23],{EHeP:function(t,a,e){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var n=e("BdFv"),i=(e("Mk6G"),e("3E4D"),e("Ch4/"),e("PI0u"),e("P9l9"),{name:"myTagLib",data:function(){return{tagCategory:"myTagList"}},methods:{toAddMyTagLib:function(){}},mounted:function(){},components:{tagLib:n.a}}),s={render:function(){var t=this.$createElement,a=this._self._c||t;return a("div",{staticClass:"myTagLib-wrap common-wrap"},[a("div",{staticClass:"right-content"},[a("div",{staticClass:"right-box"},[a("tag-lib",{attrs:{tagCategory:this.tagCategory}})],1)])])},staticRenderFns:[]};var o=e("VU/8")(i,s,!1,function(t){e("NXvq")},"data-v-628de2d0",null);a.default=o.exports},NXvq:function(t,a){}});
=======
webpackJsonp([22],{EHeP:function(t,a,e){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var n=e("BdFv"),i=(e("Mk6G"),e("3E4D"),e("Ch4/"),e("PI0u"),e("P9l9"),{name:"myTagLib",data:function(){return{tagCategory:"myTagList"}},methods:{toAddMyTagLib:function(){}},mounted:function(){},components:{tagLib:n.a}}),s={render:function(){var t=this.$createElement,a=this._self._c||t;return a("div",{staticClass:"myTagLib-wrap common-wrap"},[a("div",{staticClass:"right-content"},[a("div",{staticClass:"right-box"},[a("tag-lib",{attrs:{tagCategory:this.tagCategory}})],1)])])},staticRenderFns:[]};var o=e("VU/8")(i,s,!1,function(t){e("NXvq")},"data-v-628de2d0",null);a.default=o.exports},NXvq:function(t,a){}});
>>>>>>> bugfix/分组分类重复展示:dist/static/js/22.02d8f41c5b349b9bc2fe.js
dist/static/js/23.1e9aeacb85a469484d6e.js
webpackJsonp([23],{EHeP:function(t,a,e){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var n=e("BdFv"),i=(e("Mk6G"),e("3E4D"),e("Ch4/"),e("PI0u"),e("P9l9"),{name:"myTagLib",data:function(){return{tagCategory:"myTagList"}},methods:{toAddMyTagLib:function(){}},mounted:function(){},components:{tagLib:n.a}}),s={render:function(){var t=this.$createElement,a=this._self._c||t;return a("div",{staticClass:"myTagLib-wrap common-wrap"},[a("div",{staticClass:"right-content"},[a("div",{staticClass:"right-box"},[a("tag-lib",{attrs:{tagCategory:this.tagCategory}})],1)])])},staticRenderFns:[]};var o=e("VU/8")(i,s,!1,function(t){e("NXvq")},"data-v-628de2d0",null);a.default=o.exports},NXvq:function(t,a){}});
\ No newline at end of file
<<<<<<< HEAD:dist/static/js/23.1e9aeacb85a469484d6e.js
webpackJsonp([23],{EHeP:function(t,a,e){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var n=e("BdFv"),i=(e("Mk6G"),e("3E4D"),e("Ch4/"),e("PI0u"),e("P9l9"),{name:"myTagLib",data:function(){return{tagCategory:"myTagList"}},methods:{toAddMyTagLib:function(){}},mounted:function(){},components:{tagLib:n.a}}),s={render:function(){var t=this.$createElement,a=this._self._c||t;return a("div",{staticClass:"myTagLib-wrap common-wrap"},[a("div",{staticClass:"right-content"},[a("div",{staticClass:"right-box"},[a("tag-lib",{attrs:{tagCategory:this.tagCategory}})],1)])])},staticRenderFns:[]};var o=e("VU/8")(i,s,!1,function(t){e("NXvq")},"data-v-628de2d0",null);a.default=o.exports},NXvq:function(t,a){}});
=======
webpackJsonp([22],{EHeP:function(t,a,e){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var n=e("BdFv"),i=(e("Mk6G"),e("3E4D"),e("Ch4/"),e("PI0u"),e("P9l9"),{name:"myTagLib",data:function(){return{tagCategory:"myTagList"}},methods:{toAddMyTagLib:function(){}},mounted:function(){},components:{tagLib:n.a}}),s={render:function(){var t=this.$createElement,a=this._self._c||t;return a("div",{staticClass:"myTagLib-wrap common-wrap"},[a("div",{staticClass:"right-content"},[a("div",{staticClass:"right-box"},[a("tag-lib",{attrs:{tagCategory:this.tagCategory}})],1)])])},staticRenderFns:[]};var o=e("VU/8")(i,s,!1,function(t){e("NXvq")},"data-v-628de2d0",null);a.default=o.exports},NXvq:function(t,a){}});
>>>>>>> bugfix/分组分类重复展示:dist/static/js/22.02d8f41c5b349b9bc2fe.js
dist/static/js/23.6db5fe3e35a647ae1bce.js 0 → 100644
<<<<<<< HEAD:dist/static/js/38.b71e1f4f3b700ad59435.js
webpackJsonp([38],{"Ax/m":function(t,e){},Gy5W:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var o={name:"App",data:function(){return{projectName:"member-tag",contentHeight:"0px",collapseFlag:!1,leftModulesName:"会员标签"}},methods:{toRouterView:function(t){this.$router.push({path:t.path})},collapseTag:function(t){this.collapseFlag=t}},mounted:function(){this.pathName=window.location.hash.split("/")[1],this.contentHeight=(document.documentElement.clientHeight||document.body.clientHeight)-64+"px"},components:{}},i={render:function(){var t=this.$createElement,e=this._self._c||t;return e("transition",{attrs:{name:"fade",mode:"out-in"}},[e("router-view")],1)},staticRenderFns:[]};var a=n("VU/8")(o,i,!1,function(t){n("Ax/m")},null,null);e.default=a.exports}});
=======
webpackJsonp([23],{"8xuW":function(t,e){},Gy5W:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var o={name:"App",data:function(){return{projectName:"member-tag",contentHeight:"0px",collapseFlag:!1,leftModulesName:"会员标签"}},methods:{toRouterView:function(t){this.$router.push({path:t.path})},collapseTag:function(t){this.collapseFlag=t}},mounted:function(){this.pathName=window.location.hash.split("/")[1],this.contentHeight=(document.documentElement.clientHeight||document.body.clientHeight)-64+"px"},components:{}},i={render:function(){var t=this.$createElement,e=this._self._c||t;return e("transition",{attrs:{name:"fade",mode:"out-in"}},[e("router-view")],1)},staticRenderFns:[]};var a=n("VU/8")(o,i,!1,function(t){n("8xuW")},null,null);e.default=a.exports}});
>>>>>>> bugfix/分组分类重复展示:dist/static/js/23.6db5fe3e35a647ae1bce.js
dist/static/js/31.432001f131a2901f1cff.js 0 → 100644
webpackJsonp([31],{BP9W:function(a,t){},Gl7f:function(a,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=e("EOvX"),l=e("2CGT"),i={name:"syncTagHistory",data:function(){return{navpath:[{name:"首页",path:window.location.origin+"/report/#/memberSummary",relocation:!0},{name:"会员管理",path:""},{name:"会员标签",path:"/member-tag"},{name:"同步标签",path:""}],tableData:[],currentPage:1,pageSize:20,total:0,searchVal:"",loading:!1,dateformat:n.a,dialogData:{dialogVisible:!1,tagTableData:[],total:0,currentPage:1,searchTagVal:"",loading:!1}}},mounted:function(){this.getTableData()},methods:{cancelSync:function(a){var t=this;this.$confirm("取消同步后，该分类下的标签将不会再同步至微盟，并且该分类下已同步至微盟侧的会员标签将同步从微盟侧删除，是否继续取消?","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(e){var n={tagLevelGroupId:a.tagLevelGroupId,syncWmFlag:0};Object(l.M)(n).then(function(a){t.$message.success("取消同步成功"),1==t.tableData.length&&(t.currentPage=t.currentPage-1||1),t.getTableData()})}).catch(function(a){})},getTableData:function(){var a=this;this.loading=!0;var t={search:this.searchVal,syncWmFlag:1,pageNum:this.currentPage,pageSize:this.pageSize};Object(l.t)(t).then(function(t){var e=t.result;a.tableData=e.result||[],a.total=e.totalCount}).finally(function(){return a.loading=!1})},onCurrentChange:function(a){this.currentPage=a,this.getTableData()},onSizeChange:function(a){this.pageSize=a,this.currentPage=1,this.getTableData()},onSearch:function(){this.currentPage=1,this.getTableData()},getDiaglogTableData:function(){var a=this;this.dialogData.loading=!0;var t={search:this.dialogData.searchTagVal,syncWmFlag:0,pageSize:5,pageNum:this.dialogData.currentPage};Object(l.t)(t).then(function(t){var e=t.result,n=e.result||[];a.dialogData.tagTableData=n.map(function(t,e){return t.index=a.sortIndex(e+1),t}),a.dialogData.total=e.totalCount}).finally(function(){return a.dialogData.loading=!1})},onDialogPageChange:function(a){this.dialogData.currentPage=a,this.getDiaglogTableData()},addSyncTag:function(a){var t=this,e={tagLevelGroupId:a.tagLevelGroupId,syncWmFlag:1};Object(l.M)(e).then(function(a){t.$message.success("同步成功"),1==t.dialogData.tagTableData.length&&(t.dialogData.currentPage=t.dialogData.currentPage-1||1),t.getDiaglogTableData()})},onDialogSearch:function(){this.dialogData.currentPage=1,this.getDiaglogTableData()}},computed:{sortIndex:function(){var a=this;return function(t){return 5*(a.dialogData.currentPage-1)+t}},groupName:function(){return function(a){return"3d11ac15963b4c0790762e6147ea9312"==a?"导购标签":"a3a4ed179ed3435fab33f5952d021b6d"==a?"其他":"--"}}},watch:{"dialogData.dialogVisible":function(a){a?(this.dialogData.searchTagVal="",this.dialogData.currentPage=1,this.getDiaglogTableData()):this.getTableData()}}},o={render:function(){var a=this,t=a.$createElement,e=a._self._c||t;return e("div",{staticClass:"common-wrap syncTag"},[e("div",{directives:[{name:"loading",rawName:"v-loading",value:a.loading,expression:"loading"}],staticClass:"right-content"},[e("div",{staticClass:"right-box"},[e("div",{staticClass:"title"},[e("el-input",{staticClass:"w220",attrs:{placeholder:"请输入标签分类名称","prefix-icon":"el-icon-search"},on:{change:a.onSearch},model:{value:a.searchVal,callback:function(t){a.searchVal=t},expression:"searchVal"}}),a._v(" "),e("el-button",{staticClass:"add-btn",attrs:{type:"primary"},on:{click:function(t){a.dialogData.dialogVisible=!0}}},[a._v("添加标签分类")]),a._v(" "),e("span",[a._v("添加标签分类后，分类下面所有会员标签均会同步至微盟")])],1),a._v(" "),e("div",{staticClass:"sync-content"},[e("el-table",{attrs:{data:a.tableData}},[e("el-table-column",{attrs:{label:"标签分类",prop:"levelName"}}),a._v(" "),e("el-table-column",{attrs:{label:"标签分组",prop:""},scopedSlots:a._u([{key:"default",fn:function(t){var e=t.row;return[a._v(" "+a._s(e.parentLevelGroupId?a.groupName(e.parentLevelGroupId):"--")+" ")]}}])}),a._v(" "),e("el-table-column",{attrs:{label:"添加时间",prop:"flagUpdateTime"},scopedSlots:a._u([{key:"default",fn:function(t){var e=t.row;return[a._v(a._s(e.flagUpdateTime?a.dateformat(new Date(e.flagUpdateTime),"yyyy-MM-dd hh:mm:ss"):"--"))]}}])}),a._v(" "),a._e()],1),a._v(" "),e("el-pagination",{staticStyle:{"text-align":"right",padding:"28px 0"},attrs:{background:"","hide-on-single-page":"","current-page":a.currentPage,"page-sizes":[20,40,60,80],"page-size":a.pageSize,layout:"total, sizes, prev, pager, next, jumper",total:a.total},on:{"size-change":a.onSizeChange,"current-change":a.onCurrentChange}})],1)])]),a._v(" "),e("el-dialog",{attrs:{visible:a.dialogData.dialogVisible,width:"1000px"},on:{"update:visible":function(t){return a.$set(a.dialogData,"dialogVisible",t)}}},[e("template",{slot:"title"},[e("p",{staticClass:"el-dialog__title"},[a._v("添加分类标签"),e("span",{staticClass:"tip"},[a._v("仅查询未同步的标签")])])]),a._v(" "),e("div",{directives:[{name:"loading",rawName:"v-loading",value:a.dialogData.loading,expression:"dialogData.loading"}],staticClass:"dialog_contetn"},[e("el-input",{staticClass:"w220 mb20",attrs:{"prefix-icon":"el-icon-search",placeholder:"请输入标签分类名称"},on:{change:a.onDialogSearch},model:{value:a.dialogData.searchTagVal,callback:function(t){a.$set(a.dialogData,"searchTagVal",t)},expression:"dialogData.searchTagVal"}}),a._v(" "),e("el-table",{attrs:{data:a.dialogData.tagTableData}},[e("el-table-column",{attrs:{label:"序号",prop:"index"}}),a._v(" "),e("el-table-column",{attrs:{label:"标签分类",prop:"levelName"}}),a._v(" "),e("el-table-column",{attrs:{label:"标签分组",prop:""},scopedSlots:a._u([{key:"default",fn:function(t){var e=t.row;return[a._v(" "+a._s(e.parentLevelGroupId?a.groupName(e.parentLevelGroupId):"--")+" ")]}}])}),a._v(" "),e("el-table-column",{attrs:{label:"操作"},scopedSlots:a._u([{key:"default",fn:function(t){var n=t.row;return[e("el-button",{attrs:{type:"text"},on:{click:function(t){return a.addSyncTag(n)}}},[a._v("添加")])]}}])})],1),a._v(" "),e("el-pagination",{staticStyle:{"text-align":"right",margin:"28px 0 8px"},attrs:{"hide-on-single-page":"",layout:"prev, pager, next","current-page":a.dialogData.currentPage,"page-size":5,total:a.dialogData.total},on:{"current-change":a.onDialogPageChange}})],1),a._v(" "),e("template",{slot:"footer"},[e("el-button",{attrs:{type:"primary"},on:{click:function(t){a.dialogData.dialogVisible=!1}}},[a._v("关闭")])],1)],2)],1)},staticRenderFns:[]};var r=e("VU/8")(i,o,!1,function(a){e("BP9W")},"data-v-4d36d4b6",null);t.default=r.exports}});
\ No newline at end of file
dist/static/js/32.b6ac2827a57d12878f97.js 0 → 100644
<<<<<<< HEAD:dist/static/js/31.8bb65ed0025e229ed6a6.js
webpackJsonp([31],{"G/on":function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=a("5QTb"),s=(a("Mk6G"),a("3E4D")),n=a("Ch4/"),i=(a("PI0u"),a("P9l9")),o={name:"platformTagList",data:function(){return{tagLibName:"platformTag",tagSearch:"",tagTableData:[],selTagTableData:[],currentPage:1,pageSize:20,total:0,currentGroupId:0}},methods:{toAddMyTagLib:function(t,e){var a={};if("mult"===t){if(!this.selTagTableData.length)return this.$message.error({message:"请选择标签"}),!1;a.tagIds=[],this.selTagTableData.forEach(function(t,e){a.tagIds.push(t.tagId)}),a.tagIds=a.tagIds.join(","),this.addByTagId("addByTagIds",a)}else a.tagId=e,this.addByTagId("addByTagId",a)},addByTagId:function(t,e){var a=this;Object(i.a)("/enterpriseMemberTag/"+t,e).then(function(t){var e=t.data;if(0==e.errorCode)return s.a.showmsg("添加成功","success"),void a.getTagList();n.a.errorMsg(e)}).catch(function(t){a.$message.error({duration:1e3,message:t.message})})},searchEnterFun:function(t){this.currentPage=1,this.getTagList()},clearSearch:function(){this.currentPage=1,this.getTagList()},handleSelectChange:function(t){this.selTagTableData=t},handleSizeChange:function(t){this.pageSize=t,this.getTagList()},handleCurrentChange:function(t){this.currentPage=t,this.$route.fullPath.includes("?")&&this.$router.push(this.$route.path+"?tagLevelGroupId="+this.$route.query.tagLevelGroupId+"&currentPage="+t),this.getTagList()},getTagList:function(t){var e=this,a={tagName:e.tagSearch,tagLevelGroupId:e.currentGroupId,pageNum:e.currentPage,pageSize:e.pageSize};Object(i.a)("/memberTag/platformTagPageList",a).then(function(t){var a=t.data;if(0==a.errorCode)return e.tagTableData=a.result.result,void(e.total=a.result.totalCount);n.a.errorMsg(a)}).catch(function(t){e.$message.error({duration:1e3,message:t.message})})},getUrlParams:function(){this.tagSearch=this.$route.query.searchName?this.$route.query.searchName:"",this.currentGroupId=this.$route.query.tagLevelGroupId?this.$route.query.tagLevelGroupId:0,this.currentPage=this.$route.query.currentPage?parseInt(this.$route.query.currentPage):1,this.getTagList()}},watch:{$route:{handler:function(t,e){this.getUrlParams()},deep:!0}},mounted:function(){this.getUrlParams()},components:{tagCategory:r.a}},l={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"platformTagList-wrap common-wrap"},[a("div",{staticClass:"right-content"},[a("div",{staticClass:"right-box"},[a("div",{staticClass:"common-wrap__cateTags"},[a("tag-category",{attrs:{tagLibName:t.tagLibName}})],1),t._v(" "),a("div",{staticClass:"common-wrap__opt"},[a("el-input",{staticClass:"w-184",attrs:{placeholder:"搜索标签","prefix-icon":"el-icon-search",clearable:""},on:{clear:t.clearSearch},nativeOn:{keyup:function(e){return!e.type.indexOf("key")&&t._k(e.keyCode,"enter",13,e.key,"Enter")?null:t.searchEnterFun(e)}},model:{value:t.tagSearch,callback:function(e){t.tagSearch=e},expression:"tagSearch"}}),t._v(" "),a("el-button",{staticClass:"fr",attrs:{type:"primary"},on:{click:function(e){return t.toAddMyTagLib("mult")}}},[t._v("添加至我的标签库")])],1),t._v(" "),a("div",{staticClass:"common-wrap__table m-t-20"},[a("el-table",{ref:"multipleTable",staticStyle:{width:"100%"},attrs:{data:t.tagTableData,"tooltip-effect":"dark"},on:{"selection-change":t.handleSelectChange}},[a("el-table-column",{attrs:{type:"selection"}}),t._v(" "),a("el-table-column",{attrs:{prop:"tagName",label:"标签名称","show-overflow-tooltip":""}}),t._v(" "),a("el-table-column",{attrs:{prop:"tagDescribe",label:"标签描述","show-overflow-tooltip":""}}),t._v(" "),a("el-table-column",{attrs:{label:"是否实时"},scopedSlots:t._u([{key:"default",fn:function(e){return[t._v("\n "+t._s(1==e.row.isActive?"实时":"非实时")+"\n ")]}}])}),t._v(" "),a("el-table-column",{attrs:{label:"操作"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("router-link",{staticClass:"edit-btn el-button--text",attrs:{to:{path:"/platformTagDetail",query:{tagId:e.row.tagId,addFlag:e.row.isAdd,form:"notMyTag",navSign:"platformTag"}}}},[t._v("详情")]),t._v(" "),a("el-button",{staticClass:"p-l-10",attrs:{type:"text",size:"small",disabled:1==e.row.isAdd},on:{click:function(a){return t.toAddMyTagLib("single",e.row.tagId)}}},[t._v("\n "+t._s(1==e.row.isAdd?"已":"")+"添加至我的标签库\n ")])]}}])})],1)],1),t._v(" "),0!=t.tagTableData.length?a("div",{staticClass:"block common-wrap__page text-right"},[a("dm-pagination",{attrs:{background:"","current-page":t.currentPage,"page-sizes":[10,20,30,40],"page-size":t.pageSize,layout:"total, sizes, prev, pager, next, jumper",total:t.total},on:{"size-change":t.handleSizeChange,"current-change":t.handleCurrentChange}})],1):t._e()])])])},staticRenderFns:[]};var c=a("VU/8")(o,l,!1,function(t){a("eyn9")},"data-v-48357d6b",null);e.default=c.exports},eyn9:function(t,e){}});
=======
webpackJsonp([32],{"G/on":function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=a("5QTb"),s=(a("Mk6G"),a("3E4D")),n=a("Ch4/"),i=(a("PI0u"),a("P9l9")),o={name:"platformTagList",data:function(){return{tagLibName:"platformTag",tagSearch:"",tagTableData:[],selTagTableData:[],currentPage:1,pageSize:20,total:0,currentGroupId:0}},methods:{toAddMyTagLib:function(t,e){var a={};if("mult"===t){if(!this.selTagTableData.length)return this.$message.error({message:"请选择标签"}),!1;a.tagIds=[],this.selTagTableData.forEach(function(t,e){a.tagIds.push(t.tagId)}),a.tagIds=a.tagIds.join(","),this.addByTagId("addByTagIds",a)}else a.tagId=e,this.addByTagId("addByTagId",a)},addByTagId:function(t,e){var a=this;Object(i.a)("/enterpriseMemberTag/"+t,e).then(function(t){var e=t.data;if(0==e.errorCode)return s.a.showmsg("添加成功","success"),void a.getTagList();n.a.errorMsg(e)}).catch(function(t){a.$message.error({duration:1e3,message:t.message})})},searchEnterFun:function(t){this.currentPage=1,this.getTagList()},clearSearch:function(){this.currentPage=1,this.getTagList()},handleSelectChange:function(t){this.selTagTableData=t},handleSizeChange:function(t){this.pageSize=t,this.getTagList()},handleCurrentChange:function(t){this.currentPage=t,this.$route.fullPath.includes("?")&&this.$router.push(this.$route.path+"?tagLevelGroupId="+this.$route.query.tagLevelGroupId+"&currentPage="+t),this.getTagList()},getTagList:function(t){var e=this,a={tagName:e.tagSearch,tagLevelGroupId:e.currentGroupId,pageNum:e.currentPage,pageSize:e.pageSize};Object(i.a)("/memberTag/platformTagPageList",a).then(function(t){var a=t.data;if(0==a.errorCode)return e.tagTableData=a.result.result,void(e.total=a.result.totalCount);n.a.errorMsg(a)}).catch(function(t){e.$message.error({duration:1e3,message:t.message})})},getUrlParams:function(){this.tagSearch=this.$route.query.searchName?this.$route.query.searchName:"",this.currentGroupId=this.$route.query.tagLevelGroupId?this.$route.query.tagLevelGroupId:0,this.currentPage=this.$route.query.currentPage?parseInt(this.$route.query.currentPage):1,this.getTagList()}},watch:{$route:{handler:function(t,e){this.getUrlParams()},deep:!0}},mounted:function(){this.getUrlParams()},components:{tagCategory:r.a}},l={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"platformTagList-wrap common-wrap"},[a("div",{staticClass:"right-content"},[a("div",{staticClass:"right-box"},[a("div",{staticClass:"common-wrap__cateTags"},[a("tag-category",{attrs:{tagLibName:t.tagLibName}})],1),t._v(" "),a("div",{staticClass:"common-wrap__opt"},[a("el-input",{staticClass:"w-184",attrs:{placeholder:"搜索标签","prefix-icon":"el-icon-search",clearable:""},on:{clear:t.clearSearch},nativeOn:{keyup:function(e){return!e.type.indexOf("key")&&t._k(e.keyCode,"enter",13,e.key,"Enter")?null:t.searchEnterFun(e)}},model:{value:t.tagSearch,callback:function(e){t.tagSearch=e},expression:"tagSearch"}}),t._v(" "),a("el-button",{staticClass:"fr",attrs:{type:"primary"},on:{click:function(e){return t.toAddMyTagLib("mult")}}},[t._v("添加至我的标签库")])],1),t._v(" "),a("div",{staticClass:"common-wrap__table m-t-20"},[a("el-table",{ref:"multipleTable",staticStyle:{width:"100%"},attrs:{data:t.tagTableData,"tooltip-effect":"dark"},on:{"selection-change":t.handleSelectChange}},[a("el-table-column",{attrs:{type:"selection"}}),t._v(" "),a("el-table-column",{attrs:{prop:"tagName",label:"标签名称","show-overflow-tooltip":""}}),t._v(" "),a("el-table-column",{attrs:{prop:"tagDescribe",label:"标签描述","show-overflow-tooltip":""}}),t._v(" "),a("el-table-column",{attrs:{label:"是否实时"},scopedSlots:t._u([{key:"default",fn:function(e){return[t._v("\n "+t._s(1==e.row.isActive?"实时":"非实时")+"\n ")]}}])}),t._v(" "),a("el-table-column",{attrs:{label:"操作"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("router-link",{staticClass:"edit-btn el-button--text",attrs:{to:{path:"/platformTagDetail",query:{tagId:e.row.tagId,addFlag:e.row.isAdd,form:"notMyTag",navSign:"platformTag"}}}},[t._v("详情")]),t._v(" "),a("el-button",{staticClass:"p-l-10",attrs:{type:"text",size:"small",disabled:1==e.row.isAdd},on:{click:function(a){return t.toAddMyTagLib("single",e.row.tagId)}}},[t._v("\n "+t._s(1==e.row.isAdd?"已":"")+"添加至我的标签库\n ")])]}}])})],1)],1),t._v(" "),0!=t.tagTableData.length?a("div",{staticClass:"block common-wrap__page text-right"},[a("dm-pagination",{attrs:{background:"","current-page":t.currentPage,"page-sizes":[10,20,30,40],"page-size":t.pageSize,layout:"total, sizes, prev, pager, next, jumper",total:t.total},on:{"size-change":t.handleSizeChange,"current-change":t.handleCurrentChange}})],1):t._e()])])])},staticRenderFns:[]};var c=a("VU/8")(o,l,!1,function(t){a("eyn9")},"data-v-48357d6b",null);e.default=c.exports},eyn9:function(t,e){}});
>>>>>>> bugfix/分组分类重复展示:dist/static/js/32.b6ac2827a57d12878f97.js
dist/static/js/33.8dc1ab50ce2217d20323.js 0 → 100644
webpackJsonp([33],{SJ7l:function(e,t,i){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var s=i("Dd8w"),a=i.n(s),o=i("2CGT"),l={name:"group-list",props:{activeType:String},data:function(){return{addGroupDialog:!1,listsParams:{pageNum:1,pageSize:20,totalPage:1,classifyName:""},lists:[],currentIndex:-1,editDialog:{visible:!1,loading:!1,classifyName:"",list:{}},memberGroupLoading:!1}},methods:{onSearch:function(){this.listsParams.pageNum=1,this.getMemberGroupList()},onPageNumChange:function(){this.listsParams.pageNum>=this.listsParams.totalPage||(this.listsParams.pageNum++,this.getMemberGroupList())},onScroll:function(e){e.target.scrollTop+e.target.clientHeight>=40*this.lists.length&&this.onPageNumChange()},handleChangeIndex:function(e,t){this.currentIndex=e,this.$emit("second-list",1==this.activeType?t:{isFixed:!0,list:t})},editGroupName:function(e){this.operatorName(e)&&(this.editDialog.visible=!0,this.editDialog.classifyName=e.classifyName,this.editDialog.list=e)},deleteGroupName:function(e,t){var i=this;this.operatorName(e)&&this.$confirm("删除分类名称，包括该分类下的内容，确定删除吗？","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){i.excludeName(e.memberTagGroupClassifyId,t)})},excludeName:function(e,t){var i=this,s={requestProject:"gic-member-tag-web",memberTagGroupClassifyId:e,type:1==this.activeType?0:1};Object(o.B)(s).then(function(e){if(0==e.errorCode&&(i.$message({type:"success",message:"删除成功!"}),i.lists.splice(t,1),t==i.currentIndex)){var s=t>=i.lists.length?i.lists[t-1]:i.lists[t];i.$emit("second-list",1==i.activeType?s:{isFixed:!0,item:s})}})},modifyName:function(){var e=this,t=this.editDialog,i=t.classifyName,s=t.list;if(0!=i.length){this.editDialog.loading=!0;var a={requestProject:"gic-member-tag-web",classifyName:i,memberTagGroupClassifyId:s.memberTagGroupClassifyId,type:1==this.activeType?0:1};Object(o.D)(a).then(function(t){0==t.errorCode&&(e.$message({type:"success",message:"修改成功",duration:2e3}),s.memberTagGroupClassifyId?e.editDialog.list.classifyName=e.editDialog.classifyName:(e.listsParams.pageNum=1,e.getMemberGroupList()),e.editDialog.visible=!1)}).finally(function(){setTimeout(function(){return e.editDialog.loading=!1},500)})}else this.$message({message:"分类名称不能为空！",type:"warning",duration:2e3})},operatorName:function(e){return"0"!=e.memberTagGroupClassifyId&&"1"!=e.memberTagGroupClassifyId},closeEditGroup:function(){this.editDialog.classifyName="",this.editDialog.list={}},getMemberGroupList:function(){var e=this;this.memberGroupLoading=!0;var t=this.listsParams,i=t.pageNum,s=t.pageSize,l=t.classifyName;1==i&&(this.lists=[]),Object(o.C)({requestProject:"gic-member-tag-web",type:1==this.activeType?0:1,pageNum:i,pageSize:s,classifyName:l}).then(function(t){if(e.memberGroupLoading=!1,0==t.errorCode){var i=t.result||{},s=i.result,o=i.totalPage;Array.isArray(s)&&(e.lists=e.lists.concat(s.map(function(e){return a()({},e,{edit:!1})}))),e.listsParams.totalPage=o}})}},activated:function(){this.listsParams.pageNum=1,this.listsParams.classifyName="",this.getMemberGroupList()},created:function(){this.getMemberGroupList()},watch:{activeType:function(e){this.listsParams.pageNum=1,this.listsParams.classifyName="",this.getMemberGroupList(),1==e?this.$emit("second-list","all"):2==e?this.$emit("second-list","showFixedList"):3==e&&this.$emit("second-list","allLevel")}}},r={render:function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("div",{staticClass:"group-list"},[i("div",{staticClass:"search-box"},[i("el-input",{attrs:{clearable:"","prefix-icon":"el-icon-search",placeholder:"请输入分类名称"},on:{change:e.onSearch},model:{value:e.listsParams.classifyName,callback:function(t){e.$set(e.listsParams,"classifyName",t)},expression:"listsParams.classifyName"}})],1),e._v(" "),i("ul",{staticClass:"lists-box",on:{scroll:e.onScroll}},[e._l(e.lists,function(t,s){return i("li",{key:s,class:["member-list",{"active-li":s==e.currentIndex}],on:{click:function(i){return e.handleChangeIndex(s,t)}}},[i("div",{staticClass:"wrap"},[i("span",{directives:[{name:"show",rawName:"v-show",value:!t.edit,expression:"!list.edit"}],staticClass:"name-txt",attrs:{title:t.classifyName}},[e._v(e._s(t.classifyName))]),e._v(" "),i("span",{staticStyle:{"vertical-align":"top"}},[e._v("("+e._s(t.groupNum)+")")])]),e._v(" "),e.operatorName(t)?i("el-popover",{attrs:{placement:"bottom",trigger:"click"}},[e.$getButtonLimit(e.$buttonCode.memberTagEditCateGory)?i("p",{staticClass:"more",attrs:{"limit-code":e.$buttonCode.memberTagEditCateGory},on:{click:function(i){return e.editGroupName(t)}}},[e._v("编辑分类")]):e._e(),e._v(" "),e.$getButtonLimit(e.$buttonCode.memberTagDelCateGory)?i("p",{staticClass:"more",attrs:{"limit-code":e.$buttonCode.memberTagDelCateGory},on:{click:function(i){return e.deleteGroupName(t,s)}}},[e._v("删除分类")]):e._e(),e._v(" "),i("i",{staticClass:"iconfont icon-gengduo icon",attrs:{slot:"reference"},slot:"reference"})]):e._e()],1)}),e._v(" "),i("li",[e.memberGroupLoading?i("div",{staticClass:"el-loading-spinner",staticStyle:{width:"86%"}},[i("i",{staticClass:"el-icon-loading"})]):e._e()])],2),e._v(" "),e.$getButtonLimit(e.$buttonCode.memberTagAddCateGory)&&1==e.activeType?i("div",{staticClass:"add-category"},[i("el-button",{staticClass:"ghost-btn add-group",attrs:{"limit-code":e.$buttonCode.memberTagAddCateGory,type:"primary"},on:{click:function(t){e.editDialog.visible=!0}}},[e._v("新增分类")])],1):e._e(),e._v(" "),i("el-dialog",{attrs:{title:e.editDialog.list.memberTagGroupClassifyId?"编辑分类":"新增分类",visible:e.editDialog.visible,width:"600px",top:"30vh","close-on-click-modal":!1},on:{"update:visible":function(t){return e.$set(e.editDialog,"visible",t)},close:e.closeEditGroup}},[i("div",[e._v("\n 分类名称：\n "),i("el-input",{staticClass:"m-t-10",attrs:{placeholder:"请输入分类名称",maxlength:8,"show-word-limit":"",clearable:""},model:{value:e.editDialog.classifyName,callback:function(t){e.$set(e.editDialog,"classifyName",t)},expression:"editDialog.classifyName"}})],1),e._v(" "),i("span",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[i("el-button",{on:{click:function(t){e.editDialog.visible=!1}}},[e._v("取 消")]),e._v(" "),i("el-button",{attrs:{type:"primary",loading:e.editDialog.loading},on:{click:e.modifyName}},[e._v("确 定")])],1)])],1)},staticRenderFns:[]};var n=i("VU/8")(l,r,!1,function(e){i("dQYS")},"data-v-47acf3f6",null);t.default=n.exports},dQYS:function(e,t){}});
\ No newline at end of file
dist/static/js/34.7b662a230391f8739e52.js 0 → 100644
webpackJsonp([34],{"0c8U":function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=a("Dd8w"),i=a.n(n),o=a("QOex"),r=a("DMDI"),s=a("EOvX"),l=a("2CGT"),c=a("r9pr"),d=a("Ch4/"),u=a("P9l9"),m={name:"tag-container",mixins:[r.a,o.a],components:{DeleteTagDialog:c.default},props:{data:{type:Array,default:function(){return[]}},refersh:Object},data:function(){return{tableData:[],tagData:{},dateformat:s.a,deleteTagDialog:{visible:!1,deleteData:{}},animationPos:{}}},methods:{addTag:function(t){this.$emit("addTag",t)},handleTrackParam:function(t,e){var a={addTag:function(){return{data:{id:e.tagId,name:e.tagName}}}}[t];return{fn:function(){},data:a?a():{}}},editActiveTag:function(t){this.$emit("ediActiveTag",t)},editActiveTagValue:function(t){this.$emit("setGroupId"),localStorage.setItem("jumpTag",""),localStorage.setItem("jumpThirdTag",""),this.$router.push({path:"/manualTagValueEdit",query:{tagId:t.tagId,type:"active"}})},deleteActiveTag:function(t,e,a){this.deleteTagDialog.visible=!0,this.deleteTagDialog.deleteData=i()({},t,{currentIndex:e,e:a})},doDelete:function(t){var e=t.currentIndex,a=t.e;0==t.memberCount?this.directDelTag(t):this.intoTrash(t,e,a)},directDelTag:function(t){var e=this,a={tagId:t.tagId,requestProject:"gic-member-tag-web"};Object(l.h)(a).then(function(t){0==t.errorCode&&(e.$message({message:"删除成功",type:"success",duration:1e3}),e.$emit("deleteHandTag",e.groupId))})},intoTrash:function(t,e,a){var n=this,i={itemId:t.tagId,type:1};Object(u.a)("/delTagItem/add",i).then(function(e){if(0==e.data.errorCode)return t.delStatus=0,n.startAnimation(a),n.$store.commit("changeDelTrashNum",n.$store.state.delTrashNum+1),void n.$message.success("添加成功，请点击右侧「垃圾桶」图标进行删除");d.a.errorMsg(e.data)}).catch(function(t){n.$message.error({duration:1e3,message:t.message})})},startAnimation:function(t){this.animationPos={x:document.body.offsetWidth-t.pageX,y:document.body.offsetHeight-t.pageY},document.getElementById("activeAniIcon").style.display="block",setTimeout(function(){document.getElementById("activeAniIcon").style.display="none"},1800)}},watch:{data:{immediate:!0,handler:function(t){this.tableData=t}},refersh:{immediate:!0,handler:function(t){if(t.changeRefersh){var e=this.tableData.findIndex(function(e){return t.tagId===e.tagId});this.tableData[e].refersh=!0}}}},computed:{getCodeAuth:function(){return this.$getButtonLimit(this.$buttonCode.memberTagCreateGroup)},getCode:function(){return this.$buttonCode.memberTagCreateGroup}}},g={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"tag-some-list"},[a("el-table",{staticStyle:{width:"100%"},attrs:{data:t.tableData}},[a("el-table-column",{attrs:{label:"标签名称",prop:"tagName","min-width":"170",fixed:"left"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("span",{staticClass:"tag-name"},[t._v(t._s(e.row.tagName))]),t._v(" "),a("el-tooltip",{staticClass:"item",attrs:{effect:"dark",content:"添加标签",placement:"bottom"}},[t.getCodeAuth?a("i",{directives:[{name:"track",rawName:"v-track:common.click",value:t.handleTrackParam("addTag",e.row),expression:"handleTrackParam('addTag', scope.row)",arg:"common",modifiers:{click:!0}}],staticClass:"iconfont icon-tag-name icon-PlusOutlined",attrs:{"limit-code":t.getCode},on:{click:function(a){return t.addTag(e.row)}}}):t._e()])]}}])}),t._v(" "),a("el-table-column",{attrs:{label:"上级分类名称","min-width":"110",prop:"tagLevelGroupName"},scopedSlots:t._u([{key:"default",fn:function(e){var n=e.row;return[a("span",[t._v(t._s(n.tagLevelGroupName||"--"))])]}}])}),t._v(" "),a("el-table-column",{attrs:{label:"覆盖人数",prop:"memberCount","min-width":"100","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[t._v("\n "+t._s(e.row.memberCount?(e.row.memberCount|t.formatNum)+"人":"--")+"\n ")]}}])},[a("template",{slot:"header"},[t._v("\n 覆盖人数\n "),a("el-popover",{attrs:{width:"260",trigger:"hover",placement:"top"}},[a("div",{staticStyle:{color:"#303133"}},[t._v("\n 标签下不同标签值可能覆盖相同的会员，因此此处“标签”覆盖人数去重显示（如“喜欢的颜色-白、红、黑、蓝”，某会员身上可能同时具备“白、黑”二种标签值）\n ")]),t._v(" "),a("i",{staticClass:"iconfont icon-QuestionCircleOutlined refresh",attrs:{slot:"reference"},slot:"reference"})])],1)],2),t._v(" "),a("el-table-column",{attrs:{label:"标签描述",prop:"tagDescribe","min-width":"150"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("div",[t._v(t._s(e.row.tagDescribe?e.row.tagDescribe:"--"))])]}}])}),t._v(" "),a("el-table-column",{attrs:{label:"创建时间",prop:"createTime","min-width":"100"},scopedSlots:t._u([{key:"default",fn:function(e){var n=e.row;return[n.createTime?[a("p",[t._v(t._s(t.dateformat(new Date(n.createTime),"yyyy-MM-dd")))]),t._v(" "),a("p",[t._v(t._s(t.dateformat(new Date(n.createTime),"hh:mm:ss")))])]:a("span",[t._v("--")])]}}])}),t._v(" "),a("el-table-column",{attrs:{label:"操作",fixed:"right","min-width":"200"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("div",{staticClass:"font-0"},[a("el-button",{staticClass:"m-r-12",attrs:{type:"text"},on:{click:function(a){return t.editActiveTag(e.row)}}},[t._v("编辑")]),t._v(" "),a("el-button",{staticClass:"m-r-12",attrs:{type:"text"},on:{click:function(a){return t.editActiveTagValue(e.row)}}},[t._v("详情")]),t._v(" "),a("el-button",{staticClass:"m-r-12",attrs:{type:"text"},on:{click:function(a){return t.deleteActiveTag(e.row,e.$index,a)}}},[t._v("删除")])],1)]}}])})],1),t._v(" "),a("delete-tag-dialog",{attrs:{visible:t.deleteTagDialog.visible,data:t.deleteTagDialog.deleteData},on:{"update:visible":function(e){return t.$set(t.deleteTagDialog,"visible",e)},submit:t.doDelete}}),t._v(" "),a("i",{staticClass:"iconfont icon-biaoqian activeAniIcon",style:{right:t.animationPos.x+"px",bottom:t.animationPos.y+"px"},attrs:{id:"activeAniIcon"}})],1)},staticRenderFns:[]};var f=a("VU/8")(m,g,!1,function(t){a("fIqy")},"data-v-41aa0392",null);e.default=f.exports},fIqy:function(t,e){}});
\ No newline at end of file
dist/static/js/35.f6c7eb27d91ddb250e6d.js 0 → 100644
<<<<<<< HEAD:dist/static/js/34.89f7a562ee8c90e92752.js
webpackJsonp([34],{OK0t:function(t,e){},vRdD:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i={data:function(){return{filesData:void 0}},props:{data:{type:Object,default:function(){return{}}},visiable:Boolean},methods:{tagItemImport:function(){if(console.log(this.filesData),!this.filesData)return this.$message.warning("请上传文件");this.$emit("submit",this.filesData,this.$refs.upload)},onClose:function(){this.filesData=void 0,this.$emit("close",!1)},handleUpload:function(){console.log(this.data),0===this.data.excelData.length&&this.reHandleUpload()},reHandleUpload:function(){this.$refs.upload.click()},handleFileChange:function(t){var e=t.target.files[0];console.log(e);if(e)return/(\.(xlsx|xls|csv))$/.test(e.name)?void(this.filesData=e):(this.$message.warning({duration:1e3,message:"仅支持上传xlsx、xls、csv格式的文件"}),void(t.target.value=""))},downloadExcelTemp:function(){var t=window.location.origin;t=t.indexOf("localhost")>=0?"http://gicdev.demogic.com/":t,window.location.href=""+t+this.data.downLoadUrl}}},s={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("el-dialog",{attrs:{title:t.data.title,visible:t.data.isShow,"custom-class":"manual-dialog"},on:{"update:visible":function(e){return t.$set(t.data,"isShow",e)},close:t.onClose}},[a("div",{staticClass:"import"},[a("div",{class:["excel-icon",t.filesData?"excel-icon--active":"excel-icon--add"],on:{click:t.handleUpload}},[a("span",{directives:[{name:"show",rawName:"v-show",value:0===t.data.excelData.length,expression:"data.excelData.length === 0"}],staticClass:"import-btn"},[t._v("点击上传会员")])]),t._v(" "),a("div",{staticClass:"import-cont"},[a("div",{staticClass:"import-handle"},[a("input",{ref:"upload",staticStyle:{display:"none"},attrs:{type:"file",accept:".xlsx, .xls, .csv"},on:{change:t.handleFileChange}}),t._v(" "),t.data.excelData.length>0?[a("span",[t._v(t._s(t.data.excelName))]),t._v(" "),a("span",{staticClass:"import-num"},[t._v("\n 已导入会员\n "),a("span",{staticClass:"color-303133"},[t._v(t._s(t.data.excelData.length))]),t._v("\n 人\n ")]),t._v(" "),a("el-button",{attrs:{type:"text"},on:{click:t.reHandleUpload}},[t._v("重新导入")])]:t._e()],2),t._v(" "),a("div",{staticClass:"import-tip"},[a("span",{staticClass:"import-tip-text"},[t._v("只能上传一个excel文件（2003版本以上），且数据不超过50000条")]),t._v(" "),a("el-button",{attrs:{type:"text"},on:{click:t.downloadExcelTemp}},[a("span",{staticClass:"font-12"},[t._v("下载Excel模板")])])],1),t._v(" "),a("div",{staticClass:"clear-old"},[a("el-checkbox",{model:{value:t.data.optType,callback:function(e){t.$set(t.data,"optType",e)},expression:"data.optType"}},[t._v("清空标签历史标记会员")]),t._v(" "),a("el-tooltip",{attrs:{content:"勾选后，此前被该标签标记的会员将移除此标签，此标签标记会员以本次导入为准。"}},[a("i",{staticClass:"iconfont icon-xinxixianshi"})])],1)])]),t._v(" "),a("template",{slot:"footer"},[a("el-button",{on:{click:function(e){return t.$emit("update:visiable",!1)}}},[t._v("取消")]),t._v(" "),a("el-button",{attrs:{type:"primary"},on:{click:t.tagItemImport}},[t._v("确定")])],1)],2)},staticRenderFns:[]};var l=a("VU/8")(i,s,!1,function(t){a("OK0t")},"data-v-3ff51ef1",null);e.default=l.exports}});
=======
webpackJsonp([35],{OK0t:function(t,e){},vRdD:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i={data:function(){return{filesData:void 0}},props:{data:{type:Object,default:function(){return{}}},visiable:Boolean},methods:{tagItemImport:function(){if(console.log(this.filesData),!this.filesData)return this.$message.warning("请上传文件");this.$emit("submit",this.filesData,this.$refs.upload)},onClose:function(){this.filesData=void 0,this.$emit("close",!1)},handleUpload:function(){console.log(this.data),0===this.data.excelData.length&&this.reHandleUpload()},reHandleUpload:function(){this.$refs.upload.click()},handleFileChange:function(t){var e=t.target.files[0];console.log(e);if(e)return/(\.(xlsx|xls|csv))$/.test(e.name)?void(this.filesData=e):(this.$message.warning({duration:1e3,message:"仅支持上传xlsx、xls、csv格式的文件"}),void(t.target.value=""))},downloadExcelTemp:function(){var t=window.location.origin;t=t.indexOf("localhost")>=0?"http://gicdev.demogic.com/":t,window.location.href=""+t+this.data.downLoadUrl}}},s={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("el-dialog",{attrs:{title:t.data.title,visible:t.data.isShow,"custom-class":"manual-dialog"},on:{"update:visible":function(e){return t.$set(t.data,"isShow",e)},close:t.onClose}},[a("div",{staticClass:"import"},[a("div",{class:["excel-icon",t.filesData?"excel-icon--active":"excel-icon--add"],on:{click:t.handleUpload}},[a("span",{directives:[{name:"show",rawName:"v-show",value:0===t.data.excelData.length,expression:"data.excelData.length === 0"}],staticClass:"import-btn"},[t._v("点击上传会员")])]),t._v(" "),a("div",{staticClass:"import-cont"},[a("div",{staticClass:"import-handle"},[a("input",{ref:"upload",staticStyle:{display:"none"},attrs:{type:"file",accept:".xlsx, .xls, .csv"},on:{change:t.handleFileChange}}),t._v(" "),t.data.excelData.length>0?[a("span",[t._v(t._s(t.data.excelName))]),t._v(" "),a("span",{staticClass:"import-num"},[t._v("\n 已导入会员\n "),a("span",{staticClass:"color-303133"},[t._v(t._s(t.data.excelData.length))]),t._v("\n 人\n ")]),t._v(" "),a("el-button",{attrs:{type:"text"},on:{click:t.reHandleUpload}},[t._v("重新导入")])]:t._e()],2),t._v(" "),a("div",{staticClass:"import-tip"},[a("span",{staticClass:"import-tip-text"},[t._v("只能上传一个excel文件（2003版本以上），且数据不超过50000条")]),t._v(" "),a("el-button",{attrs:{type:"text"},on:{click:t.downloadExcelTemp}},[a("span",{staticClass:"font-12"},[t._v("下载Excel模板")])])],1),t._v(" "),a("div",{staticClass:"clear-old"},[a("el-checkbox",{model:{value:t.data.optType,callback:function(e){t.$set(t.data,"optType",e)},expression:"data.optType"}},[t._v("清空标签历史标记会员")]),t._v(" "),a("el-tooltip",{attrs:{content:"勾选后，此前被该标签标记的会员将移除此标签，此标签标记会员以本次导入为准。"}},[a("i",{staticClass:"iconfont icon-xinxixianshi"})])],1)])]),t._v(" "),a("template",{slot:"footer"},[a("el-button",{on:{click:function(e){return t.$emit("update:visiable",!1)}}},[t._v("取消")]),t._v(" "),a("el-button",{attrs:{type:"primary"},on:{click:t.tagItemImport}},[t._v("确定")])],1)],2)},staticRenderFns:[]};var l=a("VU/8")(i,s,!1,function(t){a("OK0t")},"data-v-3ff51ef1",null);e.default=l.exports}});
>>>>>>> bugfix/分组分类重复展示:dist/static/js/35.f6c7eb27d91ddb250e6d.js
dist/static/js/38.35167ce3debdaddce4dd.js 0 → 100644
webpackJsonp([38],{Gndl:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=a("Xxa5"),o=a.n(n),r=a("exGp"),i=a.n(r),s=a("Dd8w"),l=a.n(s),u=a("QOex"),d=a("DMDI"),c=a("r9pr"),m=a("2CGT"),g=a("EOvX"),f=a("Ch4/"),p=a("P9l9"),h={name:"tag-container",mixins:[d.a,u.a],props:{data:{type:Array,default:function(){return[]}},groupId:String,refersh:Object,isWeim:Boolean,resource:String},data:function(){return{tableData:[],dateformat:g.a,deleteTagDialog:{visible:!1,deleteData:{}},weimId:["3d11ac15963b4c0790762e6147ea9315","5bdac971673b4f40a9af981e3c9215bf"],animationPos:{}}},methods:{addTag:function(e){this.$emit("addTag",e)},editHandTag:function(e){this.$emit("editHandTag",e)},editHandTagValue:function(e){this.$emit("setGroupId"),localStorage.setItem("jumpTag",""),localStorage.setItem("jumpThirdTag",""),this.$router.push({path:"/manualTagValueEdit",query:{tagId:e.tagId,type:"manual"}})},deleteHandTag:function(e,t,a){this.deleteTagDialog.visible=!0,this.deleteTagDialog.deleteData=l()({},e,{currentIndex:t,e:a})},doDelete:function(e){var t=e.currentIndex,a=e.e;0==e.memberCount?this.directDelTag(e):this.intoTrash(e,t,a)},directDelTag:function(e){var t=this,a={tagId:e.tagId,requestProject:"gic-member-tag-web"};Object(m.h)(a).then(function(e){0==e.errorCode&&(t.$message({message:"删除成功",type:"success",duration:1e3}),t.$emit("deleteHandTag",t.groupId))})},intoTrash:function(e,t,a){var n=this,o={itemId:e.tagId,type:1};Object(p.a)("/delTagItem/add",o).then(function(t){if(0==t.data.errorCode)return e.delStatus=0,n.startAnimation(a),n.$store.commit("changeDelTrashNum",n.$store.state.delTrashNum+1),void n.$message.success("添加成功，请点击右侧「垃圾桶」图标进行删除");f.a.errorMsg(t.data)}).catch(function(e){n.$message.error({duration:1e3,message:e.message})})},startAnimation:function(e){this.animationPos={x:document.body.offsetWidth-e.pageX-30,y:document.body.offsetHeight-e.pageY},document.getElementById("tagAniIcon").style.display="block",setTimeout(function(){document.getElementById("tagAniIcon").style.display="none"},1800)},handleTrackParam:function(e,t){var a={addTag:function(){return{data:{id:t.tagId,name:t.tagName}}}}[e];return{fn:function(){},data:a?a():{}}},onClickSort:function(e){var t=this;e.numRool=!1,this.$nextTick(function(){return t.$refs["input"+e.tagId].focus()})},blurNumInput:function(e){return e.sort?e.sort>1e5||e.sort<1?this.$message.error("仅支持输入1-1-100000之间的整数"):(e.numRool=!0,void this.sortMenu(e)):this.$message.error("排序值不能为空")},validateInput:function(e){/^[0-9]+$/.test(e.sort)||(e.sort=null)},sortMenu:function(e){var t=this;return i()(o.a.mark(function a(){var n;return o.a.wrap(function(a){for(;;)switch(a.prev=a.next){case 0:return n={tagId:e.tagId,sort:e.sort},a.next=3,Object(m.f)(n);case 3:t.$message.success("排序成功"),t.$emit("change");case 5:case"end":return a.stop()}},a,t)}))()},sortChange:function(e){var t=e.order,a=e.prop;this.$emit("remote-sort",a,t)}},watch:{data:{immediate:!0,handler:function(e){this.tableData=e}},refersh:{immediate:!0,handler:function(e){if(e.changeRefersh){var t=this.tableData.findIndex(function(t){return e.tagId===t.tagId});this.tableData[t].refersh=!0}}}},computed:{getCodeAuth:function(){var e=this;return function(t){var a;return a="add"==t?"memberTagCreateGroup":"edit"==t?"memberTagEditTag":"setValue"==t?"memberTagSetTagValue":"memberTagDelTag",e.$getButtonLimit(e.$buttonCode[a])}},getCode:function(){var e=this;return function(t){var a;return a="add"==t?"memberTagCreateGroup":"edit"==t?"memberTagEditTag":"setValue"==t?"memberTagSetTagValue":"memberTagDelTag",e.$buttonCode[a]}}},components:{DeleteTagDialog:c.default}},v={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"tag-some-list"},[a("el-table",{staticStyle:{width:"100%"},attrs:{data:e.tableData},on:{"sort-change":e.sortChange}},[a("el-table-column",{attrs:{label:"标签名称",prop:"tagName","min-width":"170",fixed:""},scopedSlots:e._u([{key:"default",fn:function(t){return[a("span",{staticClass:"tag-name"},[e._v(e._s(t.row.tagName))]),e._v(" "),a("el-tooltip",{staticClass:"item",attrs:{effect:"dark",content:"添加标签",placement:"bottom"}},[e.getCodeAuth?a("i",{directives:[{name:"track",rawName:"v-track:common.click",value:e.handleTrackParam("addTag",t.row),expression:"handleTrackParam('addTag', scope.row)",arg:"common",modifiers:{click:!0}}],staticClass:"iconfont icon-tag-name icon-PlusOutlined",attrs:{"limit-code":e.getCode},on:{click:function(a){return e.addTag(t.row)}}}):e._e()])]}}])}),e._v(" "),a("el-table-column",{attrs:{label:"上级分类名称","min-width":"110",prop:"tagLevelGroupName"},scopedSlots:e._u([{key:"default",fn:function(t){var n=t.row;return[a("span",[e._v(e._s(n.tagLevelGroupName||"--"))])]}}])}),e._v(" "),a("el-table-column",{attrs:{label:"覆盖人数",prop:"memberCount","min-width":"110","show-overflow-tooltip":""},scopedSlots:e._u([{key:"default",fn:function(t){return[e._v("\n "+e._s(t.row.memberCount?(t.row.memberCount|e.formatNum)+"人":"--")+"\n ")]}}])},[a("template",{slot:"header"},[e._v("\n 覆盖人数\n "),a("el-popover",{attrs:{width:"260",trigger:"hover",placement:"top"}},[a("div",{staticStyle:{color:"#303133"}},[e._v("\n 标签下不同标签值可能覆盖相同的会员，因此此处“标签”覆盖人数去重显示（如“喜欢的颜色-白、红、黑、蓝”，某会员身上可能同时具备“白、黑”二种标签值）\n ")]),e._v(" "),a("i",{staticClass:"iconfont icon-QuestionCircleOutlined refresh",attrs:{slot:"reference"},slot:"reference"})])],1)],2),e._v(" "),a("el-table-column",{attrs:{label:"标签类型",prop:"isMultiple","min-width":"100"},scopedSlots:e._u([{key:"default",fn:function(t){var n=t.row;return[a("div",[e._v(e._s(n.isMultiple?"多选":"单选"))])]}}])}),e._v(" "),a("el-table-column",{attrs:{label:"标签描述",prop:"tagDescribe","min-width":"150"},scopedSlots:e._u([{key:"default",fn:function(t){return[a("div",[e._v(e._s(t.row.tagDescribe?t.row.tagDescribe:"--"))])]}}])}),e._v(" "),a("el-table-column",{attrs:{label:"排序",prop:"sort","min-width":"100",sortable:"custom"},scopedSlots:e._u([{key:"default",fn:function(t){return[t.row.numRool?a("span",{staticClass:"sort",on:{click:function(a){return e.onClickSort(t.row)}}},[e._v(e._s(t.row.sort))]):a("el-input",{ref:"input"+t.row.tagId,on:{input:function(a){return e.validateInput(t.row)},blur:function(a){return e.blurNumInput(t.row)}},model:{value:t.row.sort,callback:function(a){e.$set(t.row,"sort",e._n(a))},expression:"scope.row.sort"}})]}}])},[a("template",{slot:"header"},[e._v("\n 排序\n "),a("el-popover",{attrs:{width:"260",trigger:"hover",placement:"top"}},[a("div",{staticStyle:{color:"#303133"}},[e._v("\n 控制好办上标签展示顺序，按照数字降序排序\n ")]),e._v(" "),a("i",{staticClass:"iconfont icon-QuestionCircleOutlined refresh",attrs:{slot:"reference"},slot:"reference"})])],1)],2),e._v(" "),a("el-table-column",{attrs:{label:"创建时间",prop:"createTime","min-width":"100"},scopedSlots:e._u([{key:"default",fn:function(t){var n=t.row;return[n.createTime?[a("p",[e._v(e._s(e.dateformat(new Date(n.createTime),"yyyy-MM-dd")))]),e._v(" "),a("p",[e._v(e._s(e.dateformat(new Date(n.createTime),"hh:mm:ss")))])]:a("span",[e._v("--")])]}}])}),e._v(" "),(e.getCodeAuth("edit")||e.getCodeAuth("setValue")||e.getCodeAuth("delete"))&&"memberGroupEdit"!=e.resource?a("el-table-column",{attrs:{label:"操作","min-width":"200",fixed:"right"},scopedSlots:e._u([{key:"default",fn:function(t){return[a("div",{staticClass:"font-0"},[e.isWeim||!e.getCodeAuth("edit")||e.weimId.includes(t.row.tagLevelGroupId)?e._e():a("el-button",{staticClass:"m-r-12",attrs:{type:"text","limit-code":e.getCode("edit")},on:{click:function(a){return e.editHandTag(t.row)}}},[e._v("编辑")]),e._v(" "),e.getCodeAuth("setValue")?a("el-button",{staticClass:"m-r-12",attrs:{type:"text","limit-code":e.getCode("setValue")},on:{click:function(a){return e.editHandTagValue(t.row)}}},[e._v("详情")]):e._e(),e._v(" "),e.isWeim||!e.getCodeAuth("delete")||e.weimId.includes(t.row.tagLevelGroupId)?e._e():a("el-button",{staticClass:"m-r-12",attrs:{type:"text","limit-code":e.getCode("delete")},on:{click:function(a){return e.deleteHandTag(t.row,t.$index,a)}}},[e._v("删除")])],1)]}}])}):e._e()],1),e._v(" "),a("delete-tag-dialog",{attrs:{visible:e.deleteTagDialog.visible,data:e.deleteTagDialog.deleteData},on:{"update:visible":function(t){return e.$set(e.deleteTagDialog,"visible",t)},submit:e.doDelete}}),e._v(" "),a("i",{staticClass:"iconfont icon-biaoqian tagAniIcon",style:{right:e.animationPos.x+"px",bottom:e.animationPos.y+"px"},attrs:{id:"tagAniIcon"}})],1)},staticRenderFns:[]};var b=a("VU/8")(h,v,!1,function(e){a("yyRL")},"data-v-35478275",null);t.default=b.exports},yyRL:function(e,t){}});
\ No newline at end of file
dist/static/js/38.b71e1f4f3b700ad59435.js
webpackJsonp([38],{"Ax/m":function(t,e){},Gy5W:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var o={name:"App",data:function(){return{projectName:"member-tag",contentHeight:"0px",collapseFlag:!1,leftModulesName:"会员标签"}},methods:{toRouterView:function(t){this.$router.push({path:t.path})},collapseTag:function(t){this.collapseFlag=t}},mounted:function(){this.pathName=window.location.hash.split("/")[1],this.contentHeight=(document.documentElement.clientHeight||document.body.clientHeight)-64+"px"},components:{}},i={render:function(){var t=this.$createElement,e=this._self._c||t;return e("transition",{attrs:{name:"fade",mode:"out-in"}},[e("router-view")],1)},staticRenderFns:[]};var a=n("VU/8")(o,i,!1,function(t){n("Ax/m")},null,null);e.default=a.exports}});
\ No newline at end of file
<<<<<<< HEAD:dist/static/js/38.b71e1f4f3b700ad59435.js
webpackJsonp([38],{"Ax/m":function(t,e){},Gy5W:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var o={name:"App",data:function(){return{projectName:"member-tag",contentHeight:"0px",collapseFlag:!1,leftModulesName:"会员标签"}},methods:{toRouterView:function(t){this.$router.push({path:t.path})},collapseTag:function(t){this.collapseFlag=t}},mounted:function(){this.pathName=window.location.hash.split("/")[1],this.contentHeight=(document.documentElement.clientHeight||document.body.clientHeight)-64+"px"},components:{}},i={render:function(){var t=this.$createElement,e=this._self._c||t;return e("transition",{attrs:{name:"fade",mode:"out-in"}},[e("router-view")],1)},staticRenderFns:[]};var a=n("VU/8")(o,i,!1,function(t){n("Ax/m")},null,null);e.default=a.exports}});
=======
webpackJsonp([23],{"8xuW":function(t,e){},Gy5W:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var o={name:"App",data:function(){return{projectName:"member-tag",contentHeight:"0px",collapseFlag:!1,leftModulesName:"会员标签"}},methods:{toRouterView:function(t){this.$router.push({path:t.path})},collapseTag:function(t){this.collapseFlag=t}},mounted:function(){this.pathName=window.location.hash.split("/")[1],this.contentHeight=(document.documentElement.clientHeight||document.body.clientHeight)-64+"px"},components:{}},i={render:function(){var t=this.$createElement,e=this._self._c||t;return e("transition",{attrs:{name:"fade",mode:"out-in"}},[e("router-view")],1)},staticRenderFns:[]};var a=n("VU/8")(o,i,!1,function(t){n("8xuW")},null,null);e.default=a.exports}});
>>>>>>> bugfix/分组分类重复展示:dist/static/js/23.6db5fe3e35a647ae1bce.js
dist/static/js/manifest.631ddd5d222abceceabf.js 0 → 100644
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,n,r){for(var d,t,o,i=0,u=[];i<a.length;i++)t=a[i],f[t]&&u.push(f[t][0]),f[t]=0;for(d in n)Object.prototype.hasOwnProperty.call(n,d)&&(e[d]=n[d]);for(c&&c(a,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=b(b.s=r[i]);return o};var a={},f={46:0};function b(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,b),f.l=!0,f.exports}b.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,b){c=f[e]=[a,b]});c[2]=a;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,b.nc&&r.setAttribute("nonce",b.nc),r.src=b.p+"static/js/"+e+"."+{0:"c4b6d6cb755f46a93f77",1:"a5b1143fb090193afa6f",2:"443c91d33cd2464b19a1",3:"177b38feffa284c86774",4:"204aedfb0870a329fb96",5:"d93d4e6e37b270e74e0c",6:"73c4cc952259800eebb9",7:"4c47ec34587d4554f310",8:"0ee171376d4ff4853265",9:"6745d9c9726c50323c7f",10:"b3e0655ae069b2914dce",11:"cfa61640d1a3d8d26b48",12:"ed35f742a5cdceb1f843",13:"04f66cbd91ce2ab0d824",14:"3579fb9c54d114b602fb",15:"1795eb2c89cf81f17b46",16:"fd8e0aca022b16e268de",17:"ee4ff30e9c5028d2ab9a",18:"04fef63821c104201b24",19:"4fcd3f0652be046eae2b",20:"b2ba64154f555459cc42",21:"9c7b0847654fea50f3ce",22:"02d8f41c5b349b9bc2fe",23:"6db5fe3e35a647ae1bce",24:"49727bc8e6bb48fc50c2",25:"42b206ebe92a46e8ac20",26:"2382a2ad8dc8d8be0114",27:"d90ade7168d3fa22652f",28:"a162a9e98e1b2c78ae46",29:"9efcfdb3a2c8b24f6f57",30:"fbb528f02d4f8a0b02d6",31:"432001f131a2901f1cff",32:"b6ac2827a57d12878f97",33:"8dc1ab50ce2217d20323",34:"7b662a230391f8739e52",35:"f6c7eb27d91ddb250e6d",36:"9de99ecb4d9b9240a7fb",37:"9963beab4d1e44f7645e",38:"35167ce3debdaddce4dd",39:"24c82589a8b9a16a8124",40:"360db6296b4b9cbcf1a5",41:"9a90b7405429e597f965",42:"50661a28c4416e9dd052",43:"a58b09332b3e4b0b022a"}[e]+".js";var d=setTimeout(t,12e4);function t(){r.onerror=r.onload=null,clearTimeout(d);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=t,n.appendChild(r),a},b.m=e,b.c=a,b.d=function(e,c,a){b.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},b.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(c,"a",c),c},b.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},b.p="./",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/view/memberGroup/group-list.vue
......@@ -214,6 +214,9 @@ export default {
this.memberGroupLoading = false;
if (res.errorCode == 0) {
const { result, totalPage } = res.result || {};
if (pageNum == 1) {
this.lists = [];
}
if (Array.isArray(result)) {
this.lists = this.lists.concat(result.map(el => ({ ...el, edit: false })));
}
......
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