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

fix: 主归属人变更-变更审核

.env.development

@@ -1,16 +1,2 @@
-
+# VITE_APP_BASE_URL = "http://192.168.20.191:3000"
-#调用后台地址
+VITE_APP_BASE_URL = "http://123.57.20.168:3000"
-# 贝英斯公司
-# VITE_APP_BASE_URL = 'http://118.186.13.120:31302'
-# VITE_APP_BASE_URL = "http://192.168.236.71:31302"
-# VITE_APP_BASE_URL = "http://123.57.20.168:3000"
-
-# 友晟test外网
-# VITE_APP_BASE_URL = 'https://app-test.718yousheng.com/app'
-# 友晟test内网
-# VITE_APP_BASE_URL = 'https://appi-test.718yousheng.com/app'
-
-# 友晟线上内网
-# VITE_APP_BASE_URL = 'https://appi.718yousheng.com/app'
-# 友晟线上外网网
-VITE_APP_BASE_URL = 'https://app.718yousheng.com/app'

.env.production

@@ -1,16 +1 @@
-
+VITE_APP_BASE_URL = "http://192.168.20.191:5173"
-#调用后台地址
-# 贝英斯公司
-# VITE_APP_BASE_URL = 'http://118.186.13.120:31302'
-# VITE_APP_BASE_URL = "http://192.168.236.71:31302"
-# VITE_APP_BASE_URL = "http://123.57.20.168:3000"
-
-# 友晟test外网
-# VITE_APP_BASE_URL = 'https://app-test.718yousheng.com/app'
-# 友晟test内网
-# VITE_APP_BASE_URL = 'https://appi-test.718yousheng.com/app'
-
-# 友晟线上内网
-# VITE_APP_BASE_URL = 'https://appi.718yousheng.com/app'
-# 友晟线上外网网
-VITE_APP_BASE_URL = 'https://app.718yousheng.com/app'

.gitignore

@@ -8,7 +8,6 @@ pnpm-debug.log*
 lerna-debug.log*
 
 node_modules
-.hbuilderx
 .DS_Store
 dist
 *.local

.hbuilderx/launch.json

@@ -2,18 +2,12 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
         },
         {
-            "app" : {
+            "openVueDevtools" : true,
-                "launchtype" : "remote"
+            "type" : "uni-app:h5"
-            },
-            "default" : {
-                "launchtype" : "local"
-            },
-            "provider" : "aliyun",
-            "type" : "uniCloud"
         }
     ]
 }

nativeplugins/Tm-TmSafeSaveFileModule/package.json

@@ -1,29 +0,0 @@
-{
-	"name": "TmSafeSaveFileModule隐私数据保存",
-	"id": "Tm-TmSafeSaveFileModule",
-	"version": "1.0.0",
-	"description": "TmSafeSaveFileModule隐私数据保存",
-	"_dp_type": "nativeplugin",
-	"_dp_nativeplugin": {
-		"android": {
-			 "plugins": [
-			        {
-			          "type": "module",
-			          "name": "Tm-TmSafeSaveFileModule",
-			          "class": "io.dcloud.uniplugin.safesave.TmSafeSaveFileModule"
-			        }
-		  	],
-			"abis": [
-				"armeabi-v7a",
-				"x86"
-			],
-			"minSdkVersion": "26",
-			"integrateType": "aar",
-			"dependencies": [
-				"androidx.security:security-crypto:1.1.0-alpha06"
-			],
-			"permissions": [
-			]
-		}
-	}
-}

package.json

@@ -40,40 +40,36 @@
     "build:quickapp-webview-union": "uni build -p quickapp-webview-union"
   },
   "dependencies": {
-    "@dcloudio/uni-app": "3.0.0-4070620250821001",
+    "@dcloudio/uni-app": "3.0.0-4070520250711001",
-    "@dcloudio/uni-app-harmony": "3.0.0-4070620250821001",
+    "@dcloudio/uni-app-harmony": "3.0.0-4070520250711001",
-    "@dcloudio/uni-app-plus": "3.0.0-4070620250821001",
+    "@dcloudio/uni-app-plus": "3.0.0-4070520250711001",
-    "@dcloudio/uni-components": "3.0.0-4070620250821001",
+    "@dcloudio/uni-components": "3.0.0-4070520250711001",
-    "@dcloudio/uni-h5": "3.0.0-4070620250821001",
+    "@dcloudio/uni-h5": "3.0.0-4070520250711001",
-    "@dcloudio/uni-mp-alipay": "3.0.0-4070620250821001",
+    "@dcloudio/uni-mp-alipay": "3.0.0-4070520250711001",
-    "@dcloudio/uni-mp-baidu": "3.0.0-4070620250821001",
+    "@dcloudio/uni-mp-baidu": "3.0.0-4070520250711001",
-    "@dcloudio/uni-mp-harmony": "3.0.0-4070620250821001",
+    "@dcloudio/uni-mp-harmony": "3.0.0-4070520250711001",
-    "@dcloudio/uni-mp-jd": "3.0.0-4070620250821001",
+    "@dcloudio/uni-mp-jd": "3.0.0-4070520250711001",
-    "@dcloudio/uni-mp-kuaishou": "3.0.0-4070620250821001",
+    "@dcloudio/uni-mp-kuaishou": "3.0.0-4070520250711001",
-    "@dcloudio/uni-mp-lark": "3.0.0-4070620250821001",
+    "@dcloudio/uni-mp-lark": "3.0.0-4070520250711001",
-    "@dcloudio/uni-mp-qq": "3.0.0-4070620250821001",
+    "@dcloudio/uni-mp-qq": "3.0.0-4070520250711001",
-    "@dcloudio/uni-mp-toutiao": "3.0.0-4070620250821001",
+    "@dcloudio/uni-mp-toutiao": "3.0.0-4070520250711001",
-    "@dcloudio/uni-mp-weixin": "3.0.0-4070620250821001",
+    "@dcloudio/uni-mp-weixin": "3.0.0-4070520250711001",
-    "@dcloudio/uni-mp-xhs": "3.0.0-4070620250821001",
+    "@dcloudio/uni-mp-xhs": "3.0.0-4070520250711001",
-    "@dcloudio/uni-quickapp-webview": "3.0.0-4070620250821001",
+    "@dcloudio/uni-quickapp-webview": "3.0.0-4070520250711001",
-    "@dcloudio/uni-ui": "^1.5.11",
+    "@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"
-    "vue": "3.4.21",
-    "vue-i18n": "9.14.5"
   },
   "devDependencies": {
-    "@dcloudio/types": "3.4.19",
+    "@dcloudio/types": "^3.4.8",
-    "@dcloudio/uni-automator": "3.0.0-4070620250821001",
+    "@dcloudio/uni-automator": "3.0.0-4070520250711001",
-    "@dcloudio/uni-cli-shared": "3.0.0-4070620250821001",
+    "@dcloudio/uni-cli-shared": "3.0.0-4070520250711001",
-    "@dcloudio/uni-stacktracey": "3.0.0-4070620250821001",
+    "@dcloudio/uni-stacktracey": "3.0.0-4070520250711001",
-    "@dcloudio/vite-plugin-uni": "3.0.0-4070620250821001",
+    "@dcloudio/vite-plugin-uni": "3.0.0-4070520250711001",
-    "@vue/runtime-core": "3.5.20",
+    "@vue/runtime-core": "^3.4.21",
     "lodash-es": "^4.17.21",
-    "sass": "^1.91.0",
+    "sass": "^1.79.3",
-    "sass-loader": "^10.1.1",
     "vite": "5.2.8"
   }
 }

server/index.js

@@ -107,60 +107,19 @@ app.post('/api/search', (req,res) => {
     }))
 });
 
