From cba592b87ddd060686c96c759ac468170bdbf8c9 Mon Sep 17 00:00:00 2001
From: wangyifeng <812766448@qq.com>
Date: Fri, 14 Mar 2025 17:05:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=81=8A=E5=A4=A9=E5=9C=A8we?=
 =?UTF-8?q?bview=E6=89=93=E5=BC=80=E6=97=B6=E5=BA=95=E9=83=A8tabbar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                    |  2 +
 src/App.vue                        | 10 ++---
 src/pages/chooseByDeps/index.vue   | 61 ++++++++++++++++--------------
 src/pages/creatGroupChat/index.vue |  7 +++-
 src/pages/dialog/index.vue         | 13 +++++++
 src/pages/index/index.vue          |  2 +
 src/pages/search/index.vue         |  6 +++
 src/store/auth/index.js            |  4 +-
 src/utils/common.js                | 29 +++++++++++---
 src/utils/upload/request.js        |  2 +-
 10 files changed, 93 insertions(+), 43 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index 0dae289..5202040 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -30,6 +30,8 @@ declare module 'vue' {
     LoginMessage: typeof import('./src/components/talk/message/LoginMessage.vue')['default']
     Message: typeof import('./src/components/x-message/message/index.vue')['default']
     MixedMessage: typeof import('./src/components/talk/message/MixedMessage.vue')['default']
+    NButton: typeof import('naive-ui')['NButton']
+    NIcon: typeof import('naive-ui')['NIcon']
     PageAnimation: typeof import('./src/components/page-animation/index.vue')['default']
     RevokeMessage: typeof import('./src/components/talk/message/RevokeMessage.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/App.vue b/src/App.vue
index db49d9c..acd16a7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -11,12 +11,12 @@ const userStore = useUserStore()
 const root = document.documentElement
 root.style.setProperty('--statusBarHeight', `${statusBarHeight.value}px`)
 const handleWebview = () => {
-  let statusBarHeight = window?.plus?.navigator?.getStatusbarHeight()
+  let statusBarHeight_ = window?.plus?.navigator?.getStatusbarHeight()
   const webview = plus.webview.currentWebview()
-  webview.setStyle({
-    top: statusBarHeight,
-    bottom: 0,
-  })
+  // webview.setStyle({
+  //   top: statusBarHeight_,
+  //   bottom: 0,
+  // })
   // console.log(webview)
   token.value = webview.token
 }
diff --git a/src/pages/chooseByDeps/index.vue b/src/pages/chooseByDeps/index.vue
index c75b162..e99187f 100644
--- a/src/pages/chooseByDeps/index.vue
+++ b/src/pages/chooseByDeps/index.vue
@@ -2,8 +2,11 @@
   <div class="choose-deps-page">
     <zPaging ref="zPaging" :show-scrollbar="false">
       <template #top>
-        <div :class="state.chooseMode === 3 ? 'top_bg': ''">
-          <customNavbar :class="state.chooseMode === 3 ? 'index_top_navbar': ''" :title="pageTitle"></customNavbar>
+        <div :class="state.chooseMode === 3 ? 'top_bg' : ''">
+          <customNavbar
+            :class="state.chooseMode === 3 ? 'index_top_navbar' : ''"
+            :title="pageTitle"
+          ></customNavbar>
           <div class="pl-[32rpx] pr-[32rpx] pt-[32rpx] pb-[32rpx]">
             <customInput
               :searchText="searchVal"
@@ -14,33 +17,33 @@
       </template>
       <div class="choose-deps">
         <div class="w-full pl-[32rpx] pr-[32rpx]">
+          <div
+            v-if="crumbs.length"
+            class="w-full overflow-x-auto mt-[22rpx] leading-[48rpx] text-[#2F2F2F] flex items-center no-scrollbar"
+            ref="crumbsContainer"
+          >
             <div
-              v-if="crumbs.length"
-              class="w-full overflow-x-auto mt-[22rpx] leading-[48rpx] text-[#2F2F2F] flex items-center no-scrollbar"
-              ref="crumbsContainer"
+              v-for="(item, index) in crumbs"
+              class="flex items-center text-[28rpx] leading-[48rpx] whitespace-nowrap"
+              :class="[
+                index === crumbsIndex ? 'text-[#747474]' : 'text-[#46299D]',
+                index === 0 ? '' : 'ml-[12rpx]',
+              ]"
+              @click="handleCrumbsClick(index)"
             >
+              <div>{{ item.name }}</div>
               <div
-                v-for="(item, index) in crumbs"
-                class="flex items-center text-[28rpx] leading-[48rpx] whitespace-nowrap"
-                :class="[
-                  index === crumbsIndex ? 'text-[#747474]' : 'text-[#46299D]',
-                  index === 0 ? '' : 'ml-[12rpx]',
-                ]"
-                @click="handleCrumbsClick(index)"
+                v-if="index !== crumbs.length - 1"
+                class="ml-[20rpx] flex items-center mb-[2rpx]"
               >
