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 661dca560bc86938d69c034eee56c03952bfc86d..db1a11f830331655cf34dc12c6dabf09d0725904 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
Binary files "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/db.sqlite3" and "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/db.sqlite3" differ
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
Binary files "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/__pycache__/admin.cpython-36.pyc" and "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/__pycache__/admin.cpython-36.pyc" differ
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
Binary files "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/__pycache__/models.cpython-36.pyc" and "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/__pycache__/models.cpython-36.pyc" differ
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 b0611a4ce7fff6387256c29cac82963e3ba4f15f..3e94c5c5182ea2d130ed2061fa7cdafd113a47fb 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 0000000000000000000000000000000000000000..74357daa57b005fa7cc5810147395e5240e6ab33
--- /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
Binary files /dev/null and "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/migrations/__pycache__/0004_auto_20190712_2128.cpython-36.pyc" differ
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 312309f22c19e34e24d2aae294553be9cf33a41b..99f92b3bc144197f362f67900be8f533c4d92efe 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
Binary files "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/service/__pycache__/init_permission.cpython-36.pyc" and "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/service/__pycache__/init_permission.cpython-36.pyc" differ
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 435864c235a0a5c269881339a81b89a7884f4363..56b48130f2c66d27e73a6f95b99219e1d1ca5aed 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 f952ea9e7e0fe6e61cdf7e308b09cf41f82e0ef7..abe45ce202cf311ca9fccbefc37e4fd58f336398 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 2cbdf6f4d0f0d6e5e715673fa94194aff1af34dd..37b510442e81e64964be82619a936363c278927d 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
Binary files "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/__pycache__/my_tags.cpython-36.pyc" and "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/__pycache__/my_tags.cpython-36.pyc" differ
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 d743376c71f6a15c18acb4ab2060a8dbe0f8b936..7d7d655772b2809da9a2efad1c45b08422697e45 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 f578dd2f1c33e1eb02fcdcac9db02fac1d6fd5ff..e83bc99de877d32007ecaae8ee91cd21dff5b931 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