Merge branch 'develop-718' of http://123.57.20.168:4000/admin/ys-app into develop-718

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,20 +2,12 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "customPlaygroundType" : "local",
+            "playground" : "standard",
-            "packageName" : "com.ys718.app",
-            "playground" : "custom",
             "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,43 +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",
-    "minio": "^8.0.6",
-    "minio-js": "^1.0.7",
     "pinia": "2.0.20",
-    "uniapp-video-player": "^1.3.0",
+    "vue": "^3.4.21"
-    "uuid": "^11.1.0",
-    "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,90 +205,9 @@ export function getRejectReason(data) {
 //查询签到打卡信息集合为了报告
 export function addMapForReport(data) {
   return request.get({
-    url: "/crm/app/appVisistReport/addMapList",
+    url: "/app/appVisistReport/addMapList",
     data,
   },{
     isTransformResponse:false
   });
 }
-
-
-//新增请假申请
-export function addLeaveApply(data) {
-  return request.post({
-    url: "/crm/app/appLeaveApply/add",
-    data,
-  },{
-    isTransformResponse:false
-  });
-}
-
-//我的表单
-export function getLeaveApplyList(data) {
-  return request.get({
-    url: "/crm/app/appLeaveApply/list",
-    data
-  },{
-    isTransformResponse:false
-  });
-}
-
-//可销假表单
-export function getBackList(data) {
-  return request.get({
-    url: "/crm/app/appLeaveApply/getBackList",
-    data
-  },{
-    isTransformResponse:false
-  });
-}
-
-//我的审批
-export function getMyReviewList(data) {
-  return request.get({
-    url: "/crm/app/appLeaveApply/myReview",
-    data
-  },{
-    isTransformResponse:false
-  });
-}
-
-//可销假表单
-export function getBackLeaveList(data) {
-  return request.get({
-    url: "/crm/app/appLeaveApply/myBackLeave",
-    data
-  },{
-    isTransformResponse:false
-  });
-}
-
-//提交审批
-export function addReviewLeave(data) {
-  return request.post({
-    url: "/crm/app/appLeaveApply/addReview",
-    data,
-  },{
-    isTransformResponse:false
-  });
-}
-
-//新增销假申请
-export function addBackApply(data) {
-  return request.post({
-    url: "/crm/app/appLeaveApply/addBackApply",
-    data,
-  },{
-    isTransformResponse:false
-  });
-}
-
-//可销假表单
-export function getDelLeaveApply(data) {
-  return request.get({
-    url: "/crm/app/appLeaveApply/delLeaveApply",
-    data
-  },{
-    isTransformResponse:false
-  });
-}

src/api/crm/activity/map.js

@@ -3,25 +3,17 @@ import request from "@/utils/request";
 //新增地图开始签到接口
 export function addStartMap(data) {
   return request.post({
-    url: "/crm/app/appVisistMap/Startadd",
+    url: "/app/appVisistMap/Startadd",
     data,
   },{
     isTransformResponse:false
   });
 }
 
