Merge branch 'master' of http://git.jishutao.com/FrontEnd/kede-research

vue.config.js

@@ -35,8 +35,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://172.16.0.255:8888`,
-        target: `https://yanfa.jishutao.com/prod-api`,
+        target: `http://172.16.0.255:8888`,
+        // target: `https://yanfa.jishutao.com/prod-api`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''