diff --git a/api/request.js b/api/request.js index bfc02ae..61bfc54 100644 --- a/api/request.js +++ b/api/request.js @@ -18,9 +18,9 @@ // export const BASE_URL = "http://42.180.188.17:9809" // 鞍钢正式环境 // export const BASE_URL = "http://42.180.188.17:19098" // 鞍钢线上测试环境 // export const BASE_URL = "http://jxj.zhgdyun.com:18004" // 包头线上地址 -export const BASE_URL = "http://219.147.96.219:9809" // 包头线上地址(正式) +// export const BASE_URL = "http://219.147.96.219:9809" // 包头线上地址(正式) -// export const BASE_URL = process.env.NODE_ENV === 'development' ? "http://192.168.34.221:9111" : "http://219.147.96.219:9809" // 包头线上地址(正式) +export const BASE_URL = process.env.NODE_ENV === 'development' ? "http://192.168.34.221:9111" : "http://219.147.96.219:9809" // 包头线上地址(正式) //是否已显示未登录弹窗 let showNoLoginTip = false diff --git a/pages/instance/instancePreview.vue b/pages/instance/instancePreview.vue index 361b5b8..071dee5 100644 --- a/pages/instance/instancePreview.vue +++ b/pages/instance/instancePreview.vue @@ -226,9 +226,9 @@ const contentHeight = computed(() => { const h = uni.getSystemInfoSync().windowHeight if(window.plus) { - return instanceData.value.finishTime ? h : h - uni.upx2px(88) - uni.upx2px(44) - uni.upx2px(60) - uni.upx2px(88); + return instanceData.value.finishTime ? h - uni.upx2px(88) : h - uni.upx2px(88) - uni.upx2px(44) - uni.upx2px(60) - uni.upx2px(88); } - return instanceData.value.finishTime ? h : h - uni.upx2px(88) - uni.upx2px(60) - uni.upx2px(88); + return instanceData.value.finishTime ? h - uni.upx2px(88) : h - uni.upx2px(88) - uni.upx2px(60) - uni.upx2px(88); }) //滚动延时去抖动