From 026bcc87c73b5a0f8e6da5e5989781df199b5b5e Mon Sep 17 00:00:00 2001
From: Dong Fei <dongfei@shucong.com>
Date: Fri, 18 May 2018 10:03:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0.gitignore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 91ad4fa4..b1f0472b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /private/
 /storage/
 /litemall.iml
+.idea
\ No newline at end of file

From 6f44ee71c139fad16e5de8bab7c242438fbe962b Mon Sep 17 00:00:00 2001
From: Dong Fei <dongfei@shucong.com>
Date: Fri, 18 May 2018 11:10:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix[litemall-wx]:=20=E8=A7=A3=E5=86=B3iOS?=
 =?UTF-8?q?=E4=B8=8B=E7=82=B9=E5=87=BB=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=90=8E=E5=BA=95=E9=83=A8=E6=8C=89=E9=92=AE=E6=B6=88?=
 =?UTF-8?q?=E5=A4=B1=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 litemall-wx/pages/goods/goods.wxml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/litemall-wx/pages/goods/goods.wxml b/litemall-wx/pages/goods/goods.wxml
index 4a259cc5..a517d1b2 100644
--- a/litemall-wx/pages/goods/goods.wxml
+++ b/litemall-wx/pages/goods/goods.wxml
@@ -130,18 +130,18 @@
       </view>
     </view>
   </view>
-  <view class="bottom-btn">
-    <view class="l l-collect {{ openAttr ? 'back' : ''}}" bindtap="closeAttrOrCollect">
-      <image class="icon" src="{{ collectBackImage }}"></image>
-    </view>
-    <view class="l l-cart">
-      <view class="box">
-        <text class="cart-count">{{cartGoodsCount}}</text>
-        <image bindtap="openCartPage" class="icon" src="/static/images/ic_menu_shoping_nor.png"></image>
-      </view>
-    </view>
-    <view class="c" bindtap="addFast" wx:if="{{!soldout}}">立即购买</view>
-    <view class="r" bindtap="addToCart" wx:if="{{!soldout}}">加入购物车</view>
-    <view class="n" wx:if="{{soldout}}">商品已售空</view>
+</scroll-view>
+<view class="bottom-btn">
+  <view class="l l-collect {{ openAttr ? 'back' : ''}}" bindtap="closeAttrOrCollect">
+    <image class="icon" src="{{ collectBackImage }}"></image>
   </view>
-</scroll-view>
\ No newline at end of file
+  <view class="l l-cart">
+    <view class="box">
+      <text class="cart-count">{{cartGoodsCount}}</text>
+      <image bindtap="openCartPage" class="icon" src="/static/images/ic_menu_shoping_nor.png"></image>
+    </view>
+  </view>
+  <view class="c" bindtap="addFast" wx:if="{{!soldout}}">立即购买</view>
+  <view class="r" bindtap="addToCart" wx:if="{{!soldout}}">加入购物车</view>
+  <view class="n" wx:if="{{soldout}}">商品已售空</view>
+</view>
\ No newline at end of file