fix: 客户人员-客户人员所属

fix: 主归属人变更-变更审核
fix: 客户人员-接口地址调整
2025-09-01 13:16:14 +08:00 · 2025-09-01 13:05:30 +08:00 · 2025-09-01 13:02:08 +08:00 · 2025-08-26 11:33:41 +08:00 · 2025-08-26 11:32:49 +08:00 · 2025-08-26 09:27:47 +08:00
96 changed files with 15530 additions and 12944 deletions
--- a/.env.development
+++ b/.env.development
@@ -1,6 +1,2 @@
-
-#调用后台地址
-# VITE_APP_BASE_URL = 'http://118.186.13.120:31302'
-VITE_APP_BASE_URL = 'https://app-test.718yousheng.com'
-# VITE_APP_BASE_URL = "http://192.168.236.71:31302"
-# VITE_APP_BASE_URL = "http://123.57.20.168:3000"
+# VITE_APP_BASE_URL = "http://192.168.20.191:3000"
+VITE_APP_BASE_URL = "http://123.57.20.168:3000"
--- a/.env.production
+++ b/.env.production
@@ -1,6 +1 @@
-
-#调用后台地址
-VITE_APP_BASE_URL = 'https://app-test.718yousheng.com'
-# 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"
+VITE_APP_BASE_URL = "http://192.168.20.191:5173"
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -0,0 +1,13 @@
+{
+    "version" : "1.0",
+    "configurations" : [
+        {
+            "playground" : "standard",
+            "type" : "uni-app:app-android"
+        },
+        {
+            "openVueDevtools" : true,
+            "type" : "uni-app:h5"
+        }
+    ]
+}
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -40,40 +40,36 @@
    "build:quickapp-webview-union": "uni build -p quickapp-webview-union"
  },
  "dependencies": {
-    "@dcloudio/uni-app": "3.0.0-4070620250821001",
-    "@dcloudio/uni-app-harmony": "3.0.0-4070620250821001",
-    "@dcloudio/uni-app-plus": "3.0.0-4070620250821001",
-    "@dcloudio/uni-components": "3.0.0-4070620250821001",
-    "@dcloudio/uni-h5": "3.0.0-4070620250821001",
-    "@dcloudio/uni-mp-alipay": "3.0.0-4070620250821001",
-    "@dcloudio/uni-mp-baidu": "3.0.0-4070620250821001",
-    "@dcloudio/uni-mp-harmony": "3.0.0-4070620250821001",
-    "@dcloudio/uni-mp-jd": "3.0.0-4070620250821001",
-    "@dcloudio/uni-mp-kuaishou": "3.0.0-4070620250821001",
-    "@dcloudio/uni-mp-lark": "3.0.0-4070620250821001",
-    "@dcloudio/uni-mp-qq": "3.0.0-4070620250821001",
-    "@dcloudio/uni-mp-toutiao": "3.0.0-4070620250821001",
-    "@dcloudio/uni-mp-weixin": "3.0.0-4070620250821001",
-    "@dcloudio/uni-mp-xhs": "3.0.0-4070620250821001",
-    "@dcloudio/uni-quickapp-webview": "3.0.0-4070620250821001",
-    "@dcloudio/uni-ui": "^1.5.11",
-    "crypto-js": "^4.2.0",
+    "@dcloudio/uni-app": "3.0.0-4070520250711001",
+    "@dcloudio/uni-app-harmony": "3.0.0-4070520250711001",
+    "@dcloudio/uni-app-plus": "3.0.0-4070520250711001",
+    "@dcloudio/uni-components": "3.0.0-4070520250711001",
+    "@dcloudio/uni-h5": "3.0.0-4070520250711001",
+    "@dcloudio/uni-mp-alipay": "3.0.0-4070520250711001",
+    "@dcloudio/uni-mp-baidu": "3.0.0-4070520250711001",
+    "@dcloudio/uni-mp-harmony": "3.0.0-4070520250711001",
+    "@dcloudio/uni-mp-jd": "3.0.0-4070520250711001",
+    "@dcloudio/uni-mp-kuaishou": "3.0.0-4070520250711001",
+    "@dcloudio/uni-mp-lark": "3.0.0-4070520250711001",
+    "@dcloudio/uni-mp-qq": "3.0.0-4070520250711001",
+    "@dcloudio/uni-mp-toutiao": "3.0.0-4070520250711001",
+    "@dcloudio/uni-mp-weixin": "3.0.0-4070520250711001",
+    "@dcloudio/uni-mp-xhs": "3.0.0-4070520250711001",
+    "@dcloudio/uni-quickapp-webview": "3.0.0-4070520250711001",
+    "@dcloudio/uni-ui": "^1.5.7",
    "mescroll-uni": "^1.3.7",
    "pinia": "2.0.20",
-    "uuid": "^11.1.0",
-    "vue": "3.4.21",
-    "vue-i18n": "9.14.5"
+    "vue": "^3.4.21"
  },
  "devDependencies": {
-    "@dcloudio/types": "3.4.19",
-    "@dcloudio/uni-automator": "3.0.0-4070620250821001",
-    "@dcloudio/uni-cli-shared": "3.0.0-4070620250821001",
-    "@dcloudio/uni-stacktracey": "3.0.0-4070620250821001",
-    "@dcloudio/vite-plugin-uni": "3.0.0-4070620250821001",
-    "@vue/runtime-core": "3.5.20",
+    "@dcloudio/types": "^3.4.8",
+    "@dcloudio/uni-automator": "3.0.0-4070520250711001",
+    "@dcloudio/uni-cli-shared": "3.0.0-4070520250711001",
+    "@dcloudio/uni-stacktracey": "3.0.0-4070520250711001",
+    "@dcloudio/vite-plugin-uni": "3.0.0-4070520250711001",
+    "@vue/runtime-core": "^3.4.21",
    "lodash-es": "^4.17.21",
-    "sass": "^1.91.0",
-    "sass-loader": "^10.1.1",
+    "sass": "^1.79.3",
    "vite": "5.2.8"
  }
 }
--- a/server/index.js
+++ b/server/index.js
@@ -107,60 +107,19 @@ 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: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'}
+                {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'}
            ]
        }
    }))
