Hooke / tswj

Go to a project
Toggle navigation Toggle navigation pinning
hookehuyr
857de646 1 parent 489caaeb

fix 上传视频loading提示

Inline Side-by-side
Showing 3 changed files with 33 additions and 31 deletions
...@@ -49,14 +49,14 @@ const handle = () => { ...@@ -49,14 +49,14 @@ const handle = () => {
49 // 上传视频 49 // 上传视频
50 const show = ref(false); 50 const show = ref(false);
51 const onUpload = (v) => { 51 const onUpload = (v) => {
52 - // show.value = true; 52 + show.value = true;
53 // x_field_1是金数据表单传入的参数，老师上传的格式为：user_id-book_id-perf_id，perf_id 为 0 53 // x_field_1是金数据表单传入的参数，老师上传的格式为：user_id-book_id-perf_id，perf_id 为 0
54 let str = `${props.user_id}-${v.id}-0`; 54 let str = `${props.user_id}-${v.id}-0`;
55 location.href = `${JSJ_FORM_B}?x_field_1=${str}`; 55 location.href = `${JSJ_FORM_B}?x_field_1=${str}`;
56 // BUG: 关闭loading临时处理 56 // BUG: 关闭loading临时处理
57 - // setTimeout(() => { 57 + setTimeout(() => {
58 - // show.value = false; 58 + show.value = false;
59 - // }, 2000); 59 + }, 2000);
60 } 60 }
61 61
62 onBeforeRouteLeave(() => { 62 onBeforeRouteLeave(() => {
......
...@@ -208,31 +208,30 @@ const noticeHtml = ref('') ...@@ -208,31 +208,30 @@ const noticeHtml = ref('')
208 const show = ref(false); // 跳转等待提示 208 const show = ref(false); // 跳转等待提示
209 const uploadVideo = () => { 209 const uploadVideo = () => {
210 if (userInfo.value.can_upload === 1) { // 可以上传 210 if (userInfo.value.can_upload === 1) { // 可以上传
211 - // show.value = true; 211 + show.value = true;
212 // x_field_1 是金数据表单传入的参数，家长上传的格式为：user_id-book_id-perf_id，perf_id是当前缺省的儿童id 212 // x_field_1 是金数据表单传入的参数，家长上传的格式为：user_id-book_id-perf_id，perf_id是当前缺省的儿童id
213 const str = `${userInfo.value.user_id}-${$route.query.id}-${userInfo.value.perf_id}`; 213 const str = `${userInfo.value.user_id}-${$route.query.id}-${userInfo.value.perf_id}`;
214 // 已读隐私条例，直接跳转上传页面 214 // 已读隐私条例，直接跳转上传页面
215 - // TODO: 暂时屏蔽已读不显示，方便测试 215 + // $router.push({
216 - $router.push({ 216 + // path: '/client/privacyNotice',
217 - path: '/client/privacyNotice', 217 + // query: {
218 - query: { 218 + // str
219 - str 219 + // }
220 - } 220 + // })
221 - }) 221 + if (Cookies.get('privacy_notice')) {
222 - // if (Cookies.get('privacy_notice')) { 222 + location.href = `${JSJ_FORM_C}?x_field_1=${str}`;
223 - // location.href = `${JSJ_FORM_C}?x_field_1=${str}`; 223 + // BUG: 关闭loading临时处理
224 - // // BUG: 关闭loading临时处理 224 + setTimeout(() => {
225 - // // setTimeout(() => { 225 + show.value = false;
226 - // // show.value = false; 226 + }, 2000);
227 - // // }, 2000); 227 + } else { // 跳转个人隐私阅读
228 - // } else { // 跳转个人隐私阅读 228 + $router.push({
229 - // $router.push({ 229 + path: '/client/privacyNotice',
230 - // path: '/client/privacyNotice', 230 + query: {
231 - // query: { 231 + str
232 - // str 232 + }
233 - // } 233 + })
234 - // }) 234 + }
235 - // }
236 } else if (userInfo.value.can_upload === -1) { // 未实名认证 235 } else if (userInfo.value.can_upload === -1) { // 未实名认证
237 showNotice.value = true; 236 showNotice.value = true;
238 noticeText.value = '前往认证' 237 noticeText.value = '前往认证'
......
...@@ -43,20 +43,23 @@ const $route = useRoute(); ...@@ -43,20 +43,23 @@ const $route = useRoute();
43 const $router = useRouter(); 43 const $router = useRouter();
44 44
45 const disagree = () => { 45 const disagree = () => {
46 - $router.go(-1) 46 + $router.go(-1);
47 + setTimeout(() => {
48 + show.value = false;
49 + }, 2000);
47 } 50 }
48 51
49 const show = ref(false); // 跳转等待提示 52 const show = ref(false); // 跳转等待提示
50 53
51 const agree = () => { 54 const agree = () => {
52 - // show.value = true; 55 + show.value = true;
53 Cookies.set('privacy_notice', '1'); 56 Cookies.set('privacy_notice', '1');
54 // x_field_1 是金数据表单传入的参数，家长上传的格式为：user_id-book_id-perf_id，perf_id是当前缺省的儿童id 57 // x_field_1 是金数据表单传入的参数，家长上传的格式为：user_id-book_id-perf_id，perf_id是当前缺省的儿童id
55 location.href = `${JSJ_FORM_C}?x_field_1=${$route.query.str}`; 58 location.href = `${JSJ_FORM_C}?x_field_1=${$route.query.str}`;
56 // BUG: 关闭loading临时处理 59 // BUG: 关闭loading临时处理
57 - // setTimeout(() => { 60 + setTimeout(() => {
58 - // show.value = false; 61 + show.value = false;
59 - // }, 2000); 62 + }, 2000);
60 } 63 }
61 64
62 const videoInfo = { 65 const videoInfo = {
......