chore: change some code (#2756)

example/app.json

@@ -47,7 +47,8 @@
     "pages/grid/index",
     "pages/dropdown-menu/index",
     "pages/index-bar/index",
-    "pages/skeleton/index"
+    "pages/skeleton/index",
+    "pages/divider/index"
   ],
   "window": {
     "navigationBarBackgroundColor": "#f8f8f8",

example/components/demo-home-nav/index.json

@@ -1,6 +1,6 @@
 {
   "component": true,
   "usingComponents": {
-    "van-icon": "../../dist/icon"
+    "van-icon": "../../dist/icon/index"
   }
 }

example/components/demo-home-nav/index.wxss

@@ -27,12 +27,12 @@
 }
 
 .demo-home-nav__icon {
-  position: absolute;
+  position: absolute !important;
   top: 50%;
   right: 16px;
   width: 16px;
   height: 16px;
   margin-top: -8px;
   color: rgb(182, 195, 210);
-  font-weight: 900;
+  font-weight: 900 !important;
 }

example/components/demo-home/index.json

@@ -1,6 +1,6 @@
 {
   "component": true,
   "usingComponents": {
-    "demo-home-nav": "../demo-home-nav"
+    "demo-home-nav": "../demo-home-nav/index"
   }
 }

example/pages/card/index.js

@@ -2,6 +2,6 @@ import Page from '../../common/page';
 
 Page({
   data: {
-    imageURL: '//img.yzcdn.cn/upload_files/2017/07/02/af5b9f44deaeb68000d7e4a711160c53.jpg'
+    imageURL: 'https://img.yzcdn.cn/upload_files/2017/07/02/af5b9f44deaeb68000d7e4a711160c53.jpg'
   }
 });

example/pages/dashboard/index.json

@@ -1,6 +1,6 @@
 {
   "navigationBarTitleText": "Vant Weapp",
   "usingComponents": {
-    "demo-home": "../../components/demo-home"
+    "demo-home": "../../components/demo-home/index"
   }
 }

example/pages/goods-action/index.wxml

@@ -1,5 +1,5 @@
 <demo-block title="基础用法">
-  <van-goods-action custom-class="goods-action" safe-area-inset-bottom="{{ false }}">
+  <van-goods-action custom-class="goods-action-position" safe-area-inset-bottom="{{ false }}">
     <van-goods-action-icon
       icon="chat-o"
       text="客服"
@@ -23,7 +23,7 @@
 </demo-block>
 
 <demo-block title="提示信息">
-  <van-goods-action custom-class="goods-action" safe-area-inset-bottom="{{ false }}">
+  <van-goods-action custom-class="goods-action-position" safe-area-inset-bottom="{{ false }}">
     <van-goods-action-icon icon="chat-o" text="客服" dot />
     <van-goods-action-icon icon="cart-o" text="购物车" info="5" />
     <van-goods-action-icon icon="shop-o" text="店铺" />
@@ -33,7 +33,7 @@
 </demo-block>
 
 <demo-block title="自定义按钮颜色">
-  <van-goods-action custom-class="goods-action" safe-area-inset-bottom="{{ false }}">
+  <van-goods-action custom-class="goods-action-position" safe-area-inset-bottom="{{ false }}">
     <van-goods-action-icon icon="chat-o" text="客服" />
     <van-goods-action-icon icon="shop-o" text="店铺" />
     <van-goods-action-button color="#be99ff" type="warning" text="加入购物车" />
@@ -42,7 +42,7 @@
 </demo-block>
 
 <demo-block title="朴素按钮">
-  <van-goods-action custom-class="goods-action" safe-area-inset-bottom="{{ false }}">
+  <van-goods-action custom-class="goods-action-position" safe-area-inset-bottom="{{ false }}">
     <van-goods-action-icon icon="chat-o" text="客服" />
     <van-goods-action-icon icon="shop-o" text="店铺" />
     <van-goods-action-button color="#7232dd"  text="加入购物" type="warning" />

example/pages/goods-action/index.wxss

