bug fix

.idea/workspace.xml

@@ -3,11 +3,9 @@
   <component name="ChangeListManager">
     <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$/shop/src/main/resource/templates/fqa.html" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/fqa.html" />
-      <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/fragments.html" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/fragments.html" />
-      <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/mypayedorders.html" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/mypayedorders.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/nHeader.css" afterPath="$PROJECT_DIR$/shop/static/style/nHeader.css" />
       <change beforePath="$PROJECT_DIR$/shop/static/style/shop.css" afterPath="$PROJECT_DIR$/shop/static/style/shop.css" />
-      <change beforePath="$PROJECT_DIR$/shop/static/style/user.css" afterPath="$PROJECT_DIR$/shop/static/style/user.css" />
     </list>
     <ignored path="$PROJECT_DIR$/shop/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -34,21 +32,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="main.css" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/shop/static/style/main.css">
+      <file leaf-file-name="main.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/shop/static/js/main.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="509">
-              <caret line="284" column="17" lean-forward="false" selection-start-line="284" selection-start-column="17" selection-end-line="284" selection-end-column="17" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="shop.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/shop/src/main/resource/templates/shop.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="90">
-              <caret line="6" column="60" lean-forward="false" selection-start-line="6" selection-start-column="54" selection-end-line="6" selection-end-column="60" />
+            <state relative-caret-position="75">
+              <caret line="54" column="60" lean-forward="false" selection-start-line="54" selection-start-column="51" selection-end-line="54" selection-end-column="60" />
               <folding />
             </state>
           </provider>
@@ -74,11 +62,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="shop.css" pinned="false" current-in-tab="false">
+      <file leaf-file-name="shop.css" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/shop/static/style/shop.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="224">
-              <caret line="37" column="25" lean-forward="false" selection-start-line="37" selection-start-column="25" selection-end-line="37" selection-end-column="25" />
+            <state relative-caret-position="361">
+              <caret line="56" column="19" lean-forward="false" selection-start-line="56" selection-start-column="19" selection-end-line="56" selection-end-column="19" />
               <folding />
             </state>
           </provider>
@@ -124,16 +112,23 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="nHeader.css" pinned="false" current-in-tab="true">
+      <file leaf-file-name="nHeader.css" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/shop/static/style/nHeader.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="267">
-              <caret line="38" column="21" lean-forward="false" selection-start-line="38" selection-start-column="20" selection-end-line="38" selection-end-column="21" />
+            <state relative-caret-position="210">
+              <caret line="14" column="25" lean-forward="true" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="erweimafooter.png" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/shop/static/images/erweimafooter.png">
+          <provider selected="true" editor-type-id="images">
+            <state />
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -146,9 +141,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>islogin</find>
-      <find>type</find>
-      <find>queryNewBase</find>
       <find>shop</find>
       <find>advertising</find>
       <find>queryNextNew</find>
@@ -176,6 +168,9 @@
       <find>tjorders</find>
       <find>subnav l mt20</find>
       <find>list-style-type:none;</find>
+      <find>click</find>
+      <find>zskk-weixin</find>
+      <find>.add</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -222,7 +217,6 @@
         <option value="$PROJECT_DIR$/shop/static/style/news.css" />
         <option value="$PROJECT_DIR$/shop/static/style/smallBanner.css" />
         <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/InfoController.java" />
-        <option value="$PROJECT_DIR$/shop/static/style/nHeader.css" />
         <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/NewService.java" />
         <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/NewController.java" />
         <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/NewMapper.java" />
@@ -235,13 +229,14 @@
         <option value="$PROJECT_DIR$/shop/static/style/doctors.css" />
         <option value="$PROJECT_DIR$/shop/static/manager/src/components/page/NewsManager.vue" />
         <option value="$PROJECT_DIR$/shop/static/manager/src/components/Sidebar.vue" />
