Merge branch 'master' of git://github.com/jaceechan/uni-app into dev

src/platforms/mp-weixin/runtime/wrapper/component-base-parser.js

@@ -20,13 +20,14 @@ export default function parseBaseComponent (vueComponentOptions, {
   initRelation
 } = {}) {
   let [VueComponent, vueOptions] = initVueComponent(Vue, vueComponentOptions)
-
+  
   const options = {
     multipleSlots: true,
-    addGlobalClass: true
+    addGlobalClass: true,
+    ...(vueOptions.options || {})
   }
 
-  if (__PLATFORM__ === 'mp-weixin' || __PLATFORM__ === 'mp-qq') {
+  if (__PLATFORM__ === 'mp-weixin' || __PLATFORM__ === 'mp-qq') {
     // 微信 multipleSlots 部分情况有 bug，导致内容顺序错乱 如 u-list，提供覆盖选项
     if (vueOptions['mp-weixin'] && vueOptions['mp-weixin']['options']) {
       Object.assign(options, vueOptions['mp-weixin']['options'])
@@ -109,4 +110,4 @@ export default function parseBaseComponent (vueComponentOptions, {
     return componentOptions
   }
   return [componentOptions, VueComponent]
-}
+}