diff --git a/src/App.vue b/src/App.vue index 40fda31..5824b61 100644 --- a/src/App.vue +++ b/src/App.vue @@ -22,10 +22,37 @@ export default { }, onShow: function () { console.log('App Show') + this.isHaveNetwork() }, onHide: function () { console.log('App Hide') }, + methods: { + isHaveNetwork() { + uni.getNetworkType({ + success: (res) => { + if (res.networkType == 'none') { + uni.showModal({ + title: '网络不给力~', + content: '是否重新连接', + showCancel: true, + confirmText: '是', + cancelText: '不了', + success: (res) => { + if (res.confirm) { + setTimeout(() => { + this.isHaveNetwork() //再次判断 + }, 200) + } + }, + }) + } + }, + fail: (err) => console.error('调用失败'), + complete: () => {}, + }) + }, + }, } diff --git a/src/pages/revert/index.vue b/src/pages/revert/index.vue index e57d9f2..0a94185 100644 --- a/src/pages/revert/index.vue +++ b/src/pages/revert/index.vue @@ -150,9 +150,10 @@ class="fixed z-10 bottom-0 left-0 right-0 h-120rpx bg-white flex-center box-border px-base" :style="style" > + userStore.userInfo || {}) const store = computed(() => userInfo.value.store) const endDate = timeFormat(new Date(), 'yyyy-mm-dd') - +const isRule = computed(()=>{ + return !form.allow_rereport || !checkPermission(['store']) +}) const form = reactive({ date: endDate, @@ -451,6 +454,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) return add(a, b?.sales ?? 0) }, 0) @@ -461,6 +465,7 @@ const expenditureChange = async () => { await nextTick() const val = form?.items || [] const expenditure = val.reduce((a, b) => { + if(b.operator=='-') return sub(a, b?.expenditure ?? 0) return add(a, b?.expenditure ?? 0) }, 0) form.expenditure = expenditure || 0