x

.idea/workspace.xml

@@ -2,7 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="2054d288-d3d9-47a2-840a-057f9d2a0c35" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/template_setmeal.html" beforeDir="false" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/template_setmeal.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/template_info.html" beforeDir="false" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/template_info.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -205,7 +206,7 @@
       <workItem from="1585628259581" duration="1403000" />
       <workItem from="1585706005737" duration="789000" />
       <workItem from="1585792990603" duration="197000" />
-      <workItem from="1585812151059" duration="232000" />
+      <workItem from="1585812151059" duration="2300000" />
     </task>
     <servers />
   </component>
@@ -217,77 +218,93 @@
       <screen x="0" y="23" width="1440" height="822" />
     </state>
     <state x="184" y="96" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.23.1440.822@0.23.1440.822" timestamp="1584449391479" />
-    <state width="1398" height="380" key="GridCell.Tab.0.bottom" timestamp="1585793191751">
-      <screen x="0" y="23" width="1440" height="822" />
+    <state width="1398" height="380" key="GridCell.Tab.0.bottom" timestamp="1585819809488">
+      <screen x="0" y="23" width="1440" height="823" />
     </state>
     <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.822/-1920.-72.1920.1057@0.23.1440.822" timestamp="1585793191751" />
+    <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585819809488" />
     <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.825/-1920.-72.1920.1057@0.23.1440.825" timestamp="1585707136936" />
+    <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1585813764830" />
     <state width="1398" height="232" key="GridCell.Tab.0.bottom/0.23.1440.826@0.23.1440.826" timestamp="1585555485989" />
     <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421909" />
     <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.827@0.23.1440.827" timestamp="1585568481547" />
     <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.828/-1920.-72.1920.1057@0.23.1440.828" timestamp="1585706287029" />
     <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.828@0.23.1440.828" timestamp="1585565681676" />
     <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.829@0.23.1440.829" timestamp="1585560326117" />
-    <state width="1398" height="380" key="GridCell.Tab.0.center" timestamp="1585793191750">
-      <screen x="0" y="23" width="1440" height="822" />
+    <state width="1398" height="380" key="GridCell.Tab.0.center" timestamp="1585819809487">
+      <screen x="0" y="23" width="1440" height="823" />
     </state>
     <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.822/-1920.-72.1920.1057@0.23.1440.822" timestamp="1585793191750" />
+    <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585819809487" />
     <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.825/-1920.-72.1920.1057@0.23.1440.825" timestamp="1585707136935" />
+    <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1585813764829" />
     <state width="1398" height="232" key="GridCell.Tab.0.center/0.23.1440.826@0.23.1440.826" timestamp="1585555485988" />
     <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421908" />
     <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.827@0.23.1440.827" timestamp="1585568481546" />
     <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.828/-1920.-72.1920.1057@0.23.1440.828" timestamp="1585706287028" />
     <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.828@0.23.1440.828" timestamp="1585565681675" />
     <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.829@0.23.1440.829" timestamp="1585560326115" />
-    <state width="1398" height="380" key="GridCell.Tab.0.left" timestamp="1585793191749">
-      <screen x="0" y="23" width="1440" height="822" />
+    <state width="1398" height="380" key="GridCell.Tab.0.left" timestamp="1585819809485">
+      <screen x="0" y="23" width="1440" height="823" />
     </state>
     <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.822/-1920.-72.1920.1057@0.23.1440.822" timestamp="1585793191749" />
+    <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585819809485" />
     <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.825/-1920.-72.1920.1057@0.23.1440.825" timestamp="1585707136935" />
+    <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1585813764829" />
     <state width="1398" height="232" key="GridCell.Tab.0.left/0.23.1440.826@0.23.1440.826" timestamp="1585555485988" />
     <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421907" />
     <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.827@0.23.1440.827" timestamp="1585568481545" />
     <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.828/-1920.-72.1920.1057@0.23.1440.828" timestamp="1585706287027" />
     <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.828@0.23.1440.828" timestamp="1585565681675" />
     <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.829@0.23.1440.829" timestamp="1585560326115" />
-    <state width="1398" height="380" key="GridCell.Tab.0.right" timestamp="1585793191750">
-      <screen x="0" y="23" width="1440" height="822" />
+    <state width="1398" height="380" key="GridCell.Tab.0.right" timestamp="1585819809487">
+      <screen x="0" y="23" width="1440" height="823" />
     </state>
     <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.822/-1920.-72.1920.1057@0.23.1440.822" timestamp="1585793191750" />
+    <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585819809487" />
     <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.825/-1920.-72.1920.1057@0.23.1440.825" timestamp="1585707136936" />
