From a97aa12556d661d09040fb8a87e2c68d165a6d75 Mon Sep 17 00:00:00 2001
From: hjdhnx <hjd124579>
Date: Wed, 21 Sep 2022 15:16:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=85=A8=E9=83=A8=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=90=AF=E7=94=A8=E5=B9=B6=E5=A2=9E=E5=8A=A0=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F=E5=AD=97=E6=AE=B5=E9=9D=99=E5=BE=85=E6=9C=89=E7=BC=98?=
 =?UTF-8?q?=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base/rules.db             | Bin 86016 -> 86016 bytes
 controllers/layui.py      |   2 ++
 templates/layui_list.html |   1 +
 3 files changed, 3 insertions(+)

diff --git a/base/rules.db b/base/rules.db
index becd6bcbcf94712d09ce7e48cf6cf4deb4044e22..7c2910ee4dbacda30081fdfb5bcbcef456510482 100644
GIT binary patch
delta 370
zcmZozz}m2Yb%Hcw(nJ|&#-xo2PKPI7yJs|6UA%pA^bsCDQ!7JLD-#nv15--_V~fe9
zM_w^<PEI(QCJvV{H#RXbOl0O_kW5u(;GBH-s1HJunTes1$!7Co(M&9y42}$wD<mAG
zj0}v7bPX(ZjSLllMng?EvoJ9?-TdK%D?iZqg@QSg7u{&$0%>{L-t%PF#K{XK6({@O
zR6&?*Vq{`su(|POp!xJW0*n$|Ol*wL8BZ{-WbB&QIBj~DAfrG%+;Ff9x#XA~8FAY!
kfLj{m2WFho;BXPaBFzH{H?TvMrY{s?6x(hs#CX&e00Hk`O#lD@

delta 391
zcmZozz}m2Yb%Hcw%tRSy#+Z!>PKOyeCSSj2I9Xl1eRA{>9zGK*Q&TGwOFc6Ka|?5$
z$)!hL0Tm=1O%sPp7#SLxTP8AdF-WE=GjL44d(;P^$<PQWx7qwyG!qL4gCoP_3JC`(
zBLgENT?0#9BSQs4xFLpSAcY@JxbibHOkOCMGkMXCCN7Ycr|msYc1@hTP*QQS|4kKy
z$p!`%=BAq)Zw8txF|jc|XFS2UlCg`qiaDCuhFO;BAJcuN1568<nwXNAT$ofRHcp$~
zCCDgH54R8OXf8QsM@HPv5x^}C@)k2rX>d@9V3Fp51|`VtO4An#F^X-s7GgYV3jprR
BWFY_m

diff --git a/controllers/layui.py b/controllers/layui.py
index eb7c513..4198f7a 100644
--- a/controllers/layui.py
+++ b/controllers/layui.py
@@ -60,8 +60,10 @@ def layui_rule_list():
         if site_name in rule_names:
             site_rule = rule_list[rule_names.index(site_name)]
             sites[i]['state'] = 1 if site_rule['state'] is None else site_rule['state']
+            sites[i]['order'] = 0 if site_rule['order'] is None else site_rule['order']
         else:
             sites[i]['state'] = 1
+            sites[i]['order'] = 0
         sites[i]['site_name'] = site_name
 
     new_sites = sites[(page-1)*limit:page*limit]
diff --git a/templates/layui_list.html b/templates/layui_list.html
index 9e973d7..e3637ed 100644
--- a/templates/layui_list.html
+++ b/templates/layui_list.html
@@ -127,6 +127,7 @@ layui.use(['table', 'dropdown'], function(){
         }
       }
     }
+      ,{field: 'order', title: '顺序', width: 80}
       ,{field: 'name', title: '显示名称', width: 120}
       ,{field: 'key', title: '唯一标识', width: 120}
       ,{field: 'type', title: '<i class="layui-icon layui-icon-email">类型</i>', minWidth: 80}
-- 
GitLab