Hooke / tswj

Go to a project
Toggle navigation Toggle navigation pinning
hookehuyr
379d0018 1 parent d83e6e3a

✨ feat(上传功能模块): 上传根据普通话/方言跳转不同上传表单页

Inline Side-by-side
Showing 2 changed files with 33 additions and 22 deletions
...@@ -2,13 +2,14 @@ ...@@ -2,13 +2,14 @@
2 * @Author: hookehuyr hookehuyr@gmail.com 2 * @Author: hookehuyr hookehuyr@gmail.com
3 * @Date: 2022-05-25 18:34:17 3 * @Date: 2022-05-25 18:34:17
4 * @LastEditors: hookehuyr hookehuyr@gmail.com 4 * @LastEditors: hookehuyr hookehuyr@gmail.com
5 - * @LastEditTime: 2022-06-22 19:34:49 5 + * @LastEditTime: 2022-06-22 19:51:41
6 * @FilePath: /tswj/src/constant.js 6 * @FilePath: /tswj/src/constant.js
7 * @Description: 7 * @Description:
8 */ 8 */
9 -// 金数据表单 - 家长端 9 +// 金数据表单 - 家长端（废弃）
10 export const JSJ_FORM_C = 'https://jsjs.onwall.cn/f/NAGn1D'; 10 export const JSJ_FORM_C = 'https://jsjs.onwall.cn/f/NAGn1D';
11 -// 金数据表单 - 普通话 / 方言 11 +// 金数据表单 - 家长端（普通话/方言）
12 +// TODO: 等待后端提供正式地址
12 export const JSJ_FORM_MANDARIN = 'https://jsjs.onwall.cn/f/NAGn1D'; 13 export const JSJ_FORM_MANDARIN = 'https://jsjs.onwall.cn/f/NAGn1D';
13 export const JSJ_FORM_LOCALISM = 'https://jsjs.onwall.cn/f/NAGn1D'; 14 export const JSJ_FORM_LOCALISM = 'https://jsjs.onwall.cn/f/NAGn1D';
14 15
......
...@@ -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-06-22 18:34:38 5 + * @LastEditTime: 2022-06-22 19:47:53
6 * @FilePath: /tswj/src/views/client/bookDetail.vue 6 * @FilePath: /tswj/src/views/client/bookDetail.vue
7 * @Description: 7 * @Description:
8 --> 8 -->
...@@ -130,7 +130,7 @@ import { useRoute, useRouter, onBeforeRouteLeave } from 'vue-router' ...@@ -130,7 +130,7 @@ import { useRoute, useRouter, onBeforeRouteLeave } from 'vue-router'
130 import { Cookies, _, storeToRefs, mainStore, Toast, hasEllipsis } from '@/utils/generatePackage' 130 import { Cookies, _, storeToRefs, mainStore, Toast, hasEllipsis } from '@/utils/generatePackage'
131 import { MyButton, VideoCard, NoticeOverlay, DonateFlower, ShortcutFixed } from '@/utils/generateModules' 131 import { MyButton, VideoCard, NoticeOverlay, DonateFlower, ShortcutFixed } from '@/utils/generateModules'
132 import { icon_video, icon_up, icon_down, icon_subscribed, icon_unsubscribe, no_image } from '@/utils/generateIcons' 132 import { icon_video, icon_up, icon_down, icon_subscribed, icon_unsubscribe, no_image } from '@/utils/generateIcons'
133 -import { JSJ_FORM_C } from '@/constant' 133 +import { JSJ_FORM_C, JSJ_FORM_MANDARIN, JSJ_FORM_LOCALISM } from '@/constant'
134 import { useVideoList, useDefaultPerf, useScrollTop } from '@/composables'; 134 import { useVideoList, useDefaultPerf, useScrollTop } from '@/composables';
135 import { addSubscribeAPI } from '@/api/C/book.js' 135 import { addSubscribeAPI } from '@/api/C/book.js'
136 import { prepareDonateAPI } from '@/api/C/donate.js' 136 import { prepareDonateAPI } from '@/api/C/donate.js'
...@@ -237,24 +237,34 @@ const uploadVideo = () => { ...@@ -237,24 +237,34 @@ const uploadVideo = () => {
237 show.value = true; 237 show.value = true;
238 // x_field_1 是金数据表单传入的参数，家长上传的格式为：user_id-book_id-perf_id，perf_id是当前缺省的儿童id 238 // x_field_1 是金数据表单传入的参数，家长上传的格式为：user_id-book_id-perf_id，perf_id是当前缺省的儿童id
239 const str = `${userInfo.value.user_id}-${$route.query.id}-${userInfo.value.perf_id}`; 239 const str = `${userInfo.value.user_id}-${$route.query.id}-${userInfo.value.perf_id}`;
240 - // 已读隐私条例，直接跳转上传页面 240 + // 根据语言选择跳转相关上传页面
241 - if (Cookies.get('privacy_notice')) { 241 + if (checkMandarin.value) {
242 - location.href = `${JSJ_FORM_C}?x_field_1=${str}`; 242 + location.href = `${JSJ_FORM_MANDARIN}?x_field_1=${str}`;
243 - // BUG: 关闭loading临时处理 243 + } else {
244 - setTimeout(() => { 244 + location.href = `${JSJ_FORM_LOCALISM}?x_field_1=${str}`;
245 - show.value = false;
246 - }, 2000);
247 - } else { // 跳转个人隐私阅读
248 - $router.push({
249 - path: '/client/privacyNotice',
250 - query: {
251 - str
252 - }
253 - })
254 - setTimeout(() => {
255 - show.value = false;
256 - }, 2000);
257 } 245 }
246 + // BUG: 关闭loading临时处理
247 + setTimeout(() => {
248 + show.value = false;
249 + }, 2000);
250 + // // 已读隐私条例，直接跳转上传页面
251 + // if (Cookies.get('privacy_notice')) {
252 + // location.href = `${JSJ_FORM_C}?x_field_1=${str}`;
253 + // // BUG: 关闭loading临时处理
254 + // setTimeout(() => {
255 + // show.value = false;
256 + // }, 2000);
257 + // } else { // 跳转个人隐私阅读
258 + // $router.push({
259 + // path: '/client/privacyNotice',
260 + // query: {
261 + // str
262 + // }
263 + // })
264 + // setTimeout(() => {
265 + // show.value = false;
266 + // }, 2000);
267 + // }
258 } else if (userInfo.value.can_upload === -1) { // 未实名认证 268 } else if (userInfo.value.can_upload === -1) { // 未实名认证
259 showNotice.value = true; 269 showNotice.value = true;
260 noticeText.value = '前往认证' 270 noticeText.value = '前往认证'
......