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

# Conflicts:
#	sheep/request/index.js
#	sheep/request2/index.js

sheep/api/activity.js

@@ -60,5 +60,21 @@ export default {
 			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
+		}),
 
 };

sheep/api/commission.js

@@ -37,7 +37,7 @@ export default {
 	// 分销订单
 	order: (params) =>
 		request({
-			url: 'commission/order',
+			url: '/app-api/trade/brokerage-record/page',
 			method: 'GET',
 			params,
 		}),
@@ -52,7 +52,7 @@ export default {
 	// 我的团队
 	team: (params) =>
 		request({
-			url: 'commission/agent/team',
+			url: '/app-api/trade/brokerage-user/child-summary-page',
 			method: 'GET',
 			params,
 		}),
@@ -68,4 +68,22 @@ export default {
 			url: '/app-api/trade/brokerage-user/get-summary',
 			method: 'GET',
 		}),
+	getBrokerageRankNumber: (params) =>
+		request({
+			url: '/app-api/trade/brokerage-user/get-rank-by-price',
+			method: 'GET',
+			params
+		}),
+	getBrokerageRankList: (params) =>
+		request({
+			url: '/app-api/trade/brokerage-user/rank-page-by-price',
+			method: 'GET',
+			params
+		}),
+	getRanklist: (params) =>
+		request({
+			url: '/app-api/trade/brokerage-user/rank-page-by-user-count',
+			method: 'GET',
+			params
+		}),
 };

sheep/api/pay.js

@@ -1,44 +1,54 @@
 import request from '@/sheep/request';
 
 export default {
-  // 预支付
-  prepay: (data) =>
-    request({
-      url: 'pay/prepay',
-      method: 'POST',
-      data,
-      custom: {
-        loadingMsg: '支付中',
-      },
-    }),
-  // 发起提现
-  withdraw: {
-    list: (params) =>
-      request({
-        url: 'withdraw',
-        method: 'GET',
-        params,
-        custom: {
-          auth: true,
-        },
-      }),
-    rules: () =>
-      request({
-        url: 'withdraw/rules',
-        method: 'GET',
-        custom: {
-          auth: true,
-        },
-      }),
-    apply: (data) =>
-      request({
-        url: 'withdraw/apply',
-        method: 'POST',
-        data,
-        custom: {
-          loadingMsg: '申请中',
-          auth: true,
-        },
-      }),
-  },
-};
+	// 预支付
+	prepay: (data) =>
+		request({
+			url: 'pay/prepay',
+			method: 'POST',
+			data,
+			custom: {
+				loadingMsg: '支付中',
+			},
+		}),
+	// 发起提现
+	withdraw: {
+		list: (params) =>
+			request({
+				url: 'withdraw',
+				method: 'GET',
+				params,
+				custom: {
+					auth: true,
+				},
+			}),
+		rules: () =>
+			request({
+				url: 'withdraw/rules',
+				method: 'GET',
+				custom: {
+					auth: true,
+				},
+			}),
+		apply: (data) =>
+			request({
+				url: '/app-api/trade/brokerage-withdraw/create',
+				method: 'POST',
+				data,
+				custom: {
+					loadingMsg: '申请中',
+					// auth: true,
+				},
+			}),
+		userGet: (params) =>
+			request({
+				url: '/app-api/trade/brokerage-user/get',
+				method: 'GET',
+				params,
+				// custom: {
+				//   loadingMsg: '申请中',
+				//   auth: true,
+				// },
+			}),
+	},
+};

sheep/api/promotion/diy/template.js

@@ -1,20 +1,22 @@
 import request from '@/sheep/request';
 
- const DiyTemplateApi = {
-  // TODO 芋艿：测试
-  getUsedDiyTemplate: () => {
-      return request({
-          url: '/app-api/promotion/diy-template/used',
-          method: 'GET',
-      });
-  },
-  getDiyTemplate: (id) => {
-      return request({
-          url: '/app-api/promotion/diy-template/get',
-          method: 'GET',
-          params: { id }
-      });
-  },
+const DiyTemplateApi = {
+	// TODO 芋艿：测试
+	// getUsedDiyTemplate: () => {
+	//     return request({
+	//         url: '/app-api/promotion/diy-template/used',
+	//         method: 'GET',
+	//     });
+	// },
+	getDiyTemplate: (id) => {
+		return request({
+			url: '/app-api/promotion/diy-template/get',
+			method: 'GET',
+			params: {
+				id
+			}
+		});
+	},
 };
 
-export default DiyTemplateApi;
+export default DiyTemplateApi;

sheep/api/user.js

@@ -264,6 +264,13 @@ export default {
 				params,
 				custom: {},
 			}),
+		log3: (params) =>
+			request({
+				url: '/app-api/trade/brokerage-record/page',
+				// url: 'pay/wallet-transaction/page',
+				method: 'GET',
+				params,
+			}),
 	},
 	account: {
 		info: (params) =>