2023年7月19日14:18:23

pages.json

@@ -1410,7 +1410,6 @@
 				}
 			]
 		}
-<<<<<<< HEAD
 		// ,{
 		// 	//其他服务模块
 		// 	"root": "subpackage/service",
@@ -1515,8 +1514,6 @@
 		// 		}
 		// 	]
 		// }
-=======
->>>>>>> 4e785fbeaf279bbb097c57a51fc5a7a31f0e4aab
 	],
 	"tabBar": {
 		"color": "#666666",

subpackage/orders/order-details-new.vue

@@ -478,10 +478,6 @@
 	
 	//是否有售后信息
 	const isHaveAfterSaleInfo = () =>{
-<<<<<<< HEAD
-
-=======
->>>>>>> 4e785fbeaf279bbb097c57a51fc5a7a31f0e4aab
 		if(isBlank(state.orderInfo.orderInfoExt.returnMode ?state.orderInfo.orderInfoExt.returnMode: null) && isBlank(state.orderInfo.orderInfoExt.exchangeMode ?state.orderInfo.orderInfoExt.exchangeMode: null)){
 			return false;
 		}

utils/utils.ts

@@ -226,11 +226,7 @@ export const getOrderTypeName = (orderType = 'ISSUE') => {
 }
 
 //根据车辆类型获取车辆名称
-<<<<<<< HEAD
-export const getCarTypeName = (carType : any) => {
-=======
 export const getCarTypeName = (carType: any) => {
->>>>>>> 4e785fbeaf279bbb097c57a51fc5a7a31f0e4aab
 	switch (carType) {
 		case 1:
 			return '客车';