From 2443ba1ededdb12af683f6bf07ffde2d839e2511 Mon Sep 17 00:00:00 2001
From: wangyaqi <wangyaqi@163.com>
Date: Tue, 10 Sep 2019 15:19:59 +0800
Subject: [PATCH] =?UTF-8?q?update:=20H5=E6=94=AF=E6=8C=81titleNview->type?=
 =?UTF-8?q?=3D'float'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/view/bridge/subscribe/index.js         |  2 +-
 src/platforms/h5/components/page/index.vue      |  5 +++--
 src/platforms/h5/components/page/pageHead.vue   | 10 ++++++++--
 src/platforms/h5/components/page/transparent.js |  6 +++---
 src/platforms/h5/helpers/get-window-offset.js   |  2 +-
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/core/view/bridge/subscribe/index.js b/src/core/view/bridge/subscribe/index.js
index 2be7605d3..a047a8733 100644
--- a/src/core/view/bridge/subscribe/index.js
+++ b/src/core/view/bridge/subscribe/index.js
@@ -27,7 +27,7 @@ const passiveOptions = supportsPassive ? {
 function updateCssVar (vm) {
   if (uni.canIUse('css.var')) {
     const pageVm = vm.$parent.$parent
-    const windowTop = pageVm.showNavigationBar && pageVm.navigationBar.type !== 'transparent' && pageVm.navigationBar.type !== 'alwaysTransparent' ? (NAVBAR_HEIGHT +
+    const windowTop = pageVm.showNavigationBar && pageVm.navigationBar.type !== 'transparent' && pageVm.navigationBar.type !== 'float' ? (NAVBAR_HEIGHT +
         'px')
       : '0px'
     const windowBottom = getApp().$children[0].showTabBar ? (TABBAR_HEIGHT + 'px') : '0px'
diff --git a/src/platforms/h5/components/page/index.vue b/src/platforms/h5/components/page/index.vue
index 67d789b14..1921a3cac 100644
--- a/src/platforms/h5/components/page/index.vue
+++ b/src/platforms/h5/components/page/index.vue
@@ -146,7 +146,7 @@ export default {
     const titleNViewTypeList = {
       'none': 'default',
       'auto': 'transparent',
-      'always': 'alwaysTransparent'
+      'always': 'float'
     }
 
     const navigationBar = mergeTitleNView({
@@ -158,7 +158,8 @@ export default {
       titleImage: this.titleImage,
       duration: '0',
       timingFunc: '',
-      type: titleNViewTypeList[this.transparentTitle]
+      type: titleNViewTypeList[this.transparentTitle],
+      transparentTitle: this.transparentTitle
     }, this.titleNView)
 
     const showNavigationBar = this.navigationStyle === 'default' && this.titleNView
diff --git a/src/platforms/h5/components/page/pageHead.vue b/src/platforms/h5/components/page/pageHead.vue
index a235c2f0f..8127d0f5b 100644
--- a/src/platforms/h5/components/page/pageHead.vue
+++ b/src/platforms/h5/components/page/pageHead.vue
@@ -96,7 +96,7 @@
       </div>
     </div>
     <div
-      v-if="type!=='transparent'&&type!=='alwaysTransparent'"
+      v-if="type!=='transparent'&&type!=='float'"
       class="uni-placeholder"/>
   </uni-page-head>
 </template>
@@ -335,7 +335,7 @@ export default {
     type: {
       default: 'default',
       validator (value) {
-        return ['default', 'transparent', 'alwaysTransparent'].indexOf(value) !== -1
+        return ['default', 'transparent', 'float'].indexOf(value) !== -1
       }
     },
     coverage: {
@@ -357,6 +357,12 @@ export default {
     titleImage: {
       type: String,
       default: ''
+    },
+    transparentTitle: {
+      default: 'none',
+      validator (value) {
+        return ['none', 'auto', 'always'].indexOf(value) !== -1
+      }
     }
   },
   data () {
diff --git a/src/platforms/h5/components/page/transparent.js b/src/platforms/h5/components/page/transparent.js
index db4829496..b4a169aff 100644
--- a/src/platforms/h5/components/page/transparent.js
+++ b/src/platforms/h5/components/page/transparent.js
@@ -53,7 +53,7 @@ export default {
           borderRadiusElemStyle.backgroundColor = `rgba(${rgba})`
         })
       })
-    } else if (this.type === 'alwaysTransparent') {
+    } else if (this.transparentTitle === 'always') {
       const iconElems = this.$el.querySelectorAll('.uni-btn-icon')
       const iconElemsStyles = []
       for (let i = 0; i < iconElems.length; i++) {
@@ -71,13 +71,13 @@ export default {
   },
   computed: {
     color () {
-      return this.type === 'transparent' || this.type === 'alwaysTransparent' ? '#fff' : this.textColor
+      return this.type === 'transparent' || this.transparentTitle === 'always' ? '#fff' : this.textColor
     },
     offset () {
       return parseInt(this.coverage)
     },
     bgColor () {
-      if (this.type === 'transparent' || this.type === 'alwaysTransparent') {
+      if (this.type === 'transparent' || this.transparentTitle === 'always') {
         const {
           r,
           g,
diff --git a/src/platforms/h5/helpers/get-window-offset.js b/src/platforms/h5/helpers/get-window-offset.js
index a1359d74b..b989996b0 100644
--- a/src/platforms/h5/helpers/get-window-offset.js
+++ b/src/platforms/h5/helpers/get-window-offset.js
@@ -17,7 +17,7 @@ export default function getWindowOffset () {
   const pages = getCurrentPages()
   if (pages.length) {
     const pageVm = pages[pages.length - 1].$parent.$parent
-    top = pageVm.showNavigationBar && (pageVm.navigationBar.type !== 'transparent' || pageVm.navigationBar.type !== 'alwaysTransparent') ? NAVBAR_HEIGHT : 0
+    top = pageVm.showNavigationBar && (pageVm.navigationBar.type !== 'transparent' || pageVm.navigationBar.type !== 'float') ? NAVBAR_HEIGHT : 0
   }
   const app = getApp()
   if (app) {
-- 
GitLab