From ff59356a9855b45f2f4497d4c96741f4262c3408 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Wed, 27 Feb 2019 15:01:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E9=80=8F=E6=98=8E?=
 =?UTF-8?q?=E6=B8=90=E5=8F=98=E5=AF=BC=E8=88=AA=E6=A0=8F=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E8=83=8C=E6=99=AF=E8=89=B2=E5=92=8C=E6=96=87=E5=AD=97=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E9=85=8D=E7=BD=AE=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/platforms/h5/components/page/pageHead.vue | 23 +++++++++++--------
 .../h5/components/page/transparent.js         | 17 ++++++++++----
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/platforms/h5/components/page/pageHead.vue b/src/platforms/h5/components/page/pageHead.vue
index a41b30f554..c32c556b44 100644
--- a/src/platforms/h5/components/page/pageHead.vue
+++ b/src/platforms/h5/components/page/pageHead.vue
@@ -8,6 +8,7 @@
       <div class="uni-page-head-hd">
         <div
           v-show="backButton"
+          class="uni-page-head-btn"
           @click="_back">
           <i
             :style="{color:color,fontSize:'27px'}"
@@ -17,7 +18,8 @@
           <div
             v-if="btn.float === 'left'"
             :key="index"
-            :style="{marginRight:index>0?'5px':'0px'}">
+            :style="{marginRight:index>0?'5px':'0px',backgroundColor: btn.background}"
+            class="uni-page-head-btn">
             <i
               :style="_formatBtnStyle(btn)"
               class="uni-btn-icon"
@@ -59,16 +61,18 @@
           :placeholder-style="`color:${searchInput.placeholderColor}`"
           class="uni-page-head-search-input"
           confirm-type="search"
-          @focus="__focus"
-          @blur="__blur"
-          @input="__input"
+          @focus="_focus"
+          @blur="_blur"
+          @input="_input"
         />
       </div>
       <div class="uni-page-head-ft">
         <template v-for="(btn,index) in btns">
           <div
             v-if="btn.float !== 'left'"
-            :key="index">
+            :key="index"
+            :style="{backgroundColor: btn.background}"
+            class="uni-page-head-btn">
             <i
               :style="_formatBtnStyle(btn)"
               class="uni-btn-icon"
@@ -143,12 +147,13 @@ uni-page-head .uni-page-head-bd {
   user-select: auto;
 }
 
-.uni-btn-icon {
+.uni-page-head-btn {
   max-width: 48px;
   word-break: keep-all;
   margin: 0 2px;
   overflow: hidden;
   word-break: keep-all;
+  background-color: rgba(153,153,153,1);
 }
 
 .uni-page-head-search {
@@ -383,13 +388,13 @@ export default {
       }
       return style
     },
-    __focus () {
+    _focus () {
       this.focus = true
     },
-    __blur () {
+    _blur () {
       this.focus = false
     },
-    __input () {
+    _input () {
       UniServiceJSBridge.emit('onNavigationBarSearchInputChanged', {
         text: this.text
       })
diff --git a/src/platforms/h5/components/page/transparent.js b/src/platforms/h5/components/page/transparent.js
index 7a30252d13..69aa55c072 100644
--- a/src/platforms/h5/components/page/transparent.js
+++ b/src/platforms/h5/components/page/transparent.js
@@ -9,13 +9,17 @@ export default {
       const titleElem = this.$el.querySelector('.uni-page-head__title')
       const iconElems = this.$el.querySelectorAll('.uni-btn-icon')
       const iconElemsStyles = []
+      const textColor = this.textColor
       for (let i = 0; i < iconElems.length; i++) {
         iconElemsStyles.push(iconElems[i].style)
       }
-      const borderRadiusElems = this.$el.querySelectorAll('.uni-page-head-hd>div,.uni-page-head-ft>div')
+      const borderRadiusElems = this.$el.querySelectorAll('.uni-page-head-btn')
+      const oldColors = []
       const borderRadiusElemsStyles = []
       for (let i = 0; i < borderRadiusElems.length; i++) {
-        borderRadiusElemsStyles.push(borderRadiusElems[i].style)
+        let borderRadiusElem = borderRadiusElems[i]
+        oldColors.push(getComputedStyle(borderRadiusElem).backgroundColor)
+        borderRadiusElemsStyles.push(borderRadiusElem.style)
       }
       this._A = 0
       UniViewJSBridge.on('onPageScroll', ({
@@ -27,7 +31,7 @@ export default {
         }
         if (alpha > 0.5 && this._A <= 0.5) {
           iconElemsStyles.forEach(function (iconElemStyle) {
-            iconElemStyle.color = '#000'
+            iconElemStyle.color = textColor
           })
         } else if (alpha <= 0.5 && this._A > 0.5) {
           iconElemsStyles.forEach(function (iconElemStyle) {
@@ -40,8 +44,11 @@ export default {
           titleElem.style.opacity = alpha
         }
         transparentElemStyle.backgroundColor = `rgba(${this._R},${this._G},${this._B},${alpha})`
-        borderRadiusElemsStyles.forEach(function (borderRadiusElemStyle) {
-          borderRadiusElemStyle.backgroundColor = `rgba(153,153,153,${1 - alpha})`
+        borderRadiusElemsStyles.forEach(function (borderRadiusElemStyle, index) {
+          let oldColor = oldColors[index]
+          let rgba = oldColor.match(/\d+/g)
+          rgba[3] = (1 - alpha) * (rgba.length === 4 ? rgba[3] : 1)
+          borderRadiusElemStyle.backgroundColor = `rgba(${rgba})`
         })
       })
     }
-- 
GitLab