邀请模块优化

pages/im/group/announcement.vue

@@ -182,8 +182,9 @@
 
         .item {
             background-color: #fff;
-            padding: $padding $padding + 10;
-            border-bottom: $padding solid #f9f9f9;
+            padding: $padding $padding + 10 10rpx $padding + 10;
+            border-bottom: $padding solid #f9f9f9;
+            
 
             .user {
                 display: flex;
@@ -192,7 +193,8 @@
                 align-items: center;
                 box-sizing: border-box;
                 font-size: $title-size-m;
-                color: $text-gray-m;
+                color: $text-gray-m;
+                padding: 10rpx;
 
                 .name {
                     padding-left: 10rpx;
@@ -207,12 +209,14 @@
                 font-size: $title-size;
                 color: $text-color;
                 max-width: 100%;
-                margin-bottom: $padding;
+                margin-bottom: 10rpx;
                 display: -webkit-box;
                 -webkit-box-orient: vertical;
                 -webkit-line-clamp: 3;
                 overflow: hidden;
-                line-height: 1.5;
+                line-height: 1.5;
+                border-bottom: solid 1rpx  #F9F9F9;
+                padding-bottom: 20rpx;
 
                 span {
                     color: #fff;

pages/im/group/index.vue

@@ -98,7 +98,7 @@
             font-size: $title-size;
             color: $text-gray;
             background-color: #fff;
-            padding: 10rpx $padding $padding $padding;
+            padding: 10rpx $padding 20rpx $padding;
             font-weight: normal;
         }
     }

pages/im/group/info.vue

@@ -5,9 +5,8 @@
         </view>
 
         <u-cell-group class="cells" :border="false">
-            <u-cell :border="false" class="u-border-bottom" isLink title="群公告" 
-                @click="toAnnouncement" >
-                <view slot="label" class="announcement-label "> {{announcement}} </view>
+            <u-cell :border="false" class="u-border-bottom" isLink title="群公告" @click="toAnnouncement">
+                <view slot="label" class="announcement-label "> {{announcement}} </view>
             </u-cell>
             <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="群聊邀请确认"
@@ -107,8 +106,8 @@
             })
             this.initData()
             uni.$on('groupAnnouncementCreated', this.initData)
-            uni.$on('groupInvitedUser', this.updateUserList)
-            uni.$on('updateAnnouncement',this.initData)
+            uni.$on('groupInvitedUser', this.updateUserList)
+            uni.$on('updateAnnouncement', this.initData)
         },
         onUnload() {
             uni.$off('groupAnnouncementCreated')
@@ -258,8 +257,11 @@
                         }
                         return item
                     })
-                    this.initData()
                     this.joinType = e.name
+                    this.$nextTick(() => {
+                        this.$refs.userList.initGroupInfo()
+                        this.initData()
+                    })
                     this.showActions = false
                 }).catch(err => {
                     console.log(err);
@@ -340,19 +342,20 @@
 
     .cells {
         margin-top: $padding;
-        background-color: white;
-        .announcement-label{
-            font-size: $title-size-m + 2;
-            padding-top: 10rpx;
-            color: $text-gray-m;
-            overflow: hidden;
-            width: 620rpx;
-            display: inline-block;
-            overflow:hidden; 
-            text-overflow:ellipsis;
-            display:-webkit-box; 
-            -webkit-box-orient:vertical;
-            -webkit-line-clamp:3; 
+        background-color: white;
+
+        .announcement-label {
+            font-size: $title-size-m + 2;
+            padding-top: 10rpx;
+            color: $text-gray-m;
+            overflow: hidden;
+            width: 620rpx;
+            display: inline-block;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 3;
         }
     }
 

pages/im/group/invite.vue

@@ -101,7 +101,8 @@
                     this.orignalIndexs = res.indexList
                 })
                 getGroupUsers(this.targetId).then(res => {
-                    res.map(res => {
+                    res.map(res => {
+                        console.log(res)
                         this.checkboxValue.push(String(res.targetId))
                         this.selectValue.push(String(res.targetId))
                     })
@@ -121,7 +122,16 @@
                 }
 
             },
-            onInvite() {
+            onInvite() {
+                console.log(this.checkboxValue,'userIds.....')
+                console.log(this.selectValue,'userIds.....')
+                // let userIds = []
+                // this.checkboxValue.filter(item=>{
+                //     if(!utils.inArray(item, this.selectValue)){
+                //         userIds.push(item)
+                //     } 
+                // })
+                // console.log(userIds)
                 inviteGroupUser(this.targetId, this.checkboxValue).then(res => {
                     uni.navigateBack({
                         delta: 1,

pages/im/group/reviewed.vue

@@ -138,8 +138,6 @@
         }
 
     }
-<<<<<<< HEAD
-
     .no-lists {
         padding-top: $padding * 5;
         display: flex;
@@ -154,6 +152,4 @@
             padding-top: $padding;
         }
     }
-=======
->>>>>>> d8b90f97d110aed79b35d385dbc0eeb481ef4eab
 </style>