hookehuyr

测试条件判断新方法

...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: hookehuyr hookehuyr@gmail.com 2 * @Author: hookehuyr hookehuyr@gmail.com
3 * @Date: 2022-05-21 09:35:14 3 * @Date: 2022-05-21 09:35:14
4 * @LastEditors: hookehuyr hookehuyr@gmail.com 4 * @LastEditors: hookehuyr hookehuyr@gmail.com
5 - * @LastEditTime: 2022-07-01 15:14:26 5 + * @LastEditTime: 2022-07-01 17:10:49
6 * @FilePath: /tswj/src/views/client/bookDetail.vue 6 * @FilePath: /tswj/src/views/client/bookDetail.vue
7 * @Description: 7 * @Description:
8 --> 8 -->
...@@ -236,7 +236,45 @@ const closeDonate = (v) => { ...@@ -236,7 +236,45 @@ const closeDonate = (v) => {
236 } 236 }
237 /*******************************************/ 237 /*******************************************/
238 238
239 +// 校验用户状态判断条件
240 +const userStatusPass = status => status === USER_STATUS.PASS
241 +const userStatusNoPass = status => status !== USER_STATUS.PASS
242 +const userStatusNonVerified = status => status === USER_STATUS.NON_VERIFIED
243 +const userStatusNonDefaultChild = status => status === USER_STATUS.NON_DEFAULT_CHILD
239 244
245 +const noticeNonVerifiedFn = () => {
246 + go('/me/verifyUser', { back_url: $route.fullPath })
247 +}
248 +const noticeNonDefaultChildFn = () => {
249 + go('/me/handleUser', { perf_id: '', kg_id: '', kg_name: '', type: 'ADD', back_url: $route.fullPath })
250 +}
251 +const noticeFlowVerify = _.cond([
252 + [userStatusNonVerified, noticeNonVerifiedFn],
253 + [userStatusNonDefaultChild, noticeNonDefaultChildFn],
254 +])
255 +
256 +const uploadPassFn = () => {
257 + show.value = true;
258 + // x_field_1 是金数据表单传入的参数,家长上传的格式为:user_id-book_id-perf_id,perf_id是当前缺省的儿童id
259 + const str = `${userInfo.value.user_id}-${$route.query.id}-${userInfo.value.perf_id}`;
260 + // 根据语言选择跳转相关上传页面
261 + if (checkMandarin.value) {
262 + location.href = `${JSJ_FORM_MANDARIN}?x_field_1=${str}`;
263 + } else {
264 + location.href = `${JSJ_FORM_LOCALISM}?x_field_1=${str}`;
265 + }
266 + // BUG: 关闭loading临时处理
267 + setTimeout(() => {
268 + show.value = false;
269 + }, 2000);
270 +}
271 +const uploadNoPassFn = () => {
272 + showNotice.value = true;
273 +}
274 +const uploadFlowVerify = _.cond([
275 + [userStatusPass, uploadPassFn],
276 + [userStatusNoPass, uploadNoPassFn],
277 +])
240 /** 278 /**
241 * 上传作品回调 279 * 上传作品回调
242 */ 280 */
...@@ -246,37 +284,17 @@ const showNotice = ref(false) ...@@ -246,37 +284,17 @@ const showNotice = ref(false)
246 const onClose = () => { // 关闭提示框回调 284 const onClose = () => { // 关闭提示框回调
247 showNotice.value = false; 285 showNotice.value = false;
248 } 286 }
249 -// 跳转个人中心 287 +// 校验身份不通过操作回调
250 const onSubmit = () => { 288 const onSubmit = () => {
251 setTimeout(() => { 289 setTimeout(() => {
252 showNotice.value = false; 290 showNotice.value = false;
253 }, 1000); 291 }, 1000);
254 - if (userInfo.value.can_upload === USER_STATUS.NON_VERIFIED) { 292 + noticeFlowVerify(userInfo.value.can_upload);
255 - go('/me/verifyUser', { back_url: $route.fullPath })
256 - } else if (userInfo.value.can_upload === USER_STATUS.NON_DEFAULT_CHILD) {
257 - go('/me/handleUser', { perf_id: '', kg_id: '', kg_name: '', type: 'ADD', back_url: $route.fullPath })
258 - }
259 } 293 }
260 294
261 const show = ref(false); // 跳转等待提示 295 const show = ref(false); // 跳转等待提示
262 const uploadVideo = () => { 296 const uploadVideo = () => {
263 - if (userInfo.value.can_upload === USER_STATUS.PASS) { 297 + uploadFlowVerify(userInfo.value.can_upload)
264 - show.value = true;
265 - // x_field_1 是金数据表单传入的参数,家长上传的格式为:user_id-book_id-perf_id,perf_id是当前缺省的儿童id
266 - const str = `${userInfo.value.user_id}-${$route.query.id}-${userInfo.value.perf_id}`;
267 - // 根据语言选择跳转相关上传页面
268 - if (checkMandarin.value) {
269 - location.href = `${JSJ_FORM_MANDARIN}?x_field_1=${str}`;
270 - } else {
271 - location.href = `${JSJ_FORM_LOCALISM}?x_field_1=${str}`;
272 - }
273 - // BUG: 关闭loading临时处理
274 - setTimeout(() => {
275 - show.value = false;
276 - }, 2000);
277 - } else {
278 - showNotice.value = true;
279 - }
280 } 298 }
281 299
282 /****************** keepAlive 模块 *******************/ 300 /****************** keepAlive 模块 *******************/
......