chore: 调整搜索相关页面

src/components/ActivityList.vue

@@ -14,7 +14,11 @@
         :key="item.id"
       ></activity-item>
     </van-list>
-    <div class="empty" v-else>暂时没有内容哦，去别处看看吧～</div>
+    <template v-else>
+      <slot name="empty">
+        <div class="empty">暂时没有内容哦，去别处看看吧～</div>
+      </slot>
+    </template>
   </div>
 </template>
 

src/components/GroupItem.vue

@@ -86,6 +86,11 @@ export default {
   overflow: hidden;
   white-space: nowrap;
 }
+.group-item-content__hot {
+  background: url('~@/assets/img/icon_hot.png') no-repeat left center;
+  background-size: 8px auto;
+  padding-left: 10px;
+}
 .group-item-index {
   width: 25px;
   margin-right: 10px;

src/components/GroupList.vue

@@ -14,7 +14,11 @@
         :key="item.id"
       ></group-item>
     </van-list>
-    <div class="empty" v-else>暂时没有内容哦，去别处看看吧～</div>
+    <template v-else>
+      <slot name="empty">
+        <div class="empty">暂时没有内容哦，去别处看看吧～</div>
+      </slot>
+    </template>
   </div>
 </template>
 

src/components/MemberItem.vue

 <template>
   <div class="member-item">
     <div class="member-item-pic">
-      <img :src="data.avatar" v-if="data.avatar" />
+      <img :src="data.avatar | avatar" />
     </div>
     <slot name="member-before"></slot>
     <div class="member-item-content">
@@ -22,6 +22,7 @@ export default {
 <style lang="scss" scoped>
 .member-item {
   display: flex;
+  align-items: center;
   margin-bottom: 20px;
 }
 .member-item-pic {

src/components/MemberList.vue

@@ -12,7 +12,11 @@
         :key="item.id"
       ></member-item>
     </van-list>
-    <div class="empty" v-else>暂时没有内容哦，去别处看看吧～</div>
+    <template v-else>
+      <slot name="empty">
+        <div class="empty">暂时没有内容哦，去别处看看吧～</div>
+      </slot>
+    </template>
   </div>
 </template>
 

src/components/MyActivityList.vue

@@ -12,7 +12,11 @@
         :key="item.id"
       ></my-activity-item>
     </van-list>
-    <div class="empty" v-else>暂时没有内容哦，去别处看看吧～</div>
+    <template v-else>
+      <slot name="empty">
+        <div class="empty">暂时没有内容哦，去别处看看吧～</div>
+      </slot>
+    </template>
   </div>
 </template>
 

src/components/MyApproveList.vue

@@ -14,7 +14,11 @@
         @check="onCheck"
       ></my-activity-item>
     </van-list>
-    <div class="empty" v-else>暂时没有内容哦，去别处看看吧～</div>
+    <template v-else>
+      <slot name="empty">
+        <div class="empty">暂时没有内容哦，去别处看看吧～</div>
+      </slot>
+    </template>
     <!-- 审核 -->
     <van-action-sheet
       v-model="check.show"

src/components/MyGroupList.vue

@@ -12,7 +12,11 @@
         :key="item.id"
       ></my-group-item>
     </van-list>
-    <div class="empty" v-else>暂时没有内容哦，去别处看看吧～</div>
+    <template v-else>
+      <slot name="empty">
+        <div class="empty">暂时没有内容哦，去别处看看吧～</div>
+      </slot>
+    </template>
   </div>
 </template>
 

src/views/create/Index.vue

@@ -20,13 +20,13 @@
             >去逛逛</router-link
           >
         </p>
-        <p class="create-item__tip" v-else-if="groupCount < 6">
+        <p class="create-item__tip" v-else-if="groupCount < maxGroup">
           您已加入{{ groupCount }}个组织，可直接发布活动或<router-link
             :to="{ name: 'group' }"
             >看看其他组织</router-link
           >
         </p>
-        <p class="create-item__tip" v-if="groupCount >= 6">
+        <p class="create-item__tip" v-if="groupCount >= maxGroup">
           您已加入满{{ groupCount }}个组织咯，请直接创建活动或者管理<router-link
             :to="{ name: 'my' }"
             >我的组织～</router-link
@@ -69,7 +69,7 @@ export default {
       return this.groupList.length || 0
     },
     groupDisabled() {
-      return this.groupCount >= 6
+      return this.groupCount >= this.maxGroup
     },
     activityDisabled() {
       return !this.groupCount

src/views/group/Member.vue

@@ -18,7 +18,11 @@
             v-for="item in memberManagementList"
             :data="item"
             :key="item.id"
-          ></member-item>
+          >
+            <template #member-before
+              ><span class="member-creater">创建者</span></template
+            >
+          </member-item>
         </div>
       </div>
       <div class="member-card">
@@ -97,4 +101,18 @@ export default {
 ::v-deep .member-item {
   margin: 20px 0;
 }
+.member-creater {
+  margin-left: 10px;
+  padding: 0 5px;
+  height: 14px;
+  font-size: 10px;
+  line-height: 14px;
+  color: #fff;
+  background: linear-gradient(
+    180deg,
+    rgba(255, 201, 44, 1) 0%,
+    rgba(255, 116, 42, 1) 100%
+  );
+  border-radius: 3px;
+}
 </style>

src/views/my/Index.vue

@@ -11,7 +11,7 @@
       </ul>
     </div>
     <div class="user">
-      <div class="user-avatar"><img :src="user.avatar" /></div>
+      <div class="user-avatar"><img :src="user.avatar | avatar" /></div>
       <div class="user-content">
         <div class="user-content__name">{{ user.nickname }}</div>
         <div class="user-content__info">{{ user.mobile }}</div>
@@ -115,6 +115,11 @@ export default {
   background-color: #ccc;
   border-radius: 50%;
   overflow: hidden;
+  img {
+    width: 100%;
+    height: 100%;
+    object-fit: contain;
+  }
 }
 .user-content {
   display: flex;

src/views/search/Index.vue

 <template>
-  <div class="main search">
+  <div class="main">
     <search-bar
       placeholder=""
       :focus="true"
@@ -13,21 +13,48 @@
           :params="{ keywords: searchValue }"
           ref="list"
           v-if="tabActive === '0'"
-        ></group-list>
+        >
+          <template #empty>
+            <div class="search-empty">暂时没有内容哦，来做第一人吧～</div>
+            <div class="group-create">
+              <input
+                type="button"
+                class="button button-primary"
+                value="创建组织"
+                :disabled="groupDisabled"
+                @click="onCreateGroup"
+              />
+              <p class="tips" v-if="groupDisabled">
+                您已加入满{{ groupCount }}个组织咯，管理<router-link
+                  :to="{ name: 'my' }"
+                  >我的组织～</router-link
+                >
+              </p>
+            </div>
+          </template>
+        </group-list>
       </van-tab>
       <van-tab title="个人" name="1">
         <member-list
           :params="{ keywords: searchValue }"
           ref="list"
           v-if="tabActive === '1'"
-        ></member-list>
+        >
+          <template #empty>
+            <div class="search-empty">暂时没有内容哦，去别处看看吧～</div>
+          </template>
+        </member-list>
       </van-tab>
       <van-tab title="活动" name="2">
         <activity-list
           :params="{ keywords: searchValue }"
           ref="list"
           v-if="tabActive === '2'"
-        ></activity-list>
+        >
+          <template #empty>
+            <div class="search-empty">暂时没有内容哦，去别处看看吧～</div>
+          </template>
+        </activity-list>
       </van-tab>
     </van-tabs>
   </div>
@@ -39,14 +66,16 @@ import SearchBar from '@/components/SearchBar'
 import GroupList from '@/components/GroupList'
 import MemberList from '@/components/MemberList'
 import ActivityList from '@/components/ActivityList'
-
+import * as api from '@/api'
 export default {
   name: 'Search',
   components: { SearchBar, GroupList, MemberList, ActivityList },
   data() {
     return {
       tabActive: '0',
-      searchValue: ''
+      searchValue: '',
+      groupList: [],
+      maxGroup: 6
     }
   },
   watch: {
@@ -59,6 +88,14 @@ export default {
       }
     }
   },
+  computed: {
+    groupCount() {
+      return this.groupList.length || 0
+    },
+    groupDisabled() {
+      return this.groupCount >= this.maxGroup
+    }
+  },
   methods: {
     onTabClick(name) {
       this.$router.replace({ query: { tab: name, keywords: this.searchValue } })
@@ -67,15 +104,66 @@ export default {
       this.$router.replace({
         query: { tab: this.tabActive, keywords: this.searchValue }
       })
+    },
+    // 创建组织
+    onCreateGroup() {
+      !this.groupDisabled && this.$router.push({ name: 'createGroup' })
+    },
+    // 获取我加入的组织
+    getJoinedGroupes() {
+      api.getJoinedGroupes().then(response => {
+        this.groupList = Array.isArray(response) ? response : []
+      })
     }
+  },
+  beforeMount() {
+    this.getJoinedGroupes()
   }
 }
 </script>
 
-<style lang="scss">
-.search {
-  .list {
-    margin-top: 20px;
+<style lang="scss" scoped>
+::v-deep .list {
+  margin-top: 20px;
+}
+.search-empty {
+  margin-top: 50px;
+  padding-top: 200px;
+  font-size: 14px;
+  color: #999;
+  background: url('~@/assets/img/search_empty.png') no-repeat center top;
+  background-size: 160px auto;
+  text-align: center;
+}
+.group-create {
+  padding: 60px 0;
+  text-align: center;
+  .tips {
+    margin-top: 10px;
+    font-size: 12px;
+    text-align: center;
+    color: #999;
+    a {
+      color: #1989fa;
+      white-space: nowrap;
+    }
+  }
+  .button {
+    display: inline-block;
+    height: 30px;
+    padding: 0 20px;
+    line-height: 30px;
+    color: #fff;
+    text-align: center;
+    background: linear-gradient(
+      180deg,
+      rgba(255, 201, 44, 1) 0%,
+      rgba(255, 116, 42, 1) 100%
+    );
+    border-radius: 20px;
+  }
+  .button:disabled {
+    background: #ccc !important;
   }
 }
 </style>