Explorar el Código

Merge branch '2.0.1'

yuantianjiao hace 6 años
padre
commit
a808d46df4
Se han modificado 3 ficheros con 6 adiciones y 12 borrados
  1. 1
    10
      src/pages/user/App.vue
  2. 4
    1
      src/pages/user/majorProjects/index.vue
  3. 1
    1
      vue.config.js

+ 1
- 10
src/pages/user/App.vue Ver fichero

@@ -6,16 +6,13 @@
6 6
 
7 7
 <script>
8 8
 import '../../common/css/reset.css'
9
-import logo from '../../common/icon/indexlogo.jpg'
10
-import wxsdk from '../../util/share'
11 9
 import { mapState, createNamespacedHelpers } from 'vuex'
12 10
 const { mapActions: actions } = createNamespacedHelpers('userCenter')
13 11
 export default {
14 12
   name: 'app',
15 13
   data () {
16 14
     return {
17
-      showPage: false,
18
-      logo
15
+      showPage: false
19 16
     }
20 17
   },
21 18
   components: {},
@@ -34,12 +31,6 @@ export default {
34 31
     this.getUserInfo({ org: this.org, code: this.code }).then(() => {
35 32
       this.showPage = true
36 33
     })
37
-    // wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
38
-    //   title: '城的空间',
39
-    //   desc: '城的空间',
40
-    //   link: `${window.location.origin}${window.location.pathname}#/mainPage/indexPage`,
41
-    //   thu_image: `https://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/citymini%2Findexlogo.jpg`
42
-    // })
43 34
   },
44 35
   methods: {
45 36
     ...actions(['getUserInfo'])

+ 4
- 1
src/pages/user/majorProjects/index.vue Ver fichero

@@ -7,7 +7,7 @@
7 7
             <img :src='item.CaseImageUrl' class="cover" alt="">
8 8
           </swiper-slide>
9 9
         </swiper> -->
10
-        <img :src="projectInfo.CmsCaseImgs[0].CaseImageUrl" alt="">
10
+        <img :src="cover" alt="" class="cover">
11 11
       </div>
12 12
     </div>
13 13
     <p>{{projectInfo.DetailContent}}</p>
@@ -69,6 +69,7 @@ export default {
69 69
       },
70 70
       courseList: [], // 课程列表
71 71
       initList: [],
72
+      cover:''
72 73
     }
73 74
   },
74 75
   computed: {
@@ -141,6 +142,8 @@ export default {
141 142
             endDate: new Date(res.Courses[n].EndDate).getTime(),
142 143
           })
143 144
         }
145
+        this.cover = res.CmsCaseImgs.filter(item => item.ImageType === 'detail')[0].CaseImageUrl
146
+        console.log(this.cover)
144 147
         console.log(aArr)
145 148
         this.initList = aArr
146 149
         this.calcArr()

+ 1
- 1
vue.config.js Ver fichero

@@ -34,7 +34,7 @@ module.exports = {
34 34
       },
35 35
     },
36 36
     // compress: true,
37
-    devtool: 'source-map',
37
+    // devtool: 'source-map',
38 38
     disableHostCheck: true,   // That solved it
39 39
   }
40 40
 }