From 1e33c1307e5e5e42b97b5a5880429ee6b736698a Mon Sep 17 00:00:00 2001
From: wangkesi <wangkesi@3ncto.com>
Date: Thu, 25 Oct 2018 17:00:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/view/order-check.vue | 50 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/src/view/order-check.vue b/src/view/order-check.vue
index 21f2230..17e9b99 100644
--- a/src/view/order-check.vue
+++ b/src/view/order-check.vue
@@ -4,6 +4,13 @@
             订单确认
         </back-header>
         <div class="top">
+            <div class="item-top">
+                <div class="item-top-left">
+                    <img src="../assets/images/order-list/address.png">
+                    <div class="item-top-address">{{info.merchantName}}</div>
+                </div>
+                <!-- <div class="item-top-state" :class="'state'+state">{{stateText}}</div> -->
+            </div>
             <div class="goods-container">
                 <img :src="imghost+info.goodsImgUrl">
                 <div class="goods-main-container">
@@ -304,11 +311,52 @@ export default {
 .top {
     margin-bottom: 0.18rem;
 }
+.item-top {
+    height: 0.65rem;
+    width: 100%;
+    background-color: white;
+    margin-top: 0.15rem;
+    border-bottom: 0.01rem solid #e5e5e5;
+    box-sizing: border-box;
+    font-size: 0.3rem;
+    display: flex;
+    justify-content: space-between;
+    width: 100%;
+    padding: 0 0.36rem 0 0.3rem;
+    line-height: 1;
+    align-items: center;
+    img {
+        width: 0.34rem;
+        height: 0.28rem;
+        margin-right: 0.2rem;
+    }
+    .item-top-left {
+        display: flex;
+        align-items: center;
+    }
+    .item-top-address {
+    }
+    .item-top-state {
+        color: #999;
+        font-size: 0.28rem;
+    }
+    .state0 {
+        color: #fcac21;
+    }
+    .state10 {
+        color: #00ba86;
+    }
+    .state11 {
+        color: #00ba86;
+    }
+    .state20 {
+        color: #fc4f21;
+    }
+}
 .goods-container {
     width: 100%;
     color: #333;
     height: 1.6rem;
-    margin-top: 0.1rem;
     background-color: white;
     display: flex;
     box-sizing: border-box;