From e010ff02249fd15c6b7d4cd42911a5f204ea67a8 Mon Sep 17 00:00:00 2001
From: yongzy <635602689@qq.com>
Date: Fri, 12 Jul 2019 22:50:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E7=94=9F=E6=88=90=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../.idea/workspace.xml"                      | 192 ++++++++++++------
 .../db.sqlite3"                               | Bin 65536 -> 68608 bytes
 .../rbac/__pycache__/admin.cpython-36.pyc"    | Bin 566 -> 594 bytes
 .../rbac/__pycache__/models.cpython-36.pyc"   | Bin 1507 -> 1898 bytes
 .../rbac/admin.py"                            |   5 +-
 .../migrations/0004_auto_20190712_2128.py"    |  37 ++++
 .../0004_auto_20190712_2128.cpython-36.pyc"   | Bin 0 -> 1092 bytes
 .../rbac/models.py"                           |  15 +-
 .../init_permission.cpython-36.pyc"           | Bin 789 -> 915 bytes
 .../rbac/service/init_permission.py"          |  42 +++-
 .../rbac/static/rbac/css/menu.css"            | 112 ++++++----
 .../rbac/templates/rbac/menu.html"            |  20 +-
 .../__pycache__/my_tags.cpython-36.pyc"       | Bin 632 -> 548 bytes
 .../rbac/templatetags/my_tags.py"             |   9 +-
 .../web/templates/layout.html"                |   5 +
 15 files changed, 312 insertions(+), 125 deletions(-)
 create mode 100644 "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/0004_auto_20190712_2128.py"
 create mode 100644 "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/__pycache__/0004_auto_20190712_2128.cpython-36.pyc"

diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/.idea/workspace.xml" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/.idea/workspace.xml"
index 661dca5..db1a11f 100644
--- "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/.idea/workspace.xml"
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/.idea/workspace.xml"
@@ -1,16 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="2bd9986f-9fd5-4cdf-a330-5da7c76a6a75" name="默认更改列表" comment="">
-      <change afterPath="$PROJECT_DIR$/rbac/service/init_permission.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/db.sqlite3" beforeDir="false" afterPath="$PROJECT_DIR$/db.sqlite3" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web/templates/layout.html" beforeDir="false" afterPath="$PROJECT_DIR$/web/templates/layout.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web/templates/menu.html" beforeDir="false" afterPath="$PROJECT_DIR$/rbac/templates/menu.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web/templatetags/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/rbac/templatetags/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web/templatetags/my_tags.py" beforeDir="false" afterPath="$PROJECT_DIR$/rbac/templatetags/my_tags.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web/views/auth.py" beforeDir="false" afterPath="$PROJECT_DIR$/web/views/auth.py" afterDir="false" />
-    </list>
+    <list default="true" id="2bd9986f-9fd5-4cdf-a330-5da7c76a6a75" name="默认更改列表" comment="" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -67,8 +58,29 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/rbac/service/init_permission.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="299">
-              <caret line="13" column="10" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
+            <state relative-caret-position="-490">
+              <caret line="12" column="18" lean-forward="true" selection-start-line="12" selection-start-column="18" selection-end-line="12" selection-end-column="18" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/rbac/models.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="92">
+              <caret line="4" column="9" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="9" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/rbac/admin.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="154">
+              <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+              <folding>
+                <element signature="e#0#32#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -76,10 +88,12 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/web/templates/layout.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="207">
-              <caret line="129" column="15" lean-forward="true" selection-start-line="129" selection-start-column="15" selection-end-line="129" selection-end-column="15" />
+            <state relative-caret-position="115">
+              <caret line="62" lean-forward="true" selection-start-line="62" selection-end-line="62" />
               <folding>
                 <element signature="n#head#0;n#html#0;n#!!top" />
+                <element signature="n#div#0;n#body#0;n#html#0;n#!!top" />
+                <element signature="n#div#1;n#body#0;n#html#0;n#!!top" />
               </folding>
             </state>
           </provider>
@@ -88,8 +102,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/rbac/templatetags/my_tags.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="261">
-              <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+            <state relative-caret-position="299">
+              <caret line="13" column="42" selection-start-line="13" selection-start-column="42" selection-end-line="13" selection-end-column="42" />
               <folding>
                 <element signature="e#0#27#0" expanded="true" />
               </folding>
@@ -97,10 +111,28 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/rbac/templates/rbac/menu.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="276">
+              <caret line="15" column="28" selection-start-line="15" selection-start-column="28" selection-end-line="15" selection-end-column="28" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/rbac/static/rbac/css/menu.css">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="290">
+              <caret line="76" column="1" selection-start-line="76" selection-start-column="1" selection-end-line="76" selection-end-column="1" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/web/views/customer.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1073">
+            <state relative-caret-position="-1065">
               <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
             </state>
           </provider>
@@ -130,24 +162,26 @@
         <option value="$PROJECT_DIR$/web/templates/login.html" />
         <option value="$PROJECT_DIR$/web/templates/index.html" />
         <option value="$PROJECT_DIR$/web/urls.py" />
