From 6c79fec45d0c1783a83f8000db03307048b187ea Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Tue, 12 Mar 2019 18:26:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E9=80=92=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/index/view/default/order/detail.html   | 14 ++++++++++++++
 .../plugins/view/answers/admin/sliderinfo.html     |  2 +-
 application/service/PluginsAdminService.php        |  2 +-
 application/service/ThemeService.php               |  2 +-
 public/static/index/default/css/order.detail.css   |  5 +++++
 5 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/application/index/view/default/order/detail.html b/application/index/view/default/order/detail.html
index 056f3f39f..b740fb9c8 100755
--- a/application/index/view/default/order/detail.html
+++ b/application/index/view/default/order/detail.html
@@ -205,6 +205,20 @@
                         {{if in_array($data['status'], [4,5,6])}}
                             <button type="button" class="am-btn am-btn-danger am-btn-xs am-radius submit-delete" data-url="{{:MyUrl('index/order/delete')}}" data-id="{{$data.id}}" data-view="jump" data-value="{{:MyUrl('index/order/index')}}">删除</button>
                         {{/if}}
+
+                        <!-- 钩子订单操作 -->
+                        {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
+                            <div class="plugins-tag">
+                                <span>plugins_service_order_handle_operation_html</span>
+                            </div>
+                        {{/if}}
+                        {{if !empty($data['plugins_service_order_handle_operation_html']) and is_array($data['plugins_service_order_handle_operation_html'])}}
+                            {{foreach $data.plugins_service_order_handle_operation_html as $hook}}
+                                {{if is_string($hook) or is_int($hook)}}
+                                    {{$hook|raw}}
+                                {{/if}}
+                            {{/foreach}}
+                        {{/if}}
                     </div>
                     {{if in_array($data['status'], [3,4])}}
                         <div class="logistics">
diff --git a/application/plugins/view/answers/admin/sliderinfo.html b/application/plugins/view/answers/admin/sliderinfo.html
index 0d2f6f03a..97fc7d37d 100644
--- a/application/plugins/view/answers/admin/sliderinfo.html
+++ b/application/plugins/view/answers/admin/sliderinfo.html
@@ -23,7 +23,7 @@
                 </div>
                 
                 <div class="am-form-group">
-                    <label>url地址<span class="fs-12 fw-100 cr-ccc">（带http://或https://</span></label>
+                    <label>url地址<span class="am-form-group-label-tips">带http://或https://</span></label>
                     <input type="url" placeholder="url地址" name="url"  data-validation-message="url格式有误" class="am-radius" {{if !empty($data)}} value="{{$data.url}}"{{/if}} required />
                 </div>
 
diff --git a/application/service/PluginsAdminService.php b/application/service/PluginsAdminService.php
index 1bb49c8ee..e7a1cab53 100755
--- a/application/service/PluginsAdminService.php
+++ b/application/service/PluginsAdminService.php
@@ -867,7 +867,7 @@ php;
         }
 
         // 文件格式化校验
-        $type = array('application/zip', 'application/octet-stream');
+        $type = array('application/zip', 'application/octet-stream', 'application/x-zip-compressed');
         if(!in_array($_FILES['file']['type'], $type))
         {
             return DataReturn('文件格式有误，请上传zip压缩包', -2);
diff --git a/application/service/ThemeService.php b/application/service/ThemeService.php
index 203fc4df4..7c3396724 100755
--- a/application/service/ThemeService.php
+++ b/application/service/ThemeService.php
@@ -100,7 +100,7 @@ class ThemeService
         }
 
         // 文件格式化校验
-        $type = array('application/zip', 'application/octet-stream');
+        $type = array('application/zip', 'application/octet-stream', 'application/x-zip-compressed');
         if(!in_array($_FILES['theme']['type'], $type))
         {
             return DataReturn('文件格式有误，请上传zip压缩包', -2);
diff --git a/public/static/index/default/css/order.detail.css b/public/static/index/default/css/order.detail.css
index 3f13443c5..21b74169f 100755
--- a/public/static/index/default/css/order.detail.css
+++ b/public/static/index/default/css/order.detail.css
@@ -137,6 +137,11 @@ ul.progress li.current .title {
 .order-base .logistics {
     margin-top: 10px;
 }
+.order-base .am-btn-block {
+    width: auto;
+    padding-left: 1em;
+    padding-right: 1em;
+}
 @media only screen and (min-width: 641px) {
     .order-base .base-left, .order-base .base-right {
         width: 50%;
-- 
GitLab