✨ feat(书籍详情页): 判断用户状态使用常量

hookehuyr
Commit 9929086734dac598cbcfb7e3a75a22ba61664437 99290867 1 parent 12a03a01
Showing 2 changed files with 36 additions and 53 deletions
src/constant.js
src/views/client/bookDetail.vue
--- a/src/constant.js
View file @9929086
+++ b/src/constant.js
View file @9929086
@@ -2,7 +2,7 @@
  * @Author: hookehuyr hookehuyr@gmail.com
  * @Date: 2022-05-25 18:34:17
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-06-23 15:07:55
+ * @LastEditTime: 2022-06-30 16:55:15
  * @FilePath: /tswj/src/constant.js
  * @Description: 
  */
@@ -45,3 +45,15 @@ export const USER_TYPE = {
 // 默认视频封面
 export const DEFAULT_COVER = 'http://gyzs.onwall.cn/tswj_vidieo_cover.jpg'
+
+/**
+ * 用户操作状态
+ * @param PASS 正常
+ * @param NON_VERIFIED 未实名认证
+ * @param NON_DEFAULT_CHILD 没有默认儿童
+ */
+export const USER_STATUS = {
+  PASS: 1,
+  NON_VERIFIED: -1,
+  NON_DEFAULT_CHILD: -2
+}
--- a/src/views/client/bookDetail.vue
View file @9929086
+++ b/src/views/client/bookDetail.vue
View file @9929086
@@ -2,7 +2,7 @@
  * @Author: hookehuyr hookehuyr@gmail.com
  * @Date: 2022-05-21 09:35:14
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-06-24 18:45:05
+ * @LastEditTime: 2022-06-30 17:17:14
  * @FilePath: /tswj/src/views/client/bookDetail.vue
  * @Description:
 -->
@@ -134,8 +134,11 @@ import { JSJ_FORM_C, JSJ_FORM_MANDARIN, JSJ_FORM_LOCALISM } from '@/constant'
 import { useVideoList, useDefaultPerf, useScrollTop } from '@/composables';
 import { addSubscribeAPI } from '@/api/C/book.js'
 import { prepareDonateAPI } from '@/api/C/donate.js'
-import { USER_ROLE, USER_TYPE } from '@/constant'
+import { USER_ROLE, USER_TYPE, USER_STATUS } from '@/constant'
 import { sharePage } from '@/composables/useShare.js'
+import { useGo } from '@/hooks/useGo'
+
+const go = useGo();
 const { resetScrollTop } = useScrollTop(); // 页面滚动恢复
 resetScrollTop('scrollTop');
@@ -252,24 +255,10 @@ const onSubmit = () => {
   setTimeout(() => {
     showNotice.value = false;
   }, 1000);
-  if (userInfo.value.can_upload === -1) { // 未实名认证
+  if (userInfo.value.can_upload === USER_STATUS.NON_VERIFIED) {
-    $router.push({
+    go('/me/verifyUser', { back_url: $route.fullPath })
-      path: '/me/verifyUser',
+  } else if (userInfo.value.can_upload === USER_STATUS.NON_DEFAULT_CHILD) {
-      query: {
+    go('/me/handleUser', { perf_id: '', kg_id: '', kg_name: '', type: 'ADD', back_url: $route.fullPath })
-        back_url: $route.fullPath
-      }
-    });
-  } else if (userInfo.value.can_upload === -2) { // 没有默认儿童
-    $router.push({
-      path: '/me/handleUser',
-      query: {
-        perf_id: '',
-        kg_id: '',
-        kg_name: '',
-        type: 'ADD',
-        back_url: $route.fullPath
-      }
-    });
   }
 }
@@ -277,7 +266,7 @@ const noticeText = ref('')
 const noticeHtml = ref('')
 const show = ref(false); // 跳转等待提示
 const uploadVideo = () => {
-  if (userInfo.value.can_upload === 1) { // 可以上传
+  if (userInfo.value.can_upload === USER_STATUS.PASS) {
     show.value = true;
     // x_field_1 是金数据表单传入的参数，家长上传的格式为：user_id-book_id-perf_id，perf_id是当前缺省的儿童id
     const str = `${userInfo.value.user_id}-${$route.query.id}-${userInfo.value.perf_id}`;
@@ -291,32 +280,14 @@ const uploadVideo = () => {
     setTimeout(() => {
       show.value = false;
     }, 2000);
-    // // 已读隐私条例，直接跳转上传页面
+  } else if (userInfo.value.can_upload === USER_STATUS.NON_VERIFIED) {
-    // if (Cookies.get('privacy_notice')) {
-    //   location.href = `${JSJ_FORM_C}?x_field_1=${str}`;
-    //   // BUG: 关闭loading临时处理
-    //   setTimeout(() => {
-    //     show.value = false;
-    //   }, 2000);
-    // } else { // 跳转个人隐私阅读
-    //   $router.push({
-    //     path: '/client/privacyNotice',
-    //     query: {
-    //       str
-    //     }
-    //   })
-    //   setTimeout(() => {
-    //     show.value = false;
-    //   }, 2000);
-    // }
-  } else if (userInfo.value.can_upload === -1) { // 未实名认证
     showNotice.value = true;
     noticeText.value = '前往认证'
     noticeHtml.value = `
       <p>您还没有实名认证</p>
       <p>请前往个人中心进行实名认证</p>
     `
-  } else if (userInfo.value.can_upload === -2) { // 没有默认儿童
+  } else if (userInfo.value.can_upload === USER_STATUS.NON_DEFAULT_CHILD) {
     showNotice.value = true;
     noticeText.value = '前往新增'
     noticeHtml.value = `
@@ -374,17 +345,17 @@ onBeforeRouteLeave(() => {
 })
 /****************** 视频组件相关操作 *******************/
-const goToDetail = (v) => { // 跳转作品详情页
+// const goToDetail = (v) => { // 跳转作品详情页
-  $router.push({
+//   $router.push({
-    path: '/client/videoDetail',
+//     path: '/client/videoDetail',
-    query: {
+//     query: {
-      prod_id: v.id,
+//       prod_id: v.id,
-      book_id: v.book_id,
+//       book_id: v.book_id,
-      type: v.type, // 特殊标识，判断入口 为keepAlive使用
+//       type: v.type, // 特殊标识，判断入口 为keepAlive使用
-      perf_id: v.perf_id
+//       perf_id: v.perf_id
-    }
+//     }
-  });
+//   });
-}
+// }
 const setComment = (v) => {
   $router.push({