-        <option value="$PROJECT_DIR$/rbac/admin.py" />
-        <option value="$PROJECT_DIR$/rbac/models.py" />
         <option value="$PROJECT_DIR$/rbac/middlewares/middleware.py" />
         <option value="$PROJECT_DIR$/luffy_permission/settings.py" />
         <option value="$PROJECT_DIR$/web/templatetags/my_tags.py" />
         <option value="$PROJECT_DIR$/web/templates/menu.html" />
         <option value="$PROJECT_DIR$/web/views/auth.py" />
         <option value="$PROJECT_DIR$/rbac/static/css/menu.css" />
+        <option value="$PROJECT_DIR$/rbac/models.py" />
+        <option value="$PROJECT_DIR$/rbac/admin.py" />
         <option value="$PROJECT_DIR$/rbac/service/init_permission.py" />
         <option value="$PROJECT_DIR$/rbac/templatetags/my_tags.py" />
+        <option value="$PROJECT_DIR$/rbac/static/rbac/css/menu.css" />
+        <option value="$PROJECT_DIR$/rbac/templates/rbac/menu.html" />
         <option value="$PROJECT_DIR$/web/templates/layout.html" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="7">
-    <option name="x" value="876" />
-    <option name="y" value="2" />
-    <option name="width" value="1047" />
+  <component name="ProjectFrameBounds">
+    <option name="x" value="827" />
+    <option name="y" value="7" />
+    <option name="width" value="1225" />
     <option name="height" value="1045" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
@@ -177,12 +211,34 @@
               <item name="rbac" type="462c0819:PsiDirectoryNode" />
               <item name="static" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="luffy_permission-空白版" type="b2602c69:ProjectViewProjectNode" />
+              <item name="luffy_permission-空白版" type="462c0819:PsiDirectoryNode" />
+              <item name="rbac" type="462c0819:PsiDirectoryNode" />
+              <item name="static" type="462c0819:PsiDirectoryNode" />
+              <item name="rbac" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="luffy_permission-空白版" type="b2602c69:ProjectViewProjectNode" />
+              <item name="luffy_permission-空白版" type="462c0819:PsiDirectoryNode" />
+              <item name="rbac" type="462c0819:PsiDirectoryNode" />
+              <item name="static" type="462c0819:PsiDirectoryNode" />
+              <item name="rbac" type="462c0819:PsiDirectoryNode" />
+              <item name="css" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="luffy_permission-空白版" type="b2602c69:ProjectViewProjectNode" />
               <item name="luffy_permission-空白版" type="462c0819:PsiDirectoryNode" />
               <item name="rbac" type="462c0819:PsiDirectoryNode" />
               <item name="templates" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="luffy_permission-空白版" type="b2602c69:ProjectViewProjectNode" />
+              <item name="luffy_permission-空白版" type="462c0819:PsiDirectoryNode" />
+              <item name="rbac" type="462c0819:PsiDirectoryNode" />
+              <item name="templates" type="462c0819:PsiDirectoryNode" />
+              <item name="rbac" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="luffy_permission-空白版" type="b2602c69:ProjectViewProjectNode" />
               <item name="luffy_permission-空白版" type="462c0819:PsiDirectoryNode" />
@@ -212,10 +268,11 @@
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\homework\DjangoLearning\luffy_permission-空白版\rbac\templates\rbac" />
+      <recent name="D:\homework\DjangoLearning\luffy_permission-空白版\rbac\static\rbac" />
+      <recent name="D:\homework\DjangoLearning\luffy_permission-空白版\rbac\static\css" />
       <recent name="D:\homework\DjangoLearning\luffy_permission-空白版\rbac\static" />
       <recent name="D:\homework\DjangoLearning\luffy_permission-空白版\rbac\static\css\rbac" />
-      <recent name="D:\homework\DjangoLearning\luffy_permission-空白版\rbac\templates" />
-      <recent name="D:\homework\DjangoLearning\luffy_permission-空白版\rbac" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -269,22 +326,23 @@
       <workItem from="1562827785852" duration="8595000" />
       <workItem from="1562836703031" duration="41000" />
       <workItem from="1562921631604" duration="4949000" />
-      <workItem from="1562930125078" duration="4989000" />
+      <workItem from="1562930125078" duration="11682000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="18574000" />
+    <option name="totallyTimeSpent" value="25267000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
+    <frame x="662" y="6" width="980" height="836" extended-state="0" />
+    <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49134198" visible="true" weight="0.23927614" />
-      <window_info id="Structure" order="1" sideWeight="0.508658" side_tool="true" weight="0.23927614" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.490991" weight="0.45174262" />
+      <window_info id="Structure" order="1" sideWeight="0.509009" side_tool="true" weight="0.1732991" />
       <window_info id="Favorites" order="2" sideWeight="0.50345784" side_tool="true" weight="0.211126" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.28354082" />
