From f75bf9d74209f8298cd675c7a233bb0d917e0eea Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Wed, 13 Nov 2019 23:17:12 +0800
Subject: [PATCH] =?UTF-8?q?feat[litemall-wx,=20litemall-wx-api]:=20?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=AE=A2=E5=8D=95=E7=95=99=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../litemall/wx/service/WxOrderService.java          |  1 +
 .../pages/ucenter/orderDetail/orderDetail.wxml       |  5 +++--
 .../pages/ucenter/orderDetail/orderDetail.wxss       | 12 +-----------
 renard-wx/pages/ucenter/orderDetail/orderDetail.wxml |  5 +++--
 renard-wx/pages/ucenter/orderDetail/orderDetail.wxss | 12 +-----------
 5 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxOrderService.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxOrderService.java
index 383efa53..a4b551ba 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxOrderService.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/service/WxOrderService.java
@@ -191,6 +191,7 @@ public class WxOrderService {
         Map<String, Object> orderVo = new HashMap<String, Object>();
         orderVo.put("id", order.getId());
         orderVo.put("orderSn", order.getOrderSn());
+        orderVo.put("message", order.getMessage());
         orderVo.put("addTime", order.getAddTime());
         orderVo.put("consignee", order.getConsignee());
         orderVo.put("mobile", order.getMobile());
diff --git a/litemall-wx/pages/ucenter/orderDetail/orderDetail.wxml b/litemall-wx/pages/ucenter/orderDetail/orderDetail.wxml
index de6797eb..00e3ebdb 100644
--- a/litemall-wx/pages/ucenter/orderDetail/orderDetail.wxml
+++ b/litemall-wx/pages/ucenter/orderDetail/orderDetail.wxml
@@ -1,7 +1,8 @@
 <view class="container">
   <view class="order-info">
-    <view class="item-a">下单时间：{{orderInfo.addTime}}</view>
-    <view class="item-b">订单编号：{{orderInfo.orderSn}}</view>
+    <view class="item">下单时间：{{orderInfo.addTime}}</view>
+    <view class="item">订单编号：{{orderInfo.orderSn}}</view>
+    <view class="item">订单留言：{{orderInfo.message}}</view>
     <view class="item-c">
       <view class="l">实付：
         <text class="cost">￥{{orderInfo.actualPrice}}</text>
diff --git a/litemall-wx/pages/ucenter/orderDetail/orderDetail.wxss b/litemall-wx/pages/ucenter/orderDetail/orderDetail.wxss
index 2669af95..90aabcd9 100644
--- a/litemall-wx/pages/ucenter/orderDetail/orderDetail.wxss
+++ b/litemall-wx/pages/ucenter/orderDetail/orderDetail.wxss
@@ -11,7 +11,7 @@ page {
   overflow: hidden;
 }
 
-.item-a {
+.item {
   padding-left: 31.25rpx;
   height: 42.5rpx;
   padding-bottom: 12.5rpx;
@@ -20,16 +20,6 @@ page {
   color: #666;
 }
 
-.item-b {
-  padding-left: 31.25rpx;
-  height: 29rpx;
-  line-height: 29rpx;
-  margin-top: 12.5rpx;
-  margin-bottom: 41.5rpx;
-  font-size: 30rpx;
-  color: #666;
-}
-
 .item-c {
   margin-left: 31.25rpx;
   border-top: 1px solid #f4f4f4;
diff --git a/renard-wx/pages/ucenter/orderDetail/orderDetail.wxml b/renard-wx/pages/ucenter/orderDetail/orderDetail.wxml
index 39115c8f..fe430330 100644
--- a/renard-wx/pages/ucenter/orderDetail/orderDetail.wxml
+++ b/renard-wx/pages/ucenter/orderDetail/orderDetail.wxml
@@ -1,7 +1,8 @@
 <view class="container">
   <view class="order-info">
-    <view class="item-a">下单时间：{{orderInfo.addTime}}</view>
-    <view class="item-b">订单编号：{{orderInfo.orderSn}}</view>
+    <view class="item">下单时间：{{orderInfo.addTime}}</view>
+    <view class="item">订单编号：{{orderInfo.orderSn}}</view>
+    <view class="item">订单留言：{{orderInfo.message}}</view>
     <view class="item-c">
       <view class="l">实付：
         <text class="cost">￥{{orderInfo.actualPrice}}</text>
diff --git a/renard-wx/pages/ucenter/orderDetail/orderDetail.wxss b/renard-wx/pages/ucenter/orderDetail/orderDetail.wxss
index 4b769cb5..8ed25d35 100644
--- a/renard-wx/pages/ucenter/orderDetail/orderDetail.wxss
+++ b/renard-wx/pages/ucenter/orderDetail/orderDetail.wxss
@@ -11,7 +11,7 @@ page {
   overflow: hidden;
 }
 
-.item-a {
+.item {
   padding-left: 31.25rpx;
   height: 42.5rpx;
   padding-bottom: 12.5rpx;
@@ -20,16 +20,6 @@ page {
   color: #666;
 }
 
-.item-b {
-  padding-left: 31.25rpx;
-  height: 29rpx;
-  line-height: 29rpx;
-  margin-top: 12.5rpx;
-  margin-bottom: 41.5rpx;
-  font-size: 30rpx;
-  color: #666;
-}
-
 .item-c {
   margin-left: 31.25rpx;
   border-top: 1px solid #f4f4f4;