yuantianjiao 6 years ago
parent
commit
945d32c90e

+ 6
- 2
src/pages/user/lessonDetail/index.vue View File

26
         <span>下单时间</span>
26
         <span>下单时间</span>
27
         <span class="flex-item">{{toolClass.dateFormat(courseOrderDetail.CreateDate)}}</span>
27
         <span class="flex-item">{{toolClass.dateFormat(courseOrderDetail.CreateDate)}}</span>
28
       </div>
28
       </div>
29
-      <!-- <div class="list-item">
29
+      <div class="list-item flex-h">
30
+        <span>课程时间</span>
31
+        <span class="flex-item">{{toolClass.dateFormat(courseOrderDetail.CreateDate)}}</span>
32
+      </div>
33
+      <div class="list-item">
30
         <span>地点</span>
34
         <span>地点</span>
31
         <span>{{returnCaseName(courseOrderDetail.CaseId)}}</span>
35
         <span>{{returnCaseName(courseOrderDetail.CaseId)}}</span>
32
-      </div> -->
36
+      </div>
33
       <div class="list-item">
37
       <div class="list-item">
34
         <span>付款方式</span>
38
         <span>付款方式</span>
35
         <span>{{courseOrderDetail.CourseObtaimType === 'cheng-coin' ? '城币支付' : '优惠券抵用'}}</span>
39
         <span>{{courseOrderDetail.CourseObtaimType === 'cheng-coin' ? '城币支付' : '优惠券抵用'}}</span>

+ 2
- 2
src/pages/user/lessonDetail/page.scss View File

66
   }
66
   }
67
   .useType{
67
   .useType{
68
     position: absolute;
68
     position: absolute;
69
-    bottom: 1.6rem;
70
-    right: .8rem;
69
+    bottom: 3.2rem;
70
+    right: .5rem;
71
     width: .76rem;
71
     width: .76rem;
72
     height: .76rem;
72
     height: .76rem;
73
   }
73
   }

+ 6
- 6
src/pages/user/mainPage/coffeeIndex/index.vue View File

153
       cardTotalCount: 0,
153
       cardTotalCount: 0,
154
       postCouponData: {
154
       postCouponData: {
155
         page: 1,
155
         page: 1,
156
-        pageSize: 10000
156
+        pagesize: 10000
157
       },
157
       },
158
       postCardData: {
158
       postCardData: {
159
         page: 1,
159
         page: 1,
160
-        pageSize: 10000
160
+        pagesize: 10000
161
       },
161
       },
162
       pullUpLoad: true,
162
       pullUpLoad: true,
163
       pullUpLoadThreshold: 40,
163
       pullUpLoadThreshold: 40,
208
           hasPic: false,
208
           hasPic: false,
209
           hasMore: true,
209
           hasMore: true,
210
           page: 1,
210
           page: 1,
211
-          pageSize: 1,
211
+          pagesize: 1,
212
           list: []
212
           list: []
213
         },
213
         },
214
         {
214
         {
215
           hasPic: false,
215
           hasPic: false,
216
           hasMore: true,
216
           hasMore: true,
217
           page: 1,
217
           page: 1,
218
-          pageSize: 1,
218
+          pagesize: 1,
219
           list: []
219
           list: []
220
         },
220
         },
221
         {
221
         {
222
           hasPic: false,
222
           hasPic: false,
223
           hasMore: true,
223
           hasMore: true,
224
           page: 1,
224
           page: 1,
225
-          pageSize: 1,
225
+          pagesize: 1,
226
           list: []
226
           list: []
227
         },
227
         },
228
         {
228
         {
229
           hasPic: false,
229
           hasPic: false,
230
           hasMore: true,
230
           hasMore: true,
231
           page: 1,
231
           page: 1,
232
-          pageSize: 1,
232
+          pagesize: 1,
233
           list: []
233
           list: []
234
         }
234
         }
235
       ]
235
       ]

+ 4
- 2
src/pages/user/majorProjectsDetail/index.vue View File

4
       <div class="content">
4
       <div class="content">
5
         <div class="banner">
5
         <div class="banner">
6
           <div class="scrollImg">
6
           <div class="scrollImg">
7
-            <img :src='courseDetail.CourseImgs? courseDetail.CourseImgs[0].ImgUrl : ""' class="cover" alt="">
7
+            <img :src='topImage' class="cover" alt="">
8
             <!-- <swiper :options="swiperOption" ref="mySwiper">
8
             <!-- <swiper :options="swiperOption" ref="mySwiper">
9
               <swiper-slide class="swiper-slide" v-for="(item,index) in courseDetail.CourseImgs" :key="index">
9
               <swiper-slide class="swiper-slide" v-for="(item,index) in courseDetail.CourseImgs" :key="index">
10
                 <img :src='item.ImgUrl' class="cover" alt="">
10
                 <img :src='item.ImgUrl' class="cover" alt="">
100
       showMoreCourse: false, // 显隐更多课程时间
100
       showMoreCourse: false, // 显隐更多课程时间
101
       courseTimeList: [], // 课程时间
101
       courseTimeList: [], // 课程时间
102
       detailImage: [],
102
       detailImage: [],
103
-      showPage: false
103
+      showPage: false,
104
+      topImage: ''
104
     }
105
     }
105
   },
106
   },
106
   computed: {
107
   computed: {
130
         arr = []
131
         arr = []
131
       }
132
       }
132
       this.courseDetail.CourseImgs = this.courseDetail.CourseImgs || []
133
       this.courseDetail.CourseImgs = this.courseDetail.CourseImgs || []
