From 5e36cbb24436925037e578fdf6c6e8d91def8012 Mon Sep 17 00:00:00 2001
From: xuli3099 <jswawa@qq.com>
Date: Mon, 18 Aug 2025 16:11:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/customSearch.vue |   4 +-
 src/pages/business/business.vue |  56 +++++---
 src/pages/home/home.vue         | 243 +++++++++++++++++---------------
 src/pages/notice/notice.vue     |  22 +--
 4 files changed, 178 insertions(+), 147 deletions(-)

diff --git a/src/components/customSearch.vue b/src/components/customSearch.vue
index 540300d..28ad531 100644
--- a/src/components/customSearch.vue
+++ b/src/components/customSearch.vue
@@ -68,7 +68,7 @@ const props = defineProps({
     searchKeywords:{//搜索文本
         type:String
     },
-    searchType:{//哪种类型显示对象
+    searchType:{//哪种类型显示对象 typeId:1-首页，2-业务首页，3-消息  之后可以自动添加
         type:Object
     },
     searchTypeList:{//类型列表
@@ -111,7 +111,7 @@ const emit = defineEmits(['confirm']);
 
 //  加载历史记录
 const loadHistory = () => {
-    let typeId = props.searchType.typeId
+    let typeId = props.searchType?props.searchType.typeId:undefined
     const history = uni.getStorageSync('searchHistory'+typeId) || []
     historyList.value = history
 }
diff --git a/src/pages/business/business.vue b/src/pages/business/business.vue
index 6b1d7ed..2d2aede 100644
--- a/src/pages/business/business.vue
+++ b/src/pages/business/business.vue
@@ -3,23 +3,33 @@
         <view class="con-bg">
             <!-- 头部 -->
             <customHeader ref="customHeaderRef" :title="'业务中心'" 
-                :leftFlag="false" :rightFlag="false" 
+                :leftFlag="false" :rightFlag="false"   v-if="!searchShow"
+            ></customHeader>
+            <customHeader v-else ref="customHeaderRef" :title="'搜索'" 
+                :leftFlag="true" :rightFlag="false"
+                @back="handleBack" :searchType="1"
             ></customHeader>
             <!-- 高度来避免头部遮挡 -->
             <view class="top-height"></view>
 
             <!-- 搜索  @confirm="handleSearch"  -->
-            <view class="search">
+            <customSearch v-if="searchShow"   
+                :searchKeywords="searchText" 
+                :searchType="searchTypeObj" 
+                @confirm="handleSearchConfirm"
+            ></customSearch>
+            <view class="search"  v-else>
                 <uni-search-bar class="custom-search" radius="28" 
                     placeholder="请输入您想查询的内容或服务"
                     clearButton="auto" cancelButton="none" 
                     bgColor="#6FA2F8" textColor="#ffffff"
-                    @focus="handleFocus"
+                    @focus="handleSearchFocus"
+                    v-model="searchText"
                 />
             </view>
 
             <!-- 下拉刷新 -->
-            <mescroll-uni ref="mescrollRef" @init="mescrollInit"
+            <mescroll-uni  v-if="!searchShow" ref="mescrollRef" @init="mescrollInit"
                 :down="downOption"  @down="downCallback"
                 :fixed="false" class="scroll-h"
             >
@@ -59,7 +69,8 @@
 <script setup>
 import { ref,onMounted } from 'vue'
 import { onLoad,onShow } from '@dcloudio/uni-app';
-import customHeader from '@/components/customHeader.vue'
+import customHeader from '@/components/customHeader.vue';
+import customSearch from '@/components/customSearch.vue'
 import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
 import { getNavBarPaddingTop} from '@/utils/system.js'
 import { businessList } from '@/api/business.js';
@@ -83,11 +94,32 @@ onMounted(() => {
     navBarPaddingTop.value = getNavBarPaddingTop()*2;
 })
 
+// 搜索处理
+let searchShow = ref(false);
+let searchText = ref(undefined);
+let searchTypeObj = ref({typeId:2});
+
+// 搜索返回操作
+const handleBack=()=>{
+    searchShow.value=false;
+}
+// 获取input 焦点跳转
+const handleSearchFocus=()=>{
+    searchShow.value = true;
+}
+
+// 搜索完返回处理
+const handleSearchConfirm = (param1,param2)=>{
+    // console.log(param1,param2)
+    searchText.value=param2.value;;
+    searchShow.value=false;
+}
+
 // 查询列表
 let list = ref([]);
 let getList = async()=>{
-   
-    let res = await businessList({});//查询所有业务
+    let searchValue = searchText.value?searchText.value:undefined;
+    let res = await businessList({searchValue});//查询所有业务
     let arr = res || [];
     let bizList = initTree(arr,0,'bizId');//递归获取数组处理
     bizList.forEach(item => {
@@ -101,16 +133,6 @@ let handleExpand = (item)=>{
     item.expandFlag = !item.expandFlag;
 }
 
-// 获取input 焦点跳转
-let handleFocus=()=>{
-    uni.navigateTo({url:'/pages/search/search?type=2'})
-}
-
-// 查询搜索跳转
-let handleSearch = ()=>{
-
-}
-
 // 下拉刷新
 const mescrollRef = ref(null);
 const mescrollInit = (mescroll) => {
diff --git a/src/pages/home/home.vue b/src/pages/home/home.vue
index 9676316..0e15857 100644
--- a/src/pages/home/home.vue
+++ b/src/pages/home/home.vue
@@ -17,132 +17,140 @@
           <!-- #endif -->
 
           <!-- 搜索  @confirm="handleSearch"  -->
-          <view class="search search-sao" >
+          <customSearch v-if="searchShow"   
+                :searchKeywords="searchText" 
+                :searchType="searchTypeObj" 
+                @confirm="handleSearchConfirm"
+            ></customSearch>
+          <view class="search search-sao" v-else>
               <uni-search-bar class="custom-search" radius="28" 
                   placeholder="请输入您想查询的内容或服务"
                   clearButton="auto" cancelButton="none" 
                   bgColor="#6FA2F8" textColor="#ffffff"
-                  @focus="handleFocus"
+                  @focus="handleSearchFocus"
+                  v-model="searchText"
               />
               <uni-icons custom-prefix="iconfont" color="#ffffff" type="icon-phonesaoyisao" size="20"></uni-icons>
           </view>
 
-          <!-- 待办内容 -->
-          <view class="backlog-bg">
-            <view class="backlog-b-item">
-              <view class="font-number">{{ backBlogObj.count1 }}</view>
-              <view class="font-title">待办</view>
+          <block v-if="!searchShow">
+            <!-- 待办内容 -->
+            <view class="backlog-bg">
+              <view class="backlog-b-item">
+                <view class="font-number">{{ backBlogObj.count1 }}</view>
+                <view class="font-title">待办</view>
+              </view>
+              <view class="backlog-b-item">
+                <view class="font-number">{{ backBlogObj.count2 }}</view>
+                <view class="font-title">待审查</view>
+              </view>
+              <view class="backlog-b-item">
+                <view class="font-number">{{ backBlogObj.count3 }}</view>
+                <view class="font-title">待巡检</view>
+              </view>
+              <view class="backlog-b-item">
+                <view class="font-number">{{ backBlogObj.count4 }}</view>
+                <view class="font-title">待发货</view>
+              </view>
             </view>
-            <view class="backlog-b-item">
-              <view class="font-number">{{ backBlogObj.count2 }}</view>
-              <view class="font-title">待审查</view>
-            </view>
-            <view class="backlog-b-item">
-              <view class="font-number">{{ backBlogObj.count3 }}</view>
-              <view class="font-title">待巡检</view>
-            </view>
-            <view class="backlog-b-item">
-              <view class="font-number">{{ backBlogObj.count4 }}</view>
-              <view class="font-title">待发货</view>
-            </view>
-          </view>
 
-          <!-- 跑马灯滚动 -->
-          <view class="notice-bg">
-            <img :src="'static/images/icon-notice@2x.png'" class="notice-icon" />
-            <view class="notice-list">
-              <!-- :interval="4000" -->
-              <swiper class="swiper-con"
-                :vertical="true"
-                :autoplay="true"
-                :duration="500"
-                :circular="true"
-                :disable-touch="true"
-                :display-multiple-items="1"
-              >
-                <swiper-item  v-for="(item, index) in extendedList" :key="index" >
-                  <view class="swiper-item">
-                    {{ item }}
-                  </view>
-                </swiper-item>
-              </swiper>
-            </view>
-          </view>
-
-          <!-- 日程提醒 -->
-          <view class="white-bg mar-top" v-if="stepList.length>0">
-              <view class="w-b-title">日程提醒
-                  <view class="yellow-bg">
-                    <i :class="{iconfont:true,'icon-phoneshizhong':true}"></i>
-                    <view class="text-black">{{ weekStr }}</view>
-                  </view>
-              </view>
-              <view class="section-line">
-                <customSteps :steps="stepList" :modelValue="stepList"></customSteps>
-              </view>
-          </view>
-
-          <!-- 销售任务完成情况 -->
-          <view class="white-bg mar-top">
-            <view class="w-b-title">销售任务完成情况
-              <view class="yellow-bg">
-                <picker @change="bindPickerChange" :value="activeIndex" :range="salesList" @click="clickPicker" @cancel="bindPickerCancel">
-                  <view class="uni-input">{{salesList[activeIndex]}}</view>
-                </picker>
-                <i :class="{iconfont:true,'icon-down':salesFlag,'icon-up':!salesFlag}" class="picker-icon"></i>
+            <!-- 跑马灯滚动 -->
+            <view class="notice-bg">
+              <img :src="'static/images/icon-notice@2x.png'" class="notice-icon" />
+              <view class="notice-list">
+                <!-- :interval="4000" -->
+                <swiper class="swiper-con"
+                  :vertical="true"
+                  :autoplay="true"
+                  :duration="500"
+                  :circular="true"
+                  :disable-touch="true"
+                  :display-multiple-items="1"
+                >
+                  <swiper-item  v-for="(item, index) in extendedList" :key="index" >
+                    <view class="swiper-item">
+                      {{ item }}
+                    </view>
+                  </swiper-item>
+                </swiper>
               </view>
             </view>
-            <view class="progress-bg">
-              <progress :percent="percentNum"  stroke-width="10" activeColor="#41E1B1" backgroundColor="#F0F0F0" />
-              <view class="percent" :style="{left:percentNum+'%'}">
-                <view class="percent-num">{{ percentNum }}%</view>
-                <i class="iconfont icon-down"></i>
-              </view>
-              <view class="percent-con">
-                <view class="p-first">
-                  <view>实际销售额</view>
-                  <view class="font-money">{{totalSales}}</view>
+
+            <!-- 日程提醒 -->
+            <view class="white-bg mar-top" v-if="stepList.length>0">
+                <view class="w-b-title">日程提醒
+                    <view class="yellow-bg">
+                      <i :class="{iconfont:true,'icon-phoneshizhong':true}"></i>
+                      <view class="text-black">{{ weekStr }}</view>
+                    </view>
                 </view>
-                <view class="p-last">
-                  <view>目标销售额</view>
-                  <view class="font-money">{{ targetSales }}</view>
+                <view class="section-line">
+                  <customSteps :steps="stepList" :modelValue="stepList"></customSteps>
+                </view>
+            </view>
+
+            <!-- 销售任务完成情况 -->
+            <view class="white-bg mar-top">
+              <view class="w-b-title">销售任务完成情况
+                <view class="yellow-bg">
+                  <picker @change="bindPickerChange" :value="activeIndex" :range="salesList" @click="clickPicker" @cancel="bindPickerCancel">
+                    <view class="uni-input">{{salesList[activeIndex]}}</view>
+                  </picker>
+                  <i :class="{iconfont:true,'icon-down':salesFlag,'icon-up':!salesFlag}" class="picker-icon"></i>
+                </view>
+              </view>
+              <view class="progress-bg">
+                <progress :percent="percentNum"  stroke-width="10" activeColor="#41E1B1" backgroundColor="#F0F0F0" />
+                <view class="percent" :style="{left:percentNum+'%'}">
+                  <view class="percent-num">{{ percentNum }}%</view>
+                  <i class="iconfont icon-down"></i>
+                </view>
+                <view class="percent-con">
+                  <view class="p-first">
+                    <view>实际销售额</view>
+                    <view class="font-money">{{totalSales}}</view>
+                  </view>
+                  <view class="p-last">
+                    <view>目标销售额</view>
+                    <view class="font-money">{{ targetSales }}</view>
+                  </view>
                 </view>
               </view>
             </view>
-          </view>
 
-          <!-- 常用服务 -->
-          <view class="white-bg" v-if="commonServiceList.length>0">
-              <view class="w-b-title">常用服务</view>
-              <view class="logo-list">
-                  <view  v-for="(item,index) in commonServiceList" class="l-l-item" :key="index"  @click="handleJump(item.bizUrl)">
-                      <img :src="'static/images/business/'+item.icon+'.png'" />
-                      <text class="font-gray">{{ item.bizName }}</text>
-                  </view>
-                  <!-- <view  class="l-l-item" @click="handleAddCommonSercice">
-                    <img :src="'static/images/business/icon-add.png'">
-                    <text class="font-gray">添加</text>
-                  </view> -->
-              </view>
-          </view>
+            <!-- 常用服务 -->
+            <view class="white-bg" v-if="commonServiceList.length>0">
+                <view class="w-b-title">常用服务</view>
+                <view class="logo-list">
+                    <view  v-for="(item,index) in commonServiceList" class="l-l-item" :key="index"  @click="handleJump(item.bizUrl)">
+                        <img :src="'static/images/business/'+item.icon+'.png'" />
+                        <text class="font-gray">{{ item.bizName }}</text>
+                    </view>
+                    <!-- <view  class="l-l-item" @click="handleAddCommonSercice">
+                      <img :src="'static/images/business/icon-add.png'">
+                      <text class="font-gray">添加</text>
+                    </view> -->
+                </view>
+            </view>
 
-          <!-- 新闻公告 -->
-          <view class="white-bg">
-              <view class="w-b-title">新闻公告
-                  <text>更多新闻</text>
-              </view>
-              <view class="news-list">
-                  <view v-for="(item,index) in newsList" class="news-item" :key="index">
-                      <view class="n-i-title">{{ item.name }}
-                        <view class="n-i-date">{{ formatDateStr(item.date) }}</view>
-                      </view>
-                      <img :src="item.imgSrc" v-if="item.imgSrc" />
-                  </view>
-              </view>
-          </view>
+            <!-- 新闻公告 -->
+            <view class="white-bg">
+                <view class="w-b-title">新闻公告
+                    <text>更多新闻</text>
+                </view>
+                <view class="news-list">
+                    <view v-for="(item,index) in newsList" class="news-item" :key="index">
+                        <view class="n-i-title">{{ item.name }}
+                          <view class="n-i-date">{{ formatDateStr(item.date) }}</view>
+                        </view>
+                        <img :src="item.imgSrc" v-if="item.imgSrc" />
+                    </view>
+                </view>
+            </view>
 
-          <!-- 底部加高度来避免tabbar遮挡 -->
-          <view class="bottom-height"></view>
+            <!-- 底部加高度来避免tabbar遮挡 -->
+            <view class="bottom-height"></view>
+        </block>
       </mescroll-uni>
       </view>
   </view>
@@ -153,6 +161,7 @@ import { ref,onMounted,computed } from 'vue';
 import { onLoad } from '@dcloudio/uni-app';
 import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
 import customSteps from '@/components/customSteps.vue'
+import customSearch from '@/components/customSearch.vue'
 import { getNavBarPaddingTop} from '@/utils/system.js'
 // ,swiperList,stepData,salesTask,commonServices,newsQueryList 
 import { messageNotifyCount,messageFlowCount,getUserFavorite} from '@/api/home.js';
@@ -242,13 +251,21 @@ onMounted(() => {
     navBarPaddingTop.value = getNavBarPaddingTop()*2;
 })
 
-// 获取input 焦点跳转
-let handleFocus=()=>{
-    uni.navigateTo({url:'/pages/search/search?type=1'})
-}
-// 查询搜索跳转
-let handleSearch = ()=>{
+// 搜索处理
+let searchShow = ref(false);
+let searchTypeObj = ref({typeId:1});
+let searchText = ref(undefined);
 
+// 获取input 焦点跳转
+const handleSearchFocus=()=>{
+    searchShow.value = true;
+}
+
+// 搜索完返回处理
+const handleSearchConfirm = (param1,param2)=>{
+    // console.log(param1,param2)
+    searchText.value=param2.value;;
+    searchShow.value=false;
 }
 
 
diff --git a/src/pages/notice/notice.vue b/src/pages/notice/notice.vue
index 6df5ec3..aa51436 100644
--- a/src/pages/notice/notice.vue
+++ b/src/pages/notice/notice.vue
@@ -31,15 +31,6 @@
                         <input class="uni-input" v-model="searchText" placeholder="请输入您想查询的内容或服务" placeholder-class="search-color" />
                     </view>
                 </view>
-                <!-- <uni-search-bar class="custom-search" radius="28" 
-                    placeholder="请输入您想查询的内容或服务" 
-                    clearButton="auto"
-                    cancelButton="none" 
-                    bgColor="#6FA2F8" 
-                    textColor="#ffffff" 
-                    @focus="handleSearchFocus"
-                    v-model="searchText"
-                /> -->
             </view>
 
             <!-- 消息列表 -->
@@ -65,11 +56,15 @@
 import { ref, onMounted,computed } from 'vue'
 import { onLoad } from '@dcloudio/uni-app';
 import customHeader from '@/components/customHeader.vue'
+import customSearch from '@/components/customSearch.vue'
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
 import { getNavBarPaddingTop } from '@/utils/system.js'
 import { noticeList } from '@/api/notice.js'
 import { formatTimestamp } from '@/utils/datetime.js'
-import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
-import customSearch from '@/components/customSearch.vue'
+
+onLoad(async(opt) => {
+    uni.setStorageSync('page_cache',true);
+})
 
 // 获取导航栏高度用于内容区域padding
 const navBarPaddingTop = ref(0);
@@ -80,7 +75,7 @@ onMounted(() => {
 // 搜索处理
 let searchShow = ref(false);
 let searchText = ref(undefined);
-let searchTypeObj = ref({typeId:1,typeName:'消息类型'});
+let searchTypeObj = ref({typeId:3,typeName:'消息类型'});
 let noticeTypeList=ref([
     {id:1,name:'日程消息一二'}, 
     {id:2,name:'提醒消息'}, 
@@ -90,9 +85,6 @@ let noticeTypeList=ref([
 ]);
 let notictTypeCheck = ref({});//选中类型
 
-onLoad(async(opt) => {
-    uni.setStorageSync('page_cache',true);
-})
 
 // 搜索返回操作
 const handleBack=()=>{