x

.idea/workspace.xml

@@ -3,7 +3,11 @@
   <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/static/style/common.css" afterPath="$PROJECT_DIR$/shop/static/style/common.css" />
+      <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/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" />
@@ -40,91 +44,91 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="logback-spring-dev.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/shop/src/main/resource/logback-spring-dev.xml">
+      <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="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+            <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" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="application-test.properties" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/shop/src/main/resource/application-test.properties">
+      <file leaf-file-name="common.css" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/shop/static/style/common.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="12" column="37" lean-forward="false" selection-start-line="12" selection-start-column="27" selection-end-line="12" selection-end-column="37" />
+            <state relative-caret-position="15">
+              <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
               <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">
+      <file leaf-file-name="user.css" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/shop/static/style/user.css">
           <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="105">
+              <caret line="7" column="46" lean-forward="false" selection-start-line="7" selection-start-column="46" selection-end-line="7" selection-end-column="46" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="common.css" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/shop/static/style/common.css">
+      <file leaf-file-name="shop.css" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/shop/static/style/shop.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="15">
-              <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
+            <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" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="nHeader.css" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/shop/static/style/nHeader.css">
+      <file leaf-file-name="GoodController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/GoodController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="30">
-              <caret line="2" column="11" lean-forward="true" selection-start-line="2" selection-start-column="11" selection-end-line="8" selection-end-column="23" />
+            <state relative-caret-position="287">
+              <caret line="38" column="14" lean-forward="true" selection-start-line="38" selection-start-column="14" selection-end-line="38" selection-end-column="14" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="dev.env.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/shop/static/manager/config/dev.env.js">
+      <file leaf-file-name="TJCallbackController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/api/TJCallbackController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+            <state relative-caret-position="195">
+              <caret line="30" column="14" lean-forward="true" selection-start-line="30" selection-start-column="14" selection-end-line="30" selection-end-column="14" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="prod.env.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/shop/static/manager/config/prod.env.js">
+      <file leaf-file-name="ApiController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/api/ApiController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="60">
-              <caret line="4" column="36" lean-forward="false" selection-start-line="4" selection-start-column="36" selection-end-line="4" selection-end-column="36" />
+            <state relative-caret-position="213">
+              <caret line="42" column="14" lean-forward="true" selection-start-line="42" selection-start-column="14" selection-end-line="42" selection-end-column="14" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="index.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/shop/static/manager/config/index.js">
+      <file leaf-file-name="BuyOrderController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/BuyOrderController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+            <state relative-caret-position="163">
+              <caret line="79" column="30" lean-forward="false" selection-start-line="79" selection-start-column="22" selection-end-line="79" selection-end-column="30" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="application.properties" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/shop/src/main/resource/application.properties">
+      <file leaf-file-name="nHeader.css" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/shop/static/style/nHeader.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="270">
-              <caret line="18" column="6" lean-forward="false" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
+            <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" />
               <folding />
             </state>
           </provider>
@@ -142,10 +146,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>url</find>
-      <find>isSelect</find>
-      <find>PageBean</find>
-      <find>key</find>
       <find>islogin</find>
       <find>type</find>
       <find>queryNewBase</find>
@@ -172,6 +172,10 @@
       <find>phone</find>
       <find>zskk-phone</find>
       <find>zskk-label</find>
+      <find>u2</find>
+      <find>tjorders</find>
+      <find>subnav l mt20</find>
+      <find>list-style-type:none;</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -188,7 +192,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/bean/EquipmentBean.java" />
         <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/EquipmentController.java" />
         <option value="$PROJECT_DIR$/shop/src/main/resource/mapper/EquipmentMapper.xml" />
         <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/EquipmentMapper.java" />
@@ -224,7 +227,6 @@
         <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" />
         <option value="$PROJECT_DIR$/shop/src/main/resource/mapper/NewMapper.xml" />
-        <option value="$PROJECT_DIR$/shop/static/style/shop.css" />
         <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/AbstractController.java" />
         <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/GoodController.java" />
         <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java" />
