Merge branch 'mrr_sj_develop_hjy_20260520_商家改版' of https://gitee.com/qtvbidt/mrr.sj.front into mrr_sj_develop_hjy_20260520_商家改版

pages.json

@@ -951,6 +951,12 @@
 			"style": {
 				"navigationBarTitleText": "拍摄技巧"
 			}
+		},
+		{
+			"path": "pages/my/myFavorite",
+			"style": {
+				"navigationBarTitleText": "我的收藏"
+			}
 		}
 
 

pages/my/my.vue

@@ -56,11 +56,11 @@
 			<view class="inviteMessage" v-if="inviteList.length > 0">
 				<view class="inviteMessage_content">
 					<image mode="widthFix" class="inviteMessage_img"
-						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/7f577210-2d63-4146-af09-bcaf3db85a49.png" />
+						src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/bb9d15ac-ece5-4481-ae30-62f76ace032f.png" />
 					<view class="inviteMessage_text">您有{{ inviteList.length }}条商家邀请</view>
 				</view>
 				<image @click="goToInviteList" mode="aspectFill" class="btn_img"
-					src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/f2483bec-bbe7-4f2c-a6fd-e40a0accae82.png" />
+					src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/defe90dd-3e35-4582-ad45-b36f68681bcc.png" />
 			</view>
 		</view>
 		<!-- 用户相关信息 -->
@@ -107,8 +107,16 @@
 					<view class="image-title">{{ card.title }}</view>
 					<image @click="handleFunction(card)" :src="card.url" mode="widthFix"></image>
 				</view>
+				<view class="listcard-list" v-if="card.type == 'listcard'">
+					<view class="function-title">{{ card.title }}</view>
+					<view class="listcard-item" v-for="(item, index) in card.list" :key="index">
+						<image @click="handleFunction(item)" :src="item.url" mode="widthFix"></image>
+						<view class="listcard-title">{{ item.title }}</view>
+						<view class="listcard-text">{{ item.text }}</view>
+					</view>
+				</view>
 				<view class="imageText-list" v-if="card.type == 'imageText'">
-					<view class="imageText-title">{{ card.title }}</view>
+					<view class="lineCard-title">{{ card.title }}</view>
 					<view class="imageText-content">
 						<image :src="card.url" mode="widthFix"></image>
 						<view class="text-status">入驻成功啦！</view>
@@ -155,13 +163,26 @@
 
 				list: [{
 					title: "员工管理",
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/a9c13cce-f3e1-4ac1-9881-d39dc2b813ff.png",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/9d847e84-e4ca-44c0-b9fb-e33803a67457.png",
 					path: "/pages/shop/staff/manage",
 					go_id_type: 1,
 				},
 				{
 					title: "服务分配",
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/673f9885-3be1-4769-b417-b675b8ac5099.png",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0d27ea76-2a81-4374-8033-5eef76598f9c.png",
+					path: "/pages/shop/staff/distribution-service",
+					go_id_type: 1,
+				},
+				{
+					title: "店铺装修",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/4b558456-2e38-4185-8713-d1f0e6645820.png",
+					// https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e6e72039-eec4-414c-8a86-aad404602962.png
+					path: "/pages/shop/staff/distribution-service",
+					go_id_type: 1,
+				},
+				{
+					title: "财务管理",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/edafae37-8258-4e1c-9dcc-019484117047.png",
 					path: "/pages/shop/staff/distribution-service",
 					go_id_type: 1,
 				},
@@ -175,25 +196,25 @@
 					title: "服务管理",
 					path: "/pages/artisan/service-list",
 					go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/c4a8df11-b4c0-46e3-a72e-7bbb20bbbd6a.png",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0076bdee-f1c6-412d-9f05-187189a855a6.png",
 				},
 				{
 					title: "工位管理",
 					path: "/pages/shop/workSpace/list",
 					go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d4c59f74-34a5-4e0f-b3be-766342e4d6e9.png",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6568df0b-e646-4593-804b-a21ed0b35ede.png",
 				},
 				{
 					title: "购买服务",
 					path: "/pages/shop/buy-service",
 					go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/285172ae-9757-472f-b466-73d5cc78d82a.png",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6c9aa5ea-63aa-4a86-8858-cb58d303114f.png",
 				},
 				{
 					title: "购买工时",
 					path: "/pages/shop/manHour/buyManHour",
 					go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/9a13b1d0-3099-4e52-8d43-549f2520c1ca.png",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/c40cddcb-6a43-4355-b25d-ab3e53e17982.png",
 				},
 				],
 			},
