Merge branch 'develop' into develop-intranet

.env.development

@@ -1,2 +1,5 @@
-# VITE_APP_BASE_URL = "http://192.168.20.191:3000"
-VITE_APP_BASE_URL = "http://123.57.20.168:3000"
+
+#调用后台地址
+VITE_APP_BASE_URL = 'http://118.186.13.120:31302'
+# VITE_APP_BASE_URL = "http://192.168.236.71:31302"
+# VITE_APP_BASE_URL = "http://123.57.20.168:3000"

.env.production

@@ -1 +1,5 @@
-VITE_APP_BASE_URL = "http://192.168.20.191:5173"
+
+#调用后台地址
+VITE_APP_BASE_URL = 'http://118.186.13.120:31302'
+# VITE_APP_BASE_URL = "http://192.168.236.71:31302"
+# VITE_APP_BASE_URL = "http://123.57.20.168:3000"

index.html

@@ -10,6 +10,11 @@
         (coverSupport ? ', viewport-fit=cover' : '') + '" />')
     </script>
     <title></title>
+    <style>
+      body{
+          background-color: transparent;
+      }
+    </style>
     <!--preload-links-->
     <!--app-context-->
   </head>

package.json

@@ -57,8 +57,10 @@
     "@dcloudio/uni-mp-xhs": "3.0.0-4070520250711001",
     "@dcloudio/uni-quickapp-webview": "3.0.0-4070520250711001",
     "@dcloudio/uni-ui": "^1.5.7",
+    "crypto-js": "^4.2.0",
     "mescroll-uni": "^1.3.7",
     "pinia": "2.0.20",
+    "uuid": "^11.1.0",
     "vue": "^3.4.21"
   },
   "devDependencies": {

server/index.js

@@ -107,19 +107,60 @@ app.post('/api/search', (req,res) => {
     }))
 });
 
