From fbb96ab8a5a00015227612d9706f0ca1a7f85461 Mon Sep 17 00:00:00 2001
From: ‘chensiAb’ <‘chenchenco03@163.com’>
Date: Tue, 15 Apr 2025 18:29:56 +0800
Subject: [PATCH] Merge branch 'master_dev'
---
layout/navCustomBar/CNavCustomBar.vue | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/layout/navCustomBar/CNavCustomBar.vue b/layout/navCustomBar/CNavCustomBar.vue
index 065738c..38acbd9 100644
--- a/layout/navCustomBar/CNavCustomBar.vue
+++ b/layout/navCustomBar/CNavCustomBar.vue
@@ -6,7 +6,7 @@
<template>
<view
class="c-nav-custom-bar"
- :style="{height:navBarHeight + 'px',paddingTop:statusBarHeight + 'px',boxSizing:'border-box'}"
+ :style="{height:navBarHeight + 'px',paddingTop:statusBarHeight + 'px',boxSizing:'border-box',zIndex:99}"
>
<view
class="c-nav-icon"
@@ -21,7 +21,7 @@
<view
v-if="isNeedBackIcon"
class="c-nav-back-icon"
- @tap="evt => onBack()"
+ @tap="evt => handleBack()"
>
<AtIcon
value='chevron-left'
@@ -30,7 +30,7 @@
></AtIcon>
</view>
</view>
- <view class="c-nav-title">
+ <view :class="[isNeedBackIcon ? 'c-nav-title-back' : 'c-nav-title']">
{{ title }}
</view>
</view>
@@ -54,6 +54,10 @@
title: {
type: String,
default: '',
+ },
+ onBack: {
+ type: Function,
+ default: () => {},
},
},
computed: {},
@@ -85,10 +89,11 @@
this.statusBarHeight = statusBarHeight;
},
- onBack() {
- Taro.navigateBack({
- delta: 1,
- });
+ handleBack() {
+ this.onBack();
+ // Taro.navigateBack({
+ // delta: 1,
+ // });
},
$getStatusBarHeight() {
--
Gitblit v1.9.1