修改忘了

main
ihzero 2024-05-13 22:21:33 +08:00
parent af49453786
commit 06569963e7
4 changed files with 16 additions and 6 deletions

View File

@ -22,7 +22,7 @@ export default {
}, },
onShow: function () { onShow: function () {
console.log('App Show') console.log('App Show')
this.isHaveNetwork() // this.isHaveNetwork()
}, },
onHide: function () { onHide: function () {
console.log('App Hide') console.log('App Hide')

View File

@ -1,5 +1,8 @@
<template> <template>
<view> <view>
<!-- <view class="z-9999 relative">
<uv-no-network @connected="onConnected"></uv-no-network>
</view> -->
<CuNavbar :isBack="false" title="首页"> <CuNavbar :isBack="false" title="首页">
<template #center> <template #center>
<view class="w-full" v-if="checkPermission(['admin'])"> <view class="w-full" v-if="checkPermission(['admin'])">
@ -93,6 +96,11 @@ import checkUpdate from '@/pages/upgrade/check-update'
checkUpdate() checkUpdate()
// #endif // #endif
const onConnected = () => {
getData()
userStore.fetchUserInfo()
}
const userStore = useUserStore() const userStore = useUserStore()
const userInfo = computed(() => userStore.userInfo) const userInfo = computed(() => userStore.userInfo)
const unread_notifications = computed( const unread_notifications = computed(

View File

@ -246,7 +246,7 @@ const rules = reactive({
}, },
sales: { sales: {
required: true, required: true,
message: '请输入总账销售合计', message: '请输入总账销售金额',
}, },
expenditure: { expenditure: {
required: true, required: true,
@ -311,13 +311,16 @@ function removeEmptyValues(datas) {
}).filter(item => Object.keys(item).length !== 0); // }).filter(item => Object.keys(item).length !== 0); //
} }
const onSubmit = async () => { const onSubmit = async () => {
let valid = false
filterLotteryData(form.items).forEach(item => { filterLotteryData(form.items).forEach(item => {
if (!item.sales) { if (!item.sales) {
valid = true
return uni.showToast({ return uni.showToast({
title: `请填写${item.name}销售金额`, title: `请填写${item.name}销售金额`,
icon: 'none', icon: 'none',
}) })
} }
valid = true
if (!item.expenditure) { if (!item.expenditure) {
return uni.showToast({ return uni.showToast({
title: `请填写${item.name}兑奖金额`, title: `请填写${item.name}兑奖金额`,
@ -325,6 +328,7 @@ const onSubmit = async () => {
}) })
} }
}) })
if (valid) return
const params = { const params = {
date: form.date, date: form.date,
@ -454,7 +458,7 @@ const salesChange = async () => {
await nextTick() await nextTick()
const val = form?.items || [] const val = form?.items || []
const sales = val.reduce((a, b) => { const sales = val.reduce((a, b) => {
if(b.operator=='-') return sub(a, b?.expenditure ?? 0) if(b.operator=='-') return sub(a, b?.sales ?? 0)
return add(a, b?.sales ?? 0) return add(a, b?.sales ?? 0)
}, 0) }, 0)

View File

@ -40,7 +40,6 @@ http.interceptors.request.use((config) => {
if (token != null) { if (token != null) {
config.header.Authorization = `Bearer ${token}`; config.header.Authorization = `Bearer ${token}`;
} }
return config; return config;
}, (config) => { }, (config) => {
return Promise.reject(config); return Promise.reject(config);
@ -83,9 +82,8 @@ http.interceptors.response.use(async (response) => {
} }
return response.data; return response.data;
}, (error) => { }, (error) => {
uni.showToast({ uni.showToast({
title: error.errMsg, title: '网络异常请检查网络',
icon: 'none' icon: 'none'
}) })
return Promise.reject(error); return Promise.reject(error);