From dcc642ac5951c31aba960ad38e122ea70604af2d Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Tue, 18 Dec 2018 23:00:13 +0800
Subject: [PATCH] [improvement] Swipe: update indicator color (#2324)
---
packages/address-list/test/__snapshots__/demo.spec.js.snap | 4 ++--
packages/contact-card/test/__snapshots__/demo.spec.js.snap | 2 +-
packages/swipe/index.less | 3 ++-
packages/swipe/index.vue | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/packages/address-list/test/__snapshots__/demo.spec.js.snap b/packages/address-list/test/__snapshots__/demo.spec.js.snap
index 4deaa854d..c4a91e7ee 100644
--- a/packages/address-list/test/__snapshots__/demo.spec.js.snap
+++ b/packages/address-list/test/__snapshots__/demo.spec.js.snap
@@ -19,7 +19,7 @@ exports[`renders demo correctly 1`] = `
<!---->
<!---->
<div class="van-cell__value van-cell__value--alone">
- <div class="van-radio"><span class="van-radio__input"><input type="radio" value="2" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;font-size:undefined;"> <!----> <!----></i></span> <span class="van-radio__label"><div class="van-address-item__name">李四，1310000000</div> <div class="van-address-item__address">浙江省杭州市拱墅区莫干山路 50 号</div></span></div>
+ <div class="van-radio"><span class="van-radio__input"><input type="radio" value="2" class="van-radio__control"> <i class="van-icon van-icon-circle" style="color:undefined;font-size:undefined;"> <!----> <!----></i></span> <span class="van-radio__label"><div class="van-address-item__name">李四，1310000000</div> <div class="van-address-item__address">浙江省杭州市拱墅区莫干山路 50 号</div></span></div>
</div> <i class="van-icon van-icon-edit van-address-item__edit" style="color:undefined;font-size:undefined;">
<!---->
<!----></i>
@@ -34,7 +34,7 @@ exports[`renders demo correctly 1`] = `
<!---->
<!---->
<div class="van-cell__value van-cell__value--alone">
- <div class="van-radio"><span class="van-radio__input"><input type="radio" value="3" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;font-size:undefined;"> <!----> <!----></i></span> <span class="van-radio__label"><div class="van-address-item__name">王五，1320000000</div> <div class="van-address-item__address">浙江省杭州市滨江区江南大道 15 号</div></span></div>
+ <div class="van-radio"><span class="van-radio__input"><input type="radio" value="3" class="van-radio__control"> <i class="van-icon van-icon-circle" style="color:undefined;font-size:undefined;"> <!----> <!----></i></span> <span class="van-radio__label"><div class="van-address-item__name">王五，1320000000</div> <div class="van-address-item__address">浙江省杭州市滨江区江南大道 15 号</div></span></div>
</div> <i class="van-icon van-icon-edit van-address-item__edit" style="color:undefined;font-size:undefined;">
<!---->
<!----></i>
diff --git a/packages/contact-card/test/__snapshots__/demo.spec.js.snap b/packages/contact-card/test/__snapshots__/demo.spec.js.snap
index 2a1a92ca1..0a21098c9 100644
--- a/packages/contact-card/test/__snapshots__/demo.spec.js.snap
+++ b/packages/contact-card/test/__snapshots__/demo.spec.js.snap
@@ -19,7 +19,7 @@ exports[`renders demo correctly 1`] = `
<!---->
<!---->
<div class="van-cell__value van-cell__value--alone">
- <div class="van-radio"><span class="van-radio__input"><input type="radio" value="0" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;font-size:undefined;"> <!----> <!----></i></span> <span class="van-radio__label"><div class="van-contact-list__name">张三，13000000000</div></span></div>
+ <div class="van-radio"><span class="van-radio__input"><input type="radio" value="0" class="van-radio__control"> <i class="van-icon van-icon-circle" style="color:undefined;font-size:undefined;"> <!----> <!----></i></span> <span class="van-radio__label"><div class="van-contact-list__name">张三，13000000000</div></span></div>
</div> <i class="van-icon van-icon-edit van-contact-list__edit" style="color:undefined;font-size:undefined;">
<!---->
<!----></i>
diff --git a/packages/swipe/index.less b/packages/swipe/index.less
index ac488b7a2..fd0d1b106 100644
--- a/packages/swipe/index.less
+++ b/packages/swipe/index.less
@@ -32,10 +32,10 @@
&__indicator {
opacity: .3;
border-radius: 100%;
- background-color: @blue;
width: @swipe-indicator;
height: @swipe-indicator;
transition: opacity .2s;
+ background-color: @border-color;
&:not(:last-child) {
margin-right: @swipe-indicator;
@@ -43,6 +43,7 @@
&--active {
opacity: 1;
+ background-color: @blue;
}
}
}
diff --git a/packages/swipe/index.vue b/packages/swipe/index.vue
index c1f5bf80f..d27974a53 100644
--- a/packages/swipe/index.vue
+++ b/packages/swipe/index.vue
@@ -19,7 +19,7 @@
<i
v-for="index in count"
:class="b('indicator', { active: index - 1 === activeIndicator })"
- :style="indicatorStyle"
+ :style="index - 1 === activeIndicator ? indicatorStyle : null"
/>
</div>
</slot>