fuyu 5 years ago
parent
commit
7c0c3afbfc
2 changed files with 5 additions and 9 deletions
  1. 4 8
      .idea/workspace.xml
  2. 1 1
      shop/src/main/resource/templates/template_setmeal.html

+ 4 - 8
.idea/workspace.xml

@@ -3,10 +3,7 @@
   <component name="ChangeListManager">
   <component name="ChangeListManager">
     <list default="true" id="2054d288-d3d9-47a2-840a-057f9d2a0c35" name="Default" comment="">
     <list default="true" id="2054d288-d3d9-47a2-840a-057f9d2a0c35" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/template_service.html" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/template_service.html" />
       <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/template_setmeal.html" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/template_setmeal.html" />
       <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/template_setmeal.html" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/template_setmeal.html" />
-      <change beforePath="$PROJECT_DIR$/shop/static/js/main.js" afterPath="$PROJECT_DIR$/shop/static/js/main.js" />
-      <change beforePath="$PROJECT_DIR$/shop/static/style/main.css" afterPath="$PROJECT_DIR$/shop/static/style/main.css" />
     </list>
     </list>
     <ignored path="$PROJECT_DIR$/shop/target/" />
     <ignored path="$PROJECT_DIR$/shop/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -531,12 +528,12 @@
       <workItem from="1579068546792" duration="1909000" />
       <workItem from="1579068546792" duration="1909000" />
       <workItem from="1579073948519" duration="1104000" />
       <workItem from="1579073948519" duration="1104000" />
       <workItem from="1579153318820" duration="21000" />
       <workItem from="1579153318820" duration="21000" />
-      <workItem from="1579242767300" duration="1179000" />
+      <workItem from="1579242767300" duration="1537000" />
     </task>
     </task>
     <servers />
     <servers />
   </component>
   </component>
   <component name="TimeTrackingManager">
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="170070000" />
+    <option name="totallyTimeSpent" value="170428000" />
   </component>
   </component>
   <component name="TodoView">
   <component name="TodoView">
     <todo-panel id="selected-file">
     <todo-panel id="selected-file">
@@ -549,7 +546,6 @@
   </component>
   </component>
   <component name="ToolWindowManager">
   <component name="ToolWindowManager">
     <frame x="120" y="32" width="1440" height="823" extended-state="0" />
     <frame x="120" y="32" width="1440" height="823" extended-state="0" />
-    <editor active="true" />
     <layout>
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.36038515" sideWeight="0.47567955" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.36038515" sideWeight="0.47567955" order="7" side_tool="true" content_ui="tabs" />
@@ -568,10 +564,10 @@
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3287483" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3287483" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.35851648" sideWeight="0.5243205" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.35851648" sideWeight="0.5243205" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3287483" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3287483" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3287483" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3287483" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.22420909" sideWeight="0.49679193" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2239011" sideWeight="0.49679193" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23748212" sideWeight="0.48895028" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23748212" sideWeight="0.48895028" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />

+ 1 - 1
shop/src/main/resource/templates/template_setmeal.html

@@ -18,7 +18,7 @@
             <a th:href="@{/shop(headkey=3, label=${sysLabel.id})}" th:text="${sysLabel.name}"></a>
             <a th:href="@{/shop(headkey=3, label=${sysLabel.id})}" th:text="${sysLabel.name}"></a>
           </li>
           </li>
           <li >
           <li >
-            <a href="/shop?headkey=3" >更多...</a>
+            <a href="/shop?headkey=3" >更多>></a>
           </li>
           </li>
         </ul>
         </ul>
       </section>
       </section>