From 2d3f85249b81912590d40e64ee3a4c1dbd064d81 Mon Sep 17 00:00:00 2001
From: Ge Hao <althoughghgh@gmail.com>
Date: Sat, 21 Jan 2017 09:28:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=8AcodeFloating=E7=9A=84=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E6=94=BE=E5=9C=A8=E4=B8=80=E4=B8=AAdata=20object?=
 =?UTF-8?q?=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/show_product/show_product.js   | 44 +++++++++++++++-------------
 pages/show_product/show_product.wxml |  4 +--
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/pages/show_product/show_product.js b/pages/show_product/show_product.js
index 9ef7946..c107bec 100644
--- a/pages/show_product/show_product.js
+++ b/pages/show_product/show_product.js
@@ -12,18 +12,20 @@ Page({
     accountType: '',
     from_share: false,
 
-    codeFloatingData: {},
-    codeFloatingStyle: {
-      width: 100,
-      height: 100
-    },
-    codeFloatingState: 'small',
-    codeFloatingPos: {
-      left: 650,
-      top: 650
-    },
-    codeFloatingUrl: '',
-    codeFloatingImgStyle: ''
+    codeFloating: {
+      data: {},
+      style: {
+        width: 100,
+        height: 100
+      },
+      pos: {
+        left: 650,
+        top: 650
+      },
+      state: 'small',
+      url: '',
+      imgStyle: ''
+    }
   },
 
   onShareAppMessage: function () {
@@ -83,7 +85,7 @@ Page({
 
     var reqPath = {path: `pages/show_product/show_product?id=${this.data.product.id}&share=1`}
     productUtil.getProductPageQrCode(reqPath, function(resp){
-      that.setData({codeFloatingUrl: resp.data.url})
+      that.setData({'codeFloating.url': resp.data.url})
     })
   },
 
@@ -148,7 +150,7 @@ Page({
 
   changeCodeState: function (e) {
     var ratio = 750 / this.data.windowWidth
-    var eleStyle = this.data.codeFloatingStyle
+    var eleStyle = this.data.codeFloating.style
     var pos = e.touches[0]
 
     var eleLeft = pos.clientX - eleStyle.width / ratio / 2
@@ -173,8 +175,8 @@ Page({
     })
     animation.left(`${eleLeft}rpx`).top(`${eleTop}rpx`).step()
     this.setData({
-      codeFloatingData: animation.export(),
-      codeFloatingPos: {left: eleLeft, top: eleTop}
+      'codeFloating.data': animation.export(),
+      'codeFloating.pos': {left: eleLeft, top: eleTop}
     })
   },
 
@@ -185,21 +187,21 @@ Page({
     })
 
     var state, width
-    if (this.data.codeFloatingState == "small") {
+    if (this.data.codeFloating.state == "small") {
       width = "750rpx"
       state = 'big'
       animation.left(0).top('100rpx').width(width).height(width).step()
     } else {
       width = "100rpx"
-      let pos = this.data.codeFloatingPos
+      let pos = this.data.codeFloating.pos
       state = 'small'
       animation.left(`${pos.left}rpx`).top(`${pos.top}rpx`).width(width).height(width).step()
     }
 
     this.setData({
-      codeFloatingData: animation.export(),
-      codeFloatingState: state,
-      codeFloatingImgStyle: `width: ${width}; height: ${width};`
+      'codeFloating.data': animation.export(),
+      'codeFloating.state': state,
+      'codeFloating.imgStyle': `width: ${width}; height: ${width};`
     })
   }
 })
diff --git a/pages/show_product/show_product.wxml b/pages/show_product/show_product.wxml
index 5de4e5c..65d2546 100644
--- a/pages/show_product/show_product.wxml
+++ b/pages/show_product/show_product.wxml
@@ -37,6 +37,6 @@
   </view>
 </view>
 
-<view id="codeFloating" catchtouchmove="changeCodeState" catchtap="catchScaleCode" animation="{{codeFloatingData}}">
-  <image src="{{codeFloatingUrl || '../../images/1.png'}}" style="{{codeFloatingImgStyle}}"></image>
+<view id="codeFloating" catchtouchmove="changeCodeState" catchtap="catchScaleCode" animation="{{'codeFloating.data'}}">
+  <image src="{{codeFloating.url}}" style="{{codeFloating.imgStyle}}"></image>
 </view>
\ No newline at end of file