diff --git a/application/index/view/default/order/detail.html b/application/index/view/default/order/detail.html
index 056f3f39f4e3d52faef935b01d4d8d3b0f342625..b740fb9c8bf26b2d3f851fff90a7d514809a8c1f 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])}}
{{/if}}
+
+
+ {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
+
+ plugins_service_order_handle_operation_html
+
+ {{/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}}
{{if in_array($data['status'], [3,4])}}
diff --git a/application/plugins/view/answers/admin/sliderinfo.html b/application/plugins/view/answers/admin/sliderinfo.html
index 0d2f6f03a2480b25b8d750e3dad311053fc7b704..97fc7d37db604074809ce3e0200c50314b43aab8 100644
--- a/application/plugins/view/answers/admin/sliderinfo.html
+++ b/application/plugins/view/answers/admin/sliderinfo.html
@@ -23,7 +23,7 @@
-
+
diff --git a/application/service/PluginsAdminService.php b/application/service/PluginsAdminService.php
index 1bb49c8ee99909c803b7550552c912ff17b2a3dc..e7a1cab5395619c5c31f5683cbad886b870068d4 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 203fc4df43728af75aca0c5e6dd10969b0486ef2..7c33967241487ada554c799f6467356a90b0de5f 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 3f13443c59f9b8ac5018add9090e02ac5c5a9a99..21b74169f4df15df977793f631a22f54e2acb491 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%;