diff --git a/pages.json b/pages.json
index 5ce82d1..ed6b0b8 100644
--- a/pages.json
+++ b/pages.json
@@ -3,7 +3,8 @@
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "全民演练",
- "enablePullDownRefresh": false
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
}
},
{
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1015568..789f711 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -6,9 +6,9 @@
-
+
-
+
@@ -67,7 +67,7 @@
},
onLoad() {
this.getSwiperList();
- this.checkLogin()
+ // this.checkLogin()
},
onShow() {
this.page= "home"
diff --git a/pages/my/my.vue b/pages/my/my.vue
index db4e3af..b7de2e9 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -8,9 +8,9 @@
-
+
-
+
diff --git a/pages/scan/scan.vue b/pages/scan/scan.vue
index 8e2b9f0..2caefbd 100644
--- a/pages/scan/scan.vue
+++ b/pages/scan/scan.vue
@@ -1,5 +1,5 @@
-
+
@@ -44,5 +44,6 @@
\ No newline at end of file
diff --git a/static/base_css.css b/static/base_css.css
index 5d667b8..2234db0 100644
--- a/static/base_css.css
+++ b/static/base_css.css
@@ -58,7 +58,7 @@ img {
.mainwrap {
- margin-top: 0px;
+ margin-top: 40px;
padding-bottom: 5%;
height: calc(100% - 100px);
width: 100%;
@@ -70,23 +70,23 @@ img {
.topcont {
position: relative;
- top: 4%;
+ top: 1%;
width: 100%;
- height: 10.5%;
+ height: 17.5%;
text-align: center;
}
.topcont img {
width: 80%;
- height: auto;
+ height: 100%;
}
.banbox {
position: relative;
- top: 4%;
+ top: -3.5%;
z-index: 1;
margin: 0 auto;
- height: 60%;
+ height: 65%;
width: 94%;
box-sizing: content-box;
border-radius: 10px;
@@ -95,7 +95,7 @@ img {
.itembox {
display: flex;
position: relative;
- top: 4%;
+ top: -3.5%;
margin: 3.5% auto 0;
width: 94%;
height: 21%;