diff --git a/manifest.json b/manifest.json index d9a7a22..1b2f52e 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "优购商城", "appid" : "__UNI__8B19741", "description" : "", - "versionName" : "1.4.1", - "versionCode" : 141, + "versionName" : "1.4.2", + "versionCode" : 142, "transformPx" : false, "app-plus" : { "privacy" : { diff --git a/pages/home/staff.vue b/pages/home/staff.vue index 2fb9d46..e78c994 100644 --- a/pages/home/staff.vue +++ b/pages/home/staff.vue @@ -87,7 +87,17 @@ let cardPages = ref(null); let height = ref('100%'); let sysInfo = uni.getSystemInfoSync(); - height.value = sysInfo.windowHeight - sysInfo.statusBarHeight - uni.upx2px(88) + 'px'; + const headerHeight = uni.upx2px(248); + const headerMargin = uni.upx2px(64); + const listTopMargin = uni.upx2px(16); + height.value = + sysInfo.windowHeight - + sysInfo.statusBarHeight - + uni.upx2px(88) - + headerHeight - + headerMargin - + listTopMargin + + 'px'; const sum_list = ref([{ text: '总人数', value: 0, diff --git a/pages/index/listRecord.vue b/pages/index/listRecord.vue index 8b60bce..98afaed 100644 --- a/pages/index/listRecord.vue +++ b/pages/index/listRecord.vue @@ -88,7 +88,7 @@ const items = Array.isArray(order?.items) ? order.items : []; const firstItem = items[0] || {}; const titleText = firstItem?.spuName || order?.no || '-'; - const qty = Number(order?.productCount ?? 0) || 0; + const qty = Number(firstItem?.count ?? 0) || 0; const statusText = formatOrderStatus(order || {}); const sumItemTotalPrice = items.reduce((acc, cur) => acc + (Number(cur?.totalPrice) || 0), 0); const sumItemTotalRevenue = items.reduce((acc, cur) => acc + (Number(cur?.totalRevenue) || 0), 0); diff --git a/pages/index/startPage.vue b/pages/index/startPage.vue index f6e89e2..0b88e9b 100644 --- a/pages/index/startPage.vue +++ b/pages/index/startPage.vue @@ -34,7 +34,7 @@ @click="onMediaClick" /> @@ -49,24 +49,29 @@