体检中心改版

.idea/workspace.xml

@@ -3,12 +3,10 @@
   <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/java/com/zskk/shop/controller/admin/DoctorManageController.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/DoctorManageController.java" />
-      <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java" />
-      <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/DoctorMapper.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/DoctorMapper.java" />
-      <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/DoctorService.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/DoctorService.java" />
-      <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/GoodService.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/GoodService.java" />
-      <change beforePath="$PROJECT_DIR$/shop/src/main/resource/mapper/DoctorMapper.xml" afterPath="$PROJECT_DIR$/shop/src/main/resource/mapper/DoctorMapper.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/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>
     <ignored path="$PROJECT_DIR$/shop/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -38,7 +36,7 @@
       <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="335">
+            <state relative-caret-position="405">
               <caret line="44" column="28" lean-forward="false" selection-start-line="44" selection-start-column="28" selection-end-line="44" selection-end-column="28" />
               <folding />
             </state>
@@ -48,7 +46,7 @@
       <file leaf-file-name="IndexController.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="401">
+            <state relative-caret-position="1845">
               <caret line="151" column="58" lean-forward="false" selection-start-line="151" selection-start-column="58" selection-end-line="151" selection-end-column="58" />
               <folding />
             </state>
@@ -78,8 +76,18 @@
       <file leaf-file-name="main.css" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/shop/static/style/main.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="217">
-              <caret line="293" column="16" lean-forward="false" selection-start-line="293" selection-start-column="16" selection-end-line="293" selection-end-column="16" />
+            <state relative-caret-position="326">
+              <caret line="299" column="1" lean-forward="false" selection-start-line="299" selection-start-column="1" selection-end-line="299" selection-end-column="1" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="main.js" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/shop/static/js/main.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="185">
+              <caret line="69" column="33" lean-forward="false" selection-start-line="69" selection-start-column="33" selection-end-line="69" selection-end-column="33" />
               <folding />
             </state>
           </provider>
@@ -88,17 +96,17 @@
       <file leaf-file-name="DoctorController.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/DoctorController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-16">
+            <state relative-caret-position="390">
               <caret line="43" column="46" lean-forward="false" selection-start-line="43" selection-start-column="46" selection-end-line="43" selection-end-column="46" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="DoctorManageController.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="DoctorManageController.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/DoctorManageController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="92">
+            <state relative-caret-position="201">
               <caret line="32" column="59" lean-forward="false" selection-start-line="32" selection-start-column="59" selection-end-line="32" selection-end-column="59" />
               <folding />
             </state>
@@ -108,9 +116,10 @@
       <file leaf-file-name="DoctorService.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/DoctorService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="169">
+            <state relative-caret-position="660">
               <caret line="69" column="5" lean-forward="false" selection-start-line="69" selection-start-column="5" selection-end-line="69" selection-end-column="5" />
               <folding>
+                <element signature="e#1287#1288#0" expanded="true" />
                 <element signature="e#1331#1332#0" expanded="true" />
               </folding>
             </state>
@@ -127,33 +136,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="GoodMapper.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/shop/src/main/resource/mapper/GoodMapper.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="439">
-              <caret line="42" column="21" lean-forward="false" selection-start-line="42" selection-start-column="17" selection-end-line="42" selection-end-column="21" />
-              <folding>
-                <marker date="1575454051197" expanded="true" signature="286:403" ph="select id, g... good_ad" />
-                <marker date="1575454051197" expanded="true" signature="489:613" ph="insert into good_ad... " />
-                <marker date="1575454051197" expanded="true" signature="702:795" ph="update good_ad... " />
-                <marker date="1575454051197" expanded="true" signature="834:868" ph="delete from good_ad... " />
-                <marker date="1575454051197" expanded="true" signature="928:1028" ph="select gid, " />
-                <marker date="1575454051197" expanded="true" signature="2615:2764" ph="insert into good_base... " />
-                <marker date="1575454051197" expanded="true" signature="2857:2979" ph="update good_base... " />
-                <marker date="1575454051197" expanded="true" signature="3020:3066" ph="update good_base... " />
-                <marker date="1575454051197" expanded="true" signature="3156:3246" ph="update good_base... " />
-                <marker date="1575454051197" expanded="true" signature="3308:3357" ph="select id, g... " />
-                <marker date="1575454051197" expanded="true" signature="3636:3767" ph="insert into good_describe... " />
-                <marker date="1575454051197" expanded="true" signature="3868:3969" ph="update good_describe... " />
-                <marker date="1575454051197" expanded="true" signature="4018:4060" ph="delete from good_describe... " />
-                <marker date="1575454051197" expanded="true" signature="4119:4228" ph="select id, g... " />
-                <marker date="1575454051197" expanded="true" signature="4489:4710" ph="INSERT INTO `good_price`... " />
-                <marker date="1575454051197" expanded="true" signature="4806:4967" ph="update good_price... " />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -166,7 +148,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>queryNextNew</find>
       <find>ALL_KEYS</find>
       <find>bigweixin</find>
       <find>queryAllOnlineDoctors</find>
