修复冲突

Signed-off-by: Bluemark <kongdy@bluemark.cn>
2023-12-13 01:56:36 +00:00
parent cf2c782c0e 25a82c1812
commit 7c2ab0b7ad
24 changed files with 1231 additions and 1147 deletions
@@ -85,12 +85,6 @@ export default {
 			params: data2
 		})
 	},
-	// calc: (data) =>
-	//   request({
-	//     url: 'order/order/calc',
-	//     method: 'POST',
-	//     data,
-	//   }),
 	// 创建订单
 	create: (data) =>
 		request({