diff --git a/pages/index/tradingPlatform.vue b/pages/index/tradingPlatform.vue index 78484f4..26b0803 100644 --- a/pages/index/tradingPlatform.vue +++ b/pages/index/tradingPlatform.vue @@ -71,10 +71,10 @@ mixinsListApi: 'getMyProductlist', type: [ { - name: this.$t('other.spotTrading') + name: this.$t('other.futuresTrading') }, { - name: this.$t('other.futuresTrading') + name: this.$t('other.spotTrading') }, ], chartData: [ diff --git a/pages_order/components/order/myOrderList.vue b/pages_order/components/order/myOrderList.vue index abd0bd0..121bd06 100644 --- a/pages_order/components/order/myOrderList.vue +++ b/pages_order/components/order/myOrderList.vue @@ -38,15 +38,22 @@ 提货时间:{{ item.takeTime }} - - - + + 审核状态:{{ item.auditStatus == 0? '审核中' : (item.auditStatus == 1? '审核通过' : '审核未通过') }} + + + + + + + + 取消订单 @@ -135,6 +142,7 @@ height: calc(90vh - 180rpx); .content { + position: relative; margin: 10rpx 0; .box-flex{ display: flex; @@ -142,8 +150,8 @@ .left { width: 200rpx; height: 100%; - height: 100%; border-radius: 10rpx; + flex-shrink: 0; image { width: 100%; @@ -175,5 +183,12 @@ } + .tip { + width: 80rpx; + height: 80rpx; + position: absolute; + top: 20rpx; + right: 20rpx; + } } \ No newline at end of file diff --git a/pages_order/components/order/orderList.vue b/pages_order/components/order/orderList.vue index ce92a4e..1c587c1 100644 --- a/pages_order/components/order/orderList.vue +++ b/pages_order/components/order/orderList.vue @@ -39,12 +39,17 @@ - - - - + + + + + diff --git a/pages_order/tradingPlatform/nowOrder.vue b/pages_order/tradingPlatform/nowOrder.vue index 7b53ccc..ef256ae 100644 --- a/pages_order/tradingPlatform/nowOrder.vue +++ b/pages_order/tradingPlatform/nowOrder.vue @@ -49,12 +49,12 @@ + v-if="fatherData.reportVideo"> 检测视频 + v-for="(item, index) in fatherData.reportVideo.split(',')">