Merge branch 'dev' into next

2020-10-18 20:10:42 +08:00
parent 9cd48e0e33 efc05af6f6
commit 791d9e2315
21 changed files with 145 additions and 62 deletions
@@ -25,7 +25,7 @@ exports[`height prop 1`] = `
 </div>
 `;

-exports[`nav badge 1`] = `
+exports[`nav render badge 1`] = `
 <div class="van-tree-select" style="height: 300px;">
  <div class="van-sidebar van-tree-select__nav"><a class="van-sidebar-item van-sidebar-item--select van-tree-select__nav-item">
      <div class="van-sidebar-item__text">group1<div class="van-badge van-sidebar-item__badge">3</div>