From 2cf2683ed2da243a91793dfd2e250b678f1a7da4 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Tue, 20 Nov 2018 17:42:23 +0800
Subject: [PATCH] user

---
 alipay/pages/user-order/user-order.axml            | 4 ++--
 service/Application/Service/OrderService.class.php | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/alipay/pages/user-order/user-order.axml b/alipay/pages/user-order/user-order.axml
index 09f331493..925a3fbea 100755
--- a/alipay/pages/user-order/user-order.axml
+++ b/alipay/pages/user-order/user-order.axml
@@ -12,10 +12,10 @@
         <view class="list-item bg-white spacing-mb" a:if="{{data_list.length > 0}}" a:for="{{data_list}}">
             <view class="item-base oh br-b">
                 <text class="cr-666">{{item.add_time}}</text>
-                <text class="fr cr-main">{{item.status_text}}</text>
+                <text class="fr cr-main">{{item.status_name}}</text>
             </view>
             <navigator url="/pages/user-order-detail/user-order-detail?id={{item.id}}">
-                <view a:for="{{item.goods}}" a:for-item="items" class="goods-item oh">
+                <view a:for="{{item.items}}" a:for-item="items" class="goods-item oh">
                     <image class="goods-image fl" src="{{items.images}}" mode="aspectFill" />
                     <view class="goods-base">
                         <view class="goods-title multi-text">{{items.title}}</view>
diff --git a/service/Application/Service/OrderService.class.php b/service/Application/Service/OrderService.class.php
index f2df9b6b0..e2890548c 100755
--- a/service/Application/Service/OrderService.class.php
+++ b/service/Application/Service/OrderService.class.php
@@ -606,6 +606,9 @@ class OrderService
                     }
                     $v['items'] = $items;
                     $v['items_count'] = count($items);
+
+                    // 描述
+                    $v['describe'] = '共'.$v['items_count'].'件 合计:￥'.$v['total_price'].'元';
                 }
             }
         }