From a69aee6376d5564b68439a5e51c3177f1d6f88af Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Sat, 19 Jun 2021 17:08:51 +0800
Subject: [PATCH] 修复升级后 Tools 在 h5 模式下 rem 转 px 函数报错的问题
---
layout/h5Page/CNavBar.vue | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/layout/h5Page/CNavBar.vue b/layout/h5Page/CNavBar.vue
index e7f2daf..096602c 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"
@@ -37,7 +43,16 @@
AtNavBar,
},
props: {
+ // H5页面导航标题
title: String,
+ // H5页面导航左侧图标
+ iconType: {
+ type: String,
+ default: 'chevron-left',
+ },
+ // H5页面导航左侧图点击事件
+ onClickIcon: Function,
+ // H5页面导航右侧下拉菜单配置
dropNav: Array,
},
data() {
@@ -49,7 +64,7 @@
},
methods: {
onGoBack() {
- window.history.go(-1);
+ Taro.navigateBack();
},
onGoNav(nav) {
if (!nav.url) {
--
Gitblit v1.9.1