-                <div>{{ item.name }}</div>
-                <div
-                  v-if="index !== crumbs.length - 1"
-                  class="ml-[20rpx] flex items-center mb-[2rpx]"
-                >
-                  <tm-icon
-                    name="tmicon-angle-right"
-                    :font-size="20"
-                    :color="index !== crumbs.length - 1 ? '#7A58DE' : '#C1B4EA'"
-                  ></tm-icon>
-                </div>
+                <tm-icon
+                  name="tmicon-angle-right"
+                  :font-size="20"
+                  :color="index !== crumbs.length - 1 ? '#7A58DE' : '#C1B4EA'"
+                ></tm-icon>
               </div>
             </div>
+          </div>
           <div
             v-if="
               (state.chooseMode === 1 || state.chooseMode === 2) &&
@@ -460,6 +463,7 @@ import downDep from '@/static/image/chatList/downDep.png'
 import downDepDis from '@/static/image/chatList/downDepDis.png'
 import checkBox from '@/components/checkBox/index.vue'
 import lodash from 'lodash'
+import { handleSetWebviewStyle } from '@/utils/common'
 
 import { useI18n } from 'vue-i18n'
 const { t } = useI18n()
@@ -990,6 +994,7 @@ const checkCurrentItem = (item) => {
 }
 
 onMounted(() => {
+  handleSetWebviewStyle()
   init()
 })
 
@@ -1106,18 +1111,18 @@ const toUserDetail = (userItem) => {
   height: 100%;
   display: flex;
 }