@@ -196,6 +177,7 @@
       <find>.add</find>
       <find>queryAllGoodBases</find>
       <find>zskk-bg-</find>
+      <find>.swiper-slide .title</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -255,14 +237,14 @@
         <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" />
         <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/GoodService.java" />
         <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java" />
-        <option value="$PROJECT_DIR$/shop/static/style/main.css" />
         <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/DoctorService.java" />
         <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/DoctorManageController.java" />
+        <option value="$PROJECT_DIR$/shop/static/style/main.css" />
+        <option value="$PROJECT_DIR$/shop/static/js/main.js" />
       </list>
     </option>
   </component>
@@ -292,10 +274,10 @@
     <handled-path value="$PROJECT_DIR$/shop/static/manager/node_modules" />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-79" />
-    <option name="y" value="40" />
+    <option name="x" value="120" />
+    <option name="y" value="32" />
     <option name="width" value="1440" />
-    <option name="height" value="822" />
+    <option name="height" value="823" />
   </component>
   <component name="ProjectView">
     <navigator currentView="ProjectPane" proportions="" version="1">
@@ -312,121 +294,43 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scratches" />
-      <pane id="ProjectPane">
+      <pane id="PackagesPane">
         <subPane>
           <expand>
             <path>
-              <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tjshop" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tjshop" 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" />
-            </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" />
-            </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" />
-            </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" />
-            </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" />
-            </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" />
-            </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="tjshop" type="58d84e3e:PackageViewProjectNode" />
+              <item name="shop" type="616d4139:PackageViewModuleNode" />
             </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="Scratches" />
+      <pane id="Scope" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
             <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="admin" 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" />
               <item name="shop" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resource" 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" />
@@ -439,18 +343,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
-      <pane id="PackagesPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="tjshop" type="58d84e3e:PackageViewProjectNode" />
-              <item name="shop" type="616d4139:PackageViewModuleNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -637,11 +529,14 @@
       <workItem from="1577706672203" duration="8957000" />
       <workItem from="1577933633701" duration="3198000" />
       <workItem from="1579068546792" duration="1909000" />
+      <workItem from="1579073948519" duration="1104000" />
+      <workItem from="1579153318820" duration="21000" />
+      <workItem from="1579242767300" duration="1179000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="167766000" />
+    <option name="totallyTimeSpent" value="170070000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -653,7 +548,8 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-79" y="40" width="1440" height="822" extended-state="0" />
+    <frame x="120" y="32" width="1440" height="823" 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" />
       <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" />
@@ -672,11 +568,11 @@
       <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="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="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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.35900962" sideWeight="0.5243205" order="2" 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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22889842" 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="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="Theme Preview" 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" />
@@ -713,15 +609,6 @@
       <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" />
