From 46d7799d4d4feb6b3d33b4c8ae27efd3d111cf1f Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Sun, 26 Jul 2020 00:22:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=AE=A2=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/form/Admin.php              |   2 +-
 application/admin/form/Order.php              |   1 +
 application/admin/form/Orderaftersale.php     |   1 +
 .../view/default/order/module/goods.html      |  10 +-
 .../default/public/module/form_table.html     |  21 +--
 application/index/controller/Order.php        |  81 ++++++-----
 application/index/form/Order.php              |  20 ++-
 application/index/form/Orderaftersale.php     |  23 +--
 .../index/view/default/order/detail.html      |   4 +-
 .../index/view/default/order/index.html       |   9 +-
 .../view/default/order/module/goods.html      |  22 ++-
 .../view/default/order/module/status.html     |   7 -
 .../module/{info.html => goods.html}          |   6 +-
 .../default/public/module/form_table.html     |  21 +--
 application/module/FormHandleModule.php       |  15 +-
 public/static/admin/default/css/common.css    |   1 -
 public/static/common/css/common.css           |  14 +-
 public/static/index/default/css/common.css    | 133 +++++++++++++++---
 18 files changed, 268 insertions(+), 123 deletions(-)
 delete mode 100644 application/index/view/default/order/module/status.html
 rename application/index/view/default/orderaftersale/module/{info.html => goods.html} (77%)

diff --git a/application/admin/form/Admin.php b/application/admin/form/Admin.php
index a798d6382..4184da601 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 ca8f089cf..2dbfab722 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 0b3a25b54..027177c1a 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 56fd4e88d..1b437dbce 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}}
                 </span>
-                <div class="am-text-right">
-                    {{if $item['returned_quantity'] gt 0 or $item['refund_price'] gt 0}}
-                        <span class="am-text-danger am-margin-right-lg">已退 {{$item.returned_quantity}} / {{$price_symbol}}{{$item.refund_price}}</span>
-                    {{/if}}
+                <div class="am-nbfc am-margin-top-xs">
                     <span>{{$price_symbol}}{{$item.price}}x{{$item.buy_number}}</span>
+                    <div class="am-fr">
+                        {{if $item['returned_quantity'] gt 0 or $item['refund_price'] gt 0}}
+                            <span class="am-text-danger am-margin-left-lg">已退 {{$item.returned_quantity}} / {{$price_symbol}}{{$item.refund_price}}</span>
+                        {{/if}}
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/application/admin/view/default/public/module/form_table.html b/application/admin/view/default/public/module/form_table.html
index 6fb4afcd3..e862d7b88 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 @@
                         <!-- 3. 内容位置居（左|中|右） -->
                         <!-- 4. 格子是否固定（left|right 左|右） -->
                         <th class="
-                            {{if !isset($t['is_middle']) or $t['is_middle'] eq 1}}am-text-middle {{/if}}
+                            {{if isset($t['is_middle']) and $t['is_middle'] eq 1}}am-text-middle {{/if}}
                             {{if !empty($t['grid_size'])}}am-grid-{{$t.grid_size}} {{/if}}
                             {{if !empty($t['align'])}}am-text-{{$t.align}} {{/if}}
                             {{if !empty($t['fixed'])}}am-grid-fixed-{{$t.fixed}} {{/if}}
@@ -39,7 +39,7 @@
                     {{foreach $form_table['form'] as $k=>$t}}
                         {{if !isset($t['is_list']) or $t['is_list'] eq 1}}
                             <td class="
-                                {{if !isset($t['is_middle']) or $t['is_middle'] eq 1}}am-text-middle {{/if}}
+                                {{if isset($t['is_middle']) and $t['is_middle'] eq 1}}am-text-middle {{/if}}
                                 {{if !empty($t['grid_size'])}}am-grid-{{$t.grid_size}} {{/if}}
                                 {{if !empty($t['align'])}}am-text-{{$t.align}} {{/if}}
                                 {{if !empty($t['fixed'])}}am-grid-fixed-{{$t.fixed}} {{/if}}
@@ -138,7 +138,7 @@
                                 <!-- 4. 格子是否固定（left|right 左|右） -->
                                 <!-- 5. 是否操作列 -->
                                 <td class="am-nowrap-initial
