From 841dc290b2bd896e6873de1da54b36baaf1cb2d0 Mon Sep 17 00:00:00 2001
From: Gdpao <1341331954@qq.com>
Date: Sun, 20 Sep 2020 18:19:35 +0800
Subject: [PATCH] gdpao

---
 components/order-item/index.vue | 4 ++--
 pages/index/details.vue         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/order-item/index.vue b/components/order-item/index.vue
index c7c2960..a7988f2 100644
--- a/components/order-item/index.vue
+++ b/components/order-item/index.vue
@@ -19,8 +19,8 @@
 			<view class="name u-line-1">{{info.extend_order_goods[0].goods_name}}</view>
 			<view class="info">
 				<view class="num">共{{info.count_number}}件商品</view>
-				<view class="price">实付<span>￥{{info.order_amount}}</span></view>
-                <view class="time">{{ info.payment_time.slice(5,16) }}</view>
+				<view class="price">{{ info.view_type==10 ? "待支付" : "实付" }}<span>￥{{info.order_amount}}</span></view>
+                <view class="time">{{ info.view_type==10 ? info.add_time.slice(5,16) : info.payment_time.slice(5,16) }}</view>
 			</view>
 		</view>
 	</view>
diff --git a/pages/index/details.vue b/pages/index/details.vue
index f2a5cc3..6a85706 100644
--- a/pages/index/details.vue
+++ b/pages/index/details.vue
@@ -848,8 +848,8 @@ export default {
     .pain-box {
         .info-container {
             padding: 0 30rpx;
-            background-color: #ffffff;
             margin-bottom: 20rpx;
+            background-color: #ffffff;
             .remark {
                 padding: 10rpx 0;
                 height: 100%;