Merge branch 'develop' into v1.5.26_bohai_feature

src/pages/ConsumptionReport/ConsumptionReport.vue

@@ -340,15 +340,10 @@
 </template>
 
 <script>
-	var gHost = "https://dev-az-order-api.xiaopay.net";
-	if (window.location.host.indexOf("dev")) {
-		gHost = "https://dev-az-order-api.xiaopay.net";
-	} else if (window.location.host.indexOf("uat")) {
-		gHost = "https://uat.xiaopay.net";
-	} else {
-		gHost = "https://az-order-api.xiaopay.net";
+	var gHost = "https://" + window.location.host;
+	if (window.location.protocol != "https:") {
+		gHost = "https://fpdev.xiaopay.net";
 	}
-
 	//获取参数
 	function getQueryParams(params) {
 		let href = window.location.href
@@ -819,7 +814,7 @@
 				justify-content: space-between;
 				align-items: center;
 				position: absolute;
-				top:54rpx;
+				top: 54rpx;
 				left: 0;
 
 				.consumption-report-info {
@@ -1307,7 +1302,7 @@
 					display: flex;
 					justify-content: space-between;
 					align-items: center;
-					
+
 					.consumption-report-card-four-title {
 						display: flex;
 						align-items: center;
@@ -1343,10 +1338,10 @@
 					}
 
 					.noeatting-total {
-						flex:1;
+						flex: 1;
 						display: flex;
 						justify-content: flex-end;
-						
+
 						.noeatting-total-item {
 							height: 40rpx;
 							font-size: 28rpx;