-        <option value="$PROJECT_DIR$/shop/static/js/main.js" />
         <option value="$PROJECT_DIR$/shop/static/style/main.css" />
         <option value="$PROJECT_DIR$/shop/src/main/resource/application-test.properties" />
         <option value="$PROJECT_DIR$/shop/static/manager/config/prod.env.js" />
         <option value="$PROJECT_DIR$/shop/src/main/resource/templates/shop.html" />
         <option value="$PROJECT_DIR$/shop/static/style/common.css" />
         <option value="$PROJECT_DIR$/shop/static/style/user.css" />
+        <option value="$PROJECT_DIR$/shop/static/js/main.js" />
+        <option value="$PROJECT_DIR$/shop/static/style/nHeader.css" />
         <option value="$PROJECT_DIR$/shop/static/style/shop.css" />
       </list>
     </option>
@@ -272,8 +267,8 @@
     <handled-path value="$PROJECT_DIR$/shop/static/manager/node_modules" />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="180" />
-    <option name="y" value="39" />
+    <option name="x" value="368" />
+    <option name="y" value="23" />
     <option name="width" value="1440" />
     <option name="height" value="822" />
   </component>
@@ -436,6 +431,20 @@
               <item name="shop" type="462c0819:PsiDirectoryNode" />
               <item name="static" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
+              <item name="tjshop" type="462c0819:PsiDirectoryNode" />
+              <item name="shop" type="462c0819:PsiDirectoryNode" />
+              <item name="static" type="462c0819:PsiDirectoryNode" />
+              <item name="js" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
+              <item name="tjshop" type="462c0819:PsiDirectoryNode" />
+              <item name="shop" type="462c0819:PsiDirectoryNode" />
+              <item name="static" type="462c0819:PsiDirectoryNode" />
+              <item name="shop" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
               <item name="tjshop" type="462c0819:PsiDirectoryNode" />
@@ -633,12 +642,12 @@
       <workItem from="1577240993676" duration="26945000" />
       <workItem from="1577418968701" duration="6485000" />
       <workItem from="1577706672203" duration="8957000" />
-      <workItem from="1577933633701" duration="1732000" />
+      <workItem from="1577933633701" duration="2494000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="164391000" />
+    <option name="totallyTimeSpent" value="165153000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -650,7 +659,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="180" y="39" width="1440" height="822" extended-state="0" />
+    <frame x="368" y="23" width="1440" height="822" extended-state="0" />
     <editor active="true" />
     <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" />
@@ -707,20 +716,6 @@
     </buildFile>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/SysLabelController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="494">
-          <caret line="56" column="34" lean-forward="false" selection-start-line="56" selection-start-column="34" selection-end-line="56" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/ShopConfigController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="262">
-          <caret line="54" column="36" lean-forward="false" selection-start-line="54" selection-start-column="36" selection-end-line="54" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/ShopConfigService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="192">
@@ -975,16 +970,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/shop/static/js/main.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="960">
-          <caret line="113" column="40" lean-forward="false" selection-start-line="113" selection-start-column="29" selection-end-line="113" selection-end-column="40" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/shop/src/main/resource/application-prod.properties">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="375">
@@ -1110,18 +1095,36 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/shop/static/style/shop.css">
+    <entry file="file://$PROJECT_DIR$/shop/static/images/erweimafooter.png">
+      <provider selected="true" editor-type-id="images">
+        <state />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/shop/static/images/erweima.png">
+      <provider selected="true" editor-type-id="images">
+        <state />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/shop/static/js/main.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="224">
-          <caret line="37" column="25" lean-forward="false" selection-start-line="37" selection-start-column="25" selection-end-line="37" selection-end-column="25" />
+        <state relative-caret-position="75">
+          <caret line="54" column="60" lean-forward="false" selection-start-line="54" selection-start-column="51" selection-end-line="54" selection-end-column="60" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/shop/static/style/nHeader.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="267">
-          <caret line="38" column="21" lean-forward="false" selection-start-line="38" selection-start-column="20" selection-end-line="38" selection-end-column="21" />
+        <state relative-caret-position="210">
+          <caret line="14" column="25" lean-forward="true" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/shop/static/style/shop.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="361">
+          <caret line="56" column="19" lean-forward="false" selection-start-line="56" selection-start-column="19" selection-end-line="56" selection-end-column="19" />
           <folding />
         </state>
       </provider>

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

