yuantianjiao 6 年之前
父節點
當前提交
5b4013b615

+ 8
- 3
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 || (courseOrderDetail.IsDone === 0 && now > time(item.EndDate)), 'gray': courseOrderDetail.IsDone === 1 || (courseOrderDetail.IsDone === 0 && now > time(item.EndDate))}">
4
+    <div class="content" :class="{'opacity' : courseOrderDetail.IsDone === 1 || (courseOrderDetail.IsDone === 0 && now > time(courseOrderDetail.EndDate)), 'gray': courseOrderDetail.IsDone === 1 || (courseOrderDetail.IsDone === 0 && now > time(courseOrderDetail.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="courseOrderDetail.IsDone === 0 && now > time(item.EndDate)" width="100%" height="100%">
54
+      <img :src="failure" alt="已失效" v-if="courseOrderDetail.IsDone === 0 && now > time(courseOrderDetail.EndDate)" width="100%" height="100%">
55
     </div>
55
     </div>
56
   </div>
56
   </div>
57
 </template>
57
 </template>
70
       used,
70
       used,
71
       failure,
71
       failure,
72
       showQrCode: false,
72
       showQrCode: false,
73
-      showPage: false
73
+      showPage: false,
74
+      now: ''
74
     }
75
     }
75
   },
76
   },
76
   created () {
77
   created () {
78
+    this.now = Date.now()
77
     this.getCourseLocationList().then(() => {
79
     this.getCourseLocationList().then(() => {
78
       this.getCaseList().then(() => {
80
       this.getCaseList().then(() => {
79
         this.getCourseOrderDetail({
81
         this.getCourseOrderDetail({
117
         }
119
         }
118
       }
120
       }
119
     },
121
     },
122
+    time (time) {
123
+      return new Date(time).getTime()
124
+    }
120
   },
125
   },
121
   components: {
126
   components: {
122
     qrCode,
127
     qrCode,

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

496
           title: '城的空间',
496
           title: '城的空间',
497
           desc: '城的空间',
497
           desc: '城的空间',
498
           link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
498
           link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
499
-          thu_image: `https://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/citymini%2Findexlogo.jpg?x-oss-process=style/wxicon`
499
+          thu_image: `https://spaceofcheng.oss-cn-beijing.aliyuncs.com/indexlogo.jpg?x-oss-process=style/wxicon`
500
         }).then(() => {
500
         }).then(() => {
501
           wx.getLocation({
501
           wx.getLocation({
502
             type: 'gcj02', // 默认为wgs84的gps坐标,如果要返回直接给openLocation用的火星坐标,可传入'gcj02'
502
             type: 'gcj02', // 默认为wgs84的gps坐标,如果要返回直接给openLocation用的火星坐标,可传入'gcj02'

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

192
         title: '城的空间',
192
         title: '城的空间',
193
         desc: '城的空间',
193
         desc: '城的空间',
194
         link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
194
         link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
195
-        thu_image: `https://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/citymini%2Findexlogo.jpg?x-oss-process=style/wxicon`
195
+        thu_image: `https://spaceofcheng.oss-cn-beijing.aliyuncs.com/indexlogo.jpg?x-oss-process=style/wxicon`
196
       }).then(() => {
196
       }).then(() => {
197
         let result = this.courseDetail.CaseInfo.Coordinate.split(",")
197
         let result = this.courseDetail.CaseInfo.Coordinate.split(",")
198
         let latitude = parseFloat(result[0])
198
         let latitude = parseFloat(result[0])

+ 1
- 1
src/util/ajax.js 查看文件

10
     localStorage.setItem('JWT', headers.authorization)
10
     localStorage.setItem('JWT', headers.authorization)
11
     JWT = headers.authorization
11
     JWT = headers.authorization
12
   }
12
   }
13
-  const token = JWT ? JWT : localStorage.getItem('JWT')
13
+  const token = JWT ? JWT : localStorage.getItem('JWT') // eslint-disable-line
14
 
14
 
15
   return !token ? '' : token
15
   return !token ? '' : token
16
 }
16
 }