Merge remote-tracking branch 'origin/feature/v1/plb'

# Conflicts:
#	src/router/index.js

src/router/index.js

@@ -172,6 +172,7 @@ Router.prototype.push = function push(location) {
 
 export default new Router({
   base: process.env.VUE_APP_CONTEXT_PATH,
+  // mode: 'history', // 去掉url中的#
   mode: 'hash', // 去掉url中的#
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRoutes

vue.config.js

@@ -35,7 +35,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.0.132:8080`,
+        target: `https://farming.nyinhong.com/api`,
+        // target: `http://192.168.0.169`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''