@@ -239,6 +241,8 @@
         <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/style/shop.css" />
       </list>
     </option>
   </component>
@@ -268,8 +272,8 @@
     <handled-path value="$PROJECT_DIR$/shop/static/manager/node_modules" />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-21" />
-    <option name="y" value="23" />
+    <option name="x" value="180" />
+    <option name="y" value="39" />
     <option name="width" value="1440" />
     <option name="height" value="822" />
   </component>
@@ -362,6 +366,44 @@
               <item name="zskk" type="462c0819:PsiDirectoryNode" />
               <item name="shop" 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="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="zskk" type="462c0819:PsiDirectoryNode" />
+              <item name="shop" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" 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="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="zskk" type="462c0819:PsiDirectoryNode" />
+              <item name="shop" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
+              <item name="api" 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="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="zskk" type="462c0819:PsiDirectoryNode" />
+              <item name="shop" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
+              <item name="pc" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
               <item name="tjshop" type="462c0819:PsiDirectoryNode" />
@@ -591,12 +633,12 @@
       <workItem from="1577240993676" duration="26945000" />
       <workItem from="1577418968701" duration="6485000" />
       <workItem from="1577706672203" duration="8957000" />
-      <workItem from="1577933633701" duration="662000" />
+      <workItem from="1577933633701" duration="1732000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="163321000" />
+    <option name="totallyTimeSpent" value="164391000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -608,7 +650,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-21" y="23" width="1440" height="822" extended-state="0" />
+    <frame x="180" y="39" 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" />
@@ -665,34 +707,6 @@
     </buildFile>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/NewLabelService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="209">
-          <caret line="46" column="38" lean-forward="false" selection-start-line="46" selection-start-column="26" selection-end-line="46" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/bean/PageBean.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="28" column="0" lean-forward="true" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/bean/BottomPageBean.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="16" column="31" lean-forward="false" selection-start-line="16" selection-start-column="19" selection-end-line="16" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/ManagerUserController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="28" column="13" lean-forward="false" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <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">
@@ -891,13 +905,6 @@
         </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="840">
-          <caret line="56" column="15" lean-forward="false" selection-start-line="56" selection-start-column="15" selection-end-line="56" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/AbstractController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1710">
@@ -919,13 +926,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/BuyOrderController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="123">
-          <caret line="64" column="37" lean-forward="false" selection-start-line="64" selection-start-column="37" selection-end-line="64" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/bean/GoodDescribeBean.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="270">
@@ -947,13 +947,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/GoodController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="510">
-          <caret line="51" column="80" lean-forward="false" selection-start-line="51" selection-start-column="71" selection-end-line="51" selection-end-column="80" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/shop/static/style/setmeal.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="3450">
@@ -1064,18 +1057,71 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/shop/static/style/nHeader.css">
+    <entry file="file://$PROJECT_DIR$/shop/static/style/common.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="11" lean-forward="true" selection-start-line="2" selection-start-column="11" selection-end-line="8" selection-end-column="23" />
+        <state relative-caret-position="15">
+          <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/shop/static/style/common.css">
+    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/GoodController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
+        <state relative-caret-position="287">
+          <caret line="38" column="14" lean-forward="true" selection-start-line="38" selection-start-column="14" selection-end-line="38" selection-end-column="14" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/api/TJCallbackController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="30" column="14" lean-forward="true" selection-start-line="30" selection-start-column="14" selection-end-line="30" selection-end-column="14" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/api/ApiController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="213">
+          <caret line="42" column="14" lean-forward="true" selection-start-line="42" selection-start-column="14" selection-end-line="42" selection-end-column="14" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/BuyOrderController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="163">
+          <caret line="79" column="30" lean-forward="false" selection-start-line="79" selection-start-column="22" selection-end-line="79" selection-end-column="30" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/shop/static/style/u_subnav_icon.fw.png">
+      <provider selected="true" editor-type-id="images">
+        <state />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/shop/static/style/user.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="7" column="46" lean-forward="false" selection-start-line="7" selection-start-column="46" selection-end-line="7" selection-end-column="46" />
+          <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="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" />
+          <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" />
           <folding />
         </state>
       </provider>

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