@@ -1,3 +1,3 @@
-.goods-action {
+.goods-action-position {
   position: relative !important;
 }

example/pages/grid/index.js

@@ -1,3 +1,10 @@
 import Page from '../../common/page';
 
-Page();
+Page({
+  data: {
+    array3: [0, 1, 2],
+    array4: [0, 1, 2, 3],
+    array6: [0, 1, 2, 3, 4, 5],
+    array8: [0, 1, 2, 3, 4, 5, 6, 7],
+  },
+});

example/pages/grid/index.wxml

@@ -1,18 +1,18 @@
 <demo-block title="基本用法">
   <van-grid>
-    <van-grid-item icon="photo-o" text="文字" wx:for="{{ 4 }}" wx:key="*this" />
+    <van-grid-item icon="photo-o" text="文字" wx:for="{{ array4 }}" wx:key="*this" />
   </van-grid>
 </demo-block>
 
 <demo-block title="自定义列数">
   <van-grid column-num="3">
-    <van-grid-item icon="photo-o" text="文字" wx:for="{{ 6 }}" wx:key="*this" />
+    <van-grid-item icon="photo-o" text="文字" wx:for="{{ array6 }}" wx:key="*this" />
   </van-grid>
 </demo-block>
 
 <demo-block title="自定义内容">
   <van-grid column-num="3" border="{{ false }}">
-    <van-grid-item use-slot wx:for="{{ 3 }}" wx:for-item="index" wx:key="*this">
+    <van-grid-item use-slot wx:for="{{ array3 }}" wx:for-item="index" wx:key="*this">
       <image style="width: 100%; height: 90px;" src="https://img.yzcdn.cn/vant/apple-{{ index + 1 }}.jpg" />
     </van-grid-item>
   </van-grid>
@@ -20,13 +20,13 @@
 
 <demo-block title="正方形格子">
   <van-grid square>
-    <van-grid-item icon="photo-o" text="文字" wx:for="{{ 8 }}" wx:key="*this" />
+    <van-grid-item icon="photo-o" text="文字" wx:for="{{ array8 }}" wx:key="*this" />
   </van-grid>
 </demo-block>
 
 <demo-block title="格子间距">
   <van-grid gutter="{{ 10 }}">
-    <van-grid-item icon="photo-o" text="文字" wx:for="{{ 8 }}" wx:key="*this" />
+    <van-grid-item icon="photo-o" text="文字" wx:for="{{ array8 }}" wx:key="*this" />
   </van-grid>
 </demo-block>
 

example/pages/submit-bar/index.wxml

@@ -41,7 +41,7 @@
     tip="{{ true }}"
     safe-area-inset-bottom="{{ false }}"
   >
-    <van-tag type="primary" custom-class="van-tag">标签</van-tag>
+    <van-tag type="primary" custom-class="submit-tag">标签</van-tag>
     <view slot="tip">
       您的收货地址不支持同城送
       <text class="edit-address" bindtap="onClickLink">修改地址</text>

example/pages/submit-bar/index.wxss

@@ -6,6 +6,6 @@
   color: #1989fa;
 }
 
