({
closeIcon: 'https://gw.alicdn.com/tfs/TB1qDJUpwMPMeJjy1XdXXasrXXa-64-64.png',
diff --git a/packages/wxc-progress/README.md b/packages/wxc-progress/README.md
index 15d92ae3..f087b821 100644
--- a/packages/wxc-progress/README.md
+++ b/packages/wxc-progress/README.md
@@ -84,5 +84,7 @@ More details can be found in [here](https://github.com/alibaba/weex-ui/blob/mast
|-------------|------------|--------|-----|-----|
| value | `Number` |`Y`| `0` | percent `(0-100)` |
| bar-height | `Number` |`N`| `8` | progress bar height |
+| bar-color | `String` |`N`| `#FFC900` | progress bar color |
| bar-width | `Number` |`N`| `600` | progress bar width |
| bar-radius | `number` |`n`| `0` | progress bar radius |
+| background-color | `String` |`N`| `#f2f3f4` | overall background color |
\ No newline at end of file
diff --git a/packages/wxc-progress/README_cn.md b/packages/wxc-progress/README_cn.md
index 4e781fc7..80ae638a 100644
--- a/packages/wxc-progress/README_cn.md
+++ b/packages/wxc-progress/README_cn.md
@@ -87,3 +87,4 @@
| bar-width | `Number` |`N`| `600` | 长度 |
| bar-color | `String` |`N`| `#FFC900` | 颜色 |
| bar-radius | `Number` |`N`| `0` | 圆角 |
+| background-color | `String` |`N`| `#f2f3f4` | 整体背景色 |
\ No newline at end of file
diff --git a/packages/wxc-progress/index.vue b/packages/wxc-progress/index.vue
index 804abc5a..5ef3b23b 100644
--- a/packages/wxc-progress/index.vue
+++ b/packages/wxc-progress/index.vue
@@ -43,15 +43,20 @@
value: {
type: Number,
default: 0
+ },
+ backgroundColor: {
+ type: String,
+ default: '#f2f3f4'
}
},
computed: {
runWayStyle () {
- const { barWidth, barHeight, barRadius } = this;
+ const { barWidth, barHeight, barRadius, backgroundColor } = this;
return {
width: barWidth + 'px',
height: barHeight + 'px',
- borderRadius: barRadius + 'px'
+ borderRadius: barRadius + 'px',
+ backgroundColor
}
},
progressStyle () {
diff --git a/packages/wxc-radio/item.vue b/packages/wxc-radio/item.vue
index 489792c7..88d96ed8 100644
--- a/packages/wxc-radio/item.vue
+++ b/packages/wxc-radio/item.vue
@@ -19,12 +19,14 @@
diff --git a/packages/wxc-rich-text/README.md b/packages/wxc-rich-text/README.md
index 64f182bd..0ede1398 100644
--- a/packages/wxc-rich-text/README.md
+++ b/packages/wxc-rich-text/README.md
@@ -19,7 +19,7 @@
-
+
@@ -76,6 +76,9 @@
borderColor: '#FFC900',
backgroundColor: '#FFC900',
borderRadius: 14,
+ },
+ tagDivStyle: {
+ left: '50px'
}
},
{
@@ -89,7 +92,8 @@
],
}),
methods: {
- wxcRichTextLinkClick () {}
+ wxcRichTextLinkClick () {},
+ wxcSpecialRichTextClick () {}
}
};
@@ -110,6 +114,7 @@ More details can be found in [here](https://github.com/alibaba/weex-ui/blob/mast
```
@wxcRichTextLinkClick='wxcRichTextLinkClick'
+@wxcSpecialRichTextClick="wxcSpecialRichTextClick"
```
diff --git a/packages/wxc-rich-text/README_cn.md b/packages/wxc-rich-text/README_cn.md
index 13321602..71d0e484 100644
--- a/packages/wxc-rich-text/README_cn.md
+++ b/packages/wxc-rich-text/README_cn.md
@@ -19,7 +19,7 @@