From 226a24b06be7ae71be97bc625037392e422d9956 Mon Sep 17 00:00:00 2001
From: wangyifeng <812766448@qq.com>
Date: Mon, 10 Mar 2025 09:57:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=8F=90=E6=B5=8B=E5=89=8D?=
 =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  7 +++++-
 src/components/custom-input/custom-input.vue  | 20 ++++++++++++----
 .../components/settingFormItem.vue            | 24 ++++++++++++++-----
 src/pages/chatSettings/index.vue              |  2 +-
 src/pages/index/index.vue                     | 11 ++-------
 src/pages/search/searchByCondition/index.vue  |  6 ++++-
 src/store/auth/index.js                       |  4 ++--
 7 files changed, 50 insertions(+), 24 deletions(-)

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 @@
 <template>
-  <div class="custom-search-input">
+  <div class="custom-input">
     <tm-input
       class="search-input"
       placeholder="请输入…"
@@ -13,7 +13,9 @@
       :showClear="true"
       @clear="clearInput"
       placeholderStyle="color:#BABABA"
+      :disabled="props?.disabled"
     ></tm-input>
+    <div v-if="props?.disabled" class="custom-input-disabled"></div>
   </div>
 </template>
 <script setup>
@@ -21,6 +23,7 @@ import { defineProps, defineEmits, reactive, watch } from 'vue'
 const props = defineProps({
   searchText: String,
   first_talk_record_infos: Object,
+  disabled: Boolean,
 })
 const state = reactive({
   searchText: '', //搜索内容
@@ -45,18 +48,27 @@ const inputSearchText = (e) => {
 }
 </script>
 <style scoped lang="scss">
-.custom-search-input {
+.custom-input {
   width: 100%;
+  position: relative;
   .search-input {
     width: 100%;
   }
   ::v-deep .noNvueBorder > .noNvueBorder > .noNvueBorder {
-		background: #f9f9fd !important;
+    background: #f9f9fd !important;
     border-radius: 8rpx !important;
-	}
+  }
   .search-input::v-deep .tmicon-times-circle-fill::before {
     content: '\e82a';
     color: #d2d2d5;
   }
+
+  .custom-input-disabled {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+  }
 }
 </style>
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 @@
       <div class="item-main-label">
         <span class="text-[32rpx] font-regular">{{ props?.item?.label }}</span>
       </div>
-      <div class="item-main-value" >
-        <span class="text-[32rpx] font-regular" v-if="props?.item?.value  && props?.item?.value.length < 29">
+      <div class="item-main-value" @click="toManagePage(props?.item)">
+        <span
+          class="text-[32rpx] font-regular"
+          v-if="props?.item?.value && props?.item?.value.length < 29"
+        >
           {{ props?.item?.value }}
         </span>
         <img
-          @click="toManagePage(props?.item)"
           v-if="
             props?.item?.hasPointer &&
             (props?.isManager ||
@@ -31,7 +33,10 @@
         ></tm-switch>
       </div>
     </div>
-    <div class="item-sub" v-if="props?.item?.value && props?.item?.value.length > 28">
+    <div
+      class="item-sub"
+      v-if="props?.item?.value && props?.item?.value.length > 28"
+    >
       <span class="text-[32rpx] font-regular">{{ props?.item?.value }}</span>
     </div>
     <div class="item-sub cab1" v-if="props?.item?.subValue">
@@ -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 @@
             </div>
           </div>
           <div class="chat-records-search chat-settings-card">
-            <customInput></customInput>
+            <customInput :disabled="true"></customInput>
             <div class="record-search-types">
               <div
                 class="record-search-types-each"
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 57c83ca..53c7b02 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -104,15 +104,7 @@
       <div class="content">
         <div class="root">
           <div class="searchRoot" @click="toSearchPage">
-            <tm-input
-              placeholder="请输入…"
-              color="#F9F9FD"
-              :round="1"
-              prefix="tmicon-search"
-              prefixColor="#46299D"
-              placeholderStyle="color:#BABABA"
-              class="input_search"
-            ></tm-input>
+            <customInput :disabled="true"></customInput>
           </div>
           <div class="contentRoot">
             <chatItem
@@ -128,6 +120,7 @@
   </div>
 </template>
 <script setup>
+import customInput from '@/components/custom-input/custom-input.vue'
 import { ref, watch, computed } from 'vue'
 import { onShow, onLoad } from '@dcloudio/uni-app'
 import { useChatList } from '@/store/chatList/index.js'
diff --git a/src/pages/search/searchByCondition/index.vue b/src/pages/search/searchByCondition/index.vue
index 1339773..faacf4a 100644
--- a/src/pages/search/searchByCondition/index.vue
+++ b/src/pages/search/searchByCondition/index.vue
@@ -446,7 +446,11 @@ const inputSearchText = (e) => {
 }
 
 //点击取消搜索
-const cancelSearch = () => {}
+const cancelSearch = () => {
+  uni.navigateBack({
+    delta: 1,
+  })
+}
 
 //查询数据
 const queryAllSearch = () => {
diff --git a/src/store/auth/index.js b/src/store/auth/index.js
index 3882fe8..b7bd3ae 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('79b5c732d96d2b27a48a99dfd4a5566c43aaa5796242e854ebe3ffc198d6876b9628e7b764d9af65ab5dbb2d517ced88170491b74b048c0ba827c0d3741462cb89dc59ed46653a449af837a8262941caaef1334d640773710f8cd96473bacfb190cba595a5d6a9c87d70f0999a3ebb41147213b31b4bdccffca66a56acf3baab5af0154f0dce360079f37709f78e13711036899344bddb0fb4cf0f2890287cb62c3fcbe33368caa5e213624577be8b8420ab75b1f50775ee16142a4321c5d56995f37354a66a969da98d95ba6e65d142ed097e04b411c1ebad2f62866d0ec7e1838420530a9941dbbcd00490199f8b894b54078d04d4ee86e494023bfc12a4fe79d044f22bef01b0b5f132e8ca151dcd3a1a4150e348641300c622b8af98cfd5d41fb24a8409b2b49446a766ea3886f587db124e0eb7d849ed33e6618fdf2c7f')
+  const token = useStorage('token', '', uniStorage)
+  // const token = ref('79b5c732d96d2b27a48a99dfd4a5566c43aaa5796242e854ebe3ffc198d6876b9628e7b764d9af65ab5dbb2d517ced88170491b74b048c0ba827c0d3741462cb89dc59ed46653a449af837a8262941caaef1334d640773710f8cd96473bacfb190cba595a5d6a9c87d70f0999a3ebb41147213b31b4bdccffca66a56acf3baab5af0154f0dce360079f37709f78e13711036899344bddb0fb4cf0f2890287cb62c3fcbe33368caa5e213624577be8b8420ab75b1f50775ee16142a4321c5d56995f37354a66a969da98d95ba6e65d142ed097e04b411c1ebad2f62866d0ec7e1838420530a9941dbbcd00490199f8b897937e719454eda6de1352a14497a54063c2ae13c2b1418f2689268102faffee874777ce1312eb7d9399eaa8cf58674aa86c9b85ad9300293c0a3369ed429536bbea4fcb092b78466ea53a44a2b2b1c1a')
   const refreshToken = useStorage('refreshToken', '', uniStorage)
   const userInfo = useStorage('userInfo', {}, uniStorage)
   const leaderList = useStorage('leaderList', [], uniStorage)