From 3db533a39b83883548ecb1de665998667f0b42b3 Mon Sep 17 00:00:00 2001
From: houdelin <houdelin@bayekeji.com>
Date: Fri, 25 Nov 2016 15:28:53 +0800
Subject: [PATCH] add my assets show

---
 pages/my_assets/show.js   |  5 +++--
 pages/my_assets/show.wxml | 25 ++++++++++++++++---------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/pages/my_assets/show.js b/pages/my_assets/show.js
index b303fc5..e04ad7d 100644
--- a/pages/my_assets/show.js
+++ b/pages/my_assets/show.js
@@ -2,6 +2,7 @@ const my_assets = require('../../utils/my_assets.js')
 
 Page({
   data: {
+    my_asset: '',
   },
 
   onLoad: function(params) {
@@ -9,9 +10,9 @@ Page({
 
     my_assets.getAsset(params.sku, function(result) {
       var data = getApp().store.sync(result.data)
-      that.setData({'my_assets': data})
+      that.setData({'my_asset': data})
       wx.setStorage({
-        key: "my_assets",
+        key: "my_asset",
         data: data
       })
     })
diff --git a/pages/my_assets/show.wxml b/pages/my_assets/show.wxml
index deab350..187c6dc 100644
--- a/pages/my_assets/show.wxml
+++ b/pages/my_assets/show.wxml
@@ -1,12 +1,19 @@
 <view>
-<view>show</view>
-</view>
+<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>
 
 
-<view class="my_assets">
-  <block wx:for-items="{{my_assets}}">
-    <view class="nav-item">
-      <text>{{item.name}}</text>
-    </view>
-  </block>
-</view>
\ No newline at end of file
+<block wx:for="{{my_asset['inventory-changes']}}" wx:for-item="inventory_change">
+  <view class="item">
+    <text>原因{{inventory_change.reason}}</text>
+    <text>数量{{inventory_change.quantity + ci.unit}}</text>
+  </view>
+</block>
+</view>