解决合并冲突

.idea/.gitignore

@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

components/Server.vue

@@ -15,7 +15,7 @@
 		name:"Server",
 		data() {
 			return {
-				
+
 			};
 		}
 	}
@@ -40,4 +40,4 @@
 		border-radius: 20rpx;
 	}
 }
-</style>
+</style>

pages/home/index.vue

@@ -195,8 +195,8 @@
 				<view class="inner">
 					<view class="pub-tab-box">
 						<view class="tab-inner">
-							<view 
-								v-for="(item,index) in articleCateList" 
+							<view
+								v-for="(item,index) in articleCateList"
 								:key="index"
 								:class="item.cateId == cateId?'item active':'item'"
 								@click="articleCateChange(item)">
@@ -208,7 +208,7 @@
 						</view>
 						<image class="right-mask" src="https://jnlzjk-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/mask.png" mode=""></image>
 					</view>
-					 
+
 					<view class="know-list">
 						<view class="item" v-for="(item,index) in articleList" :key="index" @click="showArticle(item)">
 							<view class="left">
@@ -248,7 +248,7 @@
 				<view class="text ellipsis">关注公众号了解更新</view>
 			</view>
 			<view class="btn">查看</view>
-			
+
 		</view> -->
 		<!-- #ifdef MP-WEIXIN -->
 		<view class="official-account">
@@ -263,8 +263,8 @@
 		</view>
 		<z-modal :show="tuiModalControl" placeholderText="请输入邀请码" :btnGroup="btnGroup" :contentType="2"
 			titleText="填写邀请码" @cancle="cancleTui" @sure="submitTui"></z-modal>
-			
-			
+
+
 			<Server/>
 		<!-- <tabbar :actindex="0"></tabbar> -->
 	</view>
@@ -307,7 +307,7 @@
 	import HotProduct from './components/HotProduct.vue'
 	import NewProduct from './components/NewProduct.vue'
 	import TuiProduct from '@/components/tuiProduct.vue'
-	
+
 	import Server from '@/components/Server.vue'
 	import {
 		getUserInfo,
@@ -712,7 +712,7 @@
 					if (res.code == 200) {
 						// for (var i = 0; i < res.data.length; i++) {
 						// 	const item=res.data[i];
-						// if(item.menuName.indexOf('百域百科')>=0 || item.menuName.indexOf('百域自测')>=0 
+						// if(item.menuName.indexOf('百域百科')>=0 || item.menuName.indexOf('百域自测')>=0
 						// || item.menuName.indexOf('百域档案')>=0 ||item.menuName.indexOf('用药咨询')>=0){
 						// 	this.menus.push(item);
 						// }
@@ -2685,4 +2685,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/user/index.vue

@@ -32,7 +32,7 @@
 							<view class="msg-box" @click="navgetTo('/pages_user/user/message')">
 								<image src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/icon-msg.png" mode=""></image>
 							</view>
-							
+
 						</uni-badge> -->
 					</view>
 				</view>
@@ -122,7 +122,7 @@
 									mode=""></image>
 								<text class="text">我的足迹</text>
 							</view>
-							
+
 							<view class="item no-marin-bottom">
 								<image
 									src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/customer1.png"
@@ -151,7 +151,7 @@
 									mode=""></image>
 								<text class="text">直播订单</text>
 							</view>
-							
+
 							<!-- 销售可见 -->
 							<!-- <view  v-if="user.bindCompanyUserId" class="item no-marin-bottom" @click="toManager()">
 								<image
@@ -165,7 +165,7 @@
 									mode=""></image>
 								<text class="text">销售管理</text>
 							</view> -->
-							
+
 							<!-- <view v-if="user.bindCompanyUserId" class="item no-marin-bottom" @click="openH5('/h5/userAgreement')">
 								<image
 									src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/service_file.png"
@@ -178,8 +178,8 @@
 									mode=""></image>
 								<text class="text">隐私保护</text>
 							</view> -->
-							
-							
+
+
 							<!-- 测试用下面的 -->
 							<view  class="item no-marin-bottom align-top" @click="navgetTo('/pages_course/livingList')">
 								<image
@@ -187,7 +187,7 @@
 									mode=""></image>
 								<text class="text">直播</text>
 							</view>
-							
+
 							<view class="item no-marin-bottom" @click="toManager()">
 								<image
 									src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/products_icon.png"
@@ -684,4 +684,4 @@
 		margin: 10px;
 		border-radius: 20rpx;
 	}
-</style>
+</style>

pages_course/living.vue

@@ -163,7 +163,7 @@
 
 					<!-- 底部输入和操作区域 -->
 					<view class="input-actions-container" :class="{ 'input-actions-focused': isFocus }">
-						<view class="input-container" :class="{ 
+						<view class="input-container" :class="{
 									'input-container-focused': isFocus,
 									'input-container-normal': !isFocus
 								}">
