From 740427da76666343deaad67941a0674972e8d4a2 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 18 Aug 2021 16:33:47 +0800
Subject: [PATCH] 初版集成

---
 pages/groupChat/groupChat.vue |  117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 109 insertions(+), 8 deletions(-)

diff --git a/pages/groupChat/groupChat.vue b/pages/groupChat/groupChat.vue
index f9bde8d..3d9bb17 100644
--- a/pages/groupChat/groupChat.vue
+++ b/pages/groupChat/groupChat.vue
@@ -30,6 +30,19 @@
 					<div>
 						<div class="m-main">
 							<!-- <view class="inTitle">{{Task}}</view> -->
+							<view class="applys" @click="toFriendRequest">
+								<view class="head-wrap">
+									<image src="../../static/apply.png" class="head" />
+									<view v-if=false class="tip">233</view>
+								</view>
+								<view class="content-wrap">
+									<text class="name">好友申请</text>
+									<text class="mess">若人生只如初见</text>
+								</view>
+								<view class="data-wrap">
+									<text class="data"></text>
+								</view>
+							</view>
 							<view class="inTmain">
 								<contacts v-for="(item,index) in dataListTXL" :key="index" :Pdata="item" :fromW="indexs"
 									@refreshTask="refreshTask"></contacts>
@@ -158,10 +171,10 @@
 					});
 				} else if (this.current == 1) {
 					uni.request({
-						url: this.$store.state.piAPI + "/blade-user/page?current=1&size=9999",
+						url: this.$store.state.piAPI + "/friend/page?current=1&size=9999",
 						method: "get",
 						data: {
-							senderId: WxStorage.get("ids")
+							applicant: WxStorage.get("ids")
 						},
 						success: (res) => {
 							var resdata = res.data.data.records;
@@ -172,7 +185,7 @@
 								}
 							}
 							that.dataListTXL = resdata;
-							that.swiperHeight = resdata.length * 85;
+							// that.swiperHeight = resdata.length * 95;
 						}
 					})
 				} else if (this.current == 2) {
@@ -193,13 +206,17 @@
 							that.dataListQZ = resdata;
 							that.swiperHeight = resdata.length * 85;
 						}
-					})
+					});
 				}
 			},
 			refreshTask() {
 				this.getdataList(1);
 			},
-
+			toFriendRequest(){
+				uni.navigateTo({
+					url: '/pages/groupChat/friendrequest?'
+				});
+			}
 		},
 		mounted() {
 			this.beginObj();
@@ -222,14 +239,14 @@
 		onLoad: function(options) {
 			this.userName = options.login;
 			// if(options.txlType == 2){
-			this.current = 2;
+			// this.current = 0;
 			// }
 
 		}
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	.work {
 		width: 100%;
 		height: 100%;
@@ -271,7 +288,7 @@
 		}
 
 		.main {
-			margin-top: 0.625rem;
+			margin-top: 0.225rem;
 
 			.m-title {
 				width: 100%;
@@ -313,6 +330,7 @@
 			}
 
 			.m-main {
+				padding-left: 32upx;
 				box-sizing: border-box;
 			}
 		}
@@ -323,4 +341,87 @@
 		height: auto;
 		margin-right: 27rpx;
 	}
+
+	.top-bar {
+		background-color: rgba(255, 255, 255, .96);
+		// background-color: #42B983;
+		box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, .1);
+	}
+
+	.applys {
+		display: flex;
+		// margin: 40rpx 0;
+		padding: 40rpx 0;
+		height: 130rpx;
+		padding: 16upx 0;
+		align-items: center;
+		border-bottom: 1px solid rgba(0, 0, 0, .1);
+
+		&:active {
+			background-color: rgba(243, 244, 246, 1);
+		}
+
+		.head-wrap {
+			position: relative;
+
+
+			image {
+				width: 96rpx;
+				height: 96rpx;
+				border-radius: 20upx;
+				background-color: rgba(255, 228, 49, 1);
+			}
+
+			.tip {
+				position: absolute;
+				top: -6rpx;
+				left: 68rpx;
+				height: 36rpx;
+				min-width: 20rpx;
+				min-height: 20rpx;
+				background-color: rgba(255, 93, 91, 1);
+				border-radius: 18rpx;
+				padding: 0 6rpx;
+				font-size: 24upx;
+				color: rgba(255, 228, 49, 1);
+				line-height: 36rpx;
+				text-align: center;
+			}
+		}
+
+		.content-wrap {
+			margin-left: 32rpx;
+			flex: 1;
+
+			.name {
+				display: block;
+				color: rgba(39, 40, 50, 1);
+				font-size: 36rpx;
+				font-weight: 400;
+				line-height: 50rpx;
+			}
+
+			.mess {
+				display: block;
+				color: rgba(39, 40, 50, .6);
+				font-size: 28upx;
+				line-height: 40rpx;
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 1;
+				overflow: hidden;
+			}
+		}
+
+		.data-wrap {
+
+			justify-content: right;
+
+			.data {
+				font-size: 24upx;
+				color: rgba(39, 40, 50, 0.4);
+				line-height: 50rpx;
+			}
+		}
+	}
 </style>

--
Gitblit v1.9.3