+    <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1585813764830" />
     <state width="1398" height="232" key="GridCell.Tab.0.right/0.23.1440.826@0.23.1440.826" timestamp="1585555485989" />
     <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421908" />
     <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.827@0.23.1440.827" timestamp="1585568481547" />
     <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.828/-1920.-72.1920.1057@0.23.1440.828" timestamp="1585706287028" />
     <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.828@0.23.1440.828" timestamp="1585565681676" />
     <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.829@0.23.1440.829" timestamp="1585560326116" />
-    <state width="1398" height="380" key="GridCell.Tab.1.bottom" timestamp="1585647421910">
-      <screen x="0" y="23" width="1440" height="827" />
+    <state width="1398" height="380" key="GridCell.Tab.1.bottom" timestamp="1585819809491">
+      <screen x="0" y="23" width="1440" height="823" />
     </state>
+    <state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585819809491" />
+    <state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1585813764831" />
     <state width="1398" height="232" key="GridCell.Tab.1.bottom/0.23.1440.826@0.23.1440.826" timestamp="1585555485991" />
     <state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421910" />
     <state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.827@0.23.1440.827" timestamp="1585568481549" />
     <state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.828@0.23.1440.828" timestamp="1585565681678" />
     <state width="1398" height="380" key="GridCell.Tab.1.bottom/0.23.1440.829@0.23.1440.829" timestamp="1585560326118" />
-    <state width="1398" height="380" key="GridCell.Tab.1.center" timestamp="1585647421909">
-      <screen x="0" y="23" width="1440" height="827" />
+    <state width="1398" height="380" key="GridCell.Tab.1.center" timestamp="1585819809489">
+      <screen x="0" y="23" width="1440" height="823" />
     </state>
+    <state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585819809489" />
+    <state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1585813764831" />
     <state width="1398" height="232" key="GridCell.Tab.1.center/0.23.1440.826@0.23.1440.826" timestamp="1585555485990" />
     <state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421909" />
     <state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.827@0.23.1440.827" timestamp="1585568481548" />
     <state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.828@0.23.1440.828" timestamp="1585565681677" />
     <state width="1398" height="380" key="GridCell.Tab.1.center/0.23.1440.829@0.23.1440.829" timestamp="1585560326118" />
-    <state width="1398" height="380" key="GridCell.Tab.1.left" timestamp="1585647421909">
-      <screen x="0" y="23" width="1440" height="827" />
+    <state width="1398" height="380" key="GridCell.Tab.1.left" timestamp="1585819809489">
+      <screen x="0" y="23" width="1440" height="823" />
     </state>
+    <state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585819809489" />
+    <state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1585813764831" />
     <state width="1398" height="232" key="GridCell.Tab.1.left/0.23.1440.826@0.23.1440.826" timestamp="1585555485990" />
     <state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421909" />
     <state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.827@0.23.1440.827" timestamp="1585568481548" />
     <state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.828@0.23.1440.828" timestamp="1585565681677" />
     <state width="1398" height="380" key="GridCell.Tab.1.left/0.23.1440.829@0.23.1440.829" timestamp="1585560326117" />
-    <state width="1398" height="380" key="GridCell.Tab.1.right" timestamp="1585647421909">
-      <screen x="0" y="23" width="1440" height="827" />
+    <state width="1398" height="380" key="GridCell.Tab.1.right" timestamp="1585819809490">
+      <screen x="0" y="23" width="1440" height="823" />
     </state>
+    <state width="1398" height="380" key="GridCell.Tab.1.right/0.23.1440.823/-1920.-72.1920.1057@0.23.1440.823" timestamp="1585819809490" />
+    <state width="1398" height="380" key="GridCell.Tab.1.right/0.23.1440.826/-1920.-72.1920.1057@0.23.1440.826" timestamp="1585813764831" />
     <state width="1398" height="232" key="GridCell.Tab.1.right/0.23.1440.826@0.23.1440.826" timestamp="1585555485991" />
     <state width="1398" height="380" key="GridCell.Tab.1.right/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421909" />
     <state width="1398" height="380" key="GridCell.Tab.1.right/0.23.1440.827@0.23.1440.827" timestamp="1585568481548" />

shop/src/main/resource/templates/template_info.html

@@ -27,7 +27,7 @@
           </a>
           <section class="zskk-newsInfo">
             <ul>
-              <li th:each="newBase: ${newLabel.news}">
+              <li th:each="newBase,newBaseStat:${newLabel.news}" th:if="${newBaseStat.index lt 5}">
                 <a th:text="${newBase.title}" th:attr="href='/new/detail/' + ${newBase.id}"></a>
               </li>
             </ul>

shop/static/style/main.css

@@ -194,7 +194,7 @@
 }
 .zskk-box .zskk-setmeal .zskk-content .zskk-list .zskk-oneInfo .zskk-name {
     font-size: 12px;
-    width: 60%;
+    width: 100%;
     padding: 5px 0;
     color: #676767;
     font-weight: 600px;