From 6767d09eff6c18a553830284664676764d0ce873 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 11 二月 2026 16:01:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 mini-program/utils/http.api.js |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/mini-program/utils/http.api.js b/mini-program/utils/http.api.js
index f2c75f3..5bf9df5 100644
--- a/mini-program/utils/http.api.js
+++ b/mini-program/utils/http.api.js
@@ -32,13 +32,17 @@
 	let addCart = (data = {}) => vm.$u.http.post('web/shopCart/addCart', data);	// 鍔犲叆璐墿杞�
 	let goodsInfo = (params = {}) => vm.$u.http.get('web/goods/goodsInfo', { params });	// 鍟嗗搧璇︽儏
 	let shopCartPage = (data = {}) => vm.$u.http.post('web/shopCart/goodsPage', data);	// 璐墿杞﹀垪琛�
-	let shopOpenidLogin = (data = {}) => vm.$u.http.post('/web/shop/shopOpenidLogin', {...data,tokenType:1});	// 缁忛攢鍟� - 闈欓粯鐧诲綍
-	let shopPasswordLogin = (data = {}) => vm.$u.http.post('/web/shop/shopPasswordLogin', {...data,tokenType:1});	// 缁忛攢鍟� - 璐﹀彿瀵嗙爜鐧诲綍 
-	let getShopInfo = (params = {}) => vm.$u.http.get('/web/shop/getShopInfo', {params});	//缁忛攢鍟� - 搴楅摵璇︽儏褰�
-	let shopLogout = (params = {}) => vm.$u.http.get('/web/shop/logOut', {params});	//缁忛攢鍟� - 閫�鍑虹櫥闄�
-	let saleReport = (data = {}) => vm.$u.http.post('/web/shop/saleReport', {...data,tokenType:1});	//缁忛攢鍟� - 閿�鍞槑缁�
-	let shopOrderPage = (data = {}) => vm.$u.http.post('/web/orders/shopOrderPage', {...data,tokenType:1});	//缁忛攢鍟� - 閿�鍞槑缁�
-	
+	let shopOpenidLogin = (data = {}) => vm.$u.http.post('web/shop/shopOpenidLogin', {...data,tokenType:1});	// 缁忛攢鍟� - 闈欓粯鐧诲綍
+	let shopPasswordLogin = (data = {}) => vm.$u.http.post('web/shop/shopPasswordLogin', {...data,tokenType:1});	// 缁忛攢鍟� - 璐﹀彿瀵嗙爜鐧诲綍 
+	let getShopInfo = (params = {}) => vm.$u.http.get('web/shop/getShopInfo', {params});	//缁忛攢鍟� - 搴楅摵璇︽儏褰�
+	let shopLogout = (params = {}) => vm.$u.http.get('web/shop/logOut', {params});	//缁忛攢鍟� - 閫�鍑虹櫥闄�
+	let saleReport = (data = {}) => vm.$u.http.post('web/shop/saleReport', {...data,tokenType:1});	//缁忛攢鍟� - 閿�鍞槑缁�
+	let shopOrderPage = (data = {}) => vm.$u.http.post('web/orders/shopOrderPage', {...data,tokenType:1});	//缁忛攢鍟� - 閿�鍞槑缁�
+	let getIntegralData = (params = {}) => vm.$u.http.get('web/integral/getIntegralData', {params});	//缁忛攢鍟� - 绉垎涓庣粨绠楅噾棰濇儏鍐碉紙绉垎瑙勫垯锛�
+	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 });	//缁忛攢鍟� - 璁㈠崟璇︽儏 
 	
 	vm.$u.api = {
 		updateUserPhone,
@@ -72,7 +76,12 @@
 		getShopInfo,
 		shopLogout,
 		saleReport,
-		shopOrderPage
+		shopOrderPage,
+		getIntegralData,
+		getPlatformAboutUs,
+		findIntegralRecordPage,
+		myCustomer,
+		shopOrderDetail
 	};
 }
 

--
Gitblit v1.9.3