merge query and old config options

Author: yyx990803

lib/loader.js

@@ -42,7 +42,7 @@ module.exports = function (content) {
   var isServer = this.options.target === 'node'
   var loaderContext = this
   var query = loaderUtils.parseQuery(this.query)
-  var options = this.query ? query : this.vue || this.options.vue || {}
+  var options = Object.assign({}, this.options.vue, this.vue, query)
   var filePath = this.resourcePath
   var fileName = path.basename(filePath)
   var moduleId = 'data-v-' + genId(filePath)