From 2ad389e2f0248bebd345a3ba9659d8acb28eee9c Mon Sep 17 00:00:00 2001
From: xuli3099 <jswawa@qq.com>
Date: Tue, 19 Aug 2025 13:28:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E5=8F=8A?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                     |  18 +--
 src/components/customHeader.vue |   8 +-
 src/pages/business/business.vue |  19 ++-
 src/pages/home/home.vue         | 267 ++++++++++++++------------------
 src/pages/loading/loading.vue   |   6 +-
 src/pages/notice/notice.vue     |  18 ++-
 src/pages/userinfo/userinfo.vue |   2 +-
 src/static/common.css           |  23 +--
 8 files changed, 170 insertions(+), 191 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 7835074..a43bacc 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,16 +4,16 @@
 
 
 <script setup>
-import { onLaunch } from '@dcloudio/uni-app';
-onLaunch((opt) => {
-    console.log("onLaunch")
+// import { onLaunch } from '@dcloudio/uni-app';
+// onLaunch((opt) => {
+//     console.log("onLaunch")
 
-    uni.preloadPage({ url: "/pages/login/login" });
-    uni.preloadPage({ url: "/pages/home/home" });
-    uni.preloadPage({ url: "/pages/business/business" });
-    uni.preloadPage({ url: "/pages/notice/notice" });
-    uni.preloadPage({ url: "/pages/userinfo/userinfo" });
-})
+//     uni.preloadPage({ url: "/pages/login/login" });
+//     uni.preloadPage({ url: "/pages/home/home" });
+//     uni.preloadPage({ url: "/pages/business/business" });
+//     uni.preloadPage({ url: "/pages/notice/notice" });
+//     uni.preloadPage({ url: "/pages/userinfo/userinfo" });
+// })
 
 
 </script>
diff --git a/src/components/customHeader.vue b/src/components/customHeader.vue
index cb40ed5..f07f1a2 100644
--- a/src/components/customHeader.vue
+++ b/src/components/customHeader.vue
@@ -58,15 +58,15 @@ const handleBack = () => {
     margin-left:-375rpx;
     z-index: 999;
     /* #ifdef APP-PLUS */
-    background: url('@/static/images/bg-Blue-header.png') no-repeat;
+    /* background: url('@/static/images/bg-Blue-header.png') no-repeat;
     background-size:750rpx 160rpx;
-    height:160rpx;
+    height:160rpx; */
     /* #endif */
 
     /* #ifndef APP-PLUS */
-    background: url('@/static/images/bg-Blue-header2.png') no-repeat;
+    /* background: url('@/static/images/bg-Blue-header2.png') no-repeat;
     background-size:750rpx 116rpx;
-    height:116rpx;
+    height:116rpx; */
     /* #endif */
    
 }
diff --git a/src/pages/business/business.vue b/src/pages/business/business.vue
index 2d2aede..86e105b 100644
--- a/src/pages/business/business.vue
+++ b/src/pages/business/business.vue
@@ -2,12 +2,11 @@
     <view class="con-body">
         <view class="con-bg">
             <!-- 头部 -->
-            <customHeader ref="customHeaderRef" :title="'业务中心'" 
-                :leftFlag="false" :rightFlag="false"   v-if="!searchShow"
-            ></customHeader>
-            <customHeader v-else ref="customHeaderRef" :title="'搜索'" 
-                :leftFlag="true" :rightFlag="false"
-                @back="handleBack" :searchType="1"
+            <customHeader ref="customHeaderRef" :title="!searchShow?'业务中心':'搜索'"
+                :leftFlag="!searchShow?false:true" 
+                :rightFlag="false"
+                @back="handleBack" 
+                :searchType="searchShow?1:undefined"
             ></customHeader>
             <!-- 高度来避免头部遮挡 -->
             <view class="top-height"></view>
@@ -68,7 +67,7 @@
 
 <script setup>
 import { ref,onMounted } from 'vue'
-import { onLoad,onShow } from '@dcloudio/uni-app';
+import { onLoad,onHide } from '@dcloudio/uni-app';
 import customHeader from '@/components/customHeader.vue';
 import customSearch from '@/components/customSearch.vue'
 import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
@@ -99,6 +98,10 @@ let searchShow = ref(false);
 let searchText = ref(undefined);
 let searchTypeObj = ref({typeId:2});
 