134
+      this.topImage = this.courseDetail.CourseImgs.length > 0 ? this.courseDetail.CourseImgs[0].ImgUrl : ""
133
       if (this.courseDetail.CourseImgs.length > 0) {
135
       if (this.courseDetail.CourseImgs.length > 0) {
134
         this.detailImage = this.courseDetail.CourseImgs.slice(1)
136
         this.detailImage = this.courseDetail.CourseImgs.slice(1)
135
       }
137
       }

+ 2
- 2
src/pages/user/receive/index.vue View File

119
     receive () {
119
     receive () {
120
       if (this.$route.query.type === 'card') {
120
       if (this.$route.query.type === 'card') {
121
         this.setCardShare({ id: this.$route.query.id, salesid: this.$route.query.salesid, serialcode: this.$route.query.random }).then(() => {
121
         this.setCardShare({ id: this.$route.query.id, salesid: this.$route.query.salesid, serialcode: this.$route.query.random }).then(() => {
122
-          this.$router.push({ name: 'receiveResults', query: { type: 'success' } })
122
+          this.$router.push({ name: 'receiveResults', query: { type: 'success', text: '卡券' } })
123
         }).catch((err) => {
123
         }).catch((err) => {
124
           this.$router.push({ name: 'receiveResults', query: { type: 'fail' } })
124
           this.$router.push({ name: 'receiveResults', query: { type: 'fail' } })
125
           console.log(err)
125
           console.log(err)
126
         })
126
         })
127
       } else {
127
       } else {
128
         this.setCouponShare({ id: this.$route.query.id, salesid: this.$route.query.salesid, serialcode: this.$route.query.random }).then(() => {
128
         this.setCouponShare({ id: this.$route.query.id, salesid: this.$route.query.salesid, serialcode: this.$route.query.random }).then(() => {
129
-          this.$router.push({ name: 'receiveResults', query: { type: 'success' } })
129
+          this.$router.push({ name: 'receiveResults', query: { type: 'success', text: '优惠券' } })
130
         }).catch((err) => {
130
         }).catch((err) => {
131
           this.$router.push({ name: 'receiveResults', query: { type: 'fail' } })
131
           this.$router.push({ name: 'receiveResults', query: { type: 'fail' } })
132
           console.log(err)
132
           console.log(err)

+ 4
- 4
src/pages/user/receiveChannel/index.vue View File

59
       video: true,
59
       video: true,
60
       button: true,
60
       button: true,
61
       show: false,
61
       show: false,
62
-      type:'',
62
+      type: '',
63
       data: {}
63
       data: {}
64
     }
64
     }
65
   },
65
   },
85
     }
85
     }
86
 
86
 
87
     this.type = this.$route.query.type
87
     this.type = this.$route.query.type
88
-    
88
+
89
     this.getCaseList().then(() => {
89
     this.getCaseList().then(() => {
90
       this.init()
90
       this.init()
91
     })
91
     })
119
     receive () {
119
     receive () {
120
       if (this.$route.query.type === 'card') {
120
       if (this.$route.query.type === 'card') {
121
         this.setChannelCardShare({ id: this.$route.query.id }).then(() => {
121
         this.setChannelCardShare({ id: this.$route.query.id }).then(() => {
122
-          this.$router.push({ name: 'receiveResults', query: { type: 'success' } })
122
+          this.$router.push({ name: 'receiveResults', query: { type: 'success', text: '卡券' } })
123
         }).catch((err) => {
123
         }).catch((err) => {
124
           this.$router.push({ name: 'receiveResults', query: { type: 'fail' } })
124
           this.$router.push({ name: 'receiveResults', query: { type: 'fail' } })
125
           console.log(err)
125
           console.log(err)
126
         })
126
         })
127
       } else {
127
       } else {
128
         this.setChannelCouponShare({ id: this.$route.query.id }).then(() => {
128
         this.setChannelCouponShare({ id: this.$route.query.id }).then(() => {
129
-          this.$router.push({ name: 'receiveResults', query: { type: 'success' } })
129
+          this.$router.push({ name: 'receiveResults', query: { type: 'success', text: '优惠券' } })
130
         }).catch((err) => {
130
         }).catch((err) => {
131
           this.$router.push({ name: 'receiveResults', query: { type: 'fail' } })
131
           this.$router.push({ name: 'receiveResults', query: { type: 'fail' } })
132
           console.log(err)
132
           console.log(err)

+ 6
- 3
src/pages/user/receiveResults/index.vue View File

5
       <i class="iconfont icon-shibai fail" v-else></i>
5
       <i class="iconfont icon-shibai fail" v-else></i>
6
       <span v-if="status === 'success'">领取成功</span>
6
       <span v-if="status === 'success'">领取成功</span>
7
       <span v-else>领取失败</span>
7
       <span v-else>领取失败</span>
8
-      <span v-if="status === 'success'">快去个人中心查看我的体验券</span>
9
-      <span v-else>{{msg}}</span>
10
-      <div class="back" v-if="status === 'success'" @click="back">查看我的体验券</div>
8
+      <span v-if="status === 'success'">快去个人中心查看我的{{$route.query.text}}</span>
9
+      <span v-else>{{fli(msg)}}</span>
10
+      <div class="back" v-if="status === 'success'" @click="back">查看我的{{$route.query.text}}</div>
11
       <div v-else></div>
11
       <div v-else></div>
12
       <img :src="logo" class="bottomLogo">
12
       <img :src="logo" class="bottomLogo">
13
     </div>
13
     </div>
36
   methods: {
36
   methods: {
37
     back () {
37
     back () {
38
       this.$router.push({ name: 'userCenter' })
38
       this.$router.push({ name: 'userCenter' })
39
+    },
40
+    fli (msg) {
41
+      return msg.substring(10, msg.length)
39
     }
42
     }
40
   }
43
   }
41
 }
44
 }