Browse Source

Merge branch 'v4' of https://github.com/jdf2e/nutui into v4

suzigang 3 years ago
parent
commit
9f01637954

+ 1 - 1
src/packages/__VUE/layout/doc.en-US.md

@@ -235,7 +235,7 @@ The Layout component provides a 24-column grid, by adding the span attribute on
 | Field | Description | Type | Default
 | Field | Description | Type | Default
 |----- | ----- | ----- | -----
 |----- | ----- | ----- | -----
 | type | layout method, optional value is `flex` | string | `-`
 | type | layout method, optional value is `flex` | string | `-`
-| gutter | spacing between column elements (in `px`) | string \| number | `-`
+| gutter | spacing between column elements (`px`) | string \| number | `-`
 | justify | Flex main axis alignment, optional values are `start` `end` `center` `space-around` `space-between` `space-evenly` | string | `start`
 | justify | Flex main axis alignment, optional values are `start` `end` `center` `space-around` `space-between` `space-evenly` | string | `start`
 | align | Flex cross axis alignment, optional values are `flex-start` `center` `flex-end` | string | `flex-start`
 | align | Flex cross axis alignment, optional values are `flex-start` `center` `flex-end` | string | `flex-start`
 | flex-wrap | Whether flex wraps, optional values are `nowrap` `wrap` `reverse` | string | `nowrap`
 | flex-wrap | Whether flex wraps, optional values are `nowrap` `wrap` `reverse` | string | `nowrap`

+ 5 - 3
src/packages/__VUE/price/demo.vue

@@ -21,7 +21,7 @@
     </nut-cell>
     </nut-cell>
     <h2>{{ translate('title4') }}</h2>
     <h2>{{ translate('title4') }}</h2>
     <nut-cell>
     <nut-cell>
-      <nut-price :price="8888.01" position="after" symbol="元" />
+      <nut-price :price="8888.01" position="after" :symbol="translate('symbol')" />
     </nut-cell>
     </nut-cell>
     <h2>{{ translate('title5') }}</h2>
     <h2>{{ translate('title5') }}</h2>
     <nut-cell>
     <nut-cell>
@@ -41,14 +41,16 @@ const initTranslate = () =>
       title2: '不保留小数',
       title2: '不保留小数',
       title3: '货币符号',
       title3: '货币符号',
       title4: '货币符号位置',
       title4: '货币符号位置',
-      title5: '千位分隔'
+      title5: '千位分隔',
+      symbol: '元'
     },
     },
     'en-US': {
     'en-US': {
       title1: 'Support three sizes:small、normal、large',
       title1: 'Support three sizes:small、normal、large',
       title2: 'No decimals',
       title2: 'No decimals',
       title3: 'Currency symbol',
       title3: 'Currency symbol',
       title4: 'Currency symbol position',
       title4: 'Currency symbol position',
-      title5: 'Separated by thousands'
+      title5: 'Separated by thousands',
+      symbol: 'RMB'
     }
     }
   });
   });
 export default createDemo({
 export default createDemo({

+ 1 - 1
src/packages/__VUE/price/doc.en-US.md

@@ -67,7 +67,7 @@ Three sizes are supported: small, normal, and large, and the default is normal.
 
 
 ``` html
 ``` html
 <template>
 <template>
-    <nut-price :price="8888.01" position="after" symbol="" />
+    <nut-price :price="8888.01" position="after" symbol="RMB" />
 </template>
 </template>
 ```
 ```