hookehuyr

处理优化

1 /* 1 /*
2 * @Date: 2022-05-18 22:56:08 2 * @Date: 2022-05-18 22:56:08
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2022-06-27 23:49:43 4 + * @LastEditTime: 2022-07-05 23:27:51
5 * @FilePath: /tswj/src/api/fn.js 5 * @FilePath: /tswj/src/api/fn.js
6 * @Description: 文件描述 6 * @Description: 文件描述
7 */ 7 */
...@@ -35,6 +35,8 @@ export const fn = (api) => { ...@@ -35,6 +35,8 @@ export const fn = (api) => {
35 console.error(err); 35 console.error(err);
36 return false; 36 return false;
37 }) 37 })
38 + .finally(() => { // 最终执行
39 + })
38 } 40 }
39 41
40 /** 42 /**
......
...@@ -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 20:21:51 5 + * @LastEditTime: 2022-07-04 06:46:27
6 * @FilePath: /tswj/src/views/client/bookDetail.vue 6 * @FilePath: /tswj/src/views/client/bookDetail.vue
7 * @Description: 7 * @Description:
8 --> 8 -->
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
102 <my-button type="plain" @on-click="uploadVideo">上传作品</my-button> 102 <my-button type="plain" @on-click="uploadVideo">上传作品</my-button>
103 </div> 103 </div>
104 <div class="button"> 104 <div class="button">
105 - <my-button type="primary" @on-click="toDonate">爱心助力</my-button> 105 + <my-button type="primary" @on-click="showDonate=true">爱心助力</my-button>
106 </div> 106 </div>
107 </div> 107 </div>
108 <shortcut-fixed :type="USER_ROLE.CLIENT" :item="['home', 'me']" :custom-style="customStyle" /> 108 <shortcut-fixed :type="USER_ROLE.CLIENT" :item="['home', 'me']" :custom-style="customStyle" />
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
111 <!-- 上传时,如果没有默认儿童提示弹框, 如果没有实名认证提示弹框 --> 111 <!-- 上传时,如果没有默认儿童提示弹框, 如果没有实名认证提示弹框 -->
112 <notice-overlay-module :show="showNotice" :type="userInfo.can_upload" @on-submit="onSubmit" @on-close="onClose" /> 112 <notice-overlay-module :show="showNotice" :type="userInfo.can_upload" @on-submit="onSubmit" @on-close="onClose" />
113 113
114 - <donate-flower :show-popup="showDonate" :item="donateInfo" @on-close="closeDonate" /> 114 + <donate-flower :show-popup="showDonate" :item="donateInfo" @on-close="showDonate=false;" />
115 115
116 <van-overlay :show="show" z-index="9999"> 116 <van-overlay :show="show" z-index="9999">
117 <div class="wrapper" @click.stop> 117 <div class="wrapper" @click.stop>
...@@ -121,16 +121,16 @@ ...@@ -121,16 +121,16 @@
121 </template> 121 </template>
122 122
123 <script setup> 123 <script setup>
124 -import { ref, onActivated, onMounted, computed } from 'vue' 124 +import { ref, onActivated, onMounted } from 'vue'
125 import { useRoute, useRouter, onBeforeRouteLeave } from 'vue-router' 125 import { useRoute, useRouter, onBeforeRouteLeave } from 'vue-router'
126 -import { Cookies, _, storeToRefs, mainStore, Toast, hasEllipsis } from '@/utils/generatePackage' 126 +import { _, storeToRefs, mainStore, Toast, hasEllipsis } from '@/utils/generatePackage'
127 import { MyButton, VideoCard, NoticeOverlayModule, DonateFlower, ShortcutFixed } from '@/utils/generateModules' 127 import { MyButton, VideoCard, NoticeOverlayModule, DonateFlower, ShortcutFixed } from '@/utils/generateModules'
128 import { icon_video, icon_up, icon_down, icon_subscribed, icon_unsubscribe, no_image } from '@/utils/generateIcons' 128 import { icon_video, icon_up, icon_down, icon_subscribed, icon_unsubscribe, no_image } from '@/utils/generateIcons'
129 import { JSJ_FORM_MANDARIN, JSJ_FORM_LOCALISM } from '@/constant' 129 import { JSJ_FORM_MANDARIN, JSJ_FORM_LOCALISM } from '@/constant'
130 import { useVideoList, useDefaultPerf, useScrollTop } from '@/composables'; 130 import { useVideoList, useDefaultPerf, useScrollTop } from '@/composables';
131 import { addSubscribeAPI } from '@/api/C/book.js' 131 import { addSubscribeAPI } from '@/api/C/book.js'
132 import { prepareDonateAPI } from '@/api/C/donate.js' 132 import { prepareDonateAPI } from '@/api/C/donate.js'
133 -import { USER_ROLE, USER_TYPE, USER_STATUS } from '@/constant' 133 +import { USER_ROLE, USER_STATUS } from '@/constant'
134 import { sharePage } from '@/composables/useShare.js' 134 import { sharePage } from '@/composables/useShare.js'
135 import { useGo } from '@/hooks/useGo' 135 import { useGo } from '@/hooks/useGo'
136 136
...@@ -224,14 +224,6 @@ const onSubscribe = async () => { ...@@ -224,14 +224,6 @@ const onSubscribe = async () => {
224 224
225 // 弹出捐赠弹框模块 225 // 弹出捐赠弹框模块
226 const showDonate = ref(false); 226 const showDonate = ref(false);
227 -
228 -const toDonate = () => {
229 - showDonate.value = true;
230 -}
231 -
232 -const closeDonate = (v) => {
233 - showDonate.value = v;
234 -}
235 /*******************************************/ 227 /*******************************************/
236 228
237 // 校验用户状态判断条件 229 // 校验用户状态判断条件
......