diff --git a/build/manifest.js b/build/manifest.js index e60c7693628a61aea731456a9c08497184d8a9b0..d757622b43aaa5823f74efe9523e4b6628b2af22 100644 --- a/build/manifest.js +++ b/build/manifest.js @@ -46,7 +46,14 @@ const DEPS = { ['/core/view/components/swiper-item/index.vue', 'SwiperItem'], ['/core/view/components/movable-area/index.vue', 'MovableArea'], ['/core/view/components/movable-view/index.vue', 'MovableView'], - ['/platforms/h5/components/system-routes/preview-image/index.vue', 'PreviewImage'] + [ + '/platforms/h5/components/app/popup/preview-image/index.vue', + 'PreviewImage' + ], + [ + '/platforms/h5/components/app/popup/mixins/preview-image.js', + 'PreviewImageMixin' + ] ], showToast: TOAST_DEPS, hideToast: TOAST_DEPS, diff --git a/packages/uni-h5/manifest.json b/packages/uni-h5/manifest.json index 740525ce9c83a46d5e65dd5c0d58736d3bd6e802..f50bb092f21441f7134a64b974b70de37629c76b 100644 --- a/packages/uni-h5/manifest.json +++ b/packages/uni-h5/manifest.json @@ -383,8 +383,12 @@ "MovableView" ], [ - "/platforms/h5/components/system-routes/preview-image/index.vue", + "/platforms/h5/components/app/popup/preview-image/index.vue", "PreviewImage" + ], + [ + "/platforms/h5/components/app/popup/mixins/preview-image.js", + "PreviewImageMixin" ] ] ], diff --git a/packages/webpack-uni-pages-loader/lib/platforms/h5.js b/packages/webpack-uni-pages-loader/lib/platforms/h5.js index 72feaf423b9479221485da70659ccb68503a5b0d..99de71e4c0b077d044f4925cece4765a4919bef2 100644 --- a/packages/webpack-uni-pages-loader/lib/platforms/h5.js +++ b/packages/webpack-uni-pages-loader/lib/platforms/h5.js @@ -257,32 +257,6 @@ const genSystemRoutes = function () { return [ ` { -path: '/preview-image', -component: { - render (createElement) { - return createElement( - 'Page', - { - props:{ - navigationStyle:'custom' - } - }, - [ - createElement('system-preview-image', { - slot: 'page' - }) - ] - ) - } -}, -meta:{ - name:'preview-image', - pagePath:'/preview-image' -} -} - `, - ` -{ path: '/choose-location', component: { render (createElement) { diff --git a/src/platforms/h5/components/app/index.vue b/src/platforms/h5/components/app/index.vue index 1cd663a6fc91bc578603e56c36d99a9799044958..9e64526bfbefe42c291b4c9c8ed87f8feb39f3fb 100644 --- a/src/platforms/h5/components/app/index.vue +++ b/src/platforms/h5/components/app/index.vue @@ -1,37 +1,42 @@