From ad149b09268c33d2dd5a78429012a0b5fdec799e Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Thu, 30 Jun 2022 17:10:08 +0800
Subject: [PATCH] 优化图片上传地址,允许在外层指定服务器域名

---
 layout/h5Page/CNavBar.vue |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/layout/h5Page/CNavBar.vue b/layout/h5Page/CNavBar.vue
index 50bfc5d..4bd2986 100644
--- a/layout/h5Page/CNavBar.vue
+++ b/layout/h5Page/CNavBar.vue
@@ -3,9 +3,9 @@
         <AtNavBar
             :title="title"
             :leftIconType="iconType"
-            :onClickLeftIcon="evt=>onClickIcon ? onClickIcon() : onGoBack()"
+            :onClickLeftIcon="evt => onGoBack()"
             :rightFirstIconType="dropNav ? 'bullet-list' : ''"
-            :onClickRgIconSt="evt=>onDropMenu()"
+            :onClickRgIconSt="evt => onDropMenu()"
         />
         <view
             class="c-nav-bar-right"
@@ -43,12 +43,16 @@
         AtNavBar,
     },
     props: {
+        // H5页面导航标题
         title: String,
+        // H5页面导航左侧图标
         iconType: {
             type: String,
             default: 'chevron-left',
         },
+        // H5页面导航左侧图点击事件
         onClickIcon: Function,
+        // H5页面导航右侧下拉菜单配置
         dropNav: Array,
     },
     data() {
@@ -60,7 +64,15 @@
     },
     methods: {
         onGoBack() {
-            Taro.navigateBack();
+            if (this.onClickIcon) {
+                const needBack = this.onClickIcon();
+                // 返回 true 时继续跳回上一页
+                if (needBack) {
+                    Taro.navigateBack();
+                }
+            } else {
+                Taro.navigateBack();
+            }
         },
         onGoNav(nav) {
             if (!nav.url) {

--
Gitblit v1.9.1