From 5db8a6e8f24a3e0ca433777211a3226c311895fb Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Tue, 7 May 2019 14:48:44 +0800
Subject: [PATCH] =?UTF-8?q?chore[litemall-wx]:=20=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 litemall-wx/pages/index/index.js   |  2 +-
 litemall-wx/pages/index/index.wxml | 14 +++++++-------
 renard-wx/pages/index/index.wxml   | 14 +++++++-------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/litemall-wx/pages/index/index.js b/litemall-wx/pages/index/index.js
index 09ea4360..8e0d66d4 100644
--- a/litemall-wx/pages/index/index.js
+++ b/litemall-wx/pages/index/index.js
@@ -53,7 +53,7 @@ Page({
     });
     util.request(api.GoodsCount).then(function (res) {
       that.setData({
-        goodsCount: res.data.goodsCount
+        goodsCount: res.data
       });
     });
   },
diff --git a/litemall-wx/pages/index/index.wxml b/litemall-wx/pages/index/index.wxml
index 7a1a41d6..41245e71 100644
--- a/litemall-wx/pages/index/index.wxml
+++ b/litemall-wx/pages/index/index.wxml
@@ -61,20 +61,20 @@
     </view>
     <view class="b">
       <view class="item" wx:for="{{groupons}}" wx:for-index="index" wx:for-item="item" wx:key="id">
-        <navigator url="/pages/goods/goods?id={{item.goods.id}}">
-          <image class="img" src="{{item.goods.picUrl}}" background-size="cover"></image>
+        <navigator url="/pages/goods/goods?id={{item.id}}">
+          <image class="img" src="{{item.picUrl}}" background-size="cover"></image>
           <view class="right">
             <view class="text">
               <view class="header">
-                <text class="name">{{item.goods.name}}</text>
+                <text class="name">{{item.name}}</text>
                 <view class="capsule-tag">
-                  <zan-capsule color="#a78845" leftText="团购" rightText="{{item.groupon_member}}" />
+                  <zan-capsule color="#a78845" leftText="{{item.grouponMember}}人成团" rightText="立减{{item.grouponDiscount}}" />
                 </view>
               </view>
-              <text class="desc">{{item.goods.brief}}</text>
+              <text class="desc">{{item.brief}}</text>
               <view class="price">
-                <view class="counterPrice">原价：￥{{item.goods.counterPrice}}</view>
-                <view class="retailPrice">现价：￥{{item.groupon_price}}</view>
+                <view class="counterPrice">现价：￥{{item.retailPrice}}</view>
+                <view class="retailPrice">团购价：￥{{item.grouponPrice}}</view>
               </view>
             </view>
           </view>
diff --git a/renard-wx/pages/index/index.wxml b/renard-wx/pages/index/index.wxml
index eeca0f6d..506cb8ac 100644
--- a/renard-wx/pages/index/index.wxml
+++ b/renard-wx/pages/index/index.wxml
@@ -50,20 +50,20 @@
     </view>
     <view class="b">
       <view class="item" wx:for="{{groupons}}" wx:for-index="index" wx:for-item="item" wx:key="id">
-        <navigator url="/pages/goods/goods?id={{item.goods.id}}">
-          <image class="img" src="{{item.goods.picUrl}}" background-size="cover"></image>
+        <navigator url="/pages/goods/goods?id={{item.id}}">
+          <image class="img" src="{{item.picUrl}}" background-size="cover"></image>
           <view class="right">
             <view class="text">
               <view class="header">
-                <text class="name">{{item.goods.name}}</text>
+                <text class="name">{{item.name}}</text>
                 <view class="capsule-tag">
-                  <zan-capsule color="#a78845" leftText="团购" rightText="{{item.groupon_member}}" />
+                  <zan-capsule color="#a78845" leftText="{{item.grouponMember}}人成团" rightText="立减{{item.grouponDiscount}}" />
                 </view>
               </view>
-              <text class="desc">{{item.goods.brief}}</text>
+              <text class="desc">{{item.brief}}</text>
               <view class="price">
-                <view class="counterPrice">原价：￥{{item.goods.counterPrice}}</view>
-                <view class="retailPrice">团购价：￥{{item.groupon_price}}</view>
+                <view class="counterPrice">原价：￥{{item.retailPrice}}</view>
+                <view class="retailPrice">团购价：￥{{item.grouponPrice}}</view>
               </view>
             </view>
           </view>