From 773253721c0da0f60a19cf4c16893abb09af2dee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Tue, 3 Dec 2024 10:55:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=A0=E9=81=93=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- my/gonghui/therapist.vue | 1 - pages/my/applyBroker/myBroker.vue | 7 +- pages/my/applyBroker/mymoneydetail.vue | 2 +- pages/my/applyDistributor/myDistributor.vue | 10 +- pages/my/applySalesperson/mySalesperson.vue | 7 +- pages/my/channelMerchants/index.vue | 81 +- pages/my/channelMerchants/myMerchants.vue | 1129 +++---------------- pages/my/index.vue | 28 +- pages/public/login.vue | 83 +- pages/public/register.vue | 5 +- pages/publicThree/login.vue | 78 +- pages/publicThree/register.vue | 2 +- pages/publicTwo/login.vue | 78 +- 13 files changed, 443 insertions(+), 1068 deletions(-) diff --git a/my/gonghui/therapist.vue b/my/gonghui/therapist.vue index a59eff8..9755e68 100644 --- a/my/gonghui/therapist.vue +++ b/my/gonghui/therapist.vue @@ -153,7 +153,6 @@ wx.requestSubscribeMessage({ tmplIds: this.arr, success(re) { - console.log(JSON.stringify(re), 111111111111) var datas = JSON.stringify(re); if (datas.indexOf("accept") != -1) { console.log(re) diff --git a/pages/my/applyBroker/myBroker.vue b/pages/my/applyBroker/myBroker.vue index 12a192c..12444a1 100644 --- a/pages/my/applyBroker/myBroker.vue +++ b/pages/my/applyBroker/myBroker.vue @@ -174,8 +174,9 @@ } }); } else { - this.url = this.$queue.publicYuMingApp() + '/?invitation=' + this - .invitationCode+"&flag=3"; + // this.url = this.$queue.publicYuMingApp() + '/?invitation=' + this + // .invitationCode+"&flag=3"; + this.url = this.$queue.publicYuMingApp() + '/pages/public/login?blJjrCode=' + this.invitationCode; } } }); @@ -224,6 +225,8 @@ if (!this.haibaoImg) { this.haibaoShow = true; this.$queue.showLoading('海报生成中...'); + console.log(this.backgroundImage); + console.log(this.erweimapath); } else { this.modalName = 'Image'; } diff --git a/pages/my/applyBroker/mymoneydetail.vue b/pages/my/applyBroker/mymoneydetail.vue index 248b04d..782d3cd 100644 --- a/pages/my/applyBroker/mymoneydetail.vue +++ b/pages/my/applyBroker/mymoneydetail.vue @@ -117,7 +117,7 @@ .list-top-view-title{ color: #13141A; font-weight: bold; - font-size: 35rpx; + // font-size: 35rpx; } .list-top-view{ display: flex; diff --git a/pages/my/applyDistributor/myDistributor.vue b/pages/my/applyDistributor/myDistributor.vue index 50dff54..0f26977 100644 --- a/pages/my/applyDistributor/myDistributor.vue +++ b/pages/my/applyDistributor/myDistributor.vue @@ -198,10 +198,12 @@ }); } else { // flag=1 分销员邀请用户 flag=2分销员邀请分销员 flag=3经纪人邀请技师 - this.url = this.$queue.publicYuMingApp() + '/?invitation=' + this - .invitationCode+"&flag=2"; - this.url2 = this.$queue.publicYuMingApp() + '/?invitation=' + this - .invitationCode+"&flag=1"; + // this.url = this.$queue.publicYuMingApp() + '/?invitation=' + this + // .invitationCode+"&flag=2"; + // this.url2 = this.$queue.publicYuMingApp() + '/?invitation=' + this + // .invitationCode+"&flag=1"; + this.url = this.$queue.publicYuMingApp() + '/pages/public/login?blFxyCode=' + this.invitationCode; + this.url2 = this.$queue.publicYuMingApp() + '/pages/public/login?blFxyCode=' + this.invitationCode; } } }); diff --git a/pages/my/applySalesperson/mySalesperson.vue b/pages/my/applySalesperson/mySalesperson.vue index e21033d..dcd8dcd 100644 --- a/pages/my/applySalesperson/mySalesperson.vue +++ b/pages/my/applySalesperson/mySalesperson.vue @@ -147,8 +147,11 @@ } }); } else { - this.url = this.$queue.publicYuMingApp() + '/?invitation=' + this - .invitationCode+"&flag=3"; + // this.url = this.$queue.publicYuMingApp() + '/?invitation=' + this + // .invitationCode+"&flag=3"; + // this.url = this.$queue.publicYuMingApp() + '/?invitation=' + this + // .invitationCode+"&flag=3"; + this.url = this.$queue.publicYuMingApp() + '/pages/public/login?blYwyCode=' + this.invitationCode; } } }); diff --git a/pages/my/channelMerchants/index.vue b/pages/my/channelMerchants/index.vue index 44cdf8c..4357632 100644 --- a/pages/my/channelMerchants/index.vue +++ b/pages/my/channelMerchants/index.vue @@ -11,14 +11,14 @@ 联系电话 - + - 申请渠道 - - - + 申请渠道 + {{qudao}} + 选择渠道 + @@ -28,10 +28,11 @@ - + + 提交申请 @@ -43,46 +44,34 @@ export default { data() { return { + qudaoList: [], + qudaoShow: false, name: '', phone: '', remarks:'', qudao:'', - curIndexs: [0], - columns: [ - [ - {label: '暂无接入渠道商',value: '暂无接入渠道商'}, - {label: '足球联赛',value: '足球联赛'}, - {label: '地推',value: '地推',}, - {label: '酒店',value: '酒店'} - ], - ], + bb:'1', } }, + onLoad() { + this.getQudaoLmList(); + }, methods: { - pickerShow() { - this.$refs.ChPicker.show() + getQudao(e) { + this.qudao = e[0].label; + this.getQudaoLmList(); }, - pickerChange(e) { - console.log(e.columns[0].value); - this.qudao=e.columns[0].value - this.curIndexs = e.indexs - }, - getChannel() { - let userId = this.$queue.getData('userId'); - this.$Request.getT('/app/artificer/selectAgencyById?userId=' + userId).then(res => { + //获取渠道类目 + getQudaoLmList(){ + this.$Request.getT('/app/commission/qds/lmList').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; - } - console.log(this.bb) - // this.auditContent = res.data.auditContent; + this.qudaoList = []; + res.data.forEach((d, index) => { + let data = {} + data.label = d.name + data.value = d.id+"" + this.qudaoList.push(data); + }); } }); }, @@ -95,20 +84,17 @@ this.$queue.showToast('请输入正确的手机号！') return; } - let userId = this.$queue.getData('userId'); let data = { remarks: this.remarks, name: this.name, phone: this.phone, + lm: this.qudao, } - this.$Request.get('/app/commission/jjr/apply', data).then(res => { + this.$Request.get('/app/commission/qds/apply', data).then(res => { if (res.code == 0) { uni.hideLoading(); this.$queue.showToast(res.msg); - // setTimeout(d => { - // uni.navigateBack(); - // }, 1000); } else { uni.hideLoading(); this.$queue.showToast(res.msg); @@ -269,6 +255,17 @@ border-bottom: 1rpx solid #f7f7f7; margin-top: 10rpx; } + .text-city{ + align-content: center; + flex-wrap: wrap; + min-height: 40px; + } + .text-city-active{ + color: inherit; + } + .text-city-disable{ + color: rgb(192, 196, 204); + } } } } diff --git a/pages/my/channelMerchants/myMerchants.vue b/pages/my/channelMerchants/myMerchants.vue index 36c1794..5714b6a 100644 --- a/pages/my/channelMerchants/myMerchants.vue +++ b/pages/my/channelMerchants/myMerchants.vue @@ -3,139 +3,107 @@ - - - - 上级 - 平台 + + + + + + {{listData.name}} - - - 渠道码 + + + + + + {{listData.withdrawableAmount}} + 可提现(元) + + {{listData.notCredited}} + 未入账(元) + + {{listData.income}} - 订单总金额不含手续费 + 累计佣金(元)不含手续费 {{listData.withdrawal}} - 订单数量 - - - {{listData.notCredited}} - 总佣金不含手续费 - - - - - - 提现记录 - - - 申请提现 - + 已提现(元) + + + 我要提现 - - - - 筛选 - + + + + 我的收益 + + + + 我的邀请 + + + + 提现记录 + - - - - - - - - - - - - - - - {{ item.artificerName }} - - - - - 可服务 - {{item.time}} - - - + + + + + + + 渠道码 + + + + + + + + + + + + + + + - 休息中 + {{ item.artificerName }} + + + + 可服务 + {{item.time}} + + + + + 休息中 + + + - - - {{item.content}} - - - - - 评论 - - {{ item.commentCount ? item.commentCount : 0 }} - - - - - 收藏 - - {{ item.collectCount ? item.collectCount : 0 }} - - - - - - - - {{ item.distance }} - - - - - {{item.consortiaName}} - - - + - - - - - - - - 技师等级 - - - - 技师类型 - - - - - 确认 - - @@ -161,27 +129,6 @@ }, data() { return { - closeable: true, - tabList:[ - { - id: 3, - name: "", - value: "资深", - }, - { - id: 4, - name: "", - value: "金牌", - }, - { - id: 5, - name: "", - value: "专家", - }, - ], - tabListSon:[], - selectedValues: [], // 存储选中的值 - artificerName:"", url: '', avatar: '', listData:[], @@ -189,14 +136,10 @@ haibaoShow: false, modalName: '', backgroundImage:'', - invitationCode: '', erweimapath: '', + invitationCode: '', tuiguang: '', - showpay:false, - orderList:[], - classifyId:[], - technicianType:'', - city:'请选择城市' + codeList: [], } }, onLoad() { @@ -240,6 +183,8 @@ } }, methods:{ + + getlist() { var that=this; let index = 2 @@ -417,842 +362,6 @@ \ No newline at end of file diff --git a/pages/my/index.vue b/pages/my/index.vue index c179810..00baba9 100644 --- a/pages/my/index.vue +++ b/pages/my/index.vue @@ -163,35 +163,35 @@ 城市合伙人 - + + + + - + @@ -295,6 +295,8 @@ tagsData: [], blIsJjr:'',//1是经纪人 0不是经纪人 blIsFxy:'',//1是分销员 0不是分销员 + blIsYwy:'',//1是业务员 0不是业务员 + blIsQds:'',//1是渠道商 0不是渠道商 } }, onLoad(e) { @@ -346,6 +348,8 @@ this.isAgency = res.data.isAgency ? res.data.isAgency : 0; //是否是推广员 1是 2否 this.blIsJjr=res.data.blIsJjr;//经纪人 this.blIsFxy=res.data.blIsFxy;//分销员 + this.blIsYwy=res.data.blIsYwy;//业务员 + this.blIsQds=res.data.blIsQds;//渠道商 this.money = res.data.money this.couponnum = res.data.member diff --git a/pages/public/login.vue b/pages/public/login.vue index eb9ce19..6e73c5f 100644 --- a/pages/public/login.vue +++ b/pages/public/login.vue @@ -101,6 +101,21 @@ if (e.bindingConsortiaId) { this.$queue.setData('bindingConsortiaId', e.bindingConsortiaId); } + if (e.blFxyCode) { + this.$queue.setData('blFxyCode', e.blFxyCode); + } + if (e.blJjrCode) { + this.$queue.setData('blJjrCode', e.blJjrCode); + } + if (e.blYwyCode) { + this.$queue.setData('blYwyCode', e.blYwyCode); + } + if (e.blQdsCode) { + this.$queue.setData('blQdsCode', e.blQdsCode); + } + if (e.blDlsCode) { + this.$queue.setData('blDlsCode', e.blDlsCode); + } this.$Request.get('/app/common/type/237').then(res => { if (res.code == 0) { if (res.data && res.data.value && res.data.value == '是') { @@ -167,8 +182,12 @@ this.$queue.setData("avatar", res.user.avatar); this.$queue.setData("invitationCode", res.user.invitationCode); this.$queue.setData("inviterCode", res.user.inviterCode); - this.$queue.setData("bindingConsortiaId", res.user.bindingConsortiaId); - + this.$queue.setData("bindingConsortiaId", res.user.bindingConsortiaId); + this.$queue.setData('blFxyCode', res.user.blFxyCode); + this.$queue.setData('blJjrCode', res.user.blJjrCode); + this.$queue.setData('blYwyCode', res.user.blYwyCode); + this.$queue.setData("blQdsCode", res.user.blQdsCode); + this.$queue.setData("blDlsCode", res.user.blDlsCode); uni.switchTab({ url: '/pages/index/index' }) @@ -219,7 +238,12 @@ this.$queue.setData("avatar", res.user.avatar); this.$queue.setData("invitationCode", res.user.invitationCode); this.$queue.setData("inviterCode", res.user.inviterCode); - this.$queue.setData("bindingConsortiaId", res.user.bindingConsortiaId); + this.$queue.setData("bindingConsortiaId", res.user.bindingConsortiaId); + this.$queue.setData('blFxyCode', res.user.blFxyCode); + this.$queue.setData('blJjrCode', res.user.blJjrCode); + this.$queue.setData('blYwyCode', res.user.blYwyCode); + this.$queue.setData("blQdsCode", res.user.blQdsCode); + this.$queue.setData("blDlsCode", res.user.blDlsCode); uni.switchTab({ url: '/pages/index/index' }) @@ -248,6 +272,11 @@ this.$queue.setData("avatar", res.user.avatar); this.$queue.setData("invitationCode", res.user.invitationCode); this.$queue.setData("inviterCode", res.user.inviterCode); + this.$queue.setData('blFxyCode', res.user.blFxyCode); + this.$queue.setData('blJjrCode', res.user.blJjrCode); + this.$queue.setData('blYwyCode', res.user.blYwyCode); + this.$queue.setData("blQdsCode", res.user.blQdsCode); + this.$queue.setData("blDlsCode", res.user.blDlsCode); uni.switchTab({ url: '/pages/index/index' }) @@ -313,10 +342,30 @@ if (uni.getStorageSync('inviterCode')) { inviterCode = uni.getStorageSync('inviterCode') } - let bindingConsortiaId = ''; + let bindingConsortiaId = ''; if (uni.getStorageSync('bindingConsortiaId')) { bindingConsortiaId = uni.getStorageSync('bindingConsortiaId') } + let blFxyCode = ''; + if (uni.getStorageSync('blFxyCode')) { + blFxyCode = uni.getStorageSync('blFxyCode') + } + let blJjrCode = ''; + if (uni.getStorageSync('blJjrCode')) { + blJjrCode = uni.getStorageSync('blJjrCode') + } + let blYwyCode = ''; + if (uni.getStorageSync('blYwyCode')) { + blYwyCode = uni.getStorageSync('blYwyCode') + } + let blQdsCode = ''; + if (uni.getStorageSync('blQdsCode')) { + blQdsCode = uni.getStorageSync('blQdsCode') + } + let blDlsCode = ''; + if (uni.getStorageSync('blDlsCode')) { + blDlsCode = uni.getStorageSync('blDlsCode') + } let sendData = { openId: uni.getStorageSync('openId'), unionId: uni.getStorageSync('unionId'), @@ -324,7 +373,12 @@ avatar: avatarUrl, sex: sex, //性别 inviterCode: inviterCode, //别人登录进来携带你的邀请码 - bindingConsortiaId: bindingConsortiaId, + bindingConsortiaId: bindingConsortiaId, + blFxyCode: blFxyCode, + blJjrCode: blJjrCode, + blYwyCode: blYwyCode, + blQdsCode: blQdsCode, + blDlsCode: blDlsCode, }; that.sendDataList = sendData; that.flag = res.data.flag; @@ -393,7 +447,12 @@ sex: sendData.sex, //性别 phone: that.phone, inviterCode: sendData.inviterCode, - bindingConsortiaId: sendData.bindingConsortiaId, + bindingConsortiaId: sendData.bindingConsortiaId, + blFxyCode: sendData.blFxyCode, + blJjrCode: sendData.blJjrCode, + blYwyCode: sendData.blYwyCode, + blQdsCode: sendData.blQdsCode, + blDlsCode: sendData.blDlsCode, }; that.$Request.postJson('/app/Login/insertWxUser', postData).then(res => { uni.hideLoading(); @@ -403,6 +462,11 @@ uni.setStorageSync('avatar', res.user.avatar) uni.setStorageSync('phone', res.user.phone) uni.setStorageSync('invitationCode', res.user.invitationCode) + uni.setStorageSync('blFxyCode', res.user.blFxyCode) + uni.setStorageSync('blJjrCode', res.user.blJjrCode) + uni.setStorageSync('blYwyCode', res.user.blYwyCode) + uni.setStorageSync('blQdsCode', res.user.blQdsCode) + uni.setStorageSync('blDlsCode', res.user.blDlsCode) uni.setStorageSync('sex', res.user.sex) uni.setStorageSync('userId', res.user.userId) uni.setStorageSync('openId', res.user.openId) @@ -512,7 +576,12 @@ '/static/img/common/logo.jpg'); this.$queue.setData('inviterCode', res.data.inviterCode); this.$queue.setData('invitationCode', res.data.invitationCode); - this.$queue.setData('bindingConsortiaId', res.data.bindingConsortiaId); + this.$queue.setData('bindingConsortiaId', res.data.bindingConsortiaId); + this.$queue.setData('blFxyCode', res.data.blFxyCode); + this.$queue.setData('blJjrCode', res.data.blJjrCode); + this.$queue.setData('blYwyCode', res.data.blYwyCode); + this.$queue.setData('blQdsCode', res.data.blQdsCode); + this.$queue.setData('blDlsCode', res.data.blDlsCode); this.$queue.setData('grade', res.data.grade); this.$queue.setData('mobile', res.data.mobile); this.$queue.setData('isInvitation', res.data.isInvitation); diff --git a/pages/public/register.vue b/pages/public/register.vue index 773c2ed..fa43d01 100644 --- a/pages/public/register.vue +++ b/pages/public/register.vue @@ -197,16 +197,13 @@ } else if (!showAgree) { this.$queue.showToast('请同意《用户协议》和《隐私政策》'); } else { - - - let postData = { userName: userName, password: password, phone: phone, openId: this.$queue.getData('openid') ? this.$queue.getData('openid') : '', inviterCode: this.invitation, - bindingConsortiaId: this.bindingConsortiaId, + bindingConsortiaId: this.bindingConsortiaId, platform: this.platform, msg: code } diff --git a/pages/publicThree/login.vue b/pages/publicThree/login.vue index 756f85d..1403e3f 100644 --- a/pages/publicThree/login.vue +++ b/pages/publicThree/login.vue @@ -101,6 +101,21 @@ if (e.bindingConsortiaId) { this.$queue.setData('bindingConsortiaId', e.bindingConsortiaId); } + if (e.blFxyCode) { + this.$queue.setData('blFxyCode', e.blFxyCode); + } + if (e.blJjrCode) { + this.$queue.setData('blJjrCode', e.blJjrCode); + } + if (e.blYwyCode) { + this.$queue.setData('blYwyCode', e.blYwyCode); + } + if (e.blQdsCode) { + this.$queue.setData('blQdsCode', e.blQdsCode); + } + if (e.blDlsCode) { + this.$queue.setData('blDlsCode', e.blDlsCode); + } this.$Request.get('/app/common/type/237').then(res => { if (res.code == 0) { if (res.data && res.data.value && res.data.value == '是') { @@ -168,6 +183,11 @@ this.$queue.setData("invitationCode", res.user.invitationCode); this.$queue.setData("inviterCode", res.user.inviterCode); this.$queue.setData("bindingConsortiaId", res.user.bindingConsortiaId); + this.$queue.setData('blFxyCode', res.user.blFxyCode); + this.$queue.setData('blJjrCode', res.user.blJjrCode); + this.$queue.setData('blYwyCode', res.user.blYwyCode); + this.$queue.setData("blQdsCode", res.user.blQdsCode); + this.$queue.setData("blDlsCode", res.user.blDlsCode); uni.navigateTo({ url: '/pages/my/hehuo' }); @@ -223,6 +243,11 @@ this.$queue.setData("invitationCode", res.user.invitationCode); this.$queue.setData("inviterCode", res.user.inviterCode); this.$queue.setData("bindingConsortiaId", res.user.bindingConsortiaId); + this.$queue.setData('blFxyCode', res.user.blFxyCode); + this.$queue.setData('blJjrCode', res.user.blJjrCode); + this.$queue.setData('blYwyCode', res.user.blYwyCode); + this.$queue.setData("blQdsCode", res.user.blQdsCode); + this.$queue.setData("blDlsCode", res.user.blDlsCode); uni.navigateTo({ url: '/pages/my/hehuo' }); @@ -254,6 +279,11 @@ this.$queue.setData("avatar", res.user.avatar); this.$queue.setData("invitationCode", res.user.invitationCode); this.$queue.setData("inviterCode", res.user.inviterCode); + this.$queue.setData('blFxyCode', res.user.blFxyCode); + this.$queue.setData('blJjrCode', res.user.blJjrCode); + this.$queue.setData('blYwyCode', res.user.blYwyCode); + this.$queue.setData("blQdsCode", res.user.blQdsCode); + this.$queue.setData("blDlsCode", res.user.blDlsCode); uni.navigateTo({ url: '/pages/my/hehuo' }); @@ -322,10 +352,30 @@ if (uni.getStorageSync('inviterCode')) { inviterCode = uni.getStorageSync('inviterCode') } - let bindingConsortiaId = ''; + let bindingConsortiaId = ''; if (uni.getStorageSync('bindingConsortiaId')) { bindingConsortiaId = uni.getStorageSync('bindingConsortiaId') } + let blFxyCode = ''; + if (uni.getStorageSync('blFxyCode')) { + blFxyCode = uni.getStorageSync('blFxyCode') + } + let blJjrCode = ''; + if (uni.getStorageSync('blJjrCode')) { + blJjrCode = uni.getStorageSync('blJjrCode') + } + let blYwyCode = ''; + if (uni.getStorageSync('blYwyCode')) { + blYwyCode = uni.getStorageSync('blYwyCode') + } + let blQdsCode = ''; + if (uni.getStorageSync('blQdsCode')) { + blQdsCode = uni.getStorageSync('blQdsCode') + } + let blDlsCode = ''; + if (uni.getStorageSync('blDlsCode')) { + blDlsCode = uni.getStorageSync('blDlsCode') + } let sendData = { openId: uni.getStorageSync('openId'), unionId: uni.getStorageSync('unionId'), @@ -333,7 +383,12 @@ avatar: avatarUrl, sex: sex, //性别 inviterCode: inviterCode, //别人登录进来携带你的邀请码 - bindingConsortiaId: bindingConsortiaId, + bindingConsortiaId: bindingConsortiaId, + blFxyCode: blFxyCode, + blJjrCode: blJjrCode, + blYwyCode: blYwyCode, + blQdsCode: blQdsCode, + blDlsCode: blDlsCode, }; that.sendDataList = sendData; that.flag = res.data.flag; @@ -402,7 +457,12 @@ sex: sendData.sex, //性别 phone: that.phone, inviterCode: sendData.inviterCode, - bindingConsortiaId: sendData.bindingConsortiaId, + bindingConsortiaId: sendData.bindingConsortiaId, + blFxyCode: sendData.blFxyCode, + blJjrCode: sendData.blJjrCode, + blYwyCode: sendData.blYwyCode, + blQdsCode: sendData.blQdsCode, + blDlsCode: sendData.blDlsCode, }; that.$Request.postJson('/app/Login/insertWxUser', postData).then(res => { uni.hideLoading(); @@ -412,6 +472,11 @@ uni.setStorageSync('avatar', res.user.avatar) uni.setStorageSync('phone', res.user.phone) uni.setStorageSync('invitationCode', res.user.invitationCode) + uni.setStorageSync('blFxyCode', res.user.blFxyCode) + uni.setStorageSync('blJjrCode', res.user.blJjrCode) + uni.setStorageSync('blYwyCode', res.user.blYwyCode) + uni.setStorageSync('blQdsCode', res.user.blQdsCode) + uni.setStorageSync('blDlsCode', res.user.blDlsCode) uni.setStorageSync('sex', res.user.sex) uni.setStorageSync('userId', res.user.userId) uni.setStorageSync('openId', res.user.openId) @@ -514,7 +579,7 @@ }, getUserInfo(userId, token) { - this.$Request.postJson('/app/selectUserById?userId=' + userId).then(res => { + this.$Request.postJson('/app/user/selectUserById?userId=' + userId).then(res => { if (res.code === 0) { this.$queue.setData('token', res.data.uuid); this.$queue.setData('image_url', res.data.imageUrl ? res.data.imageUrl : @@ -522,6 +587,11 @@ this.$queue.setData('inviterCode', res.data.inviterCode); this.$queue.setData('invitationCode', res.data.invitationCode); this.$queue.setData('bindingConsortiaId', res.data.bindingConsortiaId); + this.$queue.setData('blFxyCode', res.data.blFxyCode); + this.$queue.setData('blJjrCode', res.data.blJjrCode); + this.$queue.setData('blYwyCode', res.data.blYwyCode); + this.$queue.setData('blQdsCode', res.data.blQdsCode); + this.$queue.setData('blDlsCode', res.data.blDlsCode); this.$queue.setData('grade', res.data.grade); this.$queue.setData('mobile', res.data.mobile); this.$queue.setData('isInvitation', res.data.isInvitation); diff --git a/pages/publicThree/register.vue b/pages/publicThree/register.vue index e708290..466541f 100644 --- a/pages/publicThree/register.vue +++ b/pages/publicThree/register.vue @@ -206,7 +206,7 @@ phone: phone, openId: this.$queue.getData('openid') ? this.$queue.getData('openid') : '', inviterCode: this.invitation, - bindingConsortiaId: this.bindingConsortiaId, + bindingConsortiaId: this.bindingConsortiaId, platform: this.platform, msg: code } diff --git a/pages/publicTwo/login.vue b/pages/publicTwo/login.vue index bd212f0..f65a80d 100644 --- a/pages/publicTwo/login.vue +++ b/pages/publicTwo/login.vue @@ -101,6 +101,21 @@ if (e.bindingConsortiaId) { this.$queue.setData('bindingConsortiaId', e.bindingConsortiaId); } + if (e.blFxyCode) { + this.$queue.setData('blFxyCode', e.blFxyCode); + } + if (e.blJjrCode) { + this.$queue.setData('blJjrCode', e.blJjrCode); + } + if (e.blYwyCode) { + this.$queue.setData('blYwyCode', e.blYwyCode); + } + if (e.blQdsCode) { + this.$queue.setData('blQdsCode', e.blQdsCode); + } + if (e.blDlsCode) { + this.$queue.setData('blDlsCode', e.blDlsCode); + } this.$Request.get('/app/common/type/237').then(res => { if (res.code == 0) { if (res.data && res.data.value && res.data.value == '是') { @@ -168,6 +183,11 @@ this.$queue.setData("invitationCode", res.user.invitationCode); this.$queue.setData("inviterCode", res.user.inviterCode); this.$queue.setData("bindingConsortiaId", res.user.bindingConsortiaId); + this.$queue.setData('blFxyCode', res.user.blFxyCode); + this.$queue.setData('blJjrCode', res.user.blJjrCode); + this.$queue.setData('blYwyCode', res.user.blYwyCode); + this.$queue.setData("blQdsCode", res.user.blQdsCode); + this.$queue.setData("blDlsCode", res.user.blDlsCode); let data = { userId: res.user.userId, focusedUserId: '0', @@ -233,6 +253,11 @@ this.$queue.setData("invitationCode", res.user.invitationCode); this.$queue.setData("inviterCode", res.user.inviterCode); this.$queue.setData("bindingConsortiaId", res.user.bindingConsortiaId); + this.$queue.setData('blFxyCode', res.user.blFxyCode); + this.$queue.setData('blJjrCode', res.user.blJjrCode); + this.$queue.setData('blYwyCode', res.user.blYwyCode); + this.$queue.setData("blQdsCode", res.user.blQdsCode); + this.$queue.setData("blDlsCode", res.user.blDlsCode); let data = { userId: res.user.userId, focusedUserId: '0', @@ -274,6 +299,11 @@ this.$queue.setData("avatar", res.user.avatar); this.$queue.setData("invitationCode", res.user.invitationCode); this.$queue.setData("inviterCode", res.user.inviterCode); + this.$queue.setData('blFxyCode', res.user.blFxyCode); + this.$queue.setData('blJjrCode', res.user.blJjrCode); + this.$queue.setData('blYwyCode', res.user.blYwyCode); + this.$queue.setData("blQdsCode", res.user.blQdsCode); + this.$queue.setData("blDlsCode", res.user.blDlsCode); let data = { userId: res.user.userId, focusedUserId: '0', @@ -352,10 +382,30 @@ if (uni.getStorageSync('inviterCode')) { inviterCode = uni.getStorageSync('inviterCode') } - let bindingConsortiaId = ''; + let bindingConsortiaId = ''; if (uni.getStorageSync('bindingConsortiaId')) { bindingConsortiaId = uni.getStorageSync('bindingConsortiaId') } + let blFxyCode = ''; + if (uni.getStorageSync('blFxyCode')) { + blFxyCode = uni.getStorageSync('blFxyCode') + } + let blJjrCode = ''; + if (uni.getStorageSync('blJjrCode')) { + blJjrCode = uni.getStorageSync('blJjrCode') + } + let blYwyCode = ''; + if (uni.getStorageSync('blYwyCode')) { + blYwyCode = uni.getStorageSync('blYwyCode') + } + let blQdsCode = ''; + if (uni.getStorageSync('blQdsCode')) { + blQdsCode = uni.getStorageSync('blQdsCode') + } + let blDlsCode = ''; + if (uni.getStorageSync('blDlsCode')) { + blDlsCode = uni.getStorageSync('blDlsCode') + } let sendData = { openId: uni.getStorageSync('openId'), unionId: uni.getStorageSync('unionId'), @@ -363,7 +413,12 @@ avatar: avatarUrl, sex: sex, //性别 inviterCode: inviterCode, //别人登录进来携带你的邀请码 - bindingConsortiaId: bindingConsortiaId, + bindingConsortiaId: bindingConsortiaId, + blFxyCode: blFxyCode, + blJjrCode: blJjrCode, + blYwyCode: blYwyCode, + blQdsCode: blQdsCode, + blDlsCode: blDlsCode, }; that.sendDataList = sendData; that.flag = res.data.flag; @@ -432,7 +487,12 @@ sex: sendData.sex, //性别 phone: that.phone, inviterCode: sendData.inviterCode, - bindingConsortiaId: sendData.bindingConsortiaId, + bindingConsortiaId: sendData.bindingConsortiaId, + blFxyCode: sendData.blFxyCode, + blJjrCode: sendData.blJjrCode, + blYwyCode: sendData.blYwyCode, + blQdsCode: sendData.blQdsCode, + blDlsCode: sendData.blDlsCode, }; that.$Request.postJson('/app/Login/insertWxUser', postData).then(res => { uni.hideLoading(); @@ -442,6 +502,11 @@ uni.setStorageSync('avatar', res.user.avatar) uni.setStorageSync('phone', res.user.phone) uni.setStorageSync('invitationCode', res.user.invitationCode) + uni.setStorageSync('blFxyCode', res.user.blFxyCode) + uni.setStorageSync('blJjrCode', res.user.blJjrCode) + uni.setStorageSync('blYwyCode', res.user.blYwyCode) + uni.setStorageSync('blQdsCode', res.user.blQdsCode) + uni.setStorageSync('blDlsCode', res.user.blDlsCode) uni.setStorageSync('sex', res.user.sex) uni.setStorageSync('userId', res.user.userId) uni.setStorageSync('openId', res.user.openId) @@ -544,7 +609,7 @@ }, getUserInfo(userId, token) { - this.$Request.postJson('/app/selectUserById?userId=' + userId).then(res => { + this.$Request.postJson('/app/user/selectUserById?userId=' + userId).then(res => { if (res.code === 0) { this.$queue.setData('token', res.data.uuid); this.$queue.setData('image_url', res.data.imageUrl ? res.data.imageUrl : @@ -552,6 +617,11 @@ this.$queue.setData('inviterCode', res.data.inviterCode); this.$queue.setData('invitationCode', res.data.invitationCode); this.$queue.setData('bindingConsortiaId', res.data.bindingConsortiaId); + this.$queue.setData('blFxyCode', res.data.blFxyCode); + this.$queue.setData('blJjrCode', res.data.blJjrCode); + this.$queue.setData('blYwyCode', res.data.blYwyCode); + this.$queue.setData('blQdsCode', res.data.blQdsCode); + this.$queue.setData('blDlsCode', res.data.blDlsCode); this.$queue.setData('grade', res.data.grade); this.$queue.setData('mobile', res.data.mobile); this.$queue.setData('isInvitation', res.data.isInvitation);