Skip to content

M
memberTag-web
Commit 36a5aa24 by liuchenxi
Options

Merge branch 'bugfix/迭代bug' into dev 

# Conflicts:
#	dist/index.html
#	dist/static/js/0.087662cb72d6111427ea.js
#	dist/static/js/0.3d6b3678ede5d06f0db5.js
#	dist/static/js/0.ee8213667463b1cfa618.js
#	dist/static/js/12.4863cb2833a59b3a1e0d.js
#	dist/static/js/12.627b84a8deefd3515526.js
#	dist/static/js/13.c7ab7db970dce5d8adb0.js
#	dist/static/js/15.16c6ab7eb3de19d1bc9c.js
#	dist/static/js/15.7f3864d659b15b05f7ea.js
#	dist/static/js/16.24a6f93e8f2baa075f01.js
#	dist/static/js/16.39377a8da57579f55943.js
#	dist/static/js/17.edc3cc3dd7cd59974a35.js
#	dist/static/js/18.2e5b028cddbfbe797ced.js
#	dist/static/js/18.810924567b628c1681d3.js
#	dist/static/js/19.2b51bcd6bcb234699455.js
#	dist/static/js/20.b2ba64154f555459cc42.js
#	dist/static/js/20.b55dc74c981b61c43fba.js
#	dist/static/js/21.1f6367e5dcf6de69a5bd.js
#	dist/static/js/21.9c7b0847654fea50f3ce.js
#	dist/static/js/22.4985a38ec89a12ab291d.js
#	dist/static/js/22.dba59337a67c226dbcc1.js
#	dist/static/js/22.f97c04968d78b5b99e89.js
#	dist/static/js/23.60311edadffd29177d1f.js
#	dist/static/js/23.a0c2dfb1838c5d9a1341.js
#	dist/static/js/24.f32ba41c4763fd4679f8.js
#	dist/static/js/25.5ac24c863c71cc9e9d97.js
#	dist/static/js/25.671fe3ab75a6a1f46b4a.js
#	dist/static/js/26.c747f91c8eef769638d9.js
#	dist/static/js/29.f9bed6e9047d75f2d309.js
#	dist/static/js/6.614a113d4b0cc0a6d940.js
#	dist/static/js/6.84144a26d97167c03b89.js
#	dist/static/js/7.26e7e47e73cb664ceb90.js
parents 1d97c342 712849d8
Showing with 39 additions and 11 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_99jmfacmlpp.css><link rel=stylesheet href=//at.alicdn.com/t/font_3276801_mkhlaisq2aq.css><script src=//at.alicdn.com/t/font_3276801_w3vkjjmzzz.js></script><link rel="shortcut icon" href=./favicon.ico><link href=./static/css/app.078d86dbea09737994606f3bd72e6310.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
=======
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./static/img/favicon.ico><title>金华达摩</title><link rel=stylesheet href=//at.alicdn.com/t/font_688955_99jmfacmlpp.css><link rel=stylesheet href=//at.alicdn.com/t/font_3276801_mkhlaisq2aq.css><script src=//at.alicdn.com/t/font_3276801_w3vkjjmzzz.js></script><link rel="shortcut icon" href=./favicon.ico><link href=./static/css/app.de65e508d34a7c93f3d29372b38cfc69.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
>>>>>>> bugfix/迭代bug
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.cff6626605e0959080d3.js></script><script type=text/javascript src=./static/js/vendor.ecce21da6a46da8c2fc4.js></script><script type=text/javascript src=./static/js/app.5cbaf30f08f5b67cfc90.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.cff6626605e0959080d3.js></script><script type=text/javascript src=./static/js/vendor.ecce21da6a46da8c2fc4.js></script><script type=text/javascript src=./static/js/app.5cbaf30f08f5b67cfc90.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.cdb6163b6f31d5d74af3.js></script><script type=text/javascript src=./static/js/vendor.ecce21da6a46da8c2fc4.js></script><script type=text/javascript src=./static/js/app.6738d1b11db6b84df0ab.js></script></body></html>
>>>>>>> bugfix/迭代bug
dist/static/css/app.de65e508d34a7c93f3d29372b38cfc69.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.087662cb72d6111427ea.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.ee8213667463b1cfa618.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/12.627b84a8deefd3515526.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/13.c7ab7db970dce5d8adb0.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/15.7f3864d659b15b05f7ea.js 0 → 100644
webpackJsonp([16],{"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(1==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(1==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("YceJ")},"data-v-e63bc8ae",null);e.default=c.exports},YceJ:function(t,e){}});
\ No newline at end of file
dist/static/js/16.fd8e0aca022b16e268de.js 0 → 100644
webpackJsonp([16],{iHP3:function(t,a,e){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var i=e("Dd8w"),s=e.n(i),n=e("lRwf"),l=e.n(n),c=e("l6IN"),r=e("CUHN"),o=e("SJI6");l.a.component(c.CollapseTransition.name,c.CollapseTransition);var d={name:"tag-type",components:{SecondTag:r.default},props:{tagList:Object,activeTag:String},data:function(){return{list:{},typeName:"",editData:[]}},computed:s()({},Object(o.mapState)(["tagRealName"]),{tagName:function(){var t=this.activeTag;return"system"==t?"系统标签":"manual"==t?"手工标签":"活动标签"},isOtherTag:function(){return!["手工标签","活动标签"].includes(this.list.name)}}),methods:{handleFirstTag:function(){localStorage.setItem("jumpTag",""),this.$emit("handleFristTag",this.list)}},watch:{tagList:{immediate:!0,handler:function(t){this.list=t}}}},g={render:function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("div",{staticClass:"list"},[e("div",{staticClass:"first-tag"},[t.isOtherTag?e("div",{staticClass:"mb16"},[e("svg",{staticClass:"menu-icon",class:[{"icon-tag-light":t.list.name===t.tagRealName}],attrs:{"aria-hidden":"true"}},[e("use",{attrs:{"xlink:href":"#"+t.list.icon}})]),t._v(" "),e("span",{staticClass:"tag-name",class:{"icon-tag-light":t.list.name===t.tagRealName},on:{click:t.handleFirstTag}},[t._v(t._s(t.list.name))])]):t._e(),t._v(" "),e("el-collapseTransition",[e("div",{staticClass:"second-tag"},t._l(t.list.children,function(a,i){return e("second-tag",{key:i,attrs:{type:t.activeTag,list:a,"tag-name":t.tagName}})}),1)])],1)])},staticRenderFns:[]};var m=e("VU/8")(d,g,!1,function(t){e("ihKY")},"data-v-dbd83472",null);a.default=m.exports},ihKY:function(t,a){}});
\ No newline at end of file
dist/static/js/18.cfdc70af6a4d0ba00e02.js 0 → 100644
webpackJsonp([18],{"308P":function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});r("J16i");var a=r("3E4D"),o=r("P9l9"),l=r("roJz"),i=r("PI0u"),s=function(e,t,r){if(t.some(function(e){return!e.tagItemName}))return r(new Error("请完善标签值"));r()},u=function(e,t,r){(!/^[0-9]+$/.test(t)||t>1e5||t<1)&&r(new Error("仅支持输入1-100000之间的整数")),r()},n={name:"manualTagEdit",props:{showPop:Boolean,options:Object,currentType:String},components:{tagValueItem:l.default},data:function(){return{ruleForm:{tagName:"",tagLevel:"test",tagTwoLevelGroupId:"",tagLevelGroupId:"",tagDescribe:"",pending:!1,tagSort:null,tagType:0,tagValue:[{id:Object(i.a)(),deleteFlag:!1,tagItemName:""}]},rules:{tagName:[{required:!0,message:"请输入标签名称",trigger:"blur"}],tagLevel:[{required:!0,message:""}],tagLevelGroupId:[{required:!0,message:"请选择所属分类",trigger:"blur"}],tagTwoLevelGroupId:[{required:!0,message:"请选择所属分类",trigger:"blur"}],tagSort:[{required:!0,trigger:"blur",validator:u}],tagType:[{required:!0,trigger:"blur"}],tagValue:[{required:!0,trigger:"blur",validator:s}]},optionsTwo:[],optionsThree:[],tagValTableData:[],preSyncWmStatus:0,deleteList:[],isEdit:!1}},watch:{options:{deep:!0,handler:function(e){var t=this;this.ruleForm.tagTwoLevelGroupId=e.tagTwoLevelGroupId,this.ruleForm.tagLevelGroupId=e.tagLevelGroupId,e.tagId?(this.isEdit=!0,this.getTagData(e.tagId)):(this.isEdit=!1,this.ruleForm.tagName="",this.ruleForm.tagDescribe="",this.ruleForm.tagSort=null,this.ruleForm.tagType=0,this.ruleForm.tagTwoLevelGroupId="",this.ruleForm.tagLevelGroupId="",this.ruleForm.tagValue=[{id:Object(i.a)(),deleteFlag:!1,tagItemName:""}],this.getOptionsThree(e.tagTwoLevelGroupId));var r=this.optionsThree.find(function(e){return e.tagLevelGroupId==t.ruleForm.tagLevelGroupId});r&&(this.preSyncWmStatus=r.syncWmFlag),this.getOptionsTwo()}}},methods:{closePop:function(){this.optionsThree=[],this.$refs.ruleForm.resetFields(),this.$emit("update:showPop",!1)},confirmSave:function(){var e=this;this.ruleForm.pending||(this.ruleForm.pending=!0,this.$refs.ruleForm.validate(function(t){if(t){var r=e.optionsThree.find(function(t){return t.tagLevelGroupId==e.ruleForm.tagLevelGroupId}).syncWmFlag;e.options.isSync||!e.preSyncWmStatus||r?e.saveApi():e.$confirm("该分类未开启微盟标签同步，修改后标签将不会再同步至微盟，并且已同步至微盟侧的会员标签将从微盟侧删除，是否继续保存？","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){e.saveApi()}).catch(function(){return e.ruleForm.pending=!1})}else e.ruleForm.pending=!1}))},saveApi:function(){var e=this,t=this.ruleForm.tagValue.concat(this.deleteList).map(function(e){return delete e.id,e}),r={tagId:this.options.tagId,tagName:this.ruleForm.tagName,tagDescribe:this.ruleForm.tagDescribe,tagLevelGroupId:this.ruleForm.tagLevelGroupId,tagItemList:t,isMultiple:this.ruleForm.tagType,tagType:"active"==this.currentType?2:1};"manual"==this.currentType&&(r.sort=this.ruleForm.tagSort),Object(o.c)("/memberTag/saveHandMemberTag",r).then(function(t){var r=t.data,o=r.errorCode,l=r.message;e.ruleForm.pending=!1,1===o?(a.a.showmsg("保存成功","success"),e.$emit("save"),e.closePop()):e.$message.error({duration:1e3,message:l})}).catch(function(t){e.ruleForm.pending=!1,e.$message.error({duration:1e3,message:t.message})})},getOptionsTwo:function(){var e=this,t=this.currentType,r={tagLevelType:"active"==t?2:1};return Object(o.a)("/tagLevel/handSecondLevel",r).then(function(r){var a=r.data,o=a.errorCode,l=a.result;if(1===o&&(e.optionsTwo=l,"active"==t&&!e.isEdit)){var i=l.find(function(e){return"渠道标签"===e.name});e.ruleForm.tagTwoLevelGroupId=i?i.id:i,e.getOptionsThree(e.ruleForm.tagTwoLevelGroupId)}}).catch(function(t){e.$message.error({duration:1e3,message:t.message})})},changeTwo:function(e){this.ruleForm.tagLevelGroupId="",this.getOptionsThree(e)},getOptionsThree:function(e){var t=this;Object(o.a)("/tagLevel/handThirdLevel",{tagLevelGroupId:e}).then(function(e){var r=e.data,a=r.errorCode,o=r.result;1===a&&(t.optionsThree=o)}).catch(function(e){t.$message.error({duration:1e3,message:e.message})})},getTagData:function(e){var t=this;Object(o.a)("/memberTag/getTagById",{tagId:e}).then(function(e){var r=e.data,a=r.errorCode,o=r.result;1===a&&(t.ruleForm.tagName=o.tagName,t.ruleForm.tagLevelGroupId=o.tagLevelGroupId,t.ruleForm.tagTwoLevelGroupId=o.tagTwoLevelGroupId,t.ruleForm.tagDescribe=o.tagDescribe,t.ruleForm.tagSort=o.sort,t.ruleForm.tagType=o.isMultiple,t.ruleForm.tagValue=o.itemList||[],o.itemList.length?t.ruleForm.tagValue=o.itemList.map(function(e){return e.id=Object(i.a)(),e.deleteFlag=!1,e}):t.ruleForm.tagValue=[{id:Object(i.a)(),deleteFlag:!1,tagItemName:""}],t.getOptionsThree(o.tagTwoLevelGroupId))}).catch(function(e){console.log(e)})},onAddTagVal:function(e){var t=this.ruleForm.tagValue.findIndex(function(t){return t.id==e}),r={id:Object(i.a)(),deleteFlag:!1,tagItemName:""};this.ruleForm.tagValue.splice(t+1,0,r)},onDelTagVal:function(e){var t=this.ruleForm.tagValue.findIndex(function(t){return t.id==e});if(this.ruleForm.tagValue[t].tagItemId){var r=this.ruleForm.tagValue.splice(t,1)[0];r.deleteFlag=!0,this.deleteList.push(r)}else this.ruleForm.tagValue.splice(t,1)}}},g={render:function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("el-dialog",{attrs:{visible:e.showPop,title:e.options.popTitle,width:"600px","destroy-on-close":""},on:{"update:visible":function(t){e.showPop=t},close:e.closePop}},[r("div",{staticClass:"manualTagEdit-wrap"},[r("el-form",{ref:"ruleForm",attrs:{model:e.ruleForm,rules:e.rules,"label-width":"100px"}},[r("el-form-item",{attrs:{label:"标签名称：",prop:"tagName"}},[r("el-input",{staticClass:"w-full",attrs:{placeholder:"请输入标签名称",maxlength:15,"show-word-limit":""},model:{value:e.ruleForm.tagName,callback:function(t){e.$set(e.ruleForm,"tagName",t)},expression:"ruleForm.tagName"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"所属分类：",prop:"tagLevel"}},[r("el-form-item",{staticClass:"fl",attrs:{prop:"tagTwoLevelGroupId"}},[r("el-select",{staticClass:"w-225",attrs:{placeholder:"请选择"},on:{change:e.changeTwo},model:{value:e.ruleForm.tagTwoLevelGroupId,callback:function(t){e.$set(e.ruleForm,"tagTwoLevelGroupId",t)},expression:"ruleForm.tagTwoLevelGroupId"}},e._l(e.optionsTwo,function(e){return r("el-option",{key:e.tagLevelGroupId,attrs:{label:e.levelName,value:e.tagLevelGroupId}})}),1)],1),e._v(" "),r("el-form-item",{staticClass:"fl",attrs:{prop:"tagLevelGroupId"}},[r("el-select",{staticClass:"w-225 ml10",attrs:{placeholder:"请选择"},model:{value:e.ruleForm.tagLevelGroupId,callback:function(t){e.$set(e.ruleForm,"tagLevelGroupId",t)},expression:"ruleForm.tagLevelGroupId"}},e._l(e.optionsThree,function(e){return r("el-option",{key:e.tagLevelGroupId,attrs:{label:e.levelName,value:e.tagLevelGroupId}})}),1)],1)],1),e._v(" "),"manual"==e.currentType?r("el-form-item",{attrs:{label:"排序：",prop:"tagSort"},scopedSlots:e._u([{key:"label",fn:function(){return[e._v("\n 排序\n "),r("el-tooltip",{attrs:{placement:"top",content:"控制好办上标签展示顺序，按照数字降序排序",trigger:"hover"}},[r("i",{staticClass:"iconfont icon-QuestionCircleOutlined icon"})]),e._v("\n ：\n ")]},proxy:!0}])},[e._v(" "),r("el-input",{staticClass:"w-full",attrs:{placeholder:"请输入1-100000之间的整数"},on:{input:e.validateInputSort,blur:e.blurSort},model:{value:e.ruleForm.tagSort,callback:function(t){e.$set(e.ruleForm,"tagSort",t)},expression:"ruleForm.tagSort"}})],1):e._e(),e._v(" "),"manual"==e.currentType?r("el-form-item",{attrs:{label:"标签类型：",prop:"tagType"}},[r("el-radio-group",{attrs:{disabled:e.isEdit},model:{value:e.ruleForm.tagType,callback:function(t){e.$set(e.ruleForm,"tagType",t)},expression:"ruleForm.tagType"}},[r("el-radio",{attrs:{label:0}},[e._v("单选")]),e._v(" "),r("el-radio",{attrs:{label:1}},[e._v("多选")])],1)],1):e._e(),e._v(" "),r("el-form-item",{attrs:{label:"标签值：",prop:"tagValue"}},[r("div",{staticClass:"tag-list"},e._l(e.ruleForm.tagValue,function(t){return r("tag-value-item",{key:t.id,staticClass:"w-full",attrs:{"current-length":e.ruleForm.tagValue.length,item:t},on:{add:e.onAddTagVal,del:e.onDelTagVal}})}),1)]),e._v(" "),r("el-form-item",{attrs:{label:"标签描述：",prop:"tagDescribe"}},[r("el-input",{staticClass:"w-full",attrs:{type:"textarea",maxlength:100,"show-word-limit":"",placeholder:"请输入标签描述，最多100字"},model:{value:e.ruleForm.tagDescribe,callback:function(t){e.$set(e.ruleForm,"tagDescribe",t)},expression:"ruleForm.tagDescribe"}})],1)],1),e._v(" "),r("div",{staticClass:"manualTagEdit-btns"},[r("el-button",{on:{click:function(t){return e.$emit("update:showPop",!1)}}},[e._v("取消")]),e._v(" "),r("el-button",{attrs:{type:"primary"},on:{click:e.confirmSave}},[e._v("确定")])],1)],1)])},staticRenderFns:[]};var m=r("VU/8")(n,g,!1,function(e){r("KMmm")},"data-v-bd4b8a26",null);t.default=m.exports},KMmm:function(e,t){}});
\ No newline at end of file
dist/static/js/19.2b51bcd6bcb234699455.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.0467df18d45227fe1ae0.js 0 → 100644
webpackJsonp([20],{Gy5W:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var o=n("5reh"),i={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.$store.commit(o.d,"达摩GIC"),document.title=this.$store.state.title,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("transition",{attrs:{name:"fade",mode:"out-in"}},[e("router-view")],1)],1)},staticRenderFns:[]};var s=n("VU/8")(i,a,!1,function(t){n("mR2r")},null,null);e.default=s.exports},mR2r:function(t,e){}});
\ No newline at end of file
dist/static/js/20.b55dc74c981b61c43fba.js
This source diff could not be displayed because it is too large. You can view the blob instead.
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){}});
>>>>>>> bugfix/迭代bug:dist/static/js/21.1f6367e5dcf6de69a5bd.js
dist/static/js/26.c747f91c8eef769638d9.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/28.c1335f07037eb9226047.js → dist/static/js/27.9da56a144273173dd58d.js
webpackJsonp([28],{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([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
dist/static/js/29.14f81ba933c5f226b3e1.js → dist/static/js/28.68353883591596ca2472.js
webpackJsonp([29],{"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([28],{"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/29.f9bed6e9047d75f2d309.js 0 → 100644
webpackJsonp([29],{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.L)(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.s)(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.s)(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.L)(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/manifest.cdb6163b6f31d5d74af3.js 0 → 100644
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,d){for(var t,o,b,i=0,u=[];i<c.length;i++)o=c[i],f[o]&&u.push(f[o][0]),f[o]=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++)b=n(n.s=d[i]);return b};var c={},f={42: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:"ee8213667463b1cfa618",1:"a5b1143fb090193afa6f",2:"297458ae5b2f95a5a6ec",3:"cf8d7ac0fd6cc80391e7",4:"b136bc81af7e9433e824",5:"0f395a886b33ffa77a9a",6:"84144a26d97167c03b89",7:"cbfb1c1422fe6c812024",8:"891bbc4365b8362d5195",9:"7cc1b38988e254182ad8",10:"1cbc7e505ef918253196",11:"cfa61640d1a3d8d26b48",12:"627b84a8deefd3515526",13:"a7457f18ef15d320b80c",14:"ea35b721a975949e21f9",15:"7f3864d659b15b05f7ea",16:"fd8e0aca022b16e268de",17:"edc3cc3dd7cd59974a35",18:"cfdc70af6a4d0ba00e02",19:"2b51bcd6bcb234699455",20:"0467df18d45227fe1ae0",21:"1f6367e5dcf6de69a5bd",22:"4985a38ec89a12ab291d",23:"60311edadffd29177d1f",24:"ee5a8baed163b78150c1",25:"5ac24c863c71cc9e9d97",26:"6b02cfff60b50e5fc4f1",27:"9da56a144273173dd58d",28:"68353883591596ca2472",29:"f9bed6e9047d75f2d309",30:"0a8c84f44b82680d185c",31:"e45a931553d913085331",32:"f9c104a613c25f466d77",33:"97ce2268606d1d3f3647",34:"42dff1ce9cd239441acd",35:"05a99bee6feae192b28e",36:"4e775e6d2025224e0371",37:"fd86faa4c3c1209b3d18",38:"4eb49e066fba130c61f9",39:"b99f2a7f59ecc2da15aa"}[e]+".js";var t=setTimeout(o,12e4);function o(){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=o,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/utils/utils.js
......@@ -88,6 +88,6 @@ export function toTaskCenter(taskId) {
customClass: 'import-link-confirm-content',
type: 'warning'
}).then(() => {
window.open(`http://gicdev.demogic.com/gic-web/#/taskDetail/${taskId}`);
window.open(`/gic-web/#/taskDetail/${taskId}`);
}).catch(() => true);
}
src/view/memberGroup/group-list.vue
......@@ -9,6 +9,9 @@
<!-- <el-collapseTransition> -->
<!--我的会员分组-->
<ul class="lists" v-show="activeType == '1'">
<li @click="addGroupDialog = true" :limit-code="$buttonCode.memberTagAddCateGory" v-if="$getButtonLimit($buttonCode.memberTagAddCateGory)" style="margin-bottom: 10px">
<el-button type="primary" class="ghost-btn add-group">新增分类</el-button>
</li>
<li v-for="(list, i) in lists" :key="i" :class="['member-list', { 'active-li': i == currentIndex }]" @click="handleChangeIndex(i, list)">
<div>
<i class="iconfont icon-kehufenzu icon"></i>
......@@ -21,9 +24,6 @@
<i slot="reference" class="iconfont icon-gengduo icon"></i>
</el-popover>
</li>
<li @click="addGroupDialog = true" :limit-code="$buttonCode.memberTagAddCateGory" v-if="$getButtonLimit($buttonCode.memberTagAddCateGory)" style="margin-top:10px">
<el-button type="primary" class="ghost-btn add-group">新增分类</el-button>
</li>
</ul>
<!-- </el-collapseTransition> -->
......
src/view/memberGroup/memberGroupList.vue
......@@ -1479,6 +1479,7 @@ export default {
align-items: stretch;
.left-box {
flex-shrink: 0;
height: 100%;
width: 200px;
background-color: #fff;
border-right: 1px solid rgba(220,223,230,1);
......
src/view/platformTag/member-tag.vue
......@@ -782,7 +782,10 @@ export default {
getShowSystem() {
return isShowSystemTag().then(res => {
this.isShowSystem = res.result;
if(!res.result) this.activeTag='manual';
if(!res.result) {
this.activeTag='manual';
this.handTag = 1;
};
})
}
},
......
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