From 05040da12408c05ba07f2b29eec5b197210e4bcf Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 02 Feb 2026 17:39:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
uniapps/work-wx/src/subPackages/deviceRegistration/add.vue | 26 +++++++++++++++++++++-----
uniapps/work-wx/src/subPackages/flightApplication/add.vue | 2 +-
2 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/uniapps/work-wx/src/subPackages/deviceRegistration/add.vue b/uniapps/work-wx/src/subPackages/deviceRegistration/add.vue
index 14bd687..0b30f36 100644
--- a/uniapps/work-wx/src/subPackages/deviceRegistration/add.vue
+++ b/uniapps/work-wx/src/subPackages/deviceRegistration/add.vue
@@ -659,9 +659,25 @@
// getManufacturerInfoApi()
// 动态从外部URL导入xzqhData，确保在使用前已初始化
// 注意：直接动态导入外部URL可能会有跨域或构建问题，建议检查服务器CORS设置
- const response = await fetch('https://wrj.shuixiongit.com/aiskyminio/cloud-bucket/ja-app-wx/xzqh/index.json')
- const text = await response.text()
- areaData.value = JSON.parse(text)
+ // const response = await fetch('https://wrj.shuixiongit.com/aiskyminio/cloud-bucket/ja-app-wx/xzqh/index.json')
+ // const text = await response.text()
+ // areaData.value = JSON.parse(text)
+ const response = await uni.request({
+ url: 'https://wrj.shuixiongit.com/aiskyminio/cloud-bucket/ja-app-wx/xzqh/index.json',
+ method: 'GET',
+ timeout: 10000, // 10秒超时
+ dataType: 'json'
+ })
+
+ // 检查响应
+ if (response.statusCode === 200) {
+ areaData.value = response.data
+ console.log('请求成功:', data)
+ // 处理数据
+ } else {
+ console.error('请求失败:', response)
+ throw new Error(`请求失败: ${response.statusCode}`)
+ }
})
</script>
<style scoped lang="scss">
@@ -789,11 +805,11 @@
}
.select-content {
- height: 400rpx;
+ height: 600rpx;
text-align: center;
padding: 20rpx 20rpx;
.loading-container {
- height: 400rpx;
+ height: 600rpx;
display: flex;
align-items: center;
justify-content: center;
diff --git a/uniapps/work-wx/src/subPackages/flightApplication/add.vue b/uniapps/work-wx/src/subPackages/flightApplication/add.vue
index 971bff7..9bccfe4 100644
--- a/uniapps/work-wx/src/subPackages/flightApplication/add.vue
+++ b/uniapps/work-wx/src/subPackages/flightApplication/add.vue
@@ -965,7 +965,7 @@
}
.select-content {
- height: 400rpx;
+ height: 600rpx;
text-align: center;
padding: 20rpx 20rpx;
}
--
Gitblit v1.9.3