diff --git a/components/bottom-button/index.vue b/components/bottom-button/index.vue index 14606a0..686489b 100644 --- a/components/bottom-button/index.vue +++ b/components/bottom-button/index.vue @@ -56,7 +56,7 @@ export default { position: fixed; bottom: 0; width: calc(100% - 40rpx); - padding: 10rpx 20rpx; + padding: 18rpx 20rpx; height: 80rpx; background: #FFFFFF; border-top: 1px solid #cccccc; diff --git a/components/bottom-button/three.vue b/components/bottom-button/three.vue index ce0e871..cb07693 100644 --- a/components/bottom-button/three.vue +++ b/components/bottom-button/three.vue @@ -55,7 +55,7 @@ export default { position: fixed; bottom: 0; width: calc(100% - 40rpx); - padding: 10rpx 20rpx; + padding: 18rpx 20rpx; height: 80rpx; background: #FFFFFF; border-top: 1px solid #cccccc; diff --git a/pages.json b/pages.json index 45e46a4..06bc580 100644 --- a/pages.json +++ b/pages.json @@ -54,7 +54,7 @@ // 开启下拉刷新 "enablePullDownRefresh": true, "navigationBarBackgroundColor": "#FFFFFF", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "white" } }, { @@ -121,7 +121,16 @@ "navigationBarBackgroundColor": "#F6F8FA", "navigationBarTextStyle": "black" } - }, + }, + { + "path": "pages/mine/password", + "style": { + "navigationBarTitleText": "修改密码", + // "navigationStyle": "default", + "navigationBarBackgroundColor": "#F6F8FA", + "navigationBarTextStyle": "black" + } + }, { "path": "pages/knowledge/index", "style": { diff --git a/pages/map/index.vue b/pages/map/index.vue index 6da7ce5..3ab3e8f 100644 --- a/pages/map/index.vue +++ b/pages/map/index.vue @@ -539,16 +539,16 @@ export default { position: relative; .location { position: absolute; - width: 56px; - height: 56px; + width: 48px; + height: 48px; display: flex; align-items: center; justify-content: center; right: 10px; - top: calc(50vh + 80px); + top: calc(50vh + 70px); background: #fff; border-radius: 16px; - z-index: 99999; + z-index: 99998; cover-image { width: 32px; height: 32px; @@ -563,7 +563,7 @@ export default { background: #fff; border-radius: 4px; box-sizing: border-box; - z-index: 9999; + z-index: 99999; .status { position: absolute; top: 0px; diff --git a/pages/mine/index.vue b/pages/mine/index.vue index 497cecc..14d369d 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -1,161 +1,335 @@ - - - - - + + + + + \ No newline at end of file diff --git a/pages/mine/password.vue b/pages/mine/password.vue new file mode 100644 index 0000000..da5025b --- /dev/null +++ b/pages/mine/password.vue @@ -0,0 +1,161 @@ + + + + + + \ No newline at end of file diff --git a/static/mine/background.png b/static/mine/background.png new file mode 100644 index 0000000..aa18d28 Binary files /dev/null and b/static/mine/background.png differ diff --git a/static/scimg/left1.png b/static/scimg/left1.png index 9036de5..958a999 100644 Binary files a/static/scimg/left1.png and b/static/scimg/left1.png differ diff --git a/static/scimg/left1copy.png b/static/scimg/left1copy.png new file mode 100644 index 0000000..9036de5 Binary files /dev/null and b/static/scimg/left1copy.png differ