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 | 57 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 43 insertions(+), 14 deletions(-)
diff --git a/mini-program/utils/http.api.js b/mini-program/utils/http.api.js
index 499efab..db7a0ea 100644
--- a/mini-program/utils/http.api.js
+++ b/mini-program/utils/http.api.js
@@ -6,6 +6,14 @@
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); // 鍏ㄩ儴鍖哄垝鏍戝舰鏌ヨ
@@ -36,20 +44,34 @@
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 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 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 }); //缁忛攢鍟� - 璁㈠崟璇︽儏
+ 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,
@@ -89,7 +111,14 @@
getIntegralData,
getPlatformAboutUs,
findIntegralRecordPage,
- myCustomer
+ myCustomer,
+ shopOrderDetail,
+ orderDetail,
+ delOrder,
+ cancelOrder,
+ affirmOrder,
+ writeOffOrder,
+ getOrderDetailByCode
};
}
--
Gitblit v1.9.3