-//出差打卡接口
-export function businessTripClockIn(data) {
-  return request.post({
-    url: '/crm/app/appVisistMap/businessTripClockIn',
-    data
-  },{isTransformResponse:false});
-}
-
 //新增地图开始打卡接口
 export function addStartMapForClockIn(data) {
   return request.post({
-    url: "/crm/app/appVisistMap/StartaddForClockIn",
+    url: "/app/appVisistMap/StartaddForClockIn",
     data,
   },{
     isTransformResponse:false
@@ -31,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
@@ -41,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
@@ -51,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

@@ -3,7 +3,7 @@ import request from "@/utils/request"
 // 查询客户人员列表
 export function getCustomerList(params){
     return request.get({
-        url: '/crm/app/appCustomerIfno/pageList',
+        url: '/app/appCustomerIfno/pageList',
         data: params
     },{isTransformResponse: false})
 }
@@ -11,35 +11,35 @@ export function getCustomerList(params){
 // 查询系统推荐等级
 export function getCustomerLevel(params){
     return request.get({
-        url: '/crm/app/appCrmCusUserNewController/queryCustomerLevel',
+        url: '/app/appCrmCusUserNewController/queryCustomerLevel',
         data: params
     },{isTransformResponse: false})
 }
 // 客户人员新增
 export function saveappCrmCusUserNew(params){
     return request.get({
-        url: '/crm/app/appCrmCusUserNewController/add',
+        url: '/app/appCrmCusUserNewController/add',
         data: params
     },{isTransformResponse: false})
 }
 // 查询业务员名下所有的客户
 export function SearchForAllCustomersSalesperson(params){
     return request.get({
-        url: '/crm/app/appCrmCusUserNewController/SearchForAllCustomersSalesperson',
+        url: 'app/appCrmCusUserNewController/SearchForAllCustomersSalesperson',
         data: params
     },{isTransformResponse: false})
 }
 // 客户人员归属审核详情
 export function getCusUserApprovalListDetail(params){
     return request.get({
-        url: '/crm/app/appCrmCusUserNewController/getCusUserApprovalListDetail',
+        url: '/app/appCrmCusUserNewController/getCusUserApprovalListDetail',
         data: params
     },{isTransformResponse: false})
 }
 // 查询主归属人列表
 export function SearchForAllPerson(params){
     return request.get({
-        url: '/crm/app/appCrmCusUserNewController/SearchForAllPerson',
+        url: '/app/appCrmCusUserNewController/SearchForAllPerson',
         data: params
     },{isTransformResponse: false})
 }
@@ -47,7 +47,7 @@ export function SearchForAllPerson(params){
 // 客户人员新增审核列表
 export　function　getCusUserApprovalList(params) {
     return request.get({
-        url: '/crm/app/appCrmCusUserNewController/getCusUserApprovalList',
+        url: '/app/appCrmCusUserNewController/getCusUserApprovalList',
         data: params
         }, {isTransformResponse: false}
     )

src/api/crm/customer/updateCustomer.js

@@ -2,35 +2,35 @@ import request from "@/utils/request"
 // 删除客户人员归属消息
 export function removeVisit(params){
     return request.get({
-        url: '/crm/app/appVisistReport/remove',
+        url: '/app/appVisistReport/remove',
         data: params
     },{isTransformResponse: false})
 }
 // 更新客户人员
 export function upadateappCrmCusUserNew (data){
     return request.post({
-        url: '/crm/app/appCrmCusUserNewController/update',
+        url: '/app/appCrmCusUserNewController/update',
         data
     },{isTransformResponse: false})
 }
 // 客户人员审核通过
 export function clientPersonnelsApproval(data) {
     return request.get({
-        url: '/crm/app/appCrmCusUserNewController/clientPersonnelsApproval',
+        url: '/app/appCrmCusUserNewController/clientPersonnelsApproval',
         data
     }, {isTransformResponse: false});
 }
 //客户人员驳回
 export function customerPersonnelsRejectio(data) {
     return request.get({
-        url: '/crm/app/appCrmCusUserNewController/customerPersonnelsRejectio',
+        url: '/app/appCrmCusUserNewController/customerPersonnelsRejectio',
         data
     }, {isTransformResponse: false});
 }
 //主归属人变更提交
 export function submissionOfChangeOfMainOwner (data){
     return request.get({
-        url: '/crm/app/appCrmCusUserNewController/submissionOfChangeOfMainOwner',
+        url: '/app/appCrmCusUserNewController/submissionOfChangeOfMainOwner',
         data
     },{isTransformResponse: false})
 }

src/api/crm/mainOwner/mainOwner.js

@@ -4,7 +4,7 @@ import request from "@/utils/request";
 //主归属人变更信息查看（列表）
 export function queryViewMainOwnerList(params){
     return request.get({
-        url: '/crm/app/appCrmCusUserNewController/viewInformationChangesInprimaryOwnership',
+        url: '/app/appCrmCusUserNewController/viewInformationChangesInprimaryOwnership',
         data: params
     },{isTransformResponse: false})
 }
@@ -12,7 +12,7 @@ export function queryViewMainOwnerList(params){
 //主归属人变更信息查看（详情）
 export function queryViewMainOwnerDetail(params){
     return request.get({
-        url: '/crm/app/appCrmCusUserNewController/getCrmCusUserNewChangeOwnerList',
+        url: '/app/appCrmCusUserNewController/getCrmCusUserNewChangeOwnerList',
         data: params
     },{isTransformResponse: false})
 }
@@ -20,7 +20,7 @@ export function queryViewMainOwnerDetail(params){
 //查询主归属人变更人员的列表数据
 export function personnelAwaitingReviewForChange(params){
     return request.get({
-        url: '/crm/app/appCrmCusUserNewController/personnelAwaitingReviewForChange',
+        url: '/app/appCrmCusUserNewController/personnelAwaitingReviewForChange',
         data: params
     },{isTransformResponse: false})
 }
@@ -28,14 +28,14 @@ export function personnelAwaitingReviewForChange(params){
 //主归属人变更驳回
 export function changeOfPrimaryOwnershipNoApproved(params) {
     return request.get({
-        url:'/crm/app/appCrmCusUserNewController/changeOfPrimaryOwnershipNoApproved',
+        url:'/app/appCrmCusUserNewController/changeOfPrimaryOwnershipNoApproved',
         data: params
     }, {isTransformResponse: false});
 }
 //主归属人变更通过
 export function changeOfPrimaryOwnershipApproved (params) {
     return request.get({
-        url: '/crm/app/appCrmCusUserNewController/changeOfPrimaryOwnershipApproved',
+        url: '/app/appCrmCusUserNewController/changeOfPrimaryOwnershipApproved',
         data: params
     }, {isTransformResponse: false});
 }

src/api/crm/plan/getPlan.js

@@ -1,29 +1,36 @@
 import request from "@/utils/request"
-// 获取用户信息
+
+export function getPersonalPlanList(params) {
+    return request.post({
+        url: '/getPersonalPlanList',
+        params
+    })
+}
+
 export function getUserInfo(data) {
     return request.get({
-        url: '/crm/app/user/getUserInfo',
+        url: '/app/user/getUserInfo',
         data
     }, {isTransformResponse: false})
 }
 //获取所有人周计划列表
 export function getAllWeekPlanList(params){
     return request.get({
-        url: '/crm/app/appWeeklyPlan/list',
+        url: '/app/appWeeklyPlan/list',
         data: params
     },{isTransformResponse: false})
 }
 //获取个人周计划列表
 export function getWeeklyPlanList(data) {
     return request.get({
-        url: '/crm/app/appWeeklyPlan/getWeeklyListByUser',
+        url: '/app/appWeeklyPlan/getWeeklyListByUser',
         data
     }, {isTransformResponse: false})
 }
 // 组合查询计划列表
 export function getWeekPlanListByDate(params){
     return request.get({
-        url: '/crm/app/appWeeklyPlan/weeklyListByDate',
+        url: '/app/appWeeklyPlan/weeklyListByDate',
         data: params
     },{isTransformResponse: false})
 }

src/api/crm/plan/updatePlan.js

@@ -2,7 +2,7 @@ import request from "@/utils/request"
 
 export function updateWeekPlanList(data){
     return request.post({
-        url: '/crm/app/appWeeklyPlan/updateWeekly',
+        url: '/app/appWeeklyPlan/updateWeekly',
         data: data,
         header: {
             'Content-Type': 'application/json;charset=UTF-8'
@@ -12,7 +12,7 @@ export function updateWeekPlanList(data){
 // 判断本周是否写过计划
 export function judgeThisWeek (data){
     return request.post({
-        url: '/crm/app/appWeeklyPlan/Judgethisweek',
+        url: '/app/appWeeklyPlan/Judgethisweek',
         data,
         header: {'Content-Type': 'application/json;charset=UTF-8'}
     })
@@ -21,7 +21,7 @@ export function judgeThisWeek (data){
 // 新增周计划
 export function addPlan(data){
     return request.post({
-        url: '/crm/app/appWeeklyPlan/addComment',
+        url: '/app/appWeeklyPlan/addComment',
         data,
         header:{'Content-Type': 'application/json;charset=UTF-8'}
     })

src/api/eqf/qualityFeedback.js

@@ -1,151 +0,0 @@
-import request from '@/utils/request'
-
-// 查询外部质量反馈列表
-export function listFeedback(data) {
-  return request.get({
-    url: '/crm/app/eqf/qualityFeedback/list',
-  }, {
-    isTransformResponse: false
-  });
-}
-
-// 查询电阻器类型
-export function listgetResistorTypeList(data) {
-  return request.get({
-    url: '/crm/app/eqf/qualityFeedback/listgetResistorTypeList',
-  }, {
-    isTransformResponse: false
-  });
-}
-
-// 查询产品大类
-export function listgetProductCategoriesList(data) {
-  return request.get({
-    url: '/crm/app/eqf/qualityFeedback/listgetProductCategoriesList',
-  }, {
-    isTransformResponse: false
-  });
-}
-
-// 查询产品分类
-export function listgetClassificationList(data) {
-  return request.get({
-    url: '/crm/app/eqf/qualityFeedback/listgetClassificationList',
-  }, {
-    isTransformResponse: false
-  });
-}
-
-// 查询问题现象
-export function listgetProblemPhenomenonList(data) {
-  return request.get({
-    url: '/crm/app/eqf/qualityFeedback/listgetProblemPhenomenonList',
-  }, {
-    isTransformResponse: false
-  });
-}
-
-// 查询问题发生阶段
-export function listgetProblemStageList(data) {
-  return request.get({
-    url: '/crm/app/eqf/qualityFeedback/listgetProblemStageList',
-  }, {
-    isTransformResponse: false
-  });
-}
-
-// 查询用户诉求标签
-export function listgetCustomerAppealLabelList(data) {
-  return request.get({
-    url: '/crm/app/eqf/qualityFeedback/listgetCustomerAppealLabelList',
-  }, {
-    isTransformResponse: false
-  });
-}
-
-// 新增外部质量反馈
-export function qualityFeedbackAdd(data) {
-  return request.post({
-    url: '/crm/app/eqf/qualityFeedback/qualityFeedbackAdd',
-    data
-  }, {
-    isTransformResponse: false
-  });
-}
-
-
-
-// 查询电阻器的批号
-export function getMockBatchData(data) {
-  return request.get({
-    url: '/crm/app/eqf/qualityFeedback/getMockBatchData',
-    data
-  }, {
-    isTransformResponse: false
-  });
-}
-
-
-
-// 新增外部质量反馈明细
-export function qualityFeedbackDetailAdd(data) {
-  return request.post({
-    url: '/crm/app/eqf/qualityFeedback/qualityFeedbackDetailAdd',
-    data
-  }, {
-    isTransformResponse: false
-  });
-}
-
-//根据合同号查询
-export function getCustomerOrderList(data) {
-  return request.post({
-    url: '/crm/app/eqf/qualityFeedback/getCustomerOrderList',
-    data
-  }, {
-    isTransformResponse: false
-  });
-}
-
-
-
-//根据管壳合同号查询
-export function getGkCustomerOrderList(data) {
-  return request.post({
-    url: '/crm/app/eqf/qualityFeedback/getGkCustomerOrderList',
-    data
-  }, {
-    isTransformResponse: false
-  });
-}
-
-
-// 新增外部质量反馈管壳明细
-export function qualityFeedbackGkDetailAdd(data) {
-  return request.post({
-    url: '/crm/app/eqf/qualityFeedback/qualityFeedbackGkDetailAdd',
-    data
-  }, {
-    isTransformResponse: false
-  });
-}
-
-// 删除外部质量反馈
-export function removeQualityFeedback(data) {
-  return request.post({
-    url: '/crm/app/eqf/qualityFeedback/removeQualityFeedback',
-    data
-  }, {
-    isTransformResponse: false
-  });
-}
-
-// 更新外部质量反馈状态
-export function updateStatus(data) {
-  return request.post({
-    url: '/crm/app/eqf/qualityFeedback/updateStatus',
-    data
-  }, {
-    isTransformResponse: false
-  });
-}

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/api/polling.js

@@ -1,128 +0,0 @@
-import request from "@/utils/request"
-
-// 按日查询任务表列表
-export function taskList(data) {
-    return request.post({
-        url: '/patrol/patroltask/list',
-        data
-    })
-}
-
-// 按月查询任务表列表
-export function taskListMonth(data) {
-    return request.post({
-        url: '/patrol/patroltask/listm',
-        data
-    })
-}
-
-// 按条件搜索任务列表
-export function taskLists(data) {
-    return request.post({
-        url: '/patrol/patroltask/lists',
-        data
-    })
-}
-
-// 查询任务详情
-export function taskDetail(data) {
-    return request.post({
-        url: '/patrol/patroltask/detail',
-        data
-    })
-}
-
-// 批量提交检查点的结果
-export function submitResult(data) {
-    return request.post({
-        url: '/patrol/patroltask/submitresult',
-        data
-    })
-}
-
-// 提交任务
-export function submitTask(data) {
-    return request.post({
-        url: '/patrol/patroltask/submittask',
-        data
-    })
-}
-
-// 查询任务检查项详情
-export function taskGroupDetail(data) {
-    return request.post({
-        url: '/patrol/patroltask/taskgroup',
-        data
-    })
-}
-
-// 异常上报表管理
-export function problemDetail(data) {
-    return request.post({
-        url: '/patrol/patrolproblem/detail',
-        data
-    })
-}
-
-// 查询异常上报表列表
-export function problemList(data) {
-    return request.post({
-        url: '/patrol/patrolproblem/list',
-        data
-    })
-}
-
-// 添加问题上报
-export function problemAdd(data) {
-    return request.post({
-        url: '/patrol/patrolproblem/addproblem',
-        data
-    })
-}
-// 编辑问题
-export function problemEdit(data) {
-    return request.post({
-        url: '/patrol/patrolproblem/editproblem',
-        data
-    })
-}
-// 删除问题
-export function problemDel(data) {
-    return request.post({
-        url: '/patrol/patrolproblem/delproblem',
-        data
-    })
-}
-// 添加追踪记录
-export function problemAddLog(data) {
-    return request.post({
-        url: '/patrol/patrolproblem/addproblemlog',
-        data
-    })
-}
-
-// 图片上传
-export function minioUpload(data) {
-    return request.uploadFile({
-        url: '/patrol/minio/upload',
-        ...data
-    })
-}
-// 获取minio参数
-export function minioParam(data) {
-    return request.post({
-        url: '/patrol/minio/param',
-        data
-    })
-}
-
-// 待检查的任务数量
-export function querytodaytasknum(data) {
-    return request.post({
-        url: '/patrol/patroltask/querytodaytasknum',
-        data
-    })
-}
-
-
-

src/components/NFCTemplate.vue

@@ -1,325 +0,0 @@
-<template>
-  <view class="nfc-con">
-    <view class="nfc-bg">
-        <view class="nfc-title">
-            <uni-icons type="closeempty" size="20" class="nfc-close"  @click="handleClose"></uni-icons>NFC识别
-        </view>
-        <block v-if="formData.deviceId==''">
-            <view class="nfc-pic">
-                <img  class="nfc-pic-animal" :src="'static/images/polling/nfc-logo.png'" />
-            </view>
-            <view class="nfc-desc">请将设备靠近NFC识别</view>
-        </block>
-
-        <!-- 识别成功 -->
-        <view class="result-section" v-else>
-            <block v-if="readStatus">
-                <view class="result-header">
-                    <img class="result-img" :src="'static/images/polling/icon-success.png'" />
-                    <view class="result-label">识别成功</view>
-                </view>
-                <view class="result-value">
-                    <view>识别时间</view>
-                    <view>{{parseTime(new Date().getTime(),'{y}年{m}月{d}日 星期{a} {h}:{i}')}}</view>
-                </view>
-                <view class="btn-blue" @click="handleClose">确定</view>
-            </block>
-            <block v-else>
-                <view class="result-header">
-                    <img class="result-img" :src="'static/images/polling/icon-Alert.png'" />
-                    <view class="result-label result-err">识别失败</view>
-                </view>
-                <view class="result-value">
-                    可能的失败原因：手机距离NFC设备较远、手机未联网、NFC设备故障……
-                </view>
-                <view class="btn-blue" @click="open">重新识别</view>
-            </block>
-        </view>
-    </view>
-</view>
-</template>
- 
-<script setup>
-import { ref, onBeforeUnmount,onMounted } from "vue";
-import { parseTime } from '@/utils/datetime.js';
-
-// 定义组件 emits
-const emit = defineEmits(['close',"changeNfc"]);
-
-// 状态管理
-const formData = ref({
-  deviceId: "", //录入的id
-});
-const readStatus=ref(false);//读取状态 true 成功
-
-// 变量初始化
-let NfcAdapter = null;
-let MifareClassic = null;
-let isListening = false;
-
-// 检查NFC状态
-function open() {
-  try {
-    const main = plus.android.runtimeMainActivity();
-    NfcAdapter = plus.android.importClass("android.nfc.NfcAdapter");
-    const nfcAdapter = NfcAdapter.getDefaultAdapter(main);
-
-    if (!nfcAdapter) {
-      uni.showToast({
-        icon: "error",
-        title: "该设备不支持NFC",
-        duration: 5000,
-      });
-      return;
-    }
-
-    if (!nfcAdapter.isEnabled()) {
-      uni.showToast({
-        icon: "error",
-        title: "NFC功能未打开",
-        duration: 5000,
-      });
-      return;
-    }
-
-    initNFC();
-  } catch (e) {
-    console.error("打开NFC失败:", e);
-    uni.showToast({
-      icon: "error",
-      title: "初始化NFC失败",
-    });
-  }
-}
-
-// 初始化NFC监听
-function initNFC() {
-  try {
-    const main = plus.android.runtimeMainActivity();
-    const Intent = plus.android.importClass("android.content.Intent");
-    const Activity = plus.android.importClass("android.app.Activity");
-    const PendingIntent = plus.android.importClass("android.app.PendingIntent");
-    const IntentFilter = plus.android.importClass(
-      "android.content.IntentFilter"
-    );
-
-    // 导入需要的NFC类
-    plus.android.importClass("android.nfc.NdefRecord");
-    plus.android.importClass("android.nfc.NdefMessage");
-    MifareClassic = plus.android.importClass("android.nfc.tech.MifareClassic");
-    NfcAdapter = plus.android.importClass("android.nfc.NfcAdapter");
-
-    const nfcAdapter = NfcAdapter.getDefaultAdapter(main);
-    if (!nfcAdapter || !nfcAdapter.isEnabled()) return;
-
-    // 创建Intent过滤器
-    const ndef = new IntentFilter("android.nfc.action.NDEF_DISCOVERED");
-    const tag = new IntentFilter("android.nfc.action.TAG_DISCOVERED");
-    const tech = new IntentFilter("android.nfc.action.TECH_DISCOVERED");
-
-    const intentFiltersArray = [ndef, tag, tech];
-
-    // 技术列表
-    const techListsArray = [
-      ["android.nfc.tech.Ndef"],
-      ["android.nfc.tech.IsoDep"],
-      ["android.nfc.tech.NfcA"],
-      ["android.nfc.tech.NfcB"],
-      ["android.nfc.tech.NfcF"],
-      ["android.nfc.tech.Nfcf"],
-      ["android.nfc.tech.Nfef"],
-      ["android.nfc.tech.Ndef"],
-      ["android.nfc.tech.NfcV"],
-      ["android.nfc.tech.NdefFormatable"],
-      ["android.nfc.tech.MifareClassi"],
-      ["android.nfc.tech.MifareUltralight"],
-    ];
-
-    // 创建PendingIntent
-    const _intent = new Intent(main, main.getClass());
-    _intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-    const pendingIntent = PendingIntent.getActivity(main, 0, _intent, 0);
-    // 监听NFC事件
-    startNFCListener();
-
-    // 启用前台调度
-    nfcAdapter.enableForegroundDispatch(
-      main,
-      pendingIntent,
-      intentFiltersArray,
-      techListsArray
-    );
-  } catch (e) {
-    console.error("初始化NFC失败:", e);
-  }
-}
-
-// 开始NFC监听
-function startNFCListener() {
-  if (isListening) return;
-
-  plus.globalEvent.addEventListener("newintent", handleNewIntent);
-  isListening = true;
-}
-
-// 停止NFC监听
-function stopNFCListener() {
-  if (isListening) {
-    plus.globalEvent.removeEventListener("newintent", handleNewIntent);
-    isListening = false;
-  }
-}
-
-// 处理新的NFC意图
-function handleNewIntent() {
-  readNFCData();
-  stopNFCListener();
-}
-
-// 读取NFC数据
-function readNFCData() {
-  try {
-    const main = plus.android.runtimeMainActivity();
-    const _intent = main.getIntent();
-    // 只处理 NDEF 数据
-    let rawMsgs = _intent.getParcelableArrayExtra(
-      "android.nfc.extra.NDEF_MESSAGES"
-    );
-    if (rawMsgs && rawMsgs.length > 0) {
-      try {
-        const records = rawMsgs[0].getRecords();
-        const result = records[0].getPayload();
-        // 取 deviceId
-        function bytesToString(result) {
-          return String.fromCharCode(...result);
-        }
-        formData.value.deviceId = bytesToString(result).substring(3);
-        emit("changeNfc", formData.value.deviceId);
-        readStatus.value=true;
-      } catch (e) {
-        console.log("读取NDEF数据错误:", e);
-        uni.showToast({ title: "读取数据失败,请重新读取", icon: "none" });
-      }
-    } else {
-      uni.showToast({ title: "未识别到NFC标签", icon: "none" });
-    }
-  } catch (e) {
-    console.error("读取NFC数据失败:", e);
-    uni.showToast({ title: "读取数据失败,请重新读取", icon: "none" });
-  }
-}
-
-const handleClose = ()=>{
-	emit('close');
-}
-
-onMounted(() => {
-  open();
-});
-
-// 组件卸载前清理
-onBeforeUnmount(() => {
-  stopNFCListener();
-});
-
-
-defineExpose({
-  open
-});
-</script>
-
-<style lang="scss" scoped>
-.nfc-con {
-	position: fixed;
-	top: 0;
-	right: 0;
-	bottom: 0;
-	left: 0;
-	background: rgba(0, 0, 0, 0.4);
-	z-index: 9999;
-}
-.nfc-con .nfc-bg{
-    position:absolute;
-    bottom:0;
-    left:0;
-    background-color:#fff;
-    border-radius:18rpx 18rpx  0 0;
-    text-align:center;
-    width:650rpx;
-    padding:30rpx 50rpx 130rpx;
-}
-.nfc-bg .nfc-title{
-    text-align:center;
-    color:#333333;
-    font-size:32rpx;
-    font-weight:bold;
-    position:relative;
-}
-.nfc-bg .nfc-title .nfc-close{
-    position:absolute;
-    top:0rpx;
-    left:-20rpx
-}
-.nfc-con .nfc-bg .nfc-pic{
-    padding:126rpx 0 86rpx;
-}
-.nfc-con .nfc-bg .nfc-pic img{
-    width:260rpx;
-    height:208rpx;
-    
-}
-.nfc-con .nfc-bg .nfc-desc{
-    text-align:center;
-    color:#0395E0;
-    font-size:36rpx;
-    font-weight:bold;
-}
-
-.nfc-pic-animal{
-    animation: elasticLoop 3s ease-in-out infinite;
-}
-@keyframes elasticLoop {
-    0%, 100% { transform: scale(1); }
-    25% { transform: scale(1.2); }
-    50% { transform: scale(0.95); }
-    75% { transform: scale(1.1); }
-}
-
-
-.result-section{
-    .result-header{
-        padding:70rpx 0 0; 
-        .result-img{
-            width:120rpx;
-            height:120rpx;
-        }
-        .result-label,.result-err{
-            text-align:center;
-            color:#00BF5A;
-            font-size:36rpx;
-            font-weight:bold;
-            padding:20rpx 0;
-        }
-        .result-err{
-            color:#FF9638;
-        }
-    }
-    .result-value{
-        color:#333;
-        text-align:center;
-        font-size:30rpx;
-        margin-top:20rpx;
-    }
-    .btn-blue{
-        background-color:#05A3F4;
-        border-radius:40rpx;
-        width:380rpx;
-        height:80rpx;
-        line-height:80rpx;
-        text-align:center;
-        color:#fff;
-        font-size:36rpx;
-        margin:50rpx auto 0;
-    }
-}
-</style>

src/components/calenderMonth.vue

@@ -1,235 +0,0 @@
-<template>
-  <view class="month-calendar">
-    <view class="header">
-      <view class="arrow" @click="prevYear">‹‹</view>
-      <view class="year">
-        <picker @change="changeYear" :value="yearIndex" :range="yearList">
-					<view class="uni-input">{{yearList[yearIndex]}}</view>
-				</picker>
-      </view>
-      <view class="arrow" @click="nextYear">››</view>
-    </view>
-
-    <view class="month-grid">
-      <view
-        v-for="month in months"
-        :key="month.number"
-        class="month-item"
-        :class="{ active: isActive(month.number) }"
-        @click="selectMonth(month.number)"
-      >
-        <view class="month-number">{{ month.number }}</view>
-        <view class="month-english">{{ month.english }}</view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script setup>
-import { ref, computed } from "vue";
-
-const props = defineProps({
-    year: {//默认当前年
-      default: new Date().getFullYear()
-    },
-    month:{//默认1月
-      default:1
-    }
-})
-
-// 年份列表
-const yearIndex = ref(100);
-const yearList = computed(() => {
-  let date = new Date();
-  let y = date.getFullYear();
-  let arr = [];
-  // 往前100年 往后61年
-  let j = 0;
-  for (let i = 0; i < 100; i++) {
-    let a = (y-100)+i;
-    arr.push(a);
-    j++;
-  }
-  
-  for (let i = 0; i < 62; i++) {
-    let a = y+i
-    arr.push(a);
-  }
-  yearIndex.value = j;
-  // console.log(arr,yearIndex.value)
-  return arr;
-});
-
-
-const currentYear = ref(props.year);
-const selectedMonth = ref(props.month);
-
-// 月份英文处理
-const months = ref([
-  { number: 1, english: "Jan" },
-  { number: 2, english: "Feb" },
-  { number: 3, english: "Mar" },
-  { number: 4, english: "Apr" },
-  { number: 5, english: "May" },
-  { number: 6, english: "Jun" },
-  { number: 7, english: "Jul" },
-  { number: 8, english: "Aug" },
-  { number: 9, english: "Sep" },
-  { number: 10, english: "Oct" },
-  { number: 11, english: "Nov" },
-  { number: 12, english: "Dec" },
-]);
-
-const isActive = (monthNumber) => {
-  return selectedMonth.value === monthNumber;
-}
-
-// 调用父组件方法
-const emit = defineEmits(["change"]);
-
-// 月份切换
-const selectMonth = (monthNumber) => {
-  selectedMonth.value = monthNumber;
-  // console.log(`选择: ${currentYear.value}年${monthNumber}月`);
-  let m = monthNumber<10?'0'+monthNumber:monthNumber
-  // { year: currentYear.value, month: m }
-  // 触发事件
-  emit('change',  {year:currentYear.value,month:monthNumber,ymStr:currentYear.value+'-'+m});
-}
-
-// 上一年
-const prevYear = () => {
-  currentYear.value--;
-  yearIndex.value--;
-  getCurrentMonth();
-}
-
-// 下一年
-const nextYear = () => {
-  currentYear.value++;
-  yearIndex.value++;
-  getCurrentMonth();
-}
-
-// 年份切换
-const changeYear=(e)=>{
-  // console.log("年份切换=>",e)
-  yearIndex.value = e.detail.value;
-  currentYear.value = yearList.value[yearIndex.value];
-  getCurrentMonth();
-}
-
-// 获取当前月份
-const getCurrentMonth = ()=>{
-  let date = new Date();
-  let year = date.getFullYear();
-  selectedMonth.value = 1;
-  if(year == currentYear.value){
-    selectedMonth.value = date.getMonth()+1;
-  }
-}
-
-</script>
-
-<style scoped>
-.month-calendar {
-  padding:0 20rpx;
-  background: #fff;
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding:0rpx 0 16rpx;
-  /* #ifdef APP-PLUS */
-  padding:20rpx 0;
-  /* #endif */
-  margin-bottom: 30rpx;
-  border-bottom:1px solid #E7E7E7;
-}
-
-.year {
-  font-size: 34rpx;
-  font-weight: bold;
-  color: #333;
-}
-
-.arrow {
-  font-size: 60rpx;
-  color: #CACACA;
-  padding: 0;
-  cursor: pointer;
-}
-
-.arrow:active {
-  color: #4A95FF;
-}
-
-.month-grid {
-  /* display: grid;
-  grid-template-columns: repeat(4, 1fr);
-  gap: 20rpx; */
-  display: flex;
-  flex-flow:row wrap;
-}
-
-.month-item {
-  border-radius: 16rpx;
-  /* transition: all 0.3s ease; */
-  border: 1px solid #05A3F4;
-  background-color:#EAF8FF;
-  padding:0rpx 0 0;
-  /* #ifdef APP-PLUS */
-  padding:20rpx 0 0;
-  /* #endif */
-  width: calc(100% / 4 - 12px); /* 减去一些间隙以避免溢出 */
-  margin: 9rpx; /* 可选，用于添加间距 */
-}
-
-.month-item.active {
-  background: #FFF4EA;
-  border-color: #FF9638;
-  /* transform: scale(1.05); */
-}
-
-.month-item:active {
-  /* transform: scale(0.95); */
-}
-
-.month-number{
-  color:#05A3F4;
-  font-size:60rpx;
-  font-weight: bold;
-  margin-bottom: 10rpx;
-  text-align: center;
-  position: relative;
-}
-.month-number::after{
-  position: absolute;
-  content: "月";
-  right:5rpx;
-  bottom:15rpx;
-  color:#05A3F4;
-  font-size:22rpx;
-  font-weight: normal;
-}
-
-.month-english{
-  font-size: 26rpx;
-  color: #fff;
-  font-weight: bold;
-  background-color: #05A3F4;
-  border-radius: 0 0 14rpx 14rpx;
-  text-align: center;
-}
-
-.month-item.active .month-number,
-.month-item.active .month-number::after{
-  color:#FF9638;
-}
-
-.month-item.active .month-english{
-  background-color: #FF9638;
-}
-</style>

src/components/calenderMonthSimple.vue

@@ -1,161 +0,0 @@
-<template>
-  <view class="month-calendar">
-    <view class="header">
-      <view class="arrow" @click="prevYearMonth">‹‹</view>
-      <view class="year">
-        <picker mode="multiSelector" :value="dateIndex" 
-          :range="dateRange" @change="handleChange" 
-          @columnchange="onColumnChange"
-        >
-					<view class="uni-input">{{selectedYear}}-{{ selectedMonth.toString().padStart(2, '0') }}</view>
-				</picker>
-      </view>
-      <view class="arrow" @click="nextYearMonth">››</view>
-    </view>
-  </view>
-</template>
-
-<script setup>
-import { ref, computed,onMounted,reactive } from "vue";
-
-const props = defineProps({
-    year: {//默认当前年
-      default: new Date().getFullYear()
-    },
-    month:{//默认1月
-      default:1
-    }
-})
-
-// 年份列表
-// const yearIndex = ref(100);
-const selectedYear = ref(props.year);
-const selectedMonth = ref(props.month);
-
-const dateIndex = ref([0, 0])
-const dateRange = ref([[],[]])
-
-// 初始化数据
-onMounted(() => {
-  let date = new Date();
-  let y = date.getFullYear();
-  // 往前100年 往后61年
-  let j = 0;
-  for (let i = 0; i < 100; i++) {
-    let a = (y-100)+i;
-    dateRange.value[0].push(a);
-    j++;
-  }
-  
-  for (let i = 0; i < 62; i++) {
-    let a = y+i
-    dateRange.value[0].push(a);
-  }
-  
-  // 生成月份
-  for (let i = 1; i <= 12; i++) {
-    dateRange.value[1].push(i)// + '月'
-  }
-  
-  // 设置默认选中
-  // const yearIndex = dateRange.years.findIndex(item => item === selectedYear.value)
-  const monthIndex = dateRange.value[1].findIndex(item => item === selectedMonth.value)
-  dateIndex.value = [j, monthIndex]
-  // console.log(dateRange.value[0],dateRange.value[1],dateIndex.value)
-})
-
-
-// 调用父组件方法
-const emit = defineEmits(["change"]);
-
-// 计算月份
-const getYearMonth=(type)=>{
-  let y= selectedYear.value;
-  let m = selectedMonth.value;
-  let current_date = new Date(y+'-'+m)
-  let month=type==1? current_date.getMonth()-1:current_date.getMonth()+1;//上个月or下个月
-  current_date.setMonth(month);
-  selectedYear.value = current_date.getFullYear();
-  selectedMonth.value = current_date.getMonth()+1;
-
-  const yearIndex = dateRange.value[0].findIndex(item => item === selectedYear.value)
-  const monthIndex = dateRange.value[1].findIndex(item => item === selectedMonth.value)
-  dateIndex.value = [yearIndex, monthIndex]
-
-  let m2 = selectedMonth.value.toString().padStart(2, '0')
-  emit('change', {year:selectedYear.value,month:selectedMonth.value,ymStr:selectedYear.value+'-'+m2});
-}
-
-// 上个月
-const prevYearMonth = () => {
-  getYearMonth(1)
-}
-
-// 下个月
-const nextYearMonth = () => {
-  getYearMonth(2)
-}
-
-// 列选择
-const onColumnChange = (e) => {
-  const { column, value } = e.detail;
-  // console.log(column,value)
-  if (column === 0) { // 年份列
-    dateIndex.value[0] = column
-    selectedYear.value = dateRange.value[column][value]
-  } else if (column === 1) { // 月份列
-    dateIndex.value[1] = column
-    selectedMonth.value = dateRange.value[column][value]
-  }
-}
-
-// 年月选择
-const handleChange=(e)=>{
-  const values = e.detail.value 
-  selectedYear.value = parseInt(dateRange.value[0][values[0]])
-  selectedMonth.value = parseInt(dateRange.value[1][values[1]])
-  // console.log('选择的日期:', `${selectedYear.value}-${selectedMonth.value.toString().padStart(2, '0')}`)
-  let m = selectedMonth.value.toString().padStart(2, '0')
-  emit('change',  {year:selectedYear.value,month:selectedMonth.value,ymStr:selectedYear.value+'-'+m});
-}
-
-// 获取
-const getNextMonth = (current_date)=>{
-  current_date.setMonth(current_date.getMonth() + 1);
-}
-
-</script>
-
-<style scoped>
-.month-calendar {
-  padding:0 20rpx;
-  background: #fff;
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding:0rpx 0 16rpx;
-  /* #ifdef APP-PLUS */
-  padding:20rpx 0;
-  /* #endif */
-}
-
-.year {
-  font-size: 34rpx;
-  font-weight: bold;
-  color: #333;
-}
-
-.arrow {
-  font-size: 60rpx;
-  color: #CACACA;
-  padding: 0;
-  cursor: pointer;
-}
-
-.arrow:active {
-  color: #4A95FF;
-}
-</style>

src/components/chooseMedia.vue

@@ -1,221 +0,0 @@
-<template>
-<!-- 自定义底部弹窗选择器 -->
-<view class="picker-model" v-if="showPicker">
-    <view class="picker-content">
-        <view class="picker-item" @click="takePhoto">
-            <text>拍照</text>
-        </view>
-        <view class="picker-item" @click="choosePhoto">
-            <text>选择照片</text>
-        </view>
-        <view class="picker-item" @click="takeVideo">
-            <text>拍摄视频</text>
-        </view>
-        <view class="picker-item" @click="chooseVideoFromAlbum">
-            <text>选择视频</text>
-        </view>
-        <view class="picker-item" @click="closePicker">
-            <text>取消</text>
-        </view>
-    </view>
-</view>
-</template>
-
-<script setup>
-import { ref, watch } from "vue";
-import {compressImageUni} from '@/utils/common.js'
-import { minioUpload } from '@/api/polling.js'
-
-let showPicker = ref(false);
-const openPicker = () => {
-    showPicker.value = true;
-}
-const closePicker = () => {
-    showPicker.value = false;
-    emit("closeMedia")
-}
-
-const takePhoto = () => {
-    captureMedia("image", "camera");
-}
-
-const choosePhoto = () => {
-    captureMedia("image", "album");
-}
-
-const takeVideo = () => {
-    captureMedia("video", "camera");
-}
-
-const chooseVideoFromAlbum = () => {
-    captureMedia("video", "album");
-}
-
-const captureMedia = async (type, source) => {
-    showPicker.value = false;
-    try {
-        if (type === "image") {
-            const res = await uni.chooseImage({
-                count: 1,
-                sourceType: [source],
-            });
-            processMedia(res.tempFilePaths, "image", source);
-        } else {
-            const res = await uni.chooseVideo({
-                sourceType: [source],
-                // sourceType: ['album', 'camera'], // 来源：相册和相机
-                maxDuration: 60, // 最大时长（秒）
-                camera: 'back', // 使用后置摄像头
-                compressed: true, // 压缩视频
-            });
-            processMedia([res.tempFilePath], "video", source);
-        }
-    } catch (error) {
-        emit("closeMedia")
-    }
-}
-
-// 调用父组件的方法
-const emit = defineEmits(['getMediaArr','closeMedia']);
-
-// 执行压缩并上传
-const processMedia = async(files, type, source) => {
-    let returnArr = [];
-    let res = files.map(async file=>{
-        return new Promise(async(resolve, reject) => {
-            try {
-                const info = {
-                    path: file,
-                    type: type,
-                    source: source,
-                    timestamp: Date.now(),
-                }
-                // #ifdef APP-PLUS
-                // 进行压缩图片
-                if(type=="image"){
-                    info.path = await compressImageUni(file);
-                }
-                // #endif
-
-                // 保存选择记录
-                let data = await saveSelectionRecord(info);
-                returnArr.push({
-                    fileName:data.fileName,
-                    fileType:type
-                })
-                resolve(returnArr)
-            } catch (error) {
-                reject(error)
-            }
-        });
-    })
-
-    await Promise.all(res);
-    // console.log("returnArr=>",returnArr)
-
-    showPicker.value = false;
-    emit('getMediaArr',returnArr);
-
-    // 根据来源做不同处理
-    // if (source === "camera") {
-    //     handleCameraMedia(info);
-    // } else {
-    //     handleAlbumMedia(info);
-    // }
-}
-
-// 保存到云
-const saveSelectionRecord = (info) => {
-    return new Promise(async (resolve, reject) => {
-        try {
-            // 执行上传
-            let param = {
-                filePath:  info.path,
-                name: 'file',
-                formData: {
-                    directory:'polling'
-                },
-            }
-            let res = await minioUpload(param);
-            resolve(res.data);
-        } catch (error) {
-            resolve(error);
-        }
-        // 保存到本地存储
-        // const records = uni.getStorageSync("mediaRecords") || [];
-        // records.unshift(info);
-        // uni.setStorageSync("mediaRecords", records.slice(0, 10)); // 只保留最近10条
-    })
-}
-
-const handleCameraMedia = (info) => {
-    // 从相机拍摄的媒体文件处理
-    if (info.type === "image") {
-        // 相机拍摄的照片可能有地理位置信息
-        extractImageMetadata(info.path);
-    } else {
-        // 相机拍摄的视频
-        uni.showToast({
-            title: "已保存拍摄的视频",
-            icon: "success",
-        });
-    }
-}
-
-const handleAlbumMedia = (info) => {
-    // 从相册选择的媒体文件处理
-    console.log("从相册选择:", info);
-}
-
-const extractImageMetadata = (filePath) => {
-    // 获取图片元数据（部分平台支持）
-    uni.getImageInfo({
-        src: filePath,
-        success: (res) => {
-            console.log("图片元数据:", res);
-        },
-    });
-}
-
-// 暴露方法给父组件
-defineExpose({
-    openPicker
-});
-</script>
-
-<style lang="scss" scoped>
-.picker-model{
-    position: fixed;
-	top: 0;
-	right: 0;
-	bottom: 0;
-	left: 0;
-	background: rgba(0, 0, 0, 0.4);
-	z-index: 9999;
-    .picker-content{
-        width:100%;
-        position: absolute;
-        bottom:0;
-        left:0;
-        background-color: #fff;
-        border-radius: 10rpx 10rpx 0 0;
-        .picker-item{
-            border-bottom:1px solid #E7E7E7;
-            text-align: center;
-            height:90rpx;
-            line-height: 90rpx;
-            // #ifdef APP-PLUS
-            height:120rpx;
-            line-height: 120rpx;
-            // #endif
-            &:last-child{
-                border-bottom: none;
-            }
-            text{
-                text-align: center;
-            }
-        }
-    }
-}
-
-</style>

src/components/circleTemplate.vue

@@ -1,55 +0,0 @@
-<template>
-    <view :style="{
-          width: size + 'rpx',
-          height: size + 'rpx',
-          '--offset': offset
-        }"
-        v-html="svgHtml"
-        ref="svgRef"
-    >
-    </view>
-    <!-- <svg viewBox="0 0 100 100">
-        <circle cx="50" cy="50" r="40" stroke="#7C7C7C" stroke-width="7" fill="none" />
-        <circle cx="50" cy="50" r="40" stroke="#10F6FC" stroke-width="7" fill="none" stroke-dasharray="251.2" stroke-dashoffset="251.2" class="progress-bar"/>
-    </svg> -->
-</template>
-
-<script setup>
-import { ref, computed, watch } from "vue";
-
-const props = defineProps({
-  size: {
-    type: Number,
-    default: 280,
-  },
-  color: {
-    type: String,
-    default: "#333333",
-  },
-  progress:{}
-});
-
-const svgRef = ref(null)
-const offset = ref(251.2);
-const svgHtml = ref(`<svg viewBox="0 0 100 100">
-      <circle cx="50" cy="50" r="40" stroke="#7C7C7C" stroke-width="7" fill="none" />
-      <circle cx="50" cy="50" r="40" stroke="#10F6FC" stroke-width="7" fill="none" stroke-dasharray="251.2" stroke-dashoffset="${offset.value}"/>
-  </svg>`);
-
-watch(() => props.progress, (newVal, oldVal) => {
-  updateProgress(newVal)
-},{deep:true});
-
-// 更新进度函数
-const updateProgress=(newProgress)=>{
-  offset.value = 251.2 - (251.2 * newProgress) / 100;
-  svgHtml.value = `<svg viewBox="0 0 100 100">
-      <circle cx="50" cy="50" r="40" stroke="#7C7C7C" stroke-width="7" fill="none" />
-      <circle cx="50" cy="50" r="40" stroke="#10F6FC" stroke-width="7" fill="none" stroke-dasharray="251.2" stroke-dashoffset="${offset.value}"/>
-  </svg>`
-}
-</script>
-
-<style scoped>
-
-</style>

src/components/closeableModal.vue

@@ -1,176 +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, 'align-center': contentAlign==='center'}">
-        <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
-  },
-  contentAlign: {
-    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;
-    }
-  }
-
-  .align-center{
-    text-align: center;
-  }
-
-  .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

@@ -7,9 +7,7 @@
         </view>
 
         <!-- 中间标题 -->
-        <view class="navbar-title">{{ title }}
+        <view class="navbar-title">{{ title }}</view>
-            <slot name="title"></slot>
-        </view>
 
         <!-- 右侧内容 -->
         <view class="navbar-right" v-if="rightFlag">
@@ -53,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">取消</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/mediaPreview.vue

@@ -1,123 +0,0 @@
-<template>
-  <!-- 放大后的遮罩层 -->
-  <view v-if="isEnlarged" class="image-preview-overlay">
-    <view class="image-preview-close"   @click="handleClose">
-      <uni-icons type="closeempty" size="18" color="#fff"></uni-icons>
-    </view>
-    <block v-if="getFileType(mediaUrl)=='image'">
-        <image 
-          :src="mediaUrl" 
-          mode="widthFix" 
-          class="enlarged-image" 
-        />
-    </block>
-    <view :class="videoClass"  v-else-if="getFileType(mediaUrl)=='video'">
-      <!--  object-fit="cover" -->
-      <!-- <video :src="mediaUrl" controls  @loadedmetadata="onVideoLoaded"></video> -->
-      <!-- 
-      src: '' // 视频地址
-      autoplay: false // 是否自动播放
-      loop: false // 是否循环播放
-      controls: false // 是否显示控制栏
-      muted: false // 是否静音
-      isLoading: false // Android系统加载时显示loading(为了遮挡安卓的黑色按钮)
-      objectFit: 'contain' // 视频尺寸与video区域的适应模式
-      poster: '' // 视频封面
-      -->
-      <DomVideoPlayer :src="mediaUrl" controls autoplay />
-    </view>
-  </view>
-</template>
-
-<script setup>
-import DomVideoPlayer from 'uniapp-video-player'
-import { ref,watch } from 'vue';
-import {getFileType} from '@/utils/common.js';
-const props = defineProps({
-	visible:{
-		type:Boolean
-	},
-  url:{}//图片路径
-})
-
-const isEnlarged = ref(props.visible);
-const mediaUrl = ref(props.url);
-// const mediaType = ref('');//类型
-// 显示隐藏
-watch(() => props.visible, (newVal, oldVal) => {
-  isEnlarged.value = newVal
-},{
-    deep:true, // 深度监听
-    immediate:true // 立即执行
-});
-
-watch(() => props.url, (newVal, oldVal) => {
-  mediaUrl.value = newVal;
-},{
-    deep:true,
-    immediate:true
-});
-const emit = defineEmits(['close'])
-const handleClose=()=>{
-  emit('close');
-}
-
-// 获取视频的宽和高
-let videoClass = ref('enlarged-image');
-const onVideoLoaded = (e) => {
-  // 通过事件对象获取原始宽高[citation:3]
-  let w = e.detail.width;
-  let h = e.detail.height;
-  // 你也可以在这里进行后续操作，比如根据宽高比调整UI
-  // console.log(w,h)
-  if(h>w){
-    videoClass.value="enlarged-image"
-  }else{
-    videoClass.value="enlarged-image"
-  }
-};
-
-</script>
-
-<style scoped>
-.image-preview-overlay {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  background-color: rgba(0, 0, 0, 0.9);
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  z-index: 10000;
-}
-.image-preview-overlay .image-preview-close{
-  position: absolute;
-  width:50rpx;
-  height:50rpx;
-  line-height: 50rpx;
-  text-align: center;
-  border-radius: 50%;
-  right:20rpx;
-  top:20rpx;
-  /* #ifdef APP-PLUS */
-  top:44rpx;
-  /* #endif */
-  background-color: rgba(0, 0, 0, 0.5);
-  z-index: 1;
-}
-
-:deep(uni-video){
-  width:100%;
-}
-
-.enlarged-image {
-  width: 100%;
-  height: auto;
-}
-.enlarged-image2 {
-  width:auto;
-  height: 100vh;
-}
-</style>

src/components/multipleSelect.vue

@@ -10,7 +10,7 @@
             </view>
             <!-- 显示框 -->
             <view class="uni-select-multiple" v-show="realValue.length">
-                <block v-if="multiple">
+                <block v-if="multiple" >
                     <view class="uni-select-multiple-item" v-for="(item, index) in changevalue" :key="index">
                         {{ item[slabel] }}
                         <view class="close-icon" v-if="showValueClear">
@@ -43,7 +43,8 @@
 </template>
 
 <script setup>
-import { onMounted, reactive, ref, watch} from "vue";
+import { onMounted, reactive, ref } from "vue";
+
 const props = defineProps({
     // 是否显示全部清空按钮
     showClearIcon: {
@@ -107,8 +108,8 @@ const props = defineProps({
 });
 const emit = defineEmits(["change"]);
 const active = ref(false); // 组件是否激活，
-let changevalue = ref([]);
+let changevalue = reactive([]);
-let realValue = ref([]);
+let realValue = reactive([]);
 onMounted(() => {
     init();
 });
@@ -119,16 +120,16 @@ const init = () => {
         props.options.forEach((item) => {
             props.value.forEach((i) => {
                 if (item[props.svalue] === i) {
-                    changevalue.value.push(item);
+                    changevalue.push(item);
                 }
             })
         })
-        realValue.value = props.value;
+        realValue = props.value;
-        // console.log("props---", changevalue.value);
+        console.log("props---", changevalue);
 
     } else {
-        changevalue.value = [];
+        changevalue = [];
-        realValue.value = [];
+        realValue = [];
     }
 };
 // 点击展示选项
@@ -139,51 +140,41 @@ const handleSelect = () => {
 // 移除数据
 const handleRemove = (index) => {
     if (index === null) {
-        realValue.value = [];
+        realValue = [];
-        changevalue.value = [];
+        changevalue = [];
     } else {
-        realValue.value.splice(index, 1);
+        realValue.splice(index, 1);
-        changevalue.value.splice(index, 1);
+        changevalue.splice(index, 1);
     }
-    emit("change", changevalue.value, realValue.value);
+    emit("change", changevalue, realValue);
 };
 // 点击组件某一项
 const handleChange = (index, item) => {
-    // console.log("选中了某一项", index, item);
+    console.log("选中了某一项", index, item);
     // 如果是单选框，选中一项后直接关闭
     if (!props.multiple) {
         console.log("关闭下拉框");
-        changevalue.value.length = 0
+        changevalue.length = 0
         realValue.length = 0
-        changevalue.value.push(item);
+        changevalue.push(item);
-        realValue.value.push(item[props.svalue])
+        realValue.push(item[props.svalue])
         active.value = !active.value;
     } else {
         // 多选操作
-        const arrIndex = realValue.value.indexOf(item[props.svalue]);
+        const arrIndex = realValue.indexOf(item[props.svalue]);
         if (arrIndex > -1) {
             // 如果该选项已经选中，当点击后就不选中
-            changevalue.value.splice(arrIndex, 1);
+            changevalue.splice(arrIndex, 1);
-            realValue.value.splice(arrIndex, 1);
+            realValue.splice(arrIndex, 1);
         } else {
             // 否则选中该选项
-            changevalue.value.push(item);
+            changevalue.push(item);
-            realValue.value.push(item[props.svalue]);
+            realValue.push(item[props.svalue]);
         }
     }
     // 触发回调函数
-    emit("change", changevalue.value, realValue.value);
+    emit("change", changevalue, realValue);
 };
-
-// 失去焦点时关闭选项列表
-const handleBlur = () => {
-    active.value = false;
-};
-
-// 定义组件实例暴露的方法
-defineExpose({
-    handleBlur
-});
 </script>
 
 <style lang="scss" scoped>

src/components/pollingShowModal.vue

@@ -1,245 +0,0 @@
-<template>
-<view class="model" v-if="visibleF">
-	<view class="model-con">
-		<view class="model-top" v-if="title">{{title}}</view>
-		<view class="img-title" :class="{'m-height':!title}" v-if="!isGreen">
-			<img :src="'static/images/polling/icon-Alert.png'"/>
-		</view>
-		<view class="img-title" :class="{'m-height':!title}" v-else>
-			<img :src="'static/images/polling/icon-success.png'"/>
-		</view>
-		<view class="model-middle">
-			<view :class="{'font-green':true,'font-orange':!isGreen}">{{contents}}</view>
-			<view>{{subContents}}</view>
-			<view v-if="subTimes">{{parseTime(subTimes,'{y}年{m}月{d}日 星期{a} {h}:{i}')}}</view>
-		</view>
-		<view class="model-bottom">
-			<button type="default" class="btn-green" @click="handleConfirm" 
-				v-if="btnFlags" :loading="!isGreens?false:loading" 
-				:disabled="!isGreens?false:loading"
-			>{{btnTxts}}</button>
-			<button type="primary" class="btn-cancel" @click="handleCancel" v-if="btnFlags2">{{btnCancelTxts}}</button>
-		</view>
-	</view>
-</view>
-</template>
-
-<script setup>
-import { ref,watch } from 'vue'
-import { parseTime } from '@/utils/datetime.js';
-const props = defineProps({
-	visible:{
-		type:Boolean
-	},
-	title:{//标题
-		type: String,
-	},
-	content: {//显示的内容
-		type: String
-	},
-	subContent:{//确认内容
-		type:String,
-		default:'是否确认提交?'
-	},
-	subTime:{//提交的时间
-
-	},
-	btnFlag:{//提交按钮是否显示
-		type:Boolean,
-		default:true
-	},
-	btnFlag2:{//暂不提交按钮是否显示
-		type:Boolean,
-		default:true
-	},
-	btnTxt:{//提交按钮文字
-		type:String,
-		default:'提交'
-	},
-	btnCancelTxt:{//暂不提交按钮文字
-		type:String,
-		default:'暂不提交'
-	},
-	isGreen:{//是否显示绿色
-		type:Boolean,
-		default:false
-	}
-})
-
-let visibleF = ref(props.visible)
-let titles = ref(props.title)
-let contents = ref(props.content);
-let subContents = ref(props.subContent);
-let subTimes = ref(props.subTime);
-let btnFlags = ref(props.btnFlag);
-let btnFlags2 = ref(props.btnFlag2)
-let btnTxts = ref(props.btnTxt);
-let btnCancelTxts = ref(props.btnCancelTxt);
-let isGreens = ref(props.isGreen);
-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.value = newVal
-},{
-    deep:true,
-    immediate:true
-});
-
-watch(() => props.subContent, (newVal, oldVal) => {
-	subContents.value = newVal
-},{
-    deep:true,
-    immediate:true
-});
-watch(() => props.subTime, (newVal, oldVal) => {
-	subTimes.value = newVal
-},{
-    deep:true,
-    immediate:true
-});
-
-// 按钮
-watch(() => props.btnFlag, (newVal, oldVal) => {
-	btnFlags.value = newVal
-},{
-    deep:true,
-    immediate:true
-});
-
-// 按钮
-watch(() => props.btnFlag2, (newVal, oldVal) => {
-	btnFlags2.value = newVal
-},{
-    deep:true,
-    immediate:true
-});
-
-watch(() => props.btnTxt, (newVal, oldVal) => {
-	btnTxts.value = newVal
-},{
-    deep:true,
-    immediate:true
-});
-
-watch(() => props.btnCancelTxt, (newVal, oldVal) => {
-	btnCancelTxts.value = newVal
-},{
-    deep:true,
-    immediate:true
-});
-
-// 调用父组件的方法
-const emit = defineEmits(['close','confirm'])
-const handleCancel = ()=>{
-	emit('close');
-}
-
-const handleConfirm = ()=>{
-	if(isGreens.value){
-		loading.value=false;
-	}else{
-		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:40%;
-		left:50%;
-		// width:620rpx;
-		width:580rpx;
-		min-height: 278rpx;
-		margin-left:-310rpx;
-		margin-top:-139rpx;
-		border-radius: 24rpx;
-		padding:20rpx 20rpx 30rpx;
-	}
-	.model-top{
-		text-align: center;
-		padding:20rpx 0;
-		font-size:36rpx;
-	}
-	.img-title{
-		text-align: center;
-		img{
-			width:120rpx;
-			height: 120rpx;
-		}
-	}
-	.model-middle{
-		text-align: center;
-		font-size:30rpx;
-		color:#333333;
-		margin-bottom:10rpx;
-		.font-green{
-			color:#00BF5A;
-			font-size: 36rpx;
-			font-weight: bold;
-			padding:20rpx 0;
-		}
-		.font-orange{
-			color:#FF9638;
-			font-size: 36rpx;
-			font-weight: bold;
-			padding:0rpx 0 20rpx;
-		}
-	}
-	.m-height{
-		padding:40rpx 0 20rpx;
-	}
-	.model-bottom{
-		width:380rpx;
-		margin-top:40rpx;
-		margin:40rpx auto;
-		.btn-green,.btn-cancel{
-			background-color: #fff;
-			color:#05A3F4;
-			border-radius: 48rpx;
-			font-size:36rpx;
-			text-align: center;
-			line-height: 2.2;
-			margin:10rpx 0 0 0 !important;
-			&::after{
-				border:none;
-				border-radius: 37rpx;
-			}
-		}
-		.btn-green{
-			border: 1px solid #05A3F4;
-			background-color:#05A3F4;
-			color:#fff;
-			margin:0rpx 0 0 20rpx !important;
-		}
-	}
-}
-</style>

src/components/searchDate.vue

@@ -1,242 +0,0 @@
-<template>
-<view class="date-con" v-if="isShow">
-    <view class="date-bg">
-        <view class="date-title">
-            <uni-icons type="closeempty" size="20" @click="handleClose"></uni-icons>
-            <view class="choose-title">选择时间</view>
-            <view class="date-confirm" @click="handleConfirm">确定</view>
-        </view>
-        <!-- 最近多少天 '3days' | '7days' | '1month' | '3months'-->
-        <view class="range-list">
-            <view class="range-item" :class="{active:lastType=='3days'}" @click="handleChoose('3days')">近3天</view>
-            <view class="range-item" :class="{active:lastType=='7days'}" @click="handleChoose('7days')">近7天</view>
-            <view class="range-item" :class="{active:lastType=='1month'}" @click="handleChoose('1month')">近1月</view>
-            <view class="range-item" :class="{active:lastType=='3months'}" @click="handleChoose('3months')">近3月</view>
-        </view>
-        <!-- 时间段 -->
-        <view class="range-to">
-            <view class="to-bg" :class="{blue:dateType==1}" @click="handleChooseDate(1,beginDate)">{{beginDate}}</view>
-            <view class="to">至</view>
-            <view class="to-bg" :class="{blue:dateType==2}" @click="handleChooseDate(2,endDate)">{{endDate}}</view>
-        </view>
-        <!-- 时间选择 -->
-        <picker-view class="picker-view" v-if="pickerVisible" :indicator-style="indicatorStyle" 
-            :value="dateValueArr" @change="bindChange"
-        >
-            <picker-view-column>
-                <view class="item" v-for="(item,index) in years" :key="index">{{item}}</view>
-            </picker-view-column>
-            <picker-view-column>
-                <view class="item" v-for="(item,index) in months" :key="index">{{item}}</view>
-            </picker-view-column>
-            <picker-view-column>
-                <view class="item" v-for="(item,index) in days" :key="index">{{item}}</view>
-            </picker-view-column>
-        </picker-view>
-    </view>
-</view>
-</template>
-
-<script setup>
-import { ref,onMounted } from 'vue'
-import { getDateRange } from '@/utils/datetime.js';
-const props = defineProps({
-    isShow:false,
-})
-
-let years = ref([]);
-let months= ref([]);
-let days = ref([]);
-let pickerVisible =ref(false)
-let indicatorStyle=ref(`height: 88rpx`);
-let dateValueArr = ref([])
-
-// 默认最近3天
-let lastType = ref('3days');
-let dateType = ref('');
-let beginDate = ref('');
-let endDate = ref('');
-
-// 初始化日期
-const initDate=(date)=>{
-    for (let i = 1990; i <= date.getFullYear() + 61; i++) {
-        years.value.push(i)
-    }
-    for (let i = 1; i <= 12; i++) {
-        months.value.push(i.toString().padStart(2, '0'))
-    }
-    for (let i = 1; i <= 31; i++) {
-        days.value.push(i.toString().padStart(2, '0'))
-    }
-}
-
-
-// 调用父类方法
-const emit = defineEmits(['close','confirm'])
-const handleClose = ()=>{
-    emit('close');
-}
-const handleConfirm = ()=>{
-    emit('confirm',{
-        startDate:beginDate.value,
-        endDate:endDate.value,
-        lastType:lastType.value
-    });
-}
-
-// 选择最近
-const handleChoose=(type)=>{
-    lastType.value = type;
-
-    let dateObj = getDateRange(type);
-    beginDate.value = dateObj.startDate;
-    endDate.value = dateObj.endDate;
-
-    pickerVisible.value = false;
-    dateType.value=""
-}
-// 选择开始或结束时间
-const handleChooseDate=(type,dateStr)=>{
-    dateType.value = type;
-    pickerVisible.value = true;
-    lastType.value='';
-    // 回显picker
-    let strs = dateStr.split("-"); 
-    const yearIndex = years.value.findIndex(item => item == strs[0])
-    const monthIndex = months.value.findIndex(item => item == strs[1])
-    const dayIndex = days.value.findIndex(item => item == strs[2])
-    dateValueArr.value = [yearIndex, monthIndex, dayIndex];
-    // console.log(strs,dateValueArr.value)
-}
-
-// 切换日期
-const bindChange= (e)=>{
-    const val = e.detail.value
-    let year = years.value[val[0]]
-    let month = months.value[val[1]]
-    let day = days.value[val[2]]
-    // console.log(year,month,day);
-    let dateStr = `${year}-${month}-${day}`;
-    if(dateType.value==1){//开始时间
-        beginDate.value = dateStr
-    }else{
-        endDate.value = dateStr
-    }
-}
-
-onMounted(() => {
-    let date = new Date();
-    const year = date.getFullYear();
-    const month = date.getMonth() + 1;
-    const day = date.getDate();
-
-    initDate(date);
-
-    const yearIndex = years.value.findIndex(item => item == year)
-    const monthIndex = months.value.findIndex(item => item == month)
-    const dayIndex = days.value.findIndex(item => item == day)
-    dateValueArr.value = [yearIndex, monthIndex, dayIndex];
-
-    // 默认近3天
-    let dateObj = getDateRange('3days');
-    beginDate.value = dateObj.startDate;
-    endDate.value = dateObj.endDate
-})
-</script>
-
-<style lang="scss" scoped>
-.date-con {
-	position: fixed;
-	top: 0;
-	right: 0;
-	bottom: 0;
-	left: 0;
-	background: rgba(0, 0, 0, 0.4);
-	z-index: 9999;
-
-    .date-bg{
-        width:670rpx;
-        border-radius: 18rpx 18rpx 0 0;
-        padding:20rpx 40rpx;
-        position: fixed;
-        bottom:0;
-        background-color: #fff;
-        min-height: 650rpx;
-        .date-title{
-            display: flex;
-            align-items: center;
-            .choose-title{
-                width:550rpx;
-                margin:0 auto;
-                text-align: center;
-                color:#333;
-                font-weight: bold;
-                font-size: 32rpx;
-            }
-            .date-confirm{
-                margin-left:auto;
-                color:#05A3F4;
-                font-size:28rpx;
-            }
-        }
-        .range-list{
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            margin-top:30rpx;
-            .range-item{
-                width:150rpx;
-                border-radius: 10rpx;
-                border:1px solid #E8E8E8;
-                text-align: center;
-                color:#333333;
-                font-size:28rpx;
-                padding:10rpx 0;
-                margin-right:15rpx;
-            }
-            .range-item.active{
-                border:1px solid #05A3F4;
-                color:#05A3F4;
-            }
-        }
-        .range-to{
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            margin-top:30rpx;
-            .to-bg{
-                border:1px solid #F5F5F5;
-                background-color: #F5F5F5;
-                width:275rpx;
-                border-radius: 28rpx;
-                text-align: center;
-                color:#919191;
-                font-size:28rpx;
-                padding:8rpx 0;
-            }
-            .to-bg.blue{
-                border:1px solid #05A3F4;
-                color:#05A3F4;
-                background-color:#fff;
-            }
-            .to{
-                color:#333333;
-                font-size:28rpx;
-                margin:0 42rpx;
-            }
-        }
-        .picker-view {
-            width: 670rpx;
-            height: 385rpx;
-            margin-top: 20rpx;
-            :deep(.item){
-                text-align: center;
-                line-height: 78rpx;
-                /* #ifdef APP-PLUS */
-                line-height: 88rpx;
-                /* #endif */
-            }
-        }
-    }
-}
-</style>

src/constants/mapApiConstants.js

@@ -1,22 +0,0 @@
-/**
- * @description 定位API的配置
- * @type {{URL: string, token: string}}
- */
-export const MapApiConfig = {
-    /**
-     * @description API接口地址
-     */
-    URL: 'https://tiles.geovisearth.com/geo/v1/geocode/regeo',
-    /**
-     * @description 接口鉴权Token
-     */
-    token: '66c87c897f0251295afdc794e4fbf73046a070338a726fe04f06cece6cb1ffdf',
-    /**
-     * @description 打卡类型：西安办事处
-     */
-    XI_AN_BAN: {latitude: 34.1360, longitude: 108.9126, typeName: '西安办事处位置打卡'},
-    /**
-     * @description 打卡类型：第三方维护
-     */
-    OTHER: {typeName: '第三方维护打卡'}
-}

src/enums/cacheEnums.js

@@ -1,11 +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=1;
-
-// miniIo 参数对象
-export const MINIO_KEY="minioKey"
-

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,9 +1,9 @@
 {
     "id" : "H5E705637",
-    "name" : "718友晟",
+    "name" : "app",
-    "appid" : "__UNI__0B682E1",
+    // "appid" : "",
     "description" : "",
-    "versionName" : "1.0.2",
+    "versionName" : "1.0.0",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */
@@ -16,17 +16,12 @@
         "compilerVersion" : 3,
         "splashscreen" : {
             "alwaysShowBeforeRender" : true,
-            "waiting" : false, // 是否显示等待界面
+            "waiting" : true,
             "autoclose" : true,
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {
+        "modules" : {},
-            "Push" : {},
-            "Camera" : {},
-            "Barcode" : {},
-            "VideoPlayer" : {}
-        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -46,82 +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\" />",
-                    "<uses-permission android:name=\"android.permission.NFC\"/>",
-                    "<uses-feature android:name=\"android.hardware.nfc\" android:required=\"true\"/>",
-                    "<uses-permission android:name=\"android.permission.POST_NOTIFICATIONS\"/>"
                 ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
-                "minSdkVersion" : 23,
-                "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" : {
-                            "push" : {
-                                "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"
-                            },
-                            "small" : {
-                                "ldpi" : "/static/images/icon_small.png",
-                                "mdpi" : "/static/images/icon_small.png",
-                                "hdpi" : "/static/images/icon_small.png",
-                                "xhdpi" : "/static/images/icon_small.png",
-                                "xxhdpi" : "/static/images/icon_small.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" : {}
-                }
-            }
         }
     },
     /* 快应用特有相关 */
@@ -150,10 +84,8 @@
     "h5" : {
         "router" : {
             "base" : ""
+            /*,"mode": "history"   仅对 H5 平台生效 */
         },
-        /*,"mode": "history"   仅对 H5 平台生效 */
         "template" : "index.html"
     }
 }
-/* ios打包配置 */
-

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": {
@@ -547,211 +471,23 @@
 				"navigationBarTitleText": ""
 			}
 		},
+		//===================================活动报告====================
 		{
-			"path": "pages/business/EQF/qualityFeedback/qualityFeedbackIndex",
+			"path": "pages/notice/notice",
-			//质量反馈
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"app-plus": {
+					"bounce": "none"
+					// 取消APP端iOS回弹,避免与下拉刷新冲突 (可统一配在 'globalStyle')
+				},
+				"mp-alipay": {
+					"allowsBounceVertical": "NO"
+				}
+				// 取消支付宝和钉钉小程序的iOS回弹,避免与下拉刷新冲突 (可统一配在 'globalStyle')
 			}
 		},
 		{
-			"path" : "pages/business/EQF/qualityFeedback/qualityFeedbackAdd",
+			"path": "pages/userinfo/userinfo",
-			"style" : 
-			{
-				"navigationBarTitleText" : ""
-			}
-		},
-		{
-			"path": "pages/business/EQF/components/chooseCus",
-			//选择客户单位
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/EQF/qualityFeedback/qualityFeedbackEnter",
-			//明细录入
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/EQF/components/qualityFeedbackDetailComponent",
-			
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/EQF/components/customerOrder",
-			//选择合同
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/EQF/components/gkCustomerOrder",
-			//选择合同
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/EQF/qualityFeedback/gkQualityFeedbackEnter",
-			//明细录入
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/EQF/components/gkQualityFeedbackDetailComponent",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/polling/index",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/polling/searchList",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/polling/taskDetail",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/polling/optionDetail",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/polling/problemDetail",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/polling/problemList",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/polling/taskList",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/polling/problemReport",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/polling/problemLog",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/polling/nfcTest/index",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		//************************考勤管理请假功能
-		//请假申请
-		{
-			"path": "pages/business/CRM/leave/askLeave",
-			
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		//添加请假申请
-		{
-			"path": "pages/business/CRM/leave/addApply",
-			
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		//我的申请表单
-		{
-			"path": "pages/business/CRM/leave/myApply",
-			
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		//我的申请表单详情
-		{
-			"path": "pages/business/CRM/leave/myApplyDetail",
-			
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		//可销假列表
-		{
-			"path": "pages/business/CRM/leave/backApply",
-			
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		//添加销假申请
-		{
-			"path": "pages/business/CRM/leave/addBackApply",
-			
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		//请假审批
-		{
-			"path": "pages/business/CRM/leave/reviewLeave",
-			
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		//审批详情
-		{
-			"path": "pages/business/CRM/leave/reviewDetail",
-			
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		//************************任务板块页面
-		{
-			"path": "pages/business/CRM/scheduler/index",
-			
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/CRM/scheduler/taskPlanAdded",
-			
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/business/CRM/scheduler/taskListViewing",
-			
 			"style": {
 				"navigationBarTitleText": ""
 			}
@@ -771,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",
@@ -798,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

@@ -168,8 +168,8 @@
             <uni-forms-item label="爱好" name="hobby" class="uni-forms-item is-direction-top is-top">
               <!-- 索引：hobbyIndex 范围：hobbyList 响应：handleHobbyChange-->
               <uni-easyinput v-model="formData.hobby" placeholder="请输入爱好" :disabled="!editable"/>
-              <multipleSelect ref="hobbySelectRef" :multiple="true" downInner :value="hobbyIds" :options="hobbyList"
+              <multipleSelect :multiple="true" :value="hobbyIndex" downInner :options="hobbyList"
-                              @change="handleHobbyChange" :slabel="'name'"
+                              @change="handleHobbyChange"  :slabel="'name'"
 
               ></multipleSelect><!--placeholder="请选择爱好标签"-->
             </uni-forms-item>
@@ -467,29 +467,20 @@ let handleThinkLevelChange = (e) => {
 // 系统推荐等级
 let recommendLevel = ref("");
 let getRecommendLevel = async () => {
-  if (formData.value.cusEstate) {
+  if (formData.value.cusEstate && formData.value.functionalRequirements) {
     let {cusEstate, functionalRequirements} = formData.value;
     let param = {cusEstate, functionalRequirements};
     if (formData.value.salesmanThinkLevel) {
       param.personnelLevel = formData.value.salesmanThinkLevel;
     }
-    let res = await getCustomerLevel(param)
+    let res = await getCustomerLevel(param).catch(err => {
-    /*.catch(err => {
       console.error(err, "客户的系统推荐等级获取失败")
-    })*/
+    })
-    try{
+    if (!res.systemRecommendationLevel) {
-      if(res.data.systemRecommendationLevel){
+      recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
-        formData.value.systemThinkLevel = res.data.systemRecommendationLevel;
+      console.log(formData.value.systemThinkLevel + "???")
-      }else{
-        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐";
-      }
-    }catch(e){
-      if (res.systemRecommendationLevel) {
-        formData.value.systemThinkLevel = res.systemRecommendationLevel;
-      }else{
-        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
-      }
     }
+    formData.value.systemThinkLevel = res.systemRecommendationLevel;
   } else {
     recommendLevel.value = "无公司等级信息，无法推荐等级";
   }
@@ -518,7 +509,8 @@ let handleUserTypeChange = (e) => {
 
 // 选择日期
 function handleTenureTimeChange(e) {
-  formData.value.tenureTime = e;
+  let {value} = e.detail;
+  formData.value.tenureTime = value;
 }
 
 // 需求层次索引
@@ -541,16 +533,16 @@ let handleDevelopChange = e => {
 
 // 选择生日
 function handleBirthdayChange(e) {
-  formData.value.birthday = e;
+  let{value} = e.detail
+  formData.value.birthday = value;
 }
 
 // 爱好标签索引
-let hobbyIds = ref([]);
+let hobbyIndex = reactive([]);
-let hobbies = ref([]);
 // 选择爱好标签
-const handleHobbyChange = (items, ids) => {
+const handleHobbyChange = (item, value) => {
-  hobbyIds.value = [];
+  // console.log("爱好", item, value);
-  hobbies.value = items;
+  hobbyIndex = value;
 };
 // 选择
 const handleNativeChange = (e) => {

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">
@@ -173,8 +168,8 @@
             <uni-forms-item label="爱好" name="hobby" class="uni-forms-item is-direction-top is-top">
               <!-- 索引：hobbyIndex 范围：hobbyList 响应：handleHobbyChange-->
               <uni-easyinput v-model="formData.hobby" placeholder="请输入爱好"/>
-              <multipleSelect ref="hobbySelectRef" :multiple="true" downInner :value="hobbyIds" :options="hobbyList"
+              <multipleSelect :multiple="true" :value="hobbyIndex" downInner :options="hobbyList"
-                              @change="handleHobbyChange" :slabel="'name'"
+                              @change="handleHobbyChange"  :slabel="'name'"
 
               ></multipleSelect><!--placeholder="请选择爱好标签"-->
             </uni-forms-item>
@@ -473,29 +468,20 @@ let handleThinkLevelChange = (e) => {
 // 系统推荐等级
 let recommendLevel = ref("");
 let getRecommendLevel = async () => {
-  if (formData.value.cusEstate) {
+  if (formData.value.cusEstate && formData.value.functionalRequirements) {
     let {cusEstate, functionalRequirements} = formData.value;
     let param = {cusEstate, functionalRequirements};
     if (formData.value.salesmanThinkLevel) {
       param.personnelLevel = formData.value.salesmanThinkLevel;
     }
-    let res = await getCustomerLevel(param)
+    let res = await getCustomerLevel(param).catch(err => {
-    /*.catch(err => {
       console.error(err, "客户的系统推荐等级获取失败")
-    })*/
+    })
-    try{
+    if (!res.systemRecommendationLevel) {
-      if(res.data.systemRecommendationLevel){
+      recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
-        formData.value.systemThinkLevel = res.data.systemRecommendationLevel;
+      console.log(formData.value.systemThinkLevel + "???")
-      }else{
-        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐";
-      }
-    }catch(e){
-      if (res.systemRecommendationLevel) {
-        formData.value.systemThinkLevel = res.systemRecommendationLevel;
-      }else{
-        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
-      }
     }
+    formData.value.systemThinkLevel = res.systemRecommendationLevel;
   } else {
     recommendLevel.value = "无公司等级信息，无法推荐等级";
   }
@@ -524,7 +510,8 @@ let handleUserTypeChange = (e) => {
 
 // 选择日期
 function handleTenureTimeChange(e) {
-  formData.value.tenureTime = e;
+  let {value} = e.detail;
+  formData.value.tenureTime = value;
 }
 
 // 需求层次索引
@@ -547,19 +534,17 @@ let handleDevelopChange = e => {
 
 // 选择生日
 function handleBirthdayChange(e) {
-  formData.value.birthday = e;
+  let{value} = e.detail
+  formData.value.birthday = value;
 }
 
 // 爱好标签索引
-let hobbyIds = ref([]);
+let hobbyIndex = reactive([]);
-let hobbies = ref([]);
 // 选择爱好标签
-const handleHobbyChange = (items, ids) => {
+const handleHobbyChange = (item, value) => {
-  console.log('选择爱好', items, ids);
+  // console.log("爱好", item, value);
-  hobbyIds.value = [];
+  hobbyIndex = value;
-  hobbies.value = items;
 };
-
 // 选择
 const handleNativeChange = (e) => {
   formData.value.nativec = (e.detail.value.map(item => {
@@ -582,22 +567,17 @@ 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 hobbyTags = hobbyIndex.map(it => {
-    let {name} = it;
+    let {name} = hobbyList[it];
     return name;
   })
+  formData.value.iphone = formData.value.mobilePhone; // 特殊处理
   const hobbyTagString = hobbyTags.join('，');
   console.log(hobbyTagString);
   if (hobbyTagString || formData.value.hobby) {
-    formData.value.hobby = hobbyTagString ? (formData.value.hobby ? formData.value.hobby + '，' : '') + hobbyTagString : formData.value.hobby;
+    formData.value.hobby = formData.value.hobby ? formData.value.hobby + '，' + hobbyTagString : hobbyTagString;
   }
-  formData.value.iphone = formData.value.mobilePhone; // 特殊处理
   // console.log(formData.value, "校验表单数据")
   // console.log(recommendLevel);
   formData.value.cusName = customerUser.value.cusName;
@@ -612,11 +592,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/customerAdd.vue

@@ -21,7 +21,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">
@@ -178,7 +178,7 @@
             <uni-forms-item label="爱好" name="hobby" class="uni-forms-item is-direction-top is-top">
               <!-- 索引：hobbyIndex 范围：hobbyList 响应：handleHobbyChange-->
               <uni-easyinput v-model="formData.hobby" placeholder="请输入爱好"/>
-              <multipleSelect ref="hobbySelectRef" :multiple="true" downInner :value="hobbyIds" :options="hobbyList"
+              <multipleSelect :multiple="true" :value="hobbyIndex" downInner :options="hobbyList"
                               @change="handleHobbyChange" :slabel="'name'"
 
               ></multipleSelect><!--placeholder="请选择爱好标签"-->
@@ -271,7 +271,7 @@
 </template>
 
 <script setup>
-import {ref, reactive} from 'vue'
+import {ref, onMounted, computed, reactive} from 'vue'
 import customHeader from '@/components/customHeader.vue'
 import multipleSelect from '@/components/multipleSelect.vue'
 import {
@@ -284,8 +284,7 @@ import {
 } from "./dataMap";
 import city from "@/utils/area";
 import {getCustomerLevel, saveappCrmCusUserNew} from "@/api/crm/customer/getCustomer";
-// 对 multipleSelect 组件的引用
+
-const hobbySelectRef = ref(null);
 // 表单引用
 const formRef = ref({});
 // 表单数据
@@ -413,7 +412,7 @@ let handleCustomerClick = () => {
         let {
           cusName, // 公司名称
           cusEstate, // 等级
-          cusId,
+            cusId,
         } = data;
         customerUser.value.cusName = cusName;
         if (!cusEstate) customerUser.value.sysThinkLevel = "该客户暂无等级信息，无法进行系统推荐"
@@ -449,29 +448,20 @@ let handleThinkLevelChange = (e) => {
 // 系统推荐等级
 let recommendLevel = ref("");
 let getRecommendLevel = async () => {
-  if (formData.value.cusEstate) {
+  if (formData.value.cusEstate && formData.value.functionalRequirements) {
     let {cusEstate, functionalRequirements} = formData.value;
     let param = {cusEstate, functionalRequirements};
     if (formData.value.salesmanThinkLevel) {
       param.personnelLevel = formData.value.salesmanThinkLevel;
     }
-    let res = await getCustomerLevel(param)
+    let res = await getCustomerLevel(param).catch(err => {
-    /*.catch(err => {
       console.error(err, "客户的系统推荐等级获取失败")
-    })*/
+    })
-    try{
+    if (!res.systemRecommendationLevel) {
-      if(res.data.systemRecommendationLevel){
+      recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
-        formData.value.systemThinkLevel = res.data.systemRecommendationLevel;
+      console.log(formData.value.systemThinkLevel + "???")
-      }else{
-        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐";
-      }
-    }catch(e){
-      if (res.systemRecommendationLevel) {
-        formData.value.systemThinkLevel = res.systemRecommendationLevel;
-      }else{
-        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
-      }
     }
+    formData.value.systemThinkLevel = res.systemRecommendationLevel;
   } else {
     recommendLevel.value = "无公司等级信息，无法推荐等级";
   }
@@ -499,9 +489,9 @@ let handleUserTypeChange = (e) => {
 }
 
 // 选择日期
-function handleTenureTimeChange(val) {
+function handleTenureTimeChange(e) {
-  console.log(val)
+  let {value} = e.detail;
-  formData.value.tenureTime = val;
+  formData.value.tenureTime = value;
 }
 
 // 需求层次索引
@@ -523,20 +513,18 @@ let handleDevelopChange = e => {
 }
 
 // 选择生日
-function handleBirthdayChange(val) {
+function handleBirthdayChange(e) {
-  formData.value.birthday = val;
+  let{value} = e.detail
+  formData.value.birthday = value;
 }
 
 // 爱好标签索引
-let hobbyIds = ref([]);
+let hobbyIndex = reactive([]);
-let hobbies = ref([]);
 // 选择爱好标签
-const handleHobbyChange = (items, ids) => {
+const handleHobbyChange = (item, value) => {
-  console.log('选择爱好', items, ids);
+  // console.log("爱好", item, value);
-  hobbyIds.value = [];
+  hobbyIndex = value;
-  hobbies.value = items;
 };
-
 // 选择
 const handleNativeChange = (e) => {
   formData.value.nativec = (e.detail.value.map(item => {
@@ -558,93 +546,16 @@ let handleWorkingStatusChange = e => {
   workingStatusIndex.value = 0;
   formData.value.workingStatus = workingStatusList[value].name;
 }
-// 多选组件失去焦点关闭
-let handleBlur = () => {
-  if (hobbySelectRef.value) hobbySelectRef.value.handleBlur();
-}
-// 提取爱好标签处理逻辑
-const processHobbyTags = () => {
-  let hobbyTags = hobbies.value.map(it => {
-    let {name} = it;
-    return name;
-  })
-  const hobbyTagString = hobbyTags.join('，');
-  console.log(hobbyTagString);
-  if (hobbyTagString || formData.value.hobby) {
-    formData.value.hobby = hobbyTagString ? (formData.value.hobby ? formData.value.hobby + '，' : '') + hobbyTagString : formData.value.hobby;
-  }
-};
 
-// 提取表单验证逻辑
-const validateForm = async () => {
-  formData.value.cusName = customerUser.value.cusName;
-  await formRef.value.validate();
-  console.log(formData.value, "提交表单数据");
-};
-
-// 提取API调用逻辑
-const saveCustomerUser = async () => {
-  uni.showLoading();
-  try {
-    const res = await saveappCrmCusUserNew(formData.value);
-    if(res.code === 200){
-      uni.showToast({
-        title: "保存成功"
-      });
-    } else {
-      uni.showToast({
-        title: "操作失败",
-        icon: "error"
-      });
-    }
-    setTimeout(() => uni.navigateBack(), 1500);
-  } catch(err) {
-    uni.showToast({
-      icon: 'none',
-      title: "保存失败"
-    });
-  }
-  finally{
-    uni.hideLoading()
-  }
-};
-
-// 简化后的 submitForm 方法
 let submitForm = async () => {
-  console.log(formData.value);
+  let hobbyTags = hobbyIndex.map(it => {
-  try {
+    let {name} = hobbyList[it];
-    if(formData.value.iphone){
-      formData.value.mobilePhone = formData.value.iphone;
-    }
-    // 处理爱好标签
-    processHobbyTags();
-
-    // 表单验证
-    await validateForm();
-
-    // 保存客户人员信息
-    await saveCustomerUser();
-  } catch (err) {
-    uni.showToast({
-      icon: 'none',
-      title: '请检查并完善信息'
-    });
-    console.warn(err);
-  }
-};
-
-/*let submitForm = async () => {
-  let hobbyTags = hobbies.value.map(it => {
-    let {name} = it;
     return name;
   })
   const hobbyTagString = hobbyTags.join('，');
   console.log(hobbyTagString);
   if (hobbyTagString || formData.value.hobby) {
-    formData.value.hobby = hobbyTagString ? (formData.value.hobby ? formData.value.hobby + '，' : '') + hobbyTagString : formData.value.hobby;
+    formData.value.hobby = formData.value.hobby ? formData.value.hobby + '，' + hobbyTagString : hobbyTagString;
-  }
-  if(formData.value.iphone){
-    formData.value.mobilePhone = formData.value.iphone;
   }
   // console.log(formData.value, "校验表单数据")
   // console.log(recommendLevel);
@@ -654,19 +565,19 @@ let submitForm = async () => {
     console.log(formData.value, "提交表单数据")
     // 请求保存
     uni.showLoading()
-    saveappCrmCusUserNew(formData.value).then(res => {
+    saveappCrmCusUserNew(formData.value).then(res=>{
       uni.hideLoading();
-      if (res.code === 200) {
+      if(res.code === 200){
         uni.showToast({
           title: "保存成功"
         })
-      } else {
+      }else{
         uni.showToast({
           title: "操作失败"
         })
       }
-      setTimeout(() => uni.navigateBack(), 1500);
+      setTimeout(()=>uni.navigateBack(), 1500);
-    }).catch(() => {
+    }).catch(err=>{
       uni.showToast({
         icon: 'none',
         title: "保存失败"
@@ -682,7 +593,7 @@ let submitForm = async () => {
     })
     console.warn(err);
   }
-}*/
+}
 
 
 </script>

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

@@ -17,7 +17,7 @@
       <view class="all-body">
         <!-- 搜索  @blur="blur" @focus="focus" @input="input" @cancel="cancel" @clear="clear"-->
         <view class="search">
-          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户人员名称" clearButton="auto"
+          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户名称" clearButton="auto"
                           cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"
                           @clear="clearSearchValue"
                           v-model="searchValue"
@@ -132,10 +132,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: '已经到底了'
 });
@@ -155,27 +152,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 +181,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 +198,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 +214,6 @@ let handleDetail = (item) => {
       url: "/pages/business/CRM/customer/components/customerUserEdit",
       events: {
         refreshCusUserList() {
-          console.log('refreshCusUserList',"响应刷新")
           handleSearch();
         }
       },
@@ -230,7 +221,7 @@ let handleDetail = (item) => {
         res.eventChannel.emit('editCusData', {param: item, isAdd: false})
       }
     })
-  } else {
+  }else{
     uni.showToast({
       title: '已完成审核，不可修改',
       icon: 'none'
@@ -284,15 +275,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/leave/addApply.vue

@@ -1,255 +0,0 @@
-<template>
-	<view class="con-body">
-		<view class="con-bg">
-			<customHeader ref="customHeaderRef" :title="'请假申请'" :leftFlag="true">
-			</customHeader>
-			<!-- #ifdef H5 -->
-			<view style="height:30rpx"></view>
-			<!-- #endif -->
-
-			<!-- 高度来避免头部遮挡 -->
-			<view class="top-height"></view>
-
-			<view class="white-bg">
-				<view class="example">
-					<uni-forms ref="baseForm" :modelValue="baseFormData" :label-width="80">
-						<uni-forms-item label="请假模式">
-							<uni-data-select v-model="baseFormData.typeval" :localdata="range"
-								@change="change" :clear="false"></uni-data-select>
-						</uni-forms-item>
-						<uni-forms-item label="开始日期">
-							<uni-datetime-picker type="date" :clear-icon="false"
-								placeholder="请输入开始日期" v-model="baseFormData.startDate"
-								@change="change" />
-						</uni-forms-item>
-						<uni-forms-item v-show="baseFormData.typeval=='1'" label="结束日期">
-							<uni-datetime-picker type="date" :clear-icon="false"
-								placeholder="请输入结束日期" v-model="baseFormData.endDate"
-								@change="change" />
-						</uni-forms-item>
-						<uni-forms-item label="开始时间" v-show="baseFormData.typeval!='1'">
-							<input type="text" class="inputborder" style="text-align: center;"
-								v-model="baseFormData.startTime" :disabled="true" />
-						</uni-forms-item>
-						<uni-forms-item label="结束时间" v-show="baseFormData.typeval!='1'">
-							<input type="text" class="inputborder" style="text-align: center;"
-								v-model="baseFormData.endTime" :disabled="true" />
-						</uni-forms-item>
-						<uni-forms-item label="请假天数">
-							<input type="text" class="inputborder" style="text-align: center;"
-								v-model="baseFormData.days" :disabled="true" />
-						</uni-forms-item>
-						<uni-forms-item label="详细说明" class="custom-label-height">
-							<uni-easyinput type="textarea" v-model="baseFormData.reason"
-								placeholder="请输入详细说明" />
-						</uni-forms-item>
-					</uni-forms>
-				</view>
-				<view>
-					<button type="primary" @click="submit()">提交</button>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script setup>
-	import {
-		ref,
-		onMounted,
-		reactive
-	} from 'vue'
-	import customHeader from '@/components/customHeader.vue'
-	import {
-		getNavBarPaddingTop
-	} from '@/utils/system.js'
-
-	import {
-		addLeaveApply
-	} from '@/api/crm/activity/activity';
-
-	// 获取导航栏高度用于内容区域padding
-	const navBarPaddingTop = ref(0);
-	onMounted(() => {
-		navBarPaddingTop.value = getNavBarPaddingTop() * 2;
-	})
-
-	// 表单ref
-	const baseForm = ref(null);
-
-	const baseFormData = reactive({
-		typeval: 1,
-		startDate: getDate(Date.now()),
-		endDate: getDate(Date.now()),
-		days: 1,
-		reason: '',
-		startTime: '08:30',
-		endTime: '12:30',
-	});
-
-	const range = ref([{
-		"value": 1,
-		"text": "全天"
-	}, {
-		"value": 2,
-		"text": "前半个班次"
-	}, {
-		"value": 3,
-		"text": "后半个班次"
-	}]);
-
-	const submit = async () => {
-		try {
-
-			
-			if (baseFormData.reason == null || baseFormData.reason == "") {
-				uni.showToast({
-					title: '请填写详细说明',
-					icon: 'error'
-				});
-			} else if (baseFormData.days == 0 || baseFormData.startDate < getDate(Date.now()) || baseFormData.endDate < getDate(Date.now())) {
-				uni.showToast({
-					title: '请确认日期',
-					icon: 'error'
-				});
-			} else {
-				if (baseFormData.typeval != 1) {
-					baseFormData.endDate = baseFormData.startDate
-				}
-				// 验证表单
-				await baseForm.value.validate();
-				// 验证通过后的操作
-				uni.showToast({
-					title: '验证通过',
-					icon: 'success'
-				});
-
-				addLeaveApply(baseFormData).then(
-					res => {
-						if (res.code == 200) {
-							uni.showToast({
-								title: '提交成功',
-								duration: 2000
-							});
-							setTimeout(function() {
-								uni.navigateBack({
-									success: () => {}
-								})
-							}, 500);
-						} else {
-							uni.showToast({
-								title: res.msg,
-								icon: 'none',
-							});
-						}
-					},
-				);
-			}
-
-
-		} catch (err) {
-			console.log('表单验证失败:', err);
-		}
-	};
-
-	let change = () => {
-		if (baseFormData.typeval != 1) {
-			if (baseFormData.typeval == 2) {
-				baseFormData.startTime = '08:30'
-				baseFormData.endTime = '12:30'
-			} else {
-				baseFormData.startTime = '13:00'
-				baseFormData.endTime = '17:00'
-			}
-
-			baseFormData.days = 0.5
-		} else {
-			let start = baseFormData.startDate
-			let end = baseFormData.endDate
-			baseFormData.days = getDayDiff(start, end);
-		}
-	}
-
-	function getDate(dateval) {
-		const date = new Date(dateval)
-		const year = date.getFullYear()
-		const month = date.getMonth() + 1
-		const day = date.getDate()
-		return `${year}-${addZero(month)}-${addZero(day)}`
-	}
-
-	function addZero(num) {
-		if (num < 10) {
-			num = `0${num}`
-		}
-		return num
-	}
-
-	// 计算两个日期的天数差
-	function getDayDiff(startDate, endDate) {
-		// 处理日期格式（兼容iOS）
-		const start = startDate.replace(/-/g, '/');
-		const end = endDate.replace(/-/g, '/');
-
-		const date1 = new Date(start).getTime();
-		const date2 = new Date(end).getTime();
-
-		if (date2 < date1) {
-			return 0
-		}
-
-		// 计算天数差（含边界值+1天）
-		return Math.floor(Math.abs(date2 - date1) / (24 * 3600 * 1000)) + 1;
-	}
-</script>
-
-<style lang="scss">
-	.example {
-		padding: 15px;
-		background-color: #fff;
-	}
-
-	.segmented-control {
-		margin-bottom: 15px;
-	}
-
-	.button-group {
-		margin-top: 15px;
-		display: flex;
-		justify-content: space-around;
-	}
-
-	.form-item {
-		display: flex;
-		align-items: center;
-	}
-
-	.button {
-		display: flex;
-		align-items: center;
-		height: 35px;
-		margin-left: 10px;
-	}
-
-	.inputborder {
-		width: 100%;
-		text-align: left;
-		border: 1px solid #dcdfe6;
-		border-radius: 4px;
-		font-size: 14px;
-		height: 35px;
-	}
-
-	:deep(.uni-forms-item__label) {
-		padding: 0 20rpx;
-		background-color: rgba(103, 194, 58, 0.2);
-	}
-
-	:deep(.custom-label-height .uni-forms-item__label) {
-		height: 190rpx;
-	}
-
-	::v-deep .uni-easyinput__content-textarea {
-		height: 152rpx !important;
-	}
-</style>

src/pages/business/CRM/leave/addBackApply.vue

@@ -1,316 +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="example">
-					<view class="r-list" style="display: flex;font-size: 14px;padding-top: 32rpx;
-					background-color: #03aa0315;height: 76rpx;">
-						<view class="r-left">
-							<label style="color: #03aa03;font-size: 34rpx;
-							padding: 32rpx;background-color: #dcd8d933;">
-								{{ applyData.days.replace('.0','')}} 天</label>
-						</view>
-						<view style="margin-top: -20rpx;">
-
-							<view class="r-right" style="margin-left: 30rpx;">
-								{{ applyData.startDate }}
-								至
-								{{ applyData.endDate }}
-							</view>
-							<view class="r-right" style="margin-left: 30rpx;color: #00000095;">
-								{{ applyData.reason }}
-							</view>
-						</view>
-					</view>
-					<uni-forms ref="baseForm" :modelValue="baseFormData" :label-width="80"
-						style="margin-top: 20rpx;">
-						<uni-forms-item label="销假模式">
-							<uni-data-select v-model="baseFormData.typeval" :localdata="range"
-								@change="change" :clear="false"></uni-data-select>
-						</uni-forms-item>
-						<uni-forms-item label="开始日期">
-							<uni-datetime-picker type="date" :clear-icon="false"
-								placeholder="请输入开始日期" v-model="baseFormData.startDate"
-								@change="change" />
-						</uni-forms-item>
-						<uni-forms-item v-show="baseFormData.typeval==1" label="结束日期">
-							<uni-datetime-picker type="date" :clear-icon="false"
-								placeholder="请输入结束日期" v-model="baseFormData.endDate"
-								@change="change" />
-						</uni-forms-item>
-						<uni-forms-item label="开始时间" v-show="baseFormData.typeval!='1'">
-							<uni-easyinput v-model="baseFormData.startTime" class="inputborder"
-								:disabled="true" style="text-align: center;" />
-						</uni-forms-item>
-						<uni-forms-item label="结束时间" v-show="baseFormData.typeval!='1'">
-							<uni-easyinput v-model="baseFormData.endTime" class="inputborder"
-								:disabled="true" style="text-align: center;" />
-						</uni-forms-item>
-						<uni-forms-item label="销假天数">
-							<uni-easyinput v-model="baseFormData.days" class="inputborder"
-								:disabled="true" style="text-align: center;" />
-						</uni-forms-item>
-						<uni-forms-item label="详细说明" class="custom-label-height">
-							<uni-easyinput type="textarea" v-model="baseFormData.reason" />
-						</uni-forms-item>
-					</uni-forms>
-				</view>
-				<view>
-					<button type="primary" @click="submit()">提交</button>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script setup>
-	import {
-		ref,
-		onMounted,
-		reactive
-	} from 'vue'
-	import {
-		onLoad
-	} from '@dcloudio/uni-app'
-	import customHeader from '@/components/customHeader.vue'
-	import {
-		addBackApply
-	} from '@/api/crm/activity/activity';
-
-	// 表单ref
-	let baseForm = ref(null);
-
-	const range = ref([{
-		"value": 1,
-		"text": "全天"
-	}, {
-		"value": 2,
-		"text": "前半个班次"
-	}, {
-		"value": 3,
-		"text": "后半个班次"
-	}]);
-
-	let baseFormData = reactive({
-		typeName: "全天",
-		typeval: 1,
-		startDate: getDate(Date.now()),
-		endDate: getDate(Date.now()),
-		days: 1,
-		reason: '',
-		startTime: '08:30',
-		endTime: '12:30',
-	});
-
-	let leaveId = ref(null);
-	let applyData = ref(null);
-
-	onLoad((options) => {
-		if (options.data) {
-			applyData.value = JSON.parse(decodeURIComponent(options.data))
-			leaveId.value = applyData.value.leaveId
-		}
-	})
-
-	// 查询详情
-	let item = ref({});
-	const submit = async () => {
-		try {
-			if (baseFormData.days == 0 ||
-				(baseFormData.typeval == 1 &&
-					(applyData.value.endDate < baseFormData.endDate ||
-						applyData.value.startDate > baseFormData.endDate)) ||
-				applyData.value.endDate < baseFormData.startDate ||
-				applyData.value.startDate > baseFormData.startDate ||
-				baseFormData.startDate < getDate(Date.now()) ||
-				parseFloat(baseFormData.days) > parseFloat(applyData.value.days) ||
-				(parseFloat(applyData.value.days) == 0.5 && baseFormData.typeval != applyData
-					.value.typeval)) {
-				uni.showToast({
-					title: '请确认日期',
-					icon: 'error'
-				});
-			} else {
-				if (baseFormData.typeval != 1) {
-					baseFormData.endDate = baseFormData.startDate
-				}
-				// 验证表单
-				await baseForm.value.validate();
-				// 验证通过后的操作
-				uni.showToast({
-					title: '验证通过',
-					icon: 'success'
-				});
-
-				baseFormData.leaveId = leaveId.value
-
-				addBackApply(baseFormData).then(
-					res => {
-						if (res.code == 200) {
-							uni.showToast({
-								title: '提交成功',
-								duration: 2000
-							});
-							setTimeout(function() {
-								uni.navigateBack({
-									success: () => {
-										uni.$emit('isRefresh');
-									}
-								})
-							}, 500);
-						} else {
-							uni.showToast({
-								title: res.msg,
-								icon: 'none',
-							});
-						}
-					},
-				);
-			}
-
-
-		} catch (err) {
-			console.log('表单验证失败:', err);
-		}
-	}
-
-	function getDate(dateval) {
-		const date = new Date(dateval)
-		const year = date.getFullYear()
-		const month = date.getMonth() + 1
-		const day = date.getDate()
-		return `${year}-${addZero(month)}-${addZero(day)}`
-	}
-
-	function addZero(num) {
-		if (num < 10) {
-			num = `0${num}`
-		}
-		return num
-	}
-
-	let change = () => {
-		if (baseFormData.typeval != 1) {
-			if (baseFormData.typeval == 2) {
-				baseFormData.startTime = '08:30'
-				baseFormData.endTime = '12:30'
-			} else {
-				baseFormData.startTime = '13:00'
-				baseFormData.endTime = '17:00'
-			}
-
-			baseFormData.days = 0.5
-		} else {
-			let start = baseFormData.startDate
-			let end = baseFormData.endDate
-			baseFormData.days = getDayDiff(start, end);
-		}
-
-		baseFormData.days = baseFormData.days.toString()
-	}
-
-	// 计算两个日期的天数差
-	function getDayDiff(startDate, endDate) {
-		// 处理日期格式（兼容iOS）
-		const start = startDate.replace(/-/g, '/');
-		const end = endDate.replace(/-/g, '/');
-
-		const date1 = new Date(start).getTime();
-		const date2 = new Date(end).getTime();
-
-		if (date2 < date1) {
-			return 0
-		}
-
-		// 计算天数差（含边界值+1天）
-		return Math.floor(Math.abs(date2 - date1) / (24 * 3600 * 1000)) + 1;
-	}
-</script>
-
-<style scoped>
-	.white-bg {
-		width: 690rpx;
-		margin: 0;
-		border-radius: 8px 8px 0 0;
-	}
-
-	.white-bg.white-bg-2 {
-		border-radius: 0;
-		margin-bottom: 20rpx;
-	}
-
-	:deep(.tabs-header) {
-		/* background: none !important; */
-		border-bottom: none !important;
-		margin: 0 auto;
-		gap: 5rpx;
-	}
-
-	:deep(.tab-item) {
-		color: #919191;
-		font-size: 32rpx;
-		font-weight: bold;
-		/* flex:none; */
-		/* margin: 0 -50rpx; */
-		/* padding: 0 50rpx; */
-	}
-
-	:deep(.tab-item:first-child) {
-		text-align: right;
-		margin-left: 230rpx;
-	}
-
-	:deep(.tab-item:last-child) {
-		text-align: left;
-		margin-right: 230rpx;
-	}
-
-	:deep(.tab-item.active) {
-		color: #3384DF;
-		font-weight: bold;
-	}
-
-	:deep(.tab-item.active::after) {
-		width: 100rpx;
-		height: 8rpx;
-	}
-
-	:deep(.is-disabled) {
-		background-color: rgba(255, 255, 255, 1) !important;
-		color: #333;
-	}
-
-	.btn-success {
-		background-color: #67c23a;
-		border: 1rpx solid #67c23a;
-		color: #fff;
-		/* padding: 0rpx 60rpx; */
-	}
-
-	.btn-warning {
-		background-color: #e6a23c;
-		border: 1rpx solid #e6a23c;
-		color: #fff;
-		/* padding: 0rpx 60rpx; */
-	}
-
-	:deep(.uni-forms-item__label) {
-		padding: 0 20rpx;
-		background-color: rgba(230, 162, 60, 0.2);
-	}
-
-	:deep(.custom-label-height .uni-forms-item__label) {
-		height: 190rpx;
-	}
-
-	::v-deep .uni-easyinput__content-textarea {
-		height: 152rpx !important;
-	}
-</style>

src/pages/business/CRM/leave/askLeave.vue

@@ -1,58 +0,0 @@
-<template>
-	<view class="con-body">
-		<view class="con-bg">
-			<customHeader ref="customHeaderRef" :title="'请假销假'" :leftFlag="true">
-			</customHeader>
-			<!-- #ifdef H5 -->
-			<view style="height:50rpx"></view>
-			<!-- #endif -->
-
-			<!-- 高度来避免头部遮挡 -->
-			<view class="top-height"></view>
-
-			<view class="white-bg">
-				<view class="logo-list">
-					<view class="l-l-item" @click="handleJump('addApply')">
-						<img :src="'static/images/business/icon-xxck.png'" />
-						<text class="font-gray">请假申请</text>
-					</view>
-					<view class="l-l-item" @click="handleJump('backApply')">
-						<img :src="'static/images/business/icon-xxtj.png'" />
-						<text class="font-gray">销假申请</text>
-					</view>
-					<view class="l-l-item" @click="handleJump('myApply')">
-						<img :src="'static/images/business/icon-zfbg.png'" />
-						<text class="font-gray">我的表单</text>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script setup>
-	import {
-		ref,
-		onMounted
-	} from 'vue'
-	import customHeader from '@/components/customHeader.vue'
-	import {
-		getNavBarPaddingTop
-	} from '@/utils/system.js'
-	// 获取导航栏高度用于内容区域padding
-	const navBarPaddingTop = ref(0);
-	onMounted(() => {
-		navBarPaddingTop.value = getNavBarPaddingTop() * 2;
-	})
-	
-	// 跳转
-	let handleJump=(url)=>{
-	    if(url){
-	        uni.navigateTo({ url })
-	    }
-	}
-</script>
-
-<style scoped>
-	
-</style>

src/pages/business/CRM/leave/backApply.vue

@@ -1,159 +0,0 @@
-<template>
-	<view class="con-body">
-		<view class="con-bg">
-			<!-- 头部 -->
-			<customHeader ref="customHeaderRef" :title="'销假申请'" :leftFlag="true" :rightFlag="true">
-			</customHeader>
-
-			<!-- 高度来避免头部遮挡 -->
-			<view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
-
-			<!-- 正文内容 -->
-			<view class="white-bg">
-				<view class="tabs-container">
-					<view class="white-bg-2" v-for="(item, index) in list" :key="index" @click="handleDetail(item)">
-						<view class="report-list">
-
-							<view class="title" style="margin-top: 10rpx;font-size: 30rpx">
-								{{ item.typeval == '1' ? '全天' : item.typeval == '2' ? '前半个班次' : '后半个班次' }}
-
-								<label v-if="item.applyType == '请假'" style="float: right;color: #03aa03;">
-									{{ item.applyType }}</label>
-								<label v-if="item.applyType == '销假'" style="float: right;color: #aa9303;">
-									{{ item.applyType }}</label>
-							</view>
-							<view class="apply-row" style="margin-top: 10px;">
-								<view class="r-left" style="font-size: 15px;font-weight: 500;">
-									申请日期  {{ item.applyDate }}
-								</view>
-							</view>
-							<view class="r-list">
-								<view class="r-left">休假日期</view>
-								<view class="r-right">{{ item.startDate }} 至 {{ item.endDate }}
-									（ <label style="color: #03aa03;">
-										{{ item.days.replace('.0', '') }}天</label> ）
-								</view>
-							</view>
-							<view class="r-list">
-								<view class="r-left">详细说明</view>
-								<view v-if="item.reason && item.reason.length <= 18" class="r-right">{{ item.reason }}
-								</view>
-							</view>
-							<view class="r-list" style="margin-top: -30rpx;"
-								v-if="item.reason && item.reason.length > 18">
-								<view class="r-right">{{ item.reason }}</view>
-							</view>
-							<view class="border-bottom" style="margin: 20rpx 0;"></view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script setup>
-import {
-	ref,
-	onMounted
-} from 'vue'
-import {
-	onShow
-} from '@dcloudio/uni-app'
-import customHeader from '@/components/customHeader.vue'
-import {
-	getNavBarPaddingTop
-} from '@/utils/system.js'
-import {
-	getBackLeaveList
-} from '@/api/crm/activity/activity'
-
-let list = ref([]);
-// 获取导航栏高度用于内容区域padding
-const navBarPaddingTop = ref(0);
-onMounted(() => {
-	navBarPaddingTop.value = getNavBarPaddingTop() * 2;
-	getApplyList();
-})
-
-onShow(() => {
-	uni.$on('isRefresh', function () {
-		getApplyList();
-	})
-})
-
-async function getApplyList() {
-	let param = {
-		num: 0,
-		size: 10
-	}
-	let res = await getBackLeaveList(param);
-	list.value = res.rows;
-}
-
-// 跳转到添加申请
-let handleDetail = (item) => {
-	uni.navigateTo({
-		url: "/pages/business/CRM/leave/addBackApply?data=" + 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 - 120px);
-	/* #endif */
-	/* #ifndef APP-PLUS */
-	height: calc(100vh - 110px);
-	/* #endif */
-}
-
-.white-bg {
-	padding-bottom: 10rpx;
-}
-
-:deep(.report-list .r-list) {
-	padding: 0.5rem 0;
-}
-</style>

src/pages/business/CRM/leave/myApply.vue

@@ -1,237 +0,0 @@
-<template>
-	<view class="con-body">
-		<view class="con-bg">
-			<customHeader ref="customHeaderRef" :title="'我的表单'" :leftFlag="true">
-			</customHeader>
-			<!-- #ifdef H5 -->
-			<view style="height:50rpx"></view>
-			<!-- #endif -->
-
-			<!-- 高度来避免头部遮挡 -->
-			<view class="top-height"></view>
-
-			<view class="white-bg">
-				<view class="tabs-container">
-					<view class="tabs-scorll">
-						<view class="tabs-header">
-							<view v-for="(tab, index) in tabList" :key="index"
-								:class="['tab-item', { 'active': activeTab === index }]"
-								@click="switchTab(index)">
-								{{ tab }}
-							</view>
-						</view>
-					</view>
-					<view class="white-bg-2" v-for="item in detailList">
-						<view class="report-list" @click="showDetail(item)">
-							<view class="title" style="margin-top: 20rpx;font-size: 30rpx">
-								{{ item.typeval=="1"?'全天':item.typeval=="2"?'前半个班次':'后半个班次' }}
-								<label v-if="item.applyType=='请假'"
-									style="float: right;color: #03ca03;">
-									{{ item.applyType}}</label>
-								<label v-if="item.applyType=='销假'"
-									style="float: right;color: #eaa303;">
-									{{ item.applyType}}</label>
-							</view>
-							<view class="r-list">
-								<view class="r-left" style="font-size: 30rpx;font-weight: 500;">
-									申请日期：{{ item.applyDate }}
-									（ <label v-if="item.status=='待审批'"
-										style="color: #03ca03;">{{ item.reviewStatus }}</label>
-									<label v-if="item.status=='审批中'"
-										style="color: #03ca03;">{{ item.reviewStatus }}</label>
-									<label v-if="item.status=='驳回'"
-										style="color: #fa3303;">{{ item.reviewStatus }}</label>
-									<label v-if="item.status=='完成'"
-										style="color: #03aaf3;">{{ item.reviewStatus }}</label>）
-								</view>
-							</view>
-							<view class="r-list">
-								<view class="r-left">休假日期</view>
-								<view class="r-right">{{ item.startDate }} 至 {{ item.endDate }}
-									（ <label v-if="item.applyType=='请假'" style="color: #03ca03;">
-										{{ item.days.replace('.0','')}}天</label>
-									<label v-if="item.applyType=='销假'" style="color: #eaa303;">
-										{{ item.days.replace('.0','')}}天</label> ）
-								</view>
-							</view>
-							<view class="r-list">
-								<view class="r-left">详细说明</view>
-								<view v-if="item.reason && item.reason.length <= 18"
-									class="r-right">{{ item.reason }}</view>
-							</view>
-							<view class="border-bottom" style="margin: 20rpx 0;"></view>
-						</view>
-					</view>
-					<view class="uni-pagination-box"><uni-pagination show-icon :page-size="pageSize"
-							:current="pageCurrent" :total="total" @change="change" /></view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script setup>
-	import {
-		ref,
-		onMounted,
-		reactive
-	} from 'vue'
-	import {
-		onShow
-	} from '@dcloudio/uni-app'
-	import customHeader from '@/components/customHeader.vue'
-	import {
-		getNavBarPaddingTop
-	} from '@/utils/system.js'
-
-	import {
-		getLeaveApplyList
-	} from '@/api/crm/activity/activity';
-
-	// 获取导航栏高度用于内容区域padding
-	const navBarPaddingTop = ref(0);
-	onMounted(() => {
-		navBarPaddingTop.value = getNavBarPaddingTop() * 2;
-		getlist();
-	})
-
-	onShow(() => {
-		uni.$on('isRefresh', function() {
-			getlist();
-		})
-	})
-
-	const pageSize = ref(4);
-	const pageCurrent = ref(1);
-	const loading = ref(false);
-	let tabList = ref([])
-
-	let total = ref(0);
-	const totalAll = ref(0);
-	const totalReview = ref(0);
-	const totalReject = ref(0);
-	const totalPass = ref(0);
-
-
-	let activeTab = ref(0);
-
-	let detailList = ref([])
-	let detailLists = ref([])
-
-	let reviewList = ref([])
-	let rejectList = ref([])
-	let passList = ref([])
-
-	const getlist = async () => {
-		loading.value = true
-
-		let res = await getLeaveApplyList();
-		detailLists.value = res.rows;
-		reviewList.value = res.rows.filter(t => t.status == '待审批' || t.status == '审批中')
-		rejectList.value = res.rows.filter(t => t.status == '驳回')
-		passList.value = res.rows.filter(t => t.status == '完成')
-
-		total.value = res.total
-		totalAll.value = res.total
-		totalReview.value = reviewList.value.length
-		totalReject.value = rejectList.value.length
-		totalPass.value = passList.value.length
-
-		change({
-			current: 1
-		})
-		loading.value = false
-
-		let all = '全部(' + totalAll.value + ')'
-		let review = '审核中(' + totalReview.value + ')'
-		let reject = '已驳回(' + totalReject.value + ')'
-		let pass = '已通过(' + totalPass.value + ')'
-
-		tabList.value = [all, review, reject, pass]
-	}
-
-	const switchTab = (index) => {
-		activeTab.value = index
-
-		change({
-			current: 1
-		})
-	}
-
-	// 分页触发
-	let change = (e) => {
-		pageCurrent.value = e.current
-
-		let end = pageSize.value * e.current
-		let start = end - pageSize.value
-
-		if (activeTab.value == 0) {
-			detailList.value = detailLists.value.slice(start, end)
-			total.value = totalAll.value
-		} else if (activeTab.value == 1) {
-			detailList.value = reviewList.value.slice(start, end)
-			total.value = totalReview.value
-		} else if (activeTab.value == 2) {
-			detailList.value = rejectList.value.slice(start, end)
-			total.value = totalReject.value
-		} else if (activeTab.value == 3) {
-			detailList.value = passList.value.slice(start, end)
-			total.value = totalPass.value
-		}
-	}
-
-	// 跳转
-	let showDetail = (item) => {
-		uni.navigateTo({
-			url: "/pages/business/CRM/leave/myApplyDetail?data=" + encodeURIComponent(JSON
-				.stringify(item))
-		})
-	}
-</script>
-
-<style lang="scss" scoped>
-	.apply-row {
-		margin: 5px;
-	}
-
-	.border-bottom {
-		margin: 5px;
-		width: 100%;
-	}
-
-	.tabs-header {
-		display: flex;
-		height: 80rpx;
-		background: #fff;
-		border-bottom: 1rpx solid #eee;
-	}
-
-	.tab-item {
-		flex: 1;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 28rpx;
-		color: #666;
-	}
-
-	.tab-item.active {
-		color: #007AFF;
-		position: relative;
-	}
-
-	.tab-item.active::after {
-		content: '';
-		position: absolute;
-		bottom: 0;
-		left: 50%;
-		transform: translateX(-50%);
-		width: 150rpx;
-		height: 4rpx;
-		background-color: #007AFF;
-	}
-
-	:deep(.report-list .r-list) {
-		padding: 0.5rem 0;
-	}
-</style>

src/pages/business/CRM/leave/myApplyDetail.vue

@@ -1,313 +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="example">
-					<uni-forms ref="baseForm" :modelValue="baseFormData" :label-width="80">
-						<uni-forms-item :label="baseFormData.applyType == '请假' ? '请假模式' : '销假模式'"
-							:class="baseFormData.applyType == '请假' ? 'leaveApple' : 'backLeave'">
-							<uni-easyinput v-model="baseFormData.typeName" class="inputborder"
-								:disabled="true" style="text-align: center;" />
-						</uni-forms-item>
-						<uni-forms-item label="开始日期"
-							:class="baseFormData.applyType == '请假' ? 'leaveApple' : 'backLeave'">
-							<uni-easyinput v-model="baseFormData.startDate" class="inputborder"
-								:disabled="true" style="text-align: center;" />
-						</uni-forms-item>
-						<uni-forms-item v-show="baseFormData.typeval == '1'" label="结束日期"
-							:class="baseFormData.applyType == '请假' ? 'leaveApple' : 'backLeave'">
-							<uni-easyinput v-model="baseFormData.endDate" class="inputborder"
-								:disabled="true" style="text-align: center;" />
-						</uni-forms-item>
-						<uni-forms-item label="开始时间" v-show="baseFormData.typeval != '1'"
-							:class="baseFormData.applyType == '请假' ? 'leaveApple' : 'backLeave'">
-							<uni-easyinput v-model="baseFormData.startTime" class="inputborder"
-								:disabled="true" style="text-align: center;" />
-						</uni-forms-item>
-						<uni-forms-item label="结束时间" v-show="baseFormData.typeval != '1'"
-							:class="baseFormData.applyType == '请假' ? 'leaveApple' : 'backLeave'">
-							<uni-easyinput v-model="baseFormData.endTime" class="inputborder"
-								:disabled="true" style="text-align: center;" />
-						</uni-forms-item>
-						<uni-forms-item :label="baseFormData.applyType == '请假' ? '请假天数' : '销假天数'"
-							:class="baseFormData.applyType == '请假' ? 'leaveApple' : 'backLeave'">
-							<uni-easyinput v-model="baseFormData.days" class="inputborder"
-								:disabled="true" style="text-align: center;" />
-						</uni-forms-item>
-						<uni-forms-item label="详细说明"
-							:class="baseFormData.applyType == '请假' ? 'leaveApple custom-label-height' : 'backLeave custom-label-height'">
-							<uni-easyinput type="textarea" v-model="baseFormData.reason"
-								:disabled="true" />
-						</uni-forms-item>
-
-						<view v-if="baseFormData.reviewList.length > 0" class="reviewContent">
-							<view style="display: flex;margin-top: 10rpx;"
-								v-for="(item, index) in baseFormData.reviewList" :key="index">
-								<label style="width: 150rpx;">{{ item.userName }}：</label>
-								<label style="width: 100rpx;color: #03aa03;"
-									v-if="item.reviewResult == '通过'">{{
-									item.reviewResult }}</label>
-								<label style="width: 100rpx;color:  #fa3303;"
-									v-if="item.reviewResult == '驳回'">{{
-									item.reviewResult }}</label>
-								<view style="max-width: 400rpx; overflow-y: auto;">
-									{{ item.rejectReason }}
-								</view>
-
-							</view>
-						</view>
-
-						<view class="footer-con" style="margin-top: 20rpx;"
-							v-if="baseFormData.status == '待审批' || baseFormData.status == '审批中'">
-							<button class="btn-warning" @click="cancelApply()">撤销</button>
-						</view>
-					</uni-forms>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script setup>
-	import {
-		ref,
-		onMounted,
-		reactive
-	} from 'vue'
-	import {
-		onLoad
-	} from '@dcloudio/uni-app'
-	import customHeader from '@/components/customHeader.vue'
-	import customTabs from '@/components/customTabs.vue';
-	import {
-		getDelLeaveApply
-	} from '@/api/crm/activity/activity';
-
-	// 表单ref
-	let baseForm = ref(null);
-
-	let baseFormData = reactive({
-		typeName: "全天",
-		typeval: 1,
-		startDate: getDate(Date.now()),
-		endDate: getDate(Date.now()),
-		days: 1,
-		reason: '',
-		startTime: '08:30',
-		endTime: '12:30',
-		reviewList: []
-	});
-
-	onLoad((options) => {
-		if (options.data) {
-			baseFormData = JSON.parse(decodeURIComponent(options.data))
-			change()
-
-			baseFormData.days = baseFormData.days.toString()
-		}
-	})
-
-	const cancelApply = async () => {
-		try {
-			uni.showModal({
-				title: '',
-				content: '您确定要撤销申请吗？',
-				confirmColor: '#007AFF',
-				cancelColor: '#999999',
-				success: (res) => {
-					if (res.confirm) {
-						getDelLeaveApply({
-							leaveId: baseFormData.leaveId,
-							backId: baseFormData.backId,
-							applyType: baseFormData.applyType
-						}).then(
-							res => {
-								if (res.code == 200) {
-									uni.showToast({
-										title: '撤销成功',
-										duration: 2000
-									});
-									setTimeout(function() {
-										uni.navigateBack({
-											success: () => {
-												uni.$emit('isRefresh');
-											}
-										})
-									}, 500);
-								} else {
-									uni.showToast({
-										title: res.msg,
-										icon: 'none',
-									});
-								}
-							},
-						);
-
-					} else if (res.cancel) {
-
-					}
-				}
-			});
-
-		} catch (err) {
-			console.log('表单验证失败:', err);
-		}
-	};
-
-	function getDate(dateval) {
-		const date = new Date(dateval)
-		const year = date.getFullYear()
-		const month = date.getMonth() + 1
-		const day = date.getDate()
-		return `${year}-${addZero(month)}-${addZero(day)}`
-	}
-
-	function addZero(num) {
-		if (num < 10) {
-			num = `0${num}`
-		}
-		return num
-	}
-
-	let change = () => {
-		if (baseFormData.typeval != 1) {
-			if (baseFormData.typeval == 2) {
-				baseFormData.startTime = '08:30'
-				baseFormData.endTime = '12:30'
-
-				baseFormData.typeName = '前半个班次'
-			} else {
-				baseFormData.startTime = '13:00'
-				baseFormData.endTime = '17:00'
-
-				baseFormData.typeName = '后半个班次'
-			}
-
-			baseFormData.days = 0.5
-		} else {
-			let start = baseFormData.startDate
-			let end = baseFormData.endDate
-			baseFormData.days = getDayDiff(start, end);
-
-			baseFormData.typeName = '全天'
-		}
-
-		baseFormData.days = baseFormData.days.toString()
-	}
-
-	// 计算两个日期的天数差
-	function getDayDiff(startDate, endDate) {
-		// 处理日期格式（兼容iOS）
-		const start = startDate.replace(/-/g, '/');
-		const end = endDate.replace(/-/g, '/');
-
-		const date1 = new Date(start).getTime();
-		const date2 = new Date(end).getTime();
-
-		if (date2 < date1) {
-			return 0
-		}
-
-		// 计算天数差（含边界值+1天）
-		return Math.floor(Math.abs(date2 - date1) / (24 * 3600 * 1000)) + 1;
-	}
-</script>
-
-<style scoped>
-	.white-bg {
-		width: 690rpx;
-		margin: 0;
-		border-radius: 8px 8px 0 0;
-	}
-
-	.white-bg.white-bg-2 {
-		border-radius: 0;
-		margin-bottom: 20rpx;
-	}
-
-	:deep(.tabs-header) {
-		/* background: none !important; */
-		border-bottom: none !important;
-		margin: 0 auto;
-		gap: 5px;
-	}
-
-	:deep(.tab-item) {
-		color: #919191;
-		font-size: 32rpx;
-		font-weight: bold;
-		/* flex:none; */
-		/* margin: 0 -50rpx; */
-		/* padding: 0 50rpx; */
-	}
-
-	:deep(.tab-item:first-child) {
-		text-align: right;
-		margin-left: 230rpx;
-	}
-
-	:deep(.tab-item:last-child) {
-		text-align: left;
-		margin-right: 230rpx;
-	}
-
-	:deep(.tab-item.active) {
-		color: #3384DF;
-		font-weight: bold;
-	}
-
-	:deep(.tab-item.active::after) {
-		width: 100rpx;
-		height: 8rpx;
-	}
-
-	:deep(.is-disabled) {
-		background-color: rgba(255, 255, 255, 1) !important;
-		color: #333;
-	}
-
-	.btn-success {
-		background-color: #67c23a;
-		border: 1px solid #67c23a;
-		color: #fff;
-		/* padding: 0rpx 60rpx; */
-	}
-
-	.btn-warning {
-		background-color: #f6b23c;
-		border: 1px solid #f6b23c;
-		color: #fff;
-		/* padding: 0rpx 60rpx; */
-	}
-
-	.leaveApple {
-		background-color: rgba(103, 194, 58, 0.2);
-	}
-
-	.backLeave {
-		background-color: rgba(230, 162, 60, 0.2);
-	}
-
-	:deep(.uni-forms-item__label) {
-		padding: 0 12px;
-	}
-
-	:deep(.custom-label-height .uni-forms-item__label) {
-		height: 190rpx;
-	}
-
-	::v-deep .uni-easyinput__content-textarea {
-		height: 166rpx !important;
-	}
-
-	.reviewContent {
-		border: 1px solid #dcdfe6;
-		padding: 20rpx;
-	}
-</style>

src/pages/business/CRM/leave/reviewDetail.vue

@@ -1,318 +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="example">
-					<view v-if="baseFormData.applyType != '请假'" style="display: flex;font-size: 14px;padding-top: 32rpx;
-					background-color: #03aa0315;height: 76rpx;">
-						<view class="r-left">
-							<label style="color: #03aa03;font-size: 34rpx;
-							padding: 32rpx;background-color: #dcd8d933;">
-								{{ baseFormData.days.replace('.0', '') }} 天</label>
-						</view>
-						<view style="margin-top: -20rpx;">
-							<view class="r-right" style="margin-left: 30rpx;">
-								{{ baseFormData.startDate }}
-								至
-								{{ baseFormData.endDate }}
-							</view>
-							<view class="r-right" style="margin-left: 30rpx;color: #00000095;">
-								{{ baseFormData.reason }}
-							</view>
-						</view>
-					</view>
-
-					<uni-forms ref="baseForm" :modelValue="baseFormData" :label-width="80" style="margin-top: 10rpx;">
-						<uni-forms-item :label="baseFormData.applyType == '请假' ? '请假模式' : '销假模式'"
-							:class="baseFormData.applyType == '请假' ? 'leaveApple' : 'backLeave'">
-							<uni-easyinput v-model="baseFormData.typeName" class="inputborder" :disabled="true"
-								style="text-align: center;" />
-						</uni-forms-item>
-						<uni-forms-item label="开始日期" :class="baseFormData.applyType == '请假' ? 'leaveApple' : 'backLeave'">
-							<uni-easyinput v-model="baseFormData.startDate" class="inputborder" :disabled="true"
-								style="text-align: center;" />
-						</uni-forms-item>
-						<uni-forms-item v-show="baseFormData.typeval == '1'" label="结束日期"
-							:class="baseFormData.applyType == '请假' ? 'leaveApple' : 'backLeave'">
-							<uni-easyinput v-model="baseFormData.endDate" class="inputborder" :disabled="true"
-								style="text-align: center;" />
-						</uni-forms-item>
-						<uni-forms-item label="开始时间" v-show="baseFormData.typeval != '1'"
-							:class="baseFormData.applyType == '请假' ? 'leaveApple' : 'backLeave'">
-							<uni-easyinput v-model="baseFormData.startTime" class="inputborder" :disabled="true"
-								style="text-align: center;" />
-						</uni-forms-item>
-						<uni-forms-item label="结束时间" v-show="baseFormData.typeval != '1'"
-							:class="baseFormData.applyType == '请假' ? 'leaveApple' : 'backLeave'">
-							<uni-easyinput v-model="baseFormData.endTime" class="inputborder" :disabled="true"
-								style="text-align: center;" />
-						</uni-forms-item>
-						<uni-forms-item :label="baseFormData.applyType == '请假' ? '请假天数' : '销假天数'"
-							:class="baseFormData.applyType == '请假' ? 'leaveApple' : 'backLeave'">
-							<uni-easyinput v-model="baseFormData.days" class="inputborder" :disabled="true"
-								style="text-align: center;" />
-						</uni-forms-item>
-						<uni-forms-item label="详细说明"
-							:class="baseFormData.applyType == '请假' ? 'leaveApple custom-label-height' : 'backLeave custom-label-height'">
-							<uni-easyinput type="textarea" v-model="baseFormData.reason" :disabled="true" />
-						</uni-forms-item>
-						<view class="border-bottom" style="width: 100%;"></view>
-						<view style="margin-top: 20rpx;">
-							<uni-forms-item label="审核意见" class="custom-label-height">
-								<uni-easyinput type="textarea" v-model="rejectReason" />
-							</uni-forms-item>
-						</view>
-					</uni-forms>
-				</view>
-				<view class="footer-con" style="display: flex;" v-if="baseFormData.reviewerId != 0">
-					<button class="btn-warning" type="warning" @click="submit('驳回')" size="mini">驳回</button>
-					<button class="btn-success" type="success" @click="submit('同意')" size="mini">同意</button>
-
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script setup>
-import {
-	ref,
-	onMounted,
-	reactive
-} from 'vue'
-import {
-	onLoad
-} from '@dcloudio/uni-app'
-import customHeader from '@/components/customHeader.vue'
-import customTabs from '@/components/customTabs.vue';
-import {
-	addReviewLeave
-} from '@/api/crm/activity/activity';
-
-// 表单ref
-let baseForm = ref(null);
-
-let rejectReason = ref(null);
-
-let baseFormData = reactive({
-	typeName: "全天",
-	typeval: 1,
-	startDate: getDate(Date.now()),
-	endDate: getDate(Date.now()),
-	days: 1,
-	reason: '',
-	startTime: '08:30',
-	endTime: '12:30',
-});
-
-onLoad((options) => {
-	rejectReason.value = ""
-	if (options.data) {
-		baseFormData = JSON.parse(decodeURIComponent(options.data))
-		change()
-
-		baseFormData.days = baseFormData.days.toString()
-		baseFormData.leaveDays = baseFormData.leaveDays.replace('.0', '')
-
-		if (baseFormData.reviewerIdR != null) {
-			rejectReason.value = baseFormData.rejectReason
-		}
-	}
-})
-
-// 查询详情
-let item = ref({});
-const submit = async (status) => {
-	if (status == '驳回' && (rejectReason.value == null || rejectReason.value == "")) {
-		uni.showToast({
-			title: '请填写驳回原因',
-			duration: 2000
-		});
-	} else {
-		let param = {
-			reviewStatus: status == '同意' ? '完成' : '驳回',
-			reviewResult: status == '同意' ? '通过' : '驳回',
-			rejectReason: rejectReason.value,
-			applyType: baseFormData.applyType,
-			leaveId: baseFormData.leaveId,
-			backId: baseFormData.backId,
-			days: baseFormData.days,
-		}
-		addReviewLeave(param).then(
-			res => {
-				if (res.code == 200) {
-					uni.showToast({
-						title: '提交成功',
-						duration: 2000
-					});
-					setTimeout(function () {
-						uni.navigateBack({
-							success: () => {
-								uni.$emit('isRefresh');
-							}
-						})
-					}, 500);
-				} else {
-					uni.showToast({
-						title: res.msg,
-						icon: 'none',
-					});
-				}
-			},
-		);
-	}
-}
-
-function getDate(dateval) {
-	const date = new Date(dateval)
-	const year = date.getFullYear()
-	const month = date.getMonth() + 1
-	const day = date.getDate()
-	return `${year}-${addZero(month)}-${addZero(day)}`
-}
-
-function addZero(num) {
-	if (num < 10) {
-		num = `0${num}`
-	}
-	return num
-}
-
-let change = () => {
-	if (baseFormData.typeval != 1) {
-		if (baseFormData.typeval == 2) {
-			baseFormData.startTime = '08:30'
-			baseFormData.endTime = '12:30'
-
-			baseFormData.typeName = '前半个班次'
-		} else {
-			baseFormData.startTime = '13:00'
-			baseFormData.endTime = '17:00'
-
-			baseFormData.typeName = '后半个班次'
-		}
-
-		baseFormData.days = 0.5
-	} else {
-		let start = baseFormData.startDate
-		let end = baseFormData.endDate
-		baseFormData.days = getDayDiff(start, end);
-
-		baseFormData.typeName = '全天'
-	}
-
-	baseFormData.days = baseFormData.days.toString()
-}
-
-// 计算两个日期的天数差
-function getDayDiff(startDate, endDate) {
-	// 处理日期格式（兼容iOS）
-	const start = startDate.replace(/-/g, '/');
-	const end = endDate.replace(/-/g, '/');
-
-	const date1 = new Date(start).getTime();
-	const date2 = new Date(end).getTime();
-
-	if (date2 < date1) {
-		return 0
-	}
-
-	// 计算天数差（含边界值+1天）
-	return Math.floor(Math.abs(date2 - date1) / (24 * 3600 * 1000)) + 1;
-}
-</script>
-
-<style scoped>
-.white-bg {
-	width: 690rpx;
-	margin: 0;
-	border-radius: 8px 8px 0 0;
-}
-
-.white-bg.white-bg-2 {
-	border-radius: 0;
-	margin-bottom: 20rpx;
-}
-
-:deep(.tabs-header) {
-	/* background: none !important; */
-	border-bottom: none !important;
-	margin: 0 auto;
-	gap: 5px;
-}
-
-:deep(.tab-item) {
-	color: #919191;
-	font-size: 32rpx;
-	font-weight: bold;
-	/* flex:none; */
-	/* margin: 0 -50rpx; */
-	/* padding: 0 50rpx; */
-}
-
-:deep(.tab-item:first-child) {
-	text-align: right;
-	margin-left: 230rpx;
-}
-
-:deep(.tab-item:last-child) {
-	text-align: left;
-	margin-right: 230rpx;
-}
-
-:deep(.tab-item.active) {
-	color: #3384DF;
-	font-weight: bold;
-}
-
-:deep(.tab-item.active::after) {
-	width: 100rpx;
-	height: 8rpx;
-}
-
-:deep(.is-disabled) {
-	background-color: rgba(255, 255, 255, 1) !important;
-	color: #333;
-}
-
-.btn-success {
-	background-color: #67d23a;
-	border: 1px solid #67d23a;
-	color: #fff;
-	/* padding: 0rpx 60rpx; */
-}
-
-.btn-warning {
-	background-color: #f6b23c;
-	border: 1px solid #f6b23c;
-	color: #fff;
-	/* padding: 0rpx 60rpx; */
-}
-
-.leaveApple {
-	background-color: rgba(103, 194, 58, 0.2);
-}
-
-.backLeave {
-	background-color: rgba(230, 162, 60, 0.2);
-}
-
-:deep(.uni-forms-item__label) {
-	padding: 0 12px;
-}
-
-:deep(.custom-label-height .uni-forms-item__label) {
-	height: 190rpx;
-}
-
-::v-deep .uni-easyinput__content-textarea {
-	height: 166rpx !important;
-}
-</style>

src/pages/business/CRM/leave/reviewLeave.vue

@@ -1,372 +0,0 @@
-<template>
-	<view class="con-body">
-		<view class="con-bg">
-			<customHeader ref="customHeaderRef" :title="'我的审批'" :leftFlag="true">
-			</customHeader>
-			<!-- #ifdef H5 -->
-			<view style="height:50rpx"></view>
-			<!-- #endif -->
-
-			<!-- 高度来避免头部遮挡 -->
-			<view class="top-height"></view>
-
-			<view class="white-bg">
-				<view class="tabs-container">
-					<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>
-
-					<view class="tabs-scorll">
-						<view class="tabs-header">
-							<view v-for="(tab, index) in tabHeaderList" :key="index"
-								:class="['tab-item-main', { 'active': activeTabHeader === index }]"
-								@click="switchTabHeader(index)">
-								{{ tab }}
-							</view>
-						</view>
-					</view>
-					<view class="tabs-scorll">
-						<view class="tabs-header">
-							<view v-for="(tab, index) in tabList" :key="index"
-								:class="['tab-item', { 'active': activeTab === index }]" @click="switchTab(index)">
-								{{ tab }}
-							</view>
-						</view>
-					</view>
-
-					<view class="white-bg-2" v-for="item in detailList">
-						<view class="report-list" @click="showDetail(item)">
-							<view class="report-list">
-								<view class="title" style="font-size: 30rpx;margin-top: 20rpx;">
-									{{ item.typeval == '1' ? '全天' : item.typeval == '2' ? '前半个班次' : '后半个班次' }}
-
-									<label v-if="item.applyType == '请假'" style="float: right;color: #03ca03;">
-										{{ item.applyType }}</label>
-									<label v-if="item.applyType == '销假'" style="float: right;color: #eaa303;">
-										{{ item.applyType }}</label>
-								</view>
-								<view class="r-list">
-									<view class="r-left">姓名</view>
-									<view class="r-right">{{ item.applyUserName }} </view>
-								</view>
-								<view class="r-list">
-									<view class="r-left">{{ item.applyType }}日期</view>
-									<view class="r-right">{{ item.startDate }} 至 {{ item.endDate }}
-										（ <label v-if="item.applyType == '请假'" style="color: #03ca03;">
-											{{ item.days.replace('.0', '') }}天</label>
-										<label v-if="item.applyType == '销假'" style="color: #eaa303;">
-											{{ item.days.replace('.0', '') }}天</label> ）
-									</view>
-								</view>
-
-								<view class="r-list">
-									<view class="r-left">详细说明</view>
-									<view v-if="item.reason && item.reason.length <= 18" class="r-right">{{ item.reason
-										}}</view>
-								</view>
-								<view class="r-list" style="margin-top: -30rpx;"
-									v-if="item.reason && item.reason.length > 18">
-									<view class="r-right">{{ item.reason }}</view>
-								</view>
-
-							</view>
-							<view class="border-bottom" style="margin: 20rpx 0;"></view>
-						</view>
-					</view>
-					<view class="uni-pagination-box"><uni-pagination show-icon :page-size="pageSize"
-							:current="pageCurrent" :total="total" @change="change" /></view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script setup>
-import {
-	ref,
-	onMounted,
-	reactive
-} from 'vue'
-import {
-	onShow
-} from '@dcloudio/uni-app'
-import customHeader from '@/components/customHeader.vue'
-import {
-	getNavBarPaddingTop
-} from '@/utils/system.js'
-
-import {
-	getMyReviewList
-} from '@/api/crm/activity/activity';
-
-// 获取导航栏高度用于内容区域padding
-const navBarPaddingTop = ref(0);
-onMounted(() => {
-	navBarPaddingTop.value = getNavBarPaddingTop() * 2;
-	getlist();
-})
-
-onShow(() => {
-	uni.$on('isRefresh', function () {
-		isRefresh.value = true
-		getlist();
-	})
-})
-
-let isRefresh = ref(false)
-
-let searchValue = ref(null)
-// 查询搜索跳转
-let handleSearch = () => {
-	isRefresh.value = true
-	getlist();
-}
-
-const pageSize = ref(4);
-const pageCurrent = ref(1);
-const loading = ref(false);
-let tabList = ref([])
-let tabHeaderList = ref(['待审核', '已审核'])
-
-let total = ref(0);
-const totalAll = ref(0);
-const totalReview = ref(0);
-const totalReviewA = ref(0);
-const totalReviewB = ref(0);
-const totalReject = ref(0);
-const totalPass = ref(0);
-
-
-let activeTab = ref(0);
-let activeTabHeader = ref(0);
-
-let detailList = ref([])
-let detailLists = ref([])
-
-//请假
-let reviewListA = ref([])
-//销假
-let reviewListB = ref([])
-//驳回
-let rejectList = ref([])
-//通过
-let passList = ref([])
-//已审批
-let reviewList = ref([])
-
-const getlist = async () => {
-	loading.value = true
-
-	let res = await getMyReviewList({
-		applyUserName: searchValue.value
-	});
-	detailLists.value = res.rows;
-	reviewListA.value = res.rows.filter(t => (t.status == '待审批' || t.status == '审批中') && t
-		.applyType == '请假' && t.reviewerIdR == null)
-	reviewListB.value = res.rows.filter(t => (t.status == '待审批' || t.status == '审批中') && t
-		.applyType == '销假' && t.reviewerIdR == null)
-
-	rejectList.value = res.rows.filter(t => t.status == '驳回' && t.reviewerIdR != null)
-	passList.value = res.rows.filter(t => t.status != '驳回' && t.reviewerIdR != null)
-
-	reviewList.value = res.rows.filter(t => t.reviewerIdR != null)
-
-	total.value = res.total
-
-	totalReviewA.value = reviewListA.value.length
-	totalReviewB.value = reviewListB.value.length
-
-	totalReview.value = totalReviewA.value + totalReviewB.value
-	totalReject.value = rejectList.value.length
-	totalPass.value = passList.value.length
-
-	totalAll.value = reviewList.value.length
-
-	if (isRefresh.value == false) {
-		switchTabHeader(0)
-		switchTab(0)
-	}
-
-	if (activeTabHeader.value == 0) {
-		tabList.value = ['请假(' + totalReviewA.value + ')', '销假(' + totalReviewB.value + ')']
-	} else if (activeTabHeader.value == 1) {
-		let all = '全部(' + totalAll.value + ')'
-		let pass = '已批准(' + totalPass.value + ')'
-		let reject = '已驳回(' + totalReject.value + ')'
-
-		tabList.value = [all, pass, reject]
-	}
-
-	change({
-		current: 1
-	})
-
-	loading.value = false
-}
-
-const switchTab = (index) => {
-	isRefresh.value = false
-	activeTab.value = index
-
-	change({
-		current: 1
-	})
-}
-
-const switchTabHeader = (index) => {
-	isRefresh.value = false
-	tabList.value = []
-	activeTabHeader.value = index
-
-	if (activeTabHeader.value == 0) {
-		tabList.value = ['请假(' + totalReviewA.value + ')', '销假(' + totalReviewB.value + ')']
-	} else if (activeTabHeader.value == 1) {
-		let all = '全部(' + totalAll.value + ')'
-		let pass = '已批准(' + totalPass.value + ')'
-		let reject = '已驳回(' + totalReject.value + ')'
-
-		tabList.value = [all, pass, reject]
-	}
-
-	switchTab(0)
-}
-
-// 分页触发
-let change = (e) => {
-	pageCurrent.value = e.current
-
-	let end = pageSize.value * e.current
-	let start = end - pageSize.value
-
-	if (activeTabHeader.value == 0) {
-		if (activeTab.value == 0) {
-			detailList.value = reviewListA.value.slice(start, end)
-			total.value = totalReviewA.value
-		} else if (activeTab.value == 1) {
-			detailList.value = reviewListB.value.slice(start, end)
-			total.value = totalReviewB.value
-		}
-	} else if (activeTabHeader.value == 1) {
-		if (activeTab.value == 0) {
-			detailList.value = reviewList.value.slice(start, end)
-			total.value = totalAll.value
-		} else if (activeTab.value == 1) {
-			detailList.value = passList.value.slice(start, end)
-			total.value = totalPass.value
-		} else if (activeTab.value == 2) {
-			detailList.value = rejectList.value.slice(start, end)
-			total.value = totalReject.value
-		}
-	}
-}
-
-// 跳转
-let showDetail = (item) => {
-	uni.navigateTo({
-		url: "/pages/business/CRM/leave/reviewDetail?data=" + encodeURIComponent(JSON
-			.stringify(item))
-	})
-}
-</script>
-
-<style lang="scss" scoped>
-.apply-row {
-	margin: 5px;
-}
-
-.border-bottom {
-	margin: 5px;
-	width: 100%;
-}
-
-.tabs-header {
-	display: flex;
-	height: 80rpx;
-	background: #fff;
-	border-bottom: 1rpx solid #eee;
-}
-
-.tab-item {
-	flex: 1;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	font-size: 28rpx;
-	color: #666;
-}
-
-.tab-item.active {
-	color: #007AFF;
-	position: relative;
-}
-
-.tab-item.active::after {
-	content: '';
-	position: absolute;
-	bottom: 0;
-	left: 50%;
-	transform: translateX(-50%);
-	width: 200rpx;
-	height: 4rpx;
-	background-color: #007AFF;
-}
-
-.tab-item-main {
-	flex: 1;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	font-size: 30rpx;
-	color: #666;
-}
-
-.tab-item-main.active {
-	color: #007AFF;
-	position: relative;
-}
-
-.tab-item-main.active::after {
-	content: '';
-	position: absolute;
-	bottom: 0;
-	left: 50%;
-	transform: translateX(-50%);
-	width: 300rpx;
-	height: 4rpx;
-	background-color: #007AFF;
-}
-
-:deep(.report-list .r-list) {
-	padding: 0.5rem 0;
-}
-
-.search {
-	display: flex;
-}
-
-.search .btn-search {
-	border: none;
-	background: none;
-	line-height: normal;
-	color: #666;
-	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;
-}
-</style>

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

@@ -168,8 +168,8 @@
             <uni-forms-item label="爱好" name="hobby" class="uni-forms-item is-direction-top is-top">
               <!-- 索引：hobbyIndex 范围：hobbyList 响应：handleHobbyChange-->
               <uni-easyinput v-model="formData.hobby" placeholder="请输入爱好" :disabled="!editable"/>
-              <multipleSelect ref="hobbySelectRef" :multiple="true" downInner :value="hobbyIds" :options="hobbyList"
+              <multipleSelect :multiple="true" :value="hobbyIndex" downInner :options="hobbyList"
-                              @change="handleHobbyChange" :slabel="'name'"
+                              @change="handleHobbyChange"  :slabel="'name'"
 
               ></multipleSelect><!--placeholder="请选择爱好标签"-->
             </uni-forms-item>
@@ -439,29 +439,20 @@ let handleThinkLevelChange = (e) => {
 // 系统推荐等级
 let recommendLevel = ref("");
 let getRecommendLevel = async () => {
-  if (formData.value.cusEstate) {
+  if (formData.value.cusEstate && formData.value.functionalRequirements) {
     let {cusEstate, functionalRequirements} = formData.value;
     let param = {cusEstate, functionalRequirements};
     if (formData.value.salesmanThinkLevel) {
       param.personnelLevel = formData.value.salesmanThinkLevel;
     }
-    let res = await getCustomerLevel(param)
+    let res = await getCustomerLevel(param).catch(err => {
-    /*.catch(err => {
       console.error(err, "客户的系统推荐等级获取失败")
-    })*/
+    })
-    try{
+    if (!res.systemRecommendationLevel) {
-      if(res.data.systemRecommendationLevel){
+      recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
-        formData.value.systemThinkLevel = res.data.systemRecommendationLevel;
+      console.log(formData.value.systemThinkLevel + "???")
-      }else{
-        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐";
-      }
-    }catch(e){
-      if (res.systemRecommendationLevel) {
-        formData.value.systemThinkLevel = res.systemRecommendationLevel;
-      }else{
-        recommendLevel.value = "客户无等级信息，暂无法进行等级推荐"
-      }
     }
+    formData.value.systemThinkLevel = res.systemRecommendationLevel;
   } else {
     recommendLevel.value = "无公司等级信息，无法推荐等级";
   }
@@ -490,7 +481,8 @@ let handleUserTypeChange = (e) => {
 
 // 选择日期
 function handleTenureTimeChange(e) {
-  formData.value.tenureTime = e;
+  let {value} = e.detail;
+  formData.value.tenureTime = value;
 }
 
 // 需求层次索引
@@ -513,19 +505,17 @@ let handleDevelopChange = e => {
 
 // 选择生日
 function handleBirthdayChange(e) {
-  formData.value.birthday = e;
+  let{value} = e.detail
+  formData.value.birthday = value;
 }
 
 // 爱好标签索引
-let hobbyIds = ref([]);
+let hobbyIndex = reactive([]);
-let hobbies = ref([]);
 // 选择爱好标签
-const handleHobbyChange = (items, ids) => {
+const handleHobbyChange = (item, value) => {
-  console.log('选择爱好', items, ids);
+  // console.log("爱好", item, value);
-  hobbyIds.value = [];
+  hobbyIndex = value;
-  hobbies.value = items;
 };
-
 // 选择
 const handleNativeChange = (e) => {
   formData.value.nativec = (e.detail.value.map(item => {
@@ -549,18 +539,16 @@ let handleWorkingStatusChange = e => {
 }
 
 let submitForm = async () => {
-  let hobbyTags = hobbies.value.map(it => {
+  let hobbyTags = hobbyIndex.map(it => {
-    let {name} = it;
+    let {name} = hobbyList[it];
     return name;
   })
+  formData.value.iphone = formData.value.mobilePhone; // 特殊处理
   const hobbyTagString = hobbyTags.join('，');
   console.log(hobbyTagString);
   if (hobbyTagString || formData.value.hobby) {
-    formData.value.hobby = hobbyTagString ? (formData.value.hobby ? formData.value.hobby + '，' : '') + hobbyTagString : formData.value.hobby;
+    formData.value.hobby = formData.value.hobby ? formData.value.hobby + '，' + hobbyTagString : hobbyTagString;
   }
-
-  formData.value.iphone = formData.value.mobilePhone; // 特殊处理
-
   // console.log(formData.value, "校验表单数据")
   // console.log(recommendLevel);
   formData.value.cusName = customerUser.value.cusName;
@@ -602,11 +590,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

@@ -11,7 +11,7 @@
       </customHeader>
 
       <!-- 高度来避免头部遮挡 -->
-      <view class="top-height"></view>
+      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
 
       <!-- 正文内容 -->
       <view class="all-body">
@@ -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

@@ -8,18 +8,11 @@
 			<view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
 
 			<view class="inner-box">
-				<view class="cu-form-group" style="height: 200px;padding:10px;">
+				<view class="cu-form-group">
-					<uni-forms ref="formRef" :model="form" label-width="100px">
+					<textarea v-model="form.remark" placeholder="请输入签到备注内容" name="input"></textarea>
-						<uni-forms-item label="签到备注内容" name="understandTheWay"
-							class="uni-forms-item is-direction-top is-top">
-							<uni-easyinput type="textarea" autoHeight v-model="form.remark" placeholder="请输入签到备注内容"
-								class="form-texarea" />
-						</uni-forms-item>
-					</uni-forms>
-
-					<view class="btn-box" style="padding-top: 50px;">
-					<button type="primary" @click="addInsertMapClockIn">签到</button>
 				</view>
+				<view class="btn-box">
+					<button type="primary" @click="addInsertMapClockIn">签到</button>
 				</view>
 			</view>
 		</view>
@@ -29,31 +22,31 @@
 <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({
-	addressForStart: null,
+		addressForStart: null,
-	addressForEnd: null,
+		addressForEnd: null,
-	createId: null,
+		createId: null,
-	staffName: null,
+		staffName: null,
-	visistCode: null,
+		visistCode: null,
-	visistId: null,
+		visistId: null,
-	mapId: null,
+		mapId: null,
-	remark: null
+		remark: null
-})
+	})
 
 // 获取导航栏高度用于内容区域padding
 const navBarPaddingTop = ref(0);
 onMounted(() => {
-	navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
 })
 
 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

@@ -1,171 +1,164 @@
 <template>
-  <view class="con-body">
+    <view class="con-body">
-    <view class="con-bg">
+        <view class="con-bg">
-      <!-- 头部 -->
+            <!-- 头部 -->
-      <customHeader ref="customHeaderRef" :title="'考勤查看'" :leftFlag="true" :rightFlag="false"></customHeader>
+            <customHeader ref="customHeaderRef" :title="'考勤查看'" :leftFlag="true" :rightFlag="false"></customHeader>
 
-      <!-- 高度来避免头部遮挡 -->
+            <!-- 高度来避免头部遮挡 -->
-      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+            <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
 
-      <!-- 正文内容 -->
+            <!-- 正文内容 -->
-      <view>
+            <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">
+                <view class="white-bg margin-bottom20" v-for="(item, index) in list">
-          <view class="report-list">
+                    <view class="report-list" >
-            <view class="title"
+                            <view class="title"
-                  :style="{color: MapType[item.mapType].color}"
+                            :style="{color: item.mapType == 1 ? '#F5813A' : '#1989FA'}"
-            >类型：{{ MapType[item.mapType].label }}
+                            >类型：{{ item.mapType == 1 ? '签到' : '打卡' }}</view>
-            </view><!--item.mapType == 1 ? '#F5813A' : '#1989FA'}-->
+                            <view class="r-list">
-            <view class="r-list">
+                                <view class="r-left">开始签到时间</view>
-              <view class="r-left">开始签到时间</view>
+                                <view class="r-right">{{ item.goVisistStartTime }}</view>
-              <view class="r-right">{{ item.goVisistStartTime }}</view>
+                            </view>
-            </view>
+                            <view class="border-bottom"></view>
-            <view class="border-bottom"></view>
+                            <view class="r-list">
-            <view class="r-list">
+                                <view class="r-left">开始签到地点</view>
-              <view class="r-left">开始签到地点</view>
+                                <view class="r-right">{{ item.addressForStart }}</view>
-              <view class="r-right">{{ item.addressForStart }}</view>
+                            </view>
-            </view>
+                            <view class="border-bottom"></view>
-            <view class="border-bottom"></view>
+                            <view class="r-list">
-            <view class="r-list">
+                                <view class="r-left">结束签到时间</view>
-              <view class="r-left">结束签到时间</view>
+                                <view class="r-right">{{ item.goVisistEndTime }}</view>
-              <view class="r-right">{{ item.goVisistEndTime }}</view>
+                            </view>
-            </view>
+                            <view class="border-bottom"></view>
-            <view class="border-bottom"></view>
+                            <view class="r-list">
-            <view class="r-list">
+                                <view class="r-left">结束签到地点</view>
-              <view class="r-left">结束签到地点</view>
+                                <view class="r-right">{{ item.addressForEnd }}</view>
-              <view class="r-right">{{ item.addressForEnd }}</view>
+                            </view>
-            </view>
+                            <view class="r-list" v-if="item.remark != null">
-            <view class="r-list" v-if="item.remark != null">
+                                <view class="r-left">备注内容</view>
-              <view class="r-left">备注内容</view>
+                                <view class="r-right">{{ item.remark }}</view>
-              <view class="r-right">{{ item.remark }}</view>
+                            </view>
-            </view>
+                        </view>
-          </view>
+                    </view>
+                </view>
         </view>
-      </view>
     </view>
-  </view>
 </template>
 
 <script setup>
 import customHeader from '@/components/customHeader.vue'
-import {getNavBarPaddingTop} from '@/utils/system.js'
+import { getNavBarPaddingTop } from '@/utils/system.js'
-import {onMounted, ref} from 'vue';
+import { onMounted, ref } from 'vue';
-import {getDate} from '@/utils/datetime.js'
+import { getDate } from '@/utils/datetime.js'
-import {CheckInInformationViewing} from '../../../../api/crm/activity/map';
+import { CheckInInformationViewing } from '../../../../api/crm/activity/map';
-import {onLoad} from '@dcloudio/uni-app';
+import { onLoad } from '@dcloudio/uni-app';
-import {MapType} from "./dataMap";
 
 const navBarPaddingTop = ref(0);
 onMounted(() => {
-  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
 })
 
 // 开始时间
 let startDate = getDate('start');
 // 结束时间，间隔10年
 let endDate = getDate('end');
-let defaultDate = getDate({format: true})
+let defaultDate = getDate({ format: true })
 let bindDateChange = (e) => {
-  defaultDate = e.detail.value
+    defaultDate = e.detail.value
 }
 
 //获取list集合信息
 let list = ref([])
-
 function getList() {
-  CheckInInformationViewing().then(res => {
+    CheckInInformationViewing().then(res => {
-    list.value = res.rows
+        list.value = res.rows
-  })
+    })
 }
 
 onLoad(() => {
-  getList()
+    getList()
 })
 
+
+
+
+
 </script>
 
 <style scoped>
-.r-left {
-  min-width: 6em;
-}
-
-.con-bg {
-  overflow-y: auto;
-}
-
 .search {
-  display: flex;
+    display: flex;
-  margin-bottom: 30rpx;
+    margin-bottom: 30rpx;
-  padding: 0 30rpx;
+    padding: 0 30rpx;
 }
 
 .search .btn-search {
-  border: none;
+    border: none;
-  background: none;
+    background: none;
-  color: #fff;
+    color: #fff;
-  display: flex;
+    display: flex;
-  align-items: center;
+    align-items: center;
-  justify-content: center;
+    justify-content: center;
-  font-size: 28rpx;
+    font-size: 28rpx;
-  /* 调整为更合适的字号 */
+    /* 调整为更合适的字号 */
-  font-weight: normal;
+    font-weight: normal;
-  /* 如果不需要加粗，可以去掉 bolder */
+    /* 如果不需要加粗，可以去掉 bolder */
-  margin-left: 0rpx;
+    margin-left: 0rpx;
-  padding: 0 20rpx;
+    padding: 0 20rpx;
-  /* 调整 padding，去掉 padding-top */
+    /* 调整 padding，去掉 padding-top */
-  height: 56rpx;
+    height: 56rpx;
-  /* 固定高度，确保与 picker 对齐 */
+    /* 固定高度，确保与 picker 对齐 */
-  cursor: pointer;
+    cursor: pointer;
 }
 
 .search .btn-search::after {
-  display: none;
+    display: none;
 }
 
 .search .picker-bg {
-  display: flex;
+    display: flex;
-  background-color: #6FA2F8;
+    background-color: #6FA2F8;
-  border-radius: 25px;
+    border-radius: 25px;
-  color: #fff;
+    color: #fff;
-  font-size: 28rpx;
+    font-size: 28rpx;
-  padding: 0rpx 20rpx;
+    padding: 0rpx 20rpx;
-  /* #ifndef APP-PLUS */
+    /* #ifndef APP-PLUS */
-  padding: 10rpx 20rpx 0 20rpx;
+    padding: 10rpx 20rpx 0 20rpx;
-  /* #endif */
+    /* #endif */
-  margin-right: 20rpx;
+    margin-right: 20rpx;
 }
 
 .search .picker-bg .picker {
-  display: flex;
+    display: flex;
-  align-items: center;
+    align-items: center;
-  /* #ifndef APP-PLUS */
+    /* #ifndef APP-PLUS */
-  padding-top: 2rpx;
+    padding-top: 2rpx;
-  /* #endif */
+    /* #endif */
 }
 
 .search .picker-bg .picker .uni-icons {
-  color: #fff !important;
+    color: #fff !important;
 }
 
 .search .picker-bg .picker .uni-icons:first-child {
-  margin-right: 10rpx;
+    margin-right: 10rpx;
 }
 
 .search .picker-bg .picker .uniui-down {
-  margin-left: 10rpx;
+    margin-left: 10rpx;
 }
 </style>

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

@@ -1,9 +0,0 @@
-/**
- * 签到/打卡/出差
- * @type {{"1": {label: 签到, bgc: string}, "2": {label: 打卡, bgc: string}, "3": {label: 出差, bgc: string}}}
- */
-export const MapType = {
-    '1': {label:'签到', color:'#F5813A'},
-    '2': {label:'打卡', color:'#1989FA'},
-    '3': {label:'出差', color:'#42b883'}
-}

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

@@ -1,183 +1,109 @@
 <template>
-  <view class="con-body">
+    <view class="con-body">
-    <view class="con-bg">
+        <view class="con-bg">
-      <!-- 头部 -->
+            <!-- 头部 -->
-      <customHeader ref="customHeaderRef" :title="'签到打卡'" :leftFlag="true" :rightFlag="false"></customHeader>
+            <customHeader ref="customHeaderRef" :title="'签到打卡'" :leftFlag="true" :rightFlag="false"></customHeader>
 
-      <!-- 高度来避免头部遮挡 -->
+            <!-- 高度来避免头部遮挡 -->
-      <view class="top-height"></view>
+            <view class="top-height"></view>
 
-      <!-- 正文内容 -->
+            <!-- 正文内容 -->
-      <view class="white-bg">
+            <view class="white-bg">
-        <image src="../../../../static/images/business/btn-qd.png" class="btn-image" @click="handleCheckIn"/>
+                <image src="../../../../static/images/business/btn-qd.png" class="btn-image" @click="handleCheckIn" />
-<!--        <image src="../../../../static/images/business/btn-dk.png" class="btn-image" @click="handleClockIn"/>-->
+                <image src="../../../../static/images/business/btn-dk.png" class="btn-image" @click="handleClockIn" />
-        <image src="../../../../static/images/business/btn-dk.png" class="btn-image" @click="handleClick"/>
+                <view class="check-desc">
-        <view class="check-desc">
+                    业务人员可通过<text class="font-orange">签到</text>或<text
-          业务人员可通过
+                        class="font-blue">打卡</text>进行行为记录，该时间会和走访报告中的时间进行关联，便于查看。
-          <text class="font-orange">签到</text>
+                </view>
-          或
+            </view>
-          <text
-              class="font-blue">打卡
-          </text>
-          进行行为记录，该时间会和走访报告中的时间进行关联，便于查看。
         </view>
-      </view>
+
+        <!-- 打卡遮罩层 -->
+        <!-- <view class="check-con" v-if="checkFlag">
+            <view class="check-in">
+                <view class="check-tip">打卡</view>
+                <view class="check-title">确定要在此处打卡吗？</view>
+                <view class="check-location">
+                    <uni-icons type="location-filled" size="30" color="#0395E0"></uni-icons> 亚洲金融大厦
+                </view>
+                <view class="check-address">北京市朝阳区天辰东路1号院</view>
+                <view class="check-footer">
+                    <button class="btn-default" type="default" @click="handleCancel" size="mini">取 消</button>
+                    <button class="btn-primary" type="primary" @click="handleSubmit" size="mini">确 定</button>
+                </view>
+            </view>
+        </view> -->
+
     </view>
-    <closeable-modal v-model="modalVisible"
-                     title="确认在此处打卡？"
-                     :content="form.addressForStart"
-                     closeTip="轻触空白处关闭"
-                     cancelText="出差"
-                     confirmText="未出差"
-                     contentAlign="center"
-                     @confirm="handleConfirm"
-                     @cancel="handleCancel"/>
-
-    <!-- 打卡遮罩层 -->
-    <!-- <view class="check-con" v-if="checkFlag">
-        <view class="check-in">
-            <view class="check-tip">打卡</view>
-            <view class="check-title">确定要在此处打卡吗？</view>
-            <view class="check-location">
-                <uni-icons type="location-filled" size="30" color="#0395E0"></uni-icons> 亚洲金融大厦
-            </view>
-            <view class="check-address">北京市朝阳区天辰东路1号院</view>
-            <view class="check-footer">
-                <button class="btn-default" type="default" @click="handleCancel" size="mini">取 消</button>
-                <button class="btn-primary" type="primary" @click="handleSubmit" size="mini">确 定</button>
-            </view>
-        </view>
-    </view> -->
-
-  </view>
 </template>
 
 <script setup>
-import {ref, onMounted, reactive} from 'vue'
+import { ref, onMounted, reactive } from 'vue'
 import customHeader from '@/components/customHeader.vue'
-import {addStartMapForClockIn, businessTripClockIn} from '../../../../api/crm/activity/map';
+import { addStartMapForClockIn } from '../../../../api/crm/activity/map';
-import CloseableModal from "@/components/closeableModal.vue";
-import {MapApiConfig} from "../../../../constants/mapApiConstants";
 
 let form = reactive({
-  addressForStart: null,
+    addressForStart: null,
-  addressForEnd: null,
+    addressForEnd: null,
-  createId: null,
+    createId: null,
-  staffName: null,
+    staffName: null,
-  visistCode: null,
+    visistCode: null,
-  visistId: null,
+    visistId: null,
-  remark: null,
+    mapId: null
-  mapId: null
 })
 // 签到
 let handleCheckIn = () => {
-  uni.navigateTo({
+    uni.navigateTo({
-    url: './addRearkSignIn'
+        url: './addRearkSignIn'
-  })
+    })
 }
 // 打卡
-// let handleClockIn = () => {
+let handleClockIn = () => {
-//   uni.getLocation({
+    uni.getLocation({
-//     type: 'wgs84',
+        type: 'wgs84',
-//     success: (res) => {
+        success: (res) => {
-//       const latiude = res.latitude;
+            const latiude = res.latitude;
-//       const longitude = res.longitude;
+            const longitude = res.longitude;
-//       //进行解析
+            //进行解析
-//       inverseGeocoding(latiude, longitude);
+            inverseGeocoding(latiude, longitude);
-//     },
+        },
-//     fail: function (err) {
+        fail: function (err) {
-//       console.log("获取地址失败" + err)
+            console.log("获取地址失败" + err)
-//     }
+        }
-//   })
-// }
-let modalVisible = ref(false);
-let handleClick = () => {
-  uni.getLocation({
-    type: 'wgs84',
-    success: (res) => {
-      const latitude = res.latitude;
-      const longitude = res.longitude;
-      console.log('纬度:',latitude,'，经度:', longitude);
-      inverseGeocoding(latitude, longitude);
-    },
-    fail: function (err) {
-      console.log("获取地址失败" + err)
-    }
-  })
-
-
-}
-// 反馈提示
-const feedback = (res, callback)=>{
-  if(res.code===200){
-    if(callback) callback();
-    uni.showToast({
-      title: MapApiConfig.OTHER.typeName === form.addressForStart ? MapApiConfig.OTHER.typeName : res.msg,
-      icon: 'success'
     })
-    setTimeout(()=>{
-      uni.navigateBack(1);
-    }, 500)
-  }
-  else{
-    uni.showToast({
-      icon: 'none',
-      title: res.msg
-    })
-  }
-}
-// 出差
-const handleCancel = () => {
-  businessTripClockIn(form).then(res=>{
-   feedback(res,()=>console.log('出差打卡成功'));
-  }).catch(e=>{
-    console.log(e);
-  })
-}
-// 打卡
-let handleConfirm = () => {
-  addStartMapForClockIn(form).then(res=>{
-   feedback(res, ()=>console.log('打卡成功'));
-  }).catch(e=>{
-    console.log(e)
-  })
 }
 
-// 判定是否在范围内
 function isWithinRange(lat, lon, centerLat, centerLon, rangeKm) {
-  const distance = haversineDistance(centerLat, centerLon, lat, lon);
+    const distance = haversineDistance(centerLat, centerLon, lat, lon);
-  return distance <= rangeKm;
+    return distance <= rangeKm;
 }
-
 function haversineDistance(lat1, lon1, lat2, lon2, radius = 6371) {
-  const dLat = degToRad(lat2 - lat1);
+    const dLat = degToRad(lat2 - lat1);
-  const dLon = degToRad(lon2 - lon1);
+    const dLon = degToRad(lon2 - lon1);
-  const a =
+    const a =
-      Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+        Math.sin(dLat / 2) * Math.sin(dLat / 2) +
-      Math.cos(degToRad(lat1)) * Math.cos(degToRad(lat2)) *
+        Math.cos(degToRad(lat1)) * Math.cos(degToRad(lat2)) *
-      Math.sin(dLon / 2) * Math.sin(dLon / 2);
+        Math.sin(dLon / 2) * Math.sin(dLon / 2);
-  const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+    const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-  return radius * c; // 距离，单位：公里
+    return radius * c; // 距离，单位：公里
 }
-
-// 角度转弧度
 function degToRad(deg) {
-  return deg * (Math.PI / 180);
+    return deg * (Math.PI / 180);
 }
 
 //解析地址
-function inverseGeocoding(latitude, longitude) {
+function inverseGeocoding(latiude, longitude) {
-  uni.showLoading();
+    let points = longitude + ',' + latiude
-    const apiURL = MapApiConfig.URL;
+    const apiURL = 'https://tiles.geovisearth.com/geo/v1/geocode/regeo';
     const params = {
-        lat: latitude,
+        lat: latiude,
         lng: longitude,
         radius: 1000,
         pageSize: 1,
         currentPage: 1,
         //classify: 220100
     };
-    const token = MapApiConfig.token;
+    const token = '66c87c897f0251295afdc794e4fbf73046a070338a726fe04f06cece6cb1ffdf';
     uni.request({
         url: apiURL,
         method: 'GET',
@@ -186,31 +112,124 @@ function inverseGeocoding(latitude, longitude) {
             'Authorization': 'Bearer ' + token
         },
         success: (res) => {
-          modalVisible.value=true;
+            console.log(res, "----")
-            console.log(res, "经纬度解析成功")
+            if (res.statusCode == 200 && res.data.status == 200) {
-            if (res.statusCode === 200 && res.data.status === 200) {
                 let resdata = res.data.data.rows[0].address
                 if (resdata == null) {
                     console.log(resdata.srcLat)
-                    if (isWithinRange(latitude1, longitude1, latiude, longitude, 1)) {
+                    const latiude1 = 34.1360;
-                        form.addressForStart = MapApiConfig.XI_AN_BAN.typeName;
+                    const longitude1 = 108.9126;
-                        form.path = MapApiConfig.XI_AN_BAN.longitude + ',' + MapApiConfig.XI_AN_BAN.latitude ;
+                    if (isWithinRange(latiude1, longitude1, latiude, longitude, 1)) {
+                        form.addressForStart = "西安办事处位置打卡"
+                        uni.showModal({
+                            title: '确定要在此处打卡吗',
+                            content: form.addressForStart,
+                            success: function (res) {
+                                if (res.confirm) {
+                                    var data = {
+                                        mapId: form.mapId,
+                                        addressForStart: form.addressForStart,
+                                        cusName: form.cusName,
+                                        cusId: form.cusId,
+                                        remark: form.remark,
+                                        path: longitude1 + "," + latiude1
+                                    }
+                                    addStartMapForClockIn(data).then(res => {
+                                        if (res.code == 200) {
+                                            uni.showToast({
+                                                icon: 'success',
+                                                title: res.msg,
+                                                duration: 1500,
+                                            });
+                                            setTimeout(() => {
+                                                uni.navigateBack(1)
+                                            }, 500)
+                                        } else {
+                                            uni.showToast({
+                                                icon: 'none',
+                                                title: res.msg,
+                                            });
+                                        }
+                                    })
+                                } else if (res.cancel) {
+                                    console.log('用户点击取消');
+                                }
+                            }
+                        });
                     }
-                }
+                } else {
-                else {
                     form.addressForStart = resdata;
-                    form.path = longitude + ',' + latitude; // 经度，纬度
+                    uni.showModal({
+                        title: '确定要在此处打卡吗',
+                        content: form.addressForStart,
+                        success: function (res) {
+                            if (res.confirm) {
+                                var data = {
+                                    mapId: form.mapId,
+                                    addressForStart: form.addressForStart,
+                                    cusName: form.cusName,
+                                    cusId: form.cusId,
+                                    path: points
+                                }
+                                addStartMapForClockIn(data).then(res => {
+                                    if (res.code == 200) {
+                                        uni.showToast({
+                                            icon: 'success',
+                                            title: res.msg,
+                                            duration: 1500,
+                                        });
+                                    } else {
+                                        uni.showToast({
+                                            icon: 'none',
+                                            title: res.msg,
+                                        });
+                                    }
+                                })
+                            } else if (res.cancel) {
+                                console.log('用户点击取消');
+                            }
+                        }
+                    });
                 }
             } else {
-                form.addressForStart = MapApiConfig.OTHER.typeName;
+                form.addressForStart = "第三方维护打卡"
-                form.path = longitude + ',' + latitude; // 经度，纬度
+                uni.showModal({
+                    title: '确定要在此处打卡吗',
+                    content: form.addressForStart,
+                    success: function (res) {
+                        if (res.confirm) {
+                            var data = {
+                                mapId: form.mapId,
+                                addressForStart: form.addressForStart,
+                                cusName: form.cusName,
+                                cusId: form.cusId,
+                                path: points
+                            }
+                            addStartMapForClockIn(data).then(res => {
+                                if (res.code == 200) {
+                                    uni.showToast({
+                                        icon: 'success',
+                                        title: '第三方维护打卡',
+                                        duration: 1500,
+                                    });
+                                } else {
+                                    uni.showToast({
+                                        icon: 'none',
+                                        title: res.msg,
+                                    });
+                                }
+                            })
+                        } else if (res.cancel) {
+                            console.log('用户点击取消');
+                        }
+                    }
+                });
             }
-            uni.hideLoading();
+
         },
         fail(e) {
             console.log("获取位置失败", e)
-          uni.hideLoading();
+        }
-        },
     })
 
 
@@ -220,125 +239,125 @@ function inverseGeocoding(latitude, longitude) {
 
 <style scoped>
 .white-bg {
-  width: 650rpx;
+    width: 650rpx;
-  margin: 0;
+    margin: 0;
-  border-radius: 8px 8px 0 0;
+    border-radius: 8px 8px 0 0;
-  padding: 50rpx;
+    padding: 50rpx;
-  /* #ifdef APP-PLUS */
+    /* #ifdef APP-PLUS */
-  height: calc(100vh - 125px);
+    height: calc(100vh - 125px);
-  /* #endif */
+    /* #endif */
-  /* #ifndef APP-PLUS */
+    /* #ifndef APP-PLUS */
-  height: calc(100vh - 98px);
+    height: calc(100vh - 98px);
-  /* #endif */
+    /* #endif */
 
 
 }
 
 .btn-image {
-  width: 340rpx;
+    width: 340rpx;
-  height: 340rpx;
+    height: 340rpx;
-  margin: 30rpx auto 60rpx;
+    margin: 30rpx auto 60rpx;
-  display: block;
+    display: block;
 }
 
 .check-desc {
-  background-color: #F5F5F5;
+    background-color: #F5F5F5;
-  padding: 40rpx 50rpx;
+    padding: 40rpx 50rpx;
-  font-size: 28rpx;
+    font-size: 28rpx;
-  border-radius: 10px;
+    border-radius: 10px;
-  margin-top: 100rpx;
+    margin-top: 100rpx;
 }
 
 .check-desc .font-orange {
-  color: #F5813A;
+    color: #F5813A;
-  font-size: 32rpx;
+    font-size: 32rpx;
-  font-weight: bold;
+    font-weight: bold;
 }
 
 .check-desc .font-blue {
-  color: #2CBAEF;
+    color: #2CBAEF;
-  font-size: 32rpx;
+    font-size: 32rpx;
-  font-weight: bold;
+    font-weight: bold;
 }
 
 /* 弹窗处理 */
 .check-con {
-  position: fixed;
+    position: fixed;
-  top: 0;
+    top: 0;
-  left: 0;
+    left: 0;
-  right: 0;
+    right: 0;
-  bottom: 0;
+    bottom: 0;
-  background-color: rgba(0, 0, 0, 0.4);
+    background-color: rgba(0, 0, 0, 0.4);
-  display: flex;
+    display: flex;
-  justify-content: center;
+    justify-content: center;
-  align-items: center;
+    align-items: center;
-  z-index: 999;
+    z-index: 999;
 }
 
 /* 遮罩层内容样式 */
 .check-in {
-  background-color: #fff;
+    background-color: #fff;
-  padding: 40rpx 30rpx 60rpx;
+    padding: 40rpx 30rpx 60rpx;
-  border-radius: 10px;
+    border-radius: 10px;
-  /* width: 620rpx; */
+    /* width: 620rpx; */
-  width: 560rpx;
+    width: 560rpx;
-  position: absolute;
+    position: absolute;
-  top: 48%;
+    top: 48%;
-  left: 50%;
+    left: 50%;
-  transform: translate(-50%, -50%);
+    transform: translate(-50%, -50%);
-  text-align: center;
+    text-align: center;
 }
 
 .check-in .check-tip {
-  font-weight: bold;
+    font-weight: bold;
 }
 
 .check-in .check-title {
-  font-size: 32rpx;
+    font-size: 32rpx;
-  padding: 20rpx 0;
+    padding: 20rpx 0;
 }
 
 .check-in .check-location {
-  color: #0395E0;
+    color: #0395E0;
-  font-size: 42rpx;
+    font-size: 42rpx;
-  font-weight: bold;
+    font-weight: bold;
-  display: flex;
+    display: flex;
-  align-items: center;
+    align-items: center;
-  justify-content: center;
+    justify-content: center;
-  margin: 30rpx 0;
+    margin: 30rpx 0;
 }
 
 .check-in .check-location .uniui-location-filled {
-  font-weight: normal;
+    font-weight: normal;
-  margin-right: 20rpx;
+    margin-right: 20rpx;
 }
 
 .check-in .check-address {
-  color: #919191;
+    color: #919191;
-  font-size: 32rpx;
+    font-size: 32rpx;
-  margin-bottom: 80rpx;
+    margin-bottom: 80rpx;
 }
 
 .check-in .check-footer {
-  display: flex;
+    display: flex;
 }
 
 .check-in .check-footer .btn-default,
 .check-in .check-footer .btn-primary {
-  background-color: #fff;
+    background-color: #fff;
-  border: 1px solid #05A3F4;
+    border: 1px solid #05A3F4;
-  color: #05A3F4;
+    color: #05A3F4;
-  border-radius: 25px;
+    border-radius: 25px;
-  padding: 0rpx 80rpx;
+    padding: 0rpx 80rpx;
-  font-size: 34rpx;
+    font-size: 34rpx;
-  /* margin-left: 0;
+    /* margin-left: 0;
-  margin-right: 20rpx; */
+    margin-right: 20rpx; */
 }
 
 .check-in .check-footer .btn-primary {
-  background-color: #05A3F4;
+    background-color: #05A3F4;
-  border: 1px solid #05A3F4;
+    border: 1px solid #05A3F4;
-  color: #fff;
+    color: #fff;
-  /* padding: 0rpx 60rpx; */
+    /* padding: 0rpx 60rpx; */
 }
 </style>

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/index.vue

@@ -8,7 +8,7 @@
       <!-- #endif -->
 
       <!-- 高度来避免头部遮挡 -->
-      <view class="top-height"></view>
+      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
 
       <view class="white-bg">
         <navigator url="/pages/business/CRM/plan/myPlan">