From d1b32ade0ad7ae8402998795b7335d100f7ed45d Mon Sep 17 00:00:00 2001
From: taohebin <taohebin@dcloud.io>
Date: Wed, 23 Oct 2024 15:34:04 +0800
Subject: [PATCH] update: map.uvue

# Conflicts:
#	pages/component/map/map.uvue
---
 components/boolean-data/boolean-data.vue | 6 +++++-
 pages/component/map/map.uvue             | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/components/boolean-data/boolean-data.vue b/components/boolean-data/boolean-data.vue
index bf835cab..7b3440e0 100644
--- a/components/boolean-data/boolean-data.vue
+++ b/components/boolean-data/boolean-data.vue
@@ -6,6 +6,10 @@
         type: String,
         default: ''
       },
+      disabled: {
+        type: Boolean,
+        default: false
+      },
       defaultValue: {
         type: Boolean,
         default: false
@@ -32,7 +36,7 @@
 <template>
   <view class="button-data-main uni-flex">
     <view class="uni-title" style="width:80%">{{ title }}</view>
-    <switch :checked="_checked" @change="_change" />
+    <switch :checked="_checked" :disabled="disabled" @change="_change" />
   </view>
 </template>
 
diff --git a/pages/component/map/map.uvue b/pages/component/map/map.uvue
index 48b357b5..fa6f2da2 100644
--- a/pages/component/map/map.uvue
+++ b/pages/component/map/map.uvue
@@ -15,7 +15,7 @@
       <input-data defaultValue="13" title="scale: 缩放级别，取值范围为5-18" type="number"
         @confirm="confirm_scale_input"></input-data>
       <boolean-data :defaultValue="showLocation" title="开启显示带有方向的当前定位点" @change="change_show_location"></boolean-data>
-      <boolean-data :default-value="enable3D" title="3D效果" @change="change_enable_3d"></boolean-data>
+      <boolean-data :default-value="enable3D" :disabled="enableSatellite" title="3D效果(放大缩放级别才能看到建筑物3D效果)" @change="change_enable_3d"></boolean-data>
       <boolean-data :default-value="showCompass" title="显示指南针" @change="change_show_campass"></boolean-data>
       <boolean-data :default-value="enableOverlooking" title="俯视支持" @change="change_enable_overlooking"></boolean-data>
       <boolean-data :default-value="enableRotate" title="旋转支持" @change="change_enable_rotate"></boolean-data>
-- 
GitLab