From eefea16cdc5274f3d68501b641a6bea73702e9b4 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Fri, 18 Feb 2022 13:19:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=A1=E6=A0=B8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/interfaces/im.js       | 17 ++++++++++++++++-
 pages/im/group/apply.vue    |  2 --
 pages/im/group/info.vue     |  2 +-
 pages/im/group/reviewed.vue | 28 +++++++++++++++++-----------
 4 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/apis/interfaces/im.js b/apis/interfaces/im.js
index ba17956..e6945de 100644
--- a/apis/interfaces/im.js
+++ b/apis/interfaces/im.js
@@ -264,6 +264,20 @@ const transferGroupOwner = (groupId, userId) => {
     })
 }
 
+// //群成员待审核表 -- 废弃
+// const getGroupMakeSure = (groupId) => {
+//     return request({
+//         url:`im/groups/${groupId}/makesure`
+//     })
+// }
+// // 群成员审核通过
+// const getGroupMakeSureAllow = (groupId, userId) => {
+//     return request({
+//         method: 'POST',
+//         url: 'im/groups/' + groupId + '/owner/' + userId
+//     })
+// }
+
 export {
     getImToken,
     deleteFriend,
@@ -294,5 +308,6 @@ export {
     removeGroupUser,
     setGroupAdmin,
     removeGroupAdmin,
-    transferGroupOwner
+    // transferGroupOwner, // -废弃待审核列表
+    // getGroupMakeSure // -废弃待审核列表
 }
diff --git a/pages/im/group/apply.vue b/pages/im/group/apply.vue
index f1a1f8c..15ee523 100644
--- a/pages/im/group/apply.vue
+++ b/pages/im/group/apply.vue
@@ -33,9 +33,7 @@
             }
         },
         onLoad(e) {
-            console.log(e, 'e。。。。。。')
             this.targetId = e.targetId
-            // this.targetId = "TG2"
             joinGroupPre(this.targetId).then(res => {
                 console.log(res, 'res.返回群的基本信息')
                 this.group = res
diff --git a/pages/im/group/info.vue b/pages/im/group/info.vue
index 6265cb0..4c185f1 100644
--- a/pages/im/group/info.vue
+++ b/pages/im/group/info.vue
@@ -155,7 +155,7 @@
             // 群聊邀请待确认
             showGroupsSure(){
                 uni.navigateTo({
-                    url:"/pages/im/group/reviewed"
+                    url:"/pages/im/group/reviewed?id="+this.targetId
                 })
             },
             onGroupName() {
diff --git a/pages/im/group/reviewed.vue b/pages/im/group/reviewed.vue
index e1a76c7..76ba1ff 100644
--- a/pages/im/group/reviewed.vue
+++ b/pages/im/group/reviewed.vue
@@ -2,9 +2,9 @@
 <template>
     <view class="reviewed">
         <view class="reviewed-item">
-            <u-avatar class="avatar" src="require('@/static/user/cover.png')" shape="square" size="44" />
-            <view style="width: 500rpx;">
-                <view class="nickname"><span>艾米的猫儿</span>想邀请<span>艾米的猫儿洛基艾米</span>加入群聊</view>
+            <u-avatar class="avatar" src="require('@/static/user/cover.png')" shape="square" size="36" />
+            <view style="flex:1;">
+                <view class="nickname"><span>{{`艾米的猫儿 `}}</span>想邀请<span>{{` 艾米的猫儿洛基艾米`}}</span>加入群聊</view>
                 <view> 申请原因：{{`呵呵哒。。`}}</view>
             </view>
             <view class="sure" @click="sure(2)"> 去确认 </view>
@@ -13,17 +13,18 @@
 </template>
 
 <script>
+    import {
+        getGroupMakeSure,
+        getGroupMakeSureAllow
+    } from "@/apis/interfaces/im.js"
     export default {
         data() {
             return {
                 lists: [],
             };
         },
-
-        onLoad() {
-
-        },
         methods: {
+
             sure(id) {
                 console.log(id, '....')
                 uni.navigateTo({
@@ -53,18 +54,23 @@
                 border-radius: 6rpx;
                 margin-right: 20rpx;
             }
-            .nickname{
+
+            .nickname {
                 font-size: $title-size-m;
-                span{
-                    color: rgba($color: $main-color, $alpha: 0.5);
+
+                span {
+                    color: $text-color;
                 }
             }
+
             .sure {
-                color: $main-color;
+                background-color: $main-color;
+                color: #Fff;
                 text-align: center;
                 font-size: $title-size-m;
                 padding: 6rpx 20rpx;
                 border-radius: 10rpx;
+                margin-left: 10rpx;
             }
         }