Merge remote-tracking branch 'origin/master'

composables/order/useOrderSkip.ts

@@ -90,7 +90,7 @@ export default function useOrderSkip() {
 			// #ifdef MP-WEIXIN
 			url = `/subpackage/orders/essential-information`;
 			// #endif
-			
+
 		}
 		console.log("url", url)
 		navTo(`${url}?orderId=${orderInfo.orderId}&clientFee=${orderInfo.amount}&id=${orderInfo.productId}&vehiclePlateColor=${orderInfo.vehiclePlateColor}&fromOrder=true&type=${orderInfo.type}&userType=${orderInfo.userType === 'PERSONAL_USER' ? '1' : '2'}`);
@@ -157,8 +157,8 @@ export default function useOrderSkip() {
 	const gotoEvaluateSalesman = (orderInfo : any) => {
 		navTo(`/subpackage/orders/order-evaluate-salesman?id=${orderInfo.id}&orderId=${orderInfo.orderId}`);
 	}
-	
-	
+
+
 
 	//查看物流
 	const gotoCheckLogistics = (orderInfo : any) => {

utils/network/api.js

@@ -14,6 +14,7 @@ export const envs = {
 	},
 	//生产环境配置
 	production: {
+		// baseUrl: "http://192.168.124.6:8087",
 		// baseUrl: "http://222.85.144.89:19002",
 		// baseUrl: "http://192.168.100.158:8085/html/",
 		// baseUrl: "https://qtzl.etcjz.cn",