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

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

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