Skip to content

M
memberTag-web
Commit 32e58426 by member
Options

修改tapd的bug

parent 2c78c35b
Showing with 102 additions and 109 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-会员标签</title><link href=./static/css/app.36eab8e254bbf57ffc87f57de29fff42.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.e9ad74438c3c961f372f.js></script><script type=text/javascript src=./static/js/vendor.c30398db3b176e06f763.js></script><script type=text/javascript src=./static/js/app.c252172df223e27a6494.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-会员标签</title><link href=./static/css/app.75f9e5b38a1715edc0fc681d689ada3c.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.f4acbd422e923d191ea4.js></script><script type=text/javascript src=./static/js/vendor.eb4fd5c01c3b98d7fcea.js></script><script type=text/javascript src=./static/js/app.fc31afb7820b45d2365c.js></script></body></html>
\ No newline at end of file
dist/static/css/app.36eab8e254bbf57ffc87f57de29fff42.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.75f9e5b38a1715edc0fc681d689ada3c.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/index.less
......@@ -86,4 +86,8 @@
font-size: 18px;
color: #303133;
}
}
.el-date-editor .el-range-separator {
width: 6%;
}
\ No newline at end of file
dist/static/js/0.6c1ded16c6ca1aee9209.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.83e065214dd4e831614d.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/19.a169f388d3f40343ada7.js 0 → 100644
webpackJsonp([19],{"3CRC":function(e,t){},SJ7l:function(e,t,i){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var s=i("Dd8w"),a=i.n(s),n=i("lRwf"),o=i.n(n),r=i("zL8q"),l=i("2CGT");o.a.component(r.CollapseTransition.name,r.CollapseTransition);var c={name:"group-list",data:function(){return{lists:[],addGroupDialog:!1,expendTxt:"展开",groupName:"",title:"新增分组名称",currentIndex:-1,active:!1}},computed:{expendClass:function(){return"展开"!=this.expendTxt?"is-caret":""}},methods:{handleNoEditClassifyName:function(){this.lists=this.lists.map(function(e){return a()({},e,{edit:!1})})},handleChangeIndex:function(e,t){var i=this.lists.some(function(e){return e.edit});console.log(i),i&&this.handleNoEditClassifyName(),this.active=!1,this.currentIndex=e,this.$emit("second-list",t)},editGroupName:function(e){if(e.edit)this.modifyName(e);else{if(!this.operatorName(e))return;e.edit=!0}},deleteGroupName:function(e){var t=this;this.operatorName(e)&&this.$confirm("是否删除分组名称？","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){t.excludeName(e)}).catch(function(){t.$message({type:"info",message:"已取消删除"})})},excludeName:function(e){var t=this,i={requestProject:"gic-member-tag-web",memberTagGroupClassifyId:e.memberTagGroupClassifyId};Object(l.k)(i).then(function(e){1==e.errorCode&&(t.getMemberGroupList(),t.$message({type:"success",message:"删除成功!"}))})},modifyName:function(e){var t=this;if(e.classifyName){var i={requestProject:"gic-member-tag-web",classifyName:e.classifyName,memberTagGroupClassifyId:e.memberTagGroupClassifyId};Object(l.m)(i).then(function(i){1==i.errorCode&&(e.edit=!1,t.getMemberGroupList(),t.$message({type:"success",message:"修改成功",duration:2e3}))})}else this.$message({message:"分组名称不能为空！",type:"warning",duration:2e3})},operatorName:function(e){return"0"!=e.memberTagGroupClassifyId||(this.$message({message:e.classifyName+"的不能操作",type:"warning",duration:2e3}),!1)},handleGroupDialog:function(){var e=this;if(this.groupName){var t={requestProject:"gic-member-tag-web",classifyName:this.groupName};Object(l.m)(t).then(function(t){1==t.errorCode&&(e.getMemberGroupList(),e.groupName="",e.addGroupDialog=!1,e.$message({type:"success",message:"添加成功"}))})}else this.$message({type:"warning",message:"分组名称不能为空"})},getMemberGroupList:function(){var e=this;Object(l.l)({requestProject:"gic-member-tag-web"}).then(function(t){1===t.errorCode&&(e.lists=t.result.map(function(e){return a()({},e,{edit:!1})}))})},handleExpend:function(){this.expendTxt="展开"===this.expendTxt?"收起":"展开"}},beforeMount:function(){this.getMemberGroupList()}},u={render:function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("div",{staticClass:"group-list"},[i("div",{staticClass:"member-group"},[i("i",{staticClass:"icon-list el-icon-caret-top icon-transform",class:e.expendClass,on:{click:e.handleExpend}}),e._v("\n 我的会员分组\n "),i("i",{staticClass:"el-icon-plus icon-right icon-list",on:{click:function(t){e.addGroupDialog=!0}}})]),e._v(" "),i("el-collapseTransition",[i("ul",{directives:[{name:"show",rawName:"v-show",value:"展开"==e.expendTxt,expression:"expendTxt == '展开'"}],staticClass:"lists"},e._l(e.lists,function(t,s){return i("li",{key:s,staticClass:"member-list",class:{"active-li":s==e.currentIndex},on:{click:function(i){e.handleChangeIndex(s,t)}}},[i("span",{directives:[{name:"show",rawName:"v-show",value:!t.edit,expression:"!list.edit"}]},[e._v(e._s(t.classifyName))]),e._v(" "),i("el-input",{directives:[{name:"show",rawName:"v-show",value:t.edit,expression:"list.edit"}],staticStyle:{width:"100px"},attrs:{size:"mini"},nativeOn:{keyup:function(i){if(!("button"in i)&&e._k(i.keyCode,"enter",13,i.key))return null;e.modifyName(t)}},model:{value:t.classifyName,callback:function(i){e.$set(t,"classifyName",i)},expression:"list.classifyName"}}),e._v(" "),"未分类"!==t.classifyName?i("div",{staticClass:"oper-area"},[i("i",{staticClass:"icon-list icon-list-oper",class:[t.edit?"el-icon-check":"el-icon-edit"],on:{click:function(i){i.stopPropagation(),e.editGroupName(t)}}}),e._v(" "),i("i",{staticClass:"icon-list el-icon-circle-close icon-list-oper",on:{click:function(i){e.deleteGroupName(t)}}})]):e._e()],1)}))]),e._v(" "),i("el-dialog",{attrs:{title:e.title,visible:e.addGroupDialog,width:"320px",top:"30vh","close-on-click-modal":!1},on:{"update:visible":function(t){e.addGroupDialog=t}}},[i("div",[e._v("\n 分组名称：\n "),i("el-input",{staticStyle:{width:"200px"},attrs:{placeholder:"请输入分组名称",maxlength:8,clearable:""},model:{value:e.groupName,callback:function(t){e.groupName=t},expression:"groupName"}})],1),e._v(" "),i("span",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[i("el-button",{on:{click:function(t){e.addGroupDialog=!1}}},[e._v("取 消")]),e._v(" "),i("el-button",{attrs:{type:"primary"},on:{click:e.handleGroupDialog}},[e._v("确 定")])],1)])],1)},staticRenderFns:[]};var m=i("VU/8")(c,u,!1,function(e){i("3CRC")},"data-v-7dc74b2f",null);t.default=m.exports}});
\ No newline at end of file
dist/static/js/19.22e47b0b352a44a7bc53.js → dist/static/js/20.51b68fd8795513a0e1b7.js
webpackJsonp([19],{GSV8:function(t,e){},iHP3:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var s=a("Dd8w"),n=a.n(s),i=a("lRwf"),l=a.n(i),c=a("zL8q"),o=a("CUHN"),d=a("SJI6");l.a.component(c.CollapseTransition.name,c.CollapseTransition);var r={name:"tag-type",components:{SecondTag:o.default},props:{tagList:Object},data:function(){return{list:{},typeName:"",editData:[],expends:"收起"}},computed:n()({},Object(d.mapState)(["tagRealName"])),methods:{handleChangeExpends:function(){this.expends="收起"===this.expends?"展开":"收起"},handleFirstTag:function(){this.$emit("handleFristTag",this.list)}},watch:{tagList:{immediate:!0,handler:function(t){this.list=t}}}},p={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"list"},[a("span",{staticClass:"expends-txt",on:{click:t.handleChangeExpends}},[t._v(t._s(t.expends)+" ")]),t._v(" "),a("div",{staticClass:"first-tag"},[a("div",[a("i",{staticClass:"iconfont menu-icon",class:[t.list.icon,{"icon-tag-light":t.list.name===t.tagRealName}]}),t._v(" "),a("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._v(" "),a("el-collapseTransition",[a("div",{directives:[{name:"show",rawName:"v-show",value:"收起"===t.expends,expression:"expends === '收起'"}],staticClass:"second-tag"},t._l(t.list.children,function(e,s){return a("second-tag",{key:s,attrs:{list:e,"tag-name":t.list.name}})}))])],1)])},staticRenderFns:[]};var m=a("VU/8")(r,p,!1,function(t){a("GSV8")},"data-v-76274c1c",null);e.default=m.exports}});
\ No newline at end of file
webpackJsonp([20],{GSV8:function(t,e){},iHP3:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var s=a("Dd8w"),n=a.n(s),i=a("lRwf"),l=a.n(i),c=a("zL8q"),o=a("CUHN"),d=a("SJI6");l.a.component(c.CollapseTransition.name,c.CollapseTransition);var r={name:"tag-type",components:{SecondTag:o.default},props:{tagList:Object},data:function(){return{list:{},typeName:"",editData:[],expends:"收起"}},computed:n()({},Object(d.mapState)(["tagRealName"])),methods:{handleChangeExpends:function(){this.expends="收起"===this.expends?"展开":"收起"},handleFirstTag:function(){this.$emit("handleFristTag",this.list)}},watch:{tagList:{immediate:!0,handler:function(t){this.list=t}}}},p={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"list"},[a("span",{staticClass:"expends-txt",on:{click:t.handleChangeExpends}},[t._v(t._s(t.expends)+" ")]),t._v(" "),a("div",{staticClass:"first-tag"},[a("div",[a("i",{staticClass:"iconfont menu-icon",class:[t.list.icon,{"icon-tag-light":t.list.name===t.tagRealName}]}),t._v(" "),a("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._v(" "),a("el-collapseTransition",[a("div",{directives:[{name:"show",rawName:"v-show",value:"收起"===t.expends,expression:"expends === '收起'"}],staticClass:"second-tag"},t._l(t.list.children,function(e,s){return a("second-tag",{key:s,attrs:{list:e,"tag-name":t.list.name}})}))])],1)])},staticRenderFns:[]};var m=a("VU/8")(r,p,!1,function(t){a("GSV8")},"data-v-76274c1c",null);e.default=m.exports}});
\ No newline at end of file
dist/static/js/22.f3afb7a393426670d5ef.js → dist/static/js/23.24cd9b4a91da0814be19.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("zL8q");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:"damogic",password:"1",eid:"ff808081593917d90159398ec6340012"}}},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:"ff808081593917d90159398ec6340012"})).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){if(!("button"in e)&&t._k(e.keyCode,"enter",13,e.key))return 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){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("I1mE")},null,null);e.default=d.exports},I1mE:function(t,e){}});
\ No newline at end of file
webpackJsonp([23],{"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("zL8q");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:"damogic",password:"1",eid:"ff808081593917d90159398ec6340012"}}},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:"ff808081593917d90159398ec6340012"})).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){if(!("button"in e)&&t._k(e.keyCode,"enter",13,e.key))return 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){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("I1mE")},null,null);e.default=d.exports},I1mE:function(t,e){}});
\ No newline at end of file
dist/static/js/23.a2c9d003e8e7e65e60db.js deleted 100644 → 0
webpackJsonp([23],{SJ7l:function(e,t,i){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var s=i("Dd8w"),a=i.n(s),n=i("lRwf"),o=i.n(n),r=i("zL8q"),c=i("2CGT");o.a.component(r.CollapseTransition.name,r.CollapseTransition);var l={name:"group-list",data:function(){return{lists:[],addGroupDialog:!1,expendTxt:"展开",groupName:"",title:"新增分组名称",currentIndex:-1,active:!1}},computed:{expendClass:function(){return"展开"!=this.expendTxt?"is-caret":""}},methods:{handleNoEditClassifyName:function(){this.lists=this.lists.map(function(e){return a()({},e,{edit:!1})})},handleChangeIndex:function(e,t){var i=this.lists.some(function(e){return e.edit});console.log(i),i&&this.handleNoEditClassifyName(),this.active=!1,this.currentIndex=e,this.$emit("second-list",t)},editGroupName:function(e){if(e.edit)this.modifyName(e);else{if(!this.operatorName(e))return;e.edit=!0}},deleteGroupName:function(e){var t=this;this.operatorName(e)&&this.$confirm("是否删除分组名称？","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){t.excludeName(e)}).catch(function(){t.$message({type:"info",message:"已取消删除"})})},excludeName:function(e){var t=this,i={requestProject:"gic-member-tag-web",memberTagGroupClassifyId:e.memberTagGroupClassifyId};Object(c.k)(i).then(function(e){1==e.errorCode&&(t.getMemberGroupList(),t.$message({type:"success",message:"删除成功!"}))})},modifyName:function(e){var t=this;if(e.classifyName){var i={requestProject:"gic-member-tag-web",classifyName:e.classifyName,memberTagGroupClassifyId:e.memberTagGroupClassifyId};Object(c.m)(i).then(function(i){1==i.errorCode&&(e.edit=!1,t.getMemberGroupList(),t.$message({type:"success",message:"修改成功",duration:2e3}))})}else this.$message({message:"分组名称不能为空！",type:"warning",duration:2e3})},operatorName:function(e){return"0"!=e.memberTagGroupClassifyId||(this.$message({message:e.classifyName+"的不能操作",type:"warning",duration:2e3}),!1)},handleGroupDialog:function(){var e=this;if(this.groupName){var t={requestProject:"gic-member-tag-web",classifyName:this.groupName};Object(c.m)(t).then(function(t){1==t.errorCode&&(e.getMemberGroupList(),e.groupName="",e.addGroupDialog=!1,e.$message({type:"success",message:"添加成功"}))})}else this.$message({type:"warning",message:"分组名称不能为空"})},getMemberGroupList:function(){var e=this;Object(c.l)({requestProject:"gic-member-tag-web"}).then(function(t){1===t.errorCode&&(e.lists=t.result.map(function(e){return a()({},e,{edit:!1})}))})},handleExpend:function(){this.expendTxt="展开"===this.expendTxt?"收起":"展开"},getRecommendList:function(){this.lists.some(function(e){return e.edit})&&this.handleNoEditClassifyName(),this.active=!0,this.currentIndex=-1,this.$emit("getRecommend")}},beforeMount:function(){this.getMemberGroupList()}},u={render:function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("div",{staticClass:"group-list"},[i("div",{staticClass:"member-group"},[i("i",{staticClass:"icon-list el-icon-caret-top icon-transform",class:e.expendClass,on:{click:e.handleExpend}}),e._v("\n 我的会员分组\n "),i("i",{staticClass:"el-icon-plus icon-right icon-list",on:{click:function(t){e.addGroupDialog=!0}}})]),e._v(" "),i("el-collapseTransition",[i("ul",{directives:[{name:"show",rawName:"v-show",value:"展开"==e.expendTxt,expression:"expendTxt == '展开'"}],staticClass:"lists"},e._l(e.lists,function(t,s){return i("li",{key:s,staticClass:"member-list",class:{"active-li":s==e.currentIndex},on:{click:function(i){e.handleChangeIndex(s,t)}}},[i("span",{directives:[{name:"show",rawName:"v-show",value:!t.edit,expression:"!list.edit"}]},[e._v(e._s(t.classifyName))]),e._v(" "),i("el-input",{directives:[{name:"show",rawName:"v-show",value:t.edit,expression:"list.edit"}],staticStyle:{width:"100px"},attrs:{size:"mini"},nativeOn:{keyup:function(i){if(!("button"in i)&&e._k(i.keyCode,"enter",13,i.key))return null;e.modifyName(t)}},model:{value:t.classifyName,callback:function(i){e.$set(t,"classifyName",i)},expression:"list.classifyName"}}),e._v(" "),"未分类"!==t.classifyName?i("div",{staticClass:"oper-area"},[i("i",{staticClass:"icon-list icon-list-oper",class:[t.edit?"el-icon-check":"el-icon-edit"],on:{click:function(i){i.stopPropagation(),e.editGroupName(t)}}}),e._v(" "),i("i",{staticClass:"icon-list el-icon-circle-close icon-list-oper",on:{click:function(i){e.deleteGroupName(t)}}})]):e._e()],1)}))]),e._v(" "),i("div",{staticClass:"recommend-list",class:{"recommend-active":e.active},on:{click:e.getRecommendList}},[e._v("\n 推荐会员分组\n ")]),e._v(" "),i("el-dialog",{attrs:{title:e.title,visible:e.addGroupDialog,width:"320px",top:"30vh","close-on-click-modal":!1},on:{"update:visible":function(t){e.addGroupDialog=t}}},[i("div",[e._v("\n 分组名称：\n "),i("el-input",{staticStyle:{width:"200px"},attrs:{placeholder:"请输入分组名称",maxlength:8,clearable:""},model:{value:e.groupName,callback:function(t){e.groupName=t},expression:"groupName"}})],1),e._v(" "),i("span",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[i("el-button",{on:{click:function(t){e.addGroupDialog=!1}}},[e._v("取 消")]),e._v(" "),i("el-button",{attrs:{type:"primary"},on:{click:e.handleGroupDialog}},[e._v("确 定")])],1)])],1)},staticRenderFns:[]};var m=i("VU/8")(l,u,!1,function(e){i("TJi5")},"data-v-1ffdc066",null);t.default=m.exports},TJi5:function(e,t){}});
\ No newline at end of file
dist/static/js/manifest.e9ad74438c3c961f372f.js deleted 100644 → 0
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,f,t){for(var o,d,b,i=0,u=[];i<c.length;i++)d=c[i],n[d]&&u.push(n[d][0]),n[d]=0;for(o in f)Object.prototype.hasOwnProperty.call(f,o)&&(e[o]=f[o]);for(a&&a(c,f,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=r(r.s=t[i]);return b};var c={},n={33:0};function r(a){if(c[a])return c[a].exports;var n=c[a]={i:a,l:!1,exports:{}};return e[a].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var a=n[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,r){a=n[e]=[c,r]});a[2]=c;var f=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,r.nc&&t.setAttribute("nonce",r.nc),t.src=r.p+"static/js/"+e+"."+{0:"83e065214dd4e831614d",1:"1a66f3452cb905b67755",2:"fd7dead08ec0189b0737",3:"6cdad6e2f40622209102",4:"911f852d10fb50e5c0cd",5:"253c98996968281eed27",6:"31eb51419dea97959645",7:"f169140cbd6ad9f5611c",8:"fe61efcd1ccfc3412252",9:"ea583eedf0e8e01807bd",10:"f0730ab3ea2cc610aab4",11:"17a481e91574ea11a6f8",12:"ff49b3face62ef7aef5f",13:"5ff52df0201b9234fa89",14:"698cfa21b2f783438c71",15:"45a78311835c4d786a28",16:"507fddf23cee64d7ade1",17:"3d781ba9b065c4046ffa",18:"9022ea0326694df97cda",19:"22e47b0b352a44a7bc53",20:"0fef167461d750bfe493",21:"e39e3461a16359f1196b",22:"f3afb7a393426670d5ef",23:"a2c9d003e8e7e65e60db",24:"c9d5d98023a48e77bcbd",25:"6934db3f920c52113f90",26:"3aca132c47a1220d1d2f",27:"2c48b10d124016d57c0b",28:"3493abb67f82d7dbc1cb",29:"93394f129023c3e6e8fb",32:"a9aaa6e5d01423c1a780"}[e]+".js";var o=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(o);var a=n[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return t.onerror=t.onload=d,f.appendChild(t),c},r.m=e,r.c=c,r.d=function(e,a,c){r.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},r.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(a,"a",a),a},r.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},r.p="./",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/manifest.f4acbd422e923d191ea4.js 0 → 100644
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,t,f){for(var o,d,b,i=0,u=[];i<c.length;i++)d=c[i],n[d]&&u.push(n[d][0]),n[d]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(a&&a(c,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=r(r.s=f[i]);return b};var c={},n={33:0};function r(a){if(c[a])return c[a].exports;var n=c[a]={i:a,l:!1,exports:{}};return e[a].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var a=n[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,r){a=n[e]=[c,r]});a[2]=c;var t=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,r.nc&&f.setAttribute("nonce",r.nc),f.src=r.p+"static/js/"+e+"."+{0:"6c1ded16c6ca1aee9209",1:"1a66f3452cb905b67755",2:"fd7dead08ec0189b0737",3:"210e6af50974508e5e2b",4:"49e68de9803de60ccec8",5:"24a4b34a9fa81651035d",6:"31eb51419dea97959645",7:"f169140cbd6ad9f5611c",8:"fe61efcd1ccfc3412252",9:"ea583eedf0e8e01807bd",10:"f0730ab3ea2cc610aab4",11:"98e7df513cbef53064c2",12:"ff49b3face62ef7aef5f",13:"5ff52df0201b9234fa89",14:"698cfa21b2f783438c71",15:"45a78311835c4d786a28",16:"507fddf23cee64d7ade1",17:"3d781ba9b065c4046ffa",18:"9022ea0326694df97cda",19:"a169f388d3f40343ada7",20:"51b68fd8795513a0e1b7",21:"11aedf5a4196557df7ad",22:"61bb63c1296b6c9972a5",23:"24cd9b4a91da0814be19",24:"c9d5d98023a48e77bcbd",25:"6934db3f920c52113f90",26:"3aca132c47a1220d1d2f",27:"2c48b10d124016d57c0b",28:"3493abb67f82d7dbc1cb",29:"93394f129023c3e6e8fb",32:"a9aaa6e5d01423c1a780"}[e]+".js";var o=setTimeout(d,12e4);function d(){f.onerror=f.onload=null,clearTimeout(o);var a=n[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=d,t.appendChild(f),c},r.m=e,r.c=c,r.d=function(e,a,c){r.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},r.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(a,"a",a),a},r.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},r.p="./",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/vendor.c30398db3b176e06f763.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/vendor.eb4fd5c01c3b98d7fcea.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
package-lock.json
......@@ -690,7 +690,7 @@
},
"async-validator": {
"version": "1.8.5",
"resolved": "http://registry.npm.taobao.org/async-validator/download/async-validator-1.8.5.tgz?cache=0&other_urls=http%3A%2F%2Fregistry.npm.taobao.org%2Fasync-validator%2Fdownload%2Fasync-validator-1.8.5.tgz",
"resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-1.8.5.tgz",
"integrity": "sha1-3D4I7B/Q3dtn5ghC8CwM0c7G1/A=",
"requires": {
"babel-runtime": "6.x"
......@@ -3650,9 +3650,9 @@
"dev": true
},
"element-ui": {
"version": "2.7.2",
"resolved": "http://registry.npm.taobao.org/element-ui/download/element-ui-2.7.2.tgz",
"integrity": "sha1-i8W+9cPFOiFwQiUWtDJOcAacI9E=",
"version": "2.8.2",
"resolved": "https://registry.npm.taobao.org/element-ui/download/element-ui-2.8.2.tgz",
"integrity": "sha1-Iaeky5Jhaw+LddTU5jfToc2MCd4=",
"requires": {
"async-validator": "~1.8.1",
"babel-helper-vue-jsx-merge-props": "^2.0.0",
......@@ -4751,9 +4751,9 @@
"dev": true
},
"fsevents": {
"version": "1.2.8",
"resolved": "http://registry.npm.taobao.org/fsevents/download/fsevents-1.2.8.tgz",
"integrity": "sha1-V+pTIPdizUaW5ejocSDszIsRys8=",
"version": "1.2.9",
"resolved": "https://registry.npm.taobao.org/fsevents/download/fsevents-1.2.9.tgz",
"integrity": "sha1-P17WZYPM1vQAtaANtvfoYTY+OI8=",
"dev": true,
"optional": true,
"requires": {
......
package.json
......@@ -11,7 +11,7 @@
"version": "conventional-changelog -p angular -i changelog.md -s -r 0 && git add changelog.md"
},
"dependencies": {
"element-ui": "^2.3.9",
"element-ui": "^2.8.2",
"file-saver": "^1.3.8",
"tinymce": "^4.8.3",
"vue": "^2.5.2",
......
src/components/tag/tag-config-options.vue
......@@ -16,6 +16,7 @@
</div>
</div>
</template>
<!-- 2.数字范围 -->
<template v-if="parent.templateCode == 'tag003'">
<div class="m-b-20" :key="'tag2' + pindex">
......@@ -64,7 +65,7 @@
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
format="yyyyMMdd"
format="yyyy-MM-dd"
value-format="yyyyMMdd"
:default-time="['000000', '235959']"
><!-- :picker-options="pickerOptions" -->
......@@ -164,7 +165,7 @@
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
format="yyyyMMdd"
format="yyyy-MM-dd"
value-format="yyyyMMdd"
:default-time="['000000', '235959']"
><!-- :picker-options="pickerOptions" -->
......@@ -426,7 +427,7 @@
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
format="yyyyMMdd"
format="yyyy-MM-dd"
value-format="yyyyMMdd"
:default-time="['000000', '235959']">
</el-date-picker>
......@@ -446,10 +447,8 @@
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
format="yyyyMMdd"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00', '23:59:59']"
>
format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</div>
<!-- 相对时段 -->
......@@ -517,10 +516,9 @@
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
format="yyyyMMdd"
value-format="yyyyMMdd"
format="yyyy-MM-dd"
:default-time="['000000', '235959']"
><!-- :picker-options="pickerOptions" -->
value-format="yyyyMMdd">
</el-date-picker>
</div>
<!-- 相对时段 -->
......@@ -707,18 +705,7 @@ export default {
tag009: {
allSelectActive: 'first',
inputSearch: '',
allSelectOptions: [
// {
// id: 1,
// check: false,
// name: '欧时力'
// },
// {
// id: 2,
// check: false,
// name: '伊芙丽'
// }
],
allSelectOptions: [],
selectedOptions: []
},
......@@ -906,6 +893,7 @@ export default {
template: data.template
};
// syo 关键点 修改实时以及key
this.tagData.tagId = data.tagId;
this.tagData.tagType = data.tagType;
this.tagData.tagName = data.tagName;
this.currentKey = data.columnKey;
......@@ -1074,10 +1062,10 @@ export default {
key: this.tagData.tagType == 1 ? this.tagData.tagId : this.currentKey,
requestProject: 'gic-member-tag-web'
};
this.axios
.post(`${this.baseUrl}${url}`, qs.stringify(para))
this.axios.post(`${this.baseUrl}${url}`, qs.stringify(para))
.then(res => {
let resData = res;
console.log(resData);
if (this.tagData.tagType != 1 && this.currentKey != 'tag') {
if (resData.data.errorCode == 0) {
data.options = resData.data.result;
......@@ -1086,8 +1074,8 @@ export default {
return;
}
} else {
if (resData.errorCode == 1) {
data.options = resData.result;
if (resData.data.errorCode == 1) {
data.options = resData.data.result;
this.templateData.push(data);
this.getExistData(this.tagData.tagId, data.options);
}
......@@ -1099,17 +1087,30 @@ export default {
});
},
isContained(a, b) {
if (!(a instanceof Array) || !(b instanceof Array)) return false;
if (!b.length) {
return false;
}
if (a.length < b.length) return false;
let aStr = a.toString();
for (let i = 0, len = b.length; i < len; i++) {
if (aStr.indexOf(b[i]) == -1) return false;
}
return true;
},
/**
* 获取当前标签已存数据
*/
getExistData(tagId, newOptions) {
let that = this;
const param = {
tagId: tagId,
requestProject: 'gic-member-tag-web'
};
findOndJson(param)
.then(res => {
console.log(res);
if (res.errorCode == 1) {
if (!res.result || res.tagParams == '[]') {
this.addTempFlag = false;
......@@ -1117,11 +1118,10 @@ export default {
}
// 查看该标签是否在暂存架中
this.addTempFlag = true;
let items = JSON.parse(res.tagParams).template;
let items = JSON.parse(res.result.tagParams).template;
if (!!newOptions) {
items.forEach(function(ele, index) {
if (ele.templateCode == 'tag013') {
console.log(11);
ele.options = newOptions;
let idOptions = newOptions.map(el => el.key);
let checkFlag = true;
......@@ -1131,7 +1131,7 @@ export default {
}
});
let checkedCount = ele.checkeditems.length;
if (this.isContained(ele.checkeditems, idOptions)) {
if (that.isContained(ele.checkeditems, idOptions)) {
ele.checkAll = true;
ele.isIndeterminate = false;
return false;
......@@ -1243,6 +1243,7 @@ export default {
case 'tag013':
value = tagValue.val[0].data.value.split(' ');
console.log(value);
for (let i = 0; i < this.templateData.length; i++) {
if (this.templateData[i].templateCode === 'tag013') {
this.templateData[i].checkeditems = value;
......@@ -1420,14 +1421,18 @@ export default {
* 重置条件添加的时候是空的
*/
resetOptions() {
// let tagValue = JSON.parse(this.templateDataList.tagValue);
switch (this.templateDataList.templateCode) {
case 'tag003':
this.templateData[0].numRange = [];
break;
case 'tag007':
this.templateData[0].addTags = [];
break;
if (this.templateData.length) {
for (let tem of this.templateData) {
console.log(tem);
switch(tem.templateCode) {
case 'tag003':
tem.numRange = [];
break;
case 'tag007':
tem.addTags = [];
break;
}
}
}
}
},
......
src/components/tagDetail/mixin/index.js
......@@ -334,6 +334,8 @@ export default {
]
};
console.log(this.templateData[0]);
let code = that.templateData[0].templateCode;
/* 多选 */
if (code === 'tag001' && !that.templateData[0].checkeditems.length) {
......@@ -2032,6 +2034,7 @@ export default {
*/
getAsyncList(url, data) {
const that = this;
console.log(this.tagData.tagType)
const para = {
key: that.tagData.tagType == 1 ? that.tagData.tagId : that.currentKey,
requestProject: 'member-tag'
......
src/view/memberGroup/edit-tag.vue
......@@ -106,24 +106,17 @@ export default {
<style lang="less" scoped>
.dialog-box {
.tag-name {
display: inline-block;
vertical-align: middle;
<<<<<<< HEAD
font-size: 16px;
font-weight: bold;
color: #303133;
display: inline-block;
margin-bottom: 5px;
.tag-flag {
margin-left: 5px;
padding: 3px 8px;
vertical-align: middle;
font-size: 12px;
margin-left: 6px;
padding: 3px 10px;
border-top-right-radius: 5px;
border-bottom-left-radius: 5px;
background-color: #1890ff;
color: #fff;
background: #1890FF;
border-radius: 0 5px 0 5px;
}
=======
margin-bottom: 5px;
>>>>>>> origin/dev
}
.icon-tag-name {
display: inline-block;
......
src/view/memberGroup/group-list.vue
......@@ -19,9 +19,9 @@
</ul>
</el-collapseTransition>
<div class="recommend-list" :class="{ 'recommend-active': active }" @click="getRecommendList">
<!-- <div class="recommend-list" :class="{ 'recommend-active': active }" @click="getRecommendList">
推荐会员分组
</div>
</div> -->
<el-dialog :title="title" :visible.sync="addGroupDialog" width="320px" top="30vh" :close-on-click-modal="false">
<div>
......@@ -223,15 +223,15 @@ export default {
handleExpend() {
this.expendTxt = this.expendTxt === '展开' ? '收起' : '展开';
},
getRecommendList() {
let editFlag = this.lists.some(el => el.edit);
if (editFlag) {
this.handleNoEditClassifyName();
}
this.active = true;
this.currentIndex = -1;
this.$emit('getRecommend');
}
// getRecommendList() {
// let editFlag = this.lists.some(el => el.edit);
// if (editFlag) {
// this.handleNoEditClassifyName();
// }
// this.active = true;
// this.currentIndex = -1;
// this.$emit('getRecommend');
// }
},
beforeMount() {
......@@ -262,6 +262,9 @@ export default {
color: #303133;
font-weight: bold;
cursor: pointer;
&:hover {
color: #1890ff;
}
.icon-right {
float: right;
}
......@@ -298,6 +301,7 @@ export default {
}
}
.active-li {
background-color: #f6f8fd;
color: #1890ff;
}
.icon-list-oper {
......
src/view/memberGroup/memberGroupList.vue
......@@ -59,11 +59,7 @@
{{ scope.row.isRealTime === 1 ? '实时' : '非实时' }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="最近更新时间" show-overflow-tooltip >
=======
<el-table-column label="最近更新时间" show-overflow-tooltip width="230px">
>>>>>>> origin/dev
<template slot-scope="scope">
<p class="h-18">{{ scope.row.latestUpdateTime | formatTimeYMD }}</p>
<p class="h-18">{{ scope.row.latestUpdateTime | formatTimeHMS }}</p>
......@@ -106,17 +102,15 @@
<p class="h-18">{{ scope.row.createTime | formatTimeHMS }}</p>
</template>
</el-table-column>
<el-table-column prop="recentUpdateDate" label="到期时间" show-overflow-tooltip >
<template slot-scope="scope">
<p class="h-18">{{ scope.row.effectiveDate | formatTimeYMD }}</p>
<p class="h-18">{{ scope.row.effectiveDate | formatTimeHMS }}</p>
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="操作" width="130">
=======
<el-table-column label="操作" width="150px">
>>>>>>> origin/dev
<template slot-scope="scope">
<router-link
:to="`/memberGroupDetail?memberTagGroupId=${scope.row.memberTagGroupId}`"
......@@ -130,13 +124,9 @@
>
编辑
</router-link>
<!-- <el-button type="text" size="small" class="p-r-12" @click="toDelTag(scope.row, scope.$index)">删除</el-button>
<el-popover placement="top" width="50" trigger="hover">
刷新覆盖人数
<el-button slot="reference" type="text" size="small" @click="refreshGroup(scope.row)">刷新</el-button>
</el-popover> -->
</template>
</el-table-column>
</el-table>
</div>
<div class="block common-wrap__page text-right" v-if="groupTableData.length != 0">
......
src/view/platformTag/member-tag.vue
......@@ -58,13 +58,7 @@
<vue-gic-footer></vue-gic-footer>
</div>
<<<<<<< HEAD
<div class="group-right-list" v-show="groupShow">
=======
<!-- <div class="deal-list-mask" v-show="groupShow"></div> -->
<div class="group-right-list" :class="{'group-transtion-list': groupShow}">
>>>>>>> origin/dev
<div class="group-right-list" :class="{'group-transtion-list': groupShow}">
<div class="group-title">
<i class="iconfont icon-17" />
已经选标签：
......@@ -91,7 +85,7 @@
</div>
<div class="form-item" :class="{ 'margin-60': marginSixty }">
<label for="">分组有效期</label>
<el-date-picker v-model="tagConfig.date" :picker-options="pickerOptions" value-format="yyyy-MM-dd HH:MM:SS" type="date" placeholder="选择日期"> </el-date-picker>
<el-date-picker v-model="tagConfig.date" :picker-options="pickerOptions" type="date" placeholder="选择日期"> </el-date-picker>
</div>
<div class="form-item" :class="{ 'margin-60': marginSixty }">
<label for="">分组描述</label>
......@@ -145,6 +139,7 @@ export default {
data() {
return {
sy: '',
margin60: false,
refershList: {},
tagConfig: {
......@@ -680,8 +675,8 @@ export default {
bottom: 0px;
box-shadow: 0 0 5px #bbb;
background-color: #fff;
z-index: 10000;
transition: all 0.3s ease-in-out;
z-index: 1001;
transition: all .3s ease-in;
.group-title {
padding: 10px;
height: 50px;
......@@ -739,7 +734,7 @@ export default {
}
}
.group-transtion-list {
transition: all ease-in 0.3s;
transition: all .3s ease-in;
right: 0px;
}
.groupName-txt {
......@@ -747,11 +742,13 @@ export default {
color: #909399;
top: 2px;
left: -45px;
font-size: 14px;
}
.textarea-txt {
position: relative;
color: #909399;
left: -70px;
font-size: 14px;
}
}
.margin-60 {
......
src/view/platformTag/tag-type.vue
......@@ -98,10 +98,6 @@ export default {
}
}
.second-tag {
<<<<<<< HEAD
padding: 10px 0px 10px 23px;
=======
>>>>>>> origin/dev
margin: 0 1px;
font-size: 14px;
color: #303133;
......
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