Merge branch 'master' of http://face3d.4dage.com:7005/shaogen1995/YFYC-H5 into master

yfyc/src/components/BookingSuccess.vue

@@ -104,7 +104,8 @@ export default {
     }
     > .time-summary {
       margin-top: 3.3vw;
-      margin-bottom: 9vw;
+      height: 12vw;
+      font-size: 3.2vw;
     }
     > .tip-2 {
       position: absolute;

yfyc/src/components/Select.vue

@@ -98,6 +98,8 @@ export default {
     width: 25.5vw;
     background: #FDFDFD;
     box-shadow: 0.1vw 0.1vw 1.1vw 0vw rgba(109,128,166,0.29);
+    max-height: 80vw;
+    overflow: auto;
     > button {
       width: calc(100% - 2.7vw * 2);
       height: 13.2vw;

yfyc/src/views/My/MyBookings.vue

@@ -6,7 +6,8 @@
         v-for="(item, index) in bookingListShow"
         :key="item.id"
         :class="{
-          disabled: item.status !== 0,
+          disabled: item.proceedStatus === 2,
+          canceled: item.status !== 0,
         }"
       >
         <div class="top-bar">
@@ -44,8 +45,8 @@
               <span class="value">{{item.num}}人</span>
             </div>
           </div>
-          <button class="cancel" @click="onClickCancel(item.id)" v-show="item.proceedStatus === 0">
-            {{item.status === 0 ? '取消预约' : '已取消'}}
+          <button class="cancel" @click="onClickCancel(item.id)" :disabled="item.proceedStatus !== 0">
+            {{item.proceedStatus === 0 ? '取消预约' : item.proceedStatus === 1 ? '活动中' : '已结束'}}
           </button>
         </div>
       </article>
@@ -84,12 +85,12 @@ export default {
   computed: {
     bookingListActive() {
       return this.bookingListRaw.filter((item) => {
-        return item.proceedStatus === 0
+        return item.proceedStatus === 1
       })
     },
     bookingListFuture() {
       return this.bookingListRaw.filter((item) => {
-        return item.proceedStatus === 1
+        return item.proceedStatus === 0
       })
     },
     bookingListOver() {

yfyc/src/views/Serve/FoodList.vue

@@ -114,12 +114,12 @@ export default {
   watch: {
     foodList: {
       handler() {
-        this.$nextTick(() => {
-          $('.card-list').masonry({
-            itemSelector: '.card-list > article',
-            percentPosition: true,
-          });
-        })
+        // setTimeout(() => {
+        //   $('.card-list').masonry({
+        //     itemSelector: '.card-list > article',
+        //     percentPosition: true,
+        //   });
+        // }, 1000)
       },
       deep: true,
     }
@@ -135,10 +135,10 @@ export default {
     },
   },
   mounted() {
-    $('.card-list').masonry({
-      itemSelector: '.card-list > article',
-      percentPosition: true,
-    });
+    // $('.card-list').masonry({
+    //   itemSelector: '.card-list > article',
+    //   percentPosition: true,
+    // });
   }
 }
 </script>