From b613bb368d4e678b42d25e94397d0aab3e213438 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 25 二月 2026 09:41:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 mini-program/utils/http.api.js |   45 ++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/mini-program/utils/http.api.js b/mini-program/utils/http.api.js
index 845a7e3..35c61f8 100644
--- a/mini-program/utils/http.api.js
+++ b/mini-program/utils/http.api.js
@@ -6,6 +6,19 @@
 	    return config;
 	})
 	
+	let getCollectNum = (params = {}) => vm.$u.http.get('web/collect/getCollectNum', {params});	// 鎴戠殑鏀惰棌鏁伴噺
+	let myCollectPage = (data = {}) => vm.$u.http.post('web/collect/myCollectPage', data);	// 鎴戠殑鏀惰棌
+	let memberCouponDetail = (params = {}) => vm.$u.http.get('web/orders/memberCouponDetail', {params});	// 浼氬憳浼樻儬鍒歌鎯�
+	let memberCouponPage = (params = {}) => vm.$u.http.get('web/orders/memberCouponPage', {params});	// 浼氬憳浼樻儬鍒�
+	let findUserIntegralRecordPage = (data = {}) => vm.$u.http.post('web/integral/findUserIntegralRecordPage', data);	// 鑾峰彇鐢ㄦ埛鐨勭Н鍒嗚褰�
+	let getUserIntegralData = (params = {}) => vm.$u.http.get('web/integral/getUserIntegralData', {params});	// 鐢ㄦ埛绉垎鎯呭喌
+	let cancelbatch = (params = {}) => vm.$u.http.get('web/collect/cancel/batch', {params});	// 鍙栨秷鏀惰棌
+	let saveCollect = (data = {}) => vm.$u.http.post('web/collect/saveCollect', data);	// 鍒涘缓鏀惰棌
+	let zanCreate = (data = {}) => vm.$u.http.post('web/zan/create', data);	// 鐐硅禐
+	let zanCancel = (data = {}) => vm.$u.http.post('web/zan/cancel', data);	// 鍙栨秷鐐硅禐
+	let commentApply = (data = {}) => vm.$u.http.post('web/comment/apply', data);	// 鏂板缓璇勮
+	let findActivityReplyCommentDTOPage = (data = {}) => vm.$u.http.post('web/comment/findActivityReplyCommentDTOPage', data);	// 鍒嗛〉娲诲姩鎺㈠簵璇勮鍥炲鏌ヨ
+	let findActivityCommentDTOPage = (data = {}) => vm.$u.http.post('web/comment/findActivityCommentDTOPage', data);	// 鍒嗛〉娲诲姩鎺㈠簵璇勮鏌ヨ
 	let getArticleDetail = (params = {}) => vm.$u.http.get('web/article/getArticleDetail', { params });	// 绀惧尯璇︽儏
 	let getArticlePage = (data = {}) => vm.$u.http.post('web/article/getArticlePage', data);	// 绀惧尯璧勮
 	let deleteAddr = (data = {}) => vm.$u.http.post('web/addr/delete', data);	// 鏍规嵁ID鍒犻櫎鏀惰揣鍦板潃
@@ -47,9 +60,29 @@
 	let getPlatformAboutUs = (params = {}) => vm.$u.http.get('web/account/getPlatformAboutUs', { params });	// 鑾峰彇绯荤粺閰嶇疆
 	let findIntegralRecordPage = (data = {}) => vm.$u.http.post('web/integral/findIntegralRecordPage', {...data,tokenType:1});	//缁忛攢鍟� - 鑾峰彇缁忛攢鍟嗙殑绉垎璁板綍
 	let myCustomer = (data = {}) => vm.$u.http.post('web/shop/myCustomer', {...data,tokenType:1});	//缁忛攢鍟� - 鎴戠殑瀹㈡埛淇℃伅 
-	let shopOrderDetail = (params = {}) => vm.$u.http.get('/web/orders/shopOrderDetail', { params });	//缁忛攢鍟� - 璁㈠崟璇︽儏 
-	
+	let shopOrderDetail = (params = {}) => vm.$u.http.get('web/orders/shopOrderDetail', { params });	//缁忛攢鍟� - 璁㈠崟璇︽儏
+	let orderDetail = (params = {}) => vm.$u.http.get('web/orders/orderDetail', { params });	//瀹㈡埛 - 璁㈠崟璇︽儏
+	let delOrder = (data = {}) => vm.$u.http.post('web/orders/delOrder',data );	//璁㈠崟鍒犻櫎
+	let cancelOrder = (data = {}) => vm.$u.http.post('web/orders/cancelOrder', data );	//鍙栨秷璁㈠崟
+	let affirmOrder = (data = {}) => vm.$u.http.post('web/orders/affirmOrder',data );	//纭鏀惰揣
+	let writeOffOrder = (data = {}) => vm.$u.http.post('web/orders/writeOffOrder',{...data,tokenType:1} );	//璁㈠崟鏍搁攢
+	let getOrderDetailByCode = (data = {}) => vm.$u.http.post('web/orders/getOrderDetailByCode',{...data,tokenType:1});	//缁忛攢鍟� - 璁㈠崟璇︽儏
+
+
 	vm.$u.api = {
+		getCollectNum,
+		myCollectPage,
+		memberCouponDetail,
+		memberCouponPage,
+		findUserIntegralRecordPage,
+		getUserIntegralData,
+		commentApply,
+		findActivityReplyCommentDTOPage,
+		findActivityCommentDTOPage,
+		cancelbatch,
+		saveCollect,
+		zanCreate,
+		zanCancel,
 		getArticleDetail,
 		getArticlePage,
 		deleteAddr,
@@ -91,7 +124,13 @@
 		getPlatformAboutUs,
 		findIntegralRecordPage,
 		myCustomer,
-		shopOrderDetail
+		shopOrderDetail,
+		orderDetail,
+		delOrder,
+		cancelOrder,
+		affirmOrder,
+		writeOffOrder,
+		getOrderDetailByCode
 	};
 }
 

--
Gitblit v1.9.3