From bee36e12605424293348783fe24387da5225763e Mon Sep 17 00:00:00 2001 From: lin-xin <2981207131@qq.com> Date: Sun, 23 Jun 2019 15:38:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E4=B8=8D=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- favicon.ico | Bin 914 -> 0 bytes package.json | 2 +- public/vuetable.json | 53 ------------------------------ src/api/index.js | 9 +++++ src/assets/vuetable.json | 43 ------------------------ src/components/common/Sidebar.vue | 6 ++++ src/components/page/BaseTable.vue | 14 +++----- src/components/page/Donate.vue | 26 +++++++++++++++ src/components/page/Upload.vue | 2 +- src/router/index.js | 5 +++ src/utils/request.js | 27 +++++++++++++++ vue.config.js | 19 +++++------ 12 files changed, 88 insertions(+), 118 deletions(-) delete mode 100644 favicon.ico delete mode 100644 public/vuetable.json create mode 100644 src/api/index.js delete mode 100644 src/assets/vuetable.json create mode 100644 src/components/page/Donate.vue create mode 100644 src/utils/request.js diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 3b45b1d9e790650af872aaba0d97f4e0b770baf1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 914 zcmV;D18w{O0096205C8B0096X0DJ=g02TlM0EtjeM-2)Z3IG5A4M|8uQUCw|FaQ7m zFbDhsJ!}8(F*jvJnL`Ph>!FqN{|AHw<|3FtR+K4#H)6^F zppTX)5Z@y1$(ie?7(rrj4+3qBAhGx_39Ojwk4r#D9|}GGQuHwhwE(C6MGmk)Q6oab zXv$ol6+W|~tN>I15}hCq0JdFId#xHu;BE&vE6NpsS7-P|e{X#Eg}Tr^bAWH{7o9vO zAtsO{;>JmZTJn9?A3CPvrL2lXd_Er6Y8 zy&Hra;+O+`0v&pDSb}y<-9rg)La8C>B_pyxR+I_&5IRMGOKOvA>iulu-ryj0q1Xh* zxscDQYwP!s$^%jYoc5O{P+7kZ)B;OcfI4s#i5tb}Y;4AlT~m{}MM_{!1}3dw=NEl& zO*S5&A`%IffYtx{z_pNEIL!4v34pydzR^*Mgv0`K%Lncp80GA(y$)SdA34DQ8G)Ga z8FD?(igJ%j%ZY5JU5?Gn6co& zEiWhnoL^G)Q3WNuSwoVb*18_Lg3i)oiQ!&<^1Y$SigFF$7qjUW*RHgJ(zq>%5q<#h z4mz^6P|tvRy;fxjzw4U%raGlc2}y$D4(Cw|G+6&D|8(S-et9zX$}YSX0D!D0KR~+* z1@m;lMhazx5Rh4#JH%u==Rphgcw|arec+mGiNO)rAuL&KpoFLH*+S-?Ed=!u=|aHR zDZOGkmJd+%&=F32W{^VVhpEunLWN6_rC0(6nur}*hpwsHiTA`INO2vN+R$=ZOyE&5 oClfyez6g9az6g9a{&@m_0528$l@e~SoB#j-07*qoM6N<$f>yVR4FCWD diff --git a/package.json b/package.json index 4812d42..895b961 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "dependencies": { "axios": "^0.18.0", "babel-polyfill": "^6.26.0", - "element-ui": "^2.8.2", + "element-ui": "^2.9.2", "mavon-editor": "^2.6.17", "vue": "^2.6.10", "vue-cropperjs": "^3.0.0", diff --git a/public/vuetable.json b/public/vuetable.json deleted file mode 100644 index 4282853..0000000 --- a/public/vuetable.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "list": [{ - "id": 1, - "date": "2013-05-04", - "name": "邱秀兰", - "address": "浙江省 金华市 兰溪市" - }, { - "id": 2, - "date": "1991-05-02", - "name": "蒋军", - "address": "广东省 东莞市 长安镇" - }, { - "id": 3, - "date": "2009-12-01", - "name": "廖艳", - "address": "陕西省 渭南市 富平县" - }, { - "id": 4, - "date": "1999-07-15", - "name": "秦强", - "address": "内蒙古自治区 巴彦淖尔市 磴口县" - }, { - "id": 5, - "date": "1997-02-09", - "name": "唐洋", - "address": "湖南省 长沙市 " - }, { - "id": 6, - "date": "2018-05-23", - "name": "易勇", - "address": "重庆 重庆市 双桥区" - }, { - "id": 7, - "date": "2014-04-09", - "name": "袁丽", - "address": "陕西省 铜川市 耀州区" - }, { - "id": 8, - "date": "2013-08-05", - "name": "常刚", - "address": "海外 海外 -" - }, { - "id": 9, - "date": "1995-12-13", - "name": "龚勇", - "address": "黑龙江省 牡丹江市 西安区" - }, { - "id": 10, - "date": "2017-06-06", - "name": "魏强", - "address": "安徽省 六安市 裕安区" - }] -} \ No newline at end of file diff --git a/src/api/index.js b/src/api/index.js new file mode 100644 index 0000000..77cdf6a --- /dev/null +++ b/src/api/index.js @@ -0,0 +1,9 @@ +import request from '../utils/request'; + +export const fetchData = (query) => { + return request({ + url: '/ms/table/list', + method: 'post', + data: query + }) +} \ No newline at end of file diff --git a/src/assets/vuetable.json b/src/assets/vuetable.json deleted file mode 100644 index ab347a4..0000000 --- a/src/assets/vuetable.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "list": [{ - "date": "1997-11-11", - "name": "林丽", - "address": "吉林省 辽源市 龙山区" - }, { - "date": "1987-09-24", - "name": "文敏", - "address": "江西省 萍乡市 芦溪县" - }, { - "date": "1996-08-08", - "name": "杨秀兰", - "address": "黑龙江省 黑河市 五大连池市" - }, { - "date": "1978-06-18", - "name": "魏强", - "address": "广东省 韶关市 始兴县" - }, { - "date": "1977-07-09", - "name": "石秀兰", - "address": "江苏省 宿迁市 宿豫区" - }, { - "date": "1994-09-20", - "name": "朱洋", - "address": "海外 海外 -" - }, { - "date": "1980-01-22", - "name": "傅敏", - "address": "海外 海外 -" - }, { - "date": "1985-10-10", - "name": "毛明", - "address": "内蒙古自治区 包头市 九原区" - }, { - "date": "1975-09-08", - "name": "何静", - "address": "西藏自治区 阿里地区 普兰县" - }, { - "date": "1970-06-07", - "name": "郭秀英", - "address": "四川省 巴中市 恩阳区" - }] -} \ No newline at end of file diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue index eb4c899..ef365ea 100644 --- a/src/components/common/Sidebar.vue +++ b/src/components/common/Sidebar.vue @@ -127,6 +127,12 @@ } ] } + , + { + icon: 'el-icon-lx-redpacket_fill', + index: '/donate', + title: '支持作者' + } ] } }, diff --git a/src/components/page/BaseTable.vue b/src/components/page/BaseTable.vue index 4cd24e8..9aa442f 100644 --- a/src/components/page/BaseTable.vue +++ b/src/components/page/BaseTable.vue @@ -7,13 +7,13 @@
- 批量删除 + 批量删除 - 搜索 + 搜索
@@ -68,11 +68,11 @@ + + \ No newline at end of file diff --git a/src/components/page/Upload.vue b/src/components/page/Upload.vue index 64e124f..82bea49 100644 --- a/src/components/page/Upload.vue +++ b/src/components/page/Upload.vue @@ -15,7 +15,7 @@
将文件拖到此处,或点击上传
diff --git a/src/router/index.js b/src/router/index.js index c2f8454..4186f97 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -96,6 +96,11 @@ export default new Router({ path: '/403', component: resolve => require(['../components/page/403.vue'], resolve), meta: { title: '403' } + }, + { + path: '/donate', + component: resolve => require(['../components/page/Donate.vue'], resolve), + meta: { title: '支持作者' } } ] }, diff --git a/src/utils/request.js b/src/utils/request.js new file mode 100644 index 0000000..53a721c --- /dev/null +++ b/src/utils/request.js @@ -0,0 +1,27 @@ +import axios from 'axios'; + +const service = axios.create({ + // process.env.NODE_ENV === 'development' 来判断是否开发环境 + baseURL: 'https://www.easy-mock.com/mock/592501a391470c0ac1fab128', + timeout: 5000 +}) + +service.interceptors.request.use( config => { + return config; +}, error => { + console.log(error); + return Promise.reject(); +}) + +service.interceptors.response.use(response => { + if(response.status === 200){ + return response.data; + }else{ + Promise.reject(); + } +}, error => { + console.log(error); + return Promise.reject(); +}) + +export default service; \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index aebd6dd..7ad6c43 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,19 +1,16 @@ module.exports = { baseUrl: './', + assetsDir: 'static', productionSourceMap: false, devServer: { proxy: { - '/api':{ - target:'http://jsonplaceholder.typicode.com', - changeOrigin:true, - pathRewrite:{ - '/api':'' - } - }, - '/ms':{ - target: 'https://www.easy-mock.com/mock/592501a391470c0ac1fab128', - changeOrigin: true - } + // '/api':{ + // target:'http://jsonplaceholder.typicode.com', + // changeOrigin:true, + // pathRewrite:{ + // '/api':'' + // } + // } } } } \ No newline at end of file