Showing
19 changed files
with
74 additions
and
63 deletions
| 1 | +### | ||
| 2 | + # @Date: 2024-11-12 11:00:25 | ||
| 3 | + # @LastEditors: hookehuyr hookehuyr@gmail.com | ||
| 4 | + # @LastEditTime: 2024-11-27 09:19:51 | ||
| 5 | + # @FilePath: /tswj/.env.development | ||
| 6 | + # @Description: 文件描述 | ||
| 7 | +### | ||
| 1 | # 资源公共路径 | 8 | # 资源公共路径 |
| 2 | VITE_BASE = / | 9 | VITE_BASE = / |
| 3 | 10 | ||
| ... | @@ -9,7 +16,8 @@ VITE_OPENID = oJLZq5je9NQMByqS80qryiQ2xgeA | ... | @@ -9,7 +16,8 @@ VITE_OPENID = oJLZq5je9NQMByqS80qryiQ2xgeA |
| 9 | # VITE_OPENID = oJLZq5uT_6GwIh2tQWh1F9IoHZ3U | 16 | # VITE_OPENID = oJLZq5uT_6GwIh2tQWh1F9IoHZ3U |
| 10 | 17 | ||
| 11 | # B端账号 | 18 | # B端账号 |
| 12 | -VITE_ID = 13761653761 | 19 | +# VITE_ID = 13761653761 |
| 20 | +VITE_ID = 13817721867 | ||
| 13 | 21 | ||
| 14 | # 验证码 | 22 | # 验证码 |
| 15 | VITE_PIN = | 23 | VITE_PIN = | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | * @Author: hookehuyr hookehuyr@gmail.com | 2 | * @Author: hookehuyr hookehuyr@gmail.com |
| 3 | * @Date: 2022-05-26 23:52:36 | 3 | * @Date: 2022-05-26 23:52:36 |
| 4 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 4 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 5 | - * @LastEditTime: 2023-01-30 18:03:28 | 5 | + * @LastEditTime: 2024-11-27 09:35:32 |
| 6 | * @FilePath: /tswj/src/App.vue | 6 | * @FilePath: /tswj/src/App.vue |
| 7 | * @Description: | 7 | * @Description: |
| 8 | --> | 8 | --> |
| ... | @@ -38,12 +38,6 @@ watchEffect( | ... | @@ -38,12 +38,6 @@ watchEffect( |
| 38 | () => useTitle($route.meta.title) | 38 | () => useTitle($route.meta.title) |
| 39 | ) | 39 | ) |
| 40 | 40 | ||
| 41 | -// TAG: 全局配置Toast | ||
| 42 | -// Toast.setDefaultOptions({ | ||
| 43 | -// duration: 2000, | ||
| 44 | -// className: 'zIndex' | ||
| 45 | -// }); | ||
| 46 | - | ||
| 47 | onMounted(async () => { | 41 | onMounted(async () => { |
| 48 | const { data } = await wxJsAPI(); | 42 | const { data } = await wxJsAPI(); |
| 49 | data.jsApiList = apiList; | 43 | data.jsApiList = apiList; | ... | ... |
| 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: 2024-11-26 12:47:58 | 4 | + * @LastEditTime: 2024-11-27 09:35:45 |
| 5 | * @FilePath: /tswj/src/api/fn.js | 5 | * @FilePath: /tswj/src/api/fn.js |
| 6 | * @Description: 文件描述 | 6 | * @Description: 文件描述 |
| 7 | */ | 7 | */ |
| ... | @@ -53,7 +53,7 @@ export const uploadFn = (api) => { | ... | @@ -53,7 +53,7 @@ export const uploadFn = (api) => { |
| 53 | // tslint:disable-next-line: no-console | 53 | // tslint:disable-next-line: no-console |
| 54 | console.warn(res); | 54 | console.warn(res); |
| 55 | if (!res.data.show) return false; | 55 | if (!res.data.show) return false; |
| 56 | - Toast({ | 56 | + showToast({ |
| 57 | icon: 'close', | 57 | icon: 'close', |
| 58 | message: res.data.msg | 58 | message: res.data.msg |
| 59 | }); | 59 | }); | ... | ... |
| ... | @@ -66,7 +66,7 @@ import { useRoute, useRouter } from 'vue-router' | ... | @@ -66,7 +66,7 @@ import { useRoute, useRouter } from 'vue-router' |
| 66 | 66 | ||
| 67 | import axios from '@/utils/axios'; | 67 | import axios from '@/utils/axios'; |
| 68 | import _ from 'lodash' | 68 | import _ from 'lodash' |
| 69 | -import { showSuccessToast, showFailToast } from 'vant'; | 69 | +import { showSuccessToast, showFailToast, showToast } from 'vant'; |
| 70 | 70 | ||
| 71 | import { ref, watch } from 'vue' | 71 | import { ref, watch } from 'vue' |
| 72 | // 获取是否实名认证 | 72 | // 获取是否实名认证 |
| ... | @@ -141,7 +141,7 @@ const submitCommentBox = (note) => { | ... | @@ -141,7 +141,7 @@ const submitCommentBox = (note) => { |
| 141 | } else { | 141 | } else { |
| 142 | console.warn(res); | 142 | console.warn(res); |
| 143 | if (!res.data.show) return false; | 143 | if (!res.data.show) return false; |
| 144 | - Toast({ | 144 | + showToast({ |
| 145 | icon: 'close', | 145 | icon: 'close', |
| 146 | message: res.data.msg | 146 | message: res.data.msg |
| 147 | }); | 147 | }); |
| ... | @@ -215,7 +215,7 @@ const onLoad = () => { | ... | @@ -215,7 +215,7 @@ const onLoad = () => { |
| 215 | } else { | 215 | } else { |
| 216 | console.warn(res); | 216 | console.warn(res); |
| 217 | if (!res.data.show) return false; | 217 | if (!res.data.show) return false; |
| 218 | - Toast({ | 218 | + showToast({ |
| 219 | icon: 'close', | 219 | icon: 'close', |
| 220 | message: res.data.msg | 220 | message: res.data.msg |
| 221 | }); | 221 | }); | ... | ... |
| ... | @@ -59,7 +59,7 @@ import { ref, reactive, onMounted, watch, nextTick } from 'vue' | ... | @@ -59,7 +59,7 @@ import { ref, reactive, onMounted, watch, nextTick } from 'vue' |
| 59 | import { useRoute, useRouter } from 'vue-router' | 59 | import { useRoute, useRouter } from 'vue-router' |
| 60 | import axios from '@/utils/axios'; | 60 | import axios from '@/utils/axios'; |
| 61 | import $ from 'jquery' | 61 | import $ from 'jquery' |
| 62 | -import { Toast, Dialog } from 'vant'; | 62 | +import { showToast, Dialog } from 'vant'; |
| 63 | const $route = useRoute(); | 63 | const $route = useRoute(); |
| 64 | const $router = useRouter(); | 64 | const $router = useRouter(); |
| 65 | 65 | ||
| ... | @@ -94,7 +94,7 @@ const donateBook = () => { | ... | @@ -94,7 +94,7 @@ const donateBook = () => { |
| 94 | } else { | 94 | } else { |
| 95 | console.warn(res); | 95 | console.warn(res); |
| 96 | if (!res.data.show) return false; | 96 | if (!res.data.show) return false; |
| 97 | - Toast({ | 97 | + showToast({ |
| 98 | icon: 'close', | 98 | icon: 'close', |
| 99 | message: res.data.msg | 99 | message: res.data.msg |
| 100 | }); | 100 | }); | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Date: 2022-06-17 17:17:13 | 2 | * @Date: 2022-06-17 17:17:13 |
| 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 4 | - * @LastEditTime: 2024-11-20 10:34:06 | 4 | + * @LastEditTime: 2024-11-27 09:33:38 |
| 5 | * @FilePath: /tswj/src/components/DonateFlower/agreement.vue | 5 | * @FilePath: /tswj/src/components/DonateFlower/agreement.vue |
| 6 | * @Description: 文件描述 | 6 | * @Description: 文件描述 |
| 7 | --> | 7 | --> |
| ... | @@ -59,7 +59,7 @@ | ... | @@ -59,7 +59,7 @@ |
| 59 | import { ref } from 'vue' | 59 | import { ref } from 'vue' |
| 60 | import { useRoute, useRouter } from 'vue-router' | 60 | import { useRoute, useRouter } from 'vue-router' |
| 61 | 61 | ||
| 62 | -import { Cookies, $, _, axios, storeToRefs, mainStore, Toast, useTitle } from '@/utils/generatePackage.js' | 62 | +import { Cookies, $, _, axios, storeToRefs, mainStore, useTitle } from '@/utils/generatePackage.js' |
| 63 | //import { } from '@/utils/generateModules.js' | 63 | //import { } from '@/utils/generateModules.js' |
| 64 | //import { } from '@/utils/generateIcons.js' | 64 | //import { } from '@/utils/generateIcons.js' |
| 65 | //import { } from '@/composables' | 65 | //import { } from '@/composables' | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | * @Author: hookehuyr hookehuyr@gmail.com | 2 | * @Author: hookehuyr hookehuyr@gmail.com |
| 3 | * @Date: 2022-05-31 22:09:58 | 3 | * @Date: 2022-05-31 22:09:58 |
| 4 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 4 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 5 | - * @LastEditTime: 2023-02-08 13:45:09 | 5 | + * @LastEditTime: 2024-11-27 09:37:45 |
| 6 | * @FilePath: /tswj/src/components/DonateFlower/index.vue | 6 | * @FilePath: /tswj/src/components/DonateFlower/index.vue |
| 7 | * @Description: 捐花组件 | 7 | * @Description: 捐花组件 |
| 8 | --> | 8 | --> |
| ... | @@ -98,7 +98,7 @@ import { icon_flower } from '@/utils/generateIcons' | ... | @@ -98,7 +98,7 @@ import { icon_flower } from '@/utils/generateIcons' |
| 98 | import MyButton from '@/components/MyButton/index.vue' | 98 | import MyButton from '@/components/MyButton/index.vue' |
| 99 | import agreement from './agreement.vue' | 99 | import agreement from './agreement.vue' |
| 100 | import { ref, watch, nextTick } from 'vue' | 100 | import { ref, watch, nextTick } from 'vue' |
| 101 | -import { $, Toast } from '@/utils/generatePackage' | 101 | +import { $, showFailToast } from '@/utils/generatePackage' |
| 102 | import { addDonateAPI } from '@/api/C/donate.js' | 102 | import { addDonateAPI } from '@/api/C/donate.js' |
| 103 | // import { wxJsAPI } from '@/api/wx/config' | 103 | // import { wxJsAPI } from '@/api/wx/config' |
| 104 | // import { wxPayAPI } from '@/api/wx/pay' | 104 | // import { wxPayAPI } from '@/api/wx/pay' |
| ... | @@ -113,11 +113,11 @@ const emit = defineEmits(['on-close']); | ... | @@ -113,11 +113,11 @@ const emit = defineEmits(['on-close']); |
| 113 | let donate_number = ref(1); | 113 | let donate_number = ref(1); |
| 114 | const donateFlower = () => { | 114 | const donateFlower = () => { |
| 115 | if (!agreed.value) { | 115 | if (!agreed.value) { |
| 116 | - Toast.fail('请先查看捐赠协议,勾选同意!'); | 116 | + showFailToast('请先查看捐赠协议,勾选同意!'); |
| 117 | return false; | 117 | return false; |
| 118 | } | 118 | } |
| 119 | if (!props.item.donate_name) { | 119 | if (!props.item.donate_name) { |
| 120 | - Toast.fail('捐赠人姓名不能为空!'); | 120 | + showFailToast('捐赠人姓名不能为空!'); |
| 121 | return false; | 121 | return false; |
| 122 | } | 122 | } |
| 123 | // 业务逻辑调整,有值就传值显示 | 123 | // 业务逻辑调整,有值就传值显示 | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Date: 2022-06-20 11:35:50 | 2 | * @Date: 2022-06-20 11:35:50 |
| 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 4 | - * @LastEditTime: 2022-06-21 19:10:41 | 4 | + * @LastEditTime: 2024-11-27 09:38:06 |
| 5 | * @FilePath: /tswj/src/components/LocalismBox/index.vue | 5 | * @FilePath: /tswj/src/components/LocalismBox/index.vue |
| 6 | * @Description: 调整作品方言弹框组件 | 6 | * @Description: 调整作品方言弹框组件 |
| 7 | --> | 7 | --> |
| ... | @@ -41,7 +41,7 @@ | ... | @@ -41,7 +41,7 @@ |
| 41 | import { ref, watch, nextTick } from 'vue' | 41 | import { ref, watch, nextTick } from 'vue' |
| 42 | import MyButton from '@/components/MyButton/index.vue' | 42 | import MyButton from '@/components/MyButton/index.vue' |
| 43 | import { localismListModiAPI, addLocalismAPI, modifyProdLocalismAPI } from '@/api/B/localism' | 43 | import { localismListModiAPI, addLocalismAPI, modifyProdLocalismAPI } from '@/api/B/localism' |
| 44 | -import { Toast, Dialog } from '@/utils/generatePackage.js' | 44 | +import { showSuccessToast, Dialog } from '@/utils/generatePackage.js' |
| 45 | 45 | ||
| 46 | const props = defineProps({ | 46 | const props = defineProps({ |
| 47 | showLocalism: Boolean, | 47 | showLocalism: Boolean, |
| ... | @@ -52,7 +52,7 @@ const props = defineProps({ | ... | @@ -52,7 +52,7 @@ const props = defineProps({ |
| 52 | const emit = defineEmits(['on-close', 'on-submit']); | 52 | const emit = defineEmits(['on-close', 'on-submit']); |
| 53 | /** | 53 | /** |
| 54 | * 滚动到指定位置 | 54 | * 滚动到指定位置 |
| 55 | - * @param {*} id | 55 | + * @param {*} id |
| 56 | */ | 56 | */ |
| 57 | const scrollToDom = (id) => { | 57 | const scrollToDom = (id) => { |
| 58 | nextTick(() => { | 58 | nextTick(() => { |
| ... | @@ -115,7 +115,7 @@ const onBlur = () => { // 失焦保存录入方言 | ... | @@ -115,7 +115,7 @@ const onBlur = () => { // 失焦保存录入方言 |
| 115 | .then(async () => { | 115 | .then(async () => { |
| 116 | const { code } = await addLocalismAPI({ localism_name: localism_name.value }); | 116 | const { code } = await addLocalismAPI({ localism_name: localism_name.value }); |
| 117 | if (code) { | 117 | if (code) { |
| 118 | - Toast.success('新增成功!'); | 118 | + showSuccessToast('新增成功!'); |
| 119 | localismList.value.forEach((item) => { | 119 | localismList.value.forEach((item) => { |
| 120 | item.checked = false; | 120 | item.checked = false; |
| 121 | }); | 121 | }); |
| ... | @@ -154,7 +154,7 @@ const handleSubmit = () => { // 提交选择方言 | ... | @@ -154,7 +154,7 @@ const handleSubmit = () => { // 提交选择方言 |
| 154 | .then(async () => { | 154 | .then(async () => { |
| 155 | const { code } = await modifyProdLocalismAPI({ prod_id: props.id, localism_name: localism[0].id }); | 155 | const { code } = await modifyProdLocalismAPI({ prod_id: props.id, localism_name: localism[0].id }); |
| 156 | if (code) { | 156 | if (code) { |
| 157 | - Toast.success('更新成功!'); | 157 | + showSuccessToast('更新成功!'); |
| 158 | clearAll(); | 158 | clearAll(); |
| 159 | emit('on-submit', localism[0].id); | 159 | emit('on-submit', localism[0].id); |
| 160 | } | 160 | } | ... | ... |
| ... | @@ -41,7 +41,7 @@ import { useCountDown } from '@vant/use'; | ... | @@ -41,7 +41,7 @@ import { useCountDown } from '@vant/use'; |
| 41 | import { wxInfo } from '@/utils/tools'; | 41 | import { wxInfo } from '@/utils/tools'; |
| 42 | import { styleColor } from '@/constant.js'; | 42 | import { styleColor } from '@/constant.js'; |
| 43 | 43 | ||
| 44 | -import { Cookies, $, _, axios, storeToRefs, mainStore, Toast, useTitle } from '@/utils/generatePackage.js' | 44 | +import { Cookies, $, _, axios, storeToRefs, mainStore, showToast, showSuccessToast, useTitle } from '@/utils/generatePackage.js' |
| 45 | //import { } from '@/utils/generateModules.js' | 45 | //import { } from '@/utils/generateModules.js' |
| 46 | //import { } from '@/utils/generateIcons.js' | 46 | //import { } from '@/utils/generateIcons.js' |
| 47 | //import { } from '@/composables' | 47 | //import { } from '@/composables' |
| ... | @@ -60,7 +60,7 @@ const submit = () => { | ... | @@ -60,7 +60,7 @@ const submit = () => { |
| 60 | }) | 60 | }) |
| 61 | .catch(error => { | 61 | .catch(error => { |
| 62 | console.error(error); | 62 | console.error(error); |
| 63 | - Toast({ | 63 | + showToast({ |
| 64 | message: '请检查后再次提交', | 64 | message: '请检查后再次提交', |
| 65 | icon: 'cross', | 65 | icon: 'cross', |
| 66 | }); | 66 | }); |
| ... | @@ -78,7 +78,7 @@ const themeVars = { | ... | @@ -78,7 +78,7 @@ const themeVars = { |
| 78 | CellVerticalPadding: '14px' | 78 | CellVerticalPadding: '14px' |
| 79 | }; | 79 | }; |
| 80 | 80 | ||
| 81 | -const onSubmit = () => { | 81 | +const onSubmit = () => { |
| 82 | emit('on-submit', { | 82 | emit('on-submit', { |
| 83 | phone: phone.value, | 83 | phone: phone.value, |
| 84 | code: code.value, | 84 | code: code.value, |
| ... | @@ -90,7 +90,7 @@ let use_widget = ref(true); | ... | @@ -90,7 +90,7 @@ let use_widget = ref(true); |
| 90 | /** | 90 | /** |
| 91 | * 手机号码校验 | 91 | * 手机号码校验 |
| 92 | * 函数返回 true 表示校验通过,false 表示不通过 | 92 | * 函数返回 true 表示校验通过,false 表示不通过 |
| 93 | - * @param {*} val | 93 | + * @param {*} val |
| 94 | */ | 94 | */ |
| 95 | const validator = (val) => { | 95 | const validator = (val) => { |
| 96 | let flag = false; | 96 | let flag = false; |
| ... | @@ -167,11 +167,11 @@ const sendCode = () => { // 发送验证码 | ... | @@ -167,11 +167,11 @@ const sendCode = () => { // 发送验证码 |
| 167 | }) | 167 | }) |
| 168 | .then(res => { | 168 | .then(res => { |
| 169 | if (res.data.code === 1) { | 169 | if (res.data.code === 1) { |
| 170 | - Toast.success('发送成功'); | 170 | + showSuccessToast('发送成功'); |
| 171 | } else { | 171 | } else { |
| 172 | console.warn(res.data); | 172 | console.warn(res.data); |
| 173 | if (!res.data.show) return false; | 173 | if (!res.data.show) return false; |
| 174 | - Toast({ | 174 | + showToast({ |
| 175 | message: res.data.msg, | 175 | message: res.data.msg, |
| 176 | icon: 'close', | 176 | icon: 'close', |
| 177 | }); | 177 | }); | ... | ... |
| 1 | +<!-- | ||
| 2 | + * @Date: 2024-05-15 10:28:10 | ||
| 3 | + * @LastEditors: hookehuyr hookehuyr@gmail.com | ||
| 4 | + * @LastEditTime: 2024-11-27 09:38:57 | ||
| 5 | + * @FilePath: /tswj/src/components/LoginBox/test.vue | ||
| 6 | + * @Description: 文件描述 | ||
| 7 | +--> | ||
| 1 | <template> | 8 | <template> |
| 2 | <login-box ref="form" @on-submit="onSubmit"></login-box> | 9 | <login-box ref="form" @on-submit="onSubmit"></login-box> |
| 3 | <div class="btn" @click="submit"> | 10 | <div class="btn" @click="submit"> |
| ... | @@ -17,7 +24,7 @@ import { | ... | @@ -17,7 +24,7 @@ import { |
| 17 | axios, | 24 | axios, |
| 18 | storeToRefs, | 25 | storeToRefs, |
| 19 | mainStore, | 26 | mainStore, |
| 20 | - Toast, | 27 | + showToast, |
| 21 | useTitle, | 28 | useTitle, |
| 22 | } from '@/utils/generatePackage.js'; | 29 | } from '@/utils/generatePackage.js'; |
| 23 | //import { } from '@/utils/generateModules.js' | 30 | //import { } from '@/utils/generateModules.js' |
| ... | @@ -45,7 +52,7 @@ const onSubmit = (values) => { | ... | @@ -45,7 +52,7 @@ const onSubmit = (values) => { |
| 45 | }); | 52 | }); |
| 46 | } else { | 53 | } else { |
| 47 | console.warn(res.data); | 54 | console.warn(res.data); |
| 48 | - Toast({ | 55 | + showToast({ |
| 49 | message: res.data.msg, | 56 | message: res.data.msg, |
| 50 | icon: 'close', | 57 | icon: 'close', |
| 51 | }); | 58 | }); | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | * @Author: hookehuyr hookehuyr@gmail.com | 2 | * @Author: hookehuyr hookehuyr@gmail.com |
| 3 | * @Date: 2022-05-23 18:00:39 | 3 | * @Date: 2022-05-23 18:00:39 |
| 4 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 4 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 5 | - * @LastEditTime: 2022-06-02 17:41:38 | 5 | + * @LastEditTime: 2024-11-27 09:39:05 |
| 6 | * @FilePath: /tswj/src/components/MuiVideo/test.vue | 6 | * @FilePath: /tswj/src/components/MuiVideo/test.vue |
| 7 | * @Description: 视频播放通用组件演示组件 | 7 | * @Description: 视频播放通用组件演示组件 |
| 8 | * @Description: type: video 为纯视频播放框,bookDetail为定制模式 | 8 | * @Description: type: video 为纯视频播放框,bookDetail为定制模式 |
| ... | @@ -30,7 +30,6 @@ | ... | @@ -30,7 +30,6 @@ |
| 30 | axios, | 30 | axios, |
| 31 | storeToRefs, | 31 | storeToRefs, |
| 32 | mainStore, | 32 | mainStore, |
| 33 | - Toast, | ||
| 34 | useTitle, | 33 | useTitle, |
| 35 | } from '@/utils/generatePackage.js'; | 34 | } from '@/utils/generatePackage.js'; |
| 36 | //import { } from '@/utils/generateModules.js' | 35 | //import { } from '@/utils/generateModules.js' | ... | ... |
| ... | @@ -36,7 +36,7 @@ | ... | @@ -36,7 +36,7 @@ |
| 36 | */ | 36 | */ |
| 37 | import { icon_dianzan1, icon_dianzan2, icon_liuyan, icon_avatar } from '@/utils/generateIcons.js' | 37 | import { icon_dianzan1, icon_dianzan2, icon_liuyan, icon_avatar } from '@/utils/generateIcons.js' |
| 38 | import { ref, onMounted } from 'vue' | 38 | import { ref, onMounted } from 'vue' |
| 39 | -import { _, Toast } from '@/utils/generatePackage.js' | 39 | +import { _, showToast } from '@/utils/generatePackage.js' |
| 40 | import { useRouter } from 'vue-router' | 40 | import { useRouter } from 'vue-router' |
| 41 | import 'mui-player/dist/mui-player.min.css' | 41 | import 'mui-player/dist/mui-player.min.css' |
| 42 | import MuiPlayer from 'mui-player' | 42 | import MuiPlayer from 'mui-player' |
| ... | @@ -63,14 +63,14 @@ const handleAction = useDebounce(async (action_type, prod_id) => { | ... | @@ -63,14 +63,14 @@ const handleAction = useDebounce(async (action_type, prod_id) => { |
| 63 | const { msg } = await prodActionAPI({ action_type, prod_id }); | 63 | const { msg } = await prodActionAPI({ action_type, prod_id }); |
| 64 | if (msg === `${action_type}-add-OK`) { // 动作操作成功 | 64 | if (msg === `${action_type}-add-OK`) { // 动作操作成功 |
| 65 | if (action_type === 'favor') { | 65 | if (action_type === 'favor') { |
| 66 | - Toast('收藏成功'); | 66 | + showToast('收藏成功'); |
| 67 | } | 67 | } |
| 68 | if (action_type === 'like') { | 68 | if (action_type === 'like') { |
| 69 | - Toast('点赞成功'); | 69 | + showToast('点赞成功'); |
| 70 | } | 70 | } |
| 71 | } else { // 取消操作,播放动作不提示 | 71 | } else { // 取消操作,播放动作不提示 |
| 72 | if (action_type !== 'play') { | 72 | if (action_type !== 'play') { |
| 73 | - Toast('取消成功'); | 73 | + showToast('取消成功'); |
| 74 | } | 74 | } |
| 75 | } | 75 | } |
| 76 | getProductDetail(action_type, prod_id); // 更新信息 | 76 | getProductDetail(action_type, prod_id); // 更新信息 | ... | ... |
| 1 | /* | 1 | /* |
| 2 | * @Date: 2022-06-22 00:07:42 | 2 | * @Date: 2022-06-22 00:07:42 |
| 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 4 | - * @LastEditTime: 2022-06-30 13:45:54 | 4 | + * @LastEditTime: 2024-11-27 09:33:07 |
| 5 | * @FilePath: /tswj/src/composables/useLogin.js | 5 | * @FilePath: /tswj/src/composables/useLogin.js |
| 6 | * @Description: 文件描述 | 6 | * @Description: 文件描述 |
| 7 | */ | 7 | */ |
| ... | @@ -11,7 +11,7 @@ import { wxInfo } from '@/utils/tools'; | ... | @@ -11,7 +11,7 @@ import { wxInfo } from '@/utils/tools'; |
| 11 | import { ref } from 'vue' | 11 | import { ref } from 'vue' |
| 12 | import { useCountDown } from '@vant/use'; | 12 | import { useCountDown } from '@vant/use'; |
| 13 | import { smsAPI } from '@/api/common' | 13 | import { smsAPI } from '@/api/common' |
| 14 | -import { Toast } from 'vant' | 14 | +import { showToast, showSuccessToast } from 'vant' |
| 15 | 15 | ||
| 16 | export const useLogin = () => { | 16 | export const useLogin = () => { |
| 17 | const phone = ref(''); | 17 | const phone = ref(''); |
| ... | @@ -26,7 +26,7 @@ export const useLogin = () => { | ... | @@ -26,7 +26,7 @@ export const useLogin = () => { |
| 26 | }) | 26 | }) |
| 27 | .catch(error => { | 27 | .catch(error => { |
| 28 | console.error(error); | 28 | console.error(error); |
| 29 | - Toast({ | 29 | + showToast({ |
| 30 | message: '请检查后再次提交', | 30 | message: '请检查后再次提交', |
| 31 | icon: 'cross', | 31 | icon: 'cross', |
| 32 | }); | 32 | }); |
| ... | @@ -44,7 +44,7 @@ export const useLogin = () => { | ... | @@ -44,7 +44,7 @@ export const useLogin = () => { |
| 44 | /** | 44 | /** |
| 45 | * 手机号码校验 | 45 | * 手机号码校验 |
| 46 | * 函数返回 true 表示校验通过,false 表示不通过 | 46 | * 函数返回 true 表示校验通过,false 表示不通过 |
| 47 | - * @param {*} val | 47 | + * @param {*} val |
| 48 | */ | 48 | */ |
| 49 | const sms_disabled = ref(true); | 49 | const sms_disabled = ref(true); |
| 50 | const phoneValidator = (val) => { | 50 | const phoneValidator = (val) => { |
| ... | @@ -88,7 +88,7 @@ export const useLogin = () => { | ... | @@ -88,7 +88,7 @@ export const useLogin = () => { |
| 88 | // 验证码接口 | 88 | // 验证码接口 |
| 89 | const { code } = await smsAPI({ phone: phone.value }); | 89 | const { code } = await smsAPI({ phone: phone.value }); |
| 90 | if (code) { | 90 | if (code) { |
| 91 | - Toast.success('发送成功'); | 91 | + showSuccessToast('发送成功'); |
| 92 | } | 92 | } |
| 93 | }; | 93 | }; |
| 94 | 94 | ||
| ... | @@ -97,8 +97,8 @@ export const useLogin = () => { | ... | @@ -97,8 +97,8 @@ export const useLogin = () => { |
| 97 | 97 | ||
| 98 | /** | 98 | /** |
| 99 | * 用户登录 | 99 | * 用户登录 |
| 100 | - * @param {*} phone | 100 | + * @param {*} phone |
| 101 | - * @param {*} pin | 101 | + * @param {*} pin |
| 102 | */ | 102 | */ |
| 103 | const $router = useRouter(); | 103 | const $router = useRouter(); |
| 104 | const onSubmit = async (values) => { | 104 | const onSubmit = async (values) => { | ... | ... |
| 1 | /* | 1 | /* |
| 2 | * @Date: 2022-06-13 17:42:32 | 2 | * @Date: 2022-06-13 17:42:32 |
| 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 4 | - * @LastEditTime: 2022-06-18 21:14:42 | 4 | + * @LastEditTime: 2024-11-27 09:39:25 |
| 5 | * @FilePath: /tswj/src/composables/useShare.js | 5 | * @FilePath: /tswj/src/composables/useShare.js |
| 6 | * @Description: 文件描述 | 6 | * @Description: 文件描述 |
| 7 | */ | 7 | */ |
| 8 | import wx from 'weixin-js-sdk'; | 8 | import wx from 'weixin-js-sdk'; |
| 9 | -// import { Toast } from 'vant'; | ||
| 10 | 9 | ||
| 11 | /** | 10 | /** |
| 12 | * @description: 微信分享功能 | 11 | * @description: 微信分享功能 | ... | ... |
| 1 | /* | 1 | /* |
| 2 | * @Date: 2022-05-17 11:26:03 | 2 | * @Date: 2022-05-17 11:26:03 |
| 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 3 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 4 | - * @LastEditTime: 2022-06-20 14:00:13 | 4 | + * @LastEditTime: 2024-11-27 09:34:47 |
| 5 | * @FilePath: /tswj/src/utils/generatePackage.js | 5 | * @FilePath: /tswj/src/utils/generatePackage.js |
| 6 | * @Description: 文件描述 | 6 | * @Description: 文件描述 |
| 7 | */ | 7 | */ |
| ... | @@ -11,7 +11,7 @@ import _ from 'lodash' | ... | @@ -11,7 +11,7 @@ import _ from 'lodash' |
| 11 | import axios from '@/utils/axios'; | 11 | import axios from '@/utils/axios'; |
| 12 | import { storeToRefs } from 'pinia' | 12 | import { storeToRefs } from 'pinia' |
| 13 | import { mainStore } from '@/store' | 13 | import { mainStore } from '@/store' |
| 14 | -import { Toast, Dialog } from 'vant'; | 14 | +import { showToast, showSuccessToast, showFailToast, Dialog } from 'vant'; |
| 15 | import { wxInfo, hasEllipsis } from '@/utils/tools'; | 15 | import { wxInfo, hasEllipsis } from '@/utils/tools'; |
| 16 | import { useTitle } from '@vueuse/core' | 16 | import { useTitle } from '@vueuse/core' |
| 17 | 17 | ||
| ... | @@ -22,7 +22,9 @@ export { | ... | @@ -22,7 +22,9 @@ export { |
| 22 | axios, | 22 | axios, |
| 23 | storeToRefs, | 23 | storeToRefs, |
| 24 | mainStore, | 24 | mainStore, |
| 25 | - Toast, | 25 | + showToast, |
| 26 | + showSuccessToast, | ||
| 27 | + showFailToast, | ||
| 26 | Dialog, | 28 | Dialog, |
| 27 | wxInfo, | 29 | wxInfo, |
| 28 | hasEllipsis, | 30 | hasEllipsis, | ... | ... |
| ... | @@ -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: 2024-11-11 15:58:45 | 5 | + * @LastEditTime: 2024-11-27 09:39:44 |
| 6 | * @FilePath: /tswj/src/views/client/bookDetail.vue | 6 | * @FilePath: /tswj/src/views/client/bookDetail.vue |
| 7 | * @Description: | 7 | * @Description: |
| 8 | --> | 8 | --> |
| ... | @@ -123,7 +123,7 @@ | ... | @@ -123,7 +123,7 @@ |
| 123 | <script setup> | 123 | <script setup> |
| 124 | import { ref, onActivated, onMounted } 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 { _, storeToRefs, mainStore, Toast, hasEllipsis } from '@/utils/generatePackage' | 126 | +import { _, storeToRefs, mainStore, showSuccessToast, 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' |
| ... | @@ -213,10 +213,10 @@ const onSubscribe = async () => { | ... | @@ -213,10 +213,10 @@ const onSubscribe = async () => { |
| 213 | const { msg } = await addSubscribeAPI({ book_id: $route.query.id }); | 213 | const { msg } = await addSubscribeAPI({ book_id: $route.query.id }); |
| 214 | if (msg === 'add subscribe OK') { | 214 | if (msg === 'add subscribe OK') { |
| 215 | bookInfo.value.is_subscribe = true; | 215 | bookInfo.value.is_subscribe = true; |
| 216 | - Toast.success('订阅成功') | 216 | + showSuccessToast('订阅成功') |
| 217 | } else { | 217 | } else { |
| 218 | bookInfo.value.is_subscribe = false; | 218 | bookInfo.value.is_subscribe = false; |
| 219 | - Toast.success('取消订阅') | 219 | + showSuccessToast('取消订阅') |
| 220 | } | 220 | } |
| 221 | } | 221 | } |
| 222 | 222 | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | * @Author: hookehuyr hookehuyr@gmail.com | 2 | * @Author: hookehuyr hookehuyr@gmail.com |
| 3 | * @Date: 2022-04-26 16:06:31 | 3 | * @Date: 2022-04-26 16:06:31 |
| 4 | * @LastEditors: hookehuyr hookehuyr@gmail.com | 4 | * @LastEditors: hookehuyr hookehuyr@gmail.com |
| 5 | - * @LastEditTime: 2022-07-01 17:50:15 | 5 | + * @LastEditTime: 2024-11-27 09:40:12 |
| 6 | * @FilePath: /tswj/src/views/client/finishUpload.vue | 6 | * @FilePath: /tswj/src/views/client/finishUpload.vue |
| 7 | * @Description: 作品上传成功提示页面 | 7 | * @Description: 作品上传成功提示页面 |
| 8 | --> | 8 | --> |
| ... | @@ -40,6 +40,8 @@ import { ref, onMounted } from 'vue' | ... | @@ -40,6 +40,8 @@ import { ref, onMounted } from 'vue' |
| 40 | import { useRoute, useRouter } from 'vue-router' | 40 | import { useRoute, useRouter } from 'vue-router' |
| 41 | import { prepareDonateAPI } from '@/api/C/donate.js' | 41 | import { prepareDonateAPI } from '@/api/C/donate.js' |
| 42 | 42 | ||
| 43 | +import { showFailToast } from 'vant'; | ||
| 44 | + | ||
| 43 | const $route = useRoute(); | 45 | const $route = useRoute(); |
| 44 | const $router = useRouter(); | 46 | const $router = useRouter(); |
| 45 | 47 | ||
| ... | @@ -48,7 +50,7 @@ const $router = useRouter(); | ... | @@ -48,7 +50,7 @@ const $router = useRouter(); |
| 48 | const book_id = $route.query.x_field_1 ? $route.query.x_field_1.split('-')[1] : ''; | 50 | const book_id = $route.query.x_field_1 ? $route.query.x_field_1.split('-')[1] : ''; |
| 49 | const { userInfo } = useDefaultPerf(book_id); | 51 | const { userInfo } = useDefaultPerf(book_id); |
| 50 | if (!book_id) { | 52 | if (!book_id) { |
| 51 | - Toast.fail('书籍数据不全'); | 53 | + showFailToast('书籍数据不全'); |
| 52 | } | 54 | } |
| 53 | 55 | ||
| 54 | const donateInfo = ref({}) | 56 | const donateInfo = ref({}) | ... | ... |
| ... | @@ -80,7 +80,7 @@ import { useRoute, onBeforeRouteLeave } from 'vue-router' | ... | @@ -80,7 +80,7 @@ import { useRoute, onBeforeRouteLeave } from 'vue-router' |
| 80 | import { storeToRefs } from 'pinia' | 80 | import { storeToRefs } from 'pinia' |
| 81 | import { MyButton, VideoCard, DonateFlower } from '@/utils/generateModules' | 81 | import { MyButton, VideoCard, DonateFlower } from '@/utils/generateModules' |
| 82 | import { icon_avatar, no_image, icon_flower } from '@/utils/generateIcons.js' | 82 | import { icon_avatar, no_image, icon_flower } from '@/utils/generateIcons.js' |
| 83 | -import { _, Toast } from '@/utils/generatePackage.js' | 83 | +import { _, showSuccessToast } from '@/utils/generatePackage.js' |
| 84 | import { addPages, store } from '@/hooks/useKeepAlive' | 84 | import { addPages, store } from '@/hooks/useKeepAlive' |
| 85 | import { perfInfoAPI, addFollowAPI } from '@/api/C/perf.js' | 85 | import { perfInfoAPI, addFollowAPI } from '@/api/C/perf.js' |
| 86 | import { useScrollTop } from '@/composables'; | 86 | import { useScrollTop } from '@/composables'; |
| ... | @@ -173,10 +173,10 @@ const followUser = async () => { | ... | @@ -173,10 +173,10 @@ const followUser = async () => { |
| 173 | const { msg } = await addFollowAPI({ perf_id: $route.query.perf_id }); | 173 | const { msg } = await addFollowAPI({ perf_id: $route.query.perf_id }); |
| 174 | if (msg === 'add follow OK') { | 174 | if (msg === 'add follow OK') { |
| 175 | userInfo.value.is_follow = 1 | 175 | userInfo.value.is_follow = 1 |
| 176 | - Toast.success('关注成功') | 176 | + showSuccessToast('关注成功') |
| 177 | } else { | 177 | } else { |
| 178 | userInfo.value.is_follow = 0 | 178 | userInfo.value.is_follow = 0 |
| 179 | - Toast.success('取消关注') | 179 | + showSuccessToast('取消关注') |
| 180 | } | 180 | } |
| 181 | }; | 181 | }; |
| 182 | 182 | ... | ... |
| ... | @@ -56,7 +56,7 @@ import { no_image, icon_avatar } from '@/utils/generateIcons.js' | ... | @@ -56,7 +56,7 @@ import { no_image, icon_avatar } from '@/utils/generateIcons.js' |
| 56 | import { ref, onActivated } from 'vue' | 56 | import { ref, onActivated } from 'vue' |
| 57 | import { onBeforeRouteLeave } from 'vue-router' | 57 | import { onBeforeRouteLeave } from 'vue-router' |
| 58 | import _ from 'lodash' | 58 | import _ from 'lodash' |
| 59 | -import { Toast, Dialog } from 'vant'; | 59 | +import { showSuccessToast, Dialog } from 'vant'; |
| 60 | // import { addPages } from '@/hooks/useKeepAlive' | 60 | // import { addPages } from '@/hooks/useKeepAlive' |
| 61 | import goToVideoDetail from '@/router/methods/videoDetail' | 61 | import goToVideoDetail from '@/router/methods/videoDetail' |
| 62 | import { myCommentAPI, delCommentAPI } from '@/api/C/me' | 62 | import { myCommentAPI, delCommentAPI } from '@/api/C/me' |
| ... | @@ -137,7 +137,7 @@ const deleteComment = (id: string) => { // 删除评论 | ... | @@ -137,7 +137,7 @@ const deleteComment = (id: string) => { // 删除评论 |
| 137 | if (result) { | 137 | if (result) { |
| 138 | // 移除当前选中评论,避免刷新页面 | 138 | // 移除当前选中评论,避免刷新页面 |
| 139 | _.remove(commentList.value, comment => comment.id === id); | 139 | _.remove(commentList.value, comment => comment.id === id); |
| 140 | - Toast.success('删除成功'); | 140 | + showSuccessToast('删除成功'); |
| 141 | if (!commentList.value.length) { | 141 | if (!commentList.value.length) { |
| 142 | onLoad() | 142 | onLoad() |
| 143 | } | 143 | } | ... | ... |
-
Please register or login to post a comment