接口层兼容

sheep/api/order.js

@@ -1,11 +1,10 @@
 import request from '@/sheep/request';
-import request2 from '@/sheep/request2';
 
 export default {
 	// 订单详情
 	detail: (id, params) =>
-		request2({
-			url: 'trade/order/get-detail?id=' + id,
+		request({
+			url: '/app-api/trade/order/get-detail?id=' + id,
 			method: 'GET',
 			params,
 		}),
@@ -40,8 +39,8 @@ export default {
 		}),
 	// 订单列表
 	list: (params) =>
-		request2({
-			url: 'trade/order/page',
+		request({
+			url: '/app-api/trade/order/page',
 			method: 'GET',
 			params,
 			custom: {
@@ -66,9 +65,9 @@ export default {
 		delete data2.items
 		for (let i = 0; i < data.items.length; i++) {
 			// 此处转码问题,待解决方案
-			// data2[encodeURIComponent('items[' + i + '' + '].skuId')] = data.items[i].skuId + '';
-			// data2[encodeURIComponent('items[' + i + '' + '].count')] = data.items[i].count + '';
-			// data2[encodeURIComponent('items[' + i + '' + '].cartId')] = data.items[i].cartId + '';
+			data2[encodeURIComponent('items[' + i + '' + '].skuId')] = data.items[i].skuId + '';
+			data2[encodeURIComponent('items[' + i + '' + '].count')] = data.items[i].count + '';
+			data2[encodeURIComponent('items[' + i + '' + '].cartId')] = data.items[i].cartId + '';
 
 			// data2['items' + `[${i}]` + '.skuId'] = data.items[i].skuId + '';
 			// data2['items' + `[${i}]` + '.count'] = data.items[i].count + '';
@@ -79,8 +78,8 @@ export default {
 			// data2['items' + `%5B${i}%5D` + '.cartId'] = data.items[i].cartId + '';
 		}
 		console.log(data2, '手动转码的参数')
-		return request2({
-			url: 'trade/order/settlement',
+		return request({
+			url: '/app-api/trade/order/settlement',
 			method: 'GET',
 			// data: data2,
 			params: data2
@@ -114,8 +113,8 @@ export default {
 		}),
 	// 评价订单
 	comment: (data) =>
-		request2({
-			url: 'trade/order/item/create-comment',
+		request({
+			url: '/app-api/trade/order/item/create-comment',
 			method: 'POST',
 			data,
 		}),
@@ -153,8 +152,8 @@ export default {
 				data,
 			}),
 		list: (params) =>
-			request2({
-				url: 'trade/after-sale/page',
+			request({
+				url: '/app-api/trade/after-sale/page',
 				method: 'GET',
 				params,
 				custom: {
@@ -184,8 +183,8 @@ export default {
 			}),
 		// 售后详情
 		detail: (id) =>
-			request2({
-				url: 'trade/after-sale/get?id=' + id,
+			request({
+				url: '/app-api/trade/after-sale/get?id=' + id,
 				method: 'GET',
 			}),
 	},