-          <folding>
-            <marker date="1576638286353" expanded="true" signature="384:479" ph="select from equipment" />
-            <marker date="1576638286353" expanded="true" signature="578:690" ph="select from equipment" />
-            <marker date="1576638286353" expanded="true" signature="785:861" ph="select from equipment" />
-            <marker date="1576638286353" expanded="true" signature="955:1030" ph="select from equipment" />
-            <marker date="1576638286353" expanded="true" signature="1124:1305" ph="insert into equipment... " />
-            <marker date="1576638286353" expanded="true" signature="1400:1529" ph="update equipment... " />
-            <marker date="1576638286353" expanded="true" signature="1618:1670" ph="update equipment... " />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -729,26 +616,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="74">
           <caret line="37" column="24" lean-forward="false" selection-start-line="37" selection-start-column="24" selection-end-line="37" selection-end-column="24" />
-          <folding>
-            <marker date="1577067523851" expanded="true" signature="279:304" ph="select * fro... new_label" />
-            <marker date="1577067523851" expanded="true" signature="279:322" ph="select * fro... new_label" />
-            <marker date="1577067523851" expanded="true" signature="409:451" ph="select * fro... new_label" />
-            <marker date="1577067523851" expanded="true" signature="409:469" ph="select * fro... new_label" />
-            <marker date="1577067523851" expanded="true" signature="557:599" ph="select * fro... new_label" />
-            <marker date="1577067523851" expanded="true" signature="742:838" ph="insert into new_label... " />
-            <marker date="1577067523851" expanded="true" signature="928:1006" ph="update new_label... " />
-            <marker date="1577067523851" expanded="true" signature="1045:1089" ph="update new_label... " />
-            <marker date="1577067523851" expanded="true" signature="1178:1230" ph="update new_label... " />
-            <marker date="1577067523851" expanded="true" signature="1318:1403" ph="select sl.* new_type" />
-            <marker date="1577067523851" expanded="true" signature="1318:1425" ph="select nl.* new_type" />
-            <marker date="1577067523851" expanded="true" signature="1514:1585" ph="insert into new_type... " />
-            <marker date="1577067523851" expanded="true" signature="1627:1664" ph="delete from new_type... " />
-            <marker date="1577067523851" expanded="true" signature="1755:1816" ph="select id, g... good_label" />
-            <marker date="1577067523851" expanded="true" signature="1915:2018" ph="select sl.* good_label" />
-            <marker date="1577067523851" expanded="true" signature="2131:2212" ph="insert into good_label... " />
-            <marker date="1577067523851" expanded="true" signature="2277:2316" ph="delete from good_label... " />
-            <marker date="1577067523851" expanded="true" signature="2380:2419" ph="delete from good_label... " />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -763,15 +630,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="203">
           <caret line="17" column="25" lean-forward="false" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
-          <folding>
-            <marker date="1579070222599" expanded="true" signature="387:495" ph="select from doctor" />
-            <marker date="1579070222599" expanded="true" signature="591:683" ph="select from doctor" />
-            <marker date="1579070222599" expanded="true" signature="772:845" ph="select from doctor" />
-            <marker date="1579070222599" expanded="true" signature="933:1005" ph="select from doctor" />
-            <marker date="1579070222599" expanded="true" signature="1093:1306" ph="insert into doctor... " />
-            <marker date="1579070222599" expanded="true" signature="1395:1554" ph="update doctor... " />
-            <marker date="1579070222599" expanded="true" signature="1640:1689" ph="update doctor... " />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -833,14 +691,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="450">
           <caret line="30" column="26" lean-forward="false" selection-start-line="30" selection-start-column="26" selection-end-line="30" selection-end-column="26" />
-          <folding>
-            <marker date="1577354540409" expanded="true" signature="241:334" ph="select id, n... " />
-            <marker date="1577354540409" expanded="true" signature="420:646" ph="select n.* f... new" />
-            <marker date="1577354540409" expanded="true" signature="734:964" ph="select n.* f... new" />
-            <marker date="1577354540409" expanded="true" signature="3476:3697" ph="insert into new... " />
-            <marker date="1577354540409" expanded="true" signature="3788:4006" ph="update good_base... " />
-            <marker date="1577354540409" expanded="true" signature="4046:4084" ph="update new... " />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -897,7 +747,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="375">
           <caret line="25" column="37" lean-forward="false" selection-start-line="25" selection-start-column="37" selection-end-line="25" selection-end-column="37" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -905,7 +754,6 @@
       <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" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -934,7 +782,6 @@
       <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" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -949,7 +796,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="15">
           <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -957,7 +803,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="195">
           <caret line="30" column="14" lean-forward="false" selection-start-line="30" selection-start-column="14" selection-end-line="30" selection-end-column="14" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -965,7 +810,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="240">
           <caret line="42" column="14" lean-forward="false" selection-start-line="42" selection-start-column="14" selection-end-line="42" selection-end-column="14" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -973,7 +817,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="585">
           <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>
