diff --git a/application/admin/form/Admin.php b/application/admin/form/Admin.php
index a798d63827acc069d22d29083cec6341dee909bf..4184da6012c1c8a6ceaee2b68f3d963bbd234fe3 100644
--- a/application/admin/form/Admin.php
+++ b/application/admin/form/Admin.php
@@ -54,8 +54,8 @@ class Admin
'checked_text' => '反选',
'not_checked_text' => '全选',
'align' => 'center',
- 'not_show_data' => [1],
'not_show_key' => 'id',
+ 'not_show_data' => [1],
'width' => 80,
],
[
diff --git a/application/admin/form/Order.php b/application/admin/form/Order.php
index ca8f089cf1aa0dea425c2ac95ef76a0531413379..2dbfab722a9248b74f9b8be56616b5cec32a707f 100644
--- a/application/admin/form/Order.php
+++ b/application/admin/form/Order.php
@@ -47,6 +47,7 @@ class Order
'is_search' => 1,
'search_url' => MyUrl('admin/order/index'),
'detail_title' => '基础信息',
+ 'is_middle' => 0,
],
// 表单配置
'form' => [
diff --git a/application/admin/form/Orderaftersale.php b/application/admin/form/Orderaftersale.php
index 0b3a25b540bc2bdd80751105c7f34788092d8a5a..027177c1a623888b992a3e88627d4062a7985907 100644
--- a/application/admin/form/Orderaftersale.php
+++ b/application/admin/form/Orderaftersale.php
@@ -42,6 +42,7 @@ class Orderaftersale
'key_field' => 'id',
'is_search' => 1,
'search_url' => MyUrl('admin/orderaftersale/index'),
+ 'is_middle' => 0,
],
// 表单配置
'form' => [
diff --git a/application/admin/view/default/order/module/goods.html b/application/admin/view/default/order/module/goods.html
index 56fd4e88d0ce6367ee20c986de29cd1161dd112a..1b437dbce7413569f782b12f89996d768013b8dc 100644
--- a/application/admin/view/default/order/module/goods.html
+++ b/application/admin/view/default/order/module/goods.html
@@ -19,11 +19,13 @@
{{$item.spec_text}}
{{/if}}
-
- {{if $item['returned_quantity'] gt 0 or $item['refund_price'] gt 0}}
-
已退 {{$item.returned_quantity}} / {{$price_symbol}}{{$item.refund_price}}
- {{/if}}
+
{{$price_symbol}}{{$item.price}}x{{$item.buy_number}}
+
+ {{if $item['returned_quantity'] gt 0 or $item['refund_price'] gt 0}}
+ 已退 {{$item.returned_quantity}} / {{$price_symbol}}{{$item.refund_price}}
+ {{/if}}
+
diff --git a/application/admin/view/default/public/module/form_table.html b/application/admin/view/default/public/module/form_table.html
index 6fb4afcd333be6fc60da13101ad707ed1b31b21d..e862d7b8873613ed93fa491fd06c3b9e2ecff961 100644
--- a/application/admin/view/default/public/module/form_table.html
+++ b/application/admin/view/default/public/module/form_table.html
@@ -9,7 +9,7 @@
-
-
-
-
+
+ {{if empty($t['not_show_data']) or empty($t['not_show_key']) or !isset($data_list[$i][$t['not_show_key']]) or !in_array($data_list[$i][$t['not_show_key']], $t['not_show_data'])}}
+
+
+
+
+
+ {{/if}}
{{/if}}
{{/case}}
{{case checkbox}}
{{if isset($data_list[$i][$form_table['base']['key_field']])}}
- {{if empty($t['not_show_data']) or empty($t['not_show_key']) or !in_array($data_list[$i][$form_table['base']['key_field']], $t['not_show_data'])}}
+ {{if empty($t['not_show_data']) or empty($t['not_show_key']) or !isset($data_list[$i][$t['not_show_key']]) or !in_array($data_list[$i][$t['not_show_key']], $t['not_show_data'])}}
@@ -216,7 +216,7 @@
您可以
{{/if}}
{{if in_array($data['status'], [0,1])}}
- 取消
+ 取消
{{/if}}
{{if in_array($data['status'], [1])}}
{{if $data['is_under_line'] eq 1}}切换{{/if}}支付
diff --git a/application/index/view/default/order/index.html b/application/index/view/default/order/index.html
index 72b90466a6be5c9c89ff1ebea9941f67da713d6e..9624be5f7ebe7e02ea798372041ec33d5f34c55f 100755
--- a/application/index/view/default/order/index.html
+++ b/application/index/view/default/order/index.html
@@ -1,2 +1,9 @@
-{{extend name="public/module/user_form" /}}
\ No newline at end of file
+{{extend name="public/module/user_form" /}}
+
+
+{{block name="form_operate_top"}}
+ 批量支付
+
+ {__block__}
+{{/block}}
\ No newline at end of file
diff --git a/application/index/view/default/order/module/goods.html b/application/index/view/default/order/module/goods.html
index 9398f899b856bccc6f1c6ba046e2a211d6e6ad8d..6143f185cd4cc2808af699746ae75844ea112061 100644
--- a/application/index/view/default/order/module/goods.html
+++ b/application/index/view/default/order/module/goods.html
@@ -20,14 +20,26 @@
{{/if}}
-
- {{if $item['returned_quantity'] gt 0 or $item['refund_price'] gt 0}}
-
已退 {{$item.returned_quantity}} / {{$price_symbol}}{{$item.refund_price}}
- {{/if}}
+
{{if $item.original_price gt 0}}
{{$price_symbol}}{{$item.original_price}}
{{/if}}
-
{{$price_symbol}}{{$item.price}}x{{$item.buy_number}}
+
{{$price_symbol}}{{$item.price}}x{{$item.buy_number}}
+ {{if $item['returned_quantity'] gt 0 or $item['refund_price'] gt 0}}
+
已退 {{$item.returned_quantity}} / {{$price_symbol}}{{$item.refund_price}}
+ {{/if}}
+
+
{{/foreach}}
diff --git a/application/index/view/default/order/module/status.html b/application/index/view/default/order/module/status.html
deleted file mode 100644
index 3f7b07dced487c99d828db79f66aa7b7837ee2f3..0000000000000000000000000000000000000000
--- a/application/index/view/default/order/module/status.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
-{{if !empty($module_data)}}
-
{{$module_data.status_name}}
- {{if $module_data['user_is_delete_time'] neq 0}}
-
用户已删除
- {{/if}}
-{{/if}}
\ No newline at end of file
diff --git a/application/index/view/default/orderaftersale/module/info.html b/application/index/view/default/orderaftersale/module/goods.html
similarity index 76%
rename from application/index/view/default/orderaftersale/module/info.html
rename to application/index/view/default/orderaftersale/module/goods.html
index 5c0a6ca4629574a77e066486929e3644a9893e1c..ffe769fb13150b10231006223fb58d12cbfb9076 100644
--- a/application/index/view/default/orderaftersale/module/info.html
+++ b/application/index/view/default/orderaftersale/module/goods.html
@@ -1,5 +1,9 @@
{{if !empty($module_data) and !empty($module_data['order_data'])}}
+
+ {{$module_data.order_no}}
+
+
{{/if}}
\ No newline at end of file
diff --git a/application/index/view/default/public/module/form_table.html b/application/index/view/default/public/module/form_table.html
index 6fb4afcd333be6fc60da13101ad707ed1b31b21d..e862d7b8873613ed93fa491fd06c3b9e2ecff961 100644
--- a/application/index/view/default/public/module/form_table.html
+++ b/application/index/view/default/public/module/form_table.html
@@ -9,7 +9,7 @@
-
-
-
-
+
+ {{if empty($t['not_show_data']) or empty($t['not_show_key']) or !isset($data_list[$i][$t['not_show_key']]) or !in_array($data_list[$i][$t['not_show_key']], $t['not_show_data'])}}
+
+
+
+
+
+ {{/if}}
{{/if}}
{{/case}}
{{case checkbox}}
{{if isset($data_list[$i][$form_table['base']['key_field']])}}
- {{if empty($t['not_show_data']) or empty($t['not_show_key']) or !in_array($data_list[$i][$form_table['base']['key_field']], $t['not_show_data'])}}
+ {{if empty($t['not_show_data']) or empty($t['not_show_key']) or !isset($data_list[$i][$t['not_show_key']]) or !in_array($data_list[$i][$t['not_show_key']], $t['not_show_data'])}}
diff --git a/application/module/FormHandleModule.php b/application/module/FormHandleModule.php
index 4cd724a6b5c398a0b8a6135423e521b3dbfd31d8..9fdefe90c2af16bba9594182fdbe3cd3384ca4ac 100644
--- a/application/module/FormHandleModule.php
+++ b/application/module/FormHandleModule.php
@@ -81,6 +81,12 @@ class FormHandleModule
return DataReturn('表格唯一字段配置有误['.$module.']base->[key_field]', -1);
}
+ // 是否上下居中(0否,1是)默认1
+ if(!isset($this->form_data['base']['is_middle']))
+ {
+ $this->form_data['base']['is_middle'] = 1;
+ }
+
// 钩子
$hv = explode('\\', $module);
if(isset($hv[2]) && isset($hv[4]) && in_array($hv[2], config('shopxo.module_form_hook_group')))
@@ -125,7 +131,14 @@ class FormHandleModule
{
foreach($this->form_data['form'] as $k=>&$v)
{
- // 基础处理
+ // 基础字段处理
+ // 是否上下居中(0否,1是)默认1
+ if(!isset($v['is_middle']))
+ {
+ $v['is_middle'] = isset($this->form_data['base']['is_middle']) ? $this->form_data['base']['is_middle'] : 1;
+ }
+
+ // 基础数据类型处理
if(!empty($v['view_type']))
{
switch($v['view_type'])
diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css
index 34dac2fd0c5a9a8832e965eab4e6f0f3ab286b99..3eb1311359f78d365851d825649dd8221c27933b 100755
--- a/public/static/admin/default/css/common.css
+++ b/public/static/admin/default/css/common.css
@@ -491,7 +491,6 @@ ul {margin-top:0;}
.menu-mini-container-popup .mui-mbar-tab-tip{color:#36373c}
.menu-mini-container-popup ul li a.common-left-menu-active { background: #686868 !important; }
-
/**
* 列表按钮美化
*/
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index c6347817f9f24ce7f381610fbf13ae0184366722..ec3049bc3b1380700b23da08d6abec29fc254444 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -1,6 +1,7 @@
/**
* 公共
*/
+*{ outline:none !important; }
ul { list-style: none; }
.none { display:none !important; }
.block { display:block !important; }
@@ -492,8 +493,8 @@ button.colorpicker-submit img {
.am-table-scrollable-horizontal .am-table > tfoot > tr > td {
padding: 12px;
line-height: 20px;
- min-width: 150px;
- max-width: 150px;
+ min-width: 160px;
+ max-width: 160px;
}
.am-table-scrollable-horizontal .am-table .am-nowrap-initial {
white-space: initial;
@@ -506,6 +507,15 @@ button.colorpicker-submit img {
background: #e8e6e6;
min-width: 100px;
}
+.am-table-scrollable-horizontal .am-table tr .am-grid-xxxl {
+ min-width: 650px;
+}
+.am-table-scrollable-horizontal .am-table tr .am-grid-xxl {
+ min-width: 550px;
+}
+.am-table-scrollable-horizontal .am-table tr .am-grid-xl {
+ min-width: 450px;
+}
.am-table-scrollable-horizontal .am-table tr .am-grid-lg {
min-width: 350px;
}
diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css
index 799ded32cec715d9cb038fa436e3dff4f2eeda92..0aa4aebdd67a779a6c18b9efec21944e84161a4b 100755
--- a/public/static/index/default/css/common.css
+++ b/public/static/index/default/css/common.css
@@ -474,6 +474,9 @@ ul.am-dropdown-content > .am-active > a:focus,
/**
* 框架覆盖
*/
+/**
+ * 操作按钮
+ */
.am-btn-default {
color: #666 !important;
background-color: #e6e6e6;
@@ -496,24 +499,24 @@ ul.am-dropdown-content > .am-active > a:focus,
}
.am-btn-secondary {
- color: #F44336 !important;
- background-color: #fddedc;
- border-color: #ffc3bf;
+ color: #E91E63 !important;
+ background-color: #ffc4d8;
+ border-color: #fb9bbc;
}
.am-btn-secondary:hover, .am-btn-secondary:focus {
- background-color: #F44336;
+ background-color: #E91E63;
}
.am-btn-secondary:hover, .am-btn-secondary:focus, .am-btn-secondary:active, .am-btn-secondary.am-active, .am-dropdown.am-active .am-btn-secondary.am-dropdown-toggle {
color: #fff !important;
- border-color: #F44336;
+ border-color: #E91E63;
}
.am-btn-secondary.am-disabled, .am-btn-secondary[disabled], fieldset[disabled] .am-btn-secondary, .am-btn-secondary.am-disabled:hover, .am-btn-secondary[disabled]:hover, fieldset[disabled] .am-btn-secondary:hover, .am-btn-secondary.am-disabled:focus, .am-btn-secondary[disabled]:focus, fieldset[disabled] .am-btn-secondary:focus, .am-btn-secondary.am-disabled:active, .am-btn-secondary[disabled]:active, fieldset[disabled] .am-btn-secondary:active, .am-btn-secondary.am-disabled.am-active, .am-btn-secondary[disabled].am-active, fieldset[disabled] .am-btn-secondary.am-active {
- background-color: #fddedc;
- border-color: #fddedc;
+ background-color: #ffc4d8;
+ border-color: #ffc4d8;
}
.am-btn-secondary:active, .am-btn-secondary.am-active, .am-dropdown.am-active .am-btn-secondary.am-dropdown-toggle {
background-image: none;
- background-color: #F44336;
+ background-color: #E91E63;
}
.am-btn-primary {
@@ -538,24 +541,24 @@ ul.am-dropdown-content > .am-active > a:focus,
}
.am-btn-danger {
- color: #f7274d !important;
- background-color: #ffcdd6;
- border-color: #f8adbb;
+ color: #f00 !important;
+ background-color: #ffcbcb;
+ border-color: #ff9e9e;
}
.am-btn-danger:hover, .am-btn-danger:focus {
- background-color: #f7274d;
+ background-color: #f00;
}
.am-btn-danger:hover, .am-btn-danger:focus, .am-btn-danger:active, .am-btn-danger.am-active, .am-dropdown.am-active .am-btn-danger.am-dropdown-toggle {
color: #fff !important;
- border-color: #f7274d;
+ border-color: #f00;
}
.am-btn-danger.am-disabled, .am-btn-danger[disabled], fieldset[disabled] .am-btn-danger, .am-btn-danger.am-disabled:hover, .am-btn-danger[disabled]:hover, fieldset[disabled] .am-btn-danger:hover, .am-btn-danger.am-disabled:focus, .am-btn-danger[disabled]:focus, fieldset[disabled] .am-btn-danger:focus, .am-btn-danger.am-disabled:active, .am-btn-danger[disabled]:active, fieldset[disabled] .am-btn-danger:active, .am-btn-danger.am-disabled.am-active, .am-btn-danger[disabled].am-active, fieldset[disabled] .am-btn-danger.am-active {
- background-color: #ffcdd6;
- border-color: #ffcdd6;
+ background-color: #ffcbcb;
+ border-color: #ffcbcb;
}
.am-btn-danger:active, .am-btn-danger.am-active, .am-dropdown.am-active .am-btn-danger.am-dropdown-toggle {
background-image: none;
- background-color: #f7274d;
+ background-color: #f00;
}
.am-btn-success {
@@ -600,13 +603,105 @@ ul.am-dropdown-content > .am-active > a:focus,
background-color: #F37B1D;
}
+
+/**
+ * 分页
+ */
.am-pagination > .am-active > a, .am-pagination > .am-active > a:hover { background-color: #d13b49; border-color: #d13b49; }
+
+/**
+ * 弹窗
+ */
.am-popup-bd {
padding: 5px;
- background: none; }
+ background: none;
+}
+
+/**
+ * 列表按钮美化
+ */
+table.am-table .am-btn-default {
+ border: 1px solid #666;
+ background: #fff;
+ color: #666;
+}
+table.am-table .am-btn-default:focus, table.am-table .am-btn-default:active, table.am-table .am-btn-default.am-active {
+ color: #666 !important;
+ border-color: #666;
+}
+table.am-table .am-btn-default:hover {
+ background: #666;
+ color: #fff !important;
+}
+
+table.am-table .am-btn-primary {
+ border: 1px solid #d13b49;
+ background: #fff;
+ color: #d13b49;
+}
+table.am-table .am-btn-primary:focus, table.am-table .am-btn-primary:active, table.am-table .am-btn-primary.am-active {
+ color: #d13b49 !important;
+ border-color: #d13b49;
+}
+table.am-table .am-btn-primary:hover {
+ background: #d13b49;
+ color: #fff !important;
+}
-.am-badge {
- padding: 0.25em 0.5em;
+table.am-table .am-btn-secondary {
+ border: 1px solid #E91E63;
+ background: #fff;
+ color: #E91E63;
+}
+table.am-table .am-btn-secondary:focus, table.am-table .am-btn-secondary:active, table.am-table .am-btn-secondary.am-active {
+ color: #E91E63 !important;
+ border-color: #E91E63;
+}
+table.am-table .am-btn-secondary:hover {
+ background: #E91E63;
+ color: #fff !important;
+}
+
+table.am-table .am-btn-success {
+ border: 1px solid #5eb95e;
+ background: #fff;
+ color: #5eb95e;
+}
+table.am-table .am-btn-success:focus, table.am-table .am-btn-success:active, table.am-table .am-btn-success.am-active {
+ color: #5eb95e !important;
+ border-color: #5eb95e;
+}
+table.am-table .am-btn-success:hover {
+ background: #5eb95e;
+ color: #fff !important;
+}
+
+table.am-table .am-btn-warning {
+ border: 1px solid #F37B1D;
+ background: #fff;
+ color: #F37B1D;
+}
+table.am-table .am-btn-warning:focus, table.am-table .am-btn-warning:active, table.am-table .am-btn-warning.am-active {
+ color: #F37B1D !important;
+ border-color: #F37B1D;
+}
+table.am-table .am-btn-warning:hover {
+ background: #F37B1D;
+ color: #fff !important;
+}
+
+table.am-table .am-btn-danger {
+ border: 1px solid #f00;
+ background: #fff;
+ color: #f00;
+}
+table.am-table .am-btn-danger:focus, table.am-table .am-btn-danger:active, table.am-table .am-btn-danger.am-active {
+ color: #f00 !important;
+ border-color: #f00;
+}
+table.am-table .am-btn-danger:hover {
+ background: #f00;
+ color: #fff !important;
}
/**