hookehuyr

🐞 fix(修改活动报名): 额外必填项未填写时提示优化

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-10-20 21:56:24 4 + * @LastEditTime: 2022-11-02 11:20:03
5 * @FilePath: /swx/src/pages/joinActivity/index.vue 5 * @FilePath: /swx/src/pages/joinActivity/index.vue
6 * @Description: 活动报名 6 * @Description: 活动报名
7 --> 7 -->
...@@ -162,34 +162,38 @@ const onAgeCancel = (event) => { ...@@ -162,34 +162,38 @@ const onAgeCancel = (event) => {
162 } 162 }
163 163
164 const validForm = () => { 164 const validForm = () => {
165 + let flag = true;
165 if (!username.value) { 166 if (!username.value) {
166 Toast('姓名不能为空'); 167 Toast('姓名不能为空');
167 - return false; 168 + flag = false;
168 } 169 }
169 if (!phone.value) { 170 if (!phone.value) {
170 Toast('手机号不能为空'); 171 Toast('手机号不能为空');
171 - return false; 172 + flag = false;
172 } 173 }
173 const pattern = /^\d{11}$/; 174 const pattern = /^\d{11}$/;
174 if (!pattern.test(phone.value)) { 175 if (!pattern.test(phone.value)) {
175 Toast('请输入正确手机号'); 176 Toast('请输入正确手机号');
176 - return false; 177 + flag = false;
177 } 178 }
178 if (!age_group.value) { 179 if (!age_group.value) {
179 Toast('年龄段不能为空'); 180 Toast('年龄段不能为空');
180 - return false; 181 + flag = false;
181 } 182 }
182 if (!user_sex.value) { 183 if (!user_sex.value) {
183 Toast('性别不能为空'); 184 Toast('性别不能为空');
184 - return false; 185 + flag = false;
185 } 186 }
187 +
186 fields.value.length && fields.value.forEach(item => { 188 fields.value.length && fields.value.forEach(item => {
187 if (item.is_require && !item.value) { 189 if (item.is_require && !item.value) {
188 Toast(item.field + '不能为空'); 190 Toast(item.field + '不能为空');
189 - return false; 191 + flag = false;
192 + return;
190 } 193 }
194 + if (!flag) return;
191 }); 195 });
192 - return true; 196 + return flag;
193 } 197 }
194 198
195 const onSubmit = async (val) => { 199 const onSubmit = async (val) => {
......