From 8359d94c443813502733fb2ff58a492d52817547 Mon Sep 17 00:00:00 2001
From: augushong <augushong@163.com>
Date: Sun, 20 Dec 2020 16:04:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=96=B0=E5=A2=9E=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5key?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/ColumnFormat.php                   | 19 ++++++++++++++++++-
 .../20200417060522_create_table_nav.php       |  1 +
 view/admin/nav/create.html                    | 10 ++++++++--
 view/admin/nav/edit.html                      | 10 ++++++++--
 view/admin/nav/index.html                     |  3 +++
 5 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/app/common/ColumnFormat.php b/app/common/ColumnFormat.php
index cf3d21e..f3c6f0e 100644
--- a/app/common/ColumnFormat.php
+++ b/app/common/ColumnFormat.php
@@ -45,8 +45,14 @@ class ColumnFormat
         ->setLimit(30)
         ->setDefault('');
     }
+    public static function stringTypeStatus($name = 'type')
+    {
+        return Column::make($name,'string')
+        ->setLimit(80)
+        ->setDefault('');
+    }
 
-    public static function integerTypeStatus($name,$default = 0)
+    public static function integerTypeStatus($name = 'type',$default = 0)
     {
         return Column::make($name,'integer')
         ->setLimit(10)
@@ -61,4 +67,15 @@ class ColumnFormat
         ->setLimit(20)
         ->setSigned(false);
     }
+
+    public static function text($name)
+    {
+      return Column::make($name,'text')
+      ->setDefault(''); 
+    }
+    public static function textLong($name)
+    {
+      return Column::longText($name)
+      ->setDefault(''); 
+    }
 }
diff --git a/database/migrations/20200417060522_create_table_nav.php b/database/migrations/20200417060522_create_table_nav.php
index e1fda38..1306172 100644
--- a/database/migrations/20200417060522_create_table_nav.php
+++ b/database/migrations/20200417060522_create_table_nav.php
@@ -45,6 +45,7 @@ class CreateTableNav extends Migrator
         $table->addColumn(Column::make('value','string')->setLimit(100)->setComment('对象值,有可能是网页链接,小程序导航页面路径,小程序普通页面路径,电话'));
         $table->addColumn(Column::make('xcx_appid','string')->setLimit(30)->setComment('小程序appid,目标是其他小程序是有效'));
         $table->addColumn(ColumnFormat::integerTypeStatus('status')->setComment('0:下架,1:显示'));
+        $table->addColumn(ColumnFormat::stringTypeStatus('key')->setComment('英文标记'));
         $table->addIndex('delete_time');
         $table->addIndex('type');
         $table->addIndex('sort');
diff --git a/view/admin/nav/create.html b/view/admin/nav/create.html
index 680bba6..c2f6df1 100644
--- a/view/admin/nav/create.html
+++ b/view/admin/nav/create.html
@@ -45,7 +45,7 @@
                     <div class="layui-form-item">
                       <div class="layui-form-label">标题</div>
                       <div class="layui-input-block">
-                        <input type="text" name="title" required lay-verify="required" value="" class="layui-input">
+                        <input type="text" name="title" value="" class="layui-input">
                       </div>
                     </div>
                     <div class="layui-form-item">
@@ -109,7 +109,13 @@
                     </div>
                     {/if}
                     <div class="layui-form-item">
-                      <div class="layui-form-label">排序<span class="layui-word-aux">排序越小越靠前</span></div>
+                      <div class="layui-form-label">key</div>
+                      <div class="layui-input-block">
+                        <input type="text" name="key" value="" class="layui-input">
+                      </div>
+                    </div>
+                    <div class="layui-form-item">
+                      <div class="layui-form-label">排序</div>
                       <div class="layui-input-block">
                         <input type="number" name="sort" value="" class="layui-input">
                       </div>
diff --git a/view/admin/nav/edit.html b/view/admin/nav/edit.html
index 0aa2f36..e350eb0 100644
--- a/view/admin/nav/edit.html
+++ b/view/admin/nav/edit.html
@@ -44,7 +44,7 @@
                     <div class="layui-form-item">
                       <div class="layui-form-label">标题</div>
                       <div class="layui-input-block">
-                        <input type="text" name="title" required lay-verify="required" value="{$nav.title}"
+                        <input type="text" name="title" value="{$nav.title}"
                           class="layui-input">
                       </div>
                     </div>
@@ -110,7 +110,13 @@
                     </div>
                     {/if}
                     <div class="layui-form-item">
-                      <div class="layui-form-label">排序<span class="layui-word-aux">排序越小越靠前</span></div>
+                      <div class="layui-form-label">key</div>
+                      <div class="layui-input-block">
+                        <input type="text" name="key" value="{$nav.key}" class="layui-input">
+                      </div>
+                    </div>
+                    <div class="layui-form-item">
+                      <div class="layui-form-label">排序</div>
                       <div class="layui-input-block">
                         <input type="number" name="sort" value="{$nav.sort}" class="layui-input">
                       </div>
diff --git a/view/admin/nav/index.html b/view/admin/nav/index.html
index 70128f0..49b167d 100644
--- a/view/admin/nav/index.html
+++ b/view/admin/nav/index.html
@@ -82,6 +82,9 @@
                 {/if}
               </tbody>
             </table>
+            <div>
+              {$list|raw}
+            </div>
           </div>
         </div>
       </div>