From a8daa8cb767cac584d51ab5ad76e3c2793851beb Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Sat, 19 Sep 2020 13:23:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E5=AF=BC=E8=88=AA=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=8F=AF=E8=87=AA=E5=AE=9A=E4=B9=89=EF=BC=8C=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4qq=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=AE=A2=E6=9C=8D?=
 =?UTF-8?q?=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/view/default/site/siteset.html    | 13 +++++++++++++
 .../index/view/default/public/header_nav.html       |  2 +-
 sourcecode/qq/pages/goods-detail/goods-detail.js    |  2 +-
 sourcecode/qq/pages/index/index.js                  |  2 +-
 sourcecode/qq/pages/user/user.js                    |  2 +-
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/application/admin/view/default/site/siteset.html b/application/admin/view/default/site/siteset.html
index aef40c192..1098e3860 100644
--- a/application/admin/view/default/site/siteset.html
+++ b/application/admin/view/default/site/siteset.html
@@ -9,6 +9,19 @@
 
         <!-- form start -->
         <form class="am-form form-validation view-save" action="{{:MyUrl('admin/site/save')}}" method="POST" request-type="ajax-url" request-value="{{:MyUrl('admin/site/index', ['nav_type'=>'siteset'])}}" enctype="multipart/form-data">
+            <!-- 全局 -->
+            <div class="am-panel am-panel-default">
+                <div class="am-panel-hd">
+                    <h3 class="am-panel-title">全局</h3>
+                </div>
+                <div class="am-panel-bd">
+                    <div class="am-form-group">
+                        <label>{{$data.home_navigation_main_quick_name.name}}<span class="am-form-group-label-tips">{{$data.home_navigation_main_quick_name.describe}}</span></label>
+                        <input type="text" maxlength="4" name="{{$data.home_navigation_main_quick_name.only_tag}}" placeholder="{{$data.home_navigation_main_quick_name.name}}" data-validation-message="{{$data.home_navigation_main_quick_name.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.home_navigation_main_quick_name.value}}"{{/if}} />
+                    </div>
+                </div>
+            </div>
+
             <!-- 首页 -->
             <div class="am-panel am-panel-default">
                 <div class="am-panel-hd">
diff --git a/application/index/view/default/public/header_nav.html b/application/index/view/default/public/header_nav.html
index 0d2aa0bc4..cc697b3c5 100755
--- a/application/index/view/default/public/header_nav.html
+++ b/application/index/view/default/public/header_nav.html
@@ -71,7 +71,7 @@
                     <a href="javascript:;" class="am-block" data-am-modal="{target: '#left-main-quick-popup'}">
                         <span class="am-icon-sliders icon"></span>
                         <b class="am-block"></b>
-                        <p class="am-text-truncate name">百宝箱</p>
+                        <p class="am-text-truncate name">{{:MyC('home_navigation_main_quick_name', '百宝箱', true)}}</p>
                         <i class="am-icon-angle-down"></i>
                     </a>
                 </div>
diff --git a/sourcecode/qq/pages/goods-detail/goods-detail.js b/sourcecode/qq/pages/goods-detail/goods-detail.js
index e11244564..13bcf2218 100755
--- a/sourcecode/qq/pages/goods-detail/goods-detail.js
+++ b/sourcecode/qq/pages/goods-detail/goods-detail.js
@@ -87,7 +87,7 @@ Page({
         currency_symbol: app.get_config('currency_symbol'),
         common_app_is_use_mobile_detail: app.get_config('config.common_app_is_use_mobile_detail'),
         common_is_goods_detail_show_photo: app.get_config('config.common_is_goods_detail_show_photo'),
-        common_app_is_online_service: app.get_config('config.common_app_is_online_service'),
+        //common_app_is_online_service: app.get_config('config.common_app_is_online_service'),
         common_app_customer_service_tel: app.get_config('config.common_app_customer_service_tel'),
       });
     } else {
diff --git a/sourcecode/qq/pages/index/index.js b/sourcecode/qq/pages/index/index.js
index a95fe2a10..886963d82 100755
--- a/sourcecode/qq/pages/index/index.js
+++ b/sourcecode/qq/pages/index/index.js
@@ -41,7 +41,7 @@ Page({
         common_app_is_enable_search: app.get_config('config.common_app_is_enable_search'),
         common_app_is_enable_answer: app.get_config('config.common_app_is_enable_answer'),
         common_app_is_header_nav_fixed: app.get_config('config.common_app_is_header_nav_fixed'),
-        common_app_is_online_service: app.get_config('config.common_app_is_online_service'),
+        //common_app_is_online_service: app.get_config('config.common_app_is_online_service'),
       });
     } else {
       app.is_config(this, 'init_config');
diff --git a/sourcecode/qq/pages/user/user.js b/sourcecode/qq/pages/user/user.js
index bb8da2f03..45350721b 100755
--- a/sourcecode/qq/pages/user/user.js
+++ b/sourcecode/qq/pages/user/user.js
@@ -44,7 +44,7 @@ Page({
       this.setData({
         common_app_customer_service_tel: app.get_config('config.common_app_customer_service_tel'),
         common_user_center_notice: app.get_config('config.common_user_center_notice'),
-        common_app_is_online_service: app.get_config('config.common_app_is_online_service'),
+        //common_app_is_online_service: app.get_config('config.common_app_is_online_service'),
         common_app_is_head_vice_nav: app.get_config('config.common_app_is_head_vice_nav'),
       });
     } else {