Merge remote-tracking branch 'origin/master'

doum

10 天以前 28a2f7a48f508970a10413c8aa2367a4e4790b1b

 small-program/utils/http.api.js

@@ -32,6 +32,7 @@
   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 shopNoticePage = (data = {}) => vm.$u.http.post('web/config/shopNoticePage', 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 });   // 门店钱包统计
@@ -46,8 +47,31 @@
   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);   //订单评价
   let payOverdueFee = (data = {}) => vm.$u.http.post('web/order/payOverdueFee/'+data.orderId, data);   //继续发起支付
   let shopSalesStats = (params = {}) => vm.$u.http.get('web/shopInfo/salesStats',{ params });   //门店销售统计
   let shopOrderDetail = (params = {}) => vm.$u.http.get('web/order/shopDetail',{ params });   //门店订单详情
   let shopVerifyOrder = (data = {}) => vm.$u.http.post('web/order/shopVerify',data);   //门店核销收件
   let storeOutOrder = (data = {}) => vm.$u.http.post('web/order/storeOut',data);   //门店核销出货
   let confirmArrivedOrder = (data = {}) => vm.$u.http.post('web/order/confirmArrived',data);   //确认到店
   let getShopInfoDetail= (params = {}) => vm.$u.http.get('web/shopInfo/shopDetail',{ params });   // 获取我的店铺信息
   let logOutShop= (params = {}) => vm.$u.http.get('web/account/logOutShop',{ params });   // 门店退出登录
   let getActiveOrderTip= (params = {}) => vm.$u.http.get('web/config/getActiveOrderTip',{ params });   // 首页进行中订单提示
   let maintainInfo= (data = {}) => vm.$u.http.post('web/shopInfo/maintainInfo',data);   // 查询门店维护信息
   let maintainShopInfo= (data = {}) => vm.$u.http.post('web/shopInfo/maintain',data);   // 查询门店维护信息
   vm.$u.api = {
      getActiveOrderTip,
      logOutShop,
      maintainShopInfo,
      maintainInfo,
      getShopInfoDetail,
      storeOutOrder,
      confirmArrivedOrder,
      shopVerifyOrder,
      shopOrderDetail,
      shopSalesStats,
      payOverdueFee,
      orderComment, 
      confirmReceipt,
      cancelOrder,
      deleteOrder,
@@ -88,7 +112,8 @@
      shopSummary,
      shopPage,
      shopApply,
      getShopInfo
      getShopInfo,
      shopNoticePage
   };
}