修改忘了
parent
af49453786
commit
06569963e7
|
|
@ -22,7 +22,7 @@ export default {
|
|||
},
|
||||
onShow: function () {
|
||||
console.log('App Show')
|
||||
this.isHaveNetwork()
|
||||
// this.isHaveNetwork()
|
||||
},
|
||||
onHide: function () {
|
||||
console.log('App Hide')
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
<template>
|
||||
<view>
|
||||
<!-- <view class="z-9999 relative">
|
||||
<uv-no-network @connected="onConnected"></uv-no-network>
|
||||
</view> -->
|
||||
<CuNavbar :isBack="false" title="首页">
|
||||
<template #center>
|
||||
<view class="w-full" v-if="checkPermission(['admin'])">
|
||||
|
|
@ -93,6 +96,11 @@ import checkUpdate from '@/pages/upgrade/check-update'
|
|||
checkUpdate()
|
||||
// #endif
|
||||
|
||||
const onConnected = () => {
|
||||
getData()
|
||||
userStore.fetchUserInfo()
|
||||
}
|
||||
|
||||
const userStore = useUserStore()
|
||||
const userInfo = computed(() => userStore.userInfo)
|
||||
const unread_notifications = computed(
|
||||
|
|
|
|||
|
|
@ -246,7 +246,7 @@ const rules = reactive({
|
|||
},
|
||||
sales: {
|
||||
required: true,
|
||||
message: '请输入总账销售合计',
|
||||
message: '请输入总账销售金额',
|
||||
},
|
||||
expenditure: {
|
||||
required: true,
|
||||
|
|
@ -311,13 +311,16 @@ function removeEmptyValues(datas) {
|
|||
}).filter(item => Object.keys(item).length !== 0); // 移除所有属性都为空的对象
|
||||
}
|
||||
const onSubmit = async () => {
|
||||
let valid = false
|
||||
filterLotteryData(form.items).forEach(item => {
|
||||
if (!item.sales) {
|
||||
valid = true
|
||||
return uni.showToast({
|
||||
title: `请填写${item.name}销售金额`,
|
||||
icon: 'none',
|
||||
})
|
||||
}
|
||||
valid = true
|
||||
if (!item.expenditure) {
|
||||
return uni.showToast({
|
||||
title: `请填写${item.name}兑奖金额`,
|
||||
|
|
@ -325,6 +328,7 @@ const onSubmit = async () => {
|
|||
})
|
||||
}
|
||||
})
|
||||
if (valid) return
|
||||
|
||||
const params = {
|
||||
date: form.date,
|
||||
|
|
@ -454,7 +458,7 @@ const salesChange = async () => {
|
|||
await nextTick()
|
||||
const val = form?.items || []
|
||||
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)
|
||||
}, 0)
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@ http.interceptors.request.use((config) => {
|
|||
if (token != null) {
|
||||
config.header.Authorization = `Bearer ${token}`;
|
||||
}
|
||||
|
||||
return config;
|
||||
}, (config) => {
|
||||
return Promise.reject(config);
|
||||
|
|
@ -83,9 +82,8 @@ http.interceptors.response.use(async (response) => {
|
|||
}
|
||||
return response.data;
|
||||
}, (error) => {
|
||||
|
||||
uni.showToast({
|
||||
title: error.errMsg,
|
||||
title: '网络异常请检查网络',
|
||||
icon: 'none'
|
||||
})
|
||||
return Promise.reject(error);
|
||||
|
|
|
|||
Loading…
Reference in New Issue