Merge branch 'master' of https://github.com/jiaming743/DataV

src/components/activeRingChart/src/main.vue

@@ -196,7 +196,8 @@ export default {
               show: false
             }
           }
-        ]
+        ],
+        color: mergedConfig.color
       }
     },
     getRealRadius (active = false) {