Browse Source

feat[litemall-wx, litemall-wx-api]: 显示订单留言

Junling Bu 6 years ago
parent
commit
f75bf9d742

+ 1 - 0
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());

+ 3 - 2
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>

+ 1 - 11
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;

+ 3 - 2
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>

+ 1 - 11
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;