From 2e3ab7fbbb336cf11ed37b8b0a7871976d597564 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 22 四月 2026 20:06:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/utils/http.api.js | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/small-program/utils/http.api.js b/small-program/utils/http.api.js
index fa623a8..4036dfb 100644
--- a/small-program/utils/http.api.js
+++ b/small-program/utils/http.api.js
@@ -34,15 +34,29 @@
let getMemberNoticePage = (data = {}) => vm.$u.http.post('web/config/memberNoticePage', data); // 鑾峰彇浼氬憳閫氱煡鍒楄〃
let shopLogin = (data = {}) => vm.$u.http.post('web/account/shopLogin', data); // 闂ㄥ簵鐧诲綍
let shopSilentLogin = (params = {}) => vm.$u.http.get('web/account/shopSilentLogin',{ params }); // 闂ㄥ簵闈欓粯鐧诲綍
+ let shopStatistics = (params = {}) => vm.$u.http.get('web/wallet/shopStatistics',{ params }); // 闂ㄥ簵閽卞寘缁熻
+ let shopSummary = (data = {}) => vm.$u.http.post('web/revenue/shopSummary', data); // 闂ㄥ簵钀ユ敹缁熻
+ let shopPage = (data = {}) => vm.$u.http.post('web/revenue/shopPage', data); // 闂ㄥ簵钀ユ敹鍒嗛〉鏌ヨ
+ let shopApply = (data = {}) => vm.$u.http.post('web/wallet/shopApply', data); // 闂ㄥ簵鎻愮幇鐢宠
+ let getShopInfo = (params = {}) => vm.$u.http.get('web/shopInfo/getShopInfo',{ params }); // 鑾峰彇闂ㄥ簵淇℃伅
let myOrderPage = (data = {}) => vm.$u.http.post('web/order/myPage', data); // 浼氬憳璁㈠崟鍒嗛〉
let shopOrderPage = (data = {}) => vm.$u.http.post('web/order/shopPage', data); // 闂ㄥ簵璁㈠崟鍒嗛〉
-
+ let deleteOrder = (data = {}) => vm.$u.http.post('web/order/delete/'+data.orderId, data); // 鍒犻櫎璁㈠崟
+ let cancelOrder = (data = {}) => vm.$u.http.post('web/order/cancel', data); // 鍙栨秷璁㈠崟
+ let confirmReceipt = (data = {}) => vm.$u.http.post('web/order/confirmReceipt/'+data.orderId, data); // 浼氬憳纭鏀惰揣
+ let continuePayOrder = (data = {}) => vm.$u.http.post('web/order/continuePay/'+data.orderId, data); //缁х画鍙戣捣鏀粯
+
vm.$u.api = {
+ confirmReceipt,
+ cancelOrder,
+ deleteOrder,
+ continuePayOrder,
myOrderPage,
shopOrderPage,
wxLogin,
wxAuthPhone,
+ getMemberInfo,
getMemberInfo,
updateMember,
getBannerList,
@@ -69,7 +83,12 @@
getOpenCityList,
getMemberNoticePage,
shopLogin,
- shopSilentLogin
+ shopSilentLogin,
+ shopStatistics,
+ shopSummary,
+ shopPage,
+ shopApply,
+ getShopInfo
};
}
--
Gitblit v1.9.3