ytj

src/components/topCaseInfo/index.vue

@@ -4,7 +4,7 @@
       <span>{{data.caseName}}</span>
       <a v-if="data.ShowSelect" @click="selectCase">请选择</a>
       <div class="flex-item">
-        <span v-if="data.recommendCode">我的推荐码{{data.recommendCode}}</span>
+        <span v-if="data.recommendCode && fromPage === 'sales'">我的推荐码{{data.recommendCode}}</span>
         <span v-else></span>
         <span>{{userName}}您好！</span>
       </div>
@@ -15,7 +15,7 @@
 
 export default {
   name: '',
-  props: ['data', 'userName'],
+  props: ['data', 'userName' ,'fromPage'],
   data () {
     return {
 

src/components/topCaseInfo/page.scss

@@ -23,7 +23,7 @@
     display: flex;
     justify-content: space-between;
     align-items: center;
-    margin: 0 .2rem 0 .1rem;
+    margin: 0 .2rem 0 .2rem;
     font-size: 0;
     span{
       font-size: .12rem;

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

@@ -1,7 +1,7 @@
 <template>
   <div class="mainPage flex-v">
     <div class="top">
-      <topCaseInfo :data="topCaseInfoData" :userName="userInfo.customer.RealName ? userInfo.customer.RealName : userInfo.customer.Name" @selectCase="showVanPicker"></topCaseInfo>
+      <topCaseInfo :data="topCaseInfoData" :fromPage='fromPage' :userName="userInfo.customer.RealName ? userInfo.customer.RealName : userInfo.customer.Name" @selectCase="showVanPicker"></topCaseInfo>
     </div>
     <nav class="flex-h" v-if="userInfo.customer.MapUser !== '' && fromPage === 'sales'">
       <a class="flex-item" v-for="(item,index) in cutNavList" :key="index" :class="{'active': navActive === index}" @click="cutNav(index)">{{item.value}}</a>
@@ -196,7 +196,7 @@ export default {
         caseName: '',
         caseId: '',
         ShowSelect: false,
-        recommendCode: 3066
+        recommendCode: ''
       },
       caseInfo: {
         value: '',
@@ -348,6 +348,9 @@ export default {
           }
         })
       })
+      this.getRecommendCode().then((res) => {
+        this.topCaseInfoData.recommendCode = res
+      })
     } else {
 
     }
