diff --git a/src/api/business.js b/src/api/business.js
index a42d45a..41c0907 100644
--- a/src/api/business.js
+++ b/src/api/business.js
@@ -16,7 +16,7 @@ export function businessDaily(data) {
     })
 }
 
-// CRM 列表
+// crm 列表
 export function businessCRMList(data) {
     return request.post({
         url: '/api/businessCRMList',
@@ -24,15 +24,17 @@ export function businessCRMList(data) {
     })
 }
 
-// CRM 查询走访报告列表
+// crm 查询走访报告列表
 export function visitorReportList(data) {
-    return request.post({
-        url: '/api/visitorReportList',
+    return request.get({
+        url: '/app/appVisistReport/list',
         data
+    },{
+        isTransformResponse:false
     })
 }
 
-// CRM 客户列表
+// crm 客户列表
 export function getGuestList(data) {
     return request.post({
         url: '/api/guestList',
@@ -40,7 +42,7 @@ export function getGuestList(data) {
     })
 }
 
-// CRM 查询走访报告详情
+// crm 查询走访报告详情
 export function visitorReportDetail(data) {
     return request.post({
         url: '/api/visitorReportDetail',
@@ -48,10 +50,10 @@ export function visitorReportDetail(data) {
     })
 }
 
-// CRM 查询走访报告列表
+// crm 查询走访报告列表
 export function mattersList(data) {
     return request.post({
         url: '/api/mattersList',
         data
     })
-}
\ No newline at end of file
+}
diff --git a/src/api/crm/activity/activity.js b/src/api/crm/activity/activity.js
new file mode 100644
index 0000000..db0612a
--- /dev/null
+++ b/src/api/crm/activity/activity.js
@@ -0,0 +1,213 @@
+import request from "@/utils/request";
+
+//获取客户单位用户人员信息
+export function crmCustomerUser(data) {
+  return request.get({
+    url: "/app/appCrmCusUserNewController/crmCustomerUser",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//获取我公司人员信息
+export function myUserNameList(data) {
+  return request.get({
+    url: "/app/appVisistDetail/getCompanyPersonnerlName",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//保存走访报告明细
+export function addVisistDetail(data) {
+  return request.post({
+    url: "/app/appVisistDetail/addVisistDetail",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//删除走访报告中的某一项（日常走访，业务招待）
+export function deleVisistDetailItem(data) {
+  return request.get({
+    url: "/app/appVisistDetail/deleVisistDetailItem",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//走访明细查询
+export function getVisistDetailItem(data) {
+  return request.get({
+    url: "/app/appVisistDetail/queryList",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//删除整体的报告
+export function removeVisist(data) {
+  return request.get({
+    url: "/app/appVisistReport/remove",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//走访报告列表查询
+export function getYsVisistList(data) {
+  return request.get({
+    url: "/app/appVisistReport/list",
+    data
+  },{
+    isTransformResponse:false
+  });
+}
+
+//更新一个报告的状态
+export function updateStatus(data) {
+  return request.post({
+    url: "/app/appVisistReport/updateStatus",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//获取客户信息列表
+export function getYsCustomerList(data) {
+  return request.get({
+    url: "/app/appCustomerIfno/pageList",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//新增走访报告
+export function addVisist(data) {
+  return request.post({
+    url: "/app/appVisistReport/add",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//走访报告查询
+export function getQueryVisistList(data) {
+  return request.get({
+    url: "/app/appVisistReport/queryList",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//走访报告详细信息
+export function getYsVisistInfo(data) {
+  return request.get({
+    url: "/app/appVisistReport/getDetail",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//一个走访报告下面关联的日常走访，业务招待等具体信息
+export function getVisistDetailList(data) {
+  return request.get({
+    url: "/app/appVisistDetail/list",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//新增点赞
+export function insertUserLike(data) {
+  return request.post({
+    url: "/app/appUserLike/addVisistDetail",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//查询是否已经点过赞
+export function getUserLike(data) {
+  return request.get({
+    url: "/app/appUserLike/queryUserLikeStatus/" + data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//获取当前人的信息
+export function getUserInfo(data) {
+  return request.get({
+    url: "/app/user/getUserInfo",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//查询没有经过信息管理员审批的单子
+export function getApprovalList(data) {
+  return request.get({
+    url: "/app/appVisistReport/approvalList",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//打开详情页设置成为已读
+export function getUpdateApprovalForRead(data) {
+  return request.post({
+    url: "/app/appVisistReport/updateApprovalForRead",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//提交通过活动报告
+export function auditActivityReport(data) {
+  return request.post({
+    url: "/app/activity/auditActivityReport",
+    data,
+    header: {
+    'Content-Type': 'application/x-www-form-urlencoded' // 设置请求头，确保服务器正确解析 FormData
+    }
+  },{
+    isTransformResponse:false
+  });
+}
+
+//更新驳回原因
+export function getRejectReason(data) {
+  return request.post({
+    url: "/app/appVisistReport/updaterejectReason",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//查询签到打卡信息集合为了报告
+export function addMapForReport(data) {
+  return request.get({
+    url: "/app/appVisistReport/addMapList",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
diff --git a/src/api/crm/activity/map.js b/src/api/crm/activity/map.js
new file mode 100644
index 0000000..3a1611b
--- /dev/null
+++ b/src/api/crm/activity/map.js
@@ -0,0 +1,51 @@
+import request from "@/utils/request";
+
+//新增地图开始签到接口
+export function addStartMap(data) {
+  return request.post({
+    url: "/app/appVisistMap/Startadd",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//新增地图开始打卡接口
+export function addStartMapForClockIn(data) {
+  return request.post({
+    url: "/app/appVisistMap/StartaddForClockIn",
+    data,
+  },{
+    isTransformResponse:false
+  });
+}
+
+//打卡信息查看
+export function CheckInInformationViewing(data) {
+  return request.get({
+    url: "/app/appVisistMap/DKList",
+    data
+  },{
+    isTransformResponse:false
+  });
+}
+
+//签到统计
+export function getSigninList(data) {
+  return request.get({
+    url: "/app/appVisistMap/QueryBased",
+    data
+  },{
+    isTransformResponse:false
+  });
+}
+
+//不签到统计
+export function getNoSigninList(data) {
+  return request.get({
+    url: "/app/appVisistMap/QueryBasedIsNull",
+    data
+  },{
+    isTransformResponse:false
+  });
+}
diff --git a/src/pages.json b/src/pages.json
index e4a6d80..46ebd8b 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -7,6 +7,7 @@
 		}
 	},
 	"pages": [
+
 		{
 			"path": "pages/loading/loading",
 			"style": {
@@ -199,7 +200,108 @@
 			"style": {
 				"navigationBarTitleText": ""
 			}
-		}
+		},
+		//===================================活动报告====================
+		{
+			"path": "pages/business/CRM/marketActivity/visitReport",//市场信息管理
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/visitorReportAdd",//走访报告添加
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/visitReportView",//走访报告查看
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/visitReportDetail",//走访报告查看具体明细
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/auditReport",//走访报告审批列表查看
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/detailForApproval",//走访报告明细审批
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/visitorReportEnter",//走访报告内容录入
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/auditReject",//走访报告驳回输入原因
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/customerUserList",//客户公司人员信息
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/myUserList",//我公司人员信息
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/activityTypeList",//活动类型
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/marketActivity/chooseCus",//选择客户单位
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		//====================地图======
+		{
+			"path": "pages/business/CRM/map/vistorCheckin",//签到打卡
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/map/addRearkSignIn",//签到备注
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/map/checkInView",//打卡信息（考勤查看）
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/CRM/map/checkinStatistics",//打卡统计
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+
+
+		//===================================活动报告====================
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
diff --git a/src/pages/business/CRM/map/addRearkSignIn.vue b/src/pages/business/CRM/map/addRearkSignIn.vue
new file mode 100644
index 0000000..c0cc860
--- /dev/null
+++ b/src/pages/business/CRM/map/addRearkSignIn.vue
@@ -0,0 +1,270 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'签到打卡'" :leftFlag="true" :rightFlag="false"></customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+
+			<view class="inner-box">
+				<view class="cu-form-group">
+					<textarea v-model="form.remark" placeholder="请输入签到备注内容" name="input"></textarea>
+				</view>
+				<view class="btn-box">
+					<button type="primary" @click="addInsertMapClockIn">签到</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import customHeader from '@/components/customHeader.vue'
+import { onMounted, reactive, ref } from 'vue';
+import { addStartMap } from '../../../../api/crm/activity/map';
+import { dateFormat } from '../../../../utils/formatter';
+import { onLoad } from '@dcloudio/uni-app';
+import { getNavBarPaddingTop } from '@/utils/system.js'
+let form = reactive({
+		addressForStart: null,
+		addressForEnd: null,
+		createId: null,
+		staffName: null,
+		visistCode: null,
+		visistId: null,
+		mapId: null,
+		remark: null
+	})
+
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+
+onLoad(option => {
+	form.visistId = option.visistId
+	let date = new Date();
+	form.craeteTime = dateFormat("YYYY-mm-dd", date)
+})
+
+function addInsertMapClockIn() {
+	uni.getLocation({
+		type: 'wgs84',
+		success: (res) => {
+			const latiude = res.latitude; //纬度
+			const longitude = res.longitude; //经度
+			//进行解析
+			inverseGeocoding(latiude, longitude);
+		},
+		fail: function (err) {
+			console.log("获取地址失败" + err)
+		}
+	})
+}
+function isWithinRange(lat, lon, centerLat, centerLon, rangeKm) {
+	const distance = haversineDistance(centerLat, centerLon, lat, lon);
+	return distance <= rangeKm;
+}
+function haversineDistance(lat1, lon1, lat2, lon2, radius = 6371) {
+	const dLat = degToRad(lat2 - lat1);
+	const dLon = degToRad(lon2 - lon1);
+	const a =
+		Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+		Math.cos(degToRad(lat1)) * Math.cos(degToRad(lat2)) *
+		Math.sin(dLon / 2) * Math.sin(dLon / 2);
+	const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+	return radius * c; // 距离，单位：公里
+}
+function degToRad(deg) {
+	return deg * (Math.PI / 180);
+}
+function inverseGeocoding(latiude, longitude) {
+	let points = longitude + ',' + latiude
+	//URL
+	const apiURL = 'https://tiles.geovisearth.com/geo/v1/geocode/regeo';
+	const params = {
+		lat: latiude,
+		lng: longitude,
+		radius: 1000,
+		pageSize: 1,
+		currentPage: 1,
+	};
+	const token = '66c87c897f0251295afdc794e4fbf73046a070338a726fe04f06cece6cb1ffdf';
+	uni.request({
+		url: apiURL,
+		method: 'GET',
+		data: params,
+		header: {
+			'Authorization': 'Bearer ' + token
+		},
+		success: (res) => {
+			if (res.statusCode == 200 && res.data.status == 200) {
+				let resdata = res.data.data.rows[0].address
+				if (resdata == null) {
+					const latiude1 = ref(34.1360);
+					const longitude1 = ref(108.9126);
+					if (isWithinRange(latiude1.value, longitude1.value, latiude, longitude, 1)) {
+						form.addressForStart = "西安办事处位置签到"
+						uni.showModal({
+							title: '确定要在此处签到吗',
+							content: form.addressForStart,
+							success: function (res) {
+								if (res.confirm) {
+									var data = {
+										mapId: form.mapId,
+										addressForStart: form.addressForStart,
+										cusName: form.cusName,
+										cusId: form.cusId,
+										remark: form.remark,
+										path: longitude1 + "," + latiude1
+									}
+									addStartMap(data).then(res => {
+										if (res.code == 200) {
+											uni.showToast({
+												icon: 'success',
+												title: res.msg,
+												duration: 1500,
+											});
+											setTimeout(() => {
+												uni.navigateBack(1)
+											}, 500)
+										} else {
+											uni.showToast({
+												icon: 'none',
+												title: res.msg,
+											});
+										}
+									})
+								} else if (res.cancel) {
+									console.log('用户点击取消');
+								}
+							}
+						});
+					}
+				} else {
+					form.addressForStart = resdata;
+					uni.showModal({
+						title: '确定要在此处签到吗',
+						content: form.addressForStart,
+						success: function (res) {
+							if (res.confirm) {
+								var data = {
+									mapId: form.mapId,
+									addressForStart: form
+										.addressForStart,
+									cusName: form.cusName,
+									cusId: form.cusId,
+									remark: form.remark,
+									path: points
+								}
+								addStartMap(data).then(res => {
+									if (res.code == 200) {
+										uni.showToast({
+											icon: 'success',
+											title: res.msg,
+											duration: 1500,
+										});
+										setTimeout(() => {
+											uni.navigateBack(1)
+										}, 500)
+									} else {
+										uni.showToast({
+											icon: 'none',
+											title: res.msg,
+										});
+									}
+								})
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+				}
+			} else {
+				form.addressForStart = "第三方维护签到"
+				uni.showModal({
+					title: '确定要在此处签到吗',
+					content: form.addressForStart,
+					success: function (res) {
+						if (res.confirm) {
+							var data = {
+								mapId: form.mapId,
+								addressForStart: form.addressForStart,
+								cusName: form.cusName,
+								cusId: form.cusId,
+								path: points
+							}
+							addStartMap(data).then(res => {
+								if (res.code == 200) {
+									uni.showToast({
+										icon: 'success',
+										title: '第三方维护签到',
+										duration: 1500,
+									});
+								} else {
+									uni.showToast({
+										icon: 'none',
+										title: res.msg,
+									});
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			}
+		},
+		fail(e) {
+			console.log("获取位置失败", e)
+		}
+	})
+
+}
+
+</script>
+
+<style lang="scss" scoped>
+.con-bg {
+	background: white;
+}
+
+/* Container for the checkbox group */
+.checkbox-group.block {
+	width: 100%;
+}
+
+/* Each item row */
+.itemClass {
+	display: flex;
+	align-items: center;
+	padding: 10rpx 0;
+	margin-left: 15rpx;
+	border-bottom: 1px solid #eee;
+	/* optional divider */
+}
+
+/* Checkbox styling */
+.checkBoxClass {
+	margin-right: 12rpx;
+}
+
+/* Content container */
+.clientClass {
+	flex: 1;
+	display: flex;
+	align-items: center;
+	flex-wrap: wrap;
+	font-size: 36rpx;
+	color: #333;
+	/* default text color */
+}
+
+/* Blue username text */
+.blue-text {
+	/* or any blue you prefer */
+	margin-right: 5rpx;
+}
+</style>
diff --git a/src/pages/business/CRM/map/checkInView.vue b/src/pages/business/CRM/map/checkInView.vue
new file mode 100644
index 0000000..c490281
--- /dev/null
+++ b/src/pages/business/CRM/map/checkInView.vue
@@ -0,0 +1,164 @@
+<template>
+    <view class="con-body">
+        <view class="con-bg">
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'考勤查看'" :leftFlag="true" :rightFlag="false"></customHeader>
+
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+
+            <!-- 正文内容 -->
+            <view>
+                <!-- 搜索 -->
+                <view class="search">
+                    <picker mode="date" :value="defaultDate" :start="startDate" :end="endDate" @change="bindDateChange"
+                        class="picker-bg">
+                        <view class="picker">
+                            <uni-icons custom-prefix="iconfont" color="#ffffff" type="icon-phoneshizhong"
+                                size="18"></uni-icons>
+                            <view>{{ defaultDate }}</view>
+                            <uni-icons type="down" size="18"></uni-icons>
+                        </view>
+                    </picker>
+                    <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
+                </view>
+
+                <!-- 分页部分  -->
+                <view class="white-bg margin-bottom20" v-for="(item, index) in list">
+                    <view class="report-list" >
+                            <view class="title"
+                            :style="{color: item.mapType == 1 ? '#F5813A' : '#1989FA'}"
+                            >类型：{{ item.mapType == 1 ? '签到' : '打卡' }}</view>
+                            <view class="r-list">
+                                <view class="r-left">开始签到时间</view>
+                                <view class="r-right">{{ item.goVisistStartTime }}</view>
+                            </view>
+                            <view class="border-bottom"></view>
+                            <view class="r-list">
+                                <view class="r-left">开始签到地点</view>
+                                <view class="r-right">{{ item.addressForStart }}</view>
+                            </view>
+                            <view class="border-bottom"></view>
+                            <view class="r-list">
+                                <view class="r-left">结束签到时间</view>
+                                <view class="r-right">{{ item.goVisistEndTime }}</view>
+                            </view>
+                            <view class="border-bottom"></view>
+                            <view class="r-list">
+                                <view class="r-left">结束签到地点</view>
+                                <view class="r-right">{{ item.addressForEnd }}</view>
+                            </view>
+                            <view class="r-list" v-if="item.remark != null">
+                                <view class="r-left">备注内容</view>
+                                <view class="r-right">{{ item.remark }}</view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import customHeader from '@/components/customHeader.vue'
+import { getNavBarPaddingTop } from '@/utils/system.js'
+import { onMounted, ref } from 'vue';
+import { getDate } from '@/utils/datetime.js'
+import { CheckInInformationViewing } from '../../../../api/crm/activity/map';
+import { onLoad } from '@dcloudio/uni-app';
+
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+
+// 开始时间
+let startDate = getDate('start');
+// 结束时间，间隔10年
+let endDate = getDate('end');
+let defaultDate = getDate({ format: true })
+let bindDateChange = (e) => {
+    defaultDate = e.detail.value
+}
+
+//获取list集合信息
+let list = ref([])
+function getList() {
+    CheckInInformationViewing().then(res => {
+        list.value = res.rows
+    })
+}
+
+onLoad(() => {
+    getList()
+})
+
+
+
+
+
+</script>
+
+<style scoped>
+.search {
+    display: flex;
+    margin-bottom: 30rpx;
+    padding: 0 30rpx;
+}
+
+.search .btn-search {
+    border: none;
+    background: none;
+    color: #fff;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 28rpx;
+    /* 调整为更合适的字号 */
+    font-weight: normal;
+    /* 如果不需要加粗，可以去掉 bolder */
+    margin-left: 0rpx;
+    padding: 0 20rpx;
+    /* 调整 padding，去掉 padding-top */
+    height: 56rpx;
+    /* 固定高度，确保与 picker 对齐 */
+    cursor: pointer;
+}
+
+.search .btn-search::after {
+    display: none;
+}
+
+.search .picker-bg {
+    display: flex;
+    background-color: #6FA2F8;
+    border-radius: 25px;
+    color: #fff;
+    font-size: 28rpx;
+    padding: 0rpx 20rpx;
+    /* #ifndef APP-PLUS */
+    padding: 10rpx 20rpx 0 20rpx;
+    /* #endif */
+    margin-right: 20rpx;
+}
+
+.search .picker-bg .picker {
+    display: flex;
+    align-items: center;
+    /* #ifndef APP-PLUS */
+    padding-top: 2rpx;
+    /* #endif */
+}
+
+.search .picker-bg .picker .uni-icons {
+    color: #fff !important;
+}
+
+.search .picker-bg .picker .uni-icons:first-child {
+    margin-right: 10rpx;
+}
+
+.search .picker-bg .picker .uniui-down {
+    margin-left: 10rpx;
+}
+</style>
diff --git a/src/pages/business/CRM/map/checkinStatistics.vue b/src/pages/business/CRM/map/checkinStatistics.vue
new file mode 100644
index 0000000..7311543
--- /dev/null
+++ b/src/pages/business/CRM/map/checkinStatistics.vue
@@ -0,0 +1,285 @@
+<template>
+    <view class="con-body">
+        <view class="con-bg">
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'打卡统计'" :leftFlag="true" :rightFlag="false"></customHeader>
+
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height"></view>
+
+            <!-- 正文内容 -->
+            <view>
+                <!-- 搜索 -->
+                <view class="search">
+                    <picker @change="bindPickerChange" :value="cityIndex" :range="cityArr" class="picker-bg">
+                        <view class="picker">
+                            <uni-icons type="location" size="18"></uni-icons>
+                            <view>{{ cityArr[cityIndex] }}</view>
+                            <uni-icons type="down" size="18"></uni-icons>
+                        </view>
+                    </picker>
+                    <picker mode="date" :value="defaultDate" :start="startDate" :end="endDate" @change="bindDateChange"
+                        class="picker-bg">
+                        <view class="picker">
+                            <uni-icons custom-prefix="iconfont" color="#ffffff" type="icon-phoneshizhong"
+                                size="18"></uni-icons>
+                            <view>{{ defaultDate }}</view>
+                            <uni-icons type="down" size="18"></uni-icons>
+                        </view>
+                    </picker>
+                    <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
+                </view>
+                <!-- 签到打卡 -->
+                <view class="checkin-tab">
+                    <view class="checkin-tab-item" :class="{ active: tabType == 0 }" @click="handleTab(0)">
+                        <view class="tab-item-title">{{ signCount }}</view>
+                        <view class="tab-item-name">最新签到打卡</view>
+                    </view>
+                    <view class="checkin-tab-item" :class="{ active: tabType == 1 }" @click="handleTab(1)">
+                        <view class="tab-item-title">{{ noSignCount }}</view>
+                        <view class="tab-item-name">未签到打卡</view>
+                    </view>
+                </view>
+
+                <!-- tab切换显示 -->
+                <view class="white-bg">
+                    <!-- 最新签到列表 -->
+                    <view class="tab-con" v-if="tabType == 0">
+                        <view class="tab-title" v-for="(item, index) in singInList" :key="index">
+                            {{ item }}
+                            <uni-icons type="checkbox-filled" size="26" color="#02C74C"></uni-icons>
+                        </view>
+                    </view>
+                    <!-- 未签到列表 -->
+                    <view class="tab-con" v-if="tabType == 1">
+                        <view class="tab-title" v-for="(item, index) in singInNoList" :key="index">
+                            {{ item }}
+                            <uni-icons type="info-filled" size="26" color="#FF8059"></uni-icons>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+
+    </view>
+</template>
+
+<script setup>
+import { ref, onMounted, reactive } from 'vue'
+import customHeader from '@/components/customHeader.vue'
+import { getDate } from '@/utils/datetime.js'
+import { getNoSigninList, getSigninList } from '../../../../api/crm/activity/map';
+
+//进入页面初始化页面
+onMounted(() => {
+    getSignListMethod();
+    getNoSignListMethod();
+})
+
+let cityIndex = ref(0);
+let cityArr = ['市场一部','市场二部','市场三部',"北京大区", "南方大区",'北方大区','西部大区'];
+// 选择大区列表
+let bindPickerChange = (e) => {
+    console.log('picker发送选择改变，携带值为', e.detail.value)
+    cityIndex.value = e.detail.value
+}
+
+// 开始时间
+let startDate = getDate('start');
+// 结束时间，间隔10年
+let endDate = getDate('end');
+let defaultDate = getDate({ format: true })
+let bindDateChange = (e) => {
+    defaultDate = e.detail.value
+}
+
+let searchValue = ref(null)
+// 查询搜索跳转
+let handleSearch = () => {
+    queryForm.tadayDate = defaultDate
+    queryForm.region = cityArr[cityIndex.value]
+    getSignListMethod();
+    getNoSignListMethod();
+}
+
+// 列表
+let signCount = ref(0)
+let singInList = ref([]);
+let noSignCount = ref(0)
+let singInNoList = ref([]);
+
+//查询表单，默认有个北京大区的参数
+let queryForm = reactive({
+    region: "北京大区"
+})
+// tab 切换
+let tabType = ref(0)
+let handleTab = (type) => {
+    tabType.value = type;
+    //最新签到列表
+    if (type === 0) {
+        getSignListMethod();
+
+    }
+    //未签到列表
+    else if (type === 1) {
+        getNoSignListMethod();
+    }
+}
+
+function getSignListMethod() {
+    getSigninList(queryForm).then(res => {
+        signCount.value = res.total
+        singInList.value = res.rows.map(item => item.userName)
+    })
+}
+
+function getNoSignListMethod() {
+    getNoSigninList(queryForm).then(res => {
+        noSignCount.value = res.total
+        singInNoList.value = res.rows.map(item => item.userName);
+    })
+}
+
+
+// 确定
+let handleSubmit = () => {
+
+}
+</script>
+
+<style scoped>
+.search {
+    display: flex;
+    padding: 0 30rpx;
+}
+
+.search .btn-search {
+    border: none;
+    background: none;
+    line-height: normal;
+    color: #fff;
+    line-height: 56rpx !important;
+    padding: 10rpx 0 0;
+    text-align: left;
+    cursor: pointer;
+}
+
+.search .btn-search::after {
+    display: none;
+}
+
+.search .picker-bg {
+    display: flex;
+    background-color: #6FA2F8;
+    border-radius: 25px;
+    color: #fff;
+    font-size: 28rpx;
+    padding: 0rpx 20rpx;
+    /* #ifndef APP-PLUS */
+    padding: 10rpx 20rpx 0 20rpx;
+    /* #endif */
+    margin-right: 20rpx;
+}
+
+.search .picker-bg .picker {
+    display: flex;
+    align-items: center;
+    /* #ifndef APP-PLUS */
+    padding-top: 2rpx;
+    /* #endif */
+}
+
+.search .picker-bg .picker .uni-icons {
+    color: #fff !important;
+}
+
+.search .picker-bg .picker .uni-icons:first-child {
+    margin-right: 10rpx;
+}
+
+.search .picker-bg .picker .uniui-down {
+    margin-left: 20rpx;
+}
+
+.checkin-tab {
+    margin-top: 35rpx;
+    display: flex;
+    padding: 0 30rpx;
+    flex: 1;
+}
+
+.checkin-tab-item {
+    align-items: center;
+    justify-content: center;
+    color: rgba(255, 255, 255, 0.5);
+    text-align: center;
+    margin-right: 30rpx;
+    font-weight: bold;
+    padding-bottom: 20rpx;
+}
+
+.checkin-tab-item.active {
+    position: relative;
+    color: #fff;
+}
+
+.checkin-tab-item.active::after {
+    content: '';
+    position: absolute;
+    bottom: 0;
+    left: 50%;
+    transform: translateX(-50%);
+    background-color: #fff;
+    width: 100rpx;
+    height: 8rpx;
+}
+
+.checkin-tab-item .tab-item-title {
+    font-size: 60rpx;
+}
+
+
+.white-bg {
+    width: 670rpx;
+    margin: 0;
+    border-radius: 8px 8px 0 0;
+    padding: 50rpx 40rpx;
+    margin-top: 20rpx;
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 260px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 230px);
+    /* #endif */
+}
+
+.tab-con {
+    display: flex;
+    flex-flow: row wrap
+}
+
+.tab-con .tab-title {
+    border: 1px solid #E8E8E8;
+    text-align: center;
+    border-radius: 5px;
+    position: relative;
+    /* padding:10rpx 20rpx; */
+    margin-right: 20rpx;
+    margin-bottom: 30rpx;
+    width: 148rpx;
+    height: 60rpx;
+    line-height: 60rpx;
+    font-size: 28rpx;
+}
+
+.tab-con .tab-title:nth-child(4n) {
+    margin-right: 0;
+}
+
+.tab-con .uni-icons {
+    position: absolute;
+    right: -10px;
+    top: -10px;
+}
+</style>
diff --git a/src/pages/business/CRM/map/vistorCheckin.vue b/src/pages/business/CRM/map/vistorCheckin.vue
new file mode 100644
index 0000000..f5bd470
--- /dev/null
+++ b/src/pages/business/CRM/map/vistorCheckin.vue
@@ -0,0 +1,363 @@
+<template>
+    <view class="con-body">
+        <view class="con-bg">
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'签到打卡'" :leftFlag="true" :rightFlag="false"></customHeader>
+
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height"></view>
+
+            <!-- 正文内容 -->
+            <view class="white-bg">
+                <image src="../../../../static/images/business/btn-qd.png" class="btn-image" @click="handleCheckIn" />
+                <image src="../../../../static/images/business/btn-dk.png" class="btn-image" @click="handleClockIn" />
+                <view class="check-desc">
+                    业务人员可通过<text class="font-orange">签到</text>或<text
+                        class="font-blue">打卡</text>进行行为记录，该时间会和走访报告中的时间进行关联，便于查看。
+                </view>
+            </view>
+        </view>
+
+        <!-- 打卡遮罩层 -->
+        <!-- <view class="check-con" v-if="checkFlag">
+            <view class="check-in">
+                <view class="check-tip">打卡</view>
+                <view class="check-title">确定要在此处打卡吗？</view>
+                <view class="check-location">
+                    <uni-icons type="location-filled" size="30" color="#0395E0"></uni-icons> 亚洲金融大厦
+                </view>
+                <view class="check-address">北京市朝阳区天辰东路1号院</view>
+                <view class="check-footer">
+                    <button class="btn-default" type="default" @click="handleCancel" size="mini">取 消</button>
+                    <button class="btn-primary" type="primary" @click="handleSubmit" size="mini">确 定</button>
+                </view>
+            </view>
+        </view> -->
+
+    </view>
+</template>
+
+<script setup>
+import { ref, onMounted, reactive } from 'vue'
+import customHeader from '@/components/customHeader.vue'
+import { addStartMapForClockIn } from '../../../../api/crm/activity/map';
+
+let form = reactive({
+    addressForStart: null,
+    addressForEnd: null,
+    createId: null,
+    staffName: null,
+    visistCode: null,
+    visistId: null,
+    mapId: null
+})
+// 签到
+let handleCheckIn = () => {
+    uni.navigateTo({
+        url: './addRearkSignIn'
+    })
+}
+// 打卡
+let handleClockIn = () => {
+    uni.getLocation({
+        type: 'wgs84',
+        success: (res) => {
+            const latiude = res.latitude;
+            const longitude = res.longitude;
+            //进行解析
+            inverseGeocoding(latiude, longitude);
+        },
+        fail: function (err) {
+            console.log("获取地址失败" + err)
+        }
+    })
+}
+
+function isWithinRange(lat, lon, centerLat, centerLon, rangeKm) {
+    const distance = haversineDistance(centerLat, centerLon, lat, lon);
+    return distance <= rangeKm;
+}
+function haversineDistance(lat1, lon1, lat2, lon2, radius = 6371) {
+    const dLat = degToRad(lat2 - lat1);
+    const dLon = degToRad(lon2 - lon1);
+    const a =
+        Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+        Math.cos(degToRad(lat1)) * Math.cos(degToRad(lat2)) *
+        Math.sin(dLon / 2) * Math.sin(dLon / 2);
+    const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+    return radius * c; // 距离，单位：公里
+}
+function degToRad(deg) {
+    return deg * (Math.PI / 180);
+}
+
+//解析地址
+function inverseGeocoding(latiude, longitude) {
+    let points = longitude + ',' + latiude
+    const apiURL = 'https://tiles.geovisearth.com/geo/v1/geocode/regeo';
+    const params = {
+        lat: latiude,
+        lng: longitude,
+        radius: 1000,
+        pageSize: 1,
+        currentPage: 1,
+        //classify: 220100
+    };
+    const token = '66c87c897f0251295afdc794e4fbf73046a070338a726fe04f06cece6cb1ffdf';
+    uni.request({
+        url: apiURL,
+        method: 'GET',
+        data: params,
+        header: {
+            'Authorization': 'Bearer ' + token
+        },
+        success: (res) => {
+            console.log(res, "----")
+            if (res.statusCode == 200 && res.data.status == 200) {
+                let resdata = res.data.data.rows[0].address
+                if (resdata == null) {
+                    console.log(resdata.srcLat)
+                    const latiude1 = 34.1360;
+                    const longitude1 = 108.9126;
+                    if (isWithinRange(latiude1, longitude1, latiude, longitude, 1)) {
+                        form.addressForStart = "西安办事处位置打卡"
+                        uni.showModal({
+                            title: '确定要在此处打卡吗',
+                            content: form.addressForStart,
+                            success: function (res) {
+                                if (res.confirm) {
+                                    var data = {
+                                        mapId: form.mapId,
+                                        addressForStart: form.addressForStart,
+                                        cusName: form.cusName,
+                                        cusId: form.cusId,
+                                        remark: form.remark,
+                                        path: longitude1 + "," + latiude1
+                                    }
+                                    addStartMapForClockIn(data).then(res => {
+                                        if (res.code == 200) {
+                                            uni.showToast({
+                                                icon: 'success',
+                                                title: res.msg,
+                                                duration: 1500,
+                                            });
+                                            setTimeout(() => {
+                                                uni.navigateBack(1)
+                                            }, 500)
+                                        } else {
+                                            uni.showToast({
+                                                icon: 'none',
+                                                title: res.msg,
+                                            });
+                                        }
+                                    })
+                                } else if (res.cancel) {
+                                    console.log('用户点击取消');
+                                }
+                            }
+                        });
+                    }
+                } else {
+                    form.addressForStart = resdata;
+                    uni.showModal({
+                        title: '确定要在此处打卡吗',
+                        content: form.addressForStart,
+                        success: function (res) {
+                            if (res.confirm) {
+                                var data = {
+                                    mapId: form.mapId,
+                                    addressForStart: form.addressForStart,
+                                    cusName: form.cusName,
+                                    cusId: form.cusId,
+                                    path: points
+                                }
+                                addStartMapForClockIn(data).then(res => {
+                                    if (res.code == 200) {
+                                        uni.showToast({
+                                            icon: 'success',
+                                            title: res.msg,
+                                            duration: 1500,
+                                        });
+                                    } else {
+                                        uni.showToast({
+                                            icon: 'none',
+                                            title: res.msg,
+                                        });
+                                    }
+                                })
+                            } else if (res.cancel) {
+                                console.log('用户点击取消');
+                            }
+                        }
+                    });
+                }
+            } else {
+                form.addressForStart = "第三方维护打卡"
+                uni.showModal({
+                    title: '确定要在此处打卡吗',
+                    content: form.addressForStart,
+                    success: function (res) {
+                        if (res.confirm) {
+                            var data = {
+                                mapId: form.mapId,
+                                addressForStart: form.addressForStart,
+                                cusName: form.cusName,
+                                cusId: form.cusId,
+                                path: points
+                            }
+                            addStartMapForClockIn(data).then(res => {
+                                if (res.code == 200) {
+                                    uni.showToast({
+                                        icon: 'success',
+                                        title: '第三方维护打卡',
+                                        duration: 1500,
+                                    });
+                                } else {
+                                    uni.showToast({
+                                        icon: 'none',
+                                        title: res.msg,
+                                    });
+                                }
+                            })
+                        } else if (res.cancel) {
+                            console.log('用户点击取消');
+                        }
+                    }
+                });
+            }
+
+        },
+        fail(e) {
+            console.log("获取位置失败", e)
+        }
+    })
+
+
+}
+
+</script>
+
+<style scoped>
+.white-bg {
+    width: 650rpx;
+    margin: 0;
+    border-radius: 8px 8px 0 0;
+    padding: 50rpx;
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 125px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 98px);
+    /* #endif */
+
+
+}
+
+.btn-image {
+    width: 340rpx;
+    height: 340rpx;
+    margin: 30rpx auto 60rpx;
+    display: block;
+}
+
+.check-desc {
+    background-color: #F5F5F5;
+    padding: 40rpx 50rpx;
+    font-size: 28rpx;
+    border-radius: 10px;
+    margin-top: 100rpx;
+}
+
+.check-desc .font-orange {
+    color: #F5813A;
+    font-size: 32rpx;
+    font-weight: bold;
+}
+
+.check-desc .font-blue {
+    color: #2CBAEF;
+    font-size: 32rpx;
+    font-weight: bold;
+}
+
+/* 弹窗处理 */
+.check-con {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, 0.4);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    z-index: 999;
+}
+
+/* 遮罩层内容样式 */
+.check-in {
+    background-color: #fff;
+    padding: 40rpx 30rpx 60rpx;
+    border-radius: 10px;
+    /* width: 620rpx; */
+    width: 560rpx;
+    position: absolute;
+    top: 48%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    text-align: center;
+}
+
+.check-in .check-tip {
+    font-weight: bold;
+}
+
+.check-in .check-title {
+    font-size: 32rpx;
+    padding: 20rpx 0;
+}
+
+.check-in .check-location {
+    color: #0395E0;
+    font-size: 42rpx;
+    font-weight: bold;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin: 30rpx 0;
+}
+
+.check-in .check-location .uniui-location-filled {
+    font-weight: normal;
+    margin-right: 20rpx;
+}
+
+.check-in .check-address {
+    color: #919191;
+    font-size: 32rpx;
+    margin-bottom: 80rpx;
+}
+
+.check-in .check-footer {
+    display: flex;
+}
+
+.check-in .check-footer .btn-default,
+.check-in .check-footer .btn-primary {
+    background-color: #fff;
+    border: 1px solid #05A3F4;
+    color: #05A3F4;
+    border-radius: 25px;
+    padding: 0rpx 80rpx;
+    font-size: 34rpx;
+    /* margin-left: 0;
+    margin-right: 20rpx; */
+}
+
+.check-in .check-footer .btn-primary {
+    background-color: #05A3F4;
+    border: 1px solid #05A3F4;
+    color: #fff;
+    /* padding: 0rpx 60rpx; */
+}
+</style>
diff --git a/src/pages/business/CRM/marketActivity/activityTypeList.vue b/src/pages/business/CRM/marketActivity/activityTypeList.vue
new file mode 100644
index 0000000..7e90952
--- /dev/null
+++ b/src/pages/business/CRM/marketActivity/activityTypeList.vue
@@ -0,0 +1,129 @@
+<template>
+    <view class="con-body">
+        <view>
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'日常走访选择活动类型'" :leftFlag="true" :rightFlag="false">
+            </customHeader>
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height"></view>
+
+            
+                <checkbox-group class="block" @change="checkboxChange">
+                    <view class="itemClass" v-for="(item, index) in dataList" :key="item.id">
+                        <checkbox class='checkBoxClass' :value="item.name" 
+                            v-model="item.name"></checkbox>
+                        <view class="clientClass">
+                            <text class="blue-text">{{ item.name }}</text>
+                        </view>
+                    </view>
+                </checkbox-group>
+        </view>
+    </view>
+
+</template>
+
+
+<script setup>
+import customHeader from '@/components/customHeader.vue'
+import cache from '../../../../utils/cache'
+import { reactive } from 'vue'
+
+
+const dataList = reactive( [
+					{id:'1',name:'日常走访'},
+					{id:'2',name:'组合拳推广'},
+					{id:'3',name:'竞标'},
+					{id:'4',name:'型号追踪'},
+					{id:'5',name:'重点产品推广'},
+					{id:'6',name:'谈价'},
+					{id:'7',name:'道歉、感谢'},
+					{id:'8',name:'邀约'},
+					{id:'9',name:'归零会'},
+					{id:'11',name:'高层交流'},
+					{id:'12',name:'质量问题处理'},
+					{id:'13',name:'供应商大会'},
+					{id:'14',name:'新产品推广'},
+					{id:'15',name:'技术支持'}
+				])
+
+//勾选内容
+function checkboxChange(e) {
+        cache.set('checkedRCActivityTypeList', e.detail.value)
+}
+
+</script>
+
+<style scoped lang="scss">
+
+.con-body{
+    background: white;
+}
+
+ .white-bg {
+    width: 690rpx;
+    margin: 0;
+    border-radius: 8px 8px 0 0;
+}
+
+.white-bg.white-bg-2 {
+    margin-bottom: 20rpx;
+}
+
+.white-bg.white-bg-3 {
+    border-radius: 0
+}
+
+.white-bg .w-b-title {
+    color: #3384DF;
+    font-size: 38rpx;
+}
+
+.form-con {
+    padding: 30rpx 0 0;
+}
+
+:deep(.form-con .uni-forms-item) {
+    margin-bottom: 22px !important;
+}
+
+
+/* Container for the checkbox group */
+.checkbox-group.block {
+    width: 100%;
+}
+
+/* Each item row */
+.itemClass {
+    width: 340rpx;
+    display: flex;
+    align-items: center;
+    padding: 10rpx 0;
+    margin-left: 15rpx;
+    border-bottom: 1px solid #eee;
+    float: left;
+    /* optional divider */
+}
+
+/* Checkbox styling */
+.checkBoxClass {
+    margin-right: 12rpx;
+}
+
+/* Content container */
+.clientClass {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    font-size: 36rpx;
+    color: #333;
+    /* default text color */
+}
+
+/* Blue username text */
+.blue-text {
+    /* or any blue you prefer */
+    margin-right: 5rpx;
+}
+
+</style>
\ No newline at end of file
diff --git a/src/pages/business/CRM/marketActivity/auditReject.vue b/src/pages/business/CRM/marketActivity/auditReject.vue
new file mode 100644
index 0000000..0b0c021
--- /dev/null
+++ b/src/pages/business/CRM/marketActivity/auditReject.vue
@@ -0,0 +1,118 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'驳回原因'" :leftFlag="true" :rightFlag="false"></customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+
+			<view class="inner-box">
+				<view class="cu-form-group">
+					<textarea v-model="rejectReason" placeholder="请输入驳回原因" name="input"></textarea>
+				</view>
+				<view class="btn-box">
+					<button type="primary" @click="submitBack">确定驳回</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import customHeader from '@/components/customHeader.vue'
+import { onMounted, ref } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+import { getNavBarPaddingTop } from '@/utils/system.js'
+import { getRejectReason } from '../../../../api/crm/activity/activity';
+
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+	navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+
+let visistId = ref()
+onLoad(option => {
+	visistId.value = option.visistId
+})
+
+let rejectReason = ref();
+//确定驳回
+function submitBack() {
+	if (rejectReason.value==null) {
+		uni.showToast({
+			title: "驳回原因不能为空！",
+			icon: 'none',
+		});
+		return
+	}
+	let rejectForm = {
+		visistId:visistId.value,
+		rejectReason: rejectReason.value
+	}
+	getRejectReason(rejectForm).then(
+		res => {
+			if (res.code == 200) {
+				uni.showToast({
+					title: '提交成功',
+					duration: 2000
+				});
+				uni.navigateBack({
+					delta: 2
+				})
+			} else {
+				uni.showToast({
+					title: res.msg,
+					icon: 'none',
+				});
+			}
+		},
+		rej => { }
+	);
+}
+
+</script>
+
+<style lang="scss" scoped>
+.con-bg {
+	background: white;
+}
+
+/* Container for the checkbox group */
+.checkbox-group.block {
+	width: 100%;
+}
+
+/* Each item row */
+.itemClass {
+	display: flex;
+	align-items: center;
+	padding: 10rpx 0;
+	margin-left: 15rpx;
+	border-bottom: 1px solid #eee;
+	/* optional divider */
+}
+
+/* Checkbox styling */
+.checkBoxClass {
+	margin-right: 12rpx;
+}
+
+/* Content container */
+.clientClass {
+	flex: 1;
+	display: flex;
+	align-items: center;
+	flex-wrap: wrap;
+	font-size: 36rpx;
+	color: #333;
+	/* default text color */
+}
+
+/* Blue username text */
+.blue-text {
+	/* or any blue you prefer */
+	margin-right: 5rpx;
+}
+</style>
diff --git a/src/pages/business/CRM/marketActivity/auditReport.vue b/src/pages/business/CRM/marketActivity/auditReport.vue
new file mode 100644
index 0000000..dfae42c
--- /dev/null
+++ b/src/pages/business/CRM/marketActivity/auditReport.vue
@@ -0,0 +1,218 @@
+<template>
+    <view class="con-body">
+        <view class="con-bg">
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'客户审批'" :leftFlag="true" :rightFlag="false"></customHeader>
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+
+            <!-- 正文内容 -->
+            <view class="all-body">
+
+                <!-- 分页部分  -->
+                <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+                    :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"
+                    class="scroll-h" :class="{ 'loading-scroll': cssFlag }">
+                    <view class="white-bg margin-bottom20" v-for="(item, index) in dataList" :key="index"
+                        @click="showDetail(item)">
+                        <view>
+                            <view class="report-list">
+                                <view class="title">客户：{{ item.cusName }}</view>
+                                <view class="r-list">
+                                    <view class="r-name">{{ item.visistCode }}</view>
+                                    <view>
+
+                                        <view
+                                            class="r-right btn-orange"
+                                            size="mini">
+                                            {{ item.status }}
+                                        </view>
+                                    </view>
+
+                                </view>
+                                <view class="border-bottom"></view>
+                                <view class="r-list">
+                                    <view class="r-left">走访类型</view>
+                                    <view class="r-right">{{item.visistType}}</view>
+                                </view>
+                                <view class="r-list" v-if="item.joinUser != null">
+                                    <view class="r-left">我方领导</view>
+                                    <view class="r-right">{{ item.joinUser }}</view>
+                                </view>
+                                <view class="border-bottom"></view>
+                                <view class="r-list">
+                                    <view class="r-left">报告人</view>
+                                    <view class="r-right">{{ item.staffName }}</view>
+                                </view>
+                                <view class="border-bottom"></view>
+                                <view class="r-list">
+                                    <view class="r-left">报告日期</view>
+                                    <view class="r-right">{{ item.visistDate }}</view>
+                                </view>
+
+                            </view>
+                        </view>
+                    </view>
+                </mescroll-uni>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import customHeader from '@/components/customHeader.vue'
+import { ref, reactive, onMounted } from 'vue'
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import { getNavBarPaddingTop } from '@/utils/system.js'
+import { onShow } from '@dcloudio/uni-app';
+import { getApprovalList, getUserInfo } from '../../../../api/crm/activity/activity';
+
+
+let list = ref([])
+let queryParams = reactive({
+    selValue: ''
+})
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+const upOption = ref({
+    page: { num: 0, size: 10 },
+    noMoreSize: 5,
+    empty: { tip: '~ 空空如也 ~' },
+    textLoading: '加载中...',
+    textNoMore: '已经到底了'
+});
+const downOption = ref({
+    auto: true,
+    textInOffset: '下拉刷新',
+    textOutOffset: '释放更新',
+    textLoading: '刷新中...'
+});
+
+let mescrollRef = ref();
+function mescrollInit(mescroll) {
+    mescrollRef.value = mescroll;
+}
+/*下拉刷新的回调 */
+function downCallback(mescroll) {
+    mescroll.resetUpScroll()
+}
+/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
+function upCallback(page) {
+    // JSON.parse 将数据转换为 JavaScript 对象
+    // var user = JSON.parse(uni.getStorageSync("user"));
+    console.log(page.num)
+    getVisistList(page);
+}
+
+onShow(() => {
+    getUserInfoMethod();
+})
+
+let nickName = ref();
+let deptName = ref();
+let userId = ref();
+let posts = ref();
+
+//获取用户信息
+function getUserInfoMethod() {
+    getUserInfo().then(res => {
+        nickName.value = res.user.nickName;
+        deptName.value = res.user.dept.deptName;
+        userId.value = res.user.userId;
+        posts.value = res.post;
+    })
+}
+
+//查询待审批的列表信息
+let dataList = ref([])
+function getVisistList(page) {
+    var data = {
+        pageNum: page.num,
+        pageSize: 10,
+    };
+
+    getApprovalList(data).then(res => {
+        if (res.code == 200) {
+            //设置列表数据
+            if (page.num == 1) {
+                dataList.value = res.rows;
+
+            } else {
+                dataList.value = dataList.value.concat(res.rows);
+            }
+            mescrollRef.value.endBySize(res.rows.length, 1000);
+        } else {
+            uni.showToast({
+                icon: 'none',
+                title: "请求失败",
+            });
+            dataList.value = null;
+            mescrollRef.value.endErr();
+        }
+    })
+}
+
+//审核走访单明细
+function showDetail(item){
+    	uni.navigateTo({
+				url: './detailForApproval?visistId=' + item.visistId
+			})
+}
+</script>
+
+<style scoped>
+.all-body {
+    /* #ifdef APP-PLUS */
+    top: 150rpx;
+    height: calc(100vh - 75px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    top: 120rpx;
+    height: calc(100vh);
+    /* #endif */
+}
+
+.search {
+    display: flex;
+}
+
+.search .btn-search {
+    border: none;
+    background: none;
+    line-height: normal;
+    color: #fff;
+    line-height: 56rpx !important;
+    padding: 10rpx 0 0;
+    text-align: left;
+    cursor: pointer;
+}
+
+.search .btn-search::after {
+    display: none;
+}
+
+.search .custom-search {
+    width: 80%;
+
+}
+
+.search .custom-search.uni-searchbar {
+    padding-right: 0 !important;
+}
+
+.scroll-h {
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 120px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 110px);
+    /* #endif */
+}
+
+.white-bg {
+    padding-bottom: 10rpx;
+}
+</style>
diff --git a/src/pages/business/CRM/marketActivity/chooseCus.vue b/src/pages/business/CRM/marketActivity/chooseCus.vue
new file mode 100644
index 0000000..cb72ca8
--- /dev/null
+++ b/src/pages/business/CRM/marketActivity/chooseCus.vue
@@ -0,0 +1,171 @@
+<template>
+    <view class="con-body">
+        <view >
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'选择客户单位'" :leftFlag="true" :rightFlag="false">
+            </customHeader>
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height"></view>
+            <uni-easyinput prefixIcon="search" v-model="searchContent" placeholder="请输入客户单位名称" clearable
+                @iconClick="iconClick">
+            </uni-easyinput>
+
+
+		<view class="inner-box">
+			<view class="list-cont">
+				<radio-group class="block" @change="radioChange">
+					<view class="item"   v-for="(item, index) in dataList">
+						<radio class='radio' :value="index" ></radio>
+						<view class="name">{{item.cusName+"（"+item.shortName+"）"}}</view>
+					</view>
+				</radio-group>
+			</view>
+		</view>
+
+        </view>
+    </view>
+</template>
+
+<script setup>
+import customHeader from '@/components/customHeader.vue'
+import { getYsCustomerList } from '../../../../api/crm/activity/activity'
+import { onMounted,  reactive, ref, watch } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { useMessage } from '../../../../utils/message'
+
+
+
+const message = useMessage();
+
+//点击查询客户人员
+const queryParams = ref({
+    cusName: '',
+    nickName:'',
+    pageNum: 1,
+    pageSize: 10
+})
+
+
+onMounted(() => {
+
+})
+
+onLoad(options => {
+    queryParams.value.cusName = options.cusName
+})
+const dataList = ref([])
+
+
+
+
+//查询某一客户人员
+let searchContent = ref('')
+
+function iconClick() {
+    message.toast('点击了查询，当前内容：' + searchContent.value)
+}
+
+//监视查询的内容的变化
+let queryCusForm = reactive({})
+watch(searchContent,(newValue,oldValue)=>{
+    console.log("输入内容：",searchContent.value)
+    queryCusForm.cusName = searchContent.value
+    getYsCustomerList(queryCusForm).then(res=>{
+        dataList.value = res.rows
+    })
+})
+
+function radioChange(event) {
+     const selectedIndex = event.detail.value
+    let test = dataList.value[selectedIndex]
+    // 发送全局事件
+    uni.$emit('onCustomerSelected', test)
+    let cusName = test.cusName;//客户名称
+    let cusId = test.cusId;//客户ID
+    uni.navigateBack()//返回上一页
+}
+
+
+
+
+</script>
+
+<style scoped lang="scss">
+
+.con-body{
+    background: white;
+}
+
+
+/* Container for the checkbox group */
+.checkbox-group.block {
+    width: 100%;
+}
+
+/* Each item row */
+.itemClass {
+    display: flex;
+    align-items: center;
+    padding: 10rpx 0;
+    margin-left: 15rpx;
+    border-bottom: 1px solid #eee;
+    /* optional divider */
+}
+
+/* Checkbox styling */
+.checkBoxClass {
+    margin-right: 12rpx;
+}
+
+/* Content container */
+.clientClass {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    font-size: 36rpx;
+    color: #333;
+    /* default text color */
+}
+
+/* Blue username text */
+.blue-text {
+    /* or any blue you prefer */
+    margin-right: 5rpx;
+}
+.inner-box {
+  width: 100%;
+  padding: 10px;
+  box-sizing: border-box;
+}
+
+.list-cont {
+  width: 100%;
+}
+
+.block {
+  width: 100%;
+}
+
+.item {
+  display: flex;
+  align-items: center;
+  padding: 12px 0;
+  border-bottom: 1px solid #eee;
+}
+
+.radio {
+  margin-right: 12px;
+  transform: scale(0.9);
+}
+
+.name {
+  flex: 1;
+  font-size: 16px;
+  color: #333;
+}
+
+.checked {
+  color: #007AFF; /* 选中状态的颜色 */
+}
+</style>
diff --git a/src/pages/business/CRM/marketActivity/components/dailyVisitComponent.vue b/src/pages/business/CRM/marketActivity/components/dailyVisitComponent.vue
new file mode 100644
index 0000000..c76fc5a
--- /dev/null
+++ b/src/pages/business/CRM/marketActivity/components/dailyVisitComponent.vue
@@ -0,0 +1,297 @@
+<template>
+    <uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px" label-position="top">
+        <uni-forms-item label="客户人员" name="customerUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.customerUserList" placeholder="请选择客户人员" name="input" :disabled="isDisabled"
+                @focus="chooseClientUser"></uni-easyinput>
+        </uni-forms-item>
+        <uni-forms-item label="我方参与人" name="myUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.myUserList" placeholder="请选择我方参与人" name="input" :disabled="isDisabled"
+                @focus="chooseMyUser"></uni-easyinput>
+        </uni-forms-item>
+
+        <uni-forms-item label="活动内容" name="activityTypeList" class="f-c-right">
+            <uni-easyinput v-model="formData.activityTypeList" placeholder="请选择活动内容" name="input"
+                @focus="chooseActivityType"></uni-easyinput>
+        </uni-forms-item>
+
+        <uni-forms-item label="活动文字" name="activeTxt" class="uni-forms-item is-direction-top is-top">
+            <uni-easyinput type="textarea" autoHeight v-model="formData.activeTxt" placeholder="请输入" 活动文字
+                class="form-texarea" />
+        </uni-forms-item>
+    </uni-forms>
+    <view class="footer-con">
+        <button class="btn-default" type="default" @click="handleDeleteVisistDetailItem" size="mini">删 除</button>
+        <button class="btn-primary" type="primary" @click="submitForm" size="mini">保存/修改</button>
+    </view>
+</template>
+
+<script setup name="dailyVisitComponent">
+import { ref, reactive } from 'vue'
+import cache from '../../../../../utils/cache'
+import { onShow, onUnload } from '@dcloudio/uni-app';
+import { addVisistDetail, deleVisistDetailItem, getVisistDetailItem } from '../../../../../api/crm/activity/activity';
+
+let customerUserList = ref([])
+let myUserList = ref([])
+let activityTypeList = ref([])
+let activeTxt = ref([])
+let isDisabled = ref(false)
+const props = defineProps({
+    cusName: String, //客户单位名称
+    cusId: Number,//客户ID
+    visistId: Number,//活动ID
+    status: String //状态
+})
+
+// 表单数据
+const formData = ref({
+    customerUserList,
+    myUserList,
+    activityTypeList,
+    activeTxt
+});
+
+// 验证规则
+const rules = {
+    activityTypeList: {
+        rules: [
+            { required: true, errorMessage: '请选择活动内容' }
+        ]
+    }
+
+};
+
+// 表单ref
+const formRef = ref(null);
+
+//删除明细项的内容
+let rcDeleteForm = reactive({})
+function handleDeleteVisistDetailItem() {
+    rcDeleteForm.treeName = '日常走访'
+    rcDeleteForm.visistId = props.visistId
+    deleVisistDetailItem(rcDeleteForm).then(res => {
+        if (res.code == 200) {
+            uni.showToast({
+                title: '删除成功',
+                duration: 2000
+            });
+            //响应成功，删除缓存记录
+            handleDelete()
+        } else {
+            uni.showToast({
+                title: res.msg,
+                icon: 'none',
+            });
+        }
+    })
+}
+
+// 删除内容
+let handleDelete = () => {
+    formData.value.customerUserList = null
+    formData.value.myUserList = null
+    formData.value.activityTypeList = null
+    formData.value.activeTxt = null
+    if (cache.get('checkedRCClientList') != null) {
+        cache.remove('checkedRCClientList');
+    }
+    if (cache.get('checkedRCMyUserList') != null) {
+        cache.remove('checkedRCMyUserList');
+    }
+    if (cache.get('checkedRCActivityTypeList') != null) {
+        cache.remove('checkedRCActivityTypeList');
+    }
+}
+
+//删除缓存
+let handleDeleteLocal = () => {
+    cache.remove('checkedRCClientList');
+    cache.remove('checkedRCMyUserList');
+    cache.remove('checkedRCActivityTypeList');
+}
+
+let rcForm = reactive({})
+// 保存/修改
+const submitForm = async () => {
+    try {
+        // 验证表单
+        await formRef.value.validate();
+        // 验证通过后的操作
+        uni.showToast({
+            title: '验证通过',
+            icon: 'success'
+        });
+        rcForm.treeName = '日常走访'
+        rcForm.cusId = props.cusId
+        rcForm.visistId = props.visistId
+        if (Array.isArray(activityTypeList.value)) {
+            rcForm.activityTags = activityTypeList.value.join(',')
+        } else {
+            rcForm.activityTags = activityTypeList.value
+        }
+
+        if (Array.isArray(myUserList.value)) {
+            rcForm.ourPersonnel = myUserList.value.join(',')
+        } else {
+            rcForm.ourPersonnel = myUserList.value
+        }
+
+        if (Array.isArray(customerUserList.value)) {
+            rcForm.cusPersonnel = customerUserList.value.join(',')
+        } else {
+            rcForm.cusPersonnel = customerUserList.value
+        }
+
+        rcForm.bandResult = activeTxt.value
+        // 提交服务器进行新增
+        addVisistDetail(rcForm).then(res => {
+            if (res.code == 200) {
+                uni.showToast({
+                    title: '提交成功',
+                    duration: 2000
+                });
+                //响应成功，删除缓存记录
+                handleDeleteLocal()
+            } else {
+                uni.showToast({
+                    title: res.msg,
+                    icon: 'none',
+                });
+            }
+        })
+    } catch (err) {
+        console.log('表单验证失败:', err);
+    }
+};
+
+//页面渲染完成后，查询catch的get
+onShow(() => {
+
+    if (cache.get('checkedRCClientList') != null && cache.get('checkedRCClientList') != []) {
+        customerUserList.value = cache.get('checkedRCClientList')
+    }
+
+    if (cache.get('checkedRCMyUserList') != null && cache.get('checkedRCMyUserList') != []) {
+        myUserList.value = cache.get('checkedRCMyUserList')
+    }
+
+    if (cache.get('checkedRCActivityTypeList') != null && cache.get('checkedRCActivityTypeList') != []) {
+        activityTypeList.value = cache.get('checkedRCActivityTypeList')
+    }
+
+    if (props.status == '完成') {
+        isDisabled.value = true
+    } else {
+        isDisabled.value = false
+    }
+
+})
+
+//查询日常走访的内容
+let queryRCForm = reactive({})
+let getRCVisitReportDetailContent = () => {
+    queryRCForm.visistId = props.visistId
+    queryRCForm.cusId = props.cusId
+    queryRCForm.treeName = '日常走访'
+    getVisistDetailItem(queryRCForm).then(res => {
+        if (res.rows[0] != null) {
+            customerUserList.value = res.rows[0].customerPersonnel
+            myUserList.value = res.rows[0].ourPersonnel
+            activityTypeList.value = res.rows[0].activityTags
+            activeTxt.value = res.rows[0].bandResult
+        }
+    })
+}
+
+
+
+//页面卸载之后，删除缓存信息
+onUnload(() => {
+    handleDeleteLocal()
+})
+
+
+//选择客户人员
+function chooseClientUser() {
+    console.log('点击了输入框', props.cusName);
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/customerUserList?cusName=' + props.cusName + '&chooseType=日常走访'
+    })
+}
+
+//选择我方参与人
+function chooseMyUser() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/myUserList?chooseType=日常走访'
+    })
+}
+
+//选择活动类型
+function chooseActivityType() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/activityTypeList?chooseType=日常走访'
+    })
+}
+
+// 明确暴露给父组件的方法
+defineExpose({
+    handleDelete,
+    getRCVisitReportDetailContent
+})
+
+</script>
+
+
+<style scoped lang="scss">
+.all-body {
+    /* #ifdef APP-PLUS */
+    top: 150rpx;
+    height: calc(100vh - 75px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    top: 120rpx;
+    height: calc(100vh);
+    /* #endif */
+}
+
+.search {
+    display: flex;
+}
+
+.search .btn-search {
+    border: none;
+    background: none;
+    line-height: normal;
+    color: #fff;
+    line-height: 56rpx !important;
+    padding: 10rpx 0 0;
+    text-align: left;
+    cursor: pointer;
+}
+
+.search .btn-search::after {
+    display: none;
+}
+
+.search .custom-search {
+    width: 80%;
+
+}
+
+.search .custom-search.uni-searchbar {
+    padding-right: 0 !important;
+}
+
+.scroll-h {
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 120px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 110px);
+    /* #endif */
+}
+
+.white-bg {
+    padding-bottom: 10rpx;
+}
+</style>
diff --git a/src/pages/business/CRM/marketActivity/components/djVisistComponent.vue b/src/pages/business/CRM/marketActivity/components/djVisistComponent.vue
new file mode 100644
index 0000000..05f0cc2
--- /dev/null
+++ b/src/pages/business/CRM/marketActivity/components/djVisistComponent.vue
@@ -0,0 +1,258 @@
+<template>
+    <uni-forms ref="formRef" :model="formData"  label-width="100px" label-position="top">
+        <uni-forms-item label="客户人员" name="customerUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.customerUserList" placeholder="请选择客户人员" name="input"
+            :disabled="isDisabled"
+                @focus="chooseClientUser"></uni-easyinput>
+        </uni-forms-item>
+        <uni-forms-item label="我方参与人" name="myUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.myUserList" placeholder="请选择我方参与人" name="input"
+            :disabled="isDisabled"
+                @focus="chooseMyUser"></uni-easyinput>
+        </uni-forms-item>
+
+        <uni-forms-item label="活动文字" name="activeTxt" class="uni-forms-item is-direction-top is-top">
+            <uni-easyinput type="textarea" autoHeight v-model="formData.activeTxt" placeholder="请输入" 活动文字
+                class="form-texarea" />
+        </uni-forms-item>
+    </uni-forms>
+    <view class="footer-con">
+        <button class="btn-default" type="default" @click="handleDeleteVisistDetailItem" size="mini">删 除</button>
+        <button class="btn-primary" type="primary" @click="submitForm" size="mini">保存/修改</button>
+    </view>
+</template>
+
+<script setup name="djVisitComponent">
+import { ref, reactive } from 'vue'
+import cache from '../../../../../utils/cache'
+import { onShow, onUnload } from '@dcloudio/uni-app';
+import { addVisistDetail, deleVisistDetailItem, getVisistDetailItem } from '../../../../../api/crm/activity/activity';
+
+let customerUserList = ref([])
+let myUserList = ref([])
+let activeTxt = ref('')
+let isDisabled = ref(false)
+const props = defineProps({
+    cusName: String, //客户单位名称
+    cusId: Number,//客户ID
+    visistId: Number,//活动ID
+    status: String //状态
+})
+
+// 表单数据
+const formData = ref({
+    customerUserList,
+    myUserList,
+    activeTxt
+});
+
+// 表单ref
+const formRef = ref(null);
+
+//删除明细项的内容
+let djDeleteForm = reactive({})
+function handleDeleteVisistDetailItem() {
+    djDeleteForm.treeName = '党建活动'
+    djDeleteForm.visistId = props.visistId
+    deleVisistDetailItem(djDeleteForm).then(res => {
+        if (res.code == 200) {
+            uni.showToast({
+                title: '删除成功',
+                duration: 2000
+            });
+            //响应成功，删除缓存记录
+            handleDelete()
+        } else {
+            uni.showToast({
+                title: res.msg,
+                icon: 'none',
+            });
+        }
+    })
+}
+
+// 删除内容
+let handleDelete = () => {
+    formData.value.customerUserList = null
+    formData.value.myUserList = null
+    formData.value.activeTxt = null
+    if (cache.get('checkedDJClientList') != null) {
+        cache.remove('checkedDJClientList');
+    }
+    if (cache.get('checkedDJMyUserList') != null) {
+        cache.remove('checkedDJMyUserList');
+    }
+}
+
+//删除缓存
+let handleDeleteLocal = () => {
+    cache.remove('checkedDJClientList');
+    cache.remove('checkedDJMyUserList');
+}
+
+let djForm = reactive({})
+// 保存/修改
+const submitForm = async () => {
+    try {
+        // 验证表单
+        await formRef.value.validate();
+        // 验证通过后的操作
+        uni.showToast({
+            title: '验证通过',
+            icon: 'success'
+        });
+        djForm.treeName = '党建活动'
+        djForm.cusId = props.cusId
+        djForm.visistId = props.visistId
+
+        if (Array.isArray(myUserList.value)) {
+            djForm.ourPersonnel = myUserList.value.join(',')
+        } else {
+            djForm.ourPersonnel = myUserList.value
+        }
+
+        if (Array.isArray(customerUserList.value)) {
+            djForm.cusPersonnel = customerUserList.value.join(',')
+        } else {
+            djForm.cusPersonnel = customerUserList.value
+        }
+
+        djForm.bandResult = activeTxt.value
+        // 提交服务器进行新增
+        addVisistDetail(djForm).then(res => {
+            if (res.code == 200) {
+                uni.showToast({
+                    title: '提交成功',
+                    duration: 2000
+                });
+                //响应成功，删除缓存记录
+                handleDeleteLocal()
+            } else {
+                uni.showToast({
+                    title: res.msg,
+                    icon: 'none',
+                });
+            }
+        })
+    } catch (err) {
+        console.log('表单验证失败:', err);
+    }
+};
+
+//页面渲染完成后，查询catch的get
+onShow(() => {
+
+    if (cache.get('checkedDJClientList') != null && cache.get('checkedDJClientList') != []) {
+        customerUserList.value = cache.get('checkedDJClientList')
+    }
+
+    if (cache.get('checkedDJMyUserList') != null && cache.get('checkedDJMyUserList') != []) {
+        myUserList.value = cache.get('checkedDJMyUserList')
+    }
+
+        if(props.status=='完成'){
+        isDisabled.value = true
+    }else{
+        isDisabled.value = false
+    }
+})
+
+//查询日常走访的内容
+let queryDJForm = reactive({})
+let getDJVisitReportDetailContent = () => {
+    queryDJForm.visistId = props.visistId
+    queryDJForm.cusId = props.cusId
+    queryDJForm.treeName = '党建活动'
+    getVisistDetailItem(queryDJForm).then(res => {
+        if (res.rows[0] != null) {
+            customerUserList.value = res.rows[0].customerPersonnel
+            myUserList.value = res.rows[0].ourPersonnel
+            activeTxt.value = res.rows[0].bandResult
+        }
+    })
+}
+
+
+
+//页面卸载之后，删除缓存信息
+onUnload(() => {
+    handleDeleteLocal()
+})
+
+
+//选择客户人员
+function chooseClientUser() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/customerUserList?cusName=' + props.cusName + '&chooseType=党建活动'
+    })
+}
+
+//选择我方参与人
+function chooseMyUser() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/myUserList?chooseType=党建活动'
+    })
+}
+
+// 明确暴露给父组件的方法
+defineExpose({
+    handleDelete,
+    getDJVisitReportDetailContent
+})
+
+</script>
+
+
+<style scoped lang="scss">
+.all-body {
+    /* #ifdef APP-PLUS */
+    top: 150rpx;
+    height: calc(100vh - 75px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    top: 120rpx;
+    height: calc(100vh);
+    /* #endif */
+}
+
+.search {
+    display: flex;
+}
+
+.search .btn-search {
+    border: none;
+    background: none;
+    line-height: normal;
+    color: #fff;
+    line-height: 56rpx !important;
+    padding: 10rpx 0 0;
+    text-align: left;
+    cursor: pointer;
+}
+
+.search .btn-search::after {
+    display: none;
+}
+
+.search .custom-search {
+    width: 80%;
+
+}
+
+.search .custom-search.uni-searchbar {
+    padding-right: 0 !important;
+}
+
+.scroll-h {
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 120px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 110px);
+    /* #endif */
+}
+
+.white-bg {
+    padding-bottom: 10rpx;
+}
+</style>
diff --git a/src/pages/business/CRM/marketActivity/components/jsVisistComponent.vue b/src/pages/business/CRM/marketActivity/components/jsVisistComponent.vue
new file mode 100644
index 0000000..be27707
--- /dev/null
+++ b/src/pages/business/CRM/marketActivity/components/jsVisistComponent.vue
@@ -0,0 +1,262 @@
+<template>
+    <uni-forms ref="formRef" :model="formData"  label-width="100px" label-position="top">
+        <uni-forms-item label="客户人员" name="customerUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.customerUserList" placeholder="请选择客户人员" name="input"
+            :disabled="isDisabled"
+                @focus="chooseClientUser"></uni-easyinput>
+        </uni-forms-item>
+        <uni-forms-item label="我方参与人" name="myUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.myUserList" placeholder="请选择我方参与人" name="input"
+            :disabled="isDisabled"
+                @focus="chooseMyUser"></uni-easyinput>
+        </uni-forms-item>
+
+        <uni-forms-item label="活动文字" name="activeTxt" class="uni-forms-item is-direction-top is-top">
+            <uni-easyinput type="textarea" autoHeight v-model="formData.activeTxt" placeholder="请输入" 活动文字
+                class="form-texarea" />
+        </uni-forms-item>
+    </uni-forms>
+    <view class="footer-con">
+        <button class="btn-default" type="default" @click="handleDeleteVisistDetailItem" size="mini">删 除</button>
+        <button class="btn-primary" type="primary" @click="submitForm" size="mini">保存/修改</button>
+    </view>
+</template>
+
+<script setup name="jsVisitComponent">
+import { ref, reactive } from 'vue'
+import cache from '../../../../../utils/cache'
+import { onShow, onUnload } from '@dcloudio/uni-app';
+import { addVisistDetail, deleVisistDetailItem, getVisistDetailItem } from '../../../../../api/crm/activity/activity';
+
+let customerUserList = ref([])
+let myUserList = ref([])
+let activeTxt = ref('')
+let isDisabled = ref(false)
+const props = defineProps({
+    cusName: String, //客户单位名称
+    cusId: Number,//客户ID
+    visistId: Number,//活动ID
+    status: String //状态
+})
+
+// 表单数据
+const formData = ref({
+    customerUserList,
+    myUserList,
+    activeTxt
+});
+
+// 表单ref
+const formRef = ref(null);
+
+//删除明细项的内容
+let jsDeleteForm = reactive({})
+function handleDeleteVisistDetailItem() {
+    jsDeleteForm.treeName = '业务招待'
+    jsDeleteForm.visistId = props.visistId
+    deleVisistDetailItem(jsDeleteForm).then(res => {
+        if (res.code == 200) {
+            uni.showToast({
+                title: '删除成功',
+                duration: 2000
+            });
+            //响应成功，删除缓存记录
+            handleDelete()
+        } else {
+            uni.showToast({
+                title: res.msg,
+                icon: 'none',
+            });
+        }
+    })
+}
+
+// 删除内容
+let handleDelete = () => {
+    formData.value.customerUserList = null
+    formData.value.myUserList = null
+    formData.value.activeTxt = null
+    if (cache.get('checkedJSClientList') != null) {
+        cache.remove('checkedJSClientList');
+    }
+    if (cache.get('checkedJSMyUserList') != null) {
+        cache.remove('checkedJSMyUserList');
+    }
+}
+
+//删除缓存
+let handleDeleteLocal = () => {
+    cache.remove('checkedJSClientList');
+    cache.remove('checkedJSMyUserList');
+}
+
+let jsForm = reactive({})
+// 保存/修改
+const submitForm = async () => {
+    try {
+        // 验证表单
+        await formRef.value.validate();
+        // 验证通过后的操作
+        uni.showToast({
+            title: '验证通过',
+            icon: 'success'
+        });
+        jsForm.treeName = '技术交流'
+        jsForm.cusId = props.cusId
+        jsForm.visistId = props.visistId
+
+        if (Array.isArray(myUserList.value)) {
+            jsForm.ourPersonnel = myUserList.value.join(',')
+        } else {
+            jsForm.ourPersonnel = myUserList.value
+        }
+
+        if (Array.isArray(customerUserList.value)) {
+            jsForm.cusPersonnel = customerUserList.value.join(',')
+        } else {
+            jsForm.cusPersonnel = customerUserList.value
+        }
+
+        jsForm.bandResult = activeTxt.value
+        // 提交服务器进行新增
+        addVisistDetail(jsForm).then(res => {
+            if (res.code == 200) {
+                uni.showToast({
+                    title: '提交成功',
+                    duration: 2000
+                });
+                //响应成功，删除缓存记录
+                handleDeleteLocal()
+            } else {
+                uni.showToast({
+                    title: res.msg,
+                    icon: 'none',
+                });
+            }
+        })
+    } catch (err) {
+        console.log('表单验证失败:', err);
+    }
+};
+
+//页面渲染完成后，查询catch的get
+onShow(() => {
+
+    if (cache.get('checkedJSClientList') != null && cache.get('checkedJSClientList') != []) {
+        customerUserList.value = cache.get('checkedJSClientList')
+    }
+
+    if (cache.get('checkedJSMyUserList') != null && cache.get('checkedJSMyUserList') != []) {
+        myUserList.value = cache.get('checkedJSMyUserList')
+    }
+
+        if(props.status=='完成'){
+        isDisabled.value = true
+    }else{
+        isDisabled.value = false
+    }
+})
+
+//查询日常走访的内容
+let queryJSForm = reactive({})
+let getJSVisitReportDetailContent = () => {
+    queryJSForm.visistId = props.visistId
+    queryJSForm.cusId = props.cusId
+    queryJSForm.treeName = '技术交流'
+    getVisistDetailItem(queryJSForm).then(res => {
+        if (res.rows[0] != null) {
+            customerUserList.value = res.rows[0].customerPersonnel
+            myUserList.value = res.rows[0].ourPersonnel
+            activeTxt.value = res.rows[0].bandResult
+        }
+    })
+}
+
+
+
+//页面卸载之后，删除缓存信息
+onUnload(() => {
+    handleDeleteLocal()
+})
+
+
+//选择客户人员
+function chooseClientUser() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/customerUserList?cusName=' + props.cusName + '&chooseType=技术交流'
+    })
+}
+
+//选择我方参与人
+function chooseMyUser() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/myUserList?chooseType=技术交流'
+    })
+}
+
+// 明确暴露给父组件的方法
+defineExpose({
+    handleDelete,
+    getJSVisitReportDetailContent
+})
+
+</script>
+
+
+<style scoped lang="scss">
+.all-body {
+    /* #ifdef APP-PLUS */
+    top: 150rpx;
+    height: calc(100vh - 75px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    top: 120rpx;
+    height: calc(100vh);
+    /* #endif */
+}
+
+.search {
+    display: flex;
+}
+
+.search .btn-search {
+    border: none;
+    background: none;
+    line-height: normal;
+    color: #fff;
+    line-height: 56rpx !important;
+    padding: 10rpx 0 0;
+    text-align: left;
+    cursor: pointer;
+}
+
+.search .btn-search::after {
+    display: none;
+}
+
+.search .custom-search {
+    width: 80%;
+
+}
+
+.search .custom-search.uni-searchbar {
+    padding-right: 0 !important;
+}
+
+.scroll-h {
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 120px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 110px);
+    /* #endif */
+}
+
+.white-bg {
+    padding-bottom: 10rpx;
+}
+
+
+
+
+</style>
diff --git a/src/pages/business/CRM/marketActivity/components/lcVisistComponent.vue b/src/pages/business/CRM/marketActivity/components/lcVisistComponent.vue
new file mode 100644
index 0000000..18f460d
--- /dev/null
+++ b/src/pages/business/CRM/marketActivity/components/lcVisistComponent.vue
@@ -0,0 +1,262 @@
+<template>
+    <uni-forms ref="formRef" :model="formData"  label-width="100px" label-position="top">
+        <uni-forms-item label="客户人员" name="customerUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.customerUserList" placeholder="请选择客户人员" name="input"
+            :disabled="isDisabled"
+                @focus="chooseClientUser"></uni-easyinput>
+        </uni-forms-item>
+        <uni-forms-item label="我方参与人" name="myUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.myUserList" placeholder="请选择我方参与人" name="input"
+            :disabled="isDisabled"
+                @focus="chooseMyUser"></uni-easyinput>
+        </uni-forms-item>
+
+        <uni-forms-item label="活动文字" name="activeTxt" class="uni-forms-item is-direction-top is-top">
+            <uni-easyinput type="textarea" autoHeight v-model="formData.activeTxt" placeholder="请输入" 活动文字
+                class="form-texarea" />
+        </uni-forms-item>
+    </uni-forms>
+    <view class="footer-con">
+        <button class="btn-default" type="default" @click="handleDeleteVisistDetailItem" size="mini">删 除</button>
+        <button class="btn-primary" type="primary" @click="submitForm" size="mini">保存/修改</button>
+    </view>
+</template>
+
+<script setup name="lcVisitComponent">
+import { ref, reactive } from 'vue'
+import cache from '../../../../../utils/cache'
+import { onShow, onUnload } from '@dcloudio/uni-app';
+import { addVisistDetail, deleVisistDetailItem, getVisistDetailItem } from '../../../../../api/crm/activity/activity';
+
+let customerUserList = ref([])
+let myUserList = ref([])
+let activeTxt = ref('')
+let isDisabled = ref(false)
+const props = defineProps({
+    cusName: String, //客户单位名称
+    cusId: Number,//客户ID
+    visistId: Number,//活动ID
+    status: String //状态
+})
+
+// 表单数据
+const formData = ref({
+    customerUserList,
+    myUserList,
+    activeTxt
+});
+
+// 表单ref
+const formRef = ref(null);
+
+//删除明细项的内容
+let lcDeleteForm = reactive({})
+function handleDeleteVisistDetailItem() {
+    lcDeleteForm.treeName = '业务招待'
+    lcDeleteForm.visistId = props.visistId
+    deleVisistDetailItem(lcDeleteForm).then(res => {
+        if (res.code == 200) {
+            uni.showToast({
+                title: '删除成功',
+                duration: 2000
+            });
+            //响应成功，删除缓存记录
+            handleDelete()
+        } else {
+            uni.showToast({
+                title: res.msg,
+                icon: 'none',
+            });
+        }
+    })
+}
+
+// 删除内容
+let handleDelete = () => {
+    formData.value.customerUserList = null
+    formData.value.myUserList = null
+    formData.value.activeTxt = null
+    if (cache.get('checkedLCClientList') != null) {
+        cache.remove('checkedLCClientList');
+    }
+    if (cache.get('checkedLCMyUserList') != null) {
+        cache.remove('checkedLCMyUserList');
+    }
+}
+
+//删除缓存
+let handleDeleteLocal = () => {
+    cache.remove('checkedLCClientList');
+    cache.remove('checkedLCMyUserList');
+}
+
+let lcForm = reactive({})
+// 保存/修改
+const submitForm = async () => {
+    try {
+        // 验证表单
+        await formRef.value.validate();
+        // 验证通过后的操作
+        uni.showToast({
+            title: '验证通过',
+            icon: 'success'
+        });
+        lcForm.treeName = '来厂参观'
+        lcForm.cusId = props.cusId
+        lcForm.visistId = props.visistId
+
+        if (Array.isArray(myUserList.value)) {
+            lcForm.ourPersonnel = myUserList.value.join(',')
+        } else {
+            lcForm.ourPersonnel = myUserList.value
+        }
+
+        if (Array.isArray(customerUserList.value)) {
+            lcForm.cusPersonnel = customerUserList.value.join(',')
+        } else {
+            lcForm.cusPersonnel = customerUserList.value
+        }
+
+        lcForm.bandResult = activeTxt.value
+        // 提交服务器进行新增
+        addVisistDetail(lcForm).then(res => {
+            if (res.code == 200) {
+                uni.showToast({
+                    title: '提交成功',
+                    duration: 2000
+                });
+                //响应成功，删除缓存记录
+                handleDeleteLocal()
+            } else {
+                uni.showToast({
+                    title: res.msg,
+                    icon: 'none',
+                });
+            }
+        })
+    } catch (err) {
+        console.log('表单验证失败:', err);
+    }
+};
+
+//页面渲染完成后，查询catch的get
+onShow(() => {
+
+    if (cache.get('checkedLCClientList') != null && cache.get('checkedLCClientList') != []) {
+        customerUserList.value = cache.get('checkedLCClientList')
+    }
+
+    if (cache.get('checkedLCMyUserList') != null && cache.get('checkedLCMyUserList') != []) {
+        myUserList.value = cache.get('checkedLCMyUserList')
+    }
+
+        if(props.status=='完成'){
+        isDisabled.value = true
+    }else{
+        isDisabled.value = false
+    }
+})
+
+//查询日常走访的内容
+let queryLCForm = reactive({})
+let getLCVisitReportDetailContent = () => {
+    queryLCForm.visistId = props.visistId
+    queryLCForm.cusId = props.cusId
+    queryLCForm.treeName = '来厂参观'
+    getVisistDetailItem(queryLCForm).then(res => {
+        if (res.rows[0] != null) {
+            customerUserList.value = res.rows[0].customerPersonnel
+            myUserList.value = res.rows[0].ourPersonnel
+            activeTxt.value = res.rows[0].bandResult
+        }
+    })
+}
+
+
+
+//页面卸载之后，删除缓存信息
+onUnload(() => {
+    handleDeleteLocal()
+})
+
+
+//选择客户人员
+function chooseClientUser() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/customerUserList?cusName=' + props.cusName + '&chooseType=来厂参观'
+    })
+}
+
+//选择我方参与人
+function chooseMyUser() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/myUserList?chooseType=来厂参观'
+    })
+}
+
+// 明确暴露给父组件的方法
+defineExpose({
+    handleDelete,
+    getLCVisitReportDetailContent
+})
+
+</script>
+
+
+<style scoped lang="scss">
+.all-body {
+    /* #ifdef APP-PLUS */
+    top: 150rpx;
+    height: calc(100vh - 75px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    top: 120rpx;
+    height: calc(100vh);
+    /* #endif */
+}
+
+.search {
+    display: flex;
+}
+
+.search .btn-search {
+    border: none;
+    background: none;
+    line-height: normal;
+    color: #fff;
+    line-height: 56rpx !important;
+    padding: 10rpx 0 0;
+    text-align: left;
+    cursor: pointer;
+}
+
+.search .btn-search::after {
+    display: none;
+}
+
+.search .custom-search {
+    width: 80%;
+
+}
+
+.search .custom-search.uni-searchbar {
+    padding-right: 0 !important;
+}
+
+.scroll-h {
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 120px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 110px);
+    /* #endif */
+}
+
+.white-bg {
+    padding-bottom: 10rpx;
+}
+
+
+
+
+</style>
diff --git a/src/pages/business/CRM/marketActivity/components/lyVisistComponent.vue b/src/pages/business/CRM/marketActivity/components/lyVisistComponent.vue
new file mode 100644
index 0000000..0335a53
--- /dev/null
+++ b/src/pages/business/CRM/marketActivity/components/lyVisistComponent.vue
@@ -0,0 +1,308 @@
+<template>
+    <uni-forms ref="formRef" :model="formData" label-width="100px" label-position="top">
+        <uni-forms-item label="客户人员" name="customerUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.customerUserList" placeholder="请选择客户人员" name="input"
+            :disabled="isDisabled"
+                @focus="chooseClientUser"></uni-easyinput>
+        </uni-forms-item>
+        <uni-forms-item label="我方参与人" name="myUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.myUserList" placeholder="请选择我方参与人" name="input"
+            :disabled="isDisabled"
+                @focus="chooseMyUser"></uni-easyinput>
+        </uni-forms-item>
+
+<uni-forms-item label="住宿天数" name="stayDays">
+    <picker
+      @change="handlePickerChange"
+      :value="stayDaysIndex"
+      :range="stayDaysOptions"
+      :disabled="isDisabled"
+    >
+      <view class="picker-container">
+        <view class="picker-display">
+          {{ stayDaysOptions[stayDaysIndex] }}
+        </view>
+        <uni-icons type="arrowdown" size="16" color="#666"></uni-icons>
+      </view>
+    </picker>
+  </uni-forms-item>
+
+        <uni-forms-item label="活动文字" name="activeTxt" class="uni-forms-item is-direction-top is-top">
+            <uni-easyinput type="textarea" autoHeight v-model="formData.activeTxt" placeholder="请输入" 活动文字
+                class="form-texarea" />
+        </uni-forms-item>
+    </uni-forms>
+    <view class="footer-con">
+        <button class="btn-default" type="default" @click="handleDeleteVisistDetailItem" size="mini">删 除</button>
+        <button class="btn-primary" type="primary" @click="submitForm" size="mini">保存/修改</button>
+    </view>
+</template>
+
+<script setup name="lyVisitComponent">
+import { ref, reactive } from 'vue'
+import cache from '../../../../../utils/cache'
+import { onShow, onUnload } from '@dcloudio/uni-app';
+import { addVisistDetail, deleVisistDetailItem, getVisistDetailItem } from '../../../../../api/crm/activity/activity';
+
+let customerUserList = ref([])
+let myUserList = ref([])
+let activeTxt = ref('')
+let isDisabled = ref(false)
+const props = defineProps({
+    cusName: String, //客户单位名称
+    cusId: Number,//客户ID
+    visistId: Number,//活动ID
+    status: String //状态
+})
+
+
+
+// 表单数据
+const formData = ref({
+    customerUserList,
+    myUserList,
+    activeTxt
+});
+
+// 表单ref
+const formRef = ref(null);
+
+//删除明细项的内容
+let lyDeleteForm = reactive({})
+function handleDeleteVisistDetailItem() {
+    lyDeleteForm.treeName = '联谊活动'
+    lyDeleteForm.visistId = props.visistId
+    deleVisistDetailItem(lyDeleteForm).then(res => {
+        if (res.code == 200) {
+            uni.showToast({
+                title: '删除成功',
+                duration: 2000
+            });
+            //响应成功，删除缓存记录
+            handleDelete()
+        } else {
+            uni.showToast({
+                title: res.msg,
+                icon: 'none',
+            });
+        }
+    })
+}
+
+// 删除内容
+let handleDelete = () => {
+    formData.value.customerUserList = null
+    formData.value.myUserList = null
+    formData.value.activeTxt = null
+    if (cache.get('checkedLYClientList') != null) {
+        cache.remove('checkedYWClientList');
+    }
+    if (cache.get('checkedLYMyUserList') != null) {
+        cache.remove('checkedLYMyUserList');
+    }
+}
+
+//删除缓存
+let handleDeleteLocal = () => {
+    cache.remove('checkedLYClientList');
+    cache.remove('checkedLYMyUserList');
+}
+
+let lyForm = reactive({})
+// 保存/修改
+const submitForm = async () => {
+    try {
+        // 验证表单
+        await formRef.value.validate();
+        // 验证通过后的操作
+        uni.showToast({
+            title: '验证通过',
+            icon: 'success'
+        });
+        lyForm.treeName = '联谊活动'
+        lyForm.cusId = props.cusId
+        lyForm.visistId = props.visistId
+
+        if (Array.isArray(myUserList.value)) {
+            lyForm.ourPersonnel = myUserList.value.join(',')
+        } else {
+            lyForm.ourPersonnel = myUserList.value
+        }
+
+        if (Array.isArray(customerUserList.value)) {
+            lyForm.cusPersonnel = customerUserList.value.join(',')
+        } else {
+            lyForm.cusPersonnel = customerUserList.value
+        }
+
+        lyForm.bandResult = activeTxt.value
+        lyForm.multiple = stayDaysIndex.value+1
+        // 提交服务器进行新增
+        addVisistDetail(lyForm).then(res => {
+            if (res.code == 200) {
+                uni.showToast({
+                    title: '提交成功',
+                    duration: 2000
+                });
+                //响应成功，删除缓存记录
+                handleDeleteLocal()
+            } else {
+                uni.showToast({
+                    title: res.msg,
+                    icon: 'none',
+                });
+            }
+        })
+    } catch (err) {
+        console.log('表单验证失败:', err);
+    }
+};
+
+//页面渲染完成后，查询catch的get
+onShow(() => {
+
+    if (cache.get('checkedLYClientList') != null && cache.get('checkedLYClientList') != []) {
+        customerUserList.value = cache.get('checkedLYClientList')
+    }
+
+    if (cache.get('checkedLYMyUserList') != null && cache.get('checkedLYMyUserList') != []) {
+        myUserList.value = cache.get('checkedLYMyUserList')
+    }
+        console.log(props.status,'获取的状态')
+
+    if(props.status=='完成'){
+        isDisabled.value = true
+    }else{
+        isDisabled.value = false
+    }
+})
+
+//查询日常走访的内容
+let queryLYForm = reactive({})
+let getLYVisitReportDetailContent = () => {
+    queryLYForm.visistId = props.visistId
+    queryLYForm.cusId = props.cusId
+    queryLYForm.treeName = '联谊活动'
+    getVisistDetailItem(queryLYForm).then(res => {
+        if (res.rows[0] != null) {
+            customerUserList.value = res.rows[0].customerPersonnel
+            myUserList.value = res.rows[0].ourPersonnel
+            stayDaysIndex.value = res.rows[0].multiple-1
+            activeTxt.value = res.rows[0].bandResult
+        }
+    })
+}
+
+
+
+//页面卸载之后，删除缓存信息
+onUnload(() => {
+    handleDeleteLocal()
+})
+
+
+//选择客户人员
+function chooseClientUser() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/customerUserList?cusName=' + props.cusName + '&chooseType=联谊活动'
+    })
+}
+
+//选择我方参与人
+function chooseMyUser() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/myUserList?chooseType=联谊活动'
+    })
+}
+
+// 住宿天数
+const stayDaysOptions = ref(['1天', '2天', '3天', '4天', '5天', '6天', '7天'])
+const stayDaysIndex = ref(0) // 默认未选择
+
+const handlePickerChange = (e) => {
+  stayDaysIndex.value = e.detail.value
+  console.log("天数数字：",stayDaysIndex.value+1)
+}
+
+// 明确暴露给父组件的方法
+defineExpose({
+    handleDelete,
+    getLYVisitReportDetailContent
+})
+
+</script>
+
+
+<style scoped lang="scss">
+.all-body {
+    /* #ifdef APP-PLUS */
+    top: 150rpx;
+    height: calc(100vh - 75px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    top: 120rpx;
+    height: calc(100vh);
+    /* #endif */
+}
+
+.search {
+    display: flex;
+}
+
+.search .btn-search {
+    border: none;
+    background: none;
+    line-height: normal;
+    color: #fff;
+    line-height: 56rpx !important;
+    padding: 10rpx 0 0;
+    text-align: left;
+    cursor: pointer;
+}
+
+.search .btn-search::after {
+    display: none;
+}
+
+.search .custom-search {
+    width: 80%;
+
+}
+
+.search .custom-search.uni-searchbar {
+    padding-right: 0 !important;
+}
+
+.scroll-h {
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 120px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 110px);
+    /* #endif */
+}
+
+.white-bg {
+    padding-bottom: 10rpx;
+}
+
+.picker-container {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 10px 12px;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  background-color: #fff;
+}
+
+.picker-display {
+  color: #333;
+  font-size: 14px;
+}
+
+.picker-display:empty::before {
+  content: '请选择住宿天数';
+  color: #999;
+}
+</style>
diff --git a/src/pages/business/CRM/marketActivity/components/wtVisistComponent.vue b/src/pages/business/CRM/marketActivity/components/wtVisistComponent.vue
new file mode 100644
index 0000000..0f4d136
--- /dev/null
+++ b/src/pages/business/CRM/marketActivity/components/wtVisistComponent.vue
@@ -0,0 +1,259 @@
+<template>
+    <uni-forms ref="formRef" :model="formData"  label-width="100px" label-position="top">
+        <uni-forms-item label="客户人员" name="customerUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.customerUserList" placeholder="请选择客户人员" name="input"
+            :disabled="isDisabled"
+                @focus="chooseClientUser"></uni-easyinput>
+        </uni-forms-item>
+        <uni-forms-item label="我方参与人" name="myUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.myUserList" placeholder="请选择我方参与人" name="input"
+            :disabled="isDisabled"
+                @focus="chooseMyUser"></uni-easyinput>
+        </uni-forms-item>
+
+        <uni-forms-item label="活动文字" name="activeTxt" class="uni-forms-item is-direction-top is-top">
+            <uni-easyinput type="textarea" autoHeight v-model="formData.activeTxt" placeholder="请输入" 活动文字
+                class="form-texarea" />
+        </uni-forms-item>
+    </uni-forms>
+    <view class="footer-con">
+        <button class="btn-default" type="default" @click="handleDeleteVisistDetailItem" size="mini">删 除</button>
+        <button class="btn-primary" type="primary" @click="submitForm" size="mini">保存/修改</button>
+    </view>
+</template>
+
+<script setup name="wtVisitComponent">
+import { ref, reactive } from 'vue'
+import cache from '../../../../../utils/cache'
+import { onShow, onUnload } from '@dcloudio/uni-app';
+import { addVisistDetail, deleVisistDetailItem, getVisistDetailItem } from '../../../../../api/crm/activity/activity';
+
+let customerUserList = ref([])
+let myUserList = ref([])
+let activeTxt = ref('')
+let isDisabled = ref(false)
+const props = defineProps({
+    cusName: String, //客户单位名称
+    cusId: Number,//客户ID
+    visistId: Number,//活动ID
+    status: String //状态
+})
+
+// 表单数据
+const formData = ref({
+    customerUserList,
+    myUserList,
+    activeTxt
+});
+
+// 表单ref
+const formRef = ref(null);
+
+//删除明细项的内容
+let wtDeleteForm = reactive({})
+function handleDeleteVisistDetailItem() {
+    wtDeleteForm.treeName = '文体活动'
+    wtDeleteForm.visistId = props.visistId
+    deleVisistDetailItem(wtDeleteForm).then(res => {
+        if (res.code == 200) {
+            uni.showToast({
+                title: '删除成功',
+                duration: 2000
+            });
+            //响应成功，删除缓存记录
+            handleDelete()
+        } else {
+            uni.showToast({
+                title: res.msg,
+                icon: 'none',
+            });
+        }
+    })
+}
+
+// 删除内容
+let handleDelete = () => {
+    formData.value.customerUserList = null
+    formData.value.myUserList = null
+    formData.value.activeTxt = null
+    if (cache.get('checkedWTClientList') != null) {
+        cache.remove('checkedWTClientList');
+    }
+    if (cache.get('checkedWTMyUserList') != null) {
+        cache.remove('checkedWTMyUserList');
+    }
+}
+
+//删除缓存
+let handleDeleteLocal = () => {
+    cache.remove('checkedWTClientList');
+    cache.remove('checkedWTMyUserList');
+}
+
+let wtForm = reactive({})
+// 保存/修改
+const submitForm = async () => {
+    try {
+        // 验证表单
+        await formRef.value.validate();
+        // 验证通过后的操作
+        uni.showToast({
+            title: '验证通过',
+            icon: 'success'
+        });
+        wtForm.treeName = '文体活动'
+        wtForm.cusId = props.cusId
+        wtForm.visistId = props.visistId
+
+        if (Array.isArray(myUserList.value)) {
+            wtForm.ourPersonnel = myUserList.value.join(',')
+        } else {
+            wtForm.ourPersonnel = myUserList.value
+        }
+
+        if (Array.isArray(customerUserList.value)) {
+            wtForm.cusPersonnel = customerUserList.value.join(',')
+        } else {
+            wtForm.cusPersonnel = customerUserList.value
+        }
+
+        wtForm.bandResult = activeTxt.value
+        // 提交服务器进行新增
+        addVisistDetail(wtForm).then(res => {
+            if (res.code == 200) {
+                uni.showToast({
+                    title: '提交成功',
+                    duration: 2000
+                });
+                //响应成功，删除缓存记录
+                handleDeleteLocal()
+            } else {
+                uni.showToast({
+                    title: res.msg,
+                    icon: 'none',
+                });
+            }
+        })
+    } catch (err) {
+        console.log('表单验证失败:', err);
+    }
+};
+
+//页面渲染完成后，查询catch的get
+onShow(() => {
+
+    if (cache.get('checkedWTClientList') != null && cache.get('checkedWTClientList') != []) {
+        customerUserList.value = cache.get('checkedWTClientList')
+    }
+
+    if (cache.get('checkedWTMyUserList') != null && cache.get('checkedWTMyUserList') != []) {
+        myUserList.value = cache.get('checkedWTMyUserList')
+    }
+
+
+        if(props.status=='完成'){
+        isDisabled.value = true
+    }else{
+        isDisabled.value = false
+    }
+})
+
+//查询日常走访的内容
+let queryWTForm = reactive({})
+let getWTVisitReportDetailContent = () => {
+    queryWTForm.visistId = props.visistId
+    queryWTForm.cusId = props.cusId
+    queryWTForm.treeName = '文体活动'
+    getVisistDetailItem(queryWTForm).then(res => {
+        if (res.rows[0] != null) {
+            customerUserList.value = res.rows[0].customerPersonnel
+            myUserList.value = res.rows[0].ourPersonnel
+            activeTxt.value = res.rows[0].bandResult
+        }
+    })
+}
+
+
+
+//页面卸载之后，删除缓存信息
+onUnload(() => {
+    handleDeleteLocal()
+})
+
+
+//选择客户人员
+function chooseClientUser() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/customerUserList?cusName=' + props.cusName + '&chooseType=文体活动'
+    })
+}
+
+//选择我方参与人
+function chooseMyUser() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/myUserList?chooseType=文体活动'
+    })
+}
+
+// 明确暴露给父组件的方法
+defineExpose({
+    handleDelete,
+    getWTVisitReportDetailContent
+})
+
+</script>
+
+
+<style scoped lang="scss">
+.all-body {
+    /* #ifdef APP-PLUS */
+    top: 150rpx;
+    height: calc(100vh - 75px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    top: 120rpx;
+    height: calc(100vh);
+    /* #endif */
+}
+
+.search {
+    display: flex;
+}
+
+.search .btn-search {
+    border: none;
+    background: none;
+    line-height: normal;
+    color: #fff;
+    line-height: 56rpx !important;
+    padding: 10rpx 0 0;
+    text-align: left;
+    cursor: pointer;
+}
+
+.search .btn-search::after {
+    display: none;
+}
+
+.search .custom-search {
+    width: 80%;
+
+}
+
+.search .custom-search.uni-searchbar {
+    padding-right: 0 !important;
+}
+
+.scroll-h {
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 120px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 110px);
+    /* #endif */
+}
+
+.white-bg {
+    padding-bottom: 10rpx;
+}
+</style>
diff --git a/src/pages/business/CRM/marketActivity/components/ywVisistComponent.vue b/src/pages/business/CRM/marketActivity/components/ywVisistComponent.vue
new file mode 100644
index 0000000..aa60760
--- /dev/null
+++ b/src/pages/business/CRM/marketActivity/components/ywVisistComponent.vue
@@ -0,0 +1,259 @@
+<template>
+    <uni-forms ref="formRef" :model="formData"  label-width="100px" label-position="top">
+        <uni-forms-item label="客户人员" name="customerUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.customerUserList" placeholder="请选择客户人员" name="input"
+            :disabled="isDisabled"
+                @focus="chooseClientUser"></uni-easyinput>
+        </uni-forms-item>
+        <uni-forms-item label="我方参与人" name="myUserList" class="f-c-right">
+            <uni-easyinput v-model="formData.myUserList" placeholder="请选择我方参与人" name="input"
+            :disabled="isDisabled"
+                @focus="chooseMyUser"></uni-easyinput>
+        </uni-forms-item>
+
+        <uni-forms-item label="活动文字" name="activeTxt" class="uni-forms-item is-direction-top is-top">
+            <uni-easyinput type="textarea" autoHeight v-model="formData.activeTxt" placeholder="请输入" 活动文字
+                class="form-texarea" />
+        </uni-forms-item>
+    </uni-forms>
+    <view class="footer-con">
+        <button class="btn-default" type="default" @click="handleDeleteVisistDetailItem" size="mini">删 除</button>
+        <button class="btn-primary" type="primary" @click="submitForm" size="mini">保存/修改</button>
+    </view>
+</template>
+
+<script setup name="ywVisitComponent">
+import { ref, reactive } from 'vue'
+import cache from '../../../../../utils/cache'
+import { onShow, onUnload } from '@dcloudio/uni-app';
+import { addVisistDetail, deleVisistDetailItem, getVisistDetailItem } from '../../../../../api/crm/activity/activity';
+
+let customerUserList = ref([])
+let myUserList = ref([])
+let activeTxt = ref('')
+let isDisabled = ref(false)
+const props = defineProps({
+    cusName: String, //客户单位名称
+    cusId: Number,//客户ID
+    visistId: Number,//活动ID
+    status: String //状态
+})
+
+// 表单数据
+const formData = ref({
+    customerUserList,
+    myUserList,
+    activeTxt
+});
+
+// 表单ref
+const formRef = ref(null);
+
+//删除明细项的内容
+let ywDeleteForm = reactive({})
+function handleDeleteVisistDetailItem() {
+    ywDeleteForm.treeName = '业务招待'
+    ywDeleteForm.visistId = props.visistId
+    deleVisistDetailItem(ywDeleteForm).then(res => {
+        if (res.code == 200) {
+            uni.showToast({
+                title: '删除成功',
+                duration: 2000
+            });
+            //响应成功，删除缓存记录
+            handleDelete()
+        } else {
+            uni.showToast({
+                title: res.msg,
+                icon: 'none',
+            });
+        }
+    })
+}
+
+// 删除内容
+let handleDelete = () => {
+    formData.value.customerUserList = null
+    formData.value.myUserList = null
+    formData.value.activeTxt = null
+    if (cache.get('checkedYWClientList') != null) {
+        cache.remove('checkedYWClientList');
+    }
+    if (cache.get('checkedYWMyUserList') != null) {
+        cache.remove('checkedYWMyUserList');
+    }
+}
+
+//删除缓存
+let handleDeleteLocal = () => {
+    cache.remove('checkedYWClientList');
+    cache.remove('checkedYWMyUserList');
+}
+
+let ywForm = reactive({})
+// 保存/修改
+const submitForm = async () => {
+    try {
+        // 验证表单
+        await formRef.value.validate();
+        // 验证通过后的操作
+        uni.showToast({
+            title: '验证通过',
+            icon: 'success'
+        });
+        ywForm.treeName = '业务招待'
+        ywForm.cusId = props.cusId
+        ywForm.visistId = props.visistId
+
+        if (Array.isArray(myUserList.value)) {
+            ywForm.ourPersonnel = myUserList.value.join(',')
+        } else {
+            ywForm.ourPersonnel = myUserList.value
+        }
+
+        if (Array.isArray(customerUserList.value)) {
+            ywForm.cusPersonnel = customerUserList.value.join(',')
+        } else {
+            ywForm.cusPersonnel = customerUserList.value
+        }
+
+        ywForm.bandResult = activeTxt.value
+        // 提交服务器进行新增
+        addVisistDetail(ywForm).then(res => {
+            if (res.code == 200) {
+                uni.showToast({
+                    title: '提交成功',
+                    duration: 2000
+                });
+                //响应成功，删除缓存记录
+                handleDeleteLocal()
+            } else {
+                uni.showToast({
+                    title: res.msg,
+                    icon: 'none',
+                });
+            }
+        })
+    } catch (err) {
+        console.log('表单验证失败:', err);
+    }
+};
+
+//页面渲染完成后，查询catch的get
+onShow(() => {
+
+    if (cache.get('checkedYWClientList') != null && cache.get('checkedYWClientList') != []) {
+        customerUserList.value = cache.get('checkedYWClientList')
+    }
+
+    if (cache.get('checkedYWMyUserList') != null && cache.get('checkedYWMyUserList') != []) {
+        myUserList.value = cache.get('checkedYWMyUserList')
+    }
+
+
+        if(props.status=='完成'){
+        isDisabled.value = true
+    }else{
+        isDisabled.value = false
+    }
+})
+
+//查询日常走访的内容
+let queryYWForm = reactive({})
+let getYWVisitReportDetailContent = () => {
+    queryYWForm.visistId = props.visistId
+    queryYWForm.cusId = props.cusId
+    queryYWForm.treeName = '业务招待'
+    getVisistDetailItem(queryYWForm).then(res => {
+        if (res.rows[0] != null) {
+            customerUserList.value = res.rows[0].customerPersonnel
+            myUserList.value = res.rows[0].ourPersonnel
+            activeTxt.value = res.rows[0].bandResult
+        }
+    })
+}
+
+
+
+//页面卸载之后，删除缓存信息
+onUnload(() => {
+    handleDeleteLocal()
+})
+
+
+//选择客户人员
+function chooseClientUser() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/customerUserList?cusName=' + props.cusName + '&chooseType=业务招待'
+    })
+}
+
+//选择我方参与人
+function chooseMyUser() {
+    uni.navigateTo({
+        url: '/pages/business/CRM/marketActivity/myUserList?chooseType=业务招待'
+    })
+}
+
+// 明确暴露给父组件的方法
+defineExpose({
+    handleDelete,
+    getYWVisitReportDetailContent
+})
+
+</script>
+
+
+<style scoped lang="scss">
+.all-body {
+    /* #ifdef APP-PLUS */
+    top: 150rpx;
+    height: calc(100vh - 75px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    top: 120rpx;
+    height: calc(100vh);
+    /* #endif */
+}
+
+.search {
+    display: flex;
+}
+
+.search .btn-search {
+    border: none;
+    background: none;
+    line-height: normal;
+    color: #fff;
+    line-height: 56rpx !important;
+    padding: 10rpx 0 0;
+    text-align: left;
+    cursor: pointer;
+}
+
+.search .btn-search::after {
+    display: none;
+}
+
+.search .custom-search {
+    width: 80%;
+
+}
+
+.search .custom-search.uni-searchbar {
+    padding-right: 0 !important;
+}
+
+.scroll-h {
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 120px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 110px);
+    /* #endif */
+}
+
+.white-bg {
+    padding-bottom: 10rpx;
+}
+</style>
diff --git a/src/pages/business/CRM/marketActivity/customerUserList.vue b/src/pages/business/CRM/marketActivity/customerUserList.vue
new file mode 100644
index 0000000..8be6890
--- /dev/null
+++ b/src/pages/business/CRM/marketActivity/customerUserList.vue
@@ -0,0 +1,159 @@
+<template>
+    <view class="con-body">
+        <view>
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'走访报告添加客户人员'" :leftFlag="true" :rightFlag="false">
+            </customHeader>
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height"></view>
+            <uni-easyinput prefixIcon="search" v-model="searchContent" placeholder="请输入客户人员名称" clearable
+                @iconClick="iconClick">
+            </uni-easyinput>
+            <checkbox-group class="block" @change="checkboxChange">
+                <view class="itemClass" v-for="(item, index) in dataList" :key="item.userId">
+                    <checkbox class='checkBoxClass' :value="item.userName" v-model="item.userName"></checkbox>
+                    <view class="clientClass">
+                        <text class="blue-text">{{ item.userName }}</text>
+                        {{ " | " }}
+                        {{ item.userDept != null ? item.userDept : ' ' }}
+                        {{ item.job != null ? item.job : ' ' }}
+                        {{ item.mobilePhone }}
+                        {{ item.remark != null ? item.remark : ' ' }}
+                    </view>
+                </view>
+            </checkbox-group>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import customHeader from '@/components/customHeader.vue'
+import { crmCustomerUser } from '../../../../api/crm/activity/activity'
+import { onMounted, onUnmounted, reactive, ref, watch } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { useMessage } from '../../../../utils/message'
+import cache from '../../../../utils/cache'
+
+
+
+const message = useMessage();
+
+//点击查询客户人员
+const queryParams = ref({
+    cusName: '',
+    nickName: '',
+    pageNum: 1,
+    pageSize: 10
+})
+
+
+onMounted(() => {
+    getClientUserName()
+})
+
+let chooseType = ref()
+onLoad(options => {
+    queryParams.value.cusName = options.cusName
+    chooseType.value = options.chooseType
+})
+const dataList = ref([])
+
+function getClientUserName() {
+    crmCustomerUser(queryParams.value).then(res => {
+        console.log(res, '相应测试')
+        dataList.value = res.rows
+    })
+}
+
+
+//查询某一客户人员
+let searchContent = ref('')
+
+function iconClick() {
+    message.toast('点击了查询，当前内容：' + searchContent.value)
+}
+
+//监视查询的内容的变化
+watch(searchContent, (newValue, oldValue) => {
+    queryParams.value.nickName = searchContent.value
+    //变化了之后，重新查询内容
+    crmCustomerUser(queryParams.value).then(res => {
+        dataList.value = res.rows
+    })
+})
+
+
+
+//勾选内容
+function checkboxChange(e) {
+    //这里要根据传递来的不同的内容，生成不同的setCache方法
+    if (chooseType.value == '日常走访') {
+        cache.set('checkedRCClientList', e.detail.value)
+    }
+    if (chooseType.value == '业务招待') {
+        cache.set('checkedYWClientList', e.detail.value)
+    }
+    if (chooseType.value == '技术交流') {
+        cache.set('checkedJSClientList', e.detail.value)
+    }
+    if (chooseType.value == '来厂参观') {
+        cache.set('checkedLCClientList', e.detail.value)
+    }
+    if (chooseType.value == '党建活动') {
+        cache.set('checkedDJClientList', e.detail.value)
+    }
+    if (chooseType.value == '文体活动') {
+        cache.set('checkedWTClientList', e.detail.value)
+    }
+    if (chooseType.value == '联谊活动') {
+        cache.set('checkedLYClientList', e.detail.value)
+    }
+}
+
+
+
+</script>
+
+<style scoped lang="scss">
+.con-body {
+    background: white;
+}
+
+
+/* Container for the checkbox group */
+.checkbox-group.block {
+    width: 100%;
+}
+
+/* Each item row */
+.itemClass {
+    display: flex;
+    align-items: center;
+    padding: 10rpx 0;
+    margin-left: 15rpx;
+    border-bottom: 1px solid #eee;
+    /* optional divider */
+}
+
+/* Checkbox styling */
+.checkBoxClass {
+    margin-right: 12rpx;
+}
+
+/* Content container */
+.clientClass {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    font-size: 36rpx;
+    color: #333;
+    /* default text color */
+}
+
+/* Blue username text */
+.blue-text {
+    /* or any blue you prefer */
+    margin-right: 5rpx;
+}
+</style>
diff --git a/src/pages/business/CRM/marketActivity/detailForApproval.vue b/src/pages/business/CRM/marketActivity/detailForApproval.vue
new file mode 100644
index 0000000..b644ada
--- /dev/null
+++ b/src/pages/business/CRM/marketActivity/detailForApproval.vue
@@ -0,0 +1,249 @@
+<template>
+    <view class="con-body">
+        <view class="con-bg">
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'走访报告详情'" :leftFlag="true" :rightFlag="false"></customHeader>
+
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height"></view>
+
+            <!-- 正文内容 -->
+            <!-- 详情内容 -->
+            <view class="white-bg">
+                <view class="report-list">
+                    <view class="title">{{ item.cusName }}</view>
+                    <view class="r-list">
+                        <view class="r-name">{{ item.visistCode }}</view>
+                    </view>
+                    <view class="border-bottom b-width"></view>
+                    <view class="r-list">
+                        <view class="r-left">报告人</view>
+                        <view class="r-right">{{ item.staffName }}</view>
+                    </view>
+                    <view class="border-bottom b-width"></view>
+                    <view class="r-list">
+                        <view class="r-left">走访日期</view>
+                        <view class="r-right">{{ item.visistDate }}</view>
+                    </view>
+                    <view class="border-bottom b-width"></view>
+                    <view class="r-list">
+                        <view class="r-left">是否双方高层领导参与</view>
+                        <view class="r-right">{{ item.whetherHaveLeader }}</view>
+                    </view>
+                    <view class="border-bottom b-width"></view>
+                    <view class="r-list">
+                        <view class="r-left">活动类型</view>
+                        <view class="r-right">{{ item.visistType }}</view>
+                    </view>
+                    <view class="border-bottom b-width"></view>
+                </view>
+            </view>
+
+            <!-- 报告明细&评论 -->
+            <customTabs v-model="activeTab" :tabs="tabList" :modelValue="activeTab">
+                <!-- 报告明细 -->
+                <block v-if="activeTab === 0">
+                    <view class="white-bg white-bg-2" v-for="item in detailList">
+                        <view class="report-list">
+                            <view class="r-list">
+                                <view class="r-left">拜访事项</view>
+                                <view class="r-right">{{ item.detailType }}</view>
+                            </view>
+                            <view class="border-bottom b-width"></view>
+                            <view class="r-list">
+                                <view class="r-left">拜访类型</view>
+                                <view class="r-right">{{ item.treeName }}</view>
+                            </view>
+                            <view class="border-bottom b-width"></view>
+                            <view class="r-list">
+                                <view class="r-left">客户人员</view>
+                                <view class="r-right">{{ item.customerPersonnel }}</view>
+                            </view>
+                            <view class="border-bottom b-width"></view>
+                            <view class="r-list">
+                                <view class="r-left">我方人员</view>
+                                <view class="r-right">{{ item.ourPersonnel }}</view>
+                            </view>
+                            <view class="border-bottom b-width"></view>
+                            <view class="r-list" style="display: block">
+                                <view class="r-name">结果</view>
+                                <view class="r-gray">
+                                    <view>
+                                        {{ item.bandResult }} </view>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </block>
+            </customTabs>
+
+
+            <view class="tipsPopBtn">
+                <view class="btnCancal" @click="refuse">驳回</view>
+                <!-- <view class="btnComfire" @click="refusePass">通过不得分</view> -->
+                <view class="btnComfire" @click="adopt(item)">通过</view>
+
+            </view>
+            <!-- 底部加高度来避免tabbar遮挡 -->
+            <view class="bottom-height"></view>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import customHeader from '@/components/customHeader.vue'
+import customTabs from '@/components/customTabs.vue';
+import { auditActivityReport, getVisistDetailList, getYsVisistInfo } from '../../../../api/crm/activity/activity';
+
+
+let visistId = ref(0)
+// 加载后调用
+let id = ref(null)
+onLoad((options) => {
+    visistId.value = options.visistId
+    getVisitorReportDetail();
+})
+
+
+// 查询详情
+let item = ref({});
+//明细List
+let detailList = ref([])
+const getVisitorReportDetail = async () => {
+    let param = {
+        visistId: visistId.value
+    }
+
+    let res = await getYsVisistInfo(param);
+    item.value = res.data;
+    let detailRes = await getVisistDetailList(param);
+    detailList.value = detailRes.rows;
+}
+
+// 报告明细&评论
+const activeTab = ref(0);//默认报告明细
+const tabList = ['报告明细'];
+
+//点击驳回
+function refuse() {
+    uni.navigateTo({
+        url: './auditReject?visistId=' + visistId.value
+    })
+}
+
+//点击通过
+function adopt(item) {
+    console.log(item.visistId,4123123)
+    uni.showModal({
+        title: '提交',
+        content: '是否要通过本报告？',
+        success: function (res) {
+            if (res.confirm) {
+                auditActivityReport({
+                    activityId: item.visistId,
+                    reportStaffName: item.staffName,
+                }).then(res => {
+                    if (res.code == 200) {
+                        // that.mescroll.resetUpScroll()
+                    } else {
+                        uni.showToast({
+                            icon: 'none',
+                            title: res.msg,
+                        });
+                    }
+                })
+            }
+        }
+
+    })
+}
+
+</script>
+
+<style scoped>
+.white-bg {
+    width: 690rpx;
+    margin: 0;
+    border-radius: 8px 8px 0 0;
+}
+
+.white-bg.white-bg-2 {
+    border-radius: 0;
+    margin-bottom: 20rpx;
+}
+
+:deep(.tabs-header) {
+    /* background: none !important; */
+    border-bottom: none !important;
+    margin: 0 auto;
+    gap: 5px;
+}
+
+:deep(.tab-item) {
+    color: #919191;
+    font-size: 32rpx;
+    font-weight: bold;
+    /* flex:none; */
+    /* margin: 0 -50rpx; */
+    /* padding: 0 50rpx; */
+}
+
+:deep(.tab-item:first-child) {
+    text-align: right;
+    margin-left: 230rpx;
+}
+
+:deep(.tab-item:last-child) {
+    text-align: left;
+    margin-right: 230rpx;
+}
+
+:deep(.tab-item.active) {
+    color: #3384DF;
+    font-weight: bold;
+}
+
+:deep(.tab-item.active::after) {
+    width: 100rpx;
+    height: 8rpx;
+}
+
+
+.tipsPopBtn {
+    width: 370px;
+    height: 80px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin: 50px auto 56px auto;
+    bottom: 0;
+    left: 0;
+}
+
+.btnCancal {
+    width: 100px;
+    height: 60px;
+    border: 2px solid #29abe2;
+    border-radius: 40px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: #29abe2;
+    font-size: 15px;
+
+}
+
+.btnComfire {
+    width: 100px;
+    height: 60px;
+    background-color: #29abe2;
+    border-radius: 40px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: #FFF;
+    font-size: 15px;
+}
+</style>
diff --git a/src/pages/business/CRM/marketActivity/myUserList.vue b/src/pages/business/CRM/marketActivity/myUserList.vue
new file mode 100644
index 0000000..473b529
--- /dev/null
+++ b/src/pages/business/CRM/marketActivity/myUserList.vue
@@ -0,0 +1,182 @@
+<template>
+    <view class="con-body">
+        <view>
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'走访报告添加我方参与人员'" :leftFlag="true" :rightFlag="false">
+            </customHeader>
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height"></view>
+            <uni-easyinput prefixIcon="search" v-model="searchContent" placeholder="请输入客户人员名称" clearable
+                @iconClick="iconClick">
+            </uni-easyinput>
+                <checkbox-group class="block" @change="checkboxChange">
+                    <view class="itemClass" v-for="(item, index) in dataList" :key="item.userId">
+                        <checkbox class='checkBoxClass' :value="item.nickName"
+                            v-model="item.nickName"></checkbox>
+                        <view class="clientClass">
+                            <text class="blue-text">{{ item.nickName }}</text>
+                        </view>
+                    </view>
+                </checkbox-group>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import customHeader from '@/components/customHeader.vue'
+import {myUserNameList } from '../../../../api/crm/activity/activity'
+import { onMounted, onUnmounted, reactive, ref, watch } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { useMessage } from '../../../../utils/message'
+import cache from '../../../../utils/cache'
+
+
+
+const message = useMessage();
+
+//点击查询客户人员
+const queryParams = ref({
+    cusName: '',
+    nickName:'',
+    pageNum: 1,
+    pageSize: 10
+})
+
+onMounted(() => {
+    getMyUserNameList()
+})
+
+let chooseType = ref()
+onLoad(options => {
+    queryParams.value.cusName = options.cusName
+    chooseType.value = options.chooseType
+})
+const dataList = ref([])
+
+function getMyUserNameList() {
+    myUserNameList(queryParams.value).then(res => {
+        dataList.value = res.rows
+    })
+}
+
+
+//查询某一客户人员
+let searchContent = ref('')
+
+function iconClick() {
+    message.toast('点击了查询，当前内容：' + searchContent.value)
+}
+
+//监视查询的内容的变化
+watch(searchContent,(newValue,oldValue)=>{
+    queryParams.value.nickName = searchContent.value
+    //变化了之后，重新查询内容
+    myUserNameList(queryParams.value).then(res => {
+        dataList.value = res.rows
+    })
+})
+
+
+
+//勾选内容
+function checkboxChange(e) {
+    //这里要根据传递来的不同的内容，生成不同的setCache方法
+    if(chooseType.value=='日常走访'){
+        cache.set('checkedRCMyUserList', e.detail.value)
+    }
+        if(chooseType.value=='业务招待'){
+        cache.set('checkedYWMyUserList', e.detail.value)
+    }
+        if(chooseType.value=='技术交流'){
+        cache.set('checkedJSMyUserList', e.detail.value)
+    }
+        if(chooseType.value=='来厂参观'){
+        cache.set('checkedLCMyUserList', e.detail.value)
+    }
+        if(chooseType.value=='党建活动'){
+        cache.set('checkedDJMyUserList', e.detail.value)
+    }
+        if(chooseType.value=='文体活动'){
+        cache.set('checkedWTMyUserList', e.detail.value)
+    }
+        if(chooseType.value=='联谊活动'){
+        cache.set('checkedLYMyUserList', e.detail.value)
+    }
+}
+
+
+
+</script>
+
+<style scoped lang="scss">
+.con-body{
+    background: white;
+}
+
+.white-bg {
+    width: 690rpx;
+    margin: 0;
+    border-radius: 8px 8px 0 0;
+}
+
+.white-bg.white-bg-2 {
+    margin-bottom: 20rpx;
+}
+
+.white-bg.white-bg-3 {
+    border-radius: 0
+}
+
+.white-bg .w-b-title {
+    color: #3384DF;
+    font-size: 38rpx;
+}
+
+.form-con {
+    padding: 30rpx 0 0;
+}
+
+:deep(.form-con .uni-forms-item) {
+    margin-bottom: 22px !important;
+}
+
+
+/* Container for the checkbox group */
+.checkbox-group.block {
+    width: 100%;
+}
+
+/* Each item row */
+.itemClass {
+    width: 340rpx;
+    display: flex;
+    align-items: center;
+    padding: 10rpx 0;
+    margin-left: 15rpx;
+    border-bottom: 1px solid #eee;
+    float: left;
+    /* optional divider */
+}
+
+/* Checkbox styling */
+.checkBoxClass {
+    margin-right: 12rpx;
+}
+
+/* Content container */
+.clientClass {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    font-size: 36rpx;
+    color: #333;
+    /* default text color */
+}
+
+/* Blue username text */
+.blue-text {
+    /* or any blue you prefer */
+    margin-right: 5rpx;
+}
+</style>
diff --git a/src/pages/business/CRM/marketActivity/visitReport.vue b/src/pages/business/CRM/marketActivity/visitReport.vue
new file mode 100644
index 0000000..9984a08
--- /dev/null
+++ b/src/pages/business/CRM/marketActivity/visitReport.vue
@@ -0,0 +1,368 @@
+<template>
+  <view class="con-body">
+    <view class="con-bg">
+      <!-- 头部 -->
+      <customHeader ref="customHeaderRef" :title="'走访报告列表'" :leftFlag="true" :rightFlag="true">
+        <template #right>
+          <view class="head-right" @click="handleAdd">
+            <uni-icons type="plus" size="24" color="#B7D2FF"></uni-icons>新增
+          </view>
+        </template>
+      </customHeader>
+
+      <!-- 高度来避免头部遮挡 -->
+      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+
+      <!-- 正文内容 -->
+      <view class="all-body">
+        <!-- 搜索  @blur="blur" @focus="focus" @input="input" @cancel="cancel" @clear="clear"-->
+        <view class="search">
+          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户名称" clearButton="auto"
+                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff" v-model="searchValue" />
+          <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
+        </view>
+
+        <!-- 分页部分  -->
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+                      :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"
+                      class="scroll-h" :class="{ 'loading-scroll': cssFlag }">
+          <view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index"
+                @touchstart.prevent="touchstart(item)" @touchend.prevent="touchend">
+            <view>
+              <view class="report-list">
+                <view class="title">客户：{{ item.cusName }}</view>
+                <view class="r-list">
+                  <view class="r-name">{{ item.visistCode }}</view>
+                  <view @touchstart.stop="handleStatusTouchStart"
+                        @touchend.stop="handleStatusTouchEnd" @click.stop="chooseStatus(item)">
+                    <view v-if="item.status == '驳回'" class="r-right btn-orange" size="mini">
+                      {{ item.status == '驳回' ? '再次提交' : item.status }}
+                    </view>
+                    <view v-else class="r-right btn-orange" size="mini">
+                      {{ item.status }}
+                    </view>
+                  </view>
+
+                </view>
+                <view class="border-bottom"></view>
+                <view class="r-list">
+                  <view class="r-left">报告类型</view>
+                  <view class="r-right">{{ item.visistType }}</view>
+                </view>
+                <view class="r-list" v-if="item.joinUser!=null">
+                  <view class="r-left">我方领导</view>
+                  <view class="r-right">{{ item.joinUser }}</view>
+                </view>
+                <view class="border-bottom"></view>
+                <view class="r-list">
+                  <view class="r-left">报告人</view>
+                  <view class="r-right">{{ item.staffName }}</view>
+                </view>
+                <view class="border-bottom"></view>
+                <view class="r-list">
+                  <view class="r-left">报告日期</view>
+                  <view class="r-right">{{ item.visistDate }}</view>
+                </view>
+
+              </view>
+            </view>
+          </view>
+        </mescroll-uni>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref, onMounted, watch } from 'vue'
+import customHeader from '@/components/customHeader.vue'
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import { getNavBarPaddingTop } from '@/utils/system.js'
+import { visitorReportList } from '@/api/business.js'
+import { getYsVisistList, removeVisist, updateStatus } from '../../../../api/crm/activity/activity';
+
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+
+// 查询列表
+let list = ref([]);
+
+let searchValue = ref(null)
+
+//监视查询的内容的变化
+watch(searchValue, (newValue, oldValue) => {
+  //变化了之后，重新查询内容
+  var data = {
+    pageNum: 1,
+    pageSize: 10,
+    searchContent: searchValue.value
+  };
+  getYsVisistList(data).then(res => {
+    if (res.code == 200) {
+      //设置列表数据
+      list.value = res.rows;
+    }
+  })
+})
+
+
+// 查询搜索跳转
+let handleSearch = () => {
+  var data = {
+    pageNum: 1,
+    pageSize: 10,
+    searchContent: searchValue.value
+  };
+  getYsVisistList(data).then(res => {
+    if (res.code == 200) {
+      //设置列表数据
+      list.value = res.rows;
+    } else {
+      uni.showToast({
+        icon: 'none',
+        title: "请求失败",
+      });
+      list.value = null;
+    }
+
+  })
+  console.log(searchValue.value)
+}
+
+// 新增
+let handleAdd = () => {
+  uni.navigateTo({url: '/pages/business/CRM/marketActivity/visitorReportAdd'})
+}
+
+
+const mescrollRef = ref(null);
+const upOption = ref({
+  page: {num: 0, size: 10},
+  noMoreSize: 5,
+  empty: {tip: '~ 空空如也 ~'},
+  textLoading: '加载中...',
+  textNoMore: '已经到底了'
+});
+
+const downOption = ref({
+  auto: true,
+  textInOffset: '下拉刷新',
+  textOutOffset: '释放更新',
+  textLoading: '刷新中...'
+});
+
+let cssFlag = ref(false);//控制样式
+const mescrollInit = (mescroll) => {
+  cssFlag.value = true;
+  mescrollRef.value = mescroll;
+};
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+  try {
+    setTimeout(async () => {
+      const res = await getVisitorReportList(1, upOption.value.page.size);
+      cssFlag.value = false;
+      list.value = res.list;
+      mescroll.resetUpScroll();
+    }, 500);
+  } catch (error) {
+    mescroll.endErr();
+  } finally {
+    setTimeout(async () => {
+      mescroll.endSuccess();
+    }, 500);
+  }
+}
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+  try {
+    setTimeout(async () => {
+      const res = await getVisitorReportList(mescroll.num, mescroll.size);
+      if (mescroll.num === 1) {
+        list.value = res.list;
+      } else {
+        list.value.push(...res.list);
+      }
+      mescroll.endBySize(res.list.length, res.total);
+    }, 500);
+  } catch (error) {
+    mescroll.endErr();
+  }
+}
+
+// 获取数据列表
+const getVisitorReportList = (pageNum, pageSize) => {
+  return new Promise(async (resolve) => {
+    let param = {
+      pageNum,
+      pageSize
+    }
+    let res = await visitorReportList(param);
+    resolve({
+      list: res.rows,
+      total: res.total
+    });
+  });
+}
+
+
+let Loop = ref(0)
+let now
+const visistId = ref();
+const cusName = ref();
+const cusId = ref();
+const status = ref()
+
+function touchstart(item) {
+  visistId.value = item.visistId
+  cusName.value = item.cusName
+  cusId.value = item.cusId
+  status.value = item.status
+  now = new Date();
+  clearInterval(Loop.value); //再次清空定时器，防止重复注册定时器
+  Loop.value = setTimeout(() => {
+    uni.showModal({
+      title: '删除',
+      content: '请问要删除本条消息吗？',
+      success: (res) => {
+        if (res.confirm) {
+          const data = {
+            num: 1,
+            pageSize: 10,
+            status: "录入"
+          };
+          const parm = {
+            visistId: item.visistId
+          };
+          removeVisist(parm).then(res => {
+            if (res.code == 500) {
+              uni.showToast({
+                icon: 'none',
+                title: "存在明细项，不能直接删除！",
+              });
+            } else {
+              uni.showToast({
+                title: "删除成功",
+                duration: 2000
+              });
+            }
+            // 刷新内容
+            upCallback()
+          });
+        }
+      }
+    });
+  }, 750);
+
+}
+
+function touchend() {
+  let endDate = new Date();
+  console.log('结束时间', endDate)
+  let cha = endDate.getTime() - now.getTime();
+  console.log(cha, 'casd')
+  if (cha < 750) {
+    uni.navigateTo({
+      url: "/pages/business/CRM/marketActivity/visitorReportEnter?visistId=" + visistId.value + '&cusName=' + cusName.value + '&cusId=' + cusId.value + '&status=' + status.value
+    })
+  }
+  clearInterval(Loop.value);
+}
+
+//点击状态按钮
+function chooseStatus(item) {
+  updateStatus(item).then(
+      res => {
+        if (res.code == 200) {
+          uni.showToast({
+            title: '提交成功',
+            duration: 2000
+          });
+          setTimeout(function () {
+            uni.navigateBack({
+              success: () => {
+              }
+            })
+          }, 500);
+        } else {
+          uni.showToast({
+            title: res.msg,
+            icon: 'none',
+          });
+        }
+      },
+      rej => {
+      }
+  );
+}
+
+//保留点击状态，关闭长按的冒泡
+function handleStatusTouchStart(e) {
+  // e.stopPropagation(); // 阻止冒泡
+  // e.preventDefault();  // 阻止默认行为（如滚动）
+}
+
+function handleStatusTouchEnd(e) {
+  // e.stopPropagation();
+  // e.preventDefault();
+}
+
+</script>
+
+<style scoped>
+.all-body {
+  /* #ifdef APP-PLUS */
+  top: 150rpx;
+  height: calc(100vh - 75px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  top: 120rpx;
+  height: calc(100vh);
+  /* #endif */
+}
+
+.search {
+  display: flex;
+}
+
+.search .btn-search {
+  border: none;
+  background: none;
+  line-height: normal;
+  color: #fff;
+  line-height: 56rpx !important;
+  padding: 10rpx 0 0;
+  text-align: left;
+  cursor: pointer;
+}
+
+.search .btn-search::after {
+  display: none;
+}
+
+.search .custom-search {
+  width: 80%;
+
+}
+
+.search .custom-search.uni-searchbar {
+  padding-right: 0 !important;
+}
+
+.scroll-h {
+  /* #ifdef APP-PLUS */
+  height: calc(100vh - 120px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  height: calc(100vh - 110px);
+  /* #endif */
+}
+
+.white-bg {
+  padding-bottom: 10rpx;
+}
+</style>
diff --git a/src/pages/business/CRM/marketActivity/visitReportDetail.vue b/src/pages/business/CRM/marketActivity/visitReportDetail.vue
new file mode 100644
index 0000000..f983221
--- /dev/null
+++ b/src/pages/business/CRM/marketActivity/visitReportDetail.vue
@@ -0,0 +1,201 @@
+<template>
+    <view class="con-body">
+        <view class="con-bg">
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'走访报告详情'" :leftFlag="true" :rightFlag="false"></customHeader>
+
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height"></view>
+
+            <!-- 正文内容 -->
+            <!-- 详情内容 -->
+            <view class="white-bg">
+                <view class="report-list">
+                    <view class="title">{{ item.cusName }}</view>
+                    <view class="r-list">
+                        <view class="r-name">{{ item.visistCode }}</view>
+                        <view class="r-right btn-pink" size="mini" @click="handleZan">
+                            <uni-icons :type="iconType" size="16" color="#ffffff"></uni-icons>
+                            {{ zanFlag ? '已赞' : '未赞' }}
+                        </view>
+                    </view>
+                    <view class="border-bottom b-width"></view>
+                    <view class="r-list">
+                        <view class="r-left">报告人</view>
+                        <view class="r-right">{{ item.staffName }}</view>
+                    </view>
+                    <view class="border-bottom b-width"></view>
+                    <view class="r-list">
+                        <view class="r-left">走访日期</view>
+                        <view class="r-right">{{ item.visistDate }}</view>
+                    </view>
+                    <view class="border-bottom b-width"></view>
+                    <view class="r-list">
+                        <view class="r-left">是否双方高层领导参与</view>
+                        <view class="r-right">{{ item.whetherHaveLeader }}</view>
+                    </view>
+                    <view class="border-bottom b-width"></view>
+                    <view class="r-list">
+                        <view class="r-left">活动类型</view>
+                        <view class="r-right">{{ item.visistType }}</view>
+                    </view>
+                    <view class="border-bottom b-width"></view>
+                </view>
+            </view>
+
+            <!-- 报告明细&评论 -->
+            <customTabs v-model="activeTab" :tabs="tabList" :modelValue="activeTab">
+                <!-- 报告明细 -->
+                <block v-if="activeTab === 0">
+                    <view class="white-bg white-bg-2" v-for="item in detailList">
+                        <view class="report-list">
+                            <view class="r-list">
+                                <view class="r-left">拜访事项</view>
+                                <view class="r-right">{{item.detailType}}</view>
+                            </view>
+                            <view class="border-bottom b-width"></view>
+                            <view class="r-list">
+                                <view class="r-left">拜访类型</view>
+                                <view class="r-right">{{item.treeName}}</view>
+                            </view>
+                            <view class="border-bottom b-width"></view>
+                            <view class="r-list">
+                                <view class="r-left">客户人员</view>
+                                <view class="r-right">{{item.customerPersonnel}}</view>
+                            </view>
+                            <view class="border-bottom b-width"></view>
+                            <view class="r-list">
+                                <view class="r-left">我方人员</view>
+                                <view class="r-right">{{item.ourPersonnel}}</view>
+                            </view>
+                            <view class="border-bottom b-width"></view>
+                            <view class="r-list" style="display: block">
+                                <view class="r-name">结果</view>
+                                <view class="r-gray">
+                                    <view >
+                                        {{item.bandResult}} </view>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </block>
+                <!-- 评论 -->
+                <block v-if="activeTab === 1">
+                    <view class="white-bg white-bg-2">评论内容</view>
+                </block>
+            </customTabs>
+
+
+
+            <!-- 底部加高度来避免tabbar遮挡 -->
+            <view class="bottom-height"></view>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue'
+import { onLoad, onShow } from '@dcloudio/uni-app'
+import customHeader from '@/components/customHeader.vue'
+import customTabs from '@/components/customTabs.vue';
+import { getUserLike, getVisistDetailList, getYsVisistInfo, insertUserLike } from '../../../../api/crm/activity/activity';
+
+
+let visistId = ref(0)
+// 加载后调用
+let id = ref(null)
+onLoad((options) => {
+    visistId.value = options.visistId
+    getVisitorReportDetail();
+})
+
+onShow(()=>{
+    getUserLike(visistId.value).then(res=>{
+        zanFlag.value = res.rows[0]?.status==1?true:false
+        console.log(zanFlag.value,'点赞响应数据内容')
+     if(zanFlag.value==false){
+        iconType.value = 'hand-up'
+    }else{
+        //已赞
+        iconType.value = 'hand-up-filled'
+    }
+    })
+})
+
+// 查询详情
+let item = ref({});
+//明细List
+let detailList = ref([])
+const getVisitorReportDetail = async () => {
+    let param = {
+        visistId: visistId.value
+    }
+
+    let res = await getYsVisistInfo(param);
+    item.value = res.data;
+    let detailRes = await getVisistDetailList(param);
+    detailList.value = detailRes.rows;
+}
+
+// 报告明细&评论
+const activeTab = ref(0);//默认报告明细
+const tabList = ['报告明细', '评论'];
+
+// 点击赞
+let zanFlag = ref(false)
+let iconType = ref('hand-up')
+let handleZan = ()=>{
+    zanFlag.value = !zanFlag.value
+    if(zanFlag.value==false){
+        iconType.value = 'hand-up'
+    }else{
+        //已赞
+        iconType.value = 'hand-up-filled'
+    }
+     insertUserLike(visistId.value)
+}
+
+</script>
+
+<style scoped>
+.white-bg {
+    width: 690rpx;
+    margin: 0;
+    border-radius: 8px 8px 0 0;
+}
+.white-bg.white-bg-2{
+    border-radius:0;
+    margin-bottom:20rpx;
+}
+:deep(.tabs-header) {
+    /* background: none !important; */
+    border-bottom: none !important;
+    margin: 0 auto;
+    gap: 5px;
+}
+:deep(.tab-item) {
+    color:#919191;
+    font-size: 32rpx;
+    font-weight: bold;
+    /* flex:none; */
+    /* margin: 0 -50rpx; */
+    /* padding: 0 50rpx; */
+}
+:deep(.tab-item:first-child){
+    text-align: right;
+    margin-left:230rpx;
+}
+:deep(.tab-item:last-child){
+    text-align: left;
+    margin-right:230rpx;
+}
+:deep(.tab-item.active) {
+    color: #3384DF;
+    font-weight: bold;
+}
+:deep(.tab-item.active::after) {
+    width: 100rpx;
+    height: 8rpx;
+}
+
+</style>
diff --git a/src/pages/business/CRM/marketActivity/visitReportView.vue b/src/pages/business/CRM/marketActivity/visitReportView.vue
new file mode 100644
index 0000000..69e47e3
--- /dev/null
+++ b/src/pages/business/CRM/marketActivity/visitReportView.vue
@@ -0,0 +1,217 @@
+<template>
+    <view class="con-body">
+        <view class="con-bg">
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'走访查看'" :leftFlag="true" :rightFlag="false"></customHeader>
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+
+            <!-- 正文内容 -->
+            <view class="all-body">
+                <!-- 搜索  @blur="blur" @focus="focus" @input="input" @cancel="cancel" @clear="clear"-->
+                <view class="search">
+                    <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户名称" clearButton="auto"
+                        cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff" v-model="searchValue" />
+                    <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
+                </view>
+
+                <!-- 分页部分  -->
+                <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+                    :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"
+                    class="scroll-h" :class="{ 'loading-scroll': cssFlag }">
+                    <view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index"
+                        @click="showDetail(item)">
+                        <view>
+                            <view class="report-list">
+                                <view class="title">客户：{{ item.cusName }}</view>
+                                <view class="r-list">
+                                    <view class="r-name">{{ item.visistCode }}</view>
+                                    <view>
+
+                                        <view
+                                            :class="item.myselfBrowsing == 0 ? 'r-right btn-orange' : 'r-right btn-blue'"
+                                            size="mini">
+                                            {{ item.myselfBrowsing == 0 ? '未读' : '已读' }}
+                                        </view>
+                                    </view>
+
+                                </view>
+                                <view class="border-bottom"></view>
+                                <view class="r-list">
+                                    <view class="r-left">报告类型</view>
+                                    <view class="r-right">{{ item.visistType === "业务招待" ? "Ⅱ类活动" : "走访报告" }}</view>
+                                </view>
+                                <view class="r-list" v-if="item.joinUser != null">
+                                    <view class="r-left">我方领导</view>
+                                    <view class="r-right">{{ item.joinUser }}</view>
+                                </view>
+                                <view class="border-bottom"></view>
+                                <view class="r-list">
+                                    <view class="r-left">报告人</view>
+                                    <view class="r-right">{{ item.staffName }}</view>
+                                </view>
+                                <view class="border-bottom"></view>
+                                <view class="r-list">
+                                    <view class="r-left">报告日期</view>
+                                    <view class="r-right">{{ item.visistDate }}</view>
+                                </view>
+
+                            </view>
+                        </view>
+                    </view>
+                </mescroll-uni>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import customHeader from '@/components/customHeader.vue'
+import { ref, reactive, onMounted } from 'vue'
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import { getNavBarPaddingTop } from '@/utils/system.js'
+import { getQueryVisistList } from '../../../../api/crm/activity/activity';
+
+
+let list = ref([])
+let queryParams = reactive({
+    selValue: ''
+})
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+
+let cssFlag = ref(false);//控制样式
+let mescrollRef = ref(null);
+
+const mescrollInit = (mescroll) => {
+    cssFlag.value = true;
+    mescrollRef.value = mescroll;
+};
+
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+    try {
+        setTimeout(async () => {
+            queryParams.pageNum = 1;
+            queryParams.pageSize = upOption.value.page.size;
+            //获取当前页的信息
+            const res = await getQueryVisistList(queryParams)
+            cssFlag.value = false;
+            list.value = res.rows;
+            mescroll.resetUpScroll();
+        }, 500);
+    } catch (error) {
+        mescroll.endErr();
+    } finally {
+        setTimeout(async () => {
+            mescroll.endSuccess();
+        }, 500);
+    }
+}
+
+
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+    try {
+        setTimeout(async () => {
+            // const res = await getVisitorReportList(mescroll.num, mescroll.size);
+            if (mescroll.num === 1) {
+                // list.value = res.list;
+            } else {
+                // list.value.push(...res.list);
+            }
+            // mescroll.endBySize(res.list.length, res.total);
+        }, 500);
+    } catch (error) {
+        mescroll.endErr();
+    }
+}
+
+const upOption = ref({
+    page: { num: 0, size: 10 },
+    noMoreSize: 5,
+    empty: { tip: '~ 空空如也 ~' },
+    textLoading: '加载中...',
+    textNoMore: '已经到底了'
+});
+
+const downOption = ref({
+    auto: true,
+    textInOffset: '下拉刷新',
+    textOutOffset: '释放更新',
+    textLoading: '刷新中...'
+});
+
+//点击某一个进入查看明细信息
+function showDetail(item) {
+    uni.navigateTo({
+        url: './visitReportDetail?visistId=' + item.visistId
+    })
+}
+
+//点击查询方法，搜索当前报告信息
+let searchValue = ref()
+function handleSearch() {
+    queryParams.inputval = searchValue.value
+    downCallback(mescrollRef.value.mescroll);
+}
+
+</script>
+
+<style scoped>
+.all-body {
+    /* #ifdef APP-PLUS */
+    top: 150rpx;
+    height: calc(100vh - 75px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    top: 120rpx;
+    height: calc(100vh);
+    /* #endif */
+}
+
+.search {
+    display: flex;
+}
+
+.search .btn-search {
+    border: none;
+    background: none;
+    line-height: normal;
+    color: #fff;
+    line-height: 56rpx !important;
+    padding: 10rpx 0 0;
+    text-align: left;
+    cursor: pointer;
+}
+
+.search .btn-search::after {
+    display: none;
+}
+
+.search .custom-search {
+    width: 80%;
+
+}
+
+.search .custom-search.uni-searchbar {
+    padding-right: 0 !important;
+}
+
+.scroll-h {
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 120px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 110px);
+    /* #endif */
+}
+
+.white-bg {
+    padding-bottom: 10rpx;
+}
+</style>
diff --git a/src/pages/business/CRM/marketActivity/visitorReportAdd.vue b/src/pages/business/CRM/marketActivity/visitorReportAdd.vue
new file mode 100644
index 0000000..62de5ee
--- /dev/null
+++ b/src/pages/business/CRM/marketActivity/visitorReportAdd.vue
@@ -0,0 +1,350 @@
+<template>
+    <view class="con-body">
+        <view class="con-bg">
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'走访报告添加'" :leftFlag="true" :rightFlag="true">
+                <template #right>
+                    <view class="head-right" @click="submitForm">
+                        <uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
+                            color="#B7D2FF"></uni-icons>保存
+                    </view>
+                </template>
+            </customHeader>
+
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height"></view>
+
+            <!-- 正文内容 -->
+            <view class="white-bg">
+                <view class="form-con">
+                    <uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px">
+                        <view @click="addVisistReport" class="form-item-container">
+                            <uni-forms-item label="客户名称" name="cusName" class="f-c-right">
+                                <text class="name">{{ formData.cusName }}</text>
+                            </uni-forms-item>
+                        </view>
+
+                        <uni-forms-item label="签到记录" class="f-c-right">
+                            <!-- <view class="f-c-text txt-right">--</view> -->
+                            <view class="cu-form-group">
+                                <view class="title">签到记录</view>
+                            </view>
+                        </uni-forms-item>
+
+                        <view class="choose">
+                            <radio-group @change="chooseRecord">
+                                <label class="radio" v-for="(item, index) in records" :key="index">
+                                    <view class="record-container">
+                                        <radio :value="item.mapId" :checked="index === current" class="radio-style" />
+                                        <view class="record-content">
+                                            <view class="info-row">
+                                                <text class="label">开始时间：</text>
+                                                <text class="value">{{ item.goVisistStartTime }}</text>
+                                            </view>
+                                            <view class="info-row">
+                                                <text class="label">开始地点：</text>
+                                                <text class="value">{{ item.addressForStart }}</text>
+                                            </view>
+                                            <view class="info-row">
+                                                <text class="label">结束时间：</text>
+                                                <text class="value">{{ item.goVisistEndTime }}</text>
+                                            </view>
+                                            <view class="info-row">
+                                                <text class="label">结束地点：</text>
+                                                <text class="value">{{ item.addressForEnd }}</text>
+                                            </view>
+                                            <view class="info-row" v-if="item.remark != null">
+                                                <text class="label">备注：</text>
+                                                <text class="value">{{ item.remark }}</text>
+                                            </view>
+                                        </view>
+                                    </view>
+                                </label>
+                            </radio-group>
+                        </view>
+
+
+
+                        <uni-forms-item label="我方领导" name="leader" required
+                            class="uni-forms-item is-direction-top is-top">
+
+                            <multipleSelect :multiple="true" :value="chooseMyLeaderList" downInner
+                                :options="myLeaderList" @change="changeValue2" :key="Math.round()" :slabel="'text'">
+                            </multipleSelect>
+                            <!--                            <uni-easyinput v-model="formData.leader" placeholder="请输入我方领导" />-->
+
+                        </uni-forms-item>
+
+
+                        <uni-forms-item label="走访日期" name="visitDate" class="uni-forms-item is-direction-top is-top">
+                            <uni-datetime-picker :start="threeDaysAgoTimestamp" :end="todayTimestamp" type="date"
+                                :clear-icon="true" v-model="formData.visitDate" @change="changeDate" />
+                        </uni-forms-item>
+                    </uni-forms>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { ref, onMounted, reactive, onUnmounted, computed } from 'vue'
+import customHeader from '@/components/customHeader.vue'
+import MultipleSelect from "../../../../components/multipleSelect.vue";
+import { addMapForReport, addVisist } from '../../../../api/crm/activity/activity';
+// import{ getGuestList} from '@/api/business.js'
+let customerUser = reactive({})
+
+//我方领导
+const myLeaderList = [
+    { value: 0, text: "姜海洋" },
+    { value: 1, text: "曾炀" },
+    { value: 2, text: "杨博" },
+    { value: 3, text: "廖明君" },
+    { value: 4, text: "唐海岩" },
+    { value: 4, text: "赵飞" }
+];
+// 表单ref
+const formRef = ref(null);
+
+// 表单数据
+const formData = ref({
+    cusId: null,
+    cusName: '',
+    leader: '',
+    visitDate: ''
+});
+
+// 我方人员
+let chooseMyLeaderList = reactive([0]);
+const changeValue2 = (item, value) => {
+    console.log("我方领导", item, value);
+    chooseMyLeaderList = item;
+    formData.value.leader = chooseMyLeaderList
+};
+
+// 验证规则
+const rules = {
+    leader: {
+        rules: [
+            { required: true, errorMessage: '我方领导不能为空' }
+        ]
+    }
+};
+
+// 修改日期
+let changeDate = (e) => {
+    console.log('changeDate:', e);
+};
+
+// 保存走访报告
+let saveVisistReportForm = reactive({});
+const submitForm = async () => {
+    try {
+        // 验证表单
+        console.log(formRef.value, '表单验证数据')
+        await formRef.value.validate();
+        // 验证通过后的操作
+        uni.showToast({
+            title: '验证通过',
+            icon: 'success'
+        });
+        saveVisistReportForm.cusId = formData.value.cusId
+        saveVisistReportForm.joinUser = formData.value.leader.map(item => item.text).join(',')
+        saveVisistReportForm.visistDate = formData.value.visitDate
+        saveVisistReportForm.visistType = 'I类活动（走访）'
+        saveVisistReportForm.mapId = mapId.value
+        addVisist(saveVisistReportForm).then(
+            res => {
+                if (res.code == 200) {
+                    uni.showToast({
+                        title: '提交成功',
+                        duration: 2000
+                    });
+                    setTimeout(function () {
+                        uni.navigateBack({
+                            success: () => { }
+                        })
+                    }, 500);
+                } else {
+                    uni.showToast({
+                        title: res.msg,
+                        icon: 'none',
+                    });
+                }
+            },
+        );
+
+    } catch (err) {
+        console.log('表单验证失败:', err);
+    }
+};
+
+//日期禁用
+const todayTimestamp = computed(() => {
+    const today = new Date()
+    today.setHours(0, 0, 0, 0)
+    return today.getTime()
+});
+
+const threeDaysAgoTimestamp = computed(() => {
+    const date = new Date()
+    date.setDate(date.getDate() - 3)
+    date.setHours(0, 0, 0, 0)
+    return date.getTime()
+});
+
+
+//选择客户
+function addVisistReport() {
+    uni.navigateTo({
+        url: './chooseCus'
+    })
+}
+//定义数据接收的值
+let selectedCustomer = reactive(null)
+
+//监听时间
+onMounted(() => {
+    uni.$on('onCustomerSelected', handleCustomerSelected)
+})
+//取消监听
+onUnmounted(() => {
+    uni.$off('onCustomerSelected', handleCustomerSelected)
+})
+
+//处理 接收数据
+const handleCustomerSelected = (data) => {
+    formData.value.cusName = data.cusName
+    formData.value.cusId = data.cusId
+    console.log("收到客户数据的值：", customerUser)
+}
+
+//查询签到记录
+onMounted(() => {
+    recordList()
+})
+let records = ref([])
+//走访记录列表
+function recordList() {
+    addMapForReport().then(
+        res => {
+            if (res.code == 200) {
+                records.value = res.rows;
+                // that.$forceUpdate()
+            } else {
+                uni.showToast({
+                    icon: 'none',
+                    title: "请求失败",
+                });
+            }
+        },
+        rej => { }
+    );
+}
+
+//选择签到记录
+let mapId = ref()
+function chooseRecord(e) {
+    mapId.value = e.detail.value
+}
+
+
+</script>
+
+<style scoped>
+.white-bg {
+    width: 750rpx;
+    padding: 30rpx 0 0;
+    margin-bottom: 0;
+    border-radius: 8px 8px 0 0;
+}
+
+.form-con {
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 100px)
+        /* #endif */
+        /* #ifndef APP-PLUS */
+        /* #endif */
+}
+
+:deep(.uni-date-x) {
+    display: block;
+}
+
+:deep(.uni-date-x .icon-calendar) {
+    float: right;
+    margin-top: 15rpx;
+    margin-right: 20rpx;
+    background: url('../../../static/images/business/icon-date.png') no-repeat;
+    background-size: 32rpx 35rpx;
+    width: 32rpx;
+    height: 35rpx;
+}
+
+:deep(.uni-date-x .icon-calendar::before) {
+    display: none;
+}
+
+:deep(.uni-date-x .uni-date__x-input) {
+    padding-left: 20rpx;
+    color: #919191;
+}
+
+.form-item-container .uni-forms-item {
+    display: flex;
+    align-items: center;
+    /* 垂直居中 */
+}
+
+/* 确保 text 元素也垂直居中 */
+.form-item-container .name {
+    line-height: normal;
+    /* 避免 line-height 影响 */
+    display: flex;
+    align-items: center;
+}
+
+/*======*/
+.choose {
+    padding: 20rpx;
+}
+
+.record-container {
+    display: flex;
+    align-items: flex-start;
+    padding: 20rpx;
+    margin-bottom: 20rpx;
+    background-color: #f8f8f8;
+    border-radius: 12rpx;
+    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
+}
+
+.radio-style {
+    margin-right: 20rpx;
+    margin-top: 8rpx;
+}
+
+.record-content {
+    flex: 1;
+}
+
+.info-row {
+    display: flex;
+    margin-bottom: 10rpx;
+    line-height: 1.4;
+}
+
+.label {
+    width: 160rpx;
+    font-weight: bold;
+    color: #333;
+    flex-shrink: 0;
+}
+
+.value {
+    flex: 1;
+    color: #666;
+    word-break: break-all;
+}
+</style>
diff --git a/src/pages/business/CRM/marketActivity/visitorReportEnter.vue b/src/pages/business/CRM/marketActivity/visitorReportEnter.vue
new file mode 100644
index 0000000..ad7bc90
--- /dev/null
+++ b/src/pages/business/CRM/marketActivity/visitorReportEnter.vue
@@ -0,0 +1,338 @@
+<template>
+    <view class="con-body">
+        <view class="con-bg">
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'走访报告内容录入'" :leftFlag="true" :rightFlag="false"></customHeader>
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height"></view>
+
+
+            <!-- 日常走访 -->
+            <view class="white-bg white-bg-2">
+                <view class="w-b-title" @click="handleExpandRC">日常走访
+                    <text>
+                        {{ expandFlagRC ? '展开' : '收起' }}
+                        <i :class="{ iconfont: true, 'icon-up': !expandFlagRC, 'icon-down': expandFlagRC }"></i>
+                    </text>
+                </view>
+                <view v-show="!expandFlagRC" class="form-con">
+                    <DailyVisitComponent :cusName="cusName" :cusId="cusId" :visistId="visistId" :status="status"
+                        ref="dailyVisitComponentRef"></DailyVisitComponent>
+                </view>
+
+            </view>
+
+            <!-- 业务招待 -->
+            <view class="white-bg white-bg-2 white-bg-3">
+                <view class="w-b-title" @click="handleExpandYW">业务招待
+                    <text>
+                        {{ expandFlagYW ? '展开' : '收起' }}
+                        <i :class="{ iconfont: true, 'icon-up': !expandFlagYW, 'icon-down': expandFlagYW }"></i>
+                    </text>
+                </view>
+                <view v-show="!expandFlagYW" class="form-con">
+                    <YwVisistComponent :cusName="cusName" :cusId="cusId" :visistId="visistId" :status="status" ref="ywVisitComponentRef">
+                    </YwVisistComponent>
+                </view>
+            </view>
+
+            <!-- 技术交流 -->
+            <view class="white-bg white-bg-2 white-bg-3">
+                <view class="w-b-title" @click="handleExpandJS">技术交流
+                    <text>
+                        {{ expandFlagJS ? '展开' : '收起' }}
+                        <i :class="{ iconfont: true, 'icon-up': !expandFlagJS, 'icon-down': expandFlagJS }"></i>
+                    </text>
+                </view>
+                <view v-show="!expandFlagJS" class="form-con">
+                    <JsVisistComponent :cusName="cusName" :cusId="cusId" :visistId="visistId" :status="status" ref="jsVisitComponentRef">
+                    </JsVisistComponent>
+                </view>
+            </view>
+
+
+            <!-- 来厂参观 -->
+            <view class="white-bg white-bg-2 white-bg-3">
+                <view class="w-b-title" @click="handleExpandLC">来厂参观
+                    <text>
+                        {{ expandFlagLC ? '展开' : '收起' }}
+                        <i :class="{ iconfont: true, 'icon-up': !expandFlagLC, 'icon-down': expandFlagLC }"></i>
+                    </text>
+                </view>
+                <view v-show="!expandFlagLC" class="form-con">
+                    <LcVisistComponent :cusName="cusName" :cusId="cusId" :visistId="visistId" :status="status" ref="lcVisitComponentRef">
+                    </LcVisistComponent>
+                </view>
+            </view>
+
+
+            <!-- 党建活动 -->
+            <view class="white-bg white-bg-2 white-bg-3">
+                <view class="w-b-title" @click="handleExpandDJ">党建活动
+                    <text>
+                        {{ expandFlagDJ ? '展开' : '收起' }}
+                        <i :class="{ iconfont: true, 'icon-up': !expandFlagDJ, 'icon-down': expandFlagDJ }"></i>
+                    </text>
+                </view>
+                <view v-show="!expandFlagDJ" class="form-con">
+                    <DjVisistComponent :cusName="cusName" :cusId="cusId" :visistId="visistId" :status="status" ref="djVisitComponentRef">
+                    </DjVisistComponent>
+                </view>
+            </view>
+
+            <!-- 文体活动 -->
+            <view class="white-bg white-bg-2 white-bg-3">
+                <view class="w-b-title" @click="handleExpandWT">文体活动
+                    <text>
+                        {{ expandFlagWT ? '展开' : '收起' }}
+                        <i :class="{ iconfont: true, 'icon-up': !expandFlagWT, 'icon-down': expandFlagWT }"></i>
+                    </text>
+                </view>
+                <view v-show="!expandFlagWT" class="form-con">
+                    <WTVisistComponent :cusName="cusName" :cusId="cusId" :visistId="visistId" :status="status" ref="wtVisitComponentRef">
+                    </WTVisistComponent>
+                </view>
+            </view>
+
+
+            <!-- 联谊活动 -->
+            <view class="white-bg white-bg-2 white-bg-3">
+                <view class="w-b-title" @click="handleExpandLY">联谊活动
+                    <text>
+                        {{ expandFlagLY ? '展开' : '收起' }}
+                        <i :class="{ iconfont: true, 'icon-up': !expandFlagLY, 'icon-down': expandFlagLY }"></i>
+                    </text>
+                </view>
+                <view v-show="!expandFlagLY" class="form-con">
+                    <LyVisistComponent :cusName="cusName" :cusId="cusId" :visistId="visistId" :status="status" ref="lyVisitComponentRef">
+                    </LyVisistComponent>
+                </view>
+            </view>
+
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { ref, reactive, onUnmounted } from 'vue'
+import customHeader from '@/components/customHeader.vue'
+import DailyVisitComponent from './components/dailyVisitComponent.vue';
+import { onLoad } from '@dcloudio/uni-app';
+import cache from '../../../../utils/cache';
+import YwVisistComponent from './components/ywVisistComponent.vue';
+import JsVisistComponent from './components/jsVisistComponent.vue';
+import LcVisistComponent from './components/lcVisistComponent.vue';
+import DjVisistComponent from './components/djVisistComponent.vue';
+import WTVisistComponent from './components/wtVisistComponent.vue';
+import LyVisistComponent from './components/lyVisistComponent.vue';
+
+const cusName = ref()
+const cusId = ref()
+const visistId = ref()
+const status = ref()
+onLoad(options => {
+    cusName.value = options.cusName
+    cusId.value = options.cusId
+    visistId.value = options.visistId
+    status.value = options.status
+})
+
+// 日常走访
+const dailyVisitComponentRef = ref(null)
+let expandFlagRC = ref(true);
+let handleExpandRC = () => {
+    expandFlagRC.value = !expandFlagRC.value;
+    if (expandFlagRC.value) {
+        //收缩的时候，删除内容
+        dailyVisitComponentRef.value.handleDelete()
+    } else {
+        //展开的时候，查询内容
+        if (dailyVisitComponentRef.value) {
+            dailyVisitComponentRef.value.getRCVisitReportDetailContent()
+        }
+    }
+}
+
+// 业务招待
+const ywVisitComponentRef = ref(null)
+let expandFlagYW = ref(true);
+let handleExpandYW = () => {
+    expandFlagYW.value = !expandFlagYW.value;
+    if (expandFlagYW.value) {
+        //收缩的时候，删除内容
+        ywVisitComponentRef.value.handleDelete()
+    } else {
+        //展开的时候，查询内容
+        if (ywVisitComponentRef.value) {
+            ywVisitComponentRef.value.getYWVisitReportDetailContent()
+        }
+    }
+}
+
+// 技术交流
+const jsVisitComponentRef = ref(null)
+let expandFlagJS = ref(true);
+let handleExpandJS = () => {
+    expandFlagJS.value = !expandFlagJS.value;
+    if (expandFlagJS.value) {
+        //收缩的时候，删除内容
+        jsVisitComponentRef.value.handleDelete()
+    } else {
+        //展开的时候，查询内容
+        if (jsVisitComponentRef.value) {
+            jsVisitComponentRef.value.getJSVisitReportDetailContent()
+        }
+    }
+}
+
+// 来厂参观
+const lcVisitComponentRef = ref(null)
+let expandFlagLC = ref(true);
+let handleExpandLC = () => {
+    expandFlagLC.value = !expandFlagLC.value;
+    if (expandFlagLC.value) {
+        //收缩的时候，删除内容
+        lcVisitComponentRef.value.handleDelete()
+    } else {
+        //展开的时候，查询内容
+        if (lcVisitComponentRef.value) {
+            lcVisitComponentRef.value.getLCVisitReportDetailContent()
+        }
+    }
+}
+
+// 党建活动
+const djVisitComponentRef = ref(null)
+let expandFlagDJ = ref(true);
+let handleExpandDJ = () => {
+    expandFlagDJ.value = !expandFlagDJ.value;
+    if (expandFlagDJ.value) {
+        //收缩的时候，删除内容
+        djVisitComponentRef.value.handleDelete()
+    } else {
+        //展开的时候，查询内容
+        if (djVisitComponentRef.value) {
+            djVisitComponentRef.value.getDJVisitReportDetailContent()
+        }
+    }
+}
+
+// 文体活动
+const wtVisitComponentRef = ref(null)
+let expandFlagWT = ref(true);
+let handleExpandWT = () => {
+    expandFlagWT.value = !expandFlagWT.value;
+    if (expandFlagWT.value) {
+        //收缩的时候，删除内容
+        wtVisitComponentRef.value.handleDelete()
+    } else {
+        //展开的时候，查询内容
+        if (wtVisitComponentRef.value) {
+            wtVisitComponentRef.value.getWTVisitReportDetailContent()
+        }
+    }
+}
+
+// 联谊活动
+const lyVisitComponentRef = ref(null)
+let expandFlagLY = ref(true);
+let handleExpandLY = () => {
+    expandFlagLY.value = !expandFlagLY.value;
+    if (expandFlagLY.value) {
+        //收缩的时候，删除内容
+        lyVisitComponentRef.value.handleDelete()
+    } else {
+        //展开的时候，查询内容
+        if (lyVisitComponentRef.value) {
+            lyVisitComponentRef.value.getLYVisitReportDetailContent()
+        }
+    }
+}
+
+//离开页面时，删除local缓存
+onUnmounted(() => {
+    removeRCCache();
+    removeYWCache();
+    removeJSCache();
+    removeLCCache();
+    removeDJCache();
+    removeWTCache();
+    removeLYCache();
+})
+
+//删除日常缓存
+function removeRCCache() {
+    cache.remove('checkedRCClientList');
+    cache.remove('checkedRCMyUserList');
+    cache.remove('checkedRCActivityTypeList')
+}
+
+//删除业务缓存
+function removeYWCache() {
+    cache.remove('checkedYWClientList');
+    cache.remove('checkedYWMyUserList');
+}
+
+//删除技术缓存
+function removeJSCache() {
+    cache.remove('checkedJSClientList');
+    cache.remove('checkedJSMyUserList');
+}
+
+//删除来厂缓存
+function removeLCCache() {
+    cache.remove('checkedLCClientList');
+    cache.remove('checkedLCMyUserList');
+}
+
+//删除党建缓存
+function removeDJCache() {
+    cache.remove('checkedDJClientList');
+    cache.remove('checkedDJMyUserList');
+}
+
+//删除文体缓存
+function removeWTCache() {
+    cache.remove('checkedWTClientList');
+    cache.remove('checkedWTMyUserList');
+}
+
+//删除联谊缓存
+function removeLYCache() {
+    cache.remove('checkedLYClientList');
+    cache.remove('checkedLYMyUserList');
+}
+
+
+
+
+</script>
+
+<style scoped>
+.white-bg {
+    width: 690rpx;
+    margin: 0;
+    border-radius: 8px 8px 0 0;
+}
+
+.white-bg.white-bg-2 {
+    margin-bottom: 20rpx;
+}
+
+.white-bg.white-bg-3 {
+    border-radius: 0
+}
+
+.white-bg .w-b-title {
+    color: #3384DF;
+    font-size: 38rpx;
+}
+
+.form-con {
+    padding: 30rpx 0 0;
+}
+
+:deep(.form-con .uni-forms-item) {
+    margin-bottom: 22px !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/business/CRM/marketInformation.vue b/src/pages/business/CRM/marketInformation.vue
new file mode 100644
index 0000000..b69e47e
--- /dev/null
+++ b/src/pages/business/CRM/marketInformation.vue
@@ -0,0 +1,224 @@
+<template>
+    <view class="con-body">
+        <view class="con-bg">
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'市场信息管理'" :leftFlag="true" :rightFlag="true">
+                <template #right>
+                    <view class="head-right" @click="handleAdd">
+                        <uni-icons type="plus" size="24" color="#B7D2FF"></uni-icons>新增
+                    </view>
+                </template>
+            </customHeader>
+
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+
+            <!-- 正文内容 -->
+            <view class="all-body market-con">
+                <view class="nav-list">
+                    <view class="nav-item" :class="{active:index==activeTab}"
+                        v-for="(item,index) in tabList" :key="index"
+                        @click="handleNav(index)"
+                    >{{ item }}</view>
+                </view>
+
+                <!-- 分页部分  -->
+                <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+                    :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"
+                    class="scroll-h" :class="{'loading-scroll':cssFlag}">
+                    <!-- 市场机会信息 -->
+                    <block v-if="activeTab === 0">
+                        市场机会信息内容
+                    </block>
+                    <!-- 重大事项信息 -->
+                    <block v-if="activeTab === 1">
+                        <view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index">
+                            <view class="report-list">
+                                <view class="title r-list">
+                                    <view class="r-left" style="font-size:38rpx;">{{ item.title }}</view>
+                                    <view class="r-right btn-gray flex-auto" :class="{'btn-blue':item.status==2}" size="mini">{{ item.statusName }}</view>
+                                </view>
+                                <view style="padding:0rpx 0 10rpx">
+                                    <view class="font-bold" style="padding-bottom:10rpx">产生影响</view>
+                                    <view class="font-gray">{{ item.desc }}</view>
+                                </view>
+                            </view>
+                        </view>
+                    </block>
+                </mescroll-uni>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue'
+import customHeader from '@/components/customHeader.vue'
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import { getNavBarPaddingTop } from '@/utils/system.js'
+import { mattersList } from '@/api/business.js'
+
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+    navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+
+const activeTab = ref(1);// 默认重大事项信息
+const tabList = ['市场机会信息', '重大事项信息', '竞争对手信息', '人员变动信息','多标签效果','多标签效果'];
+let handleNav = (index)=>{
+    console.log(index)
+    activeTab.value = index;
+}
+
+// 新增
+let handleAdd = () => {
+    // uni.navigateTo({ url: '/pages/business/crm/visitorReportAdd' })
+}
+
+// 查询列表
+let list = ref([]);
+const mescrollRef = ref(null);
+const upOption = ref({
+    page: { num: 0, size: 10 },
+    noMoreSize: 5,
+    empty: { tip: '~ 空空如也 ~' },
+    textLoading: '加载中...',
+    textNoMore: '已经到底了'
+});
+
+const downOption = ref({
+    auto: true,
+    textInOffset: '下拉刷新',
+    textOutOffset: '释放更新',
+    textLoading: '刷新中...'
+});
+
+let cssFlag=ref(false);//控制样式
+const mescrollInit = (mescroll) => {
+    cssFlag.value = true;
+    mescrollRef.value = mescroll;
+};
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+    try {
+        setTimeout(async () => {
+            const res = await getMattersList(1, upOption.value.page.size);
+            cssFlag.value = false;
+            list.value = res.list;
+            mescroll.resetUpScroll();
+        }, 500);
+    } catch (error) {
+        mescroll.endErr();
+    } finally {
+        setTimeout(async () => {
+            mescroll.endSuccess();
+        }, 500);
+    }
+}
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+    try {
+        setTimeout(async () => {
+            const res = await getMattersList(mescroll.num, mescroll.size);
+            if (mescroll.num === 1) {
+                list.value = res.list;
+            } else {
+                list.value.push(...res.list);
+            }
+            mescroll.endBySize(res.list.length, res.total);
+        }, 500);
+    } catch (error) {
+        mescroll.endErr();
+    }
+}
+
+// 获取数据列表
+const getMattersList = (pageIndex, pageSize) => {
+    return new Promise(async (resolve) => {
+        let param = {
+            pageIndex,
+            pageSize
+        }
+
+        let res = await mattersList(param);
+        resolve({
+            list: res.list,
+            total: res.totalCount
+        });
+    });
+
+}
+
+</script>
+
+<style scoped>
+.all-body{
+    /* #ifdef APP-PLUS */
+    top:88rpx;
+    height: calc(100vh - 44px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    top:100rpx;
+    height: calc(100vh - 48px);
+    /* #endif */
+
+}
+/*.market-con{
+
+} */
+
+.nav-list{
+    display: flex;
+    flex-wrap: wrap;
+    /* #ifdef APP-PLUS */
+    padding:80rpx 30rpx 0;
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    padding:20rpx 30rpx 0;
+    /* #endif */
+}
+.nav-list .nav-item{
+    background-color:#05A3F4;
+    border-radius: 10rpx;
+    color:#FFFFFF;
+    font-size:28rpx;
+    text-align: center;
+    padding:10rpx 25rpx;
+    margin-right:15rpx;
+    margin-bottom:20rpx;
+}
+.nav-list .nav-item:nth-child(3n){
+    margin-right:0;
+}
+
+.nav-list .nav-item.active{
+    background-color: #fff;
+    color:#3384DF;
+    font-weight: bold;
+
+}
+
+.report-list .r-list{
+    align-items:flex-start;
+}
+
+
+.scroll-h {
+    /* #ifdef APP-PLUS */
+    height: calc(100vh - 155px);
+    /* #endif */
+    /* #ifndef APP-PLUS */
+    height: calc(100vh - 135px);
+    /* #endif */
+}
+
+.white-bg {
+    padding-top:10rpx;
+    padding-bottom: 10rpx;
+}
+.report-list .title{
+    display: flex;
+}
+</style>