描述: 全局地区和园区

This commit is contained in:
SelfRidicule 2024-06-26 09:44:57 +08:00
parent e468f7feab
commit e89297532f
8 changed files with 25 additions and 30 deletions

View File

@ -17,9 +17,10 @@ export function request(params) {
if (wx.getStorageSync('token')) { if (wx.getStorageSync('token')) {
header["Authorization"] = 'Bearer ' + wx.getStorageSync('token'); header["Authorization"] = 'Bearer ' + wx.getStorageSync('token');
} }
if (wx.getStorageSync('parkId')) { // 地区id
data.parkId = wx.getStorageSync('parkId') data.tenantId = app.tenantId
} // 园区id
data.parkId = app.parkId
// 加载中 // 加载中
wx.showLoading({ wx.showLoading({

View File

@ -2,15 +2,17 @@ App({
// 郑州小程序配置信息 // 郑州小程序配置信息
APPID: 'wx5582a07c1fbbcf06', APPID: 'wx5582a07c1fbbcf06',
APPSECRET: 'ad24130a8919c613efd9538f69abafd3', APPSECRET: 'ad24130a8919c613efd9538f69abafd3',
tenantId : '1', // 地区-郑州 tenantId : '1', // 地区
parkId : '25', // 园区id
parkName : '中国电子数据产业集团', // 园区名称
// 本地测试 // 本地测试
// DOMAIN_NAME_PREFIX: 'http://192.168.0.11', DOMAIN_NAME_PREFIX: 'http://192.168.0.11',
// DOMAIN_NAME: 'http://192.168.0.11:9227', //接口域名 DOMAIN_NAME: 'http://192.168.0.11:9227', //接口域名
// IMG_NAME: 'http://192.168.0.11:9227', IMG_NAME: 'http://192.168.0.11:9227',
// 生产 // 生产
DOMAIN_NAME_PREFIX: 'https://www.chuangzhikj.com', // DOMAIN_NAME_PREFIX: 'https://www.chuangzhikj.com',
DOMAIN_NAME: 'https://www.chuangzhikj.com/saas-ics', //接口域名 // DOMAIN_NAME: 'https://www.chuangzhikj.com/saas-ics', //接口域名
IMG_NAME: 'https://www.chuangzhikj.com/saas-ics', // IMG_NAME: 'https://www.chuangzhikj.com/saas-ics',
globals: { globals: {
refreshMyPages: false, refreshMyPages: false,
homedata: {}, homedata: {},

View File

@ -158,7 +158,7 @@ Page({
], ],
bannerList: [], bannerList: [],
userDetail: {}, userDetail: {},
parkName: '首页', parkName: app.parkName,
qrcodeParam: null, qrcodeParam: null,
}, },
@ -198,10 +198,8 @@ Page({
_this.setData({ _this.setData({
userDetail userDetail
}) })
// 园区id
let parkId = wx.getStorageSync('parkId');
// 查询轮播图 // 查询轮播图
getParkRq(parkId).then(res => { getParkRq(app.parkId).then(res => {
console.log('getParkRq', res); console.log('getParkRq', res);
let bannerList = res.bannerImages.map(item => item.url) let bannerList = res.bannerImages.map(item => item.url)
_this.setData({ _this.setData({

View File

@ -12,7 +12,7 @@
</view> </view>
<!-- 免费服务 --> <!-- 免费服务 -->
<view class="facilitiesView"> <!-- <view class="facilitiesView">
<view class="leftLineTitle">免费服务</view> <view class="leftLineTitle">免费服务</view>
<view class="itemView"> <view class="itemView">
<view class="singleItem" wx:for="{{detail.roomFreeServe}}" wx:key="*this"> <view class="singleItem" wx:for="{{detail.roomFreeServe}}" wx:key="*this">
@ -20,7 +20,7 @@
<view class="name">{{item.serveName}}</view> <view class="name">{{item.serveName}}</view>
</view> </view>
</view> </view>
</view> </view> -->
<!-- 增值服务 --> <!-- 增值服务 -->
<view class="serviceView"> <view class="serviceView">

View File

@ -205,16 +205,10 @@ Page({
}).then(res => { }).then(res => {
console.log('saveMeetingRecordRq', res); console.log('saveMeetingRecordRq', res);
if (res.code == 0) { if (res.code == 0) {
// 支付金额大于0需要付款 wx.reLaunch({
if (_this.data.totalAmount > 0) { url: '/pages/meeting/pay/waitComplete/waitComplete',
wx.redirectTo({ })
url: "/pages/meeting/pay/waitPay/waitPay?id=" + res.reservationId,
})
} else {
wx.reLaunch({
url: '/pages/meeting/reservationRecord/meetingRecord/meetingRecord',
})
}
} else { } else {
// 错误提示 // 错误提示
Notify({ Notify({

View File

@ -60,12 +60,12 @@
<van-icon name="arrow" size="44rpx" /> <van-icon name="arrow" size="44rpx" />
</view> </view>
</view> --> </view> -->
<view class="itemView"> <!-- <view class="itemView">
<view class="label">总金额</view> <view class="label">总金额</view>
<view class="content"> <view class="content">
<view class="price">¥{{countAmount}}</view> <view class="price">¥{{countAmount}}</view>
</view> </view>
</view> </view> -->
</view> </view>
<view class="submitBtn" bind:tap="submitCase">提交预约</view> <view class="submitBtn" bind:tap="submitCase">提交预约</view>

View File

@ -2,5 +2,5 @@
"usingComponents": { "usingComponents": {
"van-icon": "@vant/weapp/icon/index" "van-icon": "@vant/weapp/icon/index"
}, },
"navigationBarTitleText": "支付结果" "navigationBarTitleText": "预约结果"
} }

View File

@ -3,7 +3,7 @@
<!-- 支付展示 --> <!-- 支付展示 -->
<view class="showView"> <view class="showView">
<van-icon name="checked" size="200rpx" color="#4e96f8"/> <van-icon name="checked" size="200rpx" color="#4e96f8"/>
<view class="title">支付成功</view> <view class="title">预约成功</view>
</view> </view>
<!-- 查看预约 --> <!-- 查看预约 -->