@@ -361,6 +364,7 @@ export default {
       'getMyCouponList',
       'getForbidInfo',
       'getCustomerList',
+      'getRecommendCode'
     ]),
     ...actions([
       'getCaseList',

src/pages/user/rush/index.vue

@@ -13,8 +13,8 @@
       <span>秒</span>
     </div>
     <div class="content">
-      <div class="title">悦见山咖啡抽奖活动</div>
-      <div class="video-or-cover">
+      <div class="title">{{detail.FlashBuyName}}</div>
+      <!-- <div class="video-or-cover">
         <video v-if="video" width="100%" height="100%" preload="auto" x5-playsinline="true" controls="controls" :poster="type === 'card' ? data.Images[0].CardImageUrl : data.Images[0].CouponImageUrl">
           <source :src="data.VideoUrl" type="video/mp4">
           <source :src="data.VideoUrl" type="video/avi">
@@ -23,26 +23,36 @@
           <source :src="data.VideoUrl" type="video/rm">
         </video>
         <img v-else src="" width="100%" height="100%">
-      </div>
-      <pre class="rule"></pre>
+      </div> -->
+      <pre class="rule">{{detail.FlashBuyInfo}}</pre>
       <div class="scope-of-time">
         <div>活动时间</div>
-        <div></div>
+        <div>{{toolClass.dateFormat(detail.StartDate)}} ~ {{toolClass.dateFormat(detail.EndDate)}}</div>
       </div>
     </div>
     <div class="submit">
       <div :class="{light:timeStatus === 1}" @click="submit()">{{btnText[timeStatus]}}</div>
     </div>
+    <div class="success-box" v-if="showDialog">
+      <div class="success">
+        <span>恭喜您！抢购成功</span>
+        <img :src="logo" alt="">
+        <span>长按二维码关注“城的空间”，进入会员中心查看吧</span>
+        <div @click="showDialog = false">确定</div>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
+import logo from '../../../common/icon/qrCode.jpg'
 import { mapState, createNamespacedHelpers } from 'vuex'
 const { mapActions: actions } = createNamespacedHelpers('app')
 const { mapState: mapRushState, mapActions: mapRushActions } = createNamespacedHelpers('rush')
 export default {
   data () {
     return {
+      logo,
       day: '00',
       hour: '00',
       minute: '00',
@@ -50,17 +60,17 @@ export default {
       hasTime: false,
       timeStatus: 0, // 0、未开始 1、进行中 2、已结束 3、已抢购
       btnText: ['立即抢购', '立即抢购', '已结束', '已抢购'],
-      Interval: null
+      Interval: null,
+      showDialog: false
     }
   },
   created () {
     this.getRush({ flashBuyId: this.$route.query.flashBuyId }).then(() => {
-
+      let start = new Date(this.detail.StartDate).getTime()
+      let end = new Date(this.detail.EndDate).getTime()
+      this.timing(start, end)
     })
-    let start = 1540275765202
-    let end = 1540481765202
-    console.log(this)
-    this.timing(start, end)
+
   },
   computed: {
     ...mapRushState({
@@ -101,7 +111,9 @@ export default {
       if (this.timeStatus !== 1) {
         return
       }
-      this.setRush()
+      this.setRush({ id: this.detail.FlashBuyId }).then(() => {
+        this.showDialog = true
+      })
     }
   }
 }

src/pages/user/rush/page.scss

@@ -79,4 +79,47 @@
   .light{
     background: #9D876D;
   }
-}
+}
+.success-box{
+  position: fixed;
+  display: flex;
+  z-index: 999;
+  background: rgba(0,0,0,.2);
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  .success{
+    display: flex;
+    flex-flow: column nowrap;
+    justify-content: center;
+    align-items: center;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 2.8rem;
+    height: 2.2rem;
+    border-radius: .2rem;
+    padding: .2rem .1rem;
+    transform: translate(-50%,-50%);
+    background: #fff;
+    span{
+      font-size: .14rem;
+    }
+    img{
+      width: .8rem;
+      height: .8rem;
+      margin: .15rem;
+    }
+    div{
+      width: .9rem;
+      height: .3rem;
+      background: #9D876D;
+      color: white;
+      font-size: .14rem;
+      border-radius: .08rem;
+      text-align: center;
+      line-height: .3rem;
+    }
+  }
+}

src/store/rush/index.js

@@ -29,7 +29,8 @@ export default {
     setRush (context, data) {
       return new Promise((resolve, reject) => {
         Ajax({
-          ...api.rush.setRush
+          ...api.rush.setRush,
+          urlData: { ...data }
         }).then(res => {
           resolve(res)
         }).catch((err) => {

src/store/userCenter/userCenter.js

@@ -240,7 +240,6 @@ export default {
       })
     },
     recommendCode (context, data) {
-      console.log(data)
       return new Promise((resolve) => {
         Ajax({
           ...api.user.recommendCode, 
@@ -260,6 +259,17 @@ export default {
           reject()
         })
       })
+    },
+    getRecommendCode (context) {
+      return new Promise((resolve) => {
+        Ajax({
+          ...api.user.code
+        }).then(res => {
+          resolve(res)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
     }
   }
 }

src/util/api.js

@@ -148,6 +148,10 @@ const $api = {
     getVip: { // vip卡详情
       method: 'get',
       url: `${baseUrl}${wechat}/vip`
+    },
+    code: { // 获取我的推荐码
+      method: 'get',
+      url: `${baseUrl}${wechat}/user/code`
     }
   },
   director: {
@@ -264,7 +268,7 @@ const $api = {
       url: `${baseUrl}${wechat}/GetCheckByUser`
     }
   },
-  remark:{
+  remark: {
     setRemark: {
       method: 'post',
       url: `${baseUrl}${wechat}/customerremark`
@@ -274,10 +278,10 @@ const $api = {
       url: `${baseUrl}${wechat}/customerremark/:salesId/:customerId`
     }
   },
-  rush:{
+  rush: {
     setRush: {
       method: 'post',
-      url: `${baseUrl}${wechat}/customerremark`
+      url: `${baseUrl}${wechat}/flashbuy/:id`
     },
     getRush: {
       method: 'get',