From 1088d64c937ebe0af43120f8fe70dcc99df4311a Mon Sep 17 00:00:00 2001
From: pplokijuhyg <1162963624@qq.com>
Date: Mon, 30 Dec 2019 09:05:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/yue/yongjintop/yongjintop.js | 3 +-
components/yue/yongjintop/yongjintop.scss | 3 +-
components/yue/yongjintop/yongjintop.wxml | 10 ++--
components/yue/yongjintop/yongjintop.wxss | 64 +----------------------
pages/yongjin/yongjin.js | 25 ++++++++-
pages/yongjin/yongjin.scss | 5 ++
pages/yongjin/yongjin.wxml | 15 +++---
pages/yongjin/yongjin.wxss | 8 +--
8 files changed, 48 insertions(+), 85 deletions(-)
diff --git a/components/yue/yongjintop/yongjintop.js b/components/yue/yongjintop/yongjintop.js
index fd400ec..9dc8cf1 100644
--- a/components/yue/yongjintop/yongjintop.js
+++ b/components/yue/yongjintop/yongjintop.js
@@ -4,7 +4,8 @@ Component({
* 组件的属性列表
*/
properties: {
-
+ tel:String,
+ img:String
},
/**
diff --git a/components/yue/yongjintop/yongjintop.scss b/components/yue/yongjintop/yongjintop.scss
index a7f3fa5..38a16a0 100644
--- a/components/yue/yongjintop/yongjintop.scss
+++ b/components/yue/yongjintop/yongjintop.scss
@@ -12,12 +12,13 @@
width: 130rpx;
height: 130rpx;
background-color: gold;
- margin-bottom: 44rpx;
+ margin-bottom: 24rpx;
border-radius: 90%;
}
.tel {
color: #333333;
font-size: 28rpx;
+ text-align: center;
}
}
}
diff --git a/components/yue/yongjintop/yongjintop.wxml b/components/yue/yongjintop/yongjintop.wxml
index 9d99fcc..98ea39c 100644
--- a/components/yue/yongjintop/yongjintop.wxml
+++ b/components/yue/yongjintop/yongjintop.wxml
@@ -1,7 +1,7 @@
-
- 156***578
+
+ {{tel}}
@@ -9,15 +9,15 @@
昨日收益
- 657.00
+ 0
RMB
- 昨日收益
+ 累计收益
- 657.00
+ 0
RMB
diff --git a/components/yue/yongjintop/yongjintop.wxss b/components/yue/yongjintop/yongjintop.wxss
index d984e1c..320f9e7 100644
--- a/components/yue/yongjintop/yongjintop.wxss
+++ b/components/yue/yongjintop/yongjintop.wxss
@@ -1,63 +1 @@
-.box {
- width: 690rpx;
- margin: 0 auto;
- padding-bottom: 41rpx;
- border-bottom: 2rpx solid #EEEEEE;
-}
-
-.box .yongjintop {
- width: 152rpx;
- height: 196rpx;
- margin: 0 auto;
- margin-top: 40rpx;
-}
-
-.box .yongjintop .photo {
- width: 130rpx;
- height: 130rpx;
- background-color: gold;
- margin-bottom: 44rpx;
- border-radius: 90%;
-}
-
-.box .yongjintop .tel {
- color: #333333;
- font-size: 28rpx;
-}
-
-.mid {
- width: 100%;
- height: 175rpx;
- border-bottom: 20rpx solid #FBFBFB;
- color: #333333;
- font-size: 28rpx;
- text-align: center;
-}
-
-.mid .midbox {
- width: 478rpx;
- height: 175rpx;
- display: flex;
- justify-content: space-between;
- margin: 0 auto;
-}
-
-.mid .way {
- margin-top: 46rpx;
- margin-bottom: 14rpx;
-}
-
-.mid .money {
- font-size: 24rpx;
-}
-
-.mid .money1 {
- color: #F81F1F;
-}
-
-.mid .line {
- width: 2rpx;
- height: 60rpx;
- margin: auto 0;
- background-color: #EEEEEE;
-}
+.box{width:690rpx;margin:0 auto;padding-bottom:41rpx;border-bottom:2rpx solid #EEEEEE}.box .yongjintop{width:152rpx;height:196rpx;margin:0 auto;margin-top:40rpx}.box .yongjintop .photo{width:130rpx;height:130rpx;background-color:gold;margin-bottom:24rpx;border-radius:90%}.box .yongjintop .tel{color:#333333;font-size:28rpx;text-align:center}.mid{width:100%;height:175rpx;border-bottom:20rpx solid #FBFBFB;color:#333333;font-size:28rpx;text-align:center}.mid .midbox{width:478rpx;height:175rpx;display:flex;justify-content:space-between;margin:0 auto}.mid .way{margin-top:46rpx;margin-bottom:14rpx}.mid .money{font-size:24rpx}.mid .money1{color:#F81F1F}.mid .line{width:2rpx;height:60rpx;margin:auto 0;background-color:#EEEEEE}
diff --git a/pages/yongjin/yongjin.js b/pages/yongjin/yongjin.js
index 266e15f..a8fa78b 100644
--- a/pages/yongjin/yongjin.js
+++ b/pages/yongjin/yongjin.js
@@ -1,17 +1,40 @@
// pages/yongjin/yongjin.js
+import bin from "../../utils/bin"
Page({
/**
* 页面的初始数据
*/
data: {
-
+ user:{},
+ list:[]
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
+ bin.request({
+ url:"User/validateOpenid"
+ }).then((res)=>{
+ console.log(res)
+ this.setData({
+ user:res.data.data
+ })
+ })
+ bin.getuserid().then((id)=>{
+ bin.request({
+ url:"User/my_bill",
+ urldata:{
+ user_id:id
+ }
+ }).then((res)=>{
+ console.log(res)
+ this.setData({
+ list:res.data
+ })
+ })
+ })
},
diff --git a/pages/yongjin/yongjin.scss b/pages/yongjin/yongjin.scss
index 20fda9b..8414fd6 100644
--- a/pages/yongjin/yongjin.scss
+++ b/pages/yongjin/yongjin.scss
@@ -4,4 +4,9 @@
.title {
margin-top: 40rpx
+}
+.tixian{
+ position: absolute;
+ top: 20rpx;
+ right: 60rpx;
}
\ No newline at end of file
diff --git a/pages/yongjin/yongjin.wxml b/pages/yongjin/yongjin.wxml
index 3a42b1c..5aa9402 100644
--- a/pages/yongjin/yongjin.wxml
+++ b/pages/yongjin/yongjin.wxml
@@ -1,9 +1,12 @@
-
+
-
+
-
+
+
+
+
+ 提现
\ No newline at end of file
diff --git a/pages/yongjin/yongjin.wxss b/pages/yongjin/yongjin.wxss
index 175927d..5c2cd79 100644
--- a/pages/yongjin/yongjin.wxss
+++ b/pages/yongjin/yongjin.wxss
@@ -1,7 +1 @@
-.detail {
- margin-top: 41rpx;
-}
-
-.title {
- margin-top: 40rpx;
-}
+.detail{margin-top:41rpx}.title{margin-top:40rpx}.tixian{position:absolute;top:20rpx;right:60rpx}