Merge branch 'jdf2e:next' into next

gp5251 · Feb 22, 2022 · 0d8586b · 0d8586b
2 parents a849629 + 0ba68da
commit 0d8586b
Show file tree

Hide file tree

Showing 6 changed files with 370 additions and 9 deletions.
diff --git a/src/packages/__VUE/address/index.vue b/src/packages/__VUE/address/index.vue
@@ -9,7 +9,11 @@
     <view class="nut-address">
       <view class="nut-address__header">
         <view class="arrow-back" @click="switchModule">
-          <nut-icon :name="backBtnIcon" color="#cccccc" v-show="privateType == 'custom' && backBtnIcon"></nut-icon>
+          <nut-icon
+            :name="backBtnIcon"
+            color="#cccccc"
+            v-show="type == 'exist' && privateType == 'custom' && backBtnIcon"
+          ></nut-icon>
         </view>
 
         <view class="nut-address__header__title">

diff --git a/src/packages/__VUE/barrage/doc.md b/src/packages/__VUE/barrage/doc.md
@@ -20,7 +20,7 @@ app.use(Barrage);
 
 ## 代码演示
 
-### 基础用法1
+### 基础用法
 
 `Icon` 的 `name` 属性支持传入图标名称或图片链接。
 :::demo

diff --git a/src/packages/__VUE/datepicker/doc.md b/src/packages/__VUE/datepicker/doc.md
@@ -8,7 +8,10 @@
 
 ```javascript
 import { createApp } from 'vue';
-import { DatePicker } from '@nutui/nutui';
+// vue
+import { DatePicker, Picker } from '@nutui/nutui';
+// taro
+import { DatePicker, Picker } from '@nutui/nutui-taro';
 
 const app = createApp();
 app.use(DatePicker);

diff --git a/src/packages/__VUE/icon/doc.md b/src/packages/__VUE/icon/doc.md
@@ -71,6 +71,10 @@ app.use(Icon);
   <nut-icon name="dou-arrow-up" class="nut-icon-am-jump nut-icon-am-infinite"></nut-icon>
   <nut-icon name="star-fill-n" class="nut-icon-am-blink nut-icon-am-infinite"></nut-icon>
   <nut-icon name="refresh2" class="nut-icon-am-rotate nut-icon-am-infinite"></nut-icon>
+  <nut-icon name="heart-fill" class="nut-icon-am-breathe nut-icon-am-infinite"></nut-icon>
+  <nut-icon name="microphone" class="nut-icon-am-flash nut-icon-am-infinite"></nut-icon>
+  <nut-icon name="download" class="nut-icon-am-bounce nut-icon-am-infinite"></nut-icon>
+  <nut-icon name="message" class="nut-icon-am-shake nut-icon-am-infinite"></nut-icon>
 </template>
 
 <style>

diff --git a/src/packages/__VUE/numberkeyboard/doc.md b/src/packages/__VUE/numberkeyboard/doc.md
@@ -238,13 +238,13 @@ export default{
 </script>
 ```
 :::
-```
 
-## Prop
 
-| 字段 | 说明 | 类型 | 默认值
-|----- | ----- | ----- | ----- 
-| v-model:visible | 是否显示键盘 | Boolean | false
+### Prop
+
+| 字段 | 说明 | 类型 | 默认值 |
+|----- | ----- | ----- | ----- |
+| v-model:visible | 是否显示键盘 | Boolean | false | 
 | title | 键盘标题 | String | - |
 | type | 键盘模式  | String | `default`：默认样式<br>`rightColumn`：带右侧栏 |
 | random-keys | 随机数  | Boolean | false |
@@ -254,7 +254,7 @@ export default{
 | maxlength  | 输入值最大长度，结合 v-model 使用 | number <br> String| 6 |
 
 
-## Event
+### Event
 
 | 字段 | 说明 | 回调参数
 |----- | ----- | -----