From 935f34238713b63a1f44fb12d09cd2512b1bd46d Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Wed, 23 Dec 2020 16:21:18 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app
---
hive-app/pages/workbench/orderList.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/hive-app/pages/workbench/orderList.vue b/hive-app/pages/workbench/orderList.vue
index 8bd4ef2..ccbbd16 100644
--- a/hive-app/pages/workbench/orderList.vue
+++ b/hive-app/pages/workbench/orderList.vue
@@ -18,7 +18,7 @@
}"
/>
<view class="list">
- <view class="list-item" v-for="item in 4">
+ <navigator url="./orderDetail" class="list-item" v-for="item in 4">
<view class="list-header">
<text>订单号: N202012123556</text>
<text class="blue">待付款</text>
@@ -42,7 +42,7 @@
<view class="list-footer">
<text class="blue-btn small-btn">取消订单</text>
</view>
- </view>
+ </navigator>
</view>
</view>
</view>
@@ -86,7 +86,7 @@
background: #F6F6F8;
}
.header{
- padding: 10px;
+ padding: 10px 10px 5px;
background: #FFFFFF;
}
.tab{
@@ -99,25 +99,26 @@
margin: 10px;
color: #3a3f3f;
border: 1px solid #EDEAF4;
+ padding: 0 10px;
}
.list-header{
display: flex;
justify-content: space-between;
- padding: 12px 15px;
+ padding: 12px 0;
font-size: 15px;
border-bottom: 1px solid #EDEAF4;
}
.list-content{
display: flex;
justify-content: space-between;
- padding: 12px 15px;
+ padding: 12px 0;
font-size: 14px;
line-height: 28px;
}
.list-footer{
display: flex;
justify-content: flex-end;
- padding: 10px 15px;
+ padding: 10px 0;
border-top: 1px solid #EDEAF4;
}
</style>
--
Gitblit v1.9.1