Skip to content

M
memberTag-web
Commit e611edcc by dingdang
Options

Merge branch 'feature/9月-基础迭代' into test 

# Conflicts:
#	dist/index.html
#	dist/static/js/0.025a11d230b19276ed2f.js
#	dist/static/js/0.ba6ed7ca78ccaca46847.js
#	dist/static/js/0.c64a7277f548b8d25aaf.js
#	dist/static/js/25.f3238684d2f8708574ce.js
#	dist/static/js/26.293bd3aa2628b06f9f7b.js
#	dist/static/js/26.94037a1d26ca9ff1357c.js
#	dist/static/js/27.25d289cd63d296ff3b7d.js
#	dist/static/js/28.72e477a80a5213bda056.js
#	dist/static/js/28.84a9bd97e5aebc8d1cea.js
#	dist/static/js/3.c3dff49bd662e9d539c7.js
#	dist/static/js/32.ba1b9de80e3f03b1a2d3.js
#	dist/static/js/33.00364921438ed3f97457.js
#	dist/static/js/33.3f7ade7fd159c174b7f0.js
#	dist/static/js/34.1dbe7f811142e11c31b2.js
#	dist/static/js/34.4f095728a58c5e4446cc.js
#	dist/static/js/34.c49d7a32fb0830ab3e2d.js
#	dist/static/js/35.6c7a7e5f95be2e7617c9.js
#	dist/static/js/35.9124251a3bf987134726.js
#	dist/static/js/35.db4a5f9813e5ad452dbe.js
#	dist/static/js/36.4f93f6d6dcca0b44741d.js
#	dist/static/js/36.d68b8d6748b0f7772885.js
#	dist/static/js/37.471b078ac17fa88086d4.js
parents b17912ea b8a35988
Showing with 353 additions and 56 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.cd3fa9e3c80cf9b2bd1c21aa260dbf31.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.4fcd9b540eb3785e899fd00797b1cfaf.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/9月-基础迭代
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 ? 'www.gicdev.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.b7cfe378433eac62dfeb.js></script><script type=text/javascript src=./static/js/vendor.42f883472a1fc4925cbd.js></script><script type=text/javascript src=./static/js/app.8c3fa56244e44f71407a.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.b7cfe378433eac62dfeb.js></script><script type=text/javascript src=./static/js/vendor.42f883472a1fc4925cbd.js></script><script type=text/javascript src=./static/js/app.8c3fa56244e44f71407a.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.e436c1f35bd57411242c.js></script><script type=text/javascript src=./static/js/vendor.42f883472a1fc4925cbd.js></script><script type=text/javascript src=./static/js/app.d6ca4ef27b279543aae7.js></script></body></html>
>>>>>>> feature/9月-基础迭代
dist/static/css/app.4fcd9b540eb3785e899fd00797b1cfaf.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.025a11d230b19276ed2f.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.c64a7277f548b8d25aaf.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/22.f97c04968d78b5b99e89.js → dist/static/js/21.1f6367e5dcf6de69a5bd.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){}});
\ No newline at end of file
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){}});
\ No newline at end of file
dist/static/js/24.ee5a8baed163b78150c1.js → dist/static/js/23.1e9aeacb85a469484d6e.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
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
dist/static/js/25.de7e9c9cec4e7e3c2f50.js → dist/static/js/24.32ea2fce686ff5a02a83.js
webpackJsonp([25],{"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}});
\ No newline at end of file
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}});
\ No newline at end of file
dist/static/js/25.f3238684d2f8708574ce.js 0 → 100644
webpackJsonp([25],{C8bH:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=a("5QTb"),n=a("M2/U"),o=a("3fED"),i=(a("Mk6G"),a("3E4D")),s=a("Ch4/"),l=a("PI0u"),u=a("P9l9"),g={name:"myTagList",data:function(){return{showTagDetail:!1,tagShortDetailId:"",fromFlag:"myTag",tagLibName:"myTag",tagSearch:"",tagTableData:[],currentPage:1,pageSize:20,total:0,currentGroupId:0}},methods:{changeRoute:function(t){this.$router.push(t)},handleShowTag:function(){this.showTagDetail=!0},handleHideTag:function(t){this.showTagDetail=!1},toManualTagLib:function(){this.changeRoute("/manualTagList")},toPlatformTagLib:function(){this.changeRoute("/platformTagList")},searchEnterFun:Object(l.b)(function(t){this.currentPage=1,this.getTagList()},500),clearSearch:function(){this.currentPage=1,this.getTagList()},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(){var t=this,e={tagName:t.tagSearch,tagLevelGroupId:t.currentGroupId,pageNum:t.currentPage,pageSize:t.pageSize};Object(u.a)("/enterpriseMemberTag/pageList",e).then(function(e){var a=e.data;if(0==a.errorCode)return a.result.result&&a.result.result.length?(a.result.result.forEach(function(t,e){t.popVisible=!1}),t.tagTableData=a.result.result):(t.tagTableData=[],t.$message.error({duration:1e3,message:"未找到数据"})),void(t.total=a.result.totalCount);s.a.errorMsg(a)}).catch(function(e){t.$message.error({duration:1e3,message:e.message})})},addTemporary:function(t){this.tagShortDetailId=t,this.showTagDetail=!0,this.$refs.tagTemp.hideTagList()},cancelDelTag:function(t,e){e.popVisible=!1},toDelTag:function(t,e){var a=this;a.$confirm("确认要删除此标签吗？","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){a.postToDelTag(t,e)}).catch(function(){})},postToDelTag:function(t,e){var a=this,r={enterpriseMemberTagId:e.enterpriseMemberTagId};Object(u.a)("/enterpriseMemberTag/del",r).then(function(e){var r=e.data;if(0==r.errorCode)return i.a.showmsg("删除成功","success"),a.tagTableData.splice(t,1),void a.$refs.tagTemp.getTagList();s.a.errorMsg(r)}).catch(function(t){a.$message.error({duration:1e3,message:t.message})})},showShortDetail:function(t){this.showTagDetail=!0,this.tagShortDetailId=t},updateTemp:function(){this.$refs.tagTemp.getTagList(),this.$refs.tagTemp.showTagList()},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:{tagShortDetail:o.a,tagCategory:r.a,tagTemporary:n.a}},c={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"myTagList-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:(a=e,t.searchEnterFun(a));var a}},model:{value:t.tagSearch,callback:function(e){t.tagSearch=e},expression:"tagSearch"}})],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"}},[a("el-table-column",{attrs:{label:"标签名称","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[a("span",{staticClass:"pointer name-hover",on:{click:function(a){return t.addTemporary(e.row.tagId)}}},[t._v(t._s(e.row.tagName))])]}}])}),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:"/myTagDetail",query:{tagId:e.row.tagId}}}},[t._v("详情")]),t._v(" "),a("el-button",{staticClass:"p-l-10",attrs:{type:"text",size:"small"},on:{click:function(a){return t.addTemporary(e.row.tagId)}}},[t._v("添加至暂存架")]),t._v(" "),a("el-button",{attrs:{slot:"reference",type:"text"},on:{click:function(a){return t.toDelTag(e.$index,e.row)}},slot:"reference"},[t._v("\n 删除\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()])]),t._v(" "),a("tagShortDetail",{attrs:{fromFlag:t.fromFlag,tagShortId:t.tagShortDetailId,showTagDetail:t.showTagDetail},on:{"update:tagShortId":function(e){t.tagShortDetailId=e},"update:tag-short-id":function(e){t.tagShortDetailId=e},hideTag:t.handleHideTag,updateTemp:t.updateTemp}}),t._v(" "),a("tag-temporary",{ref:"tagTemp",on:{showShortDetail:t.showShortDetail}})],1)},staticRenderFns:[]};var h=a("VU/8")(g,c,!1,function(t){a("FUvw")},"data-v-5643b192",null);e.default=h.exports},FUvw:function(t,e){}});
\ No newline at end of file
dist/static/js/27.9da56a144273173dd58d.js → dist/static/js/26.2382a2ad8dc8d8be0114.js
webpackJsonp([27],{Q53H:function(t,a){},puJc:function(t,a,e){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var r={name:"platformTagLib",data:function(){return{tagCategory:"platformTagList"}},components:{tagLib:e("BdFv").a}},n={render:function(){var t=this.$createElement,a=this._self._c||t;return a("div",{staticClass:"platformTagLib-wrap common-wrap"},[a("div",{staticClass:"right-content"},[a("div",{staticClass:"right-box"},[a("tag-lib",{attrs:{tagCategory:this.tagCategory}})],1)])])},staticRenderFns:[]};var i=e("VU/8")(r,n,!1,function(t){e("Q53H")},"data-v-5568a04c",null);a.default=i.exports}});
\ No newline at end of file
webpackJsonp([26],{Q53H:function(t,a){},puJc:function(t,a,e){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var r={name:"platformTagLib",data:function(){return{tagCategory:"platformTagList"}},components:{tagLib:e("BdFv").a}},n={render:function(){var t=this.$createElement,a=this._self._c||t;return a("div",{staticClass:"platformTagLib-wrap common-wrap"},[a("div",{staticClass:"right-content"},[a("div",{staticClass:"right-box"},[a("tag-lib",{attrs:{tagCategory:this.tagCategory}})],1)])])},staticRenderFns:[]};var i=e("VU/8")(r,n,!1,function(t){e("Q53H")},"data-v-5568a04c",null);a.default=i.exports}});
\ No newline at end of file
dist/static/js/27.25d289cd63d296ff3b7d.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/28.84a9bd97e5aebc8d1cea.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/29.ac3b9ad2c1fe8c5ea040.js → dist/static/js/28.a162a9e98e1b2c78ae46.js
webpackJsonp([29],{YPWR: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}},watch:{},mounted:function(){this.pathName=window.location.hash.split("/")[1],this.contentHeight=(document.documentElement.clientHeight||document.body.clientHeight)-64+"px"},components:{}},a={render:function(){var t=this.$createElement,e=this._self._c||t;return e("div",{attrs:{id:"index"}},[e("vue-gic-header",{attrs:{projectName:this.projectName,collapseFlag:this.collapseFlag},on:{collapseTag:this.collapseTag,toRouterView:this.toRouterView}}),this._v(" "),e("div",{staticClass:"content",attrs:{id:"content"}},[e("div",{staticClass:"content-body",style:{height:this.contentHeight}},[e("transition",{attrs:{name:"fade",mode:"out-in"}},[e("router-view")],1)],1)])],1)},staticRenderFns:[]};var i=n("VU/8")(o,a,!1,function(t){n("hVvq")},"data-v-521b48e0",null);e.default=i.exports},hVvq:function(t,e){}});
\ No newline at end of file
webpackJsonp([28],{YPWR: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}},watch:{},mounted:function(){this.pathName=window.location.hash.split("/")[1],this.contentHeight=(document.documentElement.clientHeight||document.body.clientHeight)-64+"px"},components:{}},a={render:function(){var t=this.$createElement,e=this._self._c||t;return e("div",{attrs:{id:"index"}},[e("vue-gic-header",{attrs:{projectName:this.projectName,collapseFlag:this.collapseFlag},on:{collapseTag:this.collapseTag,toRouterView:this.toRouterView}}),this._v(" "),e("div",{staticClass:"content",attrs:{id:"content"}},[e("div",{staticClass:"content-body",style:{height:this.contentHeight}},[e("transition",{attrs:{name:"fade",mode:"out-in"}},[e("router-view")],1)],1)])],1)},staticRenderFns:[]};var i=n("VU/8")(o,a,!1,function(t){n("hVvq")},"data-v-521b48e0",null);e.default=i.exports},hVvq:function(t,e){}});
\ No newline at end of file
dist/static/js/30.4226ba90f06063c51c49.js → dist/static/js/29.9efcfdb3a2c8b24f6f57.js
webpackJsonp([30],{SQwf:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=a("QOex"),r=a("DMDI"),i=a("2CGT"),o={name:"tag-container",mixins:[r.a,n.a],props:{data:{type:Array,default:function(){return[]}},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():{}}},changeMoreUse:function(t){var e=this,a={tagId:t.tagId,isMoreUse:t.isMoreUse?0:1};Object(i.L)(a).then(function(){e.$message.success(a.isMoreUse?'已设为"常用标签"':'已取消"设为常用标签"'),t.isMoreUse=t.isMoreUse?0:1})}},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}}},s={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:""},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(" "),a("el-table-column",{attrs:{label:"是否实时",prop:"isActive","min-width":"70"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("span",{class:["base",1==e.row.isActive?"keep-active":"no-active"]},[t._v(" "+t._s(1==e.row.isActive?"实时":"非实时")+" ")])]}}])}),t._v(" "),a("el-table-column",{attrs:{label:"上级分类名称","min-width":"100"},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:"tagDescribe","min-width":"170"},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:"操作"},scopedSlots:t._u([{key:"default",fn:function(e){var n=e.row;return[a("el-button",{attrs:{type:"text"},on:{click:function(e){return t.changeMoreUse(n)}}},[t._v(t._s(n.isMoreUse?"取消":"设为常用"))])]}}])})],1)],1)},staticRenderFns:[]};var c=a("VU/8")(o,s,!1,function(t){a("jGIp")},"data-v-51a0b664",null);e.default=c.exports},jGIp:function(t,e){}});
\ No newline at end of file
webpackJsonp([29],{SQwf:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=a("QOex"),r=a("DMDI"),i=a("2CGT"),o={name:"tag-container",mixins:[r.a,n.a],props:{data:{type:Array,default:function(){return[]}},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():{}}},changeMoreUse:function(t){var e=this,a={tagId:t.tagId,isMoreUse:t.isMoreUse?0:1};Object(i.L)(a).then(function(){e.$message.success(a.isMoreUse?'已设为"常用标签"':'已取消"设为常用标签"'),t.isMoreUse=t.isMoreUse?0:1})}},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}}},s={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:""},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(" "),a("el-table-column",{attrs:{label:"是否实时",prop:"isActive","min-width":"70"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("span",{class:["base",1==e.row.isActive?"keep-active":"no-active"]},[t._v(" "+t._s(1==e.row.isActive?"实时":"非实时")+" ")])]}}])}),t._v(" "),a("el-table-column",{attrs:{label:"上级分类名称","min-width":"100"},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:"tagDescribe","min-width":"170"},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:"操作"},scopedSlots:t._u([{key:"default",fn:function(e){var n=e.row;return[a("el-button",{attrs:{type:"text"},on:{click:function(e){return t.changeMoreUse(n)}}},[t._v(t._s(n.isMoreUse?"取消":"设为常用"))])]}}])})],1)],1)},staticRenderFns:[]};var c=a("VU/8")(o,s,!1,function(t){a("jGIp")},"data-v-51a0b664",null);e.default=c.exports},jGIp:function(t,e){}});
\ No newline at end of file
dist/static/js/32.14f79f198642e872b60b.js → dist/static/js/31.7c02ba89e248eaadf07c.js
webpackJsonp([32],{"5/Vq":function(t,a){},q490: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:"manualTagLib",data:function(){return{tagCategory:"manualTagList"}},components:{tagLib:n.a}}),r={render:function(){var t=this.$createElement,a=this._self._c||t;return a("div",{staticClass:"manualTagLib-wrap common-wrap"},[a("div",{staticClass:"right-content"},[a("div",{staticClass:"right-box"},[a("tag-lib",{attrs:{tagCategory:this.tagCategory}})],1)])])},staticRenderFns:[]};var s=e("VU/8")(i,r,!1,function(t){e("5/Vq")},"data-v-50a34f5e",null);a.default=s.exports}});
\ No newline at end of file
webpackJsonp([31],{"5/Vq":function(t,a){},q490: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:"manualTagLib",data:function(){return{tagCategory:"manualTagList"}},components:{tagLib:n.a}}),r={render:function(){var t=this.$createElement,a=this._self._c||t;return a("div",{staticClass:"manualTagLib-wrap common-wrap"},[a("div",{staticClass:"right-content"},[a("div",{staticClass:"right-box"},[a("tag-lib",{attrs:{tagCategory:this.tagCategory}})],1)])])},staticRenderFns:[]};var s=e("VU/8")(i,r,!1,function(t){e("5/Vq")},"data-v-50a34f5e",null);a.default=s.exports}});
\ No newline at end of file
dist/static/js/33.3f7ade7fd159c174b7f0.js 0 → 100644
<<<<<<<< HEAD:dist/static/js/34.c49d7a32fb0830ab3e2d.js
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){}});
========
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){}});
>>>>>>>> feature/9月-基础迭代:dist/static/js/33.3f7ade7fd159c174b7f0.js
dist/static/js/35.9124251a3bf987134726.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/36.198c64e7eb7235b4a7ca.js 0 → 100644
webpackJsonp([36],{SJ7l:function(e,t,i){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var s=i("Dd8w"),a=i.n(s),l=i("2CGT"),o={name:"group-list",props:{activeType:String},data:function(){return{searchTip:!1,addGroupDialog:!1,listsParams:{pageNum:1,pageSize:20,totalPage:1,classifyName:""},lists:[],currentIndex:-1,editDialog:{visible:!1,loading:!1,classifyName:"",list:{}},memberGroupLoading:!1,addType:!0}},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(l.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(l.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,o=t.classifyName;1==i&&(this.lists=[]),Object(l.C)({requestProject:"gic-member-tag-web",type:1==this.activeType?0:1,pageNum:i,pageSize:s,classifyName:o}).then(function(t){if(e.memberGroupLoading=!1,0==t.errorCode){var s=t.result||{},l=s.result,o=s.totalPage;""==e.listsParams.classifyName?(e.searchTip=!1,e.addType=!0):""!=e.listsParams.classifyName&&(e.addType=!1,l.length<=0?e.searchTip=!0:e.searchTip=!1),1==i&&(e.lists=[]),Array.isArray(l)&&(e.lists=e.lists.concat(l.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",{directives:[{name:"loading",rawName:"v-loading",value:e.memberGroupLoading,expression:"memberGroupLoading"}],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)}),0),e._v(" "),e.searchTip?i("p",{staticClass:"searchTip"},[e._v("没有找到和“"+e._s(e.listsParams.classifyName)+"”相关的内容")]):e._e(),e._v(" "),e.$getButtonLimit(e.$buttonCode.memberTagAddCateGory)&&1==e.activeType?i("div",{staticClass:"add-category"},[e.addType&&e.lists.length?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("新增分类")]):e._e()],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")(o,r,!1,function(e){i("z3lI")},"data-v-289a0680",null);t.default=n.exports},z3lI:function(e,t){}});
\ No newline at end of file
dist/static/js/manifest.e436c1f35bd57411242c.js 0 → 100644
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,n,r){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 n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(a&&a(c,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=d(d.s=r[i]);return o};var c={},f={46:0};function d(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,d),f.l=!0,f.exports}d.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,d){a=f[e]=[c,d]});a[2]=c;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,d.nc&&r.setAttribute("nonce",d.nc),r.src=d.p+"static/js/"+e+"."+{0:"025a11d230b19276ed2f",1:"a5b1143fb090193afa6f",2:"e6a6cc3fa8a4dd82a7d2",3:"c3dff49bd662e9d539c7",4:"9c3715357aff12e5504e",5:"d3cde8314f2c2d792a1b",6:"1de7a9fb69c9e7b405b2",7:"ff33b18f5a141ded65fd",8:"0ee171376d4ff4853265",9:"6745d9c9726c50323c7f",10:"b3e0655ae069b2914dce",11:"cfa61640d1a3d8d26b48",12:"ed35f742a5cdceb1f843",13:"31a37a631047d0174d2e",14:"16ccd3721e67b8b0f02a",15:"35b69e299a39fb0ca1ea",16:"fd8e0aca022b16e268de",17:"ee4ff30e9c5028d2ab9a",18:"55125f92d7195b69284f",19:"50d942c9e9ba56907937",20:"f0de25cbc685c7981cae",21:"1f6367e5dcf6de69a5bd",22:"4985a38ec89a12ab291d",23:"1e9aeacb85a469484d6e",24:"32ea2fce686ff5a02a83",25:"f3238684d2f8708574ce",26:"2382a2ad8dc8d8be0114",27:"25d289cd63d296ff3b7d",28:"a162a9e98e1b2c78ae46",29:"9efcfdb3a2c8b24f6f57",30:"0ec333dccd16b5c417ec",31:"7c02ba89e248eaadf07c",32:"ba1b9de80e3f03b1a2d3",33:"3f7ade7fd159c174b7f0",34:"1dbe7f811142e11c31b2",35:"6c7a7e5f95be2e7617c9",36:"198c64e7eb7235b4a7ca",37:"dd9c79eebec6f8fb66f0",38:"da671d8e94423e1a19d5",39:"4a7eb74cbfa2a8051c57",40:"62cc19b06b630be3c8d9",41:"9a90b7405429e597f965",42:"50661a28c4416e9dd052",43:"a58b09332b3e4b0b022a"}[e]+".js";var t=setTimeout(b,12e4);function b(){r.onerror=r.onload=null,clearTimeout(t);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=b,n.appendChild(r),c},d.m=e,d.c=c,d.d=function(e,a,c){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/tag/batch-list.vue
......@@ -12,6 +12,12 @@
<p class="batch-txt">{{ list.length ? '存在分组正在被以下模块使用，请先删除对应的内容后再来删除分组。' : '删除后无法恢复，确认要删除该分组吗？' }}</p>
</div>
<div v-if="operNum == 2">
选择分类：<el-select v-model="groupId" placeholder="清选择分类" v-loadmore="loadMoreGroupList" filterable remote :remote-method="searchGroupList" class="select-classify">
<el-option v-for="el in groupList" :key="el.memberTagGroupClassifyId" :value="el.memberTagGroupClassifyId" :label="el.classifyName"></el-option>
<i class="el-icon-search" slot="prefix"></i>
</el-select>
</div>
<!-- <div v-if="operNum == 2">
<p class="title">
所有分类
</p>
......@@ -22,7 +28,7 @@
</li>
</ul>
<p class="group-name">选中的分类：{{ groupName }}</p>
</div>
</div> -->
<template v-if="operNum == 0 || operNum == 1">
<p v-for="(item, index) in list" :key="index" class="item">
{{ item.groupName }}：<a :href="item.businessLink" target="_blank" @click="isOpenPage = true">{{ item.businessModuleName }}-{{ item.businessName }}</a>
......@@ -56,11 +62,30 @@ export default {
operNum: -1,
groupList: [],
groupName: '',
groupId: '',
listIndex: -1,
list: [],
params: {
classifyName: '',
pageNum: 1,
totalPage: 1
},
loading: false
};
},
directives: {
loadmore: {
inserted(el, binding) {
const SELECTDOWN_DOM = el.querySelector('.el-select-dropdown .el-select-dropdown__wrap');
SELECTDOWN_DOM.addEventListener('scroll', function() {
const CONDITION = this.scrollHeight - this.scrollTop <= this.clientHeight;
if (CONDITION) {
binding.value();
}
})
}
}
},
methods: {
confirmBatch() {
......@@ -96,14 +121,13 @@ export default {
}
});
} else if (batchNum == 2) {
if (!this.groupName) {
if (!this.groupId) {
this.$message.warning({
message: '请先选择的会员分组的分类'
});
return;
}
let index = this.groupList.findIndex(el => el.classifyName === this.groupName);
param.memberTagGroupClassifyId = this.groupList[index].memberTagGroupClassifyId;
param.memberTagGroupClassifyId = this.groupId;
batchChangeGroup(param)
.then(res => {
if (res.errorCode == 0) {
......@@ -129,27 +153,44 @@ export default {
// 关
closeBatch() {
this.batchDialog = false;
this.groupId = '';
this.params.totalPage = 1;
this.params.classifyName = '';
this.params.pageNum = 1;
this.$emit('update:batchVisiable', false);
},
searchGroupList(classifyName) {
this.params.classifyName = classifyName;
this.params.pageNum = 0;
this.loadMoreGroupList();
},
loadMoreGroupList() {
if (this.params.pageNum + 1 > this.params.totalPage) {
return
}
this.params.pageNum = this.params.pageNum + 1;
this.getMemberGroupList();
},
getMemberGroupList() {
const { classifyName, pageNum } = this.params;
this.loading = true;
if (pageNum == 1) {
this.groupList = [];
}
memberGroupList({
classifyName,
pageNum,
pageSize: 20,
type: 0,
requestProject: 'gic-member-tag-web',
pageSize: 99999
})
.then(res => {
if (res.errorCode == 0) {
console.log(res.result)
const { result} = res.result;
this.groupList = result.filter(el => el.classifyName != '未分类' && el.classifyName != null).map(item => ({
...item,
edit: false
}));
}
})
.catch(err => {
console.log(err);
});
}).then(res => {
const { errorCode, result } = res;
if (errorCode != 0) return;
if (Array.isArray(result.result)) {
this.groupList = this.groupList.concat(result.result.filter(el => el.classifyName != '未分类' && el.classifyName != null));
}
this.params.totalPage = result.totalPage;
}).finally(() => this.loading = false);
},
checkGroup() {
this.loading = true;
......@@ -180,7 +221,9 @@ export default {
batchVisiable(newval) {
newval && [1,0].includes(this.operateNumber) && this.checkGroup();
this.batchDialog = newval;
this.getMemberGroupList();
if (newval) {
this.getMemberGroupList();
}
},
operateNumber(newval) {
this.operNum = newval;
......@@ -196,6 +239,14 @@ export default {
</script>
<style lang="scss" scoped>
.select-classify {
width: 305px;
/deep/ .el-input__prefix {
display: flex;
align-items: center;
margin-left: 5px;
}
}
.batch-txt {
padding-left: 35px;
padding-top: 7px;
......
src/components/tag/tag-config-options.vue
......@@ -183,6 +183,7 @@
<label class="inline-block middle label-unit m-r-8">最近</label
><el-input v-model="parent.fixedRecentTimeRecent" placeholder="请输入1-730" class="m-r-8" style="width: 120px" @blur="value => toEditInput(value, 'fixedRecentTimeRecent', parent)"></el-input
><label class="inline-block middle label-unit">天</label>
<span class="tips m-l-8 middle">统计当天之前的数据</span>
</div>
</div>
</div>
......@@ -438,11 +439,11 @@
></el-input>
<template v-if="parent.timeRadio == 1">
<label class="inline-block middle label-unit m-l-8">天</label>
<label class="inline-block middle label-tip">正整数，最大365</label>
<label class="inline-block middle label-tip">正整数，最大365，统计当天之前的数据</label>
</template>
<template v-if="parent.timeRadio == 2">
<label class="inline-block middle label-unit m-l-8">月</label>
<label class="inline-block middle label-tip">正整数，最大24</label>
<label class="inline-block middle label-tip">正整数，最大24，统计当月之前的数据</label>
</template>
</div>
</div>
......@@ -614,15 +615,16 @@
></el-input>
<template v-if="parent.timeRadio == 1">
<label class="inline-block middle label-unit m-l-8">天</label>
<label class="inline-block middle label-tip">正整数，最大730</label>
<!-- lastCostTime：最近消费时间 -->
<label class="inline-block middle label-tip">{{ tagData.tagCode == 'lastCostTime' ? '统计当天之前的数据' : '正整数，最大730，统计当天之前的数据' }}</label>
</template>
<template v-if="parent.timeRadio == 2">
<label class="inline-block middle label-unit m-l-8">月</label>
<label class="inline-block middle label-tip">正整数，最大24</label>
<label class="inline-block middle label-tip">{{ tagData.tagCode == 'lastCostTime' ? '统计当月之前的数据' : '正整数，最大24，统计当月之前的数据' }}</label>
</template>
<template v-if="parent.timeRadio == 3">
<label class="inline-block middle label-unit m-l-8">年</label>
<label class="inline-block middle label-tip">正整数，最大2</label>
<label class="inline-block middle label-tip">{{ tagData.tagCode == 'lastCostTime' ? '统计当年之前的数据' : '正整数，最大2，统计当年之前的数据' }}</label>
</template>
</div>
</div>
......@@ -630,7 +632,7 @@
</div>
</template>
<template v-if="parent.templateCode == 'tag050'">
<div class="m-b-20" :key="'tag17' + pindex">
<div :key="'tag17' + pindex">
<label class="inline-block m-r-20 label-unit" style="width: 108px;text-align: right">
最近关联时间
<el-tooltip placement="top" open-delay="100">
......@@ -638,7 +640,7 @@
<i class="iconfont icon-xinxixianshi m-l-4" style="font-size: 14px;color: #909399"></i>
</el-tooltip>
</label>
<el-radio-group v-model="parent.radio" @change="timeRadioChange($event,parent)">
<el-radio-group v-model="parent.radio" @change="timeRadioChange($event,parent)" class="radio-group">
<el-radio label="0">所有时间</el-radio>
<el-radio label="1">固定时段</el-radio>
<el-radio label="2">相对时段</el-radio>
......@@ -787,15 +789,18 @@
></el-input>
<template v-if="parent.timeRadio == 1">
<label class="inline-block middle label-unit m-l-8">天</label>
<label class="inline-block middle label-tip">正整数，最大365</label>
<!-- <label class="inline-block middle label-tip">正整数，最大365</label> -->
<label class="inline-block middle label-tip">统计当天之前的数据</label>
</template>
<template v-if="parent.timeRadio == 2">
<label class="inline-block middle label-unit m-l-8">月</label>
<label class="inline-block middle label-tip">正整数，最大24</label>
<!-- <label class="inline-block middle label-tip">正整数，最大24</label> -->
<label class="inline-block middle label-tip">统计当月之前的数据</label>
</template>
<template v-if="parent.timeRadio == 3">
<label class="inline-block middle label-unit m-l-8">年</label>
<label class="inline-block middle label-tip">正整数，最大2</label>
<!-- <label class="inline-block middle label-tip">正整数，最大2</label> -->
<label class="inline-block middle label-tip">统计当年之前的数据</label>
</template>
</div>
</div>
......@@ -1000,17 +1005,22 @@
</div>
</template>
<template v-if="parent.templateCode == 'tag040'">
<label class="inline-block m-r-20 label-unit" style="width: 108px;text-align: right">
<label class="inline-block m-r-20 m-b-20 label-unit" style="width: 108px;text-align: right">
关联渠道
<el-tooltip placement="top" open-delay="100">
<div slot="content">关联渠道为当前客户关联的线上渠道，根据关联状态实时变化</div>
<i class="iconfont icon-xinxixianshi m-l-4" style="font-size: 14px;color: #909399"></i>
</el-tooltip>
</label>
<el-radio-group v-model="parent.radioType">
<el-radio-group v-model="parent.radioType" class="radio-group">
<el-radio v-for="item in parent.options" :key="item.key" :label="item.key">{{ item.value }}</el-radio>
</el-radio-group>
</template>
<template v-if="parent.templateCode == 'tag060'">
<el-checkbox-group v-model="parent.checked">
<el-checkbox v-for="item in parent.options" :key="item.key" :label="item.key">{{ item.value }}</el-checkbox>
</el-checkbox-group>
</template>
<!-- 会员标签嵌入卡券选择器 com024 -->
<!-- v-if="parent.templateCode == 'com024'" -->
......@@ -1427,6 +1437,9 @@ export default {
tag040: {
radioType: '1100',
},
tag060: {
checked: []
},
cardListData: [],
com024: {},
com025: {},
......@@ -1590,6 +1603,7 @@ export default {
this.tagData.tagId = data.tagId;
this.tagData.tagType = data.tagType;
this.tagData.tagName = data.tagName;
this.tagData.tagCode = data.tagCode;
this.currentKey = data.columnKey;
this.tagData.isActive = data.isActive;
this.tagData.isMultiple = data.isMultiple;
......@@ -1839,9 +1853,22 @@ export default {
key: [1,2].includes(this.tagData.tagType) ? this.tagData.tagId : this.currentKey,
requestProject: 'gic-member-tag-web'
};
if (data.templateCode == 'tag040') {
this.templateData.push(data);
}
this.axios.post(`${this.baseUrl}${url}`, qs.stringify(para))
.then(res => {
let resData = res;
if (data.templateCode == 'tag040') {
data.options = resData.data.result;
const index = this.templateData.findIndex(el => el.esScreeningWidgetId == data.esScreeningWidgetId);
if (index >= 0) {
this.templateData.splice(index, 1, data);
} else {
this.templateData.push(data);
}
return;
}
if (this.tagData.tagType != 1 && this.currentKey != 'tag') {
if (resData.data.errorCode == 0) {
data.options = resData.data.result;
......@@ -2235,7 +2262,8 @@ export default {
case 'tag050':
for (let i = 0; i < this.templateData.length; i++) {
if (this.templateData[i].templateCode === 'tag050') {
let templateDate = tagParams.template[0];
const index = tagParams.template.findIndex(el => el.templateCode == 'tag050');
let templateDate = tagParams.template[index];
// 判断是那个时间段
// 固定时段
this.templateData[i].radio = templateDate.radio; // 时段
......@@ -2436,6 +2464,10 @@ export default {
value = tagValue.val[0].data.value;
this.templateData[i].radioType = value;
break;
case 'tag060':
value = tagValue.val[0].data.value;
this.templateData[i].checked = value.split(' ');
break;
case 'tag024':
const getTag024Data = this.hasTemplate('tag024');
......@@ -2614,12 +2646,18 @@ export default {
</script>
<style lang="scss" scoped>
.radio-group {
/deep/ .el-radio {
margin-right: 15px;
width: 92px;
}
}
.myTagDetail-wrap__btn {
margin-top: 80px;
}
.relative-range {
width: 526px;
width: 670px;
height: 191px;
padding: 19px;
background: #f3f6f9;
......
src/components/tagDetail/mixin/index.js
......@@ -564,7 +564,7 @@ export default {
}
}
}
if (code == 'tag050' && that.templateData.length > 0) {
if (code == 'tag050') {
switch(Number(that.templateData[0].radio)) {
case 0:
tagValue.time[0].compute = 'all';
......@@ -992,6 +992,10 @@ export default {
this.postTemplateData.selectedVal.push(abbr.join(' '));
this.postTemplateData.conditionList = this.com022.conditionsList;
}
if (code == 'tag060' && (!Array.isArray(that.templateData[0].checked) || that.templateData[0].checked.length == 0)) {
this.$message.error('请完善标签值');
return false;
}
/* 属于/不属于+ 选项 */
......@@ -1164,6 +1168,133 @@ export default {
tagValue.val[0].data.value = ele.radioType;
that.postTemplateData.selectedVal.push(ele.options.find(item => item.key == ele.radioType).value);
}
if (ele.templateCode == 'tag050') {
switch(Number(ele.radio)) {
case 0:
tagValue.time[0].compute = 'all';
tagValue.time[0].value = '';
that.postTemplateData.selectedVal.push('所有时间');
break;
case 1:
tagValue.time[0].compute = 'between';
tagValue.time[0].value = ele.dateRangeValue.join(',')
that.postTemplateData.selectedVal.push(ele.dateRangeValue[0].split(' ')[0] + '至' + ele.dateRangeValue[1].split(' ')[0]);
break;
case 2:
// tagValue.time[0].compute = 'lastday';
// tagValue.time[0].value = that.templateData[0].dateRangeValue
// 天
// timeAfterChecked 最近/之后
// timeChecked 当天/年/月
if (ele.timeRadio == 1) {
/** 同时选择
* lastdayHasToday 最近几天包含今天
* afterdayHasToday 之后几天包含今天
*/
if (ele.timeChecked && ele.timeAfterChecked) {
if (ele.timeSelect == 1) {
tagValue.time[0].compute = 'lastdayHasToday';
tagValue.time[0].value = String(ele.timeInput);
that.postTemplateData.selectedVal.push(`最近 ${ele.timeInput}天包含当天`);
ele.timeInput = '';
}
that.postTemplateData.template = that.templateData;
tagParams = that.postTemplateData;
}
//天 当天
if (ele.timeChecked && !ele.timeAfterChecked) {
tagValue.time[0].compute = 'today'
tagValue.time[0].value = '1';
that.postTemplateData.selectedVal.push('当天');
ele.timeInput = '';
}
if (ele.timeAfterChecked && !ele.timeChecked) {
if (ele.timeSelect == 1) {
// 最近
tagValue.time[0].compute = 'lastday';
tagValue.time[0].value = String(ele.timeInput);
that.postTemplateData.selectedVal.push(`最近 ${ele.timeInput} 天`);
}
}
}
// 月
if (ele.timeRadio == 2) {
/**
* lastmonthHasCurrentMonth 最近几月包含当月
* aftermonthHasCurrentMonth 之后几月包含当月
*/
if (ele.timeChecked && ele.timeAfterChecked) {
if (ele.timeSelect == 1) {
tagValue.time[0].compute = 'lastmonthHasCurrentMonth';
tagValue.time[0].value = String(ele.timeInput);
that.postTemplateData.selectedVal.push(`最近 ${ele.timeInput} 月包含当月`);
ele.timeInput = '';
}
that.postTemplateData.template = that.templateData;
tagParams = that.postTemplateData;
}
//月 当月
if (ele.timeChecked && !ele.timeAfterChecked) {
tagValue.time[0].compute = 'currentMonth';
tagValue.time[0].value = '1';
that.postTemplateData.selectedVal.push('当月');
ele.timeInput = '';
}
// 最近/之后
if (ele.timeAfterChecked && !ele.timeChecked) {
if (ele.timeSelect == 1) {
// 最近
tagValue.time[0].compute = 'lastmonth';
tagValue.time[0].value = String(ele.timeInput);
that.postTemplateData.selectedVal.push(`最近 ${ele.timeInput} 月`);
}
}
}
// 年
if (ele.timeRadio == 3) {
/**
* lastyearHasCurrentYear 最近几年包含当年
* afteryearHasCurrentYear 之后几年包含当年
*/
if (ele.timeChecked && ele.timeAfterChecked) {
if (ele.timeSelect == 1) {
tagValue.time[0].compute = 'lastyearHasCurrentYear';
tagValue.time[0].value = String(ele.timeInput);
that.postTemplateData.selectedVal.push(`最近 ${ele.timeInput} 年包含当年`);
ele.timeInput = '';
}
that.postTemplateData.template = that.templateData;
tagParams = that.postTemplateData;
}
//年 当年
if (ele.timeChecked && !ele.timeAfterChecked) {
tagValue.time[0].compute = 'currentYear';
tagValue.time[0].value = '1';
that.postTemplateData.selectedVal.push('当年');
ele.timeInput = '';
}
// 最近/之后
if (ele.timeAfterChecked && !ele.timeChecked) {
if (ele.timeSelect == 1) {
// 最近
tagValue.time[0].compute = 'lastyear';
tagValue.time[0].value = String(ele.timeInput);
that.postTemplateData.selectedVal.push(`最近 ${ele.timeInput} 年`);
}
}
}
break;
}
}
if (ele.templateCode == 'tag060') {
tagValue.val[0].data.value = ele.checked.join(' ');
ele.checked.forEach(item => {
that.postTemplateData.selectedVal.push(ele.options.find(k => item == k.key).value);
});
}
}
}
......@@ -1535,6 +1666,9 @@ export default {
* 天/月/年输入
*/
toEditDateInput(e, radio, parent) {
if (this.tagData.tagCode == 'lastCostTime') {
return;
}
const code = parent.templateCode;
let newNum;
newNum = Number(e.target.value) ? Math.floor(e.target.value) : 1;
......
src/utils/utils.js
......@@ -81,7 +81,7 @@ export function paddingBorth(str) {
// 任务中心弹框
export function toTaskCenter(taskId) {
this.$confirm('任务发起成功，请去【企业管理】-【任务中心】查看处理结果和执行进度', '任务发起成功', {
this.$confirm('任务发起成功，请去【系统】-【操作任务】-【任务中心】查看处理结果和执行进度', '任务发起成功', {
confirmButtonText: '去任务中心',
cancelButtonText: '取消',
closeOnClickModal: false,
......
src/view/manualTag/manual-tag-value-edit-info.vue
......@@ -226,6 +226,34 @@
<template v-if="item.code === 'highCostPaid'">
<span>{{scope.row.highCostPaid}}</span>
</template>
<!-- 销售次数(全渠道) -->
<template v-if="item.code === 'allChannelCostTimes'">
<span>{{scope.row.allChannelCostTimes}}</span>
</template>
<!-- 最高单笔/实付(全渠道) -->
<template v-if="item.code === 'allChannelHighCostPaid'">
<span>{{scope.row.allChannelHighCostPaid}}</span>
</template>
<!-- 最近消费时间(全渠道) -->
<template v-if="item.code === 'allChannelLastCostTime'">
<span>{{scope.row.allChannelLastCostTime | formatTimeYMD}}</span>
</template>
<!-- 客单价(全渠道) -->
<template v-if="item.code === 'allChannelAvgCost'">
<span>{{scope.row.allChannelAvgCost}}</span>
</template>
<!-- 连带率(全渠道) -->
<template v-if="item.code === 'allChannelAvgNumber'">
<span>{{scope.row.allChannelAvgNumber}}</span>
</template>
<!-- 平均折扣率(全渠道) -->
<template v-if="item.code === 'allChannelDiscountRate'">
<span>{{scope.row.allChannelDiscountRate}}</span>
</template>
<!-- 消费总额/实付(全渠道) -->
<template v-if="item.code === 'allChannelCostAllPaid'">
<span>{{scope.row.allChannelCostAllPaid}}</span>
</template>
</template>
</el-table-column>
<el-table-column label="添加标签时间" width="200">
......
src/view/memberGroup/group-list.vue
<template>
<div class="group-list">
<div class="group-list" v-loading="memberGroupLoading">
<div class="search-box">
<el-input v-model="listsParams.classifyName" clearable prefix-icon="el-icon-search" placeholder="请输入分类名称" @change="onSearch"></el-input>
</div>
......@@ -15,15 +15,15 @@
<i slot="reference" class="iconfont icon-gengduo icon"></i>
</el-popover>
</li>
<li >
<!-- <li >
<div class="el-loading-spinner" style="width: 86%;" v-if="memberGroupLoading">
<i class="el-icon-loading"></i>
</div>
</li>
</li> -->
</ul>
<p v-if="searchTip" class="searchTip">没有找到和“{{ listsParams.classifyName }}”相关的内容</p>
<div v-if="$getButtonLimit($buttonCode.memberTagAddCateGory) && activeType == 1" class="add-category">
<el-button @click="editDialog.visible = true" :limit-code="$buttonCode.memberTagAddCateGory" type="primary" class="ghost-btn add-group" v-if="addType">新增分类</el-button>
<el-button @click="editDialog.visible = true" :limit-code="$buttonCode.memberTagAddCateGory" type="primary" class="ghost-btn add-group" v-if="addType && lists.length">新增分类</el-button>
</div>
<!--编辑分类-->
<el-dialog :title="editDialog.list.memberTagGroupClassifyId ? '编辑分类' : '新增分类'" :visible.sync="editDialog.visible" width="600px" top="30vh" :close-on-click-modal="false" @close="closeEditGroup">
......
src/view/memberGroup/memberGroupDetail.vue
......@@ -251,6 +251,34 @@
<template v-if="item.code === 'highCostPaid'">
<span>{{scope.row.highCostPaid}}</span>
</template>
<!-- 销售次数(全渠道) -->
<template v-if="item.code === 'allChannelCostTimes'">
<span>{{scope.row.allChannelCostTimes}}</span>
</template>
<!-- 最高单笔/实付(全渠道) -->
<template v-if="item.code === 'allChannelHighCostPaid'">
<span>{{scope.row.allChannelHighCostPaid}}</span>
</template>
<!-- 最近消费时间(全渠道) -->
<template v-if="item.code === 'allChannelLastCostTime'">
<span>{{scope.row.allChannelLastCostTime | formatTimeYMD}}</span>
</template>
<!-- 客单价(全渠道) -->
<template v-if="item.code === 'allChannelAvgCost'">
<span>{{scope.row.allChannelAvgCost}}</span>
</template>
<!-- 连带率(全渠道) -->
<template v-if="item.code === 'allChannelAvgNumber'">
<span>{{scope.row.allChannelAvgNumber}}</span>
</template>
<!-- 平均折扣率(全渠道) -->
<template v-if="item.code === 'allChannelDiscountRate'">
<span>{{scope.row.allChannelDiscountRate}}</span>
</template>
<!-- 消费总额/实付(全渠道) -->
<template v-if="item.code === 'allChannelCostAllPaid'">
<span>{{scope.row.allChannelCostAllPaid}}</span>
</template>
</template>
</el-table-column>
<el-table-column label-class-name="table-header__handle" :min-width="160" fixed="right">
......
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