diff --git a/src/App.vue b/src/App.vue index a338a43..db49d9c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -2,6 +2,8 @@ import { useStatus } from '@/store/status' import { useUserStore } from '@/store' import { useProvideUserModal } from '@/hooks' +import {useAuth} from "@/store/auth"; +const {token} = useAuth() import ws from '@/connect' const { statusBarHeight } = useStatus() const { uid, isShow } = useProvideUserModal() @@ -10,10 +12,13 @@ const root = document.documentElement root.style.setProperty('--statusBarHeight', `${statusBarHeight.value}px`) const handleWebview = () => { let statusBarHeight = window?.plus?.navigator?.getStatusbarHeight() - plus.webview.currentWebview().setStyle({ + const webview = plus.webview.currentWebview() + webview.setStyle({ top: statusBarHeight, bottom: 0, }) + // console.log(webview) + token.value = webview.token } const init = () => { userStore.loadSetting() diff --git a/src/components/custom-input/custom-input.vue b/src/components/custom-input/custom-input.vue index a46b6bb..0e97e3f 100644 --- a/src/components/custom-input/custom-input.vue +++ b/src/components/custom-input/custom-input.vue @@ -1,5 +1,5 @@ diff --git a/src/pages/chatSettings/components/settingFormItem.vue b/src/pages/chatSettings/components/settingFormItem.vue index a48df44..94b0384 100644 --- a/src/pages/chatSettings/components/settingFormItem.vue +++ b/src/pages/chatSettings/components/settingFormItem.vue @@ -4,12 +4,14 @@
{{ props?.item?.label }}
-
- +
+ {{ props?.item?.value }} +
{{ props?.item?.value }}
@@ -65,7 +70,14 @@ const props = defineProps({ }) const emits = defineEmits(['toManagePage', 'changeSwitch']) const toManagePage = (item) => { - emits('toManagePage', item.label) + if ( + props?.item?.hasPointer && + (props?.isManager || + (!props?.isManager && + props?.item?.label !== t('chat.settings.groupName'))) + ) { + emits('toManagePage', item.label) + } } const modelValue = computed(() => { let switchStatus = false @@ -136,7 +148,7 @@ const changeSwitch = (e, item) => { color: #747474; } } - .cab1{ + .cab1 { white-space: nowrap; overflow: hidden; max-width: 100%; diff --git a/src/pages/chatSettings/index.vue b/src/pages/chatSettings/index.vue index 6f6f5aa..330e68a 100644 --- a/src/pages/chatSettings/index.vue +++ b/src/pages/chatSettings/index.vue @@ -96,7 +96,7 @@