ytj

src/pages/sales/login/index.vue

@@ -112,11 +112,13 @@ export default {
       canSubmit = false
       if (!this.postData.captcha) {
         this.$toast('请填写验证码')
+        canSubmit = true
         return
       }
       let reg = /^[0-9]{6}$/
       if (!reg.test(this.postData.captcha)) {
         this.$toast('验证码格式不正确')
+        canSubmit = true
         return
       }
       this.submitData(this.postData).then((res) => {
@@ -124,12 +126,13 @@ export default {
           window.location.replace(this.getUrl('mainPage/coffeeIndex'))
         }, 2000)
       }).catch(() => {
+        console.log(111)
         canSubmit = true
       })
     }
   },
   created () {
-    canSubmit = true 
+    canSubmit = true
     if (this.userInfo.customer.MapUser) {
       // this.showPage = true
       window.location.replace(this.getUrl('mainPage/coffeeIndex'))

src/pages/user/bindMobile/bindMobile.vue

@@ -171,6 +171,7 @@ export default {
       canSubmit = false
       if (!this.postData.captcha) {
         this.$toast('请填写验证码')
+        canSubmit = true
         return
       }
       // if (!this.postData.case) {
@@ -194,6 +195,7 @@ export default {
           }, 2000)
         }
       }).catch(() => {
+        console.log(111)
         canSubmit = true
       })
     }

src/pages/user/lessonDetail/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mainPage" v-if="showPage">
     <div class="title">课程详情</div>
-    <div class="content" :class="{'opacity' : courseOrderDetail.IsDone === 1, 'gray': courseOrderDetail.IsDone === 1}">
+    <div class="content" :class="{'opacity' : courseOrderDetail.IsDone === 1 || (courseOrderDetail.IsDone === 0 && now > time(item.EndDate)), 'gray': courseOrderDetail.IsDone === 1 || (courseOrderDetail.IsDone === 0 && now > time(item.EndDate))}">
       <div class="list-item flex-h">
         <span>订单编号</span>
         <span class="flex-item" style="font-size:.11rem;">{{courseOrderDetail.OrdersNo !== undefined ? courseOrderDetail.OrdersNo : ''}}</span>
@@ -51,7 +51,7 @@
     </div>
     <div class="useType">
       <img :src="used" alt="已使用" v-if="courseOrderDetail.IsDone === 1" width="100%" height="100%">
-      <!-- <img :src="failure" alt="已失效" v-if="useType == '已失效'" width="100%" height="100%"> -->
+      <img :src="failure" alt="已失效" v-if="courseOrderDetail.IsDone === 0 && now > time(item.EndDate)" width="100%" height="100%">
     </div>
   </div>
 </template>

src/pages/user/receive/index.vue

@@ -8,7 +8,7 @@
       <div class="title" v-if="$route.query.type === 'card'">{{data.CardName}}</div>
       <div class="title" v-else>{{data.CouponName}}</div>
       <div class="video" v-if='video'>
-        <video width="100%" height="100%" preload="auto" controls="controls" x5-playsinline="true">
+        <video width="100%" height="100%" preload="auto" controls="controls" x5-playsinline="true" :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">
           <source :src="data.VideoUrl" type="video/wma">

src/pages/user/receiveChannel/index.vue

@@ -16,7 +16,8 @@
       <div class="title" v-if="$route.query.type === 'card'">{{data.CardName}}</div>
       <div class="title" v-else>{{data.CouponName}}</div>
       <div class="video" v-if='video'>
-        <video width="100%" height="100%" preload="auto" x5-playsinline="true" controls="controls">
+
+        <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">
           <source :src="data.VideoUrl" type="video/wma">

src/store/userCenter/userCenter.js

@@ -240,9 +240,11 @@ export default {
       })
     },
     submitData (context, data) {
-      return new Promise((resolve) => {
+      return new Promise((resolve,reject) => {
         http.submitData(data).then((res) => {
           resolve(res)
+        }).catch(() => {
+          reject()
         })
       })
     }