@@ -205,25 +226,25 @@
 					title: "用户订单",
 					path: "/pages/shop/userorders",
 					go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/1ca76fe3-21fc-408d-a453-4b253e377e46.png",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b94e033c-836b-404c-85e9-9a7ba7680919.png",
 				},
 				{
 					title: "工位订单",
 					path: "/pages/shop/workSpace/saleList",
 					go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/6ebd42c1-09a4-4ed1-8b82-de6db52f6cda.png",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b5ede46f-71f9-4718-87a8-3aa4ba99c490.png",
 				},
 				{
 					title: "服务订单",
 					path: "/pages/shop/buy-order",
 					go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/65c5d29b-9aa6-4dd0-b766-baa484d1e5fe.png",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/673f1dac-1693-4f0a-aec4-c196aa72382b.png",
 				},
 				{
-								title: "工时订单",
+					title: "购买工时",
 					path: "/pages/shop/manHour/saleList",
 					go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/f4b1628d-9d2e-4de0-90a8-bd2c83dad2af.png",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/72520b2a-804c-4987-84ca-25e5247e65a2.png",
 				},
 				],
 			},
@@ -235,13 +256,13 @@
 					title: "拼团管理",
 					path: "/pages/shop/groupBuying/list",
 					go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/9a93bf6a-4387-460e-afb5-80441e4e7310.png",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/569c2ba5-2f39-4a3f-b36d-026c480d8203.png",
 				},
 				{
 					title: "日常推广",
 					path: "/pages/promotion/promotion",
 					go_id_type: 1,
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b7419b23-2241-4b32-98f2-603bb479bcc1.png",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/90d92ff7-4110-4ebd-8207-e6370699a1b6.png",
 				},
 				],
 			},
@@ -252,12 +273,12 @@
 				self_state: true,
 				list: [{
 					text: "自营服务",
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b0faf058-e824-4d8b-a4fa-17d3e90b04ec.png",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/fa0c9545-91f4-4a73-b5fe-fa1217aa768e.png",
 					path: "/pages/selfOperated/list",
 				},
 				{
 					text: "自营订单",
-								url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/b1dc0fc5-13be-4e21-8942-929edd42195b.png",
+					url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/dfeff761-7448-4f31-a4e9-ee12b088d6a8.png",
 					path: "/pages/shop/userorders?serviceType=2",
 				},
 				],
@@ -271,19 +292,23 @@
 				path: "/pages/selfOperated/agreement?title=平台自营项目介绍&type=18",
 			},
 			{
-						type: "line",
+				type: "listcard",
 				title: "我的服务",
-						list: [{
+				list: [
-								text: "联系平台",
+					{
-								icon: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/930a458a-9d2a-4543-a39c-399bb5bb5290.png",
+						text: "我的收藏",
-								path: "/pages/contact/contact",
+						url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/83fa7f51-dda3-494b-a50e-f15f8fdcdb9c.png",
+						path: "/pages/my/myFavorite",
 					},
 					{
 						text: "设置",
-								icon: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/0e0676c1-aa2b-4b3f-b9d5-c020c566cc85.png",
+						url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/d1173680-386b-4db3-a74c-64108da6cec9.png",
-								path: "",
+						path: "/pages/settings/index",
-								type: "setting",
+					},
-								isNeedLogin: true,
+					{
+						text: "联系客服",
+						url: "https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/5bbac7f8-940a-414a-be0b-e6faf5215f63.png",
+						path: "/pages/contact/contact",
 					},
 				],
 			},
@@ -1240,6 +1265,58 @@
 }
 
 /* 功能列表 */
+.listcard-list {
+	position: relative;
+	z-index: 99;
+	margin: 0 30rpx;
+	background: #ffffff;
+	border-radius: 24rpx;
+	padding: 30rpx 20rpx;
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: space-between;
+
+	.function-title {
+		width: 100%;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #252525;
+		line-height: 36rpx;
+		text-align: left;
+		font-style: normal;
+		margin-bottom: 20rpx;
+	}
+
+	.listcard-item {
+		width: 33.33%;
+		padding: 20rpx;
+		box-sizing: border-box;
+
+		image {
+			width: 50rpx;
+			height: 50rpx;
+			margin: 0 auto 10rpx;
+			display: block;
+		}
+
+		.listcard-title {
+			font-weight: 500;
+			font-size: 28rpx;
+			color: #252525;
+			line-height: 32rpx;
+			text-align: center;
+			margin-bottom: 8rpx;
+		}
+
+		.listcard-text {
+			font-size: 24rpx;
+			color: #999999;
+			line-height: 28rpx;
+			text-align: center;
+		}
+	}
+}
+
 .image-list {
 	background: #ffffff;
 	border-radius: 24rpx;

pages/my/myFavorite.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>