Skip to content

M
memberTag-web
Commit f88db9db by liuchenxi
Options

Merge branch 'feature/9月迭代' into dev 

# Conflicts:
#	dist/index.html
#	dist/static/css/app.2325dcd81bcfdfcbda30feabdb3dd164.css
#	dist/static/css/app.8528882092fd4fc1e70ec06a2be32fb8.css
#	dist/static/css/app.b8cad233d7dc34a45ad7233c2a47de21.css
#	dist/static/js/0.4dbf1fde366ebd606f1f.js
#	dist/static/js/0.83832a2834268ae2c713.js
#	dist/static/js/0.c358a39d1f4d610dc637.js
#	dist/static/js/manifest.8c41e454ab33bba1d3cd.js
parents 54094349 0bf2564c
Showing with 9 additions and 11 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.b8cad233d7dc34a45ad7233c2a47de21.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.12/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/index2.15.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.58.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.71.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.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/selector.1.2.27.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.8c41e454ab33bba1d3cd.js></script><script type=text/javascript src=./static/js/vendor.03b7a8aa9dada2af2203.js></script><script type=text/javascript src=./static/js/app.023836e6aca64823b641.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.b8cad233d7dc34a45ad7233c2a47de21.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.12/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/index2.15.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.58.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.71.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.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/selector.1.2.27.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.91e42dd15f9345bc14dd.js></script><script type=text/javascript src=./static/js/vendor.03b7a8aa9dada2af2203.js></script><script type=text/javascript src=./static/js/app.afd1c5e172a36b80256c.js></script></body></html>
\ No newline at end of file
dist/static/js/26.ddd8e067e8889fe496fa.js deleted 100644 → 0
webpackJsonp([26],{"G+6N":function(t,e){},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:{}},s={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 a=n("VU/8")(i,s,!1,function(t){n("G+6N")},null,null);e.default=a.exports}});
\ No newline at end of file
dist/static/js/27.b07da083851642c5176e.js 0 → 100644
webpackJsonp([27],{Gy5W:function(t,e,i){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=i("5reh"),o={name:"App",data:function(){return{projectName:"member-tag",contentHeight:"0px",collapseFlag:!1,leftModulesName:"会员标签"}},methods:{toRouterView:function(t){this.$router.push({path:t.path})},collapseTag:function(t){this.collapseFlag=t}},mounted:function(){this.$store.commit(n.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:{}},s={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("keep-alive",{attrs:{include:"memberGroupList"}},[e("router-view")],1)],1)],1)])],1)},staticRenderFns:[]};var a=i("VU/8")(o,s,!1,function(t){i("jcgr")},null,null);e.default=a.exports},jcgr:function(t,e){}});
\ No newline at end of file
dist/static/js/6.7de41ae87746990eadec.js → dist/static/js/6.bc5604b40c3f1963e4fd.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.8c41e454ab33bba1d3cd.js deleted 100644 → 0
!function(e){var f=window.webpackJsonp;window.webpackJsonp=function(a,r,d){for(var t,o,b,i=0,u=[];i<a.length;i++)o=a[i],c[o]&&u.push(c[o][0]),c[o]=0;for(t in r)Object.prototype.hasOwnProperty.call(r,t)&&(e[t]=r[t]);for(f&&f(a,r,d);u.length;)u.shift()();if(d)for(i=0;i<d.length;i++)b=n(n.s=d[i]);return b};var a={},c={35:0};function n(f){if(a[f])return a[f].exports;var c=a[f]={i:f,l:!1,exports:{}};return e[f].call(c.exports,c,c.exports,n),c.l=!0,c.exports}n.e=function(e){var f=c[e];if(0===f)return new Promise(function(e){e()});if(f)return f[2];var a=new Promise(function(a,n){f=c[e]=[a,n]});f[2]=a;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:"4dbf1fde366ebd606f1f",1:"61b1089acf1f67b03444",2:"60e12581762a5910e7ea",3:"259d8b08ae9b441809a9",4:"b272a95f5cc10e42ac6d",5:"cfa5c8af6de7d905697f",6:"7de41ae87746990eadec",7:"d2a599798964222ed70d",8:"b48538d553fda9dc47b5",9:"b459e06efee677b57562",10:"68c1375083d175dae9db",11:"cfa61640d1a3d8d26b48",12:"d351f58d3c390dbb3c5e",13:"49af49043def44dde4ea",14:"b5f145ec162622561efe",15:"f9ff1797d277205f2f12",16:"4a4cf12d77568d3424ff",17:"6f87525425a68e911f05",18:"6fd5220acc3536c9de18",19:"6d52c41adcfa61b2fcf8",20:"aeeece61257e2189c63d",21:"eaa0710ea0619e834fb3",22:"74494cecaae4fc137310",23:"df5cdef2dd6b94b4c623",24:"b75a5f0dded217826ac2",25:"4725734d6fc44e353b51",26:"ddd8e067e8889fe496fa",27:"f7d2baeb938e2eb2690f",28:"108ee657aa229c1dff48",29:"742b3c6ca0b4fdfc0f41",30:"e16f1f90ec46c4f9fa2d",31:"4591a6b917a443e5d890",32:"de40c410678368bcbe0d"}[e]+".js";var t=setTimeout(o,12e4);function o(){d.onerror=d.onload=null,clearTimeout(t);var f=c[e];0!==f&&(f&&f[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return d.onerror=d.onload=o,r.appendChild(d),a},n.m=e,n.c=a,n.d=function(e,f,a){n.o(e,f)||Object.defineProperty(e,f,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var f=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(f,"a",f),f},n.o=function(e,f){return Object.prototype.hasOwnProperty.call(e,f)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/manifest.91e42dd15f9345bc14dd.js 0 → 100644
!function(e){var f=window.webpackJsonp;window.webpackJsonp=function(c,r,d){for(var t,o,b,i=0,u=[];i<c.length;i++)o=c[i],a[o]&&u.push(a[o][0]),a[o]=0;for(t in r)Object.prototype.hasOwnProperty.call(r,t)&&(e[t]=r[t]);for(f&&f(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={},a={35:0};function n(f){if(c[f])return c[f].exports;var a=c[f]={i:f,l:!1,exports:{}};return e[f].call(a.exports,a,a.exports,n),a.l=!0,a.exports}n.e=function(e){var f=a[e];if(0===f)return new Promise(function(e){e()});if(f)return f[2];var c=new Promise(function(c,n){f=a[e]=[c,n]});f[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:"4dbf1fde366ebd606f1f",1:"61b1089acf1f67b03444",2:"e6eb96748f9f85fd388c",3:"259d8b08ae9b441809a9",4:"b272a95f5cc10e42ac6d",5:"cfa5c8af6de7d905697f",6:"bc5604b40c3f1963e4fd",7:"d2a599798964222ed70d",8:"b48538d553fda9dc47b5",9:"b459e06efee677b57562",10:"68c1375083d175dae9db",11:"cfa61640d1a3d8d26b48",12:"d351f58d3c390dbb3c5e",13:"49af49043def44dde4ea",14:"b5f145ec162622561efe",15:"f9ff1797d277205f2f12",16:"4a4cf12d77568d3424ff",17:"6f87525425a68e911f05",18:"6fd5220acc3536c9de18",19:"6d52c41adcfa61b2fcf8",20:"aeeece61257e2189c63d",21:"eaa0710ea0619e834fb3",22:"74494cecaae4fc137310",23:"df5cdef2dd6b94b4c623",24:"b75a5f0dded217826ac2",25:"4725734d6fc44e353b51",26:"590d67a756ce855df174",27:"b07da083851642c5176e",28:"108ee657aa229c1dff48",29:"742b3c6ca0b4fdfc0f41",30:"e16f1f90ec46c4f9fa2d",31:"4591a6b917a443e5d890",32:"de40c410678368bcbe0d"}[e]+".js";var t=setTimeout(o,12e4);function o(){d.onerror=d.onload=null,clearTimeout(t);var f=a[e];0!==f&&(f&&f[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return d.onerror=d.onload=o,r.appendChild(d),c},n.m=e,n.c=c,n.d=function(e,f,c){n.o(e,f)||Object.defineProperty(e,f,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var f=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(f,"a",f),f},n.o=function(e,f){return Object.prototype.hasOwnProperty.call(e,f)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/view/memberGroup/index.vue
......@@ -8,9 +8,9 @@
</div> -->
<transition name="fade" mode="out-in">
<!-- 缓存已经填好内容的页面 -->
<!-- <keep-alive include="editGroupGrade"> -->
<keep-alive include="memberGroupList">
<router-view></router-view>
<!-- </keep-alive > -->
</keep-alive >
</transition>
</div>
</div>
......
src/view/memberGroup/memberGroupList.vue
......@@ -1384,7 +1384,7 @@ export default {
}).finally(() => this.reqLock = false);
}
},
created() {
activated() {
this.loading = true;
this.params = {
groupName: this.tagSearch,
......@@ -1396,8 +1396,6 @@ export default {
memberTagGroupClassifyId: '',
fixedType: 0
};
},
mounted() {
this.getGroupList();
this._groupCount();
},
......
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