From 95a2aea6989b361cdc321bf060d730b550b09974 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Thu, 17 Feb 2022 17:08:25 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E4=BA=BA=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                        |   2 +-
 pages/im/friends/search.vue       |   6 +-
 pages/im/group/announceCreate.vue |  24 +++-
 pages/im/group/announcement.vue   |  31 ++++-
 pages/im/group/invite.vue         | 190 ++++++++++++++++++++++++++++--
 static/imgs/no-level-list.png     | Bin 0 -> 19555 bytes
 6 files changed, 231 insertions(+), 22 deletions(-)
 create mode 100644 static/imgs/no-level-list.png

diff --git a/pages.json b/pages.json
index a7aaca0..6893471 100644
--- a/pages.json
+++ b/pages.json
@@ -488,7 +488,7 @@
             "path": "pages/im/group/invite",
             "name": "imGroupInvite",
             "style": {
-                "navigationBarTitleText": "邀请好友"
+                "navigationBarTitleText": "选择联系人"
             }
         },
         {
diff --git a/pages/im/friends/search.vue b/pages/im/friends/search.vue
index 21ed374..1c08750 100644
--- a/pages/im/friends/search.vue
+++ b/pages/im/friends/search.vue
@@ -11,16 +11,14 @@
         <!-- 搜索 、   -->
         <u-sticky>
             <view class="header-search">
-                <u-search placeholder="输入用户账号、手机号" height="74" searchIcon="search" @custom="search"
-                    v-model="searchValue" @search="search" bgColor="#f9f9f9" :focus="focused" />
+                <u-search placeholder="输入用户账号、手机号" height="74" searchIcon="search" @custom="search" v-model="searchValue" @search="search" bgColor="#f9f9f9" :focus="focused" />
             </view>
         </u-sticky>
         <block v-if="searchResult.length > 0">
             <applyFriend :lists="searchResult" :isApply="true" @action="action" />
         </block>
         <view class="no-lists" v-else>
-            <u-image class="cover" radius="4" width="400rpx" height="400rpx"
-                :src="require('@/static/imgs/no-search.png')" :lazy-load="true" />
+            <u-image class="cover" radius="4" width="400rpx" height="400rpx" :src="require('@/static/imgs/no-search.png')" :lazy-load="true" />
             <span>暂无匹配内容~</span>
         </view>
     </view>
diff --git a/pages/im/group/announceCreate.vue b/pages/im/group/announceCreate.vue
index bf3a6c9..f2f51a7 100644
--- a/pages/im/group/announceCreate.vue
+++ b/pages/im/group/announceCreate.vue
@@ -1,8 +1,8 @@
 <template>
     <view class="create">
-        <u--textarea v-model="content" count height="200" maxlength="200" placeholder="请输入公告内容"></u--textarea>
-
-        <u-button type="primary" text="发布" :disabled="disabled" @click="onCreate" color="#34CE98"></u-button>
+        <view class="create-title">公告内容</view>
+        <u--textarea v-model="content" count height="240" maxlength="240" placeholder="请输入公告内容" />
+        <u-button type="primary" text="发布" :disabled="disabled" @click="onCreate" color="#34CE98" />
     </view>
 </template>
 
@@ -52,7 +52,23 @@
 <style lang="scss" scoped>
     .create {
         padding: $padding;
-
+        .create-title{
+            font-size: $title-size + 4;
+            padding: $padding - 10 0 $padding - 10 $padding - 10 ;
+            color: $text-color;
+            font-weight: 800;
+            position: relative;
+            
+            &::before{
+                content:"";
+                position: absolute;
+                width: 10rpx;
+                height: 34rpx;
+                background-color: $main-color;
+                left: 0;
+                top: 26rpx;
+            }
+        }
         .u-button {
             margin-top: $padding;
         }
diff --git a/pages/im/group/announcement.vue b/pages/im/group/announcement.vue
index 5edd2d7..826dbef 100644
--- a/pages/im/group/announcement.vue
+++ b/pages/im/group/announcement.vue
@@ -1,9 +1,9 @@
 <template>
     <view class="announce">
-        <u-skeleton rows="2" :loading="loading" avatar :rows="5">
-            <view v-for="(item,index) in announcements" :key="index" class="item">
+        <u-skeleton rows="2" :loading="loading" avatar :rows="5" v-if="announcements.length>0">
+            <view v-for="(item,index) in announcements" :key="index" class="item" >
                 <view class="header">
-                    <u-avatar :src="item.user.portraitUrl"></u-avatar>
+                    <u-avatar :src="item.user.portraitUrl" />
                     <view class="user">
                         <view class="name">{{ item.user.name }}</view>
                         <view class="time">{{ item.created_at }}</view>
@@ -13,6 +13,10 @@
                 <view class="content">{{ item.content }}</view>
             </view>
         </u-skeleton>
+        <view class="no-lists" v-else>
+            <u-image class="cover" radius="4" width="400rpx" height="400rpx" :src="require('@/static/imgs/no-level-list.png')" :lazy-load="true" />
+            <span>暂无公告内容~</span>
+        </view>
     </view>
 </template>
 
@@ -85,7 +89,20 @@
 <style lang="scss" scoped>
     .announce {
         padding: 0 $padding $padding $padding;
-
+        .no-lists {
+            padding-top: $padding * 5;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            box-sizing: border-box;
+            font-size: $title-size-m;
+            color: $text-gray-m;
+        
+            span {
+                padding-top: $padding;
+            }
+        }
         .item {
             border-bottom: solid 1rpx #f9f9f9 !important;
             padding-top: $padding;
@@ -117,8 +134,10 @@
             }
 
             .content {
-                padding: $padding;
-                font-size: 34rpx;
+                padding: 20rpx $padding;
+                font-size: $title-size;
+                color: $text-gray;
+                max-width: 100%;
             }
         }
     }
diff --git a/pages/im/group/invite.vue b/pages/im/group/invite.vue
index fa5fb59..0b7331f 100644
--- a/pages/im/group/invite.vue
+++ b/pages/im/group/invite.vue
@@ -1,21 +1,197 @@
 <template>
-    <view class="">
-
+    <view>
+        <u-index-list :index-list="indexs" inactiveColor="#666" activeColor="#34CE98">
+            <view class="search">
+                <u--input class="search-input" placeholder="搜索" border="none" prefixIcon="search" v-model="searchTxt" :disabled="friends.length>0" disabledColor="#Fff"
+                    prefixIconStyle="font-size: 22px;color: #909399" />
+            </view>
+            <block v-if="friends.length > 0">
+                <u-index-item v-for="(item, fkey) in friends" :key="fkey">
+                    <u-index-anchor :text="indexs[fkey]" bgColor="#ededed" height="20" size="12" color="#666"
+                        style="padding:10rpx 30rpx" />
+                    <view v-for="(friendItem, index) in item" :key="index" class="friend-flex"
+                        @click="toFriend(friendItem.targetId)">
+                        <u-avatar class="avatar-img" size="40" shape="square"
+                            :src="contact(friendItem.targetId).portraitUrl" />
+                        <view class="info">
+                            <view class="name">{{ contact(friendItem.targetId).name }}</view>
+                        </view>
+                    </view>
+                </u-index-item>
+            </block>
+            <view class="no-lists" v-else>
+                <u-image class="cover" radius="4" width="400rpx" height="400rpx"
+                    :src="searchTxt=== '' ? require('@/static/imgs/no-friend.png') :require('@/static/imgs/no-search.png')"
+                    :lazy-load="true" />
+                <span>{{searchTxt=== ''?'暂无好友列表~':'暂无搜索内容~'}}</span>
+            </view>
+        </u-index-list>
     </view>
 </template>
 
 <script>
+    import {
+        getFriendsLetter
+    } from '@/apis/interfaces/im';
+    import * as RongIMLib from '@/uni_modules/RongCloud-IMWrapper/js_sdk/index'
+
     export default {
         data() {
             return {
-                targetId: ''
+                indexs: [],
+                friends: [],
+                pendingCount: 0,
+                searchTxt: ''
+            };
+        },
+        computed: {
+            contact() {
+                return function(targetId) {
+                    return this.$store.getters.contactInfo(targetId)
+                }
             }
         },
-        onLoad(e) {
-            this.targetId = e.targetId
+        onLoad() {
+            this.getFriendList()
+            this.checkNewFriendPending()
+            uni.$on('onContactNotification', this.checkNewFriendPending)
+        },
+        methods: {
+            getFriendList() {
+                getFriendsLetter().then(res => {
+                    this.indexs = res.indexList
+                    this.friends = res.itemArr
+                })
+            },
+            checkNewFriendPending() {
+                // 获取是否有新的好友申请
+                RongIMLib.getConversationList([RongIMLib.ConversationType.SYSTEM], 1000, 0, (res) => {
+                    if (res.code === 0) {
+                        this.pendingCount = res.conversations.filter((item) => {
+                            return item.objectName == RongIMLib.ObjectName.ContactNotification
+                        }).length
+                    }
+                })
+            },
+            toGroup() {
+                uni.navigateTo({
+                    url: '/pages/im/group/index',
+                    fail(err) {
+                        console.log(err);
+                    }
+                })
+            },
+            toFriend(targetId) {
+                // uni.navigateTo({
+                //     url: '/pages/im/friends/info?targetId=' + targetId
+                // })
+                console.log('奥克兰打开')
+            },
+            // 新朋友
+            toPending() {
+                if (this.pendingCount > 0) {
+                    uni.navigateTo({
+                        url: '/pages/im/friends/pending'
+                    });
+                } else {
+                    uni.showToast({
+                        title: ` 暂无好友申请 ~ `,
+                        icon: "none",
+                        mask: true,
+                        duration: 3000
+                    })
+                }
+            }
+        },
+        onNavigationBarButtonTap(e) {
+            uni.navigateTo({
+                url: '/pages/im/friends/search'
+            });
         }
-    }
+    };
 </script>
 
-<style>
+<style lang="scss" scoped>
+    // 页面空
+    .pages-null {
+        height: 70vh;
+    }
+
+    // 好友列表
+    .friend-flex {
+        position: relative;
+        padding: 0 $padding 0 $padding;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        box-sizing: border-box;
+
+        .avatar-img {
+            box-shadow: 0 0 20rpx rgba($color: $main-color, $alpha: 0.2);
+        }
+
+        .info {
+            flex: 1;
+            margin-left: $padding;
+            border-bottom: solid 1rpx #f9f9f9;
+            height: 120rpx;
+            line-height: 120rpx;
+
+            .name {
+                font-size: $title-size;
+                color: #454545 !important;
+                @extend .nowrap;
+            }
+
+            .address {
+                color: $text-gray-m;
+                font-size: $title-size-m - 3;
+                padding-top: 10rpx;
+                word-break: break-word;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                width: 600rpx;
+            }
+        }
+    }
+
+    .list-cell {
+        display: flex;
+        box-sizing: border-box;
+        width: 100%;
+        padding: 10px 24rpx;
+        overflow: hidden;
+        color: #323233;
+        font-size: 14px;
+        line-height: 24px;
+        background-color: #fff;
+    }
+
+    .search {
+        background-color: #fff;
+        padding: 30rpx;
+
+        .search-input {
+            padding: 10rpx $padding;
+            width: 100%;
+        }
+
+        .searchTxt {}
+    }
+
+    .no-lists {
+        padding-top: $padding * 3;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        box-sizing: border-box;
+        font-size: $title-size-m;
+        color: $text-gray-m;
+
+        span {
+            padding-top: $padding;
+        }
+    }
 </style>
diff --git a/static/imgs/no-level-list.png b/static/imgs/no-level-list.png
new file mode 100644
index 0000000000000000000000000000000000000000..28bba9211c2dc2db11c212afea3d234047591c0a
GIT binary patch
literal 19555
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
R4*psLW@G69uQNv{{|&TRfE54$

literal 0
HcmV?d00001


From d6974e9a8b0ef164dd8105cb9be5fc8a7f4e6208 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Fri, 18 Feb 2022 10:51:01 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                  |  7 +++
 pages/im/group/apply.vue    | 29 ++++--------
 pages/im/group/info.vue     |  8 ++++
 pages/im/group/invite.vue   | 94 +++++++++++++++----------------------
 pages/im/group/reviewed.vue | 47 +++++++++++++++++++
 5 files changed, 109 insertions(+), 76 deletions(-)
 create mode 100644 pages/im/group/reviewed.vue

diff --git a/pages.json b/pages.json
index 6893471..98a5c10 100644
--- a/pages.json
+++ b/pages.json
@@ -491,6 +491,13 @@
                 "navigationBarTitleText": "选择联系人"
             }
         },
+        {
+            "path": "pages/im/group/reviewed",
+            "name": "imGroupInvite",
+            "style": {
+                "navigationBarTitleText": "群聊邀请确认"
+            }
+        },
         {
             "path": "pages/im/group/users",
             "name": "imGroupUsers",
diff --git a/pages/im/group/apply.vue b/pages/im/group/apply.vue
index 247545a..f1a1f8c 100644
--- a/pages/im/group/apply.vue
+++ b/pages/im/group/apply.vue
@@ -1,24 +1,16 @@
 <template>
     <view class="apply" v-if="loaded">
         <u-avatar :src="group.cover || require('@/static/user/cover.png')" size="128" shape="square" />
-        <view class="name">
-            {{ group.name }}
-        </view>
-
-        <u-button class="apply-btn" v-if="group.can_join" @click="applyGroup" text="申请加群" :disabled="disabled"
-            color="#34CE98" />
+        <view class="name"> {{ group.name }} </view>
+        <u-button class="apply-btn" v-if="group.can_join" @click="modalShow = true" text="申请加群" :disabled="disabled" color="#34CE98" />
         <view class="" v-else>
             <view class="" v-if="group.is_full">群已满员</view>
             <view class="" v-if="group.deny_apply">禁止申请</view>
-            <u-button class="apply-btn2" v-if="group.state === 'accepted'" color="#34CE98" text="进入群聊"
-                @click="toGroupChat" />
+            <u-button class="apply-btn2" v-if="group.state === 'accepted'" color="#34CE98" text="进入群聊" @click="toGroupChat" />
         </view>
 
-        <u-modal negativeTop="300" :show="modalShow" title="申请原因" showCancelButton @cancel="onHideModal"
-            @confirm="onJoinGroup">
-            <view class="slot-content">
-                <u--input placeholder="申请原因" border="surround" focus v-model="message" />
-            </view>
+        <u-modal negativeTop="300" :show="modalShow" title="申请原因" showCancelButton @cancel="onHideModal" @confirm="onJoinGroup">
+            <view class="slot-content"> <u--input placeholder="申请原因" border="surround" focus v-model="message" /> </view>
         </u-modal>
     </view>
 </template>
@@ -45,6 +37,7 @@
             this.targetId = e.targetId
             // this.targetId = "TG2"
             joinGroupPre(this.targetId).then(res => {
+                console.log(res, 'res.返回群的基本信息')
                 this.group = res
                 this.loaded = true
             }).catch(err => {
@@ -62,9 +55,6 @@
                     url: '/pages/im/group/chat?targetId=' + this.targetId
                 })
             },
-            applyGroup() {
-                this.modalShow = true
-            },
             onHideModal() {
                 this.message = ''
                 this.modalShow = false
@@ -75,8 +65,8 @@
                     uni.showToast({
                         icon: 'none',
                         title: '申请成功',
-                        duration:2000,
-                        mast:true
+                        duration: 2000,
+                        mast: true
                     })
                     setTimeout(() => {
                         this.$Router.back()
@@ -118,7 +108,8 @@
             width: 80%;
             font-size: $title-size;
         }
-        .apply-btn2{   
+
+        .apply-btn2 {
             padding: 0 100rpx;
         }
     }
diff --git a/pages/im/group/info.vue b/pages/im/group/info.vue
index fc10f13..6265cb0 100644
--- a/pages/im/group/info.vue
+++ b/pages/im/group/info.vue
@@ -7,6 +7,7 @@
         <u-cell-group class="cells" :border="false" >
             <u-cell :border="false" class="u-border-bottom" isLink title="群公告" :label="announcement" @click="toAnnouncement" />
             <u-cell :border="false" class="u-border-bottom" isLink title="二维码" @click="showGroupQrCode" />
+            <u-cell :border="false" class="u-border-bottom" v-if="group.can_makesure" isLink title="群聊邀请确认" @click="showGroupsSure" />
             <u-cell :border="false" class="u-border-bottom" title="聊天置顶">
                 <u-switch slot="value" size="20" v-model="isTop" activeColor="#34CE98" @change="setTop" />
             </u-cell>
@@ -105,6 +106,7 @@
         methods: {
             initData() {
                 getGroupInfo(this.targetId).then(res => {
+                    console.log(res,'群信息。。。。。')
                     this.group = res.group
                     this.groupName = res.group.name
                     this.announcement = res.announcement
@@ -150,6 +152,12 @@
             showGroupQrCode() {
                 this.qrCodeShow = true
             },
+            // 群聊邀请待确认
+            showGroupsSure(){
+                uni.navigateTo({
+                    url:"/pages/im/group/reviewed"
+                })
+            },
             onGroupName() {
                 this.modalShow = true
             },
diff --git a/pages/im/group/invite.vue b/pages/im/group/invite.vue
index 0b7331f..852418a 100644
--- a/pages/im/group/invite.vue
+++ b/pages/im/group/invite.vue
@@ -2,22 +2,24 @@
     <view>
         <u-index-list :index-list="indexs" inactiveColor="#666" activeColor="#34CE98">
             <view class="search">
-                <u--input class="search-input" placeholder="搜索" border="none" prefixIcon="search" v-model="searchTxt" :disabled="friends.length>0" disabledColor="#Fff"
-                    prefixIconStyle="font-size: 22px;color: #909399" />
+                <u--input class="search-input" placeholder="搜索" border="none" prefixIcon="search" v-model="searchTxt"
+                    disabledColor="#Fff" prefixIconStyle="font-size: 22px;color: #909399" />
             </view>
             <block v-if="friends.length > 0">
-                <u-index-item v-for="(item, fkey) in friends" :key="fkey">
-                    <u-index-anchor :text="indexs[fkey]" bgColor="#ededed" height="20" size="12" color="#666"
-                        style="padding:10rpx 30rpx" />
-                    <view v-for="(friendItem, index) in item" :key="index" class="friend-flex"
-                        @click="toFriend(friendItem.targetId)">
-                        <u-avatar class="avatar-img" size="40" shape="square"
-                            :src="contact(friendItem.targetId).portraitUrl" />
-                        <view class="info">
-                            <view class="name">{{ contact(friendItem.targetId).name }}</view>
+                <u-checkbox-group v-model="checkboxValue" placement="column" @change="checkboxChange">
+                    <u-index-item v-for="(item, fkey) in friends" :key="fkey">
+                        <u-index-anchor :text="indexs[fkey]" bgColor="#ededed" height="20" size="12" color="#666"
+                            style="padding:10rpx 30rpx" />
+                        <view v-for="(friendItem, index) in item" :key="index" class="friend-flex"
+                            @click="selectFriend(friendItem.targetId)">
+                            <u-checkbox :customStyle="{marginBottom: '8px'}" :name="friendItem.targetId" />
+                            <u-avatar class="avatar-img" size="40" shape="square" :src="contact(friendItem.targetId).portraitUrl" />
+                            <view class="info">
+                                <view class="name">{{ contact(friendItem.targetId).name }}</view>
+                            </view>
                         </view>
-                    </view>
-                </u-index-item>
+                    </u-index-item>
+                </u-checkbox-group>
             </block>
             <view class="no-lists" v-else>
                 <u-image class="cover" radius="4" width="400rpx" height="400rpx"
@@ -41,7 +43,8 @@
                 indexs: [],
                 friends: [],
                 pendingCount: 0,
-                searchTxt: ''
+                searchTxt: '',
+                checkboxValue: [],
             };
         },
         computed: {
@@ -57,56 +60,33 @@
             uni.$on('onContactNotification', this.checkNewFriendPending)
         },
         methods: {
+            // group事件
+            checkboxChange(n) {
+                console.log('change', n);
+            },
             getFriendList() {
                 getFriendsLetter().then(res => {
+                    console.log(res)
                     this.indexs = res.indexList
                     this.friends = res.itemArr
                 })
             },
-            checkNewFriendPending() {
-                // 获取是否有新的好友申请
-                RongIMLib.getConversationList([RongIMLib.ConversationType.SYSTEM], 1000, 0, (res) => {
-                    if (res.code === 0) {
-                        this.pendingCount = res.conversations.filter((item) => {
-                            return item.objectName == RongIMLib.ObjectName.ContactNotification
-                        }).length
-                    }
-                })
-            },
-            toGroup() {
-                uni.navigateTo({
-                    url: '/pages/im/group/index',
-                    fail(err) {
-                        console.log(err);
-                    }
-                })
-            },
-            toFriend(targetId) {
-                // uni.navigateTo({
-                //     url: '/pages/im/friends/info?targetId=' + targetId
-                // })
-                console.log('奥克兰打开')
-            },
-            // 新朋友
-            toPending() {
-                if (this.pendingCount > 0) {
-                    uni.navigateTo({
-                        url: '/pages/im/friends/pending'
-                    });
-                } else {
-                    uni.showToast({
-                        title: ` 暂无好友申请 ~ `,
-                        icon: "none",
-                        mask: true,
-                        duration: 3000
-                    })
+            
+            selectFriend(targetId) {
+                console.log(targetId,typeof targetId)
+                let arr = this.checkboxValue
+                let index = arr.findIndex(item => item === targetId)
+                if(index>0){
+                    console.log('选择了再次点击清除数据le')
+                    
+                }else{
+                    console.log('没有选择过，添加数据')
+                    
                 }
-            }
-        },
-        onNavigationBarButtonTap(e) {
-            uni.navigateTo({
-                url: '/pages/im/friends/search'
-            });
+                
+                console.log(this.checkboxValue,index)
+                console.log('奥克兰打开',targetId)
+            },
         }
     };
 </script>
diff --git a/pages/im/group/reviewed.vue b/pages/im/group/reviewed.vue
new file mode 100644
index 0000000..cd9e087
--- /dev/null
+++ b/pages/im/group/reviewed.vue
@@ -0,0 +1,47 @@
+<!-- 群聊邀请确认列表页面 -->
+<template>
+    <view class="reviewed">
+       <view class="reviewed-item">
+           <u-icon name="plus-people-fill"  color="#fff" class="add-icon" />
+           {{`' 艾米的猫儿洛基 '想邀请 1位朋友加入群聊`}}
+           <view class="sure"> 去确认 </view>
+       </view>
+    </view>
+</template>
+
+<script>
+   
+    export default {
+        data() {
+            return {
+                indexs: [],
+            };
+        },
+
+        onLoad() {
+         
+        },
+        methods: {
+          
+        }
+    };
+</script>
+
+<style lang="scss" scoped>
+    .reviewed{
+        .reviewed-item{
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+            box-sizing: border-box;
+            
+            .add-icon{
+                background-color: $main-color;
+                padding: 10rpx;
+                border-radius: 6rpx;
+            }
+        }
+        
+    }
+</style>

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 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=88=97=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;
             }
         }