From 20fcc73d8290c3792aff201f5735bebdc7f92b75 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Tue, 10 Sep 2019 21:03:03 +0800
Subject: [PATCH] =?UTF-8?q?ios=E6=90=9C=E7=B4=A2=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E6=9B=B4=E5=A4=9A=E7=BB=86=E8=8A=82?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/index/controller/Ueditor.php          | 7 -------
 application/index/view/default/public/footer.html | 2 +-
 application/index/view/default/search/index.html  | 2 +-
 application/service/UeditorService.php            | 2 +-
 public/static/index/default/css/search.css        | 2 +-
 public/static/index/default/js/search.js          | 4 +++-
 6 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/application/index/controller/Ueditor.php b/application/index/controller/Ueditor.php
index 075531099..811d06957 100644
--- a/application/index/controller/Ueditor.php
+++ b/application/index/controller/Ueditor.php
@@ -44,13 +44,6 @@ class Ueditor extends Common
      */
     public function Index()
     {
-        // 是否ajax请求
-        if(!IS_AJAX)
-        {
-            $this->error('非法访问');
-        }
-
-        // 调用附件服务层
         $ret = UeditorService::Run(input());
         if($ret['code'] == 0)
         {
diff --git a/application/index/view/default/public/footer.html b/application/index/view/default/public/footer.html
index c7fd13a78..5bd74771b 100755
--- a/application/index/view/default/public/footer.html
+++ b/application/index/view/default/public/footer.html
@@ -1,5 +1,5 @@
 <!-- commom html -->
-<textarea id="upload-editor-view" data-url="{{:MyUrl('index/ueditor/index', ['path_type'=>empty($editor_path_type) ? 'common' : $editor_path_type])}}" style="display: none;"></textarea>
+<textarea id="upload-editor-view" data-url="{{if !empty($user)}}{{:MyUrl('index/ueditor/index', ['path_type'=>empty($editor_path_type) ? 'common' : $editor_path_type])}}{{/if}}" style="display: none;"></textarea>
 
 <!-- footer start -->
 {{if !isset($is_footer) or $is_footer eq 1}}
diff --git a/application/index/view/default/search/index.html b/application/index/view/default/search/index.html
index 529100a3e..4af486c2e 100755
--- a/application/index/view/default/search/index.html
+++ b/application/index/view/default/search/index.html
@@ -44,7 +44,7 @@
 
     <div class="search-container am-u-sm-12 am-u-md-12 am-padding-left-0 am-padding-right-0" data-category-id="{{$params.category_id}}">
         <div class="theme-popover">
-            <ul class="select">
+            <ul class="select am-cf">
                 <p class="title-tips">
                     <span>筛选出</span>
                     <strong>...</strong>
diff --git a/application/service/UeditorService.php b/application/service/UeditorService.php
index 9cf262c44..25b5862bc 100644
--- a/application/service/UeditorService.php
+++ b/application/service/UeditorService.php
@@ -93,7 +93,7 @@ class UeditorService
         {
             if(preg_match("/^[\w_]+$/", $params['callback']))
             {
-                return DataReturn(htmlspecialchars($params['callback']) . '(' . self::$current_result . ')', -1);
+                return DataReturn(htmlspecialchars($params['callback']), -1);
             } else {
                 return DataReturn('callback参数不合法', -1);
             }
diff --git a/public/static/index/default/css/search.css b/public/static/index/default/css/search.css
index f6b3a96de..2efd202c0 100755
--- a/public/static/index/default/css/search.css
+++ b/public/static/index/default/css/search.css
@@ -1,7 +1,7 @@
 .search-container { float: none; }
 .items img{ width:100%;}
 .items .price strong{ font-size: 14px; }
-.theme-popover {z-index: 1011;overflow:hidden;background:#fff; width: 100%; }
+.theme-popover {z-index: 1011;background:#fff; width: 100%; }
 .sort-nav a:hover, .sort-nav a:focus { color: #d2364c; }
 .select .title-tips { font-size: 12px; color: #888; }
 .select .title-tips strong { font-weight: 500; color: #fe90a0; }
diff --git a/public/static/index/default/js/search.js b/public/static/index/default/js/search.js
index d92678524..4c5a75eab 100755
--- a/public/static/index/default/js/search.js
+++ b/public/static/index/default/js/search.js
@@ -100,7 +100,9 @@ $(function()
             $(".theme-popover").css({"position":"static", "top":0});
         }
     });
-    $(document).on("click", ".theme-popover-mask", function()
+
+    // 关闭弹层
+    $('.theme-popover-mask').on('click', function()
     {
         $(".dd-conent").slideUp(300);
         $(".theme-popover-mask").hide();
-- 
GitLab