From ba4b56efd8c8ea76dacdc01c2e92b7041fc46a42 Mon Sep 17 00:00:00 2001 From: "Mr.jiang" <714156421@qq.com> Date: Fri, 9 Aug 2024 18:40:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E7=BA=AA=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- my/wallet/index.vue | 2 +- my/wallet/yinhangka.vue | 14 +- my/wallet/zhifubao.vue | 14 +- pages.json | 44 ++ pages/my/applyBroker/index.vue | 28 +- pages/my/applyBroker/myBroker.vue | 177 ++++- pages/my/applyBroker/myInvitation.vue | 763 ++++++++++++++++++++++ pages/my/applyBroker/mymoneydetail.vue | 191 ++++++ pages/my/applyBroker/withdrawal.vue | 756 +++++++++++++++++++++ pages/my/applyBroker/withdrawalRecord.vue | 191 ++++++ pages/my/historyMy.vue | 20 +- pages/my/index.vue | 272 ++++---- pages/my/invitationUser.vue | 3 +- 13 files changed, 2271 insertions(+), 204 deletions(-) create mode 100644 pages/my/applyBroker/myInvitation.vue create mode 100644 pages/my/applyBroker/mymoneydetail.vue create mode 100644 pages/my/applyBroker/withdrawal.vue create mode 100644 pages/my/applyBroker/withdrawalRecord.vue diff --git a/my/wallet/index.vue b/my/wallet/index.vue index 5aefdef..501d466 100644 --- a/my/wallet/index.vue +++ b/my/wallet/index.vue @@ -17,7 +17,7 @@ ￥{{money}} - 盛安逗：{{sadNum}} + 盛安豆：{{sadNum}} 钱包明细 diff --git a/my/wallet/yinhangka.vue b/my/wallet/yinhangka.vue index 87ed1b4..c844913 100644 --- a/my/wallet/yinhangka.vue +++ b/my/wallet/yinhangka.vue @@ -165,15 +165,15 @@ color: #999999; } .btn { - background: linear-gradient(to right, #223845, #00a85b); - color: #FFFFFF; - margin: 30upx; width: 90%; - border-radius: 50rpx; - height: 78rpx; - line-height: 78rpx; - font-size: 30rpx; + margin: 0 auto; text-align: center; + background: linear-gradient(90deg, #019C88, #28BA92, #35C495); + height: 38px; + border-radius: 38px; + color: #ffffff; + line-height: 38px; + font-size: 15px; } .tui-line-cell { width: 80%; diff --git a/my/wallet/zhifubao.vue b/my/wallet/zhifubao.vue index 0e367f9..6fc2903 100644 --- a/my/wallet/zhifubao.vue +++ b/my/wallet/zhifubao.vue @@ -150,15 +150,15 @@ color: #999999; } .btn { - background: linear-gradient(to right, #223845, #00a85b); - color: #FFFFFF; - margin: 30upx; width: 90%; - border-radius: 50rpx; - height: 78rpx; - line-height: 78rpx; - font-size: 30rpx; + margin: 0 auto; text-align: center; + background: linear-gradient(90deg, #019C88, #28BA92, #35C495); + height: 38px; + border-radius: 38px; + color: #ffffff; + line-height: 38px; + font-size: 15px; } .confirm-btn { width: 300px; diff --git a/pages.json b/pages.json index 4d4e2e8..a559257 100644 --- a/pages.json +++ b/pages.json @@ -97,6 +97,50 @@ } } }, + { + "path": "pages/my/applyBroker/mymoneydetail", + "style": { + "navigationBarTitleText": "我的收益", + "enablePullDownRefresh": false, + "navigationStyle": "custom", + "app-plus": { + "titleNView": false + } + } + }, + { + "path": "pages/my/applyBroker/myInvitation", + "style": { + "navigationBarTitleText": "我的邀请", + "enablePullDownRefresh": false, + "navigationStyle": "custom", + "app-plus": { + "titleNView": false + } + } + }, + { + "path": "pages/my/applyBroker/withdrawalRecord", + "style": { + "navigationBarTitleText": "提现记录", + "enablePullDownRefresh": false, + "navigationStyle": "custom", + "app-plus": { + "titleNView": false + } + } + }, + { + "path": "pages/my/applyBroker/withdrawal", + "style": { + "navigationBarTitleText": "提现", + "enablePullDownRefresh": false, + "navigationStyle": "custom", + "app-plus": { + "titleNView": false + } + } + }, { "path": "pages/my/applySalesperson/index", "style": { diff --git a/pages/my/applyBroker/index.vue b/pages/my/applyBroker/index.vue index dc2fec3..0c2396e 100644 --- a/pages/my/applyBroker/index.vue +++ b/pages/my/applyBroker/index.vue @@ -6,7 +6,7 @@ 姓名 - + @@ -21,7 +21,7 @@ - + @@ -36,18 +36,18 @@ export default { data() { return { - userName: '', + name: '', phone: '', - textareaData:'' + remarks:'' } }, onLoad() { - this.getChannel(); + // this.getChannel(); }, methods: { textareaChange(e){//备注 - this.textareaData=e.detail.value + this.remarks=e.detail.value console.log("adsadas0",this.textareaData) }, getChannel() { @@ -70,7 +70,7 @@ }); }, save() { - if (this.userName === '') { + if (this.name === '') { this.$queue.showToast('请输入姓名') return; } @@ -81,17 +81,17 @@ let userId = this.$queue.getData('userId'); let data = { - userId: userId, - name: this.userName, + remarks: this.remarks, + name: this.name, phone: this.phone, } - this.$Request.postJson('/app/artificer/insertAgency', data).then(res => { + this.$Request.get('/app/commission/jjr/apply', data).then(res => { if (res.code == 0) { uni.hideLoading(); - this.$queue.showToast('提交成功！'); - setTimeout(d => { - uni.navigateBack(); - }, 1000); + this.$queue.showToast(res.msg); + // setTimeout(d => { + // uni.navigateBack(); + // }, 1000); } else { uni.hideLoading(); this.$queue.showToast(res.msg); diff --git a/pages/my/applyBroker/myBroker.vue b/pages/my/applyBroker/myBroker.vue index 6e84b51..212c4e2 100644 --- a/pages/my/applyBroker/myBroker.vue +++ b/pages/my/applyBroker/myBroker.vue @@ -8,7 +8,7 @@ - 方 + {{listData.name}} @@ -17,26 +17,26 @@ - 0.00 + {{listData.withdrawableAmount}} 可提现(元) - + 我要提现 - + - 0.00 + {{listData.income}} 累计佣金(元)不含手续费 - 0.00 + {{listData.withdrawal}} 已提现(元) - 0.00 + {{listData.notCredited}} 未入账(元) @@ -44,15 +44,15 @@ - + 我的收益 - + 我的邀请 - + 提现记录 @@ -61,40 +61,187 @@ 今日成交订单 - 0 + {{listData.curOrdersCount}} 累计成交订单 - 0 + {{listData.ordersCount}} 今日新增技师 - 0 + {{listData.curArtificerCount}} 累计入驻技师 - 0 + {{listData.artificerCount}} - + + + + + + + + + diff --git a/pages/my/applyBroker/myInvitation.vue b/pages/my/applyBroker/myInvitation.vue new file mode 100644 index 0000000..b79b1a7 --- /dev/null +++ b/pages/my/applyBroker/myInvitation.vue @@ -0,0 +1,763 @@ + + + + diff --git a/pages/my/applyBroker/mymoneydetail.vue b/pages/my/applyBroker/mymoneydetail.vue new file mode 100644 index 0000000..f79a983 --- /dev/null +++ b/pages/my/applyBroker/mymoneydetail.vue @@ -0,0 +1,191 @@ + + + + + diff --git a/pages/my/applyBroker/withdrawal.vue b/pages/my/applyBroker/withdrawal.vue new file mode 100644 index 0000000..44dc7ac --- /dev/null +++ b/pages/my/applyBroker/withdrawal.vue @@ -0,0 +1,756 @@ + + + + + \ No newline at end of file diff --git a/pages/my/applyBroker/withdrawalRecord.vue b/pages/my/applyBroker/withdrawalRecord.vue new file mode 100644 index 0000000..b3596f5 --- /dev/null +++ b/pages/my/applyBroker/withdrawalRecord.vue @@ -0,0 +1,191 @@ + + + + + diff --git a/pages/my/historyMy.vue b/pages/my/historyMy.vue index a45c684..40ae954 100644 --- a/pages/my/historyMy.vue +++ b/pages/my/historyMy.vue @@ -10,14 +10,10 @@ {{item.title}} - + - ￥ @@ -144,6 +140,18 @@ uni.navigateTo({ url:'/pages/my/fuwuliaochengDetail?id='+item.projectId+'&limit='+this.limit+'&page='+this.page+'&name='+'index' }) + }else if(item.type=='114'){//企业预约 + uni.navigateTo({ + url:'/pages/shop/qiyeDatail?id='+item.projectId+'&limit='+this.limit+'&page='+this.page+'&name='+'index' + }) + }else if(item.type=='111'){//拼团 + uni.navigateTo({ + url:'/pages/my/pinTuanOderDrtail?id='+item.projectId+'&limit='+this.limit+'&page='+this.page+'&name='+'index' + }) + }else if(item.type=='112'){//秒杀 + uni.navigateTo({ + url:'/pages/my/miaoShaOderDrtail?id='+item.projectId+'&limit='+this.limit+'&page='+this.page+'&name='+'index' + }) } } diff --git a/pages/my/index.vue b/pages/my/index.vue index 3e14d78..4bb6867 100644 --- a/pages/my/index.vue +++ b/pages/my/index.vue @@ -129,10 +129,71 @@ 常用功能 - - - {{item.text}} + + + 我的收藏 + + + 浏览历史 + + + + 地址管理 + + + + 设置中心 + + + + 应聘技师 + + + + 城市合伙人 + + + + 申请经纪人 + + + + 我是经纪人 + + + + + 我的团队 + + + + 项目推荐 + + + + 分享好友 + + + + 帮助中心 + + @@ -209,93 +270,13 @@ couponnum: '0', renzheng: 0, XCXIsSelect: '否', - useList: [{ - urlImg: '../../static/my-gong-1.png', - text: '我的收藏', - link: '/my/gird/shoucang' - }, - { - urlImg: '../../static/my-gong-8.png', - text: '浏览历史', - link: '/pages/my/historyMy' - }, - { - urlImg: '../../static/my-gong-5.png', - text: '地址管理', - link: '/my/address/address' - }, - { - urlImg: '../../static/my-gong-7.png', - text: '设置中心', - link: '/my/setting/index' - }, - - { - urlImg: '../../static/my-gong-2.png', - text: '应聘技师', - link: '/pages/my/hehuo' - }, - { - urlImg: '../../static/my-gong-4.png', - text: '城市合伙人', - link: '/pages/my/cooperation' - }, - // { - // urlImg: '../../static/my-gong-11.png', - // text: '申请经纪人', - // link: '/pages/my/applyBroker/index' - // }, - // { - // urlImg: '../../static/my-gong-12.png', - // text: '我是经纪人', - // link: '/pages/my/applyBroker/myBroker' - // }, - // { - // urlImg: '../../static/my-gong-14.png', - // text: '申请业务员', - // link: '/pages/my/applySalesperson/index' - // }, - // { - // urlImg: '../../static/my-gong-13.png', - // text: '我是业务员', - // link: '/pages/my/applySalesperson/mySalesperson' - // }, - // { - // urlImg: '../../static/my-gong-15.png', - // text: '申请分销员', - // link: '/pages/my/applyDistributor/index' - // }, - // { - // urlImg: '../../static/my-gong-16.png', - // text: '我是分销员', - // link: '/pages/my/applyDistributor/myDistributor' - // }, - { - urlImg: '../../static/my-gong-9.png', - text: '我的团队', - link: '/pages/my/myteam' - }, - { - urlImg: '../../static/my-gong-10.png', - text: '项目推荐', - link: '/pages/my/fuwuGengduo' - }, - { - urlImg: '../../static/my-gong-3.png', - text: '分享好友', - link: '/pages/my/invitationUser' - }, - { - urlImg: '../../static/my-gong-6.png', - text: '帮助中心', - link: '/my/help/feedbackIndex' - }, - ], + useList: [], token: '', vipData: [], vipNameType: '', dataList: [], - tagsData: [] + tagsData: [], + blIsJjr:'',//1是经纪人 0不是经纪人 } }, onLoad(e) { @@ -330,6 +311,55 @@ } }, methods: { + getUserInfo() { + this.$Request.get("/app/user/selectUserById").then(res => { + console.log("res.data--->", res.data); + if (res.code == 0) { + this.userName = res.data.userName + this.phone = res.data.phone; + this.invitationCode = res.data.invitationCode + this.avatar = res.data.avatar ? res.data.avatar : '../../static/logo.png' + this.isAuthentication = res.data.isAuthentication + this.isAgency = res.data.isAgency ? res.data.isAgency : 0; //是否是推广员 1是 2否 + this.blIsJjr=res.data.blIsJjr;//经纪人 + + this.money = res.data.money + this.couponnum = res.data.member + + // uni.setStorageSync('isAuthentication', res.data.isAuthentication) + this.isShop = res.data.isShop ? res.data.isShop : 0; + uni.setStorageSync('avatar', res.data.avatar) + uni.setStorageSync('userName', res.data.userName) + uni.setStorageSync('invitationCode', res.data.invitationCode) + uni.setStorageSync('zhiFuBao', res.data.zhiFuBao) + uni.setStorageSync('zhiFuBaoName', res.data.zhiFuBaoName) + + if (res.data.isAuthentication == 0 || res.data.isAuthentication == null) { + this.renzheng = 0 + uni.setStorageSync("renzheng", this.renzheng) + } else if (res.data.isAuthentication == 1) { + this.renzheng = 1 + uni.setStorageSync("renzheng", this.renzheng) + } else if (res.data.isAuthentication == 2) { + this.renzheng = 2 + uni.setStorageSync("renzheng", this.renzheng) + } else if (res.data.isAuthentication == 3) { + this.renzheng = 3 + uni.setStorageSync("renzheng", this.renzheng) + } else if (res.data.isAuthentication == 4) { + this.renzheng = 4 + uni.setStorageSync("renzheng", this.renzheng) + } else if (res.data.isAuthentication == 5) { + this.renzheng = 5 + uni.setStorageSync("renzheng", this.renzheng) + } else if (res.data.isAuthentication == 6) { + this.renzheng = 6 + uni.setStorageSync("renzheng", this.renzheng) + } + + } + }); + }, qiye(){ uni.navigateTo({ url:'/pages/shop/qiyeListMy' @@ -567,71 +597,7 @@ } }); }, - getUserInfo() { - this.$Request.get("/app/user/selectUserById").then(res => { - console.log("res.data--->", res.data); - if (res.code == 0) { - this.userName = res.data.userName - this.phone = res.data.phone; - this.invitationCode = res.data.invitationCode - this.avatar = res.data.avatar ? res.data.avatar : '../../static/logo.png' - this.isAuthentication = res.data.isAuthentication - this.isAgency = res.data.isAgency ? res.data.isAgency : 0; //是否是推广员 1是 2否 - - - this.money = res.data.money - this.couponnum = res.data.member - - // uni.setStorageSync('isAuthentication', res.data.isAuthentication) - this.isShop = res.data.isShop ? res.data.isShop : 0; - uni.setStorageSync('avatar', res.data.avatar) - uni.setStorageSync('userName', res.data.userName) - uni.setStorageSync('invitationCode', res.data.invitationCode) - uni.setStorageSync('zhiFuBao', res.data.zhiFuBao) - uni.setStorageSync('zhiFuBaoName', res.data.zhiFuBaoName) - - if (res.data.isAuthentication == 0 || res.data.isAuthentication == null) { - this.renzheng = 0 - uni.setStorageSync("renzheng", this.renzheng) - } else if (res.data.isAuthentication == 1) { - this.renzheng = 1 - uni.setStorageSync("renzheng", this.renzheng) - } else if (res.data.isAuthentication == 2) { - this.renzheng = 2 - uni.setStorageSync("renzheng", this.renzheng) - } else if (res.data.isAuthentication == 3) { - this.renzheng = 3 - uni.setStorageSync("renzheng", this.renzheng) - } else if (res.data.isAuthentication == 4) { - this.renzheng = 4 - uni.setStorageSync("renzheng", this.renzheng) - } else if (res.data.isAuthentication == 5) { - this.renzheng = 5 - uni.setStorageSync("renzheng", this.renzheng) - } else if (res.data.isAuthentication == 6) { - this.renzheng = 6 - uni.setStorageSync("renzheng", this.renzheng) - } - - } - }); - - // #ifdef APP-PLUS - let clientid = plus.push.getClientInfo().clientid; - let sysPhone = 1; - if (plus.os.name.toLowerCase() === 'android') { - sysPhone = 1; - } else { - sysPhone = 2; - } - let userId = this.$queue.getData('userId'); - if (userId) { - this.$Request.postT('/app/user/updateClientId?clientId=' + clientid + '&userId=' + userId + - '&sysPhone=' + sysPhone).then( - res => {}); - } - //#endif - }, + getIsVip() { this.$Request.get("/app/UserVip/selectUserVip").then(res => { @@ -692,8 +658,8 @@ }) } }, - useToUrl(item) { //常用功能跳转页面 - var link = item.link + useToUrl(link) { //常用功能跳转页面 + // var link = item.link if (this.userId) { uni.navigateTo({ url: link diff --git a/pages/my/invitationUser.vue b/pages/my/invitationUser.vue index 5f5f196..4d75b12 100644 --- a/pages/my/invitationUser.vue +++ b/pages/my/invitationUser.vue @@ -179,8 +179,9 @@ this.modalName = null; }, qrR(path) { + this.erweimapath = path; - console.log(this.erweimapath); + console.log("this.erweimapath---",this.url); }, getBackImageList() { this.$Request.getT('/app/banner/selectBannerList?state=-1&classify=5').then(res => {