From 85c7681f828a9f4cd35d70c9aecd3b24cff12fe9 Mon Sep 17 00:00:00 2001 From: xuxueyang <xuxy@fengyuntec.com> Date: 星期日, 04 八月 2024 13:07:50 +0800 Subject: [PATCH] update 分享 --- pages/login/supplier-login.vue | 58 +++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 49 insertions(+), 9 deletions(-) diff --git a/pages/login/supplier-login.vue b/pages/login/supplier-login.vue index eab8c07..d184e05 100644 --- a/pages/login/supplier-login.vue +++ b/pages/login/supplier-login.vue @@ -58,7 +58,9 @@ <view class="topic-font m-l-a m-r-0" v-if="apitype!=='loginAdmin'" @click="toReg">前往注册</view> <!-- #ifdef PUB_CUSTOMER --> - <view class="topic-font m-l-a m-r-0" @click="toHome">返回首页</view> + <view class="topic-font m-l-a m-r-0" @click="toHome" v-if="!source">返回首页</view> + <view class="topic-font m-l-a m-r-0" @click="backpage" v-if="source==='jump'">返回上一页</view> + <!-- #endif --> <!-- #ifdef PUB_PARTNER --> <view class="topic-font m-l-a m-r-0" @click="()=>{ @@ -85,6 +87,8 @@ <script> export default { async onLoad(options) { + this.source = options.source || '' + this.sharePartnerUserId = options.sharePartnerUserId || '' // #ifdef PUB_CUSTOMER var query = options.q && decodeURIComponent(options.q) || '' var querydto = {} @@ -99,7 +103,24 @@ console.error('error', e) } } - console.log('options query111', querydto) + try { + if (!querydto.partnerUserId) { + if (options.query && options.query.scene) { + //说明是特殊小程序二维码扫码跳转的 + var keyvalues = decodeURIComponent(options.query.scene).split("&") + for (var item of keyvalues) { + var tarr = item.split("=") + querydto[tarr[0]] = tarr[1] + } + } + } + + } catch (e) { + console.error('error2', e) + } + + + console.log('options query111', options, querydto) // this.optionsStr = JSON.stringify(options) || '' if (querydto.partnerUserId) { //通过接口获取名称,兼容,url上不能放中文的情况 @@ -231,9 +252,23 @@ //退出登录了,或者失效了 // uni.navigateTo({ // url: `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}` - // }) - uni.navigateTo({ - url: `/pages/login/supplier-reg?partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}` + // }) + if (!querydto.partnerUserName) { + tmp.$message.showLoading() + const resname = await tmp.$http.request('get', + '/api/customer/partner/name', { + params: { + id: querydto.partnerUserId + } + }) + tmp.$message.hideLoading() + if (resname.code == 0) { + querydto.partnerUserName = resname.data || '' + } + + } + uni.navigateTo({ + url: `/pages/login/supplier-reg?partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}` }) } } catch (e2) { @@ -273,8 +308,7 @@ }, onShareAppMessage() { let that = this; - var name = that.currentInfo.customerDTO && currentInfo.customerDTO.name || that.currentInfo.supplierDTO && - currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && currentInfo.partnerDTO.name || '' + var name = that.currentInfo.customerDTO&&that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO&&that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO&&that.currentInfo.partnerDTO.name || '' var url = `/pages/login/supplier-login?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数 return { @@ -284,8 +318,7 @@ }, onShareTimeline() { let that = this; - var name = that.currentInfo.customerDTO && currentInfo.customerDTO.name || that.currentInfo.supplierDTO && - currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && currentInfo.partnerDTO.name || '' + var name = that.currentInfo.customerDTO&&that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO&&that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO&&that.currentInfo.partnerDTO.name || '' var url = `/pages/login/supplier-login?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数 return { @@ -304,6 +337,8 @@ phoneNumber: '', smsCode: '', + source: '', //来源 + sharePartnerUserId: '', //分享跳转登录的id checked: false, loginType: 'pwd', //pwd和code,密码和验证码登录 @@ -416,6 +451,9 @@ uni.redirectTo({ url: '/pages/login/supplier-reg' }) + // todo 如果是有分享id的,可能需要提前进行绑定 + + // #endif }, changeAll(e) { @@ -487,6 +525,8 @@ // uni.navigateBack(); // }, 1000); + //todo 登录后可能需要进行绑定 + } else { // uni.showToast({ // title: '登录失败!', -- Gitblit v1.9.3