请求不使用代理

bee36e12 · lin-xin · ce21d137 · ce21d137 · bee36e12 · ce21d137
12 changed file
--- a/favicon.ico
+++ b/favicon.ico
--- 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",

--- a/public/vuetable.json
+++ b/public/vuetable.json
-{
-    "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
--- a/src/api/index.js
+++ b/src/api/index.js
+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
--- a/src/assets/vuetable.json
+++ b/src/assets/vuetable.json
-{
-    "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
--- 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: '支持作者'
+                    }
                ]
            }
        },

--- a/src/components/page/BaseTable.vue
+++ b/src/components/page/BaseTable.vue
@@ -7,13 +7,13 @@
        </div>
        <div class="container">
            <div class="handle-box">
-                <el-button type="primary" icon="delete" class="handle-del mr10" @click="delAll">批量删除</el-button>
+                <el-button type="primary" icon="el-icon-delete" class="handle-del mr10" @click="delAll">批量删除</el-button>
                <el-select v-model="select_cate" placeholder="筛选省份" class="handle-select mr10">
                    <el-option key="1" label="广东省" value="广东省"></el-option>
                    <el-option key="2" label="湖南省" value="湖南省"></el-option>
                </el-select>
                <el-input v-model="select_word" placeholder="筛选关键词" class="handle-input mr10"></el-input>
-                <el-button type="primary" icon="search" @click="search">搜索</el-button>
+                <el-button type="primary" icon="el-icon-search" @click="search">搜索</el-button>
            </div>
            <el-table :data="data" border class="table" ref="multipleTable" @selection-change="handleSelectionChange">
                <el-table-column type="selection" width="55" align="center"></el-table-column>
@@ -68,11 +68,11 @@
 </template>

 <script>
+    import { fetchData } from '../../api/index';
    export default {
        name: 'basetable',
        data() {
            return {
-                url: './vuetable.json',
                tableData: [],
                cur_page: 1,
                multipleSelection: [],
@@ -123,14 +123,10 @@
            },
            // 获取 easy-mock 的模拟数据
            getData() {
-                // 开发环境使用 easy-mock 数据，正式环境使用 json 文件
-                if (process.env.NODE_ENV === 'development') {
-                    this.url = '/ms/table/list';
-                };
-                this.$axios.post(this.url, {
+                fetchData({
                    page: this.cur_page
                }).then((res) => {
-                    this.tableData = res.data.list;
+                    this.tableData = res.list;
                })
            },
            search() {

--- a/src/components/page/Donate.vue
+++ b/src/components/page/Donate.vue
+<template>
+    <div>
+        <div class="crumbs">
+            <el-breadcrumb separator="/">
+                <el-breadcrumb-item><i class="el-icon-lx-redpacket_fill"></i> 支持作者</el-breadcrumb-item>
+            </el-breadcrumb>
+        </div>
+        <div class="container">
+            <div class="plugins-tips">
+                如果该框架对你有帮助，那就请作者喝杯饮料吧！加微信号linxin_20探讨问题。
+            </div>
+            <div><img src="http://blog.gdfengshuo.com/images/weixin.jpg"></div>
+        </div>
+
+    </div>
+</template>
+
+<script>
+    export default {
+        
+    }
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
--- a/src/components/page/Upload.vue
+++ b/src/components/page/Upload.vue
@@ -15,7 +15,7 @@
            <el-upload
                class="upload-demo"
                drag
-                action="/api/posts/"
+                action="http://jsonplaceholder.typicode.com/api/posts/"
                multiple>
                <i class="el-icon-upload"></i>
                <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>

--- 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: '支持作者' }
                }
            ]
        },

--- a/src/utils/request.js
+++ b/src/utils/request.js
+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
--- a/vue.config.js
+++ b/vue.config.js
 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