1

 <template>
 <template>
   <div @click="handleGroupClick" class="scroll-container">
   <div @click="handleGroupClick" class="scroll-container">
     <div class="group-item">
     <div class="group-item">
-      <avatar :src="group.avatar"/>
-      <div class="group-name text-ellipsis">{{ title }}</div>
+      <avatar src=""/>
+      <div class="group-name text-ellipsis">{{ group.title }}</div>
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>
@@ -24,27 +24,22 @@ export default {
       ]
       ]
     }
     }
   },
   },
-  computed: {
-    title() {
-      return (this.group.activity_type === 1 ? '推广' : '征集') + ' - ' + this.group.song_name.replace('《', '').replace('》', '')
-    }
-  },
   methods: {
   methods: {
     handleGroupClick() {
     handleGroupClick() {
-      if (this.group.is_join === 1) {
-        const conversationID = `GROUP${this.group.esm_id}`
-        this.$store.dispatch('checkoutConversation', conversationID)
-      } else {
-        MessageBox.confirm('是否加入讨论组：' + this.title, '提示', {
+      if (this.group.is_join === 0) {
+        MessageBox.confirm('是否加入讨论组：' + this.group.title, '提示', {
           type: 'warning', showClose: false
           type: 'warning', showClose: false
         }).then(() => {
         }).then(() => {
-          Helper.joinGroup(this.group.id).then(() => {
+          Helper.joinGroup(this.group.group_id).then(() => {
             this.group.is_join = 1
             this.group.is_join = 1
             this.handleGroupClick()
             this.handleGroupClick()
           })
           })
         }).catch(() => {
         }).catch(() => {
 
 
         })
         })
+      } else {
+        const conversationID = `GROUP${this.group.group_id}`
+        this.$store.dispatch('checkoutConversation', conversationID)
       }
       }
     },
     },
     quitGroup() {
     quitGroup() {

 <template>
 <template>
-  <div class="list-container"
-       v-loading="hideSearchLoading"
-       element-loading-text="拼命搜索中"
-       element-loading-background="rgba(0, 0, 0, 0.8)">
+  <div class="list-container">
     <div class="header-bar">
     <div class="header-bar">
-      <el-input v-model="search" size="mini" placeholder="筛选群名" prefix-icon="el-icon-search"/>
+      <el-input v-model="search" @keyup.enter.native="handleSearch" @clear="handleSearch" :clearable="true" size="mini"
+                placeholder="筛选群名"
+                prefix-icon="el-icon-search"/>
 
 
       <!--      <el-autocomplete-->
       <!--      <el-autocomplete-->
       <!--          :value-key="'groupID'"-->
       <!--          :value-key="'groupID'"-->
@@ -24,9 +23,12 @@
       <!--      </button>-->
       <!--      </button>-->
     </div>
     </div>
     <div class="group-container" v-infinite-scroll="fetch" :infinite-scroll-immediate="true"
     <div class="group-container" v-infinite-scroll="fetch" :infinite-scroll-immediate="true"
+         v-loading="hideSearchLoading"
+         element-loading-text="拼命搜索中"
+         element-loading-background="rgba(0, 0, 0, 0.4)"
          :infinite-scroll-delay="100"
          :infinite-scroll-delay="100"
          style="height: calc(80vh - 60px)">
          style="height: calc(80vh - 60px)">
-      <group-item v-for="group in groupList" :key="group.esm_id" :group="group"/>
+      <group-item v-for="group in groupList" :key="group.group_id" :group="group"/>
       <!--      <el-dialog title="创建群组" :visible="createGroupModelVisible" @close="closeCreateGroupModel" width="30%">-->
       <!--      <el-dialog title="创建群组" :visible="createGroupModelVisible" @close="closeCreateGroupModel" width="30%">-->
       <!--        <create-group></create-group>-->
       <!--        <create-group></create-group>-->
       <!--      </el-dialog>-->
       <!--      </el-dialog>-->
@@ -56,9 +58,6 @@ export default {
     // CreateGroup,
     // CreateGroup,
     // ElAutocomplete: Autocomplete
     // ElAutocomplete: Autocomplete
   },
   },
-  mounted() {
-
-  },
   computed: {
   computed: {
     groupList: function () {
     groupList: function () {
       return this.$store.state.group.groupList
       return this.$store.state.group.groupList
@@ -75,9 +74,13 @@ export default {
   methods: {
   methods: {
     fetch() {
     fetch() {
       Helper.groupList({
       Helper.groupList({
-        activityNameLike: this.search, size: this.size, page: this.page
+        title: this.search, size: this.size, page: this.page
       }).then(res => {
       }).then(res => {
-        this.onGroupUpdated(this.groupList.concat(res.data))
+        if (this.page === 1) {
+          this.onGroupUpdated(res.data)
+        } else {
+          this.onGroupUpdated(this.groupList.concat(res.data))
+        }
         ++this.page
         ++this.page
       }).finally(() => {
       }).finally(() => {
         this.hideSearchLoading = false
         this.hideSearchLoading = false
@@ -112,6 +115,11 @@ export default {
     showCreateGroupModel() {
     showCreateGroupModel() {
       this.$store.commit('updateCreateGroupModelVisible', true)
       this.$store.commit('updateCreateGroupModelVisible', true)
     },
     },
+    handleSearch() {
+      this.page = 1
+      this.hideSearchLoading = true
+      this.fetch()
+    },
     applyJoinGroup(group) {
     applyJoinGroup(group) {
       this.tim
       this.tim
           .joinGroup({groupID: group.groupID})
           .joinGroup({groupID: group.groupID})
@@ -153,7 +161,8 @@ export default {
   },
   },
   watch: {
   watch: {
     'search'() {
     'search'() {
-      this.fetch()
+      // this.page = 1
+      // this.fetch()
     }
     }
   }
   }
 }
 }