Merge branch 'vue3_tmp' of https://gitee.com/huizhizao/yudao-mall-uniapp into master-vue3

# Conflicts:
#	pages.json
#	pages/goods/list.vue
#	pages/order/list.vue
#	sheep/api/order.js
#	sheep/api/trade/order.js
#	sheep/hooks/useGoods.js

sheep/api/activity.js

@@ -1,43 +1,64 @@
 import request from '@/sheep/request';
 
 export default {
-  myGroupon: (params) =>
-    request({
-      url: 'activity/groupon/myGroupons',
-      method: 'GET',
-      params,
-    }),
-  getGrouponList: (params) =>
-    request({
-      url: 'activity/groupon',
-      method: 'GET',
-      params,
-    }),
-  grouponDetail: (id) =>
-    request({
-      url: 'activity/groupon/' + id,
-      method: 'GET',
-    }),
-  signList: (params) =>
-    request({
-      url: 'activity/signin',
-      method: 'GET',
-      params,
-    }),
-  signAdd: () =>
-    request({
-      url: 'activity/signin',
-      method: 'POST',
-    }),
-  replenish: (data) =>
-    request({
-      url: 'activity/signin/replenish',
-      method: 'POST',
-      data,
-    }),
-  activity: (id) =>
-    request({
-      url: 'activity/activity/' + id,
-      method: 'GET',
-    }),
-};
+	myGroupon: (params) =>
+		request({
+			url: 'activity/groupon/myGroupons',
+			method: 'GET',
+			params,
+		}),
+	getGrouponList: (params) =>
+		request({
+			url: 'activity/groupon',
+			method: 'GET',
+			params,
+		}),
+	grouponDetail: (id) =>
+		request({
+			url: 'activity/groupon/' + id,
+			method: 'GET',
+		}),
+	signList: (params) =>
+		request({
+			url: 'activity/signin',
+			method: 'GET',
+			params,
+		}),
+	signAdd: () =>
+		request({
+			url: '/app-api/member/sign-in/record/create',
+			method: 'POST',
+		}),
+	configLise: () =>
+		request({
+			url: '/app-api/member/sign-in/config/list',
+			method: 'GET',
+		}),
+	recordPage: () =>
+		request({
+			url: '/app-api/member/sign-in/record/page',
+			method: 'GET',
+		}),
+	// signAdd: () =>
+	// 	request({
+	// 		url: 'activity/signin',
+	// 		method: 'POST',
+	// 	}),
+	replenish: (data) =>
+		request({
+			url: 'activity/signin/replenish',
+			method: 'POST',
+			data,
+		}),
+	activity: (id) =>
+		request({
+			url: 'activity/activity/' + id,
+			method: 'GET',
+		}),
+	getSummary: () =>
+		request({
+			url: '/app-api/member/sign-in/record/get-summary',
+			method: 'GET',
+		}),
+
+};

sheep/api/app.js

