From 5989263b6d8c9e341a1a590ee525bdb9a9070886 Mon Sep 17 00:00:00 2001
From: Ge Hao <althoughghgh@gmail.com>
Date: Mon, 20 Feb 2017 15:17:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=B7=BB=E5=8A=A0=E5=88=B0?=
 =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E7=9A=84=E5=BC=B9=E7=AA=97=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/show_product/show_product.js   | 27 ++++++++++++++++++++-
 pages/show_product/show_product.wxml | 35 +++++++++++++++++++++++++++-
 pages/show_product/show_product.wxss |  5 ++++
 3 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/pages/show_product/show_product.js b/pages/show_product/show_product.js
index 8aae962..f4da819 100644
--- a/pages/show_product/show_product.js
+++ b/pages/show_product/show_product.js
@@ -10,7 +10,8 @@ Page({
     windowHeight: 667,
     pixelRatio: 2,
     accountType: '',
-    from_share: false
+    from_share: false,
+    addProductAnimation: {}
   },
 
   onShareAppMessage: function () {
@@ -96,6 +97,12 @@ Page({
       }
     }
 
+
+
+    this.popAddProduct()
+
+
+
     var cartItems = wx.getStorageSync('cartItems') || []
 
     var exist = cartItems.filter(function(ele){
@@ -126,5 +133,23 @@ Page({
         url: '../cart/cart'
       })
     }
+  },
+
+  popAddProduct: function () {
+    if (this.count) {
+      this.count = this.count + 1
+    } else {
+      this.count = 1
+    }
+    var animation = wx.createAnimation({
+      duration: 800,
+      timingFunction: 'ease',
+    })
+    var y = this.count % 2 === 0 ? 200 : -200
+    animation.translateY(y).step()
+
+    this.setData({
+      addProductAnimation: animation.export()
+    })
   }
 })
diff --git a/pages/show_product/show_product.wxml b/pages/show_product/show_product.wxml
index 0af0149..9b976be 100644
--- a/pages/show_product/show_product.wxml
+++ b/pages/show_product/show_product.wxml
@@ -39,4 +39,37 @@
 
 <navigator id="back-to-home" url="/pages/index/index" open-type="switchTab" hover-class="">
   <image src="../../images/back_to_home.png"></image>
-</navigator>
\ No newline at end of file
+</navigator>
+
+
+
+
+<view class="mall_tan_content" animation="{{addProductAnimation}}">
+  <view class="mall_tan_color">
+    <!--<image class="head-img" src="{{product['image-url']}}" mode="aspectFit" />-->
+    <view class="mall_bottom_word">
+      <view>{{product.name}}</view>
+      <view wx:if="{{ accountType === '巴爷' }}">
+        <text id="price">巴爷价：¥{{product['baye-price']}}</text>
+      </view>
+      <view wx:else>
+        <text id="price">¥{{product['member-price']}}</text>
+      </view>
+    </view>
+    <!--<image class="head-img" src="../../images/1.png" mode="aspectFit" />-->
+
+    <view wx:if="{{product['category-id'] === 18}}">
+      <view class="inventory_mold">
+        <text>商品类型</text>
+        <view>
+          <button>普通</button>
+          <button>实体卡</button>
+        </view>
+        <view></view>
+      </view>
+    </view>
+    <view class="mall_tan_num">
+      <text>购买数量：</text>
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/pages/show_product/show_product.wxss b/pages/show_product/show_product.wxss
index a0675c1..a5ca443 100644
--- a/pages/show_product/show_product.wxss
+++ b/pages/show_product/show_product.wxss
@@ -62,4 +62,9 @@
 #back-to-home image {
   width: 100rpx;
   height: 100rpx;
+}
+
+.mall_tan_content {
+  position: fixed;
+  bottom: 0;
 }
\ No newline at end of file