fix: 修改会员分组

3d8c4c25 · 无尘 · 9a7cd6ab · 3d8c4c25 · 3d8c4c25 · 9a7cd6ab
Commit 3d8c4c25 authored Sep 06, 2019 by 无尘
10 changed files
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link href=./static/css/app.7f025a684d12e4246a555c261ed0f3c9.css rel=stylesheet></head><body style="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/components/img-preview.2.0.00.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.9694efd06783188973e1.js></script><script type=text/javascript src=./static/js/vendor.fe563ee1a7b37e2ffba9.js></script><script type=text/javascript src=./static/js/app.bea79e4d35b85719c4de.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link href=./static/css/app.7f025a684d12e4246a555c261ed0f3c9.css rel=stylesheet></head><body style="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/components/img-preview.2.0.00.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.7850d448785c5df3a576.js></script><script type=text/javascript src=./static/js/vendor.334b7ab8931aff0857ff.js></script><script type=text/javascript src=./static/js/app.61672353028ad899554b.js></script></body></html>
\ No newline at end of file
--- a/dist/static/js/0.177230e5cc63769144b2.js
+++ b/dist/static/js/0.177230e5cc63769144b2.js
--- a/dist/static/js/0.52553b96345dd3750f43.js
+++ b/dist/static/js/0.52553b96345dd3750f43.js
--- a/dist/static/js/app.61672353028ad899554b.js
+++ b/dist/static/js/app.61672353028ad899554b.js
--- a/dist/static/js/app.bea79e4d35b85719c4de.js
+++ b/dist/static/js/app.bea79e4d35b85719c4de.js
--- a/dist/static/js/manifest.9694efd06783188973e1.js
+++ b/dist/static/js/manifest.9694efd06783188973e1.js
-!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(c&&c(a,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var a={},f={82:0};function d(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,d){c=f[e]=[a,d]});c[2]=a;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+e+"."+{0:"52553b96345dd3750f43",1:"0ebe3ead93207dc78a78",2:"d3c62c00c91d9891f916",3:"a43577b9e52a5719a124",4:"18929084ede2c2225e24",5:"baa22d481d8bbd83425c",6:"a833ce8868ce70c6219e",7:"8f462a353a2ce9c0c116",8:"4210ed7b336c1bcfc531",9:"860dbe8cf83334f9e3c0",10:"a2aa031ae677b8acbf17",11:"e34a64dea1b7a059dcfd",12:"bdcf26a1bcccf7e0239b",13:"6c87f5cefdf77374932d",14:"8a2d85b6cc3b95b868d9",15:"92854409541cf66d1361",16:"c4ebe5ae46670e5c0754",17:"43a28ed857836d70649f",18:"ca2eb072a4ce38f9e487",19:"7971a9a5d92fefa82083",20:"75e0997b94e5d6294ec8",21:"58c0c6a374fc0ec6158e",22:"047f5bba500bca0d62fe",23:"9efbbc6dd315a676ce09",24:"4637a4566383d6e864cf",25:"a579fe9e82eab9ece806",26:"8f0bb144b5e757399727",27:"b5f0e5bd5920771b58af",28:"140ad99228544036c969",29:"36261093da9264fa5f33",30:"0d4999d53befa8fd9eaa",31:"8baa6bca929d1c9a38f6",32:"836f4d0e323c721473e9",33:"7b62b2ff369669fe322c",34:"f9d53c31059aaff9b360",35:"c75699cc6fe47597f200",36:"031f3a5aae4656aba067",37:"8016d3ac07df8acaf73d",38:"23b83bd7920693bc35c6",39:"d17e2c61f3cc8d6972fa",40:"56797b378549955e7f19",41:"78d64ae1581e8ea232cc",42:"61ae052e4f4fc3284000",43:"9d05f4d2f06b9c6bba0e",44:"96d0b6e88fc87f60bac7",45:"0fe24e1d16072c526787",46:"d3a9c6eba924ac8207b3",47:"c8b46666a5089512baa4",48:"854c6c054adb5cba1f06",49:"33530ea069fc872b0d5f",50:"331006123edd2049b7d9",51:"244dc6f576a64b7c174b",52:"43d3ca00e0c9087e4956",53:"9dce74b07cc47cdf56db",54:"1503b643475934e2b5e1",55:"c423570fcbf037d349d9",56:"94bbfa32e0086c5f0bbc",57:"a5308ec502fd9436e4d8",58:"78fea9e14de750887bf1",59:"e232c753f68c56d9e59c",60:"2a9bebb0261ef9a7a939",61:"8833a156f1e38036fb28",62:"44d1241f8d57451d0c10",63:"25cb3ac91e9616a47dde",64:"ebc341a9017c4b2c1112",65:"afcb60484e7a9ec39f28",66:"0c2656f4decfecb59972",67:"d7e3675c4b4931db738d",68:"13404d9aa7a460952885",69:"ff1445c96fd757245229",70:"3720d31e136a7f99a873",71:"458af30d30795059cdbe",72:"cba3aa56f0a846445e33",73:"dc84bab89c2090b47673",74:"a9dae9c87c825ba65aa1",75:"29e0d3d537fd9fa5eabc",76:"e24f155e1168c927ee44",77:"9f7ea81c191a5e1bbaa2",78:"51dbc832d510b2a1c0a3",81:"be325ddaae712f760e1a"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),a},d.m=e,d.c=a,d.d=function(e,c,a){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},d.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(c,"a",c),c},d.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(c&&c(a,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var a={},f={82:0};function d(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,d){c=f[e]=[a,d]});c[2]=a;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+e+"."+{0:"177230e5cc63769144b2",1:"0ebe3ead93207dc78a78",2:"d3c62c00c91d9891f916",3:"a43577b9e52a5719a124",4:"18929084ede2c2225e24",5:"baa22d481d8bbd83425c",6:"a833ce8868ce70c6219e",7:"8f462a353a2ce9c0c116",8:"4210ed7b336c1bcfc531",9:"860dbe8cf83334f9e3c0",10:"a2aa031ae677b8acbf17",11:"e34a64dea1b7a059dcfd",12:"bdcf26a1bcccf7e0239b",13:"6c87f5cefdf77374932d",14:"8a2d85b6cc3b95b868d9",15:"92854409541cf66d1361",16:"c4ebe5ae46670e5c0754",17:"43a28ed857836d70649f",18:"ca2eb072a4ce38f9e487",19:"7971a9a5d92fefa82083",20:"75e0997b94e5d6294ec8",21:"58c0c6a374fc0ec6158e",22:"047f5bba500bca0d62fe",23:"9efbbc6dd315a676ce09",24:"4637a4566383d6e864cf",25:"a579fe9e82eab9ece806",26:"8f0bb144b5e757399727",27:"b5f0e5bd5920771b58af",28:"140ad99228544036c969",29:"36261093da9264fa5f33",30:"0d4999d53befa8fd9eaa",31:"8baa6bca929d1c9a38f6",32:"836f4d0e323c721473e9",33:"7b62b2ff369669fe322c",34:"f9d53c31059aaff9b360",35:"c75699cc6fe47597f200",36:"031f3a5aae4656aba067",37:"8016d3ac07df8acaf73d",38:"23b83bd7920693bc35c6",39:"d17e2c61f3cc8d6972fa",40:"56797b378549955e7f19",41:"78d64ae1581e8ea232cc",42:"61ae052e4f4fc3284000",43:"9d05f4d2f06b9c6bba0e",44:"96d0b6e88fc87f60bac7",45:"0fe24e1d16072c526787",46:"d3a9c6eba924ac8207b3",47:"c8b46666a5089512baa4",48:"854c6c054adb5cba1f06",49:"33530ea069fc872b0d5f",50:"331006123edd2049b7d9",51:"244dc6f576a64b7c174b",52:"43d3ca00e0c9087e4956",53:"9dce74b07cc47cdf56db",54:"1503b643475934e2b5e1",55:"c423570fcbf037d349d9",56:"94bbfa32e0086c5f0bbc",57:"a5308ec502fd9436e4d8",58:"78fea9e14de750887bf1",59:"e232c753f68c56d9e59c",60:"2a9bebb0261ef9a7a939",61:"8833a156f1e38036fb28",62:"44d1241f8d57451d0c10",63:"25cb3ac91e9616a47dde",64:"ebc341a9017c4b2c1112",65:"afcb60484e7a9ec39f28",66:"0c2656f4decfecb59972",67:"d7e3675c4b4931db738d",68:"13404d9aa7a460952885",69:"ff1445c96fd757245229",70:"3720d31e136a7f99a873",71:"458af30d30795059cdbe",72:"cba3aa56f0a846445e33",73:"dc84bab89c2090b47673",74:"a9dae9c87c825ba65aa1",75:"29e0d3d537fd9fa5eabc",76:"e24f155e1168c927ee44",77:"9f7ea81c191a5e1bbaa2",78:"51dbc832d510b2a1c0a3",81:"be325ddaae712f760e1a"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),a},d.m=e,d.c=a,d.d=function(e,c,a){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},d.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(c,"a",c),c},d.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/dist/static/js/vendor.334b7ab8931aff0857ff.js
+++ b/dist/static/js/vendor.334b7ab8931aff0857ff.js
--- a/dist/static/js/vendor.fe563ee1a7b37e2ffba9.js
+++ b/dist/static/js/vendor.fe563ee1a7b37e2ffba9.js
--- a/src/filters/index.js
+++ b/src/filters/index.js
+/* 全局过滤器 */
+const dateFormat = function(timeSpan, format) {
+  if (!timeSpan) return;
+  timeSpan = timeSpan.toString().length === 10 ? timeSpan * 1000 : timeSpan;
+  let date = new Date(timeSpan);
+  let o = {
+    'M+': date.getMonth() + 1,
+    'D+': date.getDate(),
+    W: '日一二三四五六'.charAt(date.getDay()),
+    'h+': date.getHours(),
+    'm+': date.getMinutes(),
+    's+': date.getSeconds(),
+    'q+': Math.floor((date.getMonth() + 3) / 3),
+    S: date.getMilliseconds()
+  };
+  if (/(Y+)/.test(format)) {
+    format = format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+  }
+  for (let k in o) {
+    if (new RegExp('(' + k + ')').test(format)) {
+      format = format.replace(RegExp.$1, RegExp.$1.length === 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length));
+    }
+  }
+  return format;
+};
+/**
+ * 时间戳---> 年-月-日 时:分:秒
+ * @param timestamp
+ */
+const formatTimeStamp = function(data) {
+  if (!data) {
+    return;
+  }
+  let date = new Date(data);
+  let month = date.getMonth() + 1;
+  let day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
+  let newMonth = month < 10 ? '0' + month : month;
+  let hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours();
+  let minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes();
+  let seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds();
+  return `${date.getFullYear()}-${newMonth}-${day} ${hours}:${minutes}:${seconds}`;
+};
+/**
+ * 时间戳---> 年-月-日
+ * @param timestamp
+ */
+const timeStampToYmd = function(data) {
+  if (!data) {
+    return;
+  }
+  let date = new Date(data);
+  let month = date.getMonth() + 1;
+  let day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
+  let newMonth = month < 10 ? '0' + month : month;
+  return `${date.getFullYear()}-${newMonth}-${day}`;
+};
+/**
+ * 时间戳---> 时:分:秒
+ * @param timestamp
+ */
+const timeStampToHms = function(data) {
+  if (!data) {
+    return;
+  }
+  let date = new Date(data);
+  let hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours();
+  let minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes();
+  let seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds();
+  return `${hours}:${minutes}:${seconds}`;
+};
+export default {
+  dateFormat,
+  formatTimeStamp,
+  timeStampToYmd,
+  timeStampToHms
+};
--- a/src/main.js
+++ b/src/main.js
@@ -14,6 +14,7 @@ import '../static/css/index.less';
 // import 'element-ui/lib/theme-chalk/index.css'
 import '../static/font/iconfont.css';
 import '../theme/index.css';
+import filters from './filters/index.js';
 import vueOfficeHeader from '@gic-test/vue-office-header';
 import vueOfficeAside from '@gic-test/vue-office-aside';
@@ -36,7 +37,11 @@ Vue.config.productionTip = false;
 Vue.use(ElementUI, { size: 'large' });
 Vue.use(VueAxios, axios);
-Vue.axios.defaults.withCredentials = true; // 跨域cookie访问
+Vue.axios.defaults.withCredentials = true; // cookie访问
+// 全局注册过滤器
+Object.keys(filters).forEach(key => {
+  Vue.filter(key, filters[key]);
+});
 /*
 * 路由守护