From 6277cf12f0d8edb55202941e28b389ff7eaae1b1 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Thu, 25 Mar 2021 14:43:37 +0800
Subject: [PATCH] Merge branch 'master' of ssh://dev.zhiheiot.com:29418/mob-components
---
layout/h5Page/CNavBar.vue | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/layout/h5Page/CNavBar.vue b/layout/h5Page/CNavBar.vue
index e7f2daf..50bfc5d 100644
--- a/layout/h5Page/CNavBar.vue
+++ b/layout/h5Page/CNavBar.vue
@@ -2,11 +2,17 @@
<view class="c-nav-bar">
<AtNavBar
:title="title"
- leftIconType="chevron-left"
- :onClickLeftIcon="evt=>onGoBack()"
+ :leftIconType="iconType"
+ :onClickLeftIcon="evt=>onClickIcon ? onClickIcon() : onGoBack()"
:rightFirstIconType="dropNav ? 'bullet-list' : ''"
:onClickRgIconSt="evt=>onDropMenu()"
/>
+ <view
+ class="c-nav-bar-right"
+ v-if="!dropNav"
+ >
+ <slot />
+ </view>
<view
class="c-nav-bar-drop"
v-show="dropShow"
@@ -38,6 +44,11 @@
},
props: {
title: String,
+ iconType: {
+ type: String,
+ default: 'chevron-left',
+ },
+ onClickIcon: Function,
dropNav: Array,
},
data() {
@@ -49,7 +60,7 @@
},
methods: {
onGoBack() {
- window.history.go(-1);
+ Taro.navigateBack();
},
onGoNav(nav) {
if (!nav.url) {
--
Gitblit v1.9.1