@@ -24,7 +24,7 @@
 			<ul class="subnav l mt20">
 				<li class="u2"><a href="/mypayedorders">预约体检</a></li>
 				<li class="u3"><a href="/completedorders">报告查询</a></li>
-				<li class="u3"><a href="/family/list" class="ca">家人管理</a></li>
+				<li class="u3"><a href="/family/list">家人管理</a></li>
 				<li class="u6"><a href="/fqa" class="ca">常见问题</a></li>
 				<li class="u7"><a th:attr="href=${ucweb} + '#/resetPwd'"
 					target="_blank">修改密码</a></li>

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

@@ -35,7 +35,9 @@
     </div>
     <div class="zskk-titleNav">
       <section class="zskk-title">
-        <img src="/images/logo.jpg" alt="" />
+        <a href="/?headkey=1">
+          <img src="/images/logo.jpg" alt="" />
+        </a>
       </section>
       <section class="zskk-nav">
         <ul>

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

@@ -1,79 +1,87 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>黑龙江昆仑盛和安体检中心</title>
-<link rel="stylesheet" type="text/css" href="/style/common.css"></link>
-<link rel="stylesheet" type="text/css" href="/style/user.css"></link>
-<link rel="icon" href="/images/favicon.ico" type="image/x-icon"/>
-<link rel="stylesheet" href="/style/nHeader.css" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>黑龙江昆仑盛和安体检中心</title>
+  <link rel="stylesheet" type="text/css" href="/style/common.css"></link>
+  <link rel="stylesheet" type="text/css" href="/style/user.css"></link>
+  <link rel="icon" href="/images/favicon.ico" type="image/x-icon" />
+  <link rel="stylesheet" href="/style/nHeader.css" />
 
-<!--[if lt IE 9]> 
+  <!--[if lt IE 9]> 
 <script src="http://css3-mediaqueries-js.googlecode.com/svn/trunk/css3-mediaqueries.js"></script> 
-<![endif]--><!--窗口自适应适配低端IE-->
-<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
+<![endif]-->
+  <!--窗口自适应适配低端IE-->
+  <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
 </head>
 
 <body>
-<div class="zskk-box">
-	<div th:include="/fragments :: header"></div>
-	
+  <div class="zskk-box">
+    <div th:include="/fragments :: header"></div>
+
     <div class="wp">
