Commit 36bc753b authored by 费陶勇's avatar 费陶勇

Merge branch 'dev' of https://github.com/YanxinNet/uView into dev

parents 376d3b77 a0c44189
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
// 颜色渐变过程数组 // 颜色渐变过程数组
this.colorGradientArr = color.colorGradient(this.inactiveColor, this.activeColor, this.colorStep); this.colorGradientArr = color.colorGradient(this.inactiveColor, this.activeColor, this.colorStep);
}, },
// 获取各个tab的节点信息 // 获取各个tab的节点信息
getTabsInfo() { getTabsInfo() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let view = uni.createSelectorQuery().in(this); let view = uni.createSelectorQuery().in(this);
...@@ -355,13 +355,11 @@ ...@@ -355,13 +355,11 @@
// swiper结束滑动 // swiper结束滑动
setFinishCurrent(current) { setFinishCurrent(current) {
// 如果滑动的索引不一致,修改tab颜色变化,因为可能会有直接点击tab的情况 // 如果滑动的索引不一致,修改tab颜色变化,因为可能会有直接点击tab的情况
if (current != this.animationFinishCurrent) { this.tabsInfo.map((val, index) => {
this.tabsInfo.map((val, index) => { if (current == index) val.color = this.activeColor;
if (current == index) val.color = this.activeColor; else val.color = this.inactiveColor;
else val.color = this.inactiveColor; return val;
return val; });
});
}
this.line3AddDx = 0; this.line3AddDx = 0;
this.animationFinishCurrent = current; this.animationFinishCurrent = current;
this.countLine3Dx(); this.countLine3Dx();
...@@ -372,7 +370,7 @@ ...@@ -372,7 +370,7 @@
<style scoped lang="scss"> <style scoped lang="scss">
@import "../../libs/css/style.components.scss"; @import "../../libs/css/style.components.scss";
view, view,
scroll-view { scroll-view {
box-sizing: border-box; box-sizing: border-box;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment