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,31 +236,24 @@ const closeDonate = (v) => { ...@@ -236,31 +236,24 @@ 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
240 -/** 245 +const noticeNonVerifiedFn = () => {
241 - * 上传作品回调
242 - */
243 -
244 -// 不能上传提示原因弹框
245 -const showNotice = ref(false)
246 -const onClose = () => { // 关闭提示框回调
247 - showNotice.value = false;
248 -}
249 -// 跳转个人中心
250 -const onSubmit = () => {
251 - setTimeout(() => {
252 - showNotice.value = false;
253 - }, 1000);
254 - if (userInfo.value.can_upload === USER_STATUS.NON_VERIFIED) {
255 go('/me/verifyUser', { back_url: $route.fullPath }) 246 go('/me/verifyUser', { back_url: $route.fullPath })
256 - } else if (userInfo.value.can_upload === USER_STATUS.NON_DEFAULT_CHILD) { 247 +}
248 +const noticeNonDefaultChildFn = () => {
257 go('/me/handleUser', { perf_id: '', kg_id: '', kg_name: '', type: 'ADD', back_url: $route.fullPath }) 249 go('/me/handleUser', { perf_id: '', kg_id: '', kg_name: '', type: 'ADD', back_url: $route.fullPath })
258 - }
259 } 250 }
251 +const noticeFlowVerify = _.cond([
252 + [userStatusNonVerified, noticeNonVerifiedFn],
253 + [userStatusNonDefaultChild, noticeNonDefaultChildFn],
254 +])
260 255
261 -const show = ref(false); // 跳转等待提示 256 +const uploadPassFn = () => {
262 -const uploadVideo = () => {
263 - if (userInfo.value.can_upload === USER_STATUS.PASS) {
264 show.value = true; 257 show.value = true;
265 // x_field_1 是金数据表单传入的参数,家长上传的格式为:user_id-book_id-perf_id,perf_id是当前缺省的儿童id 258 // 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}`; 259 const str = `${userInfo.value.user_id}-${$route.query.id}-${userInfo.value.perf_id}`;
...@@ -274,9 +267,34 @@ const uploadVideo = () => { ...@@ -274,9 +267,34 @@ const uploadVideo = () => {
274 setTimeout(() => { 267 setTimeout(() => {
275 show.value = false; 268 show.value = false;
276 }, 2000); 269 }, 2000);
277 - } else { 270 +}
271 +const uploadNoPassFn = () => {
278 showNotice.value = true; 272 showNotice.value = true;
279 - } 273 +}
274 +const uploadFlowVerify = _.cond([
275 + [userStatusPass, uploadPassFn],
276 + [userStatusNoPass, uploadNoPassFn],
277 +])
278 +/**
279 + * 上传作品回调
280 + */
281 +
282 +// 不能上传提示原因弹框
283 +const showNotice = ref(false)
284 +const onClose = () => { // 关闭提示框回调
285 + showNotice.value = false;
286 +}
287 +// 校验身份不通过操作回调
288 +const onSubmit = () => {
289 + setTimeout(() => {
290 + showNotice.value = false;
291 + }, 1000);
292 + noticeFlowVerify(userInfo.value.can_upload);
293 +}
294 +
295 +const show = ref(false); // 跳转等待提示
296 +const uploadVideo = () => {
297 + uploadFlowVerify(userInfo.value.can_upload)
280 } 298 }
281 299
282 /****************** keepAlive 模块 *******************/ 300 /****************** keepAlive 模块 *******************/
......