diff --git a/pageConsumables/addConsumables.vue b/pageConsumables/addConsumables.vue index 69181c3..8bdc68f 100644 --- a/pageConsumables/addConsumables.vue +++ b/pageConsumables/addConsumables.vue @@ -25,7 +25,8 @@ 耗材价格 - + + diff --git a/pageConsumables/editConsumables.vue b/pageConsumables/editConsumables.vue index bca1e8a..759bda4 100644 --- a/pageConsumables/editConsumables.vue +++ b/pageConsumables/editConsumables.vue @@ -25,7 +25,7 @@ 耗材价格 - + diff --git a/pageConsumables/inventoryCheck.vue b/pageConsumables/inventoryCheck.vue index 94d4561..60eebad 100644 --- a/pageConsumables/inventoryCheck.vue +++ b/pageConsumables/inventoryCheck.vue @@ -14,7 +14,7 @@ 实际数量 - + @@ -85,7 +85,7 @@ if (datas.form.balance == '-') { return (0 - datas.item.balance) * datas.item.price } else { - return (datas.form.balance - datas.item.balance) * datas.item.price + return ((datas.form.balance - datas.item.balance) * datas.item.price).toFixed(2); } }) let profitNumber = computed(() => { @@ -98,6 +98,9 @@ }) function toggle() { + if(!datas.form.balance){ + return + } tbConsInfotbConCheck({ stockNumber: datas.form.balance, conInfoId: datas.form.id, diff --git a/pageUser/index/components/user.vue b/pageUser/index/components/user.vue index d58a222..ee6e0e8 100644 --- a/pageUser/index/components/user.vue +++ b/pageUser/index/components/user.vue @@ -28,7 +28,7 @@ - + {{data.amount}} 余额 @@ -37,7 +37,7 @@ - + {{data.totalScore}} 积分 @@ -46,7 +46,7 @@ - + {{0}} 优惠券 diff --git a/pageUser/index/index.vue b/pageUser/index/index.vue index c122d50..719625d 100644 --- a/pageUser/index/index.vue +++ b/pageUser/index/index.vue @@ -229,10 +229,10 @@ - 充值余额 + - + diff --git a/pages/index/components/my-date-pickerview.vue b/pages/index/components/my-date-pickerview.vue index df67817..288b21d 100644 --- a/pages/index/components/my-date-pickerview.vue +++ b/pages/index/components/my-date-pickerview.vue @@ -24,7 +24,7 @@ {{item}}日 - + {{item}}日 - + diff --git a/pages/index/components/statistics.vue b/pages/index/components/statistics.vue index d853223..fefcd0e 100644 --- a/pages/index/components/statistics.vue +++ b/pages/index/components/statistics.vue @@ -63,7 +63,13 @@ ] const currentInstance = getCurrentInstance() onShow((options) => { - getlist() + let iToken = uni.getStorageSync('iToken') + console.log(iToken,'调试123') + if(iToken){ + getlist() + }else{ + uni.redirectTo({url: '/pages/login/index'}) + } }); function getlist(start, end) {