新增审核义工流程后，流程优化处理

hookehuyr
Commit 07103e6f03bbb0141489742761f7d69d71cbea5e 07103e6f 1 parent 16aa05ec
Showing 2 changed files with 44 additions and 23 deletions
src/components/activity-bar.vue
src/pages/activityDetail/index.vue
--- a/src/components/activity-bar.vue
View file @07103e6
+++ b/src/components/activity-bar.vue
View file @07103e6
 <!--
  * @Date: 2022-09-26 16:10:35
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-11-11 18:28:21
+ * @LastEditTime: 2022-11-14 11:11:53
  * @FilePath: /swx/src/components/activity-bar.vue
  * @Description: 活动详情页底部导航栏
 -->
@@ -33,7 +33,7 @@
             <view class="button" @tap="goTo('join')">活动报名</view>
           </view>
           <view v-if="userType === 'player_join'" class="user-reg">
-            <view class="reg" @tap="goTo('volunteer')">义工报名</view>
+            <!-- <view class="reg" @tap="goTo('volunteer')">义工报名</view> -->
             <view class="info" @tap="goTo('info', 'player')">活动报名信息</view>
           </view>
           <view v-if="userType === 'creator'" class="admin-control">
@@ -52,7 +52,7 @@
             <view class="join" @tap="goTo('join')">活动报名</view>
           </view>
           <view v-if="userType === 'player_join_volunteer'" class="volunteer-success">
-            <view class="info" @tap="goTo('info', 'volunteer')">报名信息</view>
+            <view class="info" @tap="goTo('info', 'volunteer')">义工报名信息</view>
           </view>
         </view>
       </van-col>
@@ -77,7 +77,8 @@ const props = defineProps({
   // volunteer_only=只能报名义工
   // creator=创建人，可管理活动
   userType: String,
-  regId: String,
+  playerRegId: String,
+  volunteerRegId: String,
   memberRole : String,
   regRole : String,
   isEnd : String,
@@ -120,11 +121,11 @@ const goTo = (type, status) => {
   } else if (type === 'info') { // 报名信息
     if (status === 'player') { // 普通用户报名详情页
       Taro.navigateTo({
-        url: '../joinInfo/index?reg_id=' + props.regId + '&id=' + getCurrentPageParam().id
+        url: '../joinInfo/index?reg_id=' + props.playerRegId + '&id=' + getCurrentPageParam().id
       })
     } else { // 义工报名详情页
       Taro.navigateTo({
-        url: '../joinVolunteerInfo/index?reg_id=' + props.regId + '&id=' + getCurrentPageParam().id
+        url: '../joinVolunteerInfo/index?reg_id=' + props.volunteerRegId + '&id=' + getCurrentPageParam().id
       })
     }
   } else if (type === 'list') { // 报名列表
@@ -183,14 +184,24 @@ const goTo = (type, status) => {
     display: flex;
     text-align: center;
-    .reg {
+    // .reg {
-      padding: 0.8rem;
+    //   padding: 0.8rem;
-      border-radius: 2rem;
+    //   border-radius: 2rem;
-      background-color: #199A74;
+    //   background-color: #199A74;
-      color: #FFFFFF;
+    //   color: #FFFFFF;
-      margin: 0.5rem 0.8rem;
+    //   margin: 0.5rem 0.8rem;
-      width: 50%;
+    //   width: 50%;
-    }
+    // }
+
+    // .info {
+    //   padding: 0.8rem;
+    //   border-radius: 2rem;
+    //   border: 1px solid #199A74;
+    //   background-color: #FFFFFF;
+    //   color: #199A74;
+    //   margin: 0.5rem 0.8rem;
+    //   width: 50%;
+    // }
     .info {
       padding: 0.8rem;
@@ -199,7 +210,7 @@ const goTo = (type, status) => {
       background-color: #FFFFFF;
       color: #199A74;
       margin: 0.5rem 0.8rem;
-      width: 50%;
+      width: 100%;
     }
   }
--- a/src/pages/activityDetail/index.vue
View file @07103e6
+++ b/src/pages/activityDetail/index.vue
View file @07103e6
 <!--
  * @Date: 2022-09-26 14:36:57
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-11-12 00:07:37
+ * @LastEditTime: 2022-11-14 11:00:19
  * @FilePath: /swx/src/pages/activityDetail/index.vue
  * @Description: 活动详情页
 -->
@@ -106,7 +106,17 @@
     </view>
   </view>
   <view style="height: 6rem;"></view>
-  <activity-bar @on-handle="onHandle" :user-type="userType" :reg-id="reg_id" :member-role="member_role" :reg-role="reg_role" :is-end="is_end" :activity-status="activity_status" :volunteer-status="volunteer_status" />
+  <activity-bar
+    @on-handle="onHandle"
+    :user-type="userType"
+    :player-reg-id="player_reg_id"
+    :volunteer-reg-id="volunteer_reg_id"
+    :member-role="member_role"
+    :reg-role="reg_role"
+    :is-end="is_end"
+    :activity-status="activity_status"
+    :volunteer-status="volunteer_status"
+  />
   <!-- <van-action-sheet
     :z-index="10"
@@ -527,8 +537,8 @@ export default {
       this.host = data.host;
       this.member_role = data.member_role;
       this.reg_role = data.reg_role;
-      // this.reg_id = data.reg_id;
+      //
-      this.reg_id = data.player_reg?.id ? data.player_reg?.id : '';
+      this.player_reg_id = data.player_reg?.id ? data.player_reg?.id : '';
       // 如果有岗位说明可以报名义工
       this.volunteer_status = this.activity?.extend.length ? true : false;
       // 提示标识
@@ -569,11 +579,11 @@ export default {
       },
       host: {},
       member_role: '',
-      reg_id: '',
       is_end: '',
       activity_status: '',
       volunteer_status: false,
       is_read_notice: false,
+      player_reg_id: '',
       volunteer_reg_id: '',
       volunteer_reg_status: '',
     }
@@ -591,7 +601,7 @@ export default {
       }
       if (this.member_role === 'player') { // 参与者
         // 判断申请义工或活动的情况
-        if (this.reg_id) { // 申请过活动
+        if (this.player_reg_id) { // 申请过活动
           status = 'player_join'
         } else if (this.volunteer_reg_id) { // 申请过义工
           if (this.volunteer_reg_status === 'reject') { // 申请拒绝, 按钮显示 义工报名信息/活动报名
@@ -604,8 +614,8 @@ export default {
         }
       }
       if (this.member_role === 'volunteer') { // 义工
-        if (this.reg_id) {
+        if (this.volunteer_reg_id) {
-          status = 'player_join'
+          status = 'player_join_volunteer'
         } else {
           if (this.activity.is_inner) {
             status = 'volunteer'