diff --git a/app.json b/app.json index b3a7c83..d3bfb6a 100644 --- a/app.json +++ b/app.json @@ -6,7 +6,7 @@ "pages/cart/cart", "pages/mine/mine", "pages/category/category", - "pages/my_assets/index" + "pages/my_assets/show" ], "window":{ "backgroundColor": "#f2f2f2", diff --git a/pages/mine/mine.js b/pages/mine/mine.js index ae90272..8abdecb 100644 --- a/pages/mine/mine.js +++ b/pages/mine/mine.js @@ -21,7 +21,7 @@ Page({ bindShowAsset: function (e) { wx.navigateTo({ - url: `../my_assets/index?id=${e.currentTarget.dataset.id}` + url: `../my_assets/show?id=${e.currentTarget.dataset.id}` }) }, diff --git a/pages/my_assets/index.js b/pages/my_assets/index.js deleted file mode 100644 index fc2c888..0000000 --- a/pages/my_assets/index.js +++ /dev/null @@ -1,52 +0,0 @@ -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 deleted file mode 100644 index e82feaf..0000000 --- a/pages/my_assets/index.wxml +++ /dev/null @@ -1,3 +0,0 @@ - -my_assets - diff --git a/pages/my_assets/index.wxss b/pages/my_assets/show.js similarity index 100% rename from pages/my_assets/index.wxss rename to pages/my_assets/show.js diff --git a/pages/my_assets/show.wxml b/pages/my_assets/show.wxml new file mode 100644 index 0000000..6c5197f --- /dev/null +++ b/pages/my_assets/show.wxml @@ -0,0 +1,3 @@ + +show + diff --git a/pages/my_assets/show.wxss b/pages/my_assets/show.wxss new file mode 100644 index 0000000..e69de29