@@ -986,7 +829,6 @@
       <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>
@@ -1000,19 +842,10 @@
         <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="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="210">
           <caret line="14" column="25" lean-forward="false" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1020,7 +853,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1718">
           <caret line="48" column="24" lean-forward="false" selection-start-line="48" selection-start-column="24" selection-end-line="48" selection-end-column="24" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1028,10 +860,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="249">
           <caret line="55" column="31" lean-forward="true" selection-start-line="55" selection-start-column="31" selection-end-line="55" selection-end-column="31" />
-          <folding>
-            <element signature="e#1437#1438#0" expanded="false" />
-            <element signature="e#1497#1498#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1039,7 +867,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="285">
           <caret line="28" column="44" lean-forward="false" selection-start-line="28" selection-start-column="27" selection-end-line="28" selection-end-column="44" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1047,13 +874,12 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="234">
           <caret line="54" column="43" lean-forward="false" selection-start-line="54" selection-start-column="26" selection-end-line="54" selection-end-column="43" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/shop/src/main/resource/mapper/GoodMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="439">
+        <state relative-caret-position="630">
           <caret line="42" column="21" lean-forward="false" selection-start-line="42" selection-start-column="17" selection-end-line="42" selection-end-column="21" />
           <folding>
             <marker date="1575454051197" expanded="true" signature="286:403" ph="select id, g... good_ad" />
@@ -1078,7 +904,7 @@
     </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="335">
+        <state relative-caret-position="405">
           <caret line="44" column="28" lean-forward="false" selection-start-line="44" selection-start-column="28" selection-end-line="44" selection-end-column="28" />
           <folding />
         </state>
@@ -1094,7 +920,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="401">
+        <state relative-caret-position="1845">
           <caret line="151" column="58" lean-forward="false" selection-start-line="151" selection-start-column="58" selection-end-line="151" selection-end-column="58" />
           <folding />
         </state>
@@ -1116,17 +942,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/shop/static/style/main.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="217">
-          <caret line="293" column="16" lean-forward="false" selection-start-line="293" selection-start-column="16" selection-end-line="293" selection-end-column="16" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/DoctorController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-16">
+        <state relative-caret-position="390">
           <caret line="43" column="46" lean-forward="false" selection-start-line="43" selection-start-column="46" selection-end-line="43" selection-end-column="46" />
           <folding />
         </state>
@@ -1134,9 +952,10 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/DoctorService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="169">
+        <state relative-caret-position="660">
           <caret line="69" column="5" lean-forward="false" selection-start-line="69" selection-start-column="5" selection-end-line="69" selection-end-column="5" />
           <folding>
+            <element signature="e#1287#1288#0" expanded="true" />
             <element signature="e#1331#1332#0" expanded="true" />
           </folding>
         </state>
@@ -1144,12 +963,28 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/DoctorManageController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="92">
+        <state relative-caret-position="201">
           <caret line="32" column="59" lean-forward="false" selection-start-line="32" selection-start-column="59" selection-end-line="32" selection-end-column="59" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/shop/static/style/main.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="326">
+          <caret line="299" column="1" lean-forward="false" selection-start-line="299" selection-start-column="1" selection-end-line="299" selection-end-column="1" />
+          <folding />
+        </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="185">
+          <caret line="69" column="33" lean-forward="false" selection-start-line="69" selection-start-column="33" selection-end-line="69" selection-end-column="33" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

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

@@ -18,7 +18,7 @@
           <div class="swiper-service">
             <div class="swiper-wrapper" id="zskk-service">
               <div class="swiper-slide" th:each="equipment, row: ${equipments}">
