diff --git a/api/index.js b/api/index.js index 8f6da88..1f40c58 100644 --- a/api/index.js +++ b/api/index.js @@ -4,8 +4,9 @@ */ // 基础URL配置(注意:末尾不要加斜杠) -const BASE_URL = 'https://guangsh.manage.hschengtai.com' +// const BASE_URL = 'https://guangsh.manage.hschengtai.com' // const BASE_URL = 'http://192.168.0.97:48085' +const BASE_URL = 'http://192.168.5.134:48085' // 是否正在刷新token(防止并发刷新) let isRefreshing = false // 等待刷新完成的请求队列 diff --git a/api/service.js b/api/service.js index eafd498..8eabceb 100644 --- a/api/service.js +++ b/api/service.js @@ -30,10 +30,10 @@ export function getGuildStoreDetail(id) { }) } -// 获得工会优惠券 -export function getGuildCoupon(params = {}) { +// 获得工会代金券 +export function getGuildVoucher(params = {}) { return request({ - url: '/app-api/member/labor-union-coupon/page', + url: '/app-api/member/labor-union-voucher/page', method: 'GET', data: params, }) @@ -100,12 +100,12 @@ export function isNeedMap(params = {}) { }) } -// 工会优惠券/商品下单并发起微信支付(需要后端返回小程序支付参数) +// 工会代金券/商品下单并发起微信支付(需要后端返回小程序支付参数) // 约定:后端返回字段需包含 timeStamp、nonceStr、package、signType、paySign(或等价字段) -// export function createGuildCouponWxPay(params = {}) { +// export function createGuildVoucherWxPay(params = {}) { // return request({ // // TODO: 如后端实际路径不同,请替换这里的 url -// url: '/app-api/member/labor-union-coupon/pay', +// url: '/app-api/member/labor-union-voucher/pay', // method: 'POST', // data: params, // showLoading: true, @@ -136,18 +136,18 @@ export function updateLuOrderPayStatus(params = {}){ }) } -// 删除优惠卷购买 (暂时不用) -// export function delCouponPurchaseBuy(id){ +// 删除代金券购买 (暂时不用) +// export function delVoucherPurchaseBuy(id){ // return request({ -// url: '/app-api/member/labor-union-coupon-purchase/delete?id='+id, +// url: '/app-api/member/labor-union-voucher-purchase/delete?id='+id, // method: 'DELETE', // }) // } -// // 取消优惠卷购买 (暂时不用) -// export function cancelCouponPurchaseBuy(id){ +// // 取消代金券购买 (暂时不用) +// export function cancelVoucherPurchaseBuy(id){ // return request({ -// url: '/app-api/member/labor-union-coupon-purchase/cancel?id='+id, +// url: '/app-api/member/labor-union-voucher-purchase/cancel?id='+id, // method: 'POST', // }) // } diff --git a/pages/detail/serviceDetail.vue b/pages/detail/serviceDetail.vue index ab8bf0a..f29e626 100644 --- a/pages/detail/serviceDetail.vue +++ b/pages/detail/serviceDetail.vue @@ -129,7 +129,7 @@