diff --git a/.gitignore b/.gitignore index 05ef7ea..631c3c7 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ node_modules/ .project unpackage/ .DS_Store +.idea \ No newline at end of file diff --git a/common/style/base-style.scss b/common/style/base-style.scss index c4d5643..0bc2b45 100644 --- a/common/style/base-style.scss +++ b/common/style/base-style.scss @@ -7,3 +7,4 @@ $text-font-color-1:#000; //文字主色 $text-font-color-2:#676767; //副标题颜色 $text-font-color-3:#a7a7a7; //浅色 $text-font-color-4:#e4e4e4; //更浅 + \ No newline at end of file diff --git a/common/style/common-style.scss b/common/style/common-style.scss index e182489..7de1934 100644 --- a/common/style/common-style.scss +++ b/common/style/common-style.scss @@ -1,19 +1,4 @@ -view,swiper,swiper-item{ - box-sizing: border-box; -} - -.pageBg{ - background: - linear-gradient(to bottom,transparent,#fff 400rpx), - linear-gradient(to right,#beecd8 20%,#F4E2D8); - min-height: 80vh; -} - -.loadingLayout{ - padding:30rpx 0; -} - -.safe-area-inset-bottom{ - height: env(safe-area-inset-bottom); +.safe-area-inset-bottom { + height: env(safe-area-inset-bottom); } diff --git a/pages.json b/pages.json index 993dc17..49d074a 100644 --- a/pages.json +++ b/pages.json @@ -26,6 +26,14 @@ "navigationBarTitleText": "个人中心", "navigationStyle": "custom" } + }, + { + "path" : "pages/set/set", + "style" : + { + "navigationBarTitleText" : "设置", + "autoBackButton":true + } } ], "tabBar": { diff --git a/pages/profile/profile.vue b/pages/profile/profile.vue index 1e05df4..0ba0579 100644 --- a/pages/profile/profile.vue +++ b/pages/profile/profile.vue @@ -16,8 +16,8 @@ 昵称 123****8912 - - + + @@ -136,6 +136,9 @@ export default { } }, methods: { + gotoPage(url) { + uni.navigateTo({ url }) + }, goToAgentApply() { uni.showToast({ title: '申请代理', @@ -181,7 +184,6 @@ export default { position: relative; background: #ffffff; - .avatar { position: absolute; top: -80rpx; // 头像向上偏移,一半在容器外 diff --git a/pages/set/set.vue b/pages/set/set.vue new file mode 100644 index 0000000..bb787c0 --- /dev/null +++ b/pages/set/set.vue @@ -0,0 +1,13 @@ + + + + +