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

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

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/342
This commit is contained in:
gyh 2020-09-05 16:35:07 +08:00
commit 273d984ea6
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pageB/sdetails/index.vue
View File

@ -1202,9 +1202,10 @@ export default {
background-color: #fff;
display: flex;
position: fixed;
height: 98rpx;
width: 100%;
bottom:0;
bottom: 0;
left: 0;
padding-bottom: env(safe-area-inset-bottom);
// border-top: 1rpx solid #ececec;
z-index: 10076;
.navs{

11
pageC/merchant/index.vue
View File

@ -53,7 +53,7 @@
<goods :sid="sid"></goods>
</view>
</view>
<view class="tabbar">
<view class="tabbar" :style="safeareaStyle">
<view @click="switchCurrent(0)">
<image src="/static/image/shop/9.png"></image>
<view>商品分类</view>
@ -94,6 +94,7 @@ export default {
page: 1,
scrollHeiht: '',
paddingTop: 0,
safeareaStyle: "", // 苹果底部
}
},
components:{
@ -125,6 +126,10 @@ export default {
this.getArticlelist();
this.setViewHeight();
// this.getStoreImgVideoList();
// #ifdef APP-PLUS
this.device = uni.getSystemInfoSync(); // 获取信息
console.log(this.device.safeArea);
// #endif
},
onShow() {
this.cur = 0;
@ -398,14 +403,14 @@ body {
.tabbar {
border-top: 1rpx #DBDADA solid;
width: 100%;
height: 98rpx;
background: rgba(251,251,251,1);
display: flex;
padding: 10rpx 55rpx;
position: fixed;
bottom: 0;
left: 0;
z-index: 9;
padding: 10rpx 55rpx;
padding-bottom: env(safe-area-inset-bottom);
> view {
flex: 1;
text-align: center;