bug fixes

src/api/index.js

@@ -181,6 +181,11 @@ export function updateActivity2(id, data) {
   return httpRequest.post(`/api/alumni/v1/activities2/edit/${id}`, data)
 }
 
+// 审核活动成员
+export function updateActivityMemberStatus(id, data) {
+  return httpRequest.post(`/api/alumni/v1/activities2/join/check/${id}`, data)
+}
+
 // 获取组织列表
 export function getGroupList(params) {
   return httpRequest.get('/api/alumni/v1/organization/list', { params })

src/components/ActivityItem.vue

@@ -33,6 +33,9 @@ export default {
       return this.currentIndex <= 3 ? `top${this.currentIndex}` : ''
     },
     statusText() {
+      if (this.data.approve_status === '-1') {
+        return '<span class="is-processing">待审核</span>'
+      }
       return dayjs().isAfter(dayjs(this.data.activity_time), 'day')
         ? '<span class="is-finish">已结束</span>'
         : '<span class="is-processing">进行中</span>'
@@ -88,10 +91,10 @@ export default {
 }
 .activity-item-content {
   p {
-    margin-top: 8px;
+    margin-top: 4px;
     font-size: 12px;
     color: #a0a0a0;
-    line-height: 1;
+    line-height: 18px;
   }
 }
 .activity-item-index {

src/components/MyActivityItem.vue

@@ -55,6 +55,9 @@ export default {
       }
     },
     statusText() {
+      if (this.data.approve_status === '-1') {
+        return '<span class="is-processing">待审核</span>'
+      }
       return dayjs().isAfter(dayjs(this.data.activity_time), 'day')
         ? '<span class="is-finish">已结束</span>'
         : '<span class="is-processing">进行中</span>'
@@ -110,10 +113,10 @@ export default {
 }
 .my-activity-item-content {
   p {
-    margin-top: 8px;
+    margin-top: 4px;
     font-size: 12px;
     color: #a0a0a0;
-    line-height: 1;
+    line-height: 18px;
   }
 }
 .my-activity-item-ft {

src/views/activity/Item.vue

@@ -33,7 +33,7 @@
       </div>
       <div class="detail-form__item" v-if="detail.activity_address">
         <div class="detail-form__label">地点：</div>
-        <div class="detail-form__content">{{detail.activity_city}} · {{ detail.activity_address }}</div>
+        <div class="detail-form__content">{{ detail.activity_city }} · {{ detail.activity_address }}</div>
       </div>
       <div class="detail-form__item" v-if="detail.participator_limit">
         <div class="detail-form__label">人数：</div>
@@ -57,9 +57,17 @@
       <input
         type="button"
         class="button button-default"
-        value="已报名"
-        v-if="detail.button_show === 2"
+        value="已报名，等待审核"
         @click="cancelJoinActivity"
+        v-if="detail.button_show === 2"
+      />
+    </div>
+    <div class="buttons" v-if="isMyPublished">
+      <input
+        type="button"
+        class="button button-primary"
+        value="成员列表"
+        @click="$router.push({ name: 'activityMember', params: { id: detail.id }, query: { is_mine: '1' } })"
       />
     </div>
   </div>
@@ -143,7 +151,7 @@ export default {
   },
   beforeMount() {
     this.getDetail()
-    this.getCommentList()
+    // this.getCommentList()
   }
 }
 </script>

src/views/activity/Member.vue

 <template>
   <div class="main">
     <card title="成员列表">
+      <div class="member-card" v-if="isMine && memberApplicationList.length">
+        <div class="member-card-hd">新成员申请</div>
+        <div class="member-card-bd">
+          <member-item v-for="item in memberApplicationList" :data="item" :key="item.id">
+            <template #member-after="{ user }">
+              <ul class="tools">
+                <li class="tools-default" @click="onRefuse(user)">拒绝</li>
+                <li class="tools-primary" @click="onAgree(user)">同意</li>
+              </ul>
+            </template>
+          </member-item>
+        </div>
+      </div>
       <div class="member-card" v-if="memberManagementList.length">
         <div class="member-card-hd">活动创建者、管理员</div>
         <div class="member-card-bd">
@@ -26,6 +39,8 @@
 import Card from '@/components/Card'
 import MemberList from '@/components/MemberList'
 import MemberItem from '@/components/MemberItem'
+import * as api from '@/api'
+
 export default {
   name: 'ActivityMember',
   components: { Card, MemberList, MemberItem },
@@ -41,6 +56,11 @@ export default {
     isMine() {
       return this.$route.query.is_mine === '1'
     },
+    // 申请列表
+    memberApplicationList() {
+      // role: -1待审核、0拒绝、1通过
+      return this.list.filter(item => item.status === '-1')
+    },
     // 管理员列表
     memberManagementList() {
       // role: 1参与者、 2发起人
@@ -56,9 +76,22 @@ export default {
     // 请求成功
     requestSuccess(list) {
       this.list = list
+    },
+    // 拒绝
+    onRefuse(user) {
+      this.checkGroupMember(user.check_id, { pass: 0, remark: '' })
+    },
+    // 同意
+    onAgree(user) {
+      this.checkGroupMember(user.check_id, { pass: 1, remark: '' })
+    },
+    // 审核
+    checkGroupMember(id, params) {
+      api.updateActivityMemberStatus(id, params).then(() => {
+        this.$refs.list.refresh()
+      })
     }
-  },
-  beforeMount() {}
+  }
 }
 </script>
 
@@ -81,4 +114,23 @@ export default {
 ::v-deep .member-item {
   margin: 20px 0;
 }
+.member-creater {
+  margin-left: 10px;
+  width: 31px;
+  height: 13px;
+  background: url('~@/assets/img/member_creater_icon.png') no-repeat;
+  background-size: contain;
+}
+.tools {
+  display: flex;
+  li {
+    margin-left: 20px;
+  }
+}
+.tools-default {
+  color: #999;
+}
+.tools-primary {
+  color: #1989fa;
+}
 </style>

src/views/group/Member.vue

@@ -90,8 +90,7 @@ export default {
         this.$refs.list.refresh()
       })
     }
-  },
-  beforeMount() {}
+  }
 }
 </script>