Merge branch 'feat/liujie'
This commit is contained in:
@@ -1,19 +1,19 @@
|
|||||||
@use '~@/scss/images.scss' as img;
|
@use '~@/scss/images.scss' as img;
|
||||||
|
|
||||||
.guide-bar-container {
|
.guide-bar-container {
|
||||||
padding-top: calc(60px + 20px + env(safe-area-inset-bottom));
|
// padding-top: calc(60px + 20px + env(safe-area-inset-bottom));
|
||||||
}
|
}
|
||||||
|
|
||||||
.guide-bar {
|
.guide-bar {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: calc(60px + 20px + env(safe-area-inset-bottom));
|
height: 112px;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
padding: 20px 12px env(safe-area-inset-bottom);
|
padding: 20px 12px 32px;
|
||||||
z-index: 999;
|
z-index: 999;
|
||||||
|
|
||||||
&-pages {
|
&-pages {
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ const GuideBar = (props) => {
|
|||||||
if (code === 'personal') {
|
if (code === 'personal') {
|
||||||
url = '/pages/userInfo/myself/index'
|
url = '/pages/userInfo/myself/index'
|
||||||
}
|
}
|
||||||
Taro.navigateTo({
|
Taro.redirectTo({
|
||||||
url: url,
|
url: url,
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
Taro.pageScrollTo({
|
Taro.pageScrollTo({
|
||||||
|
|||||||
@@ -905,10 +905,10 @@
|
|||||||
.sticky-bottom-bar {
|
.sticky-bottom-bar {
|
||||||
position: sticky;
|
position: sticky;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
padding: 10px 10px env(safe-area-inset-bottom);
|
padding: 10px 10px 32px;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: calc(52px + env(safe-area-inset-bottom));
|
height: 92px;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
|
|||||||
Reference in New Issue
Block a user