From 93e1557cb20ce85e9aaaf10c81cf33960f23a7a7 Mon Sep 17 00:00:00 2001
From: xuli3099 <jswawa@qq.com>
Date: Tue, 19 Aug 2025 13:27:26 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=8F=8A=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;

From 7fa1e5b2f953eec62955a331d60e64e0c0b8ddd7 Mon Sep 17 00:00:00 2001
From: xuli3099 <jswawa@qq.com>
Date: Tue, 19 Aug 2025 14:39:45 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E5=88=A0=E9=99=A4=20=20=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87id=E5=88=A0=E9=99=A4=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home/home.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/home/home.vue b/src/pages/home/home.vue
index 7b89d59..d779879 100644
--- a/src/pages/home/home.vue
+++ b/src/pages/home/home.vue
@@ -14,9 +14,9 @@
         >
           <!-- #ifdef APP-PLUS -->
           <!-- 删除设备ID--测试用 -->
-          <view class="del-cache" @click="handleDelete">
+          <!-- <view class="del-cache" @click="handleDelete">
             <uni-icons type="minus" size="30" color="#ffffff"></uni-icons>
-          </view>
+          </view> -->
           <!-- #endif -->
 
           <!-- 待办内容 -->

From 8f849cda403ad18577a8f908c11ec4bb92ec4bd2 Mon Sep 17 00:00:00 2001
From: xuli3099 <jswawa@qq.com>
Date: Tue, 19 Aug 2025 17:31:28 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=8F=8A=E8=AE=BE=E5=A4=87=E6=8E=88=E6=9D=83=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js                         |  7 ++-
 src/pages.json                      |  9 +---
 src/pages/deviceAuth/deviceAuth.vue | 19 ++++---
 src/pages/h5-webview/h5-webview.vue | 80 ++++++++++++++---------------
 src/pages/login/login.vue           | 13 +++--
 5 files changed, 68 insertions(+), 60 deletions(-)

diff --git a/src/main.js b/src/main.js
index c1db60c..cfb180d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,15 +1,20 @@
 import { createSSRApp } from "vue";
 import App from "./App.vue";
-
+import { CLIENT_ID,NETWORK_ENV } from '@/enums/cacheEnums';
 import '@/static/font/iconfont.css'
 
 // pinia
 import { createPinia } from 'pinia'
 const pinia = createPinia()
 
