Browse Source

修改样式

fuyu 5 years ago
parent
commit
713316c580
2 changed files with 4 additions and 5 deletions
  1. 2 3
      .idea/workspace.xml
  2. 2 2
      shop/src/main/resource/templates/template_setmeal.html

+ 2 - 3
.idea/workspace.xml

@@ -2,8 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="2054d288-d3d9-47a2-840a-057f9d2a0c35" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/shop/static/style/nHeader.css" beforeDir="false" afterPath="$PROJECT_DIR$/shop/static/style/nHeader.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/template_setmeal.html" beforeDir="false" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/template_setmeal.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -206,7 +205,7 @@
       <workItem from="1585628259581" duration="1403000" />
       <workItem from="1585706005737" duration="789000" />
       <workItem from="1585792990603" duration="197000" />
-      <workItem from="1585812151059" duration="10000" />
+      <workItem from="1585812151059" duration="232000" />
     </task>
     <servers />
   </component>

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

@@ -28,8 +28,8 @@
           <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>
+              <span class="zskk-now-prices" th:text="'¥' + ${good.price.discountPrice}"></span>
+              <span class="zskk-original-prices" th:text="'¥' + ${good.price.price}"></span>
             </div>
             <div class="zskk-discount">
               <span th:text="${good.price.discount} + '折'"></span>