ytj

src/components/myCard/myCard.vue

@@ -137,6 +137,10 @@ export default {
       flex: 1;
       h2 {
         font-size: 0.16rem;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        width: 2rem;
       }
       span {
         color: #323645;

src/pages/user/bindMobile/bindMobile.vue

@@ -202,7 +202,7 @@ export default {
             this.submitData(this.postData).then((res) => {
               if (this.$route.query.isLottery) {
                 setTimeout(() => {
-                  const from = this.$route.query.luckshare ? `#/from/${this.$route.query.luckshare}?lotteryId=${this.$route.query.lotteryId}&isnew=1` : `?lotteryId=${this.$route.query.lotteryId}&isnew=1`
+                  const from = this.$route.query.luckshare ? `#/from/${this.$route.query.luckshare}?lotteryId=${this.$route.query.lotteryId}&isnew=1` : `#/?lotteryId=${this.$route.query.lotteryId}&isnew=1`
                   window.location.href = `${window.location.origin}/game/luckdraw/${from}`
                 }, 2000)
               } else {
@@ -225,7 +225,7 @@ export default {
         this.submitData(this.postData).then((res) => {
           if (this.$route.query.isLottery) {
             setTimeout(() => {
-              const from = this.$route.query.luckshare ? `#/from/${this.$route.query.luckshare}?lotteryId=${this.$route.query.lotteryId}&isnew=1` : `?lotteryId=${this.$route.query.lotteryId}&isnew=1`
+              const from = this.$route.query.luckshare ? `#/from/${this.$route.query.luckshare}?lotteryId=${this.$route.query.lotteryId}&isnew=1` : `#/?lotteryId=${this.$route.query.lotteryId}&isnew=1`
               window.location.href = `${window.location.origin}/game/luckdraw/${from}`
             }, 2000)
           } else {

src/pages/user/receive/index.vue

@@ -116,9 +116,7 @@ export default {
         })
       }
       if (this.$route.query.isAuto === 'auto') {
-        setTimeout(() => {
-          this.receive()
-        }, 1000)
+        this.receive()
       }
     },
     receive () {

src/pages/user/rush/index.vue

@@ -30,7 +30,7 @@
         <div>{{toolClass.dateFormat(detail.StartDate)}} ~ {{toolClass.dateFormat(detail.EndDate)}}</div>
       </div>
     </div>
-    <div class="sign-in" v-if="timeStatus !== 2 && newCustomer && detail.AttendantType === 'no'" @click="signIn">立即注册</div>
+    <div class="sign-in" v-if="timeStatus !== 2 && detail.AttendantType === 'no' && !used" @click="signIn">立即注册</div>
     <div class="submit">
       <div :class="{light:timeStatus === 1}" @click="submit()" v-if="!used">{{btnText[timeStatus]}}</div>
       <div v-else>已抢购</div>
@@ -51,6 +51,7 @@ import logo from '../../../common/icon/qrCode.jpg'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: actions } = createNamespacedHelpers('app')
 const { mapState: mapRushState, mapActions: mapRushActions } = createNamespacedHelpers('rush')
+const { mapState: mapUserState } = createNamespacedHelpers('userCenter')
 export default {
   data () {
     return {
@@ -70,10 +71,12 @@ export default {
     }
   },
   created () {
+    console.log(1)
+    console.log(this.userInfo)
     this.AddNewFlashBuyCustomer({ flashBuyId: this.$route.query.flashBuyId }).then(() => {
       this.getRush({ flashBuyId: this.$route.query.flashBuyId }).then((res) => {
-        this.used = res.IsAttend
-        this.newCustomer = res.IsNew ? true : false
+        this.used = res.flashCustomer.IsAttend === 1 ? false : true
+        this.newCustomer = res.flashCustomer.IsNew === 1 ? true : false
         let start = new Date(this.detail.StartDate).getTime()
         let end = new Date(this.detail.EndDate).getTime()
         this.timing(start, end)
@@ -83,6 +86,9 @@ export default {
   computed: {
     ...mapRushState({
       detail: item => item.rushDetail
+    }),
+    ...mapUserState({
+      userInfo: x => x.userInfo
     })
   },
   methods: {
@@ -119,15 +125,21 @@ export default {
       this.day = day < 10 ? '0' + day : day
     },
     submit () {
-      if (this.newCustomer && this.detail.AttendantType !== 'no') {
+      if (this.timeStatus !== 1) {
+        this.$toast('活动未开始，敬请期待')
+        return
+      }
+      if (this.newCustomer && !this.userInfo.customer.Phone) {
         this.signIn()
         return
       }
-      if (this.timeStatus !== 1) {
+      if (!this.newCustomer && this.detail.AttendantType !== 'no') {
+        this.$toast('此活动仅限新用户参与')
         return
       }
       this.setRush({ id: this.detail.FlashBuyId }).then(() => {
         this.UpdateFlashBuyCustomer({ flashBuyId: this.$route.query.flashBuyId })
+        this.used = true
         this.showDialog = true
       })
     },

src/pages/user/rush/page.scss

@@ -20,6 +20,7 @@
 .content{
   padding: .24rem .2rem .6rem;
   box-sizing: border-box;
+  background-color: #fff;
   .title{
     text-align: center;
     font-size: .16rem;
@@ -73,6 +74,7 @@
   z-index: 2;
   width: 100%;
   height: .6rem;
+  background-color: #fff;
   div{
     width: 3.35rem;
     height: .4rem;