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

vue.config.js

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