Showing
4 changed files
with
27 additions
and
13 deletions
| 1 | <!-- | 1 | <!-- |
| 2 | * @Date: 2022-09-26 14:36:57 | 2 | * @Date: 2022-09-26 14:36:57 |
| 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 4 | - * @LastEditTime: 2022-11-14 11:00:19 | 4 | + * @LastEditTime: 2022-11-14 16:22:12 |
| 5 | * @FilePath: /swx/src/pages/activityDetail/index.vue | 5 | * @FilePath: /swx/src/pages/activityDetail/index.vue |
| 6 | * @Description: 活动详情页 | 6 | * @Description: 活动详情页 |
| 7 | --> | 7 | --> |
| ... | @@ -549,16 +549,16 @@ export default { | ... | @@ -549,16 +549,16 @@ export default { |
| 549 | } | 549 | } |
| 550 | // 活动状态判断显示 | 550 | // 活动状态判断显示 |
| 551 | this.activity_status = getCurrentPageParam().status ? getCurrentPageParam().status : ''; | 551 | this.activity_status = getCurrentPageParam().status ? getCurrentPageParam().status : ''; |
| 552 | - // 用户是否需要弹窗 | 552 | + // 用户是否需要弹窗 没有读过消息&&义工申请被拒绝 |
| 553 | if (!this.is_read_notice && data.volunteer_reg?.status === 'reject') { | 553 | if (!this.is_read_notice && data.volunteer_reg?.status === 'reject') { |
| 554 | - Dialog.confirm({ | 554 | + Dialog.alert({ |
| 555 | title: '温馨提示', | 555 | title: '温馨提示', |
| 556 | - message: '您报名义工申请已被拒绝，确认后下次将不会再次弹出提示窗口。', | 556 | + message: '您报名义工申请已被拒绝', |
| 557 | confirmButtonColor: "#199A74", | 557 | confirmButtonColor: "#199A74", |
| 558 | - }).then(async() => { | 558 | + confirmButtonText: '知道了' |
| 559 | + }).then(async () => { | ||
| 559 | // on close | 560 | // on close |
| 560 | - const { code, data } = await noticeRegAPI({ i: id }); | 561 | + const { code, data } = await noticeRegAPI({ i: this.volunteer_reg_id }); |
| 561 | - }).catch(() => { | ||
| 562 | }); | 562 | }); |
| 563 | } | 563 | } |
| 564 | }, | 564 | }, | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Date: 2022-09-21 16:04:10 | 2 | * @Date: 2022-09-21 16:04:10 |
| 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 4 | - * @LastEditTime: 2022-11-03 18:07:08 | 4 | + * @LastEditTime: 2022-11-14 16:00:16 |
| 5 | * @FilePath: /swx/src/pages/createActivity/index.vue | 5 | * @FilePath: /swx/src/pages/createActivity/index.vue |
| 6 | * @Description: 创建活动页面 | 6 | * @Description: 创建活动页面 |
| 7 | --> | 7 | --> |
| ... | @@ -124,7 +124,7 @@ | ... | @@ -124,7 +124,7 @@ |
| 124 | <van-col span="12" offset="0"> | 124 | <van-col span="12" offset="0"> |
| 125 | <view class="form-item-title fix"> | 125 | <view class="form-item-title fix"> |
| 126 | 是否公开显示 | 126 | 是否公开显示 |
| 127 | - <van-icon :name="icon_vip" size="1rem" color="" class="vip-icon" /> | 127 | + <!-- <van-icon :name="icon_vip" size="1rem" color="" class="vip-icon" /> --> |
| 128 | </view> | 128 | </view> |
| 129 | </van-col> | 129 | </van-col> |
| 130 | <van-col span="12" offset="0"> | 130 | <van-col span="12" offset="0"> |
| ... | @@ -142,7 +142,7 @@ | ... | @@ -142,7 +142,7 @@ |
| 142 | <view class="inner-sub-border"> | 142 | <view class="inner-sub-border"> |
| 143 | <view class="form-item-title fix"> | 143 | <view class="form-item-title fix"> |
| 144 | 允许义工报名活动 | 144 | 允许义工报名活动 |
| 145 | - <van-icon :name="icon_vip" size="1rem" color="" class="vip-icon" /> | 145 | + <!-- <van-icon :name="icon_vip" size="1rem" color="" class="vip-icon" /> --> |
| 146 | </view> | 146 | </view> |
| 147 | <van-switch style="float: right; padding-top: 0.5rem;" :checked="is_inner" @change="onInnerChange" | 147 | <van-switch style="float: right; padding-top: 0.5rem;" :checked="is_inner" @change="onInnerChange" |
| 148 | size="1.5rem" active-color="#199A74" inactive-color="#FFFFFF" /> | 148 | size="1.5rem" active-color="#199A74" inactive-color="#FFFFFF" /> |
| ... | @@ -163,7 +163,7 @@ | ... | @@ -163,7 +163,7 @@ |
| 163 | <van-col span="10" offset="0"> | 163 | <van-col span="10" offset="0"> |
| 164 | <view class="form-item-title fix"> | 164 | <view class="form-item-title fix"> |
| 165 | 义工岗位报名 | 165 | 义工岗位报名 |
| 166 | - <van-icon :name="icon_vip" size="1rem" color="" class="vip-icon" /> | 166 | + <!-- <van-icon :name="icon_vip" size="1rem" color="" class="vip-icon" /> --> |
| 167 | </view> | 167 | </view> |
| 168 | </van-col> | 168 | </van-col> |
| 169 | <van-col span="14" offset="0"> | 169 | <van-col span="14" offset="0"> | ... | ... |
| ... | @@ -170,7 +170,14 @@ export default { | ... | @@ -170,7 +170,14 @@ export default { |
| 170 | }, | 170 | }, |
| 171 | methods: { | 171 | methods: { |
| 172 | goToUserInfo ({ status, member_id }) { | 172 | goToUserInfo ({ status, member_id }) { |
| 173 | - if (status === 'request') return false; // 未审核的人没有信息，不能查看详情 | 173 | + if (status === 'request') { |
| 174 | + Taro.showToast({ | ||
| 175 | + title: '义工身份还未通过审核', | ||
| 176 | + icon: 'none', | ||
| 177 | + duration: 2000 | ||
| 178 | + }); | ||
| 179 | + return false; // 未审核的人没有信息，不能查看详情 | ||
| 180 | + } | ||
| 174 | Taro.navigateTo({ | 181 | Taro.navigateTo({ |
| 175 | url: '../userInfo/index?member_id=' + member_id | 182 | url: '../userInfo/index?member_id=' + member_id |
| 176 | }) | 183 | }) | ... | ... |
| ... | @@ -169,7 +169,14 @@ export default { | ... | @@ -169,7 +169,14 @@ export default { |
| 169 | }, | 169 | }, |
| 170 | methods: { | 170 | methods: { |
| 171 | goToUserInfo({ status, member_id }) { | 171 | goToUserInfo({ status, member_id }) { |
| 172 | - if (status === 'request') return false; // 未审核的人没有信息，不能查看详情 | 172 | + if (status === 'request') { |
| 173 | + Taro.showToast({ | ||
| 174 | + title: '义工身份还未通过审核', | ||
| 175 | + icon: 'none', | ||
| 176 | + duration: 2000 | ||
| 177 | + }); | ||
| 178 | + return false; // 未审核的人没有信息，不能查看详情 | ||
| 179 | + } | ||
| 173 | Taro.navigateTo({ | 180 | Taro.navigateTo({ |
| 174 | url: '../userInfo/index?member_id=' + member_id | 181 | url: '../userInfo/index?member_id=' + member_id |
| 175 | }) | 182 | }) | ... | ... |
-
Please register or login to post a comment