修改错误码

main
主分支：2025年8月12日 - 合并前
2025-08-19 13:23:52 +08:00 · 2025-08-12 17:07:07 +08:00 · 2025-08-12 16:57:23 +08:00 · 2025-08-12 16:35:33 +08:00 · 2025-08-12 16:29:51 +08:00 · 2025-08-06 14:56:08 +08:00
100 changed files with 26150 additions and 15552 deletions
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,2 @@
-
-#调用后台地址
-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:3000"
+VITE_APP_BASE_URL = "http://123.57.20.168:3000"
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1 @@
-
-#调用后台地址
-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/index.html
+++ b/index.html
@@ -10,11 +10,6 @@
        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
    </script>
    <title></title>
-    <style>
-      body{
-          background-color: transparent;
-      }
-    </style>
    <!--preload-links-->
    <!--app-context-->
  </head>
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -57,10 +57,8 @@
    "@dcloudio/uni-mp-xhs": "3.0.0-4070520250711001",
    "@dcloudio/uni-quickapp-webview": "3.0.0-4070520250711001",
    "@dcloudio/uni-ui": "^1.5.7",
-    "crypto-js": "^4.2.0",
    "mescroll-uni": "^1.3.7",
    "pinia": "2.0.20",
-    "uuid": "^11.1.0",
    "vue": "^3.4.21"
  },
  "devDependencies": {
--- a/server/index.js
+++ b/server/index.js
@@ -23,7 +23,7 @@ app.get('/api/captchaImage', (req,res,next) =>{
 // 获取验证码
 app.post('/api/sendSms', (req, res) => {
    res.json(Mock.mock({
-        code: 0,
+        code: 200,
        data: {
            verifyCode:'123456'
        },
@@ -35,7 +35,7 @@ app.post('/api/sendSms', (req, res) => {
 app.post('/api/user/login',(req,res,next) => {
    const { loginType,phone,verifyCode,username, password } = req.body;
    let retObj = {
-        code: 0,
+        code: 200,
        message: '登录成功',
        data: {
          'id': '@id',
@@ -82,7 +82,7 @@ app.post('/api/getUserInfo', (req,res) => {
    // console.log("req=>",req)
    // reqBody = JSON.parse(req.body)
    res.json(Mock.mock({
-        code: 0,
+        code: 200,
        data: {
            'id': '@id',
            'name': '小北',
@@ -99,7 +99,7 @@ app.post('/api/getUserInfo', (req,res) => {
 // 搜索功能
 app.post('/api/search', (req,res) => {
    res.json(Mock.mock({
-        code: 0,
+        code: 200,
        data: {
            'id': '@id',
            'content': '@cname',
@@ -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,
+        code: 200,
        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,
@@ -218,7 +177,7 @@ app.post('/api/backBlogCount', (req,res) => {
 // 首页通知消息跑马灯
 app.post('/api/swiperList', (req,res) => {
    res.json(Mock.mock({
-        code: 0,
+        code: 200,
        data: ["祝贺“友晟夏季封装外壳发布会”圆满成功","祝贺“友晟科技发布会”圆满成功","祝贺“友晟夏季封装外壳发布会”圆满成功"]
    }))
 });
@@ -227,11 +186,11 @@ app.post('/api/swiperList', (req,res) => {
 // 首页日程提醒
 app.post('/api/stepData', (req,res) => {
    res.json(Mock.mock({
-        code: 0,
+        code: 200,
        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'}, 
            ]
        }
@@ -241,7 +200,7 @@ app.post('/api/stepData', (req,res) => {
 // 首页销售任务
 app.post('/api/salesTask', (req,res) => {
    res.json(Mock.mock({
-        code: 0,
+        code: 200,
        data: {
            salesList:['2025-3季度', '2025-2季度', '2025-1季度'],
            percentNum:82,
@@ -254,7 +213,7 @@ app.post('/api/salesTask', (req,res) => {
 // 首页常用服务
 app.post('/api/commonServices', (req,res) => {
    res.json(Mock.mock({
-        code: 0,
+        code: 200,
        data: {
            list:[
                {id:1,name:'设备管理',imgSrc:'static/images/business/icon-sbgl.png'},
@@ -270,7 +229,7 @@ app.post('/api/commonServices', (req,res) => {
 // 新闻列表
 app.post('/api/newsQueryList', (req,res) => {
    res.json(Mock.mock({
-        code: 0,
+        code: 200,
        data: {
            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'},
@@ -287,7 +246,7 @@ app.post('/api/noticeList', (req,res) => {
    let param = req.body;
    if(param.pageIndex==1){
        res.json(Mock.mock({
-            code: 0,
+            code: 200,
            data: {
                list:[
                    {id:1,date:'2025-06-30',isReady:true,title:'临时调整本周工作时间的通知',imgSrc:'static/images/notice/icon-TiXing@2x.png'},
@@ -310,7 +269,7 @@ app.post('/api/noticeList', (req,res) => {
        }))
    }else if(param.pageIndex==2){
        res.json(Mock.mock({
-            code: 0,
+            code: 200,
            data: {
                list:[
                    {id:11,date:'2025-09-09 15:36:00',isReady:true,title:'祝贺“友晟夏季封装外壳发布会”圆满成功',imgSrc:'static/images/notice/icon-TongZhi@2x.png'},
@@ -323,7 +282,7 @@ app.post('/api/noticeList', (req,res) => {
        }))
    }else{
        res.json(Mock.mock({
-            code: 0,
+            code: 200,
            data: {
                list:[],
                totalCount:14
@@ -339,7 +298,7 @@ app.post('/api/visitorReportList', (req,res) => {
    // console.log(param)
    if(param.pageIndex==1){
        res.json(Mock.mock({
-            code: 0,
+            code: 200,
            data: {
                list:[
                    {
@@ -398,7 +357,7 @@ app.post('/api/visitorReportList', (req,res) => {
        }))
    }else if(param.pageIndex==2){
        res.json(Mock.mock({
-            code: 0,
+            code: 200,
            data: {
                list:[
                    {
@@ -427,7 +386,7 @@ app.post('/api/visitorReportList', (req,res) => {
        }))
    }else{
        res.json(Mock.mock({
-            code: 0,
+            code: 200,
            data: {
                list:[],
                totalCount:14
@@ -440,7 +399,7 @@ app.post('/api/visitorReportList', (req,res) => {
 // 客户列表
 app.post('/api/guestList', (req,res) => {
    res.json(Mock.mock({
-        code: 0,
+        code: 200,
        data: {
            list:[
                {id:1,name:'西安微电子技术研究所'},
@@ -457,7 +416,7 @@ app.post('/api/visitorReportDetail', (req,res) => {
    let param = req.body;
    // console.log(111,param.id)
    res.json(Mock.mock({
-        code: 0,
+        code: 200,
        data: {
            activeObj:{
                id:1,title:'客户：北京中科睿信科技有限公司',name:'YS-VR2025091515',
@@ -478,7 +437,7 @@ app.post('/api/mattersList', (req,res) => {
    // console.log(param)
    if(param.pageIndex==1){
        res.json(Mock.mock({
-            code: 0,
+            code: 200,
            data: {
                list:[
                    { id:1,status:1,statusName:'待王彦琳审核',title:'西安微电子技术研究所',desc:'a该企业产品线技术改造延期，本月设备供应周期预 计延长7-15天。' },
@@ -497,7 +456,7 @@ app.post('/api/mattersList', (req,res) => {
        }))
    }else if(param.pageIndex==2){
        res.json(Mock.mock({
-            code: 0,
+            code: 200,
            data: {
                list:[
                    { id:11,status:1,statusName:'待王彦琳审核',title:'北京中科睿信科技有限公司',desc:'该企业产品线技术改造延期，本月设备供应周期预 计延长7-15天。' },
@@ -510,7 +469,7 @@ app.post('/api/mattersList', (req,res) => {
        }))
    }else{
        res.json(Mock.mock({
-            code: 0,
+            code: 200,
            data: {
                list:[],
                totalCount:14
@@ -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
@@ -0,0 +1,213 @@
+import request from "@/utils/request";
+
+//获取客户单位用户人员信息
+export function crmCustomerUser(data) {
+  return request.get({
+    url: "/app/appCrmCusUserNewController/crmCustomerUser",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//获取我公司人员信息
+export function myUserNameList(data) {
+  return request.get({
+    url: "/app/appVisistDetail/getCompanyPersonnerlName",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//保存走访报告明细
+export function addVisistDetail(data) {
+  return request.post({
+    url: "/app/appVisistDetail/addVisistDetail",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//删除走访报告中的某一项（日常走访，业务招待）
+export function deleVisistDetailItem(data) {
+  return request.get({
+    url: "/app/appVisistDetail/deleVisistDetailItem",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//走访明细查询
+export function getVisistDetailItem(data) {
+  return request.get({
+    url: "/app/appVisistDetail/queryList",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//删除整体的报告
+export function removeVisist(data) {
+  return request.get({
+    url: "/app/appVisistReport/remove",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//走访报告列表查询
+export function getYsVisistList(data) {
+  return request.get({
+    url: "/app/appVisistReport/list",
+    data
+  },{
+    isTransformResponse:false
+  });
+}
+
+//更新一个报告的状态
+export function updateStatus(data) {
+  return request.post({
+    url: "/app/appVisistReport/updateStatus",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//获取客户信息列表
+export function getYsCustomerList(data) {
+  return request.get({
+    url: "/app/appCustomerIfno/pageList",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//新增走访报告
+export function addVisist(data) {
+  return request.post({
+    url: "/app/appVisistReport/add",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//走访报告查询
+export function getQueryVisistList(data) {
+  return request.get({
+    url: "/app/appVisistReport/queryList",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//走访报告详细信息
+export function getYsVisistInfo(data) {
+  return request.get({
+    url: "/app/appVisistReport/getDetail",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//一个走访报告下面关联的日常走访，业务招待等具体信息
+export function getVisistDetailList(data) {
+  return request.get({
+    url: "/app/appVisistDetail/list",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//新增点赞
+export function insertUserLike(data) {
+  return request.post({
+    url: "/app/appUserLike/addVisistDetail",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//查询是否已经点过赞
+export function getUserLike(data) {
+  return request.get({
+    url: "/app/appUserLike/queryUserLikeStatus/" + data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//获取当前人的信息
+export function getUserInfo(data) {
+  return request.get({
+    url: "/app/user/getUserInfo",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//查询没有经过信息管理员审批的单子
+export function getApprovalList(data) {
+  return request.get({
+    url: "/app/appVisistReport/approvalList",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//打开详情页设置成为已读
+export function getUpdateApprovalForRead(data) {
+  return request.post({
+    url: "/app/appVisistReport/updateApprovalForRead",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//提交通过活动报告
+export function auditActivityReport(data) {
+  return request.post({
+    url: "/app/activity/auditActivityReport",
+    data,
+    header: {
+    'Content-Type': 'application/x-www-form-urlencoded' // 设置请求头，确保服务器正确解析 FormData
+    }
+  },{
+    isTransformResponse:false
+  });
+}
+
+//更新驳回原因
+export function getRejectReason(data) {
+  return request.post({
+    url: "/app/appVisistReport/updaterejectReason",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//查询签到打卡信息集合为了报告
+export function addMapForReport(data) {
+  return request.get({
+    url: "/app/appVisistReport/addMapList",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
--- a/src/api/crm/activity/map.js
+++ b/src/api/crm/activity/map.js
@@ -0,0 +1,51 @@
+import request from "@/utils/request";
+
+//新增地图开始签到接口
+export function addStartMap(data) {
+  return request.post({
+    url: "/app/appVisistMap/Startadd",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//新增地图开始打卡接口
+export function addStartMapForClockIn(data) {
+  return request.post({
+    url: "/app/appVisistMap/StartaddForClockIn",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//打卡信息查看
+export function CheckInInformationViewing(data) {
+  return request.get({
+    url: "/app/appVisistMap/DKList",
+    data
+  },{
+    isTransformResponse:false
+  });
+}
+
+//签到统计
+export function getSigninList(data) {
+  return request.get({
+    url: "/app/appVisistMap/QueryBased",
+    data
+  },{
+    isTransformResponse:false
+  });
+}
+
+//不签到统计
+export function getNoSigninList(data) {
+  return request.get({
+    url: "/app/appVisistMap/QueryBasedIsNull",
+    data
+  },{
+    isTransformResponse:false
+  });
+}
--- a/src/api/crm/api_ys.js
+++ b/src/api/crm/api_ys.js
@@ -0,0 +1,59 @@
+import request from "@/utils/request"
+
+	
+	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
+			})
+	}
+	
--- 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
@@ -25,7 +25,6 @@ const props = defineProps({
    title: String,
    leftFlag:true,//默认左侧显示 false-不显示
    rightFlag:false,//默认右侧不显示
-    searchType:{default:0}//搜索返回为1，其他暂时不处理
 })

 const emit = defineEmits(['back'])
@@ -36,7 +35,7 @@ let navbarHeight = ref(0)
 let navHeight = ref(0)

 onMounted(() => {
-    navBarPaddingTop.value = getNavBarPaddingTop();
+    navBarPaddingTop.value = getNavBarPaddingTop();console.log(navBarPaddingTop.value)
    statusBarHeight.value = getStatusBarHeight();
    navbarHeight.value = getNavBarHeight();
    navHeight.value = navbarHeight.value - statusBarHeight.value
@@ -44,7 +43,6 @@ onMounted(() => {

 const handleBack = () => {
    emit('back')
-    if(!props.searchType)
    uni.navigateBack()
 }
 </script>
@@ -58,15 +56,15 @@ const handleBack = () => {
    margin-left:-375rpx;
    z-index: 999;
    /* #ifdef APP-PLUS */
-    /* background: url('@/static/images/bg-Blue-header.png') no-repeat;
+    background: url('@/static/images/bg-Blue-header.png') no-repeat;
    background-size:750rpx 160rpx;
-    height:160rpx; */
+    height:160rpx;
    /* #endif */

    /* #ifndef APP-PLUS */
-    /* background: url('@/static/images/bg-Blue-header2.png') no-repeat;
+    background: url('@/static/images/bg-Blue-header2.png') no-repeat;
    background-size:750rpx 116rpx;
-    height:116rpx; */
+    height:116rpx;
    /* #endif */
   
 }
--- a/src/components/customSearch.vue
+++ b/src/components/customSearch.vue
@@ -1,307 +1,84 @@
 <template>
    <view>
        <!-- 搜索框 -->
-        <view class="search search-sao">
-            <!--   @confirm="handleSearch"  @cancel="handleCancel"-->
-            <uni-search-bar class="custom-search" 
-                radius="28" 
-                placeholder="请输入您想查询的内容或服务" 
-                clearButton="auto"
-                bgColor="#6FA2F8" textColor="#ffffff" 
-                v-model="searchText"
-                cancelButton="none"
-                focus
-            />
-            <text class="search-btn" @click="handleSearch">查询</text>
-        </view>
-        <view class="white-bg">
+        <uni-search-bar v-model="searchText" @confirm="handleSearch" />

-            <!-- 类型列表 -->
-            <view class="search-section" v-if="searchTypeList.length>0">
-                <view class="section-header">
-                    <text class="section-title">{{ searchType.typeName }}</text>
-                </view>
-                <view class="tag-container">
-                    <view class="search-tag notice-tag" :class="{'notice-check':!searchCheckObj.id}"  @click="handleNoticeClick({})">全部</view>
-                    <view class="search-tag notice-tag" :class="{'notice-check':item.id==searchCheckObj.id}"
-                        v-for="(item, index) in searchTypeList"
-                        :key="'notice-' + index"
-                        @click="handleNoticeClick(item)"
+        <!-- <view v-if="showSuggestions" class="suggestions-list">
+            <view 
+                v-for="(item, index) in suggestions" 
+                :key="index"
+                class="suggestion-item"
+                @click="selectSuggestion(item)"
            >
-                        {{ item.name }}
-                    </view>
-                </view>
-            </view>
-
-            <!-- 历史记录  v-if="historyList.length>0" -->
-            <view class="search-section">
-                <view class="section-header">
-                    <text class="section-title">历史搜索</text>
-                    <uni-icons type="trash" size="18" color="#999" @click="clearHistory"></uni-icons>
-                </view>
-                <view class="tag-container">
-                    <view class="search-tag" v-for="(item, index) in historyList" :key="'history-' + index"
-                        @click="handleHistoryClick(item)">
                {{ item }}
            </view>
-                </view>
+        </view> -->
+
+        <!-- 筛选条件 -->
+        <view class="filter-container">
+            <picker mode="selector" :range="categoryOptions" @change="handleCategoryChange">
+                <view class="filter-item">{{ categoryText }}</view>
+            </picker>
+            <picker mode="selector" :range="sortOptions" @change="handleSortChange">
+                <view class="filter-item">{{ sortText }}</view>
+            </picker>
        </view>

        <!-- 搜索结果 -->
-            <!-- <view class="search-result" v-if="searchResult.length > 0">
-                <view class="result-item"
-                    v-for="(item, index) in searchResult"
-                    :key="'result-' + index"
-                    @click="handleResultClick(item)"
-                >
-                    {{ item.name }}
-                </view>
-            </view> -->
-        </view>
+        <search-results :list="results" />
    </view>
 </template>

 <script setup>
-import { ref,watch } from 'vue'
+import { ref, computed } from 'vue'

-const props = defineProps({
-    searchKeywords:{//搜索文本
-        type:String
-    },
-    searchType:{//哪种类型显示对象 typeId:1-首页，2-业务首页，3-消息  之后可以自动添加
-        type:Object
-    },
-    searchTypeList:{//类型列表
-        type:Array,
-        default:[]
-    },
-    checkTypeObj:{//选中的类型对象
-        type:Object
-    },
+// const suggestions = ref([])
+// const showSuggestions = ref(false)

-})
-
-const searchText = ref('');// 搜索文本
-const searchCheckObj = ref({});//选中的类型对象
-
-const showCancel = ref(false)// 是否显示取消按钮
-const historyList = ref([])// 历史记录列表
-
-const searchResult = ref([])// 搜索结果
-
-// 搜索文本内容
-watch(() => props.searchKeywords, (newVal, oldVal) => {
-    searchText.value = newVal
-},{
-    deep:true, // 深度监听
-    immediate:true // 立即执行
-});
-
-// 选中类型对象
-watch(() => props.checkTypeObj, (newVal, oldVal) => {
-    searchCheckObj.value = newVal
-},{
-    deep:true, // 深度监听
-    immediate:true // 立即执行
-});
-
-
-// 调用父组件的方法
-const emit = defineEmits(['confirm']);
-
-//  加载历史记录
-const loadHistory = () => {
-    let typeId = props.searchType?props.searchType.typeId:undefined
-    const history = uni.getStorageSync('searchHistory'+typeId) || []
-    historyList.value = history
-}
-loadHistory();
-
-// 处理搜索
-const handleSearch = () => {
-    let txtContent = searchText.value?searchText.value.trim():undefined
-    if (txtContent) {
-        // uni.showToast({
-        //     title: '请输入搜索内容',
-        //     icon: 'none'
-        // })
+// const handleInput = debounce(async () => {
+//   if (!searchText.value.trim()) {
+//     showSuggestions.value = false
 //     return
-        // 添加到历史记录
-        addToHistory(txtContent)
+//   }
+  
+//   try {
+//     const res = await getSuggestions(searchText.value)
+//     suggestions.value = res
+//     showSuggestions.value = true
+//   } catch (error) {
+//     console.error('获取搜索建议失败:', error)
+//   }
+// }, 300)
+
+const searchText = ref('')
+const category = ref(0)
+const sort = ref(0)
+
+const categoryOptions = ['全部类别', '电子产品', '服装', '食品']
+const sortOptions = ['默认排序', '价格从低到高', '价格从高到低', '销量最高']
+
+const categoryText = computed(() => categoryOptions[category.value])
+const sortText = computed(() => sortOptions[sort.value])
+
+const handleSearch = async () => {
+    const params = {
+        keyword: searchText.value,
+        category: category.value,
+        sort: sort.value
    }

-    // 模拟搜索请求
-    // searchResult.value = [
-    //     { id: 1, name: `${searchText.value} 结果1` },
-    //     { id: 2, name: `${searchText.value} 结果2` },
-    //     { id: 3, name: `${searchText.value} 结果3` }
-    // ]
-
-
-    // 传给父组件
-    emit('confirm',searchCheckObj,searchText);
+    // 调用搜索API
+    const res = await searchAPI(params)
+    results.value = res.data
 }

-// 处理输入
-const handleInput = () => {
-    showCancel.value = searchText.value.length > 0
-}
-
-// 清除搜索
-const clearSearch = () => {
-    searchText.value = ''
-    showCancel.value = false
-    searchResult.value = []
-}
-
-
-// 添加到历史记录
-const addToHistory = (keyword) => {
-    const index = historyList.value.indexOf(keyword)
-    if (index !== -1) {
-        historyList.value.splice(index, 1)
-    }
-    historyList.value.unshift(keyword)
-
-    // 限制历史记录数量
-    if (historyList.value.length > 10) {
-        historyList.value = historyList.value.slice(0, 10)
-    }
-
-    let typeId = props.searchType.typeId
-    uni.setStorageSync('searchHistory'+typeId, historyList.value)
-}
-
-// 清除历史记录
-const clearHistory = () => {
-    uni.showModal({
-        title: '提示',
-        content: '确定要清空历史记录吗？',
-        success: (res) => {
-            if (res.confirm) {
-                historyList.value = []
-                let typeId = props.searchType.typeId;
-                uni.removeStorageSync('searchHistory'+typeId)
-            }
-        }
-    })
-}
-
-// 点击历史记录
-const handleHistoryClick = (item) => {
-    searchText.value = item
+const handleCategoryChange = (e) => {
+    category.value = e.detail.value
    handleSearch()
 }

-// 点击消息类型
-const handleNoticeClick = (item) => {
-    // searchText.value = item
-    searchCheckObj.value = item;
+const handleSortChange = (e) => {
+    sort.value = e.detail.value
    handleSearch()
 }
-
-// 点击搜索结果
-const handleResultClick = (item) => {
-    uni.showToast({
-        title: `点击了 ${item.name}`,
-        icon: 'none'
-    })
-    // 实际项目中这里可以跳转到详情页
-    // uni.navigateTo({ url: `/pages/detail/detail?id=${item.id}` })
-}
 </script>
-<style scoped>
-
-.search-sao {
-    display: flex;
-}
-
-.search-sao .custom-search {
-    /* width:615rpx; */
-    width: 590rpx;
-    padding: 0 20rpx;
-    margin-bottom:15rpx;
-}
-
-.search-sao :deep(.custom-search.uni-searchbar) {
-    padding-bottom: 15rpx !important;
-}
-
-.search-sao .search-btn {
-    margin: 15rpx 30rpx 10rpx 0;
-    color: #fff;
-    font-size: 28rpx;
-    font-weight: bold;
-    text-align: center;
-}
-.white-bg {
-    width: 750rpx;
-    padding: 40rpx 0;
-    margin-bottom: 0;
-    border-radius: 8px 8px 0 0;
-    /* #ifdef APP-PLUS */
-    height: calc(100vh - 130px);
-    /* #endif */
-    /* #ifndef APP-PLUS */
-    height: calc(100vh - 150px);
-    /* #endif */
-}
-
-.search-section {
-    margin-bottom: 40rpx;
-    padding:0 45rpx;
-}
-
-.section-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 20rpx;
-}
-
-.section-title {
-    font-size: 28rpx;
-    color: #333;
-    font-weight: bold;
-}
-
-.tag-container {
-    display: flex;
-    flex-wrap: wrap;
-    gap:20rpx;
-}
-
-.search-tag {
-    background-color: #fff;
-    border:1px solid #E8E8E8;
-    border-radius: 10rpx;
-    padding: 10rpx 15rpx;
-    /* margin-right: 20rpx;
-    margin-bottom: 20rpx; */
-    font-size: 28rpx;
-}
-
-.search-tag.notice-tag{
-    padding: 10rpx 45rpx;
-}
-.notice-tag:nth-child(3n){
-    margin-right: 0;
-}
-
-.notice-check{
-    background-color: #05A3F4;
-    color:#fff;
-    border-color:#05A3F4;
-}
-.search-result {
-    margin-top: 20rpx;
-    padding:0 20rpx;
-}
-
-.result-item {
-    padding: 20rpx 0;
-    border-bottom: 1rpx solid #eee;
-    font-size: 28rpx;
-    color: #333;
-}
-</style>
--- 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/sliderCaptcha.vue
+++ b/src/components/sliderCaptcha.vue
@@ -0,0 +1,182 @@
+<template>
+    <view class="container">
+        <!-- 验证区域 -->
+        <view class="captcha-area">
+            <image :src="backgroundImg" class="bg-img" mode="widthFix"></image>
+            <view class="puzzle-hole" :style="{
+                left: `${holePosition.x}px`,
+                top: `${holePosition.y}px`,
+                width: `${puzzleSize.width}px`,
+                height: `${puzzleSize.height}px`
+            }"></view>
+        </view>
+
+        <!-- 滑块区域 -->
+        <view class="slider-area">
+            <movable-area class="movable-area">
+                <movable-view class="movable-view" direction="horizontal" :x="sliderX" @change="onDrag"
+                    @touchend="onDragEnd" :damping="40" :friction="10">
+                    <image :src="puzzleImg" class="puzzle-img"></image>
+                </movable-view>
+            </movable-area>
+            <text class="slider-text">{{ sliderText }}</text>
+        </view>
+
+        <!-- 操作按钮 -->
+        <button class="refresh-btn" @click="initCaptcha">刷新验证码</button>
+    </view>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            backgroundImg: './static/images/captcha/1.jpg?v=1', // 替换为你的背景图
+            puzzleImg: '', // 滑块小图
+            holePosition: { x: 0, y: 0 }, // 缺口位置
+            puzzleSize: { width: 50, height: 50 }, // 滑块尺寸
+            sliderX: 0, // 滑块位置
+            targetX: 0, // 正确目标位置
+            isVerified: false,
+            sliderText: '拖动滑块完成拼图'
+        };
+    },
+    mounted() {
+        this.initCaptcha();
+    },
+    methods: {
+        // 初始化验证码
+        initCaptcha() {
+            this.isVerified = false;
+            this.sliderX = 0;
+            this.sliderText = '拖动滑块完成拼图';
+
+            // 随机生成缺口位置 (示例)
+            const maxX = 300 - this.puzzleSize.width;
+            const maxY = 200 - this.puzzleSize.height;
+
+            this.holePosition = {
+                x: Math.floor(Math.random() * maxX),
+                y: Math.floor(Math.random() * maxY)
+            };
+
+            // 这里应该从服务器获取裁剪后的小图
+            // 实际项目中需要通过API获取
+            this.puzzleImg = this.generatePuzzleImage();
+
+            // 设置目标位置 (映射到滑块轨道)
+            this.targetX = this.mapToSliderPosition(this.holePosition.x);
+        },
+
+        // 模拟生成滑块图片 (实际应从服务端获取)
+        generatePuzzleImage() {
+            // 这里应该是从背景图裁剪的图片
+            return './static/images/captcha/1-1.jpg?v=1';
+        },
+
+        // 映射背景位置到滑块位置
+        mapToSliderPosition(bgX) {
+            const bgWidth = 300; // 背景图显示宽度
+            const sliderWidth = 280; // 滑块轨道宽度
+            return (bgX / bgWidth) * sliderWidth;
+        },
+
+        // 拖动中
+        onDrag(e) {
+            if (this.isVerified) return;
+            this.sliderX = e.detail.x;
+        },
+
+        // 拖动结束
+        onDragEnd() {
+            if (this.isVerified) return;
+
+            // 允许的误差范围
+            const tolerance = 5;
+
+            if (Math.abs(this.sliderX - this.targetX) < tolerance) {
+                this.isVerified = true;
+                this.sliderText = '验证成功 ✓';
+                uni.showToast({ title: '验证成功', icon: 'success' });
+                // 这里可以触发验证通过后的操作
+            } else {
+                this.sliderText = '验证失败，请重试';
+                this.sliderX = 0;
+                setTimeout(() => {
+                    if (!this.isVerified) this.sliderText = '拖动滑块完成拼图';
+                }, 1000);
+            }
+        }
+    }
+};
+</script>
+
+<style>
+.container {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 20px;
+}
+
+.captcha-area {
+    position: relative;
+    width: 300px;
+    height: 200px;
+    border: 1px solid #eee;
+    border-radius: 8px;
+    overflow: hidden;
+    margin-bottom: 30px;
+}
+
+.bg-img {
+    width: 100%;
+    height: 100%;
+}
+
+.puzzle-hole {
+    position: absolute;
+    border: 2px dashed #fff;
+    box-shadow: 0 0 0 2000px rgba(0, 0, 0, 0.5);
+    pointer-events: none;
+}
+
+.slider-area {
+    width: 300px;
+    position: relative;
+}
+
+.movable-area {
+    width: 100%;
+    height: 50px;
+    background-color: #f5f5f5;
+    border-radius: 25px;
+}
+
+.movable-view {
+    width: 60px;
+    height: 60px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.puzzle-img {
+    width: 50px;
+    height: 50px;
+    border-radius: 8px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
+}
+
+.slider-text {
+    display: block;
+    text-align: center;
+    margin-top: 10px;
+    color: #666;
+}
+
+.refresh-btn {
+    margin-top: 20px;
+    width: 200px;
+}
+</style>
--- 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
@@ -10,9 +10,9 @@ export const RequestMethodsEnum = {
 };

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

 export const RequestErrMsgEnum = {
--- a/src/main.js
+++ b/src/main.js
@@ -1,31 +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
@@ -7,18 +7,13 @@
 		}
 	},
 	"pages": [
+
 		{
 			"path": "pages/loading/loading",
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
-		{
-			"path": "pages/deviceAuth/deviceAuth",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
 		{
 			"path": "pages/login/login",
 			"style": {
@@ -28,25 +23,13 @@
 		{
 			"path": "pages/home/home",
 			"style": {
-				"navigationBarTitleText": "",
-				"renderer": "native",  // 实验性选项，可能提升性能
-				"hardwareAccelerated": true  // 启用 GPU 加速
+				"navigationBarTitleText": ""
 			}
 		},
 		{
 			"path": "pages/business/business",
 			"style": {
-				"navigationBarTitleText": "",
-				"renderer": "native",  // 实验性选项，可能提升性能
-				"hardwareAccelerated": true  // 启用 GPU 加速
-			}
-		},
-		{
-			"path": "pages/business/editDaily",
-			"style": {
-				"navigationBarTitleText": "",
-				"renderer": "native",  // 实验性选项，可能提升性能
-				"hardwareAccelerated": true  // 启用 GPU 加速
+				"navigationBarTitleText": ""
 			}
 		},
 		{
@@ -73,10 +56,109 @@
 				"navigationBarTitleText": ""
 			}
 		},
+		//市场信息管理（已更新）
 		{
-			"path": "pages/business/CRM/marketInformation",//市场信息管理
+			"path": "pages/business/CRM/marketInformation/marketInformation",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "市场信息管理"
+			}
+		},
+		//市场机会录入（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/marketOpportunities",
+			"style": {
+				"navigationBarTitleText": "市场机会录入"
+			}
+		},
+		//市场机会修改（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/marketOpportunitiesDetail",
+			"style": {
+				"navigationBarTitleText": "市场机会修改"
+			}
+		},
+		//重大事项录入（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/majorMatter",
+			"style": {
+				"navigationBarTitleText": "重大事项录入"
+			}
+		},
+		//重大事项更改（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/majorMatterDetail",
+			"style": {
+				"navigationBarTitleText": "重大事项更改"
+			}
+		},
+		//竞争对手信息录入（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/competitor",
+			"style": {
+				"navigationBarTitleText": "竞争对手信息录入"
+			}
+		},
+		//竞争对手信息更改（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/competitorDetail",
+			"style": {
+				"navigationBarTitleText": "竞争对手信息更改"
+			}
+		},
+		//人员变化信息录入（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/personnelChanges",
+			"style": {
+				"navigationBarTitleText": "人员变化信息录入"
+			}
+		},
+		//人员变化信息更改（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/personnelChangesDetail",
+			"style": {
+				"navigationBarTitleText": "人员变化信息更改"
+			}
+		},
+		//重点型号任务信息录入（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/keyModelTasks",
+			"style": {
+				"navigationBarTitleText": "重点型号任务信息录入"
+			}
+		},
+		//重点型号任务信息更新（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/keyModelTasksDetail",
+			"style": {
+				"navigationBarTitleText": "重点型号任务信息更新"
+			}
+		},
+		//通用信息录入（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/beCurrent",
+			"style": {
+				"navigationBarTitleText": "通用信息录入"
+			}
+		},
+		//通用信息更新（已更新）
+		{
+			"path": "pages/business/CRM/marketInformation/beCurrentDetail",
+			"style": {
+				"navigationBarTitleText": "通用信息更新"
+			}
+		},
+		//选择客户（已更新）
+		{
+			"path": "pages/business/CRM/chooseCus",
+			"style": {
+				"navigationBarTitleText": "客户选择"
+			}
+		}, 
+		//选择客户人员（已更新）
+		{
+			"path": "pages/business/CRM/customerUserList",
+			"style": {
+				"navigationBarTitleText": "客户人员选择"
 			}
 		}, 
 		{
@@ -106,47 +188,120 @@
 		{
 			"path": "pages/notice/notice",
 			"style": {
-				"navigationBarTitleText": ""
-			}
+				"navigationBarTitleText": "",
+				"app-plus" : {
+					"bounce" : "none" // 取消APP端iOS回弹,避免与下拉刷新冲突 (可统一配在 'globalStyle')
 				},
-		{
-			"path": "pages/notice/waitApprove",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/notice/waitApproveDetail",
-			"style": {
-				"navigationBarTitleText": ""
+				"mp-alipay":{"allowsBounceVertical":"NO"} // 取消支付宝和钉钉小程序的iOS回弹,避免与下拉刷新冲突 (可统一配在 'globalStyle')
 			}
 		},
 		{
 			"path": "pages/userinfo/userinfo",
 			"style": {
-				"navigationBarTitleText": "",
-				"renderer": "native",  // 实验性选项，可能提升性能
-				"hardwareAccelerated": true  // 启用 GPU 加速
+				"navigationBarTitleText": ""
 			}
 		},
+		//===================================活动报告====================
 		{
-			"path": "pages/userinfo/version",
+			"path": "pages/business/CRM/marketActivity/visitReport",//市场信息管理
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
 		{
-			"path": "pages/search/search",
+			"path": "pages/business/CRM/marketActivity/visitorReportAdd",//走访报告添加
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
 		{
-			"path": "pages/h5-webview/h5-webview",
+			"path": "pages/business/CRM/marketActivity/visitReportView",//走访报告查看
 			"style": {
 				"navigationBarTitleText": ""
 			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/visitReportDetail",//走访报告查看具体明细
+			"style": {
+				"navigationBarTitleText": ""
 			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/auditReport",//走访报告审批列表查看
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/detailForApproval",//走访报告明细审批
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/visitorReportEnter",//走访报告内容录入
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/auditReject",//走访报告驳回输入原因
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/customerUserList",//客户公司人员信息
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/myUserList",//我公司人员信息
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/activityTypeList",//活动类型
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/chooseCus",//选择客户单位
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		//====================地图======
+		{
+			"path": "pages/business/CRM/map/vistorCheckin",//签到打卡
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/map/addRearkSignIn",//签到备注
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/map/checkInView",//打卡信息（考勤查看）
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/map/checkinStatistics",//打卡统计
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+
+
+		//===================================活动报告====================
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
--- a/src/pages/business/CRM/chooseCus.vue
+++ b/src/pages/business/CRM/chooseCus.vue
@@ -0,0 +1,170 @@
+<template>
+    <view class="con-body">
+        <view >
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'选择客户单位'" :leftFlag="true" :rightFlag="false">
+            </customHeader>
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height"></view>
+            <uni-easyinput prefixIcon="search" v-model="searchContent" placeholder="请输入客户单位名称" clearable
+                @iconClick="iconClick">
+            </uni-easyinput>
+
+		
+		<view class="inner-box">
+			<view class="list-cont">
+				<radio-group class="block" @change="radioChange">
+					<view class="item"   v-for="(item, index) in dataList">
+						<radio class='radio' :value="index" ></radio>
+						<view class="name">{{item.cusName+"（"+item.shortName+"）"}}</view>
+					</view>
+				</radio-group>
+			</view>
+		</view>
+
+        </view>
+    </view>
+</template>
+
+<script setup>
+import customHeader from '@/components/customHeader.vue'
+import { getYsCustomerList } from '../../../api/crm/api_ys.js'
+import { onMounted,  reactive, ref, watch } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { useMessage } from '../../../utils/message.js'
+
+
+
+const message = useMessage();
+
+//点击查询客户人员
+const queryParams = ref({
+    cusName: '',
+    nickName:'',
+    pageNum: 1,
+    pageSize: 10
+})
+
+
+onMounted(() => {
+    
+})
+
+onLoad(options => {
+    queryParams.value.cusName = options.cusName
+})
+const dataList = ref([])
+
+
+
+
+//查询某一客户人员
+let searchContent = ref('')
+
+function iconClick() {
+    message.toast('点击了查询，当前内容：' + searchContent.value)
+}
+
+//监视查询的内容的变化
+let queryCusForm = reactive({})
+watch(searchContent,(newValue,oldValue)=>{
+    console.log("输入内容：",searchContent.value)
+    queryCusForm.cusName = searchContent.value
+    getYsCustomerList(queryCusForm).then(res=>{
+        dataList.value = res.rows
+    })
+})
+
+function radioChange(event) {
+     const selectedIndex = event.detail.value
+    let test = dataList.value[selectedIndex]
+    // 发送全局事件
+    uni.$emit('onCustomerSelected', test)
+    let cusName = test.cusName;//客户名称
+    let cusId = test.cusId;//客户ID
+    uni.navigateBack()//返回上一页
+}
+
+
+
+</script>
+
+<style scoped lang="scss">
+
+.con-body{
+    background: white;
+}
+
+
+/* Container for the checkbox group */
+.checkbox-group.block {
+    width: 100%;
+}
+
+/* Each item row */
+.itemClass {
+    display: flex;
+    align-items: center;
+    padding: 10rpx 0;
+    margin-left: 15rpx;
+    border-bottom: 1px solid #eee;
+    /* optional divider */
+}
+
+/* Checkbox styling */
+.checkBoxClass {
+    margin-right: 12rpx;
+}
+
+/* Content container */
+.clientClass {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    font-size: 36rpx;
+    color: #333;
+    /* default text color */
+}
+
+/* Blue username text */
+.blue-text {
+    /* or any blue you prefer */
+    margin-right: 5rpx;
+}
+.inner-box {
+  width: 100%;
+  padding: 10px;
+  box-sizing: border-box;
+}
+
+.list-cont {
+  width: 100%;
+}
+
+.block {
+  width: 100%;
+}
+
+.item {
+  display: flex;
+  align-items: center;
+  padding: 12px 0;
+  border-bottom: 1px solid #eee;
+}
+
+.radio {
+  margin-right: 12px;
+  transform: scale(0.9);
+}
+
+.name {
+  flex: 1;
+  font-size: 16px;
+  color: #333;
+}
+
+.checked {
+  color: #007AFF; /* 选中状态的颜色 */
+}
+</style>
--- a/src/pages/business/CRM/customerUserList.vue
+++ b/src/pages/business/CRM/customerUserList.vue
@@ -0,0 +1,136 @@
+<template>
+    <view class="con-body">
+        <view >
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'走访报告添加客户人员'" :leftFlag="true" :rightFlag="false">
+            </customHeader>
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height"></view>
+            <uni-easyinput prefixIcon="search" v-model="searchContent" placeholder="请输入客户人员名称" clearable
+                @iconClick="iconClick">
+            </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" 
+                            v-model="item.userName"></checkbox>
+                        <view class="clientClass">
+                            <text class="blue-text">{{ item.userName }}</text>
+                            {{ " | " }}
+                            {{ item.userDept != null ? item.userDept : ' ' }}
+                            {{ item.job != null ? item.job : ' ' }}
+                            {{ item.mobilePhone }}
+                            {{ item.remark != null ? item.remark : ' ' }}
+                        </view>
+                    </view>
+                </checkbox-group>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import customHeader from '@/components/customHeader.vue'
+import { crmCustomerUser } from '../../../api/crm/api_ys.js'
+import { onMounted, onUnmounted, reactive, ref, watch } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { useMessage } from '../../../utils/message.js'
+import cache from '../../../utils/cache'
+
+
+
+const message = useMessage();
+
+//点击查询客户人员
+const queryParams = ref({
+    cusName: '',
+    pageNum: 1,
+    pageSize: 10
+})
+
+
+onMounted(() => {
+    getClientUserName()
+})
+
+onLoad(options => {
+    queryParams.value.cusName = options.cusName
+})
+const dataList = ref([])
+
+function getClientUserName() {
+    crmCustomerUser(queryParams.value).then(res => {
+        dataList.value = res.rows
+    })
+}
+
+
+//查询某一客户人员
+let searchContent = ref('')
+
+function iconClick() {
+    message.toast('点击了查询，当前内容：' + searchContent.value)
+}
+
+//监视查询的内容的变化
+watch(searchContent,(newValue,oldValue)=>{
+    queryParams.value.nickName = searchContent.value
+    //变化了之后，重新查询内容
+    crmCustomerUser(queryParams.value).then(res => {
+        dataList.value = res.rows
+    })
+})
+
+
+
+//勾选内容
+function checkboxChange(e) {
+    cache.set('checkedRCClientList', e.detail.value)
+}
+
+
+
+</script>
+
+<style scoped lang="scss">
+
+.con-body{
+    background: white;
+}
+
+
+/* Container for the checkbox group */
+.checkbox-group.block {
+    width: 100%;
+}
+
+/* Each item row */
+.itemClass {
+    display: flex;
+    align-items: center;
+    padding: 10rpx 0;
+    margin-left: 15rpx;
+    border-bottom: 1px solid #eee;
+    /* optional divider */
+}
+
+/* Checkbox styling */
+.checkBoxClass {
+    margin-right: 12rpx;
+}
+
+/* Content container */
+.clientClass {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    font-size: 36rpx;
+    color: #333;
+    /* default text color */
+}
+
+/* Blue username text */
+.blue-text {
+    /* or any blue you prefer */
+    margin-right: 5rpx;
+}
+</style>
--- a/src/pages/business/CRM/map/addRearkSignIn.vue
+++ b/src/pages/business/CRM/map/addRearkSignIn.vue
@@ -0,0 +1,270 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'签到打卡'" :leftFlag="true" :rightFlag="false"></customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+
+			<view class="inner-box">
+				<view class="cu-form-group">
+					<textarea v-model="form.remark" placeholder="请输入签到备注内容" name="input"></textarea>
+				</view>
+				<view class="btn-box">
+					<button type="primary" @click="addInsertMapClockIn">签到</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import customHeader from '@/components/customHeader.vue'
+import { onMounted, reactive, ref } from 'vue';
+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({
+		addressForStart: null,
+		addressForEnd: null,
+		createId: null,
+		staffName: null,
+		visistCode: null,
+		visistId: null,
+		mapId: null,
+		remark: null
+	})
+
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+
+onLoad(option => {
+	form.visistId = option.visistId
+	let date = new Date();
+	form.craeteTime = dateFormat("YYYY-mm-dd", date)
+})
+
+function addInsertMapClockIn() {
+	uni.getLocation({
+		type: 'wgs84',
+		success: (res) => {
+			const latiude = res.latitude; //纬度
+			const longitude = res.longitude; //经度
+			//进行解析
+			inverseGeocoding(latiude, longitude);
+		},
+		fail: function (err) {
+			console.log("获取地址失败" + err)
+		}
+	})
+}
+function isWithinRange(lat, lon, centerLat, centerLon, rangeKm) {
+	const distance = haversineDistance(centerLat, centerLon, lat, lon);
+	return distance <= rangeKm;
+}
+function haversineDistance(lat1, lon1, lat2, lon2, radius = 6371) {
+	const dLat = degToRad(lat2 - lat1);
+	const dLon = degToRad(lon2 - lon1);
+	const a =
+		Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+		Math.cos(degToRad(lat1)) * Math.cos(degToRad(lat2)) *
+		Math.sin(dLon / 2) * Math.sin(dLon / 2);
+	const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+	return radius * c; // 距离，单位：公里
+}
+function degToRad(deg) {
+	return deg * (Math.PI / 180);
+}
+function inverseGeocoding(latiude, longitude) {
+	let points = longitude + ',' + latiude
+	//URL
+	const apiURL = 'https://tiles.geovisearth.com/geo/v1/geocode/regeo';
+	const params = {
+		lat: latiude,
+		lng: longitude,
+		radius: 1000,
+		pageSize: 1,
+		currentPage: 1,
+	};
+	const token = '66c87c897f0251295afdc794e4fbf73046a070338a726fe04f06cece6cb1ffdf';
+	uni.request({
+		url: apiURL,
+		method: 'GET',
+		data: params,
+		header: {
+			'Authorization': 'Bearer ' + token
+		},
+		success: (res) => {
+			if (res.statusCode == 200 && res.data.status == 200) {
+				let resdata = res.data.data.rows[0].address
+				if (resdata == null) {
+					const latiude1 = ref(34.1360);
+					const longitude1 = ref(108.9126);
+					if (isWithinRange(latiude1.value, longitude1.value, latiude, longitude, 1)) {
+						form.addressForStart = "西安办事处位置签到"
+						uni.showModal({
+							title: '确定要在此处签到吗',
+							content: form.addressForStart,
+							success: function (res) {
+								if (res.confirm) {
+									var data = {
+										mapId: form.mapId,
+										addressForStart: form.addressForStart,
+										cusName: form.cusName,
+										cusId: form.cusId,
+										remark: form.remark,
+										path: longitude1 + "," + latiude1
+									}
+									addStartMap(data).then(res => {
+										if (res.code == 200) {
+											uni.showToast({
+												icon: 'success',
+												title: res.msg,
+												duration: 1500,
+											});
+											setTimeout(() => {
+												uni.navigateBack(1)
+											}, 500)
+										} else {
+											uni.showToast({
+												icon: 'none',
+												title: res.msg,
+											});
+										}
+									})
+								} else if (res.cancel) {
+									console.log('用户点击取消');
+								}
+							}
+						});
+					}
+				} else {
+					form.addressForStart = resdata;
+					uni.showModal({
+						title: '确定要在此处签到吗',
+						content: form.addressForStart,
+						success: function (res) {
+							if (res.confirm) {
+								var data = {
+									mapId: form.mapId,
+									addressForStart: form
+										.addressForStart,
+									cusName: form.cusName,
+									cusId: form.cusId,
+									remark: form.remark,
+									path: points
+								}
+								addStartMap(data).then(res => {
+									if (res.code == 200) {
+										uni.showToast({
+											icon: 'success',
+											title: res.msg,
+											duration: 1500,
+										});
+										setTimeout(() => {
+											uni.navigateBack(1)
+										}, 500)
+									} else {
+										uni.showToast({
+											icon: 'none',
+											title: res.msg,
+										});
+									}
+								})
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+				}
+			} else {
+				form.addressForStart = "第三方维护签到"
+				uni.showModal({
+					title: '确定要在此处签到吗',
+					content: form.addressForStart,
+					success: function (res) {
+						if (res.confirm) {
+							var data = {
+								mapId: form.mapId,
+								addressForStart: form.addressForStart,
+								cusName: form.cusName,
+								cusId: form.cusId,
+								path: points
+							}
+							addStartMap(data).then(res => {
+								if (res.code == 200) {
+									uni.showToast({
+										icon: 'success',
+										title: '第三方维护签到',
+										duration: 1500,
+									});
+								} else {
+									uni.showToast({
+										icon: 'none',
+										title: res.msg,
+									});
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			}
+		},
+		fail(e) {
+			console.log("获取位置失败", e)
+		}
+	})
+
+}
+
+</script>
+
+<style lang="scss" scoped>
+.con-bg {
+	background: white;
+}
+
+/* Container for the checkbox group */
+.checkbox-group.block {
+	width: 100%;
+}
+
+/* Each item row */
+.itemClass {
+	display: flex;
+	align-items: center;
+	padding: 10rpx 0;
+	margin-left: 15rpx;
+	border-bottom: 1px solid #eee;
+	/* optional divider */
+}
+
+/* Checkbox styling */
+.checkBoxClass {
+	margin-right: 12rpx;
+}
+
+/* Content container */
+.clientClass {
+	flex: 1;
+	display: flex;
+	align-items: center;
+	flex-wrap: wrap;
+	font-size: 36rpx;
+	color: #333;
+	/* default text color */
+}
+
+/* Blue username text */
+.blue-text {
+	/* or any blue you prefer */
+	margin-right: 5rpx;
+}
+</style>
--- a/src/pages/business/CRM/map/checkInView.vue
+++ b/src/pages/business/CRM/map/checkInView.vue
@@ -0,0 +1,164 @@
+<template>
+    <view class="con-body">
+        <view class="con-bg">
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'考勤查看'" :leftFlag="true" :rightFlag="false"></customHeader>
+
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+
+            <!-- 正文内容 -->
+            <view>
+                <!-- 搜索 -->
+                <view class="search">
+                    <picker mode="date" :value="defaultDate" :start="startDate" :end="endDate" @change="bindDateChange"
+                        class="picker-bg">
+                        <view class="picker">
+                            <uni-icons custom-prefix="iconfont" color="#ffffff" type="icon-phoneshizhong"
+                                size="18"></uni-icons>
+                            <view>{{ defaultDate }}</view>
+                            <uni-icons type="down" size="18"></uni-icons>
+                        </view>
+                    </picker>
+                    <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
+                </view>
+
+                <!-- 分页部分  -->
+                <view class="white-bg margin-bottom20" v-for="(item, index) in list">
+                    <view class="report-list" >
+                            <view class="title"
+                            :style="{color: item.mapType == 1 ? '#F5813A' : '#1989FA'}"
+                            >类型：{{ item.mapType == 1 ? '签到' : '打卡' }}</view>
+                            <view class="r-list">
+                                <view class="r-left">开始签到时间</view>
+                                <view class="r-right">{{ item.goVisistStartTime }}</view>
+                            </view>
+                            <view class="border-bottom"></view>
+                            <view class="r-list">
+                                <view class="r-left">开始签到地点</view>
+                                <view class="r-right">{{ item.addressForStart }}</view>
+                            </view>
+                            <view class="border-bottom"></view>
+                            <view class="r-list">
+                                <view class="r-left">结束签到时间</view>
+                                <view class="r-right">{{ item.goVisistEndTime }}</view>
+                            </view>
+                            <view class="border-bottom"></view>
+                            <view class="r-list">
+                                <view class="r-left">结束签到地点</view>
+                                <view class="r-right">{{ item.addressForEnd }}</view>
+                            </view>
+                            <view class="r-list" v-if="item.remark != null">
+                                <view class="r-left">备注内容</view>
+                                <view class="r-right">{{ item.remark }}</view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import customHeader from '@/components/customHeader.vue'
+import { getNavBarPaddingTop } from '@/utils/system.js'
+import { onMounted, ref } from 'vue';
+import { getDate } from '@/utils/datetime.js'
+import { CheckInInformationViewing } from '../../../../api/crm/activity/map';
+import { onLoad } from '@dcloudio/uni-app';
+
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+
+// 开始时间
+let startDate = getDate('start');
+// 结束时间，间隔10年
+let endDate = getDate('end');
+let defaultDate = getDate({ format: true })
+let bindDateChange = (e) => {
+    defaultDate = e.detail.value
+}
+
+//获取list集合信息
+let list = ref([])
+function getList() {
+    CheckInInformationViewing().then(res => {
+        list.value = res.rows
+    })
+}
+
+onLoad(() => {
+    getList()
+})
+
+
+
+
+
+</script>
+
+<style scoped>
+.search {
+    display: flex;
+    margin-bottom: 30rpx;
+    padding: 0 30rpx;
+}
+
+.search .btn-search {
+    border: none;
+    background: none;
+    color: #fff;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 28rpx;
+    /* 调整为更合适的字号 */
+    font-weight: normal;
+    /* 如果不需要加粗，可以去掉 bolder */
+    margin-left: 0rpx;
+    padding: 0 20rpx;
+    /* 调整 padding，去掉 padding-top */
+    height: 56rpx;
+    /* 固定高度，确保与 picker 对齐 */
+    cursor: pointer;
+}
+
+.search .btn-search::after {
+    display: none;
+}
+
+.search .picker-bg {
+    display: flex;
+    background-color: #6FA2F8;
+    border-radius: 25px;
+    color: #fff;
+    font-size: 28rpx;
+    padding: 0rpx 20rpx;
+    /* #ifndef APP-PLUS */
+    padding: 10rpx 20rpx 0 20rpx;
+    /* #endif */
+    margin-right: 20rpx;
+}
+
+.search .picker-bg .picker {
+    display: flex;
+    align-items: center;
+    /* #ifndef APP-PLUS */
+    padding-top: 2rpx;
+    /* #endif */
+}
+
+.search .picker-bg .picker .uni-icons {
+    color: #fff !important;
+}
+
+.search .picker-bg .picker .uni-icons:first-child {
+    margin-right: 10rpx;
+}
+
+.search .picker-bg .picker .uniui-down {
+    margin-left: 10rpx;
+}
+</style>
--- a/src/pages/business/CRM/map/checkinStatistics.vue
+++ b/src/pages/business/CRM/map/checkinStatistics.vue
@@ -0,0 +1,285 @@
+<template>
+    <view class="con-body">
+        <view class="con-bg">
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'打卡统计'" :leftFlag="true" :rightFlag="false"></customHeader>
+
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height"></view>
+
+            <!-- 正文内容 -->
+            <view>
+                <!-- 搜索 -->
+                <view class="search">
+                    <picker @change="bindPickerChange" :value="cityIndex" :range="cityArr" class="picker-bg">
+                        <view class="picker">
+                            <uni-icons type="location" size="18"></uni-icons>
+                            <view>{{ cityArr[cityIndex] }}</view>
+                            <uni-icons type="down" size="18"></uni-icons>
+                        </view>
+                    </picker>
+                    <picker mode="date" :value="defaultDate" :start="startDate" :end="endDate" @change="bindDateChange"
+                        class="picker-bg">
+                        <view class="picker">
+                            <uni-icons custom-prefix="iconfont" color="#ffffff" type="icon-phoneshizhong"
+                                size="18"></uni-icons>
+                            <view>{{ defaultDate }}</view>
+                            <uni-icons type="down" size="18"></uni-icons>
+                        </view>
+                    </picker>
+                    <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
+                </view>
+                <!-- 签到打卡 -->
+                <view class="checkin-tab">
+                    <view class="checkin-tab-item" :class="{ active: tabType == 0 }" @click="handleTab(0)">
+                        <view class="tab-item-title">{{ signCount }}</view>
+                        <view class="tab-item-name">最新签到打卡</view>
+                    </view>
+                    <view class="checkin-tab-item" :class="{ active: tabType == 1 }" @click="handleTab(1)">
+                        <view class="tab-item-title">{{ noSignCount }}</view>
+                        <view class="tab-item-name">未签到打卡</view>
+                    </view>
+                </view>
+
+                <!-- tab切换显示 -->
+                <view class="white-bg">
+                    <!-- 最新签到列表 -->
+                    <view class="tab-con" v-if="tabType == 0">
+                        <view class="tab-title" v-for="(item, index) in singInList" :key="index">
+                            {{ item }}
+                            <uni-icons type="checkbox-filled" size="26" color="#02C74C"></uni-icons>
+                        </view>
+                    </view>
+                    <!-- 未签到列表 -->
+                    <view class="tab-con" v-if="tabType == 1">
+                        <view class="tab-title" v-for="(item, index) in singInNoList" :key="index">
+                            {{ item }}
+                            <uni-icons type="info-filled" size="26" color="#FF8059"></uni-icons>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+
+    </view>
+</template>
+
+<script setup>
+import { ref, onMounted, reactive } from 'vue'
+import customHeader from '@/components/customHeader.vue'
+import { getDate } from '@/utils/datetime.js'
+import { getNoSigninList, getSigninList } from '../../../../api/crm/activity/map';
+
+//进入页面初始化页面
+onMounted(() => {
+    getSignListMethod();
+    getNoSignListMethod();
+})
+
+let cityIndex = ref(0);
+let cityArr = ['市场一部','市场二部','市场三部',"北京大区", "南方大区",'北方大区','西部大区'];
+// 选择大区列表
+let bindPickerChange = (e) => {
+    console.log('picker发送选择改变，携带值为', e.detail.value)
+    cityIndex.value = e.detail.value
+}
+
+// 开始时间
+let startDate = getDate('start');
+// 结束时间，间隔10年
+let endDate = getDate('end');
+let defaultDate = getDate({ format: true })
+let bindDateChange = (e) => {
+    defaultDate = e.detail.value
+}
+
+let searchValue = ref(null)
+// 查询搜索跳转
+let handleSearch = () => {
+    queryForm.tadayDate = defaultDate
+    queryForm.region = cityArr[cityIndex.value]
+    getSignListMethod();
+    getNoSignListMethod();
+}
+
+// 列表
+let signCount = ref(0)
+let singInList = ref([]);
+let noSignCount = ref(0)
+let singInNoList = ref([]);
+
+//查询表单，默认有个北京大区的参数
+let queryForm = reactive({
+    region: "北京大区"
+})
+// tab 切换
+let tabType = ref(0)
+let handleTab = (type) => {
+    tabType.value = type;
+    //最新签到列表
+    if (type === 0) {
+        getSignListMethod();
+
+    }
+    //未签到列表
+    else if (type === 1) {
+        getNoSignListMethod();
+    }
+}
+
+function getSignListMethod() {
+    getSigninList(queryForm).then(res => {
+        signCount.value = res.total
+        singInList.value = res.rows.map(item => item.userName)
+    })
+}
+
+function getNoSignListMethod() {
+    getNoSigninList(queryForm).then(res => {
+        noSignCount.value = res.total
+        singInNoList.value = res.rows.map(item => item.userName);
+    })
+}
+
+
+// 确定
+let handleSubmit = () => {
+
+}
+</script>
+
+<style scoped>
+.search {
+    display: flex;
+    padding: 0 30rpx;
+}
+
+.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 .picker-bg {
+    display: flex;
+    background-color: #6FA2F8;
+    border-radius: 25px;
+    color: #fff;
+    font-size: 28rpx;
+    padding: 0rpx 20rpx;
+    /* #ifndef APP-PLUS */
+    padding: 10rpx 20rpx 0 20rpx;
+    /* #endif */
+    margin-right: 20rpx;
+}
+
+.search .picker-bg .picker {
+    display: flex;
+    align-items: center;
+    /* #ifndef APP-PLUS */
+    padding-top: 2rpx;
+    /* #endif */
+}
+
+.search .picker-bg .picker .uni-icons {
+    color: #fff !important;
+}
+
+.search .picker-bg .picker .uni-icons:first-child {
+    margin-right: 10rpx;
+}
+
+.search .picker-bg .picker .uniui-down {
+    margin-left: 20rpx;
+}
+
+.checkin-tab {
+    margin-top: 35rpx;
+    display: flex;
+    padding: 0 30rpx;
+    flex: 1;
+}
+
+.checkin-tab-item {
+    align-items: center;
+    justify-content: center;
+    color: rgba(255, 255, 255, 0.5);
+    text-align: center;
+    margin-right: 30rpx;
+    font-weight: bold;
+    padding-bottom: 20rpx;
+}
+
+.checkin-tab-item.active {
+    position: relative;
+    color: #fff;
+}
+
+.checkin-tab-item.active::after {
+    content: '';
+    position: absolute;
+    bottom: 0;
+    left: 50%;
+    transform: translateX(-50%);
+    background-color: #fff;
+    width: 100rpx;
+    height: 8rpx;
+}
+
+.checkin-tab-item .tab-item-title {
+    font-size: 60rpx;
+}
+
+
+.white-bg {
+    width: 670rpx;
+    margin: 0;
+    border-radius: 8px 8px 0 0;
+    padding: 50rpx 40rpx;
+    margin-top: 20rpx;
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 260px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 230px);
+    /* #endif */
+}
+
+.tab-con {
+    display: flex;
+    flex-flow: row wrap
+}
+
+.tab-con .tab-title {
+    border: 1px solid #E8E8E8;
+    text-align: center;
+    border-radius: 5px;
+    position: relative;
+    /* padding:10rpx 20rpx; */
+    margin-right: 20rpx;
+    margin-bottom: 30rpx;
+    width: 148rpx;
+    height: 60rpx;
+    line-height: 60rpx;
+    font-size: 28rpx;
+}
+
+.tab-con .tab-title:nth-child(4n) {
+    margin-right: 0;
+}
+
+.tab-con .uni-icons {
+    position: absolute;
+    right: -10px;
+    top: -10px;
+}
+</style>
--- a/src/pages/business/CRM/map/vistorCheckin.vue
+++ b/src/pages/business/CRM/map/vistorCheckin.vue
@@ -0,0 +1,363 @@
+<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">
+                <image src="../../../../static/images/business/btn-qd.png" class="btn-image" @click="handleCheckIn" />
+                <image src="../../../../static/images/business/btn-dk.png" class="btn-image" @click="handleClockIn" />
+                <view class="check-desc">
+                    业务人员可通过<text class="font-orange">签到</text>或<text
+                        class="font-blue">打卡</text>进行行为记录，该时间会和走访报告中的时间进行关联，便于查看。
+                </view>
+            </view>
+        </view>
+
+        <!-- 打卡遮罩层 -->
+        <!-- <view class="check-con" v-if="checkFlag">
+            <view class="check-in">
+                <view class="check-tip">打卡</view>
+                <view class="check-title">确定要在此处打卡吗？</view>
+                <view class="check-location">
+                    <uni-icons type="location-filled" size="30" color="#0395E0"></uni-icons> 亚洲金融大厦
+                </view>
+                <view class="check-address">北京市朝阳区天辰东路1号院</view>
+                <view class="check-footer">
+                    <button class="btn-default" type="default" @click="handleCancel" size="mini">取 消</button>
+                    <button class="btn-primary" type="primary" @click="handleSubmit" size="mini">确 定</button>
+                </view>
+            </view>
+        </view> -->
+
+    </view>
+</template>
+
+<script setup>
+import { ref, onMounted, reactive } from 'vue'
+import customHeader from '@/components/customHeader.vue'
+import { addStartMapForClockIn } from '../../../../api/crm/activity/map';
+
+let form = reactive({
+    addressForStart: null,
+    addressForEnd: null,
+    createId: null,
+    staffName: null,
+    visistCode: null,
+    visistId: null,
+    mapId: null
+})
+// 签到
+let handleCheckIn = () => {
+    uni.navigateTo({
+        url: './addRearkSignIn'
+    })
+}
+// 打卡
+let handleClockIn = () => {
+    uni.getLocation({
+        type: 'wgs84',
+        success: (res) => {
+            const latiude = res.latitude;
+            const longitude = res.longitude;
+            //进行解析
+            inverseGeocoding(latiude, longitude);
+        },
+        fail: function (err) {
+            console.log("获取地址失败" + err)
+        }
+    })
+}
+
+function isWithinRange(lat, lon, centerLat, centerLon, rangeKm) {
+    const distance = haversineDistance(centerLat, centerLon, lat, lon);
+    return distance <= rangeKm;
+}
+function haversineDistance(lat1, lon1, lat2, lon2, radius = 6371) {
+    const dLat = degToRad(lat2 - lat1);
+    const dLon = degToRad(lon2 - lon1);
+    const a =
+        Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+        Math.cos(degToRad(lat1)) * Math.cos(degToRad(lat2)) *
+        Math.sin(dLon / 2) * Math.sin(dLon / 2);
+    const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+    return radius * c; // 距离，单位：公里
+}
+function degToRad(deg) {
+    return deg * (Math.PI / 180);
+}
+
+//解析地址
+function inverseGeocoding(latiude, longitude) {
+    let points = longitude + ',' + latiude
+    const apiURL = 'https://tiles.geovisearth.com/geo/v1/geocode/regeo';
+    const params = {
+        lat: latiude,
+        lng: longitude,
+        radius: 1000,
+        pageSize: 1,
+        currentPage: 1,
+        //classify: 220100
+    };
+    const token = '66c87c897f0251295afdc794e4fbf73046a070338a726fe04f06cece6cb1ffdf';
+    uni.request({
+        url: apiURL,
+        method: 'GET',
+        data: params,
+        header: {
+            'Authorization': 'Bearer ' + token
+        },
+        success: (res) => {
+            console.log(res, "----")
+            if (res.statusCode == 200 && res.data.status == 200) {
+                let resdata = res.data.data.rows[0].address
+                if (resdata == null) {
+                    console.log(resdata.srcLat)
+                    const latiude1 = 34.1360;
+                    const longitude1 = 108.9126;
+                    if (isWithinRange(latiude1, longitude1, latiude, longitude, 1)) {
+                        form.addressForStart = "西安办事处位置打卡"
+                        uni.showModal({
+                            title: '确定要在此处打卡吗',
+                            content: form.addressForStart,
+                            success: function (res) {
+                                if (res.confirm) {
+                                    var data = {
+                                        mapId: form.mapId,
+                                        addressForStart: form.addressForStart,
+                                        cusName: form.cusName,
+                                        cusId: form.cusId,
+                                        remark: form.remark,
+                                        path: longitude1 + "," + latiude1
+                                    }
+                                    addStartMapForClockIn(data).then(res => {
+                                        if (res.code == 200) {
+                                            uni.showToast({
+                                                icon: 'success',
+                                                title: res.msg,
+                                                duration: 1500,
+                                            });
+                                            setTimeout(() => {
+                                                uni.navigateBack(1)
+                                            }, 500)
+                                        } else {
+                                            uni.showToast({
+                                                icon: 'none',
+                                                title: res.msg,
+                                            });
+                                        }
+                                    })
+                                } else if (res.cancel) {
+                                    console.log('用户点击取消');
+                                }
+                            }
+                        });
+                    }
+                } else {
+                    form.addressForStart = resdata;
+                    uni.showModal({
+                        title: '确定要在此处打卡吗',
+                        content: form.addressForStart,
+                        success: function (res) {
+                            if (res.confirm) {
+                                var data = {
+                                    mapId: form.mapId,
+                                    addressForStart: form.addressForStart,
+                                    cusName: form.cusName,
+                                    cusId: form.cusId,
+                                    path: points
+                                }
+                                addStartMapForClockIn(data).then(res => {
+                                    if (res.code == 200) {
+                                        uni.showToast({
+                                            icon: 'success',
+                                            title: res.msg,
+                                            duration: 1500,
+                                        });
+                                    } else {
+                                        uni.showToast({
+                                            icon: 'none',
+                                            title: res.msg,
+                                        });
+                                    }
+                                })
+                            } else if (res.cancel) {
+                                console.log('用户点击取消');
+                            }
+                        }
+                    });
+                }
+            } else {
+                form.addressForStart = "第三方维护打卡"
+                uni.showModal({
+                    title: '确定要在此处打卡吗',
+                    content: form.addressForStart,
+                    success: function (res) {
+                        if (res.confirm) {
+                            var data = {
+                                mapId: form.mapId,
+                                addressForStart: form.addressForStart,
+                                cusName: form.cusName,
+                                cusId: form.cusId,
+                                path: points
+                            }
+                            addStartMapForClockIn(data).then(res => {
+                                if (res.code == 200) {
+                                    uni.showToast({
+                                        icon: 'success',
+                                        title: '第三方维护打卡',
+                                        duration: 1500,
+                                    });
+                                } else {
+                                    uni.showToast({
+                                        icon: 'none',
+                                        title: res.msg,
+                                    });
+                                }
+                            })
+                        } else if (res.cancel) {
+                            console.log('用户点击取消');
+                        }
+                    }
+                });
+            }
+
+        },
+        fail(e) {
+            console.log("获取位置失败", e)
+        }
+    })
+
+
+}
+
+</script>
+
+<style scoped>
+.white-bg {
+    width: 650rpx;
+    margin: 0;
+    border-radius: 8px 8px 0 0;
+    padding: 50rpx;
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 125px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 98px);
+    /* #endif */
+
+
+}
+
+.btn-image {
+    width: 340rpx;
+    height: 340rpx;
+    margin: 30rpx auto 60rpx;
+    display: block;
+}
+
+.check-desc {
+    background-color: #F5F5F5;
+    padding: 40rpx 50rpx;
+    font-size: 28rpx;
+    border-radius: 10px;
+    margin-top: 100rpx;
+}
+
+.check-desc .font-orange {
+    color: #F5813A;
+    font-size: 32rpx;
+    font-weight: bold;
+}
+
+.check-desc .font-blue {
+    color: #2CBAEF;
+    font-size: 32rpx;
+    font-weight: bold;
+}
+
+/* 弹窗处理 */
+.check-con {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, 0.4);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    z-index: 999;
+}
+
+/* 遮罩层内容样式 */
+.check-in {
+    background-color: #fff;
+    padding: 40rpx 30rpx 60rpx;
+    border-radius: 10px;
+    /* width: 620rpx; */
+    width: 560rpx;
+    position: absolute;
+    top: 48%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    text-align: center;
+}
+
+.check-in .check-tip {
+    font-weight: bold;
+}
+
+.check-in .check-title {
+    font-size: 32rpx;
+    padding: 20rpx 0;
+}
+
+.check-in .check-location {
+    color: #0395E0;
+    font-size: 42rpx;
+    font-weight: bold;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin: 30rpx 0;
+}
+
+.check-in .check-location .uniui-location-filled {
+    font-weight: normal;
+    margin-right: 20rpx;
+}
+
+.check-in .check-address {
+    color: #919191;
+    font-size: 32rpx;
+    margin-bottom: 80rpx;
+}
+
+.check-in .check-footer {
+    display: flex;
+}
+
+.check-in .check-footer .btn-default,
+.check-in .check-footer .btn-primary {
+    background-color: #fff;
+    border: 1px solid #05A3F4;
+    color: #05A3F4;
+    border-radius: 25px;
+    padding: 0rpx 80rpx;
+    font-size: 34rpx;
+    /* margin-left: 0;
+    margin-right: 20rpx; */
+}
+
+.check-in .check-footer .btn-primary {
+    background-color: #05A3F4;
+    border: 1px solid #05A3F4;
+    color: #fff;
+    /* padding: 0rpx 60rpx; */
+}
+</style>
--- a/src/pages/business/CRM/marketActivity/activityTypeList.vue
+++ b/src/pages/business/CRM/marketActivity/activityTypeList.vue
@@ -0,0 +1,129 @@
+<template>
+    <view class="con-body">
+        <view>
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'日常走访选择活动类型'" :leftFlag="true" :rightFlag="false">
+            </customHeader>
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height"></view>
+
+            
+                <checkbox-group class="block" @change="checkboxChange">
+                    <view class="itemClass" v-for="(item, index) in dataList" :key="item.id">
+                        <checkbox class='checkBoxClass' :value="item.name" 
+                            v-model="item.name"></checkbox>
+                        <view class="clientClass">
+                            <text class="blue-text">{{ item.name }}</text>
+                        </view>
+                    </view>
+                </checkbox-group>
+        </view>
+    </view>
+
+</template>
+
+
+<script setup>
+import customHeader from '@/components/customHeader.vue'
+import cache from '../../../../utils/cache'
+import { reactive } from 'vue'
+
+
+const dataList = reactive( [
+					{id:'1',name:'日常走访'},
+					{id:'2',name:'组合拳推广'},
+					{id:'3',name:'竞标'},
+					{id:'4',name:'型号追踪'},
+					{id:'5',name:'重点产品推广'},
+					{id:'6',name:'谈价'},
+					{id:'7',name:'道歉、感谢'},
+					{id:'8',name:'邀约'},
+					{id:'9',name:'归零会'},
+					{id:'11',name:'高层交流'},
+					{id:'12',name:'质量问题处理'},
+					{id:'13',name:'供应商大会'},
+					{id:'14',name:'新产品推广'},
+					{id:'15',name:'技术支持'}
+				])
+
+//勾选内容
+function checkboxChange(e) {
+        cache.set('checkedRCActivityTypeList', e.detail.value)
+}
+
+</script>
+
+<style scoped lang="scss">
+
+.con-body{
+    background: white;
+}
+
+ .white-bg {
+    width: 690rpx;
+    margin: 0;
+    border-radius: 8px 8px 0 0;
+}
+
+.white-bg.white-bg-2 {
+    margin-bottom: 20rpx;
+}
+
+.white-bg.white-bg-3 {
+    border-radius: 0
+}
+
+.white-bg .w-b-title {
+    color: #3384DF;
+    font-size: 38rpx;
+}
+
+.form-con {
+    padding: 30rpx 0 0;
+}
+
+:deep(.form-con .uni-forms-item) {
+    margin-bottom: 22px !important;
+}
+
+
+/* Container for the checkbox group */
+.checkbox-group.block {
+    width: 100%;
+}
+
+/* Each item row */
+.itemClass {
+    width: 340rpx;
+    display: flex;
+    align-items: center;
+    padding: 10rpx 0;
+    margin-left: 15rpx;
+    border-bottom: 1px solid #eee;
+    float: left;
+    /* optional divider */
+}
+
+/* Checkbox styling */
+.checkBoxClass {
+    margin-right: 12rpx;
+}
+
+/* Content container */
+.clientClass {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    font-size: 36rpx;
+    color: #333;
+    /* default text color */
+}
+
+/* Blue username text */
+.blue-text {
+    /* or any blue you prefer */
+    margin-right: 5rpx;
+}
+
+</style>
--- a/src/pages/business/CRM/marketActivity/auditReject.vue
+++ b/src/pages/business/CRM/marketActivity/auditReject.vue
@@ -0,0 +1,118 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'驳回原因'" :leftFlag="true" :rightFlag="false"></customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+
+			<view class="inner-box">
+				<view class="cu-form-group">
+					<textarea v-model="rejectReason" placeholder="请输入驳回原因" name="input"></textarea>
+				</view>
+				<view class="btn-box">
+					<button type="primary" @click="submitBack">确定驳回</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import customHeader from '@/components/customHeader.vue'
+import { onMounted, ref } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+import { getNavBarPaddingTop } from '@/utils/system.js'
+import { getRejectReason } from '../../../../api/crm/activity/activity';
+
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+	navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+
+let visistId = ref()
+onLoad(option => {
+	visistId.value = option.visistId
+})
+
+let rejectReason = ref();
+//确定驳回
+function submitBack() {
+	if (rejectReason.value==null) {
+		uni.showToast({
+			title: "驳回原因不能为空！",
+			icon: 'none',
+		});
+		return
+	}
+	let rejectForm = {
+		visistId:visistId.value,
+		rejectReason: rejectReason.value
+	}
+	getRejectReason(rejectForm).then(
+		res => {
+			if (res.code == 200) {
+				uni.showToast({
+					title: '提交成功',
+					duration: 2000
+				});
+				uni.navigateBack({
+					delta: 2
+				})
+			} else {
+				uni.showToast({
+					title: res.msg,
+					icon: 'none',
+				});
+			}
+		},
+		rej => { }
+	);
+}
+
+</script>
+
+<style lang="scss" scoped>
+.con-bg {
+	background: white;
+}
+
+/* Container for the checkbox group */
+.checkbox-group.block {
+	width: 100%;
+}
+
+/* Each item row */
+.itemClass {
+	display: flex;
+	align-items: center;
+	padding: 10rpx 0;
+	margin-left: 15rpx;
+	border-bottom: 1px solid #eee;
+	/* optional divider */
+}
+
+/* Checkbox styling */
+.checkBoxClass {
+	margin-right: 12rpx;
+}
+
+/* Content container */
+.clientClass {
+	flex: 1;
+	display: flex;
+	align-items: center;
+	flex-wrap: wrap;
+	font-size: 36rpx;
+	color: #333;
+	/* default text color */
+}
+
+/* Blue username text */
+.blue-text {
+	/* or any blue you prefer */
+	margin-right: 5rpx;
+}
+</style>
--- a/src/pages/business/CRM/marketActivity/auditReport.vue
+++ b/src/pages/business/CRM/marketActivity/auditReport.vue
@@ -0,0 +1,218 @@
+<template>
+    <view class="con-body">
+        <view class="con-bg">
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'客户审批'" :leftFlag="true" :rightFlag="false"></customHeader>
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></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 dataList" :key="index"
+                        @click="showDetail(item)">
+                        <view>
+                            <view class="report-list">
+                                <view class="title">客户：{{ item.cusName }}</view>
+                                <view class="r-list">
+                                    <view class="r-name">{{ item.visistCode }}</view>
+                                    <view>
+
+                                        <view
+                                            class="r-right btn-orange"
+                                            size="mini">
+                                            {{ item.status }}
+                                        </view>
+                                    </view>
+
+                                </view>
+                                <view class="border-bottom"></view>
+                                <view class="r-list">
+                                    <view class="r-left">走访类型</view>
+                                    <view class="r-right">{{item.visistType}}</view>
+                                </view>
+                                <view class="r-list" v-if="item.joinUser != null">
+                                    <view class="r-left">我方领导</view>
+                                    <view class="r-right">{{ item.joinUser }}</view>
+                                </view>
+                                <view class="border-bottom"></view>
+                                <view class="r-list">
+                                    <view class="r-left">报告人</view>
+                                    <view class="r-right">{{ item.staffName }}</view>
+                                </view>
+                                <view class="border-bottom"></view>
+                                <view class="r-list">
+                                    <view class="r-left">报告日期</view>
+                                    <view class="r-right">{{ item.visistDate }}</view>
+                                </view>
+
+                            </view>
+                        </view>
+                    </view>
+                </mescroll-uni>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import customHeader from '@/components/customHeader.vue'
+import { ref, reactive, onMounted } from 'vue'
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import { getNavBarPaddingTop } from '@/utils/system.js'
+import { onShow } from '@dcloudio/uni-app';
+import { getApprovalList, getUserInfo } from '../../../../api/crm/activity/activity';
+
+
+let list = ref([])
+let queryParams = reactive({
+    selValue: ''
+})
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+const upOption = ref({
+    page: { num: 0, size: 10 },
+    noMoreSize: 5,
+    empty: { tip: '~ 空空如也 ~' },
+    textLoading: '加载中...',
+    textNoMore: '已经到底了'
+});
+const downOption = ref({
+    auto: true,
+    textInOffset: '下拉刷新',
+    textOutOffset: '释放更新',
+    textLoading: '刷新中...'
+});
+
+let mescrollRef = ref();
+function mescrollInit(mescroll) {
+    mescrollRef.value = mescroll;
+}
+/*下拉刷新的回调 */
+function downCallback(mescroll) {
+    mescroll.resetUpScroll()
+}
+/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
+function upCallback(page) {
+    // JSON.parse 将数据转换为 JavaScript 对象
+    // var user = JSON.parse(uni.getStorageSync("user"));
+    console.log(page.num)
+    getVisistList(page);
+}
+
+onShow(() => {
+    getUserInfoMethod();
+})
+
+let nickName = ref();
+let deptName = ref();
+let userId = ref();
+let posts = ref();
+
+//获取用户信息
+function getUserInfoMethod() {
+    getUserInfo().then(res => {
+        nickName.value = res.user.nickName;
+        deptName.value = res.user.dept.deptName;
+        userId.value = res.user.userId;
+        posts.value = res.post;
+    })
+}
+
+//查询待审批的列表信息
+let dataList = ref([])
+function getVisistList(page) {
+    var data = {
+        pageNum: page.num,
+        pageSize: 10,
+    };
+
+    getApprovalList(data).then(res => {
+        if (res.code == 200) {
+            //设置列表数据
+            if (page.num == 1) {
+                dataList.value = res.rows;
+
+            } else {
+                dataList.value = dataList.value.concat(res.rows);
+            }
+            mescrollRef.value.endBySize(res.rows.length, 1000);
+        } else {
+            uni.showToast({
+                icon: 'none',
+                title: "请求失败",
+            });
+            dataList.value = null;
+            mescrollRef.value.endErr();
+        }
+    })
+}
+
+//审核走访单明细
+function showDetail(item){
+    	uni.navigateTo({
+				url: './detailForApproval?visistId=' + item.visistId
+			})
+}
+</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 - 120px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 110px);
+    /* #endif */
+}
+
+.white-bg {
+    padding-bottom: 10rpx;
+}
+</style>
--- a/src/pages/business/CRM/marketActivity/chooseCus.vue
+++ b/src/pages/business/CRM/marketActivity/chooseCus.vue
@@ -0,0 +1,171 @@
+<template>
+    <view class="con-body">
+        <view >
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'选择客户单位'" :leftFlag="true" :rightFlag="false">
+            </customHeader>
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height"></view>
+            <uni-easyinput prefixIcon="search" v-model="searchContent" placeholder="请输入客户单位名称" clearable
+                @iconClick="iconClick">
+            </uni-easyinput>
+
+
+		<view class="inner-box">
+			<view class="list-cont">
+				<radio-group class="block" @change="radioChange">
+					<view class="item"   v-for="(item, index) in dataList">
+						<radio class='radio' :value="index" ></radio>
+						<view class="name">{{item.cusName+"（"+item.shortName+"）"}}</view>
+					</view>
+				</radio-group>
+			</view>
+		</view>
+
+        </view>
+    </view>
+</template>
+
+<script setup>
+import customHeader from '@/components/customHeader.vue'
+import { getYsCustomerList } from '../../../../api/crm/activity/activity'
+import { onMounted,  reactive, ref, watch } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { useMessage } from '../../../../utils/message'
+
+
+
+const message = useMessage();
+
+//点击查询客户人员
+const queryParams = ref({
+    cusName: '',
+    nickName:'',
+    pageNum: 1,
+    pageSize: 10
+})
+
+
+onMounted(() => {
+
+})
+
+onLoad(options => {
+    queryParams.value.cusName = options.cusName
+})
+const dataList = ref([])
+
+
+
+
+//查询某一客户人员
+let searchContent = ref('')
+
+function iconClick() {
+    message.toast('点击了查询，当前内容：' + searchContent.value)
+}
+
+//监视查询的内容的变化
+let queryCusForm = reactive({})
+watch(searchContent,(newValue,oldValue)=>{
+    console.log("输入内容：",searchContent.value)
+    queryCusForm.cusName = searchContent.value
+    getYsCustomerList(queryCusForm).then(res=>{
+        dataList.value = res.rows
+    })
+})
+
+function radioChange(event) {
+     const selectedIndex = event.detail.value
+    let test = dataList.value[selectedIndex]
+    // 发送全局事件
+    uni.$emit('onCustomerSelected', test)
+    let cusName = test.cusName;//客户名称
+    let cusId = test.cusId;//客户ID
+    uni.navigateBack()//返回上一页
+}
+
+
+
+
+</script>
+
+<style scoped lang="scss">
+
+.con-body{
+    background: white;
+}
+
+
+/* Container for the checkbox group */
+.checkbox-group.block {
+    width: 100%;
+}
+
+/* Each item row */
+.itemClass {
+    display: flex;
+    align-items: center;
+    padding: 10rpx 0;
+    margin-left: 15rpx;
+    border-bottom: 1px solid #eee;
+    /* optional divider */
+}
+
+/* Checkbox styling */
+.checkBoxClass {
+    margin-right: 12rpx;
+}
+
+/* Content container */
+.clientClass {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    font-size: 36rpx;
+    color: #333;
+    /* default text color */
+}
+
+/* Blue username text */
+.blue-text {
+    /* or any blue you prefer */
+    margin-right: 5rpx;
+}
+.inner-box {
+  width: 100%;
+  padding: 10px;
+  box-sizing: border-box;
+}
+
+.list-cont {
+  width: 100%;
+}
+
+.block {
+  width: 100%;
+}
+
+.item {
+  display: flex;
+  align-items: center;
+  padding: 12px 0;
+  border-bottom: 1px solid #eee;
+}
+
+.radio {
+  margin-right: 12px;
+  transform: scale(0.9);
+}
+
+.name {
+  flex: 1;
+  font-size: 16px;
+  color: #333;
+}
+
+.checked {
+  color: #007AFF; /* 选中状态的颜色 */
+}
+</style>
--- a/src/pages/business/CRM/marketActivity/components/dailyVisitComponent.vue
+++ b/src/pages/business/CRM/marketActivity/components/dailyVisitComponent.vue
@@ -0,0 +1,297 @@
+<template>
+    <uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px" label-position="top">
+        <uni-forms-item label="客户人员" name="customerUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.customerUserList" placeholder="请选择客户人员" name="input" :disabled="isDisabled"
+                @focus="chooseClientUser"></uni-easyinput>
+        </uni-forms-item>
+        <uni-forms-item label="我方参与人" name="myUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.myUserList" placeholder="请选择我方参与人" name="input" :disabled="isDisabled"
+                @focus="chooseMyUser"></uni-easyinput>
+        </uni-forms-item>
+
+        <uni-forms-item label="活动内容" name="activityTypeList" class="f-c-right">
+            <uni-easyinput v-model="formData.activityTypeList" placeholder="请选择活动内容" name="input"
+                @focus="chooseActivityType"></uni-easyinput>
+        </uni-forms-item>
+
+        <uni-forms-item label="活动文字" name="activeTxt" class="uni-forms-item is-direction-top is-top">
+            <uni-easyinput type="textarea" autoHeight v-model="formData.activeTxt" placeholder="请输入" 活动文字
+                class="form-texarea" />
+        </uni-forms-item>
+    </uni-forms>
+    <view class="footer-con">
+        <button class="btn-default" type="default" @click="handleDeleteVisistDetailItem" size="mini">删 除</button>
+        <button class="btn-primary" type="primary" @click="submitForm" size="mini">保存/修改</button>
+    </view>
+</template>
+
+<script setup name="dailyVisitComponent">
+import { ref, reactive } from 'vue'
+import cache from '../../../../../utils/cache'
+import { onShow, onUnload } from '@dcloudio/uni-app';
+import { addVisistDetail, deleVisistDetailItem, getVisistDetailItem } from '../../../../../api/crm/activity/activity';
+
+let customerUserList = ref([])
+let myUserList = ref([])
+let activityTypeList = ref([])
+let activeTxt = ref([])
+let isDisabled = ref(false)
+const props = defineProps({
+    cusName: String, //客户单位名称
+    cusId: Number,//客户ID
+    visistId: Number,//活动ID
+    status: String //状态
+})
+
+// 表单数据
+const formData = ref({
+    customerUserList,
+    myUserList,
+    activityTypeList,
+    activeTxt
+});
+
+// 验证规则
+const rules = {
+    activityTypeList: {
+        rules: [
+            { required: true, errorMessage: '请选择活动内容' }
+        ]
+    }
+
+};
+
+// 表单ref
+const formRef = ref(null);
+
+//删除明细项的内容
+let rcDeleteForm = reactive({})
+function handleDeleteVisistDetailItem() {
+    rcDeleteForm.treeName = '日常走访'
+    rcDeleteForm.visistId = props.visistId
+    deleVisistDetailItem(rcDeleteForm).then(res => {
+        if (res.code == 200) {
+            uni.showToast({
+                title: '删除成功',
+                duration: 2000
+            });
+            //响应成功，删除缓存记录
+            handleDelete()
+        } else {
+            uni.showToast({
+                title: res.msg,
+                icon: 'none',
+            });
+        }
+    })
+}
+
+// 删除内容
+let handleDelete = () => {
+    formData.value.customerUserList = null
+    formData.value.myUserList = null
+    formData.value.activityTypeList = null
+    formData.value.activeTxt = null
+    if (cache.get('checkedRCClientList') != null) {
+        cache.remove('checkedRCClientList');
+    }
+    if (cache.get('checkedRCMyUserList') != null) {
+        cache.remove('checkedRCMyUserList');
+    }
+    if (cache.get('checkedRCActivityTypeList') != null) {
+        cache.remove('checkedRCActivityTypeList');
+    }
+}
+
+//删除缓存
+let handleDeleteLocal = () => {
+    cache.remove('checkedRCClientList');
+    cache.remove('checkedRCMyUserList');
+    cache.remove('checkedRCActivityTypeList');
+}
+
+let rcForm = reactive({})
+// 保存/修改
+const submitForm = async () => {
+    try {
+        // 验证表单
+        await formRef.value.validate();
+        // 验证通过后的操作
+        uni.showToast({
+            title: '验证通过',
+            icon: 'success'
+        });
+        rcForm.treeName = '日常走访'
+        rcForm.cusId = props.cusId
+        rcForm.visistId = props.visistId
+        if (Array.isArray(activityTypeList.value)) {
+            rcForm.activityTags = activityTypeList.value.join(',')
+        } else {
+            rcForm.activityTags = activityTypeList.value
+        }
+
+        if (Array.isArray(myUserList.value)) {
+            rcForm.ourPersonnel = myUserList.value.join(',')
+        } else {
+            rcForm.ourPersonnel = myUserList.value
+        }
+
+        if (Array.isArray(customerUserList.value)) {
+            rcForm.cusPersonnel = customerUserList.value.join(',')
+        } else {
+            rcForm.cusPersonnel = customerUserList.value
+        }
+
+        rcForm.bandResult = activeTxt.value
+        // 提交服务器进行新增
+        addVisistDetail(rcForm).then(res => {
+            if (res.code == 200) {
+                uni.showToast({
+                    title: '提交成功',
+                    duration: 2000
+                });
+                //响应成功，删除缓存记录
+                handleDeleteLocal()
+            } else {
+                uni.showToast({
+                    title: res.msg,
+                    icon: 'none',
+                });
+            }
+        })
+    } catch (err) {
+        console.log('表单验证失败:', err);
+    }
+};
+
+//页面渲染完成后，查询catch的get
+onShow(() => {
+
+    if (cache.get('checkedRCClientList') != null && cache.get('checkedRCClientList') != []) {
+        customerUserList.value = cache.get('checkedRCClientList')
+    }
+
+    if (cache.get('checkedRCMyUserList') != null && cache.get('checkedRCMyUserList') != []) {
+        myUserList.value = cache.get('checkedRCMyUserList')
+    }
+
+    if (cache.get('checkedRCActivityTypeList') != null && cache.get('checkedRCActivityTypeList') != []) {
+        activityTypeList.value = cache.get('checkedRCActivityTypeList')
+    }
+
+    if (props.status == '完成') {
+        isDisabled.value = true
+    } else {
+        isDisabled.value = false
+    }
+
+})
+
+//查询日常走访的内容
+let queryRCForm = reactive({})
+let getRCVisitReportDetailContent = () => {
+    queryRCForm.visistId = props.visistId
+    queryRCForm.cusId = props.cusId
+    queryRCForm.treeName = '日常走访'
+    getVisistDetailItem(queryRCForm).then(res => {
+        if (res.rows[0] != null) {
+            customerUserList.value = res.rows[0].customerPersonnel
+            myUserList.value = res.rows[0].ourPersonnel
+            activityTypeList.value = res.rows[0].activityTags
+            activeTxt.value = res.rows[0].bandResult
+        }
+    })
+}
+
+
+
+//页面卸载之后，删除缓存信息
+onUnload(() => {
+    handleDeleteLocal()
+})
+
+
+//选择客户人员
+function chooseClientUser() {
+    console.log('点击了输入框', props.cusName);
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/customerUserList?cusName=' + props.cusName + '&chooseType=日常走访'
+    })
+}
+
+//选择我方参与人
+function chooseMyUser() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/myUserList?chooseType=日常走访'
+    })
+}
+
+//选择活动类型
+function chooseActivityType() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/activityTypeList?chooseType=日常走访'
+    })
+}
+
+// 明确暴露给父组件的方法
+defineExpose({
+    handleDelete,
+    getRCVisitReportDetailContent
+})
+
+</script>
+
+
+<style scoped lang="scss">
+.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 - 120px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 110px);
+    /* #endif */
+}
+
+.white-bg {
+    padding-bottom: 10rpx;
+}
+</style>
--- a/src/pages/business/CRM/marketActivity/components/djVisistComponent.vue
+++ b/src/pages/business/CRM/marketActivity/components/djVisistComponent.vue
@@ -0,0 +1,258 @@
+<template>
+    <uni-forms ref="formRef" :model="formData"  label-width="100px" label-position="top">
+        <uni-forms-item label="客户人员" name="customerUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.customerUserList" placeholder="请选择客户人员" name="input"
+            :disabled="isDisabled"
+                @focus="chooseClientUser"></uni-easyinput>
+        </uni-forms-item>
+        <uni-forms-item label="我方参与人" name="myUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.myUserList" placeholder="请选择我方参与人" name="input"
+            :disabled="isDisabled"
+                @focus="chooseMyUser"></uni-easyinput>
+        </uni-forms-item>
+
+        <uni-forms-item label="活动文字" name="activeTxt" class="uni-forms-item is-direction-top is-top">
+            <uni-easyinput type="textarea" autoHeight v-model="formData.activeTxt" placeholder="请输入" 活动文字
+                class="form-texarea" />
+        </uni-forms-item>
+    </uni-forms>
+    <view class="footer-con">
+        <button class="btn-default" type="default" @click="handleDeleteVisistDetailItem" size="mini">删 除</button>
+        <button class="btn-primary" type="primary" @click="submitForm" size="mini">保存/修改</button>
+    </view>
+</template>
+
+<script setup name="djVisitComponent">
+import { ref, reactive } from 'vue'
+import cache from '../../../../../utils/cache'
+import { onShow, onUnload } from '@dcloudio/uni-app';
+import { addVisistDetail, deleVisistDetailItem, getVisistDetailItem } from '../../../../../api/crm/activity/activity';
+
+let customerUserList = ref([])
+let myUserList = ref([])
+let activeTxt = ref('')
+let isDisabled = ref(false)
+const props = defineProps({
+    cusName: String, //客户单位名称
+    cusId: Number,//客户ID
+    visistId: Number,//活动ID
+    status: String //状态
+})
+
+// 表单数据
+const formData = ref({
+    customerUserList,
+    myUserList,
+    activeTxt
+});
+
+// 表单ref
+const formRef = ref(null);
+
+//删除明细项的内容
+let djDeleteForm = reactive({})
+function handleDeleteVisistDetailItem() {
+    djDeleteForm.treeName = '党建活动'
+    djDeleteForm.visistId = props.visistId
+    deleVisistDetailItem(djDeleteForm).then(res => {
+        if (res.code == 200) {
+            uni.showToast({
+                title: '删除成功',
+                duration: 2000
+            });
+            //响应成功，删除缓存记录
+            handleDelete()
+        } else {
+            uni.showToast({
+                title: res.msg,
+                icon: 'none',
+            });
+        }
+    })
+}
+
+// 删除内容
+let handleDelete = () => {
+    formData.value.customerUserList = null
+    formData.value.myUserList = null
+    formData.value.activeTxt = null
+    if (cache.get('checkedDJClientList') != null) {
+        cache.remove('checkedDJClientList');
+    }
+    if (cache.get('checkedDJMyUserList') != null) {
+        cache.remove('checkedDJMyUserList');
+    }
+}
+
+//删除缓存
+let handleDeleteLocal = () => {
+    cache.remove('checkedDJClientList');
+    cache.remove('checkedDJMyUserList');
+}
+
+let djForm = reactive({})
+// 保存/修改
+const submitForm = async () => {
+    try {
+        // 验证表单
+        await formRef.value.validate();
+        // 验证通过后的操作
+        uni.showToast({
+            title: '验证通过',
+            icon: 'success'
+        });
+        djForm.treeName = '党建活动'
+        djForm.cusId = props.cusId
+        djForm.visistId = props.visistId
+
+        if (Array.isArray(myUserList.value)) {
+            djForm.ourPersonnel = myUserList.value.join(',')
+        } else {
+            djForm.ourPersonnel = myUserList.value
+        }
+
+        if (Array.isArray(customerUserList.value)) {
+            djForm.cusPersonnel = customerUserList.value.join(',')
+        } else {
+            djForm.cusPersonnel = customerUserList.value
+        }
+
+        djForm.bandResult = activeTxt.value
+        // 提交服务器进行新增
+        addVisistDetail(djForm).then(res => {
+            if (res.code == 200) {
+                uni.showToast({
+                    title: '提交成功',
+                    duration: 2000
+                });
+                //响应成功，删除缓存记录
+                handleDeleteLocal()
+            } else {
+                uni.showToast({
+                    title: res.msg,
+                    icon: 'none',
+                });
+            }
+        })
+    } catch (err) {
+        console.log('表单验证失败:', err);
+    }
+};
+
+//页面渲染完成后，查询catch的get
+onShow(() => {
+
+    if (cache.get('checkedDJClientList') != null && cache.get('checkedDJClientList') != []) {
+        customerUserList.value = cache.get('checkedDJClientList')
+    }
+
+    if (cache.get('checkedDJMyUserList') != null && cache.get('checkedDJMyUserList') != []) {
+        myUserList.value = cache.get('checkedDJMyUserList')
+    }
+
+        if(props.status=='完成'){
+        isDisabled.value = true
+    }else{
+        isDisabled.value = false
+    }
+})
+
+//查询日常走访的内容
+let queryDJForm = reactive({})
+let getDJVisitReportDetailContent = () => {
+    queryDJForm.visistId = props.visistId
+    queryDJForm.cusId = props.cusId
+    queryDJForm.treeName = '党建活动'
+    getVisistDetailItem(queryDJForm).then(res => {
+        if (res.rows[0] != null) {
+            customerUserList.value = res.rows[0].customerPersonnel
+            myUserList.value = res.rows[0].ourPersonnel
+            activeTxt.value = res.rows[0].bandResult
+        }
+    })
+}
+
+
+
+//页面卸载之后，删除缓存信息
+onUnload(() => {
+    handleDeleteLocal()
+})
+
+
+//选择客户人员
+function chooseClientUser() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/customerUserList?cusName=' + props.cusName + '&chooseType=党建活动'
+    })
+}
+
+//选择我方参与人
+function chooseMyUser() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/myUserList?chooseType=党建活动'
+    })
+}
+
+// 明确暴露给父组件的方法
+defineExpose({
+    handleDelete,
+    getDJVisitReportDetailContent
+})
+
+</script>
+
+
+<style scoped lang="scss">
+.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 - 120px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 110px);
+    /* #endif */
+}
+
+.white-bg {
+    padding-bottom: 10rpx;
+}
+</style>
--- a/src/pages/business/CRM/marketActivity/components/jsVisistComponent.vue
+++ b/src/pages/business/CRM/marketActivity/components/jsVisistComponent.vue
@@ -0,0 +1,262 @@
+<template>
+    <uni-forms ref="formRef" :model="formData"  label-width="100px" label-position="top">
+        <uni-forms-item label="客户人员" name="customerUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.customerUserList" placeholder="请选择客户人员" name="input"
+            :disabled="isDisabled"
+                @focus="chooseClientUser"></uni-easyinput>
+        </uni-forms-item>
+        <uni-forms-item label="我方参与人" name="myUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.myUserList" placeholder="请选择我方参与人" name="input"
+            :disabled="isDisabled"
+                @focus="chooseMyUser"></uni-easyinput>
+        </uni-forms-item>
+
+        <uni-forms-item label="活动文字" name="activeTxt" class="uni-forms-item is-direction-top is-top">
+            <uni-easyinput type="textarea" autoHeight v-model="formData.activeTxt" placeholder="请输入" 活动文字
+                class="form-texarea" />
+        </uni-forms-item>
+    </uni-forms>
+    <view class="footer-con">
+        <button class="btn-default" type="default" @click="handleDeleteVisistDetailItem" size="mini">删 除</button>
+        <button class="btn-primary" type="primary" @click="submitForm" size="mini">保存/修改</button>
+    </view>
+</template>
+
+<script setup name="jsVisitComponent">
+import { ref, reactive } from 'vue'
+import cache from '../../../../../utils/cache'
+import { onShow, onUnload } from '@dcloudio/uni-app';
+import { addVisistDetail, deleVisistDetailItem, getVisistDetailItem } from '../../../../../api/crm/activity/activity';
+
+let customerUserList = ref([])
+let myUserList = ref([])
+let activeTxt = ref('')
+let isDisabled = ref(false)
+const props = defineProps({
+    cusName: String, //客户单位名称
+    cusId: Number,//客户ID
+    visistId: Number,//活动ID
+    status: String //状态
+})
+
+// 表单数据
+const formData = ref({
+    customerUserList,
+    myUserList,
+    activeTxt
+});
+
+// 表单ref
+const formRef = ref(null);
+
+//删除明细项的内容
+let jsDeleteForm = reactive({})
+function handleDeleteVisistDetailItem() {
+    jsDeleteForm.treeName = '业务招待'
+    jsDeleteForm.visistId = props.visistId
+    deleVisistDetailItem(jsDeleteForm).then(res => {
+        if (res.code == 200) {
+            uni.showToast({
+                title: '删除成功',
+                duration: 2000
+            });
+            //响应成功，删除缓存记录
+            handleDelete()
+        } else {
+            uni.showToast({
+                title: res.msg,
+                icon: 'none',
+            });
+        }
+    })
+}
+
+// 删除内容
+let handleDelete = () => {
+    formData.value.customerUserList = null
+    formData.value.myUserList = null
+    formData.value.activeTxt = null
+    if (cache.get('checkedJSClientList') != null) {
+        cache.remove('checkedJSClientList');
+    }
+    if (cache.get('checkedJSMyUserList') != null) {
+        cache.remove('checkedJSMyUserList');
+    }
+}
+
+//删除缓存
+let handleDeleteLocal = () => {
+    cache.remove('checkedJSClientList');
+    cache.remove('checkedJSMyUserList');
+}
+
+let jsForm = reactive({})
+// 保存/修改
+const submitForm = async () => {
+    try {
+        // 验证表单
+        await formRef.value.validate();
+        // 验证通过后的操作
+        uni.showToast({
+            title: '验证通过',
+            icon: 'success'
+        });
+        jsForm.treeName = '技术交流'
+        jsForm.cusId = props.cusId
+        jsForm.visistId = props.visistId
+
+        if (Array.isArray(myUserList.value)) {
+            jsForm.ourPersonnel = myUserList.value.join(',')
+        } else {
+            jsForm.ourPersonnel = myUserList.value
+        }
+
+        if (Array.isArray(customerUserList.value)) {
+            jsForm.cusPersonnel = customerUserList.value.join(',')
+        } else {
+            jsForm.cusPersonnel = customerUserList.value
+        }
+
+        jsForm.bandResult = activeTxt.value
+        // 提交服务器进行新增
+        addVisistDetail(jsForm).then(res => {
+            if (res.code == 200) {
+                uni.showToast({
+                    title: '提交成功',
+                    duration: 2000
+                });
+                //响应成功，删除缓存记录
+                handleDeleteLocal()
+            } else {
+                uni.showToast({
+                    title: res.msg,
+                    icon: 'none',
+                });
+            }
+        })
+    } catch (err) {
+        console.log('表单验证失败:', err);
+    }
+};
+
+//页面渲染完成后，查询catch的get
+onShow(() => {
+
+    if (cache.get('checkedJSClientList') != null && cache.get('checkedJSClientList') != []) {
+        customerUserList.value = cache.get('checkedJSClientList')
+    }
+
+    if (cache.get('checkedJSMyUserList') != null && cache.get('checkedJSMyUserList') != []) {
+        myUserList.value = cache.get('checkedJSMyUserList')
+    }
+
+        if(props.status=='完成'){
+        isDisabled.value = true
+    }else{
+        isDisabled.value = false
+    }
+})
+
+//查询日常走访的内容
+let queryJSForm = reactive({})
+let getJSVisitReportDetailContent = () => {
+    queryJSForm.visistId = props.visistId
+    queryJSForm.cusId = props.cusId
+    queryJSForm.treeName = '技术交流'
+    getVisistDetailItem(queryJSForm).then(res => {
+        if (res.rows[0] != null) {
+            customerUserList.value = res.rows[0].customerPersonnel
+            myUserList.value = res.rows[0].ourPersonnel
+            activeTxt.value = res.rows[0].bandResult
+        }
+    })
+}
+
+
+
+//页面卸载之后，删除缓存信息
+onUnload(() => {
+    handleDeleteLocal()
+})
+
+
+//选择客户人员
+function chooseClientUser() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/customerUserList?cusName=' + props.cusName + '&chooseType=技术交流'
+    })
+}
+
+//选择我方参与人
+function chooseMyUser() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/myUserList?chooseType=技术交流'
+    })
+}
+
+// 明确暴露给父组件的方法
+defineExpose({
+    handleDelete,
+    getJSVisitReportDetailContent
+})
+
+</script>
+
+
+<style scoped lang="scss">
+.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 - 120px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 110px);
+    /* #endif */
+}
+
+.white-bg {
+    padding-bottom: 10rpx;
+}
+
+
+
+
+</style>
--- a/src/pages/business/CRM/marketActivity/components/lcVisistComponent.vue
+++ b/src/pages/business/CRM/marketActivity/components/lcVisistComponent.vue
@@ -0,0 +1,262 @@
+<template>
+    <uni-forms ref="formRef" :model="formData"  label-width="100px" label-position="top">
+        <uni-forms-item label="客户人员" name="customerUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.customerUserList" placeholder="请选择客户人员" name="input"
+            :disabled="isDisabled"
+                @focus="chooseClientUser"></uni-easyinput>
+        </uni-forms-item>
+        <uni-forms-item label="我方参与人" name="myUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.myUserList" placeholder="请选择我方参与人" name="input"
+            :disabled="isDisabled"
+                @focus="chooseMyUser"></uni-easyinput>
+        </uni-forms-item>
+
+        <uni-forms-item label="活动文字" name="activeTxt" class="uni-forms-item is-direction-top is-top">
+            <uni-easyinput type="textarea" autoHeight v-model="formData.activeTxt" placeholder="请输入" 活动文字
+                class="form-texarea" />
+        </uni-forms-item>
+    </uni-forms>
+    <view class="footer-con">
+        <button class="btn-default" type="default" @click="handleDeleteVisistDetailItem" size="mini">删 除</button>
+        <button class="btn-primary" type="primary" @click="submitForm" size="mini">保存/修改</button>
+    </view>
+</template>
+
+<script setup name="lcVisitComponent">
+import { ref, reactive } from 'vue'
+import cache from '../../../../../utils/cache'
+import { onShow, onUnload } from '@dcloudio/uni-app';
+import { addVisistDetail, deleVisistDetailItem, getVisistDetailItem } from '../../../../../api/crm/activity/activity';
+
+let customerUserList = ref([])
+let myUserList = ref([])
+let activeTxt = ref('')
+let isDisabled = ref(false)
+const props = defineProps({
+    cusName: String, //客户单位名称
+    cusId: Number,//客户ID
+    visistId: Number,//活动ID
+    status: String //状态
+})
+
+// 表单数据
+const formData = ref({
+    customerUserList,
+    myUserList,
+    activeTxt
+});
+
+// 表单ref
+const formRef = ref(null);
+
+//删除明细项的内容
+let lcDeleteForm = reactive({})
+function handleDeleteVisistDetailItem() {
+    lcDeleteForm.treeName = '业务招待'
+    lcDeleteForm.visistId = props.visistId
+    deleVisistDetailItem(lcDeleteForm).then(res => {
+        if (res.code == 200) {
+            uni.showToast({
+                title: '删除成功',
+                duration: 2000
+            });
+            //响应成功，删除缓存记录
+            handleDelete()
+        } else {
+            uni.showToast({
+                title: res.msg,
+                icon: 'none',
+            });
+        }
+    })
+}
+
+// 删除内容
+let handleDelete = () => {
+    formData.value.customerUserList = null
+    formData.value.myUserList = null
+    formData.value.activeTxt = null
+    if (cache.get('checkedLCClientList') != null) {
+        cache.remove('checkedLCClientList');
+    }
+    if (cache.get('checkedLCMyUserList') != null) {
+        cache.remove('checkedLCMyUserList');
+    }
+}
+
+//删除缓存
+let handleDeleteLocal = () => {
+    cache.remove('checkedLCClientList');
+    cache.remove('checkedLCMyUserList');
+}
+
+let lcForm = reactive({})
+// 保存/修改
+const submitForm = async () => {
+    try {
+        // 验证表单
+        await formRef.value.validate();
+        // 验证通过后的操作
+        uni.showToast({
+            title: '验证通过',
+            icon: 'success'
+        });
+        lcForm.treeName = '来厂参观'
+        lcForm.cusId = props.cusId
+        lcForm.visistId = props.visistId
+
+        if (Array.isArray(myUserList.value)) {
+            lcForm.ourPersonnel = myUserList.value.join(',')
+        } else {
+            lcForm.ourPersonnel = myUserList.value
+        }
+
+        if (Array.isArray(customerUserList.value)) {
+            lcForm.cusPersonnel = customerUserList.value.join(',')
+        } else {
+            lcForm.cusPersonnel = customerUserList.value
+        }
+
+        lcForm.bandResult = activeTxt.value
+        // 提交服务器进行新增
+        addVisistDetail(lcForm).then(res => {
+            if (res.code == 200) {
+                uni.showToast({
+                    title: '提交成功',
+                    duration: 2000
+                });
+                //响应成功，删除缓存记录
+                handleDeleteLocal()
+            } else {
+                uni.showToast({
+                    title: res.msg,
+                    icon: 'none',
+                });
+            }
+        })
+    } catch (err) {
+        console.log('表单验证失败:', err);
+    }
+};
+
+//页面渲染完成后，查询catch的get
+onShow(() => {
+
+    if (cache.get('checkedLCClientList') != null && cache.get('checkedLCClientList') != []) {
+        customerUserList.value = cache.get('checkedLCClientList')
+    }
+
+    if (cache.get('checkedLCMyUserList') != null && cache.get('checkedLCMyUserList') != []) {
+        myUserList.value = cache.get('checkedLCMyUserList')
+    }
+
+        if(props.status=='完成'){
+        isDisabled.value = true
+    }else{
+        isDisabled.value = false
+    }
+})
+
+//查询日常走访的内容
+let queryLCForm = reactive({})
+let getLCVisitReportDetailContent = () => {
+    queryLCForm.visistId = props.visistId
+    queryLCForm.cusId = props.cusId
+    queryLCForm.treeName = '来厂参观'
+    getVisistDetailItem(queryLCForm).then(res => {
+        if (res.rows[0] != null) {
+            customerUserList.value = res.rows[0].customerPersonnel
+            myUserList.value = res.rows[0].ourPersonnel
+            activeTxt.value = res.rows[0].bandResult
+        }
+    })
+}
+
+
+
+//页面卸载之后，删除缓存信息
+onUnload(() => {
+    handleDeleteLocal()
+})
+
+
+//选择客户人员
+function chooseClientUser() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/customerUserList?cusName=' + props.cusName + '&chooseType=来厂参观'
+    })
+}
+
+//选择我方参与人
+function chooseMyUser() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/myUserList?chooseType=来厂参观'
+    })
+}
+
+// 明确暴露给父组件的方法
+defineExpose({
+    handleDelete,
+    getLCVisitReportDetailContent
+})
+
+</script>
+
+
+<style scoped lang="scss">
+.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 - 120px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 110px);
+    /* #endif */
+}
+
+.white-bg {
+    padding-bottom: 10rpx;
+}
+
+
+
+
+</style>
--- a/src/pages/business/CRM/marketActivity/components/lyVisistComponent.vue
+++ b/src/pages/business/CRM/marketActivity/components/lyVisistComponent.vue
@@ -0,0 +1,308 @@
+<template>
+    <uni-forms ref="formRef" :model="formData" label-width="100px" label-position="top">
+        <uni-forms-item label="客户人员" name="customerUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.customerUserList" placeholder="请选择客户人员" name="input"
+            :disabled="isDisabled"
+                @focus="chooseClientUser"></uni-easyinput>
+        </uni-forms-item>
+        <uni-forms-item label="我方参与人" name="myUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.myUserList" placeholder="请选择我方参与人" name="input"
+            :disabled="isDisabled"
+                @focus="chooseMyUser"></uni-easyinput>
+        </uni-forms-item>
+
+<uni-forms-item label="住宿天数" name="stayDays">
+    <picker
+      @change="handlePickerChange"
+      :value="stayDaysIndex"
+      :range="stayDaysOptions"
+      :disabled="isDisabled"
+    >
+      <view class="picker-container">
+        <view class="picker-display">
+          {{ stayDaysOptions[stayDaysIndex] }}
+        </view>
+        <uni-icons type="arrowdown" size="16" color="#666"></uni-icons>
+      </view>
+    </picker>
+  </uni-forms-item>
+
+        <uni-forms-item label="活动文字" name="activeTxt" class="uni-forms-item is-direction-top is-top">
+            <uni-easyinput type="textarea" autoHeight v-model="formData.activeTxt" placeholder="请输入" 活动文字
+                class="form-texarea" />
+        </uni-forms-item>
+    </uni-forms>
+    <view class="footer-con">
+        <button class="btn-default" type="default" @click="handleDeleteVisistDetailItem" size="mini">删 除</button>
+        <button class="btn-primary" type="primary" @click="submitForm" size="mini">保存/修改</button>
+    </view>
+</template>
+
+<script setup name="lyVisitComponent">
+import { ref, reactive } from 'vue'
+import cache from '../../../../../utils/cache'
+import { onShow, onUnload } from '@dcloudio/uni-app';
+import { addVisistDetail, deleVisistDetailItem, getVisistDetailItem } from '../../../../../api/crm/activity/activity';
+
+let customerUserList = ref([])
+let myUserList = ref([])
+let activeTxt = ref('')
+let isDisabled = ref(false)
+const props = defineProps({
+    cusName: String, //客户单位名称
+    cusId: Number,//客户ID
+    visistId: Number,//活动ID
+    status: String //状态
+})
+
+
+
+// 表单数据
+const formData = ref({
+    customerUserList,
+    myUserList,
+    activeTxt
+});
+
+// 表单ref
+const formRef = ref(null);
+
+//删除明细项的内容
+let lyDeleteForm = reactive({})
+function handleDeleteVisistDetailItem() {
+    lyDeleteForm.treeName = '联谊活动'
+    lyDeleteForm.visistId = props.visistId
+    deleVisistDetailItem(lyDeleteForm).then(res => {
+        if (res.code == 200) {
+            uni.showToast({
+                title: '删除成功',
+                duration: 2000
+            });
+            //响应成功，删除缓存记录
+            handleDelete()
+        } else {
+            uni.showToast({
+                title: res.msg,
+                icon: 'none',
+            });
+        }
+    })
+}
+
+// 删除内容
+let handleDelete = () => {
+    formData.value.customerUserList = null
+    formData.value.myUserList = null
+    formData.value.activeTxt = null
+    if (cache.get('checkedLYClientList') != null) {
+        cache.remove('checkedYWClientList');
+    }
+    if (cache.get('checkedLYMyUserList') != null) {
+        cache.remove('checkedLYMyUserList');
+    }
+}
+
+//删除缓存
+let handleDeleteLocal = () => {
+    cache.remove('checkedLYClientList');
+    cache.remove('checkedLYMyUserList');
+}
+
+let lyForm = reactive({})
+// 保存/修改
+const submitForm = async () => {
+    try {
+        // 验证表单
+        await formRef.value.validate();
+        // 验证通过后的操作
+        uni.showToast({
+            title: '验证通过',
+            icon: 'success'
+        });
+        lyForm.treeName = '联谊活动'
+        lyForm.cusId = props.cusId
+        lyForm.visistId = props.visistId
+
+        if (Array.isArray(myUserList.value)) {
+            lyForm.ourPersonnel = myUserList.value.join(',')
+        } else {
+            lyForm.ourPersonnel = myUserList.value
+        }
+
+        if (Array.isArray(customerUserList.value)) {
+            lyForm.cusPersonnel = customerUserList.value.join(',')
+        } else {
+            lyForm.cusPersonnel = customerUserList.value
+        }
+
+        lyForm.bandResult = activeTxt.value
+        lyForm.multiple = stayDaysIndex.value+1
+        // 提交服务器进行新增
+        addVisistDetail(lyForm).then(res => {
+            if (res.code == 200) {
+                uni.showToast({
+                    title: '提交成功',
+                    duration: 2000
+                });
+                //响应成功，删除缓存记录
+                handleDeleteLocal()
+            } else {
+                uni.showToast({
+                    title: res.msg,
+                    icon: 'none',
+                });
+            }
+        })
+    } catch (err) {
+        console.log('表单验证失败:', err);
+    }
+};
+
+//页面渲染完成后，查询catch的get
+onShow(() => {
+
+    if (cache.get('checkedLYClientList') != null && cache.get('checkedLYClientList') != []) {
+        customerUserList.value = cache.get('checkedLYClientList')
+    }
+
+    if (cache.get('checkedLYMyUserList') != null && cache.get('checkedLYMyUserList') != []) {
+        myUserList.value = cache.get('checkedLYMyUserList')
+    }
+        console.log(props.status,'获取的状态')
+
+    if(props.status=='完成'){
+        isDisabled.value = true
+    }else{
+        isDisabled.value = false
+    }
+})
+
+//查询日常走访的内容
+let queryLYForm = reactive({})
+let getLYVisitReportDetailContent = () => {
+    queryLYForm.visistId = props.visistId
+    queryLYForm.cusId = props.cusId
+    queryLYForm.treeName = '联谊活动'
+    getVisistDetailItem(queryLYForm).then(res => {
+        if (res.rows[0] != null) {
+            customerUserList.value = res.rows[0].customerPersonnel
+            myUserList.value = res.rows[0].ourPersonnel
+            stayDaysIndex.value = res.rows[0].multiple-1
+            activeTxt.value = res.rows[0].bandResult
+        }
+    })
+}
+
+
+
+//页面卸载之后，删除缓存信息
+onUnload(() => {
+    handleDeleteLocal()
+})
+
+
+//选择客户人员
+function chooseClientUser() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/customerUserList?cusName=' + props.cusName + '&chooseType=联谊活动'
+    })
+}
+
+//选择我方参与人
+function chooseMyUser() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/myUserList?chooseType=联谊活动'
+    })
+}
+
+// 住宿天数
+const stayDaysOptions = ref(['1天', '2天', '3天', '4天', '5天', '6天', '7天'])
+const stayDaysIndex = ref(0) // 默认未选择
+
+const handlePickerChange = (e) => {
+  stayDaysIndex.value = e.detail.value
+  console.log("天数数字：",stayDaysIndex.value+1)
+}
+
+// 明确暴露给父组件的方法
+defineExpose({
+    handleDelete,
+    getLYVisitReportDetailContent
+})
+
+</script>
+
+
+<style scoped lang="scss">
+.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 - 120px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 110px);
+    /* #endif */
+}
+
+.white-bg {
+    padding-bottom: 10rpx;
+}
+
+.picker-container {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 10px 12px;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  background-color: #fff;
+}
+
+.picker-display {
+  color: #333;
+  font-size: 14px;
+}
+
+.picker-display:empty::before {
+  content: '请选择住宿天数';
+  color: #999;
+}
+</style>
--- a/src/pages/business/CRM/marketActivity/components/wtVisistComponent.vue
+++ b/src/pages/business/CRM/marketActivity/components/wtVisistComponent.vue
@@ -0,0 +1,259 @@
+<template>
+    <uni-forms ref="formRef" :model="formData"  label-width="100px" label-position="top">
+        <uni-forms-item label="客户人员" name="customerUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.customerUserList" placeholder="请选择客户人员" name="input"
+            :disabled="isDisabled"
+                @focus="chooseClientUser"></uni-easyinput>
+        </uni-forms-item>
+        <uni-forms-item label="我方参与人" name="myUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.myUserList" placeholder="请选择我方参与人" name="input"
+            :disabled="isDisabled"
+                @focus="chooseMyUser"></uni-easyinput>
+        </uni-forms-item>
+
+        <uni-forms-item label="活动文字" name="activeTxt" class="uni-forms-item is-direction-top is-top">
+            <uni-easyinput type="textarea" autoHeight v-model="formData.activeTxt" placeholder="请输入" 活动文字
+                class="form-texarea" />
+        </uni-forms-item>
+    </uni-forms>
+    <view class="footer-con">
+        <button class="btn-default" type="default" @click="handleDeleteVisistDetailItem" size="mini">删 除</button>
+        <button class="btn-primary" type="primary" @click="submitForm" size="mini">保存/修改</button>
+    </view>
+</template>
+
+<script setup name="wtVisitComponent">
+import { ref, reactive } from 'vue'
+import cache from '../../../../../utils/cache'
+import { onShow, onUnload } from '@dcloudio/uni-app';
+import { addVisistDetail, deleVisistDetailItem, getVisistDetailItem } from '../../../../../api/crm/activity/activity';
+
+let customerUserList = ref([])
+let myUserList = ref([])
+let activeTxt = ref('')
+let isDisabled = ref(false)
+const props = defineProps({
+    cusName: String, //客户单位名称
+    cusId: Number,//客户ID
+    visistId: Number,//活动ID
+    status: String //状态
+})
+
+// 表单数据
+const formData = ref({
+    customerUserList,
+    myUserList,
+    activeTxt
+});
+
+// 表单ref
+const formRef = ref(null);
+
+//删除明细项的内容
+let wtDeleteForm = reactive({})
+function handleDeleteVisistDetailItem() {
+    wtDeleteForm.treeName = '文体活动'
+    wtDeleteForm.visistId = props.visistId
+    deleVisistDetailItem(wtDeleteForm).then(res => {
+        if (res.code == 200) {
+            uni.showToast({
+                title: '删除成功',
+                duration: 2000
+            });
+            //响应成功，删除缓存记录
+            handleDelete()
+        } else {
+            uni.showToast({
+                title: res.msg,
+                icon: 'none',
+            });
+        }
+    })
+}
+
+// 删除内容
+let handleDelete = () => {
+    formData.value.customerUserList = null
+    formData.value.myUserList = null
+    formData.value.activeTxt = null
+    if (cache.get('checkedWTClientList') != null) {
+        cache.remove('checkedWTClientList');
+    }
+    if (cache.get('checkedWTMyUserList') != null) {
+        cache.remove('checkedWTMyUserList');
+    }
+}
+
+//删除缓存
+let handleDeleteLocal = () => {
+    cache.remove('checkedWTClientList');
+    cache.remove('checkedWTMyUserList');
+}
+
+let wtForm = reactive({})
+// 保存/修改
+const submitForm = async () => {
+    try {
+        // 验证表单
+        await formRef.value.validate();
+        // 验证通过后的操作
+        uni.showToast({
+            title: '验证通过',
+            icon: 'success'
+        });
+        wtForm.treeName = '文体活动'
+        wtForm.cusId = props.cusId
+        wtForm.visistId = props.visistId
+
+        if (Array.isArray(myUserList.value)) {
+            wtForm.ourPersonnel = myUserList.value.join(',')
+        } else {
+            wtForm.ourPersonnel = myUserList.value
+        }
+
+        if (Array.isArray(customerUserList.value)) {
+            wtForm.cusPersonnel = customerUserList.value.join(',')
+        } else {
+            wtForm.cusPersonnel = customerUserList.value
+        }
+
+        wtForm.bandResult = activeTxt.value
+        // 提交服务器进行新增
+        addVisistDetail(wtForm).then(res => {
+            if (res.code == 200) {
+                uni.showToast({
+                    title: '提交成功',
+                    duration: 2000
+                });
+                //响应成功，删除缓存记录
+                handleDeleteLocal()
+            } else {
+                uni.showToast({
+                    title: res.msg,
+                    icon: 'none',
+                });
+            }
+        })
+    } catch (err) {
+        console.log('表单验证失败:', err);
+    }
+};
+
+//页面渲染完成后，查询catch的get
+onShow(() => {
+
+    if (cache.get('checkedWTClientList') != null && cache.get('checkedWTClientList') != []) {
+        customerUserList.value = cache.get('checkedWTClientList')
+    }
+
+    if (cache.get('checkedWTMyUserList') != null && cache.get('checkedWTMyUserList') != []) {
+        myUserList.value = cache.get('checkedWTMyUserList')
+    }
+
+
+        if(props.status=='完成'){
+        isDisabled.value = true
+    }else{
+        isDisabled.value = false
+    }
+})
+
+//查询日常走访的内容
+let queryWTForm = reactive({})
+let getWTVisitReportDetailContent = () => {
+    queryWTForm.visistId = props.visistId
+    queryWTForm.cusId = props.cusId
+    queryWTForm.treeName = '文体活动'
+    getVisistDetailItem(queryWTForm).then(res => {
+        if (res.rows[0] != null) {
+            customerUserList.value = res.rows[0].customerPersonnel
+            myUserList.value = res.rows[0].ourPersonnel
+            activeTxt.value = res.rows[0].bandResult
+        }
+    })
+}
+
+
+
+//页面卸载之后，删除缓存信息
+onUnload(() => {
+    handleDeleteLocal()
+})
+
+
+//选择客户人员
+function chooseClientUser() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/customerUserList?cusName=' + props.cusName + '&chooseType=文体活动'
+    })
+}
+
+//选择我方参与人
+function chooseMyUser() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/myUserList?chooseType=文体活动'
+    })
+}
+
+// 明确暴露给父组件的方法
+defineExpose({
+    handleDelete,
+    getWTVisitReportDetailContent
+})
+
+</script>
+
+
+<style scoped lang="scss">
+.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 - 120px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 110px);
+    /* #endif */
+}
+
+.white-bg {
+    padding-bottom: 10rpx;
+}
+</style>
--- a/src/pages/business/CRM/marketActivity/components/ywVisistComponent.vue
+++ b/src/pages/business/CRM/marketActivity/components/ywVisistComponent.vue
@@ -0,0 +1,259 @@
+<template>
+    <uni-forms ref="formRef" :model="formData"  label-width="100px" label-position="top">
+        <uni-forms-item label="客户人员" name="customerUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.customerUserList" placeholder="请选择客户人员" name="input"
+            :disabled="isDisabled"
+                @focus="chooseClientUser"></uni-easyinput>
+        </uni-forms-item>
+        <uni-forms-item label="我方参与人" name="myUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.myUserList" placeholder="请选择我方参与人" name="input"
+            :disabled="isDisabled"
+                @focus="chooseMyUser"></uni-easyinput>
+        </uni-forms-item>
+
+        <uni-forms-item label="活动文字" name="activeTxt" class="uni-forms-item is-direction-top is-top">
+            <uni-easyinput type="textarea" autoHeight v-model="formData.activeTxt" placeholder="请输入" 活动文字
+                class="form-texarea" />
+        </uni-forms-item>
+    </uni-forms>
+    <view class="footer-con">
+        <button class="btn-default" type="default" @click="handleDeleteVisistDetailItem" size="mini">删 除</button>
+        <button class="btn-primary" type="primary" @click="submitForm" size="mini">保存/修改</button>
+    </view>
+</template>
+
+<script setup name="ywVisitComponent">
+import { ref, reactive } from 'vue'
+import cache from '../../../../../utils/cache'
+import { onShow, onUnload } from '@dcloudio/uni-app';
+import { addVisistDetail, deleVisistDetailItem, getVisistDetailItem } from '../../../../../api/crm/activity/activity';
+
+let customerUserList = ref([])
+let myUserList = ref([])
+let activeTxt = ref('')
+let isDisabled = ref(false)
+const props = defineProps({
+    cusName: String, //客户单位名称
+    cusId: Number,//客户ID
+    visistId: Number,//活动ID
+    status: String //状态
+})
+
+// 表单数据
+const formData = ref({
+    customerUserList,
+    myUserList,
+    activeTxt
+});
+
+// 表单ref
+const formRef = ref(null);
+
+//删除明细项的内容
+let ywDeleteForm = reactive({})
+function handleDeleteVisistDetailItem() {
+    ywDeleteForm.treeName = '业务招待'
+    ywDeleteForm.visistId = props.visistId
+    deleVisistDetailItem(ywDeleteForm).then(res => {
+        if (res.code == 200) {
+            uni.showToast({
+                title: '删除成功',
+                duration: 2000
+            });
+            //响应成功，删除缓存记录
+            handleDelete()
+        } else {
+            uni.showToast({
+                title: res.msg,
+                icon: 'none',
+            });
+        }
+    })
+}
+
+// 删除内容
+let handleDelete = () => {
+    formData.value.customerUserList = null
+    formData.value.myUserList = null
+    formData.value.activeTxt = null
+    if (cache.get('checkedYWClientList') != null) {
+        cache.remove('checkedYWClientList');
+    }
+    if (cache.get('checkedYWMyUserList') != null) {
+        cache.remove('checkedYWMyUserList');
+    }
+}
+
+//删除缓存
+let handleDeleteLocal = () => {
+    cache.remove('checkedYWClientList');
+    cache.remove('checkedYWMyUserList');
+}
+
+let ywForm = reactive({})
+// 保存/修改
+const submitForm = async () => {
+    try {
+        // 验证表单
+        await formRef.value.validate();
+        // 验证通过后的操作
+        uni.showToast({
+            title: '验证通过',
+            icon: 'success'
+        });
+        ywForm.treeName = '业务招待'
+        ywForm.cusId = props.cusId
+        ywForm.visistId = props.visistId
+
+        if (Array.isArray(myUserList.value)) {
+            ywForm.ourPersonnel = myUserList.value.join(',')
+        } else {
+            ywForm.ourPersonnel = myUserList.value
+        }
+
+        if (Array.isArray(customerUserList.value)) {
+            ywForm.cusPersonnel = customerUserList.value.join(',')
+        } else {
+            ywForm.cusPersonnel = customerUserList.value
+        }
+
+        ywForm.bandResult = activeTxt.value
+        // 提交服务器进行新增
+        addVisistDetail(ywForm).then(res => {
+            if (res.code == 200) {
+                uni.showToast({
+                    title: '提交成功',
+                    duration: 2000
+                });
+                //响应成功，删除缓存记录
+                handleDeleteLocal()
+            } else {
+                uni.showToast({
+                    title: res.msg,
+                    icon: 'none',
+                });
+            }
+        })
+    } catch (err) {
+        console.log('表单验证失败:', err);
+    }
+};
+
+//页面渲染完成后，查询catch的get
+onShow(() => {
+
+    if (cache.get('checkedYWClientList') != null && cache.get('checkedYWClientList') != []) {
+        customerUserList.value = cache.get('checkedYWClientList')
+    }
+
+    if (cache.get('checkedYWMyUserList') != null && cache.get('checkedYWMyUserList') != []) {
+        myUserList.value = cache.get('checkedYWMyUserList')
+    }
+
+
+        if(props.status=='完成'){
+        isDisabled.value = true
+    }else{
+        isDisabled.value = false
+    }
+})
+
+//查询日常走访的内容
+let queryYWForm = reactive({})
+let getYWVisitReportDetailContent = () => {
+    queryYWForm.visistId = props.visistId
+    queryYWForm.cusId = props.cusId
+    queryYWForm.treeName = '业务招待'
+    getVisistDetailItem(queryYWForm).then(res => {
+        if (res.rows[0] != null) {
+            customerUserList.value = res.rows[0].customerPersonnel
+            myUserList.value = res.rows[0].ourPersonnel
+            activeTxt.value = res.rows[0].bandResult
+        }
+    })
+}
+
+
+
+//页面卸载之后，删除缓存信息
+onUnload(() => {
+    handleDeleteLocal()
+})
+
+
+//选择客户人员
+function chooseClientUser() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/customerUserList?cusName=' + props.cusName + '&chooseType=业务招待'
+    })
+}
+
+//选择我方参与人
+function chooseMyUser() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/myUserList?chooseType=业务招待'
+    })
+}
+
+// 明确暴露给父组件的方法
+defineExpose({
+    handleDelete,
+    getYWVisitReportDetailContent
+})
+
+</script>
+
+
+<style scoped lang="scss">
+.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 - 120px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 110px);
+    /* #endif */
+}
+
+.white-bg {
+    padding-bottom: 10rpx;
+}
+</style>
--- a/src/pages/business/CRM/marketActivity/customerUserList.vue
+++ b/src/pages/business/CRM/marketActivity/customerUserList.vue
@@ -0,0 +1,159 @@
+<template>
+    <view class="con-body">
+        <view>
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'走访报告添加客户人员'" :leftFlag="true" :rightFlag="false">
+            </customHeader>
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height"></view>
+            <uni-easyinput prefixIcon="search" v-model="searchContent" placeholder="请输入客户人员名称" clearable
+                @iconClick="iconClick">
+            </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" v-model="item.userName"></checkbox>
+                    <view class="clientClass">
+                        <text class="blue-text">{{ item.userName }}</text>
+                        {{ " | " }}
+                        {{ item.userDept != null ? item.userDept : ' ' }}
+                        {{ item.job != null ? item.job : ' ' }}
+                        {{ item.mobilePhone }}
+                        {{ item.remark != null ? item.remark : ' ' }}
+                    </view>
+                </view>
+            </checkbox-group>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import customHeader from '@/components/customHeader.vue'
+import { crmCustomerUser } from '../../../../api/crm/activity/activity'
+import { onMounted, onUnmounted, reactive, ref, watch } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { useMessage } from '../../../../utils/message'
+import cache from '../../../../utils/cache'
+
+
+
+const message = useMessage();
+
+//点击查询客户人员
+const queryParams = ref({
+    cusName: '',
+    nickName: '',
+    pageNum: 1,
+    pageSize: 10
+})
+
+
+onMounted(() => {
+    getClientUserName()
+})
+
+let chooseType = ref()
+onLoad(options => {
+    queryParams.value.cusName = options.cusName
+    chooseType.value = options.chooseType
+})
+const dataList = ref([])
+
+function getClientUserName() {
+    crmCustomerUser(queryParams.value).then(res => {
+        console.log(res, '相应测试')
+        dataList.value = res.rows
+    })
+}
+
+
+//查询某一客户人员
+let searchContent = ref('')
+
+function iconClick() {
+    message.toast('点击了查询，当前内容：' + searchContent.value)
+}
+
+//监视查询的内容的变化
+watch(searchContent, (newValue, oldValue) => {
+    queryParams.value.nickName = searchContent.value
+    //变化了之后，重新查询内容
+    crmCustomerUser(queryParams.value).then(res => {
+        dataList.value = res.rows
+    })
+})
+
+
+
+//勾选内容
+function checkboxChange(e) {
+    //这里要根据传递来的不同的内容，生成不同的setCache方法
+    if (chooseType.value == '日常走访') {
+        cache.set('checkedRCClientList', e.detail.value)
+    }
+    if (chooseType.value == '业务招待') {
+        cache.set('checkedYWClientList', e.detail.value)
+    }
+    if (chooseType.value == '技术交流') {
+        cache.set('checkedJSClientList', e.detail.value)
+    }
+    if (chooseType.value == '来厂参观') {
+        cache.set('checkedLCClientList', e.detail.value)
+    }
+    if (chooseType.value == '党建活动') {
+        cache.set('checkedDJClientList', e.detail.value)
+    }
+    if (chooseType.value == '文体活动') {
+        cache.set('checkedWTClientList', e.detail.value)
+    }
+    if (chooseType.value == '联谊活动') {
+        cache.set('checkedLYClientList', e.detail.value)
+    }
+}
+
+
+
+</script>
+
+<style scoped lang="scss">
+.con-body {
+    background: white;
+}
+
+
+/* Container for the checkbox group */
+.checkbox-group.block {
+    width: 100%;
+}
+
+/* Each item row */
+.itemClass {
+    display: flex;
+    align-items: center;
+    padding: 10rpx 0;
+    margin-left: 15rpx;
+    border-bottom: 1px solid #eee;
+    /* optional divider */
+}
+
+/* Checkbox styling */
+.checkBoxClass {
+    margin-right: 12rpx;
+}
+
+/* Content container */
+.clientClass {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    font-size: 36rpx;
+    color: #333;
+    /* default text color */
+}
+
+/* Blue username text */
+.blue-text {
+    /* or any blue you prefer */
+    margin-right: 5rpx;
+}
+</style>
--- a/src/pages/business/CRM/marketActivity/detailForApproval.vue
+++ b/src/pages/business/CRM/marketActivity/detailForApproval.vue
@@ -0,0 +1,249 @@
+<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="report-list">
+                    <view class="title">{{ item.cusName }}</view>
+                    <view class="r-list">
+                        <view class="r-name">{{ item.visistCode }}</view>
+                    </view>
+                    <view class="border-bottom b-width"></view>
+                    <view class="r-list">
+                        <view class="r-left">报告人</view>
+                        <view class="r-right">{{ item.staffName }}</view>
+                    </view>
+                    <view class="border-bottom b-width"></view>
+                    <view class="r-list">
+                        <view class="r-left">走访日期</view>
+                        <view class="r-right">{{ item.visistDate }}</view>
+                    </view>
+                    <view class="border-bottom b-width"></view>
+                    <view class="r-list">
+                        <view class="r-left">是否双方高层领导参与</view>
+                        <view class="r-right">{{ item.whetherHaveLeader }}</view>
+                    </view>
+                    <view class="border-bottom b-width"></view>
+                    <view class="r-list">
+                        <view class="r-left">活动类型</view>
+                        <view class="r-right">{{ item.visistType }}</view>
+                    </view>
+                    <view class="border-bottom b-width"></view>
+                </view>
+            </view>
+
+            <!-- 报告明细&评论 -->
+            <customTabs v-model="activeTab" :tabs="tabList" :modelValue="activeTab">
+                <!-- 报告明细 -->
+                <block v-if="activeTab === 0">
+                    <view class="white-bg white-bg-2" v-for="item in detailList">
+                        <view class="report-list">
+                            <view class="r-list">
+                                <view class="r-left">拜访事项</view>
+                                <view class="r-right">{{ item.detailType }}</view>
+                            </view>
+                            <view class="border-bottom b-width"></view>
+                            <view class="r-list">
+                                <view class="r-left">拜访类型</view>
+                                <view class="r-right">{{ item.treeName }}</view>
+                            </view>
+                            <view class="border-bottom b-width"></view>
+                            <view class="r-list">
+                                <view class="r-left">客户人员</view>
+                                <view class="r-right">{{ item.customerPersonnel }}</view>
+                            </view>
+                            <view class="border-bottom b-width"></view>
+                            <view class="r-list">
+                                <view class="r-left">我方人员</view>
+                                <view class="r-right">{{ item.ourPersonnel }}</view>
+                            </view>
+                            <view class="border-bottom b-width"></view>
+                            <view class="r-list" style="display: block">
+                                <view class="r-name">结果</view>
+                                <view class="r-gray">
+                                    <view>
+                                        {{ item.bandResult }} </view>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </block>
+            </customTabs>
+
+
+            <view class="tipsPopBtn">
+                <view class="btnCancal" @click="refuse">驳回</view>
+                <!-- <view class="btnComfire" @click="refusePass">通过不得分</view> -->
+                <view class="btnComfire" @click="adopt(item)">通过</view>
+
+            </view>
+            <!-- 底部加高度来避免tabbar遮挡 -->
+            <view class="bottom-height"></view>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import customHeader from '@/components/customHeader.vue'
+import customTabs from '@/components/customTabs.vue';
+import { auditActivityReport, getVisistDetailList, getYsVisistInfo } from '../../../../api/crm/activity/activity';
+
+
+let visistId = ref(0)
+// 加载后调用
+let id = ref(null)
+onLoad((options) => {
+    visistId.value = options.visistId
+    getVisitorReportDetail();
+})
+
+
+// 查询详情
+let item = ref({});
+//明细List
+let detailList = ref([])
+const getVisitorReportDetail = async () => {
+    let param = {
+        visistId: visistId.value
+    }
+
+    let res = await getYsVisistInfo(param);
+    item.value = res.data;
+    let detailRes = await getVisistDetailList(param);
+    detailList.value = detailRes.rows;
+}
+
+// 报告明细&评论
+const activeTab = ref(0);//默认报告明细
+const tabList = ['报告明细'];
+
+//点击驳回
+function refuse() {
+    uni.navigateTo({
+        url: './auditReject?visistId=' + visistId.value
+    })
+}
+
+//点击通过
+function adopt(item) {
+    console.log(item.visistId,4123123)
+    uni.showModal({
+        title: '提交',
+        content: '是否要通过本报告？',
+        success: function (res) {
+            if (res.confirm) {
+                auditActivityReport({
+                    activityId: item.visistId,
+                    reportStaffName: item.staffName,
+                }).then(res => {
+                    if (res.code == 200) {
+                        // that.mescroll.resetUpScroll()
+                    } else {
+                        uni.showToast({
+                            icon: 'none',
+                            title: res.msg,
+                        });
+                    }
+                })
+            }
+        }
+
+    })
+}
+
+</script>
+
+<style scoped>
+.white-bg {
+    width: 690rpx;
+    margin: 0;
+    border-radius: 8px 8px 0 0;
+}
+
+.white-bg.white-bg-2 {
+    border-radius: 0;
+    margin-bottom: 20rpx;
+}
+
+:deep(.tabs-header) {
+    /* background: none !important; */
+    border-bottom: none !important;
+    margin: 0 auto;
+    gap: 5px;
+}
+
+:deep(.tab-item) {
+    color: #919191;
+    font-size: 32rpx;
+    font-weight: bold;
+    /* flex:none; */
+    /* margin: 0 -50rpx; */
+    /* padding: 0 50rpx; */
+}
+
+:deep(.tab-item:first-child) {
+    text-align: right;
+    margin-left: 230rpx;
+}
+
+:deep(.tab-item:last-child) {
+    text-align: left;
+    margin-right: 230rpx;
+}
+
+:deep(.tab-item.active) {
+    color: #3384DF;
+    font-weight: bold;
+}
+
+:deep(.tab-item.active::after) {
+    width: 100rpx;
+    height: 8rpx;
+}
+
+
+.tipsPopBtn {
+    width: 370px;
+    height: 80px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin: 50px auto 56px auto;
+    bottom: 0;
+    left: 0;
+}
+
+.btnCancal {
+    width: 100px;
+    height: 60px;
+    border: 2px solid #29abe2;
+    border-radius: 40px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: #29abe2;
+    font-size: 15px;
+
+}
+
+.btnComfire {
+    width: 100px;
+    height: 60px;
+    background-color: #29abe2;
+    border-radius: 40px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: #FFF;
+    font-size: 15px;
+}
+</style>
--- a/src/pages/business/CRM/marketActivity/myUserList.vue
+++ b/src/pages/business/CRM/marketActivity/myUserList.vue
@@ -0,0 +1,182 @@
+<template>
+    <view class="con-body">
+        <view>
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'走访报告添加我方参与人员'" :leftFlag="true" :rightFlag="false">
+            </customHeader>
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height"></view>
+            <uni-easyinput prefixIcon="search" v-model="searchContent" placeholder="请输入客户人员名称" clearable
+                @iconClick="iconClick">
+            </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"
+                            v-model="item.nickName"></checkbox>
+                        <view class="clientClass">
+                            <text class="blue-text">{{ item.nickName }}</text>
+                        </view>
+                    </view>
+                </checkbox-group>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import customHeader from '@/components/customHeader.vue'
+import {myUserNameList } from '../../../../api/crm/activity/activity'
+import { onMounted, onUnmounted, reactive, ref, watch } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { useMessage } from '../../../../utils/message'
+import cache from '../../../../utils/cache'
+
+
+
+const message = useMessage();
+
+//点击查询客户人员
+const queryParams = ref({
+    cusName: '',
+    nickName:'',
+    pageNum: 1,
+    pageSize: 10
+})
+
+onMounted(() => {
+    getMyUserNameList()
+})
+
+let chooseType = ref()
+onLoad(options => {
+    queryParams.value.cusName = options.cusName
+    chooseType.value = options.chooseType
+})
+const dataList = ref([])
+
+function getMyUserNameList() {
+    myUserNameList(queryParams.value).then(res => {
+        dataList.value = res.rows
+    })
+}
+
+
+//查询某一客户人员
+let searchContent = ref('')
+
+function iconClick() {
+    message.toast('点击了查询，当前内容：' + searchContent.value)
+}
+
+//监视查询的内容的变化
+watch(searchContent,(newValue,oldValue)=>{
+    queryParams.value.nickName = searchContent.value
+    //变化了之后，重新查询内容
+    myUserNameList(queryParams.value).then(res => {
+        dataList.value = res.rows
+    })
+})
+
+
+
+//勾选内容
+function checkboxChange(e) {
+    //这里要根据传递来的不同的内容，生成不同的setCache方法
+    if(chooseType.value=='日常走访'){
+        cache.set('checkedRCMyUserList', e.detail.value)
+    }
+        if(chooseType.value=='业务招待'){
+        cache.set('checkedYWMyUserList', e.detail.value)
+    }
+        if(chooseType.value=='技术交流'){
+        cache.set('checkedJSMyUserList', e.detail.value)
+    }
+        if(chooseType.value=='来厂参观'){
+        cache.set('checkedLCMyUserList', e.detail.value)
+    }
+        if(chooseType.value=='党建活动'){
+        cache.set('checkedDJMyUserList', e.detail.value)
+    }
+        if(chooseType.value=='文体活动'){
+        cache.set('checkedWTMyUserList', e.detail.value)
+    }
+        if(chooseType.value=='联谊活动'){
+        cache.set('checkedLYMyUserList', e.detail.value)
+    }
+}
+
+
+
+</script>
+
+<style scoped lang="scss">
+.con-body{
+    background: white;
+}
+
+.white-bg {
+    width: 690rpx;
+    margin: 0;
+    border-radius: 8px 8px 0 0;
+}
+
+.white-bg.white-bg-2 {
+    margin-bottom: 20rpx;
+}
+
+.white-bg.white-bg-3 {
+    border-radius: 0
+}
+
+.white-bg .w-b-title {
+    color: #3384DF;
+    font-size: 38rpx;
+}
+
+.form-con {
+    padding: 30rpx 0 0;
+}
+
+:deep(.form-con .uni-forms-item) {
+    margin-bottom: 22px !important;
+}
+
+
+/* Container for the checkbox group */
+.checkbox-group.block {
+    width: 100%;
+}
+
+/* Each item row */
+.itemClass {
+    width: 340rpx;
+    display: flex;
+    align-items: center;
+    padding: 10rpx 0;
+    margin-left: 15rpx;
+    border-bottom: 1px solid #eee;
+    float: left;
+    /* optional divider */
+}
+
+/* Checkbox styling */
+.checkBoxClass {
+    margin-right: 12rpx;
+}
+
+/* Content container */
+.clientClass {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    font-size: 36rpx;
+    color: #333;
+    /* default text color */
+}
+
+/* Blue username text */
+.blue-text {
+    /* or any blue you prefer */
+    margin-right: 5rpx;
+}
+</style>
--- a/src/pages/business/CRM/marketActivity/visitReport.vue
+++ b/src/pages/business/CRM/marketActivity/visitReport.vue
@@ -0,0 +1,368 @@
+<template>
+  <view class="con-body">
+    <view class="con-bg">
+      <!-- 头部 -->
+      <customHeader ref="customHeaderRef" :title="'走访报告列表'" :leftFlag="true" :rightFlag="true">
+        <template #right>
+          <view class="head-right" @click="handleAdd">
+            <uni-icons type="plus" size="24" color="#B7D2FF"></uni-icons>新增
+          </view>
+        </template>
+      </customHeader>
+
+      <!-- 高度来避免头部遮挡 -->
+      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+
+      <!-- 正文内容 -->
+      <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"
+                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff" v-model="searchValue" />
+          <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
+        </view>
+
+        <!-- 分页部分  -->
+        <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"
+                @touchstart.prevent="touchstart(item)" @touchend.prevent="touchend">
+            <view>
+              <view class="report-list">
+                <view class="title">客户：{{ item.cusName }}</view>
+                <view class="r-list">
+                  <view class="r-name">{{ item.visistCode }}</view>
+                  <view @touchstart.stop="handleStatusTouchStart"
+                        @touchend.stop="handleStatusTouchEnd" @click.stop="chooseStatus(item)">
+                    <view v-if="item.status == '驳回'" class="r-right btn-orange" size="mini">
+                      {{ item.status == '驳回' ? '再次提交' : item.status }}
+                    </view>
+                    <view v-else class="r-right btn-orange" size="mini">
+                      {{ item.status }}
+                    </view>
+                  </view>
+
+                </view>
+                <view class="border-bottom"></view>
+                <view class="r-list">
+                  <view class="r-left">报告类型</view>
+                  <view class="r-right">{{ item.visistType }}</view>
+                </view>
+                <view class="r-list" v-if="item.joinUser!=null">
+                  <view class="r-left">我方领导</view>
+                  <view class="r-right">{{ item.joinUser }}</view>
+                </view>
+                <view class="border-bottom"></view>
+                <view class="r-list">
+                  <view class="r-left">报告人</view>
+                  <view class="r-right">{{ item.staffName }}</view>
+                </view>
+                <view class="border-bottom"></view>
+                <view class="r-list">
+                  <view class="r-left">报告日期</view>
+                  <view class="r-right">{{ item.visistDate }}</view>
+                </view>
+
+              </view>
+            </view>
+          </view>
+        </mescroll-uni>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+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';
+
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+
+// 查询列表
+let list = ref([]);
+
+let searchValue = ref(null)
+
+//监视查询的内容的变化
+watch(searchValue, (newValue, oldValue) => {
+  //变化了之后，重新查询内容
+  var data = {
+    pageNum: 1,
+    pageSize: 10,
+    searchContent: searchValue.value
+  };
+  getYsVisistList(data).then(res => {
+    if (res.code == 200) {
+      //设置列表数据
+      list.value = res.rows;
+    }
+  })
+})
+
+
+// 查询搜索跳转
+let handleSearch = () => {
+  var data = {
+    pageNum: 1,
+    pageSize: 10,
+    searchContent: searchValue.value
+  };
+  getYsVisistList(data).then(res => {
+    if (res.code == 200) {
+      //设置列表数据
+      list.value = res.rows;
+    } else {
+      uni.showToast({
+        icon: 'none',
+        title: "请求失败",
+      });
+      list.value = null;
+    }
+
+  })
+  console.log(searchValue.value)
+}
+
+// 新增
+let handleAdd = () => {
+  uni.navigateTo({url: '/pages/business/CRM/marketActivity/visitorReportAdd'})
+}
+
+
+const mescrollRef = ref(null);
+const upOption = ref({
+  page: {num: 0, size: 10},
+  noMoreSize: 5,
+  empty: {tip: '~ 空空如也 ~'},
+  textLoading: '加载中...',
+  textNoMore: '已经到底了'
+});
+
+const downOption = ref({
+  auto: true,
+  textInOffset: '下拉刷新',
+  textOutOffset: '释放更新',
+  textLoading: '刷新中...'
+});
+
+let cssFlag = ref(false);//控制样式
+const mescrollInit = (mescroll) => {
+  cssFlag.value = true;
+  mescrollRef.value = mescroll;
+};
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+  try {
+    setTimeout(async () => {
+      const res = await getVisitorReportList(1, upOption.value.page.size);
+      cssFlag.value = false;
+      list.value = res.list;
+      mescroll.resetUpScroll();
+    }, 500);
+  } catch (error) {
+    mescroll.endErr();
+  } finally {
+    setTimeout(async () => {
+      mescroll.endSuccess();
+    }, 500);
+  }
+}
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+  try {
+    setTimeout(async () => {
+      const res = await getVisitorReportList(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();
+  }
+}
+
+// 获取数据列表
+const getVisitorReportList = (pageNum, pageSize) => {
+  return new Promise(async (resolve) => {
+    let param = {
+      pageNum,
+      pageSize
+    }
+    let res = await visitorReportList(param);
+    resolve({
+      list: res.rows,
+      total: res.total
+    });
+  });
+}
+
+
+let Loop = ref(0)
+let now
+const visistId = ref();
+const cusName = ref();
+const cusId = ref();
+const status = ref()
+
+function touchstart(item) {
+  visistId.value = item.visistId
+  cusName.value = item.cusName
+  cusId.value = item.cusId
+  status.value = item.status
+  now = new Date();
+  clearInterval(Loop.value); //再次清空定时器，防止重复注册定时器
+  Loop.value = setTimeout(() => {
+    uni.showModal({
+      title: '删除',
+      content: '请问要删除本条消息吗？',
+      success: (res) => {
+        if (res.confirm) {
+          const data = {
+            num: 1,
+            pageSize: 10,
+            status: "录入"
+          };
+          const parm = {
+            visistId: item.visistId
+          };
+          removeVisist(parm).then(res => {
+            if (res.code == 500) {
+              uni.showToast({
+                icon: 'none',
+                title: "存在明细项，不能直接删除！",
+              });
+            } else {
+              uni.showToast({
+                title: "删除成功",
+                duration: 2000
+              });
+            }
+            // 刷新内容
+            upCallback()
+          });
+        }
+      }
+    });
+  }, 750);
+
+}
+
+function touchend() {
+  let endDate = new Date();
+  console.log('结束时间', endDate)
+  let cha = endDate.getTime() - now.getTime();
+  console.log(cha, 'casd')
+  if (cha < 750) {
+    uni.navigateTo({
+      url: "/pages/business/CRM/marketActivity/visitorReportEnter?visistId=" + visistId.value + '&cusName=' + cusName.value + '&cusId=' + cusId.value + '&status=' + status.value
+    })
+  }
+  clearInterval(Loop.value);
+}
+
+//点击状态按钮
+function chooseStatus(item) {
+  updateStatus(item).then(
+      res => {
+        if (res.code == 200) {
+          uni.showToast({
+            title: '提交成功',
+            duration: 2000
+          });
+          setTimeout(function () {
+            uni.navigateBack({
+              success: () => {
+              }
+            })
+          }, 500);
+        } else {
+          uni.showToast({
+            title: res.msg,
+            icon: 'none',
+          });
+        }
+      },
+      rej => {
+      }
+  );
+}
+
+//保留点击状态，关闭长按的冒泡
+function handleStatusTouchStart(e) {
+  // e.stopPropagation(); // 阻止冒泡
+  // e.preventDefault();  // 阻止默认行为（如滚动）
+}
+
+function handleStatusTouchEnd(e) {
+  // e.stopPropagation();
+  // e.preventDefault();
+}
+
+</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 - 120px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  height: calc(100vh - 110px);
+  /* #endif */
+}
+
+.white-bg {
+  padding-bottom: 10rpx;
+}
+</style>
--- a/src/pages/business/CRM/marketActivity/visitReportDetail.vue
+++ b/src/pages/business/CRM/marketActivity/visitReportDetail.vue
@@ -0,0 +1,201 @@
+<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="report-list">
+                    <view class="title">{{ item.cusName }}</view>
+                    <view class="r-list">
+                        <view class="r-name">{{ item.visistCode }}</view>
+                        <view class="r-right btn-pink" size="mini" @click="handleZan">
+                            <uni-icons :type="iconType" size="16" color="#ffffff"></uni-icons>
+                            {{ zanFlag ? '已赞' : '未赞' }}
+                        </view>
+                    </view>
+                    <view class="border-bottom b-width"></view>
+                    <view class="r-list">
+                        <view class="r-left">报告人</view>
+                        <view class="r-right">{{ item.staffName }}</view>
+                    </view>
+                    <view class="border-bottom b-width"></view>
+                    <view class="r-list">
+                        <view class="r-left">走访日期</view>
+                        <view class="r-right">{{ item.visistDate }}</view>
+                    </view>
+                    <view class="border-bottom b-width"></view>
+                    <view class="r-list">
+                        <view class="r-left">是否双方高层领导参与</view>
+                        <view class="r-right">{{ item.whetherHaveLeader }}</view>
+                    </view>
+                    <view class="border-bottom b-width"></view>
+                    <view class="r-list">
+                        <view class="r-left">活动类型</view>
+                        <view class="r-right">{{ item.visistType }}</view>
+                    </view>
+                    <view class="border-bottom b-width"></view>
+                </view>
+            </view>
+
+            <!-- 报告明细&评论 -->
+            <customTabs v-model="activeTab" :tabs="tabList" :modelValue="activeTab">
+                <!-- 报告明细 -->
+                <block v-if="activeTab === 0">
+                    <view class="white-bg white-bg-2" v-for="item in detailList">
+                        <view class="report-list">
+                            <view class="r-list">
+                                <view class="r-left">拜访事项</view>
+                                <view class="r-right">{{item.detailType}}</view>
+                            </view>
+                            <view class="border-bottom b-width"></view>
+                            <view class="r-list">
+                                <view class="r-left">拜访类型</view>
+                                <view class="r-right">{{item.treeName}}</view>
+                            </view>
+                            <view class="border-bottom b-width"></view>
+                            <view class="r-list">
+                                <view class="r-left">客户人员</view>
+                                <view class="r-right">{{item.customerPersonnel}}</view>
+                            </view>
+                            <view class="border-bottom b-width"></view>
+                            <view class="r-list">
+                                <view class="r-left">我方人员</view>
+                                <view class="r-right">{{item.ourPersonnel}}</view>
+                            </view>
+                            <view class="border-bottom b-width"></view>
+                            <view class="r-list" style="display: block">
+                                <view class="r-name">结果</view>
+                                <view class="r-gray">
+                                    <view >
+                                        {{item.bandResult}} </view>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </block>
+                <!-- 评论 -->
+                <block v-if="activeTab === 1">
+                    <view class="white-bg white-bg-2">评论内容</view>
+                </block>
+            </customTabs>
+
+
+
+            <!-- 底部加高度来避免tabbar遮挡 -->
+            <view class="bottom-height"></view>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue'
+import { onLoad, onShow } from '@dcloudio/uni-app'
+import customHeader from '@/components/customHeader.vue'
+import customTabs from '@/components/customTabs.vue';
+import { getUserLike, getVisistDetailList, getYsVisistInfo, insertUserLike } from '../../../../api/crm/activity/activity';
+
+
+let visistId = ref(0)
+// 加载后调用
+let id = ref(null)
+onLoad((options) => {
+    visistId.value = options.visistId
+    getVisitorReportDetail();
+})
+
+onShow(()=>{
+    getUserLike(visistId.value).then(res=>{
+        zanFlag.value = res.rows[0]?.status==1?true:false
+        console.log(zanFlag.value,'点赞响应数据内容')
+     if(zanFlag.value==false){
+        iconType.value = 'hand-up'
+    }else{
+        //已赞
+        iconType.value = 'hand-up-filled'
+    }
+    })
+})
+
+// 查询详情
+let item = ref({});
+//明细List
+let detailList = ref([])
+const getVisitorReportDetail = async () => {
+    let param = {
+        visistId: visistId.value
+    }
+
+    let res = await getYsVisistInfo(param);
+    item.value = res.data;
+    let detailRes = await getVisistDetailList(param);
+    detailList.value = detailRes.rows;
+}
+
+// 报告明细&评论
+const activeTab = ref(0);//默认报告明细
+const tabList = ['报告明细', '评论'];
+
+// 点击赞
+let zanFlag = ref(false)
+let iconType = ref('hand-up')
+let handleZan = ()=>{
+    zanFlag.value = !zanFlag.value
+    if(zanFlag.value==false){
+        iconType.value = 'hand-up'
+    }else{
+        //已赞
+        iconType.value = 'hand-up-filled'
+    }
+     insertUserLike(visistId.value)
+}
+
+</script>
+
+<style scoped>
+.white-bg {
+    width: 690rpx;
+    margin: 0;
+    border-radius: 8px 8px 0 0;
+}
+.white-bg.white-bg-2{
+    border-radius:0;
+    margin-bottom:20rpx;
+}
+:deep(.tabs-header) {
+    /* background: none !important; */
+    border-bottom: none !important;
+    margin: 0 auto;
+    gap: 5px;
+}
+:deep(.tab-item) {
+    color:#919191;
+    font-size: 32rpx;
+    font-weight: bold;
+    /* flex:none; */
+    /* margin: 0 -50rpx; */
+    /* padding: 0 50rpx; */
+}
+:deep(.tab-item:first-child){
+    text-align: right;
+    margin-left:230rpx;
+}
+:deep(.tab-item:last-child){
+    text-align: left;
+    margin-right:230rpx;
+}
+:deep(.tab-item.active) {
+    color: #3384DF;
+    font-weight: bold;
+}
+:deep(.tab-item.active::after) {
+    width: 100rpx;
+    height: 8rpx;
+}
+
+</style>
--- a/src/pages/business/CRM/marketActivity/visitReportView.vue
+++ b/src/pages/business/CRM/marketActivity/visitReportView.vue
@@ -0,0 +1,217 @@
+<template>
+    <view class="con-body">
+        <view class="con-bg">
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'走访查看'" :leftFlag="true" :rightFlag="false"></customHeader>
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+
+            <!-- 正文内容 -->
+            <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"
+                        cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff" v-model="searchValue" />
+                    <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
+                </view>
+
+                <!-- 分页部分  -->
+                <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="showDetail(item)">
+                        <view>
+                            <view class="report-list">
+                                <view class="title">客户：{{ item.cusName }}</view>
+                                <view class="r-list">
+                                    <view class="r-name">{{ item.visistCode }}</view>
+                                    <view>
+
+                                        <view
+                                            :class="item.myselfBrowsing == 0 ? 'r-right btn-orange' : 'r-right btn-blue'"
+                                            size="mini">
+                                            {{ item.myselfBrowsing == 0 ? '未读' : '已读' }}
+                                        </view>
+                                    </view>
+
+                                </view>
+                                <view class="border-bottom"></view>
+                                <view class="r-list">
+                                    <view class="r-left">报告类型</view>
+                                    <view class="r-right">{{ item.visistType === "业务招待" ? "Ⅱ类活动" : "走访报告" }}</view>
+                                </view>
+                                <view class="r-list" v-if="item.joinUser != null">
+                                    <view class="r-left">我方领导</view>
+                                    <view class="r-right">{{ item.joinUser }}</view>
+                                </view>
+                                <view class="border-bottom"></view>
+                                <view class="r-list">
+                                    <view class="r-left">报告人</view>
+                                    <view class="r-right">{{ item.staffName }}</view>
+                                </view>
+                                <view class="border-bottom"></view>
+                                <view class="r-list">
+                                    <view class="r-left">报告日期</view>
+                                    <view class="r-right">{{ item.visistDate }}</view>
+                                </view>
+
+                            </view>
+                        </view>
+                    </view>
+                </mescroll-uni>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import customHeader from '@/components/customHeader.vue'
+import { ref, reactive, onMounted } from 'vue'
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import { getNavBarPaddingTop } from '@/utils/system.js'
+import { getQueryVisistList } from '../../../../api/crm/activity/activity';
+
+
+let list = ref([])
+let queryParams = reactive({
+    selValue: ''
+})
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+
+let cssFlag = ref(false);//控制样式
+let mescrollRef = ref(null);
+
+const mescrollInit = (mescroll) => {
+    cssFlag.value = true;
+    mescrollRef.value = mescroll;
+};
+
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+    try {
+        setTimeout(async () => {
+            queryParams.pageNum = 1;
+            queryParams.pageSize = upOption.value.page.size;
+            //获取当前页的信息
+            const res = await getQueryVisistList(queryParams)
+            cssFlag.value = false;
+            list.value = res.rows;
+            mescroll.resetUpScroll();
+        }, 500);
+    } catch (error) {
+        mescroll.endErr();
+    } finally {
+        setTimeout(async () => {
+            mescroll.endSuccess();
+        }, 500);
+    }
+}
+
+
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+    try {
+        setTimeout(async () => {
+            // const res = await getVisitorReportList(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();
+    }
+}
+
+const upOption = ref({
+    page: { num: 0, size: 10 },
+    noMoreSize: 5,
+    empty: { tip: '~ 空空如也 ~' },
+    textLoading: '加载中...',
+    textNoMore: '已经到底了'
+});
+
+const downOption = ref({
+    auto: true,
+    textInOffset: '下拉刷新',
+    textOutOffset: '释放更新',
+    textLoading: '刷新中...'
+});
+
+//点击某一个进入查看明细信息
+function showDetail(item) {
+    uni.navigateTo({
+        url: './visitReportDetail?visistId=' + item.visistId
+    })
+}
+
+//点击查询方法，搜索当前报告信息
+let searchValue = ref()
+function handleSearch() {
+    queryParams.inputval = searchValue.value
+    downCallback(mescrollRef.value.mescroll);
+}
+
+</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 - 120px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 110px);
+    /* #endif */
+}
+
+.white-bg {
+    padding-bottom: 10rpx;
+}
+</style>
--- a/src/pages/business/CRM/marketActivity/visitorReportAdd.vue
+++ b/src/pages/business/CRM/marketActivity/visitorReportAdd.vue
@@ -0,0 +1,350 @@
+<template>
+    <view class="con-body">
+        <view class="con-bg">
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'走访报告添加'" :leftFlag="true" :rightFlag="true">
+                <template #right>
+                    <view class="head-right" @click="submitForm">
+                        <uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
+                            color="#B7D2FF"></uni-icons>保存
+                    </view>
+                </template>
+            </customHeader>
+
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height"></view>
+
+            <!-- 正文内容 -->
+            <view class="white-bg">
+                <view class="form-con">
+                    <uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px">
+                        <view @click="addVisistReport" class="form-item-container">
+                            <uni-forms-item label="客户名称" name="cusName" class="f-c-right">
+                                <text class="name">{{ formData.cusName }}</text>
+                            </uni-forms-item>
+                        </view>
+
+                        <uni-forms-item label="签到记录" class="f-c-right">
+                            <!-- <view class="f-c-text txt-right">--</view> -->
+                            <view class="cu-form-group">
+                                <view class="title">签到记录</view>
+                            </view>
+                        </uni-forms-item>
+
+                        <view class="choose">
+                            <radio-group @change="chooseRecord">
+                                <label class="radio" v-for="(item, index) in records" :key="index">
+                                    <view class="record-container">
+                                        <radio :value="item.mapId" :checked="index === current" class="radio-style" />
+                                        <view class="record-content">
+                                            <view class="info-row">
+                                                <text class="label">开始时间：</text>
+                                                <text class="value">{{ item.goVisistStartTime }}</text>
+                                            </view>
+                                            <view class="info-row">
+                                                <text class="label">开始地点：</text>
+                                                <text class="value">{{ item.addressForStart }}</text>
+                                            </view>
+                                            <view class="info-row">
+                                                <text class="label">结束时间：</text>
+                                                <text class="value">{{ item.goVisistEndTime }}</text>
+                                            </view>
+                                            <view class="info-row">
+                                                <text class="label">结束地点：</text>
+                                                <text class="value">{{ item.addressForEnd }}</text>
+                                            </view>
+                                            <view class="info-row" v-if="item.remark != null">
+                                                <text class="label">备注：</text>
+                                                <text class="value">{{ item.remark }}</text>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </label>
+                            </radio-group>
+                        </view>
+
+
+
+                        <uni-forms-item label="我方领导" name="leader" required
+                            class="uni-forms-item is-direction-top is-top">
+
+                            <multipleSelect :multiple="true" :value="chooseMyLeaderList" downInner
+                                :options="myLeaderList" @change="changeValue2" :key="Math.round()" :slabel="'text'">
+                            </multipleSelect>
+                            <!--                            <uni-easyinput v-model="formData.leader" placeholder="请输入我方领导" />-->
+
+                        </uni-forms-item>
+
+
+                        <uni-forms-item label="走访日期" name="visitDate" class="uni-forms-item is-direction-top is-top">
+                            <uni-datetime-picker :start="threeDaysAgoTimestamp" :end="todayTimestamp" type="date"
+                                :clear-icon="true" v-model="formData.visitDate" @change="changeDate" />
+                        </uni-forms-item>
+                    </uni-forms>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { ref, onMounted, reactive, onUnmounted, computed } from 'vue'
+import customHeader from '@/components/customHeader.vue'
+import MultipleSelect from "../../../../components/multipleSelect.vue";
+import { addMapForReport, addVisist } from '../../../../api/crm/activity/activity';
+// import{ getGuestList} from '@/api/business.js'
+let customerUser = reactive({})
+
+//我方领导
+const myLeaderList = [
+    { value: 0, text: "姜海洋" },
+    { value: 1, text: "曾炀" },
+    { value: 2, text: "杨博" },
+    { value: 3, text: "廖明君" },
+    { value: 4, text: "唐海岩" },
+    { value: 4, text: "赵飞" }
+];
+// 表单ref
+const formRef = ref(null);
+
+// 表单数据
+const formData = ref({
+    cusId: null,
+    cusName: '',
+    leader: '',
+    visitDate: ''
+});
+
+// 我方人员
+let chooseMyLeaderList = reactive([0]);
+const changeValue2 = (item, value) => {
+    console.log("我方领导", item, value);
+    chooseMyLeaderList = item;
+    formData.value.leader = chooseMyLeaderList
+};
+
+// 验证规则
+const rules = {
+    leader: {
+        rules: [
+            { required: true, errorMessage: '我方领导不能为空' }
+        ]
+    }
+};
+
+// 修改日期
+let changeDate = (e) => {
+    console.log('changeDate:', e);
+};
+
+// 保存走访报告
+let saveVisistReportForm = reactive({});
+const submitForm = async () => {
+    try {
+        // 验证表单
+        console.log(formRef.value, '表单验证数据')
+        await formRef.value.validate();
+        // 验证通过后的操作
+        uni.showToast({
+            title: '验证通过',
+            icon: 'success'
+        });
+        saveVisistReportForm.cusId = formData.value.cusId
+        saveVisistReportForm.joinUser = formData.value.leader.map(item => item.text).join(',')
+        saveVisistReportForm.visistDate = formData.value.visitDate
+        saveVisistReportForm.visistType = 'I类活动（走访）'
+        saveVisistReportForm.mapId = mapId.value
+        addVisist(saveVisistReportForm).then(
+            res => {
+                if (res.code == 200) {
+                    uni.showToast({
+                        title: '提交成功',
+                        duration: 2000
+                    });
+                    setTimeout(function () {
+                        uni.navigateBack({
+                            success: () => { }
+                        })
+                    }, 500);
+                } else {
+                    uni.showToast({
+                        title: res.msg,
+                        icon: 'none',
+                    });
+                }
+            },
+        );
+
+    } catch (err) {
+        console.log('表单验证失败:', err);
+    }
+};
+
+//日期禁用
+const todayTimestamp = computed(() => {
+    const today = new Date()
+    today.setHours(0, 0, 0, 0)
+    return today.getTime()
+});
+
+const threeDaysAgoTimestamp = computed(() => {
+    const date = new Date()
+    date.setDate(date.getDate() - 3)
+    date.setHours(0, 0, 0, 0)
+    return date.getTime()
+});
+
+
+//选择客户
+function addVisistReport() {
+    uni.navigateTo({
+        url: './chooseCus'
+    })
+}
+//定义数据接收的值
+let selectedCustomer = reactive(null)
+
+//监听时间
+onMounted(() => {
+    uni.$on('onCustomerSelected', handleCustomerSelected)
+})
+//取消监听
+onUnmounted(() => {
+    uni.$off('onCustomerSelected', handleCustomerSelected)
+})
+
+//处理 接收数据
+const handleCustomerSelected = (data) => {
+    formData.value.cusName = data.cusName
+    formData.value.cusId = data.cusId
+    console.log("收到客户数据的值：", customerUser)
+}
+
+//查询签到记录
+onMounted(() => {
+    recordList()
+})
+let records = ref([])
+//走访记录列表
+function recordList() {
+    addMapForReport().then(
+        res => {
+            if (res.code == 200) {
+                records.value = res.rows;
+                // that.$forceUpdate()
+            } else {
+                uni.showToast({
+                    icon: 'none',
+                    title: "请求失败",
+                });
+            }
+        },
+        rej => { }
+    );
+}
+
+//选择签到记录
+let mapId = ref()
+function chooseRecord(e) {
+    mapId.value = e.detail.value
+}
+
+
+</script>
+
+<style scoped>
+.white-bg {
+    width: 750rpx;
+    padding: 30rpx 0 0;
+    margin-bottom: 0;
+    border-radius: 8px 8px 0 0;
+}
+
+.form-con {
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 100px)
+        /* #endif */
+        /* #ifndef APP-PLUS */
+        /* #endif */
+}
+
+:deep(.uni-date-x) {
+    display: block;
+}
+
+:deep(.uni-date-x .icon-calendar) {
+    float: right;
+    margin-top: 15rpx;
+    margin-right: 20rpx;
+    background: url('../../../static/images/business/icon-date.png') no-repeat;
+    background-size: 32rpx 35rpx;
+    width: 32rpx;
+    height: 35rpx;
+}
+
+:deep(.uni-date-x .icon-calendar::before) {
+    display: none;
+}
+
+:deep(.uni-date-x .uni-date__x-input) {
+    padding-left: 20rpx;
+    color: #919191;
+}
+
+.form-item-container .uni-forms-item {
+    display: flex;
+    align-items: center;
+    /* 垂直居中 */
+}
+
+/* 确保 text 元素也垂直居中 */
+.form-item-container .name {
+    line-height: normal;
+    /* 避免 line-height 影响 */
+    display: flex;
+    align-items: center;
+}
+
+/*======*/
+.choose {
+    padding: 20rpx;
+}
+
+.record-container {
+    display: flex;
+    align-items: flex-start;
+    padding: 20rpx;
+    margin-bottom: 20rpx;
+    background-color: #f8f8f8;
+    border-radius: 12rpx;
+    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
+}
+
+.radio-style {
+    margin-right: 20rpx;
+    margin-top: 8rpx;
+}
+
+.record-content {
+    flex: 1;
+}
+
+.info-row {
+    display: flex;
+    margin-bottom: 10rpx;
+    line-height: 1.4;
+}
+
+.label {
+    width: 160rpx;
+    font-weight: bold;
+    color: #333;
+    flex-shrink: 0;
+}
+
+.value {
+    flex: 1;
+    color: #666;
+    word-break: break-all;
+}
+</style>
--- a/src/pages/business/CRM/marketActivity/visitorReportEnter.vue
+++ b/src/pages/business/CRM/marketActivity/visitorReportEnter.vue
@@ -0,0 +1,338 @@
+<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 white-bg-2">
+                <view class="w-b-title" @click="handleExpandRC">日常走访
+                    <text>
+                        {{ expandFlagRC ? '展开' : '收起' }}
+                        <i :class="{ iconfont: true, 'icon-up': !expandFlagRC, 'icon-down': expandFlagRC }"></i>
+                    </text>
+                </view>
+                <view v-show="!expandFlagRC" class="form-con">
+                    <DailyVisitComponent :cusName="cusName" :cusId="cusId" :visistId="visistId" :status="status"
+                        ref="dailyVisitComponentRef"></DailyVisitComponent>
+                </view>
+
+            </view>
+
+            <!-- 业务招待 -->
+            <view class="white-bg white-bg-2 white-bg-3">
+                <view class="w-b-title" @click="handleExpandYW">业务招待
+                    <text>
+                        {{ expandFlagYW ? '展开' : '收起' }}
+                        <i :class="{ iconfont: true, 'icon-up': !expandFlagYW, 'icon-down': expandFlagYW }"></i>
+                    </text>
+                </view>
+                <view v-show="!expandFlagYW" class="form-con">
+                    <YwVisistComponent :cusName="cusName" :cusId="cusId" :visistId="visistId" :status="status" ref="ywVisitComponentRef">
+                    </YwVisistComponent>
+                </view>
+            </view>
+
+            <!-- 技术交流 -->
+            <view class="white-bg white-bg-2 white-bg-3">
+                <view class="w-b-title" @click="handleExpandJS">技术交流
+                    <text>
+                        {{ expandFlagJS ? '展开' : '收起' }}
+                        <i :class="{ iconfont: true, 'icon-up': !expandFlagJS, 'icon-down': expandFlagJS }"></i>
+                    </text>
+                </view>
+                <view v-show="!expandFlagJS" class="form-con">
+                    <JsVisistComponent :cusName="cusName" :cusId="cusId" :visistId="visistId" :status="status" ref="jsVisitComponentRef">
+                    </JsVisistComponent>
+                </view>
+            </view>
+
+
+            <!-- 来厂参观 -->
+            <view class="white-bg white-bg-2 white-bg-3">
+                <view class="w-b-title" @click="handleExpandLC">来厂参观
+                    <text>
+                        {{ expandFlagLC ? '展开' : '收起' }}
+                        <i :class="{ iconfont: true, 'icon-up': !expandFlagLC, 'icon-down': expandFlagLC }"></i>
+                    </text>
+                </view>
+                <view v-show="!expandFlagLC" class="form-con">
+                    <LcVisistComponent :cusName="cusName" :cusId="cusId" :visistId="visistId" :status="status" ref="lcVisitComponentRef">
+                    </LcVisistComponent>
+                </view>
+            </view>
+
+
+            <!-- 党建活动 -->
+            <view class="white-bg white-bg-2 white-bg-3">
+                <view class="w-b-title" @click="handleExpandDJ">党建活动
+                    <text>
+                        {{ expandFlagDJ ? '展开' : '收起' }}
+                        <i :class="{ iconfont: true, 'icon-up': !expandFlagDJ, 'icon-down': expandFlagDJ }"></i>
+                    </text>
+                </view>
+                <view v-show="!expandFlagDJ" class="form-con">
+                    <DjVisistComponent :cusName="cusName" :cusId="cusId" :visistId="visistId" :status="status" ref="djVisitComponentRef">
+                    </DjVisistComponent>
+                </view>
+            </view>
+
+            <!-- 文体活动 -->
+            <view class="white-bg white-bg-2 white-bg-3">
+                <view class="w-b-title" @click="handleExpandWT">文体活动
+                    <text>
+                        {{ expandFlagWT ? '展开' : '收起' }}
+                        <i :class="{ iconfont: true, 'icon-up': !expandFlagWT, 'icon-down': expandFlagWT }"></i>
+                    </text>
+                </view>
+                <view v-show="!expandFlagWT" class="form-con">
+                    <WTVisistComponent :cusName="cusName" :cusId="cusId" :visistId="visistId" :status="status" ref="wtVisitComponentRef">
+                    </WTVisistComponent>
+                </view>
+            </view>
+
+
+            <!-- 联谊活动 -->
+            <view class="white-bg white-bg-2 white-bg-3">
+                <view class="w-b-title" @click="handleExpandLY">联谊活动
+                    <text>
+                        {{ expandFlagLY ? '展开' : '收起' }}
+                        <i :class="{ iconfont: true, 'icon-up': !expandFlagLY, 'icon-down': expandFlagLY }"></i>
+                    </text>
+                </view>
+                <view v-show="!expandFlagLY" class="form-con">
+                    <LyVisistComponent :cusName="cusName" :cusId="cusId" :visistId="visistId" :status="status" ref="lyVisitComponentRef">
+                    </LyVisistComponent>
+                </view>
+            </view>
+
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { ref, reactive, onUnmounted } from 'vue'
+import customHeader from '@/components/customHeader.vue'
+import DailyVisitComponent from './components/dailyVisitComponent.vue';
+import { onLoad } from '@dcloudio/uni-app';
+import cache from '../../../../utils/cache';
+import YwVisistComponent from './components/ywVisistComponent.vue';
+import JsVisistComponent from './components/jsVisistComponent.vue';
+import LcVisistComponent from './components/lcVisistComponent.vue';
+import DjVisistComponent from './components/djVisistComponent.vue';
+import WTVisistComponent from './components/wtVisistComponent.vue';
+import LyVisistComponent from './components/lyVisistComponent.vue';
+
+const cusName = ref()
+const cusId = ref()
+const visistId = ref()
+const status = ref()
+onLoad(options => {
+    cusName.value = options.cusName
+    cusId.value = options.cusId
+    visistId.value = options.visistId
+    status.value = options.status
+})
+
+// 日常走访
+const dailyVisitComponentRef = ref(null)
+let expandFlagRC = ref(true);
+let handleExpandRC = () => {
+    expandFlagRC.value = !expandFlagRC.value;
+    if (expandFlagRC.value) {
+        //收缩的时候，删除内容
+        dailyVisitComponentRef.value.handleDelete()
+    } else {
+        //展开的时候，查询内容
+        if (dailyVisitComponentRef.value) {
+            dailyVisitComponentRef.value.getRCVisitReportDetailContent()
+        }
+    }
+}
+
+// 业务招待
+const ywVisitComponentRef = ref(null)
+let expandFlagYW = ref(true);
+let handleExpandYW = () => {
+    expandFlagYW.value = !expandFlagYW.value;
+    if (expandFlagYW.value) {
+        //收缩的时候，删除内容
+        ywVisitComponentRef.value.handleDelete()
+    } else {
+        //展开的时候，查询内容
+        if (ywVisitComponentRef.value) {
+            ywVisitComponentRef.value.getYWVisitReportDetailContent()
+        }
+    }
+}
+
+// 技术交流
+const jsVisitComponentRef = ref(null)
+let expandFlagJS = ref(true);
+let handleExpandJS = () => {
+    expandFlagJS.value = !expandFlagJS.value;
+    if (expandFlagJS.value) {
+        //收缩的时候，删除内容
+        jsVisitComponentRef.value.handleDelete()
+    } else {
+        //展开的时候，查询内容
+        if (jsVisitComponentRef.value) {
+            jsVisitComponentRef.value.getJSVisitReportDetailContent()
+        }
+    }
+}
+
+// 来厂参观
+const lcVisitComponentRef = ref(null)
+let expandFlagLC = ref(true);
+let handleExpandLC = () => {
+    expandFlagLC.value = !expandFlagLC.value;
+    if (expandFlagLC.value) {
+        //收缩的时候，删除内容
+        lcVisitComponentRef.value.handleDelete()
+    } else {
+        //展开的时候，查询内容
+        if (lcVisitComponentRef.value) {
+            lcVisitComponentRef.value.getLCVisitReportDetailContent()
+        }
+    }
+}
+
+// 党建活动
+const djVisitComponentRef = ref(null)
+let expandFlagDJ = ref(true);
+let handleExpandDJ = () => {
+    expandFlagDJ.value = !expandFlagDJ.value;
+    if (expandFlagDJ.value) {
+        //收缩的时候，删除内容
+        djVisitComponentRef.value.handleDelete()
+    } else {
+        //展开的时候，查询内容
+        if (djVisitComponentRef.value) {
+            djVisitComponentRef.value.getDJVisitReportDetailContent()
+        }
+    }
+}
+
+// 文体活动
+const wtVisitComponentRef = ref(null)
+let expandFlagWT = ref(true);
+let handleExpandWT = () => {
+    expandFlagWT.value = !expandFlagWT.value;
+    if (expandFlagWT.value) {
+        //收缩的时候，删除内容
+        wtVisitComponentRef.value.handleDelete()
+    } else {
+        //展开的时候，查询内容
+        if (wtVisitComponentRef.value) {
+            wtVisitComponentRef.value.getWTVisitReportDetailContent()
+        }
+    }
+}
+
+// 联谊活动
+const lyVisitComponentRef = ref(null)
+let expandFlagLY = ref(true);
+let handleExpandLY = () => {
+    expandFlagLY.value = !expandFlagLY.value;
+    if (expandFlagLY.value) {
+        //收缩的时候，删除内容
+        lyVisitComponentRef.value.handleDelete()
+    } else {
+        //展开的时候，查询内容
+        if (lyVisitComponentRef.value) {
+            lyVisitComponentRef.value.getLYVisitReportDetailContent()
+        }
+    }
+}
+
+//离开页面时，删除local缓存
+onUnmounted(() => {
+    removeRCCache();
+    removeYWCache();
+    removeJSCache();
+    removeLCCache();
+    removeDJCache();
+    removeWTCache();
+    removeLYCache();
+})
+
+//删除日常缓存
+function removeRCCache() {
+    cache.remove('checkedRCClientList');
+    cache.remove('checkedRCMyUserList');
+    cache.remove('checkedRCActivityTypeList')
+}
+
+//删除业务缓存
+function removeYWCache() {
+    cache.remove('checkedYWClientList');
+    cache.remove('checkedYWMyUserList');
+}
+
+//删除技术缓存
+function removeJSCache() {
+    cache.remove('checkedJSClientList');
+    cache.remove('checkedJSMyUserList');
+}
+
+//删除来厂缓存
+function removeLCCache() {
+    cache.remove('checkedLCClientList');
+    cache.remove('checkedLCMyUserList');
+}
+
+//删除党建缓存
+function removeDJCache() {
+    cache.remove('checkedDJClientList');
+    cache.remove('checkedDJMyUserList');
+}
+
+//删除文体缓存
+function removeWTCache() {
+    cache.remove('checkedWTClientList');
+    cache.remove('checkedWTMyUserList');
+}
+
+//删除联谊缓存
+function removeLYCache() {
+    cache.remove('checkedLYClientList');
+    cache.remove('checkedLYMyUserList');
+}
+
+
+
+
+</script>
+
+<style scoped>
+.white-bg {
+    width: 690rpx;
+    margin: 0;
+    border-radius: 8px 8px 0 0;
+}
+
+.white-bg.white-bg-2 {
+    margin-bottom: 20rpx;
+}
+
+.white-bg.white-bg-3 {
+    border-radius: 0
+}
+
+.white-bg .w-b-title {
+    color: #3384DF;
+    font-size: 38rpx;
+}
+
+.form-con {
+    padding: 30rpx 0 0;
+}
+
+:deep(.form-con .uni-forms-item) {
+    margin-bottom: 22px !important;
+}
+</style>
--- 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/beCurrent.vue
+++ b/src/pages/business/CRM/marketInformation/beCurrent.vue
@@ -0,0 +1,233 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'通用表单添加'" :leftFlag="true" :rightFlag="true">
+				<template #right>
+					<view class="head-right" @click="submitForm">
+						<uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
+							color="#B7D2FF"></uni-icons>保存
+					</view>
+				</template>
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 正文内容 -->
+			<view class="white-bg">
+				<view class="form-con">
+					<uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px">
+						<uni-forms-item label="客户名称" name="cusName" class="f-c-right">
+							<view @click="chooseCustomer" class="form-item-container">
+								<text class="name">{{ formData.cusName || '点击选择客户' }}</text>
+							</view>
+						</uni-forms-item>
+						<uni-forms-item label="通用表单类型" name="generalFormType" class="f-c-right">
+							<picker @change="onGeneralFormTypeChange" :value="generalFormTypeIndex" :range="array"
+								:range-key="'name'">
+								<view class="picker">
+									{{ array[generalFormTypeIndex]?.name || '请选择通用表单类型' }}
+									<uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+								</view>
+							</picker>
+						</uni-forms-item>
+					
+						<uni-forms-item label="信息内容" name="informationContent" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.informationContent"
+								placeholder="请输入信息内容" class="form-texarea" />
+						</uni-forms-item>
+					</uni-forms>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		reactive,
+		onUnmounted,
+		computed
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import {
+		getGuestList
+	} from '@/api/business.js'
+	import {
+		isEmpty
+	} from '@/utils/validate.js'
+	import {
+		crmMarketInformationAdd
+	} from '@/api/crm/api_ys.js'
+
+
+	let customerUser = reactive({})
+	// 客户相关
+	const guestList = ref([])
+	const guestArr = ref([])
+	const guestIndex = ref(0)
+
+	// 表单数据
+	const formData = ref({
+					cusId: null,
+					cusName: null,
+					generalFormType:"专项市场调研信息",//通用表单类型
+					informationContent: "", //信息内容
+					picture: "", //、图片
+					photos: null,
+					description: null,
+					informationType:"通用表单" //信息类型
+				})
+
+	// 表单验证规则
+	const rules = {
+		cusName: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择客户'
+			}]
+		},
+		generalFormType: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择通用表单类型'
+			}]
+		},
+		informationContent: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入信息内容'
+			}]
+		},
+	}
+	const imgList = ref([])
+
+	// picker 相关
+	const index = ref(0)
+	const array = ref([{
+						id: 0,
+						name: '专项市场调研信息'
+					},
+					{
+						id: 1,
+						name: '供货改进需求信息'
+					},
+					{
+						id: 2,
+						name: '客户赞扬、抱怨信息'
+					},
+					{
+						id: 3,
+						name: '领导承诺'
+					},
+					{
+						id: 4,
+						name: '待办事项'
+					},
+					{
+						id: 5,
+						name: '备忘录'
+					}
+
+	])
+
+	const generalFormTypeIndex = ref(0)
+
+	// 表单引用 & 客户选择器引用
+	const formRef = ref(null)
+	const customHeaderRef = ref(null)
+	// 选择客户页面跳转
+	function chooseCustomer() {
+		uni.navigateTo({
+			url: '/pages/business/CRM/chooseCus'
+		})
+	}
+	//定义数据接收的值
+	let selectedCustomer = reactive(null)
+
+	//监听时间
+	onMounted(() => {
+		uni.$on('onCustomerSelected', handleCustomerSelected)
+	})
+	//取消监听
+	onUnmounted(() => {
+		uni.$off('onCustomerSelected', handleCustomerSelected)
+	})
+
+	//处理 接收数据
+	const handleCustomerSelected = (data) => {
+		formData.value.cusName = data.cusName
+		formData.value.cusId = data.cusId
+	}
+	// 提交表单
+	const submitForm = async () => {
+		try {
+			// 表单校验
+			await formRef.value.validate()
+			const res = await crmMarketInformationAdd(formData.value);
+			console.log(res)
+			uni.showToast({
+				title: '提交成功',
+				icon: 'success'
+			})
+			console.log('表单数据:', formData.value)
+		} catch (err) {
+			console.log('表单验证失败:', err)
+		}
+	}
+
+	const onGeneralFormTypeChange = (e) => {
+		generalFormTypeIndex.value = e.detail.value
+		console.log('generalFormTypeIndex:', array.value[e.detail.value]?.name)
+		formData.value.generalFormType = array.value[e.detail.value]?.name || ''
+	}
+	// 如果你原来在 onShow 中做了类似这样：
+	// let res = currPage.data.cusData; 判断是否传入了客户信息
+	// 那么在 Vue3 中通常是通过路由参数或者 Vuex/Pinia 等状态管理获取
+	// 暂时不做，如你后续需要可继续补充
+</script>
+
+<style scoped>
+	.white-bg {
+		width: 750rpx;
+		padding: 30rpx 0 0;
+		margin-bottom: 0;
+		border-radius: 8px 8px 0 0;
+	}
+
+	.form-con {
+		/* #ifdef APP-PLUS */
+		height: calc(120vh - 100px)
+			/* #endif */
+			/* #ifndef APP-PLUS */
+			height:calc(120vh - 80px)
+			/* #endif */
+	}
+
+	:deep(.uni-date-x) {
+		display: block;
+	}
+
+	:deep(.uni-date-x .icon-calendar) {
+		float: right;
+		margin-top: 15rpx;
+		margin-right: 20rpx;
+		background: url('../../../static/images/business/icon-date.png') no-repeat;
+		background-size: 32rpx 35rpx;
+		width: 32rpx;
+		height: 35rpx;
+	}
+
+	:deep(.uni-date-x .icon-calendar::before) {
+		display: none;
+	}
+
+	:deep(.uni-date-x .uni-date__x-input) {
+		padding-left: 20rpx;
+		color: #919191;
+	}
+</style>
--- a/src/pages/business/CRM/marketInformation/beCurrentDetail.vue
+++ b/src/pages/business/CRM/marketInformation/beCurrentDetail.vue
@@ -0,0 +1,268 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'通用表单添加'" :leftFlag="true" :rightFlag="true">
+				<template #right>
+					<view class="head-right" @click="submitForm">
+						<uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
+							color="#B7D2FF"></uni-icons>保存
+					</view>
+				</template>
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 正文内容 -->
+			<view class="white-bg">
+				<view class="form-con">
+					<uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px">
+						<uni-forms-item label="客户名称" name="cusName" class="f-c-right">
+							<view @click="chooseCustomer" class="form-item-container">
+								<text class="name">{{ formData.cusName || '点击选择客户' }}</text>
+							</view>
+						</uni-forms-item>
+						<uni-forms-item label="通用表单类型" name="generalFormType" class="f-c-right">
+							<picker @change="onGeneralFormTypeChange" :value="generalFormTypeIndex" :range="array"
+								:range-key="'name'">
+								<view class="picker">
+									{{ array[generalFormTypeIndex]?.name || '请选择通用表单类型' }}
+									<uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+								</view>
+							</picker>
+						</uni-forms-item>
+					
+						<uni-forms-item label="信息内容" name="informationContent" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.informationContent"
+								placeholder="请输入信息内容" class="form-texarea" />
+						</uni-forms-item>
+					</uni-forms>
+					<view class="footer-con">
+					    <button class="btn-default" type="default" @click="handleDelete" size="mini">删 除</button>
+					    <button class="btn-primary" type="primary" @click="submitForm" size="mini">保存/修改</button>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		reactive,
+		onUnmounted,
+		computed
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import {
+		getGuestList
+	} from '@/api/business.js'
+	import {
+		isEmpty
+	} from '@/utils/validate.js'
+	import {
+		crmMarketInformationAdd,crminformationItemForDetail,crmMarketInformationDelete
+	} from '@/api/crm/api_ys.js'
+	import { onLoad } from '@dcloudio/uni-app'
+	import { useMessage } from '@/utils/message.js'
+	import cache from '@/utils/cache.js'
+	let customerUser = reactive({})
+	// 客户相关
+	const guestList = ref([])
+	const guestArr = ref([])
+	const guestIndex = ref(0)
+
+	// 表单数据
+	const formData = ref({
+					cusId: null,
+					cusName: null,
+					generalFormType:"专项市场调研信息",//通用表单类型
+					informationContent: "", //信息内容
+					picture: "", //、图片
+					photos: null,
+					description: null,
+					informationType:"通用表单" //信息类型
+				})
+
+	// 表单验证规则
+	const rules = {
+		cusName: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择客户'
+			}]
+		},
+		generalFormType: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择通用表单类型'
+			}]
+		},
+		informationContent: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入信息内容'
+			}]
+		},
+	}
+	const imgList = ref([])
+
+	// picker 相关
+	const index = ref(0)
+	const array = ref([{
+						id: 0,
+						name: '专项市场调研信息'
+					},
+					{
+						id: 1,
+						name: '供货改进需求信息'
+					},
+					{
+						id: 2,
+						name: '客户赞扬、抱怨信息'
+					},
+					{
+						id: 3,
+						name: '领导承诺'
+					},
+					{
+						id: 4,
+						name: '待办事项'
+					},
+					{
+						id: 5,
+						name: '备忘录'
+					}
+
+	])
+
+	const generalFormTypeIndex = ref(0)
+
+	// 表单引用 & 客户选择器引用
+	const formRef = ref(null)
+	const customHeaderRef = ref(null)
+	// 选择客户页面跳转
+	function chooseCustomer() {
+		uni.navigateTo({
+			url: '/pages/business/CRM/chooseCus'
+		})
+	}
+	//定义数据接收的值
+	let selectedCustomer = reactive(null)
+
+	//监听时间
+	onMounted(() => {
+		uni.$on('onCustomerSelected', handleCustomerSelected)
+	})
+	//取消监听
+	onUnmounted(() => {
+		uni.$off('onCustomerSelected', handleCustomerSelected)
+	})
+
+	//处理 接收数据
+	const handleCustomerSelected = (data) => {
+		formData.value.cusName = data.cusName
+		formData.value.cusId = data.cusId
+	}
+	// 提交表单
+	const submitForm = async () => {
+		try {
+			// 表单校验
+			await formRef.value.validate()
+			const res = await crmMarketInformationAdd(formData.value);
+			console.log(res)
+			uni.showToast({
+				title: '提交成功',
+				icon: 'success'
+			})
+			uni.$emit('refreshMarketOpportunityList')
+			uni.navigateBack(1)
+		} catch (err) {
+			console.log('表单验证失败:', err)
+		}
+	}
+
+	const onGeneralFormTypeChange = (e) => {
+		generalFormTypeIndex.value = e.detail.value
+		console.log('generalFormTypeIndex:', array.value[e.detail.value]?.name)
+		formData.value.generalFormType = array.value[e.detail.value]?.name || ''
+	}
+//定义查询参数
+const queryParams = ref({
+    informationId: 0
+})
+onMounted(() => {
+    crminformationItemForDetail1()
+})
+	onLoad(options => {
+	    queryParams.value.informationId = options.informationId
+	})
+	const dataList = ref([])
+	function crminformationItemForDetail1() {
+	    crminformationItemForDetail(queryParams.value).then(res => {
+	       formData.value = res.rows[0]
+	    })
+	}
+	// 根据ID删除表单
+	const handleDelete = async () => {
+		try {
+	
+	        const res = await crmMarketInformationDelete(formData.value);
+			uni.showToast({
+				title: '删除成功',
+				icon: 'success'
+			})
+			uni.$emit('refreshMarketOpportunityList')
+			uni.navigateBack(1)
+		} catch (err) {
+			console.log('表单验证失败:', err)
+		}
+	}
+	
+	
+</script>
+
+<style scoped>
+	.white-bg {
+		width: 750rpx;
+		padding: 30rpx 0 0;
+		margin-bottom: 0;
+		border-radius: 8px 8px 0 0;
+	}
+
+	.form-con {
+		/* #ifdef APP-PLUS */
+		height: calc(120vh - 100px)
+			/* #endif */
+			/* #ifndef APP-PLUS */
+			height:calc(120vh - 80px)
+			/* #endif */
+	}
+
+	:deep(.uni-date-x) {
+		display: block;
+	}
+
+	:deep(.uni-date-x .icon-calendar) {
+		float: right;
+		margin-top: 15rpx;
+		margin-right: 20rpx;
+		background: url('../../../static/images/business/icon-date.png') no-repeat;
+		background-size: 32rpx 35rpx;
+		width: 32rpx;
+		height: 35rpx;
+	}
+
+	:deep(.uni-date-x .icon-calendar::before) {
+		display: none;
+	}
+
+	:deep(.uni-date-x .uni-date__x-input) {
+		padding-left: 20rpx;
+		color: #919191;
+	}
+</style>
--- a/src/pages/business/CRM/marketInformation/competitor.vue
+++ b/src/pages/business/CRM/marketInformation/competitor.vue
@@ -0,0 +1,459 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'竞争对手信息添加'" :leftFlag="true" :rightFlag="true">
+				<template #right>
+					<view class="head-right" @click="submitForm">
+						<uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
+							color="#B7D2FF"></uni-icons>保存
+					</view>
+				</template>
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 正文内容 -->
+			<view class="white-bg">
+				<view class="form-con">
+					<uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px">
+						<!-- <uni-forms-item label="客户名称" name="cusName" class="f-c-right">
+							<view @click="chooseCustomer" class="form-item-container">
+								<text class="name">{{ formData.cusName || '点击选择客户' }}</text>
+							</view>
+						</uni-forms-item> -->
+						<uni-forms-item label="竞争单位" name="competitiveUnits" class="f-c-right">
+							<picker @change="onCompetitiveUnitsChange" :value="competitiveUnitsIndex" :range="array"
+								:range-key="'name'">
+								<view class="picker">
+									{{ array[competitiveUnitsIndex]?.name || '请选择竞争单位' }}
+									<uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+								</view>
+							</picker>
+						</uni-forms-item>
+						<uni-forms-item label="信息类型" name="competitorLevelOne" class="f-c-right">
+							<picker @change="onCompetitorLevelOneChange" :value="competitorLevelOne" :range="array1"
+								:range-key="'name'">
+								<view class="picker">
+									{{ array1[competitorLevelOneIndex]?.name || '请选择信息类型' }}
+									<uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+								</view>
+							</picker>
+						</uni-forms-item>
+						<uni-forms-item label="具体分类" name="competitorLevelTwo" class="f-c-right">
+						  <picker 
+						    @change="onCompetitorLevelTwoChange" 
+						    :value="competitorLevelTwoIndex" 
+						    :range="currentCompetitorLevelTwoArray"
+						    :range-key="'name'"
+						  >
+						    <view class="picker">
+						      {{ currentCompetitorLevelTwoArray[competitorLevelTwoIndex]?.name || '请选择具体分类' }}
+						      <uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+						    </view>
+						  </picker>
+						</uni-forms-item>
+						
+						
+						<uni-forms-item label="具体信息" name="specificMatters" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.specificMatters" :placeholder="dynamicPlaceholder"
+								 class="form-texarea" />
+						</uni-forms-item>
+
+						<uni-forms-item label="备注" name="remark" class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.remark" placeholder="请输入备注"
+								class="form-texarea" />
+						</uni-forms-item>
+					</uni-forms>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		reactive,
+		onUnmounted,
+		computed
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import {
+		getGuestList
+	} from '@/api/business.js'
+	import {
+		isEmpty
+	} from '@/utils/validate.js'
+	import {
+		crmMarketInformationAdd
+	} from '@/api/crm/api_ys.js'
+
+
+	let customerUser = reactive({})
+	// 客户相关
+	const guestList = ref([])
+	const guestArr = ref([])
+	const guestIndex = ref(0)
+
+	// 表单数据
+	const formData = ref({
+		competitiveUnits: "振华云科", //竞争对手
+		competitorLevelOne: "基本信息", //竞争对手一级标签
+		competitorLevelTwo: "", //竞争对手二级标签
+		specificMatters: "", //具体事情
+		remark: "", //、备注
+		picture: "", //、图片
+		informationType: "竞争对手信息" //信息类型
+	})
+
+	// 表单验证规则
+	const rules = {
+		competitiveUnits: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择竞争单位'
+			}]
+		},
+		competitorLevelOne: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择信息类型'
+			}]
+		},
+		competitorLevelTwo: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择具体分类'
+			}]
+		},
+		specificMatters: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入具体信息'
+			}]
+		},
+	}
+	const imgList = ref([])
+
+	// picker 相关
+	const index = ref(0)
+	const array = ref([{
+			id: 0,
+			name: '振华云科'
+		},
+		{
+			id: 1,
+			name: '四川永星'
+		},
+		{
+			id: 2,
+			name: '风华邦科'
+		},
+		{
+			id: 3,
+			name: '株洲宏达'
+		},
+		{
+			id: 4,
+			name: '福建火炬'
+		},
+		{
+			id: 5,
+			name: '福建毫米'
+		},
+		{
+			id: 6,
+			name: '广州创天'
+		},
+		{
+			id: 7,
+			name: '贝迪斯'
+		},
+		{
+			id: 8,
+			name: '禹龙通电子'
+		},
+		{
+			id: 9,
+			name: '成都昊天'
+		},
+		{
+			id: 10,
+			name: '风华特种'
+		},
+		{
+			id: 11,
+			name: '济宁正和'
+		},
+		{
+			id: 12,
+			name: '盛世'
+		},
+		{
+			id: 13,
+			name: '广东意杰'
+		},
+		{
+			id: 14,
+			name: '西安威特'
+		},
+		{
+			id: 15,
+			name: '盛雷城'
+		},
+		{
+			id: 16,
+			name: '广东福德'
+		},
+		{
+			id: 17,
+			name: '咸阳智联'
+		},
+		{
+			id: 18,
+			name: '安徽来福'
+		},
+		{
+			id: 19,
+			name: '国巨'
+		},
+		{
+			id: 20,
+			name: '开步电子'
+		},
+		{
+			id: 21,
+			name: '成都宏鸣'
+		},
+		{
+			id: 22,
+			name: '其他'
+		},
+
+	])
+	const array1 = ref([{
+			id: 0,
+			name: '基本信息'
+		},
+		{
+			id: 1,
+			name: '业务信息'
+		},
+	])
+	const array2 = ref([{
+			id: 0,
+			name: '资质情况'
+		},
+		{
+			id: 1,
+			name: '人员情况'
+		},
+		{
+			id: 2,
+			name: '产品种类(新研制产品、主推产品)'
+		},
+		{
+			id: 3,
+			name: '近三年销售情况'
+		},
+		{
+			id: 4,
+			name: '市场组织架构'
+		},
+		{
+			id: 5,
+			name: '市场策略'
+		},
+		{
+			id: 6,
+			name: '竞争对手变化产生的市场机会'
+		},
+		{
+			id: 7,
+			name: '其他'
+		},
+	])
+	const array3 = ref([{
+			id: 0,
+			name: '质量问题'
+		},
+		{
+			id: 1,
+			name: '重大市场活动'
+		},
+		{
+			id: 2,
+			name: '市场占有率'
+		},
+		{
+			id: 3,
+			name: '与客户人员的关系'
+		},
+		{
+			id: 4,
+			name: '竞争动向'
+		},
+		{
+			id: 5,
+			name: '其他'
+		},
+	])
+	
+const dynamicPlaceholder = computed(() => {
+  const placeholderMap = {
+    '资质情况': '2020年通过IATF16949 汽车质量管理体系认证，IATF证书编号：0368475，CASC证书编号：2020A069；/四川永星目前有二筛条件，已经拿到CANS认证，可以对电阻器进行二筛。',
+      '人员情况': '893厂，现有员工900余人，在全国设立6个办事处/云科成都办事处有五人，负责成都、绵阳、重庆，对接凯天的是罗晓波',
+      '产品种类(新研制产品、主推产品)': '云科已申请RN5161系列进入SAST-G目录，目前尚未完成进目录工作。/云科：2022年薄膜电路产品上市。',
+      '近三年销售情况': '2021年云科销售浆料8亿元/1、云科一年在隆盛的电阻销售额在200万左右，保险丝的销售额也在200万左右。2、云科一季度在607所的销售额大概在150万左右；',
+      '市场组织架构': '1、云科市场部新上任一位领导，与九院13所领导副所长关系密切；2、西安办事处新换办事处主任杨文建，是振华集团领导的亲属；3、云科北京片区今年更换领导，是从振华富调过去的，并且把原来负责九院的业务员吴明金撤了，更换了新的业务员；1、振华云科的河南地区新增一位业务员（胡心圣）。2、佰威达的老板是施广勤，同时也是博威的老板。',
+      '市场策略': '1、外围进攻：通过熔断器、射频等产品抢占常规电阻器份额，例如中航工业金城南京机电液压工程研究中心，云科的片阻已有少量供货。2、盯住高价值产品：抢占我们高价值产品（合金箔、熔断器、射频）的最主要客户的市场份额，例如九院16所、兵器212所，但目前仍未得手。低价策略：风华和火炬今年想以低价策略进驻抢占份额。目前普军级F精度报价0.5，J精度报价0.2。',
+      '竞争对手变化产生的市场机会': '893将一部分股份卖给北海银河，银河快倒闭时改行做医药行业，不景气',
+      '其他': '请输入其他补充信息',
+      '质量问题': '在核九院五所，云科产品出现批次性硫化问题，云科及时处理，用抗硫化产品做了替代。893在梅岭说我司08年质量问题，基础采购员都知道了这个情况，说不敢选择我司火工品。目前常规片式产品普军等级，云科与我司均为8毛，893报6毛未选择他们。',
+      '重大市场活动': '云科在航天五院举办党建活动',
+      '市场占有率': '云科在航天领域的市场占有率为30%（信息来源是XXX)/振华云科在航天航空的份额占比大概在60%，大都基于领导层的关系基础，几乎不会来司拜访用户。',
+      '与客户人员的关系': '振华集团高层跟118厂高层关系很好，有时会来上海组织联谊活动/青岛整流器制造有限公司有云科内线，了解我公司价格。',
+      '竞争动向': '中电科技集团重庆声光电有限公司的106项目893中标/云科：最近一次竞标常规国军标0.55元/只（单一规格用量60万只)，D精度厚膜0.9元/只(2个规格共20万只)，通过这次竞标得到三个单一规格电阻的采购。'
+    
+  }
+  return placeholderMap[formData.value.competitorLevelTwo] || '请输入具体信息'
+})
+	const competitiveUnitsIndex = ref(0)
+
+	// 当前选中的信息类型
+	const competitorLevelOneIndex = ref(0)
+	const competitorLevelOne = ref('基本信息')
+	
+	// 当前选中的具体分类索引
+	const competitorLevelTwoIndex = ref(0)
+	
+	// 当前显示的具体分类选项数组（动态切换 array2 / array3）
+	const currentCompetitorLevelTwoArray = ref(array2.value)
+	
+	// 当前选中的具体分类名称
+	const competitorLevelTwo = ref('')
+
+	// 表单引用 & 客户选择器引用
+	const formRef = ref(null)
+	const customHeaderRef = ref(null)
+	// 选择客户页面跳转
+	function chooseCustomer() {
+		uni.navigateTo({
+			url: '/pages/business/CRM/chooseCus'
+		})
+	}
+	//定义数据接收的值
+	let selectedCustomer = reactive(null)
+
+	//监听时间
+	onMounted(() => {
+		uni.$on('onCustomerSelected', handleCustomerSelected)
+	})
+	//取消监听
+	onUnmounted(() => {
+		uni.$off('onCustomerSelected', handleCustomerSelected)
+	})
+
+	//处理 接收数据
+	const handleCustomerSelected = (data) => {
+		formData.value.cusName = data.cusName
+		formData.value.cusId = data.cusId
+	}
+	// 提交表单
+	const submitForm = async () => {
+		try {
+			// 表单校验
+			await formRef.value.validate()
+			const res = await crmMarketInformationAdd(formData.value);
+			console.log(res)
+			uni.showToast({
+				title: '提交成功',
+				icon: 'success'
+			})
+			console.log('表单数据:', formData.value)
+		} catch (err) {
+			console.log('表单验证失败:', err)
+		}
+	}
+
+	const onCompetitiveUnitsChange = (e) => {
+		competitiveUnitsIndex.value = e.detail.value
+		console.log('competitiveUnitsIndex:', array.value[e.detail.value]?.name)
+		formData.value.competitiveUnits = array.value[e.detail.value]?.name || ''
+	}
+	const onCompetitorLevelOneChange = (e) => {
+	  if (e.detail.value >= 0 && e.detail.value < array1.value.length) {
+	    competitorLevelOneIndex.value = e.detail.value
+	  } else {
+	    console.error('选择了无效的索引，重置为 0')
+	    competitorLevelOneIndex.value = 0
+	  }
+	  const selectedType = array1.value[e.detail.value]?.name
+	  console.log('选中的信息类型:', selectedType)
+	
+	  formData.value.competitorLevelOne = selectedType
+	
+	  if (selectedType === '基本信息') {
+	    currentCompetitorLevelTwoArray.value = array2.value
+	    competitorLevelTwoIndex.value = 0
+	    formData.value.competitorLevelTwo = currentCompetitorLevelTwoArray.value[0]?.name || ''
+	  } else if (selectedType === '业务信息') {
+	    currentCompetitorLevelTwoArray.value = array3.value
+	    competitorLevelTwoIndex.value = 0
+	    formData.value.competitorLevelTwo = currentCompetitorLevelTwoArray.value[0]?.name || ''
+	  } else {
+	    currentCompetitorLevelTwoArray.value = []
+	    formData.value.competitorLevelTwo = ''
+	  }
+	}
+	
+	const onCompetitorLevelTwoChange = (e) => {
+	  competitorLevelTwoIndex.value = e.detail.value
+	  formData.value.competitorLevelTwo = currentCompetitorLevelTwoArray.value[e.detail.value]?.name || ''
+	}
+</script>
+
+<style scoped>
+	.white-bg {
+		width: 750rpx;
+		padding: 30rpx 0 0;
+		margin-bottom: 0;
+		border-radius: 8px 8px 0 0;
+	}
+
+	.form-con {
+		/* #ifdef APP-PLUS */
+		height: calc(120vh - 100px)
+			/* #endif */
+			/* #ifndef APP-PLUS */
+			height:calc(120vh - 80px)
+			/* #endif */
+	}
+
+	:deep(.uni-date-x) {
+		display: block;
+	}
+
+	:deep(.uni-date-x .icon-calendar) {
+		float: right;
+		margin-top: 15rpx;
+		margin-right: 20rpx;
+		background: url('../../../static/images/business/icon-date.png') no-repeat;
+		background-size: 32rpx 35rpx;
+		width: 32rpx;
+		height: 35rpx;
+	}
+
+	:deep(.uni-date-x .icon-calendar::before) {
+		display: none;
+	}
+
+	:deep(.uni-date-x .uni-date__x-input) {
+		padding-left: 20rpx;
+		color: #919191;
+	}
+</style>
--- a/src/pages/business/CRM/marketInformation/competitorDetail.vue
+++ b/src/pages/business/CRM/marketInformation/competitorDetail.vue
@@ -0,0 +1,500 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'竞争对手信息添加'" :leftFlag="true" :rightFlag="true">
+				<template #right>
+					<view class="head-right" @click="submitForm">
+						<uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
+							color="#B7D2FF"></uni-icons>保存
+					</view>
+				</template>
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 正文内容 -->
+			<view class="white-bg">
+				<view class="form-con">
+					<uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px">
+						<!-- <uni-forms-item label="客户名称" name="cusName" class="f-c-right">
+							<view @click="chooseCustomer" class="form-item-container">
+								<text class="name">{{ formData.cusName || '点击选择客户' }}</text>
+							</view>
+						</uni-forms-item> -->
+						<uni-forms-item label="竞争单位" name="competitiveUnits" class="f-c-right">
+							<picker @change="onCompetitiveUnitsChange" :value="competitiveUnitsIndex" :range="array"
+								:range-key="'name'">
+								<view class="picker">
+									{{ array[competitiveUnitsIndex]?.name || '请选择竞争单位' }}
+									<uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+								</view>
+							</picker>
+						</uni-forms-item>
+						<uni-forms-item label="信息类型" name="competitorLevelOne" class="f-c-right">
+							<picker @change="onCompetitorLevelOneChange" :value="competitorLevelOne" :range="array1"
+								:range-key="'name'">
+								<view class="picker">
+									{{ array1[competitorLevelOneIndex]?.name || '请选择信息类型' }}
+									<uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+								</view>
+							</picker>
+						</uni-forms-item>
+						<uni-forms-item label="具体分类" name="competitorLevelTwo" class="f-c-right">
+						  <picker 
+						    @change="onCompetitorLevelTwoChange" 
+						    :value="competitorLevelTwoIndex" 
+						    :range="currentCompetitorLevelTwoArray"
+						    :range-key="'name'"
+						  >
+						    <view class="picker">
+						      {{ currentCompetitorLevelTwoArray[competitorLevelTwoIndex]?.name || '请选择具体分类' }}
+						      <uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+						    </view>
+						  </picker>
+						</uni-forms-item>
+						
+						
+						<uni-forms-item label="具体信息" name="specificMatters" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.specificMatters" :placeholder="dynamicPlaceholder"
+								 class="form-texarea" />
+						</uni-forms-item>
+
+						<uni-forms-item label="备注" name="remark" class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.remark" placeholder="请输入备注"
+								class="form-texarea" />
+						</uni-forms-item>
+					</uni-forms>
+					<view class="footer-con">
+					    <button class="btn-default" type="default" @click="handleDelete" size="mini">删 除</button>
+					    <button class="btn-primary" type="primary" @click="submitForm" size="mini">保存/修改</button>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		reactive,
+		onUnmounted,
+		computed
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import {
+		getGuestList
+	} from '@/api/business.js'
+	import {
+		isEmpty
+	} from '@/utils/validate.js'
+	import {
+		crmMarketInformationAdd,crminformationItemForDetail,crmMarketInformationDelete 
+	} from '@/api/crm/api_ys.js'
+	import { useMessage } from '@/utils/message.js'
+	import cache from '@/utils/cache.js'
+		import { onLoad } from '@dcloudio/uni-app'
+	let customerUser = reactive({})
+	// 客户相关
+	const guestList = ref([])
+	const guestArr = ref([])
+	const guestIndex = ref(0)
+
+	// 表单数据
+	const formData = ref({
+		competitiveUnits: "振华云科", //竞争对手
+		competitorLevelOne: "基本信息", //竞争对手一级标签
+		competitorLevelTwo: "", //竞争对手二级标签
+		specificMatters: "", //具体事情
+		remark: "", //、备注
+		picture: "", //、图片
+		informationType: "竞争对手信息" //信息类型
+	})
+
+	// 表单验证规则
+	const rules = {
+		competitiveUnits: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择竞争单位'
+			}]
+		},
+		competitorLevelOne: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择信息类型'
+			}]
+		},
+		competitorLevelTwo: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择具体分类'
+			}]
+		},
+		specificMatters: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入具体信息'
+			}]
+		},
+	}
+	const imgList = ref([])
+
+	// picker 相关
+	const index = ref(0)
+	const array = ref([{
+			id: 0,
+			name: '振华云科'
+		},
+		{
+			id: 1,
+			name: '四川永星'
+		},
+		{
+			id: 2,
+			name: '风华邦科'
+		},
+		{
+			id: 3,
+			name: '株洲宏达'
+		},
+		{
+			id: 4,
+			name: '福建火炬'
+		},
+		{
+			id: 5,
+			name: '福建毫米'
+		},
+		{
+			id: 6,
+			name: '广州创天'
+		},
+		{
+			id: 7,
+			name: '贝迪斯'
+		},
+		{
+			id: 8,
+			name: '禹龙通电子'
+		},
+		{
+			id: 9,
+			name: '成都昊天'
+		},
+		{
+			id: 10,
+			name: '风华特种'
+		},
+		{
+			id: 11,
+			name: '济宁正和'
+		},
+		{
+			id: 12,
+			name: '盛世'
+		},
+		{
+			id: 13,
+			name: '广东意杰'
+		},
+		{
+			id: 14,
+			name: '西安威特'
+		},
+		{
+			id: 15,
+			name: '盛雷城'
+		},
+		{
+			id: 16,
+			name: '广东福德'
+		},
+		{
+			id: 17,
+			name: '咸阳智联'
+		},
+		{
+			id: 18,
+			name: '安徽来福'
+		},
+		{
+			id: 19,
+			name: '国巨'
+		},
+		{
+			id: 20,
+			name: '开步电子'
+		},
+		{
+			id: 21,
+			name: '成都宏鸣'
+		},
+		{
+			id: 22,
+			name: '其他'
+		},
+
+	])
+	const array1 = ref([{
+			id: 0,
+			name: '基本信息'
+		},
+		{
+			id: 1,
+			name: '业务信息'
+		},
+	])
+	const array2 = ref([{
+			id: 0,
+			name: '资质情况'
+		},
+		{
+			id: 1,
+			name: '人员情况'
+		},
+		{
+			id: 2,
+			name: '产品种类(新研制产品、主推产品)'
+		},
+		{
+			id: 3,
+			name: '近三年销售情况'
+		},
+		{
+			id: 4,
+			name: '市场组织架构'
+		},
+		{
+			id: 5,
+			name: '市场策略'
+		},
+		{
+			id: 6,
+			name: '竞争对手变化产生的市场机会'
+		},
+		{
+			id: 7,
+			name: '其他'
+		},
+	])
+	const array3 = ref([{
+			id: 0,
+			name: '质量问题'
+		},
+		{
+			id: 1,
+			name: '重大市场活动'
+		},
+		{
+			id: 2,
+			name: '市场占有率'
+		},
+		{
+			id: 3,
+			name: '与客户人员的关系'
+		},
+		{
+			id: 4,
+			name: '竞争动向'
+		},
+		{
+			id: 5,
+			name: '其他'
+		},
+	])
+	
+const dynamicPlaceholder = computed(() => {
+  const placeholderMap = {
+    '资质情况': '2020年通过IATF16949 汽车质量管理体系认证，IATF证书编号：0368475，CASC证书编号：2020A069；/四川永星目前有二筛条件，已经拿到CANS认证，可以对电阻器进行二筛。',
+      '人员情况': '893厂，现有员工900余人，在全国设立6个办事处/云科成都办事处有五人，负责成都、绵阳、重庆，对接凯天的是罗晓波',
+      '产品种类(新研制产品、主推产品)': '云科已申请RN5161系列进入SAST-G目录，目前尚未完成进目录工作。/云科：2022年薄膜电路产品上市。',
+      '近三年销售情况': '2021年云科销售浆料8亿元/1、云科一年在隆盛的电阻销售额在200万左右，保险丝的销售额也在200万左右。2、云科一季度在607所的销售额大概在150万左右；',
+      '市场组织架构': '1、云科市场部新上任一位领导，与九院13所领导副所长关系密切；2、西安办事处新换办事处主任杨文建，是振华集团领导的亲属；3、云科北京片区今年更换领导，是从振华富调过去的，并且把原来负责九院的业务员吴明金撤了，更换了新的业务员；1、振华云科的河南地区新增一位业务员（胡心圣）。2、佰威达的老板是施广勤，同时也是博威的老板。',
+      '市场策略': '1、外围进攻：通过熔断器、射频等产品抢占常规电阻器份额，例如中航工业金城南京机电液压工程研究中心，云科的片阻已有少量供货。2、盯住高价值产品：抢占我们高价值产品（合金箔、熔断器、射频）的最主要客户的市场份额，例如九院16所、兵器212所，但目前仍未得手。低价策略：风华和火炬今年想以低价策略进驻抢占份额。目前普军级F精度报价0.5，J精度报价0.2。',
+      '竞争对手变化产生的市场机会': '893将一部分股份卖给北海银河，银河快倒闭时改行做医药行业，不景气',
+      '其他': '请输入其他补充信息',
+      '质量问题': '在核九院五所，云科产品出现批次性硫化问题，云科及时处理，用抗硫化产品做了替代。893在梅岭说我司08年质量问题，基础采购员都知道了这个情况，说不敢选择我司火工品。目前常规片式产品普军等级，云科与我司均为8毛，893报6毛未选择他们。',
+      '重大市场活动': '云科在航天五院举办党建活动',
+      '市场占有率': '云科在航天领域的市场占有率为30%（信息来源是XXX)/振华云科在航天航空的份额占比大概在60%，大都基于领导层的关系基础，几乎不会来司拜访用户。',
+      '与客户人员的关系': '振华集团高层跟118厂高层关系很好，有时会来上海组织联谊活动/青岛整流器制造有限公司有云科内线，了解我公司价格。',
+      '竞争动向': '中电科技集团重庆声光电有限公司的106项目893中标/云科：最近一次竞标常规国军标0.55元/只（单一规格用量60万只)，D精度厚膜0.9元/只(2个规格共20万只)，通过这次竞标得到三个单一规格电阻的采购。'
+    
+  }
+  return placeholderMap[formData.value.competitorLevelTwo] || '请输入具体信息'
+})
+	const competitiveUnitsIndex = ref(0)
+
+	// 当前选中的信息类型
+	const competitorLevelOneIndex = ref(0)
+	const competitorLevelOne = ref('基本信息')
+	
+	// 当前选中的具体分类索引
+	const competitorLevelTwoIndex = ref(0)
+	
+	// 当前显示的具体分类选项数组（动态切换 array2 / array3）
+	const currentCompetitorLevelTwoArray = ref(array2.value)
+	
+	// 当前选中的具体分类名称
+	const competitorLevelTwo = ref('')
+
+	// 表单引用 & 客户选择器引用
+	const formRef = ref(null)
+	const customHeaderRef = ref(null)
+	// 选择客户页面跳转
+	function chooseCustomer() {
+		uni.navigateTo({
+			url: '/pages/business/CRM/chooseCus'
+		})
+	}
+	//定义数据接收的值
+	let selectedCustomer = reactive(null)
+
+	//监听时间
+	onMounted(() => {
+		uni.$on('onCustomerSelected', handleCustomerSelected)
+	})
+	//取消监听
+	onUnmounted(() => {
+		uni.$off('onCustomerSelected', handleCustomerSelected)
+	})
+
+	//处理 接收数据
+	const handleCustomerSelected = (data) => {
+		formData.value.cusName = data.cusName
+		formData.value.cusId = data.cusId
+	}
+	// 提交表单
+	const submitForm = async () => {
+		try {
+			// 表单校验
+			await formRef.value.validate()
+			const res = await crmMarketInformationAdd(formData.value);
+			console.log(res)
+			uni.showToast({
+				title: '提交成功',
+				icon: 'success'
+			})
+			uni.$emit('refreshMarketOpportunityList')
+			uni.navigateBack(1)
+		} catch (err) {
+			console.log('表单验证失败:', err)
+		}
+	}
+
+	const onCompetitiveUnitsChange = (e) => {
+		competitiveUnitsIndex.value = e.detail.value
+		console.log('competitiveUnitsIndex:', array.value[e.detail.value]?.name)
+		formData.value.competitiveUnits = array.value[e.detail.value]?.name || ''
+	}
+	const onCompetitorLevelOneChange = (e) => {
+	  if (e.detail.value >= 0 && e.detail.value < array1.value.length) {
+	    competitorLevelOneIndex.value = e.detail.value
+	  } else {
+	    console.error('选择了无效的索引，重置为 0')
+	    competitorLevelOneIndex.value = 0
+	  }
+	  const selectedType = array1.value[e.detail.value]?.name
+	  console.log('选中的信息类型:', selectedType)
+	
+	  formData.value.competitorLevelOne = selectedType
+	
+	  if (selectedType === '基本信息') {
+	    currentCompetitorLevelTwoArray.value = array2.value
+	    competitorLevelTwoIndex.value = 0
+	    formData.value.competitorLevelTwo = currentCompetitorLevelTwoArray.value[0]?.name || ''
+	  } else if (selectedType === '业务信息') {
+	    currentCompetitorLevelTwoArray.value = array3.value
+	    competitorLevelTwoIndex.value = 0
+	    formData.value.competitorLevelTwo = currentCompetitorLevelTwoArray.value[0]?.name || ''
+	  } else {
+	    currentCompetitorLevelTwoArray.value = []
+	    formData.value.competitorLevelTwo = ''
+	  }
+	}
+	
+	const onCompetitorLevelTwoChange = (e) => {
+	  competitorLevelTwoIndex.value = e.detail.value
+	  formData.value.competitorLevelTwo = currentCompetitorLevelTwoArray.value[e.detail.value]?.name || ''
+	}
+	//定义查询参数
+	const queryParams = ref({
+	    informationId: 0
+	})
+	onMounted(() => {
+	    crminformationItemForDetail1()
+	})
+		onLoad(options => {
+		    queryParams.value.informationId = options.informationId
+		})
+		const dataList = ref([])
+		
+		function crminformationItemForDetail1() {
+		    crminformationItemForDetail(queryParams.value).then(res => {
+		       formData.value = res.rows[0]
+		    })
+		}
+		
+	// 根据ID删除表单
+	const handleDelete = async () => {
+		try {
+	
+	        const res = await crmMarketInformationDelete(formData.value);
+			uni.showToast({
+				title: '删除成功',
+				icon: 'success'
+			})
+			uni.$emit('refreshMarketOpportunityList')
+			uni.navigateBack(1)
+		} catch (err) {
+			console.log('表单验证失败:', err)
+		}
+	}
+	
+	
+</script>
+
+<style scoped>
+	.white-bg {
+		width: 750rpx;
+		padding: 30rpx 0 0;
+		margin-bottom: 0;
+		border-radius: 8px 8px 0 0;
+	}
+
+	.form-con {
+		/* #ifdef APP-PLUS */
+		height: calc(120vh - 100px)
+			/* #endif */
+			/* #ifndef APP-PLUS */
+			height:calc(120vh - 80px)
+			/* #endif */
+	}
+
+	:deep(.uni-date-x) {
+		display: block;
+	}
+
+	:deep(.uni-date-x .icon-calendar) {
+		float: right;
+		margin-top: 15rpx;
+		margin-right: 20rpx;
+		background: url('../../../static/images/business/icon-date.png') no-repeat;
+		background-size: 32rpx 35rpx;
+		width: 32rpx;
+		height: 35rpx;
+	}
+
+	:deep(.uni-date-x .icon-calendar::before) {
+		display: none;
+	}
+
+	:deep(.uni-date-x .uni-date__x-input) {
+		padding-left: 20rpx;
+		color: #919191;
+	}
+</style>
--- a/src/pages/business/CRM/marketInformation/keyModelTasks.vue
+++ b/src/pages/business/CRM/marketInformation/keyModelTasks.vue
@@ -0,0 +1,227 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'重点型号任务信息添加'" :leftFlag="true" :rightFlag="true">
+				<template #right>
+					<view class="head-right" @click="submitForm">
+						<uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
+							color="#B7D2FF"></uni-icons>保存
+					</view>
+				</template>
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 正文内容 -->
+			<view class="white-bg">
+				<view class="form-con">
+					<uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px">
+						<uni-forms-item label="客户名称" name="cusName" class="f-c-right">
+							<view @click="chooseCustomer" class="form-item-container">
+								<text class="name">{{ formData.cusName || '点击选择客户' }}</text>
+							</view>
+						</uni-forms-item>
+						<uni-forms-item label="重点型号" name="keyModels" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.keyModels"
+								placeholder="请输入重点型号" class="form-texarea" />
+						</uni-forms-item>
+						<uni-forms-item label="目前状态" name="currentStatus" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.currentStatus"
+								placeholder="请输入目前状态" class="form-texarea" />
+						</uni-forms-item>
+						<uni-forms-item label="批产计划" name="batchProductionPlan" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.batchProductionPlan"
+								placeholder="请输入批产计划" class="form-texarea" />
+						</uni-forms-item>
+                        <uni-forms-item label="外协、外包、上级单位情况" name="situationOfSuperiorUnits" required
+                        	class="uni-forms-item is-direction-top is-top">
+                        	<uni-easyinput type="textarea" autoHeight v-model="formData.situationOfSuperiorUnits"
+                        		placeholder="请输入外协、外包、上级单位情况" class="form-texarea" />
+                        </uni-forms-item>
+						<uni-forms-item label="下级配套单位" name="lowerLevelSupportingUnits" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.lowerLevelSupportingUnits"
+								placeholder="请输入下级配套单位" class="form-texarea" />
+						</uni-forms-item>
+						<uni-forms-item label="备注" name="remark" class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.remark" placeholder="请输入备注"
+								class="form-texarea" />
+						</uni-forms-item>
+					</uni-forms>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		reactive,
+		onUnmounted,
+		computed
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import {
+		getGuestList
+	} from '@/api/business.js'
+	import {
+		isEmpty
+	} from '@/utils/validate.js'
+	import {
+		crmMarketInformationAdd
+	} from '@/api/crm/api_ys.js'
+
+
+	let customerUser = reactive({})
+	// 客户相关
+	const guestList = ref([])
+	const guestArr = ref([])
+	const guestIndex = ref(0)
+
+	// 表单数据
+	const formData = ref({
+					cusId: null,
+					cusName: null,
+					keyModels: null,//重点型号
+					currentStatus: null,//目前状态
+					batchProductionPlan: null,//批产计划
+					situationOfSuperiorUnits: null,//外协、外包、上级单位情况
+					lowerLevelSupportingUnits: null,//下级配套单位
+					remark: "", //、备注
+					informationType:"重点型号任务信息" //信息类型
+				})
+
+	// 表单验证规则
+	const rules = {
+		cusName: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择客户'
+			}]
+		},
+		keyModels: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入重点型号'
+			}]
+		},
+		currentStatus: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入目前状态'
+			}]
+		},
+		batchProductionPlan: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入批产计划'
+			}]
+		},
+		situationOfSuperiorUnits: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入外协、外包、上级单位情况'
+			}]
+		},
+		lowerLevelSupportingUnits: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入下级配套单位'
+			}]
+		},
+	}
+	const imgList = ref([])
+
+	// picker 相关
+	const index = ref(0)
+	// 表单引用 & 客户选择器引用
+	const formRef = ref(null)
+	const customHeaderRef = ref(null)
+	// 选择客户页面跳转
+	function chooseCustomer() {
+		uni.navigateTo({
+			url: '/pages/business/CRM/chooseCus'
+		})
+	}
+	//定义数据接收的值
+	let selectedCustomer = reactive(null)
+
+	//监听时间
+	onMounted(() => {
+		uni.$on('onCustomerSelected', handleCustomerSelected)
+	})
+	//取消监听
+	onUnmounted(() => {
+		uni.$off('onCustomerSelected', handleCustomerSelected)
+	})
+
+	//处理 接收数据
+	const handleCustomerSelected = (data) => {
+		formData.value.cusName = data.cusName
+		formData.value.cusId = data.cusId
+	}
+	// 提交表单
+	const submitForm = async () => {
+		try {
+			// 表单校验
+			await formRef.value.validate()
+			const res = await crmMarketInformationAdd(formData.value);
+			console.log(res)
+			uni.showToast({
+				title: '提交成功',
+				icon: 'success'
+			})
+			console.log('表单数据:', formData.value)
+		} catch (err) {
+			console.log('表单验证失败:', err)
+		}
+	}
+</script>
+
+<style scoped>
+	.white-bg {
+		width: 750rpx;
+		padding: 30rpx 0 0;
+		margin-bottom: 0;
+		border-radius: 8px 8px 0 0;
+	}
+
+	.form-con {
+		/* #ifdef APP-PLUS */
+		height: calc(120vh - 100px)
+			/* #endif */
+			/* #ifndef APP-PLUS */
+			height:calc(120vh - 80px)
+			/* #endif */
+	}
+
+	:deep(.uni-date-x) {
+		display: block;
+	}
+
+	:deep(.uni-date-x .icon-calendar) {
+		float: right;
+		margin-top: 15rpx;
+		margin-right: 20rpx;
+		background: url('../../../static/images/business/icon-date.png') no-repeat;
+		background-size: 32rpx 35rpx;
+		width: 32rpx;
+		height: 35rpx;
+	}
+
+	:deep(.uni-date-x .icon-calendar::before) {
+		display: none;
+	}
+
+	:deep(.uni-date-x .uni-date__x-input) {
+		padding-left: 20rpx;
+		color: #919191;
+	}
+</style>
--- a/src/pages/business/CRM/marketInformation/keyModelTasksDetail.vue
+++ b/src/pages/business/CRM/marketInformation/keyModelTasksDetail.vue
@@ -0,0 +1,267 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'重点型号任务信息修改'" :leftFlag="true" :rightFlag="true">
+				<template #right>
+					<view class="head-right" @click="submitForm">
+						<uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
+							color="#B7D2FF"></uni-icons>保存
+					</view>
+				</template>
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 正文内容 -->
+			<view class="white-bg">
+				<view class="form-con">
+					<uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px">
+						<uni-forms-item label="客户名称" name="cusName" class="f-c-right">
+							<view @click="chooseCustomer" class="form-item-container">
+								<text class="name">{{ formData.cusName || '点击选择客户' }}</text>
+							</view>
+						</uni-forms-item>
+						<uni-forms-item label="重点型号" name="keyModels" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.keyModels"
+								placeholder="请输入重点型号" class="form-texarea" />
+						</uni-forms-item>
+						<uni-forms-item label="目前状态" name="currentStatus" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.currentStatus"
+								placeholder="请输入目前状态" class="form-texarea" />
+						</uni-forms-item>
+						<uni-forms-item label="批产计划" name="batchProductionPlan" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.batchProductionPlan"
+								placeholder="请输入批产计划" class="form-texarea" />
+						</uni-forms-item>
+                        <uni-forms-item label="外协、外包、上级单位情况" name="situationOfSuperiorUnits" required
+                        	class="uni-forms-item is-direction-top is-top">
+                        	<uni-easyinput type="textarea" autoHeight v-model="formData.situationOfSuperiorUnits"
+                        		placeholder="请输入外协、外包、上级单位情况" class="form-texarea" />
+                        </uni-forms-item>
+						<uni-forms-item label="下级配套单位" name="lowerLevelSupportingUnits" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.lowerLevelSupportingUnits"
+								placeholder="请输入下级配套单位" class="form-texarea" />
+						</uni-forms-item>
+						<uni-forms-item label="备注" name="remark" class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.remark" placeholder="请输入备注"
+								class="form-texarea" />
+						</uni-forms-item>
+					</uni-forms>
+					<view class="footer-con">
+					    <button class="btn-default" type="default" @click="handleDelete" size="mini">删 除</button>
+					    <button class="btn-primary" type="primary" @click="submitForm" size="mini">保存/修改</button>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		reactive,
+		onUnmounted,
+		computed
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import {
+		getGuestList
+	} from '@/api/business.js'
+	import {
+		isEmpty
+	} from '@/utils/validate.js'
+	import {
+		crmMarketInformationAdd,crminformationItemForDetail,crmMarketInformationDelete 
+	} from '@/api/crm/api_ys.js'
+		import { onLoad } from '@dcloudio/uni-app'
+	import { useMessage } from '@/utils/message.js'
+	import cache from '@/utils/cache.js'
+	let customerUser = reactive({})
+	// 客户相关
+	const guestList = ref([])
+	const guestArr = ref([])
+	const guestIndex = ref(0)
+
+	// 表单数据
+	const formData = ref({
+					cusId: null,
+					cusName: null,
+					keyModels: null,//重点型号
+					currentStatus: null,//目前状态
+					batchProductionPlan: null,//批产计划
+					situationOfSuperiorUnits: null,//外协、外包、上级单位情况
+					lowerLevelSupportingUnits: null,//下级配套单位
+					remark: "", //、备注
+					informationType:"重点型号任务信息" //信息类型
+				})
+
+	// 表单验证规则
+	const rules = {
+		cusName: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择客户'
+			}]
+		},
+		keyModels: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入重点型号'
+			}]
+		},
+		currentStatus: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入目前状态'
+			}]
+		},
+		batchProductionPlan: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入批产计划'
+			}]
+		},
+		situationOfSuperiorUnits: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入外协、外包、上级单位情况'
+			}]
+		},
+		lowerLevelSupportingUnits: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入下级配套单位'
+			}]
+		},
+	}
+	const imgList = ref([])
+
+	// picker 相关
+	const index = ref(0)
+	// 表单引用 & 客户选择器引用
+	const formRef = ref(null)
+	const customHeaderRef = ref(null)
+	// 选择客户页面跳转
+	function chooseCustomer() {
+		uni.navigateTo({
+			url: '/pages/business/CRM/chooseCus'
+		})
+	}
+	//定义数据接收的值
+	let selectedCustomer = reactive(null)
+
+	//监听时间
+	onMounted(() => {
+		uni.$on('onCustomerSelected', handleCustomerSelected)
+	})
+	//取消监听
+	onUnmounted(() => {
+		uni.$off('onCustomerSelected', handleCustomerSelected)
+	})
+
+	//处理 接收数据
+	const handleCustomerSelected = (data) => {
+		formData.value.cusName = data.cusName
+		formData.value.cusId = data.cusId
+	}
+	// 提交表单
+	const submitForm = async () => {
+		try {
+			// 表单校验
+			await formRef.value.validate()
+			const res = await crmMarketInformationAdd(formData.value);
+			console.log(res)
+			uni.showToast({
+				title: '提交成功',
+				icon: 'success'
+			})
+			uni.$emit('refreshMarketOpportunityList')
+			uni.navigateBack(1)
+		} catch (err) {
+			console.log('表单验证失败:', err)
+		}
+	}
+	
+	//定义查询参数
+	const queryParams = ref({
+	    informationId: 0
+	})
+	onMounted(() => {
+	    crminformationItemForDetail1()
+	})
+		onLoad(options => {
+		    queryParams.value.informationId = options.informationId
+		})
+		const dataList = ref([])
+		
+		function crminformationItemForDetail1() {
+		    crminformationItemForDetail(queryParams.value).then(res => {
+		       formData.value = res.rows[0]
+		    })
+		}
+		
+	// 根据ID删除表单
+	const handleDelete = async () => {
+		try {
+	
+	        const res = await crmMarketInformationDelete(formData.value);
+			uni.showToast({
+				title: '删除成功',
+				icon: 'success'
+			})
+			uni.$emit('refreshMarketOpportunityList')
+			uni.navigateBack(1)
+		} catch (err) {
+			console.log('表单验证失败:', err)
+		}
+	}
+</script>
+
+<style scoped>
+	.white-bg {
+		width: 750rpx;
+		padding: 30rpx 0 0;
+		margin-bottom: 0;
+		border-radius: 8px 8px 0 0;
+	}
+
+	.form-con {
+		/* #ifdef APP-PLUS */
+		height: calc(120vh - 100px)
+			/* #endif */
+			/* #ifndef APP-PLUS */
+			height:calc(120vh - 80px)
+			/* #endif */
+	}
+
+	:deep(.uni-date-x) {
+		display: block;
+	}
+
+	:deep(.uni-date-x .icon-calendar) {
+		float: right;
+		margin-top: 15rpx;
+		margin-right: 20rpx;
+		background: url('../../../static/images/business/icon-date.png') no-repeat;
+		background-size: 32rpx 35rpx;
+		width: 32rpx;
+		height: 35rpx;
+	}
+
+	:deep(.uni-date-x .icon-calendar::before) {
+		display: none;
+	}
+
+	:deep(.uni-date-x .uni-date__x-input) {
+		padding-left: 20rpx;
+		color: #919191;
+	}
+</style>
--- a/src/pages/business/CRM/marketInformation/majorMatter.vue
+++ b/src/pages/business/CRM/marketInformation/majorMatter.vue
@@ -0,0 +1,262 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'重大事项添加'" :leftFlag="true" :rightFlag="true">
+				<template #right>
+					<view class="head-right" @click="submitForm">
+						<uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
+							color="#B7D2FF"></uni-icons>保存
+					</view>
+				</template>
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 正文内容 -->
+			<view class="white-bg">
+				<view class="form-con">
+					<uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px">
+						<uni-forms-item label="客户名称" name="cusName" class="f-c-right">
+							<view @click="chooseCustomer" class="form-item-container">
+								<text class="name">{{ formData.cusName || '点击选择客户' }}</text>
+							</view>
+						</uni-forms-item>
+						<uni-forms-item label="重大事项类型" name="opportunityType" class="f-c-right">
+							<picker @change="onOpportunityTypeChange" :value="opportunityTypeIndex" :range="array"
+								:range-key="'name'">
+								<view class="picker">
+									{{ array[opportunityTypeIndex]?.name || '请选择重大事项类型' }}
+									<uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+								</view>
+							</picker>
+						</uni-forms-item>
+						<uni-forms-item label="了解途径" name="understandTheWay" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.understandTheWay"
+								placeholder="请输入了解途径" class="form-texarea" />
+						</uni-forms-item>
+						<uni-forms-item label="产生的影响" name="theImpactGenerated" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.theImpactGenerated"
+								placeholder="请输入产生的影响" class="form-texarea" />
+						</uni-forms-item>
+						<uni-forms-item label="公司应对策略" name="companyResponseStrategy" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.companyResponseStrategy"
+								placeholder="请输入公司应对策略" class="form-texarea" />
+						</uni-forms-item>
+
+						<uni-forms-item label="备注" name="remark" class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.remark" placeholder="请输入备注"
+								class="form-texarea" />
+						</uni-forms-item>
+					</uni-forms>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		reactive,
+		onUnmounted,
+		computed
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import {
+		getGuestList
+	} from '@/api/business.js'
+	import {
+		isEmpty
+	} from '@/utils/validate.js'
+	import {
+		crmMarketInformationAdd
+	} from '@/api/crm/api_ys.js'
+
+
+	let customerUser = reactive({})
+	// 客户相关
+	const guestList = ref([])
+	const guestArr = ref([])
+	const guestIndex = ref(0)
+
+	// 表单数据
+	const formData = ref({
+		cusId: null,
+		cusName: null,
+		majorTypesOfMatters: "", //重大事项类型
+		understandTheWay: "", //了解途径
+		theImpactGenerated: "", //、产生的影响
+		companyResponseStrategy: "", //、公司应对策略
+		remark: "", //、备注
+		picture: "", //、图片
+		photos: null,
+		informationType: "重大事项信息" //信息类型
+	})
+
+	// 表单验证规则
+	const rules = {
+		cusName: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择客户'
+			}]
+		},
+		majorTypesOfMatters: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择重大事项类型'
+			}]
+		},
+		understandTheWay: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入了解途径'
+			}]
+		},
+		theImpactGenerated: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入产生的影响'
+			}]
+		},
+		companyResponseStrategy: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入公司应对策略'
+			}]
+		},
+	}
+	const imgList = ref([])
+
+	// picker 相关
+	const index = ref(0)
+	const array = ref([{
+			id: 0,
+			name: '质量问题'
+		},
+		{
+			id: 1,
+			name: '客户重大变更'
+		},
+		{
+			id: 2,
+			name: '行业重大事项'
+		}
+
+	])
+	const form = ref({
+		cusId: null,
+		cusName: null,
+		opportunityType: "", // 机会类型
+		understandTheWay: "", // 了解途径
+		opportunityDescription: "", // 机会描述
+		opportunityStatus: "", // 机会所处状态
+		predictedAmount: "", // 预测金额或情况
+		competitionSituation: "", // 竞争情况
+		remark: "", // 备注
+		picture: "", // 图片
+		informationType: "市场机会" // 信息类型
+	})
+
+	const opportunityTypeIndex = ref(0)
+
+	// 表单引用 & 客户选择器引用
+	const formRef = ref(null)
+	const customHeaderRef = ref(null)
+	// 选择客户页面跳转
+	function chooseCustomer() {
+		uni.navigateTo({
+			url: '/pages/business/CRM/chooseCus'
+		})
+	}
+	//定义数据接收的值
+	let selectedCustomer = reactive(null)
+
+	//监听时间
+	onMounted(() => {
+		uni.$on('onCustomerSelected', handleCustomerSelected)
+	})
+	//取消监听
+	onUnmounted(() => {
+		uni.$off('onCustomerSelected', handleCustomerSelected)
+	})
+
+	//处理 接收数据
+	const handleCustomerSelected = (data) => {
+		formData.value.cusName = data.cusName
+		formData.value.cusId = data.cusId
+	}
+	// 提交表单
+	const submitForm = async () => {
+		try {
+			// 表单校验
+			await formRef.value.validate()
+			const res = await crmMarketInformationAdd(formData.value);
+			console.log(res)
+			uni.showToast({
+				title: '提交成功',
+				icon: 'success'
+			})
+			console.log('表单数据:', formData.value)
+		} catch (err) {
+			console.log('表单验证失败:', err)
+		}
+	}
+
+	const onOpportunityTypeChange = (e) => {
+		opportunityTypeIndex.value = e.detail.value
+		console.log('opportunityTypeIndex:', array.value[e.detail.value]?.name)
+		formData.value.opportunityType = array.value[e.detail.value]?.name || ''
+	}
+	// 如果你原来在 onShow 中做了类似这样：
+	// let res = currPage.data.cusData; 判断是否传入了客户信息
+	// 那么在 Vue3 中通常是通过路由参数或者 Vuex/Pinia 等状态管理获取
+	// 暂时不做，如你后续需要可继续补充
+</script>
+
+<style scoped>
+	.white-bg {
+		width: 750rpx;
+		padding: 30rpx 0 0;
+		margin-bottom: 0;
+		border-radius: 8px 8px 0 0;
+	}
+
+	.form-con {
+		/* #ifdef APP-PLUS */
+		height: calc(120vh - 100px)
+			/* #endif */
+			/* #ifndef APP-PLUS */
+			height:calc(120vh - 80px)
+			/* #endif */
+	}
+
+	:deep(.uni-date-x) {
+		display: block;
+	}
+
+	:deep(.uni-date-x .icon-calendar) {
+		float: right;
+		margin-top: 15rpx;
+		margin-right: 20rpx;
+		background: url('../../../static/images/business/icon-date.png') no-repeat;
+		background-size: 32rpx 35rpx;
+		width: 32rpx;
+		height: 35rpx;
+	}
+
+	:deep(.uni-date-x .icon-calendar::before) {
+		display: none;
+	}
+
+	:deep(.uni-date-x .uni-date__x-input) {
+		padding-left: 20rpx;
+		color: #919191;
+	}
+</style>
--- a/src/pages/business/CRM/marketInformation/majorMatterDetail.vue
+++ b/src/pages/business/CRM/marketInformation/majorMatterDetail.vue
@@ -0,0 +1,300 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'重大事项修改'" :leftFlag="true" :rightFlag="true">
+				<template #right>
+					<view class="head-right" @click="submitForm">
+						<uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
+							color="#B7D2FF"></uni-icons>保存
+					</view>
+				</template>
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 正文内容 -->
+			<view class="white-bg">
+				<view class="form-con">
+					<uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px">
+						<uni-forms-item label="客户名称" name="cusName" class="f-c-right">
+							<view @click="chooseCustomer" class="form-item-container">
+								<text class="name">{{ formData.cusName || '点击选择客户' }}</text>
+							</view>
+						</uni-forms-item>
+						<uni-forms-item label="重大事项类型" name="opportunityType" class="f-c-right">
+							<picker @change="onOpportunityTypeChange" :value="opportunityTypeIndex" :range="array"
+								:range-key="'name'">
+								<view class="picker">
+									{{ array[opportunityTypeIndex]?.name || '请选择重大事项类型' }}
+									<uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+								</view>
+							</picker>
+						</uni-forms-item>
+						<uni-forms-item label="了解途径" name="understandTheWay" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.understandTheWay"
+								placeholder="请输入了解途径" class="form-texarea" />
+						</uni-forms-item>
+						<uni-forms-item label="产生的影响" name="theImpactGenerated" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.theImpactGenerated"
+								placeholder="请输入产生的影响" class="form-texarea" />
+						</uni-forms-item>
+						<uni-forms-item label="公司应对策略" name="companyResponseStrategy" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.companyResponseStrategy"
+								placeholder="请输入公司应对策略" class="form-texarea" />
+						</uni-forms-item>
+
+						<uni-forms-item label="备注" name="remark" class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.remark" placeholder="请输入备注"
+								class="form-texarea" />
+						</uni-forms-item>
+					</uni-forms>
+					<view class="footer-con">
+					    <button class="btn-default" type="default" @click="handleDelete" size="mini">删 除</button>
+					    <button class="btn-primary" type="primary" @click="submitForm" size="mini">保存/修改</button>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		reactive,
+		onUnmounted,
+		computed
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import {
+		getGuestList
+	} from '@/api/business.js'
+		import { onLoad } from '@dcloudio/uni-app'
+	import {
+		isEmpty
+	} from '@/utils/validate.js'
+	import {
+		crmMarketInformationAdd,crminformationItemForDetail,crmMarketInformationDelete 
+	} from '@/api/crm/api_ys.js'
+	import { useMessage } from '@/utils/message.js'
+	import cache from '@/utils/cache.js'
+
+
+	let customerUser = reactive({})
+	// 客户相关
+	const guestList = ref([])
+	const guestArr = ref([])
+	const guestIndex = ref(0)
+
+	// 表单数据
+	const formData = ref({
+		cusId: null,
+		cusName: null,
+		majorTypesOfMatters: "", //重大事项类型
+		understandTheWay: "", //了解途径
+		theImpactGenerated: "", //、产生的影响
+		companyResponseStrategy: "", //、公司应对策略
+		remark: "", //、备注
+		picture: "", //、图片
+		photos: null,
+		informationType: "重大事项信息" //信息类型
+	})
+
+	// 表单验证规则
+	const rules = {
+		cusName: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择客户'
+			}]
+		},
+		majorTypesOfMatters: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择重大事项类型'
+			}]
+		},
+		understandTheWay: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入了解途径'
+			}]
+		},
+		theImpactGenerated: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入产生的影响'
+			}]
+		},
+		companyResponseStrategy: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入公司应对策略'
+			}]
+		},
+	}
+	const imgList = ref([])
+
+	// picker 相关
+	const index = ref(0)
+	const array = ref([{
+			id: 0,
+			name: '质量问题'
+		},
+		{
+			id: 1,
+			name: '客户重大变更'
+		},
+		{
+			id: 2,
+			name: '行业重大事项'
+		}
+
+	])
+	const form = ref({
+		cusId: null,
+		cusName: null,
+		opportunityType: "", // 机会类型
+		understandTheWay: "", // 了解途径
+		opportunityDescription: "", // 机会描述
+		opportunityStatus: "", // 机会所处状态
+		predictedAmount: "", // 预测金额或情况
+		competitionSituation: "", // 竞争情况
+		remark: "", // 备注
+		picture: "", // 图片
+		informationType: "市场机会" // 信息类型
+	})
+
+	const opportunityTypeIndex = ref(0)
+
+	// 表单引用 & 客户选择器引用
+	const formRef = ref(null)
+	const customHeaderRef = ref(null)
+	// 选择客户页面跳转
+	function chooseCustomer() {
+		uni.navigateTo({
+			url: '/pages/business/CRM/chooseCus'
+		})
+	}
+	//定义数据接收的值
+	let selectedCustomer = reactive(null)
+
+	//监听时间
+	onMounted(() => {
+		uni.$on('onCustomerSelected', handleCustomerSelected)
+	})
+	//取消监听
+	onUnmounted(() => {
+		uni.$off('onCustomerSelected', handleCustomerSelected)
+	})
+
+	//处理 接收数据
+	const handleCustomerSelected = (data) => {
+		formData.value.cusName = data.cusName
+		formData.value.cusId = data.cusId
+	}
+	// 提交表单
+	const submitForm = async () => {
+		try {
+			// 表单校验
+			await formRef.value.validate()
+			const res = await crmMarketInformationAdd(formData.value);
+			console.log(res)
+			uni.showToast({
+				title: '提交成功',
+				icon: 'success'
+			})
+			uni.$emit('refreshMarketOpportunityList')
+			uni.navigateBack(1)
+		} catch (err) {
+			console.log('表单验证失败:', err)
+		}
+	}
+
+	const onOpportunityTypeChange = (e) => {
+		opportunityTypeIndex.value = e.detail.value
+		console.log('opportunityTypeIndex:', array.value[e.detail.value]?.name)
+		formData.value.opportunityType = array.value[e.detail.value]?.name || ''
+	}
+	
+	//定义查询参数
+	const queryParams = ref({
+	    informationId: 0
+	})
+	onMounted(() => {
+	    crminformationItemForDetail1()
+	})
+		onLoad(options => {
+		    queryParams.value.informationId = options.informationId
+		})
+		const dataList = ref([])
+		
+		function crminformationItemForDetail1() {
+		    crminformationItemForDetail(queryParams.value).then(res => {
+		       formData.value = res.rows[0]
+		    })
+		}
+		
+	// 根据ID删除表单
+	const handleDelete = async () => {
+		try {
+
+	        const res = await crmMarketInformationDelete (formData.value);
+			uni.showToast({
+				title: '删除成功',
+				icon: 'success'
+			})
+			uni.$emit('refreshMarketOpportunityList')
+			uni.navigateBack(1)
+		} catch (err) {
+			console.log('表单验证失败:', err)
+		}
+	}
+</script>
+
+<style scoped>
+	.white-bg {
+		width: 750rpx;
+		padding: 30rpx 0 0;
+		margin-bottom: 0;
+		border-radius: 8px 8px 0 0;
+	}
+
+	.form-con {
+		/* #ifdef APP-PLUS */
+		height: calc(120vh - 100px)
+			/* #endif */
+			/* #ifndef APP-PLUS */
+			height:calc(120vh - 80px)
+			/* #endif */
+	}
+
+	:deep(.uni-date-x) {
+		display: block;
+	}
+
+	:deep(.uni-date-x .icon-calendar) {
+		float: right;
+		margin-top: 15rpx;
+		margin-right: 20rpx;
+		background: url('../../../static/images/business/icon-date.png') no-repeat;
+		background-size: 32rpx 35rpx;
+		width: 32rpx;
+		height: 35rpx;
+	}
+
+	:deep(.uni-date-x .icon-calendar::before) {
+		display: none;
+	}
+
+	:deep(.uni-date-x .uni-date__x-input) {
+		padding-left: 20rpx;
+		color: #919191;
+	}
+</style>
--- a/src/pages/business/CRM/marketInformation/marketInformation.vue
+++ b/src/pages/business/CRM/marketInformation/marketInformation.vue
@@ -0,0 +1,482 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'市场信息管理'" :leftFlag="true" :rightFlag="true">
+				<template #right>
+					<view class="head-right" @click="handleAdd">
+						<uni-icons type="plus" size="24" color="#B7D2FF"></uni-icons>新增
+					</view>
+				</template>
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+
+			<!-- 正文内容 -->
+			<view class="all-body market-con">
+				<view class="nav-list">
+					<view class="nav-item" :class="{active:index==activeTab}" v-for="(item,index) in tabList"
+						:key="index" @click="handleNav(index)">{{ item }}</view>
+				</view>
+
+				<!-- 分页部分  -->
+				<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}">
+					<!-- 市场机会信息 -->
+					<block v-if="activeTab === 0">
+						<view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index"
+							@click="itemClick(item)">
+							<view class="report-list">
+								<view class="title r-list">
+									<view class="r-left" style="font-size:38rpx;">{{ item.cusName }}</view>
+									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
+										size="mini" @click="itemView(item)">{{ item.state }}</view>
+								</view>
+								<view style="padding:0rpx 0 10rpx">
+									<view class="font-bold" style="padding-bottom:10rpx">机会类型:{{item.opportunityType}}
+									</view>
+									<view class="font-bold" style="padding-bottom:10rpx">
+										机会所处状态:{{item.opportunityStatus}}</view>
+									<!-- <view class="font-gray">{{ item.desc }}</view>灰色样式 -->
+								</view>
+							</view>
+						</view>
+					</block>
+					<!-- 重大事项信息 -->
+					<block v-if="activeTab === 1">
+						<view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index" @click="itemClick(item)">
+							<view class="report-list">
+								<view class="title r-list">
+									<view class="r-left" style="font-size:38rpx;">{{ item.cusName }}</view>
+									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
+										size="mini">{{ item.state }}</view>
+								</view>
+								<view style="padding:0rpx 0 10rpx">
+									<view class="font-bold" style="padding-bottom:10rpx">
+										产生的影响:{{item.theImpactGenerated}}</view>
+									<view class="font-bold" style="padding-bottom:10rpx">
+										重大事项类型:{{item.majorTypesOfMatters}}</view>
+									<!-- <view class="font-gray">{{ item.desc }}</view> -->
+								</view>
+							</view>
+						</view>
+					</block>
+					<!-- 竞争对手信息 -->
+					<block v-if="activeTab === 2">
+						<view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index" @click="itemClick(item)">
+							<view class="report-list">
+								<view class="title r-list">
+									<view class="r-left" style="font-size:38rpx;">{{ item.competitiveUnits }}</view>
+									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
+										size="mini">{{ item.state }}</view>
+								</view>
+								<view style="padding:0rpx 0 10rpx">
+									<view class="font-bold" style="padding-bottom:10rpx">
+										竞争对手一级标签:{{item.competitorLevelOne}}</view>
+									<view class="font-bold" style="padding-bottom:10rpx">
+										竞争对手二级标签:{{item.competitorLevelTwo}}</view>
+									<!-- <view class="font-gray">{{ item.desc }}</view> -->
+								</view>
+							</view>
+						</view>
+					</block>
+					<!-- 人员变化信息 -->
+					<block v-if="activeTab === 3">
+						<view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index" @click="itemClick(item)">
+							<view class="report-list">
+								<view class="title r-list">
+									<view class="r-left" style="font-size:38rpx;">{{ item.cusName }}</view>
+									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
+										size="mini">{{ item.state }}</view>
+								</view>
+								<view style="padding:0rpx 0 10rpx">
+									<view class="font-bold" style="padding-bottom:10rpx">客户人员名称:{{item.cusUserName}}
+									</view>
+									<view class="font-bold" style="padding-bottom:10rpx">原职务:{{item.originalPosition}}
+									</view>
+									<view class="font-bold" style="padding-bottom:10rpx">现职务:{{item.currentPosition}}
+									</view>
+									<!-- <view class="font-gray">{{ item.desc }}</view> -->
+								</view>
+							</view>
+						</view>
+					</block>
+					<!-- 重点型号任务信息 -->
+					<block v-if="activeTab === 4">
+						<view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index" @click="itemClick(item)">
+							<view class="report-list">
+								<view class="title r-list">
+									<view class="r-left" style="font-size:38rpx;">{{ item.cusName }}</view>
+									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
+										size="mini">{{ item.state }}</view>
+								</view>
+								<view style="padding:0rpx 0 10rpx">
+									<view class="font-bold" style="padding-bottom:10rpx">重点型号:{{item.keyModels}}</view>
+									<view class="font-bold" style="padding-bottom:10rpx">目前状态:{{item.currentStatus}}
+									</view>
+									<view class="font-gray">{{ item.desc }}</view>
+								</view>
+							</view>
+						</view>
+					</block>
+					<!-- 通用表单 -->
+					<block v-if="activeTab === 5">
+						<view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index" @click="itemClick(item)">
+							<view class="report-list">
+								<view class="title r-list">
+									<view class="r-left" style="font-size:38rpx;">{{ item.cusName }}</view>
+									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
+										size="mini">{{ item.state }}</view>
+								</view>
+								<view style="padding:0rpx 0 10rpx">
+									<view class="font-bold" style="padding-bottom:10rpx">标签:{{item.generalFormType}}
+									</view>
+
+									<view class="font-gray">内容:{{ item.informationContent }}</view>
+								</view>
+							</view>
+						</view>
+					</block>
+				</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 {
+		mattersList
+	} from '@/api/business.js'
+	import {
+		CrmMarketInformationList,
+		handleCrmMarketInfo
+	} from '@/api/crm/api_ys.js' 
+	// 获取导航栏高度用于内容区域padding
+	const navBarPaddingTop = ref(0);
+	onMounted(() => {
+		navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+	})
+	const mescrollInstance = ref(null);
+	const activeTab = ref(0); // 默认市场机会
+	const tabList = ['市场机会', '重大事项信息', '竞争对手信息', '人员变化信息', '重点型号任务信息', '通用表单'];
+	let handleNav = (index) => {
+		console.log(index + " 切换列表");
+		activeTab.value = index;
+
+		// 先重置列表（可选，避免新旧数据混在一起）
+		list.value = [];
+
+		// 手动触发 mescroll 下拉刷新，重新加载当前 tab 的数据
+		if (mescrollInstance.value) {
+			mescrollInstance.value.triggerDownScroll(); // 关键！触发下拉刷新，会调用 downCallback
+		}
+	}
+	// 新增
+	let handleAdd = () => {
+		if (activeTab.value == 0) {
+			console.log("市场机会")
+			uni.navigateTo({
+				url: '/pages/business/CRM/marketInformation/marketOpportunities'
+			})
+		} else if (activeTab.value == 1) {
+			console.log("重大机会事项")
+			uni.navigateTo({
+				url: '/pages/business/CRM/marketInformation/majorMatter'
+			})
+		} else if (activeTab.value == 2) {
+			console.log("竞争对手信息")
+			uni.navigateTo({
+				url: '/pages/business/CRM/marketInformation/competitor'
+			})
+		} else if (activeTab.value == 3) {
+			console.log("人员变化信息")
+			uni.navigateTo({
+				url: '/pages/business/CRM/marketInformation/personnelChanges'
+			})
+		} else if (activeTab.value == 4) {
+			console.log("重点型号任务信息")
+			uni.navigateTo({
+				url: '/pages/business/CRM/marketInformation/keyModelTasks'
+			})
+		} else if (activeTab.value == 5) {
+			console.log("通用表单")
+			uni.navigateTo({
+				url: '/pages/business/CRM/marketInformation/beCurrent'
+			})
+		} else {
+			console.log("其他？")
+		}
+		// uni.navigateTo({ url: '/pages/business/CRM/visitorReportAdd' })
+	}
+
+	// 查询列表
+	let list = ref([]);
+	const mescrollRef = ref(null);
+	const upOption = ref({
+		page: {
+			num: 0,
+			size: 10
+		},
+		noMoreSize: 5,
+		empty: {
+			tip: '~ 空空如也 ~'
+		},
+		textLoading: '加载中...',
+		textNoMore: '已经到底了'
+	});
+
+	const downOption = ref({
+		auto: true,
+		textInOffset: '下拉刷新',
+		textOutOffset: '释放更新',
+		textLoading: '刷新中...'
+	});
+
+	let cssFlag = ref(false); //控制样式
+	const mescrollInit = (mescroll) => {
+		cssFlag.value = true;
+		mescrollRef.value = mescroll;
+		mescrollInstance.value = mescroll;
+	};
+
+	// 下拉刷新
+	const downCallback = async (mescroll) => {
+		try {
+			const pageNo = 1;
+			const pageSize = upOption.value.size;
+			const type = activeTab.value + 1; // 当前tab索引
+			const description = tabList[activeTab.value]; // 当前tab文字
+
+			const res = await getCrmMarketInformationList(pageNo, pageSize, type, description);
+			list.value = res.list;
+			mescroll.resetUpScroll();
+		} catch (error) {
+			mescroll.endErr();
+		} finally {
+			mescroll.endSuccess();
+		}
+	}
+	// 上拉加载更多
+	const upCallback = async (mescroll) => {
+		try {
+			const pageNo = mescroll.num;
+			const pageSize = mescroll.size;
+			const type = activeTab.value; // 当前tab索引
+			const description = tabList[activeTab.value]; // 当前tab文字
+
+			const res = await getCrmMarketInformationList(pageNo, pageSize, type, description);
+			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 getCrmMarketInformationList = async (pageNo, pageSize, type, description) => {
+		const param = {
+			pageNo,
+			pageSize,
+			type,
+			description
+		};
+
+		const res = await CrmMarketInformationList(param);
+
+		return {
+			list: res.rows,
+			total: res.total
+		};
+	}
+
+	const itemView = async (item) => {
+		const state = (item.state || "").trim().toLowerCase()
+		if (state === "待提交" || state === "驳回") {
+			uni.showModal({
+				title: '操作确认',
+				content: '是否为商业航天行业板块信息？',
+				confirmText: '是',
+				cancelText: '否',
+				success: async (res) => {
+					if (res.confirm) {
+						item.commercialAerospace = "是"
+						try {
+							const res = await handleCrmMarketInfo(item)
+							if (res.code == 200) {
+								uni.showToast({
+									title: '提交成功',
+									duration: 2000
+								})
+							} else {
+								uni.showToast({
+									title: res.msg || '操作失败',
+									icon: 'none'
+								})
+							}
+							reload()
+						} catch {
+							uni.showToast({
+								title: '提交失败，请重试',
+								icon: 'none'
+							})
+						}
+					} else if (res.cancel) {
+						item.commercialAerospace = "否"
+						try {
+							const res = await handleCrmMarketInfo(item)
+							if (res.code == 200) {
+								uni.showToast({
+									title: '提交成功',
+									duration: 2000
+								})
+							} else {
+								uni.showToast({
+									title: res.msg || '操作失败',
+									icon: 'none'
+								})
+							}
+							reload()
+						} catch {
+							uni.showToast({
+								title: '提交失败，请重试',
+								icon: 'none'
+							})
+						}
+					}
+				}
+			})
+		} else {
+			uni.showToast({
+				title: "当前状态不可操作",
+				icon: "none",
+				duration: 2000
+			})
+		}
+	}
+
+
+
+	const itemClick = async (item) => {
+		if(item.informationType=='市场机会'){
+			uni.navigateTo({
+				url: '/pages/business/CRM/marketInformation/marketOpportunitiesDetail?informationId='+ item.informationId
+			})
+		}else if(item.informationType=='重大事项信息'){
+			uni.navigateTo({
+				url: '/pages/business/CRM/marketInformation/majorMatterDetail?informationId='+ item.informationId
+			})
+			
+		}else if(item.informationType=='竞争对手信息'){
+			uni.navigateTo({
+				url: '/pages/business/CRM/marketInformation/competitorDetail?informationId='+ item.informationId
+			})
+		}else if(item.informationType=='人员变化信息'){
+			uni.navigateTo({
+				url: '/pages/business/CRM/marketInformation/personnelChangesDetail?informationId='+ item.informationId
+			})
+		}else if(item.informationType=='重点型号任务信息'){
+			uni.navigateTo({
+				url: '/pages/business/CRM/marketInformation/keyModelTasksDetail?informationId='+ item.informationId
+			})
+		}else if(item.informationType=='通用表单'){
+			uni.navigateTo({
+				url: '/pages/business/CRM/marketInformation/beCurrentDetail?informationId='+ item.informationId
+			})
+		}
+		
+		else{
+			console.log("其他")
+		}
+		// console.log(item)
+		// uni.navigateTo({ url: '/pages/business/CRM/visitorReportAdd' })
+	}
+</script>
+
+<style scoped>
+	.all-body {
+		/* #ifdef APP-PLUS */
+		top: 88rpx;
+		height: calc(100vh - 44px);
+		/* #endif */
+		/* #ifndef APP-PLUS */
+		top: 100rpx;
+		height: calc(100vh - 48px);
+		/* #endif */
+
+	}
+
+	/*.market-con{
+
+} */
+
+	.nav-list {
+		display: flex;
+		flex-wrap: wrap;
+		/* #ifdef APP-PLUS */
+		padding: 80rpx 30rpx 0;
+		/* #endif */
+		/* #ifndef APP-PLUS */
+		padding: 20rpx 30rpx 0;
+		/* #endif */
+	}
+
+	.nav-list .nav-item {
+		background-color: #05A3F4;
+		border-radius: 10rpx;
+		color: #FFFFFF;
+		font-size: 28rpx;
+		text-align: center;
+		padding: 10rpx 25rpx;
+		margin-right: 15rpx;
+		margin-bottom: 20rpx;
+	}
+
+	.nav-list .nav-item:nth-child(3n) {
+		margin-right: 0;
+	}
+
+	.nav-list .nav-item.active {
+		background-color: #fff;
+		color: #3384DF;
+		font-weight: bold;
+
+	}
+
+	.report-list .r-list {
+		align-items: flex-start;
+	}
+
+
+	.scroll-h {
+		/* #ifdef APP-PLUS */
+		height: calc(100vh - 155px);
+		/* #endif */
+		/* #ifndef APP-PLUS */
+		height: calc(100vh - 135px);
+		/* #endif */
+	}
+
+	.white-bg {
+		padding-top: 10rpx;
+		padding-bottom: 10rpx;
+	}
+
+	.report-list .title {
+		display: flex;
+	}
+</style>
--- a/src/pages/business/CRM/marketInformation/marketOpportunities.vue
+++ b/src/pages/business/CRM/marketInformation/marketOpportunities.vue
@@ -0,0 +1,337 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'市场机会添加'" :leftFlag="true" :rightFlag="true">
+				<template #right>
+					<view class="head-right" @click="submitForm">
+						<uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
+							color="#B7D2FF"></uni-icons>保存
+					</view>
+				</template>
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 正文内容 -->
+			<view class="white-bg">
+				<view class="form-con">
+					<uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px">
+						<uni-forms-item label="客户名称" name="cusName" class="f-c-right">
+						  <view 
+						    @click="chooseCustomer" 
+						    class="form-item-container"
+						  >
+						    <text class="name">{{ formData.cusName || '点击选择客户' }}</text>
+						  </view>
+						</uni-forms-item>
+						<uni-forms-item label="机会类型" name="opportunityType" class="f-c-right">
+							<picker @change="onOpportunityTypeChange" :value="opportunityTypeIndex" :range="array"
+								:range-key="'name'">
+								<view class="picker">
+									{{ array[opportunityTypeIndex]?.name || '请选择机会类型' }}
+									<uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+								</view>
+							</picker>
+						</uni-forms-item>
+						<uni-forms-item label="了解途径" name="understandTheWay" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.understandTheWay"
+								placeholder="请输入了解途径" class="form-texarea" />
+						</uni-forms-item>
+						<uni-forms-item label="机会描述" name="opportunityDescription" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.opportunityDescription"
+								placeholder="请输入机会描述" class="form-texarea" />
+						</uni-forms-item>
+						<uni-forms-item label="机会所处状态" name="opportunityStatus" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.opportunityStatus"
+								placeholder="请输入机会所处状态" class="form-texarea" />
+						</uni-forms-item>
+						<uni-forms-item label="预测金额情况" name="predictedAmount" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.predictedAmount"
+								placeholder="请输入预测金额或情况" class="form-texarea" />
+						</uni-forms-item>
+						<uni-forms-item label="竞争情况" name="competitionSituation" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.competitionSituation"
+								placeholder="请输入竞争情况" class="form-texarea" />
+						</uni-forms-item>
+						<uni-forms-item label="备注" name="remark"
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.remark" placeholder="请输入备注"
+								class="form-texarea" />
+						</uni-forms-item>
+					</uni-forms>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		 ref, onMounted, reactive, onUnmounted, computed 
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import {
+		getGuestList
+	} from '@/api/business.js'
+	import { isEmpty } from '@/utils/validate.js'
+	import {crmMarketInformationAdd } from '@/api/crm/api_ys.js'
+	
+	
+	let customerUser = reactive({})
+	// 客户相关
+	const guestList = ref([])
+	const guestArr = ref([])
+	const guestIndex = ref(0)
+
+	// 表单数据
+	const formData = ref({
+		cusId: null,
+		cusName: null,
+		opportunityType: "", // 机会类型
+		understandTheWay: "", // 了解途径
+		opportunityDescription: "", // 机会描述
+		opportunityStatus: "", // 机会所处状态
+		predictedAmount: "", // 预测金额或情况
+		competitionSituation: "", // 竞争情况
+		remark: "", // 备注
+		picture: "", // 图片
+		informationType: "市场机会" // 信息类型
+	})
+
+	// 表单验证规则
+	const rules = {
+		cusName: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择客户'
+			}]
+		},
+		opportunityType: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择机会类型'
+			}]
+		},
+		understandTheWay: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入了解途径'
+			}]
+		},
+		opportunityDescription: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入机会描述'
+			}]
+		},
+		opportunityStatus: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入机会所处状态'
+			}]
+		},
+		predictedAmount: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入预测金额或情况'
+			}]
+		},
+		competitionSituation: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入竞争情况'
+			}]
+		},
+	}
+	const imgList = ref([])
+
+	// picker 相关
+	const index = ref(0)
+	const array = ref([{
+			id: 0,
+			name: '新产品需求'
+		},
+		{
+			id: 1,
+			name: '新客户开发'
+		},
+		{
+			id: 2,
+			name: '批产任务'
+		},
+		{
+			id: 3,
+			name: '新研任务'
+		},
+		{
+			id: 4,
+			name: '二筛服务'
+		},
+		{
+			id: 5,
+			name: '对手失利'
+		},
+		{
+			id: 6,
+			name: '其它'
+		}
+	])
+	const form = ref({
+		cusId: null,
+		cusName: null,
+		opportunityType: "", // 机会类型
+		understandTheWay: "", // 了解途径
+		opportunityDescription: "", // 机会描述
+		opportunityStatus: "", // 机会所处状态
+		predictedAmount: "", // 预测金额或情况
+		competitionSituation: "", // 竞争情况
+		remark: "", // 备注
+		picture: "", // 图片
+		informationType: "市场机会" // 信息类型
+	})
+
+	// picker 选项
+	const opportunityTypeOptions = ref([{
+			id: 0,
+			name: '新产品需求'
+		},
+		{
+			id: 1,
+			name: '新客户开发'
+		},
+		{
+			id: 2,
+			name: '批产任务'
+		},
+		{
+			id: 3,
+			name: '新研任务'
+		},
+		{
+			id: 4,
+			name: '二筛服务'
+		},
+		{
+			id: 5,
+			name: '对手失利'
+		},
+		{
+			id: 6,
+			name: '其它'
+		}
+	])
+	const opportunityTypeIndex = ref(0)
+
+	// 表单引用 & 客户选择器引用
+	const formRef = ref(null)
+	const customHeaderRef = ref(null)
+	// 选择客户页面跳转
+	function chooseCustomer(){
+		uni.navigateTo({
+			url: '/pages/business/CRM/chooseCus'
+		})  
+	} 
+	//定义数据接收的值
+	let selectedCustomer = reactive(null)
+	
+	//监听时间
+	onMounted(() => {
+	    uni.$on('onCustomerSelected', handleCustomerSelected)
+	})
+	//取消监听
+	onUnmounted(() => {
+	    uni.$off('onCustomerSelected', handleCustomerSelected)
+	})
+	
+	//处理 接收数据
+	const handleCustomerSelected = (data) => {
+	    formData.value.cusName = data.cusName
+	    formData.value.cusId = data.cusId
+	    console.log("收到客户数据的值：", customerUser)
+	}
+
+	
+	
+	
+	
+	// 提交表单
+	const submitForm = async () => {
+		try {
+			// 表单校验
+			await formRef.value.validate()
+            const res = await crmMarketInformationAdd(formData.value);
+			console.log(res)
+			uni.showToast({
+				title: '提交成功',
+				icon: 'success'
+			})
+			console.log('表单数据:', formData.value)
+
+			// TODO: 在这里添加提交到后端的逻辑，比如调用 api.CrmMarketInformationAdd(formData.value)
+			// 暂时只做校验提示
+
+		} catch (err) {
+			console.log('表单验证失败:', err)
+		}
+	}
+
+	const onOpportunityTypeChange = (e) => {
+		opportunityTypeIndex.value = e.detail.value
+		console.log('opportunityTypeIndex:', array.value[e.detail.value]?.name)
+		formData.value.opportunityType = array.value[e.detail.value]?.name || ''
+	}
+	
+	
+	// 如果你原来在 onShow 中做了类似这样：
+	// let res = currPage.data.cusData; 判断是否传入了客户信息
+	// 那么在 Vue3 中通常是通过路由参数或者 Vuex/Pinia 等状态管理获取
+	// 暂时不做，如你后续需要可继续补充
+</script>
+
+<style scoped>
+	.white-bg {
+		width: 750rpx;
+		padding: 30rpx 0 0;
+		margin-bottom: 0;
+		border-radius: 8px 8px 0 0;
+	}
+
+	.form-con {
+		/* #ifdef APP-PLUS */
+		height: calc(120vh - 100px)
+			/* #endif */
+			/* #ifndef APP-PLUS */
+			height:calc(120vh - 80px)
+			/* #endif */
+	}
+
+	:deep(.uni-date-x) {
+		display: block;
+	}
+
+	:deep(.uni-date-x .icon-calendar) {
+		float: right;
+		margin-top: 15rpx;
+		margin-right: 20rpx;
+		background: url('../../../static/images/business/icon-date.png') no-repeat;
+		background-size: 32rpx 35rpx;
+		width: 32rpx;
+		height: 35rpx;
+	}
+
+	:deep(.uni-date-x .icon-calendar::before) {
+		display: none;
+	}
+
+	:deep(.uni-date-x .uni-date__x-input) {
+		padding-left: 20rpx;
+		color: #919191;
+	}
+</style>
--- a/src/pages/business/CRM/marketInformation/marketOpportunitiesDetail.vue
+++ b/src/pages/business/CRM/marketInformation/marketOpportunitiesDetail.vue
@@ -0,0 +1,364 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'市场机会修改'" :leftFlag="true" :rightFlag="true">
+				<template #right>
+					<view class="head-right" @click="submitForm">
+						<uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
+							color="#B7D2FF"></uni-icons>保存
+					</view>
+				</template>
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 正文内容 -->
+			<view class="white-bg">
+				<view class="form-con">
+					<uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px">
+						<uni-forms-item label="客户名称" name="cusName" class="f-c-right">
+						  <view 
+						    @click="chooseCustomer" 
+						    class="form-item-container"
+						  >
+						    <text class="name">{{ formData.cusName || '点击选择客户' }}</text>
+						  </view>
+						</uni-forms-item>
+						<uni-forms-item label="机会类型" name="opportunityType" class="f-c-right">
+							<picker @change="onOpportunityTypeChange" :value="opportunityTypeIndex" :range="array"
+								:range-key="'name'">
+								<view class="picker">
+									{{ array[opportunityTypeIndex]?.name || '请选择机会类型' }}
+									<uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+								</view>
+							</picker>
+						</uni-forms-item>
+						<uni-forms-item label="了解途径" name="understandTheWay" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.understandTheWay"
+								placeholder="请输入了解途径" class="form-texarea" />
+						</uni-forms-item>
+						<uni-forms-item label="机会描述" name="opportunityDescription" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.opportunityDescription"
+								placeholder="请输入机会描述" class="form-texarea" />
+						</uni-forms-item>
+						<uni-forms-item label="机会所处状态" name="opportunityStatus" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.opportunityStatus"
+								placeholder="请输入机会所处状态" class="form-texarea" />
+						</uni-forms-item>
+						<uni-forms-item label="预测金额情况" name="predictedAmount" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.predictedAmount"
+								placeholder="请输入预测金额或情况" class="form-texarea" />
+						</uni-forms-item>
+						<uni-forms-item label="竞争情况" name="competitionSituation" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.competitionSituation"
+								placeholder="请输入竞争情况" class="form-texarea" />
+						</uni-forms-item>
+						<uni-forms-item label="备注" name="remark"
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.remark" placeholder="请输入备注"
+								class="form-texarea" />
+						</uni-forms-item>
+						
+					</uni-forms>
+					
+					<view class="footer-con">
+					    <button class="btn-default" type="default" @click="handleDelete" size="mini">删 除</button>
+					    <button class="btn-primary" type="primary" @click="submitForm" size="mini">保存/修改</button>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		 ref, onMounted, reactive, onUnmounted, computed ,watch
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import {
+		getGuestList
+	} from '@/api/business.js'
+	import { isEmpty } from '@/utils/validate.js'
+	import { onLoad } from '@dcloudio/uni-app'
+	import {crmMarketInformationAdd,crminformationItemForDetail,crmMarketInformationDelete } from '@/api/crm/api_ys.js'
+	import { useMessage } from '@/utils/message.js'
+	import cache from '@/utils/cache.js'
+	
+	const message = useMessage();
+	let customerUser = reactive({})
+	// 客户相关
+	const guestList = ref([])
+	const guestArr = ref([])
+	const guestIndex = ref(0)
+
+	// 表单数据
+	const formData = ref({
+		cusId: null,
+		cusName: null,
+		opportunityType: "", // 机会类型
+		understandTheWay: "", // 了解途径
+		opportunityDescription: "", // 机会描述
+		opportunityStatus: "", // 机会所处状态
+		predictedAmount: "", // 预测金额或情况
+		competitionSituation: "", // 竞争情况
+		remark: "", // 备注
+		picture: "", // 图片
+		informationType: "市场机会" // 信息类型
+	})
+
+	// 表单验证规则
+	const rules = {
+		cusName: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择客户'
+			}]
+		},
+		opportunityType: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择机会类型'
+			}]
+		},
+		understandTheWay: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入了解途径'
+			}]
+		},
+		opportunityDescription: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入机会描述'
+			}]
+		},
+		opportunityStatus: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入机会所处状态'
+			}]
+		},
+		predictedAmount: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入预测金额或情况'
+			}]
+		},
+		competitionSituation: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入竞争情况'
+			}]
+		},
+	}
+	const imgList = ref([])
+
+	// picker 相关
+	const index = ref(0)
+	const array = ref([{
+			id: 0,
+			name: '新产品需求'
+		},
+		{
+			id: 1,
+			name: '新客户开发'
+		},
+		{
+			id: 2,
+			name: '批产任务'
+		},
+		{
+			id: 3,
+			name: '新研任务'
+		},
+		{
+			id: 4,
+			name: '二筛服务'
+		},
+		{
+			id: 5,
+			name: '对手失利'
+		},
+		{
+			id: 6,
+			name: '其它'
+		}
+	])
+	const form = ref({
+		cusId: null,
+		cusName: null,
+		opportunityType: "", // 机会类型
+		understandTheWay: "", // 了解途径
+		opportunityDescription: "", // 机会描述
+		opportunityStatus: "", // 机会所处状态
+		predictedAmount: "", // 预测金额或情况
+		competitionSituation: "", // 竞争情况
+		remark: "", // 备注
+		picture: "", // 图片
+		informationType: "市场机会" // 信息类型
+	})
+
+	// picker 选项
+	const opportunityTypeOptions = ref([{
+			id: 0,
+			name: '新产品需求'
+		},
+		{
+			id: 1,
+			name: '新客户开发'
+		},
+		{
+			id: 2,
+			name: '批产任务'
+		},
+		{
+			id: 3,
+			name: '新研任务'
+		},
+		{
+			id: 4,
+			name: '二筛服务'
+		},
+		{
+			id: 5,
+			name: '对手失利'
+		},
+		{
+			id: 6,
+			name: '其它'
+		}
+	])
+	const opportunityTypeIndex = ref(0)
+
+	// 表单引用 & 客户选择器引用
+	const formRef = ref(null)
+	const customHeaderRef = ref(null)
+	// 选择客户页面跳转
+	function chooseCustomer(){
+		uni.navigateTo({
+			url: '/pages/business/CRM/chooseCus'
+		})  
+	} 
+	//定义数据接收的值
+	let selectedCustomer = reactive(null)
+	
+	//监听时间
+	onMounted(() => {
+	    uni.$on('onCustomerSelected', handleCustomerSelected)
+	})
+	//取消监听
+	onUnmounted(() => {
+	    uni.$off('onCustomerSelected', handleCustomerSelected)
+	})
+	
+	//处理 接收数据
+	const handleCustomerSelected = (data) => {
+	    formData.value.cusName = data.cusName
+	    formData.value.cusId = data.cusId
+	    console.log("收到客户数据的值：", customerUser)
+	}
+//定义查询参数
+const queryParams = ref({
+    informationId: 0
+})
+onMounted(() => {
+    crminformationItemForDetail1()
+})
+	onLoad(options => {
+	    queryParams.value.informationId = options.informationId
+	})
+	const dataList = ref([])
+	function crminformationItemForDetail1() {
+	    crminformationItemForDetail(queryParams.value).then(res => {
+	       formData.value = res.rows[0]
+	    })
+	}
+	
+	// 提交表单
+	const submitForm = async () => {
+		try {
+			// 表单校验
+			await formRef.value.validate()
+            const res = await crmMarketInformationAdd(formData.value);
+			console.log(res)
+			uni.showToast({
+				title: '提交成功',
+				icon: 'success'
+			})
+			uni.$emit('refreshMarketOpportunityList')
+			uni.navigateBack(1)
+
+		} catch (err) {
+			console.log('表单验证失败:', err)
+		}
+	}
+	// 根据ID删除表单
+	const handleDelete = async () => {
+		try {
+
+	        const res = await crmMarketInformationDelete (formData.value);
+			uni.showToast({
+				title: '删除成功',
+				icon: 'success'
+			})
+			uni.navigateBack(1)
+		} catch (err) {
+			console.log('表单验证失败:', err)
+		}
+	}
+
+	const onOpportunityTypeChange = (e) => {
+		opportunityTypeIndex.value = e.detail.value
+		console.log('opportunityTypeIndex:', array.value[e.detail.value]?.name)
+		formData.value.opportunityType = array.value[e.detail.value]?.name || ''
+	}
+</script>
+
+<style scoped>
+	.white-bg {
+		width: 750rpx;
+		padding: 30rpx 0 0;
+		margin-bottom: 0;
+		border-radius: 8px 8px 0 0;
+	}
+
+	.form-con {
+		/* #ifdef APP-PLUS */
+		height: calc(120vh - 100px)
+			/* #endif */
+			/* #ifndef APP-PLUS */
+			height:calc(120vh - 80px)
+			/* #endif */
+	}
+
+	:deep(.uni-date-x) {
+		display: block;
+	}
+
+	:deep(.uni-date-x .icon-calendar) {
+		float: right;
+		margin-top: 15rpx;
+		margin-right: 20rpx;
+		background: url('../../../static/images/business/icon-date.png') no-repeat;
+		background-size: 32rpx 35rpx;
+		width: 32rpx;
+		height: 35rpx;
+	}
+
+	:deep(.uni-date-x .icon-calendar::before) {
+		display: none;
+	}
+
+	:deep(.uni-date-x .uni-date__x-input) {
+		padding-left: 20rpx;
+		color: #919191;
+	}
+</style>
--- a/src/pages/business/CRM/marketInformation/personnelChanges.vue
+++ b/src/pages/business/CRM/marketInformation/personnelChanges.vue
@@ -0,0 +1,334 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'人员变化添加'" :leftFlag="true" :rightFlag="true">
+				<template #right>
+					<view class="head-right" @click="submitForm">
+						<uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
+							color="#B7D2FF"></uni-icons>保存
+					</view>
+				</template>
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 正文内容 -->
+			<view class="white-bg">
+				<view class="form-con">
+					<uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px">
+						<uni-forms-item label="客户名称" name="cusName" class="f-c-right">
+							<view @click="chooseCustomer" class="form-item-container">
+								<text class="name">{{ formData.cusName || '点击选择客户' }}</text>
+							</view>
+						</uni-forms-item>
+						<uni-forms-item label="客户人员" name="cusUserName" class="f-c-right">
+							<uni-easyinput v-model="formData.cusUserName" placeholder="请选择客户人员" name="input"
+								@focus="chooseClientUser"></uni-easyinput>
+						</uni-forms-item>
+						<uni-forms-item label="原职务" name="originalPosition" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.originalPosition"
+								placeholder="请输入原职务" class="form-texarea" />
+						</uni-forms-item>
+						<uni-forms-item label="现职务" name="currentPosition" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.currentPosition"
+								placeholder="请输入现职务" class="form-texarea" />
+						</uni-forms-item>
+						<uni-forms-item label="现职务是否与我司业务相关" name="positionOfOurCompany" class="f-c-right">
+							<picker @change="onpoSitionOfOurCompanyChange" :value="positionOfOurCompanyIndex"
+								:range="array" :range-key="'name'">
+								<view class="picker">
+									{{ array[positionOfOurCompanyIndex]?.name || '请选择机会类型' }}
+									<uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+								</view>
+							</picker>
+						</uni-forms-item>
+						<uni-forms-item label="公关力度" name="developmentEfforts" class="f-c-right">
+							<picker @change="onDevelopmentEffortsChange" :value="developmentEffortsIndex"
+								:range="array1" :range-key="'name'">
+								<view class="picker">
+									{{ array1[developmentEffortsIndex]?.name || '请选择公关力度' }}
+									<uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+								</view>
+							</picker>
+						</uni-forms-item>
+						<uni-forms-item label="继任者" name="successor" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.successor" placeholder="请输入继任者"
+								class="form-texarea" />
+						</uni-forms-item>
+						<uni-forms-item label="备注" name="remark" class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.remark" placeholder="请输入备注"
+								class="form-texarea" />
+						</uni-forms-item>
+					</uni-forms>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		reactive,
+		onUnmounted,
+		computed
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import cache from '@/utils/cache'
+	import { onShow, onUnload } from '@dcloudio/uni-app';
+	import {
+		getGuestList
+	} from '@/api/business.js'
+	import {
+		isEmpty
+	} from '@/utils/validate.js'
+	import {
+		crmMarketInformationAdd
+	} from '@/api/crm/api_ys.js'
+
+
+	let customerUser = reactive({})
+	// 客户相关
+	const guestList = ref([])
+	const guestArr = ref([])
+	const guestIndex = ref(0)
+
+	// 表单数据
+	const formData = ref({
+		cusId: null,
+		cusName: null,
+		cusUserName: null, //客户人员名称
+		originalPosition: null, //原职务
+		currentPosition: null, //现职务
+		positionOfOurCompany: '是', //现职务是否与我公司业务相关
+		developmentEfforts: '加强', //攻关力度
+		successor: null, //继任者
+		remark: "", //、备注
+		picture: "", //、图片
+		photos: null,
+		cusPersonnel: '',
+		informationType: "人员变化信息" //信息类型
+	})
+
+	// 表单验证规则
+	const rules = {
+		cusName: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择客户'
+			}]
+		},
+		cusUserName: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择客户人员'
+			}]
+		},
+		originalPosition: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入原职务'
+			}]
+		},
+		currentPosition: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入现职务'
+			}]
+		},
+		positionOfOurCompany: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择现职务是否与我公司业务相关'
+			}]
+		},
+		developmentEfforts: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择公关力度'
+			}]
+		},
+		successor: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入继任者'
+			}]
+		},
+	}
+	const imgList = ref([])
+
+	// picker 相关
+	const index = ref(0)
+	const array = ref([{
+			id: 0,
+			name: '是'
+		},
+		{
+			id: 1,
+			name: '否'
+		}
+	])
+
+	const array1 = ref([{
+			id: 0,
+			name: '加强'
+		},
+		{
+			id: 1,
+			name: '维持'
+		},
+		{
+			id: 2,
+			name: '减弱'
+		}
+
+	])
+	const opportunityTypeIndex = ref(0)
+	const positionOfOurCompanyIndex = ref(0)
+	const developmentEffortsIndex = ref(0)
+	// 表单引用 & 客户选择器引用
+	const formRef = ref(null)
+	const customHeaderRef = ref(null)
+	// 选择客户页面跳转
+	function chooseCustomer() {
+		uni.navigateTo({
+			url: '/pages/business/CRM/chooseCus'
+		})
+	}
+	//定义数据接收的值
+	let selectedCustomer = reactive(null)
+
+	//监听时间
+	onMounted(() => {
+		uni.$on('onCustomerSelected', handleCustomerSelected)
+	})
+	//取消监听
+	onUnmounted(() => {
+		uni.$off('onCustomerSelected', handleCustomerSelected)
+	})
+
+	//处理 接收数据
+	const handleCustomerSelected = (data) => {
+		formData.value.cusName = data.cusName
+		formData.value.cusId = data.cusId
+		console.log("收到客户数据的值：", customerUser)
+	}
+
+	//选择客户人员
+	function chooseClientUser() {
+		console.log('点击了输入框', formData.value.cusName);
+		uni.navigateTo({
+			url: '/pages/business/CRM/customerUserList?cusName=' + formData.value.cusName
+		})
+	}
+//页面渲染完成后，查询catch的get
+onShow(() => {
+
+    if (cache.get('checkedRCClientList') != null && cache.get('checkedRCClientList') != []) {
+        formData.value.cusUserName = cache.get('checkedRCClientList')
+    }
+
+})
+//页面卸载之后，删除缓存信息
+onUnload(() => {
+    handleDeleteLocal()
+})
+
+//删除缓存
+let handleDeleteLocal = () => {
+    cache.remove('checkedRCClientList');
+}
+
+	// 提交表单
+	const submitForm = async () => {
+		try {
+			// 表单校验
+			await formRef.value.validate()
+			const cusUserName1 = formData.value.cusUserName;
+			const stringOfNames = cusUserName1.join(",") 
+			formData.value.cusUserName = stringOfNames
+			const res = await crmMarketInformationAdd(formData.value);
+			console.log(res)
+			uni.showToast({
+				title: '提交成功',
+				icon: 'success'
+			})
+			console.log('表单数据:', formData.value)
+
+			// TODO: 在这里添加提交到后端的逻辑，比如调用 api.CrmMarketInformationAdd(formData.value)
+			// 暂时只做校验提示
+
+		} catch (err) {
+			console.log('表单验证失败:', err)
+		}
+	}
+
+	const onOpportunityTypeChange = (e) => {
+		opportunityTypeIndex.value = e.detail.value
+		console.log('opportunityTypeIndex:', array.value[e.detail.value]?.name)
+		formData.value.opportunityType = array.value[e.detail.value]?.name || ''
+	}
+
+	const onpoSitionOfOurCompanyChange = (e) => {
+		positionOfOurCompanyIndex.value = e.detail.value
+		console.log('positionOfOurCompanyIndex:', array.value[e.detail.value]?.name)
+		formData.value.positionOfOurCompany = array.value[e.detail.value]?.name || ''
+	}
+
+	const onDevelopmentEffortsChange = (e) => {
+		developmentEffortsIndex.value = e.detail.value
+		console.log('developmentEffortsIndex:', array1.value[e.detail.value]?.name)
+		formData.value.opportunityType = array1.value[e.detail.value]?.name || ''
+	}
+	// 如果你原来在 onShow 中做了类似这样：
+	// let res = currPage.data.cusData; 判断是否传入了客户信息
+	// 那么在 Vue3 中通常是通过路由参数或者 Vuex/Pinia 等状态管理获取
+	// 暂时不做，如你后续需要可继续补充
+</script>
+
+<style scoped>
+	.white-bg {
+		width: 750rpx;
+		padding: 30rpx 0 0;
+		margin-bottom: 0;
+		border-radius: 8px 8px 0 0;
+	}
+
+	.form-con {
+		/* #ifdef APP-PLUS */
+		height: calc(120vh - 100px)
+			/* #endif */
+			/* #ifndef APP-PLUS */
+			height:calc(120vh - 80px)
+			/* #endif */
+	}
+
+	:deep(.uni-date-x) {
+		display: block;
+	}
+
+	:deep(.uni-date-x .icon-calendar) {
+		float: right;
+		margin-top: 15rpx;
+		margin-right: 20rpx;
+		background: url('../../../static/images/business/icon-date.png') no-repeat;
+		background-size: 32rpx 35rpx;
+		width: 32rpx;
+		height: 35rpx;
+	}
+
+	:deep(.uni-date-x .icon-calendar::before) {
+		display: none;
+	}
+
+	:deep(.uni-date-x .uni-date__x-input) {
+		padding-left: 20rpx;
+		color: #919191;
+	}
+</style>
--- a/src/pages/business/CRM/marketInformation/personnelChangesDetail.vue
+++ b/src/pages/business/CRM/marketInformation/personnelChangesDetail.vue
@@ -0,0 +1,369 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'人员变化添加'" :leftFlag="true" :rightFlag="true">
+				<template #right>
+					<view class="head-right" @click="submitForm">
+						<uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
+							color="#B7D2FF"></uni-icons>保存
+					</view>
+				</template>
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 正文内容 -->
+			<view class="white-bg">
+				<view class="form-con">
+					<uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px">
+						<uni-forms-item label="客户名称" name="cusName" class="f-c-right">
+							<view @click="chooseCustomer" class="form-item-container">
+								<text class="name">{{ formData.cusName || '点击选择客户' }}</text>
+							</view>
+						</uni-forms-item>
+						<uni-forms-item label="客户人员" name="cusUserName" class="f-c-right">
+							<uni-easyinput v-model="formData.cusUserName" placeholder="请选择客户人员" name="input"
+								@focus="chooseClientUser"></uni-easyinput>
+						</uni-forms-item>
+						<uni-forms-item label="原职务" name="originalPosition" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.originalPosition"
+								placeholder="请输入原职务" class="form-texarea" />
+						</uni-forms-item>
+						<uni-forms-item label="现职务" name="currentPosition" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.currentPosition"
+								placeholder="请输入现职务" class="form-texarea" />
+						</uni-forms-item>
+						<uni-forms-item label="现职务是否与我司业务相关" name="positionOfOurCompany" class="f-c-right">
+							<picker @change="onpoSitionOfOurCompanyChange" :value="positionOfOurCompanyIndex"
+								:range="array" :range-key="'name'">
+								<view class="picker">
+									{{ array[positionOfOurCompanyIndex]?.name || '请选择机会类型' }}
+									<uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+								</view>
+							</picker>
+						</uni-forms-item>
+						<uni-forms-item label="公关力度" name="developmentEfforts" class="f-c-right">
+							<picker @change="onDevelopmentEffortsChange" :value="developmentEffortsIndex"
+								:range="array1" :range-key="'name'">
+								<view class="picker">
+									{{ array1[developmentEffortsIndex]?.name || '请选择公关力度' }}
+									<uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
+								</view>
+							</picker>
+						</uni-forms-item>
+						<uni-forms-item label="继任者" name="successor" required
+							class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.successor" placeholder="请输入继任者"
+								class="form-texarea" />
+						</uni-forms-item>
+						<uni-forms-item label="备注" name="remark" class="uni-forms-item is-direction-top is-top">
+							<uni-easyinput type="textarea" autoHeight v-model="formData.remark" placeholder="请输入备注"
+								class="form-texarea" />
+						</uni-forms-item>
+					</uni-forms>
+					<view class="footer-con">
+					    <button class="btn-default" type="default" @click="handleDelete" size="mini">删 除</button>
+					    <button class="btn-primary" type="primary" @click="submitForm" size="mini">保存/修改</button>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		reactive,
+		onUnmounted,
+		computed
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import { onShow, onUnload,onLoad } from '@dcloudio/uni-app';
+	import {
+		getGuestList
+	} from '@/api/business.js'
+	import {
+		isEmpty
+	} from '@/utils/validate.js'
+	import {
+		crmMarketInformationAdd,crminformationItemForDetail,crmMarketInformationDelete 
+	} from '@/api/crm/api_ys.js'
+	import { useMessage } from '@/utils/message.js'
+	import cache from '@/utils/cache.js'
+
+	let customerUser = reactive({})
+	// 客户相关
+	const guestList = ref([])
+	const guestArr = ref([])
+	const guestIndex = ref(0)
+
+	// 表单数据
+	const formData = ref({
+		cusId: null,
+		cusName: null,
+		cusUserName: null, //客户人员名称
+		originalPosition: null, //原职务
+		currentPosition: null, //现职务
+		positionOfOurCompany: '是', //现职务是否与我公司业务相关
+		developmentEfforts: '加强', //攻关力度
+		successor: null, //继任者
+		remark: "", //、备注
+		picture: "", //、图片
+		photos: null,
+		cusPersonnel: '',
+		informationType: "人员变化信息" //信息类型
+	})
+
+	// 表单验证规则
+	const rules = {
+		cusName: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择客户'
+			}]
+		},
+		cusUserName: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择客户人员'
+			}]
+		},
+		originalPosition: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入原职务'
+			}]
+		},
+		currentPosition: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入现职务'
+			}]
+		},
+		positionOfOurCompany: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择现职务是否与我公司业务相关'
+			}]
+		},
+		developmentEfforts: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择公关力度'
+			}]
+		},
+		successor: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入继任者'
+			}]
+		},
+	}
+	const imgList = ref([])
+
+	// picker 相关
+	const index = ref(0)
+	const array = ref([{
+			id: 0,
+			name: '是'
+		},
+		{
+			id: 1,
+			name: '否'
+		}
+	])
+
+	const array1 = ref([{
+			id: 0,
+			name: '加强'
+		},
+		{
+			id: 1,
+			name: '维持'
+		},
+		{
+			id: 2,
+			name: '减弱'
+		}
+
+	])
+	const opportunityTypeIndex = ref(0)
+	const positionOfOurCompanyIndex = ref(0)
+	const developmentEffortsIndex = ref(0)
+	// 表单引用 & 客户选择器引用
+	const formRef = ref(null)
+	const customHeaderRef = ref(null)
+	// 选择客户页面跳转
+	function chooseCustomer() {
+		uni.navigateTo({
+			url: '/pages/business/CRM/chooseCus'
+		})
+	}
+	//定义数据接收的值
+	let selectedCustomer = reactive(null)
+
+	//监听时间
+	onMounted(() => {
+		uni.$on('onCustomerSelected', handleCustomerSelected)
+	})
+	//取消监听
+	onUnmounted(() => {
+		uni.$off('onCustomerSelected', handleCustomerSelected)
+	})
+
+	//处理 接收数据
+	const handleCustomerSelected = (data) => {
+		formData.value.cusName = data.cusName
+		formData.value.cusId = data.cusId
+		console.log("收到客户数据的值：", customerUser)
+	}
+
+	//选择客户人员
+	function chooseClientUser() {
+		console.log('点击了输入框', formData.value.cusName);
+		uni.navigateTo({
+			url: '/pages/business/CRM/customerUserList?cusName=' + formData.value.cusName
+		})
+	}
+//页面渲染完成后，查询catch的get
+onShow(() => {
+
+    if (cache.get('checkedRCClientList') != null && cache.get('checkedRCClientList') != []) {
+        formData.value.cusUserName = cache.get('checkedRCClientList')
+    }
+
+})
+//页面卸载之后，删除缓存信息
+onUnload(() => {
+    handleDeleteLocal()
+})
+
+//删除缓存
+let handleDeleteLocal = () => {
+    cache.remove('checkedRCClientList');
+}
+
+	// 提交表单
+	const submitForm = async () => {
+		try {
+			// 表单校验
+			await formRef.value.validate()
+			const cusUserName1 = formData.value.cusUserName;
+			const stringOfNames = cusUserName1.join(",") 
+			formData.value.cusUserName = stringOfNames
+			const res = await crmMarketInformationAdd(formData.value);
+			console.log(res)
+			uni.showToast({
+				title: '提交成功',
+				icon: 'success'
+			})
+			uni.$emit('refreshMarketOpportunityList')
+			uni.navigateBack(1)
+
+			// TODO: 在这里添加提交到后端的逻辑，比如调用 api.CrmMarketInformationAdd(formData.value)
+			// 暂时只做校验提示
+
+		} catch (err) {
+			console.log('表单验证失败:', err)
+		}
+	}
+
+	const onOpportunityTypeChange = (e) => {
+		opportunityTypeIndex.value = e.detail.value
+		console.log('opportunityTypeIndex:', array.value[e.detail.value]?.name)
+		formData.value.opportunityType = array.value[e.detail.value]?.name || ''
+	}
+
+	const onpoSitionOfOurCompanyChange = (e) => {
+		positionOfOurCompanyIndex.value = e.detail.value
+		console.log('positionOfOurCompanyIndex:', array.value[e.detail.value]?.name)
+		formData.value.positionOfOurCompany = array.value[e.detail.value]?.name || ''
+	}
+
+	const onDevelopmentEffortsChange = (e) => {
+		developmentEffortsIndex.value = e.detail.value
+		console.log('developmentEffortsIndex:', array1.value[e.detail.value]?.name)
+		formData.value.opportunityType = array1.value[e.detail.value]?.name || ''
+	}
+	//定义查询参数
+	const queryParams = ref({
+	    informationId: 0
+	})
+	onMounted(() => {
+	    crminformationItemForDetail1()
+	})
+		onLoad(options => {
+		    queryParams.value.informationId = options.informationId
+		})
+		const dataList = ref([])
+		
+		function crminformationItemForDetail1() {
+		    crminformationItemForDetail(queryParams.value).then(res => {
+		       formData.value = res.rows[0]
+		    })
+		}
+		
+	// 根据ID删除表单
+	const handleDelete = async () => {
+		try {
+	
+	        const res = await crmMarketInformationDelete(formData.value);
+			uni.showToast({
+				title: '删除成功',
+				icon: 'success'
+			})
+			uni.$emit('refreshMarketOpportunityList')
+			uni.navigateBack(1)
+		} catch (err) {
+			console.log('表单验证失败:', err)
+		}
+	}
+	
+</script>
+
+<style scoped>
+	.white-bg {
+		width: 750rpx;
+		padding: 30rpx 0 0;
+		margin-bottom: 0;
+		border-radius: 8px 8px 0 0;
+	}
+
+	.form-con {
+		/* #ifdef APP-PLUS */
+		height: calc(120vh - 100px)
+			/* #endif */
+			/* #ifndef APP-PLUS */
+			height:calc(120vh - 80px)
+			/* #endif */
+	}
+
+	:deep(.uni-date-x) {
+		display: block;
+	}
+
+	:deep(.uni-date-x .icon-calendar) {
+		float: right;
+		margin-top: 15rpx;
+		margin-right: 20rpx;
+		background: url('../../../static/images/business/icon-date.png') no-repeat;
+		background-size: 32rpx 35rpx;
+		width: 32rpx;
+		height: 35rpx;
+	}
+
+	:deep(.uni-date-x .icon-calendar::before) {
+		display: none;
+	}
+
+	:deep(.uni-date-x .uni-date__x-input) {
+		padding-left: 20rpx;
+		color: #919191;
+	}
+</style>
--- a/src/pages/business/CRM/visitorReport.vue
+++ b/src/pages/business/CRM/visitorReport.vue
@@ -64,7 +64,7 @@ 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 { visitorReportList } from '@/api/business.js'
+import { getYsVisistList } from '@/api/crm/api_ys.js'

 // 获取导航栏高度用于内容区域padding
 const navBarPaddingTop = ref(0);
@@ -89,10 +89,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: '已经到底了'
 });
@@ -114,7 +111,7 @@ const mescrollInit = (mescroll) => {
 const downCallback = async (mescroll) => {
    try {
        setTimeout(async ()=>{
-            const res = await getVisitorReportList(1, upOption.value.page.size);
+            const res = await getGetYsVisistList(1, upOption.value.page.size);
            cssFlag.value = false;
            list.value = res.list;
            mescroll.resetUpScroll();
@@ -131,7 +128,7 @@ const downCallback = async (mescroll) => {
 const upCallback = async (mescroll) => {
    try {
        setTimeout(async ()=>{
-            const res = await getVisitorReportList(mescroll.num, mescroll.size);
+            const res = await getGetYsVisistList(mescroll.num, mescroll.size);
            if (mescroll.num === 1) {
                list.value = res.list;
            } else {
@@ -145,69 +142,14 @@ const upCallback = async (mescroll) => {
 }

 // 获取数据列表
-const getVisitorReportList = (pageIndex, pageSize) => {
+const getGetYsVisistList = (pageIndex, pageSize) => {
    return new Promise(async (resolve) => {
        let param = {
            pageIndex,
            pageSize
        }
        
-        // let res = await visitorReportList(param);
-        let res = {
-                list:[
-                    {
-                        id:1,title:'客户：北京中科睿信科技有限公司',name:'YS-VR2025091515',
-                        reportType:1,reportTypeName:'I 类活动 (走访)',statusName:'待胡本华审核',
-                        reportPeople:'管理员',dateStr:'2025-09-15'
-                    },
-                    {
-                        id:2,title:'客户：中国船舶集团有限公司第七一 七研究所',name:'YS-VR2025091307',
-                        reportType:1,reportTypeName:'I 类活动 (走访)',statusName:'待胡本华审核',
-                        reportPeople:'管理员',dateStr:'2025-09-15'
-                    },
-                    {
-                        id:3,title:'客户：旭日阳（北京）科技有限公司',name:'YS-VR2025090902',
-                        reportType:1,reportTypeName:'I 类活动 (走访)',statusName:'待审核',
-                        reportPeople:'管理员',dateStr:'2025-09-15'
-                    },
-                    {
-                        id:4,title:'客户：北京中科睿信科技有限公司',name:'YS-VR2025091515',
-                        reportType:1,reportTypeName:'I 类活动 (走访)',statusName:'待胡本华审核',
-                        reportPeople:'管理员',dateStr:'2025-09-15'
-                    },
-                    {
-                        id:5,title:'客户：北京中科睿信科技有限公司',name:'YS-VR2025091515',
-                        reportType:1,reportTypeName:'I 类活动 (走访)',statusName:'待胡本华审核',
-                        reportPeople:'管理员',dateStr:'2025-09-15'
-                    },
-                    {
-                        id:6,title:'客户：北京中科睿信科技有限公司',name:'YS-VR2025091515',
-                        reportType:1,reportTypeName:'I 类活动 (走访)',statusName:'待胡本华审核',
-                        reportPeople:'管理员',dateStr:'2025-09-15'
-                    },
-                    {
-                        id:7,title:'客户：北京中科睿信科技有限公司',name:'YS-VR2025091515',
-                        reportType:1,reportTypeName:'I 类活动 (走访)',statusName:'待胡本华审核',
-                        reportPeople:'管理员',dateStr:'2025-09-15'
-                    },
-                    {
-                        id:8,title:'客户：北京中科睿信科技有限公司',name:'YS-VR2025091515',
-                        reportType:1,reportTypeName:'I 类活动 (走访)',statusName:'待胡本华审核',
-                        reportPeople:'管理员',dateStr:'2025-09-15'
-                    },
-                    {
-                        id:9,title:'客户：北京中科睿信科技有限公司',name:'YS-VR2025091515',
-                        reportType:1,reportTypeName:'I 类活动 (走访)',statusName:'待胡本华审核',
-                        reportPeople:'管理员',dateStr:'2025-09-15'
-                    },
-                    {
-                        id:10,title:'客户：北京中科睿信科技有限公司',name:'YS-VR2025091515',
-                        reportType:1,reportTypeName:'I 类活动 (走访)',statusName:'待胡本华审核',
-                        reportPeople:'管理员',dateStr:'2025-09-15'
-                    }
-                ],
-                totalCount:14
-            }
+        let res = await getYsVisistList(param);
        resolve({
            list: res.list,
            total: res.totalCount
--- a/src/pages/business/CRM/visitorReportEnter.vue
+++ b/src/pages/business/CRM/visitorReportEnter.vue
@@ -18,18 +18,18 @@
                    <uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px" label-position="top">
                        <uni-forms-item label="客户人员" name="guestName1" class="f-c-right">
                            <multipleSelect :multiple="true" :value="monIndex1" downInner :options="guestList1"
-                                @change="changeValue1" :key="Math.round()"
+                                @change="changeValue1" :key="Math.round()"  :slabel="'label'"
                            ></multipleSelect>
                        </uni-forms-item>
                        <uni-forms-item label="我方参与人" name="guestName2" class="f-c-right">
                            <multipleSelect :multiple="true" :value="monIndex2" downInner :options="guestList2"
-                                @change="changeValue2" :key="Math.round()"
+                                @change="changeValue2" :key="Math.round()"  :slabel="'label'"
                            ></multipleSelect>
                        </uni-forms-item>
                        <uni-forms-item label="活动内容" name="activeCon" required
                            class="uni-forms-item is-direction-top is-top">
                            <multipleSelect :multiple="true" :value="monIndex3" downInner :options="guestList3"
-                                @change="changeValue3" :key="Math.round()"
+                                @change="changeValue3" :key="Math.round()" :slabel="'label'"
                            ></multipleSelect>
                        </uni-forms-item>
                        <uni-forms-item label="活动文字" name="activeTxt" class="uni-forms-item is-direction-top is-top">
@@ -92,11 +92,11 @@ const changeValue1 = (item, value) => {
    monIndex1 = value;
 };
 const guestList1 = [
-    { value: 0, text: "客户1" },
-    { value: 1, text: "客户2" },
-    { value: 2, text: "客户3" },
-    { value: 3, text: "客户4" },
-    { value: 4, text: "客户5" },
+    { value: 0, label: "客户1" },
+    { value: 1, label: "客户2" },
+    { value: 2, label: "客户3" },
+    { value: 3, label: "客户4" },
+    { value: 4, label: "客户5" },
 ];

 // 我方人员
@@ -106,11 +106,11 @@ const changeValue2 = (item, value) => {
    monIndex2 = value;
 };
 const guestList2 = [
-    { value: 0, text: "我方1" },
-    { value: 1, text: "我方2" },
-    { value: 2, text: "我方3" },
-    { value: 3, text: "我方4" },
-    { value: 4, text: "我方5" },
+    { value: 0, label: "我方1" },
+    { value: 1, label: "我方2" },
+    { value: 2, label: "我方3" },
+    { value: 3, label: "我方4" },
+    { value: 4, label: "我方5" },
 ];

 // 活动内容
@@ -120,11 +120,11 @@ const changeValue3 = (item, value) => {
    monIndex2 = value;
 };
 const guestList3 = [
-    { value: 0, text: "活动内容1" },
-    { value: 1, text: "活动内容2" },
-    { value: 2, text: "活动内容3" },
-    { value: 3, text: "活动内容4" },
-    { value: 4, text: "活动内容5" },
+    { value: 0, label: "活动内容1" },
+    { value: 1, label: "活动内容2" },
+    { value: 2, label: "活动内容3" },
+    { value: 3, label: "活动内容4" },
+    { value: 4, label: "活动内容5" },
 ];

 // 业务招待
--- a/src/pages/business/business.vue
+++ b/src/pages/business/business.vue
@@ -2,33 +2,24 @@
 <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 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>
+         <!-- 搜索 -->
+         <view class="search">
            <uni-search-bar class="custom-search" radius="28" 
                placeholder="请输入您想查询的内容或服务"
                clearButton="auto" cancelButton="none" 
                bgColor="#6FA2F8" textColor="#ffffff"
-                    @focus="handleSearchFocus"
-                    v-model="searchText"
+                @confirm="handleSearch"  
            />
        </view>

        <!-- 下拉刷新 -->
-            <mescroll-uni  v-if="!searchShow" ref="mescrollRef" @init="mescrollInit"
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit"
            :down="downOption"  @down="downCallback"
            :fixed="false" class="scroll-h"
        >
@@ -36,26 +27,49 @@
            <view class="white-bg">
                <view class="w-b-title">
                    首页日常服务
-                        <view type="primary" @click="handleJump('/pages/business/editDaily')" class="btn-edit">编 辑</view>
+                    <view type="primary" @click="handleEdit" class="btn-edit">编 辑</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 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>
-                    <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 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>
-                            </block>
                </view>
-                    </block>
+            </view>
+
+            <!-- CRM系统 -->
+            <view class="white-bg">
+                <view class="w-b-title" @click="handleExpand2">CRM系统
+                    <text>{{expandFlag2?'展开':'收起'}}<i :class="{iconfont:true,'icon-up':!expandFlag2,'icon-down':expandFlag2}"></i></text>
+                </view>
+                <view class="logo-list" v-if="!expandFlag2">
+                    <view  v-for="(item,index) in list2" class="l-l-item" :key="index" @click="handleJump(item.url)">
+                        <uni-badge :text="item.badgeCount" size="small"></uni-badge>
+                        <img :src="item.imgSrc" />
+                        <text class="font-gray">{{ item.name }}</text>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 供应链采纳 -->
+            <view class="white-bg">
+                <view class="w-b-title">供应链采纳
+                    <text>展开<i :class="{iconfont:true,'icon-down':true}"></i></text>
+                </view>
+            </view>
+
+            <!-- PLM系统 -->
+            <view class="white-bg">
+                <view class="w-b-title">PLM系统
+                    <text>展开<i :class="{iconfont:true,'icon-down':true}"></i></text>
+                </view>
            </view>

            <!-- 底部加高度来避免tabbar遮挡 -->
@@ -67,25 +81,10 @@

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

 <script setup>
-import { ref,getCurrentInstance } from 'vue';
 import { onLoad } from '@dcloudio/uni-app';
-import { versionCheck,getBindStatus } from '@/api/auth.js';
-import { formatIOS } from '@/utils/status.js'
-import { requestAndroidPermissionAsync,requestAndroidPermission } from '@/utils/common.js'
-import {showAlert} from '@/utils/message.js'
 import { useUserStore } from '@/stores/user';
-const userStore = useUserStore();
-const { 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){
-            uni.reLaunch({
-                url: '/pages/home/home',
-            });
-        }else{
-            uni.reLaunch({
-                url: '/pages/login/login',
-            });
-        }
-    // },1000)
-    // #endif
-
-});
-
-// 检查版本是否是最新的s
-const getOSVesion = async()=>{
-    let networkEnv = proxy.$NETWORK_ENV;//1-内网 2-外网
-    systemInfo = uni.getSystemInfoSync();
-    let param = {
-        runEnv:networkEnv,
-        // #ifdef APP-PLUS
-        verNumber:systemInfo.appWgtVersion,//当前版本号
-        // #endif
-        // #ifdef H5
-        verNumber : systemInfo.appVersion,
-        // #endif
-        os: formatIOS(systemInfo.osName),//操作系统 Android  IOS
-    }
-    // 当前手机版本
-    appVersion.value = param.verNumber;
-    // console.log("appVersion=>",appVersion)
-    versionData.value = param;
-    let data = await versionCheck(param);
-    newVersion.value = data.verNumber;
-    downloadURL.value = data.downloadUrl || '';
-
-    // isForceUpdate 是否强制更新 1-是 2-否
-    let isForceUpdate = data.isForceUpdate;
-    if(isForceUpdate==1){
-        btnVisible.value = false;
-    }else{
-        btnVisible.value = true;
-    }
-    // 是否为当前最新版本(是=1，否=2)
-    let isCurrent = data.isCurrent;
-    if(isCurrent == 1){
-        versionVisible.value=false;
-    }else{
-        versionVisible.value=true;
-    }
-}
-
-// 查询设备ID
-const selectDeviceId = async()=>{
-    // 查询本地缓存的设备状态是否绑定过
-    // let deviceId = uni.getStorageSync('app_device_id');// 本地设备ID
-    try {
-        safeSave.getSafeFile({ "key": "app_device_id" }, res2 => {
-            // showAlert(JSON.stringify(res2));
-            if (res2.code == 1) {
-                let deviceId = res2.data;
-                // showAlert("读取成功=>"+deviceId);
-                if(deviceId!=""){
-                    getBindStatus({uniqCode:deviceId}).then(res=>{
-                        let bindStatus = res.bindStatus
-                        // setTimeout(()=>{
-                            // 绑定状态（1=已提交、2=等待审核、3=审核通过、4=绑定成功、5=审核拒绝）
-                            if(bindStatus == 4){
    // 检查是否已登录 并 获取用户信息
    if (userStore.isLogin) {
+        // userStore.getUser()
+        // TODO 未登录会在拦截器中处理跳转登录页， 请在 xxx 配置登录页路径
+       // #ifdef H5
+        window.setTimeout(()=>{
            uni.reLaunch({
                url: '/pages/home/home',
            });
+        },1000)
+        // #endif

+        // #ifdef APP-PLUS
+        uni.reLaunch({
+            url: '/pages/home/home',
+        });
+        // #endif
    }else{
+        // #ifdef H5
+        window.setTimeout(()=>{
            uni.reLaunch({
                url: '/pages/login/login',
            });
-                                }
-                            }else{
+        },1000)
+        // #endif
+
+        // #ifdef APP-PLUS
            uni.reLaunch({
-                                    url: '/pages/deviceAuth/deviceAuth',
-                                });
-                            }
-                        // },1000)
-                    });
-                }else{
-                    uni.reLaunch({
-                        url: '/pages/deviceAuth/deviceAuth',
+                url: '/pages/login/login',
            });
+        // #endif
    }

-            } else {
-                uni.reLaunch({
-                    url: '/pages/deviceAuth/deviceAuth',
 });
-            }
-        })
-    } catch (error) {
-        console.log("getSafeFile=>",error)
-        // showAlert("catch=>"+error)
-    }
-}
-// 下载最新版本
-const handleDown = ()=>{
-    // 跳转到应用商店或下载最新版本的页面
-    plus.runtime.openURL(downloadURL.value);			
-    if (versionData.value.os == 'ios'){
-        plus.ios.import("UIApplication").sharedApplication().performSelector("exit")
-    } else if (versionData.value.os == 'android'){
-        plus.runtime.quit();
-    }
-}

-//版本更新关闭
-const handleClose=()=>{
-    versionVisible.value = false;
-    // 不更新版本 执行设备ID查询和绑定操作
-    if(!versionVisible.value){
-        selectDeviceId()
-    }
-}
 </script>

 <style>
 .container {
 	background:#307AF5 !important;
-	height: 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
@@ -3,8 +3,7 @@
    <view class="login-con">
        <view :style="{height: navBarPaddingTop + 'px'}"></view>
        <image mode="aspectFit" src="../../static/images/pic-logo.png" class="login-logo"></image>
-        <view class="login-title" v-if="networkEnv==1"><text>718友晟</text><text>企业内网</text></view>
-        <view class="login-title" v-else>欢迎来到718友晟</view>
+        <view class="login-title">欢迎来到718友晟</view>
        <view class="login-tab">
            <customTabs v-model="activeTab" :tabs="tabList" :modelValue="activeTab">
                <!-- 验证码登录 -->
@@ -74,30 +73,18 @@
 </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);
@@ -111,8 +98,8 @@ const tabList = ['验证码登录', '账号登录'];
 // 验证码登录
 const form = ref(null);
 const formData = ref({
-    phone: '',
-    verifyCode: '',
+    phone: '15112345600',
+    verifyCode: '123456',
    loginType:0
 });

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

@@ -205,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位字母或数字' }
        ]
    }
 };
@@ -238,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);
@@ -251,51 +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
-
-            // b6ffbbfb-5b2d-4640-af3a-e43d0158eaf9
-            param.uniqCode = '679d5560-534f-4df8-815a-49227ba6ffd2';//h5测试用 内网-sn123456 外网-b6ffbbfb-5b2d-4640-af3a-e43d0158eaf9
+            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;
-                        // showAlert("读取成功=>"+deviceId);
-                        param.uniqCode = deviceId;
-                        login(param).then(res=>{
-                            userStore.login(res);
-                            uni.switchTab({ url: '/pages/home/home' })
-                            btnLoading.value = false;
-                        }).finally(()=>{
-                            btnLoading.value = false;
-                        })
-                       
-                    } else {
-                        // showAlert('读取失败:'+res3.msg)
-                        console.error('读取失败:', error);
-                        btnLoading.value = false;
-                    }
-                })
-            } catch (error) {
-                console.error('读取失败:', error);
-                // showAlert('出错:', error)
-                btnLoading.value = false;
-            }
-            // #endif
-           
        }).catch(err => {
            console.log('表单错误11:', err);
            btnLoading.value = false;
@@ -332,12 +279,6 @@ const submitForm = () => {
    margin: 0 0 35rpx 70rpx;
 }

-.login-con .login-title text:not(:last-child)::after {
-  content: "·";
-  margin: 0 10px;
-  color: #fff;
-}
-
 :deep(.login-tab .tabs-header) {
    background: none !important;
    border-bottom: none !important;
@@ -469,12 +410,4 @@ const submitForm = () => {
    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,49 +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">
-                        <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>
@@ -54,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);
@@ -73,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) => {
@@ -112,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: '刷新中...'
@@ -157,11 +93,12 @@ const mescrollInit = (mescroll) => {
 // 下拉刷新
 const downCallback = async (mescroll) => {
    try {
-        console.log("下拉刷新")
+        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 {
@@ -173,14 +110,15 @@ const downCallback = async (mescroll) => {
 // 上拉加载更多
 const upCallback = async (mescroll) => {
    try {
-        console.log("上拉加载更多")
-        let res = await getNoticeList(mescroll.num, mescroll.size);
+        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();
    }
@@ -191,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>
@@ -244,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 */
 }

@@ -271,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>
@@ -97,50 +93,24 @@
            <!-- <view class="bottom-height"></view> -->
      </mescroll-uni>
    </view>
-    <!-- 弹窗模板 -->
-    <!-- <customShowModal
-        :title="title"
-        :content="content" 
-        :visible="visible" 
-        @close="handleClose"
-        @confirm="handleLoginOut"
-        ref="showModel"
-    ></customShowModal> -->
 </view>
 </template>

 <script setup>
-import { ref, onMounted,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,109 +125,46 @@ 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 {
+        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',
    });
-    })
-    
 }

-// 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;
+  height:calc(100vh - 30px) !important;
  /* #endif */
  /* #ifndef APP-PLUS */
-    height: calc(100vh - 80px) !important;
+  height: calc(100vh - 30px) !important;
  /* #endif */
 }
 :deep(.mescroll-upwarp){
@@ -265,7 +172,7 @@ onMounted(() => {
 }
 .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,8 +5,7 @@ page {
    height: 100%;
    padding: 0;
    margin: 0;
-    background-color: #307AF5;
-    /* background-color: #F5F5F5; */
+    background-color: #F5F5F5;
    color: #333;
 }

@@ -20,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 */
@@ -92,8 +87,6 @@ page {


 /* 弹出提示框修改样式 begin */
-/* #ifdef H5 */
-
 .uni-modal {
    border-radius: 24rpx !important;
    width: 70% !important;
@@ -143,7 +136,7 @@ page {
    background-color: #05A3F4 !important;
    color: #fff !important;
 }
-/* #endif */
+
 /* 弹出提示框修改样式 end */

 /* 搜索框修改样式 begin */
@@ -176,51 +169,13 @@ page {
 }

 .custom-search .uni-searchbar__box-icon-clear {
-    /* display: none !important; */
-    margin-right:10rpx;
+    display: none !important;
 }

-.custom-search .uni-searchbar__box-icon-clear .uniui-clear{
+/* .custom-search .uni-searchbar__box-icon-clear .uniui-clear{
    color:#fff !important;
    font-size: 40rpx !important;
-}
-
-/* 自定义搜索框 */
-.search-bg{
-    background-color: #6FA2F8;
-    border-radius: 28rpx;
-    /* width:690rpx; */
-    width:630rpx;
-    height:56rpx;
-    margin:10rpx auto 30rpx;
-    padding:0 30rpx;
-    display: flex;
-    color:#fff;
-    font-size:28rpx;
-    flex: auto;
-}
-.search-bg .search-left{
-    border-right:1px solid #4687F2;
-    margin-top:10rpx;
-    margin-bottom:10rpx;
-    padding-right:30rpx;
-    /* width:10%; */
-}
-.search-bg .search-right{
-    margin-top:10rpx;
-    padding-left:30rpx;
-    /* width:60%; */
-}
-.search-bg .search-right .uni-input{
-    color:#fff;
-    font-size:28rpx;
-}
-.search-bg .search-right .uni-input .uni-input-input{
-    width: 380rpx;
-}
-.search-bg .search-right .uni-input .search-color{
-    color:#fff !important;
-}
+} */
 /* 搜索框修改样式 end */

 .head-right {
@@ -629,7 +584,3 @@ uni-button[type='primary'][plain] {


 /* CRM 样式 end */
-
-.mescroll-empty .empty-tip{
-    color: #fff !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/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/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,16 +1,16 @@
 import HttpRequest from './http';
 import { merge } from 'lodash-es';
 import { getToken } from '../auth';
-import { CLIENT_ID } from '@/enums/cacheEnums';
 import { RequestCodeEnum, RequestMethodsEnum } from '@/enums/requestEnums';
-import { clearToken } from '@/utils/auth'
 import { useUserStore } from '@/stores/user'
 import { useMessage } from '../message';
+
 const message = useMessage();

 const requestHooks = {
    // 请求拦截器
    requestInterceptorsHook(options, config) {
+        // console.log("request=>",options,config)
        const { urlPrefix, baseUrl, withToken, isAuth } = config;
        options.header = options.header ?? {};
        if (urlPrefix) {
@@ -19,18 +19,15 @@ 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) {
@@ -39,29 +36,24 @@ const requestHooks = {
        if (!isTransformResponse) {
            return response.data;
        }
-        // const { logout, isLogin } = useUserStore();
+        const { logout, isLogin } = useUserStore();
        const { code, data, msg, show } = response.data;
        // console.log(code,data,msg,show)
             switch (code) {
                  case RequestCodeEnum.SUCCESS:
-                msg && show && message.toast(msg);
-                return data;
+                      msg && message.toast(msg);
+                      return response.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' })
-                // }
+                      if (isAuth && isLogin) {
      
+                      }
                      return Promise.reject();
-
                  default:
-                message.alert(msg)
-                // return data;
+                      message.toast(msg)
+                      // return response.data;
                      return Promise.reject(msg);
              }
    },
@@ -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/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -40,4 +40,12 @@ export function isUrl(url) {
    const urlRegex = /^(https?|ftp):\/\/[^\s/$.?#].[^\s]*$/;
    return urlRegex.test(url);
 }
-
+/**
+ * 是否为空
+ */
+export function isEmpty(value) {
+  if (value === null || value === undefined) return true
+  if (typeof value === 'string') return value.trim() === ''
+  if (Array.isArray(value)) return value.length === 0
+  return false
+}
--- 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
xuli3099	99973d2e62	修改错误码	2025-08-19 13:23:52 +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