Merge branch 'dev' into v3

packages/vue-cli-plugin-uni/lib/h5/compiler-options.js

@@ -17,11 +17,11 @@ $event = $handleWxsEvent($event);
 ${expr}($event, $getComponentDescriptor())
 `
     } else {
-      expr = expr + '($event)'
+      expr = expr + '(...arguments)'
     }
   }
   return `
-$event = $handleEvent($event);
+arguments[0] = $event = $handleEvent($event);
 ${expr}
 `
 }

src/platforms/app-plus/service/api/device/scan-code.js

@@ -2,6 +2,6 @@ import * as webview from './scan-code-webview'
 import * as weex from './scan-code-weex'
 
 export function scanCode (...array) {
-  const api = __uniConfig.nvueCompiler === 'uni-app' ? weex : webview
+  const api = __uniConfig.nvueCompiler !== 'weex' ? weex : webview
   return api.scanCode(...array)
 }

src/platforms/app-plus/service/api/location/choose-location.js

@@ -2,6 +2,6 @@ import * as webview from './choose-location-webview'
 import * as weex from './choose-location-weex'
 
 export function chooseLocation (...array) {
-  const api = __uniConfig.nvueCompiler === 'uni-app' ? weex : webview
+  const api = __uniConfig.nvueCompiler !== 'weex' ? weex : webview
   return api.chooseLocation(...array)
 }

src/platforms/app-plus/service/api/location/open-location.js

@@ -2,6 +2,6 @@ import * as webview from './open-location-webview'
 import * as weex from './open-location-weex'
 
 export function openLocation (...array) {
-  const api = __uniConfig.nvueCompiler === 'uni-app' ? weex : webview
+  const api = __uniConfig.nvueCompiler !== 'weex' ? weex : webview
   return api.openLocation(...array)
 }

src/platforms/app-plus/service/api/page.js

@@ -84,7 +84,7 @@ export function showPage ({
     animationType: 'pop-in',
     animationDuration: 200,
     uniNView: {
-      path: `${(typeof process === 'object' && process.env && process.env.VUE_APP_TEMPLATE_PATH) || '/template'}/${url}.js`,
+      path: `${(typeof process === 'object' && process.env && process.env.VUE_APP_TEMPLATE_PATH) || ''}/${url}.js`,
       defaultFontSize: plus_.screen.resolutionWidth / 20,
       viewport: plus_.screen.resolutionWidth
     }