-.van-tag {
+.submit-tag {
   margin-left: 15px;
 }

example/pages/tab/index.js

@@ -2,8 +2,10 @@ import Page from '../../common/page';
 
 Page({
   data: {
-    tabs: [1, 2, 3, 4],
+    tabs2: [1, 2],
-    tabsMore: [1, 2, 3, 4, 5, 6, 7, 8],
+    tabs3: [1, 2, 3],
+    tabs4: [1, 2, 3, 4],
+    tabs6: [1, 2, 3, 4, 5, 6],
     tabsWithName: [
       { name: 'a', index: 1 },
       { name: 'b', index: 2 },

example/pages/tab/index.wxml

@@ -1,7 +1,7 @@
 <demo-block title="基础用法">
   <van-tabs active="{{ 1 }}" bind:change="onChange">
     <van-tab
-      wx:for="1234"
+      wx:for="{{ tabs4 }}"
       wx:key="index"
       title="{{ '标签 ' + item }}"
     >
@@ -30,7 +30,7 @@
 <demo-block title="横向滚动">
   <van-tabs>
     <van-tab
-      wx:for="123456"
+      wx:for="{{ tabs6 }}"
       wx:key="index"
       title="{{ '标签 ' + item }}"
     >
@@ -44,7 +44,7 @@
 <demo-block title="禁用标签">
   <van-tabs bind:disabled="onClickDisabled">
     <van-tab
-      wx:for="123"
+      wx:for="{{ tabs3 }}"
       wx:key="index"
       disabled="{{ index === 1 }}"
       title="{{ '标签 ' + item }}"
@@ -59,7 +59,7 @@
 <demo-block title="样式风格">
   <van-tabs type="card" tab-class="tab-class">
     <van-tab
-      wx:for="123"
+      wx:for="{{ tabs3 }}"
       wx:key="index"
       title="{{ '标签 ' + item }}"
     >
@@ -73,7 +73,7 @@
 <demo-block title="点击事件">
   <van-tabs bind:click="onClick">
     <van-tab
-      wx:for="12"
+      wx:for="{{ tabs2 }}"
       wx:key="index"
       title="{{ '标签 ' + item }}"
     >
@@ -87,7 +87,7 @@
 <demo-block title="粘性布局">
   <van-tabs sticky>
     <van-tab
-      wx:for="1234"
+      wx:for="{{ tabs4 }}"
       wx:key="index"
       title="{{ '标签 ' + item }}"
     >
@@ -101,7 +101,7 @@
 <demo-block title="切换动画">
   <van-tabs animated>
     <van-tab
-      wx:for="1234"
+      wx:for="{{ tabs4 }}"
       wx:key="index"
       title="{{ '标签 ' + item }}"
     >
@@ -115,7 +115,7 @@
 <demo-block title="滑动切换">
   <van-tabs swipeable>
     <van-tab
-      wx:for="1234"
+      wx:for="{{ tabs4 }}"
       wx:key="index"
       title="{{ '标签 ' + item }}"
     >
@@ -135,7 +135,7 @@
       bind:click="onClickNavRight"
     />
     <van-tab
-      wx:for="1234"
+      wx:for="{{ tabs4 }}"
       wx:key="index"
       title="{{ '标签 ' + item }}"
       dot="{{ index === 1 }}"

example/pages/tabbar/index.wxml

@@ -2,7 +2,7 @@
   <van-tabbar
     active="{{ active }}"
     data-key="active"
-    custom-class="tabbar"
+    custom-class="tabbar-position"
     safe-area-inset-bottom="{{ false }}"
     bind:change="onChange"
   >
@@ -17,7 +17,7 @@
   <van-tabbar
     active="{{ active2 }}"
     data-key="active2"
-    custom-class="tabbar"
+    custom-class="tabbar-position"
     safe-area-inset-bottom="{{ false }}"
     bind:change="onChange"
   >
@@ -32,7 +32,7 @@
   <van-tabbar
     active="{{ active3 }}"
     data-key="active3"
-    custom-class="tabbar"
+    custom-class="tabbar-position"
     safe-area-inset-bottom="{{ false }}"
     bind:change="onChange"
   >
@@ -47,7 +47,7 @@
   <van-tabbar
     active="{{ active4 }}"
     data-key="active4"
-    custom-class="tabbar"
+    custom-class="tabbar-position"
     safe-area-inset-bottom="{{ false }}"
     bind:change="onChange"
   >
@@ -75,7 +75,7 @@
   <van-tabbar
     active="{{ active5 }}"
     data-key="active5"
-    custom-class="tabbar"
+    custom-class="tabbar-position"
     active-color="#07c160"
     inactive-color="#000"
     safe-area-inset-bottom="{{ false }}"
@@ -93,7 +93,7 @@
   <van-tabbar
     active="{{ active6 }}"
     data-key="active6"
-    custom-class="tabbar"
+    custom-class="tabbar-position"
     safe-area-inset-bottom="{{ false }}"
     bind:change="handleChange"
   >

example/pages/tabbar/index.wxss

@@ -1,3 +1,3 @@
-.tabbar {
+.tabbar-position {
   position: relative !important;
 }