From 5db15538ad8baa58ff3e6b44bd2e5574ac956118 Mon Sep 17 00:00:00 2001 From: que01 Date: Sat, 19 Sep 2026 11:09:25 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=85=8D=E7=BD=AE=E5=B1=80=E5=9F=9F?= =?UTF-8?q?=E7=BD=91=20API=20=E5=9C=B0=E5=9D=80=E7=94=A8=E4=BA=8E=E7=9C=9F?= =?UTF-8?q?=E6=9C=BA=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/miniapp/app.js | 2 +- apps/miniapp/pages/booking/index.js | 2 +- apps/miniapp/pages/bookings/index.js | 2 +- apps/miniapp/pages/index/index.js | 2 +- apps/miniapp/pages/services/index.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/miniapp/app.js b/apps/miniapp/app.js index adb7414..809d2f1 100644 --- a/apps/miniapp/app.js +++ b/apps/miniapp/app.js @@ -1,6 +1,6 @@ App({ onLaunch() { - this.globalData = { apiBaseUrl: 'http://localhost:3001' }; + this.globalData = { apiBaseUrl: 'http://192.168.88.29:3001' }; }, globalData: {}, }); diff --git a/apps/miniapp/pages/booking/index.js b/apps/miniapp/pages/booking/index.js index ea1ad91..94ec4b7 100644 --- a/apps/miniapp/pages/booking/index.js +++ b/apps/miniapp/pages/booking/index.js @@ -1,2 +1,2 @@ -const API='http://localhost:3001'; +const API=getApp().globalData.apiBaseUrl; Page({data:{service:{},form:{},serviceId:'',quantity:1,submitting:false},onLoad(q){wx.request({url:API+'/public/services',success:r=>{const service=r.data.find(x=>x.id===q.serviceId)||r.data.find(x=>x.priceAmount!==null)||{};this.setData({service,serviceId:service.id||''})}})},input(e){this.setData({['form.'+e.currentTarget.dataset.key]:e.detail.value})},increase(){if(this.data.quantity<50)this.setData({quantity:this.data.quantity+1})},decrease(){if(this.data.quantity>1)this.setData({quantity:this.data.quantity-1})},submit(){const f=this.data.form;if(!this.data.serviceId){wx.showToast({title:'请先选择服务',icon:'none'});return}if(!f.customerName||!f.wechatId){wx.showToast({title:'请填写称呼和联系方式',icon:'none'});return}this.setData({submitting:true});const send=token=>wx.request({url:API+'/customer/bookings',method:'POST',header:{Authorization:'Bearer '+token},data:{requestType:'package',customerName:f.customerName,wechatId:f.wechatId,contactPreference:'wechat',requestedTime:f.requestedTime,note:f.note,items:[{serviceId:this.data.serviceId,quantity:this.data.quantity}]},success:r=>{this.setData({submitting:false});if(r.statusCode<300){wx.showToast({title:'预约已提交'});setTimeout(()=>wx.navigateTo({url:'/pages/bookings/index'}),500)}else wx.showToast({title:'提交失败',icon:'none'})},fail:()=>this.setData({submitting:false})});const existing=wx.getStorageSync('customerToken');if(existing){send(existing);return}wx.login({success:l=>wx.request({url:API+'/customer/session/wechat',method:'POST',data:{code:l.code},success:r=>{wx.setStorageSync('customerToken',r.data.token);send(r.data.token)},fail:()=>{this.setData({submitting:false});wx.showToast({title:'登录失败',icon:'none'})}})})}}); diff --git a/apps/miniapp/pages/bookings/index.js b/apps/miniapp/pages/bookings/index.js index 1a7f488..e28b286 100644 --- a/apps/miniapp/pages/bookings/index.js +++ b/apps/miniapp/pages/bookings/index.js @@ -1,2 +1,2 @@ -const API='http://localhost:3001'; +const API=getApp().globalData.apiBaseUrl; Page({data:{loading:true,bookings:[]},onLoad(){this.load()},onShow(){this.load()},load(){const token=wx.getStorageSync('customerToken');if(!token){this.setData({loading:false});return}wx.request({url:API+'/customer/bookings',header:{Authorization:'Bearer '+token},success:r=>this.setData({bookings:r.data,loading:false}),fail:()=>this.setData({loading:false})})},cancel(e){const id=e.currentTarget.dataset.id;wx.showModal({title:'取消预约',content:'确定取消这笔预约吗?',success:r=>{if(!r.confirm)return;wx.request({url:API+'/customer/bookings/'+id+'/cancel',method:'POST',header:{Authorization:'Bearer '+wx.getStorageSync('customerToken')},success:()=>this.load()})}})}}); diff --git a/apps/miniapp/pages/index/index.js b/apps/miniapp/pages/index/index.js index facde83..a2e36d8 100644 --- a/apps/miniapp/pages/index/index.js +++ b/apps/miniapp/pages/index/index.js @@ -1,4 +1,4 @@ -const API_BASE_URL = 'http://localhost:3001'; +const API_BASE_URL = getApp().globalData.apiBaseUrl; Page({ data: { loading: true, error: '', brand: {}, services: [] }, diff --git a/apps/miniapp/pages/services/index.js b/apps/miniapp/pages/services/index.js index 86430bd..2ab8e24 100644 --- a/apps/miniapp/pages/services/index.js +++ b/apps/miniapp/pages/services/index.js @@ -1,2 +1,2 @@ -const API = 'http://localhost:3001'; +const API = getApp().globalData.apiBaseUrl; Page({data:{loading:true,services:[],filtered:[],category:'package'},onLoad(){wx.request({url:API+'/public/services',success:res=>this.setData({services:res.data,filtered:res.data.filter(x=>x.priceAmount!==null),loading:false}),fail:()=>this.setData({loading:false})})},switchCategory(e){const category=e.currentTarget.dataset.category;const filtered=category==='package'?this.data.services.filter(x=>x.priceAmount!==null):this.data.services.filter(x=>x.priceAmount===null);this.setData({category,filtered})},book(e){wx.navigateTo({url:'/pages/booking/index?serviceId='+e.currentTarget.dataset.id})}});