Merge branch 'develop' into uat

src/common/js/http.js

@@ -102,12 +102,12 @@ function postRequest(params, data = {}) {
 			}
 			//token
 			let personalInfo = uni.getStorageSync("personalInfo");
-			params.header = {
-				// seesionID: personalInfo.seesionID || '',
-				// sessionid: personalInfo.seesionID || '',
-				// token: personalInfo.seesionID || '',
-				// wechattype: 1
-			};
+			params.header = Object.assign({
+				seesionID: personalInfo.seesionID || '',
+				sessionid: personalInfo.seesionID || '',
+				token: personalInfo.seesionID || '',
+				wechattype: 1
+			}, params.header);
 			data = Object.assign({
 				seesionID: personalInfo.seesionID || '',
 				sessionid: personalInfo.seesionID || '',
@@ -164,12 +164,12 @@ function getRequest(params, data) {
 		try {
 			//token
 			let personalInfo = uni.getStorageSync("personalInfo");
-			params.header = {
-				// seesionID: personalInfo.seesionID || '',
-				// sessionid: personalInfo.seesionID || '',
-				// token: personalInfo.seesionID || '',
-				// wechattype: 1
-			};
+			params.header = Object.assign({
+				seesionID: personalInfo.seesionID || '',
+				sessionid: personalInfo.seesionID || '',
+				token: personalInfo.seesionID || '',
+				wechattype: 1
+			}, params.header);
 			data = Object.assign({
 				seesionID: personalInfo.seesionID || '',
 				sessionid: personalInfo.seesionID || '',

src/manifest.json

@@ -89,7 +89,7 @@
 			"disableHostCheck": true,
 			"proxy": {
 				"/": {
-					"target": "https://dev-az-order-api.xiaopay.net",
+					"target": "https://dev-az-cloud-api.xiaopay.net",
 					"changeOrigin": true,
 					"secure": false
 				}

src/pages.json

@@ -478,6 +478,16 @@
             }
             
         }
+        ,{
+            "path" : "pages/ConsumptionSystem/AbnormalConsumption/AbnormalConsumption",
+            "style" :                                                                                    
+            {
+				"navigationStyle": "custom",
+                "navigationBarTitleText": "消费异常",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",