Hooke / swx_weapp

Go to a project
Toggle navigation Toggle navigation pinning
hookehuyr
4a7b912e 1 parent 8ab23484

✨ feat: 更新报名义工时提示，参加活动已签到状态下，不能进行其他操作

Inline Side-by-side
Showing 4 changed files with 32 additions and 6 deletions
1 <!-- 1 <!--
2 * @Date: 2022-09-26 16:10:35 2 * @Date: 2022-09-26 16:10:35
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2022-11-14 11:11:53 4 + * @LastEditTime: 2022-11-16 10:33:15
5 * @FilePath: /swx/src/components/activity-bar.vue 5 * @FilePath: /swx/src/components/activity-bar.vue
6 * @Description: 活动详情页底部导航栏 6 * @Description: 活动详情页底部导航栏
7 --> 7 -->
...@@ -101,7 +101,7 @@ const goTo = (type, status) => { ...@@ -101,7 +101,7 @@ const goTo = (type, status) => {
101 // player报名义工之前需要弹出提示框，告诉用户注意事项。 101 // player报名义工之前需要弹出提示框，告诉用户注意事项。
102 Dialog.alert({ 102 Dialog.alert({
103 title: '温馨提示', 103 title: '温馨提示',
104 - message: '报名义工的注意事项', 104 + message: '义工报名成功后请等待主办方审核，可以在报名信息页查看审核结果',
105 confirmButtonColor: "#199A74", 105 confirmButtonColor: "#199A74",
106 confirmButtonText: '知道了' 106 confirmButtonText: '知道了'
107 }).then(() => { 107 }).then(() => {
......
...@@ -40,4 +40,18 @@ ...@@ -40,4 +40,18 @@
40 border-radius: 1.5rem; 40 border-radius: 1.5rem;
41 } 41 }
42 } 42 }
43 + .box-single {
44 + padding: 1rem 0;
45 + margin: 1rem;
46 + padding-bottom: 2rem;
47 + margin-top: 0;
48 + text-align: center;
49 + width: 100%;
50 + .button {
51 + color: #FFFFFF;
52 + background-color: #199A74;
53 + padding: 0.65rem 1rem;
54 + border-radius: 1.5rem;
55 + }
56 + }
43 } 57 }
......
1 <!-- 1 <!--
2 * @Date: 2022-09-27 17:13:05 2 * @Date: 2022-09-27 17:13:05
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2022-11-01 13:50:43 4 + * @LastEditTime: 2022-11-16 10:46:50
5 * @FilePath: /swx/src/pages/joinInfo/index.vue 5 * @FilePath: /swx/src/pages/joinInfo/index.vue
6 * @Description: 活动报名 6 * @Description: 活动报名
7 --> 7 -->
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
46 </view> 46 </view>
47 </view> 47 </view>
48 48
49 - <view class="confirm-wrapper-page"> 49 + <view v-if="status !== '已签到'" class="confirm-wrapper-page">
50 <view class="box"> 50 <view class="box">
51 <view @tap="cancelJoin" class="button">取消报名</view> 51 <view @tap="cancelJoin" class="button">取消报名</view>
52 </view> 52 </view>
...@@ -54,6 +54,11 @@ ...@@ -54,6 +54,11 @@
54 <view @tap="editJoin" class="button">修改报名</view> 54 <view @tap="editJoin" class="button">修改报名</view>
55 </view> 55 </view>
56 </view> 56 </view>
57 + <view v-else class="confirm-wrapper-page">
58 + <view class="box-single">
59 + <view @tap="closeBtn" class="button">关闭</view>
60 + </view>
61 + </view>
57 62
58 <van-dialog id="van-dialog" /> 63 <van-dialog id="van-dialog" />
59 </template> 64 </template>
...@@ -94,6 +99,10 @@ const editJoin = (val) => { ...@@ -94,6 +99,10 @@ const editJoin = (val) => {
94 url: '../joinActivity/index?type=edit&reg_id=' + getCurrentPageParam().reg_id + '&id=' + getCurrentPageParam().id 99 url: '../joinActivity/index?type=edit&reg_id=' + getCurrentPageParam().reg_id + '&id=' + getCurrentPageParam().id
95 }) 100 })
96 } 101 }
102 +
103 +const closeBtn = () => {
104 + Taro.navigateBack()
105 +}
97 </script> 106 </script>
98 107
99 <script> 108 <script>
...@@ -116,6 +125,7 @@ export default { ...@@ -116,6 +125,7 @@ export default {
116 this.phone = data.phone; 125 this.phone = data.phone;
117 this.age_group = data.age_group; 126 this.age_group = data.age_group;
118 this.user_sex = data.gender === 'man' ? '男士' : '女士'; 127 this.user_sex = data.gender === 'man' ? '男士' : '女士';
128 + this.status = data.status === 'enable' ? '已签到' : '';
119 // 额外信息 129 // 额外信息
120 if (data.extend) { 130 if (data.extend) {
121 this.extend = []; 131 this.extend = [];
......
1 /* 1 /*
2 * @Date: 2022-09-19 14:11:06 2 * @Date: 2022-09-19 14:11:06
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2022-10-09 15:41:43 4 + * @LastEditTime: 2022-11-16 10:41:25
5 * @FilePath: /swx/src/utils/config.js 5 * @FilePath: /swx/src/utils/config.js
6 * @Description: 文件描述 6 * @Description: 文件描述
7 */ 7 */
8 -const BASE_URL = "http://wenxuan.onwall.cn"; 8 +// TAG：服务器环境配置
9 +const BASE_URL = "http://wenxuan.onwall.cn"; // 测试服务器
10 +// const BASE_URL = "https://oa.onwall.cn"; // 正式服务器
9 11
10 export default BASE_URL 12 export default BASE_URL
......