.github/workflows/deploy-v2-site.yml

@@ -17,11 +17,6 @@ jobs:
         with:
           ref: '2.x'
 
-      - name: Set Node Version
-        uses: actions/setup-node@v1
-        with:
-          node-version: '14.x'
-
       - name: Install dependencies
         uses: bahmutov/npm-install@v1
 
@@ -29,17 +24,17 @@ jobs:
         run: npx --no-install vant-cli build-site
 
       - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@v4.4.1
+        uses: JamesIves/github-pages-deploy-action@v4.4.0
         with:
           branch: gh-pages
           folder: site
           target-folder: v2
 
       - name: Deploy for GitHub 🚀
-        uses: JamesIves/github-pages-deploy-action@v4.4.1
+        uses: JamesIves/github-pages-deploy-action@v4.4.0
         with:
           branch: main
-          folder: site
+          folder: packages/vant/site-dist
           token: ${{ secrets.VANT_UI_TOKEN }}
           repository-name: vant-ui/vant-ui.github.io
           target-folder: vant/v2

docs/markdown/changelog.zh-CN.md

@@ -16,7 +16,7 @@ Vant 遵循 [Semver](https://semver.org/lang/zh-CN/) 语义化版本规范。
 
 **Vant 2 维护提示**
 
-目前 Vant 3 / 4 已经发布超过 24 个月。对于 Vant 2，我们会将维护投入降低至最小范围，这意味着：
+目前 Vant 3 已经发布超过 18 个月。对于 Vant 2，我们会将维护投入降低至最小范围，这意味着：
 
 - 不再主动迭代新的功能。
 - 致命 bug 依然会被处理和修复。

src/icon/demo/index.vue

@@ -152,7 +152,7 @@ export default {
         tag = `${tag} ${option.dot ? 'dot' : ''}`;
       }
       if ('badge' in option) {
-        tag = `${tag} ${this.isWeapp ? 'info' : 'badge'}="${option.badge}"`;
+        tag = `${tag} badge="${option.badge}"`;
       }
       if ('color' in option) {
         tag = `${tag} color="${option.color}"`;