From 35460964b58c92b3a34538f361e15f1c6982be27 Mon Sep 17 00:00:00 2001 From: xingyy <373639591@qq.com> Date: Tue, 26 Sep 2023 14:47:10 +0800 Subject: [PATCH 1/5] submit --- pages/order-goods/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/order-goods/index.vue b/pages/order-goods/index.vue index 65249e6..a1274c0 100644 --- a/pages/order-goods/index.vue +++ b/pages/order-goods/index.vue @@ -47,7 +47,7 @@
{{ item.artworkName }}
-
订单号:{{ item.artworkName }}
+
{{ item.artworkSquareSize }}平尺
{{ item.startAt }}-{{ item.endAt }}
From 757a8dd4667685dd2cc67c7052f21fd74290c573 Mon Sep 17 00:00:00 2001 From: xingyy <373639591@qq.com> Date: Tue, 26 Sep 2023 14:53:51 +0800 Subject: [PATCH 2/5] submit --- pages/order-goods/index.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pages/order-goods/index.vue b/pages/order-goods/index.vue index a1274c0..40737e0 100644 --- a/pages/order-goods/index.vue +++ b/pages/order-goods/index.vue @@ -60,10 +60,13 @@
{{ statusValue.find(x => x.value === item.artworkStatus).label }}
-
-
货架号:
+
+
货架号:
{{ item.shelvesNum }}
+
+
{{item.warehouseName}}
+
From 7217e97f2c6d2dee532d79d5ba04ec685709b189 Mon Sep 17 00:00:00 2001 From: xingyy <373639591@qq.com> Date: Tue, 26 Sep 2023 16:17:28 +0800 Subject: [PATCH 3/5] submit --- pages/contract/index.vue | 5 ++++- pages/order-goods/index.vue | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pages/contract/index.vue b/pages/contract/index.vue index 154048e..1839407 100644 --- a/pages/contract/index.vue +++ b/pages/contract/index.vue @@ -42,8 +42,11 @@ export default { elementBottom:'' } }, - mounted(){ + onShow(){ this.getData() + }, + mounted(){ + this.getDistanceFromTopToPageBottom('.content3') }, diff --git a/pages/order-goods/index.vue b/pages/order-goods/index.vue index 40737e0..9ab6bee 100644 --- a/pages/order-goods/index.vue +++ b/pages/order-goods/index.vue @@ -111,7 +111,7 @@ export default { }, components: {UImage, tabbar}, mounted() { - this.getData() + uni.getSystemInfo({ success: (res) => { this.windowWidth = res.windowWidth @@ -119,6 +119,10 @@ export default { }) this.getDistanceFromTopToPageBottom('.content3') }, + onShow(){ + this.getData() + }, + computed: {}, methods: { popForward() { From 2ac4c3074997e8524aa9e6be463c110b139e9a6f Mon Sep 17 00:00:00 2001 From: xingyy <373639591@qq.com> Date: Tue, 26 Sep 2023 18:19:51 +0800 Subject: [PATCH 4/5] submit --- pages/contract/index.vue | 1 - pages/mine/index.vue | 4 ++-- pages/order-goods/index.vue | 8 +++++++- pages/order-goods/order-details.vue | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pages/contract/index.vue b/pages/contract/index.vue index 1839407..f49dce2 100644 --- a/pages/contract/index.vue +++ b/pages/contract/index.vue @@ -7,7 +7,6 @@
--> -
合同名称
合同编号
diff --git a/pages/mine/index.vue b/pages/mine/index.vue index 16246d1..d4e47d3 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -3,12 +3,12 @@
{{orderTotal}}
-
当前订单总量
+
画作寄存量
{{validContractDays}}
-
当前有效合同数
+
寄存即将到期画作
diff --git a/pages/order-goods/index.vue b/pages/order-goods/index.vue index 9ab6bee..a164255 100644 --- a/pages/order-goods/index.vue +++ b/pages/order-goods/index.vue @@ -49,7 +49,13 @@
{{ item.artworkName }}
{{ item.artworkSquareSize }}平尺
-
{{ item.startAt }}-{{ item.endAt }}
+
+
+ {{ item.startAt ||''}}-{{ item.endAt||'' }} +
+
{{item.cycleName}}
+ +
diff --git a/pages/order-goods/order-details.vue b/pages/order-goods/order-details.vue index b712521..3ee96d0 100644 --- a/pages/order-goods/order-details.vue +++ b/pages/order-goods/order-details.vue @@ -80,7 +80,7 @@
{{info.cycleName}}
-
{{`${info.startAt}-${info.endAt}`}}
+
{{`${info.startAt || ''}-${info.endAt || ''}`}}
From d4e1dc0fd32fe109a27053b99f363f8448224700 Mon Sep 17 00:00:00 2001 From: xingyy <373639591@qq.com> Date: Tue, 26 Sep 2023 18:43:07 +0800 Subject: [PATCH 5/5] submit --- components/uiq-tabbar/uiq-tabbar.vue | 2 +- pages/order-goods/index.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/components/uiq-tabbar/uiq-tabbar.vue b/components/uiq-tabbar/uiq-tabbar.vue index 6ea6404..c2d0993 100644 --- a/components/uiq-tabbar/uiq-tabbar.vue +++ b/components/uiq-tabbar/uiq-tabbar.vue @@ -1,6 +1,6 @@