From 3265d68f90ef75ee87fff80538413d61ff6fa86e Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Fri, 24 Apr 2020 22:14:13 +0800
Subject: [PATCH] style: add base-font-family (#6126)

---
 packages/vant-cli/site/common/style/base.less | 4 +++-
 src/style/normalize.less                      | 5 ++---
 src/style/reset.less                          | 1 -
 src/style/var.less                            | 5 ++++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/vant-cli/site/common/style/base.less b/packages/vant-cli/site/common/style/base.less
index efd18e307..7bb9384f5 100644
--- a/packages/vant-cli/site/common/style/base.less
+++ b/packages/vant-cli/site/common/style/base.less
@@ -6,7 +6,9 @@ body {
   overflow-x: auto;
   color: @van-doc-black;
   font-size: 16px;
-  font-family: PingFang SC, 'Helvetica Neue', Arial, sans-serif;
+  font-family: -apple-system, BlinkMacSystemFont, 'Helvetica Neue', Helvetica,
+    Segoe UI, Arial, Roboto, 'PingFang SC', 'Hiragino Sans GB',
+    'Microsoft Yahei', sans-serif;
   background-color: @van-doc-background-color;
   -webkit-font-smoothing: antialiased;
 }
diff --git a/src/style/normalize.less b/src/style/normalize.less
index 4c6254902..baf31f706 100644
--- a/src/style/normalize.less
+++ b/src/style/normalize.less
@@ -1,6 +1,4 @@
-/**
- * Normalize
- */
+@import './var';
 
 html {
   -webkit-tap-highlight-color: transparent;
@@ -8,6 +6,7 @@ html {
 
 body {
   margin: 0;
+  font-family: @base-font-family;
 }
 
 a {
diff --git a/src/style/reset.less b/src/style/reset.less
index 7e2108539..c8256b58c 100644
--- a/src/style/reset.less
+++ b/src/style/reset.less
@@ -149,7 +149,6 @@ summary {
 
 body {
   color: @text-color;
-  font-family: Arial, Helvetica, 'Microsoft YaHei', Tohoma, sans-serif;
   background-color: @background-color;
 }
 
diff --git a/src/style/var.less b/src/style/var.less
index 3eced0583..16a4d1821 100644
--- a/src/style/var.less
+++ b/src/style/var.less
@@ -42,6 +42,9 @@
 @font-size-md: 14px;
 @font-size-lg: 16px;
 @font-weight-bold: 500;
+@base-font-family: -apple-system, BlinkMacSystemFont, 'Helvetica Neue',
+  Helvetica, Segoe UI, Arial, Roboto, 'PingFang SC', 'Hiragino Sans GB',
+  'Microsoft Yahei', sans-serif;
 @price-integer-font-family: Avenir-Heavy, PingFang SC, Helvetica Neue, Arial,
   sans-serif;
 
@@ -410,7 +413,7 @@
 @info-background-color: @red;
 @info-dot-color: @red;
 @info-dot-size: 8px;
-@info-font-family: PingFang SC, Helvetica Neue, Arial, sans-serif;
+@info-font-family: @price-integer-font-family;
 
 // Image
 @image-placeholder-text-color: @gray-6;