diff --git a/front/src/App.vue b/front/src/App.vue
index 4ea79a0..7c84290 100644
--- a/front/src/App.vue
+++ b/front/src/App.vue
@@ -17,8 +17,12 @@ export default {
-moz-osx-font-smoothing: grayscale;
text-align: center;
color: #2c3e50;
- max-width: 1920px;
+ max-width: 120rem;
margin: auto;
background-color: #f5f5f5;
}
+html,body{
+ width: 100%;
+ height: 100%;
+}
diff --git a/front/src/api/competition.js b/front/src/api/competition.js
index 94404c7..12f6027 100644
--- a/front/src/api/competition.js
+++ b/front/src/api/competition.js
@@ -1,9 +1,8 @@
import request from '@/utils/request'
let baseUrl = '/api/competition/'
-export function getList(query) {
+export function getList(pageNO,type) {
return request({
- url: baseUrl+'list',
- method: 'post',
- data: query
+ url: baseUrl+'list'+"/"+type+"/"+pageNO,
+ method: 'get'
})
}
\ No newline at end of file
diff --git a/front/src/components/index.vue b/front/src/components/index.vue
index 57091a8..7dcbc3c 100644
--- a/front/src/components/index.vue
+++ b/front/src/components/index.vue
@@ -330,6 +330,9 @@ import Footer from '@/components/footer.vue'
export default {
components:{
"tz-footer": Footer
+ },
+ mounted(){
+
},
methods:{
goCompetition(id){
diff --git a/front/src/router/index.js b/front/src/router/index.js
index 1bdee5c..5ea37bc 100644
--- a/front/src/router/index.js
+++ b/front/src/router/index.js
@@ -4,6 +4,7 @@ import Index from '@/components/index'
import CompetitionIndex from '@/views/competition/index'
import Login from '@/views/login/index'
import Exam from '@/views/system/exam'
+import Member from '@/views/member/index'
Vue.use(Router)
@@ -29,6 +30,11 @@ export default new Router({
path: '/exam',
name: 'Exam',
component: Exam
+ },
+ {
+ path: '/member',
+ name: 'Member',
+ component: Member
}
]
})
diff --git a/front/src/views/member/index.vue b/front/src/views/member/index.vue
new file mode 100644
index 0000000..fb8c102
--- /dev/null
+++ b/front/src/views/member/index.vue
@@ -0,0 +1,139 @@
+
+