@@ -9,31 +9,33 @@
 </head>
 
 <body>
-    <div th:fragment="setmeal" class="zskk-setmeal">
-      <div class="zskk-content">
-        <section class="zskk-title">
-          <span class="zskk-info" th:each="sysLabel: ${sysLabels}" th:text="${sysLabel.name}"></span>
-          <ul>
-            <li th:each="sysLabel: ${sysLabels}" th:text="${sysLabel.name}"></li>
-          </ul>
-        </section>
-        <section class="zskk-list" th:each="sysLabel: ${sysLabels}">
-          <a class="zskk-oneInfo" th:each="good: ${sysLabel.goods}"  th:attr="href='/good/detail/' + ${good.gid}">
-            <img th:attr="src=${good.icon}" alt="" />
-            <div class="zskk-name" th:text="${good.name}"></div>
-            <div class="zskk-price">
-              <div class="zskk-prices">
-                <span class="zskk-now-prices" th:text="'￥' + ${good.price.price}"></span>
-                <span class="zskk-original-prices" th:text="'￥' + ${good.price.discountPrice}"></span>
-              </div>
-              <div class="zskk-discount">
-                <span th:text="${good.price.discount} + '折'"></span>
-              </div>
+  <div th:fragment="setmeal" class="zskk-setmeal">
+    <div class="zskk-content">
+      <section class="zskk-title">
+        <span class="zskk-info" th:each="sysLabel: ${sysLabels}" th:text="${sysLabel.name}"></span>
+        <ul>
+          <li th:each="sysLabel: ${sysLabels}">
+            <a th:href="@{/shop(headkey=3, label=${label.id})}" th:text="${sysLabel.name}"></a>
+          </li>
+        </ul>
+      </section>
+      <section class="zskk-list" th:each="sysLabel: ${sysLabels}">
+        <a class="zskk-oneInfo" th:each="good: ${sysLabel.goods}" th:attr="href='/good/detail/' + ${good.gid}">
+          <img th:attr="src=${good.icon}" alt="" />
+          <div class="zskk-name" th:text="${good.name}"></div>
+          <div class="zskk-price">
+            <div class="zskk-prices">
+              <span class="zskk-now-prices" th:text="'￥' + ${good.price.price}"></span>
+              <span class="zskk-original-prices" th:text="'￥' + ${good.price.discountPrice}"></span>
             </div>
-          </a>
-        </section>
-      </div>
+            <div class="zskk-discount">
+              <span th:text="${good.price.discount} + '折'"></span>
+            </div>
+          </div>
+        </a>
+      </section>
     </div>
+  </div>
 </body>
 
 </html>

shop/static/js/main.js

@@ -52,7 +52,7 @@
 
 
 changeActive(0);
-$(".zskk-setmeal .zskk-content .zskk-title ul li").click(function() {
+$(".zskk-setmeal .zskk-content .zskk-title ul li").mouseover(function() {
     changeActive($(this).index());
 });
 

shop/static/style/nHeader.css

@@ -19,7 +19,7 @@ body,
 .zskk-box .zskk-header .zskk-weixin {
     display: flex;
     align-items: center;
-    border-right: 1px solid #a5a5a5;
+    /*border-right: 1px solid #a5a5a5;*/
     box-sizing: border-box;
     padding-right: 5px;
 }

shop/static/style/shop.css

@@ -54,6 +54,7 @@ By:Jayson
 	font-size: 15px;
 	color: #fff;
 	letter-spacing: 6px;
+	cursor:pointer;
 }
 .s-list ul li .add-cart button img {
 	height: 22px;