合并冲突

pages/index/index.css

@@ -871,15 +871,39 @@ page{background: #fff;}
 .chat-fixed{
 	position: fixed;
 	bottom: 350rpx;
+	/* left:calc(100% - 130rpx); */
 	right: 30rpx;
 	z-index: 1;
+	transition:all 2s ease;
 }
 .chat-box{
-	width: 88rpx;
-	height: 88rpx;
+	width: 100rpx;
+	height: 100rpx;
 	background-color: #fff;
-	border-radius: 100%;
+	border-radius: 100rpx;
 	position: relative;
+	padding: 8rpx;
+	box-sizing: border-box;
+	transition:all 2s ease;
+}
+.chat-fixed-long{
+}
+.chat-fixed-long .chat-box{
+	width: 690rpx;
+}
+.chat-fixed-long .chat-lyl{
+	position: relative;
+    transform: translateX(0);
+    left: unset;
+    right: unset;
+    top: unset;
+    bottom: unset;
+	width: 123rpx;
+	height: 56rpx;
+	line-height: 56rpx;
+	font-size: 28rpx;
+	border-radius: 28rpx;
+	margin-right: 20rpx;
 }
 .chat-box image{
 	width: 86rpx;

pages/index/index.vue

@@ -286,12 +286,20 @@
 			</view>
 		</view>
 		<msgNumber></msgNumber>
-
 		<view class="chat-fixed" v-if="recommendCard">
 			<view class="chat-box ddflex" @click="jumpSingleChatRoom()">
 				<image :src="recommendCard.avatar?recommendCard.avatar:'../../static/pages/images/userimg.png'"></image>
 				<view class="chat-lyl">聊一聊</view>
 			</view>
+		</view> -->
+		<view :class="'chat-fixed '+(chatShow?'chat-fixed-long':'')" v-if="recommendCard">
+			<view class="chat-box ddflex">
+				<image :src="recommendCard.avatar?recommendCard.avatar:'../../static/pages/images/userimg.png'"></image>
+				<view v-if="chatShowText" class="fflex tover"
+					style="font-size: 24rpx;color: #333333;margin-left: 20rpx;">您好，我是{{recommendCard.realName}}，欢迎访问我的微页
+				</view>
+				<view class="chat-lyl">聊一聊</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -393,11 +401,14 @@
 				fxIndex: 0,
 				fxContentList: [],
 
-				recommendCard: '', //销售
+				recommendCard: {}, //销售
 
 				isShowCodePop: false,
 
-				lpalCode: req.public.lpalCode
+				lpalCode: req.public.lpalCode,
+
+				chatShow: true,
+				chatShowText: true
 			};
 		},
 
@@ -448,7 +459,7 @@
 				};
 				QQMapWX.reverseGeocoder(to, resp => {});
 			});
-			
+
 		},
 
 		async onShow() {