李志伟 3 年前
父节点
当前提交
39b916fe20

+ 1
- 1
src/App.vue 查看文件

9
 import { UserLogin } from './util/api'
9
 import { UserLogin } from './util/api'
10
 import { mapState } from 'vuex'
10
 import { mapState } from 'vuex'
11
 
11
 
12
-import Tabber from './components/Tabber.vue'
12
+import Tabber from './views/Tabber.vue'
13
 
13
 
14
 export default {
14
 export default {
15
   name: 'App',
15
   name: 'App',

+ 1
- 1
src/components/Question/Title.vue 查看文件

1
 <template>
1
 <template>
2
   <div class="question-title">
2
   <div class="question-title">
3
-    <span>{{`第${this.serialNo}题:`}}</span>
3
+    <span>{{`第${this.serialNo+1}题:`}}</span>
4
     <span>{{title}}</span>
4
     <span>{{title}}</span>
5
     <span>({{ formatType(qType) }})</span>
5
     <span>({{ formatType(qType) }})</span>
6
   </div>
6
   </div>

+ 1
- 1
src/components/Questionnaire.vue 查看文件

65
 import query from '../util/query'
65
 import query from '../util/query'
66
 
66
 
67
 export default {
67
 export default {
68
-  name: 'HelloWorld',
68
+  name: 'QuestionDetail',
69
   components: {
69
   components: {
70
     Question: () => import('./Question'),
70
     Question: () => import('./Question'),
71
     Popup: () => import('./Questionnaire/Popup.vue'),
71
     Popup: () => import('./Questionnaire/Popup.vue'),

+ 1
- 1
src/layout/index.vue 查看文件

40
         },
40
         },
41
         {
41
         {
42
           path: '/UserCenter',
42
           path: '/UserCenter',
43
-          text: '个人中心1',
43
+          text: '个人中心',
44
           icon: 'volume-o'
44
           icon: 'volume-o'
45
         }
45
         }
46
       ]
46
       ]

+ 7
- 7
src/router/index.js 查看文件

6
 import store from '../store'
6
 import store from '../store'
7
 
7
 
8
 import Course from '@/views/Course.vue'//课程
8
 import Course from '@/views/Course.vue'//课程
9
-import MyCollection from '../components/MyCollection.vue'//收藏
10
-import signIn from '../components/signIn.vue'//打卡
11
-import ClassInfo from '../components/ClassInfo.vue'//课堂详情
12
-import StrongPhoto from '../components/StrongPhoto.vue'//精彩集锦
13
-import UserCenter from '../components/UserCenter.vue'//我的页面
14
-import Questionnaire from '../components/Questionnaire.vue'
15
-import SetUser from '../components/userPages/SetUser.vue'//修改个人信息
9
+import MyCollection from '@/components/MyCollection.vue'//收藏
10
+import signIn from '@/components/signIn.vue'//打卡
11
+import ClassInfo from '@/components/ClassInfo.vue'//课堂详情
12
+import StrongPhoto from '@/views/StrongPhoto.vue'//精彩集锦
13
+import UserCenter from '@/views/UserCenter.vue'//我的页面
14
+import Questionnaire from '@/components/Questionnaire.vue'
15
+import SetUser from '@/components/userPages/SetUser.vue'//修改个人信息
16
 // // import Login from '../Login.vue'
16
 // // import Login from '../Login.vue'
17
 
17
 
18
 
18
 

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

3
 
3
 
4
 import axios from 'axios'
4
 import axios from 'axios'
5
 import store from '../store'
5
 import store from '../store'
6
+export const domain = process.env.NODE_ENV === 'development' ? '' : 'http://colmo-service.dianyang.njyunzhi.com'
6
 
7
 
7
 export default function (url, options) {
8
 export default function (url, options) {
8
   const { params, header, ...leftOptions } = options || {}
9
   const { params, header, ...leftOptions } = options || {}
14
     }
15
     }
15
     axios.request({
16
     axios.request({
16
       ...leftOptions,
17
       ...leftOptions,
17
-      url: url,
18
+      url: `${domain}${url}`,
18
       // header: header,
19
       // header: header,
19
       headers: header,
20
       headers: header,
20
     }).then(res => {
21
     }).then(res => {
21
       const { code, data, message } = res.data
22
       const { code, data, message } = res.data
22
       if (code === 1000) {
23
       if (code === 1000) {
23
         resolve(data)
24
         resolve(data)
25
+      } else {
26
+        reject(res.data)
24
       }
27
       }
25
     }).catch(err => {
28
     }).catch(err => {
26
       const message = err.message || err.errMsg || err
29
       const message = err.message || err.errMsg || err

+ 20
- 20
src/views/Course.vue 查看文件

75
         index: this.currentPage, //页数
75
         index: this.currentPage, //页数
76
         size: this.pageSize //每页个数
76
         size: this.pageSize //每页个数
77
       }
77
       }
78
-      xxxxxxx(params).then((res) => {
79
-        console.log(res)
80
-        this.dataTotal = res.total
81
-        //进行判断
82
-        if (this.dataTotal <= this.pageSize) {
83
-          this.Array = res.data.list
84
-          console.log(this.Array)
85
-        } else {
86
-          this.currentPage++
87
-          let arr = res.data.data.list
88
-          this.Array = this.Array.concat(arr)
89
-        }
90
-        // 加载状态结束
91
-        this.loading = false
92
-        // 数据全部加载完成
93
-        if (this.Array.length >= this.dataTotal) {
94
-          this.finished = true //结束,显示我也是有底线的
95
-        }
96
-      })
78
+      // xxxxxxx(params).then((res) => {
79
+      //   console.log(res)
80
+      //   this.dataTotal = res.total
81
+      //   //进行判断
82
+      //   if (this.dataTotal <= this.pageSize) {
83
+      //     this.Array = res.data.list
84
+      //     console.log(this.Array)
85
+      //   } else {
86
+      //     this.currentPage++
87
+      //     let arr = res.data.data.list
88
+      //     this.Array = this.Array.concat(arr)
89
+      //   }
90
+      //   // 加载状态结束
91
+      //   this.loading = false
92
+      //   // 数据全部加载完成
93
+      //   if (this.Array.length >= this.dataTotal) {
94
+      //     this.finished = true //结束,显示我也是有底线的
95
+      //   }
96
+      // })
97
     }
97
     }
98
   }
98
   }
99
 }
99
 }
108
 
108
 
109
 .Course-box {
109
 .Course-box {
110
   width: 100vw;
110
   width: 100vw;
111
+  padding-top: 10px;
111
 
112
 
112
   .banner-box-top {
113
   .banner-box-top {
113
     position: relative;
114
     position: relative;
114
-    margin-top: 10px;
115
     width: calc(100% - 20px);
115
     width: calc(100% - 20px);
116
 
116
 
117
     .banner-swipe {
117
     .banner-swipe {

src/components/StrongPhoto.vue → src/views/StrongPhoto.vue 查看文件


src/components/Tabber.vue → src/views/Tabber.vue 查看文件


src/components/UserCenter.vue → src/views/UserCenter.vue 查看文件