From cd1194c57789bc3d605438e67e9ce72aa2f19b81 Mon Sep 17 00:00:00 2001
From: houdelin <houdelin@bayekeji.com>
Date: Mon, 21 Nov 2016 18:20:29 +0800
Subject: [PATCH] add my assets

---
 app.json                   |  3 ++-
 pages/mine/mine.js         |  6 +++++
 pages/mine/mine.wxml       |  2 +-
 pages/my_assets/index.js   | 52 ++++++++++++++++++++++++++++++++++++++
 pages/my_assets/index.wxml |  3 +++
 pages/my_assets/index.wxss |  0
 6 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 pages/my_assets/index.js
 create mode 100644 pages/my_assets/index.wxml
 create mode 100644 pages/my_assets/index.wxss

diff --git a/app.json b/app.json
index 870dd38..b3a7c83 100644
--- a/app.json
+++ b/app.json
@@ -5,7 +5,8 @@
     "pages/address/address",
     "pages/cart/cart",
     "pages/mine/mine",
-    "pages/category/category"
+    "pages/category/category",
+    "pages/my_assets/index"
   ],
   "window":{
     "backgroundColor": "#f2f2f2",
diff --git a/pages/mine/mine.js b/pages/mine/mine.js
index ec557e3..ae90272 100644
--- a/pages/mine/mine.js
+++ b/pages/mine/mine.js
@@ -19,6 +19,12 @@ Page({
   onShow: function() {
   },
 
+  bindShowAsset: function (e) {
+    wx.navigateTo({
+      url: `../my_assets/index?id=${e.currentTarget.dataset.id}`
+    })
+  },
+
   onLoad: function() {
     var that = this
     var token = wx.getStorageSync('userToken')
diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml
index 4f1ec2a..6e30b94 100644
--- a/pages/mine/mine.wxml
+++ b/pages/mine/mine.wxml
@@ -39,7 +39,7 @@
       <scroll-view scroll-x="true">
         <view class="long-view">
           <block wx:for="{{zichan_slides}}" wx:for-item="slide" wx:key="id">
-            <view class="item">
+            <view class="item" bindtap="bindShowAsset" data-id="{{slide.id}}">
               <view class="image">
                 <image class="slide-img" src="{{slide.image}}"/>
               </view>
diff --git a/pages/my_assets/index.js b/pages/my_assets/index.js
new file mode 100644
index 0000000..fc2c888
--- /dev/null
+++ b/pages/my_assets/index.js
@@ -0,0 +1,52 @@
+const product = require('../../utils/product.js')
+Page({
+  data: {
+    items: [],
+    slides: [],
+    navs: [{icon: "../../images/asset.png",       name: "资产"},
+           {icon: "../../images/direct_sale.png", name: "直销"},
+           {icon: "../../images/our_select.png",  name: "甄选"},
+           {icon: "../../images/packing.png",     name: "包装"}],
+
+    popularity_products: [],
+    new_products: [],
+    hot_products: [],
+    promotions: []
+  },
+
+  bindShowProduct: function (e) {
+    wx.navigateTo({
+      url: `../show_product/show_product?id=${e.currentTarget.dataset.id}`
+    })
+  },
+
+  catchTapCategory: function (e) {
+    wx.navigateTo({
+      url: `../category/category?type=${e.currentTarget.dataset.type}`
+    })
+  },
+
+  onLoad: function() {
+    var that = this
+
+    product.getSlides(function(result) {
+      var data = getApp().store.sync(result.data)
+      that.setData({'slides': data})
+      wx.setStorage({
+        key:"indexSlides",
+        data:data
+      })
+    })
+
+    product.getProducts(function(result) {
+      var data = getApp().store.sync(result.data)
+      that.setData({
+        items: data,
+        popularity_products: data.filter(product => product.flag === '最热'),
+        new_products:        data.filter(product => product.flag === '新品'),
+        hot_products:        data.filter(product => product.flag === '火爆'),
+      })
+      wx.setStorageSync('products', data)
+    })
+  }
+})
diff --git a/pages/my_assets/index.wxml b/pages/my_assets/index.wxml
new file mode 100644
index 0000000..e82feaf
--- /dev/null
+++ b/pages/my_assets/index.wxml
@@ -0,0 +1,3 @@
+<view>
+<view>my_assets</view>
+</view>
diff --git a/pages/my_assets/index.wxss b/pages/my_assets/index.wxss
new file mode 100644
index 0000000..e69de29