-::v-deep .index_top_navbar .tmicon-angle-left{
-  color:#fff !important;
+::v-deep .index_top_navbar .tmicon-angle-left {
+  color: #fff !important;
 }
-::v-deep .index_top_navbar .text-weight-b{
-  color:#fff !important;
+::v-deep .index_top_navbar .text-weight-b {
+  color: #fff !important;
 }
 
 ::v-deep .index_top_navbar .statusHeightTop > .noNvueBorder:first-child {
   background: transparent !important;
   border: none !important;
 }
-.top_bg{
+.top_bg {
   background: url('@/static/image/mine/page_top.png') no-repeat;
   background-size: cover;
   background-position: bottom center;
diff --git a/src/pages/creatGroupChat/index.vue b/src/pages/creatGroupChat/index.vue
index e037485..3ca49ba 100644
--- a/src/pages/creatGroupChat/index.vue
+++ b/src/pages/creatGroupChat/index.vue
@@ -186,7 +186,7 @@ import customBtn from '@/components/custom-btn/custom-btn.vue'
 import groupMemberList from '../chatSettings/components/groupMembersList.vue'
 import avatarModule from '@/components/avatar-module/index.vue'
 
-import { ref, watch, computed } from 'vue'
+import { ref, watch, computed, onMounted } from 'vue'
 import { onShow, onLoad } from '@dcloudio/uni-app'
 import { useChatList } from '@/store/chatList/index.js'
 import { useAuth } from '@/store/auth'
@@ -195,6 +195,7 @@ import addCircle from '@/static/image/chatList/addCircle.png'
 import cahtPopover from '@/static/image/chatList/cahtPopover.png'
 import { ServeCreateGroup } from '@/api/group/index'
 import { useGroupTypeStore } from '@/store/groupType'
+import { handleSetWebviewStyle } from '@/utils/common'
 
 const {
   groupName,
@@ -217,6 +218,10 @@ onLoad(()=> {
   groupStore.$reset()
 })
 
+onMounted(() => {
+  handleSetWebviewStyle()
+})
+
 //群类型
 const groupType = computed(() => {
   let group_type = ''
diff --git a/src/pages/dialog/index.vue b/src/pages/dialog/index.vue
index 5e0c963..6b0335e 100644
--- a/src/pages/dialog/index.vue
+++ b/src/pages/dialog/index.vue
@@ -1315,6 +1315,19 @@ const isLeader = computed(() => {
 })
 
 onMounted(async () => {
+  if (typeof plus !== 'undefined') {
+    const webview = plus.webview.currentWebview()
+    webview.setStyle({
+      bottom: 0,
+    })
+  } else {
+    document.addEventListener('plusready', () => {
+      const webview = plus.webview.currentWebview()
+      webview.setStyle({
+        bottom: 0,
+      })
+    })
+  }
   nextTick(() => {
     state.value.mentionSelectHeight = pxTorPx(
       uni.getSystemInfoSync().windowHeight * 0.86,
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 53c7b02..8e33128 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -131,6 +131,7 @@ import addCircle from '@/static/image/chatList/addCircle.png'
 import cahtPopover from '@/static/image/chatList/cahtPopover.png'
 import zu3289 from '@/static/image/chatList/zu3289@2x.png'
 import ZPaging from '@/uni_modules/z-paging/components/z-paging/z-paging.vue'
+import { handleSetWebviewStyle } from '@/utils/common'
 const paging = ref()
 const isEmptyViewShow = ref(false)
 const talkStore = useTalkStore()
@@ -214,6 +215,7 @@ const toAddressBookPage = () => {
 ); */
 
 onShow(() => {
+  handleSetWebviewStyle(true)
   // 页面显示时重新加载数据
   talkStore
     .loadTalkList()
diff --git a/src/pages/search/index.vue b/src/pages/search/index.vue
index d0c6c13..b84a80b 100644
--- a/src/pages/search/index.vue
+++ b/src/pages/search/index.vue
@@ -14,6 +14,12 @@
 <script setup>
 import searchList from './components/searchList.vue'
 import { ServeSeachQueryAll } from '@/api/search/index'
+import { onMounted } from 'vue'
+import { handleSetWebviewStyle } from '@/utils/common'
+
+onMounted(() => {
+  handleSetWebviewStyle()
+})
 
 //点击跳转到更多结果页面
 const toMoreResultPage = (searchResultKey, searchText) => {
diff --git a/src/store/auth/index.js b/src/store/auth/index.js
index bf377a5..3e30a55 100644
--- a/src/store/auth/index.js
+++ b/src/store/auth/index.js
@@ -4,8 +4,8 @@ import { userInfoApi } from "@/api/user";
 
 import {ref} from 'vue'
 export const useAuth = createGlobalState(() => {
-  // const token = useStorage('token', '', uniStorage)
-  const token = ref("79b5c732d96d2b27a48a99dfd4a5566c43aaa5796242e854ebe3ffc198d6876b9628e7b764d9af65ab5dbb2d517ced88170491b74b048c0ba827c0d3741462cb89dc59ed46653a449af837a8262941caaef1334d640773710f8cd96473bacfb190cba595a5d6a9c87d70f0999a3ebb41147213b31b4bdccffca66a56acf3baab5af0154f0dce360079f37709f78e13711036899344bddb0fb4cf0f2890287cb62c3fcbe33368caa5e213624577be8b8420ab75b1f50775ee16142a4321c5d56995f37354a66a969da98d95ba6e65d142ed097e04b411c1ebad2f62866d0ec7e1838420530a9941dbbcd00490199f8b8942f76b6f248056e8ae1134eda922b6ba0e5d75a00b2e866b08fec48a0d1de7e6dff8d8a40ac1eb46bf79c6331a1a3cd43209d09865bc0ee5dc9c23d2413e0d85d2380202ce4de1e128063926efae4cb1")
+  const token = useStorage('token', '', uniStorage)
+  // const token = ref("79b5c732d96d2b27a48a99dfd4a5566c43aaa5796242e854ebe3ffc198d6876b9628e7b764d9af65ab5dbb2d517ced88170491b74b048c0ba827c0d3741462cb89dc59ed46653a449af837a8262941caaef1334d640773710f8cd96473bacfb190cba595a5d6a9c87d70f0999a3ebb41147213b31b4bdccffca66a56acf3baab5af0154f0dce360079f37709f78e13711036899344bddb0fb4cf0f2890287cb62c3fcbe33368caa5e213624577be8b8420ab75b1f50775ee16142a4321c5d56995f37354a66a969da98d95ba6e65d142ed097e04b411c1ebad2f62866d0ec7e1838420530a9941dbbcd00490199f8b8942f76b6f248056e8ae1134eda922b6ba0e5d75a00b2e866b08fec48a0d1de7e6dff8d8a40ac1eb46bf79c6331a1a3cd43209d09865bc0ee5dc9c23d2413e0d85d2380202ce4de1e128063926efae4cb1")
   const refreshToken = useStorage('refreshToken', '', uniStorage)
   const userInfo = useStorage('userInfo', {}, uniStorage)
   const leaderList = useStorage('leaderList', [], uniStorage)
diff --git a/src/utils/common.js b/src/utils/common.js
index 48b6287..dadad2b 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -64,7 +64,7 @@ export function clipboard(text, callback) {
 
 export async function clipboardImage(src, callback) {
   const { state } = await navigator.permissions.query({
-    name: 'clipboard-write'
+    name: 'clipboard-write',
   })
 
   if (state != 'granted') return
@@ -77,8 +77,8 @@ export async function clipboardImage(src, callback) {
     if (blob.type == 'image/png') {
       await navigator.clipboard.write([
         new ClipboardItem({
-          [blob.type]: blob
-        })
+          [blob.type]: blob,
+        }),
       ])
 
       return callback()
@@ -112,7 +112,7 @@ export async function clipboardImage(src, callback) {
           URL.revokeObjectURL(objectURL)
         },
         'image/png',
-        1
+        1,
       )
     }
   } catch (err) {
@@ -180,13 +180,13 @@ export function getVideoImage(file, time = 1) {
         width: video.videoWidth,
         height: video.videoHeight,
         duration: video.duration,
-        file: null
+        file: null,
       }
 
       canvas.toBlob((blob) => {
         data.file = new File([blob], 'image.jpeg', {
           type: blob.type,
-          lastModified: Date.now()
+          lastModified: Date.now(),
         })
 
         URL.revokeObjectURL(objectURL)
@@ -196,3 +196,20 @@ export function getVideoImage(file, time = 1) {
     }
   })
 }
+
+//处理webview样式
+export function handleSetWebviewStyle(hasTabBar) {
+  const setWebviewStyle = () => {
+    const webview = plus.webview.currentWebview()
+    webview.setStyle({
+      bottom: hasTabBar ? webview.tabBarHeight : 0,
+    })
+  }
+  if (typeof plus !== 'undefined') {
+    setWebviewStyle()
+  } else {
+    document.addEventListener('plusready', () => {
+      setWebviewStyle()
+    })
+  }
+}
diff --git a/src/utils/upload/request.js b/src/utils/upload/request.js
index a84e0ec..453b5ed 100644
--- a/src/utils/upload/request.js
+++ b/src/utils/upload/request.js
@@ -7,7 +7,7 @@ const request = axios.create({
   baseURL: import.meta.env.VITE_BASEURL,
 
   // 请求超时时间
-  timeout: 10000
+  timeout: 60000
 })
 
 let once = false