-    	<div class="main bgFF">
-            <ul class="subnav l mt20">
-                <li class="u2"><a href="/mypayedorders" class="ca">预约体检</a></li>
-                <li class="u3"><a href="/tjorders">报告查询</a></li>
-                <li class="u3"><a href="/family/list">家人管理</a></li>
-                <li class="u6"><a href="/fqa">常见问题</a></li>
-                <li class="u7"><a th:attr="href=${ucweb} + '#/resetPwd'" target="_blank">修改密码</a></li>
-                <li class="u8"><a th:href="'javascript:login_out(\'' + ${uccenter} + 'login/loginout?redirect=' + ${outredirect} + '\')'">退出登录</a></li>
-                <!-- <li class="u8"><a href="javascript:login_out('ff')">退出登录</a></li>  -->
-            </ul>
-            <div class="l" style="width:80%; ">
-                <div class="f12 c999 mt20">请选择已购套餐项 *</div>
-                <div th:if="${orders.size() eq 0}">
-                    <table class="tab-1-EEE mt20">
-                        <tr>
-                            <td><div class="u-ready-none"><img src="/style/list_none.png" /><p>暂无有效订单，请选择 <a href="/">体检套餐</a></p></div></td>
-                        </tr>
-                    </table>
-                </div>
-                <table class="tab-1-EEE mt20" th:each="order : ${orders}">
-                    <thead>
-                        <tr>
-                            <td>购买日期：
-                            	<span th:text="${order.ctime}"></span>
-                            	<span class="y cOrange"><span th:text="${order.etime}"></span>前使用</span>
-                            </td>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr th:each="item : ${order.items}">
-                            <td>
-                            	<div class="l">
-                            		<strong class="f12" th:text="${item.good.name}"></strong>
-                            		<div class="cBlue mt10" th:if="${item.fa == null}">适应人群：<span>*</span></div>
-                            		<div class="cBlue mt10" th:if="${item.fa != null}" >体检人：<span th:text="${item.fa.name}"></span> 预约日期：<span th:text="${item.fa.atime + ' ' + item.fa.extend}"></span></div>
-                            	</div>
-                            	<a th:if="${item.fa == null}" th:attr="href='/appointment/goappointment/'+${item.bid}+'/'+${item.id}" class="btn-blue y" >预约体检</a>
-                            	<a th:if="${item.fa != null and item.fa.tjstatus eq -3}" href="#" class="btn-blue y" >已退款</a>
-                            	<a th:if="${item.fa != null and item.fa.tjstatus eq -2}" href="#" class="btn-blue y" >已取消</a>
-                            	<a th:if="${item.fa != null and item.fa.tjstatus eq -1}" th:attr="href='/appointment/gochangeappointment/'+${item.fa.aid}" class="btn-blue y" >改约</a>
-                            	<a th:if="${item.fa != null and item.fa.tjstatus eq 0}" href="#" class="btn-blue y" >已登记</a>
-                            	<a th:if="${item.fa != null and item.fa.tjstatus eq 1}" href="#" class="btn-blue y" >报告生成中</a>
-                            	<a th:if="${item.fa != null and item.fa.tjstatus eq 4}" href="#" class="btn-blue y" >报告生成中</a>
-                            	<a th:if="${item.fa != null and item.fa.tjstatus eq 5}" href="#" class="btn-blue y" >报告生成中</a>
-                            	<a th:if="${item.fa != null and item.fa.tjstatus eq 7}" href="#" class="btn-blue y" >报告生成中</a>
-                            	<a th:if="${item.fa != null and item.fa.tjstatus eq 2}" th:attr="href=${item.fa.reportUrl}" class="btn-blue y" target="_blank" >查看报告</a>
-                            	<a th:if="${item.fa != null and item.fa.tjstatus eq 6}" th:attr="href=${item.fa.reportUrl}" class="btn-blue y" target="_blank" >查看报告</a>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
+      <div class="main bgFF">
+        <ul class="subnav l mt20">
+          <li class="u2"><a href="/mypayedorders" class="ca">预约体检</a></li>
+          <li class="u3"><a href="/tjorders">报告查询</a></li>
+          <li class="u3"><a href="/family/list">家人管理</a></li>
+          <li class="u6"><a href="/fqa">常见问题</a></li>
+          <li class="u7"><a th:attr="href=${ucweb} + '#/resetPwd'" target="_blank">修改密码</a></li>
+          <li class="u8"><a th:attr="href=${uccenter} + 'login/loginout?redirect=' + ${outredirect}">退出登录</a></li>
+          <!-- <li class="u8"><a th:href="'javascript:login_out(\'' + ${uccenter} + 'login/loginout?redirect=' + ${outredirect} + '\')'">退出登录</a></li> -->
+          <!-- <li class="u8"><a href="javascript:login_out('ff')">退出登录</a></li>  -->
+        </ul>
+        <div class="l" style="width:80%; ">
+          <div class="f12 c999 mt20">请选择已购套餐项 *</div>
+          <div th:if="${orders.size() eq 0}">
+            <table class="tab-1-EEE mt20">
+              <tr>
+                <td>
+                  <div class="u-ready-none"><img src="/style/list_none.png" />
+                    <p>暂无有效订单，请选择 <a href="/">体检套餐</a></p>
+                  </div>
+                </td>
+              </tr>
+            </table>
+          </div>
+          <table class="tab-1-EEE mt20" th:each="order : ${orders}">
+            <thead>
+              <tr>
+                <td>购买日期：
+                  <span th:text="${order.ctime}"></span>
+                  <span class="y cOrange"><span th:text="${order.etime}"></span>前使用</span>
+                </td>
+              </tr>
+            </thead>
+            <tbody>
+              <tr th:each="item : ${order.items}">
+                <td>
+                  <div class="l">
+                    <strong class="f12" th:text="${item.good.name}"></strong>
+                    <div class="cBlue mt10" th:if="${item.fa == null}">适应人群：<span>*</span></div>
+                    <div class="cBlue mt10" th:if="${item.fa != null}">体检人：<span th:text="${item.fa.name}"></span> 预约日期：<span th:text="${item.fa.atime + ' ' + item.fa.extend}"></span></div>
+                  </div>
+                  <a th:if="${item.fa == null}" th:attr="href='/appointment/goappointment/'+${item.bid}+'/'+${item.id}" class="btn-blue y">预约体检</a>
+                  <a th:if="${item.fa != null and item.fa.tjstatus eq -3}" href="#" class="btn-blue y">已退款</a>
+                  <a th:if="${item.fa != null and item.fa.tjstatus eq -2}" href="#" class="btn-blue y">已取消</a>
+                  <a th:if="${item.fa != null and item.fa.tjstatus eq -1}" th:attr="href='/appointment/gochangeappointment/'+${item.fa.aid}" class="btn-blue y">改约</a>
+                  <a th:if="${item.fa != null and item.fa.tjstatus eq 0}" href="#" class="btn-blue y">已登记</a>
+                  <a th:if="${item.fa != null and item.fa.tjstatus eq 1}" href="#" class="btn-blue y">报告生成中</a>
+                  <a th:if="${item.fa != null and item.fa.tjstatus eq 4}" href="#" class="btn-blue y">报告生成中</a>
+                  <a th:if="${item.fa != null and item.fa.tjstatus eq 5}" href="#" class="btn-blue y">报告生成中</a>
+                  <a th:if="${item.fa != null and item.fa.tjstatus eq 7}" href="#" class="btn-blue y">报告生成中</a>
+                  <a th:if="${item.fa != null and item.fa.tjstatus eq 2}" th:attr="href=${item.fa.reportUrl}" class="btn-blue y" target="_blank">查看报告</a>
+                  <a th:if="${item.fa != null and item.fa.tjstatus eq 6}" th:attr="href=${item.fa.reportUrl}" class="btn-blue y" target="_blank">查看报告</a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
         </div>
