冲突解决

pages/Client/new_file.vue

@@ -77,7 +77,7 @@
 
 
 
-<<<<<<< HEAD
+
 	// 普通用户
 	const serviceList1 = ref([{
 			icon: '/static/img/统一知识平台-营运@1x.png',
@@ -152,84 +152,9 @@
 			key: 7
 		},
 	]);
-=======
-	 // 普通用户
-	 const serviceList1 = ref([
-		 {
-	 		icon: '/static/img/统一知识平台-营运@1x.png',
-	 		name: '家庭辅导'
-	 	},
-	 	{
-	 		icon: '/static/img/编组.png',
-	 		name: '陪伴陪聊'
-	 	},
-	 	{
-	 		icon: '/static/img/清空.png',
-	 		name: '家庭助理'
-	 	},
-	 	{
-	 		icon: '/static/img/构建.png',
-	 		name: '健康管理'
-	 	},
-	 	{
-	 		icon: '/static/img/报事报修@6x.png',
-	 		name: '家庭清洁'
-	 	},
-	 	{
-	 		icon: '/static/img/报事报修@6x.png',
-	 		name: '家务帮手'
-	 	},
-	 ]);
-	 //志愿者
-	 const serviceList2 = ref([{
-	 		icon: '/static/img/统一知识平台-营运@1x.png',
-	 		name: '家庭教育注册',
-			key:2,
-	 	},
-	 	{
-	 		icon: '/static/img/编组.png',
-	 		name: '陪伴陪聊注册',
-			key:1,
-	 	},
-	 	{
-	 		icon: '/static/img/清空.png',
-	 		name: '家庭助手注册',
-			key:3,
-	 	},
-	 	{
-	 		icon: '/static/img/构建.png',
-	 		name: '健康管理注册',
-			key:4
-	 	},
-	 	{
-	 		icon: '/static/img/报事报修@6x.png',
-	 		name: '家庭清洁注册',
-			key:5
-	 	},
-	 	{
-	 		icon: '/static/img/报事报修@6x.png',
-	 		name: '家务帮手注册',
-			key:6
-	 	},
-		{
-	 		icon: '/static/img/报事报修@6x.png',
-	 		name: '咨询与服务注册',
-			key:8
-	 	},
-	 	{
-	 		icon: '/static/img/清空.png',
-	 		name: '排班管理',
-			key:7
-	 	},
-	 ]);
+	
 	 
 	
-// 宫格点击事件
-const handleGridClick = async (index) => {
-	console.log('userType', userType);
->>>>>>> 6a69d097892340385fbc618905c82a243470622e
-
-
 	// 宫格点击事件
 	const handleGridClick = async (index) => {
 		 const service = serviceList1.value[index]; // 获取点击的服务条目

pages/mine.vue

@@ -195,7 +195,6 @@
 			name: '预约单',
 			key: 'orderCount'
 		},
-
 		{
 			name: '进行单',
 			key: 'orderCount'
@@ -305,82 +304,7 @@
 			}
 		}
 
-		<<<<<<< HEAD .service-img {
-			width: 60rpx;
-			height: 60rpx;
-			margin-bottom: 10rpx;
-
-			=======.service-img {
-				width: 60rpx;
-				height: 60rpx;
-				margin-bottom: 10rpx;
-			}
-
-			.service-list {
-				padding-bottom: 12px;
-			}
-
-			.grid-text {
-				font-size: 14px;
-				color: #909399;
-				padding: 10rpx 0 20rpx 0rpx;
-				/* #ifndef APP-PLUS */
-				box-sizing: border-box;
-				/* #endif */
-			}
-
-
-			.grid-box {
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				flex-direction: column;
-				position: relative;
-
-				.item-badge {
-					position: absolute;
-				}
-			}
-
-			.price-box {
-				display: flex;
-				align-content: center;
-				justify-content: space-between;
-				// padding: 12px;
-
-				.price-item {
-					width: 50%;
-					padding: 12px;
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					justify-content: center;
-
-					.price-name {
-						font-size: 16px;
-						font-weight: 700;
-						line-height: 23.17px;
-						color: rgba(51, 51, 51, 1);
-						margin-bottom: 12px;
-					}
-
-					.price-data {
-						font-size: 20px;
-						font-weight: 700;
-						line-height: 23.44px;
-						color: rgba(51, 51, 51, 1);
-					}
-
-					.grid-min-price {
-						font-size: 12px;
-						font-weight: 500;
-						line-height: 17.38px;
-						color: rgba(153, 153, 153, 1);
-						margin-top: 4px;
-					}
-
-					>>>>>>>6a69d097892340385fbc618905c82a243470622e
-				}
+		
 
 				.service-list {
 					padding-bottom: 12px;