From 855cfa5d9419f3365d8b6ed034893dc8eaf06d6f Mon Sep 17 00:00:00 2001
From: Waiter <waitersong2012@gmail.com>
Date: Tue, 18 Feb 2020 20:33:39 +0800
Subject: [PATCH] chore: change some style (#2773)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: change some style

* chore: change some code

* fix(Tabs): 调整初始化时机
---
 example/pages/button/index.wxml   |  4 ++--
 example/pages/image/index.wxml    |  4 ++--
 example/pages/progress/index.wxml | 12 ++++++------
 example/pages/progress/index.wxss |  2 +-
 example/pages/rate/index.wxml     | 14 +++++++-------
 example/pages/rate/index.wxss     |  2 +-
 example/pages/tab/index.wxml      |  4 ++--
 example/pages/tab/index.wxss      |  4 ++--
 packages/grid/index.ts            |  4 ----
 packages/rate/index.ts            |  8 ++++++--
 packages/rate/index.wxml          |  2 +-
 packages/skeleton/index.ts        |  8 ++++++--
 packages/skeleton/index.wxml      |  2 +-
 packages/tabs/index.ts            |  5 +++--
 14 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/example/pages/button/index.wxml b/example/pages/button/index.wxml
index 1a3f6137..6d986b8b 100644
--- a/example/pages/button/index.wxml
+++ b/example/pages/button/index.wxml
@@ -1,4 +1,4 @@
-<demo-section>
+
   <demo-block title="按钮类型" padding>
     <view class="row">
       <van-button class="demo-margin-right">默认按钮</van-button>
@@ -58,4 +58,4 @@
     <van-button type="primary" custom-class="demo-margin-bottom">普通按钮</van-button>
     <van-button type="primary" block>块级元素</van-button>
   </demo-block>
-</demo-section>
+
diff --git a/example/pages/image/index.wxml b/example/pages/image/index.wxml
index 0fd6d052..4fe193a0 100644
--- a/example/pages/image/index.wxml
+++ b/example/pages/image/index.wxml
@@ -1,4 +1,4 @@
-<demo-section>
+
   <demo-block title="基础用法" padding>
     <van-row>
       <van-image
@@ -100,4 +100,4 @@
       </van-col>
     </van-row>
   </demo-block>
-</demo-section>
+
diff --git a/example/pages/progress/index.wxml b/example/pages/progress/index.wxml
index 8a7cb88d..2c0bee20 100644
--- a/example/pages/progress/index.wxml
+++ b/example/pages/progress/index.wxml
@@ -1,20 +1,20 @@
 <demo-block title="基础用法">
-  <van-progress custom-class="progress" percentage="50" />
+  <van-progress custom-class="progress-position" percentage="50" />
 </demo-block>
 
 <demo-block title="线条粗细">
-  <van-progress custom-class="progress" stroke-width="8" percentage="50" />
+  <van-progress custom-class="progress-position" stroke-width="8" percentage="50" />
 </demo-block>
 
 <demo-block title="置灰">
-  <van-progress custom-class="progress" inactive percentage="50" />
+  <van-progress custom-class="progress-position" inactive percentage="50" />
 </demo-block>
 
 <demo-block title="样式定制">
-  <van-progress custom-class="progress" pivot-text="橙色" color="#f2826a" percentage="25" />
-  <van-progress custom-class="progress" pivot-text="红色" color="#ee0a24" percentage="50" />
+  <van-progress custom-class="progress-position" pivot-text="橙色" color="#f2826a" percentage="25" />
+  <van-progress custom-class="progress-position" pivot-text="红色" color="#ee0a24" percentage="50" />
   <van-progress
-    custom-class="progress"
+    custom-class="progress-position"
     percentage="75"
     pivot-text="紫色"
     pivot-color="#7232dd"
diff --git a/example/pages/progress/index.wxss b/example/pages/progress/index.wxss
index c65bf26c..448b5305 100644
--- a/example/pages/progress/index.wxss
+++ b/example/pages/progress/index.wxss
@@ -1,3 +1,3 @@
-.progress {
+.progress-position {
   margin: 5px 15px 20px;
 }
diff --git a/example/pages/rate/index.wxml b/example/pages/rate/index.wxml
index 4feb979d..e469c3b8 100644
--- a/example/pages/rate/index.wxml
+++ b/example/pages/rate/index.wxml
@@ -1,6 +1,6 @@
 <demo-block title="基础用法">
   <van-rate
-    custom-class="van-rate"
+    custom-class="rate-position"
     data-key="value1"
     value="{{ value1 }}"
   />
@@ -8,7 +8,7 @@
 
 <demo-block title="自定义图标">
   <van-rate
-    custom-class="van-rate"
+    custom-class="rate-position"
     icon="like"
     void-icon="like-o"
     data-key="value2"
@@ -18,7 +18,7 @@
 
 <demo-block title="自定义样式">
   <van-rate
-    custom-class="van-rate"
+    custom-class="rate-position"
     data-key="value3"
     value="{{ value3 }}"
     size="{{ 25 }}"
@@ -31,7 +31,7 @@
 
 <demo-block title="半星">
   <van-rate
-    custom-class="van-rate"
+    custom-class="rate-position"
     data-key="value4"
     value="{{ value4 }}"
     size="{{ 25 }}"
@@ -46,7 +46,7 @@
 
 <demo-block title="自定义数量">
   <van-rate
-    custom-class="van-rate"
+    custom-class="rate-position"
     data-key="value5"
     value="{{ value5 }}"
     count="{{ 6 }}"
@@ -56,7 +56,7 @@
 
 <demo-block title="禁用状态">
   <van-rate
-    custom-class="van-rate"
+    custom-class="rate-position"
     data-key="value6"
     value="{{ value6 }}"
     disabled
@@ -65,7 +65,7 @@
 
 <demo-block title="只读状态">
   <van-rate
-    custom-class="van-rate"
+    custom-class="rate-position"
     data-key="value6"
     value="{{ value6 }}"
     readonly
diff --git a/example/pages/rate/index.wxss b/example/pages/rate/index.wxss
index 10c8e210..39126599 100644
--- a/example/pages/rate/index.wxss
+++ b/example/pages/rate/index.wxss
@@ -2,6 +2,6 @@ page {
   background-color: #fff;
 }
 
-.van-rate {
+.rate-position {
   margin-left: 15px;
 }
diff --git a/example/pages/tab/index.wxml b/example/pages/tab/index.wxml
index 2e696f04..67c12433 100644
--- a/example/pages/tab/index.wxml
+++ b/example/pages/tab/index.wxml
@@ -57,7 +57,7 @@
 </demo-block>
 
 <demo-block title="样式风格">
-  <van-tabs type="card" tab-class="tab-class">
+  <van-tabs type="card" tab-class="special-tab">
     <van-tab
       wx:for="{{ tabs3 }}"
       wx:key="index"
@@ -127,7 +127,7 @@
 </demo-block>
 
 <demo-block title="自定义标题">
-  <van-tabs active="{{ 1 }}" bind:change="onChange" tab-class="tab-class" tab-active-class="tab-active-class">
+  <van-tabs active="{{ 1 }}" bind:change="onChange" tab-class="special-tab" tab-active-class="special-tab-active">
     <van-icon
       slot="nav-right"
       name="search"
diff --git a/example/pages/tab/index.wxss b/example/pages/tab/index.wxss
index ebba8a87..3521a9ec 100644
--- a/example/pages/tab/index.wxss
+++ b/example/pages/tab/index.wxss
@@ -17,10 +17,10 @@ page {
   background-color: #fff;
 }
 
-.tab-class {
+.special-tab {
   transition: all 0.25s ease-in-out;
 }
 
-.tab-active-class {
+.special-tab-active {
   font-size: 1.05em !important;
 }
diff --git a/packages/grid/index.ts b/packages/grid/index.ts
index 2c3f20da..eb6c5fe5 100644
--- a/packages/grid/index.ts
+++ b/packages/grid/index.ts
@@ -43,10 +43,6 @@ VantComponent({
     viewStyle: '',
   },
 
-  beforeCreate() {
-    this.children = [];
-  },
-
   created() {
     const { gutter } = this.data;
     if (gutter) {
diff --git a/packages/rate/index.ts b/packages/rate/index.ts
index 1b2cf44f..170c7b3b 100644
--- a/packages/rate/index.ts
+++ b/packages/rate/index.ts
@@ -41,7 +41,10 @@ VantComponent({
     },
     count: {
       type: Number,
-      value: 5
+      value: 5,
+      observer(value: number) {
+        this.setData({ innerCountArray: Array.from({ length: value }) });
+      },
     },
     gutter: null,
     touchable: {
@@ -51,7 +54,8 @@ VantComponent({
   },
 
   data: {
-    innerValue: 0
+    innerValue: 0,
+    innerCountArray: Array.from({ length: 5 }),
   },
 
   methods: {
diff --git a/packages/rate/index.wxml b/packages/rate/index.wxml
index 9233c10a..58eee5cd 100644
--- a/packages/rate/index.wxml
+++ b/packages/rate/index.wxml
@@ -6,7 +6,7 @@
 >
   <view
     class="van-rate__item"
-    wx:for="{{ count }}"
+    wx:for="{{ innerCountArray }}"
     wx:key="index"
     style="padding-right: {{ index !== count - 1 ? utils.addUnit(gutter) : '' }}"
   >
diff --git a/packages/skeleton/index.ts b/packages/skeleton/index.ts
index 90ded80e..847b06c1 100644
--- a/packages/skeleton/index.ts
+++ b/packages/skeleton/index.ts
@@ -5,7 +5,10 @@ VantComponent({
   props: {
     row: {
       type: Number,
-      value: 0
+      value: 0,
+      observer(value: number) {
+        this.setData({ rowArray: Array.from({ length: value }) });
+      },
     },
     title: Boolean,
     avatar: Boolean,
@@ -39,6 +42,7 @@ VantComponent({
   },
 
   data: {
-    isArray: false
+    isArray: false,
+    rowArray: [],
   }
 });
diff --git a/packages/skeleton/index.wxml b/packages/skeleton/index.wxml
index 6f07a219..058e2efd 100644
--- a/packages/skeleton/index.wxml
+++ b/packages/skeleton/index.wxml
@@ -16,7 +16,7 @@
       style="{{ 'width:' + titleWidth }}"
     />
     <view
-      wx:for="{{ row }}"
+      wx:for="{{ rowArray }}"
       wx:key="index"
       wx:for-index="index"
       class="row-class {{ utils.bem('skeleton__row') }}"
diff --git a/packages/tabs/index.ts b/packages/tabs/index.ts
index 9ab8bb89..c1c07c73 100644
--- a/packages/tabs/index.ts
+++ b/packages/tabs/index.ts
@@ -116,9 +116,10 @@ VantComponent({
   mounted() {
     this.setData({
       container: () => this.createSelectorQuery().select('.van-tabs')
+    }, () => {
+      this.setLine(true);
+      this.scrollIntoView();
     });
-    this.setLine(true);
-    this.scrollIntoView();
   },
 
   methods: {