yudao-admin-vue3/src/components/AppLinkInput/AppLinkSelectDialog.vue

@@ -24,7 +24,7 @@
 							:content="appLink.path" placement="bottom" :show-after="300">
 							
 							<el-button class="m-b-8px m-r-8px m-l-0px!"
-								:type="appLink.path == activeAppLink.path ? 'primary' : 'default'"
+								:type="isSameLink(appLink.path, activeAppLink.path) ? 'primary' : 'default'"
 								@click="handleAppLinkSelected(appLink)">
 								{{ appLink.name }}
 							</el-button>
@@ -109,14 +109,9 @@
 
 	// 处理 APP 链接选中
 	const handleAppLinkSelected = (appLink : AppLink) => {
-		if(!appLink.path.includes('/pages/index/page')){
+		if (!isSameLink(appLink.path, activeAppLink.value.path)) {
-			if (!isSameLink(appLink.path, activeAppLink.value.path)) {
+			activeAppLink.value = appLink
-				activeAppLink.value = appLink
+			console.log(activeAppLink.value,activeAppLink.value.path,"activeAppLink.value")
-				// console.log(activeAppLink.value,activeAppLink.value.path,"activeAppLink.value")
-			}
-		}else{
-			activeAppLink.value.path = appLink.path
-			console.log(activeAppLink.value.path,"activeAppLink.value.path")
 		}
 		switch (appLink.type) {
 			case APP_LINK_TYPE_ENUM.PRODUCT_CATEGORY_LIST:

yudao-admin-vue3/src/components/DiyEditor/components/mobile/MenuGridTow/index.vue

@@ -112,7 +112,7 @@ defineProps<{ property: MenuGridProperty }>()
 		border-radius: 5px;
 		margin: 0 auto;
 		padding: 5px 0;
-		// margin-top: 10px;
+		margin-top: 10px;
 		padding-bottom: 10px;
 		padding-top: 10px;
 		&>.t {

yudao-admin-vue3/src/views/infra/file/index.vue

@@ -34,6 +34,14 @@
 		<div class="content-wrap">
 			<ContentWrap>
 				<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+					<!-- <el-form-item label="文件路径" prop="path">
+                <el-input
+                  v-model="queryParams.path"
+                  placeholder="请输入文件路径"
+                  clearable
+                  @keyup.enter="handleQuery"
+                />
+              </el-form-item> -->
 					<el-form-item label="文件类型" prop="type" width="80">
 						<el-input v-model="queryParams.type" placeholder="请输入文件类型" clearable
 							@keyup.enter="handleQuery" />
@@ -55,15 +63,12 @@
 							<Icon icon="ep:upload" class="mr-5px" /> 上传文件
 						</el-button>
 					</el-form-item>
-					<span><img @click="liebiao" style="cursor: pointer;" class="mr-10px h-30px w-30px" src="@/assets/imgs/liebiao.png" /></span>
-					<span><img @click="tubiao" style="cursor: pointer;" class="mr-10px h-30px w-30px" src="@/assets/imgs/tubiao.png" /></span>
 				</el-form>
-				
 			</ContentWrap>
 
 
-				
+			<ContentWrap>
-				<el-table v-loading="loading" :data="list" v-show="panduan == '1'">
+				<el-table v-loading="loading" :data="list">
 					<el-table-column label="文件内容" align="center" prop="url" width="110px">
 						<template #default="{ row }">
 							<el-image v-if="row.type.includes('image')" class="h-80px w-80px" lazy :src="row.url"
@@ -77,6 +82,14 @@
 					<el-table-column label="文件名" align="center" prop="name" :show-overflow-tooltip="true" />
 					<!-- <el-table-column label="文件路径" align="center" prop="path" :show-overflow-tooltip="true" /> -->
 					<el-table-column label="URL" align="center" prop="url" :show-overflow-tooltip="true" />
+					<!-- <el-table-column label="文件大小" align="center" prop="size" width="120"
+						:formatter="fileSizeFormatter" /> -->
+					<!-- <el-table-column label="文件类型" align="center" prop="type" width="180px" />
+					<el-table-column label="图片分类" align="center" prop="picType">
+						<template #default="scope">
+							<dict-tag :type="DICT_TYPE.INFRA_FILE_TYPE" :value="scope.row.picType" />
+						</template>
+					</el-table-column> -->
 
 					<el-table-column label="上传时间" align="center" prop="createTime" width="180"
 						:formatter="dateFormatter" />
@@ -93,18 +106,7 @@
 						</template>
 					</el-table-column>
 				</el-table>
-				
+			</ContentWrap>
-				<div v-show="panduan == '2'">
-								<!-- 图片展示区域 -->
-								<div class="image-container">
-								    <div v-for="item in tubiaoData" :key="item.id" class="image-item">
-									    <img :src="item.url" alt="图表" />
-									</div>
-								</div>
-							</div>
-				
-				
-		
 			<!-- 分页 -->
 			<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
 				@pagination="getList" />
@@ -167,8 +169,6 @@
 	const dialogVisibles = ref(false) // 弹窗的是否展示
 	const dialogTitles = ref('') // 弹窗的标题
 	const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-	const panduan = ref('1')
-	const tubiaoData = ref<FileDataVO[]>([]);
 	const formData = ref({
 		id: undefined,
 		sort: undefined,
@@ -210,37 +210,17 @@
 		try {
 			const data = await FileApi.getFilePage(queryParams)
 			list.value = data.list
-			tubiaoData.value = data.list
-			console.log('111111',tubiaoData)
 			total.value = data.total
 		} finally {
 			loading.value = false
 		}
 	}
-	 interface FileDataVO {
-		 id: string
-		 configId: string
-		 path: string
-		 name: string
-		 url: string
-		 type: string
-		 picType: string
-		 size: string
-		 createTime: Date
-	}
-	
-	const tubiao = () => {
-		panduan.value = '2'
-	}
-	
-	const liebiao = () => {
-		panduan.value = '1'
-	}
 
 	//新增分类
 	const createType = () => {
 		dialogVisibles.value = true
 		dialogTitles.value = '新增分类'
+
 	}
 
 	/** 添加分类菜单 */
@@ -311,6 +291,7 @@
 	const getTypeList = async () => {
 		const data = await DictDataApi.getTypeList()
 		typeMenu.value = data
+		console.log('1111111111', typeMenu)
 	}
 
 
@@ -392,29 +373,4 @@
 		overflow-y: auto;
 		/* 允许内容区域滚动 */
 	}
-	
-	
-	/* 图片容器样式 */
-		.image-container {
-			display: flex;
-			flex-wrap: wrap;
-			gap: 10px;  /* 设置图片之间的间距 */
-			justify-content: flex-start; /* 如果图片少于5张，会平均分布 */
-			max-width: 1000px; /* 设置外部容器的最大宽度 */
-			margin: 0 auto;  /* 居中显示 */
-		}
-	
-		/* 每张图片占用的宽度，使每行显示5张 */
-		.image-item {
-			width: calc(20% - 8px);  /* 宽度设为容器的20%，减去间距 */
-		}
-	
-		/* 设置图片的最大宽度 */
-		.image-item img {
-			width: 100%;
-			height: auto;
-			border-radius: 8px; /* 图片边缘圆角（可选） */
-		}
-	
-
 </style>

yudao-admin-vue3/src/views/infra/file/updateForm.vue

@@ -92,6 +92,8 @@ const open = async (type: string, ids: number, picTypes: number) => {
     formLoading.value = true
 	id.value = ids
 	picType.value = picTypes
+	console.log('11111',ids)
+	console.log('2222',picType.value)
 	formLoading.value = false
   }
 }

yudao-admin-vue3/src/views/mall/promotion/diy/template/ProductCategory.vue

@@ -1,109 +0,0 @@
-<template>
-	<div class="main">
-		<div class="mainTop">
-			<div>商品分类</div>
-			<div class="right">
-				<div class="save" @click="save">保存</div>
-				<div class="cz" @click="cz">重置</div>
-			</div>
-		</div>
-		
-		<div class="mainBottom">
-			<div class='item' :class="currItem== 1 ? 'on': ''" @click="clickItem(1)">
-				<img class="img" src="https://zysc.fjptzykj.com:3000/shangcheng/a7d0409cbf5335a2780409756914c530fc7c88bec85fc81302b53760d9be4a03.jpg" />
-				<div class="text">样式1</div>
-			</div>
-			<div class='item' :class="currItem== 2 ? 'on': ''" @click="clickItem(2)">
-				<img class="img" src="https://zysc.fjptzykj.com:3000/shangcheng/9096b2c04a6e46ea562999a93a1b975100c6b4557e680dcb31de6d3555407841.png" />
-				<div class="text">样式2</div>
-			</div>
-		</div>
-	</div>
-</template>
-<script setup lang="ts">
-	// TODO @疯狂：要不要建个 decorate 目录，然后挪进去，改成 index.vue，这样可以更明确看到是个独立界面哈，更好找
-	import * as DiyTemplateApi from '@/api/mall/promotion/diy/template'
-	import * as DiyPageApi from '@/api/mall/promotion/diy/page'
-	import { useTagsdivStore } from '@/store/modules/tagsdiv'
-	import { DiyComponentLibrary, PAGE_LIBS } from '@/components/DiyEditor/util' // 商城的 DIY 组件，在 DiyEditor 目录下
-	import { toNumber } from 'lodash-es'
-	
-	const currItem = ref(1);
-	
-	function clickItem (val){
-		currItem.value = val;
-	}
-	
-	function cz (val){
-		currItem.value = 1;
-	}
-	
-	function save (){
-		// currItem.value = val;
-		console.log("请求接口还没有写啊！！！！快让后端提供啊")
-	}
-</script>
-
-<style lang="scss" scoped>
-	.main{
-		display:flex;
-		flex-wrap:wrap;
-		.mainTop{
-			width:100%;
-			margin:10px 10px;
-			background:white;
-			padding:10px 20px;
-			font-weight:700;
-			display:flex;
-			justify-content:space-between;
-			    align-items: center;
-			.right{
-				display:flex;
-				div{
-					padding:5px 15px;
-					font-weight:400;
-					font-size: 14px;
-				}
-				.save{
-					background:#0256FF;
-					margin-right:10px;
-					color:white;
-					cursor: pointer;
-				}
-				.cz{
-					border:1px solid #cccccc;
-					cursor: pointer;
-				}
-			}
-		}
-		.mainBottom{
-			width:100%;
-			margin:10px 10px;
-			background:white;
-			padding:30px 30px;
-			display:flex;
-			.item{
-				margin-right:20px;
-				text-align: center;
-				border-radius: 12px;
-				cursor: pointer;
-				&.on{
-					.text{
-						color:#0256ff;
-					}
-					.img{
-						border:2px solid #0256ff;
-					}
-				}
-				.img{
-					width:260px;
-					border-radius: 12px;
-					border:2px solid white;
-				}
-				.text{
-					margin-top:10px;
-				}
-			}
-		}
-	}
-</style>

yudao-admin-vue3/src/views/mall/promotion/diy/template/ThemeStyle.vue

@@ -1,162 +0,0 @@
-<template>
-	<div class="main">
-		<div class="mainTop">
-			<div>主题风格</div>
-			<div class="right">
-				<div class="save" @click="save">保存</div>
-				<!-- <div class="cz" @click="cz">重置</div> -->
-			</div>
-		</div>
-
-		<div class="ztfg">
-			<div class='top'>
-				<div class="item"  :class="currItem== 1 ? 'on': ''" @click="clickItem(1)">
-					<div class="le"></div>
-					<div class="ri">天空蓝</div>
-				</div>
-				<div class="item" :class="currItem== 2 ? 'on': ''" @click="clickItem(2)">
-					<div class="le" style="background:rgb(66, 202, 77);"></div>
-					<div class="ri">生鲜绿</div>
-				</div>
-			</div>
-			<div class="mainBottom">
-				<div class='item' v-show="currItem== 1">
-					<img class="img"
-						src="https://zysc.fjptzykj.com:3000/shangcheng/4bffe9f0cee9605262a579ee45156c9e37a16e2a24035a0e49b8a4433075f793.jpg" />
-				</div>
-				<div class='item' v-show="currItem== 2">
-					<img class="img"
-						src="https://zysc.fjptzykj.com:3000/shangcheng/0d0a7ab210afb5cee674e402ca3ec197a30523687acbec2e8e5f16fb52075e9b.jpg" />
-				</div>
-			</div>
-		</div>
-	</div>
-</template>
-<script setup lang="ts">
-	// TODO @疯狂：要不要建个 decorate 目录，然后挪进去，改成 index.vue，这样可以更明确看到是个独立界面哈，更好找
-	import * as DiyTemplateApi from '@/api/mall/promotion/diy/template'
-	import * as DiyPageApi from '@/api/mall/promotion/diy/page'
-	import { useTagsdivStore } from '@/store/modules/tagsdiv'
-	import { DiyComponentLibrary, PAGE_LIBS } from '@/components/DiyEditor/util' // 商城的 DIY 组件，在 DiyEditor 目录下
-	import { toNumber } from 'lodash-es'
-
-	const currItem = ref(1);
-
-	function clickItem(val) {
-		currItem.value = val;
-	}
-
-	function cz(val) {
-		currItem.value = 1;
-	}
-
-	function save() {
-		// currItem.value = val;
-		console.log("请求接口还没有写啊！！！！快让后端提供啊")
-	}
-</script>
-
-<style lang="scss" scoped>
-	.main {
-		display: flex;
-		flex-wrap: wrap;
-
-		.mainTop {
-			width: 100%;
-			margin: 10px 10px;
-			background: white;
-			padding: 10px 20px;
-			font-weight: 700;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-
-			.right {
-				display: flex;
-
-				div {
-					padding: 5px 15px;
-					font-weight: 400;
-					font-size: 14px;
-				}
-
-				.save {
-					background: #0256FF;
-					margin-right: 10px;
-					color: white;
-					cursor: pointer;
-				}
-
-				.cz {
-					border: 1px solid #cccccc;
-					cursor: pointer;
-				}
-			}
-		}
-
-		.ztfg {
-			width: 100%;
-			margin: 10px 10px;
-			background: white;
-			padding: 30px 30px;
-			.top{
-				display: flex;
-				margin-bottom: 10px;
-				.item{
-					padding:10px 15px;
-					border:1px solid #cccccc;
-					border-radius:6px;
-					margin-right:10px;
-					display:flex;
-					align-items:center;
-					cursor: pointer;
-					&.on{
-						border:1px solid #0256ff;
-					}
-					.le{
-						margin-right:10px;
-						border-radius:6px;
-						width:25px;
-						height:25px;
-						background:rgb(28, 165, 233);
-					}
-					.ti{
-						
-					}
-				}
-			}
-			.mainBottom {
-				
-				display: flex;
-
-				.item {
-					margin-right: 20px;
-					text-align: center;
-					border-radius: 12px;
-
-					// &.on {
-					// 	.text {
-					// 		color: #0256ff;
-					// 	}
-
-					// 	.img {
-					// 		border: 2px solid #0256ff;
-					// 	}
-					// }
-
-					.img {
-						width: 800px;
-						border-radius: 12px;
-						border: 2px solid white;
-					}
-
-					.text {
-						margin-top: 10px;
-					}
-				}
-			}
-
-		}
-
-	}
-</style>

yudao-framework/yudao-spring-boot-starter-websocket/src/main/java/cn/iocoder/yudao/framework/websocket/core/sender/redis/RedisWebSocketMessageConsumer.java

@@ -18,8 +18,6 @@ public class RedisWebSocketMessageConsumer extends AbstractRedisChannelMessageLi
         redisWebSocketMessageSender.send(message.getSessionId(),
                 message.getUserType(), message.getUserId(),
                 message.getMessageType(), message.getMessageContent());
-        System.out.println("11111111111111111111 : " + message.toString());
-
     }
 
 }

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java

@@ -165,7 +165,7 @@ public class KeFuMessageServiceImpl implements KeFuMessageService {
 
     @Async
     public void sendAsyncMessageToMembers(Long userId, String messageType, Object content) {
-        webSocketSenderApi.sendObject(UserTypeEnum.ADMIN.getValue(), userId, messageType, content);
+        webSocketSenderApi.sendObject(UserTypeEnum.MEMBER.getValue(), userId, messageType, content);
     }
 
     @Async
@@ -175,7 +175,7 @@ public class KeFuMessageServiceImpl implements KeFuMessageService {
 
     @Async
     public void sendAsyncMessageToAdmins(String messageType, Object content) {
-        webSocketSenderApi.sendObject(UserTypeEnum.ADMIN.getValue(), messageType, content);
+        webSocketSenderApi.sendObject(UserTypeEnum.MEMBER.getValue(), messageType, content);
     }
 
     @Override