yuantianjiao 6 年前
父节点
当前提交
29aa777faa

+ 4
- 1
src/pages/sales/login/index.vue 查看文件

112
       canSubmit = false
112
       canSubmit = false
113
       if (!this.postData.captcha) {
113
       if (!this.postData.captcha) {
114
         this.$toast('请填写验证码')
114
         this.$toast('请填写验证码')
115
+        canSubmit = true
115
         return
116
         return
116
       }
117
       }
117
       let reg = /^[0-9]{6}$/
118
       let reg = /^[0-9]{6}$/
118
       if (!reg.test(this.postData.captcha)) {
119
       if (!reg.test(this.postData.captcha)) {
119
         this.$toast('验证码格式不正确')
120
         this.$toast('验证码格式不正确')
121
+        canSubmit = true
120
         return
122
         return
121
       }
123
       }
122
       this.submitData(this.postData).then((res) => {
124
       this.submitData(this.postData).then((res) => {
124
           window.location.replace(this.getUrl('mainPage/coffeeIndex'))
126
           window.location.replace(this.getUrl('mainPage/coffeeIndex'))
125
         }, 2000)
127
         }, 2000)
126
       }).catch(() => {
128
       }).catch(() => {
129
+        console.log(111)
127
         canSubmit = true
130
         canSubmit = true
128
       })
131
       })
129
     }
132
     }
130
   },
133
   },
131
   created () {
134
   created () {
132
-    canSubmit = true 
135
+    canSubmit = true
133
     if (this.userInfo.customer.MapUser) {
136
     if (this.userInfo.customer.MapUser) {
134
       // this.showPage = true
137
       // this.showPage = true
135
       window.location.replace(this.getUrl('mainPage/coffeeIndex'))
138
       window.location.replace(this.getUrl('mainPage/coffeeIndex'))

+ 2
- 0
src/pages/user/bindMobile/bindMobile.vue 查看文件

171
       canSubmit = false
171
       canSubmit = false
172
       if (!this.postData.captcha) {
172
       if (!this.postData.captcha) {
173
         this.$toast('请填写验证码')
173
         this.$toast('请填写验证码')
174
+        canSubmit = true
174
         return
175
         return
175
       }
176
       }
176
       // if (!this.postData.case) {
177
       // if (!this.postData.case) {
194
           }, 2000)
195
           }, 2000)
195
         }
196
         }
196
       }).catch(() => {
197
       }).catch(() => {
198
+        console.log(111)
197
         canSubmit = true
199
         canSubmit = true
198
       })
200
       })
199
     }
201
     }

+ 2
- 2
src/pages/user/lessonDetail/index.vue 查看文件

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

+ 1
- 1
src/pages/user/receive/index.vue 查看文件

8
       <div class="title" v-if="$route.query.type === 'card'">{{data.CardName}}</div>
8
       <div class="title" v-if="$route.query.type === 'card'">{{data.CardName}}</div>
9
       <div class="title" v-else>{{data.CouponName}}</div>
9
       <div class="title" v-else>{{data.CouponName}}</div>
10
       <div class="video" v-if='video'>
10
       <div class="video" v-if='video'>
11
-        <video width="100%" height="100%" preload="auto" controls="controls" x5-playsinline="true">
11
+        <video width="100%" height="100%" preload="auto" controls="controls" x5-playsinline="true" :poster="type === 'card' ? data.Images[0].CardImageUrl : data.Images[0].CouponImageUrl">
12
           <source :src="data.VideoUrl" type="video/mp4">
12
           <source :src="data.VideoUrl" type="video/mp4">
13
           <source :src="data.VideoUrl" type="video/avi">
13
           <source :src="data.VideoUrl" type="video/avi">
14
           <source :src="data.VideoUrl" type="video/wma">
14
           <source :src="data.VideoUrl" type="video/wma">

+ 2
- 1
src/pages/user/receiveChannel/index.vue 查看文件

16
       <div class="title" v-if="$route.query.type === 'card'">{{data.CardName}}</div>
16
       <div class="title" v-if="$route.query.type === 'card'">{{data.CardName}}</div>
17
       <div class="title" v-else>{{data.CouponName}}</div>
17
       <div class="title" v-else>{{data.CouponName}}</div>
18
       <div class="video" v-if='video'>
18
       <div class="video" v-if='video'>
19
-        <video width="100%" height="100%" preload="auto" x5-playsinline="true" controls="controls">
19
+
20
+        <video width="100%" height="100%" preload="auto" x5-playsinline="true" controls="controls" :poster="type === 'card' ? data.Images[0].CardImageUrl : data.Images[0].CouponImageUrl">
20
           <source :src="data.VideoUrl" type="video/mp4">
21
           <source :src="data.VideoUrl" type="video/mp4">
21
           <source :src="data.VideoUrl" type="video/avi">
22
           <source :src="data.VideoUrl" type="video/avi">
22
           <source :src="data.VideoUrl" type="video/wma">
23
           <source :src="data.VideoUrl" type="video/wma">

+ 3
- 1
src/store/userCenter/userCenter.js 查看文件

240
       })
240
       })
241
     },
241
     },
242
     submitData (context, data) {
242
     submitData (context, data) {
243
-      return new Promise((resolve) => {
243
+      return new Promise((resolve,reject) => {
244
         http.submitData(data).then((res) => {
244
         http.submitData(data).then((res) => {
245
           resolve(res)
245
           resolve(res)
246
+        }).catch(() => {
247
+          reject()
246
         })
248
         })
247
       })
249
       })
248
     }
250
     }