-      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.29249617" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.281106" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.36507937" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -339,16 +397,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/rbac/admin.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
-          <caret line="6" column="40" selection-start-line="6" selection-start-column="40" selection-end-line="6" selection-end-column="40" />
-          <folding>
-            <element signature="e#0#32#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/rbac/urls.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="92">
@@ -390,44 +438,54 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/rbac/static/rbac/menu.css">
+    <entry file="file://$PROJECT_DIR$/luffy_permission/settings.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="97">
-          <caret line="24" selection-start-line="23" selection-start-column="8" selection-end-line="24" />
+        <state relative-caret-position="328">
+          <caret line="135" column="14" lean-forward="true" selection-start-line="135" selection-start-column="14" selection-end-line="135" selection-end-column="14" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/rbac/models.py">
+    <entry file="file://$PROJECT_DIR$/rbac/middlewares/middleware.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-138">
-          <caret line="3" column="25" lean-forward="true" selection-start-line="3" selection-start-column="25" selection-end-line="3" selection-end-column="25" />
+        <state relative-caret-position="575">
+          <caret line="25" column="38" lean-forward="true" selection-start-line="25" selection-start-column="38" selection-end-line="25" selection-end-column="38" />
+          <folding>
+            <element signature="e#0#52#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/luffy_permission/settings.py">
+    <entry file="file://$PROJECT_DIR$/web/views/customer.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="328">
-          <caret line="135" column="14" lean-forward="true" selection-start-line="135" selection-start-column="14" selection-end-line="135" selection-end-column="14" />
+        <state relative-caret-position="-1065">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/views/customer.py">
+    <entry file="file://$PROJECT_DIR$/rbac/static/rbac/css/menu.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1073">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        <state relative-caret-position="290">
+          <caret line="76" column="1" selection-start-line="76" selection-start-column="1" selection-end-line="76" selection-end-column="1" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/rbac/middlewares/middleware.py">
+    <entry file="file://$PROJECT_DIR$/rbac/admin.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="169">
-          <caret line="25" column="38" lean-forward="true" selection-start-line="25" selection-start-column="38" selection-end-line="25" selection-end-column="38" />
+        <state relative-caret-position="154">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
           <folding>
-            <element signature="e#0#52#0" expanded="true" />
+            <element signature="e#0#32#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/rbac/models.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="92">
+          <caret line="4" column="9" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/web/views/auth.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="184">
@@ -440,22 +498,22 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/rbac/service/init_permission.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="13" column="10" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
+        <state relative-caret-position="-490">
+          <caret line="12" column="18" lean-forward="true" selection-start-line="12" selection-start-column="18" selection-end-line="12" selection-end-column="18" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/rbac/templates/menu.html">
+    <entry file="file://$PROJECT_DIR$/rbac/templates/rbac/menu.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="46">
-          <caret line="2" column="53" selection-start-line="2" selection-start-column="53" selection-end-line="2" selection-end-column="53" />
+        <state relative-caret-position="276">
+          <caret line="15" column="28" selection-start-line="15" selection-start-column="28" selection-end-line="15" selection-end-column="28" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/rbac/templatetags/my_tags.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="261">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        <state relative-caret-position="299">
+          <caret line="13" column="42" selection-start-line="13" selection-start-column="42" selection-end-line="13" selection-end-column="42" />
           <folding>
             <element signature="e#0#27#0" expanded="true" />
           </folding>
@@ -464,10 +522,12 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/web/templates/layout.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="129" column="15" lean-forward="true" selection-start-line="129" selection-start-column="15" selection-end-line="129" selection-end-column="15" />
+        <state relative-caret-position="115">
+          <caret line="62" lean-forward="true" selection-start-line="62" selection-end-line="62" />
           <folding>
             <element signature="n#head#0;n#html#0;n#!!top" />
+            <element signature="n#div#0;n#body#0;n#html#0;n#!!top" />
+            <element signature="n#div#1;n#body#0;n#html#0;n#!!top" />
           </folding>
         </state>
       </provider>
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/db.sqlite3" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/db.sqlite3"
index 8169a0391af5c4557d351d9a5332ec0b2077ddb9..577de6d4d91aed64ca3e7b22508a70dffa87996d 100644
GIT binary patch
delta 2492
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