+onHide(()=>{
+    searchShow.value=false;
+})
+
 // 搜索返回操作
 const handleBack=()=>{
     searchShow.value=false;
@@ -173,7 +176,7 @@ let handleJump=(url)=>{
 <style scope>
 .scroll-h{
     /* #ifdef APP-PLUS */
-    height: calc(100vh - 120px) !important;
+    height: calc(100vh - 130px) !important;
     /* #endif */
     /* #ifndef APP-PLUS */
     height: calc(100vh - 140px) !important;
diff --git a/src/pages/home/home.vue b/src/pages/home/home.vue
index 0e15857..7b89d59 100644
--- a/src/pages/home/home.vue
+++ b/src/pages/home/home.vue
@@ -1,14 +1,17 @@
 <template>
   <view class="con-body">
     <view class="con-bg">
+      <!-- 头部 -->
+      <customHeader ref="customHeaderRef" :title="'首页'" 
+          :leftFlag="false" :rightFlag="false"
+      ></customHeader>
+      <!-- 高度来避免头部遮挡 -->
+      <view class="top-height"></view>
       <!-- 下拉刷新 -->
       <mescroll-uni ref="mescrollRef" @init="mescrollInit"
             :down="downOption"  @down="downCallback"
-            :fixed="false" class="scroll-h" :style="{ paddingTop: navBarPaddingTop + 'px' }"
+            :fixed="false" class="scroll-h" 
         >
-          <!-- #ifdef H5 -->
-          <view style="height:50rpx"></view>
-          <!-- #endif -->
           <!-- #ifdef APP-PLUS -->
           <!-- 删除设备ID--测试用 -->
           <view class="del-cache" @click="handleDelete">
@@ -16,141 +19,122 @@
           </view>
           <!-- #endif -->
 
-          <!-- 搜索  @confirm="handleSearch"  -->
-          <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="handleSearchFocus"
-                  v-model="searchText"
-              />
-              <uni-icons custom-prefix="iconfont" color="#ffffff" type="icon-phonesaoyisao" size="20"></uni-icons>
+          <!-- 待办内容 -->
+          <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>
 
-          <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="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>
-              </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="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>
-                  <view class="p-last">
-                    <view>目标销售额</view>
-                    <view class="font-money">{{ targetSales }}</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>
+            </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 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>
-        </block>
+          <!-- 底部加高度来避免tabbar遮挡 -->
+          <view class="bottom-height"></view>
       </mescroll-uni>
       </view>
   </view>
@@ -159,6 +143,7 @@
 <script setup>
 import { ref,onMounted,computed } from 'vue';
 import { onLoad } from '@dcloudio/uni-app';
+import customHeader from '@/components/customHeader.vue'
 import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
 import customSteps from '@/components/customSteps.vue'
 import customSearch from '@/components/customSearch.vue'
@@ -204,7 +189,7 @@ onLoad(async(opt) => {
 // 初始化调用方法
 const initLoad =()=>{
   try {
-    showLoading("加载中...")
+    showLoading("加载中...");
     getBackBlogCount();
     getSwiperList();
     getStepData();
@@ -251,24 +236,6 @@ onMounted(() => {
     navBarPaddingTop.value = getNavBarPaddingTop()*2;
 })
 
-// 搜索处理
-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;
-}
-
-
 let backBlogObj = ref({
   count1:0,
   count2:0,
@@ -409,10 +376,10 @@ const formatDateStr =(times)=>{
 
 .scroll-h{
   /* #ifdef APP-PLUS */
-  height:calc(100vh - 30px) !important;
+  height:calc(100vh - 78px) !important;
   /* #endif */
   /* #ifndef APP-PLUS */
-  height: calc(100vh - 30px) !important;
+  height: calc(100vh - 80px) !important;
   /* #endif */
 }
 :deep(.mescroll-upwarp){
diff --git a/src/pages/loading/loading.vue b/src/pages/loading/loading.vue
index a706cdc..7638529 100644
--- a/src/pages/loading/loading.vue
+++ b/src/pages/loading/loading.vue
@@ -45,9 +45,9 @@ let versionData = ref({}); //版本参数
 onLoad(async(opt) => {
     console.log("onLoad");
 
-    uni.preloadPage({url: "/pages/login/login"});
-    uni.preloadPage({url: "/pages/deviceAuth/deviceAuth"});
-    uni.preloadPage({url: "/pages/home/home"});
+    // uni.preloadPage({url: "/pages/login/login"});
+    // uni.preloadPage({url: "/pages/deviceAuth/deviceAuth"});
+    // uni.preloadPage({url: "/pages/home/home"});
 
     // #ifdef APP-PLUS
     // 查询版本接口
diff --git a/src/pages/notice/notice.vue b/src/pages/notice/notice.vue
index aa51436..6a8b84d 100644
--- a/src/pages/notice/notice.vue
+++ b/src/pages/notice/notice.vue
@@ -2,17 +2,18 @@
     <view class="con-body">
         <view class="con-bg">
             <!-- 头部 -->
-            <customHeader ref="customHeaderRef" :title="'消息'" :leftFlag="false" :rightFlag="true"  v-if="!searchShow">
-                <template #right>
+            <customHeader ref="customHeaderRef" :title="!searchShow?'消息':'搜索'" 
+                :leftFlag="!searchShow?false:true" 
+                :rightFlag="true"  
+                @back="handleBack" :searchType="searchShow?1:undefined"
+            >
+                <template #right  v-if="!searchShow">
                     <view class="head-right" @click="handleRead">
                         <img :src="'static/images/icon-clean@2x.png'" />清除未读
                     </view>
                 </template>
             </customHeader>
-            <customHeader v-else ref="customHeaderRef" :title="'搜索'" 
-                :leftFlag="true" :rightFlag="false"
-                @back="handleBack" :searchType="1"
-            ></customHeader>
+            
             <!-- 高度来避免头部遮挡 -->
             <view class="top-height"></view>
           
@@ -54,7 +55,7 @@
 
 <script setup>
 import { ref, onMounted,computed } from 'vue'
-import { onLoad } from '@dcloudio/uni-app';
+import { onLoad,onHide } from '@dcloudio/uni-app';
 import customHeader from '@/components/customHeader.vue'
 import customSearch from '@/components/customSearch.vue'
 import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
@@ -85,6 +86,9 @@ let noticeTypeList=ref([
 ]);
 let notictTypeCheck = ref({});//选中类型
 
+onHide(()=>{
+    searchShow.value=false;
+})
 
 // 搜索返回操作
 const handleBack=()=>{
diff --git a/src/pages/userinfo/userinfo.vue b/src/pages/userinfo/userinfo.vue
index 91db566..730d7cb 100644
--- a/src/pages/userinfo/userinfo.vue
+++ b/src/pages/userinfo/userinfo.vue
@@ -213,7 +213,7 @@ onMounted(() => {
 <style scoped>
 .scroll-h{
   /* #ifdef APP-PLUS */
-  height:calc(100vh - 30px) !important;
+  height:calc(100vh - 50px) !important;
   /* #endif */
   /* #ifndef APP-PLUS */
   height: calc(100vh - 30px) !important;
diff --git a/src/static/common.css b/src/static/common.css
index 18154c7..32e47df 100644
--- a/src/static/common.css
+++ b/src/static/common.css
@@ -5,7 +5,8 @@ page {
     height: 100%;
     padding: 0;
     margin: 0;
-    background-color: #F5F5F5;
+    background-color: #307AF5;
+    /* background-color: #F5F5F5; */
     color: #333;
 }
 
@@ -19,26 +20,30 @@ page {
     width: 100%;
     margin: 0;
     padding: 0;
+    background-color: #F5F5F5;
 }
 
-
 .con-bg {
     position: absolute;
     top: 0;
     right: 0;
     bottom: 0;
     /* #ifdef APP-PLUS */
-    background: url('@/static/images/bg-Blue.png') no-repeat;
-    background-size: 100vw 761rpx;
-    width: 100vw;
-    height: 761rpx;
+    background-color: #F5F5F5;
+    background-image: url('@/static/images/bg-Blue.png');
+    background-repeat:  no-repeat;
+    background-size: 750rpx 761rpx;
+    width: 750rpx;
+    /* height: 761rpx; */
     left: 0;
     /* #endif */
     /* #ifndef APP-PLUS */
-    background: url('@/static/images/bg-Blue.png') no-repeat;
+    background-color: #F5F5F5;
+    background-image: url('@/static/images/bg-Blue.png');
+    background-repeat:  no-repeat;
     background-size: 750rpx 761rpx;
     width: 750rpx;
-    height: 761rpx;
+    /* height: 761rpx; */
     left: 50%;
     margin-left: -375rpx;
     /* #endif */
@@ -187,7 +192,7 @@ page {
     /* width:690rpx; */
     width:630rpx;
     height:56rpx;
-    margin:0 auto 30rpx;
+    margin:10rpx auto 30rpx;
     padding:0 30rpx;
     display: flex;
     color:#fff;