李楠 4 years ago
parent
commit
f376836e31
3 changed files with 8 additions and 22 deletions
  1. 1 1
      src/assets/css/reset.scss
  2. 1 1
      src/components/HyHeader.vue
  3. 6 20
      src/views/Butcher/Butcher.vue

+ 1 - 1
src/assets/css/reset.scss

@@ -8,5 +8,5 @@ html,body,#app{
     height: 100%;
     // width: 4670px;
     // height: 1751px;
-    overflow: hidden;
+    // overflow: hidden;
 }

+ 1 - 1
src/components/HyHeader.vue

@@ -53,7 +53,7 @@ export default {
 
 <style scoped lang="scss">
 header {
-    height: 133px;
+    height: 132px;
     width: 100%;
     display: flex;
     justify-content: space-between;

+ 6 - 20
src/views/Butcher/Butcher.vue

@@ -14,7 +14,7 @@
                             <th>价格</th>
                             <th>市场</th>
                         </tr>
-                        <tr v-for="item in sheepPriceList" :key="item">
+                        <tr v-for="item in sheepPriceList" :key="item.site">
                             <td>{{ item.description }}</td>
                             <td>
                                 {{ item.price }}元/公斤
@@ -264,26 +264,9 @@ export default {
     height: 100%;
     display: flex;
     flex-direction: column;
-    > header {
-        height: 180px;
-        display: flex;
-        justify-content: center;
-        .title {
-            // border: 1px solid rgb(218, 99, 99);
-            background: url(../../assets/bg_header.png) no-repeat;
-            background-size: 100% 100%;
-            width: 80%;
-            height: 100%;
-            font-size: 50px;
-            line-height: 110px;
-            color: #fff;
-            display: flex;
-            justify-content: center;
-        }
-    }
+    overflow: hidden;
     > section {
         flex-grow: 1;
-        height: 61%;
         display: flex;
         > aside {
             display: flex;
@@ -357,6 +340,7 @@ export default {
                         &::before {
                             content: "";
                             border: 1px solid #4b81ec;
+                            box-sizing: border-box;
                             height: 0px;
                             flex-grow: 1;
                             margin: 0 50px;
@@ -364,6 +348,7 @@ export default {
                         &::after {
                             content: "";
                             border: 1px solid #4b81ec;
+                            box-sizing: border-box;
                             height: 0px;
                             flex-grow: 1;
                             margin: 0 50px;
@@ -383,8 +368,8 @@ export default {
                             border-radius: 20px;
                             height: 90px;
                             min-width: 400px;
-                            border: 4px solid #53bafd;
                             box-sizing: border-box;
+                            border: 4px solid #53bafd;
                             flex: 1 0 20%;
                             margin: 20px 3%;
                             padding: 10px 10px 10px 10px;
@@ -425,6 +410,7 @@ export default {
                         align-items: center;
                         font-size: 60px;
                         color: #fff;
+                        box-sizing: border-box;
                         border: 2px solid #797979;
                         border-radius: 10px;
                         background-color: #0e93b2;