diff --git a/src/components/Home.vue b/src/components/Home.vue index a603248..c81b3e7 100644 --- a/src/components/Home.vue +++ b/src/components/Home.vue @@ -98,8 +98,9 @@ export default { .bootm{ display: flex; /* height: 100%; */ - min-height:1000px; + /* min-height:1000px; */ background: #F0F2F5; + padding-top: 65px; } .turn-on-enter { diff --git a/src/components/dateSelect/order.vue b/src/components/dateSelect/order.vue index 55fef88..39e069d 100644 --- a/src/components/dateSelect/order.vue +++ b/src/components/dateSelect/order.vue @@ -363,6 +363,7 @@ this.orderDate=res.data let state=res.data[0].goods.status if(state==1 || state==5){ + this.columns2.pop() this.columns.pop() } // this.userinfo=res.data.userinfo @@ -382,10 +383,10 @@ if(res.code==200){ this.sourceDate=res.data this.newVisible1=true - let state=res.data[0].goods.status - if(state==1){ - this.columns2.pop() - } + // let state=res.data[0].goods.status + // if(state==1 || state==5){ + // this.columns.pop() + // } }else{ this.$message.error(res.msg); } diff --git a/src/components/page/order/closed.vue b/src/components/page/order/closed.vue index cb57cc0..b96fdab 100644 --- a/src/components/page/order/closed.vue +++ b/src/components/page/order/closed.vue @@ -37,7 +37,7 @@ --> 收费类型: - + 全部 免费 付费 @@ -45,7 +45,7 @@ 交易方式: - + 全部 转让 授权 @@ -114,7 +114,7 @@ export default { order_type:'', entrust_type:'', transaction_status:'5', - createtime:'', + createtime:[], goods_isli:'', charges_type:'', }, diff --git a/src/components/page/order/completed.vue b/src/components/page/order/completed.vue index c19d31e..c3684d6 100644 --- a/src/components/page/order/completed.vue +++ b/src/components/page/order/completed.vue @@ -114,7 +114,7 @@ export default { order_type:'', entrust_type:'', transaction_status:'4', - createtime:'', + createtime:[], goods_isli:'', charges_type:'', }, diff --git a/src/components/page/order/index.vue b/src/components/page/order/index.vue index b27e6f6..7c52092 100644 --- a/src/components/page/order/index.vue +++ b/src/components/page/order/index.vue @@ -128,7 +128,7 @@ export default { order_type:'', entrust_type:'', transaction_status:'', - createtime:'', + createtime:[], goods_isli:'', charges_type:'', }, diff --git a/src/components/page/order/toBeDelivered.vue b/src/components/page/order/toBeDelivered.vue index b0231d6..1a7914e 100644 --- a/src/components/page/order/toBeDelivered.vue +++ b/src/components/page/order/toBeDelivered.vue @@ -114,7 +114,7 @@ export default { order_type:'', entrust_type:'', transaction_status:'2', - createtime:'', + createtime:[], goods_isli:'', charges_type:'', }, diff --git a/src/components/page/order/toBeSettled.vue b/src/components/page/order/toBeSettled.vue index bf6bf5b..286a8e2 100644 --- a/src/components/page/order/toBeSettled.vue +++ b/src/components/page/order/toBeSettled.vue @@ -114,7 +114,7 @@ export default { order_type:'', entrust_type:'', transaction_status:'3', - createtime:'', + createtime:[], goods_isli:'', charges_type:'', },