From 7a869f6d761a057babc3f7f15540fac96917842a Mon Sep 17 00:00:00 2001
From: linyaostalker <602604991@qq.com>
Date: Sat, 7 Dec 2019 10:40:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=90=E8=B4=B9=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E5=88=97=E8=A1=A8=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E6=96=B9=E5=BC=8F=E8=B5=84=E6=BA=90=EF=BC=8C=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E8=AF=A6=E6=83=85=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shop/models/searchs/ExpressTemplateSearch.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/backend/modules/shop/models/searchs/ExpressTemplateSearch.php b/backend/modules/shop/models/searchs/ExpressTemplateSearch.php
index a1e4b16..09beeed 100755
--- a/backend/modules/shop/models/searchs/ExpressTemplateSearch.php
+++ b/backend/modules/shop/models/searchs/ExpressTemplateSearch.php
@@ -52,17 +52,18 @@ class ExpressTemplateSearch extends ExpressTemplate
                 'width' => '2%',
                 'align' => 'center'
             ],
-                        'id',
-                    'name',
+            'id',
+            'name',
+            [
+                'attribute' => 'calculation_type',
+                'value' => function ($model) {
+                    return ExpressTemplate::$calculationType[$model->calculation_type];
+                }
+            ],
             [
                 'class' => 'iron\grid\ActionColumn',
                 'align' => 'center',
                 'config' => [
-                    [
-                        'name' => 'view',
-                        'icon' => 'list',
-                        'title' => '详情',
-                    ],
                     [
                         'name' => 'update',
                         'icon' => 'pencil',