From b80ae55c5e86aa8e524bebccc56f351a762b1c81 Mon Sep 17 00:00:00 2001 From: "Mr.jiang" <714156421@qq.com> Date: Fri, 9 Aug 2024 22:45:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=20=E7=BB=8F=E6=B5=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- my/vip/index.vue | 8 +- pages/my/applyBroker/myBroker.vue | 2 +- pages/my/applyBroker/myInvitation.vue | 38 +++- pages/my/applyBroker/mymoneydetail.vue | 42 ++-- pages/my/applyBroker/withdrawalRecord.vue | 42 ++-- pages/my/applyDistributor/index.vue | 104 +++++---- pages/my/applyDistributor/myDistributor.vue | 223 ++++++++++++++++++-- pages/my/index.vue | 15 +- 8 files changed, 351 insertions(+), 123 deletions(-) diff --git a/my/vip/index.vue b/my/vip/index.vue index be61e9d..34a594f 100644 --- a/my/vip/index.vue +++ b/my/vip/index.vue @@ -611,7 +611,7 @@ position: relative; } .biaoqian{ - width: 80px; + width: 72px; height: 25px; line-height: 25px; text-align: center; @@ -624,7 +624,8 @@ position: absolute; top: 0; margin-top: -11px; - margin-left: 14px; + margin-left: 3px; + } .bgbox-top-img{ margin-top: 120rpx; @@ -644,7 +645,8 @@ position: absolute; bottom: 0; left: 0; - margin-left: 66px; + margin-left: 56px; + margin-bottom: 47px; } .bgbox-top-show image{ width: 560.42rpx; diff --git a/pages/my/applyBroker/myBroker.vue b/pages/my/applyBroker/myBroker.vue index 212c4e2..12a192c 100644 --- a/pages/my/applyBroker/myBroker.vue +++ b/pages/my/applyBroker/myBroker.vue @@ -175,7 +175,7 @@ }); } else { this.url = this.$queue.publicYuMingApp() + '/?invitation=' + this - .invitationCode; + .invitationCode+"&flag=3"; } } }); diff --git a/pages/my/applyBroker/myInvitation.vue b/pages/my/applyBroker/myInvitation.vue index b79b1a7..ae07b59 100644 --- a/pages/my/applyBroker/myInvitation.vue +++ b/pages/my/applyBroker/myInvitation.vue @@ -14,7 +14,7 @@ - {{ item.name }} + {{ item.name?item.name:item.userName }} {{ item.phone}} @@ -60,9 +60,11 @@ limit: 10, current: 0, myId: uni.getStorageSync('userId') ? uni.getStorageSync('userId') : '', + navName:'', } }, onLoad(e) { + this.navName=e.navName let that = this that.getlist() }, @@ -91,16 +93,32 @@ page: this.page, limit: this.limit, } - this.$Request.get("/app/commission/jjr/artificerDetail", data).then(res => { - if (res.code == 0) { - if (this.page == 1) { - this.orderList = res.data.list - } else { - this.orderList = [...this.orderList, ...res.data.list] + if(this.navName=='经纪人'){ + this.$Request.get("/app/commission/jjr/artificerDetail", data).then(res => { + if (res.code == 0) { + if (this.page == 1) { + this.orderList = res.data.list + } else { + this.orderList = [...this.orderList, ...res.data.list] + } } - } - uni.stopPullDownRefresh(); - }) + uni.stopPullDownRefresh(); + uni.hideLoading(); + }) + }else if(this.navName=='分销员'){ + this.$Request.getT('/app/commission/fxy/invitationDetail',data ).then(res => { + if (res.code === 0) { + if (this.page === 1) { + this.orderList = res.data.list; + } else { + this.orderList = [...this.list, ...res.data.list]; + } + } + uni.stopPullDownRefresh(); + uni.hideLoading(); + }); + } + }, }, onReachBottom: function() { diff --git a/pages/my/applyBroker/mymoneydetail.vue b/pages/my/applyBroker/mymoneydetail.vue index f79a983..248b04d 100644 --- a/pages/my/applyBroker/mymoneydetail.vue +++ b/pages/my/applyBroker/mymoneydetail.vue @@ -44,11 +44,14 @@ contentdown: '上拉显示更多', contentrefresh: '正在加载...', contentnomore: '没有更多数据了' - } + }, + navName:'' } }, - onLoad() { + onLoad(e) { + this.navName=e.navName this.$queue.showLoading("加载中..."); + this.getList(); }, onPageScroll: function(e) { @@ -61,17 +64,32 @@ page: this.page, limit: this.limit } - this.$Request.getT('/app/commission/jjr/incomeDetail',data ).then(res => { - if (res.code === 0) { - if (this.page === 1) { - this.list = res.data.list; - } else { - this.list = [...this.list, ...res.data.list]; + if(this.navName=='经纪人'){ + this.$Request.getT('/app/commission/jjr/incomeDetail',data ).then(res => { + if (res.code === 0) { + if (this.page === 1) { + this.list = res.data.list; + } else { + this.list = [...this.list, ...res.data.list]; + } } - } - uni.stopPullDownRefresh(); - uni.hideLoading(); - }); + uni.stopPullDownRefresh(); + uni.hideLoading(); + }); + }else if(this.navName=='分销员'){ + this.$Request.getT('/app/commission/fxy/incomeDetail',data ).then(res => { + if (res.code === 0) { + if (this.page === 1) { + this.list = res.data.list; + } else { + this.list = [...this.list, ...res.data.list]; + } + } + uni.stopPullDownRefresh(); + uni.hideLoading(); + }); + } + } }, onReachBottom: function() { diff --git a/pages/my/applyBroker/withdrawalRecord.vue b/pages/my/applyBroker/withdrawalRecord.vue index b3596f5..7e4b239 100644 --- a/pages/my/applyBroker/withdrawalRecord.vue +++ b/pages/my/applyBroker/withdrawalRecord.vue @@ -44,10 +44,12 @@ contentdown: '上拉显示更多', contentrefresh: '正在加载...', contentnomore: '没有更多数据了' - } + }, + navName:'' } }, - onLoad() { + onLoad(e) { + this.navName=e.navName this.$queue.showLoading("加载中..."); this.getList(); }, @@ -56,22 +58,36 @@ }, methods: { getList() { - let userId = this.$queue.getData('userId'); let data = { page: this.page, limit: this.limit } - this.$Request.getT('/app/commission/jjr/withdrawalDetail',data ).then(res => { - if (res.code === 0) { - if (this.page === 1) { - this.list = res.data.list; - } else { - this.list = [...this.list, ...res.data.list]; + if(this.navName=='经纪人'){ + this.$Request.getT('/app/commission/jjr/withdrawalDetail',data ).then(res => { + if (res.code === 0) { + if (this.page === 1) { + this.list = res.data.list; + } else { + this.list = [...this.list, ...res.data.list]; + } } - } - uni.stopPullDownRefresh(); - uni.hideLoading(); - }); + uni.stopPullDownRefresh(); + uni.hideLoading(); + }); + }else if(this.navName=='分销员'){ + this.$Request.getT('/app/commission/fxy/withdrawalDetail',data ).then(res => { + if (res.code === 0) { + if (this.page === 1) { + this.list = res.data.list; + } else { + this.list = [...this.list, ...res.data.list]; + } + } + uni.stopPullDownRefresh(); + uni.hideLoading(); + }); + } + } }, onReachBottom: function() { diff --git a/pages/my/applyDistributor/index.vue b/pages/my/applyDistributor/index.vue index 88add15..c30c0dc 100644 --- a/pages/my/applyDistributor/index.vue +++ b/pages/my/applyDistributor/index.vue @@ -72,41 +72,52 @@ phone: '', textareaData:'', jbList:[ - {'title':'一级分销员','money':200,'id':1}, - {'title':'二级分销员','money':100,'id':2} + {'title':'一级分销员','money':'','id':1}, + {'title':'二级分销员','money':'','id':2} ], - openWay: 1, + openWay:'1', + money:'', + oneFee:'', + twoFee:'' } }, onLoad() { this.getChannel(); - }, methods: { // 支付订单 pay() { let that = this - this.showpay = false + this.showpay = false; + if (this.userName === '') { + this.$queue.showToast('请输入姓名') + return; + } + if (this.phone === '' || this.phone.length != 11) { + this.$queue.showToast('请输入正确的手机号!') + return; + } uni.showModal({ title: '付款提示', - content: '是否确定充值', + content: '是否确定提交申请!', success: function(re) { if (re.confirm) { - console.log('用户点击确定'); + that.$queue.showLoading('支付中...') let data = { - ordersId: that.order.ordersId, + level:that.openWay, + money:that.money, + name:that.userName, + phone:that.phone, + remarks:that.textareaData, type: 2 } - that.$Request.post('/app/wxPay/payOrder', data).then(rea => { - that.showpay = false + that.$Request.post('/app/wxPay/payFxyMoney', data).then(rea => { + uni.hideLoading(); if (rea.code == 0) { uni.showToast({ title: '支付成功' }) - uni.switchTab({ - url:'/pages/order/index' - }) that.callPay(rea.data); } else { @@ -128,59 +139,40 @@ selectWay: function(item) { this.openWay = item.id; + this.money=item.money }, textareaChange(e){//备注 this.textareaData=e.detail.value - console.log("adsadas0",this.textareaData) }, getChannel() { - let userId = this.$queue.getData('userId'); - this.$Request.getT('/app/artificer/selectAgencyById?userId=' + userId).then(res => { + this.$Request.getT('/app/commission/fxy/fxyConfig').then(res => { if (res.code == 0) { - if (res.data == null) { - this.bb = 1; - } else { - this.bb = res.data.status; - this.city = res.data.city; - this.age = res.data.age; - this.headImg = res.data.img; - this.userName = res.data.name; - this.phone = res.data.phone; + var data=[] + for(var i=0;i { - if (res.code == 0) { - uni.hideLoading(); - this.$queue.showToast('提交成功!'); - setTimeout(d => { - uni.navigateBack(); - }, 1000); - } else { - uni.hideLoading(); - this.$queue.showToast(res.msg); + this.openWay=data[0].id; + this.money=data[0].money; + this.jbList=data; } }); }, + } } diff --git a/pages/my/applyDistributor/myDistributor.vue b/pages/my/applyDistributor/myDistributor.vue index 6a9ca7e..50dff54 100644 --- a/pages/my/applyDistributor/myDistributor.vue +++ b/pages/my/applyDistributor/myDistributor.vue @@ -8,52 +8,52 @@ - - 平台 - 当前身份:一级分销员 + {{listData.name}} + + 当前身份:{{listData.level}}级分销员 - 0.00 + {{listData.withdrawableAmount}} 可提现(元) - 0.00 + {{listData.notCredited}} 未入账(元) - + - 0.00 + {{listData.income}} 累计佣金(元)不含手续费 - 0.00 + {{listData.withdrawal}} 已提现(元) - - 0.00 + - + 我要提现 - + 我的收益 - + 我的邀请 - + 提现记录 @@ -62,27 +62,49 @@ 今日成交订单 - 0 + {{listData.curOrdersCount}} 累计成交订单 - 0 + {{listData.ordersCount}} 今日邀请粉丝 - 0 + {{listData.curUserCount}} 累计邀请粉丝 - 0 + {{listData.userCount}} - - + + + + + + + + + + + + + + + + + + + + @@ -90,15 +112,174 @@ diff --git a/pages/my/index.vue b/pages/my/index.vue index 4bb6867..751ca73 100644 --- a/pages/my/index.vue +++ b/pages/my/index.vue @@ -153,14 +153,14 @@ 城市合伙人 - + + @@ -277,6 +277,7 @@ dataList: [], tagsData: [], blIsJjr:'',//1是经纪人 0不是经纪人 + blIsFxy:'',//1是分销员 0不是分销员 } }, onLoad(e) { @@ -322,7 +323,7 @@ this.isAuthentication = res.data.isAuthentication this.isAgency = res.data.isAgency ? res.data.isAgency : 0; //是否是推广员 1是 2否 this.blIsJjr=res.data.blIsJjr;//经纪人 - + this.blIsFxy=res.data.blIsFxy;//分销员 this.money = res.data.money this.couponnum = res.data.member @@ -1002,7 +1003,7 @@ } .my-use-list { - width: 25%; + width: 33%; margin-top:15px; display: flex; flex-direction: column;