Merge pull request #245 from GJJDD/dev

[!] theme and barStyle compatible
apache · Apr 19, 2018 · 82823be · 82823be
2 parents fcd2b3d + 0b6f677
commit 82823be
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/packages/wxc-searchbar/index.vue b/packages/wxc-searchbar/index.vue
@@ -31,6 +31,7 @@
              @click="closeClicked"
              :src="closeIcon"></image>
       <text :class="['search-bar-button','search-bar-button-'+theme]"
+            :style="buttonStyle"
             v-if="needShowCancel"
             @click="cancelClicked">{{cancelLabel}}</text>
     </div>
@@ -241,6 +242,13 @@
     computed: {
       needShowCancel () {
         return this.alwaysShowCancel || this.showCancel;
+      },
+      buttonStyle () {
+        const { barStyle } = this;
+        if (barStyle.backgroundColor) {
+            return {backgroundColor:barStyle.backgroundColor}
+        }
+        return {}
       }
     },
     data: () => ({
@@ -250,6 +258,7 @@
       showCancel: false,
       showClose: false,
       value: ''
+
     }),
     created () {
       this.defaultValue && (this.value = this.defaultValue);