Merge branch 'dev' of github.com:dcloudio/uni-app into dev

src/core/service/api/context/canvas.js

@@ -671,10 +671,17 @@ methods3.forEach(function (method) {
       case 'setFillStyle':
       case 'setStrokeStyle':
         return function (color) {
+          if (typeof color !== 'object') {
             this.actions.push({
               method,
               data: ['normal', checkColor(color)]
             })
+          } else {
+            this.actions.push({
+              method,
+              data: [color.type, color.data, color.colorStop]
+            })
+          }
         }
       case 'setGlobalAlpha':
         return function (alpha) {

src/core/view/components/canvas/index.vue

@@ -163,6 +163,7 @@ export default {
                 let color = resolveColor(data2[1])
                 LinearGradient.addColorStop(offset, color)
               })
+              color = LinearGradient
             } else if (data[0] === 'radial') {
               let x = data[1][0]
               let y = data[1][1]
@@ -173,6 +174,7 @@ export default {
                 let color = resolveColor(data2[1])
                 LinearGradient.addColorStop(offset, color)
               })
+              color = LinearGradient
             } else if (data[0] === 'pattern') {
               let loaded = this.checkImageLoaded(data[1], actions.slice(index + 1), callbackId,
                 function (image) {