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 @@
-
diff --git a/pages/contract/index.vue b/pages/contract/index.vue
index 154048e..f49dce2 100644
--- a/pages/contract/index.vue
+++ b/pages/contract/index.vue
@@ -7,7 +7,6 @@
-->
-
合同名称
合同编号
@@ -42,8 +41,11 @@ export default {
elementBottom:''
}
},
- mounted(){
+ onShow(){
this.getData()
+ },
+ mounted(){
+
this.getDistanceFromTopToPageBottom('.content3')
},
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 65249e6..db9a241 100644
--- a/pages/order-goods/index.vue
+++ b/pages/order-goods/index.vue
@@ -47,9 +47,15 @@
{{ item.artworkName }}
-
订单号:{{ item.artworkName }}
+
{{ item.artworkSquareSize }}平尺
-
{{ item.startAt }}-{{ item.endAt }}
+
+
+ {{ item.startAt ||''}}-{{ item.endAt||'' }}
+
+
{{item.cycleName}}
+
+
@@ -60,10 +66,13 @@
{{ statusValue.find(x => x.value === item.artworkStatus).label }}
-
-
货架号:
+
+
货架号:
{{ item.shelvesNum }}
+
+
{{item.warehouseName}}
+
@@ -76,6 +85,7 @@
@confirm="popForward"
>
+
@@ -108,7 +118,7 @@ export default {
},
components: {UImage, tabbar},
mounted() {
- this.getData()
+
uni.getSystemInfo({
success: (res) => {
this.windowWidth = res.windowWidth
@@ -116,6 +126,10 @@ export default {
})
this.getDistanceFromTopToPageBottom('.content3')
},
+ onShow(){
+ this.getData()
+ },
+
computed: {},
methods: {
popForward() {
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 || ''}`}}