-// 查询业务列表
-app.post('/api/businessList', (req,res) => {
-    res.json(Mock.mock({
-        code: 0,
-        data: {
-            list:[
-                {bizId:1,bizName:'企业日常',children:[
-                    {bizId:11,bizName:'任务计划',icon:'static/images/business/icon-rwjh.png',status:1,isDaily:true},
-                    {bizId:12,bizName:'日报',icon:'static/images/business/icon-rb.png',status:1,isDaily:true},
-                    {bizId:13,bizName:'设备管理',icon:'static/images/business/icon-sbgl.png',status:1},
-                    {bizId:14,bizName:'绩效管理',icon:'static/images/business/icon-jxgl.png',status:1},
-                    {bizId:15,bizName:'公章申请',icon:'static/images/business/icon-gzsq.png',status:1,isDaily:true},
-                    {bizId:16,bizName:'会议室预约',icon:'static/images/business/icon-hysyy.png',status:1,isDaily:true},
-                    {bizId:17,bizName:'报修',icon:'static/images/business/icon-bx.png',status:1}
-                ]},
-                {bizId:2,bizName:'CRM系统',children:[
-                    {bizId:21,bizName:'走访报告',icon:'static/images/business/demo.png',bizUrl:'/pages/business/CRM/visitorReport',status:true},
-                    {bizId:101,bizName:'走访报告',icon:'static/images/business/icon-zfbg.png',status:1},
-                    {bizId:102,bizName:'走访查看',icon:'static/images/business/icon-zfck.png',status:1,isDaily:true},
-                    {bizId:103,bizName:'走访审批',icon:'static/images/business/icon-zfsp.png',status:1},
-                    {bizId:104,bizName:'计划查看',icon:'static/images/business/icon-jhck.png',status:1},
-                    {bizId:105,bizName:'签到打卡',icon:'static/images/business/icon-qddk.png',status:1},
-                    {bizId:106,bizName:'打卡信息',icon:'static/images/business/icon-dkxx.png',status:1},
-                    {bizId:107,bizName:'打卡统计',icon:'static/images/business/icon-dktj.png',status:1},
-                    {bizId:108,bizName:'人员新增',icon:'static/images/business/icon-ryxz.png',status:1},
-                    {bizId:109,bizName:'信息查看',icon:'static/images/business/icon-xxck.png',status:1,isDaily:true},
-                    {bizId:1010,bizName:'信息审核',icon:'static/images/business/xxsh.png',badgeCount:5,status:1,isDaily:true},
-                    {bizId:1011,bizName:'信息统计',icon:'static/images/business/icon-xxtj.png',status:1},
-                    {bizId:1012,bizName:'回款查看',icon:'static/images/business/icon-hkck.png',status:1},
-                    {bizId:1013,bizName:'客户人员审核',icon:'static/images/business/icon-khrysh.png',badgeCount:3,status:true},
-                    {bizId:1014,bizName:'客户人员所属',icon:'static/images/business/icon-khryss.png',status:1},
-                    {bizId:1015,bizName:'客户人员归属人变更',icon:'static/images/business/icon-khrybg.png',status:1},
-                    {bizId:1016,bizName:'市场活动',icon:'static/images/business/icon-schd.png',status:1}
-                ]},
-                {bizId:3,bizName:'供应链采纳',children:[]},
-                {bizId:4,bizName:'PLM系统',children:[]}
-            ]
-        }
-    }))
-});
-
 // 查询企业日常 Daily business
 app.post('/api/businessDaily', (req,res) => {
     res.json(Mock.mock({
         code: 0,
         data: {
             list:[
-                {id:11,name:'任务计划',imgSrc:'static/images/business/icon-rwjh.png'},
+                {id:1,name:'任务计划',imgSrc:'static/images/business/icon-rwjh.png'},
-                {id:12,name:'日报',imgSrc:'static/images/business/icon-rb.png'},
+                {id:2,name:'日报',imgSrc:'static/images/business/icon-rb.png'},
-                {id:13,name:'设备管理',imgSrc:'static/images/business/icon-sbgl.png'},
+                {id:3,name:'设备管理',imgSrc:'static/images/business/icon-sbgl.png'},
-                {id:14,name:'绩效管理',imgSrc:'static/images/business/icon-jxgl.png'},
+                {id:4,name:'绩效管理',imgSrc:'static/images/business/icon-jxgl.png'},
-                {id:15,name:'公章申请',imgSrc:'static/images/business/icon-gzsq.png'},
+                {id:5,name:'公章申请',imgSrc:'static/images/business/icon-gzsq.png'},
-                {id:16,name:'会议室预约',imgSrc:'static/images/business/icon-hysyy.png'},
+                {id:6,name:'会议室预约',imgSrc:'static/images/business/icon-hysyy.png'},
-                {id:17,name:'报修',imgSrc:'static/images/business/icon-bx.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:1,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:2,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:3,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:4,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:5,name:'市场信息管理',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/marketInformation/marketInformation'},
-                {id:26,name:'修改周计划',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/weekPlanUpdate'},
+                {id:6,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:7,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:8,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:9,name:'回款查看',imgSrc:'static/images/business/demo.png',url:'/pages/business/CRM/paymentCollection'},
                 {id:101,name:'走访报告',imgSrc:'static/images/business/icon-zfbg.png'},
                 {id:102,name:'走访查看',imgSrc:'static/images/business/icon-zfck.png'},
                 {id:103,name:'走访审批',imgSrc:'static/images/business/icon-zfsp.png'},
@@ -205,7 +164,7 @@ app.post('/api/businessCRMList', (req,res) => {
 // 首页待办数据
 app.post('/api/backBlogCount', (req,res) => {
     res.json(Mock.mock({
-        code: 0,
+        code: 200,
         data: {
             count1:3,
             count2:7,
@@ -231,7 +190,7 @@ app.post('/api/stepData', (req,res) => {
         data: {
             date:new Date().getTime(),
             list:[
-                { id:1,desc: '2025秋季产品发布前期准备会，在科研楼0317会议室召开。', title: '13:30 — 15:30',beginTime:'13:30',endTime:'15:30'}, 
+                { id:1,desc: '2025秋季产品发布前期准备会1s，在科研楼0317会议室召开。', title: '13:30 — 15:30',beginTime:'13:30',endTime:'15:30'}, 
                 { id:2,desc: '生产间安全巡检。', title: '16:30 — 18:00',beginTime:'16:30',endTime:'18:00'}, 
             ]
         }
@@ -519,32 +478,6 @@ app.post('/api/mattersList', (req,res) => {
     }
 })
 
-// 查询设备绑定状态 绑定状态（1=已提交、2=等待审核、3=审核通过、4=绑定成功、5=审核拒绝）
-app.post('/api/getBindStatus', (req,res) => {
-    res.json(Mock.mock({
-        code: 0,
-        data: {
-            bindStatus:4
-        }
-    }))
-})
-
-// 查询版本号
-app.post('/api/versionCheck', (req,res) => {
-    res.json(Mock.mock({
-        "code": 0,
-        "message": "Success.",
-        "data": {
-            "status": 0,//版本状态 0-最新版本  1-有新版本，但现有版本可用  2-现有版本不可用，需要下载新版本
-            "latestVersion": "1.0.1",
-            "downloadURL": "https://www.718ys.com/downloads/android/ys718_test_v1.0.0.apk",
-            "availableVersionsList": "1.0.0",
-            remark:'fdsfddf'
-        },
-        "ok": true
-    }))
-})
-
 
 
 //2.创建server

src/App.vue

@@ -4,50 +4,14 @@
 
 
 <script setup>
-import {showAlert} from '@/utils/message.js'
 import { onLaunch } from '@dcloudio/uni-app';
 onLaunch((opt) => {
-	//     uni.preloadPage({ url: "/pages/login/login" });
+    console.log("onLaunch")
-	//     uni.preloadPage({ url: "/pages/home/home" });
-	//     uni.preloadPage({ url: "/pages/business/business" });
-	//     uni.preloadPage({ url: "/pages/notice/notice" });
-	//     uni.preloadPage({ url: "/pages/userinfo/userinfo" });
-	console.log("APP onLaunch")
-	
-    // #ifdef APP-PLUS
-   //  uni.getPushClientId({
-   //      success: (res) => {
-   //          let push_clientid = res.cid
-			// showAlert(push_clientid)
-   //          console.log('客户端推送标识:', push_clientid);
-   //      },
-   //      fail(err) {
-   //          console.log(err)
-   //      }
-   //  })
-
-    uni.onPushMessage(res => {
-        console.log("收到推送消息：", res) //监听推送消息
-        // uni.createPushMessage({
-        //     title: res.data.title,
-        //     content: res.data.content,
-        //     payload: res.data.payload
-        // })
-    })
-    // #endif
 })
 
 
-
 </script>
 <style>
 @import '@/static/common.css';
-.uni-app--show{
+
-    opacity:1;
-    transition: opacity 0.3s;
-}
-.uni-app--hide {
-    opacity:0;
-    transition:opacity 0.3s;
-}
 </style>

src/api/auth.js

@@ -1,38 +1,13 @@
 import request from "@/utils/request"
 
-// 获取客户端版本
+
-export function versionCheck(data) {
+// 获取图片
-    return request.post({
+export function getCaptchaImage() {
-        url: '/acc/auth/version',
+    return request.get({
-        data
+        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({
+    return request.post({
-        url: '/acc/profile/userInfo',
+        url: '/api/getUserInfo',
         data
     })
 }
 
-// 查询当前用户常用功能
+
-export function getUserFavorite(data) {
+
-    return request.post({
-        url: '/acc/profile/favorite',
-        data
-    })
-}

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
     })
 }
 
-// 设置常用服务
+// crm 列表
-export function bizFavoriteSetting(data) {
-    return request.post({
-        url: '/acc/biz/favoriteSetting',
-        data
-    })
-}
-
-// 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({
+    return request.get({
-        url: '/api/visitorReportList',
+        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,10 +50,10 @@ export function visitorReportDetail(data) {
     })
 }
 
-// CRM 查询走访报告列表
+// crm 查询走访报告列表
 export function mattersList(data) {
     return request.post({
         url: '/api/mattersList',
         data
     })
-}
+}

src/api/crm/activity/activity.js

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

src/api/crm/activity/map.js

@@ -3,7 +3,7 @@ import request from "@/utils/request";
 //新增地图开始签到接口
 export function addStartMap(data) {
   return request.post({
-    url: "/crm/app/appVisistMap/Startadd",
+    url: "/app/appVisistMap/Startadd",
     data,
   },{
     isTransformResponse:false
@@ -13,7 +13,7 @@ export function addStartMap(data) {
 //新增地图开始打卡接口
 export function addStartMapForClockIn(data) {
   return request.post({
-    url: "/crm/app/appVisistMap/StartaddForClockIn",
+    url: "/app/appVisistMap/StartaddForClockIn",
     data,
   },{
     isTransformResponse:false
@@ -23,7 +23,7 @@ export function addStartMapForClockIn(data) {
 //打卡信息查看
 export function CheckInInformationViewing(data) {
   return request.get({
-    url: "/crm/app/appVisistMap/DKList",
+    url: "/app/appVisistMap/DKList",
     data
   },{
     isTransformResponse:false
@@ -33,7 +33,7 @@ export function CheckInInformationViewing(data) {
 //签到统计
 export function getSigninList(data) {
   return request.get({
-    url: "/crm/app/appVisistMap/QueryBased",
+    url: "/app/appVisistMap/QueryBased",
     data
   },{
     isTransformResponse:false
@@ -43,7 +43,7 @@ export function getSigninList(data) {
 //不签到统计
 export function getNoSigninList(data) {
   return request.get({
-    url: "/crm/app/appVisistMap/QueryBasedIsNull",
+    url: "/app/appVisistMap/QueryBasedIsNull",
     data
   },{
     isTransformResponse:false

src/api/crm/api_ys.js

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

src/api/crm/customer/getCustomer.js

@@ -47,8 +47,8 @@ export function SearchForAllPerson(params){
 // 客户人员新增审核列表
 export　function　getCusUserApprovalList(params) {
     return request.get({
-        url: '/crm/app/appCrmCusUserNewController/getCusUserApprovalList',
+            url: '/crm/app/appCrmCusUserNewController/getCusUserApprovalList',
-        data: params
+            data: params
         }, {isTransformResponse: false}
     )
 }

src/api/crm/plan/getPlan.js

@@ -1,8 +1,15 @@
 import request from "@/utils/request"
 // 获取用户信息
-export function getUserInfo(data) {
+/*export function getUserInfo(data) {
     return request.get({
-        url: '/crm/app/user/getUserInfo',
+        url: '/app/user/getUserInfo',
+        data
+    }, {isTransformResponse: false})
+}*/
+//获取个人周计划列表
+export function getWeeklyPlanList(data) {
+    return request.get({
+        url: '/crm/app/appWeeklyPlan/getWeeklyListByUser',
         data
     }, {isTransformResponse: false})
 }
@@ -13,13 +20,6 @@ export function getAllWeekPlanList(params){
         data: params
     },{isTransformResponse: false})
 }
-//获取个人周计划列表
-export function getWeeklyPlanList(data) {
-    return request.get({
-        url: '/crm/app/appWeeklyPlan/getWeeklyListByUser',
-        data
-    }, {isTransformResponse: false})
-}
 // 组合查询计划列表
 export function getWeekPlanListByDate(params){
     return request.get({

src/api/home.js

@@ -1,24 +1,9 @@
 import request from "@/utils/request"
 
-// 待办数据查询 获取用户消息的待阅和已阅数量
+// 待办数据查询
-export function messageNotifyCount(data) {
+export function backBlogCount(data) {
-    return request.get({
-        url: '/acc/message/notify/count',
-        data
-    })
-}
-// 获取用户审批的待办和已办数量
-export function messageFlowCount(data) {
-    return request.get({
-        url: '/acc/message/flow/count',
-        data
-    })
-}
-
-// 常用服务 
-export function getUserFavorite(data) {
     return request.post({
-        url: '/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) {

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',
+        url: '/api/noticeList',
         data
     })
-}
+}
-
-// 获取用户审批的待办和已办详情
-export function flowList(data) {
-    return request.post({
-        url: '/acc/message/flow/detail',
-        data
-    })
-}

src/components/closeableModal.vue

@@ -1,169 +0,0 @@
-<!--
- * @author wangzhuo
- * @date 2025/9/18 10:30
- * @description 模态弹窗组件（支持点击蒙层关闭、支持换行显示内容）
--->
-<template>
-  <view class="model" v-if="modelValue" @click="handleClose" @touchmove.prevent @mousewheel.prevent>
-    <view v-if="closeTip" style="color:rgba(255,255,255,0.15); letter-spacing: 5rpx; margin-top: 50%;text-align: center">{{closeTip}}</view>
-    <view class="model-con" @click.stop>
-      <view class="model-top" v-if="title">{{ title }}</view>
-      <view :class="{'model-middle': true,'m-height': !title}">
-        <view v-for="text in content.split('\n')">{{text}}</view>
-      </view>
-      <view class="model-bottom">
-        <button v-if="cancelBtn" type="primary" class="btn-cancel" @click="handleCancel">{{ cancelText }}</button>
-        <button v-if="confirmBtn" type="default" class="btn-green" @click="handleConfirm" :loading="loading"
-                :disabled="loading">{{ confirmText }}
-        </button>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script setup>
-import {ref} from 'vue'
-
-const props = defineProps({
-  modelValue: {
-    type: Boolean,
-    default: false
-  },
-  closeTip: {
-    type: String,
-    default: "点按空白处取消",
-  },
-  title: {
-    type: String,
-  },
-  content: {
-    type: String
-  },
-  cancelBtn: {
-    type: Boolean,
-    default: true
-  },
-  confirmBtn: {
-    type: Boolean,
-    default: true
-  },
-  cancelText: {
-    type: String,
-    default: '取消'
-  },
-  confirmText: {
-    type: String,
-    default: '确认'
-  }
-})
-
-let loading = ref(false);
-
-// 调用父组件的方法
-const emit = defineEmits(['update:modelValue', 'cancel', 'confirm', 'success'])
-
-// 点击蒙层关闭模态窗
-const handleClose = () => {
-  emit('update:modelValue', false);
-}
-
-const handleCancel = () => {
-  emit('cancel');
-  emit('success', 'cancel')
-  handleClose();
-}
-
-const handleConfirm = () => {
-  emit('confirm');
-  emit('success', 'confirm')
-  handleClose();
-}
-
-
-</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;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-around;
-    top: 50%;
-    left: 50%;
-    width: 500rpx;
-    min-height: 278rpx;
-    margin-left: -270rpx;
-    margin-top: -139rpx;
-    border-radius: 24rpx;
-    padding: 20rpx 30rpx;
-  }
-
-  .model-top {
-    text-align: center;
-    padding: 20rpx 0;
-    font-size: 36rpx;
-    font-weight: 700;
-  }
-
-  .model-middle {
-    // margin-top:290rpx;
-    text-align: start;
-    font-size: 30rpx;
-    //line-height: 42rpx;
-    color: #333333;
-
-    .font-green {
-      color: #05A3F4;
-      font-size: 42rpx;
-      font-weight: bold;
-      padding: 20rpx 0;
-    }
-  }
-
-  .m-height {
-    padding-top: 28rpx;
-  }
-
-  .model-bottom {
-    display: flex;
-    justify-content: center;
-    padding: 30rpx 0 20rpx;
-    // align-items: center;
-    .btn-green, .btn-cancel {
-      background-color: #fff;
-      color: #05A3F4;
-      border-radius: 48rpx;
-      width: 200rpx;
-      height: 65rpx;
-      line-height: 60rpx;
-      text-align: center;
-      font-size: 30rpx;
-      border: 1px solid #05A3F4;
-      margin-left: 0rpx !important;
-      margin-right: 0 !important;
-
-      &::after {
-        border: none;
-        border-radius: 37rpx;
-      }
-    }
-
-    .btn-green {
-      border: 1px solid #05A3F4;
-      background-color: #05A3F4;
-      color: #fff;
-      margin-left: 20rpx !important;
-    }
-  }
-}
-</style>

src/components/customHeader.vue

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

src/components/customSearch.vue

@@ -5,7 +5,7 @@
             <!--   @confirm="handleSearch"  @cancel="handleCancel"-->
             <uni-search-bar class="custom-search" 
                 radius="28" 
-                placeholder="请输入搜索条件" 
+                placeholder="请输入您想查询的内容或服务" 
                 clearButton="auto"
                 bgColor="#6FA2F8" textColor="#ffffff" 
                 v-model="searchText"
@@ -240,7 +240,7 @@ const handleResultClick = (item) => {
     margin-bottom: 0;
     border-radius: 8px 8px 0 0;
     /* #ifdef APP-PLUS */
-    height: calc(100vh - 168px);
+    height: calc(100vh - 130px);
     /* #endif */
     /* #ifndef APP-PLUS */
     height: calc(100vh - 150px);
@@ -268,6 +268,7 @@ const handleResultClick = (item) => {
 .tag-container {
     display: flex;
     flex-wrap: wrap;
+    gap:20rpx;
 }
 
 .search-tag {
@@ -275,8 +276,8 @@ const handleResultClick = (item) => {
     border:1px solid #E8E8E8;
     border-radius: 10rpx;
     padding: 10rpx 15rpx;
-    margin-right: 20rpx;
+    /* margin-right: 20rpx;
-    margin-bottom: 20rpx;
+    margin-bottom: 20rpx; */
     font-size: 28rpx;
 }
 

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>

src/components/multipleSelect.vue

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

src/enums/cacheEnums.js

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

src/enums/requestEnums.js

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

src/main.js

@@ -1,27 +1,15 @@
 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)
 

src/manifest.json

@@ -1,7 +1,7 @@
 {
     "id" : "H5E705637",
-    "name" : "718友晟",
+    "name" : "app",
-    "appid" : "__UNI__4C459F4",
+    // "appid" : "",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -16,14 +16,12 @@
         "compilerVersion" : 3,
         "splashscreen" : {
             "alwaysShowBeforeRender" : true,
-            "waiting" : false, // 是否显示等待界面
+            "waiting" : true,
             "autoclose" : true,
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {
+        "modules" : {},
-            "Push" : {}
-        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -43,72 +41,21 @@
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                    "<uses-permission android:name=\"android.permission.INTERNET\" />",
-                    "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\" />",
-                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />",
-                    "<uses-permission android:name=\"android.permission.GET_TASKS\" />",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH\" />",
-                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\" />",
-                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\" />",
-                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\" />",
-                    "<uses-permission android:name=\"android.permission.BROADCAST_PACKAGE_ADDED\" />",
-                    "<uses-permission android:name=\"android.permission.BROADCAST_PACKAGE_CHANGED\" />",
-                    "<uses-permission android:name=\"android.permission.BROADCAST_PACKAGE_INSTALL\" />",
-                    "<uses-permission android:name=\"android.permission.BROADCAST_PACKAGE_REPLACED\" />",
-                    "<uses-permission android:name=\"android.permission.RESTART_PACKAGES\" />",
-                    "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\" />"
                 ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
-                "minSdkVersion" : 26,
-                "targetSdkVersion" : 35,
                 "icons" : {
                     "android" : {
-                        "hdpi" : "/static/images/icon.png",
+                        "hdpi" : "static/icons/72x72.png",
-                        "xhdpi" : "/static/images/icon.png",
+                        "xhdpi" : "static/icons/96x96.png",
-                        "xxhdpi" : "/static/images/icon.png",
+                        "xxhdpi" : "static/icons/144x144.png",
-                        "xxxhdpi" : "/static/images/icon.png"
+                        "xxxhdpi" : "static/icons/192x192.png"
                     }
                 }
             },
             /* ios打包配置 */
-            "ios" : {
+            "ios" : {},
-                "dSYMs" : false
-            },
             /* SDK配置 */
-            "sdkConfigs" : {
+            "sdkConfigs" : {}
-                "push" : {
-                    "unipush" : {
-                        "version" : "2",
-                        "offline" : true,
-                        "icons" : {
-                            "small" : {
-                                "ldpi" : "/static/images/icon.png",
-                                "mdpi" : "/static/images/icon.png",
-                                "hdpi" : "/static/images/icon.png",
-                                "xhdpi" : "/static/images/icon.png",
-                                "xxhdpi" : "/static/images/icon.png"
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "nativePlugins" : {
-            "Tm-TmSafeSaveFileModule" : {
-                "__plugin_info__" : {
-                    "name" : "TmSafeSaveFileModule隐私数据保存",
-                    "description" : "TmSafeSaveFileModule隐私数据保存",
-                    "platforms" : "Android",
-                    "url" : "",
-                    "android_package_name" : "",
-                    "ios_bundle_id" : "",
-                    "isCloud" : false,
-                    "bought" : -1,
-                    "pid" : "",
-                    "parameters" : {}
-                }
-            }
         }
     },
     /* 快应用特有相关 */
@@ -137,8 +84,8 @@
     "h5" : {
         "router" : {
             "base" : ""
+            /*,"mode": "history"   仅对 H5 平台生效 */
         },
-        /*,"mode": "history"   仅对 H5 平台生效 */
         "template" : "index.html"
     }
 }

src/pages.json

@@ -5,19 +5,12 @@
 			"^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue"
 		}
 	},
-	"pages": [
+	"pages": [{
-		{
 			"path": "pages/loading/loading",
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		},
-		{
-			"path": "pages/deviceAuth/deviceAuth",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
 		{
 			"path": "pages/login/login",
 			"style": {
@@ -27,79 +20,11 @@
 		{
 			"path": "pages/home/home",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": ""
-				"renderer": "native",
-				"hardwareAccelerated": true
 			}
 		},
 		{
 			"path": "pages/business/business",
-			"style": {
-				"navigationBarTitleText": "",
-				"renderer": "native",
-				"hardwareAccelerated": true
-			}
-		},
-		{
-			"path": "pages/business/editDaily",
-			"style": {
-				"navigationBarTitleText": "",
-				"renderer": "native",
-				"hardwareAccelerated": true
-			}
-		},
-		{
-			"path": "pages/notice/notice",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/notice/noticeDetail",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/notice/waitApprove",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/notice/waitApproveDetail",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/userinfo/userinfo",
-			"style": {
-				"navigationBarTitleText": "",
-				"renderer": "native",
-				"hardwareAccelerated": true
-			}
-		},
-		{
-			"path": "pages/userinfo/version",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/search/search",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/h5-webview/h5-webview",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/CRM/marketInformation", //市场信息管理
 			"style": {
 				"navigationBarTitleText": ""
 			}
@@ -223,6 +148,13 @@
 				"navigationBarTitleText": "通用信息更新"
 			}
 		},
+		//选择客户（已更新）
+		{
+			"path": "pages/business/CRM/chooseCus",
+			"style": {
+				"navigationBarTitleText": "客户选择"
+			}
+		},
 		//选择客户人员（已更新）
 		{
 			"path": "pages/business/CRM/customerUserList",
@@ -331,8 +263,7 @@
 			"path": "pages/business/CRM/plan/planView",
 			//周计划查看
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": ""
-				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -384,20 +315,6 @@
 				"navigationBarTitleText": ""
 			}
 		},
-		{
-			"path": "pages/business/CRM/mainOwner/view/viewMainOwner",
-			//客户人员主归属人变更查看
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/CRM/mainOwner/view/viewMainOwnerDetail",
-			//客户人员主归属人变更查看明细
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
 		{
 			"path": "pages/business/CRM/customer/components/customerUserEdit",
 			//客户人员详情编辑
@@ -435,6 +352,13 @@
 		},
 		//===================================活动报告====================
 		{
+			"path": "pages/business/CRM/mainOwner/view/viewMainOwner", //查看主归属人变更信息 
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+
 			"path": "pages/business/CRM/marketActivity/visitReport",
 			//市场信息管理
 			"style": {
@@ -546,8 +470,28 @@
 			"style": {
 				"navigationBarTitleText": ""
 			}
-		}
+		},
 		//===================================活动报告====================
+		{
+			"path": "pages/notice/notice",
+			"style": {
+				"navigationBarTitleText": "",
+				"app-plus": {
+					"bounce": "none"
+					// 取消APP端iOS回弹,避免与下拉刷新冲突 (可统一配在 'globalStyle')
+				},
+				"mp-alipay": {
+					"allowsBounceVertical": "NO"
+				}
+				// 取消支付宝和钉钉小程序的iOS回弹,避免与下拉刷新冲突 (可统一配在 'globalStyle')
+			}
+		},
+		{
+			"path": "pages/userinfo/userinfo",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		}
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
@@ -563,8 +507,7 @@
 		"backgroundColor": "#000000",
 		"fontSize": "12px",
 		"iconWidth": "24px",
-		"list": [
+		"list": [{
-			{
 				"pagePath": "pages/home/home",
 				"iconPath": "static/images/tabs/menu-home.png",
 				"selectedIconPath": "static/images/tabs/menu-home-on.png",
@@ -590,4 +533,4 @@
 			}
 		]
 	}
-}
+}

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>

src/pages/business/CRM/customer/changeCustomerOwner.vue

@@ -24,7 +24,7 @@
         </view>
 
         <!-- 分页部分  top="68rpx" -->
-        <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+        <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}"
         >
@@ -126,10 +126,7 @@ let list = ref([]);
 const upOption = ref({
   page: {num: 0, size: 10},
   noMoreSize: 5,
-  empty: {
+  empty: {tip: '~ 空空如也 ~'},
-    tip: '~ 空空如也 ~',
-    icon: "../../../../static/images/mescroll-empty.png"
-  },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
 });
@@ -149,31 +146,44 @@ const mescrollInit = (mescroll) => {
 
 // 下拉刷新
 const downCallback = async (mescroll) => {
-  uni.showLoading();
+  try {
-  cssFlag.value = true;
+    uni.showLoading();
-  setTimeout(async () => {
+    cssFlag.value = true;
-    // 重置页码为第一页
+    setTimeout(async () => {
-    const res = await getList(1, mescroll.size || upOption.page.size);
+      // 重置页码为第一页
-    cssFlag.value = false;
+      const res = await getList(1, mescroll.size || upOption.page.size);
-    list.value = res.list;
+      list.value = res.list;
-    // 正确传递 total 参数
+      cssFlag.value = false;
-    mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
+      // 正确传递 total 参数
-  }, 500);
+      mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
+      uni.hideLoading();
+
+    }, 500);
+  } catch (error) {
+    console.log(error)
+    mescroll.endErr();
+  }
 }
 // 上拉加载更多
 const upCallback = async (mescroll) => {
-  uni.showLoading();
+  try {
-  setTimeout(async () => {
+    uni.showLoading();
-    // 使用 mescroll 提供的页码和大小参数
+    setTimeout(async () => {
-    const res = await getList(mescroll.num, mescroll.size);
+      // 使用 mescroll 提供的页码和大小参数
-    if (mescroll.num === 1) {
+      const res = await getList(mescroll.num, mescroll.size);
-      list.value = res.list;
+      if (mescroll.num === 1) {
-    } else {
+        list.value = res.list;
-      list.value.push(...res.list);
+      } else {
-    }
+        list.value.push(...res.list);
-    // 正确判断是否还有更多数据
+      }
-    mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
+      // 正确判断是否还有更多数据
-  }, 500);
+      mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
+      uni.hideLoading();
+    }, 500);
+  } catch (error) {
+    console.log(error)
+    mescroll.endErr();
+  }
 }
 
 // 获取数据列表
@@ -184,17 +194,12 @@ const getList = (pageIndex, pageSize) => {
       pageSize,
       searchContent: searchValue.value
     }
-    try {
+
-      let res = await SearchForAllPerson(param);
+    let res = await SearchForAllPerson(param);
-      resolve({
+    resolve({
-        list: res.rows,
+      list: res.rows,
-        total: res.total
+      total: res.total
-      });
+    });
-    } catch (e) {
-      console.log(e, '数据获取失败');
-    } finally {
-      uni.hideLoading();
-    }
   });
 }
 
@@ -295,20 +300,41 @@ let handleCopyInfo = (item) => {
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 160rpx;
+  top: 150rpx;
-  height: calc(100vh - 160rpx);
+  height: calc(100vh - 75px);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 116rpx;
+  top: 120rpx;
-  height: calc(100vh - 116rpx);
+  height: calc(100vh);
   /* #endif */
 }
 
+
+.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;
+}
+
 .scroll-h {
-  height: 100%;
+  /* #ifdef APP-PLUS */
+  height: calc(100vh - 120px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  height: calc(100vh - 110px);
+  /* #endif */
 }
 
 .white-bg {
@@ -319,4 +345,10 @@ let handleCopyInfo = (item) => {
   }
 }
 
+.white-bg:hover {
+  //background-color: #f1f1f1;
+  background-color: #f1f1f1; /* Chrome, Safari, Opera */
+  box-shadow: 0px 0px 5rpx white;
+  //filter: rgba(237, 242, 250, 0.5);
+}
 </style>

src/pages/business/CRM/customer/components/confirmForm.vue

@@ -549,6 +549,7 @@ let hobbyIds = ref([]);
 let hobbies = ref([]);
 // 选择爱好标签
 const handleHobbyChange = (items, ids) => {
+  console.log('选择爱好', items, ids);
   hobbyIds.value = [];
   hobbies.value = items;
 };

src/pages/business/CRM/customer/components/customerUserEdit.vue

@@ -1,8 +1,3 @@
-<!--
- * @author wangzhuo
- * @date 2025年9月1日
- * @description 编辑客户人员信息
--->
 <template>
   <view class="con-body">
     <view class="con-bg">
@@ -22,7 +17,7 @@
 
       <!-- 正文内容 -->
       <view class="white-bg">
-        <view class="form-con" @click="handleBlur">
+        <view class="form-con">
           <uni-forms ref="formRef" :model="formData" :rules="rules" label-width="40%">
             <!-- 选择客户 -->
             <uni-forms-item label="客户名称" name="cusName" required class="f-c-right">
@@ -582,11 +577,6 @@ let handleWorkingStatusChange = e => {
   formData.value.workingStatus = workingStatusList[value].name;
 }
 
-const hobbySelectRef = ref(null);
-// 多选组件失去焦点关闭
-let handleBlur = () => {
-  if (hobbySelectRef.value) hobbySelectRef.value.handleBlur();
-}
 let submitForm = async () => {
   let hobbyTags = hobbies.value.map(it => {
     let {name} = it;
@@ -612,11 +602,12 @@ let submitForm = async () => {
         uni.showToast({
           title: "更新成功"
         })
-        const eventChannel = instance.getOpenerEventChannel();
-        eventChannel.emit("refreshCusUserList");
         setTimeout(()=>{
           uni.navigateBack();
+          const eventChannel = instance.getOpenerEventChannel();
+          eventChannel.emit("refreshCusUserList");
         },1000);
+
       }else{
         uni.showToast({
           title: "操作失败",

src/pages/business/CRM/customer/customerAudit.vue

@@ -7,13 +7,7 @@
   <view class="con-body">
     <view class="con-bg">
       <!-- 头部 -->
-      <customHeader ref="customHeaderRef" :title="'客户人员审核'" :leftFlag="true" :rightFlag="list.length > 0">
+      <customHeader ref="customHeaderRef" :title="'客户人员审核'" :leftFlag="true" :rightFlag="false">
-        <template #right>
-          <view class="head-right" @click="handleReSort">
-            <uni-icons type="arrow-down" size="20" color="#B7D2FF"></uni-icons>
-            {{iconType==='arrow-up'?'最新':'最早'}}
-          </view>
-        </template>
       </customHeader>
 
       <!-- 高度来避免头部遮挡 -->
@@ -23,12 +17,12 @@
       <view class="all-body">
         <!-- 搜索-->
         <view class="search">
-          <!--          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户人员名称" clearButton="auto"-->
+<!--          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户人员名称" clearButton="auto"-->
-          <!--                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"-->
+<!--                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"-->
-          <!--                          v-model="searchValue"-->
+<!--                          v-model="searchValue"-->
-          <!--          />-->
+<!--          />-->
           <view class="custom-search"></view>
-        </view>
+          </view>
 
         <!-- 分页部分  -->
         <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
@@ -107,23 +101,16 @@ let handleSearch = () => {
 watch(searchValue, (newValue, oldValue) => {
   handleSearch()
 })
-// 排序图标
+let clearSearchValue = () => {
-const iconType = ref('arrow-up');
+  searchValue.value = '';
-let handleReSort = () => {
-  iconType.value = iconType.value === 'arrow-down' ? 'arrow-up' : 'arrow-down';
-  list.value = list.value.reverse();
 }
-
 // 查询列表
 let list = ref([]);
 
 const upOption = ref({
   page: {num: 0, size: 10},
   noMoreSize: 5,
-  empty: {
+  empty: {tip: '~ 空空如也 ~'},
-    tip: '~ 空空如也 ~',
-    icon: "../../../../static/images/mescroll-empty.png"
-  },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
 });
@@ -143,11 +130,10 @@ const mescrollInit = (mescroll) => {
 
 // 下拉刷新
 const downCallback = async (mescroll) => {
-
+  try {
-  uni.showLoading();
+    uni.showLoading();
-  cssFlag.value = true;
+    cssFlag.value = true;
-  setTimeout(async () => {
+    setTimeout(async () => {
-    try {
       // 重置页码为第一页
       const res = await getList(1, mescroll.size || upOption.page.size);
 
@@ -155,21 +141,17 @@ const downCallback = async (mescroll) => {
       // 正确传递 total 参数
       mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size));
       uni.hideLoading();
-
-    } catch (error) {
-      console.log(error)
-      mescroll.endErr();
-    } finally {
       cssFlag.value = false;
-    }
+    }, 500);
-  }, 500);
+  } catch (error) {
-
+    console.log(error)
+    mescroll.endErr();
+  }
 }
 // 上拉加载更多
 const upCallback = async (mescroll) => {
-
+  try {
-  setTimeout(async () => {
+    setTimeout(async () => {
-    try {
       // 使用 mescroll 提供的页码和大小参数
       const res = await getList(mescroll.num, mescroll.size);
       if (mescroll.num === 1) {
@@ -180,11 +162,11 @@ const upCallback = async (mescroll) => {
       mescroll.endBySize(res.list.length, res.total);
       // 正确判断是否还有更多数据
       mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size);
-    } catch (error) {
+    }, 500);
-      mescroll.endErr();
+  } catch (error) {
-    }
+    console.log(error)
-  }, 500);
+    mescroll.endErr();
-
+  }
 }
 
 // 获取数据列表
@@ -195,17 +177,12 @@ const getList = (pageIndex, pageSize) => {
       pageSize,
       searchContent: searchValue.value
     }
-    try {
+
-      let res = await getCusUserApprovalList(param);
+    let res = await getCusUserApprovalList(param);
-      resolve({
+    resolve({
-        list: res.rows,
+      list: res.rows,
-        total: res.total
+      total: res.total
-      });
+    });
-    } catch (e) {
-      console.log(e, "客户人员审核任务列表获取失败");
-    } finally {
-      uni.hideLoading();
-    }
   });
 }
 
@@ -230,17 +207,22 @@ let handleDetail = (item) => {
 <style scoped>
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 160rpx;
+  top: 150rpx;
-  height: calc(100vh - 160rpx);
+  height: calc(100vh - 75px);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 116rpx;
+  top: 120rpx;
-  height: calc(100vh - 116rpx);
+  height: calc(100vh);
   /* #endif */
 }
 
 .scroll-h {
-  height: 100%;
+  /* #ifdef APP-PLUS */
+  height: calc(100vh - 120px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  height: calc(100vh - 110px);
+  /* #endif */
 }
 
 .white-bg {

src/pages/business/CRM/customer/customerUserBelong.vue

@@ -134,7 +134,7 @@ const upOption = ref({
   noMoreSize: 5,
   empty: {
     tip: '~ 空空如也 ~',
-    icon: "../../../../static/images/mescroll-empty.png"
+    icon: "../../static/images/mescroll-empty.png"
   },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
@@ -155,27 +155,27 @@ const mescrollInit = (mescroll) => {
 
 // 下拉刷新
 const downCallback = async (mescroll) => {
-  cssFlag.value = true;
+  try {
-  uni.showLoading();
+    cssFlag.value = true;
-  setTimeout(async () => {
+    uni.showLoading();
-    try {
+    setTimeout(async () => {
       // 重置页码为第一页
       const res = await getList(1, mescroll.size || upOption.page.size);
+      cssFlag.value = false;
       list.value = res.list;
       // 正确传递 total 参数
-      mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
+      mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size));
-    } catch (error) {
+      uni.hideLoading();
-      mescroll.endErr();
+    }, 500);
-    } finally {
+  } catch (error) {
-      cssFlag.value = false;
+    console.log(error)
-    }
+    mescroll.endErr();
-  }, 500);
+  }
-
 }
 // 上拉加载更多
 const upCallback = async (mescroll) => {
-  setTimeout(async () => {
+  try {
-    try {
+    setTimeout(async () => {
       // 使用 mescroll 提供的页码和大小参数
       const res = await getList(mescroll.num, mescroll.size);
       if (mescroll.num === 1) {
@@ -184,12 +184,13 @@ const upCallback = async (mescroll) => {
         list.value.push(...res.list);
       }
       // 正确判断是否还有更多数据
-      mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
+      mescroll.endBySize(res.list.length, res.total)
       // mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size);
-    } catch (error) {
+    }, 500);
-      mescroll.endErr();
+  } catch (error) {
-    }
+    console.log(error)
-  }, 500);
+    mescroll.endErr();
+  }
 }
 
 // 获取数据列表
@@ -200,18 +201,12 @@ const getList = (pageIndex, pageSize) => {
       pageSize,
       searchContent: searchValue.value
     }
-    try {
-      let res = await SearchForAllCustomersSalesperson(param);
-      resolve({
-        list: res.rows,
-        total: res.total
-      });
-    } catch (e) {
-      console.log(e, "获取所有客户人员所属失败");
-    } finally {
-      uni.hideLoading();
-    }
 
+    let res = await SearchForAllCustomersSalesperson(param);
+    resolve({
+      list: res.rows,
+      total: res.total
+    });
   });
 }
 
@@ -222,7 +217,6 @@ let handleDetail = (item) => {
       url: "/pages/business/CRM/customer/components/customerUserEdit",
       events: {
         refreshCusUserList() {
-          console.log('refreshCusUserList',"响应刷新")
           handleSearch();
         }
       },
@@ -230,7 +224,7 @@ let handleDetail = (item) => {
         res.eventChannel.emit('editCusData', {param: item, isAdd: false})
       }
     })
-  } else {
+  }else{
     uni.showToast({
       title: '已完成审核，不可修改',
       icon: 'none'
@@ -284,15 +278,16 @@ let handleDelete = async (item) => {
 <style lang="scss" scoped>
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 160rpx;
+  top: 150rpx;
-  height: calc(100vh - 160rpx);
+  height: calc(100vh - 75px);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 116rpx;
+  top: 120rpx;
-  height: calc(100vh - 116rpx);
+  height: calc(100vh);
   /* #endif */
 }
 
+
 .search .btn-search {
   border: none;
   background: none;

src/pages/business/CRM/customer/selectCustomer.vue

@@ -80,10 +80,7 @@ let cssFlag=ref(false);//控制样式
 const upOption = ref({
   page: { num: 0, size: 10 },
   noMoreSize: 5,
-  empty: {
+  empty: { tip: '~ 空空如也 ~' },
-    tip: '~ 空空如也 ~',
-    icon: "../../../../static/images/mescroll-empty.png"
-  },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
 });
@@ -195,14 +192,15 @@ const radioChange = (e) => {
 <style lang="scss" scoped>
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 160rpx;
+  top: 150rpx;
-  height: calc(100vh - 160rpx);
+  height: calc(100vh - 75px);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 116rpx;
+  top: 120rpx;
-  height: calc(100vh - 116rpx);
+  height: calc(100vh);
   /* #endif */
 }
+
 .search .btn-search {
   border: none;
   background: none;

src/pages/business/CRM/customerUserList.vue

@@ -11,7 +11,8 @@
             </uni-easyinput>
                 <checkbox-group class="block" @change="checkboxChange">
                     <view class="itemClass" v-for="(item, index) in dataList" :key="item.userId">
-                        <checkbox class='checkBoxClass' :value="item.userName"></checkbox>
+                        <checkbox class='checkBoxClass' :value="item.userName" 
+                            v-model="item.userName"></checkbox>
                         <view class="clientClass">
                             <text class="blue-text">{{ item.userName }}</text>
                             {{ " | " }}

src/pages/business/CRM/mainOwner/audit/confirmForm.vue

@@ -602,11 +602,11 @@ let handleReject = () => {
     async success(res){
       if(res.confirm){
         if(res.content){
-          let response = await changeOfPrimaryOwnershipNoApproved({
+          let res = await changeOfPrimaryOwnershipNoApproved({
             opinionOwn: res.content,
             userId: formData.value.userId
           })
-          if(response.code===200){
+          if(res.code==200){
             uni.showToast({
               title: '操作成功',
               success(){

src/pages/business/CRM/mainOwner/audit/mainOwnerChangeAudit.vue

@@ -21,6 +21,7 @@
 <!--                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"-->
 <!--                          v-model="searchValue"-->
 <!--          />-->
+<!--          <button type="default" @click="clearSearchValue" size="mini" class="btn-search">清空</button>-->
 <!--        </view>-->
 
         <!-- 分页部分  -->
@@ -30,11 +31,9 @@
         >
           <view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index">
             <view class="report-list" @click.stop="handleDetail(item)">
-              <view class="r-list title">
+              <view class="r-list title" >
                 {{ item.cusName }}
-                <view class="r-right no-wrap" :class="item.auditStatus ? 'btn-blue' : 'btn-pink' ">
+                <view class="r-right" :class="item.auditStatus ? '' : 'btn-pink' ">{{item.auditStatus?'':'待您审批'}}</view>
-                  {{ item.auditStatus ?  item.auditStatus : '待您审核' }}
-                </view>
               </view>
               <view class="r-list">
                 <view class="r-left">客户人员名称</view>
@@ -99,8 +98,7 @@ const mescrollRef = ref(null);
 let timerId = null;
 // 查询搜索跳转
 let handleSearch = () => {
-  // 防抖搜索
+  // 防抖搜索    console.log(searchValue.value)
-  console.log(searchValue.value)
   if (timerId) clearTimeout(timerId);
 
   timerId = setTimeout(async () => {
@@ -115,7 +113,7 @@ let handleSearch = () => {
 watch(searchValue, (newValue, oldValue) => {
   handleSearch()
 })
-let clearSearchValue = () => {
+let clearSearchValue = ()=>{
   searchValue.value = '';
 }
 // 查询列表
@@ -124,10 +122,7 @@ let list = ref([]);
 const upOption = ref({
   page: {num: 0, size: 10},
   noMoreSize: 5,
-  empty: {
+  empty: {tip: '~ 空空如也 ~'},
-    tip: '~ 空空如也 ~',
-    icon: "../../../../../static/images/mescroll-empty.png"
-  },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
 });
@@ -147,28 +142,28 @@ const mescrollInit = (mescroll) => {
 
 // 下拉刷新
 const downCallback = async (mescroll) => {
-  cssFlag.value = true;
+  try {
-  uni.showLoading();
+    cssFlag.value = true;
-  setTimeout(async () => {
+    uni.showLoading();
-    try {
+    setTimeout(async () => {
       // 重置页码为第一页
       const res = await getList(1, mescroll.size || upOption.page.size);
+
       list.value = res.list;
+      cssFlag.value = false;
       // 正确传递 total 参数
       mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size));
-    } catch (error) {
+      uni.hideLoading();
-      console.log(error)
+    }, 500);
-      mescroll.endErr();
+  } catch (error) {
-    } finally {
+    console.log(error)
-      cssFlag.value = false;
+    mescroll.endErr();
-    }
+  }
-  }, 500);
-
 }
 // 上拉加载更多
 const upCallback = async (mescroll) => {
-  setTimeout(async () => {
+  try {
-    try {
+    setTimeout(async () => {
       // 使用 mescroll 提供的页码和大小参数
       const res = await getList(mescroll.num, mescroll.size);
       if (mescroll.num === 1) {
@@ -178,11 +173,11 @@ const upCallback = async (mescroll) => {
       }
       // 正确判断是否还有更多数据
       mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size);
-    } catch (error) {
+    }, 500);
-      console.log(error)
+  } catch (error) {
-      mescroll.endErr();
+    console.log(error)
-    }
+    mescroll.endErr();
-  }, 500);
+  }
 }
 
 // 获取数据列表
@@ -193,16 +188,12 @@ const getList = (pageIndex, pageSize) => {
       pageSize,
       searchContent: searchValue.value
     }
-    try {
+
-      let res = await personnelAwaitingReviewForChange(param);
+    let res = await personnelAwaitingReviewForChange(param);
-      resolve({
+    resolve({
-        list: res.rows,
+      list: res.rows,
-        total: res.total
+      total: res.total
-      });
+    });
-    } catch (e) {
-    } finally {
-      uni.hideLoading();
-    }
   });
 }
 
@@ -212,11 +203,11 @@ let handleDetail = (item) => {
   uni.navigateTo({
     url: "/pages/business/CRM/mainOwner/audit/confirmForm",
     events: {
-      refreshOwnerChangeList() {
+      refreshOwnerChangeList(){
         handleSearch();
       }
     },
-    success(res) {
+    success(res){
       res.eventChannel.emit('auditCusOwner', {data: {userId}, editable: false})
     }
   })
@@ -227,39 +218,60 @@ let handleDetail = (item) => {
 <style scoped>
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 160rpx;
+  top: 150rpx;
-  height: calc(100vh - 160rpx);
+  height: calc(100vh - 75px);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 116rpx;
+  top: 120rpx;
-  height: calc(100vh - 116rpx);
+  height: calc(100vh);
   /* #endif */
 }
 
-.scroll-h{
+.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 */
-  top: 160rpx;
+  height: calc(100vh - 120px);
-  height: calc(100vh - 160rpx);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 116rpx;
+  height: calc(100vh - 110px);
-  height: calc(100vh - 116rpx);
   /* #endif */
 }
 
 .white-bg {
   padding-bottom: 10rpx;
-
+  .title{
-  .title {
     align-items: flex-start;
   }
 }
 
-.no-wrap {
+.btn-pink{
   white-space: nowrap;
 }
-
-.btn-blue {
-  border-radius: 10rpx;
-}
 </style>

src/pages/business/CRM/mainOwner/view/viewMainOwner.vue

@@ -1,17 +1,19 @@
-<!--
- * @description 查看主归属人变更
- * @update date 2025/9/17 21:45
--->
 <template>
   <view class="con-body">
     <view class="con-bg">
       <!-- 头部 -->
-      <customHeader ref="customHeaderRef" :title="'查看主归属人变更'" :leftFlag="true"
+      <customHeader ref="customHeaderRef" :title="'查看主归属人变更'" :leftFlag="true" :rightFlag="false"></customHeader>
-                    :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"
@@ -20,17 +22,25 @@
                 @click="showDetail(item)">
             <view>
               <view class="report-list">
-                <view class="r-list title">{{ item.cusName }}
+                <view class="title">客户：{{ item.cusName }}</view>
+                <view class="r-list">
                   <view class="r-name">{{ item.visistCode }}</view>
-                  <view class="r-right btn-blue no-wrap"> 查看 </view>
+                  <view>
-                </view>
 
+                    <view
+                        class="r-right btn-blue"
+                        size="mini">
+                      查看
+                    </view>
+                  </view>
+
+                </view>
                 <view class="border-bottom"></view>
                 <view class="r-list">
                   <view class="r-left">客户人员名称</view>
-                  <view class="r-right">{{ item.userName }}</view>
+                  <view class="r-right">{{ item.userName}}</view>
                 </view>
-                <view class="r-list">
+                <view class="r-list" >
                   <view class="r-left">目前业务员</view>
                   <view class="r-right">{{ item.belonger }}</view>
                 </view>
@@ -58,7 +68,7 @@
 
 <script setup>
 import customHeader from "../../../../../components/customHeader.vue";
-import {onMounted, ref} from 'vue';
+import { onMounted, ref } from 'vue';
 
 import {getNavBarPaddingTop} from "../../../../../utils/system";
 import MescrollUni from "mescroll-uni/mescroll-uni.vue";
@@ -78,17 +88,16 @@ let queryParams = ref({
 onMounted(() => {
   navBarPaddingTop.value = getNavBarPaddingTop() * 2;
 })
-onShow(() => {
+onShow(()=>{
   getList(queryParams)
 })
 
 
 let list = ref([])
-
 //获取列表信息
-function getList(queryParams) {
+function getList(queryParams){
   queryViewMainOwnerList(queryParams.value).then(res => {
-    list.value = res.rows
+      list.value = res.rows
   })
 }
 
@@ -144,12 +153,9 @@ const upCallback = async (mescroll) => {
 }
 
 const upOption = ref({
-  page: {num: 0, size: 10},
+  page: { num: 0, size: 10 },
   noMoreSize: 5,
-  empty: {
+  empty: { tip: '~ 空空如也 ~' },
-    tip: '~ 空空如也 ~',
-    icon: "../../../../../static/images/mescroll-empty.png"
-  },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
 });
@@ -171,43 +177,57 @@ function showDetail(item) {
 
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 
 .all-body {
   /* #ifdef APP-PLUS */
-  top: 160rpx;
+  top: 150rpx;
-  height: calc(100vh - 160rpx);
+  height: calc(100vh - 75px);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 116rpx;
+  top: 120rpx;
-  height: calc(100vh - 116rpx);
+  height: calc(100vh);
   /* #endif */
 }
 
-.scroll-h{
+.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 */
-  top: 160rpx;
+  height: calc(100vh - 120px);
-  height: calc(100vh - 160rpx);
   /* #endif */
   /* #ifndef APP-PLUS */
-  top: 116rpx;
+  height: calc(100vh - 110px);
-  height: calc(100vh - 116rpx);
   /* #endif */
 }
 
 .white-bg {
   padding-bottom: 10rpx;
 }
-
-.title {
-  align-items: baseline
-}
-
-.no-wrap {
-  white-space: nowrap;
-}
-
-.btn-blue {
-  border-radius: 10rpx;
-}
 </style>

src/pages/business/CRM/mainOwner/view/viewMainOwnerDetail.vue

@@ -135,19 +135,7 @@ function getCrmCusUserNewChangeOwnerList() {
 <style scoped>
 .con-bg{
   background: white;
-/*  min-height: 100vh; */
+  min-height: 100vh;
-}
-
-.all-body {
-  /* #ifdef APP-PLUS */
-  top: 160rpx;
-  height: calc(100vh - 160rpx);
-  /* #endif */
-  /* #ifndef APP-PLUS */
-  top: 116rpx;
-  height: calc(100vh - 116rpx);
-  /* #endif */
-  overflow-y: auto;
 }
 
 .white-bg {

src/pages/business/CRM/map/addRearkSignIn.vue

@@ -22,8 +22,8 @@
 <script setup>
 import customHeader from '@/components/customHeader.vue'
 import { onMounted, reactive, ref } from 'vue';
-import { addStartMap } from '@/api/crm/activity/map';
+import { addStartMap } from '../../../../api/crm/activity/map';
-import { parseTime } from '@/utils/datetime.js';
+import { dateFormat } from '../../../../utils/formatter';
 import { onLoad } from '@dcloudio/uni-app';
 import { getNavBarPaddingTop } from '@/utils/system.js'
 let form = reactive({
@@ -46,7 +46,7 @@ onMounted(() => {
 onLoad(option => {
 	form.visistId = option.visistId
 	let date = new Date();
-	form.craeteTime = parseTime(date, '{y}-{m}-{d}');
+	form.craeteTime = dateFormat("YYYY-mm-dd", date)
 })
 
 function addInsertMapClockIn() {

src/pages/business/CRM/map/checkInView.vue

@@ -10,18 +10,18 @@
             <!-- 正文内容 -->
             <view>
                 <!-- 搜索 -->
-<!--                <view class="search">-->
+                <view class="search">
-<!--                    <picker mode="date" :value="defaultDate" :start="startDate" :end="endDate" @change="bindDateChange"-->
+                    <picker mode="date" :value="defaultDate" :start="startDate" :end="endDate" @change="bindDateChange"
-<!--                        class="picker-bg">-->
+                        class="picker-bg">
-<!--                        <view class="picker">-->
+                        <view class="picker">
-<!--                            <uni-icons custom-prefix="iconfont" color="#ffffff" type="icon-phoneshizhong"-->
+                            <uni-icons custom-prefix="iconfont" color="#ffffff" type="icon-phoneshizhong"
-<!--                                size="18"></uni-icons>-->
+                                size="18"></uni-icons>
-<!--                            <view>{{ defaultDate }}</view>-->
+                            <view>{{ defaultDate }}</view>
-<!--                            <uni-icons type="down" size="18"></uni-icons>-->
+                            <uni-icons type="down" size="18"></uni-icons>
-<!--                        </view>-->
+                        </view>
-<!--                    </picker>-->
+                    </picker>
-<!--                    <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>-->
+                    <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
-<!--                </view>-->
+                </view>
 
                 <!-- 分页部分  -->
                 <view class="white-bg margin-bottom20" v-for="(item, index) in list">

src/pages/business/CRM/marketActivity/activityTypeList.vue

@@ -10,7 +10,8 @@
             
                 <checkbox-group class="block" @change="checkboxChange">
                     <view class="itemClass" v-for="(item, index) in dataList" :key="item.id">
-                        <checkbox class='checkBoxClass' :value="item.name"></checkbox>
+                        <checkbox class='checkBoxClass' :value="item.name" 
+                            v-model="item.name"></checkbox>
                         <view class="clientClass">
                             <text class="blue-text">{{ item.name }}</text>
                         </view>

src/pages/business/CRM/marketActivity/auditReport.vue

@@ -65,7 +65,7 @@ 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 } from '../../../../api/crm/activity/activity';
+import { getApprovalList, getUserInfo } from '../../../../api/crm/activity/activity';
 
 
 let list = ref([])
@@ -80,10 +80,7 @@ onMounted(() => {
 const upOption = ref({
     page: { num: 0, size: 10 },
     noMoreSize: 5,
-    empty: {
+    empty: { tip: '~ 空空如也 ~' },
-        tip: '~ 空空如也 ~',
-        icon: "../../../../static/images/mescroll-empty.png"
-    },
     textLoading: '加载中...',
     textNoMore: '已经到底了'
 });
@@ -110,24 +107,24 @@ function upCallback(page) {
     getVisistList(page);
 }
 
-// onShow(() => {
+onShow(() => {
-//     getUserInfoMethod();
+    getUserInfoMethod();
-// })
+})
 
 let nickName = ref();
 let deptName = ref();
 let userId = ref();
 let posts = ref();
 
-// //获取用户信息
+//获取用户信息
-// function getUserInfoMethod() {
+function getUserInfoMethod() {
-//     getUserInfo().then(res => {
+    getUserInfo().then(res => {
-//         nickName.value = res.user.nickName;
+        nickName.value = res.user.nickName;
-//         deptName.value = res.user.dept.deptName;
+        deptName.value = res.user.dept.deptName;
-//         userId.value = res.user.userId;
+        userId.value = res.user.userId;
-//         posts.value = res.post;
+        posts.value = res.post;
-//     })
+    })
-// }
+}
 
 //查询待审批的列表信息
 let dataList = ref([])

src/pages/business/CRM/marketActivity/chooseCus.vue

@@ -1,257 +1,170 @@
 <template>
-  <view class="con-body">
+    <view class="con-body">
-    <view class="con-bg">
+        <view >
-      <!-- 头部 -->
+            <!-- 头部 -->
-      <customHeader ref="customHeaderRef" :title="'客户名称列表'" :leftFlag="true" :rightFlag="false">
+            <customHeader ref="customHeaderRef" :title="'选择客户单位'" :leftFlag="true" :rightFlag="false">
-        <template #right>
+            </customHeader>
-          <view class="head-right" @click="handleAdd">
+            <!-- 高度来避免头部遮挡 -->
-            <uni-icons type="plus" size="24" color="#B7D2FF"></uni-icons>
+            <view class="top-height"></view>
-            新增
+            <uni-easyinput prefixIcon="search" v-model="searchContent" placeholder="请输入客户单位名称" clearable
-          </view>
+                @iconClick="iconClick">
-        </template>
+            </uni-easyinput>
-      </customHeader>
 
-      <!-- 高度来避免头部遮挡 -->
-      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
 
-      <!-- 正文内容 -->
+		<view class="inner-box">
-      <view class="all-body">
+			<view class="list-cont">
-        <!-- 搜索  @blur="blur" @focus="focus" @input="input" @cancel="cancel" @clear="clear"-->
+				<radio-group class="block" @change="radioChange">
-        <view class="search">
+					<view class="item"   v-for="(item, index) in dataList">
-          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户名称" clearButton="auto"
+						<radio class='radio' :value="index" ></radio>
-                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"
+						<view class="name">{{item.cusName+"（"+item.shortName+"）"}}</view>
-                          v-model="searchValue" @clear="searchValue=''"
+					</view>
-          />
+				</radio-group>
-          <!--          <button type="default" @click="searchValue=''" size="mini" class="btn-search">清空</button>-->
+			</view>
+		</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}"
-        ><!-- @down="downCallback"-->
-          <radio-group class="block" @change="radioChange">
-            <view class="white-bg" v-for="(item, index) in list" :key="index" @click="handleDetail(item)">
-              <radio class='radio'
-                     :class="index === selectIndex ? 'checked' : ''"
-                     :checked="index === selectIndex"
-                     :value="index+''">
-              </radio>
-
-              <view class="report-list">
-                <view class="title">{{ item.cusName }}</view>
-                <!--              <view class="r-list">
-                                <view class="r-name">{{ item.shortName }}</view>
-                                <view class="r-right btn-orange" size="mini">{{ item.statusName }}</view>
-                              </view>-->
-                <view class="border-bottom"></view>
-                <!--              <view class="r-list">
-                                <view class="r-left">日期</view>
-                                <view class="r-right">{{ new Date(item.createTime).toLocaleDateString()}}</view>
-                              </view>-->
-              </view>
-            </view>
-          </radio-group>
-        </mescroll-uni>
-      </view>
     </view>
-  </view>
 </template>
 
 <script setup>
-
-import {ref, onMounted, getCurrentInstance, watch} from 'vue'
 import customHeader from '@/components/customHeader.vue'
-import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import { getYsCustomerList } from '../../../../api/crm/activity/activity'
-import {getNavBarPaddingTop} from '@/utils/system.js'
+import { onMounted,  reactive, ref, watch } from 'vue'
-import {onLoad} from "@dcloudio/uni-app";
+import { onLoad } from '@dcloudio/uni-app'
-import {getCustomerList} from "@/api/crm/customer/getCustomer";
+import { useMessage } from '../../../../utils/message'
 
-let instance = null;
-// 获取导航栏高度用于内容区域padding
-const navBarPaddingTop = ref(0);
-// 查询列表
-let list = ref([]);
-const mescrollRef = ref(null);
-let searchValue = ref('')
 
-let cssFlag=ref(false);//控制样式
 
-const upOption = ref({
+const message = useMessage();
-  page: { num: 0, size: 10 },
-  noMoreSize: 5,
-  empty: {
-    tip: '~ 空空如也 ~',
-    icon: "../../../../static/images/mescroll-empty.png"
-  },
-  textLoading: '加载中...',
-  textNoMore: '已经到底了'
-});
 
-const downOption = ref({
+//点击查询客户人员
-  auto: true,
+const queryParams = ref({
-  textInOffset: '下拉刷新',
+    cusName: '',
-  textOutOffset: '释放更新',
+    nickName:'',
-  textLoading: '刷新中...'
+    pageNum: 1,
-});
+    pageSize: 10
+})
 
-const mescrollInit = (mescroll) => {
-  cssFlag.value = true;
-  mescrollRef.value = mescroll;
-};
 
 onMounted(() => {
-  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+
 })
 
+onLoad(options => {
+    queryParams.value.cusName = options.cusName
+})
+const dataList = ref([])
 
-onLoad((options)=>{
+
-  instance = getCurrentInstance().proxy;
+
-  const eventChannel = instance.getOpenerEventChannel();
+
-  eventChannel.on('requestCusList', async (res) => {
+//查询某一客户人员
-    let {cusName} = res.data;
+let searchContent = ref('')
-    // console.log(cusName, "客户选择页读取到参数");
+
-    searchValue.value = cusName;
+function iconClick() {
-  })
+    message.toast('点击了查询，当前内容：' + searchContent.value)
+}
+
+//监视查询的内容的变化
+let queryCusForm = reactive({})
+watch(searchContent,(newValue,oldValue)=>{
+    queryCusForm.cusName = searchContent.value
+    getYsCustomerList(queryCusForm).then(res=>{
+        dataList.value = res.rows
+    })
 })
 
-let timerId = null;
+function radioChange(event) {
-// 搜索
+     const selectedIndex = event.detail.value
-watch(searchValue, (newValue, oldValue) => {
+    let test = dataList.value[selectedIndex]
-  // console.log(`新值: ${newValue}, 旧值: ${oldValue}`);
+    // 发送全局事件
-  if(timerId) clearTimeout(timerId);
+    uni.$emit('onCustomerSelected', test)
-  timerId = setTimeout(async ()=>{
+    let cusName = test.cusName;//客户名称
-    handleSearch();
+    let cusId = test.cusId;//客户ID
-    clearTimeout(timerId);
+    uni.navigateBack()//返回上一页
-    timerId = null;
-  }, 500);
-});
-
-// 下拉刷新
-const downCallback = async (mescroll) => {
-  try {
-    const res = await getList(1, upOption.value.page.size);
-    list.value = res.list;
-    // 正确结束下拉刷新状态
-    mescroll.endSuccess(res.list.length, res.total >= upOption.value.page.size);
-  } catch (error) {
-    console.log(error)
-    // 发生错误时结束下拉刷新
-    mescroll.endErr();
-  }
 }
 
-// 上拉加载更多
-const upCallback = async (mescroll) => {
-  try {
-    const res = await getList(mescroll.num, mescroll.size);
-    if (mescroll.num === 1) {
-      list.value = res.list;
-    } else {
-      list.value.push(...res.list);
-    }
-    // 正确结束上拉加载状态
-    mescroll.endSuccess(res.list.length, res.list.length >= mescroll.size);
-  } catch (error) {
-    console.log(error)
-    // 发生错误时结束上拉加载
-    mescroll.endErr();
-  }
-}
-
-// 查询搜索跳转
-let handleSearch = async () => {
-  // 触发下拉刷新以重新加载数据
-  if (mescrollRef.value) {
-    cssFlag.value = true;
-    uni.showLoading()
-    await downCallback(mescrollRef.value.mescroll);
-    uni.hideLoading()
-    cssFlag.value = false;
-  }
-}
-// 获取数据列表
-const getList = async (pageIndex, pageSize) => {
-  let param = {
-    pageNum: pageIndex,
-    pageSize,
-    cusName: searchValue.value
-  }
-  let { rows, total  } = await getCustomerList(param)
-  return {list: rows, total};
-}
-// 选中项的索引号
-const selectIndex = ref(null);
-const radioChange = (e) => {
-  const selectedIndex = e.detail.value;
-  //发送全局事件
-  uni.$emit('onCustomerSelected',list.value[selectedIndex])
-  uni.navigateBack()
-}
 
 
 
 </script>
 
-<style lang="scss" scoped>
+<style scoped lang="scss">
-.all-body {
+
-  /* #ifdef APP-PLUS */
+.con-body{
-  top: 150rpx;
+    background: white;
-  height: calc(100vh - 75px);
-  /* #endif */
-  /* #ifndef APP-PLUS */
-  top: 120rpx;
-  height: calc(100vh);
-  /* #endif */
 }
 
-.search .btn-search {
+
-  border: none;
+/* Container for the checkbox group */
-  background: none;
+.checkbox-group.block {
-  line-height: normal;
+    width: 100%;
-  color: #fff;
-  line-height: 56rpx !important;
-  padding: 10rpx 0 0;
-  text-align: left;
-  cursor: pointer;
 }
 
-.search .btn-search::after {
+/* Each item row */
-  display: none;
+.itemClass {
+    display: flex;
+    align-items: center;
+    padding: 10rpx 0;
+    margin-left: 15rpx;
+    border-bottom: 1px solid #eee;
+    /* optional divider */
 }
 
-.scroll-h {
+/* Checkbox styling */
-  /* #ifdef APP-PLUS */
+.checkBoxClass {
-  height: calc(100vh - 120px);
+    margin-right: 12rpx;
-  /* #endif */
-  /* #ifndef APP-PLUS */
-  height: calc(100vh - 110px);
-  /* #endif */
 }
 
-.white-bg {
+/* Content container */
-  //padding-bottom:10rpx;
+.clientClass {
-  margin-bottom: 0;
+    flex: 1;
-  overflow: hidden;
+    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 {
-  padding-right: 20rpx;
+  margin-right: 12px;
+  transform: scale(0.9);
 }
 
-.title {
+.name {
-  font-size: 32rpx;
+  flex: 1;
-  line-height: 48rpx;
+  font-size: 16px;
+  color: #333;
 }
 
-.report-list {
+.checked {
-  width: calc(100% - 70rpx);
+  color: #007AFF; /* 选中状态的颜色 */
-  //background-color: pink;
-}
-
-.border-bottom {
-  margin-top: 6rpx;
 }
 </style>

src/pages/business/CRM/marketActivity/customerUserList.vue

@@ -11,7 +11,7 @@
             </uni-easyinput>
             <checkbox-group class="block" @change="checkboxChange">
                 <view class="itemClass" v-for="(item, index) in dataList" :key="item.userId">
-                    <checkbox class='checkBoxClass' :value="item.userName"></checkbox>
+                    <checkbox class='checkBoxClass' :value="item.userName" v-model="item.userName"></checkbox>
                     <view class="clientClass">
                         <text class="blue-text">{{ item.userName }}</text>
                         {{ " | " }}

src/pages/business/CRM/marketActivity/detailForApproval.vue

@@ -95,12 +95,7 @@ import { ref } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
 import customHeader from '@/components/customHeader.vue'
 import customTabs from '@/components/customTabs.vue';
-import {
+import { auditActivityReport, getVisistDetailList, getYsVisistInfo } from '../../../../api/crm/activity/activity';
-  auditActivityReport,
-  getRejectReason,
-  getVisistDetailList,
-  getYsVisistInfo
-} from '../../../../api/crm/activity/activity';
 
 
 let visistId = ref(0)
@@ -132,38 +127,10 @@ const activeTab = ref(0);//默认报告明细
 const tabList = ['报告明细'];
 
 //点击驳回
-// 修正后的驳回方法
+function refuse() {
-const refuse = async () => {
+    uni.navigateTo({
-  uni.showModal({
+        url: './auditReject?visistId=' + visistId.value
-    title: '驳回原因',
+    })
-    content: '',
-    editable: true,
-    success: async function (modalRes) { // 使用modalRes避免重名
-      if (modalRes.confirm) {
-        try {
-          const param = {
-            visistId: visistId.value,
-            rejectReason: modalRes.content // 用户输入的驳回原因
-          };
-          const apiRes = await getRejectReason(param); // 避免与modalRes重名
-          uni.showToast({
-            title: '驳回成功',
-            icon: 'success'
-          });
-          // 操作完成后返回
-          setTimeout(() => {
-            uni.navigateBack(1);
-          }, 800);
-        } catch (err) {
-          console.log('驳回失败:', err);
-          uni.showToast({
-            title: '驳回失败',
-            icon: 'error'
-          });
-        }
-      }
-    }
-  });
 }
 
 //点击通过
@@ -178,7 +145,7 @@ function adopt(item) {
                     reportStaffName: item.staffName,
                 }).then(res => {
                     if (res.code == 200) {
-                        mescroll.resetUpScroll()
+                        // that.mescroll.resetUpScroll()
                     } else {
                         uni.showToast({
                             icon: 'none',
@@ -186,10 +153,6 @@ function adopt(item) {
                         });
                     }
                 })
-
-              uni.navigateBack({
-              })
-
             }
         }
 

src/pages/business/CRM/marketActivity/myUserList.vue

@@ -11,7 +11,8 @@
             </uni-easyinput>
                 <checkbox-group class="block" @change="checkboxChange">
                     <view class="itemClass" v-for="(item, index) in dataList" :key="item.userId">
-                        <checkbox class='checkBoxClass' :value="item.nickName"></checkbox>
+                        <checkbox class='checkBoxClass' :value="item.nickName"
+                            v-model="item.nickName"></checkbox>
                         <view class="clientClass">
                             <text class="blue-text">{{ item.nickName }}</text>
                         </view>

src/pages/business/CRM/marketActivity/visitReport.vue

@@ -27,17 +27,14 @@
                       :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"
-                @longpress="touchstart(item)"
+                @touchstart.prevent="touchstart(item)" @touchend.prevent="touchend">
-                longpress-time="1500"
-                @tap="touchend(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 @touchstart.stop="handleStatusTouchStart"
-                        @click.stop="chooseStatus(item)">
+                        @touchend.stop="handleStatusTouchEnd" @click.stop="chooseStatus(item)">
                     <view v-if="item.status == '驳回'" class="r-right btn-orange" size="mini">
                       {{ item.status == '驳回' ? '再次提交' : item.status }}
                     </view>
@@ -81,6 +78,7 @@ 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
@@ -143,10 +141,7 @@ const mescrollRef = ref(null);
 const upOption = ref({
   page: {num: 0, size: 10},
   noMoreSize: 5,
-  empty: {
+  empty: {tip: '~ 空空如也 ~'},
-      tip: '~ 空空如也 ~',
-      icon: "../../../../static/images/mescroll-empty.png"
-  },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
 });
@@ -205,7 +200,7 @@ const getVisitorReportList = (pageNum, pageSize) => {
       pageNum,
       pageSize
     }
-    let res = await getYsVisistList(param);
+    let res = await visitorReportList(param);
     resolve({
       list: res.rows,
       total: res.total
@@ -214,6 +209,8 @@ const getVisitorReportList = (pageNum, pageSize) => {
 }
 
 
+let Loop = ref(0)
+let now
 const visistId = ref();
 const cusName = ref();
 const cusId = ref();
@@ -224,6 +221,9 @@ function touchstart(item) {
   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: '请问要删除本条消息吗？',
@@ -255,29 +255,21 @@ function touchstart(item) {
         }
       }
     });
+  }, 750);
 
 }
-let isLongPressed = ref(false);
+
-function touchend(item) {
+function touchend() {
-  visistId.value = item.visistId
+  let endDate = new Date();
-  cusName.value = item.cusName
+  console.log('结束时间', endDate)
-  cusId.value = item.cusId
+  let cha = endDate.getTime() - now.getTime();
-  status.value = item.status
+  console.log(cha, 'casd')
-  // 如果未触发长按，则执行点击逻辑
+  if (cha < 750) {
-  if (!isLongPressed.value) {
     uni.navigateTo({
-      url: "/pages/business/CRM/marketActivity/visitorReportEnter?visistId="
+      url: "/pages/business/CRM/marketActivity/visitorReportEnter?visistId=" + visistId.value + '&cusName=' + cusName.value + '&cusId=' + cusId.value + '&status=' + status.value
-          + visistId.value
-          + '&cusName='
-          + cusName.value
-          + '&cusId='
-          + cusId.value
-          + '&status='
-          + status.value
     })
   }
-  // 重置状态（避免影响下次事件）
+  clearInterval(Loop.value);
-  isLongPressed.value = false;
 }
 
 //点击状态按钮

src/pages/business/CRM/marketActivity/visitReportView.vue

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

src/pages/business/CRM/marketActivity/visitorReportAdd.vue

@@ -69,10 +69,7 @@
                             class="uni-forms-item is-direction-top is-top">
 
                             <multipleSelect :multiple="true" :value="chooseMyLeaderList" downInner
-                                :options="myLeaderList" 
+                                :options="myLeaderList" @change="changeValue2" :key="Math.round()" :slabel="'text'">
-                                @change="changeValue2" :key="Math.round()" 
-                                :slabel="'text'"
-                            >
                             </multipleSelect>
                         </uni-forms-item>
 
@@ -141,9 +138,7 @@ const submitForm = async () => {
             icon: 'success'
         });
         saveVisistReportForm.cusId = formData.value.cusId
-        if (Array.isArray(formData.value.leader)) {
+        saveVisistReportForm.joinUser = formData.value.leader.map(item => item.text).join(',')
-          saveVisistReportForm.joinUser = formData.value.leader.map(item => item.text).join(',');
-        }
         saveVisistReportForm.visistDate = formData.value.visitDate
         saveVisistReportForm.visistType = 'I类活动（走访）'
         saveVisistReportForm.mapId = mapId.value
@@ -254,11 +249,10 @@ function chooseRecord(e) {
 
 .form-con {
     /* #ifdef APP-PLUS */
-    height: calc(100vh - 95px) !important;
+    height: calc(100vh - 100px)
-    /* #endif */
+        /* #endif */
-    /* #ifndef APP-PLUS */
+        /* #ifndef APP-PLUS */
-    height:calc(100vh - 68px) !important;
+        /* #endif */
-    /* #endif */
 }
 
 :deep(.uni-date-x) {

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: { 
+    empty: { tip: '~ 空空如也 ~' },
-        tip: '~ 空空如也 ~',
-        icon: "../../static/images/mescroll-empty.png"
-    },
     textLoading: '加载中...',
     textNoMore: '已经到底了'
 });
@@ -166,7 +163,7 @@ const getMattersList = (pageIndex, pageSize) => {
     top:100rpx;
     height: calc(100vh - 48px);
     /* #endif */
-   
+
 }
 /*.market-con{
 
@@ -224,4 +221,4 @@ const getMattersList = (pageIndex, pageSize) => {
 .report-list .title{
     display: flex;
 }
-</style>
+</style>

src/pages/business/CRM/marketInformation/beCurrent.vue

@@ -143,7 +143,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/marketActivity/chooseCus'
+			url: '/pages/business/CRM/chooseCus'
 		})
 	}
 	//定义数据接收的值

src/pages/business/CRM/marketInformation/beCurrentDetail.vue

@@ -148,7 +148,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/marketActivity/chooseCus'
+			url: '/pages/business/CRM/chooseCus'
 		})
 	}
 	//定义数据接收的值

src/pages/business/CRM/marketInformation/competitor.vue

@@ -340,7 +340,7 @@ const dynamicPlaceholder = computed(() => {
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/marketActivity/chooseCus'
+			url: '/pages/business/CRM/chooseCus'
 		})
 	}
 	//定义数据接收的值

src/pages/business/CRM/marketInformation/competitorDetail.vue

@@ -348,7 +348,7 @@ const dynamicPlaceholder = computed(() => {
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/marketActivity/chooseCus'
+			url: '/pages/business/CRM/chooseCus'
 		})
 	}
 	//定义数据接收的值

src/pages/business/CRM/marketInformation/infomationView.vue

@@ -243,8 +243,7 @@ const inputval = ref(''); // 搜索内容
 		},
 		noMoreSize: 5,
 		empty: {
-			tip: '~ 空空如也 ~',
+			tip: '~ 空空如也 ~'
-			icon: "../../../../static/images/mescroll-empty.png"
 		},
 		textLoading: '加载中...',
 		textNoMore: '已经到底了'

src/pages/business/CRM/marketInformation/keyModelTasks.vue

@@ -147,7 +147,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/marketActivity/chooseCus'
+			url: '/pages/business/CRM/chooseCus'
 		})
 	}
 	//定义数据接收的值
@@ -203,7 +203,7 @@
 		height: calc(120vh - 100px)
 			/* #endif */
 			/* #ifndef APP-PLUS */
-			height:calc(140vh - 80px)
+			height:calc(120vh - 80px)
 			/* #endif */
 	}
 

src/pages/business/CRM/marketInformation/keyModelTasksDetail.vue

@@ -152,7 +152,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/marketActivity/chooseCus'
+			url: '/pages/business/CRM/chooseCus'
 		})
 	}
 	//定义数据接收的值

src/pages/business/CRM/marketInformation/majorMatter.vue

@@ -172,7 +172,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/marketActivity/chooseCus'
+			url: '/pages/business/CRM/chooseCus'
 		})
 	}
 	//定义数据接收的值

src/pages/business/CRM/marketInformation/majorMatterDetail.vue

@@ -179,7 +179,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/marketActivity/chooseCus'
+			url: '/pages/business/CRM/chooseCus'
 		})
 	}
 	//定义数据接收的值

src/pages/business/CRM/marketInformation/marketInformation.vue

@@ -31,7 +31,7 @@
 							<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.state==='完成'}"
+									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
 										size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
 								</view>
 								<view style="padding:0rpx 0 10rpx">
@@ -50,7 +50,7 @@
 							<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.state==='完成'}"
+									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
 										size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
 								</view>
 								<view style="padding:0rpx 0 10rpx">
@@ -69,7 +69,7 @@
 							<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.state==='完成'}"
+									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
 										size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
 								</view>
 								<view style="padding:0rpx 0 10rpx">
@@ -88,7 +88,7 @@
 							<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.state==='完成'}"
+									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
 										size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
 								</view>
 								<view style="padding:0rpx 0 10rpx">
@@ -109,7 +109,7 @@
 							<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.state==='完成'}"
+									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
 										size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
 								</view>
 								<view style="padding:0rpx 0 10rpx">
@@ -127,7 +127,7 @@
 							<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.state==='完成'}"
+									<view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}"
 										size="mini" @click.stop="itemView(item)">{{ item.state }}</view>
 								</view>
 								<view style="padding:0rpx 0 10rpx">
@@ -236,15 +236,14 @@
 		},
 		noMoreSize: 5,
 		empty: {
-			tip: '~ 空空如也 ~',
+			tip: '~ 空空如也 ~'
-			icon: "../../../../static/images/mescroll-empty.png"			
 		},
 		textLoading: '加载中...',
 		textNoMore: '已经到底了'
 	});
 
 	const downOption = ref({
-		auto: false,
+		auto: true,
 		textInOffset: '下拉刷新',
 		textOutOffset: '释放更新',
 		textLoading: '刷新中...'
@@ -304,6 +303,7 @@
 		};
 
 		const res = await CrmMarketInformationList(param);
+
 		return {
 			list: res.rows,
 			total: res.total
@@ -432,6 +432,7 @@
 		top: 100rpx;
 		height: calc(100vh - 48px);
 		/* #endif */
+
 	}
 
 	/*.market-con{
@@ -493,8 +494,4 @@
 	.report-list .title {
 		display: flex;
 	}
-	.btn-blue {
-	  background-color: #3384DF; /* 蓝色背景 */
-	  color: #ffffff;
-	}
 </style>

src/pages/business/CRM/marketInformation/marketInformationReview.vue

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

src/pages/business/CRM/marketInformation/marketOpportunities.vue

@@ -232,8 +232,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer(){
 		uni.navigateTo({
-			url: '/pages/business/CRM/marketActivity/chooseCus'
+			url: '/pages/business/CRM/chooseCus'
-			
 		})  
 	} 
 	//定义数据接收的值
@@ -312,7 +311,7 @@
 		height: calc(120vh - 100px)
 			/* #endif */
 			/* #ifndef APP-PLUS */
-			height:calc(140vh - 80px)
+			height:calc(120vh - 80px)
 			/* #endif */
 	}
 

src/pages/business/CRM/marketInformation/marketOpportunitiesDetail.vue

@@ -244,7 +244,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer(){
 		uni.navigateTo({
-			url:'/pages/business/CRM/marketActivity/chooseCus'
+			url: '/pages/business/CRM/chooseCus'
 		})  
 	} 
 	//定义数据接收的值
@@ -337,12 +337,11 @@ onMounted(() => {
 
 	.form-con {
 		/* #ifdef APP-PLUS */
-		height: calc(100vh - 95px) !important;
+		height: calc(120vh - 100px)
-		/* #endif */
+			/* #endif */
-		/* #ifndef APP-PLUS */
+			/* #ifndef APP-PLUS */
-		height:calc(100vh - 68px) !important;
+			height:calc(120vh - 80px)
-		/* #endif */
+			/* #endif */
-		overflow-y: auto;
 	}
 
 	:deep(.uni-date-x) {

src/pages/business/CRM/marketInformation/personnelChanges.vue

@@ -201,7 +201,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/marketActivity/chooseCus'
+			url: '/pages/business/CRM/chooseCus'
 		})
 	}
 	//定义数据接收的值

src/pages/business/CRM/marketInformation/personnelChangesDetail.vue

@@ -202,7 +202,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/marketActivity/chooseCus'
+			url: '/pages/business/CRM/chooseCus'
 		})
 	}
 	//定义数据接收的值

src/pages/business/CRM/paymentCollection.vue

@@ -28,7 +28,7 @@
                     </picker>
                     <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
                 </view>
-            
+
                 <!-- 回款信息查询 -->
                 <view class="white-bg">
                     <view class="table-title">回款信息查询</view>
@@ -81,7 +81,6 @@ let bindPickerChange = (e)=>{
 let searchValue = ref(null)
 // 查询搜索跳转
 let handleSearch = () => {
-    console.log(searchValue.value)
 }
 
 const tableData = [
@@ -93,7 +92,7 @@ const tableData = [
   { name: '张志钢',guestName:'其他',tragetReturnMoney:558703.02,returnMoney:558703.02,completRate:'100%'},
   { name: '张志钢',guestName:'武汉航空仪表有限责任公司',tragetReturnMoney:'9807328.00',returnMoney:8692300.93,completRate:'88.6%'},
   { name: '张志钢',guestName:'武汉永力科技股份有限公司',tragetReturnMoney:539087.21,returnMoney:539087.21,completRate:'100%'},
-  
+
 ]
 </script>
 
@@ -166,4 +165,4 @@ const tableData = [
     border-bottom:2px solid #E7E7E7;
     padding-bottom:20rpx;
 }
-</style>
+</style>

src/pages/business/CRM/paymentCollection/addPaymentCollection.vue

@@ -101,7 +101,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/marketActivity/chooseCus'
+			url: '/pages/business/CRM/chooseCus'
 		})
 	}
 	//定义数据接收的值

src/pages/business/CRM/paymentCollection/index.vue

@@ -108,16 +108,13 @@ const mescrollRef = ref(null);
 const upOption = ref({
   page: {num: 0, size: 10},
   noMoreSize: 5,
-  empty: { 
+  empty: {tip: '~ 空空如也 ~'},
-      tip: '~ 空空如也 ~',
-      icon: "../../../../static/images/mescroll-empty.png"
-  },
   textLoading: '加载中...',
   textNoMore: '已经到底了'
 });
 
 const downOption = ref({
-  auto: false,
+  auto: true,
   textInOffset: '下拉刷新',
   textOutOffset: '释放更新',
   textLoading: '刷新中...'

src/pages/business/CRM/paymentCollection/paymentDetail.vue

@@ -105,7 +105,7 @@
 	// 选择客户页面跳转
 	function chooseCustomer() {
 		uni.navigateTo({
-			url: '/pages/business/CRM/marketActivity/chooseCus'
+			url: '/pages/business/CRM/chooseCus'
 		})
 	}
 	//定义数据接收的值

src/pages/business/CRM/plan/dataMap.js

@@ -40,7 +40,7 @@ export const COLOR_MAP = {
     "办事处": "#307af5",
     "请假": "#f2c55c",
     "法定假日": "#e88f89",/*#ED8A73*/
-    "null": "#e7e7e782"
+    "null": "#e7e7e7"
 };
 // 地区/部门
 export const AreaList = [

src/pages/business/CRM/plan/myPlan.vue

@@ -17,7 +17,7 @@
       <view class="top-height"></view>
 
       <view class="week-plan-title">
-        <!--        <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>-->
+        <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>
         <view v-if="weekNum">
           {{ yearMonth }}
           <view v-if="isThisWeek" style=" display: inline-block;">
@@ -28,42 +28,35 @@
       </view>
 
       <view class="nav-list">
-        <view class="nav-item" :class="{'active': index == activeTab}"
+        <view class="nav-item" :class="{active:index==activeTab}"
               v-for="(item,index) in allPlans" :key="index"
               @click="handleNav(index)"
         >{{ getTapLabel(item) }}
         </view>
       </view>
-      <uni-transition :duration="300"
+
-                      :mode-class="['fade','slide-bottom']"
+      <block v-if="onShowPlan" v-for="(item, index) in OrdinalDate" :key="item">
-                      :styles="{'width':'100%', 'background-color':'#f0f0f0','border-top-left-radius': '8px', 'border-top-right-radius': '8px'}"
+        <!-- 计划详情 -->
-                      :show="showTrans">
+        <view class="white-bg white-bg-2" :class="index == 0 ? 'white-bg-r' : ''">
-        <view v-if="onShowPlan" v-for="(item, index) in OrdinalDate" :key="index">
+          <view class="report-list">
-          <!-- 计划详情 -->
+            <view class="w-b-title">
-          <view class="white-bg white-bg-2" :class="{'white-bg-r':index === 0}">
+              <view class="r-left">{{ getWorkDate(index) }} {{ WeekCN[index] }}</view>
-            <view class="report-list">
+              <view class="r-right btn-edit" @click="handleEdit(index)">编辑</view>
-              <view class="w-b-title">
+            </view>
-                <view class="r-left">{{ getWorkDate(index) }} {{ WeekCN[index] }}</view>
+            <view class="r-list">
-                <view class="r-right btn-edit" @click="handleEdit(index)">编辑</view>
+              <view class="r-left">工作类型</view>
-              </view>
+              <view class="r-right">{{ getWorkType(index) || '' }}</view>
-              <view class="r-list">
+            </view>
-                <view class="r-left">工作类型</view>
+            <view class="border-bottom b-width"></view>
-                <view class="r-right">{{ getWorkType(index) || '' }}</view>
+            <view class="r-list">
-              </view>
+              <view class="r-left">内容</view>
-              <view class="border-bottom b-width"></view>
+              <view class="r-right">{{ getWorkEvent(index) || '' }}</view>
-              <view class="r-list">
-                <view class="r-left">内容</view>
-                <view class="r-right">{{ getWorkEvent(index) || '' }}</view>
-              </view>
             </view>
           </view>
-          <view class='bottom-spliter'></view>
         </view>
+        <view class='bottom-spliter bg-gray'></view>
+      </block>
 
-        <view v-else style="text-align: center; margin-top: 50%; color: white">
-          暂无数据
-        </view>
-      </uni-transition>
       <!-- 底部加高度来避免tabbar遮挡 -->
       <!-- <view class="bottom-height bg-gray"></view> -->
     </view>
@@ -74,12 +67,13 @@
 
 <script setup>
 
-import {onMounted, ref, computed, watch} from "vue";
+import {onMounted, ref, reactive, computed} from "vue";
 import {useRoute} from "vue-router"
 import customHeader from '@/components/customHeader.vue'
 import {WeekCN, WorkType, WorkEvent, OrdinalDate} from "./dataMap";
 import {getCurrentWeekNum} from "./dateTimeUtils";
-import {getWeeklyPlanList} from "@/api/crm/plan/getPlan";
+import {getUserInfo, getWeeklyPlanList} from "@/api/crm/plan/getPlan";
+import {useMessage} from "@/utils/message";
 import {judgeThisWeek} from "@/api/crm/plan/updatePlan";
 
 const userInfo = ref(null)
@@ -98,6 +92,8 @@ const yearMonth = ref(null);
 const weekNum = ref(0);
 const allPlans = ref([]);
 const onShowPlan = ref(null);
+const message = useMessage();
+
 let getWorkDate = (index) => {
   return onShowPlan.value ? onShowPlan.value[OrdinalDate[index]] : '';
 };
@@ -109,8 +105,7 @@ let getWorkEvent = (index) => {
 };
 // 刷新计划列表
 const refreshPlanList = () => {
-  showTrans.value = false;
+  message.showLoading();
-  uni.showLoading();
   // 获取用户信息
   // getUserInfo().then(res => {
   //   userInfo.value = res.user;
@@ -127,12 +122,12 @@ const refreshPlanList = () => {
       weekNum.value = rows[0].date;
       yearMonth.value = rows[0].firstDayOfTheWeek.substring(0, 7);
     }
-    console.log(route.path, "用户周计划列表获取成功");
+    console.log(route.path, "：用户周计划列表获取成功");
   }).catch(err => {
-    console.log(err, "周计划列表获取失败")
+    console.warn(err, "用户周计划列表获取失败");
+    message.error("周计划获取失败");
   }).finally(() => {
-    uni.hideLoading();
+    message.hideLoading();
-    setTimeout(() => showTrans.value = true, 20);
   })
 }
 
@@ -142,7 +137,7 @@ onMounted(() => {
 
 // 判断计划是否为本周
 let isThisWeek = computed(() => {
-  let theYear = onShowPlan.value.firstDayOfTheWeek.substring(0, 4); // 获取年份
+  let theYear = onShowPlan.value.year || onShowPlan.value.firstDayOfTheWeek.substring(0, 4); // 获取年份
   weekNum.value = onShowPlan.value.date; // 当目前展示的计划列表变化时，更新weekNum.value
   yearMonth.value = onShowPlan.value.firstDayOfTheWeek.substring(0, 7); // 获取年月
   return date.getFullYear() === parseInt(theYear) &&
@@ -207,19 +202,6 @@ function getTapLabel(row) {
   return row.firstDayOfTheWeek.substring(0, 4) + '年' + row.month + '月 第' + row.date + '周';
 }
 
-// 展示动画
-const showTrans = ref(false);
-// 监听 activeTab 变化，触发动画
-watch(activeTab, (newVal, oldVal) => {
-  if (oldVal !== newVal) { // 确保不是初始化时的触发
-    showTrans.value = false; // 先隐藏
-    setTimeout(() => {
-      onShowPlan.value = allPlans.value[newVal]; // 更新计划列表视图
-      showTrans.value = true; // 再显示，触发动画
-    }, 20);
-  }
-});
-
 // 选中计划时间段
 function handleNav(index) {
   console.log(index, "tab更换时间段");
@@ -263,7 +245,7 @@ function handleEdit(index) {
 <style scoped>
 .week-plan-title {
   color: #fff;
-  padding: 0 30rpx;
+  padding: 0 30rpx 30rpx;
   display: flex;
   justify-content: space-between;
 }
@@ -289,31 +271,27 @@ function handleEdit(index) {
 .white-bg.white-bg-2 {
   /*  margin-bottom: 20rpx; */
 }
-
+.bottom-spliter{
-.bottom-spliter {
   height: 20rpx;
 }
-
+.bg-gray{
-.bg-gray {
   background-color: #f0f0f0;
 }
-
 .report-list .w-b-title .btn-edit {
   background-color: #5C96F7;
 }
 
 .con-bg {
-  /*height: 100%;*/
+  height: 445rpx;
-  /*  overflow-y: auto;*/
 }
 
 .nav-list {
   /*  display: flex;*/
   /*  width: 690rpx;*/
-  overflow-x: auto; /* 允许横向滚动 */
+  overflow-x: auto;   /* 允许横向滚动 */
   /*overflow-y: hidden;  隐藏垂直滚动 */
   /*-ms-overflow-style: none;   IE 隐藏滚动条 */
-  /* scrollbar-width: none; */ /*Firefox 隐藏滚动条 */
+  /* scrollbar-width: none; */     /*Firefox 隐藏滚动条 */
   /* 添加高度以确保有足够的空间 */
   /*  height: 80rpx;*/
   white-space: nowrap; /* 保持子元素在同一行显示 */
@@ -326,12 +304,10 @@ function handleEdit(index) {
   padding: 20rpx 30rpx 0;
   /* #endif */
 }
-
 /* 为 Webkit 浏览器隐藏滚动条 */
 .nav-list::-webkit-scrollbar {
   background-color: transparent;
 }
-
 .nav-list .nav-item {
   /*  flex: 0 0 auto; 关键：不放大、不缩小、自动宽度 */
   /*  width: 200rpx;*/
@@ -356,4 +332,5 @@ function handleEdit(index) {
   color: #3384DF;
   font-weight: bold;
 }
+
 </style>

src/pages/business/CRM/plan/planEdit.vue

@@ -16,11 +16,11 @@
 
       <!-- 正文内容 -->
       <view class="week-plan-title">
-<!--        <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>-->
+        <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>
         <view>{{ currentEditDate.yearMonth }} 第 <strong>{{ currentEditDate.weekNum }}</strong> 周</view>
       </view>
       <uni-forms ref="formRef" :model="weekPlanFormData" :rules="rules" label-width="100px" label-position="top">
-        <view v-for="(item, index) in OrdinalDate">
+        <block v-for="(item, index) in OrdinalDate">
           <view class="white-bg" :class="index==0?'white-bg-2':'white-bg-3'">
             <view class="w-b-title" @click="handleExpand(index)">
               {{ weekPlanFormData[item] }} {{ WeekCN[index] }}
@@ -29,8 +29,7 @@
               </text>
             </view>
 
-            <!--v-show="expandFlag[index]"-->
+            <view v-show="expandFlag[index]" class="form-con">
-            <view class="form-con" :class="{'show': expandFlag[index], 'hidden': !expandFlag[index]}">
               <uni-forms-item label="工作类型" :name="getTypeField(index)" :required="index < workDays">
                 <view class="form-picker">
                   <picker @change="handleTypeChange" :range="WORK_TYPE" :data-field="getTypeField(index)">
@@ -42,13 +41,13 @@
                 </view>
               </uni-forms-item>
               <uni-forms-item label="内容" :name="getEventField(index)" :required="index < workDays">
-                <uni-easyinput type="textarea" v-model="weekPlanFormData[getEventField(index)]"
+                <uni-easyinput type="textarea" autoHeight v-model="weekPlanFormData[getEventField(index)]"
                                placeholder="请输入" class="form-texarea"/>
               </uni-forms-item>
             </view>
 
           </view>
-        </view>
+        </block>
       </uni-forms>
 
     </view>
@@ -63,6 +62,7 @@ import {useRoute} from "vue-router"
 import {useMessage} from "@/utils/message";
 import {onLoad} from "@dcloudio/uni-app";
 import {updateWeekPlanList, addPlan} from "@/api/crm/plan/updatePlan";
+import {getUserInfo} from "@/api/crm/plan/getPlan";
 import {getDate} from "@/utils/datetime";
 import {getWeek2, getCurrentWeekNum} from "./dateTimeUtils";
 
@@ -127,10 +127,17 @@ const workDays = 5;
 // const instance = getCurrentInstance().proxy;
 let instance = null;
 // 初始化创建任务
-let initCreate = (params) => {
+let initCreate = (params)=>{
   const {itemList, selectIndex} = params;
-  console.log(route.path, `：创建${itemList[selectIndex]}计划`);
+  // 获取用户信息
-  title.value = "创建周计划";
+  getUserInfo().then(res => {
+    userInfo.value = res.user;
+    console.log(route.path, "：用户信息获取成功");
+  }).catch(err => {
+    console.warn(err, "用户信息获取失败")
+  });
+  console.log(route.path,`：创建${itemList[selectIndex]}计划`);
+  title.value="创建周计划";
   currentEditDate.value.yearMonth = getDate({format: true}).substring(0, 7); // 只要年月
   currentEditDate.value.weekNum = getCurrentWeekNum() + selectIndex; // 取巧做法，当期周则selectIndex为0，下周则selectIndex为1，用加法处理
   const week = getWeek2(itemList[selectIndex]); // 获取本周/下周一周日期
@@ -140,11 +147,11 @@ let initCreate = (params) => {
   const {year, month} = week;
   weekPlanFormData.value.year = year;
   weekPlanFormData.value.month = month;
-  for (let index in OrdinalDate) {
+  for(let index in OrdinalDate){
     let dateField = getDateField(index);
     weekPlanFormData.value[dateField] = week[dateField];
     // console.log(week[dateField]);
-    if (index >= workDays) {
+    if(index>=workDays){
       let typeField = getTypeField(index);
       weekPlanFormData.value[typeField] = "法定假日"; // TODO: 换成更规范代码
       workTypeIndex.value[typeField] = WORK_TYPE.indexOf("法定假日");
@@ -173,7 +180,7 @@ onLoad((options) => {
         expandFlag.value[index] = editFields.includes(getTypeField(index)) || editFields.includes(getEventField(index));
         // console.log(index, expandFlag.value[index], "展开状态");
       }
-    } else {
+    }else{
       initCreate(data.param);
     }
 
@@ -196,7 +203,7 @@ function getEventField(index) {
 }
 
 // 初始化校验规则
-(function bindRules() {
+(function bindRules(){
   for (let i in WorkType) {
     if (i < workDays) {
       rules[getTypeField(i)] = {
@@ -246,25 +253,25 @@ const submitForm = async () => {
     // console.log('表单数据:', weekPlanFormData.value);
 
     // 这里可以添加提交到服务器的代码
-    if (!isAdd.value) { // 请求修改
+    if(!isAdd.value){ // 请求修改
-      let res = await updateWeekPlanList(weekPlanFormData.value).catch(err => {
+      let res = await updateWeekPlanList(weekPlanFormData.value).catch(err=>{
         message.error('操作失败!');
         console.warn(err, "更新周计划失败");
       })
       message.success('修改成功!');
-      setTimeout(() => {
+      setTimeout(()=>{
         const eventChannel = instance.getOpenerEventChannel();
         eventChannel.emit('refreshData');
         uni.navigateBack()
       }, 500);
-    } else { // 请求新增
+    }else{ // 请求新增
-      console.log(weekPlanFormData.value, "新增计划");
+      console.log(weekPlanFormData.value,"新增计划");
-      let res = await addPlan(weekPlanFormData.value).catch(err => {
+      let res = await addPlan(weekPlanFormData.value).catch(err=>{
         message.error('操作失败!');
         console.error(err, "周计划新增失败");
       })
       message.success('保存成功!');
-      setTimeout(() => {
+      setTimeout(()=>{
         const eventChannel = instance.getOpenerEventChannel();
         eventChannel.emit('refreshData');
         uni.navigateBack()
@@ -272,8 +279,8 @@ const submitForm = async () => {
     }
   } catch (err) {
     uni.showToast({
-      icon: 'none',
+      icon:'none',
-      title: "请完善内容",
+      title:"请完善内容",
       duration: 1500
     })
     console.log('表单验证失败:', err);
@@ -294,7 +301,6 @@ const submitForm = async () => {
 .white-bg {
   width: 690rpx;
   margin: 0;
-  padding-bottom: 0;
   border-radius: 8px 8px 0 0;
 }
 
@@ -303,7 +309,7 @@ const submitForm = async () => {
 }
 
 .white-bg.white-bg-3 {
-  border-top: 1rpx solid #E5E5E5;
+  border-top:  1rpx solid #E5E5E5;
   border-radius: 0
 }
 
@@ -314,17 +320,10 @@ const submitForm = async () => {
 
 .form-con {
   padding: 30rpx 0 0;
-  height: 500rpx;
-  overflow: hidden;
-  transition: height 0.3s;
 }
 
 :deep(.form-con .uni-forms-item) {
   margin-bottom: 22px !important;
 }
 
-.hidden{
-  height: 0;
-}
-
 </style>

src/pages/business/CRM/plan/planView.vue

@@ -1,8 +1,3 @@
-<!--
- * @author wangzhuo
- * @update date 2025/9/18 19:38
- * @description 所有人周计划查看
--->
 <template>
   <view class="con-body">
     <view class="con-bg">
@@ -37,105 +32,94 @@
               <uni-icons type="down" size="18"></uni-icons>
             </view>
           </picker>
-<!--          <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>-->
+          <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
         </view>
 
         <!-- 分页部分  -->
-        <!--        <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"-->
+<!--        <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"-->
-        <!--                      :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"-->
+<!--                      :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"-->
-        <!--                      class="scroll-h" :class="{'loading-scroll':cssFlag}">-->
+<!--                      class="scroll-h" :class="{'loading-scroll':cssFlag}">-->
-        <view class="white-bg" v-if="list.length">
+          <view class="white-bg" v-if="list.length">
-          <!--v-for="(item, index) in list" :key="index" @click="handleDetail(item)"-->
+            <!--v-for="(item, index) in list" :key="index" @click="handleDetail(item)"-->
-          <view style="text-align: center; margin-bottom: 30rpx; font-size: 30rpx;">
+            <view style="text-align: center; margin-bottom: 30rpx; font-size: 30rpx;">
-            {{ (list[0][OrdinalDate[0]] || searchValue.selectDate).substring(5, 7) }}月
+              {{ parseInt(searchValue.selectDate.substring(5, 7)) }}月
-            <span class="line"></span>
+              <span class="line"></span>
-            {{ (list[0][OrdinalDate[0]] || searchValue.selectDate).substring(0, 4) }}年
+              {{searchValue.selectDate.substring(0, 4) }}年
-          </view>
+            </view>
-          <uni-row class="demo-uni-row">
-            <uni-col :span="1">
-              <view class="demo-uni-col right-radius"></view>
-            </uni-col>
-            <uni-col :span="2">
-              <view class="demo-uni-col left-radius">姓名</view>
-            </uni-col>
-            <!--日期 星期-->
-            <block v-for="(field, i) in OrdinalDate">
-              <uni-col :span="3">
-                <view class="demo-uni-col mar-left" >
-                  <text>{{ WeekShortCN[i] }}</text>
-                  <text v-if="list[0][field]" class="font-bold">{{ list[0][field].substring(8) }}</text>
-                  <text v-else class="font-bold">{{ getWeek(i) }}</text>
-                </view>
-              </uni-col>
-            </block>
-          </uni-row>
-          <block v-for="(item, index) in list" :key="index">
             <uni-row class="demo-uni-row">
               <uni-col :span="1">
-                <view class="demo-uni-col right-radius">
+                <view class="demo-uni-col right-radius">序号</view>
-                  <text>{{ index + 1 }}</text>
-                </view>
               </uni-col>
               <uni-col :span="2">
-                <view class="demo-uni-col left-radius">
+                <view class="demo-uni-col left-radius">姓名</view>
-                  <text>{{ item.nickName || item.userName }}</text>
-                </view>
               </uni-col>
-              <block v-for="(field, i) in WorkType">
+              <block v-for="(field, i) in OrdinalDate">
                 <uni-col :span="3">
-                  <view class="demo-uni-col mar-left color-white" @click="handleDetail(index, i)"
+                  <view class="demo-uni-col mar-left">
-                        :style="{ backgroundColor: COLOR_MAP[item[field]] }"
+                    <text>{{ WeekShortCN[i] }}</text>
-                  ><!--@click="handleView(index, i)"-->
+                    <text v-if="list[0][field]">{{ list[0][field].substring(8) }}</text>
-                    <text v-if="item[field]">{{ item[field] }}</text>
-                    <text v-else style="font-weight: 300; color: gray">暂无</text>
                   </view>
                 </uni-col>
               </block>
             </uni-row>
-          </block>
+            <block v-for="(item, index) in list" :key="index">
-        </view>
+              <uni-row class="demo-uni-row">
-        <view v-else style="text-align: center; margin-top: 50%; color: white">
+                <uni-col :span="1">
-          暂无数据
+                  <view class="demo-uni-col right-radius">
-        </view>
+                    <text>{{ index + 1 }}</text>
-        <!--        </mescroll-uni>-->
+                  </view>
+                </uni-col>
+                <uni-col :span="2">
+                  <view class="demo-uni-col left-radius">
+                    <text>{{ item.nickName || item.userName }}</text>
+                  </view>
+                </uni-col>
+                <block v-for="(field, i) in WorkType">
+                  <uni-col :span="3">
+                    <view class="demo-uni-col mar-left color-white" @click="handleDetail(index, i)"
+                          :style="{ backgroundColor: COLOR_MAP[item[field]] }"
+                    ><!--@click="handleView(index, i)"-->
+                      <text v-if="item[field]">{{ item[field] }}</text>
+                      <text v-else style="color: gray">暂无</text>
+                    </view>
+                  </uni-col>
+                </block>
+              </uni-row>
+            </block>
+          </view>
+          <view v-else style="text-align: center; margin-top: 50%; color: white">
+            暂无数据
+          </view>
+<!--        </mescroll-uni>-->
       </view>
     </view>
   </view>
-
-  <closeable-modal closeTip=""
-                   v-model="modalVisible"
-                   :title="modalData.title"
-                   :content="modalData.content"
-                   :cancelBtn="modalData.showCancel"
-                   confirmText="关闭"
-                   @success="modalData.success"/>
-
 </template>
 
 <script setup>
 import {ref, onMounted} from 'vue'
 import customHeader from '@/components/customHeader.vue'
-import CloseableModal from "@/components/closeableModal.vue";
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
 import {getNavBarPaddingTop} from '@/utils/system.js'
 import {getAllWeekPlanList} from "@/api/crm/plan/getPlan";
 import {AreaList, COLOR_MAP, OrdinalDate, WeekShortCN, WorkEvent, WorkType} from "./dataMap";
-import {getCurrentWeekNum, getWeek2} from "./dateTimeUtils";
+import {getCurrentWeekNum} from "./dateTimeUtils";
 import {getDate} from "@/utils/datetime";
 import {getWeekPlanListByDate} from "@/api/crm/plan/getPlan";
-import {onPullDownRefresh} from "@dcloudio/uni-app";
+
+// const currentYear = new Date().getFullYear();
+const currentMonth = new Date().getMonth() + 1;
+const currentWeekNum = getCurrentWeekNum();
 
 // 获取导航栏高度用于内容区域padding
 const navBarPaddingTop = ref(0);
 onMounted(() => {
   navBarPaddingTop.value = getNavBarPaddingTop() * 2;
   uni.showLoading({})
-  getPlanList().then(res => {
+  getPlanList().then(res=>{
     let {total, rows} = res;
-    console.log(total, rows, "周计划数据获取成功")
+    console.log(rows, "周计划数据获取成功")
     list.value = rows;
-  }).catch((err) => {
-    console.warn(err, "周计划数据获取失败")
-  }).finally(() => {
     uni.hideLoading();
   })
 })
@@ -155,38 +139,36 @@ let searchValue = ref({
 
 // 查询列表
 let list = ref([]);
-// const mescrollRef = ref(null);
+const mescrollRef = ref(null);
-onPullDownRefresh(() => {
+const upOption = ref({
-  uni.showLoading();
+  page: {num: 0, size: 10},
-  getPlanList().then(res => {
+  noMoreSize: 5,
-    const {rows} = res;
+  empty: {tip: '~ 空空如也 ~'},
-    list.value = rows;
+  textLoading: '加载中...',
-    console.log(rows,'刷新周计划成功');
+  textNoMore: '已经到底了'
-  }).finally(()=>{
-    uni.stopPullDownRefresh();
-    uni.hideLoading();
-  })
 });
 
-// 查询当前周一周日期
+const downOption = ref({
-// const currentYear = new Date().getFullYear();
+  auto: true,
-const currentWeekNum = getCurrentWeekNum();
+  textInOffset: '下拉刷新',
-const aweek = getWeek2('本周');
+  textOutOffset: '释放更新',
-const currentMonth = aweek.month;
+  textLoading: '刷新中...'
-console.log(currentWeekNum, '当前周数');
-const getWeek = (i) => {
-  return aweek[OrdinalDate[i]].substring(7)
-}
-const queryParams = ref({
-  month: currentMonth,
-  date: currentWeekNum,
-  pageNum: 1,
-  pageSize: 10
 });
+
+let cssFlag = ref(false);//控制样式
+
 // 获取数据列表
-const getPlanList = () => {
+const getPlanList = (month, date, pageIndex, pageSize) => {
   return new Promise(async (resolve) => {
-    let {rows, total} = await getAllWeekPlanList(queryParams.value);
+    // 查询参数
+    let queryParams = {
+      month: month ? month : currentMonth,
+      date: date ? date : currentWeekNum,
+      pageNum: pageIndex ? pageIndex : 1,
+      pageSize: pageSize ? pageSize : 10
+    }
+
+    let {rows, total} = await getAllWeekPlanList(queryParams);
     resolve({
       rows,
       total
@@ -205,17 +187,20 @@ let bindDateChange = (e) => {
 let handleSearch = () => {
   console.log(searchValue.value, '查询参数')
   uni.showLoading();
-  getWeekPlanListByDate(searchValue.value).then(res => {
+  getWeekPlanListByDate(searchValue.value).then(res=>{
-    const {total, rows} = res;
+    const {total, rows } = res;
     list.value = rows;
     console.log(rows, '查询成功');
-  }).catch(err => {
+  }).catch(err=>{
-    console.warn(err, '数据获取失败');
+    console.warn(err,'数据获取失败');
-  }).finally(() => {
+  }).finally(()=>{
     uni.hideLoading();
   })
 }
-
+const mescrollInit = (mescroll) => {
+  cssFlag.value = true;
+  mescrollRef.value = mescroll;
+};
 // 搜索区域变更
 const bindPickerChange = (e) => {
   // console.log('picker发送选择改变，携带值为', peopleIndex.value)
@@ -224,43 +209,32 @@ const bindPickerChange = (e) => {
   // 查询
   handleSearch();
 }
-// 模态窗可见性
+
-const modalVisible = ref(false);
+// 跳转到详情
-// 模态框的配置内容
+let handleDetail = (rowIndex, colIndex) => {
-const modalData = ref({
-  title: null,
-  content: null,
-  showCancel: false,
-  success: console.log
-});
-const showCloseableModal = (param)=>{
-  modalVisible.value = true;
-  Object.assign(modalData.value, param);
-  console.log(modalData.value);
-}
-// 查看计划详情
-const handleDetail = (rowIndex, colIndex) => {
   let detail = list.value[rowIndex];
   let workDate = detail[OrdinalDate[colIndex]];
   let workType = detail[WorkType[colIndex]];
   let workEvent = detail[WorkEvent[colIndex]];
-  if (workType && workEvent) {
+  if(workType && workEvent){
-    showCloseableModal({
+    uni.showModal({
-      title: `${workType}`,
+      title: `${workDate}\n${workType}`,
-      content: `姓名：${detail.userName}\n时间：${workDate}\n内容：${workEvent}`
+      content: `${workEvent}`,
-    });
+      confirmText: '关闭',
-    // uni.showModal({
+      showCancel: false,
-    //   title: `${workDate}\n${workType}`,
+      maskClosable: true, // 允许点击蒙层关闭弹窗
-    //   content: `${workEvent}`,
+      success: function (res) {
-    //   confirmText: '关闭',
+        if (res.confirm) {
-    //   showCancel: false,
-    //   maskClosable: true, // 允许点击蒙层关闭弹窗
-    //   success: console.log
-    // })
 
-  } else {
+        } else if (res.cancel) {
+
+        }
+      }
+    })
+  }
+  else{
     uni.showToast({
-      title: "无计划内容",
+      title: "暂无内容",
       icon: "none",
       duration: 1500
     })
@@ -354,9 +328,8 @@ const handleDetail = (rowIndex, colIndex) => {
 
 .demo-uni-col {
   height: 36px;
-  border-radius: 4rpx;
+  border-radius: 4px;
-  /*background-color: #E7E7E7;*/
+  background-color: #E7E7E7;
-  background-color: #e7e7e782;
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -393,17 +366,35 @@ const handleDetail = (rowIndex, colIndex) => {
   margin: 20rpx 0 0 0;
   border-radius: 8px 8px 0 0;
   /* #ifdef APP-PLUS */
-  min-height: calc(100vh - 160rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx /*.white-bg padding-bottom*/
+  min-height: calc(100vh - 160rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx/*.white-bg padding-bottom*/);
-  );
   /* #endif */
   /* #ifndef APP-PLUS */
-  min-height: calc(100vh - 116rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx /*.white-bg padding-bottom*/
+  min-height: calc(100vh - 116rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx/*.white-bg padding-bottom*/);
-  );
   /* #endif */
+  //overflow-y: auto;
+}
+
+.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;
 }
-
+/*.con-bg {
+  height: 420rpx;
+}*/
 </style>

src/pages/business/CRM/visitorReport.vue

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

src/pages/business/CRM/visitorReportAdd.vue

@@ -63,7 +63,6 @@ selectGuestList();
 
 // 选择客户列表
 let bindPickerChange = (e)=>{
-    console.log('picker发送选择改变，携带值为', e.detail.value)
     guestIndex.value = e.detail.value
 }
 
@@ -83,12 +82,11 @@ const rules = {
             { required: true, errorMessage: '我方领导不能为空' }
         ]
     }
-   
+
 };
 
 // 修改日期
 let changeDate = (e)=>{
-    console.log('changeDate:', e);
 };
 
 // 保存走访报告
@@ -147,4 +145,4 @@ const submitForm = async () => {
     padding-left:20rpx;
     color:#919191;
 }
-</style>
+</style>

src/pages/business/CRM/visitorReportEnter.vue

@@ -209,4 +209,4 @@ const submitForm = async () => {
     margin-bottom:22px !important;
 }
 
-</style>
+</style>

src/pages/business/CRM/vistorCheckin.vue

@@ -180,4 +180,4 @@ let handleSubmit = () => {
     color: #fff;
     /* padding: 0rpx 60rpx; */
 }
-</style>
+</style>

src/pages/business/CRM/weekPlanUpdate.vue

@@ -32,7 +32,7 @@
                                     <view class="flex">
                                         {{workList[workIndex]}}
                                         <uni-icons type="down" size="20" color="#A0A0A0"></uni-icons>
-                                    </view> 
+                                    </view>
                                 </picker>
                             </view>
                         </uni-forms-item>
@@ -40,12 +40,12 @@
                             <uni-easyinput  type="textarea" autoHeight v-model="formData.content" placeholder="请输入" class="form-texarea" />
                         </uni-forms-item>
                     </uni-forms>
-                   
+
                 </view>
 
             </view>
 
-           
+
         </view>
     </view>
 </template>
@@ -138,4 +138,4 @@ const submitForm = async () => {
     margin-bottom:22px !important;
 }
 
-</style>
+</style>

src/pages/business/business.vue

@@ -1,91 +1,90 @@
 <template>
-    <view class="con-body">
+<view class="con-body">
-        <view class="con-bg">
+    <view class="con-bg">
-            <!-- 头部 -->
+        <!-- 头部 -->
-            <customHeader ref="customHeaderRef" :title="!searchShow?'业务中心':'搜索'"
+        <customHeader ref="customHeaderRef" :title="'业务中心'" 
-                :leftFlag="!searchShow?false:true" 
+            :leftFlag="false" :rightFlag="false" 
-                :rightFlag="false"
+        ></customHeader>
-                @back="handleBack" 
+        <!-- 高度来避免头部遮挡 -->
-                :searchType="searchShow?1:undefined"
+        <view class="top-height"></view>
-            ></customHeader>
-            <!-- 高度来避免头部遮挡 -->
-            <view class="top-height"></view>
 
-            <!-- 搜索  @confirm="handleSearch"  -->
+         <!-- 搜索 -->
-            <customSearch v-if="searchShow"   
+         <view class="search">
-                :searchKeywords="searchText" 
+            <uni-search-bar class="custom-search" radius="28" 
-                :searchType="searchTypeObj" 
+                placeholder="请输入您想查询的内容或服务"
-                @confirm="handleSearchConfirm"
+                clearButton="auto" cancelButton="none" 
-            ></customSearch>
+                bgColor="#6FA2F8" textColor="#ffffff"
-            <view class="search"  v-else>
+                @confirm="handleSearch"  
-                <uni-search-bar class="custom-search" radius="28" 
+            />
-                    placeholder="请输入搜索条件"
+        </view>
-                    clearButton="auto" cancelButton="none" 
+
-                    bgColor="#6FA2F8" textColor="#ffffff"
+        <!-- 下拉刷新 -->
-                    @focus="handleSearchFocus"
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit"
-                    v-model="searchText"
+            :down="downOption"  @down="downCallback"
-                />
+            :fixed="false" class="scroll-h"
+        >
+            <!-- 首页日常服务 -->
+            <view class="white-bg">
+                <view class="w-b-title">
+                    首页日常服务
+                    <view type="primary" @click="handleEdit" class="btn-edit">编 辑</view>
+                </view>
             </view>
 
-            <!-- 下拉刷新 -->
+            <!-- 企业日常 -->
-            <mescroll-uni  v-if="!searchShow" ref="mescrollRef" @init="mescrollInit"
+            <view class="white-bg">
-                :down="downOption"  @down="downCallback"
+                <view class="w-b-title" @click="handleExpand">企业日常
-                :fixed="false" class="scroll-h"
+                    <text>{{expandFlag?'展开':'收起'}}<i :class="{iconfont:true,'icon-up':!expandFlag,'icon-down':expandFlag}"></i></text>
-            >
+                </view>
-                <!-- 首页日常服务 -->
+                <view class="logo-list" v-if="!expandFlag">
-                <view class="white-bg">
+                    <view  v-for="(item,index) in list1" class="l-l-item" :key="index">
-                    <view class="w-b-title">
+                        <img :src="item.imgSrc" />
-                        首页日常服务
+                        <text class="font-gray">{{ item.name }}</text>
-                        <view type="primary" @click="handleJump('/pages/business/editDaily')" class="btn-edit">编 辑</view>
                     </view>
                 </view>
+            </view>
 
-                <!-- 业务列表 -->
+            <!-- CRM系统 -->
-                <view class="white-bg" v-for="(item,index) in list" :key="index">
+            <view class="white-bg">
-                    <view class="w-b-title" @click="handleExpand(item)">{{ item.bizName }}
+                <view class="w-b-title" @click="handleExpand2">CRM系统
-                        <text>{{item.expandFlag?'展开':'收起'}}<i :class="{iconfont:true,'icon-up':!item.expandFlag,'icon-down':item.expandFlag}"></i></text>
+                    <text>{{expandFlag2?'展开':'收起'}}<i :class="{iconfont:true,'icon-up':!expandFlag2,'icon-down':expandFlag2}"></i></text>
-                    </view>
-                    <block  v-if="!item.expandFlag">
-                        <view class="logo-list" v-if="item.children&&item.children.length>0">
-                            <block v-for="(item2,index2) in item.children">
-                                <view  class="l-l-item"
-                                    @click="handleJump(item2.bizUrl)">
-                                    <img :src="'static/images/business/'+item2.icon+'.png'" />
-                                    <text class="font-gray">{{ item2.bizName }}</text>
-                                </view>
-                            </block>
-                        </view>
-                    </block>
                 </view>
+                <view class="logo-list" v-if="!expandFlag2">
+                    <view  v-for="(item,index) in list2" class="l-l-item" :key="index" @click="handleJump(item.url)">
+                        <uni-badge :text="item.badgeCount" size="small"></uni-badge>
+                        <img :src="item.imgSrc" />
+                        <text class="font-gray">{{ item.name }}</text>
+                    </view>
+                </view>
+            </view>
 
-                <!-- 底部加高度来避免tabbar遮挡 -->
+            <!-- 供应链采纳 -->
-                <view class="bottom-height"></view>
+            <view class="white-bg">
-            </mescroll-uni>
+                <view class="w-b-title">供应链采纳
-        </view>
+                    <text>展开<i :class="{iconfont:true,'icon-down':true}"></i></text>
+                </view>
+            </view>
+
+            <!-- PLM系统 -->
+            <view class="white-bg">
+                <view class="w-b-title">PLM系统
+                    <text>展开<i :class="{iconfont:true,'icon-down':true}"></i></text>
+                </view>
+            </view>
+
+            <!-- 底部加高度来避免tabbar遮挡 -->
+            <view class="bottom-height"></view>
+        </mescroll-uni>
     </view>
+</view>
 </template>
 
 <script setup>
 import { ref,onMounted } from 'vue'
-import { onLoad,onHide } from '@dcloudio/uni-app';
+import customHeader from '@/components/customHeader.vue'
-import 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 { businessList } from '@/api/business.js';
+import { businessDaily,businessCRMList } from '@/api/business.js';
-import {showLoading,hideLoading} from '@/utils/message.js'
-import { initTree } from '@/utils/common.js';
-
-onLoad(async(opt) => {
-    // uni.setStorageSync('page_cache',true);
-    try {
-        showLoading("加载中...")
-        getList();
-        hideLoading();
-    } catch (error) {
-        hideLoading();
-    }
-})
 
 // 获取导航栏高度用于内容区域padding
 const navBarPaddingTop = ref(0);
@@ -93,47 +92,9 @@ onMounted(() => {
     navBarPaddingTop.value = getNavBarPaddingTop()*2;
 })
 
-// 搜索处理
+// 查询搜索跳转
-let searchShow = ref(false);
+let handleSearch = ()=>{
-let searchText = ref(undefined);
-let searchTypeObj = ref({typeId:2});
 
-onHide(()=>{
-    searchShow.value=false;
-})
-
-// 搜索返回操作
-const handleBack=()=>{
-    searchShow.value=false;
-}
-// 获取input 焦点跳转
-const handleSearchFocus=()=>{
-    searchShow.value = true;
-}
-
-// 搜索完返回处理
-const handleSearchConfirm = (param1,param2)=>{
-    // console.log(param1,param2)
-    searchText.value=param2.value;;
-    searchShow.value=false;
-}
-
-// 查询列表
-let list = ref([]);
-let getList = async()=>{
-    let searchValue = searchText.value?searchText.value:undefined;
-    let res = await businessList({searchValue});//查询所有业务
-    let arr = res || [];
-    let bizList = initTree(arr,0,'bizId');//递归获取数组处理
-    bizList.forEach(item => {
-        item.expandFlag = false;
-    });
-    list.value = bizList;
-}
-
-// 右侧展开
-let handleExpand = (item)=>{
-    item.expandFlag = !item.expandFlag;
 }
 
 // 下拉刷新
@@ -151,10 +112,9 @@ const downOption = ref({
 // 下拉刷新
 const downCallback = async (mescroll) => {
     try {
-        getList();
+        setTimeout(async ()=>{
-        // setTimeout(async ()=>{
+            // mescroll.resetUpScroll();
-        //     // mescroll.resetUpScroll();
+        },500);
-        // },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;

src/pages/business/editDaily.vue

@@ -1,247 +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();
-        uni.navigateBack();
-    } catch (error) {
-        hideLoading();
-    }
-}
-</script>
-
-<style scoped>
-.scroll-h{
-   height: 100vh;
-}
-
-.white-bg{
-    width: 690rpx;
-    margin-bottom:0;
-    border-radius: 8px 8px 0 0;
-    min-height: calc(100vh - 100px);
-}
-
-:deep(.mescroll-upwarp){
-  display:none
-}
-
-.bus-title{
-    font-weight: bold;
-    margin:0rpx 0 30rpx;
-}
-
-.bus-list{
-    display: flex;
-    align-items: center;
-    flex-flow:row wrap;
-    margin:-10rpx;
-    margin-bottom:40rpx;
-}
-.bus-list .bus-tips{
-    /* width:210rpx; */
-    min-width: calc(100% / 3 - 30px); 
-    height:60rpx;
-    line-height: 60rpx;
-    font-size:28rpx;
-    border-radius: 5px;
-    text-align: center;
-    padding:0 10px;
-    background-color: #fff;
-    color:#333333;
-    border:1px solid #E8E8E8;
-    margin-left:8rpx;
-    margin-right:8rpx;
-    margin-bottom:20rpx;
-}
-
-.bus-list .bus-blue{
-    border:1px solid #05A3F4;
-    background-color: #05A3F4;
-    color:#fff;
-    position: relative;
-}
-.bus-list .bus-blue .bus-icon{
-    position:absolute;
-    right:-10rpx;
-    top:-10rpx;
-    background-color: #02C74C;
-    width:32rpx;
-    height:32rpx;
-    line-height: 32rpx;
-    border-radius: 50%;
-    text-align: center;
-}
-
-.bus-btn-con{
-    position: fixed;
-    bottom:0;
-    background-color: #fff;
-    width:100%;
-    padding:70rpx 0;
-}
-.bus-btn-con .bus-btn{
-    background-color: #05A3F4;
-    color:#fff;
-    text-align: center;
-    width:360rpx;
-    height:80rpx;
-    line-height: 80rpx;
-    margin:0 auto;
-    border-radius: 40rpx;
-}
-</style>

src/pages/deviceAuth/deviceAuth.vue

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

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

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

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

src/pages/loading/loading.vue

@@ -1,230 +1,71 @@
 <template>
-<view class="container" :style="{ height: `100vh` }">
+<view>
-    <view class="bg">
+    <view class="container" :style="{ height: `100vh` }">
-        <view class="env-txt" v-if="networkEnv==1">企业内网</view>
+		<view class="bg"></view>
-    </view>
+        <view class="version">Version {{ version }}</view>
-    <view class="version">Version {{ appVersion }}</view>
+        <view class="bottom-bg"></view>
-    <!-- <view class="bottom-bg"></view> -->
-
-    <!-- 检查版本弹窗 -->
-    <view class="version-con" v-if="versionVisible">
-        <view class="v-bg">
-            <view class="v-title">发现新版本</view>
-            <uni-icons custom-prefix="iconfont" color="#28B6FF" type="icon-phonefilled" size="40"></uni-icons>
-            <view class="v-version">最新版本 Version {{ newVersion }}</view>
-            <view class="v-update">立刻更新吗？</view>
-            <view class="version-btn" @click="handleDown">更 新</view>
-            <view class="version-sub" @click="handleClose" v-if="btnVisible">暂不处理</view>
-        </view>
     </view>
 </view>
-
 </template>
 
 <script setup>
-import { ref,getCurrentInstance } from 'vue';
 import { onLoad } from '@dcloudio/uni-app';
-import { versionCheck,getBindStatus } from '@/api/auth.js';
-import { formatIOS } from '@/utils/status.js'
-import { requestAndroidPermissionAsync,requestAndroidPermission } from '@/utils/common.js'
-import {showAlert} from '@/utils/message.js'
 import { useUserStore } from '@/stores/user';
-const userStore = useUserStore();
+const userStore = useUserStore()
-const { proxy } = getCurrentInstance();
-const networkEnv = ref(proxy.$NETWORK_ENV);//1-内网 2-外网
 
-// #ifdef APP-PLUS
+const version="1.0.0"
-// 获取 存储手机的module 
-const safeSave = uni.requireNativePlugin("Tm-TmSafeSaveFileModule");
-// #endif
 
-let systemInfo={};
+onLoad((opt) => {
-let appVersion = ref("1.0.0");//当前版本号
-let newVersion = ref('1.0.0');//最新版本号
-let versionVisible=ref(false);//版本弹窗
-let btnVisible = ref(true);// 暂不处理 按钮是否显示
-let downloadURL = ref(''); //下载地址
-let versionData = ref({}); //版本参数
-// 初始load页面
-onLoad(async(opt) => {
     console.log("onLoad");
-
+    // 检查是否已登录 并 获取用户信息
-    // uni.preloadPage({url: "/pages/login/login"});
+    if (userStore.isLogin) {
-    // uni.preloadPage({url: "/pages/deviceAuth/deviceAuth"});
+        // userStore.getUser()
-    // uni.preloadPage({url: "/pages/home/home"});
+        // TODO 未登录会在拦截器中处理跳转登录页， 请在 xxx 配置登录页路径
-
+       // #ifdef H5
-    // #ifdef APP-PLUS
+        window.setTimeout(()=>{
-    // 查询版本接口
-    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{
+        },1000)
+        // #endif
+
+        // #ifdef APP-PLUS
+        uni.reLaunch({
+            url: '/pages/home/home',
+        });
+        // #endif
+    }else{
+        // #ifdef H5
+        window.setTimeout(()=>{
             uni.reLaunch({
                 url: '/pages/login/login',
             });
-        }
+        },1000)
-    // },1000)
+        // #endif
-    // #endif
+
+        // #ifdef APP-PLUS
+            uni.reLaunch({
+                url: '/pages/login/login',
+            });
+        // #endif
+    }
 
 });
 
-// 检查版本是否是最新的s
-const getOSVesion = async()=>{
-    let networkEnv = proxy.$NETWORK_ENV;//1-内网 2-外网
-    systemInfo = uni.getSystemInfoSync();
-    let param = {
-        runEnv:networkEnv,
-        // #ifdef APP-PLUS
-        verNumber:systemInfo.appWgtVersion,//当前版本号
-        // #endif
-        // #ifdef H5
-        verNumber : systemInfo.appVersion,
-        // #endif
-        os: formatIOS(systemInfo.osName),//操作系统 Android  IOS
-    }
-    // 当前手机版本
-    appVersion.value = param.verNumber;
-    // console.log("appVersion=>",appVersion)
-    versionData.value = param;
-    let data = await versionCheck(param);
-    newVersion.value = data.verNumber;
-    downloadURL.value = data.downloadUrl || '';
-
-    // isForceUpdate 是否强制更新 1-是 2-否
-    let isForceUpdate = data.isForceUpdate;
-    if(isForceUpdate==1){
-        btnVisible.value = false;
-    }else{
-        btnVisible.value = true;
-    }
-    // 是否为当前最新版本(是=1，否=2)
-    let isCurrent = data.isCurrent;
-    if(isCurrent == 1){
-        versionVisible.value=false;
-    }else{
-        versionVisible.value=true;
-    }
-}
-
-// 查询设备ID
-const selectDeviceId = async()=>{
-    // 查询本地缓存的设备状态是否绑定过
-    // let deviceId = uni.getStorageSync('app_device_id');// 本地设备ID
-    try {
-        // showAlert("safeSave=>"+safeSave)
-        safeSave.getSafeFile({ "key": "app_device_id" }, res2 => {
-            // showAlert(JSON.stringify(res2));
-            if (res2.code == 1) {
-                let deviceId = res2.data;
-                // showAlert("读取成功=>"+deviceId);
-                if(deviceId!=""){
-                    getBindStatus({uniqCode:deviceId}).then(res=>{
-                        let bindStatus = res.bindStatus
-                        // setTimeout(()=>{
-                            // 绑定状态（1=已提交、2=等待审核、3=审核通过、4=绑定成功、5=审核拒绝）
-                            if(bindStatus == 4){
-                                // 检查是否已登录 并 获取用户信息
-                                if (userStore.isLogin) {
-                                    uni.reLaunch({
-                                        url: '/pages/home/home',
-                                    });
-                                
-                                }else{
-                                    uni.reLaunch({
-                                        url: '/pages/login/login',
-                                    });
-                                }
-                            }else{
-                                uni.reLaunch({
-                                    url: '/pages/deviceAuth/deviceAuth',
-                                });
-                            }
-                        // },1000)
-                    });
-                }else{
-                    uni.reLaunch({
-                        url: '/pages/deviceAuth/deviceAuth',
-                    });
-                }
-            
-            } else {
-                uni.reLaunch({
-                    url: '/pages/deviceAuth/deviceAuth',
-                });
-            }
-        })
-    } catch (error) {
-        console.log("getSafeFile=>",error)
-        // showAlert("getSafeFile=>"+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;
@@ -242,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>

src/pages/login/login.vue

@@ -1,108 +1,90 @@
 <template>
 <view class="container">
     <view class="login-con">
-        <view class="bg-h">
+        <view :style="{height: navBarPaddingTop + 'px'}"></view>
-            <view :style="{height: navBarPaddingTop + 'px'}"></view>
+        <image mode="aspectFit" src="../../static/images/pic-logo.png" class="login-logo"></image>
-            <image mode="aspectFit" src="../../static/images/pic-logo.png" class="login-logo"></image>
+        <view class="login-title">欢迎来到718友晟</view>
-            <view class="login-title" v-if="networkEnv==1"><text>718友晟</text><text>企业内网</text></view>
+        <view class="login-tab">
-            <view class="login-title" v-else>欢迎来到718友晟</view>
+            <customTabs v-model="activeTab" :tabs="tabList" :modelValue="activeTab">
-            <view class="login-tab">
+                <!-- 验证码登录 -->
-                <customTabs v-model="activeTab" :tabs="tabList" :modelValue="activeTab">
+                <view v-show="activeTab === 0">
-                    <!-- 验证码登录 -->
+                    <view class="login-form">
-                    <view v-show="activeTab === 0">
+                        <uni-forms ref="form" :model="formData" :rules="rules" label-position="top">
-                        <view class="login-form">
+                            <uni-forms-item label="手机号" required name="phone">
-                            <uni-forms ref="form" :model="formData" :rules="rules" label-position="top">
+                                <view class="code-con">
-                                <uni-forms-item label="手机号" required name="phone">
+                                    <uni-icons custom-prefix="iconfont" color="#239FDF" type="icon-phone" size="20"></uni-icons>
-                                    <view class="code-con">
+                                    <uni-easyinput type="number" :inputBorder="false"
-                                        <uni-icons custom-prefix="iconfont" color="#239FDF" type="icon-phone" size="20"></uni-icons>
+                                        v-model="formData.phone" placeholder="请输入手机号" 
-                                        <uni-easyinput type="number" :inputBorder="false"
+                                        maxlength="11"
-                                            v-model="formData.phone" placeholder="请输入手机号" 
+                                    />
-                                            maxlength="11"
+                                </view>
-                                        />
+                            </uni-forms-item>
-                                    </view>
+                            <uni-forms-item label="验证码" required name="verifyCode">
-                                </uni-forms-item>
+                                <view class="code-con">
-                                <uni-forms-item label="验证码" required name="verifyCode">
+                                    <uni-icons custom-prefix="iconfont" color="#239FDF" type="icon-code" size="20"></uni-icons>
-                                    <view class="code-con">
+                                    <uni-easyinput type="number" :inputBorder="false"
-                                        <uni-icons custom-prefix="iconfont" color="#239FDF" type="icon-code" size="20"></uni-icons>
+                                        v-model="formData.verifyCode" placeholder="请输入验证码"
-                                        <uni-easyinput type="number" :inputBorder="false"
+                                        maxlength="6" style="width:190rpx"
-                                            v-model="formData.verifyCode" placeholder="请输入验证码"
+                                    />
-                                            maxlength="6" style="width:190rpx"
+                                    <button type="primary" plain @click="getCode" size="mini" 
-                                        />
+                                        :loading="codeLoading" :disabled="codeDisabled" class="btn-plain"
-                                        <button type="primary" plain @click="getCode" size="mini" 
+                                    >{{codeText}}</button>
-                                            :loading="codeLoading" :disabled="codeDisabled" class="btn-plain"
+                                </view>
-                                        >{{codeText}}</button>
+                            </uni-forms-item>
-                                    </view>
+                        </uni-forms>
-                                </uni-forms-item>
-                            </uni-forms>
-                        </view>
-                    </view>
-                    <!-- 账号登录 -->
-                    <view v-show="activeTab === 1">
-                        <view class="login-form">
-                            <uni-forms ref="form2" :model="formData2" :rules="rules2" label-position="top">
-                                <uni-forms-item label="用户名" required name="username">
-                                    <view class="code-con">
-                                        <uni-easyinput prefixIcon="person" :inputBorder="false" 
-                                            v-model="formData2.username" placeholder="请输入用户名" 
-                                        />
-                                    </view>
-                                </uni-forms-item>
-                                <uni-forms-item label="密码" required name="password" class="password">
-                                    <view class="code-con">
-                                        <uni-easyinput prefixIcon="locked" type="password" :inputBorder="false"
-                                            v-model="formData2.password" placeholder="请输入登录密码"
-                                        />
-                                    </view>
-                                </uni-forms-item>
-                            </uni-forms>
-                        </view>
-                    </view>
-                </customTabs>
-
-                <view class="agreen-con">
-                    <uni-icons v-if="agreeChecked" type="checkbox-filled"  color="#02C74C" size="25"  @click="agreeCheck"></uni-icons>
-                    <uni-icons v-else type="circle" color="#bfbfbf" size="25"  @click="agreeCheck"></uni-icons>
-                    <view class="agreen-xy">
-                        我已阅读并接受<text @click="agreeVisable(1)">《服务条款》</text>和<text @click="agreeVisable(2)">《隐私保护协议》</text>
                     </view>
                 </view>
+                <!-- 账号登录 -->
+                <view v-show="activeTab === 1">
+                    <view class="login-form">
+                        <uni-forms ref="form2" :model="formData2" :rules="rules2" label-position="top">
+                            <uni-forms-item label="用户名" required name="username">
+                                <view class="code-con">
+                                    <uni-easyinput prefixIcon="person" :inputBorder="false" 
+                                        v-model="formData2.username" placeholder="请输入用户名" 
+                                    />
+                                </view>
+                            </uni-forms-item>
+                            <uni-forms-item label="密码" required name="password" class="password">
+                                <view class="code-con">
+                                    <uni-easyinput prefixIcon="locked" type="password" :inputBorder="false"
+                                        v-model="formData2.password" placeholder="请输入登录密码"
+                                    />
+                                </view>
+                            </uni-forms-item>
+                        </uni-forms>
+                    </view>
+                </view>
+            </customTabs>
 
-                <button type="primary" class="btn-submit" @click="submitForm" :loading="btnLoading" :disabled="btnLoading">登 录</button>
+            <view class="agreen-con">
+                <uni-icons v-if="agreeChecked" type="checkbox-filled"  color="#02C74C" size="25"  @click="agreeCheck"></uni-icons>
+                <uni-icons v-else type="circle" color="#bfbfbf" size="25"  @click="agreeCheck"></uni-icons>
+                <view class="agreen-xy">
+                    我已阅读并接受<text @click="agreeVisable(1)">《服务条款》</text>和<text @click="agreeVisable(2)">《隐私保护协议》</text>
+                </view>
             </view>
 
+            <button type="primary" class="btn-submit" @click="submitForm" :loading="btnLoading" :disabled="btnLoading">登 录</button>
         </view>
-
     </view>
-    <!-- <view class="login-bottom"></view> -->
+    <view class="login-bottom"></view>
 </view>
 </template>
 
 <script setup>
-import { ref,onMounted,getCurrentInstance } from 'vue';
+import { ref,onMounted } from 'vue';
-import { onLoad } from '@dcloudio/uni-app';
 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'
+const userStore = useUserStore()
-import {showAlert} from '@/utils/message.js'
-
-
-// #ifdef APP-PLUS
-// 获取 存储手机的module 
-const safeSave = uni.requireNativePlugin("Tm-TmSafeSaveFileModule");
-// #endif
-
-const { proxy } = getCurrentInstance();
-const userStore = useUserStore();
-let clientId = `${proxy.$CLIENT_ID || 2}`;
-let networkEnv = ref(proxy.$NETWORK_ENV);//1-内网 2-外网
-onLoad(async(opt) => {
-    uni.setStorageSync('page_cache',true);
-})
 
 // 获取导航栏高度用于内容区域padding
 const navBarPaddingTop = ref(0);
@@ -116,8 +98,8 @@ const tabList = ['验证码登录', '账号登录'];
 // 验证码登录
 const form = ref(null);
 const formData = ref({
-    phone: '',
+    phone: '15112345600',
-    verifyCode: '',
+    verifyCode: '123456',
     loginType:0
 });
 
@@ -201,8 +183,8 @@ let resetCountdown =()=>{
 // 账号登录
 const form2 = ref(null);
 const formData2 = ref({
-    username: '',
+    username: 'admin',
-    password: '',
+    password: '123456',
     loginType:1
 });
 
@@ -210,13 +192,13 @@ const rules2 = {
     username: {
         rules: [
             { required: true, errorMessage: '请输入用户名' },
-            // { minLength: 3, maxLength: 10, errorMessage: '用户名长度在3到10个字符之间' }
+            { minLength: 3, maxLength: 10, errorMessage: '用户名长度在3到10个字符之间' }
         ]
     },
     password: {
         rules: [
             { required: true, errorMessage: '请输入密码' },
-            // { pattern: /^[a-zA-Z0-9]{6,12}$/, errorMessage: '密码必须是6-12位字母或数字' }
+            { pattern: /^[a-zA-Z0-9]{6,12}$/, errorMessage: '密码必须是6-12位字母或数字' }
         ]
     }
 };
@@ -243,7 +225,7 @@ const submitForm = () => {
     if(activeTab.value===0){
         form.value.validate().then(async param => {
             // 2.调用登录接口
-            param.loginType = activeTab.value;
+            param.loginType = activeTab.value; console.log('表单数据00:', param);
             let res = await login(param)
             // 3.登录后存储token
             userStore.login(res);
@@ -256,64 +238,11 @@ const submitForm = () => {
     }else if(activeTab.value===1){
         // 用户名和密码登录
         form2.value.validate().then(async param => {
-            param.loginType = activeTab.value;
+            param.loginType = activeTab.value;   console.log('表单数据11:', formData2.value);
-            param.clientId = clientId;
-            let password = encryptObj.Encrypt(param.username + clientId + "," + param.password);
-            param.password = password;
-            param.runEnv = networkEnv.value;
-
-            // #ifdef H5
-            //h5测试用 内网-sn123456
-            //公司外网 'f3fca83f-bf56-47f4-a98b-a602ed8bddee' 529a5543-6957-401e-b090-13df6dee5429
-            //友晟外网 'b97527c8-2ad4-493c-a01c-5f9d0aabaff2' 
-            param.uniqCode = 'b97527c8-2ad4-493c-a01c-5f9d0aabaff2';
             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;
-                        uni.getPushClientId({
-                            success: (res) => {
-                                let push_clientid = res.cid
-                                console.log('客户端推送标识:', push_clientid);
-                                console.log("param=>",param)
-                                param.cid = push_clientid
-                                // showAlert("客户端推送标识=>"+push_clientid);
-                                login(param).then(res=>{
-                                    userStore.login(res);
-                                    uni.switchTab({ url: '/pages/home/home' })
-                                    btnLoading.value = false;
-                                }).finally(()=>{
-                                    btnLoading.value = false;
-                                })
-                            },
-                            fail(err) {
-                                console.log(err)
-                            }
-                        })
-                       
-                    } 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;
@@ -324,9 +253,6 @@ const submitForm = () => {
 };
 </script>
 <style scoped>
-page{
-    background-color: #F5F5F5;
-}
 .container {
     height: 100vh;
 }
@@ -353,26 +279,6 @@ page{
     margin: 0 0 35rpx 70rpx;
 }
 
-.login-con .login-title text:not(:last-child)::after {
-  content: "·";
-  margin: 0 10px;
-  color: #fff;
-}
-
-.login-con .bg-h{
-    background:url('@/static/images/login-txt.png') center bottom 10rpx no-repeat;
-    background-size:654rpx 121rpx;
-    /* #ifdef APP-PLUS */
-    width: 100vw;
-    /* #endif */
-    height: calc(100vh - 10px) ;
-    margin:0 auto;
-}
-
-.login-tab{
-    padding-bottom:20rpx;
-}
-
 :deep(.login-tab .tabs-header) {
     background: none !important;
     border-bottom: none !important;
@@ -504,12 +410,4 @@ page{
     margin-left:-327rpx;
 }
 
-.slider-con{
-    position: absolute;
-    top:0;
-    width:100%;
-    height: 100vh;
-    background-color: rgba(0, 0, 0, 0.1);
-}
-
 </style>

src/pages/notice/notice.vue

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

src/pages/notice/noticeDetail.vue

@@ -1,84 +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="n-title">{{ title }}</view>
-                <view class="n-time">
-                   <text>来自：{{appName}}</text> {{ time }}
-                </view>
-                <view class="btn-blue"  @click="handleJump">跳转详情页</view>
-            </view>
-
-            <!-- 底部加高度来避免tabbar遮挡 -->
-            <view class="bottom-height"></view>
-        </view>
-    </view>
-</template>
-
-<script setup>
-import { ref, onMounted } from 'vue'
-import { onLoad } from '@dcloudio/uni-app'
-import customHeader from '@/components/customHeader.vue'
-import {showToast} from '@/utils/message.js'
-
-// 加载后调用
-let title = ref(null);
-let time = ref(null);
-let appName = ref(null);
-onLoad((options) => {
-    console.log(options)
-    title.value = options.title;
-    time.value = options.time;
-    appName.value = options.appName
-})
-
-// 跳转webview
-const handleJump = ()=>{
-    showToast('暂不支持跳转');
-}
-
-</script>
-
-<style scoped>
-.white-bg {
-    width: 650rpx;
-    padding:30rpx 50rpx;
-    height:100vh;
-    margin: 0;
-    border-radius: 8px 8px 0 0;
-    
-}
-.white-bg .n-title{
-    font-size:40rpx;
-    font-weight: bold;
-    padding:20rpx 0 25rpx;
-    text-align: center;
-    border-bottom: 1px solid #BFBFBF;
-}
-.white-bg .n-time{
-    text-align: center;
-    color:#919191;
-    font-size:26rpx;
-    padding:20rpx;
-}
-.white-bg .n-time text{
-    margin-right:50rpx;
-}
-.btn-blue {
-    background-color: #05A3F4;
-    color: #fff;
-    width:380rpx;
-    height:80rpx;
-    line-height: 80rpx;
-    margin:300rpx auto 0;
-    text-align: center;
-    border-radius: 40rpx;
-}
-</style>

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>

src/pages/notice/waitApproveDetail.vue

@@ -1,151 +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'
-import {showToast} from '@/utils/message.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 = ()=>{
-    showToast('暂不支持跳转');
-    // let item = detail.value;
-    // uni.navigateTo({
-    //     url: `/pages/h5-webview/h5-webview?url=${item.mobileLink}&title=${item.subject}`
-    // });
-}
-</script>
-
-<style scoped>
-.all-body {
-    /* #ifdef APP-PLUS */
-    top: 150rpx;
-    height: calc(100vh - 75px);
-    /* #endif */
-    /* #ifndef APP-PLUS */
-    top:120rpx;
-    height: calc(100vh - 60px);
-    /* #endif */
-}
-
-.scroll-h{
-    /* #ifdef APP-PLUS */
-    height:calc(100vh - 78px) !important;
-    /* #endif */
-    /* #ifndef APP-PLUS */
-    height: calc(100vh - 10px) !important;
-    /* #endif */
-}
-.white-bg{
-    width: 750rpx;
-    padding: 25rpx 0 20rpx;
-    margin-bottom:0;
-    border-radius: 8px 8px 0 0;
-}
-
-.white-bg.bg-height{
-    /* #ifdef APP-PLUS */
-    height:calc(100vh - 78px) !important;
-    /* #endif */
-    /* #ifndef APP-PLUS */
-    height: calc(100vh - 80px) !important;
-    /* #endif */
-}
-
-.report-list{
-    padding: 0 0 0 30rpx;
-}
-.report-list .r-list{
-    padding-right: 30rpx;
-} 
-.report-list .r-list:first-child{
-    padding-bottom:10rpx;
-}
-.report-list .border-bottom{
-    width:720rpx;
-}
-
-.btn-blue {
-    background-color: #05A3F4;
-    color: #fff;
-    width:380rpx;
-    height:80rpx;
-    line-height: 80rpx;
-    margin:120rpx auto 0;
-    text-align: center;
-    border-radius: 40rpx;
-}
-</style>

src/pages/search/search.vue

@@ -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>

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-bg">
-                <view class="backlog-b-item" v-for="(item,index) in bizListFavorite" :key="index">
+                <view class="backlog-b-item">
-                    <img :src="'static/images/business/'+item.icon+'.png'" />
+                    <img :src="'static/images/business/icon-rwjh.png'" />
-                    <view class="font-title">{{item.bizName}}</view>
+                    <view class="font-title">任务计划</view>
-                </view> -->
+                </view>
-                <!-- <view class="backlog-b-item">
+                <view class="backlog-b-item">
                     <img :src="'static/images/business/icon-rb.png'" />
                     <view class="font-title">日报</view>
                 </view>
@@ -47,11 +43,11 @@
                 <view class="backlog-b-item">
                     <img :src="'static/images/business/icon-jxgl.png'" />
                     <view class="font-title">绩效管理</view>
-                </view> -->
+                </view>
-            <!-- </view> -->
+            </view>
 
             <!-- 头像块 -->
-            <view class="white-bg" style="margin-top:20rpx;">
+            <view class="white-bg">
                 <view class="list-item">
                     <img :src="'static/images/userinfo/icon-tx@2x.png'" class="l-icon" />
                     <text>头像</text>
@@ -80,11 +76,11 @@
                     </view>
                 </view>
                 <view class="item-border"></view>
-                <view class="list-item item-padding" @click="handleVersion">
+                <view class="list-item item-padding">
                     <img :src="'static/images/userinfo/icon-bbgx@2x.png'" class="l-icon" />
-                    <view class="item-text">版本更新 <view class="dot" v-if="isCurrent==2"></view></view>
+                    <view class="item-text">版本更新 <view class="dot"></view></view>
                     <view class="list-right">
-                        <text class="item-gray">Version {{ appVersion }}</text>
+                        <text class="item-gray">Version 1.0.0</text>
                         <uni-icons type="right" size="20" color="#A0A0A0"></uni-icons>
                     </view>
                 </view>
@@ -95,52 +91,26 @@
 
             <!-- 底部加高度来避免tabbar遮挡 -->
             <!-- <view class="bottom-height"></view> -->
-        </mescroll-uni>
+      </mescroll-uni>
     </view>
-    <!-- 弹窗模板 -->
-    <!-- <customShowModal
-        :title="title"
-        :content="content" 
-        :visible="visible" 
-        @close="handleClose"
-        @confirm="handleLoginOut"
-        ref="showModel"
-    ></customShowModal> -->
 </view>
 </template>
 
 <script setup>
-import { ref, onMounted,getCurrentInstance } from 'vue'
+import { ref, onMounted } from 'vue'
-import { onLoad } from '@dcloudio/uni-app';
+// import customHeader from '@/components/customHeader.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 { getUserInfo } from '@/api/auth.js'
-import { showAlert } from '@/utils/message.js'
+
 import { useUserStore } from '@/stores/user';
 const userStore = useUserStore()
-const { proxy } = getCurrentInstance();
-const networkEnv = ref(proxy.$NETWORK_ENV);//1-内网 2-外网
-
-let myTitle = '我的';
-myTitle = networkEnv.value==1?'我的 · 企业内网':'我的'
-
 
 // 1.头部导航栏
 const navBarPaddingTop = ref(0);
-let appVersion = ref("1.0.0");//当前版本号
+onMounted(() => {
-let newVersion = ref("1.0.0");//新版本号
+    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
-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
 })
 
 // 下拉刷新
@@ -155,117 +125,54 @@ const downOption = ref({
     textLoading: '刷新中...'
 });
 
-// 2.获取用户基本信息
-let userObj = ref({});
-let bizListFavorite = ref([]);
-const selectUserInfo = async ()=>{
-    let data = await getUserInfo({});
-
-    // 查询常用业务
-    // let favoriteBizListStr = data.favoriteBizList || '';
-    // let favoriteBizList = favoriteBizListStr.split(",");//常用业务
-    // let list = [];
-    // let bizList = data.bizList;//所有业务
-    // bizList.forEach(item => {
-    //     favoriteBizList.forEach(item2=>{
-    //         if(item.bizId == item2){
-    //             list.push(item);
-    //         }
-    //     })
-    // });
-    // bizListFavorite.value = list;
-
-    // 岗位名称，取第0个显示
-    let postName = data.postList[0]?data.postList[0].postName:'';
-    userObj.value = {
-        ...data,
-        postName,
-        level:5,//默认搞个5
-        joinDay:1000,//默认1000天
-    };
-}
-
 // 下拉刷新
 const downCallback = async (mescroll) => {
     try {
-        selectUserInfo();
+        setTimeout(async ()=>{
-        getVersion();
+            // mescroll.resetUpScroll();
+        },500);
     } catch (error) {
         mescroll.endErr();
     } finally {
-        mescroll.endSuccess();
+        setTimeout(async ()=>{
+            mescroll.endSuccess();
+        },500);
     }
 }
 
-// 3.查询是否有更新的版本显示点
+// 2.获取用户基本信息
-const getVersion = async ()=>{
+let userObj = ref({});
-    let networkEnv = proxy.$NETWORK_ENV;//1-内网 2-外网
+const selectUserInfo = async ()=>{
-    let param = {
+    let data = await getUserInfo({});
-        // #ifdef APP-PLUS
+    userObj.value = data;
-        verNumber:systemInfo.appWgtVersion,//当前版本号
-        // #endif
-        // #ifdef H5
-        verNumber : systemInfo.appVersion,
-        // #endif
-        os: formatIOS(systemInfo.osName),//操作系统 Android  IOS
-        runEnv:networkEnv
-    }
-    let data = await versionCheck(param);
-    isCurrent.value = data.isCurrent;
-}
-
-// 自定义弹窗
-let title = ref('');
-let content = ref('');
-let visible = ref(false);
-const showModel=()=>{
-    title.value = '提示'
-    content.value = '是否确认退出？';
-    visible.value = true;
-}
-//关闭
-const handleClose=()=>{
-    visible.value = false;
 }
+selectUserInfo()
 
 // 3.退出登录
 const handleLoginOut = async ()=>{
-
+    userStore.logout();
-    showAlert('是否确认退出？','提示',true,()=>{
+    uni.reLaunch({
-        userStore.logout();
+        url: '/pages/login/login',
-        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 */
+  /* #ifdef APP-PLUS */
-    height:calc(100vh - 78px) !important;
+  height:calc(100vh - 30px) !important;
-    /* #endif */
+  /* #endif */
-    /* #ifndef APP-PLUS */
+  /* #ifndef APP-PLUS */
-    height: calc(100vh - 80px) !important;
+  height: calc(100vh - 30px) !important;
-    /* #endif */
+  /* #endif */
 }
 :deep(.mescroll-upwarp){
   display:none
 }
 .head-pic {
     display: flex;
-    padding: 0rpx 0rpx 10rpx 30rpx;
+    padding: 40rpx 0rpx 10rpx 30rpx;
 }
 
 .head-pic .pic-img {

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>

src/static/common.css

@@ -5,10 +5,8 @@ page {
     height: 100%;
     padding: 0;
     margin: 0;
-    background-color: #307AF5;
+    background-color: #F5F5F5;
-    /* background-color: #F5F5F5; */
     color: #333;
-
 }
 
 .container {
@@ -21,30 +19,26 @@ page {
     width: 100%;
     margin: 0;
     padding: 0;
-    background-color: #F5F5F5;
 }
 
+
 .con-bg {
     position: absolute;
     top: 0;
     right: 0;
     bottom: 0;
     /* #ifdef APP-PLUS */
-    background-color: #F5F5F5;
+    background: url('@/static/images/bg-Blue.png') no-repeat;
-    background-image: url('@/static/images/bg-Blue.png');
+    background-size: 100vw 761rpx;
-    background-repeat:  no-repeat;
+    width: 100vw;
-    background-size: 750rpx 761rpx;
+    height: 761rpx;
-    width: 750rpx;
-    /* height: 761rpx; */
     left: 0;
     /* #endif */
     /* #ifndef APP-PLUS */
-    background-color: #F5F5F5;
+    background: url('@/static/images/bg-Blue.png') no-repeat;
-    background-image: url('@/static/images/bg-Blue.png');
-    background-repeat:  no-repeat;
     background-size: 750rpx 761rpx;
     width: 750rpx;
-    /* height: 761rpx; */
+    height: 761rpx;
     left: 50%;
     margin-left: -375rpx;
     /* #endif */
@@ -171,8 +165,7 @@ page {
     font-size: 40rpx !important;
 }
 
-.custom-search .uni-input-placeholder,
+.custom-search .uni-input-placeholder {
-.custom-search .uni-input-input {
     color: #fff !important;
     font-size: 27rpx !important;
 }
@@ -194,7 +187,7 @@ page {
     /* width:690rpx; */
     width:630rpx;
     height:56rpx;
-    margin:10rpx auto 30rpx;
+    margin:0 auto 30rpx;
     padding:0 30rpx;
     display: flex;
     color:#fff;
@@ -202,33 +195,26 @@ page {
     flex: auto;
 }
 .search-bg .search-left{
-    display: flex;
+    border-right:1px solid #4687F2;
-    align-items: center;
-    min-width: 10%;
-}
-.search-bg .search-right{
-    border-left:1px solid #4687F2;
-    padding-left:25rpx;
-    margin-left:30rpx;
     margin-top:10rpx;
     margin-bottom:10rpx;
-    max-width:60%;
+    padding-right:30rpx;
-    display: flex;
+    /* width:10%; */
-    align-items: center;
+}
-
+.search-bg .search-right{
+    margin-top:10rpx;
+    padding-left:30rpx;
+    /* width:60%; */
 }
 .search-bg .search-right .uni-input{
     color:#fff;
     font-size:28rpx;
 }
-
 .search-bg .search-right .uni-input .uni-input-input{
-    /* width: 380rpx; */
+    width: 380rpx;
 }
 .search-bg .search-right .uni-input .search-color{
     color:#fff !important;
-    display: flex;
-    align-items: center;
 }
 /* 搜索框修改样式 end */
 
@@ -326,9 +312,8 @@ page {
     display: flex;
     flex-wrap: wrap;
     /* 关键属性：允许换行 */
+    gap: 20rpx;
     /* 项目间距 */
-    margin-left:-10rpx;
-    margin-right:-10rpx;
 }
 
 .white-bg .logo-list .l-l-item {
@@ -336,11 +321,8 @@ page {
     text-align: center;
     margin-bottom: 30rpx;
     position: relative;
-    margin-left:10rpx;
-    margin-right:10rpx;
 }
 
-
 .white-bg .logo-list .l-l-item img {
     width: 90rpx;
     height: 90rpx;
@@ -561,7 +543,6 @@ uni-button[type='primary'][plain] {
 
 .form-con .footer-con {
     display: flex;
-    padding-bottom:30rpx;
 }
 
 /* .form-con .form-texarea .is-textarea{
@@ -642,9 +623,4 @@ uni-button[type='primary'][plain] {
 }
 
 
-/* CRM 样式 end */
+/* CRM 样式 end */
-
-.mescroll-empty .empty-tip{
-    color: #fff !important;
-    font-size:28rpx !important;
-}

src/static/font/iconfont.css

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