Merge remote-tracking branch 'origin/master'

rk

2026-04-23 3696830fbaf2fd97d98020087abf20917e491bdc

 small-program/utils/http.api.js

@@ -17,10 +17,48 @@
   let getCityByName = (params = {}) => vm.$u.http.get('web/config/getCityByName',{ params });   // 根据城市名称查询城市信息
   let getCategoryList = (params = {}) => vm.$u.http.get('web/config/getCategoryList',{ params });   // 获取物品分类列表
   let calculateLocalPrice = (data = {}) => vm.$u.http.post('web/config/calculateLocalPrice', data);   // 计算就地存取预估费用
   let calculateRemotePrice = (data = {}) => vm.$u.http.post('web/config/calculateRemotePrice', data);   // 计算远程存取预估费用
   let getPlatformAboutUs = (params = {}) => vm.$u.http.get('web/config/getPlatformAboutUs',{ params });   // 获取平台关于我们信息
   let findListAddr = (params = {}) => vm.$u.http.get('web/addr/list',{ params });   // 获取地址簿列表
   let createAddr = (data = {}) => vm.$u.http.post('web/addr/create', data);   // 创建地址簿
   let deleteAddr = (params = {}) => vm.$u.http.delete(`web/addr/delete/${params.id}`);   // 删除地址簿
   let setDefaultAddr = (params = {}) => vm.$u.http.post(`web/addr/setDefault/${params.id}`);   // 设置默认地址簿
   let updateById = (data = {}) => vm.$u.http.post('web/addr/updateById', data);   // 更新地址簿信息
   let treeList = (data = {}) => vm.$u.http.post('web/config/treeList', data);   // 全部区划树形查询
   let getOrderDetail = (orderId) => vm.$u.http.get(`web/order/detail/${orderId}`);   // 获取订单详情
   let applyShop = (data = {}) => vm.$u.http.post('web/shopInfo/apply', data);   // 门店入驻申请
   let getMyShop = (params = {}) => vm.$u.http.get('web/shopInfo/myShop',{ params });   // 获取我的店铺信息
   let payDeposit = (data = {}) => vm.$u.http.post('web/shopInfo/payDeposit', data);   // 门店入驻支付
   let logOut = (params = {}) => vm.$u.http.get('web/account/logOut',{ params });   // 退出登录
   let getOpenCityList = (params = {}) => vm.$u.http.get('web/config/getOpenCityList',{ params });   // 获取已开通城市列表
   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);   //继续发起支付
   let orderComment = (data = {}) => vm.$u.http.post('web/order/comment', data);   //订单评价
	
   vm.$u.api = {
      orderComment, 
      confirmReceipt,
      cancelOrder,
      deleteOrder,
      continuePayOrder,
      myOrderPage,
      shopOrderPage,
      wxLogin,
      wxAuthPhone,
      getMemberInfo,
      getMemberInfo,
      updateMember,
      getBannerList,
@@ -30,7 +68,29 @@
      createOrder,
      getCityByName,
      getCategoryList,
      calculateLocalPrice
      calculateLocalPrice,
      calculateRemotePrice,
      getPlatformAboutUs,
      findListAddr,
      createAddr,
      deleteAddr,
      setDefaultAddr,
      updateById,
      treeList,
      getOrderDetail,
      applyShop,
      getMyShop,
      payDeposit,
      logOut,
      getOpenCityList,
      getMemberNoticePage,
      shopLogin,
      shopSilentLogin,
      shopStatistics,
      shopSummary,
      shopPage,
      shopApply,
      getShopInfo
   };
}