|
@@ -1,5 +1,5 @@
|
|
|
<template>
|
|
|
- <div class="main" id="main">
|
|
|
+ <div class="main" id="main" :style="{paddingBottom:isIosSysteme?'65px':'50px'}">
|
|
|
<!-- <KeepAlive>
|
|
|
<router-view />
|
|
|
</KeepAlive> -->
|
|
@@ -10,26 +10,26 @@
|
|
|
</router-view>
|
|
|
|
|
|
</div>
|
|
|
- <van-tabbar v-model="tabType" v-if="routerName != '/main/processDtl'" :style="isIos() ? 'height:65px' : ''">
|
|
|
- <van-tabbar-item to="/main/message" :badge="msgCount" :style="isIos() ? 'padding-bottom:15px' : ''">
|
|
|
+ <van-tabbar v-model="tabType" v-if="routerName != '/main/processDtl'" :style="isIosSysteme ? 'height:65px' : ''">
|
|
|
+ <van-tabbar-item to="/main/message" :badge="msgCount" :style="isIosSysteme ? 'padding-bottom:15px' : ''">
|
|
|
{{$t('common.message')}}
|
|
|
<template #icon="props">
|
|
|
<i class="icon iconfont icon-btn_shengc_gray1 footer-icon" :class="props.active ? 'footer-icon-active' : ''"></i>
|
|
|
</template>
|
|
|
</van-tabbar-item>
|
|
|
- <van-tabbar-item to="/main/working" :style="isIos() ? 'padding-bottom:15px' : ''">
|
|
|
+ <van-tabbar-item to="/main/working" :style="isIosSysteme? 'padding-bottom:15px' : ''">
|
|
|
{{$t('common.workbench')}}
|
|
|
<template #icon="props">
|
|
|
<i class="icon iconfont icon-btn_gongz footer-icon" :class="props.active ? 'footer-icon-active' : ''"></i>
|
|
|
</template>
|
|
|
</van-tabbar-item>
|
|
|
- <van-tabbar-item :style="isIos() ? 'padding-bottom:15px' : ''"
|
|
|
+ <!-- <van-tabbar-item :style="isIosSysteme? 'padding-bottom:15px' : ''"
|
|
|
:to="tenantId == 'smt' ? '/main/xiamenList' : '/main/equipment'">{{$t('common.things')}}
|
|
|
<template #icon="props">
|
|
|
<i class="icon iconfont icon-btn_wulw footer-icon" :class="props.active ? 'footer-icon-active' : ''"></i>
|
|
|
</template>
|
|
|
- </van-tabbar-item>
|
|
|
- <van-tabbar-item icon="setting-o" to="/main/home" :style="isIos() ? 'padding-bottom:15px' : ''">
|
|
|
+ </van-tabbar-item> -->
|
|
|
+ <van-tabbar-item icon="setting-o" to="/main/home" :style="isIosSysteme ? 'padding-bottom:15px' : ''">
|
|
|
{{$t('common.mine')}}
|
|
|
<template #icon="props">
|
|
|
<i class="icon iconfont icon-btn_mine footer-icon" :class="props.active ? 'footer-icon-active' : ''"></i>
|
|
@@ -48,6 +48,8 @@ import "vant/lib/index.css";
|
|
|
import axios from "axios";
|
|
|
import { uploadDdRightBtn } from "@/utils/ddAdapter";
|
|
|
import { showDialog, showNotify } from "vant";
|
|
|
+import useDeviceStore from "@/store/device";
|
|
|
+const deviceStore = useDeviceStore();
|
|
|
const tenantId = getUserInfo().tenantId;
|
|
|
const proxy = getCurrentInstance().proxy;
|
|
|
const tabType = ref("home");
|
|
@@ -114,11 +116,13 @@ const socketInit = () => {
|
|
|
socketInit();
|
|
|
|
|
|
//判断是否是ios系统
|
|
|
+const isIosSysteme = ref(false);
|
|
|
const isIos = () => {
|
|
|
const u = navigator.userAgent;
|
|
|
- const isIOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
|
|
|
- return isIOS;
|
|
|
+ isIosSysteme.value = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
|
|
|
+ deviceStore.isIosSysteme = isIosSysteme.value;
|
|
|
};
|
|
|
+isIos();
|
|
|
|
|
|
//判断是否为开发环境.如果是开发环境,则同步前后台中文配置表
|
|
|
// const isDev = process.env.NODE_ENV === 'development'
|
|
@@ -176,7 +180,7 @@ watch(router.currentRoute, (to, from) => {
|
|
|
left: 0;
|
|
|
right: 0;
|
|
|
bottom: 0;
|
|
|
- padding-bottom: 65px;
|
|
|
+ // padding-bottom: 50px;
|
|
|
overflow-y: auto;
|
|
|
z-index: 1000;
|
|
|
}
|