-                <div th:attrappend="class=' zskk-bg-' + ${row.index % 6}" class="title" th:text="${equipment.title}"></div>
+                <div class="title" th:text="${equipment.title}"></div>
                 <img th:attr="src=${equipment.icon}" alt="" />
               </div>
             </div>

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

@@ -17,6 +17,9 @@
           <li th:each="sysLabel: ${sysLabels}">
             <a th:href="@{/shop(headkey=3, label=${sysLabel.id})}" th:text="${sysLabel.name}"></a>
           </li>
+          <li >
+            <a href="/shop?headkey=3" >更多...</a>
+          </li>
         </ul>
       </section>
       <section class="zskk-list" th:each="sysLabel: ${sysLabels}">

shop/static/js/main.js

@@ -56,30 +56,37 @@ $(".zskk-setmeal .zskk-content .zskk-title ul li").mouseover(function() {
     changeActive($(this).index());
 });
 
-function changeActive(index) {
-    $(".zskk-setmeal .zskk-content .zskk-title ul li").removeClass("zskk-active");
-    $(".zskk-setmeal .zskk-content .zskk-title ul li")
+function changeActive(index, a,b,c) {
+    var ul_li = $(".zskk-setmeal .zskk-content .zskk-title ul li");
+    if(index == ul_li.length - 1) {
+        return
+    }
+    var zskk_info = $(".zskk-setmeal .zskk-content .zskk-title .zskk-info");
+    var zskk_list = $(".zskk-setmeal .zskk-content .zskk-list");
+    var zskk_list_not = $(".zskk-setmeal .zskk-content .zskk-list-not");
+    ul_li.removeClass("zskk-active");
+    ul_li
         .eq(index)
         .addClass("zskk-active");
 
-    $(".zskk-setmeal .zskk-content .zskk-title .zskk-info").css(
+    zskk_info.css(
         "display",
         "none"
     );
-    $(".zskk-setmeal .zskk-content .zskk-title .zskk-info")
+    zskk_info
         .eq(index)
         .css("display", "flex");
-    $(".zskk-setmeal .zskk-content .zskk-list").css("display", "none");
-    $(".zskk-setmeal .zskk-content .zskk-list")
+    zskk_list.css("display", "none");
+    zskk_list
         .eq(index)
         .css("display", "flex");
-    const lengthList = $(".zskk-setmeal .zskk-content .zskk-list")
+    const lengthList = zskk_list
         .eq(index)
         .children(".zskk-oneInfo").length;
     if (lengthList === 0) {
-        $(".zskk-setmeal .zskk-content .zskk-list-not").css("display", "flex");
+        zskk_list_not.css("display", "flex");
     } else {
-        $(".zskk-setmeal .zskk-content .zskk-list-not").css("display", "none");
+        zskk_list_not.css("display", "none");
     }
 }
 
@@ -118,14 +125,14 @@ function bannerChange(activeIndex) {
                 .css("left", "");
             $(element)
                 .find("div")
-                .css({ right: 0, "border-radius": "0 5px 5px 0" });
+                .css({ right: 0 });
         } else {
             $(element)
                 .find("div")
                 .css("right", "");
             $(element)
                 .find("div")
-                .css({ left: 0, "border-radius": "5px 0 0 5px" });
+                .css({ left: 0 });
         }
     });
 }

shop/static/style/main.css

@@ -286,17 +286,17 @@ span {
 }
 .zskk-box .zskk-service .swiper-slide .title {
     position: absolute;
-    height: 100%;
-    width: 90px;
-    background: rgb(160, 15, 2, 0.7);
-    border-radius: 5px 0 0 5px;
+    bottom: 0px;
+    height: 50px;
+    width: 100%;
+    background: rgba(0, 0, 0, 0.6);
+    border-radius: 0 0 5px 5px;
     color: #fff;
-    font-size: 30px;
-    line-height: 40px;
+    font-size: 15px;
+    line-height: 50px;
     display: flex;
     justify-content: center;
     align-items: center;
-    writing-mode: tb-rl;
 }
 
 .zskk-box .zskk-service .swiper-slide .zskk-bg-0{