bug fixes

src/api/index.js

@@ -202,8 +202,8 @@ export function updateGroup(id, data) {
 }
 
 // 加入组织
-export function joinGroup(id) {
-  return httpRequest.post(`/api/alumni/v1/organization/join/${id}`)
+export function joinGroup(id, data) {
+  return httpRequest.post(`/api/alumni/v1/organization/join/${id}`, data)
 }
 
 // 退出组织

src/views/group/Item.vue

@@ -39,7 +39,7 @@
         type="button"
         class="button button-primary"
         value="申请加入"
-        @click="joinGroup"
+        @click="showJoinGroup = true"
         v-if="detail.button_show === 1"
       />
       <input
@@ -50,7 +50,7 @@
         @click="onCancelJoin"
       />
     </div>
-    <van-overlay :show="show" @click="show = false">
+    <van-overlay :show="showJoinGroup" @click="showJoinGroup = false">
       <div class="dialog-group" @click.stop>
         <div class="dialog-group-hd">申请理由</div>
         <div class="dialog-group-bd">
@@ -61,6 +61,29 @@
         </div>
       </div>
     </van-overlay>
+    <van-overlay :show="showJoinGroup" @click="showJoinGroup = false">
+      <div class="dialog-group" @click.stop>
+        <div class="dialog-group-hd">申请理由</div>
+        <div class="dialog-group-bd">
+          <van-form @submit="joinGroup">
+            <van-field type="textarea" v-model="remark" name="remark" />
+            <van-button round type="primary" native-type="joinGroup">提交</van-button>
+          </van-form>
+        </div>
+      </div>
+    </van-overlay>
+    <van-overlay :show="showJoinGroupSuccess" @click="showJoinGroupSuccess = false">
+      <div class="dialog-group" @click.stop>
+        <div class="dialog-group-hd">
+          <div><img src="../../assets/img/icon_success2.png" width="60px" /></div>
+          <p style="margin-top: 18px">提交成功</p>
+        </div>
+        <div class="dialog-group-bd">
+          <p>请您等待管理员审核，审核<br />结果会在24小时内在我的消<br />息显示</p>
+          <van-button round type="primary" @click="showJoinGroupSuccess = false">确定</van-button>
+        </div>
+      </div>
+    </van-overlay>
   </div>
 </template>
 
@@ -86,8 +109,9 @@ export default {
         { name: 'rules', label: '组织章程' },
         { name: 'plan', label: '活动计划' }
       ],
-      show: false,
-      remark: ''
+      showJoinGroup: false,
+      remark: '',
+      showJoinGroupSuccess: false
     }
   },
   computed: {
@@ -104,7 +128,10 @@ export default {
     },
     // 加入组织
     joinGroup() {
-      api.joinGroup(this.pid).then(() => {
+      api.joinGroup(this.pid, { remark: this.remark }).then(() => {
+        this.showJoinGroup = false
+        this.showJoinGroupSuccess = true
+        this.remark = ''
         this.getDetail()
       })
     },