+// 查询业务列表
+app.post('/api/businessList', (req,res) => {
+    res.json(Mock.mock({
+        code: 0,
+        data: {
+            list:[
+                {bizId:1,bizName:'企业日常',children:[
+                    {bizId:11,bizName:'任务计划',icon:'static/images/business/icon-rwjh.png',status:1,isDaily:true},
+                    {bizId:12,bizName:'日报',icon:'static/images/business/icon-rb.png',status:1,isDaily:true},
+                    {bizId:13,bizName:'设备管理',icon:'static/images/business/icon-sbgl.png',status:1},
+                    {bizId:14,bizName:'绩效管理',icon:'static/images/business/icon-jxgl.png',status:1},
+                    {bizId:15,bizName:'公章申请',icon:'static/images/business/icon-gzsq.png',status:1,isDaily:true},
+                    {bizId:16,bizName:'会议室预约',icon:'static/images/business/icon-hysyy.png',status:1,isDaily:true},
+                    {bizId:17,bizName:'报修',icon:'static/images/business/icon-bx.png',status:1}
+                ]},
+                {bizId:2,bizName:'CRM系统',children:[
+                    {bizId:21,bizName:'走访报告',icon:'static/images/business/demo.png',bizUrl:'/pages/business/CRM/visitorReport',status:true},
+                    {bizId:101,bizName:'走访报告',icon:'static/images/business/icon-zfbg.png',status:1},
+                    {bizId:102,bizName:'走访查看',icon:'static/images/business/icon-zfck.png',status:1,isDaily:true},
+                    {bizId:103,bizName:'走访审批',icon:'static/images/business/icon-zfsp.png',status:1},
+                    {bizId:104,bizName:'计划查看',icon:'static/images/business/icon-jhck.png',status:1},
+                    {bizId:105,bizName:'签到打卡',icon:'static/images/business/icon-qddk.png',status:1},
+                    {bizId:106,bizName:'打卡信息',icon:'static/images/business/icon-dkxx.png',status:1},
+                    {bizId:107,bizName:'打卡统计',icon:'static/images/business/icon-dktj.png',status:1},
+                    {bizId:108,bizName:'人员新增',icon:'static/images/business/icon-ryxz.png',status:1},
+                    {bizId:109,bizName:'信息查看',icon:'static/images/business/icon-xxck.png',status:1,isDaily:true},
+                    {bizId:1010,bizName:'信息审核',icon:'static/images/business/xxsh.png',badgeCount:5,status:1,isDaily:true},
+                    {bizId:1011,bizName:'信息统计',icon:'static/images/business/icon-xxtj.png',status:1},
+                    {bizId:1012,bizName:'回款查看',icon:'static/images/business/icon-hkck.png',status:1},
+                    {bizId:1013,bizName:'客户人员审核',icon:'static/images/business/icon-khrysh.png',badgeCount:3,status:true},
+                    {bizId:1014,bizName:'客户人员所属',icon:'static/images/business/icon-khryss.png',status:1},
+                    {bizId:1015,bizName:'客户人员归属人变更',icon:'static/images/business/icon-khrybg.png',status:1},
+                    {bizId:1016,bizName:'市场活动',icon:'static/images/business/icon-schd.png',status:1}
+                ]},
+                {bizId:3,bizName:'供应链采纳',children:[]},
+                {bizId:4,bizName:'PLM系统',children:[]}
+            ]
+        }
+    }))
+});
+
 // 查询企业日常 Daily business
 app.post('/api/businessDaily', (req,res) => {
     res.json(Mock.mock({
         code: 0,
         data: {
             list:[
-                {id:1,name:'任务计划',imgSrc:'static/images/business/icon-rwjh.png'},
-                {id:2,name:'日报',imgSrc:'static/images/business/icon-rb.png'},
-                {id:3,name:'设备管理',imgSrc:'static/images/business/icon-sbgl.png'},
-                {id:4,name:'绩效管理',imgSrc:'static/images/business/icon-jxgl.png'},
-                {id:5,name:'公章申请',imgSrc:'static/images/business/icon-gzsq.png'},
-                {id:6,name:'会议室预约',imgSrc:'static/images/business/icon-hysyy.png'},
-                {id:7,name:'报修',imgSrc:'static/images/business/icon-bx.png'}
+                {id:11,name:'任务计划',imgSrc:'static/images/business/icon-rwjh.png'},
+                {id:12,name:'日报',imgSrc:'static/images/business/icon-rb.png'},
+                {id:13,name:'设备管理',imgSrc:'static/images/business/icon-sbgl.png'},
+                {id:14,name:'绩效管理',imgSrc:'static/images/business/icon-jxgl.png'},
+                {id:15,name:'公章申请',imgSrc:'static/images/business/icon-gzsq.png'},
+                {id:16,name:'会议室预约',imgSrc:'static/images/business/icon-hysyy.png'},
+                {id:17,name:'报修',imgSrc:'static/images/business/icon-bx.png'}
             ]
         }
     }))
@@ -131,15 +172,15 @@ app.post('/api/businessCRMList', (req,res) => {
         code: 0,
         data: {
             list:[
-                {id:1,name:'走访报告',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReport'},
-                {id:2,name:'走访报告添加',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReportAdd'},
-                {id:3,name:'走访报告详情',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReportDetail'},
-                {id:4,name:'走访报告内容录入',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReportEnter'},
-                {id:5,name:'市场信息管理',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/marketInformation'},
-                {id:6,name:'修改周计划',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/weekPlanUpdate'},
-                {id:7,name:'签到打卡',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/vistorCheckin'},
-                {id:8,name:'打卡统计',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/checkinStatistics'},
-                {id:9,name:'回款查看',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/paymentCollection'},
+                {id:21,name:'走访报告',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReport'},
+                {id:22,name:'走访报告添加',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReportAdd'},
+                {id:23,name:'走访报告详情',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReportDetail'},
+                {id:24,name:'走访报告内容录入',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/visitorReportEnter'},
+                {id:25,name:'市场信息管理',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/marketInformation'},
+                {id:26,name:'修改周计划',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/weekPlanUpdate'},
+                {id:27,name:'签到打卡',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/vistorCheckin'},
+                {id:28,name:'打卡统计',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/checkinStatistics'},
+                {id:29,name:'回款查看',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/paymentCollection'},
                 {id:101,name:'走访报告',imgSrc:'static/images/business/icon-zfbg.png'},
                 {id:102,name:'走访查看',imgSrc:'static/images/business/icon-zfck.png'},
                 {id:103,name:'走访审批',imgSrc:'static/images/business/icon-zfsp.png'},
@@ -478,6 +519,32 @@ app.post('/api/mattersList', (req,res) => {
     }
 })
 
+// 查询设备绑定状态 绑定状态（1=已提交、2=等待审核、3=审核通过、4=绑定成功、5=审核拒绝）
+app.post('/api/getBindStatus', (req,res) => {
+    res.json(Mock.mock({
+        code: 0,
+        data: {
+            bindStatus:4
+        }
+    }))
+})
+
+// 查询版本号
+app.post('/api/versionCheck', (req,res) => {
+    res.json(Mock.mock({
+        "code": 0,
+        "message": "Success.",
+        "data": {
+            "status": 0,//版本状态 0-最新版本  1-有新版本，但现有版本可用  2-现有版本不可用，需要下载新版本
+            "latestVersion": "1.0.1",
+            "downloadURL": "https://www.718ys.com/downloads/android/ys718_test_v1.0.0.apk",
+            "availableVersionsList": "1.0.0",
+            remark:'fdsfddf'
+        },
+        "ok": true
+    }))
+})
+
 
 
 //2.创建server

src/App.vue

@@ -4,14 +4,27 @@
 
 
 <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" });
+// })
 
 
 </script>
 <style>
 @import '@/static/common.css';
-
+.uni-app--show{
+    opacity:1;
+    transition: opacity 0.3s;
+}
+.uni-app--hide {
+    opacity:0;
+    transition:opacity 0.3s;
+}
 </style>

src/api/auth.js

@@ -1,13 +1,38 @@
 import request from "@/utils/request"
 
-
-// 获取图片
-export function getCaptchaImage() {
-    return request.get({
-        url: '/api/captchaImage',
+// 获取客户端版本
+export function versionCheck(data) {
+    return request.post({
+        url: '/acc/auth/version',
+        data
     })
 }
 
+// 获取设备绑定状态
+export function getBindStatus(data) {
+    return request.post({
+        url: '/acc/auth/status',
+        data
+    })
+}
+
+// 申请设备授权
+export function authDeviceApply(data) {
+    return request.post({
+        url: '/acc/auth/apply',
+        data
+    })
+}
+
+// App绑定设备授权码
+export function authInputCode(data) {
+    return request.post({
+        url: '/acc/auth/inputCode',
+        data
+    })
+}
+
+
 // 获取验证码
 export function getVerifyCode(data) {
     return request.post({
@@ -19,19 +44,31 @@ export function getVerifyCode(data) {
 // 登录
 export function login(data) {
     return request.post({
-        url: '/api/user/login',
+        url: '/acc/auth/login',
         data
     })
 }
 
+// 登出
+export function logout(data) {
+    return request.post({
+        url: '/acc/auth/logout',
+        data
+    })
+}
  
 // 获取用户信息
 export function getUserInfo(data) {
-    return request.post({
-        url: '/api/getUserInfo',
+    return request.get({
+        url: '/acc/profile/userInfo',
         data
     })
 }
 
-
-
+// 查询当前用户常用功能
+export function getUserFavorite(data) {
+    return request.post({
+        url: '/acc/profile/favorite',
+        data
+    })
+}

src/api/business.js

@@ -8,10 +8,18 @@ export function search(data) {
     })
 }
 
-// 企业日常
-export function businessDaily(data) {
+// 查询当前用户业务列表
+export function businessList(data) {
     return request.post({
-        url: '/api/businessDaily',
+        url: '/acc/profile/bizList',
+        data
+    })
+}
+
+// 设置常用服务
+export function bizFavoriteSetting(data) {
+    return request.post({
+        url: '/acc/biz/favoriteSetting',
         data
     })
 }

src/api/home.js

@@ -1,9 +1,24 @@
 import request from "@/utils/request"
 
-// 待办数据查询
-export function backBlogCount(data) {
+// 待办数据查询 获取用户消息的待阅和已阅数量
+export function messageNotifyCount(data) {
+    return request.get({
+        url: '/acc/message/notify/count',
+        data
+    })
+}
+// 获取用户审批的待办和已办数量
+export function messageFlowCount(data) {
+    return request.get({
+        url: '/acc/message/flow/count',
+        data
+    })
+}
+
+// 常用服务 
+export function getUserFavorite(data) {
     return request.post({
-        url: '/api/backBlogCount',
+        url: '/acc/profile/favorite',
         data
     })
 }
@@ -32,13 +47,7 @@ export function salesTask(data) {
     })
 }
 
-// 常用服务
-export function commonServices(data) {
-    return request.post({
-        url: '/api/commonServices',
-        data
-    })
-}
+
 
 // 新闻公告
 export function newsQueryList(data) {

src/api/notice.js

@@ -3,7 +3,15 @@ import request from "@/utils/request"
 // 查询通知列表
 export function noticeList(data) {
     return request.post({
-        url: '/api/noticeList',
+        url: '/acc/message/notify/detail',
+        data
+    })
+}
+
+// 获取用户审批的待办和已办详情
+export function flowList(data) {
+    return request.post({
+        url: '/acc/message/flow/detail',
         data
     })
 }

src/components/customHeader.vue

@@ -25,6 +25,7 @@ const props = defineProps({
     title: String,
     leftFlag:true,//默认左侧显示 false-不显示
     rightFlag:false,//默认右侧不显示
+    searchType:{default:0}//搜索返回为1，其他暂时不处理
 })
 
 const emit = defineEmits(['back'])
@@ -35,7 +36,7 @@ let navbarHeight = ref(0)
 let navHeight = ref(0)
 
 onMounted(() => {
-    navBarPaddingTop.value = getNavBarPaddingTop();console.log(navBarPaddingTop.value)
+    navBarPaddingTop.value = getNavBarPaddingTop();
     statusBarHeight.value = getStatusBarHeight();
     navbarHeight.value = getNavBarHeight();
     navHeight.value = navbarHeight.value - statusBarHeight.value
@@ -43,6 +44,7 @@ onMounted(() => {
 
 const handleBack = () => {
     emit('back')
+    if(!props.searchType)
         uni.navigateBack()
 }
 </script>
@@ -56,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 */
    
 }

src/components/customSearch.vue

@@ -1,84 +1,307 @@
 <template>
     <view>
         <!-- 搜索框 -->
-        <uni-search-bar v-model="searchText" @confirm="handleSearch" />
+        <view class="search search-sao">
+            <!--   @confirm="handleSearch"  @cancel="handleCancel"-->
+            <uni-search-bar class="custom-search" 
+                radius="28" 
+                placeholder="请输入您想查询的内容或服务" 
+                clearButton="auto"
+                bgColor="#6FA2F8" textColor="#ffffff" 
+                v-model="searchText"
+                cancelButton="none"
+                focus
+            />
+            <text class="search-btn" @click="handleSearch">查询</text>
+        </view>
+        <view class="white-bg">
 
-        <!-- <view v-if="showSuggestions" class="suggestions-list">
-            <view 
-                v-for="(item, index) in suggestions" 
-                :key="index"
-                class="suggestion-item"
-                @click="selectSuggestion(item)"
+            <!-- 类型列表 -->
+            <view class="search-section" v-if="searchTypeList.length>0">
+                <view class="section-header">
+                    <text class="section-title">{{ searchType.typeName }}</text>
+                </view>
+                <view class="tag-container">
+                    <view class="search-tag notice-tag" :class="{'notice-check':!searchCheckObj.id}"  @click="handleNoticeClick({})">全部</view>
+                    <view class="search-tag notice-tag" :class="{'notice-check':item.id==searchCheckObj.id}"
+                        v-for="(item, index) in searchTypeList"
+                        :key="'notice-' + index"
+                        @click="handleNoticeClick(item)"
                     >
+                        {{ item.name }}
+                    </view>
+                </view>
+            </view>
+
+            <!-- 历史记录  v-if="historyList.length>0" -->
+            <view class="search-section">
+                <view class="section-header">
+                    <text class="section-title">历史搜索</text>
+                    <uni-icons type="trash" size="18" color="#999" @click="clearHistory"></uni-icons>
+                </view>
+                <view class="tag-container">
+                    <view class="search-tag" v-for="(item, index) in historyList" :key="'history-' + index"
+                        @click="handleHistoryClick(item)">
                         {{ item }}
                     </view>
-        </view> -->
-
-        <!-- 筛选条件 -->
-        <view class="filter-container">
-            <picker mode="selector" :range="categoryOptions" @change="handleCategoryChange">
-                <view class="filter-item">{{ categoryText }}</view>
-            </picker>
-            <picker mode="selector" :range="sortOptions" @change="handleSortChange">
-                <view class="filter-item">{{ sortText }}</view>
-            </picker>
+                </view>
             </view>
 
             <!-- 搜索结果 -->
-        <search-results :list="results" />
+            <!-- <view class="search-result" v-if="searchResult.length > 0">
+                <view class="result-item"
+                    v-for="(item, index) in searchResult"
+                    :key="'result-' + index"
+                    @click="handleResultClick(item)"
+                >
+                    {{ item.name }}
+                </view>
+            </view> -->
+        </view>
     </view>
 </template>
 
 <script setup>
-import { ref, computed } from 'vue'
+import { ref,watch } from 'vue'
 
-// const suggestions = ref([])
-// const showSuggestions = ref(false)
+const props = defineProps({
+    searchKeywords:{//搜索文本
+        type:String
+    },
+    searchType:{//哪种类型显示对象 typeId:1-首页，2-业务首页，3-消息  之后可以自动添加
+        type:Object
+    },
+    searchTypeList:{//类型列表
+        type:Array,
+        default:[]
+    },
+    checkTypeObj:{//选中的类型对象
+        type:Object
+    },
    
-// const handleInput = debounce(async () => {
-//   if (!searchText.value.trim()) {
-//     showSuggestions.value = false
-//     return
-//   }
+})
 
-//   try {
-//     const res = await getSuggestions(searchText.value)
-//     suggestions.value = res
-//     showSuggestions.value = true
-//   } catch (error) {
-//     console.error('获取搜索建议失败:', error)
-//   }
-// }, 300)
+const searchText = ref('');// 搜索文本
+const searchCheckObj = ref({});//选中的类型对象
 
-const searchText = ref('')
-const category = ref(0)
-const sort = ref(0)
+const showCancel = ref(false)// 是否显示取消按钮
+const historyList = ref([])// 历史记录列表
 
-const categoryOptions = ['全部类别', '电子产品', '服装', '食品']
-const sortOptions = ['默认排序', '价格从低到高', '价格从高到低', '销量最高']
+const searchResult = ref([])// 搜索结果
 
-const categoryText = computed(() => categoryOptions[category.value])
-const sortText = computed(() => sortOptions[sort.value])
+// 搜索文本内容
+watch(() => props.searchKeywords, (newVal, oldVal) => {
+    searchText.value = newVal
+},{
+    deep:true, // 深度监听
+    immediate:true // 立即执行
+});
 
-const handleSearch = async () => {
-    const params = {
-        keyword: searchText.value,
-        category: category.value,
-        sort: sort.value
+// 选中类型对象
+watch(() => props.checkTypeObj, (newVal, oldVal) => {
+    searchCheckObj.value = newVal
+},{
+    deep:true, // 深度监听
+    immediate:true // 立即执行
+});
+
+
+// 调用父组件的方法
+const emit = defineEmits(['confirm']);
+
+//  加载历史记录
+const loadHistory = () => {
+    let typeId = props.searchType?props.searchType.typeId:undefined
+    const history = uni.getStorageSync('searchHistory'+typeId) || []
+    historyList.value = history
+}
+loadHistory();
+
+// 处理搜索
+const handleSearch = () => {
+    let txtContent = searchText.value?searchText.value.trim():undefined
+    if (txtContent) {
+        // uni.showToast({
+        //     title: '请输入搜索内容',
+        //     icon: 'none'
+        // })
+        // return
+        // 添加到历史记录
+        addToHistory(txtContent)
     }
 
-    // 调用搜索API
-    const res = await searchAPI(params)
-    results.value = res.data
+    // 模拟搜索请求
+    // searchResult.value = [
+    //     { id: 1, name: `${searchText.value} 结果1` },
+    //     { id: 2, name: `${searchText.value} 结果2` },
+    //     { id: 3, name: `${searchText.value} 结果3` }
+    // ]
+
+
+    // 传给父组件
+    emit('confirm',searchCheckObj,searchText);
 }
 
-const handleCategoryChange = (e) => {
-    category.value = e.detail.value
+// 处理输入
+const handleInput = () => {
+    showCancel.value = searchText.value.length > 0
+}
+
+// 清除搜索
+const clearSearch = () => {
+    searchText.value = ''
+    showCancel.value = false
+    searchResult.value = []
+}
+
+
+// 添加到历史记录
+const addToHistory = (keyword) => {
+    const index = historyList.value.indexOf(keyword)
+    if (index !== -1) {
+        historyList.value.splice(index, 1)
+    }
+    historyList.value.unshift(keyword)
+
+    // 限制历史记录数量
+    if (historyList.value.length > 10) {
+        historyList.value = historyList.value.slice(0, 10)
+    }
+
+    let typeId = props.searchType.typeId
+    uni.setStorageSync('searchHistory'+typeId, historyList.value)
+}
+
+// 清除历史记录
+const clearHistory = () => {
+    uni.showModal({
+        title: '提示',
+        content: '确定要清空历史记录吗？',
+        success: (res) => {
+            if (res.confirm) {
+                historyList.value = []
+                let typeId = props.searchType.typeId;
+                uni.removeStorageSync('searchHistory'+typeId)
+            }
+        }
+    })
+}
+
+// 点击历史记录
+const handleHistoryClick = (item) => {
+    searchText.value = item
     handleSearch()
 }
 
-const handleSortChange = (e) => {
-    sort.value = e.detail.value
+// 点击消息类型
+const handleNoticeClick = (item) => {
+    // searchText.value = item
+    searchCheckObj.value = item;
     handleSearch()
 }
+
+// 点击搜索结果
+const handleResultClick = (item) => {
+    uni.showToast({
+        title: `点击了 ${item.name}`,
+        icon: 'none'
+    })
+    // 实际项目中这里可以跳转到详情页
+    // uni.navigateTo({ url: `/pages/detail/detail?id=${item.id}` })
+}
 </script>
+<style scoped>
+
+.search-sao {
+    display: flex;
+}
+
+.search-sao .custom-search {
+    /* width:615rpx; */
+    width: 590rpx;
+    padding: 0 20rpx;
+    margin-bottom:15rpx;
+}
+
+.search-sao :deep(.custom-search.uni-searchbar) {
+    padding-bottom: 15rpx !important;
+}
+
+.search-sao .search-btn {
+    margin: 15rpx 30rpx 10rpx 0;
+    color: #fff;
+    font-size: 28rpx;
+    font-weight: bold;
+    text-align: center;
+}
+.white-bg {
+    width: 750rpx;
+    padding: 40rpx 0;
+    margin-bottom: 0;
+    border-radius: 8px 8px 0 0;
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 130px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 150px);
+    /* #endif */
+}
+
+.search-section {
+    margin-bottom: 40rpx;
+    padding:0 45rpx;
+}
+
+.section-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 20rpx;
+}
+
+.section-title {
+    font-size: 28rpx;
+    color: #333;
+    font-weight: bold;
+}
+
+.tag-container {
+    display: flex;
+    flex-wrap: wrap;
+    gap:20rpx;
+}
+
+.search-tag {
+    background-color: #fff;
+    border:1px solid #E8E8E8;
+    border-radius: 10rpx;
+    padding: 10rpx 15rpx;
+    /* margin-right: 20rpx;
+    margin-bottom: 20rpx; */
+    font-size: 28rpx;
+}
+
+.search-tag.notice-tag{
+    padding: 10rpx 45rpx;
+}
+.notice-tag:nth-child(3n){
+    margin-right: 0;
+}
+
+.notice-check{
+    background-color: #05A3F4;
+    color:#fff;
+    border-color:#05A3F4;
+}
+.search-result {
+    margin-top: 20rpx;
+    padding:0 20rpx;
+}
+
+.result-item {
+    padding: 20rpx 0;
+    border-bottom: 1rpx solid #eee;
+    font-size: 28rpx;
+    color: #333;
+}
+</style>

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:#333333;
+		.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>

src/components/multipleSelect.vue

@@ -12,7 +12,7 @@
             <view class="uni-select-multiple" v-show="realValue.length">
                 <block v-if="multiple" >
                     <view class="uni-select-multiple-item" v-for="(item, index) in changevalue" :key="index">
-                        {{ item.text }}
+                        {{ item[slabel] }}
                         <view class="close-icon" v-if="showValueClear">
                             <text @click.stop="handleRemove(index)"></text>
                         </view>
@@ -20,7 +20,7 @@
                 </block>
                 <!-- 单选时展示内容 -->
                 <view v-else class="single-text">
-                    {{ changevalue.length ? changevalue[0].text : "" }}
+                    {{ changevalue.length ? changevalue[0][slabel] : "" }}
                 </view>
             </view>
             <!-- 为空时的显示文案 -->

src/components/sliderCaptcha.vue

@@ -1,182 +0,0 @@
-<template>
-    <view class="container">
-        <!-- 验证区域 -->
-        <view class="captcha-area">
-            <image :src="backgroundImg" class="bg-img" mode="widthFix"></image>
-            <view class="puzzle-hole" :style="{
-                left: `${holePosition.x}px`,
-                top: `${holePosition.y}px`,
-                width: `${puzzleSize.width}px`,
-                height: `${puzzleSize.height}px`
-            }"></view>
-        </view>
-
-        <!-- 滑块区域 -->
-        <view class="slider-area">
-            <movable-area class="movable-area">
-                <movable-view class="movable-view" direction="horizontal" :x="sliderX" @change="onDrag"
-                    @touchend="onDragEnd" :damping="40" :friction="10">
-                    <image :src="puzzleImg" class="puzzle-img"></image>
-                </movable-view>
-            </movable-area>
-            <text class="slider-text">{{ sliderText }}</text>
-        </view>
-
-        <!-- 操作按钮 -->
-        <button class="refresh-btn" @click="initCaptcha">刷新验证码</button>
-    </view>
-</template>
-
-<script>
-export default {
-    data() {
-        return {
-            backgroundImg: './static/images/captcha/1.jpg?v=1', // 替换为你的背景图
-            puzzleImg: '', // 滑块小图
-            holePosition: { x: 0, y: 0 }, // 缺口位置
-            puzzleSize: { width: 50, height: 50 }, // 滑块尺寸
-            sliderX: 0, // 滑块位置
-            targetX: 0, // 正确目标位置
-            isVerified: false,
-            sliderText: '拖动滑块完成拼图'
-        };
-    },
-    mounted() {
-        this.initCaptcha();
-    },
-    methods: {
-        // 初始化验证码
-        initCaptcha() {
-            this.isVerified = false;
-            this.sliderX = 0;
-            this.sliderText = '拖动滑块完成拼图';
-
-            // 随机生成缺口位置 (示例)
-            const maxX = 300 - this.puzzleSize.width;
-            const maxY = 200 - this.puzzleSize.height;
-
-            this.holePosition = {
-                x: Math.floor(Math.random() * maxX),
-                y: Math.floor(Math.random() * maxY)
-            };
-
-            // 这里应该从服务器获取裁剪后的小图
-            // 实际项目中需要通过API获取
-            this.puzzleImg = this.generatePuzzleImage();
-
-            // 设置目标位置 (映射到滑块轨道)
-            this.targetX = this.mapToSliderPosition(this.holePosition.x);
-        },
-
-        // 模拟生成滑块图片 (实际应从服务端获取)
-        generatePuzzleImage() {
-            // 这里应该是从背景图裁剪的图片
-            return './static/images/captcha/1-1.jpg?v=1';
-        },
-
-        // 映射背景位置到滑块位置
-        mapToSliderPosition(bgX) {
-            const bgWidth = 300; // 背景图显示宽度
-            const sliderWidth = 280; // 滑块轨道宽度
-            return (bgX / bgWidth) * sliderWidth;
-        },
-
-        // 拖动中
-        onDrag(e) {
-            if (this.isVerified) return;
-            this.sliderX = e.detail.x;
-        },
-
-        // 拖动结束
-        onDragEnd() {
-            if (this.isVerified) return;
-
-            // 允许的误差范围
-            const tolerance = 5;
-
-            if (Math.abs(this.sliderX - this.targetX) < tolerance) {
-                this.isVerified = true;
-                this.sliderText = '验证成功 ✓';
-                uni.showToast({ title: '验证成功', icon: 'success' });
-                // 这里可以触发验证通过后的操作
-            } else {
-                this.sliderText = '验证失败，请重试';
-                this.sliderX = 0;
-                setTimeout(() => {
-                    if (!this.isVerified) this.sliderText = '拖动滑块完成拼图';
-                }, 1000);
-            }
-        }
-    }
-};
-</script>
-
-<style>
-.container {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding: 20px;
-}
-
-.captcha-area {
-    position: relative;
-    width: 300px;
-    height: 200px;
-    border: 1px solid #eee;
-    border-radius: 8px;
-    overflow: hidden;
-    margin-bottom: 30px;
-}
-
-.bg-img {
-    width: 100%;
-    height: 100%;
-}
-
-.puzzle-hole {
-    position: absolute;
-    border: 2px dashed #fff;
-    box-shadow: 0 0 0 2000px rgba(0, 0, 0, 0.5);
-    pointer-events: none;
-}
-
-.slider-area {
-    width: 300px;
-    position: relative;
-}
-
-.movable-area {
-    width: 100%;
-    height: 50px;
-    background-color: #f5f5f5;
-    border-radius: 25px;
-}
-
-.movable-view {
-    width: 60px;
-    height: 60px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
-
-.puzzle-img {
-    width: 50px;
-    height: 50px;
-    border-radius: 8px;
-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
-}
-
-.slider-text {
-    display: block;
-    text-align: center;
-    margin-top: 10px;
-    color: #666;
-}
-
-.refresh-btn {
-    margin-top: 20px;
-    width: 200px;
-}
-</style>

src/enums/cacheEnums.js

@@ -1,2 +1,8 @@
 export const TOKEN_KEY = 'token';
-export const AGREEWELCOME_KEY="agreewelcome"
+export const AGREEWELCOME_KEY="agreewelcome";
+
+// clientId 默认写2 
+export const CLIENT_ID="2";
+// #区分内外网 //1-内网，2-外网
+export const NETWORK_ENV=2;
+

src/enums/requestEnums.js

@@ -10,9 +10,9 @@ export const RequestMethodsEnum = {
 };
 
 export const RequestCodeEnum = {
-    SUCCESS: 0, //成功
+    SUCCESS: 0 || 200, //成功
     FAILED: -1, // 失败
-    TOKEN_INVALID: 10003 // TOKEN失效未登录
+    TOKEN_INVALID: 401 // TOKEN失效未登录
 };
 
 export const RequestErrMsgEnum = {

src/main.js

@@ -1,16 +1,31 @@
 import { createSSRApp } from "vue";
 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)
 
 	return {

src/manifest.json

@@ -1,7 +1,7 @@
 {
     "id" : "H5E705637",
     "name" : "app",
-    // "appid" : "",
+    // "appid" : "H5E705637",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -16,7 +16,7 @@
         "compilerVersion" : 3,
         "splashscreen" : {
             "alwaysShowBeforeRender" : true,
-            "waiting" : true,
+            "waiting" : false,// 是否显示等待界面
             "autoclose" : true,
             "delay" : 0
         },

src/pages.json

@@ -13,6 +13,12 @@
 				"navigationBarTitleText": ""
 			}
 		},
+		{
+			"path": "pages/deviceAuth/deviceAuth",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
 			"path": "pages/login/login",
 			"style": {
@@ -22,13 +28,25 @@
 		{
 			"path": "pages/home/home",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"renderer": "native",  // 实验性选项，可能提升性能
+				"hardwareAccelerated": true  // 启用 GPU 加速
 			}
 		},
 		{
 			"path": "pages/business/business",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"renderer": "native",  // 实验性选项，可能提升性能
+				"hardwareAccelerated": true  // 启用 GPU 加速
+			}
+		},
+		{
+			"path": "pages/business/editDaily",
+			"style": {
+				"navigationBarTitleText": "",
+				"renderer": "native",  // 实验性选项，可能提升性能
+				"hardwareAccelerated": true  // 启用 GPU 加速
 			}
 		},
 		{
@@ -88,15 +106,43 @@
 		{
 			"path": "pages/notice/notice",
 			"style": {
-				"navigationBarTitleText": "",
-				"app-plus" : {
-					"bounce" : "none" // 取消APP端iOS回弹,避免与下拉刷新冲突 (可统一配在 'globalStyle')
+				"navigationBarTitleText": ""
+			}
 		},
-				"mp-alipay":{"allowsBounceVertical":"NO"} // 取消支付宝和钉钉小程序的iOS回弹,避免与下拉刷新冲突 (可统一配在 'globalStyle')
+		{
+			"path": "pages/notice/waitApprove",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/notice/waitApproveDetail",
+			"style": {
+				"navigationBarTitleText": ""
 			}
 		},
 		{
 			"path": "pages/userinfo/userinfo",
+			"style": {
+				"navigationBarTitleText": "",
+				"renderer": "native",  // 实验性选项，可能提升性能
+				"hardwareAccelerated": true  // 启用 GPU 加速
+			}
+		},
+		{
+			"path": "pages/userinfo/version",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/search/search",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/h5-webview/h5-webview",
 			"style": {
 				"navigationBarTitleText": ""
 			}

src/pages/business/CRM/marketInformation.vue

@@ -82,7 +82,10 @@ const mescrollRef = ref(null);
 const upOption = ref({
     page: { num: 0, size: 10 },
     noMoreSize: 5,
-    empty: { tip: '~ 空空如也 ~' },
+    empty: { 
+        tip: '~ 空空如也 ~',
+        icon: "../../static/images/mescroll-empty.png"
+    },
     textLoading: '加载中...',
     textNoMore: '已经到底了'
 });

src/pages/business/CRM/visitorReport.vue

@@ -89,7 +89,10 @@ const mescrollRef = ref(null);
 const upOption = ref({
     page: { num: 0, size: 10 },
     noMoreSize: 5,
-    empty: { tip: '~ 空空如也 ~' },
+    empty: { 
+        tip: '~ 空空如也 ~',
+        icon: "../../static/images/mescroll-empty.png"
+    },
     textLoading: '加载中...',
     textNoMore: '已经到底了'
 });
@@ -149,7 +152,62 @@ const getVisitorReportList = (pageIndex, pageSize) => {
             pageSize
         }
         
-        let res = await visitorReportList(param);
+        // let res = await visitorReportList(param);
+        let res = {
+                list:[
+                    {
+                        id:1,title:'客户：北京中科睿信科技有限公司',name:'YS-VR2025091515',
+                        reportType:1,reportTypeName:'I 类活动 (走访)',statusName:'待胡本华审核',
+                        reportPeople:'管理员',dateStr:'2025-09-15'
+                    },
+                    {
+                        id:2,title:'客户：中国船舶集团有限公司第七一 七研究所',name:'YS-VR2025091307',
+                        reportType:1,reportTypeName:'I 类活动 (走访)',statusName:'待胡本华审核',
+                        reportPeople:'管理员',dateStr:'2025-09-15'
+                    },
+                    {
+                        id:3,title:'客户：旭日阳（北京）科技有限公司',name:'YS-VR2025090902',
+                        reportType:1,reportTypeName:'I 类活动 (走访)',statusName:'待审核',
+                        reportPeople:'管理员',dateStr:'2025-09-15'
+                    },
+                    {
+                        id:4,title:'客户：北京中科睿信科技有限公司',name:'YS-VR2025091515',
+                        reportType:1,reportTypeName:'I 类活动 (走访)',statusName:'待胡本华审核',
+                        reportPeople:'管理员',dateStr:'2025-09-15'
+                    },
+                    {
+                        id:5,title:'客户：北京中科睿信科技有限公司',name:'YS-VR2025091515',
+                        reportType:1,reportTypeName:'I 类活动 (走访)',statusName:'待胡本华审核',
+                        reportPeople:'管理员',dateStr:'2025-09-15'
+                    },
+                    {
+                        id:6,title:'客户：北京中科睿信科技有限公司',name:'YS-VR2025091515',
+                        reportType:1,reportTypeName:'I 类活动 (走访)',statusName:'待胡本华审核',
+                        reportPeople:'管理员',dateStr:'2025-09-15'
+                    },
+                    {
+                        id:7,title:'客户：北京中科睿信科技有限公司',name:'YS-VR2025091515',
+                        reportType:1,reportTypeName:'I 类活动 (走访)',statusName:'待胡本华审核',
+                        reportPeople:'管理员',dateStr:'2025-09-15'
+                    },
+                    {
+                        id:8,title:'客户：北京中科睿信科技有限公司',name:'YS-VR2025091515',
+                        reportType:1,reportTypeName:'I 类活动 (走访)',statusName:'待胡本华审核',
+                        reportPeople:'管理员',dateStr:'2025-09-15'
+                    },
+                    {
+                        id:9,title:'客户：北京中科睿信科技有限公司',name:'YS-VR2025091515',
+                        reportType:1,reportTypeName:'I 类活动 (走访)',statusName:'待胡本华审核',
+                        reportPeople:'管理员',dateStr:'2025-09-15'
+                    },
+                    {
+                        id:10,title:'客户：北京中科睿信科技有限公司',name:'YS-VR2025091515',
+                        reportType:1,reportTypeName:'I 类活动 (走访)',statusName:'待胡本华审核',
+                        reportPeople:'管理员',dateStr:'2025-09-15'
+                    }
+                ],
+                totalCount:14
+            }
         resolve({
             list: res.list,
             total: res.totalCount

src/pages/business/business.vue

@@ -1,25 +1,34 @@
 <template>
-<view class="con-body">
+    <view class="con-body">
         <view class="con-bg">
             <!-- 头部 -->
-        <customHeader ref="customHeaderRef" :title="'业务中心'" 
-            :leftFlag="false" :rightFlag="false" 
+            <customHeader ref="customHeaderRef" :title="!searchShow?'业务中心':'搜索'"
+                :leftFlag="!searchShow?false:true" 
+                :rightFlag="false"
+                @back="handleBack" 
+                :searchType="searchShow?1:undefined"
             ></customHeader>
             <!-- 高度来避免头部遮挡 -->
             <view class="top-height"></view>
 
-         <!-- 搜索 -->
-         <view class="search">
+            <!-- 搜索  @confirm="handleSearch"  -->
+            <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"
-                @confirm="handleSearch"  
+                    @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"
             >
@@ -27,64 +36,56 @@
                 <view class="white-bg">
                     <view class="w-b-title">
                         首页日常服务
-                    <view type="primary" @click="handleEdit" class="btn-edit">编 辑</view>
+                        <view type="primary" @click="handleJump('/pages/business/editDaily')" class="btn-edit">编 辑</view>
                     </view>
                 </view>
 
-            <!-- 企业日常 -->
-            <view class="white-bg">
-                <view class="w-b-title" @click="handleExpand">企业日常
-                    <text>{{expandFlag?'展开':'收起'}}<i :class="{iconfont:true,'icon-up':!expandFlag,'icon-down':expandFlag}"></i></text>
+                <!-- 业务列表 -->
+                <view class="white-bg" v-for="(item,index) in list" :key="index">
+                    <view class="w-b-title" @click="handleExpand(item)">{{ item.bizName }}
+                        <text>{{item.expandFlag?'展开':'收起'}}<i :class="{iconfont:true,'icon-up':!item.expandFlag,'icon-down':item.expandFlag}"></i></text>
                     </view>
-                <view class="logo-list" v-if="!expandFlag">
-                    <view  v-for="(item,index) in list1" class="l-l-item" :key="index">
-                        <img :src="item.imgSrc" />
-                        <text class="font-gray">{{ item.name }}</text>
+                    <block  v-if="!item.expandFlag">
+                        <view class="logo-list" v-if="item.children&&item.children.length>0">
+                            <block v-for="(item2,index2) in item.children">
+                                <view  class="l-l-item"
+                                    @click="handleJump(item2.bizUrl)">
+                                    <img :src="'static/images/business/'+item2.icon+'.png'" />
+                                    <text class="font-gray">{{ item2.bizName }}</text>
                                 </view>
+                            </block>
                         </view>
-            </view>
-
-            <!-- CRM系统 -->
-            <view class="white-bg">
-                <view class="w-b-title" @click="handleExpand2">CRM系统
-                    <text>{{expandFlag2?'展开':'收起'}}<i :class="{iconfont:true,'icon-up':!expandFlag2,'icon-down':expandFlag2}"></i></text>
-                </view>
-                <view class="logo-list" v-if="!expandFlag2">
-                    <view  v-for="(item,index) in list2" class="l-l-item" :key="index" @click="handleJump(item.url)">
-                        <uni-badge :text="item.badgeCount" size="small"></uni-badge>
-                        <img :src="item.imgSrc" />
-                        <text class="font-gray">{{ item.name }}</text>
-                    </view>
-                </view>
-            </view>
-
-            <!-- 供应链采纳 -->
-            <view class="white-bg">
-                <view class="w-b-title">供应链采纳
-                    <text>展开<i :class="{iconfont:true,'icon-down':true}"></i></text>
-                </view>
-            </view>
-
-            <!-- PLM系统 -->
-            <view class="white-bg">
-                <view class="w-b-title">PLM系统
-                    <text>展开<i :class="{iconfont:true,'icon-down':true}"></i></text>
-                </view>
+                    </block>
                 </view>
 
                 <!-- 底部加高度来避免tabbar遮挡 -->
                 <view class="bottom-height"></view>
             </mescroll-uni>
         </view>
-</view>
+    </view>
 </template>
 
 <script setup>
 import { ref,onMounted } from 'vue'
-import customHeader from '@/components/customHeader.vue'
+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';
 import { getNavBarPaddingTop} from '@/utils/system.js'
-import { businessDaily,businessCRMList } from '@/api/business.js';
+import { businessList } from '@/api/business.js';
+import {showLoading,hideLoading} from '@/utils/message.js'
+import { initTree } from '@/utils/common.js';
+
+onLoad(async(opt) => {
+    // uni.setStorageSync('page_cache',true);
+    try {
+        showLoading("加载中...")
+        getList();
+        hideLoading();
+    } catch (error) {
+        hideLoading();
+    }
+})
 
 // 获取导航栏高度用于内容区域padding
 const navBarPaddingTop = ref(0);
@@ -92,9 +93,47 @@ onMounted(() => {
     navBarPaddingTop.value = getNavBarPaddingTop()*2;
 })
 
-// 查询搜索跳转
-let handleSearch = ()=>{
+// 搜索处理
+let searchShow = ref(false);
+let searchText = ref(undefined);
+let searchTypeObj = ref({typeId:2});
 
+onHide(()=>{
+    searchShow.value=false;
+})
+
+// 搜索返回操作
+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 searchValue = searchText.value?searchText.value:undefined;
+    let res = await businessList({searchValue});//查询所有业务
+    let arr = res || [];
+    let bizList = initTree(arr,0,'bizId');//递归获取数组处理
+    bizList.forEach(item => {
+        item.expandFlag = false;
+    });
+    list.value = bizList;
+}
+
+// 右侧展开
+let handleExpand = (item)=>{
+    item.expandFlag = !item.expandFlag;
 }
 
 // 下拉刷新
@@ -112,9 +151,10 @@ const downOption = ref({
 // 下拉刷新
 const downCallback = async (mescroll) => {
     try {
-        setTimeout(async ()=>{
-            // mescroll.resetUpScroll();
-        },500);
+        getList();
+        // setTimeout(async ()=>{
+        //     // mescroll.resetUpScroll();
+        // },500);
     } catch (error) {
         mescroll.endErr();
     } finally {
@@ -124,41 +164,8 @@ const downCallback = async (mescroll) => {
     }
 }
 
-// 日常服务编辑
-let handleEdit=()=>{
-
-}
-
-// 图标查询处理
-// 1.企业日常
-let list1 = ref([])
-let getBusinessDailyList= async ()=>{
-    let busRes = await businessDaily({});
-    list1.value = busRes.list || [];
-}
-getBusinessDailyList();
-// 企业日常-右侧展开
-let expandFlag=ref(false);
-let handleExpand = ()=>{
-    expandFlag.value = !expandFlag.value;
-}
-
-// 2.CRM系统
-let list2 = ref([])
-let getBusinessCRMList= async ()=>{
-    let busRes = await businessCRMList({});
-    list2.value = busRes.list || [];
-}
-getBusinessCRMList();
-// 企业日常-右侧展开
-let expandFlag2=ref(false);
-let handleExpand2 = ()=>{
-    expandFlag2.value = !expandFlag2.value;
-}
-
 // 跳转
 let handleJump=(url)=>{
-    console.log(url)
     if(url){
         uni.navigateTo({ url })
     }
@@ -169,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;

src/pages/business/editDaily.vue

@@ -0,0 +1,242 @@
+<template>
+<view class="con-body">
+    <view class="con-bg">
+        <!-- 头部 -->
+        <customHeader ref="customHeaderRef" :title="'常用服务'" 
+            :leftFlag="true" :rightFlag="false" 
+        ></customHeader>
+        <!-- 高度来避免头部遮挡 -->
+        <view class="top-height"></view>
+
+        <!-- 下拉刷新 -->
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit"
+            :down="downOption"  @down="downCallback"
+            :fixed="false" class="scroll-h"
+        >
+            <view class="white-bg">
+                <view v-for="(item,index) in list" :key="index">
+                    <view class="bus-title">{{ item.bizName }}</view>
+                    <view class="bus-list">
+                        <view class="bus-tips" :class="{'bus-blue':item2.isDaily}" 
+                            v-for="(item2,index2) in item.children" :key="index2" 
+                            @click="handleCheck(item2)"
+                        >
+                            {{ item2.bizName }}
+                            <view class="bus-icon" v-if="item2.isDaily">
+                                <uni-icons type="checkmarkempty" size="12" color="#fff"></uni-icons>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                <view class="bottom-height"></view>
+            </view>
+        </mescroll-uni>
+
+        <!-- 提交按钮 -->
+        <view class="bus-btn-con">
+            <view class="bus-btn" @click="handleSubmit">提 交（{{count}}）</view>
+        </view>
+    </view>
+</view>
+</template>
+
+<script setup>
+import { ref,onMounted } from 'vue'
+import { onLoad } from '@dcloudio/uni-app';
+import customHeader from '@/components/customHeader.vue'
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import { getNavBarPaddingTop} from '@/utils/system.js'
+import { businessList,bizFavoriteSetting } from '@/api/business.js';
+import { getUserFavorite } from '@/api/home.js';
+import {showLoading,hideLoading,showAlert} from '@/utils/message.js'
+import { initTree } from '@/utils/common.js'
+
+// 初始化加载
+onLoad(async(opt) => {
+    uni.setStorageSync('page_cache',true);
+    try {
+        showLoading("加载中...")
+        getList();
+        hideLoading();
+    } catch (error) {
+        hideLoading();
+    }
+})
+
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+    navBarPaddingTop.value = getNavBarPaddingTop()*2;
+})
+
+// 查询列表
+let list = ref([]);
+let count = ref(0);
+let bizIds = ref([]);//常用服务列表
+let getList = async()=>{
+    let arrNew = [];
+    bizIds.value = [];
+    let res = await businessList({});//查询所有业务
+    let arr = res || [];
+
+    let res2 = await getUserFavorite({});//查询当前用户的常用服务
+    let arr2 = res2 || [];
+    count.value = arr2.length;
+    arr2.forEach(item=>{
+        bizIds.value.push(item.bizId)
+    });
+   
+    arr.forEach(item=>{
+        item.isDaily=false;
+        arr2.forEach(item2=>{
+            if(item2.bizId==item.bizId){
+                item.isDaily=true;
+            }
+        })
+        arrNew.push(item)
+    })
+
+    let bizList = initTree(arrNew,0,'bizId');//递归获取数组处理
+    bizList.forEach(item => {
+        item.expandFlag = false;
+    });
+    list.value = bizList;
+    // console.log("list=>",list.value)
+}
+
+// 下拉刷新
+const mescrollRef = ref(null);
+const mescrollInit = (mescroll) => {
+    mescrollRef.value = mescroll;
+};
+const downOption = ref({
+    auto: true,
+    textInOffset: '下拉刷新',
+    textOutOffset: '释放更新',
+    textLoading: '刷新中...'
+});
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+    try {
+        setTimeout(async ()=>{
+            // mescroll.resetUpScroll();
+        },500);
+    } catch (error) {
+        mescroll.endErr();
+    } finally {
+        setTimeout(async ()=>{
+            mescroll.endSuccess();
+        },500);
+    }
+}
+
+
+// 选择常用
+const handleCheck=(item)=>{
+    item.isDaily = !item.isDaily;
+    if(item.isDaily){
+        count.value++;
+        bizIds.value.push(item.bizId);
+    }else{
+        count.value--;
+        const index = bizIds.value.findIndex(item2 => item2 == item.bizId);
+        if (index !== -1) {
+            bizIds.value.splice(index, 1);
+        }
+    }
+
+    // console.log("handleCheck=>bizIds=>",bizIds.value)
+}
+
+// 提交
+const handleSubmit= async()=>{
+    try {
+        showLoading("加载中...")
+        console.log("bizIds=>",bizIds.value)
+        await bizFavoriteSetting({bizIds:bizIds.value.join(",")});
+        showAlert("操作成功")
+        hideLoading();
+    } catch (error) {
+        hideLoading();
+    }
+}
+</script>
+
+<style scoped>
+.scroll-h{
+   height: 100vh;
+}
+
+.white-bg{
+    width: 690rpx;
+    margin-bottom:0;
+    border-radius: 8px 8px 0 0;
+    min-height: calc(100vh - 100px);
+}
+
+:deep(.mescroll-upwarp){
+  display:none
+}
+
+.bus-title{
+    font-weight: bold;
+    margin:0rpx 0 30rpx;
+}
+
+.bus-list{
+    display: flex;
+    align-items: center;
+    gap:10px;
+    flex-flow:row wrap;
+    margin-bottom:40rpx;
+}
+.bus-list .bus-tips{
+    /* width:210rpx; */
+    min-width: calc(100% / 3 - 30px); 
+    height:60rpx;
+    line-height: 60rpx;
+    font-size:28rpx;
+    border-radius: 5px;
+    text-align: center;
+    padding:0 10px;
+    background-color: #fff;
+    color:#333333;
+    border:1px solid #E8E8E8;
+}
+.bus-list .bus-blue{
+    border:1px solid #05A3F4;
+    background-color: #05A3F4;
+    color:#fff;
+    position: relative;
+}
+.bus-list .bus-blue .bus-icon{
+    position:absolute;
+    right:-10rpx;
+    top:-10rpx;
+    background-color: #02C74C;
+    width:32rpx;
+    height:32rpx;
+    line-height: 32rpx;
+    border-radius: 50%;
+    text-align: center;
+}
+
+.bus-btn-con{
+    position: fixed;
+    bottom:0;
+    background-color: #fff;
+    width:100%;
+    padding:70rpx 0;
+}
+.bus-btn-con .bus-btn{
+    background-color: #05A3F4;
+    color:#fff;
+    text-align: center;
+    width:360rpx;
+    height:80rpx;
+    line-height: 80rpx;
+    margin:0 auto;
+    border-radius: 40rpx;
+}
+</style>

src/pages/deviceAuth/deviceAuth.vue

@@ -0,0 +1,579 @@
+<template>
+<view>
+    <view class="container">
+		<view class="bg"></view>
+        <view class="bg-con">
+            <view :style="{height: navBarPaddingTop + 'px'}"></view>
+            <view class="auth-title">
+                <image src="@/static/images/icon-lock@2x.png"/>
+                <text>{{networkEnv==1?'内网':''}}设备授权</text>
+            </view>
+            <view class="login-con">
+                <!-- 登录 -->
+                <block v-if="!bindStatus">
+                    <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" 
+                                        v-model="formData2.username" placeholder="请输入用户名" 
+                                    />
+                                </view>
+                            </uni-forms-item>
+                            <uni-forms-item label="密码" required name="password" class="password">
+                                <view class="code-con">
+                                    <uni-easyinput prefixIcon="locked" type="password" :inputBorder="false"
+                                        v-model="formData2.password" placeholder="请输入登录密码"
+                                    />
+                                </view>
+                            </uni-forms-item>
+                        </uni-forms>
+                    </view>
+                    <button type="primary" class="btn-submit" @click="submitForm" :loading="btnLoading" :disabled="btnLoading">设备授权申请</button>
+                </block>
+
+                <!-- 等待页面（定时任务查询 10秒查询一次） -->
+                <view v-if="bindStatus==2" class="login-form approval">
+                    <view class="approval-title">审核中，请等待...</view>
+                    <button type="primary" class="btn-refresh" @click="handleRefresh">刷新</button>
+                </view>
+                <!-- bindStatus=5-----显示授权失败，联系管理员 -->
+                <view v-if="bindStatus==5" class="login-form approval-red-con">
+                    <view class="approval-red">显示授权失败，联系管理员</view>
+                </view>
+                <!-- bindStatus=3-----输入授权码页面 -->
+                <block v-if="bindStatus==3">
+                    <view class="login-form approval" style="padding:110rpx 55rpx 150rpx;">
+                        <view class="approval-title">审核通过，请输入授权码</view>
+                        <view class="auth-code">
+                            <input v-for="(item, index) in codes" 
+                                password
+                                :key="index"
+                                v-model="codes[index]"
+                                type="number"
+                                maxlength="1"
+                                :ref="el => { if (el) inputRefs[index] = el }"
+                                @input="handleInput(index, $event)"
+                                @keydown.delete="handleDelete(index, $event)"
+                                :focus="activeIndex==index"
+                                @blur="handleBlur(index,codes[index])"
+                            />
+                        </view>
+                    </view>
+                    <button type="primary" class="btn-submit" @click="handleSubmit" :loading="subLoading" :disabled="subLoading">提交</button>
+                </block>
+            </view>
+        </view>
+
+        <view class="bottom-pic">
+            <image src="@/static/images/PicLogo@2x.png" class="pic-logo" /> 
+            <view class="bottom-bg"></view>
+        </view>
+    </view>
+</view>
+</template>
+
+<script setup>
+import { ref,nextTick,onMounted,onUnmounted,getCurrentInstance } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+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 encryptObj from '@/utils/encrypt.js'
+import { requestAndroidPermissionAsync } from '@/utils/common.js'
+
+const { proxy } = getCurrentInstance();
+import { useUserStore } from '@/stores/user';
+const userStore = useUserStore();
+
+// #ifdef APP-PLUS
+// 获取 存储手机的module 
+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",clientId,networkEnv.value);
+    uni.setStorageSync('page_cache',true);
+    // uni.preloadPage({url: "/pages/login/login"});
+    // uni.preloadPage({url: "/pages/home/home"});
+
+    systemInfo = uni.getSystemInfoSync()
+    // #ifdef APP-PLUS
+    try {
+        safeSave.getSafeFile({ "key": "app_device_id" }, res2 => {
+            if (res2.code == 1) {
+                let deviceId = res2.data;
+                console.log("读取成功=>",deviceId)
+                deviceId.value = deviceId; // 本地设备ID
+                selectBindStatus(deviceId);
+                if(bindStatus.value==2){
+                    // bindStatus=2-----到等待页面（定时任务查询 10秒查询一次）
+                    timer = setInterval(()=>{  
+                        refreshBindStatus() 
+                    },1000*10)//10秒刷新一次
+                }
+            } else {
+                // showAlert('读取失败:'+res2.msg)
+            }
+        })
+       
+    } catch (error) {
+        console.error('权限请求出错:', error);
+        // showAlert('权限请求出错:', error)
+    }
+    // #endif
+})
+
+// 绑定状态（1=已提交、2=等待审核、3=审核通过、4=绑定成功、5=审核拒绝）
+let bindStatus = ref(undefined);
+let timer = null;
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(async () => {
+    navBarPaddingTop.value = getNavBarPaddingTop();
+})
+
+// 组件卸载时清除定时器
+onUnmounted(() => {
+    if (timer) clearInterval(timer)
+})
+
+// 根据设备ID查询设备状态
+let selectBindStatus = async (uniqCode)=>{
+    if(uniqCode){
+        let res = await getBindStatus({uniqCode})
+        bindStatus.value = res.bindStatus;
+        //bindStatus=4-----已绑定成功，跳转用户登录页面
+        if(bindStatus.value==4){
+            if (userStore.isLogin) {
+                uni.reLaunch({
+                    url: '/pages/home/home',
+                });
+            }else{
+                uni.reLaunch({
+                    url: '/pages/login/login',
+                });
+            }
+        }
+    }
+}
+
+// 刷新定时任务
+let refreshBindStatus = async ()=>{
+    let res = await getBindStatus({uniqCode:deviceId.value})
+    bindStatus.value = res.bindStatus;
+    if(bindStatus.value==2){
+
+    }else{
+        if(bindStatus.value==4){
+            if (userStore.isLogin) {
+                uni.reLaunch({
+                    url: '/pages/home/home',
+                });
+            }else{
+                uni.reLaunch({
+                    url: '/pages/login/login',
+                });
+            }
+        }
+        if (timer) clearInterval(timer)
+    }
+}
+
+// 账号登录
+const form2 = ref(null);
+const formData2 = ref({
+    uniqCode:'',
+    username: '',
+    password: ''
+});
+
+const rules2 = {
+    uniqCode:{
+        rules: [
+            { required: true, errorMessage: '请输入设备标识' },
+        ]
+    },
+    username: {
+        rules: [
+            { required: true, errorMessage: '请输入用户名' },
+            // { minLength: 3, maxLength: 10, errorMessage: '用户名长度在3到10个字符之间' }
+        ]
+    },
+    password: {
+        rules: [
+            { required: true, errorMessage: '请输入密码' },
+            // { pattern: /^[a-zA-Z0-9]{6,12}$/, errorMessage: '密码必须是6-12位字母或数字' }
+        ]
+    }
+};
+const btnLoading=ref(false)
+// 登录提交
+const submitForm = async() => {
+    // 用户名和密码登录
+    form2.value.validate().then(async param => {
+        btnLoading.value = true;
+        //1-内网，2-外网
+        if(networkEnv.value==1){
+            deviceId.value = param.uniqCode;
+        }else{
+            deviceId.value = uuidv4(); //2-外网 生成的设备唯一标识
+        }
+        
+        let password = encryptObj.Encrypt(param.username + clientId + "," + param.password);
+        let params = {
+            username:param.username,
+            password,
+            networkEnv:networkEnv.value,//1-内网，2-外网
+            uniqCode:deviceId.value,
+            ...systemInfo,//设备信息
+            // #ifdef APP-PLUS
+            verId:systemInfo.appWgtVersion,//当前版本号
+            // #endif
+            // #ifdef H5
+            verId : systemInfo.appVersion,
+            // #endif
+            osAndroidApiLevel:systemInfo.osAndroidAPILevel
+        }
+        let res = await authDeviceApply(params);
+        btnLoading.value = false;
+
+        try {
+            // 存储设备id
+            safeSave.saveSafeFile({ "key": "app_device_id","value": deviceId.value}, res3 => {
+                // showAlert("保存成功=>"+JSON.stringify(res3));
+                if (res3.code == 1) {
+                    console.log('保存成功:'+res3.msg)
+                    // showAlert("保存成功=>"+res3.msg);
+                    // uni.setStorageSync('app_device_id', deviceId.value)
+                    bindStatus.value = res.bindStatus;//默认为 2-等待审核
+                    // 刷新状态
+                    refreshBindStatus();
+                    timer = setInterval(()=>{ 
+                        refreshBindStatus() 
+                    },1000*10)//10秒刷新一次
+                } else {
+                    console.log("保存失败=>",res3.msg)
+                    // showAlert('保存失败:'+res3.msg)
+                }
+            })
+           
+        } catch (error) {
+            console.log("saveSafeFile=>",error)
+            // showAlert('设备处理异常:'+error)
+        }
+        
+    }).catch(err => {
+        console.log('表单错误11:', err);
+        btnLoading.value = false;
+    });
+};
+
+// 刷新
+const handleRefresh = ()=>{
+    selectBindStatus(deviceId.value);
+}
+
+const codes = ref(Array(6).fill(''))
+const inputRefs = ref([]);
+const activeIndex = ref(0);//初始化焦点
+let authCode = ref('')
+const handleInput = (index, event) => {
+    activeIndex.value = index;
+    // 只允许数字输入
+    const value = event.detail.value.replace(/\D/g, '')
+    codes.value[index] = value
+    
+    // 自动跳转到下一个输入框
+    if (value && index < 5) {
+        nextTick(() => {
+            activeIndex.value = index+1;
+        })
+    }
+
+    // 输入最后一个框时获取值
+    // if (index === 5 && value) {
+    //     authCode.value =  codes.value.join('')
+    //     console.log('输入完成:', authCode.value)
+    // }
+}
+
+// 鼠标离开
+const handleBlur = (index,value)=>{
+    codes.value[index] = value;
+    authCode.value =  codes.value.join('');
+    // console.log('鼠标离开:', authCode.value)
+}
+
+const handleDelete = (index, event) => {
+    // 如果当前框为空且按下删除键，跳转到上一个输入框
+    if (!codes.value[index] && index > 0) {
+        event.preventDefault() // 阻止默认删除行为
+        nextTick(() => {
+            activeIndex.value = index-1;
+        })
+    }
+}
+
+// 执行设备绑定
+let subLoading = ref(false)
+const handleSubmit=()=>{
+    console.log("authCode=>",authCode.value)
+    if(!authCode.value){
+        showToast("请输入验证码")
+        return;
+    }
+    if(authCode.value.length!=6){
+        showToast("请正确输入验证码")
+        return;
+    }
+    
+    let uniqCode = deviceId.value;
+    let param={
+        uniqCode,
+        authCode:authCode.value
+    }
+    subLoading.value=true;
+    console.log("param=>",param)
+    authInputCode(param).then(res=>{
+        console.log("authInputCode=>",res)
+        uni.reLaunch({ url: '/pages/login/login' })
+    }).finally(()=>{
+        subLoading.value = false;
+    })
+}
+</script>
+
+<style scoped>
+.container {
+	background:#307AF5 !important;
+	height:100vh !important;
+	position: relative;
+}
+.container .bg{
+    background:url('@/static/images/bg@2x.png') no-repeat;
+    background-size:750rpx 663rpx;
+    width: 750rpx;
+    height: 663rpx;
+    margin:0 auto;
+}
+
+.container .bg-con{
+    position: absolute;
+    top:200rpx;
+    width:100%;
+}
+
+.container .bg-con .auth-title{
+    color:#fff;
+    margin:0 auto;
+    text-align: center;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+.container .bg-con .auth-title image{
+    width:52rpx;
+    height:64rpx;
+    margin-right: 30rpx;
+}
+.container .bg-con .auth-title text{
+    color:#fff;
+    font-size:56rpx;
+    font-weight: bold;
+}
+
+.container .login-con{
+    width:610rpx;
+    margin:70rpx auto;
+}
+
+
+
+:deep(uni-button:after){
+    border:none;
+}
+
+.container .login-form{
+    background: #fff;
+    border-radius: 30rpx;
+    padding:30rpx 55rpx 15rpx;
+    /* width:610rpx; */
+    width:500rpx;
+    margin:70rpx auto;
+}
+.container .login-form .code-con{
+    padding:0 0 10rpx;
+    margin:0 auto;
+    display: flex;
+    align-items: center;
+    color:#919191;
+    border-bottom: 1px solid #E7E7E7;
+}
+
+
+:deep(.uni-forms-item__label){
+    color:#239FDF;
+    font-weight: bold;
+    font-size:28rpx;
+    padding:0 !important;
+}
+:deep(.uni-easyinput__content){
+    color:#333;
+    font-weight: bold;
+    font-size:32rpx;
+    
+}
+:deep(.uni-easyinput__content) .uni-icons{
+    font-weight: normal;
+    font-size:40rpx !important;
+    color:#239FDF !important;
+}
+
+:deep(.uni-input-placeholder){
+    background:none;
+    font-weight:normal;
+    color:#BFBFBF;
+    font-size:28rpx;
+}
+:deep(.uni-forms-item__error){
+    padding-left:60rpx;
+}
+:deep(.uni-forms-item .is-required){
+    display: none;
+}
+
+/* 使用深度选择器 */
+:deep(.uni-easyinput__content .uni-icons.uniui-clear) {
+  color: #BFBFBF !important;
+  font-weight: normal !important;
+  font-size:40rpx !important;
+}
+:deep(.uni-easyinput__content .uni-icons.uniui-clear::before){
+    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;
+    line-height: 88rpx;
+    background-color:#09BC48 !important;
+    margin:90rpx auto 0;
+    font-size:36rpx;
+    border-radius: 44rpx;
+}
+.btn-submit::after{
+    border:none;
+}
+
+.container .bottom-pic{
+    position: absolute;
+    bottom:48rpx;
+    width: 488rpx;
+    left:50%;
+    margin-left:-244rpx;
+    text-align: center;
+}
+
+.container .bottom-pic .pic-logo{
+    width:156rpx;
+    height:130rpx;
+    margin:0 auto 40rpx;
+}
+.container .bottom-pic .bottom-bg{
+    background:url('@/static/images/PicLogoTxt@2x.png') no-repeat;
+    background-size:488rpx 64rpx;
+    width: 488rpx;
+    height: 64rpx;
+}
+
+.container .login-con .approval{
+    padding:120rpx 55rpx;
+}
+.container .login-con .approval-red-con{
+    width:510rpx;
+    padding:120rpx 50rpx;
+}
+.container .login-con .approval-red{
+    color:#FF2B44;
+    font-size: 42rpx;
+    text-align: center;
+    font-weight: bold;
+}
+.container .login-con .approval-title{
+    color:#0395E0;
+    font-size: 42rpx;
+    text-align: center;
+    font-weight: bold;
+}
+.container .login-con .btn-refresh{
+    width:300rpx;
+    height:80rpx;
+    line-height: 80rpx;
+    background-color:#05A3F4 !important;
+    margin:90rpx auto 0;
+    font-size:36rpx;
+    border-radius: 44rpx;
+}
+.container .login-con .auth-code{
+    display: flex;
+    margin-top:50rpx;
+    justify-content: center;
+}
+.container .login-con .auth-code uni-input{
+    background:#E6E6E6;
+    margin-right:20rpx;
+    width:70rpx;
+    height:80rpx;
+    min-height: 80rpx;
+    border-radius: 5px;
+    text-align: center;
+    font-size: 70rpx;
+    font-weight: bold;
+}
+.container .login-con .auth-code uni-input:last-child{
+    margin-right: 0;
+}
+</style>

src/pages/h5-webview/h5-webview.vue

@@ -0,0 +1,74 @@
+<template>
+<view id="test">
+    <!-- #ifdef H5 -->
+    <web-view :src="url"></web-view>
+    <!-- #endif -->
+</view>
+</template>
+
+<script setup>
+import { ref,getCurrentInstance } from 'vue';
+import { onLoad,onBackPress } from '@dcloudio/uni-app';
+
+let url = ref('');
+let title = ref('');
+onLoad(async(opt) => {
+    // console.log(opt)
+    url.value = opt.url ;
+    title.value = opt.title;
+    // #ifdef APP-PLUS
+    titleNViewWebview(url.value,title.value);
+    // #endif
+})
+
+onBackPress((e)=> {//响应返回事件
+    console.log("onBackPress=>",e)
+    if (e.from === 'navigateBack') {  //这个地方必须要有的，否则会死循环
+        return false;  
+    } 
+    console.log('点击返回....');
+    let pages = getCurrentPages()
+    let page = pages[pages.length - 1];
+    let currentPages = page.$getAppWebview()
+    currentPages.close()
+    uni.navigateBack({delta:2})
+    return true;
+})
+
+// 带标题栏控件的Webview窗口
+let webview = null;
+function titleNViewWebview(url,title) {
+    console.log("titleNViewWebview=>",url,title)
+
+    let nwating = plus.nativeUI.showWaiting("loading...",{
+        width:'110px',
+        padding:'10px'
+    })
+
+    webview = plus.webview.create(url, 'test',	{
+        titleNView: {
+            backgroundColor: '#307AF5',
+            titleText: title,
+            titleColor: '#ffffff',
+            autoBackButton: true,
+            backgroundImage:'./../../static/images/bg-Blue-header.png',
+        }
+    });
+
+    webview.addEventListener('loaded', function() {
+        nwating.close();
+        webview.show();
+    }, false);
+
+    webview.addEventListener('close', function(){
+        console.log("close=>")
+        webview=null;
+        uni.navigateBack();
+    });
+}
+
+</script>
+
+<style scoped>
+
+</style>

src/pages/home/home.vue

@@ -1,32 +1,31 @@
 <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>
+          <!-- #ifdef APP-PLUS -->
+          <!-- 删除设备ID--测试用 -->
+          <!-- <view class="del-cache" @click="handleDelete">
+            <uni-icons type="minus" size="30" color="#ffffff"></uni-icons>
+          </view> -->
           <!-- #endif -->
-          <!-- 搜索 -->
-          <view class="search search-sao" >
-              <uni-search-bar class="custom-search" radius="28" 
-                  placeholder="请输入您想查询的内容或服务"
-                  clearButton="auto" cancelButton="none" 
-                  bgColor="#6FA2F8" textColor="#ffffff"
-                  @confirm="handleSearch"  
-              />
-              <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="backlog-b-item" @click="handleJump('/pages/notice/notice',1)">
               <view class="font-number">{{ backBlogObj.count1 }}</view>
               <view class="font-title">待办</view>
             </view>
-            <view class="backlog-b-item">
+            <view class="backlog-b-item" @click="handleJump('/pages/notice/waitApprove')">
               <view class="font-number">{{ backBlogObj.count2 }}</view>
               <view class="font-title">待审查</view>
             </view>
@@ -105,12 +104,12 @@
           </view>
 
           <!-- 常用服务 -->
-          <view class="white-bg">
+          <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">
-                      <img :src="item.imgSrc" />
-                      <text class="font-gray">{{ item.name }}</text>
+                  <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'">
@@ -142,13 +141,66 @@
 </template>
 
 <script setup>
-import { ref,onMounted,computed } from 'vue'
+import { ref,onMounted } 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'
 import { getNavBarPaddingTop} from '@/utils/system.js'
-import { backBlogCount,swiperList,stepData,salesTask,commonServices,newsQueryList } from '@/api/home.js';
+// ,swiperList,stepData,salesTask,commonServices,newsQueryList 
+import { messageNotifyCount,messageFlowCount,getUserFavorite} from '@/api/home.js';
 import { getWeekStr,formatTimestamp } from '@/utils/datetime.js'
 import { formatMoney } from '@/utils/formatter.js'
+import {showLoading,hideLoading} from '@/utils/message.js'
+
+// #ifdef APP-PLUS
+// 获取 存储手机的module 
+const safeSave = uni.requireNativePlugin("Tm-TmSafeSaveFileModule");
+const handleDelete=()=>{
+  uni.showModal({
+        title: '提示',
+        content: "是否确认删除设备ID？删除之后需重新绑定设备，谨慎操作！！！",
+        cancelText: '取消',
+        confirmText: '确定',
+        success: function (res) {
+            if (res.confirm) {
+              safeSave.delSafeFile({"key": "app_device_id"}, (res) => {
+                if (res.code == 1) {
+                  uni.showModal({title: "提示",content:"删除成功"})
+                } else {
+                  uni.showModal({title: "删除失败",content: res.msg})
+                }
+              })
+            } else if (res.cancel) {
+             
+            }
+        }
+    })
+}
+// #endif
+
+
+onLoad(async(opt) => {
+  uni.setStorageSync('page_cache',true);
+  // initLoad();
+})
+
+// 初始化调用方法
+const initLoad =()=>{
+  try {
+    showLoading("加载中...");
+    getBackBlogCount();
+    getSwiperList();
+    getStepData();
+    getSalesTask();
+    getCommonServices();
+    getNewsList();
+    hideLoading();
+  } catch (error) {
+    hideLoading();
+  }
+}
 
 // 下拉刷新
 const mescrollRef = ref(null);
@@ -165,9 +217,10 @@ const downOption = ref({
 // 下拉刷新
 const downCallback = async (mescroll) => {
     try {
-        setTimeout(async ()=>{
-            // mescroll.resetUpScroll();
-        },500);
+        // setTimeout(async ()=>{
+        //     // mescroll.resetUpScroll();
+        // },500);
+        initLoad();
     } catch (error) {
         mescroll.endErr();
     } finally {
@@ -182,44 +235,57 @@ const navBarPaddingTop = ref(0);
 onMounted(() => {
     navBarPaddingTop.value = getNavBarPaddingTop()*2;
 })
-// 查询搜索跳转
-let handleSearch = ()=>{
 
-}
-
-// tabar 增加消息数量
-try {
+let backBlogObj = ref({
+  count1:0,
+  count2:0,
+  count3:0,
+  count4: 0
+})
+// 获取待办数据
+const getBackBlogCount = async () =>{
+  let res = await messageNotifyCount();
+  let res2 = await messageFlowCount();
+  backBlogObj.value.count1= res.todoCount || 0//消息待阅
+  backBlogObj.value.count2= res2.todoCount || 0//审核待办
+  // tabar 增加消息数量
+  try {
+    if(backBlogObj.value.count1>0){
       wx.setTabBarBadge({
         index: 2, // TabBar的索引，从0开始计数
-        text: '3' // 徽章的文本
+        text: res.todoCount+'' // 徽章的文本
       });
-} catch (error) {
+    }
+  } catch (error) {
       console.error('设置TabBar Badge失败:', error);
+  }
 }
 
-let backBlogObj = ref({})
-// 获取待办数据
-let getBackBlogCount = async () =>{
-  backBlogObj.value = await backBlogCount();
-}
-getBackBlogCount();
 
 // 跑马灯处理
 let extendedList = ref([]);// ;
 const getSwiperList = async () => {
-  extendedList.value = await swiperList(); 
+  // extendedList.value = await swiperList(); 
+  extendedList.value = ["祝贺“友晟夏季封装外壳发布会”圆满成功","祝贺“友晟科技发布会”圆满成功","祝贺“友晟夏季封装外壳发布会”圆满成功"]
 }
-getSwiperList();
+
 
 // 日程提醒
 let weekStr = ref(null) //'2025-09-19  星期三'
 let stepList = ref([]);
 const getStepData = async ()=>{
-  let res = await stepData({});
+  // let res = await stepData({});
+  let res={
+        date:new Date().getTime(),
+        list:[
+            { id:1,desc: '2025秋季产品发布前期准备会，在科研楼0317会议室召开。', title: '13:30 — 15:30',beginTime:'13:30',endTime:'15:30'}, 
+            { id:2,desc: '生产间安全巡检。', title: '16:30 — 18:00',beginTime:'16:30',endTime:'18:00'}, 
+        ]
+    }
   weekStr.value = getWeekStr(res.date);
   stepList.value = res.list;
 }
-getStepData();
+
 
 // 销售任务完成情况
 let salesList = ref([]);
@@ -240,21 +306,37 @@ let percentNum = ref(0);
 let totalSales = ref(0)
 let targetSales = ref(0)
 const getSalesTask = async ()=>{
-  let res = await salesTask({});
+  // let res = await salesTask({});
+  let res = {
+      salesList:['2025-3季度', '2025-2季度', '2025-1季度'],
+      percentNum:82,
+      totalSales:62075000,
+      targetSales:75000000
+  }
   salesList.value = res.salesList;
   percentNum.value = res.percentNum;
   totalSales.value = formatMoney(res.totalSales);
   targetSales.value = formatMoney(res.targetSales);
 }
-getSalesTask();
+
 
 // 常用服务
 let commonServiceList = ref([]) 
 const getCommonServices = async ()=>{
-  let res = await commonServices({});
-  commonServiceList.value = res.list
+  let data = await getUserFavorite({});
+  commonServiceList.value = data || []
 }
-getCommonServices();
+// 跳转 type:1-tabbar
+let handleJump=(url,type)=>{
+    if(url){
+      if(type==1){
+        uni.switchTab({url});
+      }else{
+        uni.navigateTo({ url })
+      }
+    }
+}
+
 // 添加常用服务
 const handleAddCommonSercice = ()=>{
 
@@ -263,22 +345,45 @@ const handleAddCommonSercice = ()=>{
 // 新闻公告
 let newsList = ref([])
 const getNewsList = async()=>{
-  let res = await newsQueryList({});
+  // let res = await newsQueryList({});
+  let res = {
+      list:[
+          {id:1,date:'2025-06-29',name:'友晟亮相2025慕尼黑上海电子展',imgSrc:'https://img2.baidu.com/it/u=363858033,1221485415&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1067'},
+          {id:2,date:'2025-06-26',name:'孜孜不倦，谱写公司发展新篇章',imgSrc:'https://img0.baidu.com/it/u=2830423559,3962669886&fm=253&app=138&f=JPEG?w=570&h=760'},
+          {id:3,date:'2025-03-29 08:10:00',name:'质量管理体系提升助力实现质的飞跃',imgSrc:''},
+      ],
+  }
   newsList.value = res.list;
 }
-getNewsList();
+
 const formatDateStr =(times)=>{
   return formatTimestamp(times)
 }
 </script>
 
 <style scope>
+.del-cache{
+  position: fixed;
+  right:30rpx;
+  bottom:30%;
+  width:60rpx;
+  height: 60rpx;
+  line-height: 60rpx;
+  border-radius: 50%;
+  background:#579FF9;
+  font-size:12px;
+  padding:5rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
 .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){

src/pages/loading/loading.vue

@@ -1,71 +1,229 @@
 <template>
-<view>
-    <view class="container" :style="{ height: `100vh` }">
-		<view class="bg"></view>
-        <view class="version">Version {{ version }}</view>
-        <view class="bottom-bg"></view>
+<view class="container" :style="{ height: `100vh` }">
+    <view class="bg">
+        <view class="env-txt" v-if="networkEnv==1">企业内网</view>
+    </view>
+    <view class="version">Version {{ appVersion }}</view>
+    <!-- <view class="bottom-bg"></view> -->
+
+    <!-- 检查版本弹窗 -->
+    <view class="version-con" v-if="versionVisible">
+        <view class="v-bg">
+            <view class="v-title">发现新版本</view>
+            <uni-icons custom-prefix="iconfont" color="#28B6FF" type="icon-phonefilled" size="40"></uni-icons>
+            <view class="v-version">最新版本 Version {{ newVersion }}</view>
+            <view class="v-update">立刻更新吗？</view>
+            <view class="version-btn" @click="handleDown">更 新</view>
+            <view class="version-sub" @click="handleClose" v-if="btnVisible">暂不处理</view>
+        </view>
     </view>
 </view>
+
 </template>
 
 <script setup>
+import { ref,getCurrentInstance } from 'vue';
 import { onLoad } from '@dcloudio/uni-app';
+import { versionCheck,getBindStatus } from '@/api/auth.js';
+import { formatIOS } from '@/utils/status.js'
+import { requestAndroidPermissionAsync,requestAndroidPermission } from '@/utils/common.js'
+import {showAlert} from '@/utils/message.js'
 import { useUserStore } from '@/stores/user';
-const userStore = useUserStore()
+const userStore = useUserStore();
+const { proxy } = getCurrentInstance();
+const networkEnv = ref(proxy.$NETWORK_ENV);//1-内网 2-外网
 
-const version="1.0.0"
+// #ifdef APP-PLUS
+// 获取 存储手机的module 
+const safeSave = uni.requireNativePlugin("Tm-TmSafeSaveFileModule");
+// #endif
 
-onLoad((opt) => {
+let systemInfo={};
+let appVersion = ref("1.0.0");//当前版本号
+let newVersion = ref('1.0.0');//最新版本号
+let versionVisible=ref(false);//版本弹窗
+let btnVisible = ref(true);// 暂不处理 按钮是否显示
+let downloadURL = ref(''); //下载地址
+let versionData = ref({}); //版本参数
+// 初始load页面
+onLoad(async(opt) => {
     console.log("onLoad");
-    // 检查是否已登录 并 获取用户信息
-    if (userStore.isLogin) {
-        // userStore.getUser()
-        // TODO 未登录会在拦截器中处理跳转登录页， 请在 xxx 配置登录页路径
-       // #ifdef H5
-        window.setTimeout(()=>{
-            uni.reLaunch({
-                url: '/pages/home/home',
-            });
-        },1000)
-        // #endif
+
+    // uni.preloadPage({url: "/pages/login/login"});
+    // uni.preloadPage({url: "/pages/deviceAuth/deviceAuth"});
+    // uni.preloadPage({url: "/pages/home/home"});
 
     // #ifdef APP-PLUS
-        uni.reLaunch({
-            url: '/pages/home/home',
-        });
-        // #endif
-    }else{
-        // #ifdef H5
-        window.setTimeout(()=>{
-            uni.reLaunch({
-                url: '/pages/login/login',
-            });
-        },1000)
-        // #endif
+    // 查询版本接口
+    await getOSVesion();
     
-        // #ifdef APP-PLUS
-            uni.reLaunch({
-                url: '/pages/login/login',
-            });
-        // #endif
+    // 不更新版本 执行设备ID查询和绑定操作
+    if(!versionVisible.value){
+        try {
+            // 授权设备存储
+            // let granted =  requestAndroidPermission(systemInfo);
+            // if(granted){
+                // showAlert("22授权成功！")
+                // setTimeout(()=>{
+                    selectDeviceId();
+                // },500)
+            // }
+        } catch (error) {
+            console.error('权限请求出错:', error);
+            // showAlert(JSON.stringify(error))
         }
+    }
+    // #endif
+
+    // #ifdef H5
+    // setTimeout(()=>{
+        if(userStore.isLogin){
+            uni.reLaunch({
+                url: '/pages/home/home',
+            });
+        }else{
+            uni.reLaunch({
+                url: '/pages/login/login',
+            });
+        }
+    // },1000)
+    // #endif
 
 });
 
+// 检查版本是否是最新的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
+        // #ifdef H5
+        verNumber : systemInfo.appVersion,
+        // #endif
+        os: formatIOS(systemInfo.osName),//操作系统 Android  IOS
+    }
+    // 当前手机版本
+    appVersion.value = param.verNumber;
+    // console.log("appVersion=>",appVersion)
+    versionData.value = param;
+    let data = await versionCheck(param);
+    newVersion.value = data.verNumber;
+    downloadURL.value = data.downloadUrl || '';
+
+    // isForceUpdate 是否强制更新 1-是 2-否
+    let isForceUpdate = data.isForceUpdate;
+    if(isForceUpdate==1){
+        btnVisible.value = false;
+    }else{
+        btnVisible.value = true;
+    }
+    // 是否为当前最新版本(是=1，否=2)
+    let isCurrent = data.isCurrent;
+    if(isCurrent == 1){
+        versionVisible.value=false;
+    }else{
+        versionVisible.value=true;
+    }
+}
+
+// 查询设备ID
+const selectDeviceId = async()=>{
+    // 查询本地缓存的设备状态是否绑定过
+    // let deviceId = uni.getStorageSync('app_device_id');// 本地设备ID
+    try {
+        safeSave.getSafeFile({ "key": "app_device_id" }, res2 => {
+            // showAlert(JSON.stringify(res2));
+            if (res2.code == 1) {
+                let deviceId = res2.data;
+                // showAlert("读取成功=>"+deviceId);
+                if(deviceId!=""){
+                    getBindStatus({uniqCode:deviceId}).then(res=>{
+                        let bindStatus = res.bindStatus
+                        // setTimeout(()=>{
+                            // 绑定状态（1=已提交、2=等待审核、3=审核通过、4=绑定成功、5=审核拒绝）
+                            if(bindStatus == 4){
+                                // 检查是否已登录 并 获取用户信息
+                                if (userStore.isLogin) {
+                                    uni.reLaunch({
+                                        url: '/pages/home/home',
+                                    });
+                                
+                                }else{
+                                    uni.reLaunch({
+                                        url: '/pages/login/login',
+                                    });
+                                }
+                            }else{
+                                uni.reLaunch({
+                                    url: '/pages/deviceAuth/deviceAuth',
+                                });
+                            }
+                        // },1000)
+                    });
+                }else{
+                    uni.reLaunch({
+                        url: '/pages/deviceAuth/deviceAuth',
+                    });
+                }
+            
+            } else {
+                uni.reLaunch({
+                    url: '/pages/deviceAuth/deviceAuth',
+                });
+            }
+        })
+    } catch (error) {
+        console.log("getSafeFile=>",error)
+        // showAlert("catch=>"+error)
+    }
+}
+// 下载最新版本
+const handleDown = ()=>{
+    // 跳转到应用商店或下载最新版本的页面
+    plus.runtime.openURL(downloadURL.value);			
+    if (versionData.value.os == 'ios'){
+        plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
+    } else if (versionData.value.os == 'android'){
+        plus.runtime.quit();
+    }
+}
+
+//版本更新关闭
+const handleClose=()=>{
+    versionVisible.value = false;
+    // 不更新版本 执行设备ID查询和绑定操作
+    if(!versionVisible.value){
+        selectDeviceId()
+    }
+}
 </script>
 
 <style>
 .container {
 	background:#307AF5 !important;
-	height:100vh !important;
+	height: calc(100vh - 100px) !important;
 	position: relative;
+    padding-top:100px;
 }
+
 .container .bg{
     background:url('@/static/images/loading-logo.png') no-repeat;
     background-size:700rpx 800rpx;
     width: 700rpx;
     height: 800rpx;
     margin:0 auto;
+    position: relative;
+}
+.container .bg .env-txt{
+    position: absolute;
+    right: 35rpx;
+    top:10rpx;
+    color:#fff;
+    font-size: 36rpx;
+    font-weight: bold;
 }
 .container .version{
     color:#A8D4FF;
@@ -83,4 +241,62 @@ onLoad((opt) => {
     left:50%;
     margin-left:-328rpx;
 }
+
+.container .version-con{
+    width:100%;
+    position: fixed;
+    top:0;
+    left:0;
+    height: 100vh;
+    background: rgba(0, 0, 0, 0.4);
+}
+.version-con .v-bg{
+    position: absolute;
+    top:50%;
+    left: 50%;
+    /* width:620rpx; */
+    width:540rpx;
+    background-color: #fff;
+    border-radius: 20rpx;
+    padding:40rpx;
+    margin-left:-310rpx;
+    margin-top:-45%;
+    text-align: center;
+}
+.version-con .v-bg .v-title{
+    font-size: 36rpx;
+    font-weight: bold;
+    text-align: center;
+    margin-bottom:30rpx;
+}
+.version-con .v-bg .v-icon{
+    font-size:70rpx;
+    color:#28B6FF;
+   
+}
+.version-con .v-bg .v-version{
+    color:#0395E0;
+    font-size:42rpx;
+    font-weight: bold;
+    margin:20rpx 0 30rpx;
+}
+.version-con .v-bg .v-update{
+    font-size:32rpx;
+    margin-bottom:70rpx;
+}
+.version-con .v-bg .version-btn{
+    background-color: #05A3F4;
+    text-align: center;
+    width:360rpx;
+    height:80rpx;
+    line-height: 80rpx;
+    border-radius: 40rpx;
+    margin:0 auto;
+    color:#fff;
+}
+.version-con .v-bg .version-sub{
+    color:#05A3F4;
+    font-size:32rpx;
+    margin:40rpx 0 30rpx;
+}
 </style>

src/pages/login/login.vue

@@ -3,7 +3,8 @@
     <view class="login-con">
         <view :style="{height: navBarPaddingTop + 'px'}"></view>
         <image mode="aspectFit" src="../../static/images/pic-logo.png" class="login-logo"></image>
-        <view class="login-title">欢迎来到718友晟</view>
+        <view class="login-title" v-if="networkEnv==1"><text>718友晟</text><text>企业内网</text></view>
+        <view class="login-title" v-else>欢迎来到718友晟</view>
         <view class="login-tab">
             <customTabs v-model="activeTab" :tabs="tabList" :modelValue="activeTab">
                 <!-- 验证码登录 -->
@@ -73,18 +74,30 @@
 </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';
-import {showAlert} from '@/utils/message';
-import { getCaptchaImage,getVerifyCode,login } from '@/api/auth';
+import { getVerifyCode,login } from '@/api/auth';
 import cache from '@/utils/cache';
 import { AGREEWELCOME_KEY } from '@/enums/cacheEnums';
-
 import { getNavBarPaddingTop} from '@/utils/system.js'
-
 import { useUserStore } from '@/stores/user';
-const userStore = useUserStore()
+import encryptObj from '@/utils/encrypt.js'
+import {showAlert} from '@/utils/message.js'
+
+// #ifdef APP-PLUS
+// 获取 存储手机的module 
+const safeSave = uni.requireNativePlugin("Tm-TmSafeSaveFileModule");
+// #endif
+
+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);
+})
 
 // 获取导航栏高度用于内容区域padding
 const navBarPaddingTop = ref(0);
@@ -98,8 +111,8 @@ const tabList = ['验证码登录', '账号登录'];
 // 验证码登录
 const form = ref(null);
 const formData = ref({
-    phone: '15112345600',
-    verifyCode: '123456',
+    phone: '',
+    verifyCode: '',
     loginType:0
 });
 
@@ -183,8 +196,8 @@ let resetCountdown =()=>{
 // 账号登录
 const form2 = ref(null);
 const formData2 = ref({
-    username: 'admin',
-    password: '123456',
+    username: '',
+    password: '',
     loginType:1
 });
 
@@ -192,13 +205,13 @@ const rules2 = {
     username: {
         rules: [
             { required: true, errorMessage: '请输入用户名' },
-            { minLength: 3, maxLength: 10, errorMessage: '用户名长度在3到10个字符之间' }
+            // { minLength: 3, maxLength: 10, errorMessage: '用户名长度在3到10个字符之间' }
         ]
     },
     password: {
         rules: [
             { required: true, errorMessage: '请输入密码' },
-            { pattern: /^[a-zA-Z0-9]{6,12}$/, errorMessage: '密码必须是6-12位字母或数字' }
+            // { pattern: /^[a-zA-Z0-9]{6,12}$/, errorMessage: '密码必须是6-12位字母或数字' }
         ]
     }
 };
@@ -225,7 +238,7 @@ const submitForm = () => {
     if(activeTab.value===0){
         form.value.validate().then(async param => {
             // 2.调用登录接口
-            param.loginType = activeTab.value; console.log('表单数据00:', param);
+            param.loginType = activeTab.value;
             let res = await login(param)
             // 3.登录后存储token
             userStore.login(res);
@@ -238,11 +251,51 @@ const submitForm = () => {
     }else if(activeTab.value===1){
         // 用户名和密码登录
         form2.value.validate().then(async param => {
-            param.loginType = activeTab.value;   console.log('表单数据11:', formData2.value);
+            param.loginType = activeTab.value;
+            param.clientId = clientId;
+            let password = encryptObj.Encrypt(param.username + clientId + "," + param.password);
+            param.password = password;
+            param.runEnv = networkEnv.value;
+
+            // #ifdef H5
+
+            // b6ffbbfb-5b2d-4640-af3a-e43d0158eaf9
+            param.uniqCode = '679d5560-534f-4df8-815a-49227ba6ffd2';//h5测试用 内网-sn123456 外网-b6ffbbfb-5b2d-4640-af3a-e43d0158eaf9
             let res = await login(param);
             userStore.login(res);
             uni.switchTab({ url: '/pages/home/home' })
             btnLoading.value = false;
+            // #endif
+
+            // #ifdef APP-PLUS
+            try {
+                // 读取设备ID
+                safeSave.getSafeFile({ "key": "app_device_id" }, res3 => {
+                    if (res3.code == 1) {
+                        let deviceId = res3.data;
+                        // showAlert("读取成功=>"+deviceId);
+                        param.uniqCode = deviceId;
+                        login(param).then(res=>{
+                            userStore.login(res);
+                            uni.switchTab({ url: '/pages/home/home' })
+                            btnLoading.value = false;
+                        }).finally(()=>{
+                            btnLoading.value = false;
+                        })
+                       
+                    } else {
+                        // showAlert('读取失败:'+res3.msg)
+                        console.error('读取失败:', error);
+                        btnLoading.value = false;
+                    }
+                })
+            } catch (error) {
+                console.error('读取失败:', error);
+                // showAlert('出错:', error)
+                btnLoading.value = false;
+            }
+            // #endif
+           
         }).catch(err => {
             console.log('表单错误11:', err);
             btnLoading.value = false;
@@ -279,6 +332,12 @@ const submitForm = () => {
     margin: 0 0 35rpx 70rpx;
 }
 
+.login-con .login-title text:not(:last-child)::after {
+  content: "·";
+  margin: 0 10px;
+  color: #fff;
+}
+
 :deep(.login-tab .tabs-header) {
     background: none !important;
     border-bottom: none !important;
@@ -410,4 +469,12 @@ const submitForm = () => {
     margin-left:-327rpx;
 }
 
+.slider-con{
+    position: absolute;
+    top:0;
+    width:100%;
+    height: 100vh;
+    background-color: rgba(0, 0, 0, 0.1);
+}
+
 </style>

src/pages/notice/notice.vue

@@ -2,32 +2,49 @@
     <view class="con-body">
         <view class="con-bg">
             <!-- 头部 -->
-            <customHeader ref="customHeaderRef" :title="'消息'" :leftFlag="false" :rightFlag="true">
-                <template #right>
-                    <view class="head-right" @click="handleReady">
-                        <img :src="'static/images/notice/icon-clean@2x.png'" />清除未读
+            <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>
+            
             <!-- 高度来避免头部遮挡 -->
             <view class="top-height"></view>
           
-            <!-- 搜索 -->
-            <view class="search">
-                <uni-search-bar class="custom-search" radius="28" placeholder="请输入您想查询的内容或服务" clearButton="auto"
-                    cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff" @confirm="handleSearch" />
+            <!-- 搜索处理 -->
+            <customSearch v-if="searchShow"   
+                :searchKeywords="searchText" 
+                :searchType="searchTypeObj" 
+                :checkTypeObj="notictTypeCheck"
+                :searchTypeList="noticeTypeList" 
+                @confirm="handleSearchConfirm"
+            ></customSearch>
+            <view class="search" v-else  @click="handleSearchFocus">
+                <view class="search-bg">
+                    <view class="search-left">{{ notictTypeCheck.name?notictTypeCheck.name:'全部' }}</view>
+                    <view class="search-right">
+                        <input class="uni-input" v-model="searchText" placeholder="请输入您想查询的内容或服务" placeholder-class="search-color" />
+                    </view>
+                </view>
             </view>
 
             <!-- 消息列表 -->
-            <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+            <mescroll-uni  v-if="!searchShow" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
                 :up="upOption" :down="downOption" :fixed="false" class="scroll-h" :class="{'loading-scroll':cssFlag}">
-                <view class="white-bg" v-if="list.length">
-                    <view class="notice-list" v-for="(item, index) in list" :key="index">
-                        <img :src="item.imgSrc" />
+                <view class="white-bg" v-if="list.length>0" :class="{'bg-height':list.length<5}">
+                    <view class="notice-list" v-for="(item, index) in list" :key="index" @click="handleJump(item)">
+                        <img :src="'static/images/notice/'+item.imgSrc"  class="img-w" />
+                        <!-- <image :src="item.imgSrc" mode="aspectFit" class="img-w"></image> -->
                         <view class="notice-item">
-                            <view :class="{ 'notice-title': true, bold: item.isReady }">{{ item.title }}</view>
-                            <view class="notice-date">{{ formatDateStr(item.date) }}</view>
-                            <view class="dot" v-if="item.isReady"></view>
+                            <view :class="{ 'notice-title': true, bold: item.isRead }">{{ item.subject }}</view>
+                            <view class="notice-date">{{ formatDateStr(item.createTime) }}</view>
+                            <view class="dot" v-if="item.isRead"></view>
                         </view>
                     </view>
                 </view>
@@ -37,12 +54,18 @@
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue'
+import { ref, onMounted,computed } from 'vue'
+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';
 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';
+
+onLoad(async(opt) => {
+    uni.setStorageSync('page_cache',true);
+})
 
 // 获取导航栏高度用于内容区域padding
 const navBarPaddingTop = ref(0);
@@ -50,9 +73,38 @@ onMounted(() => {
     navBarPaddingTop.value = getNavBarPaddingTop() * 2;
 })
 
-// 查询搜索跳转
-let handleSearch = () => {
+// 搜索处理
+let searchShow = ref(false);
+let searchText = ref(undefined);
+let searchTypeObj = ref({typeId:3,typeName:'消息类型'});
+let noticeTypeList=ref([
+    {id:1,name:'日程消息一二'}, 
+    {id:2,name:'提醒消息'}, 
+    {id:3,name:'通知消息'},
+    {id:4,name:'待办消息'}, 
+    {id:5,name:'服务消息'}
+]);
+let notictTypeCheck = ref({});//选中类型
 
+onHide(()=>{
+    searchShow.value=false;
+})
+
+// 搜索返回操作
+const handleBack=()=>{
+    searchShow.value=false;
+}
+// 获取input 焦点跳转
+const handleSearchFocus=()=>{
+    searchShow.value = true;
+}
+
+// 搜索完返回处理
+const handleSearchConfirm = (param1,param2)=>{
+    // console.log(param1,param2)
+    notictTypeCheck.value=param1.value;
+    searchText.value=param2.value;;
+    searchShow.value=false;
 }
 
 const formatDateStr = (times) => {
@@ -60,25 +112,37 @@ const formatDateStr = (times) => {
 }
 
 // 清除未读
-const handleReady = () => {
+const handleRead = () => {
     list.value.forEach(item => {
-        item.isReady = false;
+        item.isRead = false;
     })
 }
 
+// 随机图片数组
+const images = [
+  'icon-TiXing@2x.png',
+  'icon-RiCheng@2x.png',
+  'icon-DaiBan@2x.png',
+  'icon-TongZhi@2x.png',
+  'icon-TiXing@2x.png'
+]
+
 // 查询通知列表
 let list = ref([]);
 const mescrollRef = ref(null);
 const upOption = ref({
     page: { num: 0, size: 10 },
     noMoreSize: 5,
-    empty: { tip: '~ 空空如也 ~' },
+    empty: { 
+        tip: '~ 空空如也 ~',
+        icon: "../../static/images/mescroll-empty.png"
+    },
     textLoading: '加载中...',
     textNoMore: '已经到底了'
 });
 
 const downOption = ref({
-    auto: true,
+    auto: false,
     textInOffset: '下拉刷新',
     textOutOffset: '释放更新',
     textLoading: '刷新中...'
@@ -93,12 +157,11 @@ const mescrollInit = (mescroll) => {
 // 下拉刷新
 const downCallback = async (mescroll) => {
     try {
-        setTimeout(async ()=>{
+        console.log("下拉刷新")
         const res = await getNoticeList(1, upOption.value.page.size);
         cssFlag.value = false;
         list.value = res.list;
         mescroll.resetUpScroll();
-        },500);
     } catch (error) {
         mescroll.endErr();
     } finally {
@@ -110,15 +173,14 @@ const downCallback = async (mescroll) => {
 // 上拉加载更多
 const upCallback = async (mescroll) => {
     try {
-        setTimeout(async ()=>{
-            const res = await getNoticeList(mescroll.num, mescroll.size);
+        console.log("上拉加载更多")
+        let res = await getNoticeList(mescroll.num, mescroll.size);
         if (mescroll.num === 1) {
             list.value = res.list;
         } else {
             list.value.push(...res.list);
         }
         mescroll.endBySize(res.list.length, res.total);
-        },500);
     } catch (error) {
         mescroll.endErr();
     }
@@ -129,17 +191,31 @@ const getNoticeList = (pageIndex, pageSize) => {
     return new Promise(async (resolve) => {
         let param = {
             pageIndex,
-            pageSize
+            pageSize,
+            searchValue:searchText.value?searchText.value:undefined,
+            type:notictTypeCheck.value.id
         }
         
         let res = await noticeList(param);
+        let list = res.list || [];
+        list.forEach(item=>{
+            const randomIndex = Math.floor(Math.random() * images.length)
+            item.imgSrc =  images[randomIndex];
+        })
         resolve({
-            list: res.list,
-            total: res.totalCount
+            list,
+            total: res.recordCount || 0
         });
     });
 
 }
+
+// 跳转webview
+const handleJump = (item)=>{
+    uni.navigateTo({
+        url: '/pages/h5-webview/h5-webview?url=' + item.mobileLink+"&title="+item.subject
+    });
+}
 </script>
 
 <style scoped>
@@ -168,16 +244,24 @@ const getNoticeList = (pageIndex, pageSize) => {
 
 .white-bg {
     width: 750rpx;
-    padding: 40rpx 0 ;
+    padding: 40rpx 0 20rpx;
     margin-bottom:0;
     border-radius: 8px 8px 0 0;
 }
+.white-bg.bg-height{
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 145px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 175px);
+    /* #endif */
+}
 .scroll-h{
     /* #ifdef APP-PLUS */
     height: calc(100vh - 120px);
     /* #endif */
     /* #ifndef APP-PLUS */
-    height: calc(100vh - 140px);
+    height: calc(100vh - 160px);
     /* #endif */
 }
 
@@ -187,7 +271,7 @@ const getNoticeList = (pageIndex, pageSize) => {
     margin-bottom: 30rpx;
 }
 
-.white-bg .notice-list img {
+.white-bg .notice-list .img-w{
     width: 80rpx;
     height: 80rpx;
     margin-right: 30rpx;

src/pages/notice/waitApprove.vue

@@ -0,0 +1,221 @@
+<template>
+<view class="con-body">
+    <view class="con-bg">
+        <!-- 头部 -->
+        <customHeader ref="customHeaderRef" :title="'待审批'" :leftFlag="true" :rightFlag="true"></customHeader>
+
+        <!-- 高度来避免头部遮挡 -->
+        <view class="top-height"></view>
+
+        <!-- 正文内容 -->
+        <view class="all-body">
+        
+            <!-- 分页部分  -->
+            <mescroll-uni ref="mescrollRef" 
+                @init="mescrollInit" 
+                @down="downCallback" 
+                @up="upCallback"
+                :up="upOption" 
+                :down="downOption" 
+                :fixed="false" 
+                textColor="#ffffff" 
+                bgColor="#ffffff"
+                class="scroll-h"  
+                :class="{'loading-scroll':cssFlag}"
+            >
+                <view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index" @click="handleJump(item)">
+                    <view class="report-list">
+                        <view class="r-list">
+                            <view class="r-name">{{ item.subject }}</view>
+                            <view class="r-right btn-orange" size="mini" v-if="item.status==1">待处理</view>
+                            <view v-else-if="item.status==2">已处理</view>
+                        </view>
+                        <view class="r-list">
+                            <view class="r-left">来自 <text>{{ item.appName }}</text></view>
+                            <view class="r-right">
+                                <text style="color:#FF2B44" v-if="item.status==1 && (item.level==1 || item.level==2)">
+                                    {{ formatLevel(item.level) }}
+                                </text>
+                                <text v-else>{{ formatLevel(item.level) }}</text>
+                            </view>
+                        </view>
+                        <view class="border-bottom"></view>
+                        <view class="r-list">
+                            <view class="r-left">创建人 <text>{{ item.createUser?item.createUser.userId:'' }}</text></view>
+                            <view class="r-right">{{ parseTime(item.createTime,'{y}-{m}-{d} {h}:{i}') }}</view>
+                        </view>
+                    </view>
+                </view>
+            </mescroll-uni>
+        </view>
+    </view>
+</view>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue'
+import customHeader from '@/components/customHeader.vue'
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import { getNavBarPaddingTop } from '@/utils/system.js'
+import { flowList } from '@/api/notice.js'
+import {formatLevel} from '@/utils/status.js'
+import { parseTime } from '@/utils/datetime.js'
+
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+
+// 查询列表
+let list = ref([]);
+const mescrollRef = ref(null);
+const upOption = ref({
+    page: { num: 0, size: 10 },
+    noMoreSize: 5,
+    empty: { 
+        tip: '~ 空空如也 ~',
+        icon: "../../static/images/mescroll-empty.png"
+    },
+    textLoading: '加载中...',
+    textNoMore: '已经到底了'
+});
+
+const downOption = ref({
+    auto: false,
+    textInOffset: '下拉刷新',
+    textOutOffset: '释放更新',
+    textLoading: '刷新中...'
+});
+
+let cssFlag=ref(false);//控制样式
+const mescrollInit = (mescroll) => {
+    console.log("mescrollInit=>")
+    cssFlag.value = true;
+    mescrollRef.value = mescroll;
+};
+
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+    try {
+        console.log("downCallback=>下拉刷新")
+        const res = await getFlowList(1, upOption.value.page.size);
+        cssFlag.value = false;
+        list.value = res.list;
+        mescroll.resetUpScroll();
+    } catch (error) {
+        mescroll.endErr();
+    } finally {
+        mescroll.endSuccess();
+    }
+}
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+    try {
+        console.log("upCallback=>上拉加载更多")
+        const res = await getFlowList(mescroll.num, mescroll.size);
+        if (mescroll.num === 1) {
+            list.value = res.list;
+        } else {
+            list.value.push(...res.list);
+        }
+        mescroll.endBySize(res.list.length, res.total);
+    } catch (error) {
+        mescroll.endErr();
+    }
+}
+
+// 获取数据列表
+const getFlowList = (pageIndex, pageSize) => {
+    return new Promise(async (resolve) => {
+        let param = {
+            pageIndex,
+            pageSize
+        }
+        let res = await flowList(param);
+        let list = res.list || [];
+        resolve({
+            list,
+            total: res.recordCount
+        });
+    });
+
+}
+
+// 跳转webview
+const handleJump = (item)=>{
+    uni.navigateTo({
+        url: `/pages/notice/waitApproveDetail?detail=${encodeURIComponent(JSON.stringify(item))}`
+    })
+}
+</script>
+
+<style scoped>
+.all-body {
+    /* #ifdef APP-PLUS */
+    top: 150rpx;
+    height: calc(100vh - 75px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    top:120rpx;
+    height: calc(100vh);
+    /* #endif */
+}
+.search{
+    display: flex;
+}
+.search .btn-search{
+    border:none;
+    background: none;
+    line-height: normal;
+    color:#fff;
+    line-height: 56rpx !important;
+    padding:10rpx 0 0;
+    text-align: left;
+    cursor: pointer;
+}
+.search .btn-search::after{
+    display: none;
+}
+.search .custom-search{
+    width:80%;
+    
+}
+.search .custom-search.uni-searchbar{
+    padding-right:0 !important;
+}
+
+.scroll-h{
+    /* #ifdef APP-PLUS */
+    height:calc(100vh - 78px) !important;
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 65px) !important;
+    /* #endif */
+}
+.white-bg{
+    padding-top:0rpx;
+    padding-bottom:10rpx;
+}
+
+.report-list .r-list{
+    align-items: flex-start;
+}
+.report-list .r-list:first-child{
+    padding-bottom:10rpx;
+}
+
+.report-list .r-list .r-name {
+    color: #3384DF;
+    font-size: 35rpx;
+    font-weight: bold;
+    width:500rpx;
+}
+
+.report-list .r-list .r-left text{
+    font-size: 28rpx;
+    color:#919191;
+}
+
+</style>

src/pages/notice/waitApproveDetail.vue

@@ -0,0 +1,149 @@
+<template>
+<view class="con-body">
+    <view class="con-bg">
+        <!-- 头部 -->
+        <customHeader ref="customHeaderRef" :title="'待审批'" :leftFlag="true" :rightFlag="true"></customHeader>
+
+        <!-- 高度来避免头部遮挡 -->
+        <view class="top-height"></view>
+
+        <!-- 正文内容 -->
+        <view class="all-body">
+            <view class="white-bg bg-height">
+                <view class="report-list">
+                    <view class="title">{{ detail.subject }}</view>
+                    <view class="r-list">
+                        <view class="r-name">进度</view>
+                        <view class="r-right btn-orange" size="mini" v-if="detail.status==1">待处理</view>
+                        <view v-else-if="detail.status==2">已处理</view>
+                    </view>
+                    <view class="border-bottom"></view>
+                    <view class="r-list">
+                        <view class="r-left">来自</view>
+                        <view class="r-right">{{ detail.appName }}</view>
+                    </view>
+                    <view class="border-bottom"></view>
+                    <view class="r-list">
+                        <view class="r-left">状态</view>
+                        <view class="r-right">
+                            <text style="color:#FF2B44" v-if="detail.status==1 && (detail.level==1 || detail.level==2)">
+                                {{ formatLevel(detail.level) }}
+                            </text>
+                            <text v-else>{{ formatLevel(detail.level) }}</text>
+                        </view>
+                    </view>  
+                    <view class="border-bottom"></view>
+                    <view class="r-list">
+                        <view class="r-left">创建人</view>
+                        <view class="r-right">{{ detail.createUser?detail.createUser.userId:'' }}</view>
+                    </view>
+                    <view class="border-bottom"></view>
+                    <view class="r-list">
+                        <view class="r-left">创建时间</view>
+                        <view class="r-right">{{ parseTime(detail.createTime,'{y}-{m}-{d} {h}:{i}') }}</view>
+                    </view>
+                </view>
+
+                <view class="btn-blue"  @click="handleJump">跳转详情页</view>
+            </view>
+        </view>
+    </view>
+</view>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+import customHeader from '@/components/customHeader.vue'
+// import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import { getNavBarPaddingTop } from '@/utils/system.js'
+import {formatLevel} from '@/utils/status.js'
+import { parseTime } from '@/utils/datetime.js'
+
+
+let detail = ref({})
+onLoad(async(opt) => {
+    try {
+        detail.value = JSON.parse(decodeURIComponent(opt.detail));
+        // console.log(detail.value);
+    } catch (e) {
+        console.error('参数解析失败', e);
+    }
+});
+
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+
+
+// 跳转webview
+const handleJump = ()=>{
+    let item = detail.value;
+    uni.navigateTo({
+        url: `/pages/h5-webview/h5-webview?url=${item.mobileLink}&title=${item.subject}`
+    });
+}
+</script>
+
+<style scoped>
+.all-body {
+    /* #ifdef APP-PLUS */
+    top: 150rpx;
+    height: calc(100vh - 75px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    top:120rpx;
+    height: calc(100vh - 60px);
+    /* #endif */
+}
+
+.scroll-h{
+    /* #ifdef APP-PLUS */
+    height:calc(100vh - 78px) !important;
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 10px) !important;
+    /* #endif */
+}
+.white-bg{
+    width: 750rpx;
+    padding: 25rpx 0 20rpx;
+    margin-bottom:0;
+    border-radius: 8px 8px 0 0;
+}
+
+.white-bg.bg-height{
+    /* #ifdef APP-PLUS */
+    height:calc(100vh - 78px) !important;
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 80px) !important;
+    /* #endif */
+}
+
+.report-list{
+    padding: 0 0 0 30rpx;
+}
+.report-list .r-list{
+    padding-right: 30rpx;
+} 
+.report-list .r-list:first-child{
+    padding-bottom:10rpx;
+}
+.report-list .border-bottom{
+    width:720rpx;
+}
+
+.btn-blue {
+    background-color: #05A3F4;
+    color: #fff;
+    width:380rpx;
+    height:80rpx;
+    line-height: 80rpx;
+    margin:120rpx auto 0;
+    text-align: center;
+    border-radius: 40rpx;
+}
+</style>

src/pages/search/search.vue

@@ -0,0 +1,31 @@
+<template>
+<view class="con-body">
+    <view class="con-bg">
+        <!-- 头部 -->
+        <customHeader ref="customHeaderRef" :title="'搜索'" 
+            :leftFlag="true" :rightFlag="false" 
+        ></customHeader>
+        <!-- 高度来避免头部遮挡 -->
+        <view class="top-height"></view>
+
+        <customSearch :type="type"></customSearch>
+
+    </view>
+</view>
+</template>
+<script setup>
+import { ref, onMounted } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+import customHeader from '@/components/customHeader.vue'
+import customSearch from '@/components/customSearch.vue'
+
+let type=ref(1);
+onLoad(async(opt) => {
+    console.log(opt.type)
+    type.value = opt.type;
+})
+</script>
+
+<style scoped>
+
+</style>

src/pages/userinfo/userinfo.vue

@@ -2,23 +2,27 @@
 <view class="con-body">
     <view class="con-bg">
        
+        <!-- 头部 -->
+        <customHeader ref="customHeaderRef" :title="myTitle" 
+            :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 -->
             <!-- 头像 -->
             <view class="head-pic">
                 <img class="pic-img" :src="'static/images/userinfo/icon-userinfo.png'" />
                 <view class="head-name">
                     <view class="nick">
-                        <view class="nick-text">{{ userObj.name }}</view>
+                        <view class="nick-text">{{ userObj.realname }}</view>
                         <img :src="`static/images/userinfo/num-${userObj.level}@2x.png`" class="level" />
                     </view>
-                    <view class="dept">{{ userObj.deptName }} {{ userObj.jobName }}</view>
+                    <view class="dept">{{ userObj.deptName }} {{ userObj.postName }}</view>
                 </view>
                 <view class="head-right">
                     <view class="font-ruzhi">已入职{{userObj.joinDay}}天</view>
@@ -27,12 +31,12 @@
             </view>
 
             <!-- 日常 -->
-            <view class="backlog-bg">
-                <view class="backlog-b-item">
-                    <img :src="'static/images/business/icon-rwjh.png'" />
-                    <view class="font-title">任务计划</view>
-                </view>
-                <view class="backlog-b-item">
+            <!-- <view class="backlog-bg">
+                <view class="backlog-b-item" v-for="(item,index) in bizListFavorite" :key="index">
+                    <img :src="'static/images/business/'+item.icon+'.png'" />
+                    <view class="font-title">{{item.bizName}}</view>
+                </view> -->
+                <!-- <view class="backlog-b-item">
                     <img :src="'static/images/business/icon-rb.png'" />
                     <view class="font-title">日报</view>
                 </view>
@@ -43,11 +47,11 @@
                 <view class="backlog-b-item">
                     <img :src="'static/images/business/icon-jxgl.png'" />
                     <view class="font-title">绩效管理</view>
-                </view>
-            </view>
+                </view> -->
+            <!-- </view> -->
 
             <!-- 头像块 -->
-            <view class="white-bg">
+            <view class="white-bg" style="margin-top:20rpx;">
                 <view class="list-item">
                     <img :src="'static/images/userinfo/icon-tx@2x.png'" class="l-icon" />
                     <text>头像</text>
@@ -76,11 +80,11 @@
                     </view>
                 </view>
                 <view class="item-border"></view>
-                <view class="list-item item-padding">
+                <view class="list-item item-padding" @click="handleVersion">
                     <img :src="'static/images/userinfo/icon-bbgx@2x.png'" class="l-icon" />
-                    <view class="item-text">版本更新 <view class="dot"></view></view>
+                    <view class="item-text">版本更新 <view class="dot" v-if="isCurrent==2"></view></view>
                     <view class="list-right">
-                        <text class="item-gray">Version 1.0.0</text>
+                        <text class="item-gray">Version {{ appVersion }}</text>
                         <uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
                     </view>
                 </view>
@@ -93,24 +97,50 @@
             <!-- <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 customHeader from '@/components/customHeader.vue'
+import { ref, onMounted,getCurrentInstance } from 'vue'
+import { onLoad } from '@dcloudio/uni-app';
+import customHeader from '@/components/customHeader.vue'
 import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
 import { getNavBarPaddingTop } from '@/utils/system.js'
-
-import { getUserInfo } from '@/api/auth.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()
+const { proxy } = getCurrentInstance();
+const networkEnv = ref(proxy.$NETWORK_ENV);//1-内网 2-外网
+
+let myTitle = '我的';
+myTitle = networkEnv.value==1?'我的 · 企业内网':'我的'
+
 
 // 1.头部导航栏
 const navBarPaddingTop = ref(0);
-onMounted(() => {
-    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+let appVersion = ref("1.0.0");//当前版本号
+let newVersion = ref("1.0.0");//新版本号
+let isCurrent = ref(undefined);//是否是当前版本 1-是 2-否
+let systemInfo = uni.getSystemInfoSync();
+onLoad(async(opt) => {
+    uni.setStorageSync('page_cache',true);
+    // #ifdef APP-PLUS
+    appVersion.value=systemInfo.appWgtVersion; //当前版本号
+    // #endif
+    // #ifdef H5
+    appVersion.value=systemInfo.appVersion;
+    // #endif
 })
 
 // 下拉刷新
@@ -125,46 +155,109 @@ const downOption = ref({
     textLoading: '刷新中...'
 });
 
+// 2.获取用户基本信息
+let userObj = ref({});
+let bizListFavorite = ref([]);
+const selectUserInfo = async ()=>{
+    let data = await getUserInfo({});
+
+    // 查询常用业务
+    // let favoriteBizListStr = data.favoriteBizList || '';
+    // let favoriteBizList = favoriteBizListStr.split(",");//常用业务
+    // let list = [];
+    // let bizList = data.bizList;//所有业务
+    // bizList.forEach(item => {
+    //     favoriteBizList.forEach(item2=>{
+    //         if(item.bizId == item2){
+    //             list.push(item);
+    //         }
+    //     })
+    // });
+    // bizListFavorite.value = list;
+
+    // 岗位名称，取第0个显示
+    let postName = data.postList[0]?data.postList[0].postName:'';
+    userObj.value = {
+        ...data,
+        postName,
+        level:5,//默认搞个5
+        joinDay:1000,//默认1000天
+    };
+}
+
 // 下拉刷新
 const downCallback = async (mescroll) => {
     try {
-        setTimeout(async ()=>{
-            // mescroll.resetUpScroll();
-        },500);
+        selectUserInfo();
+        getVersion();
     } catch (error) {
         mescroll.endErr();
     } finally {
-        setTimeout(async ()=>{
         mescroll.endSuccess();
-        },500);
     }
 }
 
-// 2.获取用户基本信息
-let userObj = ref({});
-const selectUserInfo = async ()=>{
-    let data = await getUserInfo({});
-    userObj.value = data;
+// 3.查询是否有更新的版本显示点
+const getVersion = async ()=>{
+    let networkEnv = proxy.$NETWORK_ENV;//1-内网 2-外网
+    let param = {
+        // #ifdef APP-PLUS
+        verNumber:systemInfo.appWgtVersion,//当前版本号
+        // #endif
+        // #ifdef H5
+        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;
 }
-selectUserInfo()
 
 // 3.退出登录
 const handleLoginOut = async ()=>{
+
+    showAlert('是否确认退出？','提示',true,()=>{
         userStore.logout();
         uni.reLaunch({
             url: '/pages/login/login',
         });
+    })
+    
 }
 
+// 4.跳转到版本
+const handleVersion=()=>{
+    uni.navigateTo({url:'/pages/userinfo/version'})
+}
+
+onMounted(() => {
+    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+
 </script>
 
 <style scoped>
 .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){
@@ -172,7 +265,7 @@ const handleLoginOut = async ()=>{
 }
 .head-pic {
     display: flex;
-    padding: 40rpx 0rpx 10rpx 30rpx;
+    padding: 0rpx 0rpx 10rpx 30rpx;
 }
 
 .head-pic .pic-img {

src/pages/userinfo/version.vue

@@ -0,0 +1,139 @@
+<template>
+<view class="con-body">
+    <view class="con-bg">
+        <!-- 头部 -->
+        <customHeader ref="customHeaderRef" :title="'版本更新'" :leftFlag="true" :rightFlag="false"></customHeader>
+        <!-- 高度来避免头部遮挡 -->
+        <view class="top-height"></view>
+        <view class="white-bg">
+            <view class="version-con">
+                <view class="v-title">当前版本 Version {{appVersion}}</view>
+                <block v-if="isCurrent==2">
+                    <view class="v-sub-title">最新版本 Version {{ newVersion }}</view>
+                    <view class="v-remark">
+                        <view class="v-r-title">本期更新</view>
+                        {{ remark }}
+                    </view>
+                    <view class="v-btn" @click="handleDown">更 新</view>
+                </block>
+                <block v-else>
+                    <view class="v-new-title">已经是最新版本</view>
+                </block>
+            </view>
+        </view>
+    </view>
+</view>
+</template>
+
+<script setup>
+import { ref, onMounted,getCurrentInstance } from 'vue'
+import { onLoad } from '@dcloudio/uni-app';
+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) => {
+    getOSVesion();
+});
+
+// 1.头部导航栏
+let navBarPaddingTop = ref(0);
+let appVersion = ref("1.0.0");//当前版本号
+let newVersion = ref('1.0.0');//最新版本号
+let isCurrent = ref(undefined);
+let downloadURL = ref(''); //下载地址
+let remark = ref('');//更新内容
+onMounted(() => {
+    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+let getOSVesion = async()=>{
+    let networkEnv = proxy.$NETWORK_ENV;//1-内网 2-外网
+    let systemInfo = uni.getSystemInfoSync();
+    let param = {
+        // #ifdef APP-PLUS
+        verNumber:systemInfo.appWgtVersion,//当前版本号
+        // #endif
+        // #ifdef H5
+        verNumber : systemInfo.appVersion,
+        // #endif
+        os: formatIOS(systemInfo.osName),//操作系统 Android  IOS
+        runEnv:networkEnv
+    }
+    // 当前手机版本
+    appVersion.value = param.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'
+}
+
+// 下载最新版本
+const handleDown = ()=>{
+    // #ifdef APP-PLUS
+    // 跳转到应用商店或下载最新版本的页面
+    plus.runtime.openURL(downloadURL.value);			
+    if (versionData.value.os == 'ios'){
+        plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
+    } else if (versionData.value.os == 'android'){
+        plus.runtime.quit();
+    }
+    // #endif
+}
+</script>
+
+<style scoped>
+.white-bg{
+    width: 750rpx;
+    padding: 40rpx 0 ;
+    margin-bottom:0;
+    border-radius: 8px 8px 0 0;
+    height:calc(100vh - 105px);
+  
+}
+.version-con{
+    padding:10rpx 53rpx;
+}
+.version-con .v-title{
+    font-size:38rpx;
+    font-weight: bold;
+}
+.version-con .v-sub-title{
+    color:#3384DF;
+    font-size: 28rpx;
+    margin-top: 35rpx;
+    font-weight: bold;
+    border-bottom:1px solid #E7E7E7;
+    padding-bottom: 25rpx;
+}
+.version-con .v-remark{
+    padding-top:25rpx;
+    font-size:28rpx;
+    line-height: 50rpx;
+}
+.version-con .v-remark .v-r-title{
+    font-size: 32rpx;
+    font-weight: bold;
+    margin-bottom:10rpx;
+}
+.version-con .v-btn{
+    width:496rpx;
+    height:80rpx;
+    line-height:80rpx;
+    text-align: center;
+    color:#F0F0F0;
+    background-color: #05A3F4;
+    margin:100rpx auto;
+    border-radius: 44rpx;
+}
+.version-con .v-new-title{
+    color:#919191;
+    font-size:28rpx;
+    font-weight: bold;
+    margin-top:40rpx;
+}
+</style>

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 */
@@ -87,6 +92,8 @@ page {
 
 
 /* 弹出提示框修改样式 begin */
+/* #ifdef H5 */
+
 .uni-modal {
     border-radius: 24rpx !important;
     width: 70% !important;
@@ -136,7 +143,7 @@ page {
     background-color: #05A3F4 !important;
     color: #fff !important;
 }
-
+/* #endif */
 /* 弹出提示框修改样式 end */
 
 /* 搜索框修改样式 begin */
@@ -169,13 +176,51 @@ page {
 }
 
 .custom-search .uni-searchbar__box-icon-clear {
-    display: none !important;
+    /* display: none !important; */
+    margin-right:10rpx;
 }
 
-/* .custom-search .uni-searchbar__box-icon-clear .uniui-clear{
+.custom-search .uni-searchbar__box-icon-clear .uniui-clear{
     color:#fff !important;
     font-size: 40rpx !important;
-} */
+}
+
+/* 自定义搜索框 */
+.search-bg{
+    background-color: #6FA2F8;
+    border-radius: 28rpx;
+    /* width:690rpx; */
+    width:630rpx;
+    height:56rpx;
+    margin:10rpx auto 30rpx;
+    padding:0 30rpx;
+    display: flex;
+    color:#fff;
+    font-size:28rpx;
+    flex: auto;
+}
+.search-bg .search-left{
+    border-right:1px solid #4687F2;
+    margin-top:10rpx;
+    margin-bottom:10rpx;
+    padding-right:30rpx;
+    /* width:10%; */
+}
+.search-bg .search-right{
+    margin-top:10rpx;
+    padding-left:30rpx;
+    /* width:60%; */
+}
+.search-bg .search-right .uni-input{
+    color:#fff;
+    font-size:28rpx;
+}
+.search-bg .search-right .uni-input .uni-input-input{
+    width: 380rpx;
+}
+.search-bg .search-right .uni-input .search-color{
+    color:#fff !important;
+}
 /* 搜索框修改样式 end */
 
 .head-right {
@@ -584,3 +629,7 @@ uni-button[type='primary'][plain] {
 
 
 /* CRM 样式 end */
+
+.mescroll-empty .empty-tip{
+    color: #fff !important;
+}

src/static/font/iconfont.css

@@ -11,6 +11,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-phonefilled:before {
+  content: "\e68d";
+}
+
 .icon-phonebaocun:before {
   content: "\e80b";
 }

src/stores/user.js

@@ -1,7 +1,6 @@
 import { defineStore } from 'pinia'
 import { getToken, setToken,clearToken } from '../utils/auth'
-import { getUserInfo } from '../api/auth'
-
+import { getUserInfo,logout } from '../api/auth'
 
 export const useUserStore = new defineStore({
     id: 'userStore',
@@ -26,12 +25,15 @@ export const useUserStore = new defineStore({
         },
         // 登录
         login(userinfo) {
-            this.token = userinfo.token
-            setToken(userinfo.token)
+            let token = userinfo.access_token;
+            this.token = token
+            setToken(token)
+            userinfo.token = token;
             this.userInfo = userinfo
         },
         // 退出
-        logout() {
+        async logout() {
+            await logout();
             this.token = ''
             this.userInfo = {}
             clearToken();

src/utils/cache.js

@@ -26,10 +26,10 @@ const cache = {
                 return null
             }
             const { value, expire } = JSON.parse(data)
-            if (expire && expire < this.time()) {
-                uni.removeStorageSync(key)
-                return null
-            }
+            // if (expire && expire < this.time()) {
+            //     uni.removeStorageSync(key)
+            //     return null
+            // }
             return value
         } catch (e) {
             return null

src/utils/common.js

@@ -0,0 +1,207 @@
+import { showAlert } from '@/utils/message.js'
+
+// 递归算法
+export const initTree = (arr, parentId = '0', id) => {
+    const tree = [];
+    arr.filter(item => item.parentId === parentId).forEach(item => {
+        const children = initTree(arr, item[id]);
+        if (children.length > 0) {
+            item.children = children;
+        }
+        tree.push(item);
+    });
+    return tree;
+}
+
+
+// 安卓异步调用
+export const requestAndroidPermissionAsync = (systemInfo, permissions) => {
+    return new Promise((resolve, reject) => {
+        // if (uni.getSystemInfoSync().platform !== 'android') {
+        //     resolve({ granted: true, nonSystem: true })
+        //     return
+        // }
+        plus.android.requestPermissions(permissions, (result) => {
+            showAlert("result=>" + JSON.stringify(result))
+            // const granted = Object.values(result.granted).every(Boolean);
+
+            let granted = false;
+            if (systemInfo.osVersion < 13) {
+                granted = result.granted.length == 2
+            } else if (systemInfo.osVersion == 13) {
+                granted = result.granted.length == 3
+            } else {
+                granted = result.granted.length == 1
+            }
+            resolve({ ...result, granted })
+
+        }, (error) => {
+            reject(error)
+        })
+    })
+}
+
+
+// 安卓同步调用
+export const requestAndroidPermission = (systemInfo) => {
+    let granted = false;
+    const Manifest = plus.android.importClass("android.Manifest");
+    const MainActivity = plus.android.runtimeMainActivity();
+    if (systemInfo.osVersion < 13) {  // 安卓系统版本 
+        let permissionStatus = MainActivity.checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE);
+        let perStatus = 0;
+        if (permissionStatus === 0) {
+            perStatus++;
+        }
+        permissionStatus = MainActivity.checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE);
+        if (permissionStatus === 0) {
+            perStatus++;
+        }
+        if (perStatus == 2) {
+            granted = true
+        } else {
+            granted = false //"当前文件保存权限被关闭，请到设置中开启才能继续后续操作"
+            goPermission();//调用授权方法去授权
+        }
+
+    } else if (systemInfo.osVersion == 13) {
+        let permissionStatus = MainActivity.checkSelfPermission(Manifest.permission.READ_MEDIA_IMAGES);
+        let perStatus = 0;
+        if (permissionStatus === 0) {
+            perStatus++;
+        }
+        permissionStatus = MainActivity.checkSelfPermission(Manifest.permission.READ_MEDIA_VIDEO);
+        if (permissionStatus === 0) {
+            perStatus++;
+        }
+        permissionStatus = MainActivity.checkSelfPermission(Manifest.permission.READ_MEDIA_AUDIO);
+        if (permissionStatus === 0) {
+            perStatus++;
+        }
+        if (perStatus == 3) {
+            granted = true
+        } else {
+            granted = false //"当前文件保存权限被关闭，请到设置中开启才能继续后续操作"
+            goPermission();//调用授权方法去授权
+        }
+    } else {
+        let permissionStatus = MainActivity.checkSelfPermission(Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED);
+        let perStatus = 0;
+        if (permissionStatus === 0) {
+            perStatus++;
+        }
+        if (perStatus == 1) {
+            granted = true
+        } else {
+            granted = false //"当前文件保存权限被关闭，请到设置中开启才能继续后续操作"
+            goPermission();//调用授权方法去授权
+        }
+    }
+
+    return granted
+
+}
+
+// 弹窗跳授权页面
+const goPermission = () => {
+    uni.showModal({
+        title: '提示',
+        content: "请进行设备授权",
+        cancelText: '去授权',
+        confirmText: '已授权',
+        success: function (res) {
+            if (res.confirm) {
+                uni.reLaunch({
+                    url: '/pages/loading/loading',
+                });
+            } else if (res.cancel) {
+                jumpAuthPermission();
+            }
+        }
+    })
+}
+
+// 跳转授权按钮
+const jumpAuthPermission=()=>{
+    var main = plus.android.runtimeMainActivity();
+    var Intent = plus.android.importClass('android.content.Intent');
+    var Uri = plus.android.importClass('android.net.Uri');
+    var pkg = main.getPackageName();
+    var intent = new Intent('android.settings.APPLICATION_DETAILS_SETTINGS');
+    intent.setData(Uri.parse('package:' + pkg));
+    main.startActivity(intent); 
+    setTimeout(()=>{
+        uni.reLaunch({
+            url: '/pages/loading/loading',
+        });
+    },500)
+}
+
+// 跳转授权
+const jumpAuthPermission2 = () => {
+
+    let main = plus.android.runtimeMainActivity();
+    let Intent = plus.android.importClass('android.content.Intent');
+    let Uri = plus.android.importClass('android.net.Uri');
+    let Build = plus.android.importClass('android.os.Build');
+    let Settings = plus.android.importClass('android.provider.Settings');
+    let PackageManager = plus.android.importClass('android.content.pm.PackageManager');
+    let pkg = main.getPackageName();
+
+    let intent = new Intent();
+    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+    try {
+        showAlert(Build.VERSION.SDK_INT)
+        // 尝试直接跳转到存储权限设置（Android 13+ 支持）
+        if (Build.VERSION.SDK_INT >= 33) {
+            // Android 13+ 尝试直接打开存储权限页面
+            intent.setAction(Settings.ACTION_MANAGE_APP_PERMISSIONS);
+            intent.putExtra(Settings.EXTRA_APP_PACKAGE, pkg);
+            // 指定权限类型为存储（需要Android 13+支持）
+            intent.putExtra(Settings.EXTRA_PERMISSION_NAME, "android.permission.READ_EXTERNAL_STORAGE");
+        } 
+        // Android 11-12 尝试直接跳转到权限列表
+        else if (Build.VERSION.SDK_INT >= 30) {
+            intent.setAction(Settings.ACTION_MANAGE_APP_PERMISSIONS);
+            intent.putExtra(Settings.EXTRA_APP_PACKAGE, pkg);
+           
+        }
+        // Android 6.0-10 跳转到应用详情页（用户需手动点击权限）
+        else if (Build.VERSION.SDK_INT >= 23) {
+            intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+            let uri = Uri.fromParts("package", pkg, null);
+            intent.setData(uri);
+        }
+        // 低版本系统
+        else {
+            intent.setAction(Settings.ACTION_MANAGE_APPLICATIONS_SETTINGS);
+        }
+        
+        showAlert("main=>"+main)
+        showAlert("intent=>"+intent)
+        main.startActivity(intent);
+
+        setTimeout(() => {
+            uni.reLaunch({
+                url: '/pages/loading/loading',
+            });
+        }, 1000)
+
+    } catch (e) {
+        showAlert(e)
+        // 异常情况下降级处理
+        console.error("跳转存储权限页面失败，使用备用方案", e);
+        let fallbackIntent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+        fallbackIntent.setData(Uri.parse('package:' + pkg));
+        fallbackIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        main.startActivity(fallbackIntent);
+
+        setTimeout(() => {
+            uni.reLaunch({
+                url: '/pages/loading/loading',
+            });
+        }, 1000)
+    }
+    
+}

src/utils/datetime.js

@@ -87,3 +87,44 @@ export function getDate(type) {
 
   return `${year}-${month}-${day}`;
 }
+
+// 日期格式化
+export function parseTime(time, pattern) {
+  if (arguments.length === 0 || !time) {
+    return null
+  }
+  const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
+  let date
+  if (typeof time === 'object') {
+    date = time
+  } else {
+    if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+      time = parseInt(time)
+    } else if (typeof time === 'string') {
+      time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '');
+    }
+    if ((typeof time === 'number') && (time.toString().length === 10)) {
+      time = time * 1000
+    }
+    date = new Date(time)
+  }
+  const formatObj = {
+    y: date.getFullYear(),
+    m: date.getMonth() + 1,
+    d: date.getDate(),
+    h: date.getHours(),
+    i: date.getMinutes(),
+    s: date.getSeconds(),
+    a: date.getDay()
+  }
+  const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+    let value = formatObj[key]
+    // Note: getDay() returns 0 on Sunday
+    if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
+    if (result.length > 0 && value < 10) {
+      value = '0' + value
+    }
+    return value || 0
+  })
+  return time_str
+}

src/utils/encrypt.js

@@ -0,0 +1,30 @@
+import CryptoJS from 'crypto-js'
+
+const key = "DOkldC48$@#(&siI";
+const iv = "4dad87133de5f2de"
+
+// 加密
+function Encrypt(text) {
+    // 解密模式为CBC，补码方式为PKCS5Padding（也就是PKCS7）
+    return CryptoJS.AES.encrypt(text, CryptoJS.enc.Utf8.parse(key), {
+        iv: CryptoJS.enc.Utf8.parse(iv),
+        mode: CryptoJS.mode.CBC,
+        padding: CryptoJS.pad.Pkcs7
+    }).toString()
+}
+
+// 解密 
+function Decrypt(text) {
+     // 解密模式为CBC，补码方式为PKCS5Padding（也就是PKCS7）
+    let decrypted = CryptoJS.AES.decrypt(text, CryptoJS.enc.Utf8.parse(key), {
+        iv: CryptoJS.enc.Utf8.parse(iv),
+        mode: CryptoJS.mode.CBC,
+        padding: CryptoJS.pad.Pkcs7
+    })
+    return decrypted.toString(CryptoJS.enc.Utf8)
+}
+
+export default {
+    Encrypt,
+    Decrypt
+}

src/utils/message.js

@@ -20,7 +20,7 @@ export const showToast = (msg, icon = 'none', mask = false) => {
  * @param title 
  * @returns 
  */
-export const showAlert = (content, title = '提示',showCancel=true,succFun) => {
+export const showAlert = (content, title = '提示',showCancel=false,succFun) => {
     return uni.showModal({
         title: title,
         content: content,
@@ -28,7 +28,7 @@ export const showAlert = (content, title = '提示',showCancel=true,succFun) =>
         success: function (res) {
             if (res.confirm) {
                 // console.log('用户点击确定');
-                succFun();
+                if(succFun)succFun();
             } else if (res.cancel) {
                 // console.log('用户点击取消');
             }

src/utils/request/index.js

@@ -1,16 +1,16 @@
 import HttpRequest from './http';
 import { merge } from 'lodash-es';
 import { getToken } from '../auth';
+import { CLIENT_ID } from '@/enums/cacheEnums';
 import { RequestCodeEnum, RequestMethodsEnum } from '@/enums/requestEnums';
+import { clearToken } from '@/utils/auth'
 import { useUserStore } from '@/stores/user'
 import { useMessage } from '../message';
-
 const message = useMessage();
 
 const requestHooks = {
     // 请求拦截器
     requestInterceptorsHook(options, config) {
-        // console.log("request=>",options,config)
         const { urlPrefix, baseUrl, withToken, isAuth } = config;
         options.header = options.header ?? {};
         if (urlPrefix) {
@@ -19,15 +19,18 @@ const requestHooks = {
         if (baseUrl) {
             options.url = `${baseUrl}${options.url}`;
         }
-        const token = getToken();
-        if (withToken && !options.header.token) {
-            options.header.token = token;
-        }
+        const token = getToken(); //console.log("token=>",token)
+        // if (withToken && !options.header.token) {
+            options.header.token = "Bearer "+ token;
+            options.header.Authorization = "Bearer "+ token;
+        // }
+        // console.log("request=>",options)
         return options;
     },
     // 响应拦截器
     responseInterceptorsHook(response, config) {
-        // console.log("response=>",response,config)
+        // console.log("response=>",response)
+        // console.log("response=>config=>",config)
         const { isTransformResponse, isReturnDefaultResponse, isAuth } = config;
         
         if (isReturnDefaultResponse) {
@@ -36,7 +39,7 @@ const requestHooks = {
         if (!isTransformResponse) {
             return response.data;
         }
-        const { logout, isLogin } = useUserStore();
+        // const { logout, isLogin } = useUserStore();
         const { code, data, msg, show } = response.data;
         // console.log(code,data,msg,show)
         switch (code) {
@@ -47,14 +50,17 @@ const requestHooks = {
                 message.toast(msg);
                 return Promise.reject(msg);
             case RequestCodeEnum.TOKEN_INVALID:
-                if (isAuth && isLogin) {
-                    
-                }
+                message.toast('登录状态已过期，请重新登录！');
+                // console.log(isAuth,isLogin)
+                // if (isAuth && isLogin) {
+					clearToken();
+					uni.reLaunch({ url: '/pages/login/login' })
+                // }
                 
                 return Promise.reject();
 
             default:
-                message.toast(msg)
+                message.alert(msg)
                 // return data;
                 return Promise.reject(msg);
         }
@@ -72,7 +78,10 @@ const requestHooks = {
 const defaultOptions = {
     requestOptions: {// 请求配置
         timeout: 10 * 1000,
-        header: { version: '1.0.0' }
+        header: { 
+            version: '1.0.0',
+            clientId:`${CLIENT_ID || 2}`, // clientId传2
+        }
     },
     baseUrl: `${import.meta.env.VITE_APP_BASE_URL || ''}`,// 基础 URL
     isReturnDefaultResponse: false,// 是否返回默认响应

src/utils/status.js

@@ -0,0 +1,20 @@
+
+// 1=Android、2=IOS
+export function formatIOS(type){
+    const result = {
+        'android':1,
+        'ios':2,
+    }
+    return result[type];
+}
+
+// 紧急程度 1-紧急 2-急 3-一般
+export function formatLevel(type){
+    const result = {
+        1:'紧急',
+        2:'急',
+        3:'一般',
+    }
+    return result[type];
+}
+

src/utils/system.js

@@ -39,6 +39,6 @@ export const getNavBarPaddingTop = () => {
 		h=0
 		// #endif
 	}
-	console.log("h=>",h)
+	// console.log("h=>",h)
 	return h;
 }

vite.config.js

@@ -17,13 +17,15 @@ export default defineConfig({
     },
   },
   server: {
+    host: '0.0.0.0', // 监听所有本地 IP
+    // port:9995,
     https: false,//是否启动https
-    proxy: {
-      // 简单代理配置
-      '/api': {
-        target: 'http://localhost:3000', // 目标服务器地址
-      }
-    }
+    // proxy: {
+    //   // 简单代理配置
+    //   '/api': {
+    //     target: 'http://localhost:3000', // 目标服务器地址
+    //   }
+    // }
     
   },