diff --git a/pages/public/login.vue b/pages/public/login.vue
index 2e19f74..0bc3be9 100644
--- a/pages/public/login.vue
+++ b/pages/public/login.vue
@@ -10,7 +10,7 @@
Hello!
欢迎使用优购商城
-
+
{{ dataObj.con[type].title }}
@@ -115,8 +115,7 @@
},
3: {
title: '用户注册',
- arr: [1, 4, 5],
- // arr: [1, 2, 4, 5],
+ arr: [1, 2, 4, 5],
text: '已有账号,',
btn1: 4,
btn2: 3,
@@ -346,6 +345,7 @@
.login {
position: relative;
min-height: 100vh;
+ padding-bottom: 200rpx;
.login_top_img {
position: absolute;
z-index: 1;
@@ -373,7 +373,7 @@
background-color: #ffffff;
border-radius: 40rpx;
position: absolute;
- top:220rpx;
+ top: 220rpx;
left: 5%;
box-sizing: border-box;
overflow: hidden;
diff --git a/sheep/components/s-layout/s-layout.vue b/sheep/components/s-layout/s-layout.vue
index 2b9a6f0..200608f 100644
--- a/sheep/components/s-layout/s-layout.vue
+++ b/sheep/components/s-layout/s-layout.vue
@@ -202,10 +202,16 @@
});
const bgMain = computed(() => {
+ const bgColor = props.bgStyle.backgroundColor || props.bgStyle.color;
+ const bgImg = props.bgStyle.backgroundImage
+ ? `url(${sheep.$url.cdn(props.bgStyle.backgroundImage)})`
+ : 'none';
return {
- background: `${props.bgStyle.backgroundColor || props.bgStyle.color} url(${sheep.$url.cdn(
- props.bgStyle.backgroundImage,
- )}) no-repeat top center / 100% auto`,
+ backgroundColor: bgColor,
+ backgroundImage: bgImg,
+ backgroundRepeat: 'no-repeat',
+ backgroundPosition: 'top center',
+ backgroundSize: '100% auto',
};
});
@@ -291,9 +297,15 @@
}
.page-app {
+ min-height: 100vh;
+ display: flex;
+ flex-direction: column;
.page-main {
+ flex: 1;
+ display: flex;
+ flex-direction: column;
.pageCon {
- // min-height: 100vh;
+ flex: 1;
box-sizing: border-box;
}
}