diff --git a/docs/examples-docs/icon.md b/docs/examples-docs/icon.md
index f2d7d7079..33b302122 100644
--- a/docs/examples-docs/icon.md
+++ b/docs/examples-docs/icon.md
@@ -331,6 +331,38 @@ export default {
after-sale
+
+
+ edit-data
+
+
+
+ question
+
+
+
+ delete
+
+
+
+ records
+
+
+
+ description
+
+
+
+ card
+
+
+
+ gift-card
+
+
+
+ coupon
+
```
:::
diff --git a/packages/tab/src/tabs.vue b/packages/tab/src/tabs.vue
index 68c325819..3d88981ac 100644
--- a/packages/tab/src/tabs.vue
+++ b/packages/tab/src/tabs.vue
@@ -92,7 +92,7 @@
* `type`为`line`时，tab下方的横线的样式
*/
navBarStyle() {
- if (!this.isReady || this.type !== 'line') return;
+ if (!this.isReady || this.type !== 'line' || !this.$refs.tabkey) return;
const tabKey = this.curActive;
const elem = this.$refs.tabkey[tabKey];
diff --git a/packages/vant-css/assets/icons.sketch b/packages/vant-css/assets/icons.sketch
index 3a15fd865..545fba709 100644
Binary files a/packages/vant-css/assets/icons.sketch and b/packages/vant-css/assets/icons.sketch differ
diff --git a/packages/vant-css/scripts/fount-config.js b/packages/vant-css/scripts/fount-config.js
index 7ae428b47..f3b0a15f9 100644
--- a/packages/vant-css/scripts/fount-config.js
+++ b/packages/vant-css/scripts/fount-config.js
@@ -341,8 +341,48 @@ module.exports = {
},
{
keywords: ['after', 'sale'],
- src: '售后记录.svg',
+ src: '售后.svg',
css: 'after-sale'
+ },
+ {
+ keywords: ['edit', 'data'],
+ src: '编辑资料.svg',
+ css: 'edit-data'
+ },
+ {
+ keywords: ['question'],
+ src: '答疑.svg',
+ css: 'question'
+ },
+ {
+ keywords: ['delete'],
+ src: '删除.svg',
+ css: 'delete'
+ },
+ {
+ keywords: ['records'],
+ src: '记录.svg',
+ css: 'records'
+ },
+ {
+ keywords: ['description'],
+ src: '描述.svg',
+ css: 'description'
+ },
+ {
+ keywords: ['card'],
+ src: '卡.svg',
+ css: 'card'
+ },
+ {
+ keywords: ['gift', 'card'],
+ src: '礼卡.svg',
+ css: 'gift-card'
+ },
+ {
+ keywords: ['coupon'],
+ src: '优惠券卡.svg',
+ css: 'coupon'
}
]
};
diff --git a/packages/vant-css/src/icon.css b/packages/vant-css/src/icon.css
index 8b11c608f..a79e94a57 100644
--- a/packages/vant-css/src/icon.css
+++ b/packages/vant-css/src/icon.css
@@ -2,11 +2,11 @@
@font-face {
font-family: 'vant-icon';
- src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-ab58022933.eot');
- src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-ab58022933.eot?#iefix') format('embedded-opentype'),
- url('https://b.yzcdn.cn/zanui/icon/vant-icon-ab58022933.woff2') format('woff2'),
- url('https://b.yzcdn.cn/zanui/icon/vant-icon-ab58022933.woff') format('woff'),
- url('https://b.yzcdn.cn/zanui/icon/vant-icon-ab58022933.ttf') format('truetype')
+ src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-868bbca7fc.eot');
+ src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-868bbca7fc.eot?#iefix') format('embedded-opentype'),
+ url('https://b.yzcdn.cn/zanui/icon/vant-icon-868bbca7fc.woff2') format('woff2'),
+ url('https://b.yzcdn.cn/zanui/icon/vant-icon-868bbca7fc.woff') format('woff'),
+ url('https://b.yzcdn.cn/zanui/icon/vant-icon-868bbca7fc.ttf') format('truetype')
}
.van-icon {
@@ -111,4 +111,12 @@
.van-icon-cash-on-deliver:before { content: '\e83d'; } /* '' */
.van-icon-underway:before { content: '\e83e'; } /* '' */
.van-icon-point-gift:before { content: '\e83f'; } /* '' */
-.van-icon-after-sale:before { content: '\e840'; } /* '' */
\ No newline at end of file
+.van-icon-after-sale:before { content: '\e840'; } /* '' */
+.van-icon-edit-data:before { content: '\e841'; } /* '' */
+.van-icon-question:before { content: '\e842'; } /* '' */
+.van-icon-delete:before { content: '\e843'; } /* '' */
+.van-icon-records:before { content: '\e844'; } /* '' */
+.van-icon-description:before { content: '\e845'; } /* '' */
+.van-icon-card:before { content: '\e846'; } /* '' */
+.van-icon-gift-card:before { content: '\e847'; } /* '' */
+.van-icon-coupon:before { content: '\e848'; } /* '' */
\ No newline at end of file
diff --git a/packages/vant-css/yarn.lock b/packages/vant-css/yarn.lock
index 9c3f690d8..6f1e1e131 100644
--- a/packages/vant-css/yarn.lock
+++ b/packages/vant-css/yarn.lock
@@ -1167,15 +1167,15 @@ micromatch@^2.3.7:
parse-glob "^3.0.4"
regex-cache "^0.4.2"
-"minimatch@2 || 3", minimatch@^2.0.1:
- version "2.0.10"
- resolved "http://registry.npm.qima-inc.com/minimatch/download/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"
+"minimatch@2 || 3", minimatch@^3.0.2:
+ version "3.0.3"
+ resolved "http://registry.npm.qima-inc.com/minimatch/download/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
dependencies:
brace-expansion "^1.0.0"
-minimatch@^3.0.2:
- version "3.0.3"
- resolved "http://registry.npm.qima-inc.com/minimatch/download/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
+minimatch@^2.0.1:
+ version "2.0.10"
+ resolved "http://registry.npm.qima-inc.com/minimatch/download/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"
dependencies:
brace-expansion "^1.0.0"
@@ -1382,12 +1382,6 @@ postcss-color-function@^2.0.0:
postcss-message-helpers "^2.0.0"
postcss-value-parser "^3.3.0"
-postcss-css-reset@^1.0.2:
- version "1.0.2"
- resolved "http://registry.npm.qima-inc.com/postcss-css-reset/download/postcss-css-reset-1.0.2.tgz#769f2d62d3f1f76e2600fb4f79066399bebe2bd8"
- dependencies:
- postcss "^5.0.19"
-
postcss-custom-media@^5.0.0:
version "5.0.1"
resolved "http://registry.npm.qima-inc.com/postcss-custom-media/download/postcss-custom-media-5.0.1.tgz#138d25a184bf2eb54de12d55a6c01c30a9d8bd81"
diff --git a/yarn.lock b/yarn.lock
index e7756f407..43f00c901 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7308,7 +7308,7 @@ yeast@0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
-zan-doc@0.1.0:
+zan-doc@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/zan-doc/-/zan-doc-0.1.0.tgz#6ea2aba808c39b35b9730899f000dbf05806cbad"
dependencies: