ytj

src/pages/user/mainPage/userCenter/index.vue

@@ -36,7 +36,7 @@
             <img src="../../../../common/icon/userCenter-icon-3.png" width="100%" height="100%" alt="">
           </div>
           <span>VIP卡</span>
-          <span>￥{{(Nums.account || {}).Amount || 0}} <i class="iconfont icon-jiantou-right" style="font-size: 0.1rem;"></i></span>
+          <span>￥{{Nums.vipbalance}} <i class="iconfont icon-jiantou-right" style="font-size: 0.1rem;"></i></span>
         </div>
       </div>
 

src/pages/user/rush/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="mainPage">
+  <div class="mainPage" v-if="showPage">
     <div class="top-time" v-if="timeStatus<2">
       <span v-if="timeStatus === 0">距抢购开始</span>
       <span v-if="timeStatus === 1">距抢购结束</span>
@@ -24,14 +24,16 @@
         </video>
         <img v-else src="" width="100%" height="100%">
       </div> -->
-      <pre class="rule">{{detail.FlashBuyInfo}}</pre>
+      <pre class="rule" v-html="detail.FlashBuyInfo"></pre>
       <div class="scope-of-time">
         <div>活动时间</div>
         <div>{{toolClass.dateFormat(detail.StartDate)}} ~ {{toolClass.dateFormat(detail.EndDate)}}</div>
       </div>
     </div>
+    <div class="sign-in" v-show="timeStatus !== 1" @click="signIn">立即注册</div>
     <div class="submit">
-      <div :class="{light:timeStatus === 1}" @click="submit()">{{btnText[timeStatus]}}</div>
+      <div :class="{light:timeStatus === 1}" @click="submit()" v-if="!used">{{btnText[timeStatus]}}</div>
+      <div v-else>已抢购</div>
     </div>
     <div class="success-box" v-if="showDialog">
       <div class="success">
@@ -61,7 +63,9 @@ export default {
       timeStatus: 0, // 0、未开始 1、进行中 2、已结束 3、已抢购
       btnText: ['立即抢购', '立即抢购', '已结束', '已抢购'],
       Interval: null,
-      showDialog: false
+      showDialog: false,
+      used: false,
+      showPage: false
     }
   },
   created () {
@@ -69,6 +73,7 @@ export default {
       let start = new Date(this.detail.StartDate).getTime()
       let end = new Date(this.detail.EndDate).getTime()
       this.timing(start, end)
+      this.showPage = true
     })
 
   },
@@ -82,15 +87,15 @@ export default {
     timing (startTime, endTime) {
       this.Interval = setInterval(() => {
         let nowTime = new Date().getTime()
-        if (nowTime > endTime) {
+        if (nowTime >= endTime) {
           clearInterval(this.Interval)
           this.timeStatus = 2
           return
-        } else if (nowTime < startTime) {
+        } else if (nowTime <= startTime) {
           let time = Math.floor((startTime - nowTime) / 1000)
           this.getTime(time)
           this.timeStatus = 0
-        } else if (nowTime > startTime && nowTime < endTime) {
+        } else if (nowTime >= startTime && nowTime <= endTime) {
           let time = Math.floor((endTime - nowTime) / 1000)
           this.getTime(time)
           this.timeStatus = 1
@@ -114,6 +119,9 @@ export default {
       this.setRush({ id: this.detail.FlashBuyId }).then(() => {
         this.showDialog = true
       })
+    },
+    signIn () {
+      this.$router.push({ name: 'bindMobile' })
     }
   }
 }

src/pages/user/rush/page.scss

@@ -123,3 +123,17 @@
     }
   }
 }
+.sign-in{
+  position: fixed;
+  bottom: .8rem;
+  right: .4rem;
+  width: .5rem;
+  height: .5rem;
+  background: #BAE0F6;
+  color: #fff;
+  font-size: .12rem;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 50%;
+}

src/pages/user/vipDetail/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="mainPage">
-    <swiper :options="swiperOption" ref="mySwiper" class="inner">
+    <swiper :options="swiperOption" ref="mySwiper" class="inner" v-if="detail">
       <swiper-slide class="swiper-slide" v-for="(item,index) in detail" :key="index">
         <div class="vip-box">
           <div class="vip-header">
@@ -23,7 +23,8 @@
         </div>
       </swiper-slide>
     </swiper>
-    <div class="swiper-pagination"></div>
+    <div class="swiper-pagination" v-if="detail"></div>
+    <noMore v-if='!detail'></noMore>
   </div>
 </template>
 
@@ -31,6 +32,7 @@
 import vipBg from '../../../common/icon/vipBg.jpg'
 import { swiper, swiperSlide } from 'vue-awesome-swiper'
 import 'swiper/dist/css/swiper.css'
+import noMore from '../../../components/noMore/noMore'
 import { createNamespacedHelpers } from 'vuex'
 const { mapState: mapVipState, mapActions: mapVipActions } = createNamespacedHelpers('vip')
 export default {
@@ -53,6 +55,7 @@ export default {
   components: {
     swiper,
     swiperSlide,
+    noMore
   },
   created () {
     this.getVipDetail().then((res) => {
@@ -78,7 +81,7 @@ export default {
 </style>
 
 <style>
-.swiper-pagination > span{
+.swiper-pagination > span {
   margin: 0 0.025rem;
 }
 </style>

src/pages/user/vipDetail/page.scss

@@ -65,6 +65,10 @@
         border-bottom: 1px solid rgba(242,242,242,1);
         span{
           width: 30%;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          margin-right: .05rem;
         }
         .date{
           color: #999;