Skip to content

M
memberTag-web
Commit e9a2fefe by huaying
Options

fix: 合并dist冲突

parents c135ca45 7c2dbe21
Showing with 66 additions and 14 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.08b63c11fd8cee90cda9a103457ca988.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.ac0d9272051f162bfd2134a1489926f7.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() {
>>>>>>> feature/7月迭代-会员
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.5b7f99ca716dbad3e080.js></script><script type=text/javascript src=./static/js/vendor.42f883472a1fc4925cbd.js></script><script type=text/javascript src=./static/js/app.000fcb6ba35e99355941.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.5b7f99ca716dbad3e080.js></script><script type=text/javascript src=./static/js/vendor.42f883472a1fc4925cbd.js></script><script type=text/javascript src=./static/js/app.000fcb6ba35e99355941.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.0fc82cdf9e8a775ca04e.js></script><script type=text/javascript src=./static/js/vendor.42f883472a1fc4925cbd.js></script><script type=text/javascript src=./static/js/app.a944f905dccf130a70a5.js></script></body></html>
>>>>>>> feature/7月迭代-会员
dist/static/css/app.08b63c11fd8cee90cda9a103457ca988.css
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.ac0d9272051f162bfd2134a1489926f7.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.665d738a5f739f3a7a74.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/20.2fa96d2046651d4bda7a.js 0 → 100644
webpackJsonp([20],{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),d=a("QOex"),u=a("DMDI"),c=a("r9pr"),m=a("2CGT"),g=a("EOvX"),f=a("Ch4/"),p=a("P9l9"),h={name:"tag-container",mixins:[u.a,d.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=this,a=e.currentIndex,n=e.e,o=e.tagId;Object(p.a)("/memberTag/getTagById",{tagId:o}).then(function(o){var r=o.data,i=r.errorCode,s=r.result;0==i&&(s.memberCount?t.intoTrash(e,a,n):t.directDelTag(e))}).catch(function(e){console.log(e)})},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("WP9V")},"data-v-741c1466",null);t.default=b.exports},WP9V:function(e,t){}});
\ No newline at end of file
dist/static/js/21.1f6367e5dcf6de69a5bd.js 0 → 100644
<<<<<<<< HEAD:dist/static/js/22.f97c04968d78b5b99e89.js
webpackJsonp([22],{"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([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){}});
>>>>>>>> feature/7月迭代-会员:dist/static/js/21.1f6367e5dcf6de69a5bd.js
dist/static/js/23.1e9aeacb85a469484d6e.js 0 → 100644
<<<<<<<< HEAD:dist/static/js/24.ee5a8baed163b78150c1.js
webpackJsonp([24],{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([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){}});
>>>>>>>> feature/7月迭代-会员:dist/static/js/23.1e9aeacb85a469484d6e.js
dist/static/js/24.32ea2fce686ff5a02a83.js 0 → 100644
<<<<<<<< HEAD:dist/static/js/37.825178909c13097bc512.js
webpackJsonp([37],{"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([24],{"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}});
>>>>>>>> feature/7月迭代-会员:dist/static/js/24.32ea2fce686ff5a02a83.js
dist/static/js/24.ee5a8baed163b78150c1.js
webpackJsonp([24],{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/24.ee5a8baed163b78150c1.js
webpackJsonp([24],{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([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){}});
>>>>>>>> feature/7月迭代-会员:dist/static/js/23.1e9aeacb85a469484d6e.js
dist/static/js/3.b285d4f0174a039da00a.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/3.ff305e5dc9d6506945c1.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/33.00364921438ed3f97457.js 0 → 100644
webpackJsonp([33],{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/33.d14ec9ab3b5db564d2d1.js → dist/static/js/34.7eff4f62b69145f81c4d.js
webpackJsonp([33],{"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){}});
\ No newline at end of file
webpackJsonp([34],{"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){}});
\ No newline at end of file
dist/static/js/37.825178909c13097bc512.js
webpackJsonp([37],{"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/37.825178909c13097bc512.js
webpackJsonp([37],{"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([24],{"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}});
>>>>>>>> feature/7月迭代-会员:dist/static/js/24.32ea2fce686ff5a02a83.js
dist/static/js/manifest.0fc82cdf9e8a775ca04e.js 0 → 100644
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,d){for(var t,b,o,i=0,u=[];i<c.length;i++)b=c[i],f[b]&&u.push(f[b][0]),f[b]=0;for(t in r)Object.prototype.hasOwnProperty.call(r,t)&&(e[t]=r[t]);for(a&&a(c,r,d);u.length;)u.shift()();if(d)for(i=0;i<d.length;i++)o=n(n.s=d[i]);return o};var c={},f={46: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],d=document.createElement("script");d.type="text/javascript",d.charset="utf-8",d.async=!0,d.timeout=12e4,n.nc&&d.setAttribute("nonce",n.nc),d.src=n.p+"static/js/"+e+"."+{0:"665d738a5f739f3a7a74",1:"a5b1143fb090193afa6f",2:"5f0c728239e6984ffd30",3:"ff305e5dc9d6506945c1",4:"d8eb0bf6cc0afb951c78",5:"2b76bfcb34e27514247e",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:"2fa96d2046651d4bda7a",21:"1f6367e5dcf6de69a5bd",22:"4985a38ec89a12ab291d",23:"1e9aeacb85a469484d6e",24:"32ea2fce686ff5a02a83",25:"9631a7f7112daff44b57",26:"94037a1d26ca9ff1357c",27:"9da56a144273173dd58d",28:"c08b5446e0d6813e98ab",29:"ac3b9ad2c1fe8c5ea040",30:"4226ba90f06063c51c49",31:"7c02ba89e248eaadf07c",32:"079e1a2a7c4b75892e4d",33:"00364921438ed3f97457",34:"7eff4f62b69145f81c4d",35:"f6c7eb27d91ddb250e6d",36:"9de99ecb4d9b9240a7fb",37:"9963beab4d1e44f7645e",38:"468b3385aaf0fc8f3b55",39:"b59b4162a53300ded7b9",40:"78641cb6ef8afc5d86f9",41:"9a90b7405429e597f965",42:"50661a28c4416e9dd052",43:"a58b09332b3e4b0b022a"}[e]+".js";var t=setTimeout(b,12e4);function b(){d.onerror=d.onload=null,clearTimeout(t);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return d.onerror=d.onload=b,r.appendChild(d),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/manualTag/manual-tag-value-edit-info.vue
......@@ -84,15 +84,21 @@
<img class="channel-icon" v-if="channel.parentSourceCode == 1700" src="../../../static/img/channel-icon/qiyeweixin-1.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1303" src="../../../static/img/channel-icon/weimen-1.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1302" src="../../../static/img/channel-icon/tianmao-1.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1304" src="../../../static/img/channel-icon/douyin-1.png" alt="">
<!-- <img class="channel-icon" v-if="channel.parentSourceCode == 1304" src="../../../static/img/channel-icon/douyin-1.png" alt=""> -->
</template>
<template v-if="channel.activeFlag == 1">
<img class="channel-icon" v-if="channel.parentSourceCode == 1304" src="../../../static/img/channel-icon/douyin-1.png" alt="">
</template>
<template v-if="channel.activeFlag != 1">
<img class="channel-icon" v-if="channel.parentSourceCode == 1304" src="../../../static/img/channel-icon/douyin-2.png" alt="">
</template>
<template v-if="channel.highlight == 2">
<img class="channel-icon" v-if="channel.parentSourceCode == 1100" src="../../../static/img/channel-icon/weixin-2.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1600" src="../../../static/img/channel-icon/xiaochengxu-2.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1700" src="../../../static/img/channel-icon/qiyeweixin-2.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1303" src="../../../static/img/channel-icon/weimen-2.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1302" src="../../../static/img/channel-icon/tianmao-2.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1304" src="../../../static/img/channel-icon/douyin-2.png" alt="">
<!-- <img class="channel-icon" v-if="channel.parentSourceCode == 1304" src="../../../static/img/channel-icon/douyin-2.png" alt=""> -->
</template>
</span>
</template>
......
src/view/memberGroup/memberGroupDetail.vue
......@@ -105,15 +105,21 @@
<img class="channel-icon" v-if="channel.parentSourceCode == 1700" src="../../../static/img/channel-icon/qiyeweixin-1.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1303" src="../../../static/img/channel-icon/weimen-1.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1302" src="../../../static/img/channel-icon/tianmao-1.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1304" src="../../../static/img/channel-icon/douyin-1.png" alt="">
<!-- <img class="channel-icon" v-if="channel.parentSourceCode == 1304" src="../../../static/img/channel-icon/douyin-1.png" alt=""> -->
</template>
<template v-if="channel.activeFlag == 1">
<img class="channel-icon" v-if="channel.parentSourceCode == 1304" src="../../../static/img/channel-icon/douyin-1.png" alt="">
</template>
<template v-if="channel.activeFlag != 1">
<img class="channel-icon" v-if="channel.parentSourceCode == 1304" src="../../../static/img/channel-icon/douyin-2.png" alt="">
</template>
<template v-if="channel.highlight == 2">
<img class="channel-icon" v-if="channel.parentSourceCode == 1100" src="../../../static/img/channel-icon/weixin-2.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1600" src="../../../static/img/channel-icon/xiaochengxu-2.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1700" src="../../../static/img/channel-icon/qiyeweixin-2.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1303" src="../../../static/img/channel-icon/weimen-2.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1302" src="../../../static/img/channel-icon/tianmao-2.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1304" src="../../../static/img/channel-icon/douyin-2.png" alt="">
<!-- <img class="channel-icon" v-if="channel.parentSourceCode == 1304" src="../../../static/img/channel-icon/douyin-2.png" alt=""> -->
</template>
</span>
</template>
......
src/view/memberGroup/memberLevelDetail.vue
......@@ -81,15 +81,21 @@
<img class="channel-icon" v-if="channel.parentSourceCode == 1700" src="../../../static/img/channel-icon/qiyeweixin-1.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1303" src="../../../static/img/channel-icon/weimen-1.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1302" src="../../../static/img/channel-icon/tianmao-1.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1304" src="../../../static/img/channel-icon/douyin-1.png" alt="">
<!-- <img class="channel-icon" v-if="channel.parentSourceCode == 1304" src="../../../static/img/channel-icon/douyin-1.png" alt=""> -->
</template>
<template v-if="channel.activeFlag == 1">
<img class="channel-icon" v-if="channel.parentSourceCode == 1304" src="../../../static/img/channel-icon/douyin-1.png" alt="">
</template>
<template v-if="channel.activeFlag != 1">
<img class="channel-icon" v-if="channel.parentSourceCode == 1304" src="../../../static/img/channel-icon/douyin-2.png" alt="">
</template>
<template v-if="channel.highlight == 2">
<img class="channel-icon" v-if="channel.parentSourceCode == 1100" src="../../../static/img/channel-icon/weixin-2.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1600" src="../../../static/img/channel-icon/xiaochengxu-2.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1700" src="../../../static/img/channel-icon/qiyeweixin-2.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1303" src="../../../static/img/channel-icon/weimen-2.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1302" src="../../../static/img/channel-icon/tianmao-2.png" alt="">
<img class="channel-icon" v-if="channel.parentSourceCode == 1304" src="../../../static/img/channel-icon/douyin-2.png" alt="">
<!-- <img class="channel-icon" v-if="channel.parentSourceCode == 1304" src="../../../static/img/channel-icon/douyin-2.png" alt=""> -->
</template>
</span>
</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