ytj

src/components/customerCard/customerCard.vue

@@ -123,8 +123,13 @@ export default {
     display: flex;
     padding: 0.15rem;
     justify-content: space-between;
+    align-items: center;
     span:nth-of-type(1) {
       color: #323645;
+      width: 2.3rem;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
     }
     span:nth-of-type(2) {
       color: #909090;

src/pages/sales/cardAndCouponNum/index.vue

@@ -6,7 +6,8 @@
         <div>
           <span>{{data.CardName}}</span>
           <span>卡券描述卡券描述卡券描述卡券描述卡券描述</span>
-          <span>{{toolClass.dateFormat(data.StartDate)}} - {{toolClass.dateFormat(data.EndDate)}}</span>
+          <span v-if="data.ValidDays>0">领取后{{data.ValidDays}}天有效</span>
+          <span v-else>{{toolClass.dateFormat(data.StartDate)}} - {{toolClass.dateFormat(data.EndDate)}}</span>
         </div>
       </div>
     </div>

src/pages/sales/customerSearch/index.vue

@@ -123,6 +123,7 @@ export default {
           isrecommend: false,
           key: this.key,
         }).then((res) => {
+          this.message = null
           this.cardList = []
           if (res) {
             for (var n = 0; n < res.length; n++) {

src/pages/sales/history/index.vue

@@ -3,11 +3,11 @@
     <div class="top">
       <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer.RealName ? userInfo.customer.RealName : userInfo.customer.CustomerName"></topCaseInfo>
     </div>
-    <div class="info">
+    <div class="info" v-if="list.length > 0">
       <span><em>姓名</em>：{{list[0].CustomerName}}</span>
       <span><em>手机号</em>：{{list[0].Phone}}</span>
     </div>
-    <div class="list-content">
+    <div class="list-content" v-if="list.length > 0">
       <div class="list-year">备注记录</div>
       <div class="list-card" v-for="(item,index) in list" :key="index">
         <div class="point-top"></div>
@@ -16,11 +16,13 @@
         <div class="card-content">{{item.Remark}}</div>
       </div>
     </div>
+    <noMore v-if="list.length <= 0"></noMore>
   </div>
 </template>
 
 <script>
 import topCaseInfo from '../../../components/topCaseInfo/index'
+import noMore from '../../../components/noMore/noMore'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: actions } = createNamespacedHelpers('app')
 const { mapState: mapRemarkState, mapActions: mapRemarkActions } = createNamespacedHelpers('remark')
@@ -37,6 +39,7 @@ export default {
   },
   components: {
     topCaseInfo,
+    noMore
   },
   computed: {
     ...mapState({

src/pages/user/bindMobile/bindMobile.vue

@@ -70,7 +70,6 @@
 import logo from '../../../common/icon/logo.png'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: actions } = createNamespacedHelpers('userCenter')
-let canSubmit
 export default {
   data () {
     return {
@@ -88,7 +87,8 @@ export default {
         // sales: '',
         recommendCode: '',
         captcha: ''
-      }
+      },
+      canSubmit: true
     }
   },
   computed: {
@@ -97,10 +97,10 @@ export default {
     })
   },
   created () {
-    canSubmit = true
     this.getCaseInfo(1).then(() => {
       this.columns = this.caseInfo.cases
     })
+    console.log(1123)
   },
   methods: {
     ...actions(['getCaseInfo']),
@@ -187,39 +187,58 @@ export default {
       }, 1000)
     },
     submit () {
-      if (!canSubmit) {
+      if (!this.canSubmit) {
         return
       }
-      canSubmit = false
+      this.canSubmit = false
       if (!this.postData.captcha) {
         this.$toast('请填写验证码')
-        canSubmit = true
+        this.canSubmit = true
         return
       }
-      // if (!this.postData.case) {
-      //   this.$toast('请选择案场')
-      //   return
-      // }
-      // if (!this.postData.sales) {
-      //   this.$toast('请选择销售')
-      //   return
-      // }
-      this.submitData(this.postData).then((res) => {
-        if (this.$route.query.isLottery) {
-          setTimeout(() => {
-            const from = this.$route.query.luckshare ? `#/from/${this.$route.query.luckshare}` : ''
-            window.location.href = `${window.location.origin}/game/luckdraw/${from}`
-          }, 2000)
-        } else {
-          setTimeout(() => {
-            // this.$router.push({name: 'userCenter'})
-            window.history.go(-1)
-          }, 2000)
-        }
-      }).catch(() => {
-        console.log(111)
-        canSubmit = true
-      })
+      if (this.postData.recommendCode) {
+        this.recommendCode({ recommendCode: this.postData.recommendCode }).then((res) => {
+          if (res) {
+            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`
+                  window.location.href = `${window.location.origin}/game/luckdraw/${from}`
+                }, 2000)
+              } else {
+                setTimeout(() => {
+                  // this.$router.push({name: 'userCenter'})
+                  window.history.go(-1)
+                }, 2000)
+              }
+            }).catch(() => {
+              console.log(111)
+              this.canSubmit = true
+            })
+          } else {
+            this.$toast('推荐码不正确,请与案场人员核对')
+            this.canSubmit = true
+            return
+          }
+        })
+      } else {
+        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`
+              window.location.href = `${window.location.origin}/game/luckdraw/${from}`
+            }, 2000)
+          } else {
+            setTimeout(() => {
+              // this.$router.push({name: 'userCenter'})
+              window.history.go(-1)
+            }, 2000)
+          }
+        }).catch(() => {
+          console.log(111)
+          this.canSubmit = true
+        })
+      }
     }
   }
 }

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

@@ -399,8 +399,9 @@ export default {
       }
     },
     returnInvalid (item, type) {
+      console.log(item)
       if (item.ValidDays && item.ValidDays > 0) {
-        return true
+        return false
       }
       for (var n = 0; n < this.forbidList.length; n++) {
         if (this.forbidList[n].UserId === this.userInfo.customer.CustomerId && this.forbidList[n].ForbidType === type) {
@@ -573,6 +574,7 @@ export default {
           this.getCustomerList({
             ...this.postCustomerData
           }).then((res) => {
+            this.message = null
             this.data[3].list = []
             if (res) {
               for (var n = 0; n < res.length; n++) {

src/pages/user/receive/index.vue

@@ -29,7 +29,8 @@
           <i class="icon-kaquan iconfont"></i>
           <span>卡券有效期</span>
         </div>
-        <pre>有效期至{{toolClass.dateFormat(data.EndDate,'yyyy-MM-dd')}}，请在有效期结束前使用， 过期作废；</pre>
+        <pre v-if="data.ValidDays>0">领取后{{data.ValidDays}}天有效，请在有效期结束前使用， 过期作废；</pre>
+        <pre v-else>有效期至{{toolClass.dateFormat(data.EndDate,'yyyy-MM-dd')}}，请在有效期结束前使用， 过期作废；</pre>
       </div>
       <div class="text">
         <div>

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 !== 1 && !used" @click="signIn">立即注册</div>
+    <div class="sign-in" v-if="timeStatus !== 2 && newCustomer && detail.AttendantType === 'no'" @click="signIn">立即注册</div>
     <div class="submit">
       <div :class="{light:timeStatus === 1}" @click="submit()" v-if="!used">{{btnText[timeStatus]}}</div>
       <div v-else>已抢购</div>
@@ -65,19 +65,22 @@ export default {
       Interval: null,
       showDialog: false,
       used: false,
-      showPage: false
+      showPage: false,
+      newCustomer: false
     }
   },
   created () {
-    this.getRush({ flashBuyId: this.$route.query.flashBuyId }).then((res) => {
-      if (res.userInfo) {
-        this.used = true
-      }
-      let start = new Date(this.detail.StartDate).getTime()
-      let end = new Date(this.detail.EndDate).getTime()
-      this.timing(start, end)
+    this.AddNewFlashBuyCustomer({ flashBuyId: this.$route.query.flashBuyId }).then(() => {
+      this.getRush({ flashBuyId: this.$route.query.flashBuyId }).then((res) => {
+        if (res.userInfo) {
+          this.used = true
+          this.newCustomer = res
+        }
+        let start = new Date(this.detail.StartDate).getTime()
+        let end = new Date(this.detail.EndDate).getTime()
+        this.timing(start, end)
+      })
     })
-
   },
   computed: {
     ...mapRushState({
@@ -85,7 +88,7 @@ export default {
     })
   },
   methods: {
-    ...mapRushActions(['setRush', 'getRush']),
+    ...mapRushActions(['setRush', 'getRush', 'AddNewFlashBuyCustomer', 'IsNewCustomer', 'UpdateFlashBuyCustomer']),
     timing (startTime, endTime) {
       this.Interval = setInterval(() => {
         let nowTime = new Date().getTime()
@@ -118,10 +121,15 @@ export default {
       this.day = day < 10 ? '0' + day : day
     },
     submit () {
+      if (this.newCustomer && this.detail.AttendantType !== 'no') {
+        this.signIn()
+        return
+      }
       if (this.timeStatus !== 1) {
         return
       }
       this.setRush({ id: this.detail.FlashBuyId }).then(() => {
+        this.UpdateFlashBuyCustomer({ flashBuyId: this.$route.query.flashBuyId })
         this.showDialog = true
       })
     },

src/pages/user/vipDetail/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="mainPage">
-    <swiper :options="swiperOption" ref="mySwiper" class="inner" v-if="detail">
+    <swiper :options="swiperOption" ref="mySwiper" class="inner" v-if="detail.length > 0">
       <swiper-slide class="swiper-slide" v-for="(item,index) in detail" :key="index">
         <div class="vip-box">
           <div class="vip-header">
@@ -23,8 +23,8 @@
         </div>
       </swiper-slide>
     </swiper>
-    <div class="swiper-pagination" v-if="detail"></div>
-    <noMore v-if='!detail'></noMore>
+    <div class="swiper-pagination" v-if="detail.length > 0"></div>
+    <noMore v-if='detail.length <= 0'></noMore>
   </div>
 </template>
 

src/store/rush/index.js

@@ -37,6 +37,41 @@ export default {
           reject(err)
         })
       })
+    },
+    IsNewCustomer (context) {
+      return new Promise((resolve, reject) => {
+        Ajax({
+          ...api.rush.IsNewCustomer
+        }).then(res => {
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    },
+    AddNewFlashBuyCustomer (context, data) {
+      return new Promise((resolve, reject) => {
+        Ajax({
+          ...api.rush.AddNewFlashBuyCustomer,
+          urlData: { ...data }
+        }).then(res => {
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
+    },
+    UpdateFlashBuyCustomer (context, data) {
+      return new Promise((resolve, reject) => {
+        Ajax({
+          ...api.rush.UpdateFlashBuyCustomer,
+          urlData: { ...data }
+        }).then(res => {
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
     }
   }
 }

src/util/api.js

@@ -286,6 +286,18 @@ const $api = {
     getRush: {
       method: 'get',
       url: `${baseUrl}${wechat}/flashbuy/flash/:flashBuyId`
+    },
+    IsNewCustomer: { // 是否为新用户
+      method: 'get',
+      url: `${baseUrl}${wechat}/flashbuy/newcustomer`
+    },
+    AddNewFlashBuyCustomer: { 
+      method: 'post',
+      url: `${baseUrl}${wechat}/flashbuy/customer/:flashBuyId`
+    },
+    UpdateFlashBuyCustomer: { 
+      method: 'put',
+      url: `${baseUrl}${wechat}/flashbuy/customer/:flashBuyId`
     }
   }
 }