@@ -190,8 +190,8 @@
 										src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/userapp/images/more-icon.png"
 										class="action-icon" /> -->
 
-									<image :src="liveItem.showType == 1 
-										    ? '/static/images/more2.png' 
+									<image :src="liveItem.showType == 1
+										    ? '/static/images/more2.png'
 										    :'https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/userapp/images/more-icon.png'"
 										class="action-icon" />
 								</view>
@@ -1214,7 +1214,7 @@
 										this.isLogin = true
 										this.haveLogin()
 										// console.log("TOKEN_KEYAuto",TOKEN_KEYAuto)
-										// this.getIsAddKf() 
+										// this.getIsAddKf()
 									} else {
 										uni.showToast({
 											title: res.msg,
@@ -3694,6 +3694,8 @@
 
 				// 给消息添加唯一ID
 				message.uniqueId = ++this.messageIdCounter;
+				let msgdata = JSON.parse(message.data);
+				message.msgId = msgdata.msgId;
 				this.talklist.push(message);
 
 				// 当消息超过限制时，批量删除旧消息
@@ -3904,7 +3906,10 @@
 								status: true
 							};
 						} else if (socketMessage.cmd == 'deleteMsg') {
-							
+							const index = this.talklist.findIndex(item => item.msgId == socketMessage.msg);
+							if (index !== -1) {
+							  this.talklist.splice(index, 1);
+							}
 						}else if (socketMessage.cmd == 'LotteryDetail') {
 							try {
 								this.prizeInfo = Array.isArray(JSON.parse(socketMessage.data || '[]')) ? JSON.parse(
@@ -3984,34 +3989,32 @@
 				};
 				// 发送socket消息
 				try {
-					if (this.myselfFlag) {
-						this.addToTalkList(data);
-					} else {
-						this.socket.send({
-							data: JSON.stringify(data),
-							success: () => {
-								this.value = '';
-								// 发送成功后强制滚动到底部，无论当前滚动位置如何
-								this.forceScrollToBottomOnSend();
-							},
-							fail: (err) => {
-								console.error('消息发送失败:', err);
-								if (retries > 0) {
-									uni.showToast({
-										title: `发送失败，正在重试（${retries}次）`,
-										icon: 'none'
-									});
-									setTimeout(() => this.sendMsg(retries - 1), 500);
-								} else {
-									uni.showToast({
-										title: '发送失败，请稍后再试',
-										icon: 'none'
-									});
-									this.value = text; // 恢复输入框内容
-								}
+
+					this.socket.send({
+						data: JSON.stringify(data),
+						success: () => {
+							this.value = '';
+							// 发送成功后强制滚动到底部，无论当前滚动位置如何
+							this.forceScrollToBottomOnSend();
+						},
+						fail: (err) => {
+							console.error('消息发送失败:', err);
+							if (retries > 0) {
+								uni.showToast({
+									title: `发送失败，正在重试（${retries}次）`,
+									icon: 'none'
+								});
+								setTimeout(() => this.sendMsg(retries - 1), 500);
+							} else {
+								uni.showToast({
+									title: '发送失败，请稍后再试',
+									icon: 'none'
+								});
+								this.value = text; // 恢复输入框内容
 							}
-						});
-					}
+						}
+					});
+
 
 				} catch (err) {
 					console.error('发送消息异常:', err);
@@ -5676,4 +5679,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages_shopping/live/order.vue

@@ -586,4 +586,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages_shopping/live/storeOrderDelivery.vue

@@ -3,7 +3,7 @@
 		<view class="top-cont">
 			<!-- 背景图片 -->
 			<image class="bg" src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/userapp/images/order_top_bg2.png" mode=""></image>
-			<view class="top-inner">			
+			<view class="top-inner">
 				<!-- 这里是状态栏 -->
 				<view class="status_bar" :style="{height: statusBarHeight}"></view>
 				<view class="back-box" @click="back">
@@ -18,7 +18,7 @@
 						 :class="actexpress==index?'itemlist itemact':'itemlist' " >
 							物流{{index+1}}</view>
 					</view>
-					
+
 					<view class="inner">
 						<view class="num-box">
 							<text class="text">运单号</text>
@@ -58,16 +58,16 @@
 							<view  class="desc-text">
 								{{item.AcceptStation}}
 							</view>
-							 
+
 							<view class="time">{{item.AcceptTime}}</view>
 						</view>
 					</view>
 				</view>
-				
+
 			</view>
-			
+
 		</view>
-		
+
 	</view>
 </template>
 
@@ -102,25 +102,25 @@
 					if(res.code==200){
 						this.ExpressMulti=res.data
 						this.expressList=res.data[this.actexpress]
-						
+
 					}
 				})
 			},
 			getExpress(){
 				var data={orderId:this.orderId};
-				
+
 				getExpress(data).then(res => {
 					if(res.code==200){
 						this.express=res.express;
 						this.expressList=res.data;
 						this.deliveryId=res.deliveryId
-				 
+
 					}else{
 						uni.showToast({
 							icon:'none',
 							title: "请求失败",
 						});
-						 
+
 					}
 				});
 			},
@@ -254,7 +254,7 @@
 					}
 				}
 			}
