agv

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" : ""
                     }

pages.json

@@ -2,27 +2,33 @@
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "DOAN",
-		"navigationBarBackgroundColor": "#FFFFFF",
+		"navigationBarBackgroundColor": "#FFFFFF"
-		"tabBar": {
+
-			"color": "#7A7E83",
+	},
-			"selectedColor": "#3cc51f",
+	"tabBar": {
-			"borderStyle": "black",
+		"color": "#7A7E83",
-			"backgroundColor": "#ffffff",
+		"selectedColor": "#3cc51f",
-			"list": [
+		"borderStyle": "black",
-				{
+		"backgroundColor": "#ffffff",
-					"pagePath": "pages/index/index",
+		"list": [{
-					"iconPath": "static/images/tabbar/home.png",
+				"pagePath": "pages/index/index",
-					"selectedIconPath": "static/images/home_.png",
+				"iconPath": "static/images/tabbar/home.png",
-					"text": "首页"
+				"selectedIconPath": "static/images/home_.png",
-				},
+				"text": "首页"
-				{
+			},
-					"pagePath": "pages/agv/agv",
+			{
-					"iconPath": "static/images/tabbar/work.png",
+				"pagePath": "pages/agv/agv",
-					"selectedIconPath": "static/images/work_.png",
+				"iconPath": "static/images/tabbar/work.png",
-					"text": "AGV"
+				"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",
+			"path": "pages/agv/agv",
-			"style" : 
+			"style": {
-			{
+				"navigationBarTitleText": "AGV",
-				"navigationBarTitleText" : "AGV",
+				"enablePullDownRefresh": false
-				"enablePullDownRefresh" : false
 			}
 		}
 	]

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 || {}