-                                    {{if !isset($t['is_middle']) or $t['is_middle'] eq 1}}am-text-middle {{/if}}
+                                    {{if isset($t['is_middle']) and $t['is_middle'] eq 1}}am-text-middle {{/if}}
                                     {{if !empty($t['grid_size'])}}am-grid-{{$t.grid_size}} {{/if}}
                                     {{if !empty($t['align'])}}am-text-{{$t.align}} {{/if}}
                                     {{if !empty($t['fixed'])}}am-grid-fixed-{{$t.fixed}} {{/if}}
@@ -247,17 +247,20 @@
                                             {{/case}}
                                             {{case radio}}
                                                 {{if isset($data_list[$i][$form_table['base']['key_field']])}}
-                                                    <div class="form-table-operate-radio">
-                                                        <label class="am-radio am-secondary am-radio-inline">
-                                                            <input type="radio" name="{{$t.view_key}}" value="{{$data_list[$i][$form_table['base']['key_field']]}}" {{if isset($t['is_checked']) and $t['is_checked'] eq 1}}checked{{/if}} data-am-ucheck />
-                                                        </label>
-                                                    </div>
+                                                    <!-- 是否配置指定数据不显示控件 -->
+                                                    {{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'])}}
+                                                        <div class="form-table-operate-radio">
+                                                            <label class="am-radio am-secondary am-radio-inline">
+                                                                <input type="radio" name="{{$t.view_key}}" value="{{$data_list[$i][$form_table['base']['key_field']]}}" {{if isset($t['is_checked']) and $t['is_checked'] eq 1}}checked{{/if}} data-am-ucheck />
+                                                            </label>
+                                                        </div>
+                                                    {{/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'])}}
                                                         <div class="form-table-operate-checkbox">
                                                             <label class="am-checkbox am-secondary am-checkbox-inline">
                                                                 <input type="checkbox" name="{{$t.view_key}}" value="{{$data_list[$i][$form_table['base']['key_field']]}}" {{if isset($t['is_checked']) and $t['is_checked'] eq 1}}checked{{/if}} data-am-ucheck />
diff --git a/application/index/controller/Order.php b/application/index/controller/Order.php
index eb3fa201c..28f115918 100755
--- a/application/index/controller/Order.php
+++ b/application/index/controller/Order.php
@@ -66,10 +66,11 @@ class Order extends Common
 
         // 获取列表
         $data_params = [
-            'm'         => $page->GetPageStarNumber(),
-            'n'         => $this->page_size,
-            'where'     => $this->form_where,
-            'user_type' => 'user',
+            'm'                 => $page->GetPageStarNumber(),
+            'n'                 => $this->page_size,
+            'where'             => $this->form_where,
+            'is_orderaftersale' => 1,
+            'user_type'         => 'user',
         ];
         $ret = OrderService::OrderList($data_params);
 
@@ -96,27 +97,7 @@ class Order extends Common
      */
     public function Detail()
     {
-        $data = [];
-        if(!empty($this->data_request['id']))
-        {
-            // 条件
-            $where = [
-                ['is_delete_time', '=', 0],
-                ['user_is_delete_time', '=', 0],
-                ['id', '=', intval($this->data_request['id'])],
-                ['user_id', '=', $this->user['id']],
-            ];
-
-            // 获取列表
-            $data_params = [
-                'm'         => 0,
-                'n'         => 1,
-                'where'     => $where,
-                'user_type' => 'user',
-            ];
-            $ret = OrderService::OrderList($data_params);
-            $data = (empty($ret['data']) || empty($ret['data'][0])) ? [] : $ret['data'][0];
-        }
+        $data = $this->OrderFirst();
         if(!empty($data))
         {
              // 发起支付 - 支付方式
@@ -129,6 +110,9 @@ class Order extends Common
             // 加载百度地图api
             $this->assign('is_load_baidu_map_api', 1);
 
+            // 浏览器名称
+        $this->assign('home_seo_site_title', SeoService::BrowserSeoTitle('订单详情', 1));
+
             // 数据赋值
             $this->assign('data', $data);
             $this->assign('params', $this->data_request);
@@ -145,6 +129,31 @@ class Order extends Common
      * @desc    description
      */
     public function Comments()
+    {
+        $data = $this->OrderFirst();
+        if(!empty($data))
+        {
+            $this->assign('referer_url', empty($_SERVER['HTTP_REFERER']) ? MyUrl('index/order/index') : $_SERVER['HTTP_REFERER']);
+            $this->assign('data', $data);
+
+            // 编辑器文件存放地址
+            $this->assign('editor_path_type', 'order_comments-'.$this->user['id'].'-'.$data['id']);
+            return $this->fetch();
+        } else {
+            $this->assign('msg', '没有相关数据');
+            return $this->fetch('public/tips_error');
+        }
+    }
+
+    /**
+     * 获取一条订单信息
+     * @author  Devil
+     * @blog    http://gong.gg/
+     * @version 1.0.0
+     * @date    2020-07-25
+     * @desc    description
+     */
+    public function OrderFirst()
     {
         $data = [];
         if(!empty($this->data_request['id']))
@@ -159,26 +168,16 @@ class Order extends Common
 
             // 获取列表
             $data_params = [
-                'm'         => 0,
-                'n'         => 1,
-                'where'     => $where,
-                'user_type' => 'user',
+                'm'                 => 0,
+                'n'                 => 1,
+                'where'             => $where,
+                'is_orderaftersale' => 1,
+                'user_type'         => 'user',
             ];
             $ret = OrderService::OrderList($data_params);
             $data = (empty($ret['data']) || empty($ret['data'][0])) ? [] : $ret['data'][0];
         }
-        if(!empty($data))
-        {
-            $this->assign('referer_url', empty($_SERVER['HTTP_REFERER']) ? MyUrl('index/order/index') : $_SERVER['HTTP_REFERER']);
-            $this->assign('data', $data);
-
-            // 编辑器文件存放地址
-            $this->assign('editor_path_type', 'order_comments-'.$this->user['id'].'-'.$data['id']);
-            return $this->fetch();
-        } else {
-            $this->assign('msg', '没有相关数据');
-            return $this->fetch('public/tips_error');
-        }
+        return $data;
     }
 
     /**
diff --git a/application/index/form/Order.php b/application/index/form/Order.php
index a49bef3c0..d2c2c84e8 100644
--- a/application/index/form/Order.php
+++ b/application/index/form/Order.php
@@ -65,14 +65,25 @@ class Order
                 'is_search'     => 1,
                 'search_url'    => MyUrl('index/order/index'),
                 'detail_title'  => '基础信息',
+                'is_middle'     => 0,
             ],
             // 表单配置
             'form' => [
+                [
+                    'view_type'         => 'checkbox',
+                    'is_checked'        => 0,
+                    'checked_text'      => '反选',
+                    'not_checked_text'  => '全选',
+                    'not_show_key'      => 'status',
+                    'not_show_data'     => [0,2,3,4,5,6],
+                    'align'             => 'center',
+                    'width'             => 80,
+                ],
                 [
                     'label'         => '基础信息',
                     'view_type'     => 'module',
                     'view_key'      => 'order/module/goods',
-                    'grid_size'     => 'lg',
+                    'grid_size'     => 'xl',
                     'search_config' => [
                         'form_type'             => 'input',
                         'form_name'             => 'id',
@@ -84,11 +95,12 @@ class Order
                 ],
                 [
                     'label'         => '订单状态',
-                    'view_type'     => 'module',
-                    'view_key'      => 'order/module/status',
+                    'view_type'     => 'field',
+                    'view_key'      => 'status',
+                    'view_data_key' => 'name',
+                    'view_data'     => lang('common_order_user_status'),
                     'search_config' => [
                         'form_type'         => 'select',
-                        'form_name'         => 'status',
                         'where_type'        => 'in',
                         'data'              => lang('common_order_user_status'),
                         'data_key'          => 'id',
diff --git a/application/index/form/Orderaftersale.php b/application/index/form/Orderaftersale.php
index 9ca229122..2eec760d3 100644
--- a/application/index/form/Orderaftersale.php
+++ b/application/index/form/Orderaftersale.php
@@ -59,31 +59,22 @@ class Orderaftersale
                 'key_field'     => 'id',
                 'is_search'     => 1,
                 'search_url'    => MyUrl('admin/orderaftersale/index'),
+                'is_middle'     => 0,
             ],
             // 表单配置
             'form' => [
-                [
-                    'label'         => '订单号',
-                    'view_type'     => 'field',
-                    'view_key'      => 'order_no',
-                    'width'         => 170,
-                    'search_config' => [
-                        'form_type'         => 'input',
-                        'where_type'        => '=',
-                    ],
-                ],
                 [
                     'label'         => '基础信息',
                     'view_type'     => 'module',
-                    'view_key'      => 'orderaftersale/module/info',
+                    'view_key'      => 'orderaftersale/module/goods',
                     'grid_size'     => 'lg',
                     'search_config' => [
                         'form_type'             => 'input',
                         'form_name'             => 'id',
                         'where_type'            => 'like',
                         'where_type_custom'     => 'in',
-                        'where_handle_custom'   => 'WhereValueBaseInfo',
-                        'placeholder'           => '请输入商品名称/型号',
+                        'where_handle_custom'   => 'WhereBaseGoodsInfo',
+                        'placeholder'           => '请输入订单号/商品名称/型号',
                     ],
                 ],
                 [
@@ -254,7 +245,7 @@ class Orderaftersale
     }
 
     /**
-     * 基础信息条件处理
+     * 基础条件处理
      * @author  Devil
      * @blog    http://gong.gg/
      * @version 1.0.0
@@ -263,12 +254,12 @@ class Orderaftersale
      * @param   [string]          $value    [条件值]
      * @param   [array]           $params   [输入参数]
      */
-    public function WhereValueBaseInfo($value, $params = [])
+    public function WhereBaseGoodsInfo($value, $params = [])
     {
         if(!empty($value))
         {
             // 获取订单详情搜索的订单售后 id
-            $ids = Db::name('OrderAftersale')->alias('oa')->join(['__ORDER_DETAIL__'=>'od'], 'oa.order_detail_id=od.id')->where('title|model', 'like', '%'.$value.'%')->column('oa.id');
+            $ids = Db::name('OrderAftersale')->alias('oa')->join(['__ORDER_DETAIL__'=>'od'], 'oa.order_detail_id=od.id')->whereOr('od.title|od.model', 'like', '%'.$value.'%')->whereOr('oa.order_no', '=', $value)->column('oa.id');
 
             // 避免空条件造成无效的错觉
             return empty($ids) ? [0] : $ids;
diff --git a/application/index/view/default/order/detail.html b/application/index/view/default/order/detail.html
index 49f5743ac..515bba0b1 100755
--- a/application/index/view/default/order/detail.html
+++ b/application/index/view/default/order/detail.html
@@ -121,7 +121,7 @@
                                     <div class="items-detail am-fl">
                                         <span>{{$data.payment_name}}</span>
                                         {{if !empty($data['is_under_line_text'])}}
-                                            <span class="am-badge am-badge-danger am-radius">{{$data.is_under_line_text}}</span>
+                                            <span class="am-badge am-badge-danger-plain am-radius">{{$data.is_under_line_text}}</span>
                                         {{/if}}
                                     </div>
                                 </div>
@@ -216,7 +216,7 @@
                             <span>您可以</span>
                         {{/if}}
                         {{if in_array($data['status'], [0,1])}}
-                            <button type="button" class="am-btn am-btn-danger am-btn-xs am-radius am-icon-paint-brush submit-ajax submit-cancel" data-url="{{:MyUrl('index/order/cancel')}}" data-id="{{$data.id}}" data-view="reload"> 取消</button>
+                            <button type="button" class="am-btn am-btn-warning am-btn-xs am-radius am-icon-paint-brush submit-ajax submit-cancel" data-url="{{:MyUrl('index/order/cancel')}}" data-id="{{$data.id}}" data-view="reload"> 取消</button>
                         {{/if}}
                         {{if in_array($data['status'], [1])}}
                             <button class="am-btn am-btn-primary am-btn-xs am-radius am-icon-paypal submit-pay" data-id="{{$data.id}}" data-payment-id="{{$data.payment_id}}" data-am-modal="{target: '#order-pay-popup'}" data-is-auto="{{if isset($params['is_pay_auto']) and $params['is_pay_auto'] eq 1}}1{{else /}}0{{/if}}" data-is-pay="{{if isset($params['is_pay_submit']) and $params['is_pay_submit'] eq 1}}1{{else /}}0{{/if}}"> {{if $data['is_under_line'] eq 1}}切换{{/if}}支付</button>
diff --git a/application/index/view/default/order/index.html b/application/index/view/default/order/index.html
index 72b90466a..9624be5f7 100755
--- a/application/index/view/default/order/index.html
+++ b/application/index/view/default/order/index.html
@@ -1,2 +1,9 @@
 <!-- 继承公共的 form -->
-{{extend name="public/module/user_form" /}}
\ No newline at end of file
+{{extend name="public/module/user_form" /}}
+
+<!-- 表单顶部操作栏 -->
+{{block name="form_operate_top"}}
+    <button type="button" class="am-btn am-btn-secondary am-radius am-btn-xs am-icon-paypal"> 批量支付</button>
+    <!-- 父级内容 -->
+    {__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 9398f899b..6143f185c 100644
--- a/application/index/view/default/order/module/goods.html
+++ b/application/index/view/default/order/module/goods.html
@@ -20,14 +20,26 @@
                 {{/if}}
             </div>
         </div>
-        <div class="am-text-right">
-            {{if $item['returned_quantity'] gt 0 or $item['refund_price'] gt 0}}
-                <span class="am-text-danger am-margin-right-lg">已退 {{$item.returned_quantity}} / {{$price_symbol}}{{$item.refund_price}}</span>
-            {{/if}}
+        <div class="am-nbfc am-margin-top-xs">
             {{if $item.original_price gt 0}}
                 <span class="original-price am-margin-right-xs">{{$price_symbol}}{{$item.original_price}}</span>
             {{/if}}
-            <strong>{{$price_symbol}}{{$item.price}}x{{$item.buy_number}}</strong>
+            <span>{{$price_symbol}}{{$item.price}}x{{$item.buy_number}}</span>
+            {{if $item['returned_quantity'] gt 0 or $item['refund_price'] gt 0}}
+                <span class="am-text-danger am-margin-left-lg">已退 {{$item.returned_quantity}} / {{$price_symbol}}{{$item.refund_price}}</span>
+            {{/if}}
+
+            <div class="am-fr">
+                {{if ($module_data['is_can_launch_aftersale'] eq 1 or !empty($item['orderaftersale'])) and !empty($item['orderaftersale_btn_text'])}}
+                <a href="{{:MyUrl('index/orderaftersale/detail', ['oid'=>$module_data['id'], 'did'=>$item['id']])}}" target="_blank">
+                    {{if empty($item['orderaftersale'])}}
+                        {{$item.orderaftersale_btn_text}}
+                    {{else /}}
+                        <span class="{{if $item['orderaftersale']['status'] eq 3}}am-text-success{{else /}}am-text-secondary{{/if}}">{{$item.orderaftersale_btn_text}}</span>
+                    {{/if}}
+                </a>
+            {{/if}}
+            </div>
         </div>
         <hr data-am-widget="divider" class="am-divider am-divider-dashed" />
     {{/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 3f7b07dce..000000000
--- a/application/index/view/default/order/module/status.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- 订单状态 -->
-{{if !empty($module_data)}}
-    <p>{{$module_data.status_name}}</p>
-    {{if $module_data['user_is_delete_time'] neq 0}}
-        <p class="am-text-warning">用户已删除</p>
-    {{/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 77%
rename from application/index/view/default/orderaftersale/module/info.html
rename to application/index/view/default/orderaftersale/module/goods.html
index 5c0a6ca46..ffe769fb1 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'])}}
+    <p class="am-nbfc am-margin-bottom-sm">
+        <strong class="am-icon-bookmark-o"> {{$module_data.order_no}}</strong>
+    </p>
+    <hr data-am-widget="divider" class="am-divider am-divider-dashed am-margin-top-0" />
     <div class="am-nbfc">
         <a href="{{$module_data.order_data.items.goods_url}}" target="_blank">
             <img src="{{$module_data.order_data.items.images}}" class="am-img-thumbnail am-radius am-margin-right-xs am-fl" width="60" height="60" />
@@ -19,6 +23,6 @@
         {{if $module_data.order_data.items.original_price gt 0}}
             <span class="original-price am-margin-right-xs">{{$price_symbol}}{{$module_data.order_data.items.original_price}}</span>
         {{/if}}
-        <strong>{{$price_symbol}}{{$module_data.order_data.items.price}} x {{$module_data.order_data.items.buy_number}}</strong>
+        <span>{{$price_symbol}}{{$module_data.order_data.items.price}} x {{$module_data.order_data.items.buy_number}}</span>
     </div>
 {{/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 6fb4afcd3..e862d7b88 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 @@
                         <!-- 3. 内容位置居（左|中|右） -->
                         <!-- 4. 格子是否固定（left|right 左|右） -->
                         <th class="
-                            {{if !isset($t['is_middle']) or $t['is_middle'] eq 1}}am-text-middle {{/if}}
+                            {{if isset($t['is_middle']) and $t['is_middle'] eq 1}}am-text-middle {{/if}}
                             {{if !empty($t['grid_size'])}}am-grid-{{$t.grid_size}} {{/if}}
                             {{if !empty($t['align'])}}am-text-{{$t.align}} {{/if}}
                             {{if !empty($t['fixed'])}}am-grid-fixed-{{$t.fixed}} {{/if}}
@@ -39,7 +39,7 @@
                     {{foreach $form_table['form'] as $k=>$t}}
                         {{if !isset($t['is_list']) or $t['is_list'] eq 1}}
                             <td class="
-                                {{if !isset($t['is_middle']) or $t['is_middle'] eq 1}}am-text-middle {{/if}}
+                                {{if isset($t['is_middle']) and $t['is_middle'] eq 1}}am-text-middle {{/if}}
                                 {{if !empty($t['grid_size'])}}am-grid-{{$t.grid_size}} {{/if}}
                                 {{if !empty($t['align'])}}am-text-{{$t.align}} {{/if}}
                                 {{if !empty($t['fixed'])}}am-grid-fixed-{{$t.fixed}} {{/if}}
@@ -138,7 +138,7 @@
                                 <!-- 4. 格子是否固定（left|right 左|右） -->
                                 <!-- 5. 是否操作列 -->
                                 <td class="am-nowrap-initial
-                                    {{if !isset($t['is_middle']) or $t['is_middle'] eq 1}}am-text-middle {{/if}}
+                                    {{if isset($t['is_middle']) and $t['is_middle'] eq 1}}am-text-middle {{/if}}
                                     {{if !empty($t['grid_size'])}}am-grid-{{$t.grid_size}} {{/if}}
                                     {{if !empty($t['align'])}}am-text-{{$t.align}} {{/if}}
                                     {{if !empty($t['fixed'])}}am-grid-fixed-{{$t.fixed}} {{/if}}
@@ -247,17 +247,20 @@
                                             {{/case}}
                                             {{case radio}}
                                                 {{if isset($data_list[$i][$form_table['base']['key_field']])}}
-                                                    <div class="form-table-operate-radio">
-                                                        <label class="am-radio am-secondary am-radio-inline">
-                                                            <input type="radio" name="{{$t.view_key}}" value="{{$data_list[$i][$form_table['base']['key_field']]}}" {{if isset($t['is_checked']) and $t['is_checked'] eq 1}}checked{{/if}} data-am-ucheck />
-                                                        </label>
-                                                    </div>
+                                                    <!-- 是否配置指定数据不显示控件 -->
+                                                    {{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'])}}
+                                                        <div class="form-table-operate-radio">
+                                                            <label class="am-radio am-secondary am-radio-inline">
+                                                                <input type="radio" name="{{$t.view_key}}" value="{{$data_list[$i][$form_table['base']['key_field']]}}" {{if isset($t['is_checked']) and $t['is_checked'] eq 1}}checked{{/if}} data-am-ucheck />
+                                                            </label>
+                                                        </div>
+                                                    {{/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'])}}
                                                         <div class="form-table-operate-checkbox">
                                                             <label class="am-checkbox am-secondary am-checkbox-inline">
                                                                 <input type="checkbox" name="{{$t.view_key}}" value="{{$data_list[$i][$form_table['base']['key_field']]}}" {{if isset($t['is_checked']) and $t['is_checked'] eq 1}}checked{{/if}} data-am-ucheck />
diff --git a/application/module/FormHandleModule.php b/application/module/FormHandleModule.php
index 4cd724a6b..9fdefe90c 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 34dac2fd0..3eb131135 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 c6347817f..ec3049bc3 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 799ded32c..0aa4aebdd 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;
+}
 
-.am-badge {
-    padding: 0.25em 0.5em;
+/**
+ * 列表按钮美化
+ */
+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;
+}
+
+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;
 }
 
 /**