diff --git a/components/index_page.vue b/components/index_page.vue index 1afa257..8a90f78 100644 --- a/components/index_page.vue +++ b/components/index_page.vue @@ -74,8 +74,8 @@ background-color: #fff; height: 12vh; display: flex; - border-radius: 15px; align-items: center; + margin: 10px; } .page view:first-of-type { diff --git a/components/part.vue b/components/part.vue index c4e2dd5..a1d099a 100644 --- a/components/part.vue +++ b/components/part.vue @@ -86,6 +86,7 @@ .part { width: 100%; + margin: 10px; } .part p:first-child { diff --git a/pages.json b/pages.json index 929449a..b57e8a8 100644 --- a/pages.json +++ b/pages.json @@ -42,6 +42,12 @@ "style": { "navigationBarTitleText": "" } + }, + { + "path": "pages/index/voluteer_son", + "style": { + "navigationBarTitleText": "" + } } ], "globalStyle": { diff --git a/pages/index/index.vue b/pages/index/index.vue index 6e69d00..2b14ae2 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -8,7 +8,7 @@ - + @@ -34,10 +34,10 @@ 楷模列表 + - - +

{{path_image[1]}}

@@ -101,7 +101,7 @@ method: "GET", headers: { "Content-Type": "application/json", - "Authorization":(await this.requests("up", "/app/login")).token + "Authorization": (await this.requests("up", "/app/login")).token }, }) @@ -109,6 +109,20 @@ const data = await response.json() console.log(data) return data + }, + gowhere(index) { + switch (index) { + case 1: + uni.navigateTo({ + url: '/pages/index/voluteer' + }); + break; + case 2: + uni.navigateTo({ + url: '/pages/index/student' + }); + break; + } } }, async mounted() { @@ -118,7 +132,7 @@ datavalue.push(this.requests("down", `/appNotice/app-o/loopMapDetail?id=${i}`)) } datavalue = (await Promise.all(datavalue)).map(x => x.data.picPath) - this.banner_content =datavalue + this.banner_content = datavalue console.log(datavalue) }, } @@ -131,7 +145,7 @@ } .begin { - background-color: rgb(246, 246, 246); + background-color: rgb(221,221,221); } .text1 { @@ -157,13 +171,16 @@ border: 1px red solid; background-color: #fff !important; } - .headers_middle swiper{ + + .headers_middle swiper { height: 100%; } - .headers_middle swiper .swiper-item image{ + + .headers_middle swiper .swiper-item image { width: 100%; height: 25vh; } + .headers_bottom { height: 10vh; display: flex; @@ -225,9 +242,8 @@ } .headers+view+view { - background-color: rgb(246, 246, 246); margin: 10px 15px; - padding-bottom: 10px; + padding-bottom: 65px; } .title { @@ -241,6 +257,12 @@ .index_end { display: flex; justify-content: space-around; + position: fixed; + bottom: 0; + left: 0; + width: 100vw; + background-color: #fff; + height:65px; } .nav_bottom { @@ -248,13 +270,13 @@ flex-direction: column; align-items: center; } - + .nav_bottom image { - width: 6vw; - height: 3vh; + width: 40px; + height: 40px; } - + .nav_bottom:nth-child(1) p { color: #C2050F; } - \ No newline at end of file + diff --git a/pages/index/student.vue b/pages/index/student.vue index 91ce147..32252c3 100644 --- a/pages/index/student.vue +++ b/pages/index/student.vue @@ -20,7 +20,7 @@
- +

{{path_image[1]}}

@@ -66,7 +66,7 @@ this.write_none = false; this.useInput = "" }, - async requests(updown,path) { + async requests(updown, path) { let response if (updown == "up") { response = await fetch(`http://124.93.196.45:10091/Neusoft/times-model${path}`, { @@ -92,10 +92,24 @@ const data = await response.json() console.log(data) return data + }, + gowhere(index) { + switch (index) { + case 0: + uni.navigateTo({ + url: '/pages/index/index' + }); + break; + case 1: + uni.navigateTo({ + url: '/pages/index/voluteer' + }); + break; + } } }, - async mounted(){ - await this.requests("down","/appStudy/app/deleteStatement") + async mounted() { + await this.requests("down", "/appStudy/app/deleteStatement") } } @@ -138,14 +152,26 @@ .student_end { display: flex; justify-content: space-around; + background-color: white; + position: fixed; + bottom: 0; + left: 0; + width: 100vw; + height:65px; } + .nav_bottom { + display: flex; + flex-direction: column; + align-items: center; + } + .nav_bottom image { width: 40px; height: 40px; } - + .nav_bottom:nth-child(3) p { color: #C2050F; } - \ No newline at end of file + diff --git a/pages/index/voluteer.vue b/pages/index/voluteer.vue index 95ec693..e50df2d 100644 --- a/pages/index/voluteer.vue +++ b/pages/index/voluteer.vue @@ -22,7 +22,13 @@ 已报名{{ever[6]}}人
- 去报名 + 去报名 +
+
+ + + +

{{path_image[1]}}

@@ -36,10 +42,16 @@ + +