@@ -115,14 +115,12 @@ export default {
         formData: {
           group,
         },
-        // TODO 芋艿：临时写死
         header: {
           // Accept: 'text/json',
           // Authorization: token,
-          Accept : '*/*',
-          'tenant-id' :'1',
-          'terminal': 20,
-          Authorization:  'Bearer test247',
+		  Accept : '*/*',
+		  'tenant-id' :'1',
+		  Authorization:  'Bearer test247',
         },
         success: (uploadFileRes) => {
           let result = JSON.parse(uploadFileRes.data);

sheep/api/cart.js

@@ -1,9 +1,10 @@
 import request from '@/sheep/request';
+import request2 from '@/sheep/request2';
 
 export default {
 	list: (data) =>
-		request({
-			url: '/app-api/trade/cart/list',
+		request2({
+			url: 'trade/cart/list',
 			method: 'GET',
 			custom: {
 				showLoading: false,
@@ -12,40 +13,26 @@ export default {
 		}),
 	append: (data) =>
 		request({
-			url: '/app-api/trade/cart/add',
+			url: 'cart',
 			method: 'POST',
-      // TODO 芋艿：这里没提示
 			custom: {
 				showSuccess: true,
 				successMsg: '已添加到购物车~',
 			},
 			data: {
 				...data,
-				// type: 'inc',
+				type: 'inc',
 			},
 		}),
-	// append: (data) =>
-	// 	request({
-	// 		url: 'cart',
-	// 		method: 'POST',
-	// 		custom: {
-	// 			showSuccess: true,
-	// 			successMsg: '已添加到购物车~',
-	// 		},
-	// 		data: {
-	// 			...data,
-	// 			type: 'inc',
-	// 		},
-	// 	}),
 	// 删除购物车
 	delete: (ids) =>
-		request({
-			url: '/app-api/trade/cart/delete?ids=' + ids,
+		request2({
+			url: 'trade/cart/delete?ids=' + ids,
 			method: 'DELETE',
 		}),
 	update: (data) =>
-		request({
-			url: '/app-api/trade/cart/update-count',
+		request2({
+			url: 'trade/cart/update-count',
 			method: 'PUT',
 			data: {
 				...data,

sheep/api/category.js

@@ -1,8 +1,10 @@
+import request2 from '@/sheep/request2';
+
 export default {
-	list: (params) =>
-		request({
-			url: '/app-api/product/category/list',
-			method: 'GET',
-			params,
-		}),
-};
+  list: (params) =>
+    request2({
+      url: 'product/category/list',
+      method: 'GET',
+      params,
+    }),
+};

sheep/api/coupon.js

@@ -1,4 +1,5 @@
 import request from '@/sheep/request';
+import request2 from '@/sheep/request2';
 
 export default {
 	// 我的拼团
@@ -12,8 +13,8 @@ export default {
 			},
 		}),
 	userCoupon: (params) =>
-		request({
-			url: '/app-api/promotion/coupon/page',
+		request2({
+			url: 'promotion/coupon/page',
 			method: 'GET',
 			params,
 		}),
@@ -33,20 +34,9 @@ export default {
 		}),
 	get: (id) =>
 		request({
-			url: '/app-api/promotion/coupon/take',
+			url: 'coupon/get/' + id,
 			method: 'POST',
-			data: {
-				templateId: id
-			},
-			params: {
-				templateId: id
-			},
 		}),
-	// get: (id) =>
-	// 	request({
-	// 		url: 'coupon/get/' + id,
-	// 		method: 'POST',
-	// 	}),
 	listByGoods: (id) =>
 		request({
 			url: 'coupon/listByGoods/' + id,

sheep/api/data.js

@@ -1,24 +1,25 @@
 import request from '@/sheep/request';
+import request2 from '@/sheep/request2';
 
 export default {
-	area: () =>
-		request({
-			url: '/app-api/system/area/tree',
-			method: 'GET',
-		}),
-	// area: () =>
-	//   request({
-	//     url: 'data/area',
-	//     method: 'GET',
-	//   }),
-	faq: () =>
-		request({
-			url: 'data/faq',
-			method: 'GET',
-		}),
-	richtext: (id) =>
-		request({
-			url: 'data/richtext/' + id,
-			method: 'GET',
-		}),
-};
+  area: () =>
+    request2({
+      url: 'system/area/tree',
+      method: 'GET',
+    }),
+  // area: () =>
+  //   request({
+  //     url: 'data/area',
+  //     method: 'GET',
+  //   }),
+  faq: () =>
+    request({
+      url: 'data/faq',
+      method: 'GET',
+    }),
+  richtext: (id) =>
+    request({
+      url: 'data/richtext/' + id,
+      method: 'GET',
+    }),
+};

sheep/api/goods.js

@@ -1,84 +1,80 @@
 import request from '@/sheep/request';
+import request2 from '@/sheep/request2';
 
 export default {
-	// 商品详情
-	detail: (id, params = {}) =>
-		request({
-			url: '/app-api/product/spu/get-detail?id=' + id,
-			method: 'GET',
-			params,
-			custom: {
-				showLoading: false,
-				showError: false,
-			},
-		}),
+  // 商品详情
+  detail: (id, params = {}) =>
+    request2({
+      url: 'product/spu/get-detail?id=' + id,
+      method: 'GET',
+      params,
+      custom: {
+        showLoading: false,
+        showError: false,
+      },
+    }),
 
-	// 商品列表
-	list: (params) =>
-		request({
-			url: '/app-api/product/spu/page',
-			method: 'GET',
-			params,
-			custom: {
-				showLoading: false,
-				showError: false,
-			},
-		}),
+  // 商品列表
+  list: (params) =>
+    request2({
+      url: 'product/spu/page',
+      method: 'GET',
+      params,
+      custom: {
+        showLoading: false,
+        showError: false,
+      },
+    }),
 
-	// 商品查询
-	ids: (params = {}) =>
-		request({
-			url: 'goods/goods/ids',
-			method: 'GET',
-			params,
-			custom: {
-				showLoading: false,
-				showError: false,
-			},
-		}),
-	// 商品评价列表
-	comment: (id, params = {}) =>
-		request({
-			url: '/app-api/product/comment/list?spuId=' + id,
-			method: 'GET',
-			params,
-			custom: {
-				showLoading: false,
-				showError: false,
-			},
-		}),
-	// 商品评价类型
-	getType: (id) =>
-		request({
-			url: 'goods/comment/getType/' + id,
-			method: 'GET',
-			custom: {
-				showLoading: false,
-				showError: false,
-			},
-		}),
-	// 活动商品查询
-	// 商品查询
-	activity: (params = {}) =>
-		request({
-			url: 'goods/goods/activity',
-			method: 'GET',
-			params,
-			custom: {
-				showLoading: false,
-				showError: false,
-			},
-		}),
-	activityList: (params = {}) =>
-		request({
-			url: 'goods/goods/activityList',
-			method: 'GET',
-			params,
-		}),
-	// 检查是否收藏商品
-	exits: (id) =>
-		request({
-			url: '/app-api/product/favorite/exits?spuId=' + id,
-			method: 'GET',
-		}),
-};
+  // 商品查询
+  ids: (params = {}) =>
+    request({
+      url: 'goods/goods/ids',
+      method: 'GET',
+      params,
+      custom: {
+        showLoading: false,
+        showError: false,
+      },
+    }),
+
+  // 商品评价列表
+  comment: (id, params = {}) =>
+    request2({
+      url: 'product/comment/list?spuId=' + id,
+      method: 'GET',
+      params,
+      custom: {
+        showLoading: false,
+        showError: false,
+      },
+    }),
+  // 商品评价类型
+  getType: (id) =>
+    request({
+      url: 'goods/comment/getType/' + id,
+      method: 'GET',
+      custom: {
+        showLoading: false,
+        showError: false,
+      },
+    }),
+  // 活动商品查询
+  // 商品查询
+  activity: (params = {}) =>
+    request({
+      url: 'goods/goods/activity',
+      method: 'GET',
+      params,
+      custom: {
+        showLoading: false,
+        showError: false,
+      },
+    }),
+  activityList: (params = {}) =>
+    request({
+      url: 'goods/goods/activityList',
+      method: 'GET',
+      params,
+    }),
+};

sheep/api/index2.js

@@ -1,14 +1,14 @@
-import request from '@/sheep/request';
+import request2 from '@/sheep/request2';
 
 export default {
-	decorate: () =>
-		request({
-			url: '/app-api/promotion/decorate/list?page=1',
-			method: 'GET',
-		}),
-	spids: () =>
-		request({
-			url: '/app-api/product/spu/page?recommendType=best&pageNo=1&pageSize=10',
-			method: 'GET',
-		}),
-};
+  decorate: () =>
+    request2({
+      url: 'promotion/decorate/list?page=1',
+      method: 'GET',
+    }),
+  spids: () =>
+    request2({
+      url: 'product/spu/page?recommendType=best&pageNo=1&pageSize=10',
+      method: 'GET',
+    }),
+};

sheep/api/order.js

@@ -1,10 +1,11 @@
 import request from '@/sheep/request';
+import request2 from '@/sheep/request2';
 
 export default {
 	// 订单详情
 	detail: (id, params) =>
-		request({
-			url: '/app-api/trade/order/get-detail?id=' + id,
+		request2({
+			url: 'trade/order/get-detail?id=' + id,
 			method: 'GET',
 			params,
 		}),
@@ -37,7 +38,16 @@ export default {
 				showLoading: false,
 			},
 		}),
-
+	// 订单列表
+	list: (params) =>
+		request2({
+			url: 'trade/order/page',
+			method: 'GET',
+			params,
+			custom: {
+				showLoading: false,
+			},
+		}),
 	// list: (params) =>
 	//   request({
 	//     url: 'order/order',
@@ -55,27 +65,27 @@ export default {
 		// 解决 SpringMVC 接受 List<Item> 参数的问题
 		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['items' + `[${i}]` + '.skuId'] = data.items[i].skuId + '';
-			// data2['items' + `[${i}]` + '.count'] = data.items[i].count + '';
-			// data2['items' + `[${i}]` + '.cartId'] = data.items[i].cartId + '';
-
-			// data2['items' + `%5B${i}%5D` + '.skuId'] = data.items[i].skuId + '';
-			// data2['items' + `%5B${i}%5D` + '.count'] = data.items[i].count + '';
-			// data2['items' + `%5B${i}%5D` + '.cartId'] = data.items[i].cartId + '';
+			// data2['items[' + i + '' + '].skuId'] = data.items[i].skuId + '';
+			// data2['items[' + i + '' + '].count'] = data.items[i].count + '';
+			// data2['items[' + i + '' + '].cartId'] = data.items[i].cartId + '';
+			data2['items' + `%5B${i}%5D` + '.skuId'] = data.items[i].skuId + '';
+			data2['items' + `%5B${i}%5D` + '.count'] = data.items[i].count + '';
+			data2['items' + `%5B${i}%5D` + '.cartId'] = data.items[i].cartId + '';
 		}
-		console.log(data2, '手动转码的参数')
-		return request({
-			url: '/app-api/trade/order/settlement',
+		console.log(data2, '对比数据')
+		return request2({
+			url: 'trade/order/settlement',
 			method: 'GET',
-			// data: data2,
+			// data,
 			params: data2
 		})
 	},
+	// calc: (data) =>
+	//   request({
+	//     url: 'order/order/calc',
+	//     method: 'POST',
+	//     data,
+	//   }),
 	// 创建订单
 	create: (data) =>
 		request({
@@ -98,8 +108,8 @@ export default {
 		}),
 	// 评价订单
 	comment: (data) =>
-		request({
-			url: '/app-api/trade/order/item/create-comment',
+		request2({
+			url: 'trade/order/item/create-comment',
 			method: 'POST',
 			data,
 		}),
@@ -129,15 +139,31 @@ export default {
 		}),
 	// 售后
 	aftersale: {
-		list: (params) =>
+		// 申请售后
+		apply: (data) =>
 			request({
-				url: '/app-api/trade/after-sale/page',
+				url: 'order/aftersale',
+				method: 'POST',
+				data,
+			}),
+		list: (params) =>
+			request2({
+				url: 'trade/after-sale/page',
 				method: 'GET',
 				params,
 				custom: {
 					showLoading: false,
 				},
 			}),
+		// list: (params) =>
+		// 	request({
+		// 		url: 'order/aftersale',
+		// 		method: 'GET',
+		// 		params,
+		// 		custom: {
+		// 			showLoading: false,
+		// 		},
+		// 	}),
 		//取消售后
 		cancel: (id) =>
 			request({
@@ -150,10 +176,10 @@ export default {
 				url: 'order/aftersale/' + id,
 				method: 'DELETE',
 			}),
-		// 售后详情 DONE
+		// 售后详情
 		detail: (id) =>
-			request({
-				url: '/app-api/trade/after-sale/get?id=' + id,
+			request2({
+				url: 'trade/after-sale/get?id=' + id,
 				method: 'GET',
 			}),
 	},

sheep/api/pay/channel.js

@@ -1,14 +0,0 @@
-import request from '@/sheep/request';
-
-const PayChannelApi = {
-  // 获得指定应用的开启的支付渠道编码列表
-  getEnableChannelCodeList: (appId) => {
-    return request({
-      url: '/app-api/pay/channel/get-enable-code-list',
-      method: 'GET',
-      params: { appId }
-    });
-  },
-};
-
-export default PayChannelApi;

sheep/api/pay/order.js

@@ -1,22 +0,0 @@
-import request from '@/sheep/request';
-
-const PayOrderApi = {
-  // 获得支付订单
-  getOrder: (id) => {
-    return request({
-      url: '/app-api/pay/order/get',
-      method: 'GET',
-      params: { id }
-    });
-  },
-  // 提交支付订单
-  submitOrder: (data) => {
-    return request({
-      url: '/app-api/pay/order/submit',
-      method: 'POST',
-      data
-    });
-  }
-};
-
-export default PayOrderApi;

sheep/api/product/comment.js

@@ -1,19 +1,18 @@
 import request from '@/sheep/request';
 
 const CommentApi = {
-
-	// 获得商品评价分页
-	getCommentPage: (spuId, pageNo, pageSize, type) => {
-		return request({
-			url: '/app-api/product/comment/page',
-			method: 'GET',
-			params: {
-				spuId,
-				pageNo,
-				pageSize,
-				type
-			},
-		});
-	},
+  // 获得商品评价分页
+  getCommentPage: (spuId, pageNo, pageSize, type) => {
+    return request({
+      url: '/app-api/product/comment/page',
+      method: 'GET',
+      params: {
+        spuId,
+        pageNo,
+        pageSize,
+        type
+      },
+    });
+  },
 };
-export default CommentApi;
+export default CommentApi;

sheep/api/promotion/activity.js

@@ -1,16 +1,16 @@
-import request from '@/sheep/request';
+import request2 from '@/sheep/request2';
 
 const ActivityApi = {
-	// 获得单个商品，近期参与的每个活动
-	getActivityListBySpuId: (spuId) => {
-		return request({
-			url: '/app-api/promotion/activity/list-by-spu-id',
-			method: 'GET',
-			params: {
-				spuId,
-			},
-		});
-	},
+  // 获得单个商品，近期参与的每个活动
+  getActivityListBySpuId: (spuId) => {
+    return request2({
+      url: '/app-api/promotion/activity/list-by-spu-id',
+      method: 'GET',
+      params: {
+        spuId,
+      },
+    });
+  },
 };
 
 export default ActivityApi;

sheep/api/promotion/combination.js

@@ -1,69 +1,67 @@
-import request from "@/sheep/request";
+import request2 from "@/sheep/request2";
 
 // 拼团 API
 const CombinationApi = {
-	// 获得拼团活动列表
-	getCombinationActivityList: (count) => {
-		return request({
-			url: "/app-api/promotion/combination-activity/list",
-			method: 'GET',
-			params: {
-				count
-			}
-		});
-	},
+    // 获得拼团活动列表
+    getCombinationActivityList: (count) => {
+        return request2({
+            url: "promotion/combination-activity/list",
+            method: 'GET',
+            params: {count}
+        });
+    },
 
-	// 获得拼团活动分页
-	getCombinationActivityPage: (params) => {
-		return request({
-			url: "/app-api/promotion/combination-activity/page",
-			method: 'GET',
-			params
-		});
-	},
+    // 获得拼团活动分页
+    getCombinationActivityPage: (params) => {
+        return request2({
+            url: "promotion/combination-activity/page",
+            method: 'GET',
+            params
+        });
+    },
 
-	// 获得拼团活动明细
-	getCombinationActivity: (id) => {
-		return request({
-			url: "/app-api/promotion/combination-activity/get-detail",
-			method: 'GET',
-			params: {
-				id
-			}
-		});
-	},
+    // 获得拼团活动明细
+    getCombinationActivity: (id) => {
+        return request2({
+            url: "promotion/combination-activity/get-detail",
+            method: 'GET',
+            params: {
+                id
+            }
+        });
+    },
 
-	// 获得最近 n 条拼团记录（团长发起的）
-	getHeadCombinationRecordList: (activityId, status, count) => {
-		return request({
-			url: "/app-api/promotion/combination-record/get-head-list",
-			method: 'GET',
-			params: {
-				activityId,
-				status,
-				count
-			}
-		});
-	},
+    // 获得最近 n 条拼团记录（团长发起的）
+    getHeadCombinationRecordList: (activityId, status, count) => {
+        return request2({
+            url: "promotion/combination-record/get-head-list",
+            method: 'GET',
+            params: {
+                activityId,
+                status,
+                count
+            }
+        });
+    },
 
-	// 获得拼团记录明细
-	getCombinationRecordDetail: (id) => {
-		return request({
-			url: "/app-api/promotion/combination-record/get-detail",
-			method: 'GET',
-			params: {
-				id
-			}
-		});
-	},
+    // 获得拼团记录明细
+    getCombinationRecordDetail: (id) => {
+        return request2({
+            url: "promotion/combination-record/get-detail",
+            method: 'GET',
+            params: {
+                id
+            }
+        });
+    },
 
-	// 获得拼团记录的概要信息
-	getCombinationRecordSummary: () => {
-		return request({
-			url: "/app-api/promotion/combination-record/get-summary",
-			method: 'GET',
-		});
-	}
+    // 获得拼团记录的概要信息
+    getCombinationRecordSummary: () => {
+        return request2({
+            url: "promotion/combination-record/get-summary",
+            method: 'GET',
+        });
+    }
 }
 
-export default CombinationApi
+export default CombinationApi

sheep/api/promotion/coupon.js

@@ -17,17 +17,4 @@ export default {
       params: { spuId, productScope, count },
     });
   },
-  // 获得匹配指定商品的优惠劵列表
-  getMatchCouponList: (price, spuIds, skuIds, categoryIds) => {
-    return request({
-      url: '/app-api/promotion/coupon/match-list',
-      method: 'GET',
-      params: {
-        price,
-        spuIds: spuIds.join(','),
-        skuIds: skuIds.join(','),
-        categoryIds: categoryIds.join(','),
-      },
-    });
-  }
 };

sheep/api/promotion/seckill.js

@@ -1,44 +1,33 @@
-import request from "@/sheep/request";
+import request2 from "@/sheep/request2";
 
 const SeckillApi = {
-	// 获得秒杀时间段列表
-	getSeckillConfigList: () => {
-		return request({
-			url: '/app-api/promotion/seckill-config/list',
-			method: 'GET'
-		});
-	},
+  // 获得秒杀时间段列表
+  getSeckillConfigList: () => {
+    return request2({ url: 'promotion/seckill-config/list', method: 'GET' });
+  },
 
-	// 获得当前秒杀活动
-	getNowSeckillActivity: () => {
-		return request({
-			url: '/app-api/promotion/seckill-activity/get-now',
-			method: 'GET'
-		});
-	},
+  // 获得当前秒杀活动
+  getNowSeckillActivity: () => {
+    return request2({ url: 'promotion/seckill-activity/get-now', method: 'GET' });
+  },
 
-	// 获得秒杀活动分页
-	getSeckillActivityPage: () => {
-		return request({
-			url: '/app-api/promotion/seckill-activity/page',
-			method: 'GET'
-		});
-	},
+  // 获得秒杀活动分页
+  getSeckillActivityPage: () => {
+    return request2({ url: 'promotion/seckill-activity/page', method: 'GET' });
+  },
 
-	/**
-	 * 获得秒杀活动明细
-	 * @param {number} id 秒杀活动编号
-	 * @return {*}
-	 */
-	getSeckillActivity: (id) => {
-		return request({
-			url: '/app-api/promotion/seckill-activity/get-detail',
-			method: 'GET',
-			params: {
-				id
-			}
-		});
-	}
+  /**
+   * 获得秒杀活动明细
+   * @param {number} id 秒杀活动编号
+   * @return {*}
+   */
+  getSeckillActivity: (id) => {
+    return request2({
+      url: 'promotion/seckill-activity/get-detail',
+      method: 'GET',
+      params: { id }
+    });
+  }
 }
 
-export default SeckillApi;
+export default SeckillApi;

sheep/api/trade.js

@@ -1,37 +1,46 @@
 import request from '@/sheep/request';
 
 export default {
-  order: (id) =>
-    request({
-      url: 'trade/order/' + id,
-      method: 'GET',
-      custom: {
-        showLoading: false,
-      },
-    }),
-  orderLog: (params) =>
-    request({
-      url: 'trade/order',
-      method: 'GET',
-      params,
-      custom: {
-        showLoading: false,
-      },
-    }),
+	order: (id) =>
+		request({
+			url: 'trade/order/' + id,
+			method: 'GET',
+			custom: {
+				showLoading: false,
+			},
+		}),
+	orderLog: (params) =>
+		request({
+			url: 'trade/order',
+			method: 'GET',
+			params,
+			custom: {
+				showLoading: false,
+			},
+		}),
 
-  rechargeRules: () =>
-    request({
-      url: 'trade/order/rechargeRules',
-      method: 'GET',
-      custom: {
-        showError: false,
-        showLoading: false,
-      },
-    }),
-  recharge: (data) =>
-    request({
-      url: 'trade/order/recharge',
-      method: 'POST',
-      data,
-    }),
-};
+	rechargeRules: () =>
+		request({
+			url: 'trade/order/rechargeRules',
+			method: 'GET',
+			custom: {
+				showError: false,
+				showLoading: false,
+			},
+		}),
+	rechargeRules2: () =>
+		request({
+			url: '/app-api/pay/wallet-recharge-package/list',
+			method: 'GET',
+			custom: {
+				showError: false,
+				showLoading: false,
+			},
+		}),
+	recharge: (data) =>
+		request({
+			url: '/app-api/pay/wallet-recharge/create',
+			method: 'POST',
+			data,
+		}),
+};

sheep/api/trade/cart.js

@@ -1,47 +0,0 @@
-import request2 from '@/sheep/request2';
-
-const CartApi = {
-  addCart: (data) => {
-    return request2({
-      url: '/app-api/trade/cart/add',
-      method: 'POST',
-      data: data,
-      // TODO 芋艿：这里没提示
-      custom: {
-        showSuccess: true,
-        successMsg: '已添加到购物车~',
-      }
-    });
-  },
-  updateCartCount: (data) => {
-    return request2({
-      url: '/app-api/trade/cart/update-count',
-      method: 'PUT',
-      data: data
-    });
-  },
-  updateCartSelected: (data) => {
-    return request2({
-      url: '/app-api/trade/cart/update-selected',
-      method: 'PUT',
-      data: data
-    });
-  },
-  deleteCart: (ids) => {
-    return request2({
-      url: '/app-api/trade/cart/delete',
-      method: 'DELETE',
-      params: {
-        ids
-      }
-    });
-  },
-  getCartList: () => {
-    return request2({
-      url: '/app-api/trade/cart/list',
-      method: 'GET',
-    });
-  },
-};
-
-export default CartApi;

sheep/api/trade/order.js

@@ -1,85 +0,0 @@
-import request2 from '@/sheep/request2';
-import request from '@/sheep/request';
-
-const OrderApi = {
-  // 计算订单信息
-  settlementOrder: (data) => {
-    const data2 = {
-      ...data,
-    };
-    // 移除多余字段
-    if (!(data.couponId > 0)) {
-      delete data2.couponId;
-    }
-    if (!(data.addressId > 0)) {
-      delete data2.addressId;
-    }
-    // 解决 SpringMVC 接受 List<Item> 参数的问题
-    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 + '';
-      if (data.items[i].cartId) {
-        data2[encodeURIComponent('items[' + i + '' + '].cartId')] = data.items[i].cartId + '';
-      }
-    }
-    const queryString = Object.keys(data2)
-      .map((key) => key + '=' + data2[key])
-      .join('&');
-    return request2({
-      url: `trade/order/settlement?${queryString}`,
-      method: 'GET',
-    });
-  },
-  // 创建订单
-  createOrder: (data) => {
-    return request2({
-      url: `trade/order/create`,
-      method: 'POST',
-      data,
-    });
-  },
-  // 获得订单
-  getOrder: (id) => {
-    return request2({
-      url: `trade/order/get-detail`,
-      method: 'GET',
-      params: {
-        id,
-      },
-    });
-  },
-  // 订单列表
-  getOrderPage: (params) => {
-    return request({
-      url: '/app-api/trade/order/page',
-      method: 'GET',
-      params,
-      custom: {
-        showLoading: false,
-      },
-    });
-  },
-  // 确认收货
-  receiveOrder: (id) => {
-    return request2({
-      url: `/app-api/trade/order/receive`,
-      method: 'PUT',
-      params: {
-        id,
-      },
-    });
-  },
-  // 获得交易订单的物流轨迹
-  getOrderExpressTrackList: (id) => {
-    return request2({
-      url: `/app-api/trade/order/get-express-track-list`,
-      method: 'GET',
-      params: {
-        id,
-      },
-    });
-  }
-};
-
-export default OrderApi;

sheep/api/user.js

@@ -1,10 +1,11 @@
 import request from '@/sheep/request';
+import request2 from '@/sheep/request2';
 import $platform from '@/sheep/platform';
 
 export default {
 	getUnused: () =>
-		request({
-			url: '/app-api/promotion/coupon/get-unused-count',
+		request2({
+			url: 'promotion/coupon/get-unused-count',
 			method: 'GET',
 			custom: {
 				showLoading: false,
@@ -12,8 +13,8 @@ export default {
 			},
 		}),
 	profile: () =>
-		request({
-			url: '/app-api/member/user/get',
+		request2({
+			url: 'member/user/get',
 			method: 'GET',
 			custom: {
 				showLoading: false,
@@ -21,7 +22,7 @@ export default {
 			},
 		}),
 	balance: () =>
-		request({
+		request2({
 			url: '/app-api/pay/wallet/get',
 			method: 'GET',
 			custom: {
@@ -29,9 +30,28 @@ export default {
 				auth: true,
 			},
 		}),
+	// profile: () =>
+	//   request({
+	//     url: '/user/api/user/profile',
+	//     method: 'GET',
+	//     custom: {
+	//       showLoading: false,
+	//       auth: true,
+	//     },
+	//   }),
+	// update: (data) =>
+	//   request({
+	//     url: '/user/api/user/update',
+	//     method: 'POST',
+	//     custom: {
+	//       showSuccess: true,
+	//       auth: true,
+	//     },
+	//     data,
+	//   }),
 	update: (data) =>
-		request({
-			url: '/app-api/member/user/update',
+		request2({
+			url: 'member/user/update',
 			method: 'PUT',
 			custom: {
 				showSuccess: true,
@@ -176,48 +196,90 @@ export default {
 		}),
 
 	address: {
+		// default: () =>
+		// 	request({
+		// 		url: 'user/address/default',
+		// 		method: 'GET',
+		// 		custom: {
+		// 			showError: false,
+		// 		},
+		// 	}),
 		default: () =>
-			request({
-				url: '/app-api/member/address/get-default',
+			request2({
+				url: 'member/address/get-default',
 				method: 'GET',
 				custom: {
 					showError: false,
 				},
 			}),
 		list: () =>
-			request({
-				url: '/app-api/member/address/list',
+			request2({
+				url: 'member/address/list',
 				method: 'GET',
 				custom: {},
 			}),
+		// list: () =>
+		//   request({
+		//     url: 'user/address',
+		//     method: 'GET',
+		//     custom: {},
+		//   }),
 		create: (data) =>
-			request({
-				url: '/app-api/member/address/create',
+			request2({
+				url: 'member/address/create',
 				method: 'POST',
 				data,
 				custom: {
 					showSuccess: true,
 				},
 			}),
+		// create: (data) =>
+		//   request({
+		//     url: 'user/address',
+		//     method: 'POST',
+		//     data,
+		//     custom: {
+		//       showSuccess: true,
+		//     },
+		//   }),
 		update: (data) =>
-			request({
-				url: '/app-api/member/address/update',
+			request2({
+				url: 'member/address/update',
 				method: 'PUT',
 				data,
 				custom: {
 					showSuccess: true,
 				},
 			}),
+		// update: (id, data) =>
+		// 	request({
+		// 		url: 'user/address/' + id,
+		// 		method: 'PUT',
+		// 		data,
+		// 		custom: {
+		// 			showSuccess: true,
+		// 		},
+		// 	}),
 		detail: (id) =>
-			request({
-				url: '/app-api/member/address/get?id=' + id,
+			request2({
+				url: 'member/address/get?id=' + id,
 				method: 'GET',
 			}),
+		// detail: (id) =>
+		//   request({
+		//     url: 'user/address/' + id,
+		//     method: 'GET',
+		//   }),
 		delete: (id) =>
-			request({
-				url: '/app-api/member/address/delete?id=' + id,
+			request2({
+				url: 'member/address/delete?id=' + id,
 				method: 'DELETE',
 			}),
+		// delete: (id) =>
+		// 	request({
+		// 		url: 'user/address/' + id,
+		// 		method: 'DELETE',
+		// 	}),
 	},
 	invoice: {
 		list: () =>
@@ -257,29 +319,17 @@ export default {
 	},
 	favorite: {
 		list: (params) =>
-			request({
-				url: '/app-api/product/favorite/page',
+			request2({
+				url: 'product/favorite/page',
 				method: 'GET',
 				params,
 			}),
 		do: (id) =>
 			request({
-				url: '/app-api/product/favorite/create',
+				url: 'user/goodsLog/favorite',
 				method: 'POST',
 				data: {
-					spuId: id,
-				},
-				custom: {
-					showSuccess: true,
-					auth: true,
-				},
-			}),
-		dos: (id) =>
-			request({
-				url: '/app-api/product/favorite/delete',
-				method: 'DELETE',
-				data: {
-					spuId: id,
+					goods_id: id,
 				},
 				custom: {
 					showSuccess: true,
@@ -288,8 +338,8 @@ export default {
 			}),
 		// 取消收藏
 		cancel: (id) =>
-			request({
-				url: '/app-api/product/favorite/delete-list',
+			request2({
+				url: 'product/favorite/delete-list',
 				method: 'DELETE',
 				data: {
 					spuIds: id.split(',').map(item => item * 1),
@@ -300,6 +350,18 @@ export default {
 					auth: true,
 				},
 			}),
+		// cancel: (id) =>
+		//   request({
+		//     url: 'user/goodsLog/favorite',
+		//     method: 'POST',
+		//     data: {
+		//       goods_ids: id,
+		//     },
+		//     custom: {
+		//       showSuccess: true,
+		//       auth: true,
+		//     },
+		//   }),
 	},
 	view: {
 		list: (params) =>
@@ -321,21 +383,28 @@ export default {
 	},
 	wallet: {
 		log: (params) =>
-			request({
+			request2({
 				// url: 'member/point/record/page',
-				url: '/app-api/pay/wallet-transaction/page',
+				url: 'pay/wallet-transaction/page',
 				method: 'GET',
 				params,
 				custom: {},
 			}),
 		log2: (params) =>
-			request({
-				url: '/app-api/member/point/record/page',
+			request2({
+				url: 'member/point/record/page',
 				// url: 'pay/wallet-transaction/page',
 				method: 'GET',
 				params,
 				custom: {},
 			}),
+		// log: (params) =>
+		// request({
+		// 	url: '/user/api/walletLog',
+		// 	method: 'GET',
+		// 	params,
+		// 	custom: {},
+		// }),
 	},
 	account: {
 		info: (params) =>
@@ -360,9 +429,18 @@ export default {
 			}),
 	},
 	//数量接口
+	// data: () =>
+	//   request({
+	//     url: 'user/user/data',
+	//     method: 'GET',
+	//     custom: {
+	//       showLoading: false,
+	//       auth: true,
+	//     },
+	//   }),
 	data: () =>
-		request({
-			url: '/app-api/trade/order/get-count',
+		request2({
+			url: 'trade/order/get-count',
 			method: 'GET',
 			custom: {
 				showLoading: false,
@@ -370,8 +448,8 @@ export default {
 			},
 		}),
 	data2: () =>
-		request({
-			url: '/app-api/trade/after-sale/get-applying-count',
+		request2({
+			url: 'trade/after-sale/get-applying-count',
 			method: 'GET',
 			custom: {
 				showLoading: false,