From 492d84073d5f8240a71228f72f984bb91ce5e40d Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 17 Jan 2024 19:45:39 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E5=85=A8=E5=B1=80=EF=BC=9A?=
 =?UTF-8?q?=E6=B8=85=E7=90=86=E5=A4=9A=E4=BD=99=E7=9A=84=20request2.js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/bargain/detail.vue             |  23 +-
 pages/activity/bargain/list.vue               |   2 +-
 pages/activity/groupon/order.vue              |   2 +-
 pages/chat/components/select-popup.vue        |   7 +-
 pages/coupon/list.vue                         |  10 +-
 pages/goods/comment/add.vue                   |   2 +-
 pages/goods/list.vue                          |   8 +-
 pages/order/aftersale/list.vue                |   2 +-
 pages/order/detail.vue                        |   3 +-
 sheep/api/activity.js                         |  48 ----
 sheep/api/cart.js                             |  42 ----
 sheep/api/category.js                         |  10 -
 sheep/api/coupon.js                           |  29 ---
 sheep/api/goods.js                            |  58 -----
 sheep/api/{ => migration}/app.js              |   7 +-
 sheep/api/{ => migration}/chat.js             |   1 +
 sheep/api/{ => migration}/index.js            |   3 -
 sheep/api/migration/third.js                  |  44 ++++
 sheep/api/order.js                            | 186 --------------
 sheep/api/promotion/activity.js               |   4 +-
 sheep/api/promotion/bargain.js                |  28 +++
 sheep/api/promotion/seckill.js                |  10 +-
 sheep/api/third.js                            | 103 --------
 sheep/api/trade.js                            |  23 --
 sheep/api/trade/afterSale.js                  |  11 +
 sheep/api/user.js                             | 168 -------------
 .../s-coupon-block/s-coupon-block.vue         |  13 +-
 sheep/hooks/useModal.js                       |   4 +-
 sheep/index.js                                |   2 -
 sheep/libs/sdk-h5-weixin.js                   |   1 -
 .../provider/wechat/officialAccount.js        |   1 -
 sheep/request/index.js                        |   1 +
 sheep/request2/index.js                       | 226 ------------------
 sheep/store/app.js                            |   1 -
 sheep/store/user.js                           |   4 +-
 35 files changed, 123 insertions(+), 964 deletions(-)
 delete mode 100644 sheep/api/activity.js
 delete mode 100644 sheep/api/cart.js
 delete mode 100644 sheep/api/category.js
 delete mode 100644 sheep/api/coupon.js
 delete mode 100644 sheep/api/goods.js
 rename sheep/api/{ => migration}/app.js (78%)
 rename sheep/api/{ => migration}/chat.js (84%)
 rename sheep/api/{ => migration}/index.js (54%)
 create mode 100644 sheep/api/migration/third.js
 delete mode 100644 sheep/api/order.js
 create mode 100644 sheep/api/promotion/bargain.js
 delete mode 100644 sheep/api/third.js
 delete mode 100644 sheep/api/trade.js
 delete mode 100644 sheep/api/user.js
 delete mode 100644 sheep/request2/index.js

diff --git a/pages/activity/bargain/detail.vue b/pages/activity/bargain/detail.vue
index 4687b87..23fe5e9 100644
--- a/pages/activity/bargain/detail.vue
+++ b/pages/activity/bargain/detail.vue
@@ -102,25 +102,10 @@
 </template>
 
 <script setup>
-	import {
-		computed,
-		reactive
-	} from 'vue';
+	import { reactive } from 'vue';
 	import sheep from '@/sheep';
