fix: 修复组织存在的一些问题

src/components/GroupItem.vue

@@ -59,7 +59,7 @@ export default {
   img {
     width: 100%;
     height: 100%;
-    object-fit: cover;
+    object-fit: contain;
   }
 }
 .group-item-main {

src/components/MyActivityItem.vue

@@ -27,29 +27,19 @@
     </div>
     <div class="my-activity-item-ft">
       <ul>
-        <!-- 审核的活动 -->
-        <template v-if="isCheck">
-          <li v-if="data.approve_status === '-1'">
-            <div
-              class="button default-button"
-              @click.stop="$emit('check', data)"
-            >
-              审核
-            </div>
-          </li>
-          <li v-else>
-            <div class="button default-button" @click.stop="onClick">详情</div>
-          </li>
-        </template>
-        <!-- 正常的活动 -->
-        <template v-else>
-          <li v-if="data.is_mine && data.approve_status !== '1'">
-            <div class="button default-button" @click.stop="onClick">管理</div>
-          </li>
-          <li v-else>
-            <div class="button default-button" @click.stop="onClick">详情</div>
-          </li>
-        </template>
+        <li v-if="data.is_mine && data.approve_status !== '1'">
+          <div
+            class="button default-button"
+            @click.stop="
+              $router.push({ name: 'activityUpdate', params: { id: data.id } })
+            "
+          >
+            管理
+          </div>
+        </li>
+        <li v-else>
+          <div class="button default-button">详情</div>
+        </li>
         <li>
           <div
             class="button default-button"
@@ -130,7 +120,7 @@ export default {
   img {
     width: 100%;
     height: 100%;
-    object-fit: cover;
+    object-fit: contain;
   }
 }
 .my-activity-item-ft {

src/components/MyGroupItem.vue

@@ -5,20 +5,24 @@
         <div class="my-group-item-title line-clamp">{{ data.org_name }}</div>
         <div class="my-group-item-content">
           <p>
-            <b>类型:</b><span>{{ data.org_type_str }}</span>
+            <b>类型:</b>
+            <span>{{ data.org_type_str }}</span>
           </p>
           <p v-if="data.org_city">
-            <b>地点:</b><span>{{ data.org_city }}</span>
+            <b>地点:</b>
+            <span>{{ data.org_city }}</span>
           </p>
           <p v-if="data.industry">
-            <b>行业:</b><span>{{ data.industry }}</span>
+            <b>行业:</b>
+            <span>{{ data.industry }}</span>
           </p>
           <p>
-            <b>宗旨:</b><span>{{ data.purpose }}</span>
+            <b>宗旨:</b>
+            <span>{{ data.purpose }}</span>
           </p>
           <p>
-            <b>审核状态:</b
-            ><span :class="statusClass">{{ data.approve_status_str }}</span>
+            <b>审核状态:</b>
+            <span :class="statusClass">{{ data.approve_status_str }}</span>
           </p>
         </div>
       </div>
@@ -38,12 +42,18 @@
             编辑
           </div>
         </li>
-        <li v-else><div class="button default-button">详情</div></li>
+        <li v-else>
+          <div class="button default-button">详情</div>
+        </li>
         <li>
           <div
             class="button default-button"
             @click.stop="
-              $router.push({ name: 'groupMember', params: { id: data.id } })
+              $router.push({
+                name: 'groupMember',
+                params: { id: data.id },
+                query: { is_mine: `${data.is_mine}` }
+              })
             "
           >
             成员列表
@@ -140,7 +150,7 @@ export default {
   img {
     width: 100%;
     height: 100%;
-    object-fit: cover;
+    object-fit: contain;
   }
 }
 .my-group-item-ft {

src/views/activity/Update.vue

 <template>
   <div class="main">
-    <card title="创建活动">
+    <card title="编辑活动">
       <v-form ref="form" :model="formModel" :fields="fields" @submit="onSubmit">
         <input
           type="button"
-          value="确认创建，提交审核"
+          value="提交"
           class="submit-button"
           @click="handleSubmit"
         />
@@ -107,6 +107,11 @@ export default {
       }
     }
   },
+  computed: {
+    pid() {
+      return this.$route.params.id
+    }
+  },
   methods: {
     handleSubmit() {
       this.$refs.form.submit()
@@ -124,7 +129,7 @@ export default {
           this.$dialog
             .alert({
               confirmButtonText: '确定',
-              message: '活动创建成功，已提交审核'
+              message: '提交成功'
             })
             .then(() => {
               this.$router.replace({ name: 'my', query: { tab: '1' } })
@@ -133,7 +138,28 @@ export default {
           this.$toast(response.message)
         }
       })
+    },
+    getDetail() {
+      const toast = this.$toast.loading({
+        message: '加载中...',
+        forbidClick: true,
+        duration: 0
+      })
+      api
+        .getActivity(this.pid)
+        .then(response => {
+          this.formModel = response
+          // 城市设置
+          // if (['1', '3'].includes(response.org_type)) {
+          //   this.formModel.area = `${response.org_province}-${response.org_city}`
+          // }
+          toast.clear()
+        })
+        .catch(toast.clear)
     }
+  },
+  beforeMount() {
+    this.getDetail()
   }
 }
 </script>

src/views/group/Item.vue

@@ -19,18 +19,19 @@
           </div>
         </template>
       </div>
-      <!-- 自己创建的组织 -->
-      <div class="buttons" v-if="detail.is_mine">
+      <div class="buttons">
         <input
           type="button"
           class="button button-info"
           value="查看更多活动"
+          v-if="detail.button_show === 3"
           @click="$router.push({ name: 'groupActivity', params: { id: pid } })"
         />
         <input
           type="button"
           class="button button-primary"
           value="创建活动"
+          v-if="detail.is_mine"
           @click="
             $router.push({
               name: 'createActivity',
@@ -38,8 +39,6 @@
             })
           "
         />
-      </div>
-      <div class="buttons">
         <input
           type="button"
           class="button button-primary"
@@ -183,7 +182,7 @@ export default {
   width: 100px;
   height: 100px;
   border-radius: 6px;
-  object-fit: cover;
+  object-fit: contain;
 }
 .leave-group {
   font-size: 12px;

src/views/group/Member.vue

 <template>
   <div class="main">
     <card title="成员列表">
-      <div class="member-card" v-if="memberApplicationList.length">
+      <div class="member-card" v-if="isMine && memberApplicationList.length">
         <div class="member-card-hd">新成员申请</div>
         <div class="member-card-bd">
           <member-item
@@ -65,6 +65,9 @@ export default {
     pid() {
       return this.$route.params.id
     },
+    isMine() {
+      return this.$route.query.is_mine === '1'
+    },
     // 申请列表
     memberApplicationList() {
       // role: -1待审核、0拒绝、1通过
@@ -80,7 +83,7 @@ export default {
     // 请求数据处理
     requestCallback(data) {
       // role: 1参与者、 2发起人
-      return data.filter(item => item.role === '1')
+      return data.filter(item => item.role === '1' && item.status === '1')
     },
     // 请求成功
     requestSuccess(list) {

src/views/group/Update.vue

@@ -160,7 +160,7 @@ export default {
           this.$dialog
             .alert({
               confirmButtonText: '确定',
-              message: '组织创建成功，已提交审核'
+              message: '提交成功'
             })
             .then(() => {
               this.$router.replace({ name: 'my' })