From 7f55234a759a71b0b9451eff2641e516d339fb98 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Fri, 1 Nov 2024 15:11:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
http/yskApi/http.js | 4 ++--
pageConsumables/addConsumables.vue | 3 ++-
pageConsumables/editConsumables.vue | 2 +-
pageConsumables/inventoryCheck.vue | 7 +++++--
pageUser/index/components/user.vue | 6 +++---
pageUser/index/index.vue | 4 ++--
pages/index/components/my-date-pickerview.vue | 8 ++++----
pages/index/components/statistics.vue | 8 +++++++-
8 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/http/yskApi/http.js b/http/yskApi/http.js
index b3305c5..abded03 100644
--- a/http/yskApi/http.js
+++ b/http/yskApi/http.js
@@ -17,13 +17,13 @@ import infoBox from "@/commons/utils/infoBox.js"
import go from '@/commons/utils/go.js';
import { reject } from 'lodash';
// 测试服
-// let baseUrl = 'https://admintestpapi.sxczgkj.cn'
+let baseUrl = 'https://admintestpapi.sxczgkj.cn'
//预发布
// let baseUrl = 'https://pre-cashieradmin.sxczgkj.cn'
//正式
-let baseUrl = 'https://cashieradmin.sxczgkj.cn'
+// let baseUrl = 'https://cashieradmin.sxczgkj.cn'
// 王伟本地测
// let baseUrl = '/ww'
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) {