yuantianjiao 6 years ago
parent
commit
0c1e341508
2 changed files with 5 additions and 3 deletions
  1. 1
    1
      src/pages/user/placeOrder/index.vue
  2. 4
    2
      src/pages/user/rush/index.vue

+ 1
- 1
src/pages/user/placeOrder/index.vue View File

@@ -68,7 +68,7 @@
68 68
       </div>
69 69
       <a @click="toPlaceOrder">下单</a>
70 70
     </div>
71
-    <orderPopup :show="showPopup" :data="currentSpec" @closePopup="closePopup" @returnData="calcMenus"></orderPopup>
71
+    <orderPopup v-if="showPopup" :show="showPopup" :data="currentSpec" @closePopup="closePopup" @returnData="calcMenus"></orderPopup>
72 72
     <calcMenu :show="showCalcMenu" :totalNum="sumNum + caseTotal.total" :data="selGoods" @returnData="calcMenus" @emptyMenus="emptyMenus" @closeCalcMenu="closeCalcMenu" @placeOrder="placeOrder"></calcMenu>
73 73
     <div class="successPopup" v-if="showSuccessPopup">
74 74
       <div>

+ 4
- 2
src/pages/user/rush/index.vue View File

@@ -70,13 +70,12 @@ export default {
70 70
   },
71 71
   created () {
72 72
     this.getRush({ flashBuyId: this.$route.query.flashBuyId }).then((res) => {
73
-      if (res.userInfo){
73
+      if (res.userInfo) {
74 74
         this.used = true
75 75
       }
76 76
       let start = new Date(this.detail.StartDate).getTime()
77 77
       let end = new Date(this.detail.EndDate).getTime()
78 78
       this.timing(start, end)
79
-      this.showPage = true
80 79
     })
81 80
 
82 81
   },
@@ -93,15 +92,18 @@ export default {
93 92
         if (nowTime >= endTime) {
94 93
           clearInterval(this.Interval)
95 94
           this.timeStatus = 2
95
+          this.showPage = true
96 96
           return
97 97
         } else if (nowTime <= startTime) {
98 98
           let time = Math.floor((startTime - nowTime) / 1000)
99 99
           this.getTime(time)
100 100
           this.timeStatus = 0
101
+          this.showPage = true
101 102
         } else if (nowTime >= startTime && nowTime <= endTime) {
102 103
           let time = Math.floor((endTime - nowTime) / 1000)
103 104
           this.getTime(time)
104 105
           this.timeStatus = 1
106
+          this.showPage = true
105 107
         }
106 108
       }, 1000)
107 109
     },