@@ -169,18 +128,18 @@ app.post('/api/businessDaily', (req,res) => {
 // 查询CRM系统 Daily business
 app.post('/api/businessCRMList', (req,res) => {
    res.json(Mock.mock({
-        code: 0,
+        code: 200,
        data: {
            list:[
-                {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: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/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: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'},
@@ -205,7 +164,7 @@ app.post('/api/businessCRMList', (req,res) => {
 // 首页待办数据
 app.post('/api/backBlogCount', (req,res) => {
    res.json(Mock.mock({
-        code: 0,
+        code: 200,
        data: {
            count1:3,
            count2:7,
@@ -231,7 +190,7 @@ app.post('/api/stepData', (req,res) => {
        data: {
            date:new Date().getTime(),
            list:[
-                { id:1,desc: '2025秋季产品发布前期准备会，在科研楼0317会议室召开。', title: '13:30 — 15:30',beginTime:'13:30',endTime:'15:30'}, 
+                { id:1,desc: '2025秋季产品发布前期准备会1s，在科研楼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'}, 
            ]
        }
@@ -519,32 +478,6 @@ 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
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,27 +4,14 @@


 <script setup>
-// 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" });
-// })
+import { onLaunch } from '@dcloudio/uni-app';
+onLaunch((opt) => {
+    console.log("onLaunch")
+})


 </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>
--- a/src/api/auth.js
+++ b/src/api/auth.js
@@ -1,38 +1,13 @@
 import request from "@/utils/request"

-// 获取客户端版本
-export function versionCheck(data) {
-    return request.post({
-        url: '/acc/auth/version',
-        data
+
+// 获取图片
+export function getCaptchaImage() {
+    return request.get({
+        url: '/api/captchaImage',
    })
 }

-// 获取设备绑定状态
-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({
@@ -44,31 +19,19 @@ export function getVerifyCode(data) {
 // 登录
 export function login(data) {
    return request.post({
-        url: '/acc/auth/login',
+        url: '/api/user/login',
        data
    })
 }

-// 登出
-export function logout(data) {
-    return request.post({
-        url: '/acc/auth/logout',
-        data
-    })
-}

 // 获取用户信息
 export function getUserInfo(data) {
-    return request.get({
-        url: '/acc/profile/userInfo',
+    return request.post({
+        url: '/api/getUserInfo',
        data
    })
 }

-// 查询当前用户常用功能
-export function getUserFavorite(data) {
-    return request.post({
-        url: '/acc/profile/favorite',
-        data
-    })
-}
+
+
--- a/src/api/business.js
+++ b/src/api/business.js
@@ -8,23 +8,15 @@ export function search(data) {
    })
 }

-// 查询当前用户业务列表
-export function businessList(data) {
+// 企业日常
+export function businessDaily(data) {
    return request.post({
-        url: '/acc/profile/bizList',
+        url: '/api/businessDaily',
        data
    })
 }

-// 设置常用服务
-export function bizFavoriteSetting(data) {
-    return request.post({
-        url: '/acc/biz/favoriteSetting',
-        data
-    })
-}
-
-// CRM 列表
+// crm 列表
 export function businessCRMList(data) {
    return request.post({
        url: '/api/businessCRMList',
@@ -32,15 +24,17 @@ export function businessCRMList(data) {
    })
 }

-// CRM 查询走访报告列表
+// crm 查询走访报告列表
 export function visitorReportList(data) {
-    return request.post({
-        url: '/api/visitorReportList',
+    return request.get({
+        url: '/app/appVisistReport/list',
        data
+    },{
+        isTransformResponse:false
    })
 }

-// CRM 客户列表
+// crm 客户列表
 export function getGuestList(data) {
    return request.post({
        url: '/api/guestList',
@@ -48,7 +42,7 @@ export function getGuestList(data) {
    })
 }

-// CRM 查询走访报告详情
+// crm 查询走访报告详情
 export function visitorReportDetail(data) {
    return request.post({
        url: '/api/visitorReportDetail',
@@ -56,7 +50,7 @@ export function visitorReportDetail(data) {
    })
 }

-// CRM 查询走访报告列表
+// crm 查询走访报告列表
 export function mattersList(data) {
    return request.post({
        url: '/api/mattersList',
--- a/src/api/crm/activity/activity.js
+++ b/src/api/crm/activity/activity.js
@@ -3,7 +3,7 @@ import request from "@/utils/request";
 //获取客户单位用户人员信息
 export function crmCustomerUser(data) {
  return request.get({
-    url: "/crm/app/appCrmCusUserNewController/crmCustomerUser",
+    url: "/app/appCrmCusUserNewController/crmCustomerUser",
    data,
  },{
    isTransformResponse:false
@@ -13,7 +13,7 @@ export function crmCustomerUser(data) {
 //获取我公司人员信息
 export function myUserNameList(data) {
  return request.get({
-    url: "/crm/app/appVisistDetail/getCompanyPersonnerlName",
+    url: "/app/appVisistDetail/getCompanyPersonnerlName",
    data,
  },{
    isTransformResponse:false
@@ -23,7 +23,7 @@ export function myUserNameList(data) {
 //保存走访报告明细
 export function addVisistDetail(data) {
  return request.post({
-    url: "/crm/app/appVisistDetail/addVisistDetail",
+    url: "/app/appVisistDetail/addVisistDetail",
    data,
  },{
    isTransformResponse:false
@@ -33,7 +33,7 @@ export function addVisistDetail(data) {
 //删除走访报告中的某一项（日常走访，业务招待）
 export function deleVisistDetailItem(data) {
  return request.get({
-    url: "/crm/app/appVisistDetail/deleVisistDetailItem",
+    url: "/app/appVisistDetail/deleVisistDetailItem",
    data,
  },{
    isTransformResponse:false
@@ -43,7 +43,7 @@ export function deleVisistDetailItem(data) {
 //走访明细查询
 export function getVisistDetailItem(data) {
  return request.get({
-    url: "/crm/app/appVisistDetail/queryList",
+    url: "/app/appVisistDetail/queryList",
    data,
  },{
    isTransformResponse:false
@@ -53,7 +53,7 @@ export function getVisistDetailItem(data) {
 //删除整体的报告
 export function removeVisist(data) {
  return request.get({
-    url: "/crm/app/appVisistReport/remove",
+    url: "/app/appVisistReport/remove",
    data,
  },{
    isTransformResponse:false
@@ -63,7 +63,7 @@ export function removeVisist(data) {
 //走访报告列表查询
 export function getYsVisistList(data) {
  return request.get({
-    url: "/crm/app/appVisistReport/list",
+    url: "/app/appVisistReport/list",
    data
  },{
    isTransformResponse:false
@@ -73,7 +73,7 @@ export function getYsVisistList(data) {
 //更新一个报告的状态
 export function updateStatus(data) {
  return request.post({
-    url: "/crm/app/appVisistReport/updateStatus",
+    url: "/app/appVisistReport/updateStatus",
    data,
  },{
    isTransformResponse:false
@@ -83,7 +83,7 @@ export function updateStatus(data) {
 //获取客户信息列表
 export function getYsCustomerList(data) {
  return request.get({
-    url: "/crm/app/appCustomerIfno/pageList",
+    url: "/app/appCustomerIfno/pageList",
    data,
  },{
    isTransformResponse:false
@@ -93,7 +93,7 @@ export function getYsCustomerList(data) {
 //新增走访报告
 export function addVisist(data) {
  return request.post({
-    url: "/crm/app/appVisistReport/add",
+    url: "/app/appVisistReport/add",
    data,
  },{
    isTransformResponse:false
@@ -103,7 +103,7 @@ export function addVisist(data) {
 //走访报告查询
 export function getQueryVisistList(data) {
  return request.get({
-    url: "/crm/app/appVisistReport/queryList",
+    url: "/app/appVisistReport/queryList",
    data,
  },{
    isTransformResponse:false
@@ -113,7 +113,7 @@ export function getQueryVisistList(data) {
 //走访报告详细信息
 export function getYsVisistInfo(data) {
  return request.get({
-    url: "/crm/app/appVisistReport/getDetail",
+    url: "/app/appVisistReport/getDetail",
    data,
  },{
    isTransformResponse:false
@@ -123,7 +123,7 @@ export function getYsVisistInfo(data) {
 //一个走访报告下面关联的日常走访，业务招待等具体信息
 export function getVisistDetailList(data) {
  return request.get({
-    url: "/crm/app/appVisistDetail/list",
+    url: "/app/appVisistDetail/list",
    data,
  },{
    isTransformResponse:false
@@ -133,7 +133,7 @@ export function getVisistDetailList(data) {
 //新增点赞
 export function insertUserLike(data) {
  return request.post({
-    url: "/crm/app/appUserLike/addVisistDetail",
+    url: "/app/appUserLike/addVisistDetail",
    data,
  },{
    isTransformResponse:false
@@ -143,7 +143,7 @@ export function insertUserLike(data) {
 //查询是否已经点过赞
 export function getUserLike(data) {
  return request.get({
-    url: "/crm/app/appUserLike/queryUserLikeStatus/" + data,
+    url: "/app/appUserLike/queryUserLikeStatus/" + data,
  },{
    isTransformResponse:false
  });
@@ -152,7 +152,7 @@ export function getUserLike(data) {
 //获取当前人的信息
 export function getUserInfo(data) {
  return request.get({
-    url: "/crm/app/user/getUserInfo",
+    url: "/app/user/getUserInfo",
    data,
  },{
    isTransformResponse:false
@@ -162,7 +162,7 @@ export function getUserInfo(data) {
 //查询没有经过信息管理员审批的单子
 export function getApprovalList(data) {
  return request.get({
-    url: "/crm/app/appVisistReport/approvalList",
+    url: "/app/appVisistReport/approvalList",
    data,
  },{
    isTransformResponse:false
@@ -172,7 +172,7 @@ export function getApprovalList(data) {
 //打开详情页设置成为已读
 export function getUpdateApprovalForRead(data) {
  return request.post({
-    url: "/crm/app/appVisistReport/updateApprovalForRead",
+    url: "/app/appVisistReport/updateApprovalForRead",
    data,
  },{
    isTransformResponse:false
@@ -182,7 +182,7 @@ export function getUpdateApprovalForRead(data) {
 //提交通过活动报告
 export function auditActivityReport(data) {
  return request.post({
-    url: "/crm/app/activity/auditActivityReport",
+    url: "/app/activity/auditActivityReport",
    data,
    header: {
    'Content-Type': 'application/x-www-form-urlencoded' // 设置请求头，确保服务器正确解析 FormData
@@ -195,7 +195,7 @@ export function auditActivityReport(data) {
 //更新驳回原因
 export function getRejectReason(data) {
  return request.post({
-    url: "/crm/app/appVisistReport/updaterejectReason",
+    url: "/app/appVisistReport/updaterejectReason",
    data,
  },{
    isTransformResponse:false
@@ -205,7 +205,7 @@ export function getRejectReason(data) {
 //查询签到打卡信息集合为了报告
 export function addMapForReport(data) {
  return request.get({
-    url: "/crm/app/appVisistReport/addMapList",
+    url: "/app/appVisistReport/addMapList",
    data,
  },{
    isTransformResponse:false
--- a/src/api/crm/activity/map.js
+++ b/src/api/crm/activity/map.js
@@ -3,7 +3,7 @@ import request from "@/utils/request";
 //新增地图开始签到接口
 export function addStartMap(data) {
  return request.post({
-    url: "/crm/app/appVisistMap/Startadd",
+    url: "/app/appVisistMap/Startadd",
    data,
  },{
    isTransformResponse:false
@@ -13,7 +13,7 @@ export function addStartMap(data) {
 //新增地图开始打卡接口
 export function addStartMapForClockIn(data) {
  return request.post({
-    url: "/crm/app/appVisistMap/StartaddForClockIn",
+    url: "/app/appVisistMap/StartaddForClockIn",
    data,
  },{
    isTransformResponse:false
@@ -23,7 +23,7 @@ export function addStartMapForClockIn(data) {
 //打卡信息查看
 export function CheckInInformationViewing(data) {
  return request.get({
-    url: "/crm/app/appVisistMap/DKList",
+    url: "/app/appVisistMap/DKList",
    data
  },{
    isTransformResponse:false
@@ -33,7 +33,7 @@ export function CheckInInformationViewing(data) {
 //签到统计
 export function getSigninList(data) {
  return request.get({
-    url: "/crm/app/appVisistMap/QueryBased",
+    url: "/app/appVisistMap/QueryBased",
    data
  },{
    isTransformResponse:false
@@ -43,7 +43,7 @@ export function getSigninList(data) {
 //不签到统计
 export function getNoSigninList(data) {
  return request.get({
-    url: "/crm/app/appVisistMap/QueryBasedIsNull",
+    url: "/app/appVisistMap/QueryBasedIsNull",
    data
  },{
    isTransformResponse:false
--- a/src/api/crm/api_ys.js
+++ b/src/api/crm/api_ys.js
@@ -1,175 +1,138 @@
 import request from "@/utils/request"

 	
-export function getYsVisistList(data) {
-	return request.get({
-		url: '/crm/app/appVisistReport/list',
-		data: data
-	},{
-		isTransformResponse:false
-	})
-}
-//市场信息列表接口
-export function CrmMarketInformationList(data) {
-	return request.get({
-		url: '/crm/app/informationMarketInformation/list',
-		data: data
-	},{
-		isTransformResponse:false
-	})
-}
-//市场信息模块待审核改为提交
-export function handleCrmMarketInfo(data) {
-	return request.post({
-		url: '/crm/app/informationMarketInformation/handleCrmMarketInfo',
-		data
-	},{
-		isTransformResponse:false
-	})
-}
-//获取客户名称
-export function getYsCustomerList(data) {
-	return request.get({
-		url: '/crm/app/appCustomerIfno/pageList',
-		data
-	},{
-		isTransformResponse:false
-	})
-}
-//市场信息模块提交
-export function crmMarketInformationAdd(data) {
-	return request.post({
-		url: '/crm/app/informationMarketInformation/add',
-		data
-	},{
-		isTransformResponse:false
-	})
-}
-//市场信息模块查询
-export function crminformationItemForDetail(data) {
-	return request.get({
-		url: '/crm/app/informationMarketInformation/getDetail',
-		data
-	},{
-		isTransformResponse:false
-	})
-}
-//客户人员信息查询
-export function crmCustomerUser(data) {
-	return request.get({
-		url: '/crm/app/appCrmCusUserNewController/crmCustomerUser',
-		data
-	},{
-		isTransformResponse:false
-	})
-}
-//市场信息根据ID删除
-export function crmMarketInformationDelete(data) {
-	return request.get({
-		url: '/crm/app/informationMarketInformation/delete',
-		data
-	},{
-		isTransformResponse:false
-	})
-}
-//市场信息查询接口
-export function viewingMarketInfForAllMembers(data) {
-	return request.get({
-		url: '/crm/app/informationMarketInformation/viewList',
-		data
-	},{
-		isTransformResponse:false
-	})
-}
-//市场信息详情查询接口
-export function viewingMarketInfgetDetail(data) {
-	return request.get({
-		url: '/crm/app/informationMarketInformation/getDetail',
-		data
-	},{
-		isTransformResponse:false
-	})
-}
-//市场信审核列表接口
-export function approvalMarketInfget(data) {
-	return request.get({
-		url: 'app/informationMarketInformation/Approval',
-		data
-	},{
-		isTransformResponse:false
-	})
-}
-//回款模块列表查询
-export function getPaymentList(data) {
-	return request.get({
-		url: '/crm/app/InformationReviewController/getPaymentList',
-		data
-	},{
-		isTransformResponse:false
-	})
-}
-//回款新增接口
-export function addPaymentCollection(data) {
-	return request.post({
-		url: '/crm/app/InformationReviewController/addPaymentCollection',
-		data
-	},{
-		isTransformResponse:false
-	})
-}
-//回款更新接口
-export function updatePaymentDetail(data) {
-	return request.post({
-		url: '/crm/app/InformationReviewController/updatePaymentDetail',
-		data
-	},{
-		isTransformResponse:false
-	})
-}
-//回款删除接口
-export function deletePaymentDetail(data) {
-	return request.post({
-		url: '/crm/app/InformationReviewController/deletePaymentDetail',
-		data
-	},{
-		isTransformResponse:false
-	})
-}
+	export function getYsVisistList(data) {
+	    return request.get({
+	        url: '/app/appVisistReport/list',
+			data: data
+	    })
+	}
+	//市场信息列表接口
+	export function CrmMarketInformationList(data) {
+	    return request.get({
+	        url: '/app/informationMarketInformation/list',
+			data: data
+	    })
+	}
+	//市场信息模块待审核改为提交
+	export function handleCrmMarketInfo(data) {
+			return request.post({
+			    url: '/app/informationMarketInformation/handleCrmMarketInfo',
+			    data
+			})
+	}
+	//获取客户名称
+	export function getYsCustomerList(data) {
+			return request.get({
+			    url: '/app/appCustomerIfno/pageList',
+			    data
+			})
+	}
+	//市场信息模块提交
+	export function crmMarketInformationAdd(data) {
+			return request.post({
+			    url: '/app/informationMarketInformation/add',
+			    data
+			})
+	}
+	//市场信息模块查询
+	export function crminformationItemForDetail(data) {
+			return request.get({
+			    url: '/app/informationMarketInformation/getDetail',
+			    data
+			})
+	}
+	//客户人员信息查询
+	export function crmCustomerUser(data) {
+			return request.get({
+			    url: '/app/appCrmCusUserNewController/crmCustomerUser',
+			    data
+			})
+	}
+	//市场信息根据ID删除
+	export function crmMarketInformationDelete(data) {
+			return request.get({
+			    url: '/app/informationMarketInformation/delete',
+			    data
+			})
+	}
+	//市场信息查询接口
+	export function viewingMarketInfForAllMembers(data) {
+			return request.get({
+			    url: '/app/informationMarketInformation/viewList',
+			    data
+			})
+	}
+	//市场信息详情查询接口
+	export function viewingMarketInfgetDetail(data) {
+			return request.get({
+			    url: '/app/informationMarketInformation/getDetail',
+			    data
+			})
+	}
+	//市场信审核列表接口
+	export function approvalMarketInfget(data) {
+			return request.get({
+			    url: 'app/informationMarketInformation/Approval',
+			    data
+			})
+	}
+	//回款模块列表查询
+	export function getPaymentList(data) {
+			return request.get({
+			    url: '/app/InformationReviewController/getPaymentList',
+			    data
+			})
+	}
+	//回款新增接口
+	export function addPaymentCollection(data) {
+			return request.post({
+			    url: '/app/InformationReviewController/addPaymentCollection',
+			    data
+			})
+	}
+	//回款更新接口
+	export function updatePaymentDetail(data) {
+			return request.post({
+			    url: '/app/InformationReviewController/updatePaymentDetail',
+			    data
+			})
+	}
+	//回款删除接口
+	export function deletePaymentDetail(data) {
+			return request.post({
+			    url: '/app/InformationReviewController/deletePaymentDetail',
+			    data
+			})
+	}

-//全员查询回款接口
-export function getFullStaffStatisticsViewingTable(data) {
-	return request.get({
-		url: '/crm/app/InformationReviewController/getFullStaffStatisticsViewingTable',
-		data
-	},{
-		isTransformResponse:false
-	})
-}
-//个人查询回款接口
-export function getPersonalPaymentCollectionTable(data) {
-	return request.get({
-		url: '/crm/app/InformationReviewController/getPersonalPaymentCollectionTable',
-		data
-	},{
-		isTransformResponse:false
-	})
-}
+	//全员查询回款接口
+	export function getFullStaffStatisticsViewingTable(data) {
+			return request.get({
+			    url: '/app/InformationReviewController/getFullStaffStatisticsViewingTable',
+			    data
+			})
+	}
+	//个人查询回款接口
+	export function getPersonalPaymentCollectionTable(data) {
+			return request.get({
+			    url: '/app/InformationReviewController/getPersonalPaymentCollectionTable',
+			    data
+			})
+	}
+	
+	//市场信息审核通过接口
+	export function crmMarketInformationApprovalSuccess(data) {
+			return request.get({
+			    url: '/app/informationMarketInformation/ApprovalSuccess',
+			    data
+			})
+	}
+	//市场信息审核驳回接口
+	export function crmMarketInformationApprovalUnSuccess(data) {
+			return request.get({
+			    url: '/app/informationMarketInformation/ApprovalUnSuccess',
+			    data
+			})
+	}
 	
-//市场信息审核通过接口
-export function crmMarketInformationApprovalSuccess(data) {
-	return request.get({
-		url: '/crm/app/informationMarketInformation/ApprovalSuccess',
-		data
-	},{
-		isTransformResponse:false
-	})
-}
-//市场信息审核驳回接口
-export function crmMarketInformationApprovalUnSuccess(data) {
-	return request.get({
-		url: '/crm/app/informationMarketInformation/ApprovalUnSuccess',
-		data
-	},{
-		isTransformResponse:false
-	})
-}
--- a/src/api/crm/customer/getCustomer.js
+++ b/src/api/crm/customer/getCustomer.js
@@ -25,7 +25,7 @@ export function saveappCrmCusUserNew(params){
 // 查询业务员名下所有的客户
 export function SearchForAllCustomersSalesperson(params){
    return request.get({
-        url: 'app/appCrmCusUserNewController/SearchForAllCustomersSalesperson',
+        url: '/crm/app/appCrmCusUserNewController/SearchForAllCustomersSalesperson',
        data: params
    },{isTransformResponse: false})
 }
@@ -47,8 +47,8 @@ export function SearchForAllPerson(params){
 // 客户人员新增审核列表
 export　function　getCusUserApprovalList(params) {
    return request.get({
-        url: '/crm/app/appCrmCusUserNewController/getCusUserApprovalList',
-        data: params
+            url: '/crm/app/appCrmCusUserNewController/getCusUserApprovalList',
+            data: params
        }, {isTransformResponse: false}
    )
 }
--- a/src/api/crm/plan/getPlan.js
+++ b/src/api/crm/plan/getPlan.js
@@ -1,15 +1,15 @@
 import request from "@/utils/request"
-
-export function getPersonalPlanList(params) {
-    return request.post({
-        url: '/getPersonalPlanList',
-        params
-    })
-}
-
-export function getUserInfo(data) {
+// 获取用户信息
+/*export function getUserInfo(data) {
    return request.get({
-        url: '/crm/app/user/getUserInfo',
+        url: '/app/user/getUserInfo',
+        data
+    }, {isTransformResponse: false})
+}*/
+//获取个人周计划列表
+export function getWeeklyPlanList(data) {
+    return request.get({
+        url: '/crm/app/appWeeklyPlan/getWeeklyListByUser',
        data
    }, {isTransformResponse: false})
 }
@@ -20,13 +20,6 @@ export function getAllWeekPlanList(params){
        data: params
    },{isTransformResponse: false})
 }
-//获取个人周计划列表
-export function getWeeklyPlanList(data) {
-    return request.get({
-        url: '/crm/app/appWeeklyPlan/getWeeklyListByUser',
-        data
-    }, {isTransformResponse: false})
-}
 // 组合查询计划列表
 export function getWeekPlanListByDate(params){
    return request.get({
--- a/src/api/home.js
+++ b/src/api/home.js
@@ -1,24 +1,9 @@
 import request from "@/utils/request"

-// 待办数据查询 获取用户消息的待阅和已阅数量
-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) {
+// 待办数据查询
+export function backBlogCount(data) {
    return request.post({
-        url: '/acc/profile/favorite',
+        url: '/api/backBlogCount',
        data
    })
 }
@@ -47,7 +32,13 @@ export function salesTask(data) {
    })
 }

-
+// 常用服务
+export function commonServices(data) {
+    return request.post({
+        url: '/api/commonServices',
+        data
+    })
+}

 // 新闻公告
 export function newsQueryList(data) {
--- a/src/api/notice.js
+++ b/src/api/notice.js
@@ -3,15 +3,7 @@ import request from "@/utils/request"
 // 查询通知列表
 export function noticeList(data) {
    return request.post({
-        url: '/acc/message/notify/detail',
-        data
-    })
-}
-
-// 获取用户审批的待办和已办详情
-export function flowList(data) {
-    return request.post({
-        url: '/acc/message/flow/detail',
+        url: '/api/noticeList',
        data
    })
 }
--- a/src/components/customHeader.vue
+++ b/src/components/customHeader.vue
@@ -51,20 +51,22 @@ const handleBack = () => {

 <style scoped>
 .custom-navbar {
-    width: 100%;
+    width: 750rpx;
    position: fixed;
    top: 0;
+    left: 50%;
+    margin-left:-375rpx;
    z-index: 999;
    /* #ifdef APP-PLUS */
-    background: #307AF5 url('@/static/images/bg-Blue-header.png') no-repeat;
-    background-size:100% 160rpx;
-    height:160rpx;
+    /* background: url('@/static/images/bg-Blue-header.png') no-repeat;
+    background-size:750rpx 160rpx;
+    height:160rpx; */
    /* #endif */

    /* #ifndef APP-PLUS */
-    background: #307AF5 url('@/static/images/bg-Blue-header2.png') no-repeat;
-    background-size:100% 116rpx;
-    height:116rpx;
+    /* background: url('@/static/images/bg-Blue-header2.png') no-repeat;
+    background-size:750rpx 116rpx;
+    height:116rpx; */
    /* #endif */
   
 }
--- a/src/components/customSearch.vue
+++ b/src/components/customSearch.vue
@@ -5,7 +5,7 @@
            <!--   @confirm="handleSearch"  @cancel="handleCancel"-->
            <uni-search-bar class="custom-search" 
                radius="28" 
-                placeholder="请输入搜索条件" 
+                placeholder="请输入您想查询的内容或服务" 
                clearButton="auto"
                bgColor="#6FA2F8" textColor="#ffffff" 
                v-model="searchText"
@@ -240,7 +240,7 @@ const handleResultClick = (item) => {
    margin-bottom: 0;
    border-radius: 8px 8px 0 0;
    /* #ifdef APP-PLUS */
-    height: calc(100vh - 168px);
+    height: calc(100vh - 130px);
    /* #endif */
    /* #ifndef APP-PLUS */
    height: calc(100vh - 150px);
@@ -268,6 +268,7 @@ const handleResultClick = (item) => {
 .tag-container {
    display: flex;
    flex-wrap: wrap;
+    gap:20rpx;
 }

 .search-tag {
@@ -275,8 +276,8 @@ const handleResultClick = (item) => {
    border:1px solid #E8E8E8;
    border-radius: 10rpx;
    padding: 10rpx 15rpx;
-    margin-right: 20rpx;
-    margin-bottom: 20rpx;
+    /* margin-right: 20rpx;
+    margin-bottom: 20rpx; */
    font-size: 28rpx;
 }

--- a/src/components/customShowModal.vue
+++ b/src/components/customShowModal.vue
@@ -1,163 +0,0 @@
-<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>
--- a/src/components/multipleSelect.vue
+++ b/src/components/multipleSelect.vue
@@ -43,8 +43,7 @@
 </template>

 <script setup>
-import { onMounted, reactive, ref } from "vue";
-
+import { onMounted, reactive, ref, defineExpose} from "vue";
 const props = defineProps({
    // 是否显示全部清空按钮
    showClearIcon: {
@@ -175,6 +174,14 @@ const handleChange = (index, item) => {
    // 触发回调函数
    emit("change", changevalue, realValue);
 };
+// 失去焦点时关闭选项列表
+const handleBlur = () => {
+  active.value = false;
+};
+// 定义组件实例暴露的方法
+defineExpose({
+  handleBlur
+});
 </script>

 <style lang="scss" scoped>
--- a/src/enums/cacheEnums.js
+++ b/src/enums/cacheEnums.js
@@ -1,8 +1,2 @@
 export const TOKEN_KEY = 'token';
-export const AGREEWELCOME_KEY="agreewelcome";
-
-// clientId 默认写2 
-export const CLIENT_ID="2";
-// #区分内外网 //1-内网，2-外网
-export const NETWORK_ENV=2;
-
+export const AGREEWELCOME_KEY="agreewelcome"
--- a/src/enums/requestEnums.js
+++ b/src/enums/requestEnums.js
@@ -11,8 +11,8 @@ export const RequestMethodsEnum = {

 export const RequestCodeEnum = {
    SUCCESS: 200, //成功
-    FAILED: -1, // 失败
-    TOKEN_INVALID: 401 // TOKEN失效未登录
+    FAILED: 500, // 失败
+    TOKEN_INVALID: 10003 // TOKEN失效未登录
 };

 export const RequestErrMsgEnum = {
--- a/src/main.js
+++ b/src/main.js
@@ -1,28 +1,16 @@
 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 {
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,7 +1,7 @@
 {
    "id" : "H5E705637",
    "name" : "app",
-    // "appid" : "H5E705637",
+    // "appid" : "",
    "description" : "",
    "versionName" : "1.0.0",
    "versionCode" : "100",
@@ -16,7 +16,7 @@
        "compilerVersion" : 3,
        "splashscreen" : {
            "alwaysShowBeforeRender" : true,
-            "waiting" : false,// 是否显示等待界面
+            "waiting" : true,
            "autoclose" : true,
            "delay" : 0
        },
--- a/src/pages.json
+++ b/src/pages.json
@@ -5,19 +5,12 @@
 			"^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue"
 		}
 	},
-	"pages": [
-		{
+	"pages": [{
 			"path": "pages/loading/loading",
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
-		{
-			"path": "pages/deviceAuth/deviceAuth",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
 		{
 			"path": "pages/login/login",
 			"style": {
@@ -27,73 +20,11 @@
 		{
 			"path": "pages/home/home",
 			"style": {
-				"navigationBarTitleText": "",
-				"renderer": "native",
-				"hardwareAccelerated": true
+				"navigationBarTitleText": ""
 			}
 		},
 		{
 			"path": "pages/business/business",
-			"style": {
-				"navigationBarTitleText": "",
-				"renderer": "native",
-				"hardwareAccelerated": true
-			}
-		},
-		{
-			"path": "pages/business/editDaily",
-			"style": {
-				"navigationBarTitleText": "",
-				"renderer": "native",
-				"hardwareAccelerated": true
-			}
-		},
-		{
-			"path": "pages/notice/notice",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/notice/waitApprove",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/notice/waitApproveDetail",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/userinfo/userinfo",
-			"style": {
-				"navigationBarTitleText": "",
-				"renderer": "native",
-				"hardwareAccelerated": true
-			}
-		},
-		{
-			"path": "pages/userinfo/version",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/search/search",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/h5-webview/h5-webview",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/CRM/marketInformation", //市场信息管理
 			"style": {
 				"navigationBarTitleText": ""
 			}
@@ -384,20 +315,6 @@
 				"navigationBarTitleText": ""
 			}
 		},
-		{
-			"path": "pages/business/CRM/mainOwner/view/viewMainOwner",
-			//客户人员主归属人变更查看
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/CRM/mainOwner/view/viewMainOwnerDetail",
-			//客户人员主归属人变更查看明细
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
 		{
 			"path": "pages/business/CRM/customer/components/customerUserEdit",
 			//客户人员详情编辑
@@ -435,6 +352,13 @@
 		},
 		//===================================活动报告====================
 		{
+			"path": "pages/business/CRM/mainOwner/view/viewMainOwner", //查看主归属人变更信息 
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+
 			"path": "pages/business/CRM/marketActivity/visitReport",
 			//市场信息管理
 			"style": {
@@ -546,8 +470,28 @@
 			"style": {
 				"navigationBarTitleText": ""
 			}
-		}
+		},
 		//===================================活动报告====================
+		{
+			"path": "pages/notice/notice",
+			"style": {
+				"navigationBarTitleText": "",
+				"app-plus": {
+					"bounce": "none"
+					// 取消APP端iOS回弹,避免与下拉刷新冲突 (可统一配在 'globalStyle')
+				},
+				"mp-alipay": {
+					"allowsBounceVertical": "NO"
+				}
+				// 取消支付宝和钉钉小程序的iOS回弹,避免与下拉刷新冲突 (可统一配在 'globalStyle')
+			}
+		},
+		{
+			"path": "pages/userinfo/userinfo",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		}
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
@@ -563,8 +507,7 @@
 		"backgroundColor": "#000000",
 		"fontSize": "12px",
 		"iconWidth": "24px",
-		"list": [
-			{
+		"list": [{
 				"pagePath": "pages/home/home",
 				"iconPath": "static/images/tabs/menu-home.png",
 				"selectedIconPath": "static/images/tabs/menu-home-on.png",
--- a/src/pages/business/CRM/customer/changeCustomerOwner.vue
+++ b/src/pages/business/CRM/customer/changeCustomerOwner.vue
@@ -126,10 +126,7 @@ let list = ref([]);
 const upOption = ref({
  page: {num: 0, size: 10},
  noMoreSize: 5,
-  empty: { 
-    tip: '~ 空空如也 ~',
-    icon: "../../static/images/mescroll-empty.png"
-  },
+  empty: {tip: '~ 空空如也 ~'},
  textLoading: '加载中...',
  textNoMore: '已经到底了'
 });
--- a/src/pages/business/CRM/customer/components/confirmForm.vue
+++ b/src/pages/business/CRM/customer/components/confirmForm.vue
@@ -168,8 +168,8 @@
            <uni-forms-item label="爱好" name="hobby" class="uni-forms-item is-direction-top is-top">
              <!-- 索引：hobbyIndex 范围：hobbyList 响应：handleHobbyChange-->
              <uni-easyinput v-model="formData.hobby" placeholder="请输入爱好" :disabled="!editable"/>
-              <multipleSelect :multiple="true" :value="hobbyIndex" downInner :options="hobbyList"
-                              @change="handleHobbyChange"  :slabel="'name'"
+              <multipleSelect ref="hobbySelectRef" :multiple="true" downInner :value="hobbyIds" :options="hobbyList"
+                              @change="handleHobbyChange" :slabel="'name'"

              ></multipleSelect><!--placeholder="请选择爱好标签"-->
            </uni-forms-item>
@@ -467,20 +467,29 @@ let handleThinkLevelChange = (e) => {
 // 系统推荐等级
 let recommendLevel = ref("");
 let getRecommendLevel = async () => {
-  if (formData.value.cusEstate && formData.value.functionalRequirements) {
+  if (formData.value.cusEstate) {
    let {cusEstate, functionalRequirements} = formData.value;
    let param = {cusEstate, functionalRequirements};
    if (formData.value.salesmanThinkLevel) {
      param.personnelLevel = formData.value.salesmanThinkLevel;
    }
-    let res = await getCustomerLevel(param).catch(err => {
+    let res = await getCustomerLevel(param)
+    /*.catch(err => {
      console.error(err, "客户的系统推荐等级获取失败")
-    })
-    if (!res.systemRecommendationLevel) {
-      recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
-      console.log(formData.value.systemThinkLevel + "???")
+    })*/
+    try{
+      if(res.data.systemRecommendationLevel){
+        formData.value.systemThinkLevel = res.data.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐";
+      }
+    }catch(e){
+      if (res.systemRecommendationLevel) {
+        formData.value.systemThinkLevel = res.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
+      }
    }
-    formData.value.systemThinkLevel = res.systemRecommendationLevel;
  } else {
    recommendLevel.value = "无公司等级信息，无法推荐等级";
  }
@@ -509,8 +518,7 @@ let handleUserTypeChange = (e) => {

 // 选择日期
 function handleTenureTimeChange(e) {
-  let {value} = e.detail;
-  formData.value.tenureTime = value;
+  formData.value.tenureTime = e;
 }

 // 需求层次索引
@@ -533,16 +541,17 @@ let handleDevelopChange = e => {

 // 选择生日
 function handleBirthdayChange(e) {
-  let{value} = e.detail
-  formData.value.birthday = value;
+  formData.value.birthday = e;
 }

 // 爱好标签索引
-let hobbyIndex = reactive([]);
+let hobbyIds = ref([]);
+let hobbies = ref([]);
 // 选择爱好标签
-const handleHobbyChange = (item, value) => {
-  // console.log("爱好", item, value);
-  hobbyIndex = value;
+const handleHobbyChange = (items, ids) => {
+  console.log('选择爱好', items, ids);
+  hobbyIds.value = [];
+  hobbies.value = items;
 };
 // 选择
 const handleNativeChange = (e) => {
--- a/src/pages/business/CRM/customer/components/customerUserEdit.vue
+++ b/src/pages/business/CRM/customer/components/customerUserEdit.vue
@@ -168,8 +168,8 @@
            <uni-forms-item label="爱好" name="hobby" class="uni-forms-item is-direction-top is-top">
              <!-- 索引：hobbyIndex 范围：hobbyList 响应：handleHobbyChange-->
              <uni-easyinput v-model="formData.hobby" placeholder="请输入爱好"/>
-              <multipleSelect :multiple="true" :value="hobbyIndex" downInner :options="hobbyList"
-                              @change="handleHobbyChange"  :slabel="'name'"
+              <multipleSelect ref="hobbySelectRef" :multiple="true" downInner :value="hobbyIds" :options="hobbyList"
+                              @change="handleHobbyChange" :slabel="'name'"

              ></multipleSelect><!--placeholder="请选择爱好标签"-->
            </uni-forms-item>
@@ -468,20 +468,29 @@ let handleThinkLevelChange = (e) => {
 // 系统推荐等级
 let recommendLevel = ref("");
 let getRecommendLevel = async () => {
-  if (formData.value.cusEstate && formData.value.functionalRequirements) {
+  if (formData.value.cusEstate) {
    let {cusEstate, functionalRequirements} = formData.value;
    let param = {cusEstate, functionalRequirements};
    if (formData.value.salesmanThinkLevel) {
      param.personnelLevel = formData.value.salesmanThinkLevel;
    }
-    let res = await getCustomerLevel(param).catch(err => {
+    let res = await getCustomerLevel(param)
+    /*.catch(err => {
      console.error(err, "客户的系统推荐等级获取失败")
-    })
-    if (!res.systemRecommendationLevel) {
-      recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
-      console.log(formData.value.systemThinkLevel + "???")
+    })*/
+    try{
+      if(res.data.systemRecommendationLevel){
+        formData.value.systemThinkLevel = res.data.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐";
+      }
+    }catch(e){
+      if (res.systemRecommendationLevel) {
+        formData.value.systemThinkLevel = res.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
+      }
    }
-    formData.value.systemThinkLevel = res.systemRecommendationLevel;
  } else {
    recommendLevel.value = "无公司等级信息，无法推荐等级";
  }
@@ -510,8 +519,7 @@ let handleUserTypeChange = (e) => {

 // 选择日期
 function handleTenureTimeChange(e) {
-  let {value} = e.detail;
-  formData.value.tenureTime = value;
+  formData.value.tenureTime = e;
 }

 // 需求层次索引
@@ -534,17 +542,19 @@ let handleDevelopChange = e => {

 // 选择生日
 function handleBirthdayChange(e) {
-  let{value} = e.detail
-  formData.value.birthday = value;
+  formData.value.birthday = e;
 }

 // 爱好标签索引
-let hobbyIndex = reactive([]);
+let hobbyIds = ref([]);
+let hobbies = ref([]);
 // 选择爱好标签
-const handleHobbyChange = (item, value) => {
-  // console.log("爱好", item, value);
-  hobbyIndex = value;
+const handleHobbyChange = (items, ids) => {
+  console.log('选择爱好', items, ids);
+  hobbyIds.value = [];
+  hobbies.value = items;
 };
+
 // 选择
 const handleNativeChange = (e) => {
  formData.value.nativec = (e.detail.value.map(item => {
@@ -568,16 +578,16 @@ let handleWorkingStatusChange = e => {
 }

 let submitForm = async () => {
-  let hobbyTags = hobbyIndex.map(it => {
-    let {name} = hobbyList[it];
+  let hobbyTags = hobbies.value.map(it => {
+    let {name} = it;
    return name;
  })
-  formData.value.iphone = formData.value.mobilePhone; // 特殊处理
  const hobbyTagString = hobbyTags.join('，');
  console.log(hobbyTagString);
  if (hobbyTagString || formData.value.hobby) {
-    formData.value.hobby = formData.value.hobby ? formData.value.hobby + '，' + hobbyTagString : hobbyTagString;
+    formData.value.hobby = hobbyTagString ? (formData.value.hobby ? formData.value.hobby + '，' : '') + hobbyTagString : formData.value.hobby;
  }
+  formData.value.iphone = formData.value.mobilePhone; // 特殊处理
  // console.log(formData.value, "校验表单数据")
  // console.log(recommendLevel);
  formData.value.cusName = customerUser.value.cusName;
--- a/src/pages/business/CRM/customer/customerAdd.vue
+++ b/src/pages/business/CRM/customer/customerAdd.vue
@@ -21,7 +21,7 @@

      <!-- 正文内容 -->
      <view class="white-bg">
-        <view class="form-con">
+        <view class="form-con" @click="handleBlur">
          <uni-forms ref="formRef" :model="formData" :rules="rules" label-width="40%">
            <!-- 选择客户 -->
            <uni-forms-item label="客户名称" name="cusName" required class="f-c-right">
@@ -178,7 +178,7 @@
            <uni-forms-item label="爱好" name="hobby" class="uni-forms-item is-direction-top is-top">
              <!-- 索引：hobbyIndex 范围：hobbyList 响应：handleHobbyChange-->
              <uni-easyinput v-model="formData.hobby" placeholder="请输入爱好"/>
-              <multipleSelect :multiple="true" :value="hobbyIndex" downInner :options="hobbyList"
+              <multipleSelect ref="hobbySelectRef" :multiple="true" downInner :value="hobbyIds" :options="hobbyList"
                              @change="handleHobbyChange" :slabel="'name'"

              ></multipleSelect><!--placeholder="请选择爱好标签"-->
@@ -271,7 +271,7 @@
 </template>

 <script setup>
-import {ref, onMounted, computed, reactive} from 'vue'
+import {ref, reactive} from 'vue'
 import customHeader from '@/components/customHeader.vue'
 import multipleSelect from '@/components/multipleSelect.vue'
 import {
@@ -284,7 +284,8 @@ import {
 } from "./dataMap";
 import city from "@/utils/area";
 import {getCustomerLevel, saveappCrmCusUserNew} from "@/api/crm/customer/getCustomer";
-
+// 对 multipleSelect 组件的引用
+const hobbySelectRef = ref(null);
 // 表单引用
 const formRef = ref({});
 // 表单数据
@@ -412,7 +413,7 @@ let handleCustomerClick = () => {
        let {
          cusName, // 公司名称
          cusEstate, // 等级
-            cusId,
+          cusId,
        } = data;
        customerUser.value.cusName = cusName;
        if (!cusEstate) customerUser.value.sysThinkLevel = "该客户暂无等级信息，无法进行系统推荐"
@@ -448,20 +449,29 @@ let handleThinkLevelChange = (e) => {
 // 系统推荐等级
 let recommendLevel = ref("");
 let getRecommendLevel = async () => {
-  if (formData.value.cusEstate && formData.value.functionalRequirements) {
+  if (formData.value.cusEstate) {
    let {cusEstate, functionalRequirements} = formData.value;
    let param = {cusEstate, functionalRequirements};
    if (formData.value.salesmanThinkLevel) {
      param.personnelLevel = formData.value.salesmanThinkLevel;
    }
-    let res = await getCustomerLevel(param).catch(err => {
+    let res = await getCustomerLevel(param)
+    /*.catch(err => {
      console.error(err, "客户的系统推荐等级获取失败")
-    })
-    if (!res.systemRecommendationLevel) {
-      recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
-      console.log(formData.value.systemThinkLevel + "???")
+    })*/
+    try{
+      if(res.data.systemRecommendationLevel){
+        formData.value.systemThinkLevel = res.data.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐";
+      }
+    }catch(e){
+      if (res.systemRecommendationLevel) {
+        formData.value.systemThinkLevel = res.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
+      }
    }
-    formData.value.systemThinkLevel = res.systemRecommendationLevel;
  } else {
    recommendLevel.value = "无公司等级信息，无法推荐等级";
  }
@@ -489,9 +499,9 @@ let handleUserTypeChange = (e) => {
 }

 // 选择日期
-function handleTenureTimeChange(e) {
-  let {value} = e.detail;
-  formData.value.tenureTime = value;
+function handleTenureTimeChange(val) {
+  console.log(val)
+  formData.value.tenureTime = val;
 }

 // 需求层次索引
@@ -513,18 +523,20 @@ let handleDevelopChange = e => {
 }

 // 选择生日
-function handleBirthdayChange(e) {
-  let{value} = e.detail
-  formData.value.birthday = value;
+function handleBirthdayChange(val) {
+  formData.value.birthday = val;
 }

 // 爱好标签索引
-let hobbyIndex = reactive([]);
+let hobbyIds = ref([]);
+let hobbies = ref([]);
 // 选择爱好标签
-const handleHobbyChange = (item, value) => {
-  // console.log("爱好", item, value);
-  hobbyIndex = value;
+const handleHobbyChange = (items, ids) => {
+  console.log('选择爱好', items, ids);
+  hobbyIds.value = [];
+  hobbies.value = items;
 };
+
 // 选择
 const handleNativeChange = (e) => {
  formData.value.nativec = (e.detail.value.map(item => {
@@ -546,16 +558,93 @@ let handleWorkingStatusChange = e => {
  workingStatusIndex.value = 0;
  formData.value.workingStatus = workingStatusList[value].name;
 }
-
-let submitForm = async () => {
-  let hobbyTags = hobbyIndex.map(it => {
-    let {name} = hobbyList[it];
+// 多选组件失去焦点关闭
+let handleBlur = () => {
+  if (hobbySelectRef.value) hobbySelectRef.value.handleBlur();
+}
+// 提取爱好标签处理逻辑
+const processHobbyTags = () => {
+  let hobbyTags = hobbies.value.map(it => {
+    let {name} = it;
    return name;
  })
  const hobbyTagString = hobbyTags.join('，');
  console.log(hobbyTagString);
  if (hobbyTagString || formData.value.hobby) {
-    formData.value.hobby = formData.value.hobby ? formData.value.hobby + '，' + hobbyTagString : hobbyTagString;
+    formData.value.hobby = hobbyTagString ? (formData.value.hobby ? formData.value.hobby + '，' : '') + hobbyTagString : formData.value.hobby;
+  }
+};
+
+// 提取表单验证逻辑
+const validateForm = async () => {
+  formData.value.cusName = customerUser.value.cusName;
+  await formRef.value.validate();
+  console.log(formData.value, "提交表单数据");
+};
+
+// 提取API调用逻辑
+const saveCustomerUser = async () => {
+  uni.showLoading();
+  try {
+    const res = await saveappCrmCusUserNew(formData.value);
+    if(res.code === 200){
+      uni.showToast({
+        title: "保存成功"
+      });
+    } else {
+      uni.showToast({
+        title: "操作失败",
+        icon: "error"
+      });
+    }
+    setTimeout(() => uni.navigateBack(), 1500);
+  } catch(err) {
+    uni.showToast({
+      icon: 'none',
+      title: "保存失败"
+    });
+  }
+  finally{
+    uni.hideLoading()
+  }
+};
+
+// 简化后的 submitForm 方法
+let submitForm = async () => {
+  console.log(formData.value);
+  try {
+    if(formData.value.iphone){
+      formData.value.mobilePhone = formData.value.iphone;
+    }
+    // 处理爱好标签
+    processHobbyTags();
+
+    // 表单验证
+    await validateForm();
+
+    // 保存客户人员信息
+    await saveCustomerUser();
+  } catch (err) {
+    uni.showToast({
+      icon: 'none',
+      title: '请检查并完善信息'
+    });
+    console.warn(err);
+  }
+};
+
+/*let submitForm = async () => {
+  let hobbyTags = hobbies.value.map(it => {
+    let {name} = it;
+    return name;
+  })
+  const hobbyTagString = hobbyTags.join('，');
+  console.log(hobbyTagString);
+  if (hobbyTagString || formData.value.hobby) {
+    formData.value.hobby = hobbyTagString ? (formData.value.hobby ? formData.value.hobby + '，' : '') + hobbyTagString : formData.value.hobby;
+  }
+  if(formData.value.iphone){
+    formData.value.mobilePhone = formData.value.iphone;
  }
  // console.log(formData.value, "校验表单数据")
  // console.log(recommendLevel);
@@ -565,19 +654,19 @@ let submitForm = async () => {
    console.log(formData.value, "提交表单数据")
    // 请求保存
    uni.showLoading()
-    saveappCrmCusUserNew(formData.value).then(res=>{
+    saveappCrmCusUserNew(formData.value).then(res => {
      uni.hideLoading();
-      if(res.code === 200){
+      if (res.code === 200) {
        uni.showToast({
          title: "保存成功"
        })
-      }else{
+      } else {
        uni.showToast({
          title: "操作失败"
        })
      }
-      setTimeout(()=>uni.navigateBack(), 1500);
-    }).catch(err=>{
+      setTimeout(() => uni.navigateBack(), 1500);
+    }).catch(() => {
      uni.showToast({
        icon: 'none',
        title: "保存失败"
@@ -593,7 +682,7 @@ let submitForm = async () => {
    })
    console.warn(err);
  }
-}
+}*/


 </script>
--- a/src/pages/business/CRM/customer/customerAudit.vue
+++ b/src/pages/business/CRM/customer/customerAudit.vue
@@ -110,10 +110,7 @@ let list = ref([]);
 const upOption = ref({
  page: {num: 0, size: 10},
  noMoreSize: 5,
-  empty: { 
-    tip: '~ 空空如也 ~',
-    icon: "../../static/images/mescroll-empty.png"
-  },
+  empty: {tip: '~ 空空如也 ~'},
  textLoading: '加载中...',
  textNoMore: '已经到底了'
 });
--- a/src/pages/business/CRM/customer/customerUserBelong.vue
+++ b/src/pages/business/CRM/customer/customerUserBelong.vue
@@ -17,7 +17,7 @@
      <view class="all-body">
        <!-- 搜索  @blur="blur" @focus="focus" @input="input" @cancel="cancel" @clear="clear"-->
        <view class="search">
-          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户名称" clearButton="auto"
+          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户人员名称" clearButton="auto"
                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"
                          @clear="clearSearchValue"
                          v-model="searchValue"
@@ -133,8 +133,8 @@ const upOption = ref({
  page: {num: 0, size: 10},
  noMoreSize: 5,
  empty: {
-      tip: '~ 空空如也 ~',
-      icon: "../../static/images/mescroll-empty.png"
+    tip: '~ 空空如也 ~',
+    icon: "../../static/images/mescroll-empty.png"
  },
  textLoading: '加载中...',
  textNoMore: '已经到底了'
--- a/src/pages/business/CRM/customer/selectCustomer.vue
+++ b/src/pages/business/CRM/customer/selectCustomer.vue
@@ -80,10 +80,7 @@ let cssFlag=ref(false);//控制样式
 const upOption = ref({
  page: { num: 0, size: 10 },
  noMoreSize: 5,
-  empty: { 
-      tip: '~ 空空如也 ~',
-      icon: "../../static/images/mescroll-empty.png"
-  },
+  empty: { tip: '~ 空空如也 ~' },
  textLoading: '加载中...',
  textNoMore: '已经到底了'
 });
--- a/src/pages/business/CRM/customerUserList.vue
+++ b/src/pages/business/CRM/customerUserList.vue
@@ -11,7 +11,8 @@
            </uni-easyinput>
                <checkbox-group class="block" @change="checkboxChange">
                    <view class="itemClass" v-for="(item, index) in dataList" :key="item.userId">
-                        <checkbox class='checkBoxClass' :value="item.userName"></checkbox>
+                        <checkbox class='checkBoxClass' :value="item.userName" 
+                            v-model="item.userName"></checkbox>
                        <view class="clientClass">
                            <text class="blue-text">{{ item.userName }}</text>
                            {{ " | " }}
--- a/src/pages/business/CRM/mainOwner/audit/confirmForm.vue
+++ b/src/pages/business/CRM/mainOwner/audit/confirmForm.vue
@@ -168,8 +168,8 @@
            <uni-forms-item label="爱好" name="hobby" class="uni-forms-item is-direction-top is-top">
              <!-- 索引：hobbyIndex 范围：hobbyList 响应：handleHobbyChange-->
              <uni-easyinput v-model="formData.hobby" placeholder="请输入爱好" :disabled="!editable"/>
-              <multipleSelect :multiple="true" :value="hobbyIndex" downInner :options="hobbyList"
-                              @change="handleHobbyChange"  :slabel="'name'"
+              <multipleSelect ref="hobbySelectRef" :multiple="true" downInner :value="hobbyIds" :options="hobbyList"
+                              @change="handleHobbyChange" :slabel="'name'"

              ></multipleSelect><!--placeholder="请选择爱好标签"-->
            </uni-forms-item>
@@ -439,20 +439,29 @@ let handleThinkLevelChange = (e) => {
 // 系统推荐等级
 let recommendLevel = ref("");
 let getRecommendLevel = async () => {
-  if (formData.value.cusEstate && formData.value.functionalRequirements) {
+  if (formData.value.cusEstate) {
    let {cusEstate, functionalRequirements} = formData.value;
    let param = {cusEstate, functionalRequirements};
    if (formData.value.salesmanThinkLevel) {
      param.personnelLevel = formData.value.salesmanThinkLevel;
    }
-    let res = await getCustomerLevel(param).catch(err => {
+    let res = await getCustomerLevel(param)
+    /*.catch(err => {
      console.error(err, "客户的系统推荐等级获取失败")
-    })
-    if (!res.systemRecommendationLevel) {
-      recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
-      console.log(formData.value.systemThinkLevel + "???")
+    })*/
+    try{
+      if(res.data.systemRecommendationLevel){
+        formData.value.systemThinkLevel = res.data.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐";
+      }
+    }catch(e){
+      if (res.systemRecommendationLevel) {
+        formData.value.systemThinkLevel = res.systemRecommendationLevel;
+      }else{
+        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
+      }
    }
-    formData.value.systemThinkLevel = res.systemRecommendationLevel;
  } else {
    recommendLevel.value = "无公司等级信息，无法推荐等级";
  }
@@ -481,8 +490,7 @@ let handleUserTypeChange = (e) => {

 // 选择日期
 function handleTenureTimeChange(e) {
-  let {value} = e.detail;
-  formData.value.tenureTime = value;
+  formData.value.tenureTime = e;
 }

 // 需求层次索引
@@ -505,17 +513,19 @@ let handleDevelopChange = e => {

 // 选择生日
 function handleBirthdayChange(e) {
-  let{value} = e.detail
-  formData.value.birthday = value;
+  formData.value.birthday = e;
 }

 // 爱好标签索引
-let hobbyIndex = reactive([]);
+let hobbyIds = ref([]);
+let hobbies = ref([]);
 // 选择爱好标签
-const handleHobbyChange = (item, value) => {
-  // console.log("爱好", item, value);
-  hobbyIndex = value;
+const handleHobbyChange = (items, ids) => {
+  console.log('选择爱好', items, ids);
+  hobbyIds.value = [];
+  hobbies.value = items;
 };
+
 // 选择
 const handleNativeChange = (e) => {
  formData.value.nativec = (e.detail.value.map(item => {
@@ -539,16 +549,18 @@ let handleWorkingStatusChange = e => {
 }

 let submitForm = async () => {
-  let hobbyTags = hobbyIndex.map(it => {
-    let {name} = hobbyList[it];
+  let hobbyTags = hobbies.value.map(it => {
+    let {name} = it;
    return name;
  })
-  formData.value.iphone = formData.value.mobilePhone; // 特殊处理
  const hobbyTagString = hobbyTags.join('，');
  console.log(hobbyTagString);
  if (hobbyTagString || formData.value.hobby) {
-    formData.value.hobby = formData.value.hobby ? formData.value.hobby + '，' + hobbyTagString : hobbyTagString;
+    formData.value.hobby = hobbyTagString ? (formData.value.hobby ? formData.value.hobby + '，' : '') + hobbyTagString : formData.value.hobby;
  }
+
+  formData.value.iphone = formData.value.mobilePhone; // 特殊处理
+
  // console.log(formData.value, "校验表单数据")
  // console.log(recommendLevel);
  formData.value.cusName = customerUser.value.cusName;
--- a/src/pages/business/CRM/mainOwner/audit/mainOwnerChangeAudit.vue
+++ b/src/pages/business/CRM/mainOwner/audit/mainOwnerChangeAudit.vue
@@ -11,7 +11,7 @@
      </customHeader>

      <!-- 高度来避免头部遮挡 -->
-      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+      <view class="top-height"></view>

      <!-- 正文内容 -->
      <view class="all-body">
@@ -122,10 +122,7 @@ let list = ref([]);
 const upOption = ref({
  page: {num: 0, size: 10},
  noMoreSize: 5,
-  empty: { 
-      tip: '~ 空空如也 ~',
-      icon: "../../static/images/mescroll-empty.png"
-  },
+  empty: {tip: '~ 空空如也 ~'},
  textLoading: '加载中...',
  textNoMore: '已经到底了'
 });
--- a/src/pages/business/CRM/mainOwner/view/viewMainOwner.vue
+++ b/src/pages/business/CRM/mainOwner/view/viewMainOwner.vue
@@ -155,10 +155,7 @@ const upCallback = async (mescroll) => {
 const upOption = ref({
  page: { num: 0, size: 10 },
  noMoreSize: 5,
-  empty: { 
-      tip: '~ 空空如也 ~',
-      icon: "../../static/images/mescroll-empty.png"
-  },
+  empty: { tip: '~ 空空如也 ~' },
  textLoading: '加载中...',
  textNoMore: '已经到底了'
 });
--- a/src/pages/business/CRM/map/addRearkSignIn.vue
+++ b/src/pages/business/CRM/map/addRearkSignIn.vue
@@ -22,8 +22,8 @@
 <script setup>
 import customHeader from '@/components/customHeader.vue'
 import { onMounted, reactive, ref } from 'vue';
-import { addStartMap } from '@/api/crm/activity/map';
-import { parseTime } from '@/utils/datetime.js';
+import { addStartMap } from '../../../../api/crm/activity/map';
+import { dateFormat } from '../../../../utils/formatter';
 import { onLoad } from '@dcloudio/uni-app';
 import { getNavBarPaddingTop } from '@/utils/system.js'
 let form = reactive({
@@ -46,7 +46,7 @@ onMounted(() => {
 onLoad(option => {
 	form.visistId = option.visistId
 	let date = new Date();
-	form.craeteTime = parseTime(date, '{y}-{m}-{d}');
+	form.craeteTime = dateFormat("YYYY-mm-dd", date)
 })

 function addInsertMapClockIn() {
--- a/src/pages/business/CRM/marketActivity/activityTypeList.vue
+++ b/src/pages/business/CRM/marketActivity/activityTypeList.vue
@@ -10,7 +10,8 @@
            
                <checkbox-group class="block" @change="checkboxChange">
                    <view class="itemClass" v-for="(item, index) in dataList" :key="item.id">
-                        <checkbox class='checkBoxClass' :value="item.name"></checkbox>
+                        <checkbox class='checkBoxClass' :value="item.name" 
+                            v-model="item.name"></checkbox>
                        <view class="clientClass">
                            <text class="blue-text">{{ item.name }}</text>
                        </view>
--- a/src/pages/business/CRM/marketActivity/auditReport.vue
+++ b/src/pages/business/CRM/marketActivity/auditReport.vue
@@ -80,10 +80,7 @@ onMounted(() => {
 const upOption = ref({
    page: { num: 0, size: 10 },
    noMoreSize: 5,
-    empty: { 
-        tip: '~ 空空如也 ~',
-        icon: "../../static/images/mescroll-empty.png"
-    },
+    empty: { tip: '~ 空空如也 ~' },
    textLoading: '加载中...',
    textNoMore: '已经到底了'
 });
--- a/src/pages/business/CRM/marketActivity/customerUserList.vue
+++ b/src/pages/business/CRM/marketActivity/customerUserList.vue
@@ -11,7 +11,7 @@
            </uni-easyinput>
            <checkbox-group class="block" @change="checkboxChange">
                <view class="itemClass" v-for="(item, index) in dataList" :key="item.userId">
-                    <checkbox class='checkBoxClass' :value="item.userName"></checkbox>
+                    <checkbox class='checkBoxClass' :value="item.userName" v-model="item.userName"></checkbox>
                    <view class="clientClass">
                        <text class="blue-text">{{ item.userName }}</text>
                        {{ " | " }}
--- a/src/pages/business/CRM/marketActivity/myUserList.vue
+++ b/src/pages/business/CRM/marketActivity/myUserList.vue
@@ -11,7 +11,8 @@
            </uni-easyinput>
                <checkbox-group class="block" @change="checkboxChange">
                    <view class="itemClass" v-for="(item, index) in dataList" :key="item.userId">
-                        <checkbox class='checkBoxClass' :value="item.nickName"></checkbox>
+                        <checkbox class='checkBoxClass' :value="item.nickName"
+                            v-model="item.nickName"></checkbox>
                        <view class="clientClass">
                            <text class="blue-text">{{ item.nickName }}</text>
                        </view>
--- a/src/pages/business/CRM/marketActivity/visitReport.vue
+++ b/src/pages/business/CRM/marketActivity/visitReport.vue
@@ -78,8 +78,8 @@ import { ref, onMounted, watch } from 'vue'
 import customHeader from '@/components/customHeader.vue'
 import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
 import { getNavBarPaddingTop } from '@/utils/system.js'
+import { visitorReportList } from '@/api/business.js'
 import { getYsVisistList, removeVisist, updateStatus } from '../../../../api/crm/activity/activity';
-import {onShow} from "@dcloudio/uni-app";

 // 获取导航栏高度用于内容区域padding
 const navBarPaddingTop = ref(0);
@@ -87,10 +87,6 @@ onMounted(() => {
  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
 })

-onShow(()=>{
-  getList()
-})
-
 // 查询列表
 let list = ref([]);

@@ -145,10 +141,7 @@ const mescrollRef = ref(null);
 const upOption = ref({
  page: {num: 0, size: 10},
  noMoreSize: 5,
-  empty: {
-      tip: '~ 空空如也 ~',
-      icon: "../../static/images/mescroll-empty.png"
-  },
+  empty: {tip: '~ 空空如也 ~'},
  textLoading: '加载中...',
  textNoMore: '已经到底了'
 });
@@ -207,7 +200,7 @@ const getVisitorReportList = (pageNum, pageSize) => {
      pageNum,
      pageSize
    }
-    let res = await getYsVisistList(param);
+    let res = await visitorReportList(param);
    resolve({
      list: res.rows,
      total: res.total
@@ -215,13 +208,6 @@ const getVisitorReportList = (pageNum, pageSize) => {
  });
 }

-//页面数据方法
-function getList(){
-  getYsVisistList({pageNum: 1, pageSize: 10}).then(res=>{
-    list.value=res.rows;
-  })
-}
-

 let Loop = ref(0)
 let now
@@ -264,7 +250,7 @@ function touchstart(item) {
              });
            }
            // 刷新内容
-            downCallback(mescrollRef.value.mescroll);
+            upCallback()
          });
        }
      }
--- a/src/pages/business/CRM/marketActivity/visitReportView.vue
+++ b/src/pages/business/CRM/marketActivity/visitReportView.vue
@@ -140,10 +140,7 @@ const upCallback = async (mescroll) => {
 const upOption = ref({
    page: { num: 0, size: 10 },
    noMoreSize: 5,
-    empty: { 
-        tip: '~ 空空如也 ~',
-        icon: "../../static/images/mescroll-empty.png"
-    },
+    empty: { tip: '~ 空空如也 ~' },
    textLoading: '加载中...',
    textNoMore: '已经到底了'
 });
--- a/src/pages/business/CRM/marketActivity/visitorReportAdd.vue
+++ b/src/pages/business/CRM/marketActivity/visitorReportAdd.vue
@@ -138,9 +138,7 @@ const submitForm = async () => {
            icon: 'success'
        });
        saveVisistReportForm.cusId = formData.value.cusId
-        if (Array.isArray(formData.value.leader)) {
-          saveVisistReportForm.joinUser = formData.value.leader.map(item => item.text).join(',');
-        }
+        saveVisistReportForm.joinUser = formData.value.leader.map(item => item.text).join(',')
        saveVisistReportForm.visistDate = formData.value.visitDate
        saveVisistReportForm.visistType = 'I类活动（走访）'
        saveVisistReportForm.mapId = mapId.value
--- a/src/pages/business/CRM/marketInformation.vue
+++ b/src/pages/business/CRM/marketInformation.vue
@@ -73,7 +73,7 @@ let handleNav = (index)=>{

 // 新增
 let handleAdd = () => {
-    // uni.navigateTo({ url: '/pages/business/CRM/visitorReportAdd' })
+    // uni.navigateTo({ url: '/pages/business/crm/visitorReportAdd' })
 }

 // 查询列表
@@ -82,10 +82,7 @@ const mescrollRef = ref(null);
 const upOption = ref({
    page: { num: 0, size: 10 },
    noMoreSize: 5,
-    empty: { 
-        tip: '~ 空空如也 ~',
-        icon: "../../static/images/mescroll-empty.png"
-    },
+    empty: { tip: '~ 空空如也 ~' },
    textLoading: '加载中...',
    textNoMore: '已经到底了'
 });
--- a/src/pages/business/CRM/marketInformation/infomationView.vue
+++ b/src/pages/business/CRM/marketInformation/infomationView.vue
@@ -243,8 +243,7 @@ const inputval = ref(''); // 搜索内容
 		},
 		noMoreSize: 5,
 		empty: {
-			tip: '~ 空空如也 ~',
-			icon: "../../static/images/mescroll-empty.png"
+			tip: '~ 空空如也 ~'
 		},
 		textLoading: '加载中...',
 		textNoMore: '已经到底了'
--- a/src/pages/business/CRM/marketInformation/marketInformation.vue
+++ b/src/pages/business/CRM/marketInformation/marketInformation.vue
@@ -236,15 +236,14 @@
 		},
 		noMoreSize: 5,
 		empty: {
-			tip: '~ 空空如也 ~',
-			icon: "../../static/images/mescroll-empty.png"			
+			tip: '~ 空空如也 ~'
 		},
 		textLoading: '加载中...',
 		textNoMore: '已经到底了'
 	});

 	const downOption = ref({
-		auto: false,
+		auto: true,
 		textInOffset: '下拉刷新',
 		textOutOffset: '释放更新',
 		textLoading: '刷新中...'
@@ -304,6 +303,7 @@
 		};

 		const res = await CrmMarketInformationList(param);
+
 		return {
 			list: res.rows,
 			total: res.total
@@ -432,6 +432,7 @@
 		top: 100rpx;
 		height: calc(100vh - 48px);
 		/* #endif */
+
 	}

 	/*.market-con{
--- a/src/pages/business/CRM/marketInformation/marketInformationReview.vue
+++ b/src/pages/business/CRM/marketInformation/marketInformationReview.vue
@@ -103,10 +103,7 @@ const mescrollRef = ref(null);
 const upOption = ref({
  page: {num: 0, size: 10},
  noMoreSize: 5,
-  empty: { 
-      tip: '~ 空空如也 ~',
-      icon: "../../static/images/mescroll-empty.png"
-  },
+  empty: {tip: '~ 空空如也 ~'},
  textLoading: '加载中...',
  textNoMore: '已经到底了'
 });
--- a/src/pages/business/CRM/marketInformation/marketOpportunitiesDetail.vue
+++ b/src/pages/business/CRM/marketInformation/marketOpportunitiesDetail.vue
@@ -337,12 +337,11 @@ onMounted(() => {

 	.form-con {
 		/* #ifdef APP-PLUS */
-		height: calc(100vh - 95px) !important;
-		/* #endif */
-		/* #ifndef APP-PLUS */
-		height:calc(100vh - 68px) !important;
-		/* #endif */
-		overflow-y: auto;
+		height: calc(120vh - 100px)
+			/* #endif */
+			/* #ifndef APP-PLUS */
+			height:calc(120vh - 80px)
+			/* #endif */
 	}

 	:deep(.uni-date-x) {
--- a/src/pages/business/CRM/paymentCollection.vue
+++ b/src/pages/business/CRM/paymentCollection.vue
@@ -81,7 +81,6 @@ let bindPickerChange = (e)=>{
 let searchValue = ref(null)
 // 查询搜索跳转
 let handleSearch = () => {
-    console.log(searchValue.value)
 }

 const tableData = [
--- a/src/pages/business/CRM/paymentCollection/index.vue
+++ b/src/pages/business/CRM/paymentCollection/index.vue
@@ -108,16 +108,13 @@ const mescrollRef = ref(null);
 const upOption = ref({
  page: {num: 0, size: 10},
  noMoreSize: 5,
-  empty: { 
-      tip: '~ 空空如也 ~',
-      icon: "../../static/images/mescroll-empty.png"
-  },
+  empty: {tip: '~ 空空如也 ~'},
  textLoading: '加载中...',
  textNoMore: '已经到底了'
 });

 const downOption = ref({
-  auto: false,
+  auto: true,
  textInOffset: '下拉刷新',
  textOutOffset: '释放更新',
  textLoading: '刷新中...'
--- a/src/pages/business/CRM/plan/index.vue
+++ b/src/pages/business/CRM/plan/index.vue
@@ -8,7 +8,7 @@
      <!-- #endif -->

      <!-- 高度来避免头部遮挡 -->
-      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+      <view class="top-height"></view>

      <view class="white-bg">
        <navigator url="/pages/business/CRM/plan/myPlan">
--- a/src/pages/business/CRM/plan/myPlan.vue
+++ b/src/pages/business/CRM/plan/myPlan.vue
@@ -17,7 +17,7 @@
      <view class="top-height"></view>

      <view class="week-plan-title">
-        <view>姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>
+        <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>
        <view v-if="weekNum">
          {{ yearMonth }}
          <view v-if="isThisWeek" style=" display: inline-block;">
@@ -28,9 +28,9 @@
      </view>

      <view class="nav-list">
-          <view class="nav-item" :class="{active:index==activeTab}"
-                    v-for="(item,index) in allPlans" :key="index"
-                    @click="handleNav(index)"
+        <view class="nav-item" :class="{active:index==activeTab}"
+              v-for="(item,index) in allPlans" :key="index"
+              @click="handleNav(index)"
        >{{ getTapLabel(item) }}
        </view>
      </view>
@@ -54,10 +54,11 @@
            </view>
          </view>
        </view>
+        <view class='bottom-spliter bg-gray'></view>
      </block>

      <!-- 底部加高度来避免tabbar遮挡 -->
-      <view class="bottom-height"></view>
+      <!-- <view class="bottom-height bg-gray"></view> -->
    </view>


@@ -106,12 +107,12 @@ let getWorkEvent = (index) => {
 const refreshPlanList = () => {
  message.showLoading();
  // 获取用户信息
-  getUserInfo().then(res => {
-    userInfo.value = res.user;
-    console.log(route.path, "：用户信息获取成功");
-  }).catch(err => {
-    console.warn(err, "用户信息获取失败")
-  });
+  // getUserInfo().then(res => {
+  //   userInfo.value = res.user;
+  //   console.log(route.path, "：用户信息获取成功");
+  // }).catch(err => {
+  //   console.warn(err, "用户信息获取失败")
+  // });
  // 获取周计划列表
  getWeeklyPlanList(queryParams.value).then(res => {
    const {rows} = res;
@@ -180,11 +181,11 @@ function handleCreate() {
        handlePlanEdit({itemList, selectIndex: result.tapIndex}, true);
      }).catch((err) => {
        console.warn(err, "已存在周计划")
-        uni.showToast({
-          icon: 'error',
-          title: '已有本周或下周计划',
-          duration: 2000
-        })
+        // uni.showToast({
+        //   icon: 'error',
+        //   title: '已有本周或下周计划',
+        //   duration: 2000
+        // })
      })
      // }else{ // 创建下周计划
      // }
@@ -234,7 +235,7 @@ function handleEdit(index) {
  // console.log(JSON.stringify(formData))
  console.log(route.path, formData, "前往修改页面");
  const editFields = [OrdinalDate[index], WorkType[index], WorkEvent[index]];
-  let userName = userInfo.value.nickName || userInfo.value.userName;
+  let userName = null; // userInfo.value.userName || userInfo.value.nickName;
  handlePlanEdit({userName, formData, editFields}, false);
 }

@@ -268,9 +269,14 @@ function handleEdit(index) {
 }

 .white-bg.white-bg-2 {
-  margin-bottom: 20rpx;
+  /*  margin-bottom: 20rpx; */
+}
+.bottom-spliter{
+  height: 20rpx;
+}
+.bg-gray{
+  background-color: #f0f0f0;
 }
-
 .report-list .w-b-title .btn-edit {
  background-color: #5C96F7;
 }
@@ -280,14 +286,14 @@ function handleEdit(index) {
 }

 .nav-list {
-/*  display: flex;*/
-/*  width: 690rpx;*/
+  /*  display: flex;*/
+  /*  width: 690rpx;*/
  overflow-x: auto;   /* 允许横向滚动 */
  /*overflow-y: hidden;  隐藏垂直滚动 */
  /*-ms-overflow-style: none;   IE 隐藏滚动条 */
- /* scrollbar-width: none; */     /*Firefox 隐藏滚动条 */
+  /* scrollbar-width: none; */     /*Firefox 隐藏滚动条 */
  /* 添加高度以确保有足够的空间 */
-/*  height: 80rpx;*/
+  /*  height: 80rpx;*/
  white-space: nowrap; /* 保持子元素在同一行显示 */
  /* 添加这些属性确保滚动正常工作 */
  scroll-behavior: smooth;
@@ -304,7 +310,7 @@ function handleEdit(index) {
 }
 .nav-list .nav-item {
  /*  flex: 0 0 auto; 关键：不放大、不缩小、自动宽度 */
-/*  width: 200rpx;*/
+  /*  width: 200rpx;*/
  display: inline-block;
  background-color: #05A3F4;
  border-radius: 10rpx;
--- a/src/pages/business/CRM/plan/planEdit.vue
+++ b/src/pages/business/CRM/plan/planEdit.vue
@@ -4,7 +4,7 @@
      <!-- 头部 -->
      <customHeader ref="customHeaderRef" :title="title" :leftFlag="true" :rightFlag="true">
        <template #right>
-          <view class="head-right" @click="submitForm" v-if="userInfo.nickName || userInfo.userName">
+          <view class="head-right" @click="submitForm">
            <uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
                       color="#B7D2FF"></uni-icons>
            保存
@@ -16,7 +16,7 @@

      <!-- 正文内容 -->
      <view class="week-plan-title">
-        <view>姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>
+        <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>
        <view>{{ currentEditDate.yearMonth }} 第 <strong>{{ currentEditDate.weekNum }}</strong> 周</view>
      </view>
      <uni-forms ref="formRef" :model="weekPlanFormData" :rules="rules" label-width="100px" label-position="top">
--- a/src/pages/business/CRM/plan/planView.vue
+++ b/src/pages/business/CRM/plan/planView.vue
@@ -11,8 +11,7 @@
      </customHeader>

      <!-- 高度来避免头部遮挡 -->
-      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
-
+      <view class="top-height"></view>
      <!-- 正文内容 -->
      <view>

@@ -144,10 +143,7 @@ const mescrollRef = ref(null);
 const upOption = ref({
  page: {num: 0, size: 10},
  noMoreSize: 5,
-  empty: { 
-      tip: '~ 空空如也 ~',
-      icon: "../../static/images/mescroll-empty.png"
-  },
+  empty: {tip: '~ 空空如也 ~'},
  textLoading: '加载中...',
  textNoMore: '已经到底了'
 });
--- a/src/pages/business/CRM/visitorReport.vue
+++ b/src/pages/business/CRM/visitorReport.vue
@@ -75,7 +75,6 @@ onMounted(() => {
 let searchValue = ref(null)
 // 查询搜索跳转
 let handleSearch = () => {
-    console.log(searchValue.value)
 }

 // 新增
@@ -89,10 +88,7 @@ const mescrollRef = ref(null);
 const upOption = ref({
    page: { num: 0, size: 10 },
    noMoreSize: 5,
-    empty: {
-        tip: '~ 空空如也 ~',
-        icon: "../../static/images/mescroll-empty.png"
-    },
+    empty: { tip: '~ 空空如也 ~' },
    textLoading: '加载中...',
    textNoMore: '已经到底了'
 });
--- a/src/pages/business/CRM/visitorReportAdd.vue
+++ b/src/pages/business/CRM/visitorReportAdd.vue
@@ -63,7 +63,6 @@ selectGuestList();

 // 选择客户列表
 let bindPickerChange = (e)=>{
-    console.log('picker发送选择改变，携带值为', e.detail.value)
    guestIndex.value = e.detail.value
 }

@@ -88,7 +87,6 @@ const rules = {

 // 修改日期
 let changeDate = (e)=>{
-    console.log('changeDate:', e);
 };

 // 保存走访报告
--- a/src/pages/business/business.vue
+++ b/src/pages/business/business.vue
@@ -1,91 +1,90 @@
 <template>
-    <view class="con-body">
-        <view class="con-bg">
-            <!-- 头部 -->
-            <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="con-body">
+    <view class="con-bg">
+        <!-- 头部 -->
+        <customHeader ref="customHeaderRef" :title="'业务中心'" 
+            :leftFlag="false" :rightFlag="false" 
+        ></customHeader>
+        <!-- 高度来避免头部遮挡 -->
+        <view class="top-height"></view>

-            <!-- 搜索  @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"
-                    @focus="handleSearchFocus"
-                    v-model="searchText"
-                />
+         <!-- 搜索 -->
+         <view class="search">
+            <uni-search-bar class="custom-search" radius="28" 
+                placeholder="请输入您想查询的内容或服务"
+                clearButton="auto" cancelButton="none" 
+                bgColor="#6FA2F8" textColor="#ffffff"
+                @confirm="handleSearch"  
+            />
+        </view>
+
+        <!-- 下拉刷新 -->
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit"
+            :down="downOption"  @down="downCallback"
+            :fixed="false" class="scroll-h"
+        >
+            <!-- 首页日常服务 -->
+            <view class="white-bg">
+                <view class="w-b-title">
+                    首页日常服务
+                    <view type="primary" @click="handleEdit" class="btn-edit">编 辑</view>
+                </view>
            </view>

-            <!-- 下拉刷新 -->
-            <mescroll-uni  v-if="!searchShow" ref="mescrollRef" @init="mescrollInit"
-                :down="downOption"  @down="downCallback"
-                :fixed="false" class="scroll-h"
-            >
-                <!-- 首页日常服务 -->
-                <view class="white-bg">
-                    <view class="w-b-title">
-                        首页日常服务
-                        <view type="primary" @click="handleJump('/pages/business/editDaily')" class="btn-edit">编 辑</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>
+                <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>
                    </view>
                </view>
+            </view>

-                <!-- 业务列表 -->
-                <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>
-                    <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>
-                    </block>
+            <!-- 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>

-                <!-- 底部加高度来避免tabbar遮挡 -->
-                <view class="bottom-height"></view>
-            </mescroll-uni>
-        </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>
+            </view>
+
+            <!-- 底部加高度来避免tabbar遮挡 -->
+            <view class="bottom-height"></view>
+        </mescroll-uni>
    </view>
+</view>
 </template>

 <script setup>
 import { ref,onMounted } from 'vue'
-import { onLoad,onHide } from '@dcloudio/uni-app';
-import customHeader from '@/components/customHeader.vue';
-import customSearch from '@/components/customSearch.vue'
+import customHeader from '@/components/customHeader.vue'
 import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
 import { getNavBarPaddingTop} from '@/utils/system.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();
-    }
-})
+import { businessDaily,businessCRMList } from '@/api/business.js';

 // 获取导航栏高度用于内容区域padding
 const navBarPaddingTop = ref(0);
@@ -93,47 +92,9 @@ onMounted(() => {
    navBarPaddingTop.value = getNavBarPaddingTop()*2;
 })

-// 搜索处理
-let searchShow = ref(false);
-let searchText = ref(undefined);
-let searchTypeObj = ref({typeId:2});
+// 查询搜索跳转
+let handleSearch = ()=>{

-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;
 }

 // 下拉刷新
@@ -151,10 +112,9 @@ const downOption = ref({
 // 下拉刷新
 const downCallback = async (mescroll) => {
    try {
-        getList();
-        // setTimeout(async ()=>{
-        //     // mescroll.resetUpScroll();
-        // },500);
+        setTimeout(async ()=>{
+            // mescroll.resetUpScroll();
+        },500);
    } catch (error) {
        mescroll.endErr();
    } finally {
@@ -164,8 +124,41 @@ 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 })
    }
@@ -176,7 +169,7 @@ let handleJump=(url)=>{
 <style scope>
 .scroll-h{
    /* #ifdef APP-PLUS */
-    height: calc(100vh - 130px) !important;
+    height: calc(100vh - 120px) !important;
    /* #endif */
    /* #ifndef APP-PLUS */
    height: calc(100vh - 140px) !important;
--- a/src/pages/business/editDaily.vue
+++ b/src/pages/business/editDaily.vue
@@ -1,246 +0,0 @@
-<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;
-    flex-flow:row wrap;
-    margin:-10rpx;
-    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;
-    margin-left:8rpx;
-    margin-right:8rpx;
-    margin-bottom:20rpx;
-}
-
-.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>
--- a/src/pages/deviceAuth/deviceAuth.vue
+++ b/src/pages/deviceAuth/deviceAuth.vue
@@ -1,591 +0,0 @@
-<template>
-<view>
-    <view class="container">
-		<view class="bg"></view>
-        <view class="bg-con">
-            <view class="bg-h">
-
-                <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>
-
-        <!-- <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 .bg-h{
-    background:url('@/static/images/PicLogoTxt2@2x.png') center bottom 10rpx no-repeat;
-    background-size:487rpx 214rpx;
-    width: 100vw;
-    height: calc(100vh - 110px) ;
-    margin:0 auto;
-}
-
-.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>
--- a/src/pages/h5-webview/h5-webview.vue
+++ b/src/pages/h5-webview/h5-webview.vue
@@ -1,74 +0,0 @@
-<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("加载中...",{
-        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>
--- a/src/pages/home/home.vue
+++ b/src/pages/home/home.vue
@@ -1,31 +1,32 @@
 <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" 
+            :fixed="false" class="scroll-h" :style="{ paddingTop: navBarPaddingTop + 'px' }"
        >
-          <!-- #ifdef APP-PLUS -->
-          <!-- 删除设备ID--测试用 -->
-          <!-- <view class="del-cache" @click="handleDelete">
-            <uni-icons type="minus" size="30" color="#ffffff"></uni-icons>
-          </view> -->
+          <!-- #ifdef H5 -->
+          <view style="height:50rpx"></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" @click="handleJump('/pages/notice/notice',1)">
+            <view class="backlog-b-item">
              <view class="font-number">{{ backBlogObj.count1 }}</view>
              <view class="font-title">待办</view>
            </view>
-            <view class="backlog-b-item" @click="handleJump('/pages/notice/waitApprove')">
+            <view class="backlog-b-item">
              <view class="font-number">{{ backBlogObj.count2 }}</view>
              <view class="font-title">待审查</view>
            </view>
@@ -104,12 +105,12 @@
          </view>

          <!-- 常用服务 -->
-          <view class="white-bg" v-if="commonServiceList.length>0">
+          <view class="white-bg">
              <view class="w-b-title">常用服务</view>
              <view class="logo-list">
-                  <view  v-for="(item,index) in commonServiceList" class="l-l-item" :key="index"  @click="handleJump(item.bizUrl)">
-                      <img :src="'static/images/business/'+item.icon+'.png'" />
-                      <text class="font-gray">{{ item.bizName }}</text>
+                  <view  v-for="(item,index) in commonServiceList" class="l-l-item" :key="index">
+                      <img :src="item.imgSrc" />
+                      <text class="font-gray">{{ item.name }}</text>
                  </view>
                  <!-- <view  class="l-l-item" @click="handleAddCommonSercice">
                    <img :src="'static/images/business/icon-add.png'">
@@ -136,72 +137,18 @@
          <!-- 底部加高度来避免tabbar遮挡 -->
          <view class="bottom-height"></view>
      </mescroll-uni>
-    </view>
+      </view>
  </view>
 </template>

 <script setup>
-import { ref,onMounted } from 'vue';
-import { onLoad } from '@dcloudio/uni-app';
-import customHeader from '@/components/customHeader.vue'
+import { ref,onMounted,computed } from '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'
-// ,swiperList,stepData,salesTask,commonServices,newsQueryList 
-import { messageNotifyCount,messageFlowCount,getUserFavorite} from '@/api/home.js';
+import { backBlogCount,swiperList,stepData,salesTask,commonServices,newsQueryList } 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);
 const mescrollInit = (mescroll) => {
@@ -214,13 +161,13 @@ const downOption = ref({
    textLoading: '刷新中...'
 });

+
 // 下拉刷新
 const downCallback = async (mescroll) => {
    try {
-        // setTimeout(async ()=>{
-        //     // mescroll.resetUpScroll();
-        // },500);
-        initLoad();
+        setTimeout(async ()=>{
+            // mescroll.resetUpScroll();
+        },500);
    } catch (error) {
        mescroll.endErr();
    } finally {
@@ -235,57 +182,44 @@ const navBarPaddingTop = ref(0);
 onMounted(() => {
    navBarPaddingTop.value = getNavBarPaddingTop()*2;
 })
+// 查询搜索跳转
+let handleSearch = ()=>{

-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: res.todoCount+'' // 徽章的文本
-      });
-    }
-  } catch (error) {
-      console.error('设置TabBar Badge失败:', error);
-  }
 }

+// tabar 增加消息数量
+try {
+    wx.setTabBarBadge({
+        index: 2, // TabBar的索引，从0开始计数
+        text: '3' // 徽章的文本
+    });
+} 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 = ["祝贺“友晟夏季封装外壳发布会”圆满成功","祝贺“友晟科技发布会”圆满成功","祝贺“友晟夏季封装外壳发布会”圆满成功"]
+  extendedList.value = await swiperList(); 
 }
-
+getSwiperList();

 // 日程提醒
 let weekStr = ref(null) //'2025-09-19  星期三'
 let stepList = ref([]);
 const getStepData = async ()=>{
-  // 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'}, 
-        ]
-    }
+  let res = await stepData({});
  weekStr.value = getWeekStr(res.date);
  stepList.value = res.list;
 }
-
+getStepData();

 // 销售任务完成情况
 let salesList = ref([]);
@@ -306,37 +240,21 @@ let percentNum = ref(0);
 let totalSales = ref(0)
 let targetSales = ref(0)
 const getSalesTask = async ()=>{
-  // let res = await salesTask({});
-  let res = {
-      salesList:['2025-3季度', '2025-2季度', '2025-1季度'],
-      percentNum:82,
-      totalSales:62075000,
-      targetSales:75000000
-  }
+  let res = await salesTask({});
  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 data = await getUserFavorite({});
-  commonServiceList.value = data || []
+  let res = await commonServices({});
+  commonServiceList.value = res.list
 }
-// 跳转 type:1-tabbar
-let handleJump=(url,type)=>{
-    if(url){
-      if(type==1){
-        uni.switchTab({url});
-      }else{
-        uni.navigateTo({ url })
-      }
-    }
-}
-
+getCommonServices();
 // 添加常用服务
 const handleAddCommonSercice = ()=>{

@@ -345,45 +263,22 @@ const handleAddCommonSercice = ()=>{
 // 新闻公告
 let newsList = ref([])
 const getNewsList = async()=>{
-  // 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:''},
-      ],
-  }
+  let res = await newsQueryList({});
  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 - 78px) !important;
+  height:calc(100vh - 30px) !important;
  /* #endif */
  /* #ifndef APP-PLUS */
-  height: calc(100vh - 80px) !important;
+  height: calc(100vh - 30px) !important;
  /* #endif */
 }
 :deep(.mescroll-upwarp){
@@ -518,20 +413,16 @@ const formatDateStr =(times)=>{
 }

 .white-bg .logo-list{
-  margin-left:-25rpx;
-  margin-right:-25rpx;
+  gap:50rpx; 
  padding:0 20rpx;
+  /* margin-bottom: -50rpx;  */
 }

 .white-bg .logo-list .l-l-item{
  width:160rpx;
  margin-bottom:0rpx;
-  margin-left:25rpx;
-  margin-right:25rpx;
-  margin-bottom: 25rpx;
 }

-
 .white-bg .logo-list .l-l-item img{
  width:110rpx;
  height:110rpx;
--- a/src/pages/loading/loading.vue
+++ b/src/pages/loading/loading.vue
@@ -1,229 +1,71 @@
 <template>
-<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 class="container" :style="{ height: `100vh` }">
+		<view class="bg"></view>
+        <view class="version">Version {{ version }}</view>
+        <view class="bottom-bg"></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 { proxy } = getCurrentInstance();
-const networkEnv = ref(proxy.$NETWORK_ENV);//1-内网 2-外网
+const userStore = useUserStore()

-// #ifdef APP-PLUS
-// 获取 存储手机的module 
-const safeSave = uni.requireNativePlugin("Tm-TmSafeSaveFileModule");
-// #endif
+const version="1.0.0"

-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) => {
+onLoad((opt) => {
    console.log("onLoad");
-
-    // uni.preloadPage({url: "/pages/login/login"});
-    // uni.preloadPage({url: "/pages/deviceAuth/deviceAuth"});
-    // uni.preloadPage({url: "/pages/home/home"});
-
-    // #ifdef APP-PLUS
-    // 查询版本接口
-    await getOSVesion();
-    
-    // 不更新版本 执行设备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){
+    // 检查是否已登录 并 获取用户信息
+    if (userStore.isLogin) {
+        // userStore.getUser()
+        // TODO 未登录会在拦截器中处理跳转登录页， 请在 xxx 配置登录页路径
+       // #ifdef H5
+        window.setTimeout(()=>{
            uni.reLaunch({
                url: '/pages/home/home',
            });
-        }else{
+        },1000)
+        // #endif
+
+        // #ifdef APP-PLUS
+        uni.reLaunch({
+            url: '/pages/home/home',
+        });
+        // #endif
+    }else{
+        // #ifdef H5
+        window.setTimeout(()=>{
            uni.reLaunch({
                url: '/pages/login/login',
            });
-        }
-    // },1000)
-    // #endif
+        },1000)
+        // #endif
+
+        // #ifdef APP-PLUS
+            uni.reLaunch({
+                url: '/pages/login/login',
+            });
+        // #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(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: calc(100vh - 100px) !important;
+	height:100vh !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;
@@ -241,62 +83,4 @@ const handleClose=()=>{
    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>
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -1,108 +1,90 @@
 <template>
 <view class="container">
    <view class="login-con">
-        <view class="bg-h">
-            <view :style="{height: navBarPaddingTop + 'px'}"></view>
-            <image mode="aspectFit" src="../../static/images/pic-logo.png" class="login-logo"></image>
-            <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">
-                    <!-- 验证码登录 -->
-                    <view v-show="activeTab === 0">
-                        <view class="login-form">
-                            <uni-forms ref="form" :model="formData" :rules="rules" label-position="top">
-                                <uni-forms-item label="手机号" required name="phone">
-                                    <view class="code-con">
-                                        <uni-icons custom-prefix="iconfont" color="#239FDF" type="icon-phone" size="20"></uni-icons>
-                                        <uni-easyinput type="number" :inputBorder="false"
-                                            v-model="formData.phone" placeholder="请输入手机号" 
-                                            maxlength="11"
-                                        />
-                                    </view>
-                                </uni-forms-item>
-                                <uni-forms-item label="验证码" required name="verifyCode">
-                                    <view class="code-con">
-                                        <uni-icons custom-prefix="iconfont" color="#239FDF" type="icon-code" size="20"></uni-icons>
-                                        <uni-easyinput type="number" :inputBorder="false"
-                                            v-model="formData.verifyCode" placeholder="请输入验证码"
-                                            maxlength="6" style="width:190rpx"
-                                        />
-                                        <button type="primary" plain @click="getCode" size="mini" 
-                                            :loading="codeLoading" :disabled="codeDisabled" class="btn-plain"
-                                        >{{codeText}}</button>
-                                    </view>
-                                </uni-forms-item>
-                            </uni-forms>
-                        </view>
-                    </view>
-                    <!-- 账号登录 -->
-                    <view v-show="activeTab === 1">
-                        <view class="login-form">
-                            <uni-forms ref="form2" :model="formData2" :rules="rules2" label-position="top">
-                                <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>
-                    </view>
-                </customTabs>
-
-                <view class="agreen-con">
-                    <uni-icons v-if="agreeChecked" type="checkbox-filled"  color="#02C74C" size="25"  @click="agreeCheck"></uni-icons>
-                    <uni-icons v-else type="circle" color="#bfbfbf" size="25"  @click="agreeCheck"></uni-icons>
-                    <view class="agreen-xy">
-                        我已阅读并接受<text @click="agreeVisable(1)">《服务条款》</text>和<text @click="agreeVisable(2)">《隐私保护协议》</text>
+        <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-tab">
+            <customTabs v-model="activeTab" :tabs="tabList" :modelValue="activeTab">
+                <!-- 验证码登录 -->
+                <view v-show="activeTab === 0">
+                    <view class="login-form">
+                        <uni-forms ref="form" :model="formData" :rules="rules" label-position="top">
+                            <uni-forms-item label="手机号" required name="phone">
+                                <view class="code-con">
+                                    <uni-icons custom-prefix="iconfont" color="#239FDF" type="icon-phone" size="20"></uni-icons>
+                                    <uni-easyinput type="number" :inputBorder="false"
+                                        v-model="formData.phone" placeholder="请输入手机号" 
+                                        maxlength="11"
+                                    />
+                                </view>
+                            </uni-forms-item>
+                            <uni-forms-item label="验证码" required name="verifyCode">
+                                <view class="code-con">
+                                    <uni-icons custom-prefix="iconfont" color="#239FDF" type="icon-code" size="20"></uni-icons>
+                                    <uni-easyinput type="number" :inputBorder="false"
+                                        v-model="formData.verifyCode" placeholder="请输入验证码"
+                                        maxlength="6" style="width:190rpx"
+                                    />
+                                    <button type="primary" plain @click="getCode" size="mini" 
+                                        :loading="codeLoading" :disabled="codeDisabled" class="btn-plain"
+                                    >{{codeText}}</button>
+                                </view>
+                            </uni-forms-item>
+                        </uni-forms>
                    </view>
                </view>
+                <!-- 账号登录 -->
+                <view v-show="activeTab === 1">
+                    <view class="login-form">
+                        <uni-forms ref="form2" :model="formData2" :rules="rules2" label-position="top">
+                            <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>
+                </view>
+            </customTabs>

-                <button type="primary" class="btn-submit" @click="submitForm" :loading="btnLoading" :disabled="btnLoading">登 录</button>
+            <view class="agreen-con">
+                <uni-icons v-if="agreeChecked" type="checkbox-filled"  color="#02C74C" size="25"  @click="agreeCheck"></uni-icons>
+                <uni-icons v-else type="circle" color="#bfbfbf" size="25"  @click="agreeCheck"></uni-icons>
+                <view class="agreen-xy">
+                    我已阅读并接受<text @click="agreeVisable(1)">《服务条款》</text>和<text @click="agreeVisable(2)">《隐私保护协议》</text>
+                </view>
            </view>

+            <button type="primary" class="btn-submit" @click="submitForm" :loading="btnLoading" :disabled="btnLoading">登 录</button>
        </view>
-
    </view>
-    <!-- <view class="login-bottom"></view> -->
+    <view class="login-bottom"></view>
 </view>
 </template>

 <script setup>
-import { ref,onMounted,getCurrentInstance } from 'vue';
-import { onLoad } from '@dcloudio/uni-app';
+import { ref,onMounted } from 'vue';
 import customTabs from '@/components/customTabs.vue';
 import {isPhoneNumber} from '@/utils/validate';
-import { getVerifyCode,login } from '@/api/auth';
+import {showAlert} from '@/utils/message';
+import { getCaptchaImage,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';
-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);
-})
+const userStore = useUserStore()

 // 获取导航栏高度用于内容区域padding
 const navBarPaddingTop = ref(0);
@@ -116,8 +98,8 @@ const tabList = ['验证码登录', '账号登录'];
 // 验证码登录
 const form = ref(null);
 const formData = ref({
-    phone: '',
-    verifyCode: '',
+    phone: '15112345600',
+    verifyCode: '123456',
    loginType:0
 });

@@ -201,8 +183,8 @@ let resetCountdown =()=>{
 // 账号登录
 const form2 = ref(null);
 const formData2 = ref({
-    username: '',
-    password: '',
+    username: 'admin',
+    password: '123456',
    loginType:1
 });

@@ -210,13 +192,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位字母或数字' }
        ]
    }
 };
@@ -243,7 +225,7 @@ const submitForm = () => {
    if(activeTab.value===0){
        form.value.validate().then(async param => {
            // 2.调用登录接口
-            param.loginType = activeTab.value;
+            param.loginType = activeTab.value; console.log('表单数据00:', param);
            let res = await login(param)
            // 3.登录后存储token
            userStore.login(res);
@@ -256,53 +238,11 @@ const submitForm = () => {
    }else if(activeTab.value===1){
        // 用户名和密码登录
        form2.value.validate().then(async param => {
-            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
-            //h5测试用 内网-sn123456
-            //公司外网 '9516053c-b441-465b-9781-06e7b8031811'
-            //友晟外网 'b97527c8-2ad4-493c-a01c-5f9d0aabaff2' 
-            param.uniqCode = 'b97527c8-2ad4-493c-a01c-5f9d0aabaff2';
+            param.loginType = activeTab.value;   console.log('表单数据11:', formData2.value);
            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;//'b97527c8-2ad4-493c-a01c-5f9d0aabaff2' //
-                        // showAlert("读取成功=>"+deviceId);
-                        param.uniqCode = deviceId;
-                        console.log("param=>",param)
-                        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;
@@ -313,9 +253,6 @@ const submitForm = () => {
 };
 </script>
 <style scoped>
-page{
-    background-color: #F5F5F5;
-}
 .container {
    height: 100vh;
 }
@@ -342,24 +279,6 @@ page{
    margin: 0 0 35rpx 70rpx;
 }

-.login-con .login-title text:not(:last-child)::after {
-  content: "·";
-  margin: 0 10px;
-  color: #fff;
-}
-
-.login-con .bg-h{
-    background:url('@/static/images/login-txt.png') center bottom 10rpx no-repeat;
-    background-size:654rpx 121rpx;
-    width: 100vw;
-    height: calc(100vh - 10px) ;
-    margin:0 auto;
-}
-
-.login-tab{
-    padding-bottom:20rpx;
-}
-
 :deep(.login-tab .tabs-header) {
    background: none !important;
    border-bottom: none !important;
@@ -491,12 +410,4 @@ page{
    margin-left:-327rpx;
 }

-.slider-con{
-    position: absolute;
-    top:0;
-    width:100%;
-    height: 100vh;
-    background-color: rgba(0, 0, 0, 0.1);
-}
-
 </style>
--- a/src/pages/notice/notice.vue
+++ b/src/pages/notice/notice.vue
@@ -2,50 +2,32 @@
    <view class="con-body">
        <view class="con-bg">
            <!-- 头部 -->
-            <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'" />清除未读
+            <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'" />清除未读
                    </view>
                </template>
            </customHeader>
-            
            <!-- 高度来避免头部遮挡 -->
            <view class="top-height"></view>

-            <!-- 搜索处理 -->
-            <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">
-                        <uni-icons type="search" size="20" color="#ffffff"></uni-icons>
-                        <input class="uni-input" v-model="searchText" placeholder="搜索" placeholder-class="search-color" />
-                    </view>
-                </view>
+            <!-- 搜索 -->
+            <view class="search">
+                <uni-search-bar class="custom-search" radius="28" placeholder="请输入您想查询的内容或服务" clearButton="auto"
+                    cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff" @confirm="handleSearch" />
            </view>

            <!-- 消息列表 -->
-            <mescroll-uni  v-if="!searchShow" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+            <mescroll-uni 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>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="white-bg" v-if="list.length">
+                    <view class="notice-list" v-for="(item, index) in list" :key="index">
+                        <img :src="item.imgSrc" />
                        <view class="notice-item">
-                            <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 :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>
                    </view>
                </view>
@@ -55,18 +37,12 @@
 </template>

 <script setup>
-import { ref, onMounted,computed } from 'vue'
-import { onLoad,onHide } from '@dcloudio/uni-app';
+import { ref, onMounted } from 'vue'
 import customHeader from '@/components/customHeader.vue'
-import customSearch from '@/components/customSearch.vue'
-import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
 import { getNavBarPaddingTop } from '@/utils/system.js'
 import { noticeList } from '@/api/notice.js'
 import { formatTimestamp } from '@/utils/datetime.js'
-
-onLoad(async(opt) => {
-    uni.setStorageSync('page_cache',true);
-})
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';

 // 获取导航栏高度用于内容区域padding
 const navBarPaddingTop = ref(0);
@@ -74,38 +50,9 @@ onMounted(() => {
    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
 })

-// 搜索处理
-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({});//选中类型
+// 查询搜索跳转
+let handleSearch = () => {

-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) => {
@@ -113,37 +60,25 @@ const formatDateStr = (times) => {
 }

 // 清除未读
-const handleRead = () => {
+const handleReady = () => {
    list.value.forEach(item => {
-        item.isRead = false;
+        item.isReady = 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: '~ 空空如也 ~',
-        icon: "../../static/images/mescroll-empty.png"
-    },
+    empty: { tip: '~ 空空如也 ~' },
    textLoading: '加载中...',
    textNoMore: '已经到底了'
 });

 const downOption = ref({
-    auto: false,
+    auto: true,
    textInOffset: '下拉刷新',
    textOutOffset: '释放更新',
    textLoading: '刷新中...'
@@ -158,11 +93,12 @@ const mescrollInit = (mescroll) => {
 // 下拉刷新
 const downCallback = async (mescroll) => {
    try {
-        console.log("下拉刷新")
-        const res = await getNoticeList(1, upOption.value.page.size);
-        cssFlag.value = false;
-        list.value = res.list;
-        mescroll.resetUpScroll();
+        setTimeout(async ()=>{
+            const res = await getNoticeList(1, upOption.value.page.size);
+            cssFlag.value = false;
+            list.value = res.list;
+            mescroll.resetUpScroll();
+        },500);
    } catch (error) {
        mescroll.endErr();
    } finally {
@@ -174,14 +110,15 @@ const downCallback = async (mescroll) => {
 // 上拉加载更多
 const upCallback = async (mescroll) => {
    try {
-        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);
+        setTimeout(async ()=>{
+            const 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();
    }
@@ -192,31 +129,17 @@ const getNoticeList = (pageIndex, pageSize) => {
    return new Promise(async (resolve) => {
        let param = {
            pageIndex,
-            pageSize,
-            searchValue:searchText.value?searchText.value:undefined,
-            type:notictTypeCheck.value.id
+            pageSize
        }
        
        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,
-            total: res.recordCount || 0
+            list: res.list,
+            total: res.totalCount
        });
    });

 }
-
-// 跳转webview
-const handleJump = (item)=>{
-    uni.navigateTo({
-        url: '/pages/h5-webview/h5-webview?url=' + item.mobileLink+"&title="+item.subject
-    });
-}
 </script>

 <style scoped>
@@ -245,24 +168,16 @@ const handleJump = (item)=>{

 .white-bg {
    width: 750rpx;
-    padding: 40rpx 0 20rpx;
+    padding: 40rpx 0 ;
    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 - 160px);
+    height: calc(100vh - 140px);
    /* #endif */
 }

@@ -272,7 +187,7 @@ const handleJump = (item)=>{
    margin-bottom: 30rpx;
 }

-.white-bg .notice-list .img-w{
+.white-bg .notice-list img {
    width: 80rpx;
    height: 80rpx;
    margin-right: 30rpx;
--- a/src/pages/notice/waitApprove.vue
+++ b/src/pages/notice/waitApprove.vue
@@ -1,221 +0,0 @@
-<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>
--- a/src/pages/notice/waitApproveDetail.vue
+++ b/src/pages/notice/waitApproveDetail.vue
@@ -1,149 +0,0 @@
-<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>
--- a/src/pages/search/search.vue
+++ b/src/pages/search/search.vue
@@ -1,31 +0,0 @@
-<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>
--- a/src/pages/userinfo/userinfo.vue
+++ b/src/pages/userinfo/userinfo.vue
@@ -2,27 +2,23 @@
 <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"
+            :fixed="false" class="scroll-h" :style="{ paddingTop: navBarPaddingTop + 'px' }"
        >
+            <!-- #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.realname }}</view>
+                        <view class="nick-text">{{ userObj.name }}</view>
                        <img :src="`static/images/userinfo/num-${userObj.level}@2x.png`" class="level" />
                    </view>
-                    <view class="dept">{{ userObj.deptName }} {{ userObj.postName }}</view>
+                    <view class="dept">{{ userObj.deptName }} {{ userObj.jobName }}</view>
                </view>
                <view class="head-right">
                    <view class="font-ruzhi">已入职{{userObj.joinDay}}天</view>
@@ -31,12 +27,12 @@
            </view>

            <!-- 日常 -->
-            <!-- <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">
+            <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">
                    <img :src="'static/images/business/icon-rb.png'" />
                    <view class="font-title">日报</view>
                </view>
@@ -47,11 +43,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" style="margin-top:20rpx;">
+            <view class="white-bg">
                <view class="list-item">
                    <img :src="'static/images/userinfo/icon-tx@2x.png'" class="l-icon" />
                    <text>头像</text>
@@ -80,11 +76,11 @@
                    </view>
                </view>
                <view class="item-border"></view>
-                <view class="list-item item-padding" @click="handleVersion">
+                <view class="list-item item-padding">
                    <img :src="'static/images/userinfo/icon-bbgx@2x.png'" class="l-icon" />
-                    <view class="item-text">版本更新 <view class="dot" v-if="isCurrent==2"></view></view>
+                    <view class="item-text">版本更新 <view class="dot"></view></view>
                    <view class="list-right">
-                        <text class="item-gray">Version {{ appVersion }}</text>
+                        <text class="item-gray">Version 1.0.0</text>
                        <uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
                    </view>
                </view>
@@ -95,52 +91,26 @@

            <!-- 底部加高度来避免tabbar遮挡 -->
            <!-- <view class="bottom-height"></view> -->
-        </mescroll-uni>
+      </mescroll-uni>
    </view>
-    <!-- 弹窗模板 -->
-    <!-- <customShowModal
-        :title="title"
-        :content="content" 
-        :visible="visible" 
-        @close="handleClose"
-        @confirm="handleLoginOut"
-        ref="showModel"
-    ></customShowModal> -->
 </view>
 </template>

 <script setup>
-import { ref, onMounted,getCurrentInstance } from 'vue'
-import { onLoad } from '@dcloudio/uni-app';
-import customHeader from '@/components/customHeader.vue'
+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 { getUserInfo,versionCheck } from '@/api/auth.js'
-import { formatIOS } from '@/utils/status.js'
-import { showAlert } from '@/utils/message.js'
+
+import { getUserInfo } from '@/api/auth.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);
-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
+onMounted(() => {
+    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
 })

 // 下拉刷新
@@ -155,117 +125,54 @@ 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 {
-        selectUserInfo();
-        getVersion();
+        setTimeout(async ()=>{
+            // mescroll.resetUpScroll();
+        },500);
    } catch (error) {
        mescroll.endErr();
    } finally {
-        mescroll.endSuccess();
+        setTimeout(async ()=>{
+            mescroll.endSuccess();
+        },500);
    }
 }

-// 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;
+// 2.获取用户基本信息
+let userObj = ref({});
+const selectUserInfo = async ()=>{
+    let data = await getUserInfo({});
+    userObj.value = data;
 }
+selectUserInfo()

 // 3.退出登录
 const handleLoginOut = async ()=>{
-
-    showAlert('是否确认退出？','提示',true,()=>{
-        userStore.logout();
-        uni.reLaunch({
-            url: '/pages/login/login',
-        });
-    })
-    
+    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 - 78px) !important;
-    /* #endif */
-    /* #ifndef APP-PLUS */
-    height: calc(100vh - 80px) !important;
-    /* #endif */
+  /* #ifdef APP-PLUS */
+  height:calc(100vh - 30px) !important;
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  height: calc(100vh - 30px) !important;
+  /* #endif */
 }
 :deep(.mescroll-upwarp){
  display:none
 }
 .head-pic {
    display: flex;
-    padding: 0rpx 0rpx 10rpx 30rpx;
+    padding: 40rpx 0rpx 10rpx 30rpx;
 }

 .head-pic .pic-img {
--- a/src/pages/userinfo/version.vue
+++ b/src/pages/userinfo/version.vue
@@ -1,139 +0,0 @@
-<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>
--- a/src/static/common.css
+++ b/src/static/common.css
@@ -5,10 +5,8 @@ page {
    height: 100%;
    padding: 0;
    margin: 0;
-    background-color: #307AF5;
-    /* background-color: #F5F5F5; */
+    background-color: #F5F5F5;
    color: #333;
-
 }

 .container {
@@ -21,30 +19,26 @@ page {
    width: 100%;
    margin: 0;
    padding: 0;
-    background-color: #F5F5F5;
 }

+
 .con-bg {
    position: absolute;
    top: 0;
    right: 0;
    bottom: 0;
    /* #ifdef APP-PLUS */
-    background-color: #F5F5F5;
-    background-image: url('@/static/images/bg-Blue.png');
-    background-repeat:  no-repeat;
-    background-size: 750rpx 761rpx;
-    width: 750rpx;
-    /* height: 761rpx; */
+    background: url('@/static/images/bg-Blue.png') no-repeat;
+    background-size: 100vw 761rpx;
+    width: 100vw;
+    height: 761rpx;
    left: 0;
    /* #endif */
    /* #ifndef APP-PLUS */
-    background-color: #F5F5F5;
-    background-image: url('@/static/images/bg-Blue.png');
-    background-repeat:  no-repeat;
+    background: url('@/static/images/bg-Blue.png') no-repeat;
    background-size: 750rpx 761rpx;
    width: 750rpx;
-    /* height: 761rpx; */
+    height: 761rpx;
    left: 50%;
    margin-left: -375rpx;
    /* #endif */
@@ -171,8 +165,7 @@ page {
    font-size: 40rpx !important;
 }

-.custom-search .uni-input-placeholder,
-.custom-search .uni-input-input {
+.custom-search .uni-input-placeholder {
    color: #fff !important;
    font-size: 27rpx !important;
 }
@@ -194,7 +187,7 @@ page {
    /* width:690rpx; */
    width:630rpx;
    height:56rpx;
-    margin:10rpx auto 30rpx;
+    margin:0 auto 30rpx;
    padding:0 30rpx;
    display: flex;
    color:#fff;
@@ -202,33 +195,26 @@ page {
    flex: auto;
 }
 .search-bg .search-left{
-    display: flex;
-    align-items: center;
-    min-width: 10%;
-}
-.search-bg .search-right{
-    border-left:1px solid #4687F2;
-    padding-left:25rpx;
-    margin-left:30rpx;
+    border-right:1px solid #4687F2;
    margin-top:10rpx;
    margin-bottom:10rpx;
-    max-width:60%;
-    display: flex;
-    align-items: center;
-
+    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; */
+    width: 380rpx;
 }
 .search-bg .search-right .uni-input .search-color{
    color:#fff !important;
-    display: flex;
-    align-items: center;
 }
 /* 搜索框修改样式 end */

@@ -326,9 +312,8 @@ page {
    display: flex;
    flex-wrap: wrap;
    /* 关键属性：允许换行 */
+    gap: 20rpx;
    /* 项目间距 */
-    margin-left:-10rpx;
-    margin-right:-10rpx;
 }

 .white-bg .logo-list .l-l-item {
@@ -336,11 +321,8 @@ page {
    text-align: center;
    margin-bottom: 30rpx;
    position: relative;
-    margin-left:10rpx;
-    margin-right:10rpx;
 }

-
 .white-bg .logo-list .l-l-item img {
    width: 90rpx;
    height: 90rpx;
@@ -561,7 +543,6 @@ uni-button[type='primary'][plain] {

 .form-con .footer-con {
    display: flex;
-    padding-bottom:30rpx;
 }

 /* .form-con .form-texarea .is-textarea{
@@ -643,8 +624,3 @@ uni-button[type='primary'][plain] {


 /* CRM 样式 end */
-
-.mescroll-empty .empty-tip{
-    color: #fff !important;
-    font-size:28rpx !important;
-}
--- a/src/static/font/iconfont.css
+++ b/src/static/font/iconfont.css
@@ -11,10 +11,6 @@
  -moz-osx-font-smoothing: grayscale;
 }

-.icon-phonefilled:before {
-  content: "\e68d";
-}
-
 .icon-phonebaocun:before {
  content: "\e80b";
 }
--- a/src/static/font/iconfont.ttf
+++ b/src/static/font/iconfont.ttf
--- a/src/static/images/PicLogo@2x.png
+++ b/src/static/images/PicLogo@2x.png
--- a/src/static/images/PicLogoTxt2@2x.png
+++ b/src/static/images/PicLogoTxt2@2x.png
--- a/src/static/images/PicLogoTxt@2x.png
+++ b/src/static/images/PicLogoTxt@2x.png
--- a/src/static/images/bg@2x.png
+++ b/src/static/images/bg@2x.png
--- a/src/static/images/icon-lock@2x.png
+++ b/src/static/images/icon-lock@2x.png
--- a/src/static/images/login-bg.png
+++ b/src/static/images/login-bg.png
--- a/src/static/images/login-biaoshi.png
+++ b/src/static/images/login-biaoshi.png
--- a/src/static/images/mescroll-empty.png
+++ b/src/static/images/mescroll-empty.png
--- a/src/static/images/notice/icon-clean@2x.png
+++ b/src/static/images/notice/icon-clean@2x.png
--- a/src/stores/user.js
+++ b/src/stores/user.js
@@ -1,6 +1,7 @@
 import { defineStore } from 'pinia'
 import { getToken, setToken,clearToken } from '../utils/auth'
-import { getUserInfo,logout } from '../api/auth'
+import { getUserInfo } from '../api/auth'
+

 export const useUserStore = new defineStore({
    id: 'userStore',
@@ -25,15 +26,12 @@ export const useUserStore = new defineStore({
        },
        // 登录
        login(userinfo) {
-            let token = userinfo.access_token;
-            this.token = token
-            setToken(token)
-            userinfo.token = token;
+            this.token = userinfo.token
+            setToken(userinfo.token)
            this.userInfo = userinfo
        },
        // 退出
-        async logout() {
-            await logout();
+        logout() {
            this.token = ''
            this.userInfo = {}
            clearToken();
--- a/src/utils/cache.js
+++ b/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
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -1,207 +0,0 @@
-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)
-    }
-    
-}
--- a/src/utils/datetime.js
+++ b/src/utils/datetime.js
@@ -87,44 +87,3 @@ 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
-}
--- a/src/utils/encrypt.js
+++ b/src/utils/encrypt.js
@@ -1,30 +0,0 @@
-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
-}
--- a/src/utils/formatter.js
+++ b/src/utils/formatter.js
@@ -45,3 +45,23 @@ export function formatMoney(num, decimals,units){

    return units+retVal;
 }
+
+export function dateFormat(fmt, date) {
+    let ret;
+    const opt = {
+        "Y+": date.getFullYear().toString(),        // 年
+        "m+": (date.getMonth() + 1).toString(),     // 月
+        "d+": date.getDate().toString(),            // 日
+        "H+": date.getHours().toString(),           // 时
+        "M+": date.getMinutes().toString(),         // 分
+        "S+": date.getSeconds().toString()          // 秒
+        // 有其他格式化字符需求可以继续添加，必须转化成字符串
+    };
+    for (let k in opt) {
+        ret = new RegExp("(" + k + ")").exec(fmt);
+        if (ret) {
+            fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
+        };
+    };
+    return fmt;
+}
--- a/src/utils/message.js
+++ b/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=false,succFun) => {
+export const showAlert = (content, title = '提示',showCancel=true,succFun) => {
    return uni.showModal({
        title: title,
        content: content,
@@ -28,7 +28,7 @@ export const showAlert = (content, title = '提示',showCancel=false,succFun) =>
        success: function (res) {
            if (res.confirm) {
                // console.log('用户点击确定');
-                if(succFun)succFun();
+                succFun();
            } else if (res.cancel) {
                // console.log('用户点击取消');
            }
--- a/src/utils/request/index.js
+++ b/src/utils/request/index.js
@@ -1,17 +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=>config=>",config)
+        // console.log("request=>",options,config)
        const { urlPrefix, baseUrl, withToken, isAuth } = config;
        options.header = options.header ?? {};
        if (urlPrefix) {
@@ -20,50 +19,43 @@ const requestHooks = {
        if (baseUrl) {
            options.url = `${baseUrl}${options.url}`;
        }
-        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)
+        const token = getToken();
+        if (withToken && !options.header.token) {
+            options.header.token = token;
+        }
        return options;
    },
    // 响应拦截器
    responseInterceptorsHook(response, config) {
-        // console.log("response=>",response)
-        // console.log("response=>config=>",config)
+        // console.log("response=>",response,config)
        const { isTransformResponse, isReturnDefaultResponse, isAuth } = config;
+        
        if (isReturnDefaultResponse) {
            return response;
        }
-        // const { logout, isLogin } = useUserStore();
-        const { code, data, msg, show } = response.data;
-        switch (code) {
-            case RequestCodeEnum.SUCCESS:
-                msg && show && message.toast(msg);
-                if (!isTransformResponse) {
-                    return response.data;
-                }else{
-                    return data;
-                }
-            case RequestCodeEnum.FAILED:
-                message.toast(msg);
-                return Promise.reject(msg);
-            case RequestCodeEnum.TOKEN_INVALID:
-                message.toast('登录状态已过期，请重新登录！');
-                // console.log(isAuth,isLogin)
-                // if (isAuth && isLogin) {
-					clearToken();
-					uni.reLaunch({ url: '/pages/login/login' })
-                // }
-                
-                return Promise.reject();
-
-            default:
-                message.alert(msg)
-                // return data;
-                return Promise.reject(msg);
+        if (!isTransformResponse) {
+            return response.data;
        }
+        const { logout, isLogin } = useUserStore();
+        const { code, data, msg, show } = response.data;
+        // console.log(code,data,msg,show)
+             switch (code) {
+                  case RequestCodeEnum.SUCCESS:
+                      msg && message.toast(msg);
+                      return response.data;
+                  case RequestCodeEnum.FAILED:
+                      message.toast(msg);
+                      return Promise.reject(msg);
+                  case RequestCodeEnum.TOKEN_INVALID:
+                      if (isAuth && isLogin) {
+      
+                      }
+                      return Promise.reject();
+                  default:
+                      message.toast(msg)
+                      // return response.data;
+                      return Promise.reject(msg);
+              }
    },
    // 响应异常拦截器
    responseInterceptorsCatchHook(options, err) {
@@ -78,10 +70,7 @@ const requestHooks = {
 const defaultOptions = {
    requestOptions: {// 请求配置
        timeout: 10 * 1000,
-        header: { 
-            version: '1.0.0',
-            clientId:`${CLIENT_ID || 2}`, // clientId传2
-        }
+        header: { version: '1.0.0',AppToken: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxIiwiaWF0IjoxNzU0NzI5NzEwLCJleHAiOjE3NTUzMzQ1MTB9.Jas3EQ98u3ZhbrGv0NeESMZPuBjq9PZIzPEV9LcDjjKH19BWiyXJkPUlGrUVuzQKUWrwYCnqXfeZHjm0pLf_UQ' }
    },
    baseUrl: `${import.meta.env.VITE_APP_BASE_URL || ''}`,// 基础 URL
    isReturnDefaultResponse: false,// 是否返回默认响应
--- a/src/utils/status.js
+++ b/src/utils/status.js
@@ -1,20 +0,0 @@
-
-// 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];
-}
-
--- a/src/utils/system.js
+++ b/src/utils/system.js
@@ -39,6 +39,6 @@ export const getNavBarPaddingTop = () => {
 		h=0
 		// #endif
 	}
-	// console.log("h=>",h)
+	console.log("h=>",h)
 	return h;
 }
--- a/vite.config.js
+++ b/vite.config.js
@@ -17,15 +17,13 @@ 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', // 目标服务器地址
+      }
+    }
    
  },
Author	SHA1	Message	Date
wangzhuo	0d359e2708	fix: 客户人员-客户人员所属 fix: 主归属人变更-变更审核	2025-09-01 13:16:14 +08:00
wangzhuo	a51ecb2fa0	fix: 客户人员-接口地址调整 fix: 客户人员-编辑表单-多选组件、日期组件修复	2025-09-01 13:05:30 +08:00
wangzhuo	9223b619f5	fix: 计划查看-导航栏空白高度 fix: 计划查看-接口地址调整	2025-09-01 13:02:08 +08:00
wangyang	63a9a1def5	Merge remote-tracking branch 'origin/develop-718' into develop-718	2025-08-26 11:33:41 +08:00
wangyang	a0ddac37f5	CRM-提交日期格式化	2025-08-26 11:32:49 +08:00
$PC-202311141343\Administrator$ PC-202311141343\Administrator	92311e0aaf	Merge branch 'develop-718' of http://123.57.20.168:4000/admin/ys-app into develop-718	2025-08-26 09:27:47 +08:00
$PC-202311141343\Administrator$ PC-202311141343\Administrator	3d8df52107	提交本地代码到718分支	2025-08-26 09:27:09 +08:00
wangzhuo	8389a78b3a	fix: 上拉分页查询判断	2025-08-22 17:09:15 +08:00
wangzhuo	1703e5987c	fix: 修改页面白色背景高度100vh为高度最小是100vh	2025-08-22 09:13:31 +08:00
wangzhuo	050ee0fd8c	pref: 优化客户查询单选组的警告 fix: 调整周计划查看页面高度	2025-08-21 13:02:20 +08:00
wangyang	64da5061ac	Merge remote-tracking branch 'origin/develop-718' into develop-718	2025-08-20 15:40:23 +08:00
wangyang	7034c138f7	CRM-查看主归属人变更信息，去除检索，优化显示	2025-08-20 15:40:05 +08:00
wangzhuo	ed827b09af	feat: 客户人员审核	2025-08-20 15:04:02 +08:00
wangzhuo	1fda9c6500	feat: 客户人员主归属人变更审核	2025-08-19 22:06:10 +08:00
wangzhuo	5904893d1e	fix: 客户人员主归属人变更-page.json	2025-08-19 11:30:16 +08:00
wangzhuo	5fd7c1d158	feat: 客户人员主归属人变更	2025-08-19 11:29:46 +08:00
wangzhuo	d00ae06fa8	fix: 客户人员编辑更新	2025-08-18 21:54:42 +08:00
wangzhuo	df29941de5	fix: 客户人员编辑表单组件 style: 对page.json代码缩进对齐	2025-08-18 21:43:28 +08:00
wangzhuo	f9474ac01d	feat: 客户人员编辑表单组件	2025-08-18 17:08:56 +08:00
$PC-202311141343\Administrator$ PC-202311141343\Administrator	e6efc466d8	补充json文件	2025-08-18 16:34:43 +08:00
$PC-202311141343\Administrator$ PC-202311141343\Administrator	236c99ad92	推送市场信息模块	2025-08-18 16:30:52 +08:00
wangyang	46f12f9be4	去除打印控制台无效代码	2025-08-18 15:28:41 +08:00
wangyang	0e2de9d6de	主归属人变更查看-功能实现	2025-08-18 15:24:12 +08:00
wangyang	985111fb9e	优化：走访审批查看问题	2025-08-18 10:34:15 +08:00
wangyang	e1d31fb8e7	优化： 1、取消新增报告时，我方领导必填项 2、走访查看，返回时即刷新页面 3、取消评论展示	2025-08-13 10:45:18 +08:00
wangyang	a6ee6db40d	优化： 1、取消新增报告时，我方领导必填项	2025-08-13 10:43:37 +08:00
wangyang	b46899331f	fix:修改走访报告的查看，添加丢失的路由	2025-08-13 10:16:13 +08:00
wangyang	5c407c2830	恢复备注描述信息	2025-08-13 08:37:35 +08:00
wangzhuo	3f2ac17849	fix: 客户人员-新增	2025-08-12 22:41:05 +08:00
wangzhuo	b5d6d4496f	fix: 下拉刷新、上拉加载更多功能修复	2025-08-12 20:39:25 +08:00
wangzhuo	cdb739960d	fix: 计划查看-无数据时展示内容	2025-08-12 18:45:55 +08:00
wangzhuo	5d5b0c2115	test: 测试git合并2	2025-08-12 17:58:14 +08:00
wangyang	0969ee38a8	test-测试Git	2025-08-12 17:55:17 +08:00
wangzhuo	a22feae18a	test: 测试git合并	2025-08-12 17:51:19 +08:00
wangzhuo	07a5991624	fix: 我的计划、计划查看-包导入路径修复	2025-08-12 17:49:43 +08:00
wangzhuo	c61b2aa37c	Merge remote-tracking branch 'origin/develop-718' into develop-718	2025-08-12 17:32:14 +08:00
wangzhuo	7902cc3e6d	feat: 我的计划、计划查看	2025-08-12 17:29:09 +08:00
$PC-202311141343\Administrator$ PC-202311141343\Administrator	9bcf14dbed	main	2025-08-12 17:07:07 +08:00
$PC-202311141343\Administrator$ PC-202311141343\Administrator	297526cd8d	主分支：2025年8月12日 - 合并前	2025-08-12 16:57:23 +08:00
$PC-202311141343\Administrator$ PC-202311141343\Administrator	d6024d1f37	page - commit	2025-08-12 16:35:33 +08:00
wangyang	77b8f42f92	APP-活动报告，签到打卡页面功能实现。	2025-08-12 16:29:51 +08:00
xuli3099	dfb105ee9a	增加使用组件显示配置	2025-08-06 14:56:08 +08:00
xuli3099	e82b75ab78	修改配置	2025-08-06 14:54:26 +08:00