From e89297532fd4ed1cf1828f8d7b3324b95e0b3622 Mon Sep 17 00:00:00 2001 From: SelfRidicule Date: Wed, 26 Jun 2024 09:44:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=8F=E8=BF=B0:=20=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E5=92=8C=E5=9B=AD=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- miniprogram/api/selfRequest.js | 7 ++++--- miniprogram/app.js | 16 +++++++++------- miniprogram/pages/index/index.js | 6 ++---- .../meetingFacilities/meetingFacilities.wxml | 4 ++-- .../meetingRoom/meetingOrder/meetingOrder.js | 14 ++++---------- .../meetingRoom/meetingOrder/meetingOrder.wxml | 4 ++-- .../meeting/pay/waitComplete/waitComplete.json | 2 +- .../meeting/pay/waitComplete/waitComplete.wxml | 2 +- 8 files changed, 25 insertions(+), 30 deletions(-) diff --git a/miniprogram/api/selfRequest.js b/miniprogram/api/selfRequest.js index ca6172a..584ce07 100644 --- a/miniprogram/api/selfRequest.js +++ b/miniprogram/api/selfRequest.js @@ -17,9 +17,10 @@ export function request(params) { if (wx.getStorageSync('token')) { header["Authorization"] = 'Bearer ' + wx.getStorageSync('token'); } - if (wx.getStorageSync('parkId')) { - data.parkId = wx.getStorageSync('parkId') - } + // 地区id + data.tenantId = app.tenantId + // 园区id + data.parkId = app.parkId // 加载中 wx.showLoading({ diff --git a/miniprogram/app.js b/miniprogram/app.js index ad02a15..2069900 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -2,15 +2,17 @@ App({ // 郑州小程序配置信息 APPID: 'wx5582a07c1fbbcf06', APPSECRET: 'ad24130a8919c613efd9538f69abafd3', - tenantId : '1', // 地区-郑州 + tenantId : '1', // 地区 + parkId : '25', // 园区id + parkName : '中国电子数据产业集团', // 园区名称 // 本地测试 - // DOMAIN_NAME_PREFIX: 'http://192.168.0.11', - // DOMAIN_NAME: 'http://192.168.0.11:9227', //接口域名 - // IMG_NAME: 'http://192.168.0.11:9227', + DOMAIN_NAME_PREFIX: 'http://192.168.0.11', + DOMAIN_NAME: 'http://192.168.0.11:9227', //接口域名 + IMG_NAME: 'http://192.168.0.11:9227', // 生产 - DOMAIN_NAME_PREFIX: 'https://www.chuangzhikj.com', - DOMAIN_NAME: 'https://www.chuangzhikj.com/saas-ics', //接口域名 - IMG_NAME: 'https://www.chuangzhikj.com/saas-ics', + // DOMAIN_NAME_PREFIX: 'https://www.chuangzhikj.com', + // DOMAIN_NAME: 'https://www.chuangzhikj.com/saas-ics', //接口域名 + // IMG_NAME: 'https://www.chuangzhikj.com/saas-ics', globals: { refreshMyPages: false, homedata: {}, diff --git a/miniprogram/pages/index/index.js b/miniprogram/pages/index/index.js index 0db01c6..1414af0 100644 --- a/miniprogram/pages/index/index.js +++ b/miniprogram/pages/index/index.js @@ -158,7 +158,7 @@ Page({ ], bannerList: [], userDetail: {}, - parkName: '首页', + parkName: app.parkName, qrcodeParam: null, }, @@ -198,10 +198,8 @@ Page({ _this.setData({ userDetail }) - // 园区id - let parkId = wx.getStorageSync('parkId'); // 查询轮播图 - getParkRq(parkId).then(res => { + getParkRq(app.parkId).then(res => { console.log('getParkRq', res); let bannerList = res.bannerImages.map(item => item.url) _this.setData({ diff --git a/miniprogram/pages/meeting/meetingRoom/meetingFacilities/meetingFacilities.wxml b/miniprogram/pages/meeting/meetingRoom/meetingFacilities/meetingFacilities.wxml index bd9ac15..f95affd 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingFacilities/meetingFacilities.wxml +++ b/miniprogram/pages/meeting/meetingRoom/meetingFacilities/meetingFacilities.wxml @@ -12,7 +12,7 @@ - + diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js index 1b23451..052139b 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js +++ b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js @@ -205,16 +205,10 @@ Page({ }).then(res => { console.log('saveMeetingRecordRq', res); if (res.code == 0) { - // 支付金额大于0，需要付款 - if (_this.data.totalAmount > 0) { - wx.redirectTo({ - url: "/pages/meeting/pay/waitPay/waitPay?id=" + res.reservationId, - }) - } else { - wx.reLaunch({ - url: '/pages/meeting/reservationRecord/meetingRecord/meetingRecord', - }) - } + wx.reLaunch({ + url: '/pages/meeting/pay/waitComplete/waitComplete', + }) + } else { // 错误提示 Notify({ diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml index 4344881..95fe050 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml +++ b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml @@ -60,12 +60,12 @@ --> - + 提交预约 diff --git a/miniprogram/pages/meeting/pay/waitComplete/waitComplete.json b/miniprogram/pages/meeting/pay/waitComplete/waitComplete.json index 27d6a2c..0d9ea4d 100644 --- a/miniprogram/pages/meeting/pay/waitComplete/waitComplete.json +++ b/miniprogram/pages/meeting/pay/waitComplete/waitComplete.json @@ -2,5 +2,5 @@ "usingComponents": { "van-icon": "@vant/weapp/icon/index" }, - "navigationBarTitleText": "支付结果" + "navigationBarTitleText": "预约结果" } \ No newline at end of file diff --git a/miniprogram/pages/meeting/pay/waitComplete/waitComplete.wxml b/miniprogram/pages/meeting/pay/waitComplete/waitComplete.wxml index d6f5cc7..00fcc6c 100644 --- a/miniprogram/pages/meeting/pay/waitComplete/waitComplete.wxml +++ b/miniprogram/pages/meeting/pay/waitComplete/waitComplete.wxml @@ -3,7 +3,7 @@ - 支付成功 + 预约成功