diff --git a/README.md b/README.md index 2e67499..04517f7 100644 --- a/README.md +++ b/README.md @@ -70,4 +70,5 @@ - pages/member/member 会员商品
- member/membertop 会员商品顶部的字 - member/membershop 单个商品 -- pages/deposit/deposit 提现 \ No newline at end of file +- pages/deposit/deposit 提现 +- pages/commission/commission 当前佣金 \ No newline at end of file diff --git a/app.json b/app.json index bbe7f15..ed771f4 100644 --- a/app.json +++ b/app.json @@ -1,6 +1,8 @@ { "pages": [ "pages/index/index", + "pages/share/share", + "pages/commission/commission", "pages/login/login", "pages/search/search", "pages/shopping/shopping", @@ -23,9 +25,8 @@ "pages/deposit/deposit", "pages/yue/yue", - "pages/yongjin/yongjin", + "pages/yongjin/yongjin" - "pages/share/share" ], "window": { "backgroundTextStyle": "light", diff --git a/components/yue/share/share.js b/components/yue/share/share.js index fd400ec..8abd79c 100644 --- a/components/yue/share/share.js +++ b/components/yue/share/share.js @@ -4,7 +4,11 @@ Component({ * 组件的属性列表 */ properties: { - + name:String, + img:String, + A:String, + B:String, + C:String }, /** diff --git a/components/yue/share/share.scss b/components/yue/share/share.scss index 2e49bca..2678f55 100644 --- a/components/yue/share/share.scss +++ b/components/yue/share/share.scss @@ -45,7 +45,7 @@ font-size: 28rpx; text-align: center; .midbox { - width: 478rpx; + width: 590rpx; height: 175rpx; display: flex; justify-content: space-between; @@ -60,6 +60,7 @@ } .money1 { color: #F81F1F; + font-size: 24rpx; } .line { width: 2rpx; diff --git a/components/yue/share/share.wxml b/components/yue/share/share.wxml index 9739c98..e76217c 100644 --- a/components/yue/share/share.wxml +++ b/components/yue/share/share.wxml @@ -1,9 +1,9 @@ - + - 156***578 + {{name}} 我的名片 @@ -11,18 +11,26 @@ - 昨日收益 + A级 - 657.00 - RMB + {{A}} + 人 + + + + + B级 + + {{B}} + 人 - 昨日收益 + C级 - 657.00 - RMB + {{C}} + 人 diff --git a/components/yue/share/share.wxss b/components/yue/share/share.wxss index 13fc361..45135f7 100644 --- a/components/yue/share/share.wxss +++ b/components/yue/share/share.wxss @@ -1,78 +1 @@ -.box { - width: 690rpx; - margin: 0 auto; - padding-bottom: 41rpx; - border-bottom: 2rpx solid #EEEEEE; -} - -.box .img { - width: 40rpx; - height: 39rpx; - background-color: #999999; - float: right; -} - -.box .yongjintop { - width: 317rpx; - margin-top: 71rpx; - margin-left: 30rpx; - display: flex; -} - -.box .yongjintop .photo { - width: 130rpx; - height: 130rpx; - background-color: gold; - margin-bottom: 52rpx; - border-radius: 90%; -} - -.box .yongjintop .tel { - color: #333333; - font-size: 28rpx; - margin-top: 33rpx; - margin-left: 35rpx; -} - -.box .yongjintop .tel .mingpian { - font-size: 24rpx; - color: #999999; - margin-top: 18rpx; -} - -.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 .img{width:40rpx;height:39rpx;background-color:#999999;float:right}.box .yongjintop{width:317rpx;margin-top:71rpx;margin-left:30rpx;display:flex}.box .yongjintop .photo{width:130rpx;height:130rpx;background-color:gold;margin-bottom:52rpx;border-radius:90%}.box .yongjintop .tel{color:#333333;font-size:28rpx;margin-top:33rpx;margin-left:35rpx}.box .yongjintop .tel .mingpian{font-size:24rpx;color:#999999;margin-top:18rpx}.mid{width:100%;height:175rpx;border-bottom:20rpx solid #FBFBFB;color:#333333;font-size:28rpx;text-align:center}.mid .midbox{width:590rpx;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;font-size:24rpx}.mid .line{width:2rpx;height:60rpx;margin:auto 0;background-color:#EEEEEE} diff --git a/pages/commission/commission.js b/pages/commission/commission.js new file mode 100644 index 0000000..9839979 --- /dev/null +++ b/pages/commission/commission.js @@ -0,0 +1,66 @@ +// pages/commission/commission.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/commission/commission.json b/pages/commission/commission.json new file mode 100644 index 0000000..430f006 --- /dev/null +++ b/pages/commission/commission.json @@ -0,0 +1,6 @@ +{ + "usingComponents": { + "yuedetail": "/components/yue/yuedetail/yuedetail" + + } +} \ No newline at end of file diff --git a/pages/commission/commission.scss b/pages/commission/commission.scss new file mode 100644 index 0000000..37eff53 --- /dev/null +++ b/pages/commission/commission.scss @@ -0,0 +1,45 @@ +.box{ + background-color: #eee; + padding:0 30rpx; + .top{ + background-color: #fff; + display: flex; + .tx{ + width: 130rpx; + height: 130rpx; + + } + .rigth{ + display: flex; + .name{ + font-size: 28rpx; + color: #333; + } + .mp{ + font-size: 24rpx; + color: #999; + } + } + } + .xj{ + background-color: #fff; + display: flex; + >view{ + width: 263rpx; + border-right: 1rpx solid #eee; + } + >view:last-child{ + border:none; + } + } + .list{ + margin-top: 20rpx; + background-color: #fff; + .title{ + font-size: 28rpx; + color: #333; + + } + } + +} \ No newline at end of file diff --git a/pages/commission/commission.wxml b/pages/commission/commission.wxml new file mode 100644 index 0000000..ff0d2b7 --- /dev/null +++ b/pages/commission/commission.wxml @@ -0,0 +1,25 @@ + + + + + + + + + + + A级 + 0 + + B级 + 0 + C级 + 0 + + + 佣金明细 + + + + + \ No newline at end of file diff --git a/pages/commission/commission.wxss b/pages/commission/commission.wxss new file mode 100644 index 0000000..6180cd9 --- /dev/null +++ b/pages/commission/commission.wxss @@ -0,0 +1 @@ +.box{background-color:#eee;padding:0 30rpx}.box .top{background-color:#fff;display:flex}.box .top .tx{width:130rpx;height:130rpx}.box .top .rigth{display:flex}.box .top .rigth .name{font-size:28rpx;color:#333}.box .top .rigth .mp{font-size:24rpx;color:#999}.box .xj{background-color:#fff;display:flex}.box .xj>view{width:263rpx;border-right:1rpx solid #eee}.box .xj>view:last-child{border:none}.box .list{margin-top:20rpx;background-color:#fff}.box .list .title{font-size:28rpx;color:#333} diff --git a/pages/personal/personal.js b/pages/personal/personal.js index 3d82caa..91e4a99 100644 --- a/pages/personal/personal.js +++ b/pages/personal/personal.js @@ -74,6 +74,17 @@ Page({ }) } }, + share(){ + + wx.navigateTo({ // request({ + // url:"User/validateOpenid" + // }).then((res)=>{ + + // }) + url:"/pages/share/share" + }) + + }, onReady: function() { }, diff --git a/pages/share/share.js b/pages/share/share.js index 08bb3c8..2b44154 100644 --- a/pages/share/share.js +++ b/pages/share/share.js @@ -1,18 +1,40 @@ // pages/share/share.js +import bin from "../../utils/bin" Page({ /** * 页面的初始数据 */ data: { - + list:{}, + user:{} }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - + bin.getuserid().then((id)=>{ + bin.request({ + url:"Distribut/rebateLogList", + data:{ + user_id:id + } + }).then((res)=>{ + console.log(res) + this.setData({ + list:res.data.data + }) + }) + }) + bin.request({ + url:"User/validateOpenid" + }).then((res)=>{ + console.log(res) + this.setData({ + user:res.data.data + }) + }) }, /** diff --git a/pages/share/share.json b/pages/share/share.json index 41687e2..2236faf 100644 --- a/pages/share/share.json +++ b/pages/share/share.json @@ -1,5 +1,6 @@ { - "usingComponents": { + "navigationBarTitleText": "佣金列表", + "usingComponents": { "share": "/components/yue/share/share", "yuedetail": "/components/yue/yuedetail/yuedetail" } diff --git a/pages/share/share.wxml b/pages/share/share.wxml index 976b44f..7ff3be8 100644 --- a/pages/share/share.wxml +++ b/pages/share/share.wxml @@ -1,6 +1,9 @@