From 83a3338e6cc294e2904e168ff81c27a4fd3c580c Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Tue, 7 Nov 2023 09:32:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/online-service/online-service.vue |  3 +-
 components/quick-nav/quick-nav.vue           | 29 ++++++++++----------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/components/online-service/online-service.vue b/components/online-service/online-service.vue
index 5d4f7151..7578307c 100644
--- a/components/online-service/online-service.vue
+++ b/components/online-service/online-service.vue
@@ -64,12 +64,11 @@
 </template>
 <script>
     const app = getApp();
-    var common_static_url = app.globalData.get_static_url('common');
     export default {
         data() {
             return {
                 theme_view: app.globalData.get_theme_value_view(),
-                common_static_url: common_static_url,
+                common_static_url: app.globalData.get_static_url('common'),
                 is_chat: 0,
                 chat_url: null,
                 common_app_customer_service_tel: null,
diff --git a/components/quick-nav/quick-nav.vue b/components/quick-nav/quick-nav.vue
index c5b7363c..a75054d1 100644
--- a/components/quick-nav/quick-nav.vue
+++ b/components/quick-nav/quick-nav.vue
@@ -9,11 +9,11 @@
 
         <!-- 弹窗 -->
         <component-popup :propShow="popup_status" :propIsBar="propIsBar" propPosition="bottom" @onclose="quick_close_event">
-            <view :class="'nav-popup-container ' + common_ent">
-                <view class="close oh">
-                    <view class="icon-right" @tap.stop="quick_close_event">
-                        <iconfont name="icon-huiyuan-guanbi" size="28rpx" color="#999"></iconfont>
-                    </view>
+            <view :class="'nav-popup-container ' + common_ent">
+                <view class="close oh">
+                    <view class="fr" @tap.stop="quick_close_event">
+                        <iconfont name="icon-huiyuan-guanbi" size="28rpx" color="#999"></iconfont>
+                    </view>
                 </view>
                 <view class="nav-popup-content">
                     <view v-if="data_list.length > 0" class="nav-data-list">
@@ -37,12 +37,11 @@
     const app = getApp();
     import componentPopup from '../popup/popup';
     import componentNoData from '../no-data/no-data';
-    var common_static_url = app.globalData.get_static_url('common');
     export default {
         data() {
             return {
                 theme_view: app.globalData.get_theme_value_view(),
-                common_static_url: common_static_url,
+                common_static_url: app.globalData.get_static_url('common'),
                 popup_status: false,
                 quick_status: 0,
                 data_list: [],
@@ -114,10 +113,11 @@
         methods: {
             // 初始化配置
             init_config(status) {
-                if ((status || false) == true) {
+                if ((status || false) == true) {
+                    var data_list = app.globalData.get_config('quick_nav') || [];
                     this.setData({
-                        data_list: app.globalData.get_config('quick_nav') || [],
-                        quick_status: app.globalData.get_config('config.home_navigation_main_quick_status') || 0,
+                        data_list: data_list,
+                        quick_status: (data_list.length > 0) ? (app.globalData.get_config('config.home_navigation_main_quick_status') || 0) : 0,
                     });
                 } else {
                     app.globalData.is_config(this, 'init_config');
@@ -188,11 +188,10 @@
     }
 
     .nav-popup-container .close {
-        overflow: hidden;
-    }
-
-    .nav-popup-container .close .icon-right {
-        float: right;
+        position: absolute;
+        top: 20rpx;
+        right: 20rpx;
+        z-index: 2;
     }
 
     .nav-popup-content {