From 6821b91200115f15740f6231e5c0b6d20af7c73d Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Thu, 9 Jan 2025 15:57:13 +0800
Subject: [PATCH] =?UTF-8?q?diy=E6=B5=AE=E5=8A=A8=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=BF=AB=E6=8D=B7=E5=AF=BC=E8=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy/float-window.vue    | 26 ++++++++++++++++++++------
 components/quick-nav/quick-nav.vue | 10 +++++++---
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/components/diy/float-window.vue b/components/diy/float-window.vue
index e957231b..6099a38d 100644
--- a/components/diy/float-window.vue
+++ b/components/diy/float-window.vue
@@ -1,6 +1,6 @@
 <template>
     <movable-area class="float-window-movable-container">
-        <movable-view :x="x" :y="y" direction="all" class="float-window-spread flex-row align-c jc-c" @tap="url_open">
+        <movable-view :x="x" :y="y" direction="all" class="float-window-spread flex-row align-c jc-c" @tap="btn_event">
             <block v-if="style.float_style == 'diffuse'">
                 <view class="ring" :style="content_style"></view>
                 <view class="ring" :style="content_style"></view>
@@ -14,6 +14,7 @@
                 </block>
             </view>
         </movable-view>
+        <component-quick-nav ref="quick_nav" :propIsBtn="false"></component-quick-nav>
     </movable-area>
 </template>
 
@@ -22,10 +23,12 @@
     import { isEmpty } from '@/common/js/common/common.js';
     import imageEmpty from '@/components/diy/modules/image-empty.vue';
     import componentOnlineService from '@/components/online-service/online-service';
+    import componentQuickNav from '@/components/quick-nav/quick-nav';
     export default {
         components: {
             imageEmpty,
-            componentOnlineService
+            componentOnlineService,
+            componentQuickNav
         },
         props: {
             propValue: {
@@ -83,11 +86,22 @@
                     y: y
                 });
             },
-            url_open() {
+            // 按钮事件
+            btn_event() {
                 const { button_jump, button_link } = this.form;
-                // 如果是指定链接，并且链接不为空的情况下跳转
-                if (button_jump == 'link' && !isEmpty(button_link)) {
-                    app.globalData.url_open(button_link.page);
+                switch(button_jump) {
+                    // 链接
+                    case 'link' :
+                        if (!isEmpty(button_link)) {
+                            app.globalData.url_open(button_link.page);
+                        }
+                        break;
+                    // 快捷导航
+                    case 'quick_nav' :
+                        if ((this.$refs.quick_nav || null) != null) {
+                            this.$refs.quick_nav.quick_open_event();
+                        }
+                        break;
                 }
             },
         },
diff --git a/components/quick-nav/quick-nav.vue b/components/quick-nav/quick-nav.vue
index bd215851..c2db9b74 100644
--- a/components/quick-nav/quick-nav.vue
+++ b/components/quick-nav/quick-nav.vue
@@ -1,7 +1,7 @@
 <template>
     <view :class="theme_view">
         <!-- 开启事件 -->
-        <movable-area v-if="quick_status == 1" :class="'quick-movable-container ' + common_ent" :style="'height: calc(100% - ' + height_dec + 'rpx);top:' + top + 'rpx;'">
+        <movable-area v-if="propIsBtn && quick_status == 1" :class="'quick-movable-container ' + common_ent" :style="'height: calc(100% - ' + height_dec + 'rpx);top:' + top + 'rpx;'">
             <movable-view direction="all" :x="x" :y="y" :animation="false" class="quick-event-submit" @tap="quick_open_event">
                 <image class="image" :src="common_static_url + 'quick-icon.png'" mode="widthFix"></image>
             </movable-view>
@@ -59,9 +59,13 @@
             componentNoData,
         },
         props: {
-            propIsBar: {
+            propIsBtn: {
                 type: Boolean,
-                default: false,
+                default: true,
+            },
+            propIsBar: {
+                type: Boolean,
+                default: false,
             },
             propIsNav: {
                 type: Boolean,