delta 918
zcmY*WU2Kz87(U;5`t!lQ&UITOux2)6OTqr^`?{{sHVgX`=>k(0L9Afyw#tg_D(woH
zK{uJYxrIP;rp|ETFeJ(aMmQIQY-%DBWAH{Lh`1_hHo>SP3vkn9cpAKrlf20}@AJIx
z^StjFp3)5u>yA~KCkY|VBAP@<BA&}R8>GoI&!03_D>Sd*Q>ZwKkMJrIcox@Sp-VK6
z&DhK}<pgCHR<@WcSERe6J&|lCmX4%TiCBhNN>o@XD%h5ih)b!^!y!ep1AUQ~V(DZ&
zlZmJLYb_G$rQUtf{=KP4GQKw*9T3?}IlEk<mMU0B@Q+ZwhHo&<D-{EB(`9_!LvuRR
zN^WMX3^7gqnY%4lYOD(E1b^d4T*55g$2bn44?BgyM%Z&LYj|MeFO=OFDdqNHUX;Vh
zjLjk8eU5Tx+f~(V!3aSCcd&??_#JutfNyaeZ;PSd!iea45uf8cI8Nh3oZx2bcCg4n
zJs&%GNCyk1nDLN9WM2TE8cOIC2?eo45<r1o=4G!hKp*gEZXYj<o^LDl1iTvp4Su&@
z^ZHele{rc*XH{sB;3s^7H_(G1D(E7;NRQJYx`zh2CRb4&{O)UWxlvjo!pb;QdPRUC
zX-R-{65U~8yXQ4tw{TsrCtZYe<#Jo(QHM^y?MSSJ?Z05-FaNa)ta@=R+jGm@8hyI+
zKzBUk3njySTg5&6_>O^a(mxm-?C|f}r8ap~&F@k-xI8|a_MqG1RK>%dT(a`oTc@ze
zyKUcgE!_T$_lfqdL}&YpgW;!k_I1WP{QqmB`U75HpuywzY*c+}gNaH6QaQnX`Wq{q
z+{BvYukc!8D;vH2sMO5P-acZAXCld1f40Wfok}Ix%w79RA^PjXjg8Xb2z%v@OKM_=
zCy$mnZ8Z-t`PI8lNv4<}_!1N1Lx#X63fWaA1c*$-gpOeb6WC3|SWW+=vtoO#l!cem
z?|x6EYT0EpkhVJ6#Fm%s@*@TVu@@hXd#h#SNzMAY6(-hkZ;kBI{YSh0W>w|<*!0c!
zPR@V)!NS-%Hw@&lVu?0t_5CsX&W+D<_W>I<ko5wn@5yEcQps4lKHA$`zi@75eth~q
OLyWi9Q4~0~T=g&1UL5lP

diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/__pycache__/admin.cpython-36.pyc" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/__pycache__/admin.cpython-36.pyc"
index 519f1c2448e3ef8f011ef7ad1b938b676874d444..78285de30eb1b8b973f5f0c4ff3d333b89a07f6f 100644
GIT binary patch
delta 116
zcmdnSa*0LRn3tF9f3HStJ|hFeV+JI^0%SV?adE~(<w&kn#w@lh_EhF9?uix6j4TuX
zhw?iEC0(pyGV*g%%kzt}Cr2>`GV)Ab!x+hSi^VrJuXHjild=F0P!SI!53>-f03#m|
F0szYU7;pdp

delta 91
zcmcb_vW-RAn3tE!AxI-Oh>?NeF#{4{0kR!{xHxK}a^%FWdKUJ~;`qs2jG=5+Kv5T~
h$$5-{jNFqCFh)+6XHw?l0t)gl@-Pdr3NZ390s!&Y4^;pF

diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/__pycache__/models.cpython-36.pyc" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/__pycache__/models.cpython-36.pyc"
index c3c251e569c4dd52673841410e9c36625f0b7bc1..b44fe77a2ce0d69d5c2e3328937e6c8f5dc29b9b 100644
GIT binary patch
literal 1898
zcma)--)kII6vyxU+MSu*P22V7ixPYg_o1Qan}`$|>VqbTR*+$3nC!htb~`(h-pQyD
zg-C-o*kBO_Q&VUKN&BLuFG4{7ko&5;oBacP_j~T_X4lw;49wZNXYSl{@A;hX+1F|{
zKfC$LM_<^C{l%s(jM+up*@rNkaU*73BQOm17UL$jwivgB(J`-Efd!Av9eA9P$A+iG
z%kY#(9tR$md+>N8Pl@~Qvqoiz)mg((rEbbaoV92;zK*tV0Up5ugR{UCR>$TBZDGd@
z96dsCUcv|=xx2-JGWW2wuj~bp<ilBfoO>{b-|qExe(2rWX_(6IMxTbUNLJQYRrO;b
zm(omxNz@g22{U^?{n@|!_3%|ZHVo<Dr)9v<MZa`k!ky9F&sm2dnz4vOIP2~8Sm43V
zM7;cfNgosbnTMHwy}6op#V4t}+MMr1$x8Z;h-A`ER+@3Xyu1;v3E6FDSvyV64;~y0
zcK;Y`-)PFEsMRbIGq<*(%3+wT%P@2)wh6<G&#H9BxzUTohO69ApCb&FABOlgj|HBq
zVR$W%Vme_MO8QoLmsTTrxh-NYX~Dp5x6(vb@u;^wWh&&eU<imlv}?>5Gp6?ahZv>m
zB26N5BC&#B3H-`LkI3y<0ZN4XAn5T5a#~gP2bqu>-r)QD{Tsgno}^8Ts1&e%`)Y9a
zOJ%>8#v*?nFN>-D?alr-zx4OE2e-El_rE*besrZ_N+PD5r8r8io(`#-V+WKrgrp)m
zo)*g2IowA)XvY&CzO2zlGi1(?q14N>WS)jm?pl;(s0yymEJVr1m6WW85;zhE%AO2_
zqEhsX=xHFvSyPht@kpo)$4IylSi<f&BqMH<bo7Wo(5Q@&OGrqwzyc_|0xUkS0!vN#
z?;cfazJO)>cdie2Zynyd@6X~w&buheu+3*@|30`mIM^?gSG;_5Z|Z%2_t)X(Z4fF}
z&@(jdT*ke<hrK(S!%eI|jhlq|^N+d;bo~+4r!Ys^Ngl_if~xEN1fDNqxiQcB<fs#>
zm19&%nLKTcl%?@13rEm_lz%yuqP>#5Ej9w1GV^4n&mr<N6rCD}Yuh9<qDub9Q>7j?
zrux6u2%3esz>sL7|3YHA@5(wp%&C3~aX?vv{fE=y(m}PLiW$>_DsYVjrSpHP%mdQN
zQhFI18mGQWik>9hJC^h*DZPNN<g+lUGU=lyNQch;5=EkRK+-{q$+y@jE062;Jja)c
rHt8(TACoRMEiRoFJ$tGZ5H3k=Qn_ywJ@-xelhD$vT6MSX)ocF(F7mIL

delta 738
zcmZ`%ON-M`6wb{%X;SO7_0@=PF)johM(}~)pj{0`7~B*jWP0ytH4nMB5z&P%1Xshf
zUIbxWxDs6X3l#kYy3WGQ(7|!<#+Bz}Kn9@+=i@wb&OP6k`>VcL^XGlv?JS?Uv!N-<
z=49L^-N}iYCbgH9(3w0BWKSJ5w~s1{5|YwQ<Hu3Lvb&>u@{@YLU3!lgU&#fFvN&a>
zv695u1NluqC68!ctJDQcRzE1b2Hn4}0Nl7NIav%GaD@t>kSE@4!T7l-5+fc(z0j54
z$pUfYQ|<J;4<A&$yTHR7Y^vyB!UnKO9o~joWhd+V$ddeO1lM({Q-f-2YTsnqeT$mZ
zqBcY}L^^e-Th$y|quvXp?@}N5)=T#m<LOX{VV=oX`q_nUu?LRWdh>BQeh>I_{q1z^
zb*PpWWvg+KjJO5m!UULZeBOHZa{B_fl>ke`ImBIv{$CzhHD%j4{;ZBwoX;BwC<xyR
zP-+EF_yP31#XL_~oOOpRp?zy8qLgJtUmp(gjL+1k1+7>Vc>az)ppnWkKLFc#<PXi0
zUyMt{lz)t4q$LCMq=S4o%36`gOy}S%4jnl*13HTX@8F;&Kv{eEPg5~_XVh>%m_P@2
rhChmKFEnMtI(!j#uM)fT#Cyf@MwIr|G^a(vt`Uf;5uP^Z%(;I7t~;2c

diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/admin.py" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/admin.py"
index b0611a4..3e94c5c 100644
--- "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/admin.py"
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/admin.py"
@@ -3,10 +3,11 @@ from rbac import models
 
 
 class PermissionConfig(admin.ModelAdmin):
-    list_display = ['id', 'url', 'title', 'is_menu']
-    list_editable = ['url', 'title','is_menu']
+    list_display = ['id', 'url', 'title', 'menu']
+    list_editable = ['url', 'title', 'menu']
 
 
 admin.site.register(models.Permission, PermissionConfig)
 admin.site.register(models.Role)
 admin.site.register(models.User)
+admin.site.register(models.Menu)
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/0004_auto_20190712_2128.py" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/0004_auto_20190712_2128.py"
new file mode 100644
index 0000000..74357da
--- /dev/null
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/0004_auto_20190712_2128.py"
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2019-07-12 13:28
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rbac', '0003_permission_icon'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Menu',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=32, verbose_name='菜单名')),
+                ('icon', models.CharField(max_length=50, verbose_name='图标')),
+            ],
+        ),
+        migrations.RemoveField(
+            model_name='permission',
+            name='icon',
+        ),
+        migrations.RemoveField(
+            model_name='permission',
+            name='is_menu',
+        ),
+        migrations.AddField(
+            model_name='permission',
+            name='menu',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='rbac.Menu'),
+        ),
+    ]
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/__pycache__/0004_auto_20190712_2128.cpython-36.pyc" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/__pycache__/0004_auto_20190712_2128.cpython-36.pyc"
new file mode 100644
index 0000000000000000000000000000000000000000..cbb3fd8777454f757173470a539a9df263c1aec6
GIT binary patch
literal 1092
zcmYjQ$&S-N5VhNF$IdbY2+MHdNDf4qfW#t%h!O@N7!JV63Tm8GC*zEl(6)ha1&Kw9
zKu8=A91yqp1tj>8zQQof2XLp_W(bb_RMqZU-mA))TCM!!)v0@*siu9`{(I2ZuHc(o
zL;wx+KnrzO*Og5I5*n@%QkUkw5ty!ZO#=$%GYw2`OiND<w*<x=t!eFHyw=oZJ&XKN
z44egi%7qssO(M&oKM`K)$5A4!5I+XVt&zIF|5VYqf^YH`forY~noD4HqPqsCQxgoJ
z+?tla#GeHvuorYpz`-*c%20vof}mf^{S`P+_!9%_3xe?u9E2Ji`ez^hYnSo7fiV@8
zmsh8?sWn}h9)KfobV1?R!kAFE4#$z*3F&O?Q;<{)y^(CR+wC)K#zp8S2{L2II+ApQ
zN0}r(++COCdcR3!)yvYDjRf~n4ze;6e&~rg+v0QSBwYAj;6LHA`jCrZoNyL-A(v+A
zrvcwPiDG09!mrmKcNXt<-Yjx0y~ixz(InjzEBH-PRd}zX?pg>tAHMzk^c*kJJe4)}
zc>swlFFVbXs3GLVL<57|lAo|pwN4d2aTLXt;(`p!Vc<num@f+g=^#@K<tdjWjhluz
zhT(Y*Y38MFHHlDth!R5cptM<DhA~-Y3}>GO9PKJ&4>B)MEh-QAj7Pwuk<SxhV4$q@
za>X`OpF%CEbh;?yx?&@p-liuCvvQk<@k3rXb{C+q%ImS<{v^7AGFve9qDd?X45gj-
zj^mQ0UiVI~+rKKyF-lV`=e8zJtJW3#zK_tqIM|Fs{wNk(gMOanCig_-N0UL2jmPu<
z=6`y3`^)b8ue&c_43v0-<;o9mQ_iw{4La?$3+;1j9oAXvoNvwM!o(tK!pTVl+ps9r
z32Eqc{iuPKZjmJtJ-^+wm5}2s%>+s(2*ydLVAz6TE?%M6>c7KQ@t14ua~G#DC{MPe
YTUafX&AwEO>9QI`qGnkob=@}p01jtAhyVZp

literal 0
HcmV?d00001

diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/models.py" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/models.py"
index 312309f..99f92b3 100644
--- "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/models.py"
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/models.py"
@@ -1,6 +1,14 @@
 from django.db import models
 
 
+class Menu(models.Model):
+    title = models.CharField(max_length=32, verbose_name='菜单名')
+    icon = models.CharField('图标', max_length=50)
+
+    def __str__(self):
+        return self.title
+
+
 class User(models.Model):
     username = models.CharField('用户名', max_length=32)
     password = models.CharField('密码', max_length=32)
@@ -11,10 +19,13 @@ class User(models.Model):
 
 
 class Permission(models.Model):
+    """权限表
+    有menu_id  二级菜单
+    没有menu_id 普通的权限
+    """
     url = models.CharField('url地址', max_length=128)
     title = models.CharField('标题', max_length=32)
-    is_menu = models.BooleanField(default=False, verbose_name='是否是菜单')
-    icon = models.CharField('图标', max_length=50)
+    menu = models.ForeignKey('Menu', blank=True, null=True)
 
     def __str__(self):
         return self.title
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/service/__pycache__/init_permission.cpython-36.pyc" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/service/__pycache__/init_permission.cpython-36.pyc"
index 5bdc2db4e483115a30ddd2a5bc1b082f53c585e0..ad9fa12a4614535ddb67d758930e014a79cb0904 100644
GIT binary patch
delta 466
zcmZXQF-yZh7>2*^?vk`=D#coCR$W?<EQ(V{-314sQZn>Hy_lx<l7hn(hpLM@lprqs
z1O5a5g^N@Ei|94&V3C9Od%5?0zJq%;Gs`}#R_&*^R`0`{+r7Il08ki0h#Wb2!H{su
z88^7et(g(h8BB?QDILI+-QFv50zEY~6bl(IDT7lN1kMmad&>pst)`;amVDISaF>Z$
zC@WMGyu2U-<o1H9OS%F&F!t2i>q5nakm+OtSw1uNE<iB_p^=)Q)d9_{e5nK6S$ba8
z4$h&yHUBw1Xx;>JD3U~s;>7odK|JyORHRYR-TjwjXV^F{DuU;9BBM6RjiM~6{-rjR
zOplz2{wU5%{VNf18N|}mm)Qe8@0Safi+<Xz{aqf3B+XI0gREyqB=K4r0Ng^dJ~m~H
kRczeG5<0|0lkBk?Hi?4{%0~7{+(ttavc4%h**9ta0-HH+!T<mO

delta 377
zcmY*UF;2rk5Zt{zJB~>Zm^5yoNu*HGT1b&XNkxGaDRRMC=uVCecaB7HAw^m!f<?y%
zka&@Q!2^&ulZI%uqnX*6V(ZSkA71qP;rH`!zNT$BU%vr>MFk243igVM2@+g*!ryR3
z8(6V>Sdm-)G_`CB^JL{&Qe1SbCnyGq8$@v2k3o+uSA6F?<Z<hJF^J%U+SKFt7A#p%
zUgfJ!0+!o&CxQe-w>^l^F}Q)zK|R5%$?-#`7t$D67A8&QU0KWq`<6);S+Q(rsq+zO
za^EywC96DZcpI;O@a632e<hcunswV!+R_H)C+MjDVrF>i+JJ}1{w5^OIEENufE;}{
j5$j<O^`O3{_<Z29I@*U5Cz~Kylwz4@m*|vX4tn$pxDHts

diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/service/init_permission.py" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/service/init_permission.py"
index 435864c..56b4813 100644
--- "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/service/init_permission.py"
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/service/init_permission.py"
@@ -5,21 +5,41 @@ def init_permission(request, obj):
     permissions = obj.roles.filter(permissions__url__isnull=False).values(
         'permissions__url',
         'permissions__title',
-        'permissions__icon',
-        'permissions__is_menu',
+        'permissions__menu__title',
+        'permissions__menu__icon',
+        'permissions__menu_id',
     ).distinct()
+    # print(permissions)
+    menu_dict = {}
+
+    # print(menu_dict)
     # 权限信息的列表
     permissions_list = []
-    # 菜单信息的列表
-    menu_list = []
+    # # 菜单信息的列表
+    # menu_list = []
+    # for i in permissions:
+    #     permissions_list.append({'url': i['permissions__url']})
+    #     if i['permissions__is_menu']:
+    #         menu_list.append({
+    #             'url': i['permissions__url'],
+    #             'title': i['permissions__title'],
+    #
+    #         })
     for i in permissions:
         permissions_list.append({'url': i['permissions__url']})
-        if i['permissions__is_menu']:
-            menu_list.append({
-                'url': i['permissions__url'],
-                'title': i['permissions__title'],
-                'icon': i['permissions__icon'],
-            })
+        if i['permissions__menu_id']:
+            if i['permissions__menu_id'] not in menu_dict:
+                menu_dict[i['permissions__menu_id']] = {
+                    'title': i['permissions__menu__title'],
+                    'icon': i['permissions__menu__icon'],
+                    'children': [
+                        {'title': i['permissions__title'], 'url': i['permissions__url']}
+                    ]
+                }
+            else:
+                menu_dict[i['permissions__menu_id']]['children'].append(
+                    {'title': i['permissions__title'], 'url': i['permissions__url']}
+                )
     request.session[settings.PERMISSION_SESSION_KEY] = permissions_list
-    request.session[settings.MENU_SESSION_KEY] = menu_list
+    request.session[settings.MENU_SESSION_KEY] = menu_dict
     request.session['is_login'] = True
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/static/rbac/css/menu.css" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/static/rbac/css/menu.css"
index f952ea9..abe45ce 100644
--- "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/static/rbac/css/menu.css"
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/static/rbac/css/menu.css"
@@ -1,35 +1,77 @@
-       .left-menu .menu-body .static-menu {
-
-        }
-
-        .left-menu .menu-body .static-menu .icon-wrap {
-            width: 20px;
-            display: inline-block;
-            text-align: center;
-        }
-
-        .left-menu .menu-body .static-menu a {
-            text-decoration: none;
-            padding: 8px 15px;
-            border-bottom: 1px solid #ccc;
-            color: #333;
-            display: block;
-            background: #efefef;
-            background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #efefef), color-stop(1, #fafafa));
-            background: -ms-linear-gradient(bottom, #efefef, #fafafa);
-            background: -moz-linear-gradient(center bottom, #efefef 0%, #fafafa 100%);
-            background: -o-linear-gradient(bottom, #efefef, #fafafa);
-            filter: progid:dximagetransform.microsoft.gradient(startColorStr='#e3e3e3', EndColorStr='#ffffff');
-            -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#fafafa',EndColorStr='#efefef')";
-            box-shadow: inset 0px 1px 1px white;
-        }
-
-        .left-menu .menu-body .static-menu a:hover {
-            color: #2F72AB;
-            border-left: 2px solid #2F72AB;
-        }
-
-        .left-menu .menu-body .static-menu a.active {
-            color: #2F72AB;
-            border-left: 2px solid #2F72AB;
-        }
\ No newline at end of file
+
+.left-menu .menu-body .static-menu {
+
+}
+
+.left-menu .menu-body .static-menu .icon-wrap {
+    width: 20px;
+    display: inline-block;
+    text-align: center;
+}
+
+.left-menu .menu-body .static-menu a {
+    text-decoration: none;
+    padding: 8px 15px;
+    border-bottom: 1px solid #ccc;
+    color: #333;
+    display: block;
+    background: #efefef;
+    background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #efefef), color-stop(1, #fafafa));
+    background: -ms-linear-gradient(bottom, #efefef, #fafafa);
+    background: -moz-linear-gradient(center bottom, #efefef 0%, #fafafa 100%);
+    background: -o-linear-gradient(bottom, #efefef, #fafafa);
+    filter: progid:dximagetransform.microsoft.gradient(startColorStr='#e3e3e3', EndColorStr='#ffffff');
+    -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#fafafa',EndColorStr='#efefef')";
+    box-shadow: inset 0px 1px 1px white;
+}
+
+.left-menu .menu-body .static-menu a:hover {
+    color: #2F72AB;
+    border-left: 2px solid #2F72AB;
+}
+
+.left-menu .menu-body .static-menu a.active {
+    color: #2F72AB;
+    border-left: 2px solid #2F72AB;
+}
+
+
+.multi-menu .item {
+    background-color: white;
+}
+
+.multi-menu .item > .title {
+    padding: 10px 5px;
+    border-bottom: 1px solid #dddddd;
+    cursor: pointer;
+    color: #333;
+    display: block;
+    background: #efefef;
+    background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #efefef), color-stop(1, #fafafa));
+    background: -ms-linear-gradient(bottom, #efefef, #fafafa);
+    background: -o-linear-gradient(bottom, #efefef, #fafafa);
+    filter: progid:dximagetransform.microsoft.gradient(startColorStr='#e3e3e3', EndColorStr='#ffffff');
+    -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#fafafa',EndColorStr='#efefef')";
+    box-shadow: inset 0 1px 1px white;
+}
+
+.multi-menu .item > .body {
+    border-bottom: 1px solid #dddddd;
+}
+
+.multi-menu .item > .body a {
+    display: block;
+    padding: 5px 20px;
+    text-decoration: none;
+    border-left: 2px solid transparent;
+    font-size: 13px;
+
+}
+
+.multi-menu .item > .body a:hover {
+    border-left: 2px solid #2F72AB;
+}
+
+.multi-menu .item > .body a.active {
+    border-left: 2px solid #2F72AB;
+}
\ No newline at end of file
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templates/rbac/menu.html" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templates/rbac/menu.html"
index 2cbdf6f..37b5104 100644
--- "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templates/rbac/menu.html"
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templates/rbac/menu.html"
@@ -1,6 +1,20 @@
-<div class="static-menu">
+{#<div class="static-menu">#}
+{#    {% for menu in menu_list %}#}
+{#        <a href="{{ menu.url }}" class="{{ menu.class }}">#}
+{#            <span class="icon-wrap"><i class="fa {{ menu.icon }}"></i></span>{{ menu.title }}</a>#}
+{#    {% endfor %}#}
+{#</div>#}
+
+
+<div class="multi-menu">
     {% for menu in menu_list %}
-        <a href="{{ menu.url }}" class="{{ menu.class }}">
-            <span class="icon-wrap"><i class="fa {{ menu.icon }}"></i></span>{{ menu.title }}</a>
+        <div class="item">
+            <div class="title"><i class="fa {{ menu.icon }}"></i>{{ menu.title }}</div>
+            <div class="body hide">
+                {% for i in menu.children %}
+                    <a href="{{ i.url }}">{{ i.title }}</a>
+                {% endfor %}
+            </div>
+        </div>
     {% endfor %}
 </div>
\ No newline at end of file
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/__pycache__/my_tags.cpython-36.pyc" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/__pycache__/my_tags.cpython-36.pyc"
index 52d86c52b0655ec4562a861a58cd8c46fe740cc0..f0d31dfa3229cdc180291d7805a20d0da90554c8 100644
GIT binary patch
delta 182
zcmeytvV?`xn3tF9*>sIq+lic09GMvy7?^<A8HkG&fJ6;L7DE<e2~!qxGh;0ykjGNX
zl)_lUn8n)6kjWU#pvmMH#hII$R~ny_SzMyYHd&F;P>roDF{d=OSd;k{dr@j3kX3RE
zq9!FXx#SjeX;IEfh9aKH4UDNgY(P60nD`jkn2Pu&|728Qxy4kJI$4QHS(FbbQN)8v
K@J^0mk^=zo%PZ0V

delta 266
zcmZ3&@`Hubn3tC;x=|x`>qO2e^(+hw46H!x48+A=K%#~riy@1#gei-;nX#4;$YZHx
zs?e!nbYX~9sbwx<&0<So%wn%$PGOQ{XlAToYGx{uN?``_S!@^r7z(Ar8B$nl7&94z
z88q4as+g;5Rc<kt7UkSxOH3}wEK9w`nw*nZTzrc&H#M&`K8H24xI~j<;ypt>rXrwR
zZemGt#x1tA{30MrljRnBQEFjnYH>*sJJ4lCAh+IP%v{M(BskfWF;#>Q$Y)^UV`O9G
mViaTK0MbRmlb127uom$EB_^L^R2CHmGKvII38BesOmYB#kw0nx

diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/my_tags.py" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/my_tags.py"
index d743376..7d7d655 100644
--- "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/my_tags.py"
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/my_tags.py"
@@ -8,10 +8,7 @@ register = template.Library()
 
 @register.inclusion_tag('rbac/menu.html')
 def menu(request):
-    menu_list = request.session.get(settings.MENU_SESSION_KEY)
+    menu_dict = request.session.get(settings.MENU_SESSION_KEY)
     url = request.path_info
-    for i in menu_list:
-        if re.match(r'{}$'.format(i['url']), url):
-            i['class'] = 'active'
-            break
-    return {'menu_list': menu_list}
+
+    return {'menu_list': menu_dict.values()}
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templates/layout.html" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templates/layout.html"
index f578dd2..e83bc99 100644
--- "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templates/layout.html"
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templates/layout.html"
@@ -146,6 +146,11 @@
 
 <script src="{% static 'js/jquery-3.3.1.min.js' %} "></script>
 <script src="{% static 'plugins/bootstrap/js/bootstrap.js' %} "></script>
+<script>
+    $('.multi-menu .title').click(function () {
+        $(this).next().toggleClass('hide')
+    })
+</script>
 {% block js %} {% endblock %}
 </body>
 </html>
\ No newline at end of file
-- 
Gitee