Skip to content

M
memberTag-web
Commit 06286517 by xiaohai
Options

Merge branch 'dev' of http://115.159.76.241/memberTag/memberTag-web into dev

parents 11b90f1e 48f112a1
Showing with 48 additions and 34 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.b163c3eb10ba2da12381587f0e187aec.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.d122144bb58e0060164a.js></script><script type=text/javascript src=./static/js/vendor.c0034a7b125cfc06ce44.js></script><script type=text/javascript src=./static/js/app.979563e13012ac23a7d2.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.dc65306555a86d347c5f38961625796c.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.bacd2494d213895ff6a7.js></script><script type=text/javascript src=./static/js/vendor.c0034a7b125cfc06ce44.js></script><script type=text/javascript src=./static/js/app.cd5ea6dd7cc5611d133f.js></script></body></html>
\ No newline at end of file
dist/static/css/app.b163c3eb10ba2da12381587f0e187aec.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.b163c3eb10ba2da12381587f0e187aec.css.map 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.dc65306555a86d347c5f38961625796c.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.dc65306555a86d347c5f38961625796c.css.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/public.css
......@@ -133,7 +133,12 @@ a {
text-decoration: none;
-webkit-backface-visibility: hidden;
}
a.a-href {
color: #606266;
}
a.a-href:hover {
color: #1890ff;
}
li {
list-style: none;
}
......@@ -888,7 +893,7 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
}
.common-libFields {
min-width: 1148px;
min-width: 1104px;
-webkit-flex-wrap: wrap;
-moz-flex-wrap: wrap;
-ms-flex-wrap: wrap;
......@@ -901,7 +906,7 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
.common-libFields .common-lib__cell {
position: relative;
margin-bottom: 30px;
min-width: 542px;
min-width: 522px;
max-width: calc(50% - 15px);
border: 1px solid rgba(220,223,230,1);
border-radius: 3px;
......@@ -977,7 +982,7 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
width: calc(100% - 80px);
max-width: 500px;
vertical-align: top;
font-size: 14px;
font-size: 16px;
max-height: 66px;
overflow: hidden;
}
......@@ -1253,10 +1258,10 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
}
.checkboxOption-wrap__head .realtime-span {
padding: 2px 5px;
padding: 3px 4px;
font-size: 11px;
color: #fff;
border-radius: 13px;
border-radius: 4px;
background: #1890ff;
}
......
dist/static/js/0.6301e59b41e85ae317d5.js → dist/static/js/0.1aa29bf81c0301f61f1f.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.1aa29bf81c0301f61f1f.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.6301e59b41e85ae317d5.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/14.13d60d9a87843e007a16.js → dist/static/js/13.5a5420738b36cc0d6498.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/16.bb9dde1c4d3e905746b7.js → dist/static/js/15.4f45fd738eeeaaf760fd.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/17.87298362479631d442ad.js → dist/static/js/16.2ae1ea35393ef9595e61.js
webpackJsonp([17],{Gy5W:function(t,e,o){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=o("bOdI"),a=o.n(n),i=o("5reh"),s={name:"App",data:function(){var t;return t={projectName:"member-tag",contentHeight:"0px",collapseFlag:!1},a()(t,"collapseFlag",!1),a()(t,"leftModulesName","会员标签"),t},methods:{toRouterView:function(t){console.log(t),this.$router.push({path:t.path})},collapseTag:function(t){console.log(t),this.collapseFlag=t}},mounted:function(){this.$store.commit(i.d,"达摩GIC"),document.title=this.$store.state.title,this.pathName=window.location.hash.split("/")[1],console.log("pathname:",this.pathName,this.$route.path),this.contentHeight=(document.documentElement.clientHeight||document.body.clientHeight)-64+"px"},components:{}},l={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 c=o("VU/8")(s,l,!1,function(t){o("tC7Q")},null,null);e.default=c.exports},tC7Q:function(t,e){}});
//# sourceMappingURL=17.87298362479631d442ad.js.map
\ No newline at end of file
webpackJsonp([16],{Gy5W:function(t,e,o){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=o("bOdI"),a=o.n(n),i=o("5reh"),s={name:"App",data:function(){var t;return t={projectName:"member-tag",contentHeight:"0px",collapseFlag:!1},a()(t,"collapseFlag",!1),a()(t,"leftModulesName","会员标签"),t},methods:{toRouterView:function(t){console.log(t),this.$router.push({path:t.path})},collapseTag:function(t){console.log(t),this.collapseFlag=t}},mounted:function(){this.$store.commit(i.d,"达摩GIC"),document.title=this.$store.state.title,this.pathName=window.location.hash.split("/")[1],console.log("pathname:",this.pathName,this.$route.path),this.contentHeight=(document.documentElement.clientHeight||document.body.clientHeight)-64+"px"},components:{}},l={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 c=o("VU/8")(s,l,!1,function(t){o("tC7Q")},null,null);e.default=c.exports},tC7Q:function(t,e){}});
//# sourceMappingURL=16.2ae1ea35393ef9595e61.js.map
\ No newline at end of file
dist/static/js/18.e9340c7464485bff58d4.js → dist/static/js/17.c8a47b8d501bd5430967.js
webpackJsonp([18],{"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:(a.Message.error(t),!1)}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,"Enter"))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("OWNH")},null,null);e.default=d.exports},OWNH:function(t,e){}});
//# sourceMappingURL=18.e9340c7464485bff58d4.js.map
\ No newline at end of file
webpackJsonp([17],{"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:(a.Message.error(t),!1)}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,"Enter"))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("OWNH")},null,null);e.default=d.exports},OWNH:function(t,e){}});
//# sourceMappingURL=17.c8a47b8d501bd5430967.js.map
\ No newline at end of file
dist/static/js/20.4cb82e73cc38372ce54c.js → dist/static/js/19.b8aae3f01d63924d6f28.js
webpackJsonp([20],{YPWR:function(e,t,o){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var a=o("bOdI"),n=o.n(a),s=o("5reh"),l={name:"App",data:function(){var e;return e={projectName:"member-tag",contentHeight:"0px",collapseFlag:!1},n()(e,"collapseFlag",!1),n()(e,"leftModulesName","会员标签"),e},methods:{toRouterView:function(e){console.log(e),this.$router.push({path:e.path})},collapseTag:function(e){console.log(e),this.collapseFlag=e}},watch:{$route:{handler:function(e,t){console.log("获取当前路由:",e,t),this.$refs.asideMenu.refreshRoute()},deep:!0}},mounted:function(){this.$store.commit(s.d,"达摩GIC"),document.title=this.$store.state.title,this.pathName=window.location.hash.split("/")[1],console.log("pathname:",this.pathName,this.$route.path),this.contentHeight=(document.documentElement.clientHeight||document.body.clientHeight)-64+"px"},components:{}},i={render:function(){var e=this,t=e.$createElement,o=e._self._c||t;return o("div",{attrs:{id:"index"}},[o("vue-gic-header",{attrs:{projectName:e.projectName,collapseFlag:e.collapseFlag},on:{collapseTag:e.collapseTag,toRouterView:e.toRouterView}}),e._v(" "),o("div",{staticClass:"content",attrs:{id:"content"}},[o("div",{staticClass:"content-body",style:{height:e.contentHeight}},[o("div",{staticClass:"left-menu",style:{height:e.contentHeight}},[o("vue-gic-aside-menu",{ref:"asideMenu",attrs:{projectName:e.projectName,leftModulesName:e.leftModulesName,collapseFlag:e.collapseFlag}})],1),e._v(" "),o("transition",{attrs:{name:"fade",mode:"out-in"}},[o("router-view")],1)],1)])],1)},staticRenderFns:[]};var c=o("VU/8")(l,i,!1,function(e){o("fAWH")},null,null);t.default=c.exports},fAWH:function(e,t){}});
//# sourceMappingURL=20.4cb82e73cc38372ce54c.js.map
\ No newline at end of file
webpackJsonp([19],{YPWR:function(e,t,o){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var a=o("bOdI"),n=o.n(a),s=o("5reh"),l={name:"App",data:function(){var e;return e={projectName:"member-tag",contentHeight:"0px",collapseFlag:!1},n()(e,"collapseFlag",!1),n()(e,"leftModulesName","会员标签"),e},methods:{toRouterView:function(e){console.log(e),this.$router.push({path:e.path})},collapseTag:function(e){console.log(e),this.collapseFlag=e}},watch:{$route:{handler:function(e,t){console.log("获取当前路由:",e,t),this.$refs.asideMenu.refreshRoute()},deep:!0}},mounted:function(){this.$store.commit(s.d,"达摩GIC"),document.title=this.$store.state.title,this.pathName=window.location.hash.split("/")[1],console.log("pathname:",this.pathName,this.$route.path),this.contentHeight=(document.documentElement.clientHeight||document.body.clientHeight)-64+"px"},components:{}},i={render:function(){var e=this,t=e.$createElement,o=e._self._c||t;return o("div",{attrs:{id:"index"}},[o("vue-gic-header",{attrs:{projectName:e.projectName,collapseFlag:e.collapseFlag},on:{collapseTag:e.collapseTag,toRouterView:e.toRouterView}}),e._v(" "),o("div",{staticClass:"content",attrs:{id:"content"}},[o("div",{staticClass:"content-body",style:{height:e.contentHeight}},[o("div",{staticClass:"left-menu",style:{height:e.contentHeight}},[o("vue-gic-aside-menu",{ref:"asideMenu",attrs:{projectName:e.projectName,leftModulesName:e.leftModulesName,collapseFlag:e.collapseFlag}})],1),e._v(" "),o("transition",{attrs:{name:"fade",mode:"out-in"}},[o("router-view")],1)],1)])],1)},staticRenderFns:[]};var c=o("VU/8")(l,i,!1,function(e){o("fAWH")},null,null);t.default=c.exports},fAWH:function(e,t){}});
//# sourceMappingURL=19.b8aae3f01d63924d6f28.js.map
\ No newline at end of file
dist/static/js/21.bfdb22fadb3ca9d818cc.js → dist/static/js/20.3d26bb4503e7e9f2e788.js
webpackJsonp([21],{eNXc:function(t,a){},twLH:function(t,a,e){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var n=e("3Xzz"),i=e("BdFv"),r=(e("Mk6G"),e("3E4D"),e("Ch4/"),e("PI0u"),e("P9l9"),{name:"myTagLib",data:function(){return{navpath:[{name:"首页",path:window.origin+"/report/#/memberSummary",relocation:!0},{name:"会员管理",path:""},{name:"会员标签",path:""},{name:"我的标签库",path:""}],tagCategory:"myTagList"}},methods:{toAddMyTagLib:function(){}},mounted:function(){},components:{navCrumb:n.a,tagLib:i.a}}),o={render:function(){var t=this.$createElement,a=this._self._c||t;return a("div",{staticClass:"myTagLib-wrap common-wrap"},[a("nav-crumb",{attrs:{navpath:this.navpath}}),this._v(" "),a("div",{staticClass:"right-content"},[a("div",{staticClass:"right-box"},[a("tag-lib",{attrs:{tagCategory:this.tagCategory}})],1)]),this._v(" "),a("vue-gic-footer")],1)},staticRenderFns:[]};var s=e("VU/8")(r,o,!1,function(t){e("eNXc")},"data-v-4763dd3a",null);a.default=s.exports}});
//# sourceMappingURL=21.bfdb22fadb3ca9d818cc.js.map
\ No newline at end of file
webpackJsonp([20],{eNXc:function(t,a){},twLH:function(t,a,e){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var n=e("3Xzz"),i=e("BdFv"),r=(e("Mk6G"),e("3E4D"),e("Ch4/"),e("PI0u"),e("P9l9"),{name:"myTagLib",data:function(){return{navpath:[{name:"首页",path:window.origin+"/report/#/memberSummary",relocation:!0},{name:"会员管理",path:""},{name:"会员标签",path:""},{name:"我的标签库",path:""}],tagCategory:"myTagList"}},methods:{toAddMyTagLib:function(){}},mounted:function(){},components:{navCrumb:n.a,tagLib:i.a}}),o={render:function(){var t=this.$createElement,a=this._self._c||t;return a("div",{staticClass:"myTagLib-wrap common-wrap"},[a("nav-crumb",{attrs:{navpath:this.navpath}}),this._v(" "),a("div",{staticClass:"right-content"},[a("div",{staticClass:"right-box"},[a("tag-lib",{attrs:{tagCategory:this.tagCategory}})],1)]),this._v(" "),a("vue-gic-footer")],1)},staticRenderFns:[]};var s=e("VU/8")(r,o,!1,function(t){e("eNXc")},"data-v-4763dd3a",null);a.default=s.exports}});
//# sourceMappingURL=20.3d26bb4503e7e9f2e788.js.map
\ No newline at end of file
dist/static/js/22.6fa2e5eec68626176108.js → dist/static/js/21.fce3d8ad3d06890dda32.js
webpackJsonp([22],{"3PJM":function(t,a){},puJc:function(t,a,e){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var n=e("3Xzz"),r=e("BdFv"),i=(e("Mk6G"),e("3E4D"),e("Ch4/"),e("PI0u"),e("P9l9"),{name:"platformTagLib",data:function(){return{navpath:[{name:"首页",path:window.origin+"/report/#/memberSummary",relocation:!0},{name:"会员管理",path:""},{name:"会员标签",path:""},{name:"平台标签库",path:""}],tagCategory:"platformTagList"}},methods:{},mounted:function(){},components:{navCrumb:n.a,tagLib:r.a}}),o={render:function(){var t=this.$createElement,a=this._self._c||t;return a("div",{staticClass:"platformTagLib-wrap common-wrap"},[a("nav-crumb",{attrs:{navpath:this.navpath}}),this._v(" "),a("div",{staticClass:"right-content"},[a("div",{staticClass:"right-box"},[a("tag-lib",{attrs:{tagCategory:this.tagCategory}})],1)]),this._v(" "),a("vue-gic-footer")],1)},staticRenderFns:[]};var s=e("VU/8")(i,o,!1,function(t){e("3PJM")},"data-v-2cbababa",null);a.default=s.exports}});
//# sourceMappingURL=22.6fa2e5eec68626176108.js.map
\ No newline at end of file
webpackJsonp([21],{"3PJM":function(t,a){},puJc:function(t,a,e){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var n=e("3Xzz"),r=e("BdFv"),i=(e("Mk6G"),e("3E4D"),e("Ch4/"),e("PI0u"),e("P9l9"),{name:"platformTagLib",data:function(){return{navpath:[{name:"首页",path:window.origin+"/report/#/memberSummary",relocation:!0},{name:"会员管理",path:""},{name:"会员标签",path:""},{name:"平台标签库",path:""}],tagCategory:"platformTagList"}},methods:{},mounted:function(){},components:{navCrumb:n.a,tagLib:r.a}}),o={render:function(){var t=this.$createElement,a=this._self._c||t;return a("div",{staticClass:"platformTagLib-wrap common-wrap"},[a("nav-crumb",{attrs:{navpath:this.navpath}}),this._v(" "),a("div",{staticClass:"right-content"},[a("div",{staticClass:"right-box"},[a("tag-lib",{attrs:{tagCategory:this.tagCategory}})],1)]),this._v(" "),a("vue-gic-footer")],1)},staticRenderFns:[]};var s=e("VU/8")(i,o,!1,function(t){e("3PJM")},"data-v-2cbababa",null);a.default=s.exports}});
//# sourceMappingURL=21.fce3d8ad3d06890dda32.js.map
\ No newline at end of file
dist/static/js/5.458296a289cd4a59d02e.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/5.458296a289cd4a59d02e.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/5.880974fccb85a82cdbbe.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/5.880974fccb85a82cdbbe.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/6.e5922da652f223fade70.js → dist/static/js/6.7876ecf2594c8e353954.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/6.7876ecf2594c8e353954.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/6.e5922da652f223fade70.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/7.571d8139a39270a9c596.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/7.571d8139a39270a9c596.js → dist/static/js/7.999b1113ef4d68de6f86.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/7.999b1113ef4d68de6f86.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.bacd2494d213895ff6a7.js 0 → 100644
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,f,o){for(var c,d,b,i=0,u=[];i<r.length;i++)d=r[i],t[d]&&u.push(t[d][0]),t[d]=0;for(c in f)Object.prototype.hasOwnProperty.call(f,c)&&(e[c]=f[c]);for(n&&n(r,f,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)b=a(a.s=o[i]);return b};var r={},t={28:0};function a(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,a){n=t[e]=[r,a]});n[2]=r;var f=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,a.nc&&o.setAttribute("nonce",a.nc),o.src=a.p+"static/js/"+e+"."+{0:"1aa29bf81c0301f61f1f",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"458296a289cd4a59d02e",6:"7876ecf2594c8e353954",7:"999b1113ef4d68de6f86",8:"1ef35a1fcfb90d865a58",9:"bd6886217341a2ac6364",10:"bda2f0473989f24cfd79",11:"2ab073fed444f24b5b49",12:"876f50725c342b2d03e1",13:"5a5420738b36cc0d6498",14:"e3674474da8a18925ba8",15:"4f45fd738eeeaaf760fd",16:"2ae1ea35393ef9595e61",17:"c8a47b8d501bd5430967",18:"7a971724ceedf92fdfcc",19:"b8aae3f01d63924d6f28",20:"3d26bb4503e7e9f2e788",21:"fce3d8ad3d06890dda32",22:"2c241e3328773abdab05",23:"8d9024391ef085f99b5a",24:"d8ebf9b105c3079a42bd",27:"02b5e0be03d9340bd130"}[e]+".js";var c=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(c);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=d,f.appendChild(o),r},a.m=e,a.c=r,a.d=function(e,n,r){a.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},a.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(n,"a",n),n},a.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},a.p="./",a.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.bacd2494d213895ff6a7.js.map
\ No newline at end of file
dist/static/js/manifest.d122144bb58e0060164a.js deleted 100644 → 0
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,a){for(var d,f,b,i=0,u=[];i<r.length;i++)f=r[i],t[f]&&u.push(t[f][0]),t[f]=0;for(d in o)Object.prototype.hasOwnProperty.call(o,d)&&(e[d]=o[d]);for(n&&n(r,o,a);u.length;)u.shift()();if(a)for(i=0;i<a.length;i++)b=c(c.s=a[i]);return b};var r={},t={28:0};function c(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,c),t.l=!0,t.exports}c.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,c){n=t[e]=[r,c]});n[2]=r;var o=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,c.nc&&a.setAttribute("nonce",c.nc),a.src=c.p+"static/js/"+e+"."+{0:"6301e59b41e85ae317d5",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"880974fccb85a82cdbbe",6:"e5922da652f223fade70",7:"571d8139a39270a9c596",8:"32a9313e421e70390499",9:"bd6886217341a2ac6364",10:"bda2f0473989f24cfd79",11:"2ab073fed444f24b5b49",12:"876f50725c342b2d03e1",13:"8bab3da8e93e308a0dc3",14:"13d60d9a87843e007a16",15:"03c99387e2d84322c63f",16:"bb9dde1c4d3e905746b7",17:"87298362479631d442ad",18:"e9340c7464485bff58d4",19:"925085fbbf74dc7c1514",20:"4cb82e73cc38372ce54c",21:"bfdb22fadb3ca9d818cc",22:"6fa2e5eec68626176108",23:"8d9024391ef085f99b5a",24:"d8ebf9b105c3079a42bd",27:"02b5e0be03d9340bd130"}[e]+".js";var d=setTimeout(f,12e4);function f(){a.onerror=a.onload=null,clearTimeout(d);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=f,o.appendChild(a),r},c.m=e,c.c=r,c.d=function(e,n,r){c.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},c.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(n,"a",n),n},c.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},c.p="./",c.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.d122144bb58e0060164a.js.map
\ No newline at end of file
src/api/api.js
......@@ -30,15 +30,15 @@ Vue.axios.interceptors.response.use(data=> {
}, err=> {
// console.log("response err:",err);
Message.error({message: err.response.message});
// Message.error({message: err.response.message});
if (err.response.status == 504||err.response.status == 404) {
// window.location.href= local + "/gic-web/#/"
Message.error({message: '服务异常⊙﹏⊙∥'});
} else if (err.response.status == 403) {
// window.location.href= local + "/gic-web/#/"
window.location.href= local + "/gic-web/#/"
// Message.error({message: '权限不足,请联系管理员!'});
}else {
// window.location.href= local + "/gic-web/#/"
window.location.href= local + "/gic-web/#/"
// Message.error({message: '未知错误!'});
}
return Promise.resolve(err);
......
src/components/uploadExcel/index.vue
......@@ -5,8 +5,15 @@
<el-button
style="margin-left:16px;"
size="mini" type="text"
@click.stop="handleUpload"
:disabled="(tagItemStatus==2 ||tagItemStatus==4 ||tagItemStatus ==5 ||tagItemStatus==6) ? true: false">
<span class="p-r-8" @click="handleUpload">点击导入会员</span><span class="p-l-8 border-l-dcdfe6 color-e55858" v-if="tagItemStatus == 8" @click.stop="handleDownload">上传完成,下载失败会员清单</span>
<span class=" inline-block">点击导入会员</span><!-- p-r-8 -->
</el-button>
<el-button
size="mini" type="text"
@click.stop="handleDownload"
v-if="tagItemStatus == 8">
<span class="p-l-8 border-l-dcdfe6 color-e55858" >上传完成,下载失败会员清单</span>
</el-button>
<div class="excel-upload__tip">只能上传一个excle文件（2003版本以上），且数据不超过5000条</div>
</div>
......@@ -88,6 +95,7 @@ export default {
},
handleUpload() {
var that = this
console.log(11111)
console.log(that.excelBodyData);
// if (!!that.excelHeader&&!!that.excelHeader.length) {
if (that.excelBodyData.length > 0) {
......
src/view/memberGroup/memberGroupDetail.vue
......@@ -296,7 +296,7 @@
},
computed: {
// 面包屑参数
navpath() {
navpath() {
console.log(window.origin, "origin");
return [
{
......@@ -585,6 +585,7 @@
// 获取自定义字段
this.getFieldsList();
// this.getGroupDetail();
document.getElementById("app").style.zIndex = 'auto';
},
components: {
navCrumb,
......
static/css/public.css
......@@ -893,7 +893,7 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
}
.common-libFields {
min-width: 1148px;
min-width: 1104px;
-webkit-flex-wrap: wrap;
-moz-flex-wrap: wrap;
-ms-flex-wrap: wrap;
......@@ -906,7 +906,7 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
.common-libFields .common-lib__cell {
position: relative;
margin-bottom: 30px;
min-width: 542px;
min-width: 522px;
max-width: calc(50% - 15px);
border: 1px solid rgba(220,223,230,1);
border-radius: 3px;
......@@ -982,7 +982,7 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
width: calc(100% - 80px);
max-width: 500px;
vertical-align: top;
font-size: 14px;
font-size: 16px;
max-height: 66px;
overflow: hidden;
}
......
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