-			
+
 		}
 	}
 	.content{
@@ -346,7 +346,7 @@
 				}
 			}
 		}
-		
+
 	}
-	
+
 </style>

pages_shopping/live/storeOrderDetail.vue

@@ -884,4 +884,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages_user/user/storeOrderDetail.vue

@@ -25,7 +25,7 @@
 			<!-- 背景图片 -->
 			<image class="bg" src="https://jnlzjk-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/order_top_bg.png" mode=""></image>
 			<view class="top-inner">
-				
+
 				<!-- 顶部固定后站位元素 -->
 				<view style="padding-bottom: 88upx;">
 					<view :style="{height: statusBarHeight}"></view>
@@ -151,10 +151,10 @@
 									</view>
 									<view class="spec ellipsis2">{{JSON.parse(order.packageJson).descs}}</view>
 								</view>
-								 
+
 							</view>
 						</view>
-					 
+
 						<!-- 已优惠、小计 -->
 						<view class="sub-total">
 							<view class="discount">
@@ -194,7 +194,7 @@
 							<text class="label">优惠金额</text>
 							<text class="text" v-if="order.couponPrice!=null">-¥{{order.couponPrice.toFixed(2)}}</text>
 						</view>
-						
+
 						<view   class="item">
 							<text class="label">应付金额</text>
 							<text class="text" v-if="order.payPrice!=null">¥{{order.payPrice.toFixed(2)}}</text>
@@ -215,7 +215,7 @@
 							<text class="label">发货时间</text>
 							<text class="text"></text>
 						</view> -->
-						 
+
 					</view>
 					<!-- 处方信息 -->
 					<view class="order-info" v-if="order.isPrescribe&&prescribe!=null">
@@ -241,7 +241,7 @@
 						</view>
 					</view>
 				</view>
-				
+
 			</view>
 		</view>
 		<!-- 按钮 -->
@@ -316,7 +316,7 @@
 							icon:'none',
 							title: res.msg,
 						});
-						 
+
 					}
 				}).catch(()=>{
 					this.loading = false
@@ -359,7 +359,7 @@
 							icon:'none',
 							title: "请求失败",
 						});
-						 
+
 					}
 				}).catch(()=>{
 					uni.hideLoading()
@@ -392,7 +392,7 @@
 									});
 								}
 							});
-				        } 
+				        }
 						else if (res.cancel) {
 				        }
 				    }
@@ -419,7 +419,7 @@
 									});
 								}
 							});
-				        } 
+				        }
 						else if (res.cancel) {
 				        }
 				    }
@@ -454,7 +454,7 @@
 						url:"/pages/common/launch"
 					})
 				}
-				
+
 			},
 			// 复制订单编号
 			copyOrderSn(text) {
@@ -618,7 +618,7 @@
 						}
 					}
 				}
-				
+
 			}
 		}
 	}