diff --git a/manifest.json b/manifest.json index 8f84138..fe138d8 100644 --- a/manifest.json +++ b/manifest.json @@ -100,7 +100,7 @@ "disableHostCheck" : true, "proxy" : { "/api" : { - "target" : "http://192.168.2.101:8888", + "target" : "http://192.168.0.31:8888", "pathRewrite" : { "^/api" : "" } diff --git a/pages.json b/pages.json index 9cd384e..57664ee 100644 --- a/pages.json +++ b/pages.json @@ -2,27 +2,33 @@ "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "DOAN", - "navigationBarBackgroundColor": "#FFFFFF", - "tabBar": { - "color": "#7A7E83", - "selectedColor": "#3cc51f", - "borderStyle": "black", - "backgroundColor": "#ffffff", - "list": [ - { - "pagePath": "pages/index/index", - "iconPath": "static/images/tabbar/home.png", - "selectedIconPath": "static/images/home_.png", - "text": "首页" - }, - { - "pagePath": "pages/agv/agv", - "iconPath": "static/images/tabbar/work.png", - "selectedIconPath": "static/images/work_.png", - "text": "AGV" - } - ] - } + "navigationBarBackgroundColor": "#FFFFFF" + + }, + "tabBar": { + "color": "#7A7E83", + "selectedColor": "#3cc51f", + "borderStyle": "black", + "backgroundColor": "#ffffff", + "list": [{ + "pagePath": "pages/index/index", + "iconPath": "static/images/tabbar/home.png", + "selectedIconPath": "static/images/home_.png", + "text": "首页" + }, + { + "pagePath": "pages/agv/agv", + "iconPath": "static/images/tabbar/work.png", + "selectedIconPath": "static/images/work_.png", + "text": "AGV" + }, + { + "pagePath": "pages/agv/agv", + "iconPath": "static/images/tabbar/work.png", + "selectedIconPath": "static/images/work_.png", + "text": "AGV" + } + ] }, "pages": [{ "path": "pages/login/login", @@ -84,11 +90,10 @@ } }, { - "path" : "pages/agv/agv", - "style" : - { - "navigationBarTitleText" : "AGV", - "enablePullDownRefresh" : false + "path": "pages/agv/agv", + "style": { + "navigationBarTitleText": "AGV", + "enablePullDownRefresh": false } } ] diff --git a/utils/request.js b/utils/request.js index 444bed1..e7ea161 100644 --- a/utils/request.js +++ b/utils/request.js @@ -18,9 +18,9 @@ import { let timeout = 10000 const request = config => { // 浏览器测试用 - // const storageBaseUrl = 'http://' + getBaseUrl() + '/api'; + const storageBaseUrl = 'http://' + getBaseUrl() + '/api'; // 真机测试以及部署用 - const storageBaseUrl = 'http://' + getBaseUrl(); + //const storageBaseUrl = 'http://' + getBaseUrl(); // 是否需要设置 token const isToken = (config.headers || {}).isToken === false config.header = config.header || {}