✨ feat: 修改Toast组件调用方式

+###
+ # @Date: 2024-11-12 11:00:25
+ # @LastEditors: hookehuyr hookehuyr@gmail.com
+ # @LastEditTime: 2024-11-27 09:19:51
+ # @FilePath: /tswj/.env.development
+ # @Description: 文件描述
+###
 # 资源公共路径
 VITE_BASE = /
 
@@ -9,7 +16,8 @@ VITE_OPENID = oJLZq5je9NQMByqS80qryiQ2xgeA
 # VITE_OPENID = oJLZq5uT_6GwIh2tQWh1F9IoHZ3U
 
 # B端账号
-VITE_ID = 13761653761
+# VITE_ID = 13761653761
+VITE_ID = 13817721867
 
 # 验证码
 VITE_PIN =

@@ -2,7 +2,7 @@
  * @Author: hookehuyr hookehuyr@gmail.com
  * @Date: 2022-05-26 23:52:36
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2023-01-30 18:03:28
+ * @LastEditTime: 2024-11-27 09:35:32
  * @FilePath: /tswj/src/App.vue
  * @Description:
 -->
@@ -38,12 +38,6 @@ watchEffect(
   () => useTitle($route.meta.title)
 )
 
-// TAG: 全局配置Toast
-// Toast.setDefaultOptions({
-//   duration: 2000,
-//   className: 'zIndex'
-// });
-
 onMounted(async () => {
   const { data } = await wxJsAPI();
   data.jsApiList = apiList;

 /*
  * @Date: 2022-05-18 22:56:08
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2024-11-26 12:47:58
+ * @LastEditTime: 2024-11-27 09:35:45
  * @FilePath: /tswj/src/api/fn.js
  * @Description: 文件描述
  */
@@ -53,7 +53,7 @@ export const uploadFn = (api) => {
         // tslint:disable-next-line: no-console
         console.warn(res);
         if (!res.data.show) return false;
-        Toast({
+        showToast({
           icon: 'close',
           message: res.data.msg
         });

@@ -66,7 +66,7 @@ import { useRoute, useRouter } from 'vue-router'
 
 import axios from '@/utils/axios';
 import _ from 'lodash'
-import { showSuccessToast, showFailToast } from 'vant';
+import { showSuccessToast, showFailToast, showToast } from 'vant';
 
 import { ref, watch } from 'vue'
 // 获取是否实名认证
@@ -141,7 +141,7 @@ const submitCommentBox = (note) => {
       } else {
         console.warn(res);
         if (!res.data.show) return false;
-        Toast({
+        showToast({
           icon: 'close',
           message: res.data.msg
         });
@@ -215,7 +215,7 @@ const onLoad = () => {
       } else {
         console.warn(res);
         if (!res.data.show) return false;
-        Toast({
+        showToast({
           icon: 'close',
           message: res.data.msg
         });

@@ -59,7 +59,7 @@ import { ref, reactive, onMounted, watch, nextTick } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import axios from '@/utils/axios';
 import $ from 'jquery'
-import { Toast, Dialog } from 'vant';
+import { showToast, Dialog } from 'vant';
 const $route = useRoute();
 const $router = useRouter();
 
@@ -94,7 +94,7 @@ const donateBook = () => {
       } else {
         console.warn(res);
         if (!res.data.show) return false;
-        Toast({
+        showToast({
           icon: 'close',
           message: res.data.msg
         });

 <!--
  * @Date: 2022-06-17 17:17:13
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2024-11-20 10:34:06
+ * @LastEditTime: 2024-11-27 09:33:38
  * @FilePath: /tswj/src/components/DonateFlower/agreement.vue
  * @Description: 文件描述
 -->
@@ -59,7 +59,7 @@
 import { ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 
-import { Cookies, $, _, axios, storeToRefs, mainStore, Toast, useTitle } from '@/utils/generatePackage.js'
+import { Cookies, $, _, axios, storeToRefs, mainStore, useTitle } from '@/utils/generatePackage.js'
 //import { } from '@/utils/generateModules.js'
 //import { } from '@/utils/generateIcons.js'
 //import { } from '@/composables'

@@ -2,7 +2,7 @@
  * @Author: hookehuyr hookehuyr@gmail.com
  * @Date: 2022-05-31 22:09:58
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2023-02-08 13:45:09
+ * @LastEditTime: 2024-11-27 09:37:45
  * @FilePath: /tswj/src/components/DonateFlower/index.vue
  * @Description: 捐花组件
 -->
@@ -98,7 +98,7 @@ import { icon_flower } from '@/utils/generateIcons'
 import MyButton from '@/components/MyButton/index.vue'
 import agreement from './agreement.vue'
 import { ref, watch, nextTick } from 'vue'
-import { $, Toast } from '@/utils/generatePackage'
+import { $, showFailToast } from '@/utils/generatePackage'
 import { addDonateAPI } from '@/api/C/donate.js'
 // import { wxJsAPI } from '@/api/wx/config'
 // import { wxPayAPI } from '@/api/wx/pay'
@@ -113,11 +113,11 @@ const emit = defineEmits(['on-close']);
 let donate_number = ref(1);
 const donateFlower = () => {
   if (!agreed.value) {
-    Toast.fail('请先查看捐赠协议，勾选同意！');
+    showFailToast('请先查看捐赠协议，勾选同意！');
     return false;
   }
   if (!props.item.donate_name) {
-    Toast.fail('捐赠人姓名不能为空！');
+    showFailToast('捐赠人姓名不能为空！');
     return false;
   }
   // 业务逻辑调整，有值就传值显示

 <!--
  * @Date: 2022-06-20 11:35:50
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-06-21 19:10:41
+ * @LastEditTime: 2024-11-27 09:38:06
  * @FilePath: /tswj/src/components/LocalismBox/index.vue
  * @Description: 调整作品方言弹框组件
 -->
@@ -41,7 +41,7 @@
 import { ref, watch, nextTick } from 'vue'
 import MyButton from '@/components/MyButton/index.vue'
 import { localismListModiAPI, addLocalismAPI, modifyProdLocalismAPI } from '@/api/B/localism'
-import { Toast, Dialog } from '@/utils/generatePackage.js'
+import { showSuccessToast, Dialog } from '@/utils/generatePackage.js'
 
 const props = defineProps({
   showLocalism: Boolean,
@@ -52,7 +52,7 @@ const props = defineProps({
 const emit = defineEmits(['on-close', 'on-submit']);
 /**
  * 滚动到指定位置
- * @param {*} id 
+ * @param {*} id
  */
 const scrollToDom = (id) => {
   nextTick(() => {
@@ -115,7 +115,7 @@ const onBlur = () => { // 失焦保存录入方言
     .then(async () => {
       const { code } = await addLocalismAPI({ localism_name: localism_name.value });
       if (code) {
-        Toast.success('新增成功！');
+        showSuccessToast('新增成功！');
         localismList.value.forEach((item) => {
           item.checked = false;
         });
@@ -154,7 +154,7 @@ const handleSubmit = () => { // 提交选择方言
       .then(async () => {
         const { code } = await modifyProdLocalismAPI({ prod_id: props.id, localism_name: localism[0].id });
         if (code) {
-          Toast.success('更新成功！');
+          showSuccessToast('更新成功！');
           clearAll();
           emit('on-submit', localism[0].id);
         }

@@ -41,7 +41,7 @@ import { useCountDown } from '@vant/use';
 import { wxInfo } from '@/utils/tools';
 import { styleColor } from '@/constant.js';
 
-import { Cookies, $, _, axios, storeToRefs, mainStore, Toast, useTitle } from '@/utils/generatePackage.js'
+import { Cookies, $, _, axios, storeToRefs, mainStore, showToast, showSuccessToast, useTitle } from '@/utils/generatePackage.js'
 //import { } from '@/utils/generateModules.js'
 //import { } from '@/utils/generateIcons.js'
 //import { } from '@/composables'
@@ -60,7 +60,7 @@ const submit = () => {
     })
     .catch(error => {
       console.error(error);
-      Toast({
+      showToast({
         message: '请检查后再次提交',
         icon: 'cross',
       });
@@ -78,7 +78,7 @@ const themeVars = {
   CellVerticalPadding: '14px'
 };
 
-const onSubmit = () => { 
+const onSubmit = () => {
   emit('on-submit', {
     phone: phone.value,
     code: code.value,
@@ -90,7 +90,7 @@ let use_widget = ref(true);
 /**
  * 手机号码校验
  * 函数返回 true 表示校验通过，false 表示不通过
- * @param {*} val 
+ * @param {*} val
  */
 const validator = (val) => {
   let flag = false;
@@ -167,11 +167,11 @@ const sendCode = () => { // 发送验证码
   })
     .then(res => {
       if (res.data.code === 1) {
-        Toast.success('发送成功');
+        showSuccessToast('发送成功');
       } else {
         console.warn(res.data);
         if (!res.data.show) return false;
-        Toast({
+        showToast({
           message: res.data.msg,
           icon: 'close',
         });

+<!--
+ * @Date: 2024-05-15 10:28:10
+ * @LastEditors: hookehuyr hookehuyr@gmail.com
+ * @LastEditTime: 2024-11-27 09:38:57
+ * @FilePath: /tswj/src/components/LoginBox/test.vue
+ * @Description: 文件描述
+-->
 <template>
   <login-box ref="form" @on-submit="onSubmit"></login-box>
   <div class="btn" @click="submit">
@@ -17,7 +24,7 @@ import {
   axios,
   storeToRefs,
   mainStore,
-  Toast,
+  showToast,
   useTitle,
 } from '@/utils/generatePackage.js';
 //import { } from '@/utils/generateModules.js'
@@ -45,7 +52,7 @@ const onSubmit = (values) => {
         });
       } else {
         console.warn(res.data);
-        Toast({
+        showToast({
           message: res.data.msg,
           icon: 'close',
         });

@@ -2,7 +2,7 @@
  * @Author: hookehuyr hookehuyr@gmail.com
  * @Date: 2022-05-23 18:00:39
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-06-02 17:41:38
+ * @LastEditTime: 2024-11-27 09:39:05
  * @FilePath: /tswj/src/components/MuiVideo/test.vue
  * @Description: 视频播放通用组件演示组件
  * @Description: type: video 为纯视频播放框，bookDetail为定制模式
@@ -30,7 +30,6 @@
     axios,
     storeToRefs,
     mainStore,
-    Toast,
     useTitle,
   } from '@/utils/generatePackage.js';
   //import { } from '@/utils/generateModules.js'

@@ -36,7 +36,7 @@
  */
 import { icon_dianzan1, icon_dianzan2, icon_liuyan, icon_avatar } from '@/utils/generateIcons.js'
 import { ref, onMounted } from 'vue'
-import { _, Toast } from '@/utils/generatePackage.js'
+import { _, showToast } from '@/utils/generatePackage.js'
 import { useRouter } from 'vue-router'
 import 'mui-player/dist/mui-player.min.css'
 import MuiPlayer from 'mui-player'
@@ -63,14 +63,14 @@ const handleAction = useDebounce(async (action_type, prod_id) => {
   const { msg } = await prodActionAPI({ action_type, prod_id });
   if (msg === `${action_type}-add-OK`) { // 动作操作成功
     if (action_type === 'favor') {
-      Toast('收藏成功');
+      showToast('收藏成功');
     }
     if (action_type === 'like') {
-      Toast('点赞成功');
+      showToast('点赞成功');
     }
   } else { // 取消操作，播放动作不提示
     if (action_type !== 'play') {
-      Toast('取消成功');
+      showToast('取消成功');
     }
   }
   getProductDetail(action_type, prod_id); // 更新信息

 /*
  * @Date: 2022-06-22 00:07:42
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-06-30 13:45:54
+ * @LastEditTime: 2024-11-27 09:33:07
  * @FilePath: /tswj/src/composables/useLogin.js
  * @Description: 文件描述
  */
@@ -11,7 +11,7 @@ import { wxInfo } from '@/utils/tools';
 import { ref } from 'vue'
 import { useCountDown } from '@vant/use';
 import { smsAPI } from '@/api/common'
-import { Toast } from 'vant'
+import { showToast, showSuccessToast } from 'vant'
 
 export const useLogin = () => {
   const phone = ref('');
@@ -26,7 +26,7 @@ export const useLogin = () => {
       })
       .catch(error => {
         console.error(error);
-        Toast({
+        showToast({
           message: '请检查后再次提交',
           icon: 'cross',
         });
@@ -44,7 +44,7 @@ export const useLogin = () => {
   /**
    * 手机号码校验
    * 函数返回 true 表示校验通过，false 表示不通过
-   * @param {*} val 
+   * @param {*} val
    */
   const sms_disabled = ref(true);
   const phoneValidator = (val) => {
@@ -88,7 +88,7 @@ export const useLogin = () => {
     // 验证码接口
     const { code } = await smsAPI({ phone: phone.value });
     if (code) {
-      Toast.success('发送成功');
+      showSuccessToast('发送成功');
     }
   };
 
@@ -97,8 +97,8 @@ export const useLogin = () => {
 
   /**
    * 用户登录
-   * @param {*} phone 
-   * @param {*} pin 
+   * @param {*} phone
+   * @param {*} pin
    */
   const $router = useRouter();
   const onSubmit = async (values) => {

 /*
  * @Date: 2022-06-13 17:42:32
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-06-18 21:14:42
+ * @LastEditTime: 2024-11-27 09:39:25
  * @FilePath: /tswj/src/composables/useShare.js
  * @Description: 文件描述
  */
 import wx from 'weixin-js-sdk';
-// import { Toast } from 'vant';
 
 /**
  * @description: 微信分享功能

 /*
  * @Date: 2022-05-17 11:26:03
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-06-20 14:00:13
+ * @LastEditTime: 2024-11-27 09:34:47
  * @FilePath: /tswj/src/utils/generatePackage.js
  * @Description: 文件描述
  */
@@ -11,7 +11,7 @@ import _ from 'lodash'
 import axios from '@/utils/axios';
 import { storeToRefs } from 'pinia'
 import { mainStore } from '@/store'
-import { Toast, Dialog } from 'vant';
+import { showToast, showSuccessToast, showFailToast, Dialog } from 'vant';
 import { wxInfo, hasEllipsis } from '@/utils/tools';
 import { useTitle } from '@vueuse/core'
 
@@ -22,7 +22,9 @@ export {
   axios,
   storeToRefs,
   mainStore,
-  Toast,
+  showToast,
+  showSuccessToast,
+  showFailToast,
   Dialog,
   wxInfo,
   hasEllipsis,

@@ -2,7 +2,7 @@
  * @Author: hookehuyr hookehuyr@gmail.com
  * @Date: 2022-05-21 09:35:14
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2024-11-11 15:58:45
+ * @LastEditTime: 2024-11-27 09:39:44
  * @FilePath: /tswj/src/views/client/bookDetail.vue
  * @Description:
 -->
@@ -123,7 +123,7 @@
 <script setup>
 import { ref, onActivated, onMounted } from 'vue'
 import { useRoute, useRouter, onBeforeRouteLeave } from 'vue-router'
-import { _, storeToRefs, mainStore, Toast, hasEllipsis } from '@/utils/generatePackage'
+import { _, storeToRefs, mainStore, showSuccessToast, hasEllipsis } from '@/utils/generatePackage'
 import { MyButton, VideoCard, NoticeOverlayModule, DonateFlower, ShortcutFixed } from '@/utils/generateModules'
 import { icon_video, icon_up, icon_down, icon_subscribed, icon_unsubscribe, no_image } from '@/utils/generateIcons'
 import { JSJ_FORM_MANDARIN, JSJ_FORM_LOCALISM } from '@/constant'
@@ -213,10 +213,10 @@ const onSubscribe = async () => {
   const { msg } = await addSubscribeAPI({ book_id: $route.query.id });
   if (msg === 'add subscribe OK') {
     bookInfo.value.is_subscribe = true;
-    Toast.success('订阅成功')
+    showSuccessToast('订阅成功')
   } else {
     bookInfo.value.is_subscribe = false;
-    Toast.success('取消订阅')
+    showSuccessToast('取消订阅')
   }
 }
 

@@ -2,7 +2,7 @@
  * @Author: hookehuyr hookehuyr@gmail.com
  * @Date: 2022-04-26 16:06:31
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-07-01 17:50:15
+ * @LastEditTime: 2024-11-27 09:40:12
  * @FilePath: /tswj/src/views/client/finishUpload.vue
  * @Description: 作品上传成功提示页面
 -->
@@ -40,6 +40,8 @@ import { ref, onMounted } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { prepareDonateAPI } from '@/api/C/donate.js'
 
+import { showFailToast } from 'vant';
+
 const $route = useRoute();
 const $router = useRouter();
 
@@ -48,7 +50,7 @@ const $router = useRouter();
 const book_id = $route.query.x_field_1 ? $route.query.x_field_1.split('-')[1] : '';
 const { userInfo } = useDefaultPerf(book_id);
 if (!book_id) {
-  Toast.fail('书籍数据不全');
+  showFailToast('书籍数据不全');
 }
 
 const donateInfo = ref({})

@@ -80,7 +80,7 @@ import { useRoute, onBeforeRouteLeave } from 'vue-router'
 import { storeToRefs } from 'pinia'
 import { MyButton, VideoCard, DonateFlower } from '@/utils/generateModules'
 import { icon_avatar, no_image, icon_flower } from '@/utils/generateIcons.js'
-import { _, Toast } from '@/utils/generatePackage.js'
+import { _, showSuccessToast } from '@/utils/generatePackage.js'
 import { addPages, store } from '@/hooks/useKeepAlive'
 import { perfInfoAPI, addFollowAPI } from '@/api/C/perf.js'
 import { useScrollTop } from '@/composables';
@@ -173,10 +173,10 @@ const followUser = async () => {
   const { msg } = await addFollowAPI({ perf_id: $route.query.perf_id });
   if (msg === 'add follow OK') {
     userInfo.value.is_follow = 1
-    Toast.success('关注成功')
+    showSuccessToast('关注成功')
   } else {
     userInfo.value.is_follow = 0
-    Toast.success('取消关注')
+    showSuccessToast('取消关注')
   }
 };
 

@@ -56,7 +56,7 @@ import { no_image, icon_avatar } from '@/utils/generateIcons.js'
 import { ref, onActivated } from 'vue'
 import { onBeforeRouteLeave } from 'vue-router'
 import _ from 'lodash'
-import { Toast, Dialog } from 'vant';
+import { showSuccessToast, Dialog } from 'vant';
 // import { addPages } from '@/hooks/useKeepAlive'
 import goToVideoDetail from '@/router/methods/videoDetail'
 import { myCommentAPI, delCommentAPI } from '@/api/C/me'
@@ -137,7 +137,7 @@ const deleteComment = (id: string) => { // 删除评论
       if (result) {
         // 移除当前选中评论，避免刷新页面
         _.remove(commentList.value, comment => comment.id === id);
-        Toast.success('删除成功');
+        showSuccessToast('删除成功');
         if (!commentList.value.length) {
           onLoad()
         }