|
|
@@ -8,25 +8,25 @@
|
|
|
'align-items-center':!customNav,
|
|
|
}"
|
|
|
:style="[{'height': customBarH + 'px', 'padding-top': statusBarH + 'px','background':bgckgroundBox}]">
|
|
|
- <view @tap="goBack">
|
|
|
- <!-- <text class="iconfont" v-if="leftShow">
|
|
|
- 
|
|
|
- </text> -->
|
|
|
- <uni-icons type="left" :color="leftColor" size="18" v-if="leftShow"></uni-icons>
|
|
|
+ <view @tap="goBack" v-if="leftShow">
|
|
|
+ <uni-icons type="left" :color="leftColor" size="18" ></uni-icons>
|
|
|
</view>
|
|
|
|
|
|
<view v-if="!customNav" class="title-text">{{title}}</view>
|
|
|
-
|
|
|
<view v-else class="">
|
|
|
<slot name="custom"></slot>
|
|
|
</view>
|
|
|
|
|
|
- <view class="right-button button" @click="rightClick">
|
|
|
- <slot name="right" v-if="rightShow">
|
|
|
+
|
|
|
+
|
|
|
+ <view v-if="rightShow" class="right-button button" @click="rightClick">
|
|
|
+ <slot name="right" >
|
|
|
<text class="rightName" v-if="rightType===1">{{rightText}}</text>
|
|
|
<text class="rightName r-but" v-else>{{rightText}}</text>
|
|
|
</slot>
|
|
|
</view>
|
|
|
+ <view v-else class="w-right"></view>
|
|
|
+
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
@@ -115,7 +115,6 @@
|
|
|
if(!this.leftShow){
|
|
|
return ;
|
|
|
}
|
|
|
- // this.$emit('leftClick')
|
|
|
tools.leftClick()
|
|
|
}
|
|
|
},
|
|
|
@@ -126,14 +125,14 @@
|
|
|
let custom=0;
|
|
|
//#ifdef MP-WEIXIN
|
|
|
custom = wx.getMenuButtonBoundingClientRect()
|
|
|
- console.log(custom,'11111111111111');
|
|
|
+
|
|
|
this.customBarH = custom.height
|
|
|
//#endif
|
|
|
//#ifdef H5
|
|
|
this.customBarH = 30
|
|
|
this.left=0
|
|
|
//#endif
|
|
|
- console.log('self.customBarH---------'+this.customBarH)
|
|
|
+
|
|
|
this.$emit('navHeight', this.customBarH-10)
|
|
|
}
|
|
|
})
|
|
|
@@ -200,7 +199,9 @@
|
|
|
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+ .w-right{
|
|
|
+ width: 20rpx;
|
|
|
+ }
|
|
|
|
|
|
.box-title {
|
|
|
width: 100vw;
|