From 4140d8e8d662b7b3ec0dafb3b9636955e4fd9a6c Mon Sep 17 00:00:00 2001
From: pplokijuhyg <1162963624@qq.com>
Date: Sat, 28 Dec 2019 10:13:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=99=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/yue/yuedetail/yuedetail.js   |  4 +-
 components/yue/yuedetail/yuedetail.wxml |  6 +--
 components/yue/yuetop/yuetop.js         |  2 +-
 components/yue/yuetop/yuetop.wxml       |  2 +-
 pages/yue/yue.js                        | 55 ++++++++++++++++---------
 pages/yue/yue.wxml                      | 21 +++++-----
 6 files changed, 53 insertions(+), 37 deletions(-)

diff --git a/components/yue/yuedetail/yuedetail.js b/components/yue/yuedetail/yuedetail.js
index be367cd..3508117 100644
--- a/components/yue/yuedetail/yuedetail.js
+++ b/components/yue/yuedetail/yuedetail.js
@@ -4,7 +4,9 @@ Component({
    * 组件的属性列表
    */
   properties: {
-
+    money:String,
+    date:String,
+    time:String
   },
 
   /**
diff --git a/components/yue/yuedetail/yuedetail.wxml b/components/yue/yuedetail/yuedetail.wxml
index 74002d8..42d3da0 100644
--- a/components/yue/yuedetail/yuedetail.wxml
+++ b/components/yue/yuedetail/yuedetail.wxml
@@ -1,7 +1,7 @@
 <view class="yuedetail">
     <view class="left">
-        <view class="date">2017-02-21</view>
-        <view class="time">17:23:25</view>
+        <view class="date">{{date}}</view>
+        <view class="time">{{time}}</view>
     </view>
-    <view class="right">-1234.00</view>
+    <view class="right">{{money}}</view>
 </view>
\ No newline at end of file
diff --git a/components/yue/yuetop/yuetop.js b/components/yue/yuetop/yuetop.js
index 0ec4954..610e633 100644
--- a/components/yue/yuetop/yuetop.js
+++ b/components/yue/yuetop/yuetop.js
@@ -4,7 +4,7 @@ Component({
    * 组件的属性列表
    */
   properties: {
-
+    money:String
   },
 
   /**
diff --git a/components/yue/yuetop/yuetop.wxml b/components/yue/yuetop/yuetop.wxml
index 5f710cd..f1d4125 100644
--- a/components/yue/yuetop/yuetop.wxml
+++ b/components/yue/yuetop/yuetop.wxml
@@ -1,7 +1,7 @@
 <view class="yuetop">
     <view class="all">总资产</view>
     <view class="money">
-        <text>615.96</text>
+        <text>{{money}}</text>
         <text class="chong">充值</text>
     </view>
 </view>
\ No newline at end of file
diff --git a/pages/yue/yue.js b/pages/yue/yue.js
index e4c19fd..d824eba 100644
--- a/pages/yue/yue.js
+++ b/pages/yue/yue.js
@@ -1,23 +1,38 @@
-// pages/yue/yue.js
-Component({
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-
-  },
-
-  /**
-   * 组件的初始数据
-   */
+import bin from "../../utils/bin"
+Page({
   data: {
-
+    money:"",
+    list:[]
   },
-
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-
+  onLoad(a) {
+    bin.request({
+      url:"User/validateOpenid"
+    }).then((res)=>{
+      console.log(res)
+      if(res.data.code == 200){
+        this.setData({
+          money : res.data.data.user_money
+        })
+      }
+    })
+    bin.getuserid().then((userid) => {
+      bin.request({
+        url: "User/account",
+        urldata: {
+          user_id : userid,
+          page:0
+        }
+      }).then((res)=>{
+        console.log(res)
+        for(let i in res.data.result){
+          let linshi = res.data.result[i].change_time.split(" ")
+          res.data.result[i].date = linshi[0]
+          res.data.result[i].time = linshi[1]
+        }
+        this.setData({
+          list:res.data.result
+        })
+      })
+    })
   }
-})
+})
\ No newline at end of file
diff --git a/pages/yue/yue.wxml b/pages/yue/yue.wxml
index 2f88218..307b7fd 100644
--- a/pages/yue/yue.wxml
+++ b/pages/yue/yue.wxml
@@ -1,19 +1,18 @@
 <view class="yue">
-    <yuetop></yuetop>
+    <yuetop money="{{money}}"></yuetop>
     <view class="title">
-<yuetitle></yuetitle>
+        <yuetitle></yuetitle>
+    </view>
+    <view class="detail" wx:for="{{list}}" wx:key="{{index}}">
+        <yuedetail money="{{item.user_money}}" date="{{item.date}}" time="{{item.time}}"></yuedetail>
+    </view>
+    <!-- <view class="detail">
+        <yuedetail></yuedetail>
     </view>
     <view class="detail">
         <yuedetail></yuedetail>
     </view>
-        <view class="detail">
+    <view class="detail">
         <yuedetail></yuedetail>
-    </view>
-        <view class="detail">
-        <yuedetail></yuedetail>
-    </view>
-        <view class="detail">
-        <yuedetail></yuedetail>
-    </view>
-
+    </view> -->
 </view>
\ No newline at end of file