Merge branch '2.x' into dev

2020-12-14 17:07:29 +08:00
parent a33f06bb9d dc3fee12c1
commit 96204b350c
11 changed files with 29 additions and 25 deletions
@@ -38,9 +38,7 @@ app.use(Form);
    :rules="[{ required: true, message: '请填写密码' }]"
  />
  <div style="margin: 16px;">
-    <van-button round block type="primary" native-type="submit">
-      提交
-    </van-button>
+    <van-button round block type="info" native-type="submit">提交</van-button>
  </div>
 </van-form>
 ```
@@ -89,9 +87,9 @@ export default {
    :rules="[{ validator: asyncValidator, message: '请输入正确内容' }]"
  />
  <div style="margin: 16px;">
-    <van-button round block type="primary" native-type="submit">
-      提交
-    </van-button>
+    <van-button round block type="primary" native-type="submit"
+      >提交</van-button
+    >
  </div>
 </van-form>
 ```