From f2a607eca3961d59b8fa72fd638e27d600573a53 Mon Sep 17 00:00:00 2001
From: Ge Hao <althoughghgh@gmail.com>
Date: Thu, 1 Dec 2016 15:11:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9C=AA=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E7=9A=84=20my=20asset=20=E8=AF=A6=E6=83=85=E9=A1=B5=EF=BC=88fo?=
 =?UTF-8?q?r=20=E5=AE=A1=E6=A0=B8=E7=89=88=E6=9C=AC=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                  |  3 +--
 pages/mine/mine.js        |  6 ------
 pages/my_assets/show.js   | 22 ----------------------
 pages/my_assets/show.wxml | 23 -----------------------
 pages/my_assets/show.wxss |  0
 utils/my_assets.js        | 16 ----------------
 6 files changed, 1 insertion(+), 69 deletions(-)
 delete mode 100644 pages/my_assets/show.js
 delete mode 100644 pages/my_assets/show.wxml
 delete mode 100644 pages/my_assets/show.wxss
 delete mode 100644 utils/my_assets.js

diff --git a/app.json b/app.json
index 3b04385..1206756 100644
--- a/app.json
+++ b/app.json
@@ -6,8 +6,7 @@
     "pages/cart/cart",
     "pages/cart/coupon",
     "pages/mine/mine",
-    "pages/category/category",
-    "pages/my_assets/show"
+    "pages/category/category"
   ],
   "window":{
     "backgroundColor": "#f2f2f2",
diff --git a/pages/mine/mine.js b/pages/mine/mine.js
index cc7bc00..da3b7ae 100644
--- a/pages/mine/mine.js
+++ b/pages/mine/mine.js
@@ -22,12 +22,6 @@ Page({
   onShow: function() {
   },
 
-  bindShowAsset: function (e) {
-    wx.navigateTo({
-      url: `../my_assets/show?sku=${e.currentTarget.dataset.sku}`
-    })
-  },
-
   onLoad: function() {
     var that = this
 
diff --git a/pages/my_assets/show.js b/pages/my_assets/show.js
deleted file mode 100644
index f215257..0000000
--- a/pages/my_assets/show.js
+++ /dev/null
@@ -1,22 +0,0 @@
-const my_assets = require('../../utils/my_assets.js')
-
-Page({
-  data: {
-    my_asset: '',
-    years: '',
-  },
-
-  onLoad: function(params) {
-    var that = this
-
-    my_assets.getAsset(params.sku, function(result) {
-      var data = getApp().store.sync(result.data)
-      that.setData({'my_asset': data})
-      that.setData({'years': Object.keys(data['inventory-changes'])})
-      wx.setStorage({
-        key: "my_asset",
-        data: data
-      })
-    })
-  }
-})
diff --git a/pages/my_assets/show.wxml b/pages/my_assets/show.wxml
deleted file mode 100644
index b63830f..0000000
--- a/pages/my_assets/show.wxml
+++ /dev/null
@@ -1,23 +0,0 @@
-<view>
-<image src="{{my_asset['product-icon']}}"></image>
-<text>{{my_asset.product.name}}</text>
-<text>资产编号{{my_asset.no}}</text>
-<text>{{my_asset.product.unit}}</text>
-
-<block wx:for="{{my_asset['sub-products']}}" wx:for-item="sub_product">
-  <view class="item">
-    <text>{{sub_product.name}} {{sub_product.stock}}</text>
-  </view>
-</block>
-
-<block wx:for="{{years}}" wx:for-item="year">
-    <text>{{year}}</text>
-    <block wx:for="{{my_asset['inventory-changes'][year]}}" wx:for-item="inventory_change">
-      <view class="item">
-        <text>原因{{inventory_change.reason}}</text>
-        <text>数量{{(inventory_change.quantity)/1000}}克</text>
-      </view>
-    </block>
-</block>
-
-</view>
diff --git a/pages/my_assets/show.wxss b/pages/my_assets/show.wxss
deleted file mode 100644
index e69de29..0000000
diff --git a/utils/my_assets.js b/utils/my_assets.js
deleted file mode 100644
index b095d49..0000000
--- a/utils/my_assets.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const app = getApp()
-
-function getAsset (sku, resolve) {
-  app.request({
-    url: `${app.globalData.API_URL}/my_assets/${sku}`,
-    success: resolve,
-    fail: function(){}
-  })
-}
-
-
-module.exports = {
-  getAsset(sku, resolve) {
-    return getAsset(sku, resolve)
-  }
-}