Merge remote-tracking branch 'origin/master'

rk

2026-04-22 2e3ab7fbbb336cf11ed37b8b0a7871976d597564

 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
   };
}