From 897c9822a47cf22146176208610635a660992b3d Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Fri, 29 Apr 2022 16:25:38 +0800
Subject: [PATCH] 微调微信支付弹窗显示
---
layout/h5Page/CNavBar.vue | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/layout/h5Page/CNavBar.vue b/layout/h5Page/CNavBar.vue
index e7f2daf..4bd2986 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 => onGoBack()"
:rightFirstIconType="dropNav ? 'bullet-list' : ''"
- :onClickRgIconSt="evt=>onDropMenu()"
+ :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,15 @@
},
methods: {
onGoBack() {
- window.history.go(-1);
+ if (this.onClickIcon) {
+ const needBack = this.onClickIcon();
+ // 返回 true 时继续跳回上一页
+ if (needBack) {
+ Taro.navigateBack();
+ }
+ } else {
+ Taro.navigateBack();
+ }
},
onGoNav(nav) {
if (!nav.url) {
--
Gitblit v1.9.1