-	import _ from 'lodash';
-	import {
-		onLoad,
-		onReachBottom
-	} from '@dcloudio/uni-app';
-	import {
-		useDurationTime
-	} from '@/sheep/hooks/useGoods';
-	import {
-		showShareModal
-	} from '@/sheep/hooks/useModal';
-	import {
-		isEmpty
-	} from 'lodash';
+	import { onLoad } from '@dcloudio/uni-app';
+  import BargainApi from '@/sheep/api/promotion/bargain'
 
 	const state = reactive({
 		id: '',
@@ -142,7 +127,7 @@
 		let {
 			data,
 			code
-		} = await sheep.$api.activity.getBargainActivityDetail({
+		} = await BargainApi.getBargainActivityDetail({
 			id: state.id
 		})
 		if (code == 0) {
diff --git a/pages/activity/bargain/list.vue b/pages/activity/bargain/list.vue
index 4619687..f55a0e2 100644
--- a/pages/activity/bargain/list.vue
+++ b/pages/activity/bargain/list.vue
@@ -82,7 +82,7 @@
 	import {
 		fen2yuan
 	} from '@/sheep/hooks/useGoods';
-	import BargainApi from '@/sheep/api/activity'
+	import BargainApi from '@/sheep/api/promotion/bargain'
 	const state = reactive({
 		navH: '',
 		returnShow: true,
diff --git a/pages/activity/groupon/order.vue b/pages/activity/groupon/order.vue
index cf98253..fc2a38a 100644
--- a/pages/activity/groupon/order.vue
+++ b/pages/activity/groupon/order.vue
@@ -38,7 +38,7 @@
         <view class="order-card-footer ss-flex ss-row-right ss-p-x-20">
           <button
             class="detail-btn ss-reset-button"
-            @tap="sheep.$router.go('/pages/order/detail', { id: record.id })"
+            @tap="sheep.$router.go('/pages/order/detail', { id: record.orderId })"
           >
             订单详情
           </button>
diff --git a/pages/chat/components/select-popup.vue b/pages/chat/components/select-popup.vue
index ba0f96a..cd829a1 100644
--- a/pages/chat/components/select-popup.vue
+++ b/pages/chat/components/select-popup.vue
@@ -32,11 +32,12 @@
 
 <script setup>
   import { reactive, watch } from 'vue';
-  import { onLoad } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
   import _ from 'lodash';
   import GoodsItem from './goods.vue';
   import OrderItem from './order.vue';
+  import OrderApi from '@/sheep/api/trade/order';
+  import SpuHistoryApi from '@/sheep/api/product/history';
 
   const emits = defineEmits(['select', 'close']);
   const props = defineProps({
@@ -74,11 +75,11 @@
     state.loadStatus = 'loading';
     const res =
       props.mode == 'goods'
-        ? await sheep.$api.user.view.list({
+        ? await SpuHistoryApi.getBrowseHistoryPage({
             page,
             list_rows,
           })
-        : await sheep.$api.order.list({
+        : await OrderApi.getOrderPage({
             page,
             list_rows,
           });
diff --git a/pages/coupon/list.vue b/pages/coupon/list.vue
index 5c01f29..e7c4394 100644
--- a/pages/coupon/list.vue
+++ b/pages/coupon/list.vue
@@ -15,7 +15,7 @@
       text="暂无优惠券"
     />
     <!-- 情况一：领劵中心 -->
-    <template v-if="state.currentTab === '0'">
+    <template v-if="state.currentTab === 0">
       <view v-for="item in state.pagination.list" :key="item.id">
         <s-coupon-list
           :data="item"
@@ -40,11 +40,7 @@
         <s-coupon-list
           :data="item"
           type="user"
-          @tap="
-            sheep.$router.go('/pages/coupon/detail', {
-              data: JSON.stringify(item),
-            })
-          "
+          @tap="sheep.$router.go('/pages/coupon/detail', { couponId: item.id })"
         >
           <template #default>
             <button
@@ -183,12 +179,12 @@
       getData();
     // 我的优惠劵
     } else {
-      state.type = Option.type;
       Option.type === 'geted'
         ? (state.currentTab = 1)
         : Option.type === 'used'
           ? (state.currentTab = 2)
           : (state.currentTab = 3);
+      state.type = state.currentTab;
       getCoupon();
     }
   });
diff --git a/pages/goods/comment/add.vue b/pages/goods/comment/add.vue
index 9ffda27..43d08c4 100644
--- a/pages/goods/comment/add.vue
+++ b/pages/goods/comment/add.vue
@@ -80,7 +80,7 @@
     }
 		state.id = options.id;
 
-		const { code, data } = await sheep.$api.order.detail(state.id);
+		const { code, data } = await OrderApi.getOrder(state.id);
     if (code !== 0) {
       sheep.$helper.toast('无待评价订单');
       return
diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index 6fae623..36240d5 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -87,13 +87,11 @@
 
 <script setup>
 	import { reactive } from 'vue';
-	import {
-		onLoad,
-		onReachBottom
-	} from '@dcloudio/uni-app';
+	import { onLoad, onReachBottom } from '@dcloudio/uni-app';
 	import sheep from '@/sheep';
 	import _ from 'lodash';
   import { resetPagination } from '@/sheep/util';
+  import SpuApi from '@/sheep/api/product/spu';
 
 	const sys_navBar = sheep.$platform.navbar;
 	const emits = defineEmits(['close', 'change']);
@@ -232,7 +230,7 @@
 
 	async function getList() {
 		state.loadStatus = 'loading';
-		const { code, data } = await sheep.$api.goods.list({
+		const { code, data } = await SpuApi.getSpuPage({
       pageNo: state.pagination.pageNo,
       pageSize: state.pagination.pageSize,
 			sortField: state.currentSort,
diff --git a/pages/order/aftersale/list.vue b/pages/order/aftersale/list.vue
index 1201386..7af6f32 100644
--- a/pages/order/aftersale/list.vue
+++ b/pages/order/aftersale/list.vue
@@ -102,7 +102,7 @@
 	// 获取售后列表
 	async function getOrderList() {
 		state.loadStatus = 'loading';
-		let { data, code } = await sheep.$api.order.aftersale.list({
+		let { data, code } = await AfterSaleApi.getAfterSalePage({
 			// type: tabMaps[state.currentTab].value,
       pageNo: state.pagination.pageNo,
       pageSize: state.pagination.pageSize,
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 5299873..6b3025b 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -372,7 +372,8 @@
     // 对详情数据进行适配
     let res;
     if (state.comeinType === 'wechat') {
-      res = await sheep.$api.order.detail(id, {
+      // TODO 芋艿：微信场景下
+      res = await OrderApi.getOrder(id, {
         merchant_trade_no: state.merchantTradeNo,
       });
     } else {
diff --git a/sheep/api/activity.js b/sheep/api/activity.js
deleted file mode 100644
index 09b3f00..0000000
--- a/sheep/api/activity.js
+++ /dev/null
@@ -1,48 +0,0 @@
-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',
-		}),
-	activity: (id) =>
-		request({
-			url: 'activity/activity/' + id,
-			method: 'GET',
-		}),
-  getSummary: () =>
-    request({
-      url: '/app-api/member/sign-in/record/get-summary',
-      method: 'GET',
-    }),
-	getBargainRecordSummary: () =>
-		request({
-			url: '/app-api/promotion/bargain-record/get-summary',
-			method: 'GET',
-		}),
-	getBargainActivityPage: () =>
-		request({
-			url: '/app-api/promotion/bargain-activity/page',
-			method: 'GET',
-		}),
-	getBargainActivityDetail: (params) =>
-		request({
-			url: '/app-api/promotion/bargain-activity/get-detail',
-			method: 'GET',
-			params
-		}),
-
-};
\ No newline at end of file
diff --git a/sheep/api/cart.js b/sheep/api/cart.js
deleted file mode 100644
index f4aacaa..0000000
--- a/sheep/api/cart.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import request from '@/sheep/request';
-import request2 from '@/sheep/request2';
-
-export default {
-	list: (data) =>
-		request2({
-			url: 'trade/cart/list',
-			method: 'GET',
-			custom: {
-				showLoading: false,
-				auth: true,
-			},
-		}),
-	append: (data) =>
-		request({
-			url: 'cart',
-			method: 'POST',
-			custom: {
-				showSuccess: true,
-				successMsg: '已添加到购物车~',
-			},
-			data: {
-				...data,
-				type: 'inc',
-			},
-		}),
-	// 删除购物车
-	delete: (ids) =>
-		request2({
-			url: 'trade/cart/delete?ids=' + ids,
-			method: 'DELETE',
-		}),
-	update: (data) =>
-		request2({
-			url: 'trade/cart/update-count',
-			method: 'PUT',
-			data: {
-				...data,
-				type: 'cover',
-			},
-		}),
-};
\ No newline at end of file
diff --git a/sheep/api/category.js b/sheep/api/category.js
deleted file mode 100644
index 9c82506..0000000
--- a/sheep/api/category.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import request2 from '@/sheep/request2';
-
-export default {
-  list: (params) =>
-    request2({
-      url: 'product/category/list',
-      method: 'GET',
-      params,
-    }),
-};
diff --git a/sheep/api/coupon.js b/sheep/api/coupon.js
deleted file mode 100644
index 95fd11c..0000000
--- a/sheep/api/coupon.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import request from '@/sheep/request';
-import request2 from '@/sheep/request2';
-
-export default {
-	// 我的拼团
-	list: (params) =>
-		request({
-			url: 'coupon',
-			method: 'GET',
-			params,
-			custom: {
-				showLoading: false,
-			},
-		}),
-
-	detail: (id, user_coupon_id) =>
-		request({
-			url: 'coupon/' + id,
-			method: 'GET',
-			params: {
-				user_coupon_id,
-			},
-		}),
-	get: (id) =>
-		request({
-			url: 'coupon/get/' + id,
-			method: 'POST',
-		}),
-};
\ No newline at end of file
diff --git a/sheep/api/goods.js b/sheep/api/goods.js
deleted file mode 100644
index 3368221..0000000
--- a/sheep/api/goods.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import request from '@/sheep/request';
-import request2 from '@/sheep/request2';
-
-export default {
-  // 商品详情
-  detail: (id, params = {}) =>
-    request2({
-      url: 'product/spu/get-detail?id=' + id,
-      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,
-      },
-    }),
-
-  // 商品查询
-  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,
-    }),
-};
diff --git a/sheep/api/app.js b/sheep/api/migration/app.js
similarity index 78%
rename from sheep/api/app.js
rename to sheep/api/migration/app.js
index 4f4f415..158414f 100644
--- a/sheep/api/app.js
+++ b/sheep/api/migration/app.js
@@ -1,12 +1,7 @@
 import request from '@/sheep/request';
 
+// TODO 芋艿：小程序直播还不支持
 export default {
-  // 自定义页面
-  page: (id) =>
-    request({
-      url: 'page/' + id,
-      method: 'GET',
-    }),
   //小程序直播
   mplive: {
     getRoomList: (ids) =>
diff --git a/sheep/api/chat.js b/sheep/api/migration/chat.js
similarity index 84%
rename from sheep/api/chat.js
rename to sheep/api/migration/chat.js
index 5a4a544..140dd75 100644
--- a/sheep/api/chat.js
+++ b/sheep/api/migration/chat.js
@@ -1,5 +1,6 @@
 import request from '@/sheep/request';
 
+// TODO 芋艿：暂不支持 socket 聊天
 export default {
   // 获取聊天token
   unifiedToken: () =>
diff --git a/sheep/api/index.js b/sheep/api/migration/index.js
similarity index 54%
rename from sheep/api/index.js
rename to sheep/api/migration/index.js
index d415fa4..7c429fb 100644
--- a/sheep/api/index.js
+++ b/sheep/api/migration/index.js
@@ -7,7 +7,4 @@ Object.keys(files).forEach((key) => {
   };
 });
 
-// TODO 芋艿：直接在 useModal 引入 AuthUtil 会报错，所以采用这用这方式先
-api.AuthUtil = import.meta.globEager('./member/auth.js')['./member/auth.js'].default;
-
 export default api;
\ No newline at end of file
diff --git a/sheep/api/migration/third.js b/sheep/api/migration/third.js
new file mode 100644
index 0000000..277e0c3
--- /dev/null
+++ b/sheep/api/migration/third.js
@@ -0,0 +1,44 @@
+import request from '@/sheep/request';
+import { baseUrl, apiPath } from '@/sheep/config';
+
+export default {
+  // 微信相关
+  wechat: {
+    // 小程序订阅消息
+    subscribeTemplate: (params) =>
+      request({
+        url: 'third/wechat/subscribeTemplate',
+        method: 'GET',
+        params: {
+          platform: 'miniProgram',
+        },
+        custom: {
+          showError: false,
+          showLoading: false,
+        },
+      }),
+
+    // 获取微信小程序码
+    getWxacode: (path) =>
+      `${baseUrl}${apiPath}third/wechat/wxacode?platform=miniProgram&payload=${encodeURIComponent(
+        JSON.stringify({
+          path,
+        }),
+      )}`,
+  },
+
+  // 苹果相关
+  apple: {
+    // 第三方登录
+    login: (data) =>
+      request({
+        url: 'third/apple/login',
+        method: 'POST',
+        data,
+        custom: {
+          showSuccess: true,
+          loadingMsg: '登陆中',
+        },
+      }),
+  },
+};
diff --git a/sheep/api/order.js b/sheep/api/order.js
deleted file mode 100644
index 7b27d44..0000000
--- a/sheep/api/order.js
+++ /dev/null
@@ -1,186 +0,0 @@
-import request from '@/sheep/request';
-import request2 from '@/sheep/request2';
-
-export default {
-	// 订单详情
-	detail: (id, params) =>
-		request2({
-			url: 'trade/order/get-detail?id=' + id,
-			method: 'GET',
-			params,
-		}),
-	// detail: (id, params) =>
-	// 	request({
-	// 		url: 'order/order/' + id,
-	// 		method: 'GET',
-	// 		params,
-	// 	}),
-	// 获取支付结果
-	payResult: (id) =>
-		request({
-			url: 'order/order/' + id,
-			method: 'GET',
-			custom: {
-				showLoading: false,
-			},
-		}),
-	itemDetail: (id, itemId) =>
-		request({
-			url: 'order/order/itemDetail/' + id + '/' + itemId,
-			method: 'GET',
-			custom: {
-				showLoading: false,
-			},
-		}),
-	// 订单列表
-	list: (params) =>
-		request2({
-			url: 'trade/order/page',
-			method: 'GET',
-			params,
-			custom: {
-				showLoading: false,
-			},
-		}),
-	// list: (params) =>
-	//   request({
-	//     url: 'order/order',
-	//     method: 'GET',
-	//     params,
-	//     custom: {
-	//       showLoading: false,
-	//     },
-	//   }),
-	// 计算订单信息
-	calc: (data) => {
-		const data2 = {
-			...data,
-		}
-		// 解决 SpringMVC 接受 List<Item> 参数的问题
-		delete data2.items
-		for (let i = 0; i < data.items.length; i++) {
-			// 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 request2({
-			url: 'trade/order/settlement',
-			method: 'GET',
-			// data,
-			params: data2
-		})
-	},
-	// calc: (data) =>
-	//   request({
-	//     url: 'order/order/calc',
-	//     method: 'POST',
-	//     data,
-	//   }),
-	// 创建订单
-	create: (data) =>
-		request({
-			url: 'order/order/create',
-			method: 'POST',
-			data,
-		}),
-	//订单可用优惠券
-	coupons: (data) =>
-		request({
-			url: 'order/order/coupons',
-			method: 'POST',
-			data,
-		}),
-	// 确认收货
-	confirm: (id) =>
-		request({
-			url: 'order/order/confirm/' + id,
-			method: 'PUT',
-		}),
-	// 评价订单
-	comment: (data) =>
-		request2({
-			url: 'trade/order/item/create-comment',
-			method: 'POST',
-			data,
-		}),
-	// comment: (id, data) =>
-	// 	request({
-	// 		url: 'order/order/comment/' + id,
-	// 		method: 'POST',
-	// 		data,
-	// 	}),
-	// 申请退款
-	applyRefund: (id) =>
-		request({
-			url: 'order/order/applyRefund/' + id,
-			method: 'PUT',
-		}),
-	// 取消订单
-	cancel: (id) =>
-		request({
-			url: 'order/order/cancel/' + id,
-			method: 'PUT',
-		}),
-	// 删除订单
-	delete: (id) =>
-		request({
-			url: 'order/order/' + id,
-			method: 'DELETE',
-		}),
-	// 售后
-	aftersale: {
-		// 申请售后
-		apply: (data) =>
-			request({
-				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({
-				url: 'order/aftersale/cancel/' + id,
-				method: 'PUT',
-			}),
-		//删除售后单
-		delete: (id) =>
-			request({
-				url: 'order/aftersale/' + id,
-				method: 'DELETE',
-			}),
-		// 售后详情
-		detail: (id) =>
-			request2({
-				url: 'trade/after-sale/get?id=' + id,
-				method: 'GET',
-			}),
-	},
-	//订单包裹
-	express: (id, orderId) =>
-		request({
-			url: 'order/express/' + id + `${orderId ? '/' + orderId : ''}`,
-			method: 'GET',
-		}),
-};
\ No newline at end of file
diff --git a/sheep/api/promotion/activity.js b/sheep/api/promotion/activity.js
index efa0e1e..183b4ff 100644
--- a/sheep/api/promotion/activity.js
+++ b/sheep/api/promotion/activity.js
@@ -1,9 +1,9 @@
-import request2 from '@/sheep/request2';
+import request from '@/sheep/request';
 
 const ActivityApi = {
   // 获得单个商品，近期参与的每个活动
   getActivityListBySpuId: (spuId) => {
-    return request2({
+    return request({
       url: '/app-api/promotion/activity/list-by-spu-id',
       method: 'GET',
       params: {
diff --git a/sheep/api/promotion/bargain.js b/sheep/api/promotion/bargain.js
new file mode 100644
index 0000000..5e01a6f
--- /dev/null
+++ b/sheep/api/promotion/bargain.js
@@ -0,0 +1,28 @@
+import request from '@/sheep/request';
+
+const BargainApi = {
+  // 获得砍价记录的概要信息
+  getBargainRecordSummary: () => {
+    return request({
+      url: '/app-api/promotion/bargain-record/get-summary',
+      method: 'GET',
+    });
+  },
+  // 获得砍价活动分页
+  getBargainActivityPage: () => {
+    return request({
+      url: '/app-api/promotion/bargain-activity/page',
+      method: 'GET',
+    });
+  },
+  // 获得砍价活动详情
+  getBargainActivityDetail(params) {
+    return request({
+      url: '/app-api/promotion/bargain-activity/get-detail',
+      method: 'GET',
+      params,
+    });
+  },
+};
+
+export default BargainApi;
diff --git a/sheep/api/promotion/seckill.js b/sheep/api/promotion/seckill.js
index aa0fdcd..4d41e8b 100644
--- a/sheep/api/promotion/seckill.js
+++ b/sheep/api/promotion/seckill.js
@@ -1,19 +1,19 @@
-import request2 from "@/sheep/request2";
+import request from "@/sheep/request";
 
 const SeckillApi = {
   // 获得秒杀时间段列表
   getSeckillConfigList: () => {
-    return request2({ url: 'promotion/seckill-config/list', method: 'GET' });
+    return request({ url: 'promotion/seckill-config/list', method: 'GET' });
   },
 
   // 获得当前秒杀活动
   getNowSeckillActivity: () => {
-    return request2({ url: 'promotion/seckill-activity/get-now', method: 'GET' });
+    return request({ url: 'promotion/seckill-activity/get-now', method: 'GET' });
   },
 
   // 获得秒杀活动分页
   getSeckillActivityPage: (params) => {
-    return request2({ url: 'promotion/seckill-activity/page', method: 'GET', params });
+    return request({ url: 'promotion/seckill-activity/page', method: 'GET', params });
   },
 
   /**
@@ -22,7 +22,7 @@ const SeckillApi = {
    * @return {*}
    */
   getSeckillActivity: (id) => {
-    return request2({
+    return request({
       url: 'promotion/seckill-activity/get-detail',
       method: 'GET',
       params: { id }
diff --git a/sheep/api/third.js b/sheep/api/third.js
deleted file mode 100644
index d1cc02c..0000000
--- a/sheep/api/third.js
+++ /dev/null
@@ -1,103 +0,0 @@
-import request from '@/sheep/request';
-import { baseUrl, apiPath } from '@/sheep/config';
-
-export default {
-  // 微信相关
-  wechat: {
-    // 第三方登录
-    login: (data) =>
-      request({
-        url: 'third/wechat/login',
-        method: 'POST',
-        data,
-        custom: {
-          showSuccess: true,
-          loadingMsg: '登陆中',
-        },
-      }),
-
-    // 绑定微信
-    bind: (data) =>
-      request({
-        url: 'third/wechat/bind',
-        method: 'POST',
-        data,
-        custom: {
-          showSuccess: true,
-          loadingMsg: '绑定中',
-        },
-      }),
-
-    // 公众号授权
-    oauthLogin: (data) =>
-      request({
-        url: 'third/wechat/oauthLogin',
-        method: 'GET',
-        data,
-        custom: {
-          showSuccess: true,
-          loadingMsg: '登陆中',
-        },
-      }),
-
-    // 获取小程序sessionKey（后端不会给前端返回真实的sessionKey）
-    getSessionId: (data) =>
-      request({
-        url: 'third/wechat/getSessionId',
-        method: 'POST',
-        data,
-        custom: {
-          showLoading: false,
-        },
-      }),
-
-    // 微信小程序 绑定一键获取的手机号
-    bindUserPhoneNumber: (data) =>
-      request({
-        url: 'third/wechat/bindUserPhoneNumber',
-        method: 'POST',
-        data,
-        custom: {
-          showSuccess: true,
-          loadingMsg: '获取中',
-        },
-      }),
-
-    // 小程序订阅消息
-    subscribeTemplate: (params) =>
-      request({
-        url: 'third/wechat/subscribeTemplate',
-        method: 'GET',
-        params: {
-          platform: 'miniProgram',
-        },
-        custom: {
-          showError: false,
-          showLoading: false,
-        },
-      }),
-
-    // 获取微信小程序码
-    getWxacode: (path) =>
-      `${baseUrl}${apiPath}third/wechat/wxacode?platform=miniProgram&payload=${encodeURIComponent(
-        JSON.stringify({
-          path,
-        }),
-      )}`,
-  },
-
-  // 苹果相关
-  apple: {
-    // 第三方登录
-    login: (data) =>
-      request({
-        url: 'third/apple/login',
-        method: 'POST',
-        data,
-        custom: {
-          showSuccess: true,
-          loadingMsg: '登陆中',
-        },
-      }),
-  },
-};
diff --git a/sheep/api/trade.js b/sheep/api/trade.js
deleted file mode 100644
index 51df968..0000000
--- a/sheep/api/trade.js
+++ /dev/null
@@ -1,23 +0,0 @@
-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,
-			},
-		}),
-
-
-};
\ No newline at end of file
diff --git a/sheep/api/trade/afterSale.js b/sheep/api/trade/afterSale.js
index 716826b..85e3dab 100644
--- a/sheep/api/trade/afterSale.js
+++ b/sheep/api/trade/afterSale.js
@@ -1,6 +1,17 @@
 import request from '@/sheep/request';
 
 const AfterSaleApi = {
+  // 获得售后分页
+  getAfterSalePage: (params) => {
+    return request({
+      url: `/app-api/trade/after-sale/page`,
+      method: 'GET',
+      params,
+      custom: {
+        showLoading: false,
+      },
+    });
+  },
   // 创建售后
   createAfterSale: (data) => {
     return request({
diff --git a/sheep/api/user.js b/sheep/api/user.js
deleted file mode 100644
index 6f87b0e..0000000
--- a/sheep/api/user.js
+++ /dev/null
@@ -1,168 +0,0 @@
-import request from '@/sheep/request';
-import request2 from '@/sheep/request2';
-import $platform from '@/sheep/platform';
-
-export default {
-
-
-
-	// 添加分享记录
-	addShareLog: (data) =>
-		request({
-			url: 'share/add',
-			method: 'POST',
-			data,
-			custom: {
-				showError: false,
-			},
-		}),
-	share: {
-		list: (params) =>
-			request({
-				url: 'share/list',
-				method: 'GET',
-				params,
-			}),
-	},
-
-	address: {
-		default: () =>
-			request2({
-				url: 'member/address/get-default',
-				method: 'GET',
-				custom: {
-					showError: false,
-				},
-			}),
-		list: () =>
-			request2({
-				url: 'member/address/list',
-				method: 'GET',
-				custom: {},
-			}),
-		create: (data) =>
-			request2({
-				url: 'member/address/create',
-				method: 'POST',
-				data,
-				custom: {
-					showSuccess: true,
-				},
-			}),
-		update: (data) =>
-			request2({
-				url: 'member/address/update',
-				method: 'PUT',
-				data,
-				custom: {
-					showSuccess: true,
-				},
-			}),
-		detail: (id) =>
-			request2({
-				url: 'member/address/get?id=' + id,
-				method: 'GET',
-			}),
-		delete: (id) =>
-			request2({
-				url: 'member/address/delete?id=' + id,
-				method: 'DELETE',
-			}),
-	},
-	favorite: {
-		list: (params) =>
-			request2({
-				url: 'product/favorite/page',
-				method: 'GET',
-				params,
-			}),
-		do: (id) =>
-			request({
-				url: 'user/goodsLog/favorite',
-				method: 'POST',
-				data: {
-					goods_id: id,
-				},
-				custom: {
-					showSuccess: true,
-					auth: true,
-				},
-			}),
-		// 取消收藏
-		cancel: (id) =>
-			request2({
-				url: 'product/favorite/delete-list',
-				method: 'DELETE',
-				data: {
-					spuIds: id.split(',').map(item => item * 1),
-					// spuIds: id.split(',').join(','),
-				},
-				custom: {
-					showSuccess: true,
-					auth: true,
-				},
-			}),
-		// cancel: (id) =>
-		//   request({
-		//     url: 'user/goodsLog/favorite',
-		//     method: 'POST',
-		//     data: {
-		//       goods_ids: id,
-		//     },
-		//     custom: {
-		//       showSuccess: true,
-		//       auth: true,
-		//     },
-		//   }),
-	},
-	view: {
-		list: (params) =>
-			request({
-				url: 'user/goodsLog/views',
-				method: 'GET',
-				params,
-				custom: {},
-			}),
-		delete: (data) =>
-			request({
-				url: 'user/goodsLog/viewDel',
-				method: 'DELETE',
-				data,
-				custom: {
-					showSuccess: true,
-				},
-			}),
-	},
-	wallet: {
-		log: (params) =>
-			request2({
-				// url: 'member/point/record/page',
-				url: 'pay/wallet-transaction/page',
-				method: 'GET',
-				params,
-				custom: {},
-			}),
-	},
-	account: {
-		info: (params) =>
-			request({
-				url: 'user/account',
-				method: 'GET',
-				params,
-				custom: {
-					showError: false,
-					auth: true,
-				},
-			}),
-		save: (data) =>
-			request({
-				url: 'user/account',
-				method: 'POST',
-				data,
-				custom: {
-					showSuccess: true,
-					auth: true,
-				},
-			}),
-	}
-};
\ No newline at end of file
diff --git a/sheep/components/s-coupon-block/s-coupon-block.vue b/sheep/components/s-coupon-block/s-coupon-block.vue
index 22a7731..6250b4b 100644
--- a/sheep/components/s-coupon-block/s-coupon-block.vue
+++ b/sheep/components/s-coupon-block/s-coupon-block.vue
@@ -45,10 +45,10 @@
 
 <script setup>
   import sheep from '@/sheep';
-  import TemplateApi from '@/sheep/api/promotion/coupon';
+  import CouponApi from '@/sheep/api/promotion/coupon';
   import { ref, onMounted } from 'vue';
-  import {CouponTemplateValidityTypeEnum, PromotionDiscountTypeEnum} from "@/sheep/util/const";
-  import {floatToFixed2, formatDate} from "@/sheep/util";
+  import { CouponTemplateValidityTypeEnum, PromotionDiscountTypeEnum } from "@/sheep/util/const";
+  import { floatToFixed2, formatDate } from "@/sheep/util";
 
   const props = defineProps({
     data: {
@@ -91,6 +91,7 @@
     }
     return `未知【${coupon.discountType}】`
   }
+
   // 格式化【有效期限】
   const formatValidityType = (row) => {
     if (row.validityType === CouponTemplateValidityTypeEnum.DATE.type) {
@@ -103,9 +104,9 @@
   }
 
   const couponList = ref([]);
-  //立即领取优惠券
+  // 立即领取优惠券
   async function onGetCoupon(id) {
-    const { error, msg } = await sheep.$api.coupon.get(id);
+    const { error, msg } = await CouponApi.takeCoupon(id);
     if (error === 0) {
       uni.showToast({
         title: msg,
@@ -116,7 +117,7 @@
     await getCouponTemplateList()
   }
   const getCouponTemplateList = async () => {
-    const { data } = await TemplateApi.getCouponTemplateListByIds(props.data.couponIds.join(','));
+    const { data } = await CouponApi.getCouponTemplateListByIds(props.data.couponIds.join(','));
     couponList.value = data;
   }
   onMounted(() => {
diff --git a/sheep/hooks/useModal.js b/sheep/hooks/useModal.js
index 16ae4f8..e9d5b94 100644
--- a/sheep/hooks/useModal.js
+++ b/sheep/hooks/useModal.js
@@ -3,7 +3,7 @@ import $helper from '@/sheep/helper';
 import dayjs from 'dayjs';
 import { ref } from 'vue';
 import test from '@/sheep/helper/test.js';
-import $api from '@/sheep/api';
+import AuthUtil from '@/sheep/api/member/auth';
 
 // 打开授权弹框
 export function showAuthModal(type = 'smsLogin') {
@@ -94,7 +94,7 @@ export function getSmsCode(event, mobile) {
       scene = 1;
       break;
   }
-  $api.AuthUtil.sendSmsCode(mobile, scene).then((res) => {
+  AuthUtil.sendSmsCode(mobile, scene).then((res) => {
     if (res.code === 0) {
       modalStore.$patch((state) => {
         state.lastTimer[event] = dayjs().unix();
diff --git a/sheep/index.js b/sheep/index.js
index 2361ab7..9af8f08 100644
--- a/sheep/index.js
+++ b/sheep/index.js
@@ -1,4 +1,3 @@
-import $api from '@/sheep/api';
 import $url from '@/sheep/url';
 import $router from '@/sheep/router';
 import $platform from '@/sheep/platform';
@@ -15,7 +14,6 @@ dayjs.extend(relativeTime);
 dayjs.extend(duration);
 
 const sheep = {
-  $api,
   $store,
   $url,
   $router,
diff --git a/sheep/libs/sdk-h5-weixin.js b/sheep/libs/sdk-h5-weixin.js
index 57cafc4..a71b951 100644
--- a/sheep/libs/sdk-h5-weixin.js
+++ b/sheep/libs/sdk-h5-weixin.js
@@ -5,7 +5,6 @@
 
 import jweixin, { ready } from 'weixin-js-sdk';
 import $helper from '@/sheep/helper';
-import third from '@/sheep/api/third';
 import AuthUtil from '@/sheep/api/member/auth';
 
 let configSuccess = false;
diff --git a/sheep/platform/provider/wechat/officialAccount.js b/sheep/platform/provider/wechat/officialAccount.js
index cc3f4e6..2d3e5dd 100644
--- a/sheep/platform/provider/wechat/officialAccount.js
+++ b/sheep/platform/provider/wechat/officialAccount.js
@@ -1,4 +1,3 @@
-import third from '@/sheep/api/third';
 import $wxsdk from '@/sheep/libs/sdk-h5-weixin';
 import { getRootUrl } from '@/sheep/helper';
 import AuthUtil from '@/sheep/api/member/auth';
diff --git a/sheep/request/index.js b/sheep/request/index.js
index 120859f..c8dddcf 100644
--- a/sheep/request/index.js
+++ b/sheep/request/index.js
@@ -135,6 +135,7 @@ http.interceptors.response.use(
 				icon: 'none',
 			});
 		}
+    // TODO 芋艿：全局的 error code 处理；例如说 401
 		return Promise.resolve(response.data);
 	},
 	(error) => {
diff --git a/sheep/request2/index.js b/sheep/request2/index.js
deleted file mode 100644
index 6d4815f..0000000
--- a/sheep/request2/index.js
+++ /dev/null
@@ -1,226 +0,0 @@
-/**
- * Shopro-request
- * @description api模块管理，loading配置，请求拦截，错误处理
- */
-
-import Request from 'luch-request';
-import {
-	baseUrl,
-	apiPath
-} from '@/sheep/config';
-import $store from '@/sheep/store';
-import $platform from '@/sheep/platform';
-import {
-	showAuthModal
-} from '@/sheep/hooks/useModal';
-
-const options = {
-	// 显示操作成功消息 默认不显示
-	showSuccess: false,
-	// 成功提醒 默认使用后端返回值
-	successMsg: '',
-	// 显示失败消息 默认显示
-	showError: true,
-	// 失败提醒 默认使用后端返回信息
-	errorMsg: '',
-	// 显示请求时loading模态框 默认显示
-	showLoading: true,
-	// loading提醒文字
-	loadingMsg: '加载中',
-	// 需要授权才能请求 默认放开
-	auth: false,
-	// ...
-};
-
-// Loading全局实例
-let LoadingInstance = {
-	target: null,
-	count: 0,
-};
-
-/**
- * 关闭loading
- */
-function closeLoading() {
-	if (LoadingInstance.count > 0) LoadingInstance.count--;
-	if (LoadingInstance.count === 0) uni.hideLoading();
-}
-
-/**
- * @description 请求基础配置 可直接使用访问自定义请求
- */
-const http = new Request({
-	baseURL: 'https://api.shopro.sheepjs.com/',
-	timeout: 8000,
-	method: 'GET',
-	header: {
-		Accept: 'text/json',
-		'Content-Type': 'application/json;charset=UTF-8',
-		platform: $platform.name,
-	},
-	// #ifdef APP-PLUS
-	sslVerify: false,
-	// #endif
-	// #ifdef H5
-	// 跨域请求时是否携带凭证（cookies）仅H5支持（HBuilderX 2.6.15+）
-	withCredentials: false,
-	// #endif
-	custom: options,
-});
-
-/**
- * @description 请求拦截器
- */
-http.interceptors.request.use(
-	(config) => {
-		// console.log(config);
-		if (config.custom.auth && !$store('user').isLogin) {
-			showAuthModal();
-			return Promise.reject();
-		}
-		if (config.custom.showLoading) {
-			LoadingInstance.count++;
-			LoadingInstance.count === 1 &&
-				uni.showLoading({
-					title: config.custom.loadingMsg,
-					mask: true,
-					fail: () => {
-						uni.hideLoading();
-					},
-				});
-		}
-		const token = uni.getStorageSync('token');
-		if (token) config.header['Authorization'] = token;
-		// TODO 芋艿：特殊处理
-		if (config.url.indexOf('/app-api/') !== -1) {
-			config.header['Accept'] = '*/*'
-			config.header['tenant-id'] = '1';
-			config.header['terminal'] = '20';
-			// config.header['Authorization'] = 'Bearer test247';
-		}
-		return config;
-	},
-	(error) => {
-		return Promise.reject(error);
-	},
-);
-
-/**
- * @description 响应拦截器
- */
-http.interceptors.response.use(
-	(response) => {
-		// 自动设置登陆令牌
-		if (response.header.authorization || response.header.Authorization) {
-			$store('user').setToken(response.header.authorization || response.header.Authorization);
-		}
-
-		response.config.custom.showLoading && closeLoading();
-		if (response.data.code !== 0) {
-			if (response.config.custom.showError)
-				uni.showToast({
-					title: response.data.msg || '服务器开小差啦,请稍后再试~',
-					icon: 'none',
-					mask: true,
-				});
-			return Promise.resolve(response.data);
-		}
-		if (
-			response.data.error === 0 &&
-			response.data.msg !== '' &&
-			response.config.custom.showSuccess
-		) {
-			uni.showToast({
-				title: response.config.custom.successMsg || response.data.msg,
-				icon: 'none',
-			});
-		}
-		return Promise.resolve(response.data);
-	},
-	(error) => {
-		const userStore = $store('user');
-		const isLogin = userStore.isLogin;
-		let errorMessage = '网络请求出错';
-		if (error !== undefined) {
-			switch (error.statusCode) {
-				case 400:
-					errorMessage = '请求错误';
-					break;
-				case 401:
-					if (isLogin) {
-						errorMessage = '您的登陆已过期';
-					} else {
-						errorMessage = '请先登录';
-					}
-					userStore.logout();
-					showAuthModal();
-					break;
-				case 403:
-					errorMessage = '拒绝访问';
-					break;
-				case 404:
-					errorMessage = '请求出错';
-					break;
-				case 408:
-					errorMessage = '请求超时';
-					break;
-				case 429:
-					errorMessage = '请求频繁, 请稍后再访问';
-					break;
-				case 500:
-					errorMessage = '服务器开小差啦,请稍后再试~';
-					break;
-				case 501:
-					errorMessage = '服务未实现';
-					break;
-				case 502:
-					errorMessage = '网络错误';
-					break;
-				case 503:
-					errorMessage = '服务不可用';
-					break;
-				case 504:
-					errorMessage = '网络超时';
-					break;
-				case 505:
-					errorMessage = 'HTTP版本不受支持';
-					break;
-			}
-			if (error.errMsg.includes('timeout')) errorMessage = '请求超时';
-			// #ifdef H5
-			if (error.errMsg.includes('Network'))
-				errorMessage = window.navigator.onLine ? '服务器异常' : '请检查您的网络连接';
-			// #endif
-		}
-
-		if (error && error.config) {
-			if (error.config.custom.showError === false) {
-				uni.showToast({
-					title: error.data?.msg || errorMessage,
-					icon: 'none',
-					mask: true,
-				});
-			}
-			error.config.custom.showLoading && closeLoading();
-		}
-
-		return false;
-	},
-);
-
-const request = (config) => {
-	if (config.url[0] !== '/') {
-		config.url = '/app-api/' + config.url;
-	}
-	// TODO 芋艿：额外拼接
-	if (config.url.indexOf('/app-api/') >= 0) {
-		// 设置接口地址
-		// config.url = 'http://api-dashboard.yudao.iocoder.cn' + config.url; // 调用【云端】
-		// config.url = 'https://app.test.huizhizao.vip/prod-api' + config.url; // 调用【云端】
-		config.url = 'http://127.0.0.1:48080' + config.url; // 调用【本地】
-    // config.url = 'http://yunai.natapp1.cc' + config.url; // 调用【natapp】
-	}
-	return http.middleware(config);
-};
-
-export default request;
\ No newline at end of file
diff --git a/sheep/store/app.js b/sheep/store/app.js
index 73fb587..c9e46b4 100644
--- a/sheep/store/app.js
+++ b/sheep/store/app.js
@@ -1,4 +1,3 @@
-import appApi from '@/sheep/api/app';
 import diyTemplateApi from '@/sheep/api/promotion/diy/template';
 import { defineStore } from 'pinia';
 import $platform from '@/sheep/platform';
diff --git a/sheep/store/user.js b/sheep/store/user.js
index a939331..d38715a 100644
--- a/sheep/store/user.js
+++ b/sheep/store/user.js
@@ -1,7 +1,7 @@
 import {
 	defineStore
 } from 'pinia';
-import userApi from '@/sheep/api/user';
+// import userApi from '@/sheep/api/user';
 import $share from '@/sheep/platform/share';
 import {
 	isEmpty,
@@ -13,8 +13,6 @@ import app from './app';
 import {
 	showAuthModal
 } from '@/sheep/hooks/useModal';
-import AuthUtil from '@/sheep/api/member/auth';
-import BrokerageApi from '@/sheep/api/trade/brokerage';
 import UserApi from '@/sheep/api/member/user';
 import PayWalletApi from '@/sheep/api/pay/wallet';
 import OrderApi from '@/sheep/api/trade/order';