+
+
 export function createApp() {
 
 	const app = createSSRApp(App);
+
+	app.config.globalProperties.$CLIENT_ID = CLIENT_ID;
+	app.config.globalProperties.$NETWORK_ENV = NETWORK_ENV;
 	
 	app.use(pinia)
 
diff --git a/src/pages.json b/src/pages.json
index 373c782..5e726d4 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -145,14 +145,7 @@
 		"navigationBarTitleText": "718友晟",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8",
-		"navigationStyle": "custom",
-		// #ifdef APP-PLUS
-		"style": {
-			"app-plus": {
-				"background":"#F5F5F5"
-			}
-		}
-		// #endif
+		"navigationStyle": "custom"
 	},
 	"tabBar": {
 		"color": "#919191",
diff --git a/src/pages/deviceAuth/deviceAuth.vue b/src/pages/deviceAuth/deviceAuth.vue
index 34116cd..6e5178b 100644
--- a/src/pages/deviceAuth/deviceAuth.vue
+++ b/src/pages/deviceAuth/deviceAuth.vue
@@ -80,7 +80,6 @@ import { v4 as uuidv4 } from 'uuid'
 import { getNavBarPaddingTop} from '@/utils/system.js';
 import { getBindStatus,authDeviceApply,authInputCode } from '@/api/auth.js';
 import {showToast,showAlert} from '@/utils/message.js'
-import { CLIENT_ID,NETWORK_ENV } from '@/enums/cacheEnums';
 import encryptObj from '@/utils/encrypt.js'
 import { requestAndroidPermissionAsync } from '@/utils/common.js'
 
@@ -94,8 +93,10 @@ const safeSave = uni.requireNativePlugin("Tm-TmSafeSaveFileModule");
 // #endif
 let systemInfo = {};
 let deviceId = ref(undefined);
+let clientId = `${proxy.$CLIENT_ID || 2}`;
+let networkEnv = ref(proxy.$NETWORK_ENV);//1-内网 2-外网
 onLoad(async(opt) => {
-    console.log("deviceAuth=>onLoad");
+    console.log("deviceAuth=>onLoad",clientId,networkEnv);
     uni.setStorageSync('page_cache',true);
     // uni.preloadPage({url: "/pages/login/login"});
     // uni.preloadPage({url: "/pages/home/home"});
@@ -210,14 +211,19 @@ const submitForm = async() => {
     // 用户名和密码登录
     form2.value.validate().then(async param => {
         btnLoading.value = true;
-        deviceId.value = uuidv4();
-        let clientId = `${CLIENT_ID || 2}`;
+        //1-内网，2-外网
+        if(networkEnv==1){
+            deviceId.value = form2.value.uniqCode;
+        }else{
+            deviceId.value = uuidv4(); //2-外网 生成的设备唯一标识
+        }
+        
         let password = encryptObj.Encrypt(param.username + clientId + "," + param.password);
         let params = {
             username:param.username,
             password,
-            networkEnv:NETWORK_ENV,//1-内网，2-外网
-            uniqCode:deviceId.value,//生成的设备唯一标识
+            networkEnv:networkEnv.value,//1-内网，2-外网
+            uniqCode:deviceId.value,
             ...systemInfo,//设备信息
             // #ifdef APP-PLUS
             verId:systemInfo.appWgtVersion,//当前版本号
@@ -402,6 +408,7 @@ const handleSubmit=()=>{
     border-bottom: 1px solid #E7E7E7;
 }
 
+
 :deep(.uni-forms-item__label){
     color:#239FDF;
     font-weight: bold;
diff --git a/src/pages/h5-webview/h5-webview.vue b/src/pages/h5-webview/h5-webview.vue
index 8557c37..b7fa2d9 100644
--- a/src/pages/h5-webview/h5-webview.vue
+++ b/src/pages/h5-webview/h5-webview.vue
@@ -1,71 +1,71 @@
 <template>
-<view>
+<view id="test">
+    <!-- #ifdef h5 -->
     <web-view :src="url"></web-view>
+    <!-- #endif -->
 </view>
 </template>
 
 <script setup>
 import { ref,onMounted,getCurrentInstance } from 'vue';
-import { onLoad,onReady } from '@dcloudio/uni-app';
+import { onLoad,onReady,onBackPress } from '@dcloudio/uni-app';
 const { proxy } = getCurrentInstance();
 
 let windowInfo = ref(null);
 let url = ref('');
 let title = ref('');
-//将要创建的webview对象
-let wv;
 onLoad(async(opt) => {
-    // console.log(opt)
+    console.log(opt)
     url.value = opt.url;
     title.value = opt.title;
-   
+    // #ifdef APP-PLUS
+    titleNViewWebview(url.value,title.value);
+    // #endif
+    // uni.getSystemInfo({
+    //     success: (res)=> {
+    //         windowInfo.value = res;
+    //         createWvAndLoadUrl(url.value,title.value);
+    //     }
+    // });
 })
 
-onReady(()=>{
-    setTimeout(()=>{
-        uni.setNavigationBarTitle({
-            title:title.value
-        })
-    },2000)
-})
 
-onMounted(() => {
-    uni.getSystemInfo({
-        success: (res)=> {
-            windowInfo.value = res;
-            createWvAndLoadUrl(url.value);
+
+// 带标题栏控件的Webview窗口
+let webview = null;
+function titleNViewWebview(url,title) {
+    webview = plus.webview.create(url, 'test',	{
+        titleNView: {
+            backgroundColor: '#307AF5',
+            titleText: title,
+            titleColor: '#ffffff',
+            autoBackButton: true,
+            backgroundImage:'./../../static/images/bg-Blue-header.png',
+            buttons:[{onclick:clickButton}]
         }
     });
-})
-
-/*创建web-view并加载url*/
-const createWvAndLoadUrl=(url)=>{
-    // #ifdef APP-PLUS
-    wv = plus.webview.create(url,"webview",{
-        // plusrequire:"none", //禁止远程网页使用plus的API，有些使用mui制作的网页可能会监听plus.key，造成关闭页面混乱，可以通过这种方式禁止
-        top: 0,//this.windowInfo.statusBarHeight + 126, //放置在titleNView下方。如果还想在webview上方加个地址栏的什么的，可以继续降低TOP值
-        scalable: true,
-        height: windowInfo.value.windowHeight - windowInfo.value.statusBarHeight //- 126
-    })
-    wv.addEventListener('loading', () => {
+    webview.addEventListener('close', function(){
+        webview=null;
+    });
+    webview.addEventListener('titleUpdate', function(){
+        webview.show();
+    });
+    webview.addEventListener('loading', () => {
         plus.nativeUI.showWaiting("loading...",{
             width:'110px',
             padding:'10px'
         })
     }, false);
     //plus.nativeUI.showWaiting()
-    wv.addEventListener('loaded', () => {
+    webview.addEventListener('loaded', () => {
         plus.nativeUI.closeWaiting();
     }, false);
-    
-    //wv.loadURL(url)
-    let currentWebview = proxy.$scope.$getAppWebview();
-    currentWebview = wv;
-    // console.log(wv)
-    // setTimeout(()=> {
-    // 	console.log(wv.getStyle())
-    // }, 1000);
-    // #endif 
+}
+
+// 左侧按钮返回
+function clickButton(){
+	// plus.nativeUI.alert('clicked!');
+    webview=null;
 }
 </script>
 
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 651a8dc..a8c85e8 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -73,7 +73,7 @@
 </template>
 
 <script setup>
-import { ref,onMounted } from 'vue';
+import { ref,onMounted,getCurrentInstance } from 'vue';
 import { onLoad } from '@dcloudio/uni-app';
 import customTabs from '@/components/customTabs.vue';
 import {isPhoneNumber} from '@/utils/validate';
@@ -83,14 +83,17 @@ import { AGREEWELCOME_KEY } from '@/enums/cacheEnums';
 import { getNavBarPaddingTop} from '@/utils/system.js'
 import { useUserStore } from '@/stores/user';
 import encryptObj from '@/utils/encrypt.js'
-import { CLIENT_ID } from '@/enums/cacheEnums';
 import {showAlert} from '@/utils/message.js'
 
 // #ifdef APP-PLUS
 // 获取 存储手机的module 
 const safeSave = uni.requireNativePlugin("Tm-TmSafeSaveFileModule");
 // #endif
-const userStore = useUserStore()
+
+const { proxy } = getCurrentInstance();
+const userStore = useUserStore();
+let clientId = `${proxy.$CLIENT_ID || 2}`;
+let networkEnv = ref(proxy.$NETWORK_ENV);//1-内网 2-外网
 onLoad(async(opt) => {
     uni.setStorageSync('page_cache',true);
 })
@@ -248,13 +251,13 @@ const submitForm = () => {
         // 用户名和密码登录
         form2.value.validate().then(async param => {
             param.loginType = activeTab.value;
-            let clientId = `${CLIENT_ID || "2"}`;
             param.clientId = clientId;
             let password = encryptObj.Encrypt(param.username + clientId + "," + param.password);
             param.password = password;
+            param.runEnv = networkEnv.value;
 
             // #ifdef H5
-            param.uniqCode = '7f47cfb4-59e2-4cb9-ac46-9da5e23c4de2';//uni.getStorageSync('app_device_id');//先从缓存取之后处理 '7f47cfb4-59e2-4cb9-ac46-9da5e23c4de2'//
+            param.uniqCode = 'e5687e80-526f-4522-ba7d-41d5db197a15';//h5测试用
             let res = await login(param);
             userStore.login(res);
             uni.switchTab({ url: '/pages/home/home' })

From b2b0c11966c12742472d183103de083d9e644ca0 Mon Sep 17 00:00:00 2001
From: xuli3099 <jswawa@qq.com>
Date: Wed, 20 Aug 2025 09:43:00 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=86=85=E7=BD=91?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/cacheEnums.js             |   2 +-
 src/pages/deviceAuth/deviceAuth.vue |  54 +++++++++++++++++++++++++---
 src/pages/home/home.vue             |   4 +--
 src/static/images/login-biaoshi.png | Bin 0 -> 860 bytes
 4 files changed, 52 insertions(+), 8 deletions(-)
 create mode 100644 src/static/images/login-biaoshi.png

diff --git a/src/enums/cacheEnums.js b/src/enums/cacheEnums.js
index a67dd81..264ff92 100644
--- a/src/enums/cacheEnums.js
+++ b/src/enums/cacheEnums.js
@@ -4,5 +4,5 @@ export const AGREEWELCOME_KEY="agreewelcome";
 // clientId 默认写2 
 export const CLIENT_ID="2";
 // #区分内外网 //1-内网，2-外网
-export const NETWORK_ENV=2;
+export const NETWORK_ENV=1;
 
diff --git a/src/pages/deviceAuth/deviceAuth.vue b/src/pages/deviceAuth/deviceAuth.vue
index 6e5178b..2a14911 100644
--- a/src/pages/deviceAuth/deviceAuth.vue
+++ b/src/pages/deviceAuth/deviceAuth.vue
@@ -6,13 +6,26 @@
             <view :style="{height: navBarPaddingTop + 'px'}"></view>
             <view class="auth-title">
                 <image src="@/static/images/icon-lock@2x.png"/>
-                <text>设备授权</text>
+                <text>{{networkEnv==1?'内网':''}}设备授权</text>
             </view>
             <view class="login-con">
                 <!-- 登录 -->
                 <block v-if="!bindStatus">
-                    <view class="login-form">
+                    <view class="login-form" :class="{network1:networkEnv==1}">
                         <uni-forms ref="form2" :model="formData2" :rules="rules2" label-position="top">
+                            <!-- networkEnv -->
+                            <uni-forms-item label="设备标识" required name="uniqCode" v-if="networkEnv==1">
+                                <view class="code-con code-device">
+                                    <uni-easyinput prefixIcon="person" :inputBorder="false" 
+                                        v-model="formData2.uniqCode" placeholder="请输入设备标识" 
+                                    >
+                                        <!-- <template #prefixIcon> -->
+                                            <!-- <image src="@/static/images/login-biaoshi.png" style="width: 20px; height: 20px;" /> -->
+                                        <!-- </template> -->
+                                        
+                                    </uni-easyinput>
+                                </view>
+                            </uni-forms-item>
                             <uni-forms-item label="用户名" required name="username">
                                 <view class="code-con">
                                     <uni-easyinput prefixIcon="person" :inputBorder="false" 
@@ -96,7 +109,7 @@ let deviceId = ref(undefined);
 let clientId = `${proxy.$CLIENT_ID || 2}`;
 let networkEnv = ref(proxy.$NETWORK_ENV);//1-内网 2-外网
 onLoad(async(opt) => {
-    console.log("deviceAuth=>onLoad",clientId,networkEnv);
+    console.log("deviceAuth=>onLoad",clientId,networkEnv.value);
     uni.setStorageSync('page_cache',true);
     // uni.preloadPage({url: "/pages/login/login"});
     // uni.preloadPage({url: "/pages/home/home"});
@@ -187,11 +200,17 @@ let refreshBindStatus = async ()=>{
 // 账号登录
 const form2 = ref(null);
 const formData2 = ref({
+    uniqCode:'',
     username: '',
     password: ''
 });
 
 const rules2 = {
+    uniqCode:{
+        rules: [
+            { required: true, errorMessage: '请输入设备标识' },
+        ]
+    },
     username: {
         rules: [
             { required: true, errorMessage: '请输入用户名' },
@@ -212,8 +231,8 @@ const submitForm = async() => {
     form2.value.validate().then(async param => {
         btnLoading.value = true;
         //1-内网，2-外网
-        if(networkEnv==1){
-            deviceId.value = form2.value.uniqCode;
+        if(networkEnv.value==1){
+            deviceId.value = param.uniqCode;
         }else{
             deviceId.value = uuidv4(); //2-外网 生成的设备唯一标识
         }
@@ -450,6 +469,31 @@ const handleSubmit=()=>{
     content: "\e66c" !important;
 }
 
+/* 加设备ID样式 */
+.container .login-form.network1{
+    padding-bottom:50rpx;
+}
+.container .login-form.network1 .code-con{
+    padding:0 0 3rpx;
+}
+.container .login-form.network1 :deep(.uni-forms-item){
+    margin-bottom:10px !important
+}
+.container .login-form.network1 :deep(.uni-easyinput__content-input){
+    height: 30px !important;
+}
+
+.container .login-form .code-con.code-device :deep(.uni-easyinput__content .uniui-person){
+    background: url('@/static/images/login-biaoshi.png') 15rpx no-repeat;
+    background-size:25rpx 30rpx;
+    width: 25rpx;
+    height: 30rpx;
+    margin-right:10rpx;
+}
+.container .login-form .code-con.code-device :deep(.uniui-person:before){
+    display: none;
+}
+
 .btn-submit{
     width:496rpx;
     height:88rpx;
diff --git a/src/pages/home/home.vue b/src/pages/home/home.vue
index d779879..7b89d59 100644
--- a/src/pages/home/home.vue
+++ b/src/pages/home/home.vue
@@ -14,9 +14,9 @@
         >
           <!-- #ifdef APP-PLUS -->
           <!-- 删除设备ID--测试用 -->
-          <!-- <view class="del-cache" @click="handleDelete">
+          <view class="del-cache" @click="handleDelete">
             <uni-icons type="minus" size="30" color="#ffffff"></uni-icons>
-          </view> -->
+          </view>
           <!-- #endif -->
 
           <!-- 待办内容 -->
diff --git a/src/static/images/login-biaoshi.png b/src/static/images/login-biaoshi.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c8e479773201e47ed34667b5fc2812479df96b7
GIT binary patch
literal 860
zcmV-i1Ec(jP)<h;3K|Lk000e1NJLTq000&M000{Z1^@s6cq)J80009KNkl<Zcmb@G
z&rcIU6vyA&E#MEL+)Sk{@mKVqCZ>teghY%8q*1$&NNkImAn`AdGaO7jNTL@-1I7ci
zC1ApWKdN{zob;k_F)^qJT_JM8#DhpFGrqT_wQaU*15D;S^Y;Dt?C$K&D2)Siek~IJ
zp+yY28S+PrxeF1aL6Jgq1K=*$q=o>yNxcg3oFo8r?9qd6+=!M1x`7&jD;Z2CfF5wp
zn8pT%Sc~g>x;z6;I||LUgI{<0!qZiS;`#of!P}E1O{G{G%m);@E*gxW5LA+&s8$rX
zzHi0}AWswVF#SqLY5s4w1Z&}0uNH~l@kiqK{1KyPtExtcq>@09(4&Rpy`=kE*tmNx
zYSgelUzT7!RP|nh@(BQ2>DOrkfK#MYM>r0M*GSh%3(qdO##4dZ(GtulBSF_gl%ksK
zX;My?AQyzhvwF~Vi{LURxOPzx%yE8lM7+&*wou}O(U9v+wlCkd1#_~L;NzK;013Zo
z=AQPkZ7ExD&Es!dq?Bjq)jtYUPGB-|Od`Ca*Y`G=e~Km3blQS<lsRf>DY_FCZtrNI
za$@-EzNu2xRV}3G5Q?MLBor8I!DS8@rw?=^=ELQ5{ZKQmj)pup7fR%lw9jg`1rIg5
zm#m7|_tqxHaa%AatXD;W{r$!f+JP}sWEXQYTQGllg7u&R6SM;xOp)D4+ni%|H?Rbs
ze>%TSiy9q5Ri_BnMga4ipqaZ$Tdj>_oWr^7%vTQh;^3g#7>&28zmi`-LMH%}ljvZB
zNf5FgL8&AEB&1q7*`1urHC&r=r^XCe8<?+4Bu{>j5+Bh9pktB~aF)i)`e&C{Z}E%`
z2P<E*%{~A#MiV-@hHL%dcs;DO3>d`fD|+qpS-U7vwl7yK9n^#Fe&|F2=|(pDI7Yj&
zo!pBg;95j{$u{dBn67B;{!nt)iWK`t0-mmz??7f_P&lV^Y$W6{bGe3VvlCKa2?7xN
zR^-YdN^XB1s`{CoWM^|O*KjQ}Xx#<pD`boTpjQvLuDl5C<u!%%G_GX^5Q~|A0RRC1
m|Gtv}0RR9121!IgR09BV9cFsq-Dg<<0000<MNUMnLSTZL=!>ra

literal 0
HcmV?d00001


From 9d5432058a7ec2bf2e120c72b4d8ad5f84ff38a0 Mon Sep 17 00:00:00 2001
From: xuli3099 <jswawa@qq.com>
Date: Wed, 20 Aug 2025 09:52:32 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home/home.vue   | 4 ++--
 src/pages/login/login.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/home/home.vue b/src/pages/home/home.vue
index 7b89d59..d779879 100644
--- a/src/pages/home/home.vue
+++ b/src/pages/home/home.vue
@@ -14,9 +14,9 @@
         >
           <!-- #ifdef APP-PLUS -->
           <!-- 删除设备ID--测试用 -->
-          <view class="del-cache" @click="handleDelete">
+          <!-- <view class="del-cache" @click="handleDelete">
             <uni-icons type="minus" size="30" color="#ffffff"></uni-icons>
-          </view>
+          </view> -->
           <!-- #endif -->
 
           <!-- 待办内容 -->
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index a8c85e8..487ba6f 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -257,7 +257,7 @@ const submitForm = () => {
             param.runEnv = networkEnv.value;
 
             // #ifdef H5
-            param.uniqCode = 'e5687e80-526f-4522-ba7d-41d5db197a15';//h5测试用
+            param.uniqCode = 'sn123456';//h5测试用 内网-sn123456 外网-e5687e80-526f-4522-ba7d-41d5db197a15
             let res = await login(param);
             userStore.login(res);
             uni.switchTab({ url: '/pages/home/home' })

From 6635ceb0d8eb79a4118614dd8619090915fcf34e Mon Sep 17 00:00:00 2001
From: xuli3099 <jswawa@qq.com>
Date: Wed, 20 Aug 2025 10:04:40 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8A=A0=E5=86=85=E5=A4=96=E7=BD=91=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/loading/loading.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/loading/loading.vue b/src/pages/loading/loading.vue
index 7638529..a177ab7 100644
--- a/src/pages/loading/loading.vue
+++ b/src/pages/loading/loading.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script setup>
-import { ref } from 'vue';
+import { ref,getCurrentInstance } from 'vue';
 import { onLoad } from '@dcloudio/uni-app';
 import { versionCheck,getBindStatus } from '@/api/auth.js';
 import { formatIOS } from '@/utils/status.js'
@@ -28,6 +28,7 @@ import { requestAndroidPermissionAsync,requestAndroidPermission } from '@/utils/
 import {showAlert} from '@/utils/message.js'
 import { useUserStore } from '@/stores/user';
 const userStore = useUserStore();
+const { proxy } = getCurrentInstance();
 
 // #ifdef APP-PLUS
 // 获取 存储手机的module 
@@ -89,8 +90,10 @@ onLoad(async(opt) => {
 
 // 检查版本是否是最新的s
 const getOSVesion = async()=>{
+    let networkEnv = proxy.$NETWORK_ENV;//1-内网 2-外网
     systemInfo = uni.getSystemInfoSync();
     let param = {
+        runEnv:networkEnv,
         // #ifdef APP-PLUS
         verNumber:systemInfo.appWgtVersion,//当前版本号
         // #endif

From 08ca660b875bd99782134c1f051e0373c4f5ae85 Mon Sep 17 00:00:00 2001
From: xuli3099 <jswawa@qq.com>
Date: Wed, 20 Aug 2025 10:14:22 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=80=80=E5=87=BA?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/userinfo/userinfo.vue | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/pages/userinfo/userinfo.vue b/src/pages/userinfo/userinfo.vue
index 730d7cb..9972ce7 100644
--- a/src/pages/userinfo/userinfo.vue
+++ b/src/pages/userinfo/userinfo.vue
@@ -103,6 +103,7 @@ import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
 import { getNavBarPaddingTop } from '@/utils/system.js'
 import { getUserInfo,versionCheck } from '@/api/auth.js'
 import { formatIOS } from '@/utils/status.js'
+import { showAlert } from '@/utils/message.js'
 import { useUserStore } from '@/stores/user';
 const userStore = useUserStore()
 
@@ -193,10 +194,14 @@ const getVersion = async ()=>{
 
 // 3.退出登录
 const handleLoginOut = async ()=>{
-    userStore.logout();
-    uni.reLaunch({
-        url: '/pages/login/login',
-    });
+
+    showAlert('是否确认退出？','提示',true,()=>{
+        userStore.logout();
+        uni.reLaunch({
+            url: '/pages/login/login',
+        });
+    })
+    
 }
 
 // 4.跳转到版本

From b1064f911844c2563914e373aac096b8e59f094b Mon Sep 17 00:00:00 2001
From: xuli3099 <jswawa@qq.com>
Date: Wed, 20 Aug 2025 10:22:34 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E8=BF=98=E6=94=B9=E4=B8=BA=E5=A4=96?=
 =?UTF-8?q?=E7=BD=91=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/cacheEnums.js   | 2 +-
 src/pages/login/login.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/enums/cacheEnums.js b/src/enums/cacheEnums.js
index 264ff92..a67dd81 100644
--- a/src/enums/cacheEnums.js
+++ b/src/enums/cacheEnums.js
@@ -4,5 +4,5 @@ export const AGREEWELCOME_KEY="agreewelcome";
 // clientId 默认写2 
 export const CLIENT_ID="2";
 // #区分内外网 //1-内网，2-外网
-export const NETWORK_ENV=1;
+export const NETWORK_ENV=2;
 
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 487ba6f..9cd0390 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -257,7 +257,7 @@ const submitForm = () => {
             param.runEnv = networkEnv.value;
 
             // #ifdef H5
-            param.uniqCode = 'sn123456';//h5测试用 内网-sn123456 外网-e5687e80-526f-4522-ba7d-41d5db197a15
+            param.uniqCode = 'e5687e80-526f-4522-ba7d-41d5db197a15';//h5测试用 内网-sn123456 外网-e5687e80-526f-4522-ba7d-41d5db197a15
             let res = await login(param);
             userStore.login(res);
             uni.switchTab({ url: '/pages/home/home' })

From 27d64dbd72827998139017fde110a282a24a2841 Mon Sep 17 00:00:00 2001
From: xuli3099 <jswawa@qq.com>
Date: Wed, 20 Aug 2025 11:36:31 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/customShowModal.vue | 163 +++++++++++++++++++++++++++++
 src/main.js                        |   8 +-
 src/pages/login/login.vue          |   2 +-
 src/pages/userinfo/userinfo.vue    |  35 ++++++-
 src/pages/userinfo/version.vue     |   9 +-
 5 files changed, 208 insertions(+), 9 deletions(-)
 create mode 100644 src/components/customShowModal.vue

diff --git a/src/components/customShowModal.vue b/src/components/customShowModal.vue
new file mode 100644
index 0000000..3bce085
--- /dev/null
+++ b/src/components/customShowModal.vue
@@ -0,0 +1,163 @@
+<template>
+<view class="model" v-if="visibleF">
+	<view class="model-con">
+		<view class="model-top" v-if="title">{{title}}</view>
+		<view :class="{'model-middle':true,'m-height':!title}">{{contents}}</view>
+		<view class="model-bottom">
+			<button type="primary" class="btn-cancel" @click="handleCancel" v-if="btnFlag2">Cancel</button>
+			<button type="default" class="btn-green" @click="handleConfirm" v-if="btnFlag" :loading="loading" :disabled="loading">{{btnTxt}}</button>
+		</view>
+	</view>
+</view>
+</template>
+
+<script setup>
+import { ref,watch } from 'vue'
+const props = defineProps({
+	visible:{
+		type:Boolean
+	},
+	title:{
+		type: String,
+	},
+	content: {
+		type: String
+	},
+	btnFlag:{
+		type:Boolean,
+		default:true
+	},
+	btnFlag2:{
+		type:Boolean,
+		default:true
+	},
+	btnTxt:{
+		type:String,
+		default:'确定'
+	}
+})
+
+let visibleF = ref(props.visible)
+let titles = ref(props.title)
+let contents = ref(props.content)
+let btnFlags = ref(props.btnFlag)
+let loading = ref(false);
+
+// 显示隐藏
+watch(() => props.visible, (newVal, oldVal) => {
+    loading.value = false;
+	visibleF = newVal
+},{
+    deep:true, // 深度监听
+    immediate:true // 立即执行
+});
+
+// 标题
+watch(() => props.title, (newVal, oldVal) => {
+	titles.value = newVal
+},{
+    deep:true,
+    immediate:true
+});
+// 内容
+watch(() => props.content, (newVal, oldVal) => {
+	contents = newVal
+},{
+    deep:true,
+    immediate:true
+});
+
+// 按钮
+watch(() => props.btnFlag, (newVal, oldVal) => {
+	btnFlags.value = newVal
+},{
+    deep:true,
+    immediate:true
+});
+
+// 调用父组件的方法
+const emit = defineEmits(['close','confirm'])
+const handleCancel = ()=>{
+	emit('close');
+}
+
+const handleConfirm = ()=>{
+	loading.value=true;
+	emit('confirm')
+}
+
+</script>
+
+<style lang="scss" scoped>
+.model {
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	background: rgba(0, 0, 0, 0.4);
+	z-index: 9999;
+	.model-con{
+		background: #fff;
+		position: fixed;
+		top:50%;
+		left:50%;
+		width:500rpx;
+		min-height: 278rpx;
+		margin-left: -270rpx;
+		margin-top:-139rpx;
+		border-radius: 24rpx;
+		padding:20rpx 20rpx 30rpx;
+	}
+	.model-top{
+		text-align: center;
+		padding:20rpx 0;
+		font-size:36rpx;
+	}
+	.model-middle{
+		// margin-top:290rpx;
+		text-align: center;
+		font-size:36rpx;
+		color:#393939;
+		.font-green{
+			color:#05A3F4;
+			font-size: 42rpx;
+			font-weight: bold;
+			padding:20rpx 0;
+		}
+	}
+	.model-middle.m-height{
+		padding:60rpx 0 20rpx;
+	}
+	.model-bottom{
+		display: flex;
+		justify-content: center;
+		margin-top:40rpx;
+		// align-items: center;
+		.btn-green,.btn-cancel{
+			background-color: #fff;
+			color:#05A3F4;
+			border-radius: 48rpx;
+			font-size:30rpx;
+			width:200rpx;
+			height:65rpx;
+			line-height: 60rpx;
+			text-align: center;
+			font-size:30rpx;
+			border: 1px solid #05A3F4;
+			margin-left:0rpx !important;
+			margin-right:0 !important;
+			&::after{
+				border:none;
+				border-radius: 37rpx;
+			}
+		}
+		.btn-green{
+			border: 1px solid #05A3F4;
+			background-color:#05A3F4;
+			color:#fff;
+			margin-left:20rpx !important;
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index cfb180d..5b95c9d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -3,18 +3,24 @@ import App from "./App.vue";
 import { CLIENT_ID,NETWORK_ENV } from '@/enums/cacheEnums';
 import '@/static/font/iconfont.css'
 
+// 注册自定义组件
+import customShowModal from '@/components/customShowModal.vue'
+
 // pinia
 import { createPinia } from 'pinia'
 const pinia = createPinia()
 
 
-
 export function createApp() {
 
 	const app = createSSRApp(App);
 
+	// 全局变量
 	app.config.globalProperties.$CLIENT_ID = CLIENT_ID;
 	app.config.globalProperties.$NETWORK_ENV = NETWORK_ENV;
+
+	// 全局自定义组件
+	app.component('customShowModal', customShowModal)
 	
 	app.use(pinia)
 
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 9cd0390..c28b951 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -257,7 +257,7 @@ const submitForm = () => {
             param.runEnv = networkEnv.value;
 
             // #ifdef H5
-            param.uniqCode = 'e5687e80-526f-4522-ba7d-41d5db197a15';//h5测试用 内网-sn123456 外网-e5687e80-526f-4522-ba7d-41d5db197a15
+            param.uniqCode = '7666ac20-827a-4c23-8e2e-fbbf24564fc0';//h5测试用 内网-sn123456 外网-7666ac20-827a-4c23-8e2e-fbbf24564fc0
             let res = await login(param);
             userStore.login(res);
             uni.switchTab({ url: '/pages/home/home' })
diff --git a/src/pages/userinfo/userinfo.vue b/src/pages/userinfo/userinfo.vue
index 9972ce7..02aa6ff 100644
--- a/src/pages/userinfo/userinfo.vue
+++ b/src/pages/userinfo/userinfo.vue
@@ -87,17 +87,27 @@
             </view>
 
             <!-- 退出登录 -->
-            <button type="primary" plain="true" size="small" class="logout-btn" @click="handleLoginOut">退出登录</button>
+            <button type="primary" plain="true" size="small" class="logout-btn" @click="showModel">退出登录</button>
 
             <!-- 底部加高度来避免tabbar遮挡 -->
             <!-- <view class="bottom-height"></view> -->
       </mescroll-uni>
     </view>
+
+    <!-- 弹窗模板 -->
+    <customShowModal
+        :title="title"
+        :content="content" 
+        :visible="visible" 
+        @close="handleClose"
+        @confirm="handleLoginOut"
+        ref="showModel"
+    ></customShowModal>
 </view>
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue'
+import { ref, onMounted,getCurrentInstance } from 'vue'
 import { onLoad } from '@dcloudio/uni-app';
 import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
 import { getNavBarPaddingTop } from '@/utils/system.js'
@@ -106,6 +116,7 @@ import { formatIOS } from '@/utils/status.js'
 import { showAlert } from '@/utils/message.js'
 import { useUserStore } from '@/stores/user';
 const userStore = useUserStore()
+const { proxy } = getCurrentInstance();
 
 // 1.头部导航栏
 const navBarPaddingTop = ref(0);
@@ -179,6 +190,7 @@ const downCallback = async (mescroll) => {
 
 // 3.查询是否有更新的版本显示点
 const getVersion = async ()=>{
+    let networkEnv = proxy.$NETWORK_ENV;//1-内网 2-外网
     let param = {
         // #ifdef APP-PLUS
         verNumber:systemInfo.appWgtVersion,//当前版本号
@@ -187,20 +199,35 @@ const getVersion = async ()=>{
         verNumber : systemInfo.appVersion,
         // #endif
         os: formatIOS(systemInfo.osName),//操作系统 Android  IOS
+        runEnv:networkEnv
     }
     let data = await versionCheck(param);
     isCurrent.value = data.isCurrent;
 }
 
+// 自定义弹窗
+let title = ref('');
+let content = ref('');
+let visible = ref(false);
+const showModel=()=>{
+    title.value = '提示'
+    content.value = '是否确认退出？';
+    visible.value = true;
+}
+//关闭
+const handleClose=()=>{
+    visible.value = false;
+}
+
 // 3.退出登录
 const handleLoginOut = async ()=>{
 
-    showAlert('是否确认退出？','提示',true,()=>{
+    // showAlert('是否确认退出？','提示',true,()=>{
         userStore.logout();
         uni.reLaunch({
             url: '/pages/login/login',
         });
-    })
+    // })
     
 }
 
diff --git a/src/pages/userinfo/version.vue b/src/pages/userinfo/version.vue
index 6bdaaf2..9a76ff2 100644
--- a/src/pages/userinfo/version.vue
+++ b/src/pages/userinfo/version.vue
@@ -26,12 +26,13 @@
 </template>
 
 <script setup>
+import { ref, onMounted,getCurrentInstance } from 'vue'
 import { onLoad } from '@dcloudio/uni-app';
-import { ref, onMounted } from 'vue'
 import customHeader from '@/components/customHeader.vue'
 import { versionCheck } from '@/api/auth.js';
 import { getNavBarPaddingTop } from '@/utils/system.js'
 import { formatIOS } from '@/utils/status.js'
+const { proxy } = getCurrentInstance();
 
 // 初始load页面
 onLoad(async(opt) => {
@@ -49,6 +50,7 @@ onMounted(() => {
     navBarPaddingTop.value = getNavBarPaddingTop() * 2;
 })
 let getOSVesion = async()=>{
+    let networkEnv = proxy.$NETWORK_ENV;//1-内网 2-外网
     let systemInfo = uni.getSystemInfoSync();
     let param = {
         // #ifdef APP-PLUS
@@ -58,15 +60,16 @@ let getOSVesion = async()=>{
         verNumber : systemInfo.appVersion,
         // #endif
         os: formatIOS(systemInfo.osName),//操作系统 Android  IOS
+        runEnv:networkEnv
     }
     // 当前手机版本
     appVersion.value = param.appVersion;
-    console.log("appVersion=>",appVersion)
+    console.log("appVersion=>",appVersion.value)
     let data = await versionCheck(param);
     newVersion.value = data.verNumber;
     downloadURL.value = data.downloadUrl || '';
     isCurrent.value = data.isCurrent;
-    remark.value = data.remark //|| '全新的UI界面 优化了签到/打卡功能，整体流程更加简洁清晰 搜索功能全面升级 修复了已知BUG'
+    remark.value = data.remark; //|| '全新的UI界面 优化了签到/打卡功能，整体流程更加简洁清晰 搜索功能全面升级 修复了已知BUG'
 }
 
 // 下载最新版本

From 876b9b1c0674179421a13283646039db20fc2958 Mon Sep 17 00:00:00 2001
From: xuli3099 <jswawa@qq.com>
Date: Wed, 20 Aug 2025 11:39:24 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/userinfo/userinfo.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/userinfo/userinfo.vue b/src/pages/userinfo/userinfo.vue
index 02aa6ff..7122dbd 100644
--- a/src/pages/userinfo/userinfo.vue
+++ b/src/pages/userinfo/userinfo.vue
@@ -87,7 +87,7 @@
             </view>
 
             <!-- 退出登录 -->
-            <button type="primary" plain="true" size="small" class="logout-btn" @click="showModel">退出登录</button>
+            <button type="primary" plain="true" size="small" class="logout-btn" @click="handleLoginOut">退出登录</button>
 
             <!-- 底部加高度来避免tabbar遮挡 -->
             <!-- <view class="bottom-height"></view> -->
@@ -95,14 +95,14 @@
     </view>
 
     <!-- 弹窗模板 -->
-    <customShowModal
+    <!-- <customShowModal
         :title="title"
         :content="content" 
         :visible="visible" 
         @close="handleClose"
         @confirm="handleLoginOut"
         ref="showModel"
-    ></customShowModal>
+    ></customShowModal> -->
 </view>
 </template>
 
@@ -222,12 +222,12 @@ const handleClose=()=>{
 // 3.退出登录
 const handleLoginOut = async ()=>{
 
-    // showAlert('是否确认退出？','提示',true,()=>{
+    showAlert('是否确认退出？','提示',true,()=>{
         userStore.logout();
         uni.reLaunch({
             url: '/pages/login/login',
         });
-    // })
+    })
     
 }