Merge branch 'master' of https://gitlab.ezijing.com/ezijing/ezijing-friends-h5

src/views/create/Activity.vue

@@ -140,6 +140,7 @@ export default {
         const [first = { url: '' }] = data.activity_image
         data.activity_image = first.url
       }
+      data.activity_demand_type = ruleForm.activity_demand_type
       data.org_id = ruleForm.org_id
       data.visibility = ruleForm.visibility
       api.addActivity(data).then(response => {

src/views/group/Member.vue

@@ -4,11 +4,7 @@
       <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"
-          >
+          <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>
@@ -21,12 +17,7 @@
       <div class="member-card" v-if="memberManagementList.length">
         <div class="member-card-hd">组织创建者、管理员</div>
         <div class="member-card-bd">
-          <member-item
-            v-for="item in memberManagementList"
-            :data="item"
-            :key="item.id"
-          >
-          </member-item>
+          <member-item v-for="item in memberManagementList" :data="item" :key="item.id"> </member-item>
         </div>
       </div>
       <div class="member-card">
@@ -62,7 +53,7 @@ export default {
       return this.$route.params.id
     },
     isMine() {
-      return this.$route.query.is_mine === '1'
+      return this.$route.query.is_mine == '1'
     },
     // 申请列表
     memberApplicationList() {
@@ -83,6 +74,7 @@ export default {
     },
     // 请求成功
     requestSuccess(list) {
+      console.log(list)
       this.list = list
     },
     // 拒绝