diff --git a/packages/uni-app-plus/lib/uni.config.js b/packages/uni-app-plus/lib/uni.config.js
index 4b6e332fb9e16f9f99606399a04a766039bb6813..9e1ee7f629d88777c0bae62cebf064b1728c3c64 100644
--- a/packages/uni-app-plus/lib/uni.config.js
+++ b/packages/uni-app-plus/lib/uni.config.js
@@ -36,7 +36,7 @@ module.exports = {
copyOptions.push(path.resolve(__dirname, '../dist/view.css'))
copyOptions.push(path.resolve(__dirname, '../dist/view.umd.min.js'))
// TODO 后续common与v3目录应该合并
- copyOptions.push(path.resolve(__dirname, '../template/common'))
+ copyOptions.push(path.resolve(__dirname, process.env.UNI_USING_NVUE_COMPILER ? '../template/common' : '../template/weex'))
copyOptions.push(path.resolve(__dirname, '../template/v3'))
}
return copyOptions
@@ -56,4 +56,4 @@ module.exports = {
devtool
}
}
-}
+}
diff --git a/packages/uni-app-plus/template/weex/__uniappchooselocation.html b/packages/uni-app-plus/template/weex/__uniappchooselocation.html
new file mode 100644
index 0000000000000000000000000000000000000000..f13ddd9c542386207472b5bb78a60dac94c99391
--- /dev/null
+++ b/packages/uni-app-plus/template/weex/__uniappchooselocation.html
@@ -0,0 +1,678 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/packages/uni-app-plus/template/weex/__uniappopenlocation.html b/packages/uni-app-plus/template/weex/__uniappopenlocation.html
new file mode 100644
index 0000000000000000000000000000000000000000..b25bbbd5e8d95275065b0530d90adc2195c4a9d7
--- /dev/null
+++ b/packages/uni-app-plus/template/weex/__uniappopenlocation.html
@@ -0,0 +1,284 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/packages/uni-app-plus/template/weex/__uniapppicker.html b/packages/uni-app-plus/template/weex/__uniapppicker.html
new file mode 100644
index 0000000000000000000000000000000000000000..31a563a79e369fff98594c0017458f6bbd5b945e
--- /dev/null
+++ b/packages/uni-app-plus/template/weex/__uniapppicker.html
@@ -0,0 +1,10 @@
+
\ No newline at end of file
diff --git a/packages/uni-app-plus/template/weex/__uniappscan.html b/packages/uni-app-plus/template/weex/__uniappscan.html
new file mode 100644
index 0000000000000000000000000000000000000000..76db379747161b82832a52257e74606373b7b631
--- /dev/null
+++ b/packages/uni-app-plus/template/weex/__uniappscan.html
@@ -0,0 +1,146 @@
+
+
+
+
+
+
+ 扫码
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/uni-app-plus/template/weex/__uniappsuccess.png b/packages/uni-app-plus/template/weex/__uniappsuccess.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1f5bd7c5293dcc37284f30b215ff2a3779c316f
Binary files /dev/null and b/packages/uni-app-plus/template/weex/__uniappsuccess.png differ
diff --git a/packages/uni-cli-shared/template/weex/__uniappchooselocation.html b/packages/uni-cli-shared/template/weex/__uniappchooselocation.html
new file mode 100644
index 0000000000000000000000000000000000000000..f13ddd9c542386207472b5bb78a60dac94c99391
--- /dev/null
+++ b/packages/uni-cli-shared/template/weex/__uniappchooselocation.html
@@ -0,0 +1,678 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/packages/uni-cli-shared/template/weex/__uniappopenlocation.html b/packages/uni-cli-shared/template/weex/__uniappopenlocation.html
new file mode 100644
index 0000000000000000000000000000000000000000..b25bbbd5e8d95275065b0530d90adc2195c4a9d7
--- /dev/null
+++ b/packages/uni-cli-shared/template/weex/__uniappopenlocation.html
@@ -0,0 +1,284 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/packages/uni-cli-shared/template/weex/__uniapppicker.html b/packages/uni-cli-shared/template/weex/__uniapppicker.html
new file mode 100644
index 0000000000000000000000000000000000000000..31a563a79e369fff98594c0017458f6bbd5b945e
--- /dev/null
+++ b/packages/uni-cli-shared/template/weex/__uniapppicker.html
@@ -0,0 +1,10 @@
+
\ No newline at end of file
diff --git a/packages/uni-cli-shared/template/weex/__uniappscan.html b/packages/uni-cli-shared/template/weex/__uniappscan.html
new file mode 100644
index 0000000000000000000000000000000000000000..76db379747161b82832a52257e74606373b7b631
--- /dev/null
+++ b/packages/uni-cli-shared/template/weex/__uniappscan.html
@@ -0,0 +1,146 @@
+
+
+
+
+
+
+ 扫码
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/uni-cli-shared/template/weex/__uniappsuccess.png b/packages/uni-cli-shared/template/weex/__uniappsuccess.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1f5bd7c5293dcc37284f30b215ff2a3779c316f
Binary files /dev/null and b/packages/uni-cli-shared/template/weex/__uniappsuccess.png differ
diff --git a/packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js b/packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js
index e5366c26e410c008a4490acfb91aac42de24e7bd..f2157c29e06964b1bed9eff39be5f33fd980879f 100644
--- a/packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js
+++ b/packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js
@@ -189,6 +189,11 @@ if (process.env.UNI_USING_NATIVE || process.env.UNI_USING_V3_NATIVE) {
from: path.resolve(getTemplatePath(), 'common'),
to: process.env.UNI_OUTPUT_DIR
})
+ } else if (process.env.UNI_USING_V3_NATIVE) {
+ array.push({
+ from: path.resolve(getTemplatePath(), 'weex'),
+ to: process.env.UNI_OUTPUT_DIR
+ })
} else {
let nativeTemplatePath = path.resolve(process.env.UNI_HBUILDERX_PLUGINS, 'weapp-tools/template/v8-native')
if (!fs.existsSync(nativeTemplatePath)) { // 兼容旧版本
@@ -318,4 +323,4 @@ module.exports = function () {
zlib: false
}
}
-}
+}
diff --git a/src/platforms/app-plus/view/components/picker/index.vue b/src/platforms/app-plus/view/components/picker/index.vue
index d5e21e1b2380d97a2ced540e0d66e4b1f9963ffa..69beab4d2d30182ce34c3d29adf089e568304a35 100644
--- a/src/platforms/app-plus/view/components/picker/index.vue
+++ b/src/platforms/app-plus/view/components/picker/index.vue
@@ -10,6 +10,7 @@