From 8dfc59832df6e86f1840857a5b497faa9061a2af Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 13 二月 2026 10:00:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/mini-program/utils/http.api.js b/mini-program/utils/http.api.js
index 1f49310..db7a0ea 100644
--- a/mini-program/utils/http.api.js
+++ b/mini-program/utils/http.api.js
@@ -6,6 +6,28 @@
 	    return config;
 	})
 	
+	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鍒犻櫎鏀惰揣鍦板潃
+	let treeList = (data = {}) => vm.$u.http.post('web/util/treeList', data);	// 鍏ㄩ儴鍖哄垝鏍戝舰鏌ヨ
+	let logOff = (params = {}) => vm.$u.http.get('web/account/logOff', { params });	//鐢ㄦ埛娉ㄩ攢
+	let updateUserPhone = (data = {}) => vm.$u.http.post('web/home/updateUserPhone', data);	// 鏇存崲缁戝畾鎵嬫満鍙�
+	let verifyCode = (params = {}) => vm.$u.http.get('web/account/verifyCode', { params });	// 鍙戦�佺煭淇¢獙璇佺爜
+	let sendSmsCode = (params = {}) => vm.$u.http.get('web/account/sendSmsCode', { params });	// 鍙戦�佺煭淇¢獙璇佺爜
+	let upload = (data = {}) => vm.$u.http.post('public/upload', data);	// 涓婁紶鏂囦欢
+	let logOut = (params = {}) => vm.$u.http.get('web/account/logOut', { params });	// 娑堣垂鑰� - 閫�鍑虹櫥褰�
+	let updateMember = (data = {}) => vm.$u.http.post('web/account/updateMember', data);	// 鏇存柊鐢ㄦ埛淇℃伅
+	let updateAddr = (data = {}) => vm.$u.http.post('web/addr/update', data);	// 缂栬緫鏀惰揣鍦板潃
+	let createAddr = (data = {}) => vm.$u.http.post('web/addr/create', data);	// 鍒涘缓鏀惰揣鍦板潃
+	let findListAddr = (params = {}) => vm.$u.http.get('web/addr/findList', { params });	// 鏌ヨ鐢ㄦ埛鍦板潃鍒楄〃
+	let cartGoodsTypeNum = (params = {}) => vm.$u.http.get('web/shopCart/cartGoodsTypeNum', { params });	// 璐墿杞︽暟閲�
 	let updateNum = (data = {}) => vm.$u.http.post('web/shopCart/updateNum', data);	// 鏇存柊璐墿杞︽暟閲�
 	let deleteBatch = (params = {}) => vm.$u.http.get('web/shopCart/deleteBatch', { params });	// 鎵归噺鍒犻櫎
 	let searchHistoryList = (params = {}) => vm.$u.http.get('web/goods/searchHistoryList', { params });	// 鍟嗗搧鎼滅储鍘嗗彶
@@ -32,9 +54,38 @@
 	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 = {
+		commentApply,
+		findActivityReplyCommentDTOPage,
+		findActivityCommentDTOPage,
+		cancelbatch,
+		saveCollect,
+		zanCreate,
+		zanCancel,
+		getArticleDetail,
+		getArticlePage,
+		deleteAddr,
+		treeList,
+		logOff,
+		updateUserPhone,
+		verifyCode,
+		sendSmsCode,
+		upload,
+		logOut,
+		updateMember,
+		updateAddr,
+		createAddr,
+		findListAddr,
+		cartGoodsTypeNum,
 		updateNum,
 		deleteBatch,
 		searchHistoryList,
@@ -61,7 +112,13 @@
 		getPlatformAboutUs,
 		findIntegralRecordPage,
 		myCustomer,
-		shopOrderDetail
+		shopOrderDetail,
+		orderDetail,
+		delOrder,
+		cancelOrder,
+		affirmOrder,
+		writeOffOrder,
+		getOrderDetailByCode
 	};
 }
 

--
Gitblit v1.9.3