+      </div>
     </div>
     <div th:replace="/fragments :: footer"></div>
-    </div>
+  </div>
 </body>
-</html>
+
+</html>

shop/static/style/shop.css

@@ -35,6 +35,7 @@ By:Jayson
 
 .s-list ul li {
 	margin: 0px 16px 20px 0;
+	list-style-type:none;
 }
 .s-list ul li .add-cart {
 	display: flex;

shop/static/style/user.css

@@ -5,7 +5,7 @@ By:Jayson
 
 /*后台导航*/
 .subnav{ width:20%; padding-bottom:40px; }
-.subnav li{ height:40px; }
+.subnav li{ height:40px; list-style-type:none; }
 .subnav .u1 a, .subnav .u2 a, .subnav .u3 a, .subnav .u4 a, .subnav .u5 a, .subnav .u6 a, .subnav .u7 a, .subnav .u8 a, .subnav .u1 a.ca, .subnav .u2 a.ca, .subnav .u3 a.ca, .subnav .u4 a.ca, .subnav .u5 a.ca, .subnav .u6 a.ca, .subnav .u7 a.ca, .subnav .u8 a.ca{ display:inline-block; height:40px; line-height:40px; padding-left:32px; font-size:14px; color:#666; background:url(u_subnav_icon.fw.png) no-repeat; }
 .subnav .u1 a{ background-position:0 0; }
 .subnav .u2 a{ background-position:0 -40px; }