Changpeng Duan 4 lat temu
rodzic
commit
31f6115cea
2 zmienionych plików z 64 dodań i 44 usunięć
  1. 10 3
      app/src/page/mainpage.vue
  2. 54 41
      pc/src/views/online.vue

+ 10 - 3
app/src/page/mainpage.vue

@@ -7,14 +7,20 @@
         <ul class="list">
             <li v-for="l in list" @click="goAppoint(l)" v-if="parseInt(l.Status) == 1">
                 <div class="lt">
-                    <img src="../static/images/main/shop2.jpg" width="100%" height="100%" v-show="parseInt(l.ShopID) == 3"/>
-                    <img src="../static/images/main/shop.jpg" width="100%" height="100%" v-show="parseInt(l.ShopID) == 4"/>
-                    <img src="../static/images/main/shop3.png" width="100%" height="100%" v-show="parseInt(l.ShopID) == 5"/>
+                    <img src="../static/images/main/shop2.jpg" width="100%" height="100%"
+                         v-show="parseInt(l.ShopID) == 3"/>
+                    <img src="../static/images/main/shop.jpg" width="100%" height="100%"
+                         v-show="parseInt(l.ShopID) == 4"/>
+                    <img src="../static/images/main/shop3.png" width="100%" height="100%"
+                         v-show="parseInt(l.ShopID) == 5"/>
+                    <img src="../static/images/main/shop3.png" width="100%" height="100%"
+                         v-show="parseInt(l.ShopID) == 6"/>
                 </div>
                 <div class="rt">
                     <h4 style="background-color: #FFA310" v-if="l.ShopID == 3">{{ l.ShopName.substr(5,12) }}</h4>
                     <h4 style="background-color: #37CB00" v-if="l.ShopID == 4">{{ l.ShopName.substr(5,12) }}</h4>
                     <h4 style="background-color: #028FE1" v-if="l.ShopID == 5">{{ l.ShopName.substr(5,12) }}</h4>
+                    <h4 style="background-color: #028FE1" v-if="l.ShopID == 6">{{ l.ShopName.substr(5,12) }}</h4>
                     <span>今日预约名额剩余
               <i v-if="l.RemainOrdernum > 0">{{ l.RemainOrdernum }}</i>
               <i v-if="l.RemainOrdernum == 0" class="red">{{ l.RemainOrdernum }}</i>
@@ -271,6 +277,7 @@
         height: 100%;
         float: left;
     }
+
     .list .lt {
         width: 33%;
         height: 100%;

+ 54 - 41
pc/src/views/online.vue

@@ -123,7 +123,7 @@
             };
         },
         mounted() {
-            this.getList(10);
+            this.getList(13);
 
         },
         watch: {
@@ -1319,37 +1319,37 @@
     }
 
     .ten .cla {
-        width: 4rem;
+        width: 5rem;
         height: 4rem;
-        top: -4rem;
-        left: 0;
-        font-size: 0.2rem;
+        top: -5rem;
+        left: 2rem;
+        font-size: 1rem;
     }
 
     .ten .lcla span {
-        font-size: 3rem;
-        top: -45rem;
+        font-size: 1.5rem;
+        top: -5rem;
         float: left;
-        left: -0rem;
+        left: 2rem;
     }
 
     .ten .cla em {
-        font-size: 2rem;
-        left: 2rem;
+        font-size: 4rem;
+        left: 4rem;
     }
 
     .ten .lhj span {
-        width: 1.4rem;
-        height: 2.1rem;
-        top: -0.9rem;
-        left: 1.4rem;
-        font-size: 0.6rem;
+        width: 4rem;
+        height: 4rem;
+        top: -5rem;
+        left: 9.5rem;
+        font-size: 4rem;
     }
 
     .ten .rhj img {
-        width: 0.2rem;
-        top: -0.9rem;
-        right: 0.15rem;
+        width: 1rem;
+        top: -4.5rem;
+        right: 0.5rem;
     }
 
     .ten .topLi {
@@ -1358,15 +1358,15 @@
 
     .ten .bottomLi {
         width: 98%;
-        font-size: 0.25rem;
+        font-size: 1.5rem;
         margin-top: 0.1rem;
         text-align: center;
     }
 
     .ten .bottomLi img {
-        width: 1.2rem;
-        height: 1.2rem;
-        margin-top: 0.25rem;
+        width: 1.5em;
+        height: 1.5rem;
+        margin-top: 0.9rem;
     }
 
     .ten .bottomLi span {
@@ -1396,13 +1396,13 @@
     .ten .lhj span.plus {
         position: relative;
         left: 1.2rem;
-        line-height: 0.75rem;
+        line-height: 1rem;
     }
 
     .ten .btck img {
-        width: 1.6rem;
-        height: 1.6rem;
-        margin-top: 0.18rem;
+        width: 1.8rem;
+        height: 1.8rem;
+        margin-top: 0.65rem;
     }
     .ten /deep/ .powerContainer img {
         width: 1.4rem;
@@ -1410,8 +1410,8 @@
 
     /*twelve*/
     .twelve {
-        width: 20%;
-        height: 2.4rem;
+        width: 20rem;
+        height: 11rem;
         float: left;
         overflow: hidden;
         margin-bottom: 1.2rem
@@ -1429,23 +1429,23 @@
 
     .twelve .human .name {
         width: 100%;
-        height: 0.5rem;
-        font-size: 0.25rem;
-        line-height: 0.7rem;
-        margin-bottom: 0.2rem;
+        height: 1.5rem;
+        font-size: 1rem;
+        line-height: 1.5rem;
+        margin-bottom: 0.5rem;
     }
 
     .twelve .human img {
-        width: 0.9rem;
-        height: 0.9rem;
+        width: 5rem;
+        height: 5rem;
     }
 
     .twelve .cla {
-        width: 1.2rem;
-        height: 1.2rem;
+        width: 4rem;
+        height: 4rem;
         top: -3.2rem;
-        left: -0.1rem;
-        font-size: 0.2rem;
+        left: -0.4rem;
+        font-size:1rem;
     }
 
     .twelve .lcla span {
@@ -1475,7 +1475,7 @@
     }
 
     .twelve .topLi {
-        height: 1.65rem;
+        height: 8rem;
     }
 
     .twelve .bottomLi {
@@ -1530,7 +1530,9 @@
         height: 1.3rem;
         margin-top: 0.22rem;
     }
-
+    .twelve /deep/ .powerContainer img {
+        width: 1.4rem;
+    }
 
     /*sixteen*/
     .sixteen {
@@ -1651,7 +1653,9 @@
         height: 1.2rem;
     }
 
-
+    .sixteen /deep/ .powerContainer img {
+        width: 1.2rem;
+    }
     /*twenty*/
     .twenty {
         width: 16.66667%;
@@ -1763,6 +1767,9 @@
         position: relative;
         left: 3.2rem
     }
+    .twenty /deep/ .powerContainer img {
+        width: 1.2rem;
+    }
 
 
     /*twentyFour*/
@@ -1889,6 +1896,12 @@
         margin-top: 0.16rem;
     }
 
+    .twentyFour /deep/ .powerContainer img {
+        width: 1.1rem;
+    }
+
+    /*生日*/
+
     .birth {
         position: relative;
         top: -3.3rem;