yuantianjiao 6 years ago
parent
commit
a9085af18d

BIN
src/common/icon/bottomMsg.png View File


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

82
         justify-content: space-between;
82
         justify-content: space-between;
83
         span{
83
         span{
84
           color: rgba(168,182,200,1);
84
           color: rgba(168,182,200,1);
85
+          white-space: nowrap;
85
         }
86
         }
86
         i{
87
         i{
87
           color: rgba(168,182,200,1);
88
           color: rgba(168,182,200,1);
88
-          padding-left: .14rem;
89
           font-size: .12rem;
89
           font-size: .12rem;
90
         }
90
         }
91
         div{
91
         div{
99
           padding: .1rem;
99
           padding: .1rem;
100
           box-sizing: border-box;
100
           box-sizing: border-box;
101
           span{
101
           span{
102
-            width: 70%;
102
+            width: 85%;
103
             overflow:hidden;
103
             overflow:hidden;
104
             text-overflow:ellipsis;
104
             text-overflow:ellipsis;
105
             white-space:nowrap;
105
             white-space:nowrap;

+ 1
- 1
src/pages/user/card/index.vue View File

143
           })
143
           })
144
         }
144
         }
145
       } else {
145
       } else {
146
-        this.data[this.active].hasPic
146
+        this.data[this.active].hasPic = true
147
       }
147
       }
148
     })
148
     })
149
   },
149
   },

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

65
 export default {
65
 export default {
66
   data () {
66
   data () {
67
     return {
67
     return {
68
-      msg: {
69
-        course_type: 800,
70
-        orderNo: '342897789334'
71
-      },
72
       useType: '未使用',
68
       useType: '未使用',
73
       used,
69
       used,
74
       failure,
70
       failure,

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

66
   }
66
   }
67
   .useType{
67
   .useType{
68
     position: absolute;
68
     position: absolute;
69
-    top: 2.5rem;
69
+    top: 3.3rem;
70
     right: .5rem;
70
     right: .5rem;
71
     width: .76rem;
71
     width: .76rem;
72
     height: .76rem;
72
     height: .76rem;

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

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

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

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

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

136
     sdk (info) {
136
     sdk (info) {
137
       let logo, title
137
       let logo, title
138
       if (this.$route.query.type === 'card') {
138
       if (this.$route.query.type === 'card') {
139
-        logo = this.data.Images[0].CardImageUrl
139
+        logo = this.data.Images[0].CardImageUrl + '?x-oss-process=style/wxicon'
140
         title = this.data.CardName
140
         title = this.data.CardName
141
       } else {
141
       } else {
142
-        logo = this.data.Images[0].CouponImageUrl
142
+        logo = this.data.Images[0].CouponImageUrl + '?x-oss-process=style/wxicon'
143
         title = this.data.CouponName
143
         title = this.data.CouponName
144
       }
144
       }
145
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
145
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {

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

15
       <div class="title" v-if="$route.query.type === 'card'">{{data.CardName}}</div>
15
       <div class="title" v-if="$route.query.type === 'card'">{{data.CardName}}</div>
16
       <div class="title" v-else>{{data.CouponName}}</div>
16
       <div class="title" v-else>{{data.CouponName}}</div>
17
       <!-- <div class="video" v-if='video'> -->
17
       <!-- <div class="video" v-if='video'> -->
18
-        <video :src="data.VideoUrl" height="100%"
19
-          style="object-fit:fill" 
20
-          webkit-playsinline="true" 
21
-          x-webkit-airplay="true" 
22
-          playsinline="true" 
23
-          x5-video-player-type="h5"
24
-          x5-video-orientation="h5" 
25
-          x5-video-player-fullscreen="true"
26
-          preload="auto" 
27
-        ></video>
18
+        <video :src="data.VideoUrl" height="100%" width="100%" preload="auto" ></video>
28
       <!-- </div> -->
19
       <!-- </div> -->
29
       <div class="text">
20
       <div class="text">
30
         <div>
21
         <div>
146
     sdk (info) {
137
     sdk (info) {
147
       let logo, title
138
       let logo, title
148
       if (this.$route.query.type === 'card') {
139
       if (this.$route.query.type === 'card') {
149
-        logo = this.data.Images[0].CardImageUrl
140
+        logo = this.data.Images[0].CardImageUrl + '?x-oss-process=style/wxicon'
150
         title = this.data.CardName
141
         title = this.data.CardName
151
       } else {
142
       } else {
152
-        logo = this.data.Images[0].CouponImageUrl
143
+        logo = this.data.Images[0].CouponImageUrl + '?x-oss-process=style/wxicon'
153
         title = this.data.CouponName
144
         title = this.data.CouponName
154
       }
145
       }
155
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
146
       wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {