theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'gdpao' (#185) from gyh into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/185
This commit was merged in pull request #185.
This commit is contained in:
gyh
2020-08-13 19:42:28 +08:00
parent 5a1a8f01c0 137279b774
commit f4ae3578a2
2 changed files with 47 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pageC/merchant/index.vue
View File

@@ -16,7 +16,7 @@
</view> -->
<view class="top" :style="{'background':'url(' + info.store_banner + ') 100% 100% no-repeat' }">
<view class="mantle"></view>
<view class="main-container">
<view class="main-container" :style="{ 'padding-top': paddingTop }">
<image :src="info.store_avatar"></image>
<view class="info">
<view class="name u-line-1">{{info.store_name}}</view>
@@ -93,6 +93,7 @@ export default {
info: {},
page: 1,
scrollHeiht: '',
paddingTop: 0,
}
},
components:{
@@ -217,6 +218,8 @@ export default {
setViewHeight() {
const res = uni.getSystemInfoSync();
this.scrollHeiht = res.windowHeight - (73 + 20 + 170) + 'px';
this.paddingTop = res.windowWidth / 750 * (90 + 50) + 'px';
console.log(this.paddingTop);
}
},
onLoad(option){
@@ -255,7 +258,8 @@ export default {
.main-container {
display: flex;
align-items: center;
padding: 54rpx 60rpx 0 30rpx;
// padding-top: calc(var(--status-bar-height) + 54);
padding: 0 60rpx 0 30rpx;
position: absolute;
top: 0;
left: 0;