Merge pull request #1 from linlinjava/master

同步更新代码

litemall-wx/pages/ucenter/orderDetail/orderDetail.wxml

 <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>

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;

pom.xml

@@ -115,7 +115,7 @@
             <dependency>
                 <groupId>com.qcloud</groupId>
                 <artifactId>cos_api</artifactId>
-                <version>5.4.4</version>
+                <version>5.6.8</version>
             </dependency>
 
             <dependency>

renard-wx/pages/cart/cart.wxml

@@ -31,7 +31,7 @@
                     <text class="name">{{item.goodsName}}</text>
                     <text class="num">x{{item.number}}</text>
                   </view>
-                  <view class="attr">{{ isEditCart ? '已选择:' : ''}}{{item.goodsSpecificationValues||''}}</view>
+                  <view class="attr">{{ isEditCart ? '已选择:' : ''}}{{item.specifications||''}}</view>
                   <view class="b">
                     <text class="price">￥{{item.price}}</text>
                     <view class="selnum">

renard-wx/pages/ucenter/orderDetail/orderDetail.wxml

 <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>

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;