提交 a199e2d9 编写于 作者: fxy060608's avatar fxy060608

feat(mp-360): Compatible with sysComponents

上级 4ef75c29
...@@ -39,6 +39,6 @@ export default function initVue (Vue) { ...@@ -39,6 +39,6 @@ export default function initVue (Vue) {
if (~conflictTags.indexOf(tag)) { // svg 部分标签名称与 uni 标签冲突 if (~conflictTags.indexOf(tag)) { // svg 部分标签名称与 uni 标签冲突
return false return false
} }
return oldGetTagNamespace(tag) || false return oldGetTagNamespace(tag)
} }
} }
...@@ -6,25 +6,32 @@ ...@@ -6,25 +6,32 @@
<router-view :key="key" /> <router-view :key="key" />
</keep-alive> </keep-alive>
<!-- </transition> --> <!-- </transition> -->
<tab-bar <tab-bar
v-if="hasTabBar" v-if="hasTabBar"
v-show="showTabBar" v-show="showTabBar"
v-bind="tabBar" v-bind="tabBar"
/> />
<toast <toast
v-if="$options.components.Toast" v-if="$options.components.Toast"
v-bind="showToast" v-bind="showToast"
/> />
<action-sheet <action-sheet
v-if="$options.components.ActionSheet" v-if="$options.components.ActionSheet"
v-bind="showActionSheet" v-bind="showActionSheet"
@close="_onActionSheetClose" @close="_onActionSheetClose"
/> />
<modal <modal
v-if="$options.components.Modal" v-if="$options.components.Modal"
v-bind="showModal" v-bind="showModal"
@close="_onModalClose" @close="_onModalClose"
/> />
<template v-if="sysComponents&&sysComponents.length">
<component
:is="item"
v-for="(item, index) in sysComponents"
:key="index"
/>
</template>
</uni-app> </uni-app>
</template> </template>
<script> <script>
...@@ -56,7 +63,8 @@ export default { ...@@ -56,7 +63,8 @@ export default {
return { return {
transitionName: 'fade', transitionName: 'fade',
hideTabBar: false, hideTabBar: false,
tabBar: __uniConfig.tabBar || {} tabBar: __uniConfig.tabBar || {},
sysComponents: this.$sysComponents
} }
}, },
computed: { computed: {
...@@ -79,7 +87,8 @@ export default { ...@@ -79,7 +87,8 @@ export default {
if (uni.canIUse('css.var')) { if (uni.canIUse('css.var')) {
const windowBottomValue = !newVal ? (TABBAR_HEIGHT) : 0 const windowBottomValue = !newVal ? (TABBAR_HEIGHT) : 0
const envMethod = uni.canIUse('css.env') ? 'env' : (uni.canIUse('css.constant') ? 'constant' : '') const envMethod = uni.canIUse('css.env') ? 'env' : (uni.canIUse('css.constant') ? 'constant' : '')
const windowBottom = windowBottomValue && envMethod ? `calc(${windowBottomValue}px + ${envMethod}(safe-area-inset-bottom))` : `${windowBottomValue}px` const windowBottom = windowBottomValue && envMethod
? `calc(${windowBottomValue}px + ${envMethod}(safe-area-inset-bottom))` : `${windowBottomValue}px`
document.documentElement.style.setProperty('--window-bottom', windowBottom) document.documentElement.style.setProperty('--window-bottom', windowBottom)
console.debug(`uni.${windowBottom ? 'showTabBar' : 'hideTabBar'}:--window-bottom=${windowBottom}`) console.debug(`uni.${windowBottom ? 'showTabBar' : 'hideTabBar'}:--window-bottom=${windowBottom}`)
} }
...@@ -111,10 +120,11 @@ export default { ...@@ -111,10 +120,11 @@ export default {
<style> <style>
@import "~uni-core/view/index.css"; @import "~uni-core/view/index.css";
uni-app {
display: block; uni-app {
box-sizing: border-box; display: block;
width: 100%; box-sizing: border-box;
height: 100%; width: 100%;
} height: 100%;
</style> }
</style>
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册