From 76000a08cdf76ad198712955e88bb75b8c40395b Mon Sep 17 00:00:00 2001
From: Ge Hao <althoughghgh@gmail.com>
Date: Fri, 9 Dec 2016 16:57:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/category/category.js         | 5 +++++
 pages/show_product/show_product.js | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pages/category/category.js b/pages/category/category.js
index 2de9020..3ef8f25 100644
--- a/pages/category/category.js
+++ b/pages/category/category.js
@@ -43,6 +43,10 @@ Page({
   bindTapProduct: function(e) {
     var that = this
 
+    wx.navigateTo({
+      url: `../show_product/show_product?id=${e.currentTarget.dataset.id}&type=${this.data.categoryType}`
+    })
+/*
     // 管到屏蔽
     if (this.data.categoryType === '管到') {
       wx.showModal({
@@ -96,5 +100,6 @@ Page({
       icon: 'success',
       duration: 1000
     })
+*/
   }
 })
diff --git a/pages/show_product/show_product.js b/pages/show_product/show_product.js
index 4e4dea9..33674a9 100644
--- a/pages/show_product/show_product.js
+++ b/pages/show_product/show_product.js
@@ -26,7 +26,12 @@ Page({
     } catch (e) {
     }
 
-    var allProducts = wx.getStorageSync('products')
+    var allProducts
+    if (params.type) {
+      allProducts = wx.getStorageSync(`cate_${params.type}`)
+    } else {
+      allProducts = wx.getStorageSync('products')
+    }
     var id = params.id
     var product = allProducts.filter(function(i){
       return i.id === id