Commit 61ab3971 authored by 琉璃丶c's avatar 琉璃丶c

1.修改路由文件eslint问题

2.修改物流页面路由问题
parent 1dc0da38
...@@ -18,11 +18,11 @@ const myOrder = [ ...@@ -18,11 +18,11 @@ const myOrder = [
component: resolve => require(['@/views/myOrder/detail/orderDetail'], resolve) component: resolve => require(['@/views/myOrder/detail/orderDetail'], resolve)
}, },
{ {
path:"/goodsInfo", path: '/goodsInfo',
name:"goodsInfo", name: 'goodsInfo',
meta:{ meta: {
title:'商品信息', title: '商品信息',
auth:false auth: false
}, },
component: resolve => require(['@/views/myOrder/goodsInfo'], resolve) component: resolve => require(['@/views/myOrder/goodsInfo'], resolve)
}, },
...@@ -35,6 +35,5 @@ const myOrder = [ ...@@ -35,6 +35,5 @@ const myOrder = [
}, },
component: resolve => require(['@/views/myOrder/detail/logisticsDetail'], resolve) component: resolve => require(['@/views/myOrder/detail/logisticsDetail'], resolve)
} }
] ]
export default myOrder export default myOrder
...@@ -23,6 +23,18 @@ export default { ...@@ -23,6 +23,18 @@ export default {
logo: require('@/assets/img/u48.png') logo: require('@/assets/img/u48.png')
} }
} }
},
mounted() {
// 设置标题栏关闭返回按钮
this.$store.commit('setNavBar', {
show: true,
leftArrow: true,
rightIcon: false,
title: '',
leftText: '物流详情',
leftClick: null,
rightClick: null
})
} }
} }
</script> </script>
......
...@@ -52,24 +52,24 @@ ...@@ -52,24 +52,24 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 订单商品 --> <!-- 订单商品 -->
<div class="order-common order-goods"> <div class="order-common order-goods">
<div class="goods-all"> <div class="goods-all">
<span class="all-title">商品信息</span> <span class="all-title">商品信息</span>
全部 全部
<van-icon class="title-arrow" name="arrow"/> <van-icon class="title-arrow" name="arrow"/>
</div> </div>
<goods-simple-item /> <goods-simple-item/>
<goods-simple-item /> <goods-simple-item/>
</div> </div>
<!-- 订单发票信息 --> <!-- 订单发票信息 -->
<div class="order-common order-invoice"> <div class="order-common order-invoice">
<div class="invoice-all"> <div class="invoice-all">
<span class="all-title">发票信息</span> <span class="all-title">发票信息</span>
全部 全部
<van-icon class="title-arrow" name="arrow"/> <van-icon class="title-arrow" name="arrow"/>
</div> </div>
<invoice-simple-item /> <invoice-simple-item/>
</div> </div>
</div> </div>
</template> </template>
...@@ -110,8 +110,9 @@ export default { ...@@ -110,8 +110,9 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.order-detail { .order-detail {
overflow: auto; overflow: auto;
font-size:12px; font-size: 12px;
height: calc(100vh - 46px); height: calc(100vh - 46px);
.order-common { .order-common {
padding: 10px; padding: 10px;
border-radius: 4px; border-radius: 4px;
...@@ -275,37 +276,43 @@ export default { ...@@ -275,37 +276,43 @@ export default {
.goods-all { .goods-all {
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom:10px; margin-bottom: 10px;
.all-title { .all-title {
flex: 1; flex: 1;
font-size: 14px; font-size: 14px;
color:#000; color: #000;
font-weight: 400; font-weight: 400;
} }
.title-arrow { .title-arrow {
font-size: 15px; font-size: 15px;
//margin-top: 1px; //margin-top: 1px;
margin-left:6px; margin-left: 6px;
} }
} }
} }
/*订单发票*/ /*订单发票*/
.order-invoice { .order-invoice {
margin-bottom:20px; margin-bottom: 20px;
.invoice-all { .invoice-all {
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom:10px; margin-bottom: 10px;
.all-title { .all-title {
flex: 1; flex: 1;
font-size: 14px; font-size: 14px;
color:#000; color: #000;
font-weight: 400; font-weight: 400;
} }
.title-arrow { .title-arrow {
font-size: 15px; font-size: 15px;
//margin-top: 1px; //margin-top: 1px;
margin-left:6px; margin-left: 6px;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment