From 7ab85d2bafc52f50a016e37538ccc79e9180cc74 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 13 八月 2024 17:12:12 +0800
Subject: [PATCH] 1
---
pages/login/supplier-login.vue | 104 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 77 insertions(+), 27 deletions(-)
diff --git a/pages/login/supplier-login.vue b/pages/login/supplier-login.vue
index b779053..dcb669d 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上不能放中文的情况
@@ -120,22 +141,22 @@
tmp.$nextTick(async () => {
if (!tmp.currentInfo.customerDTO) {
tmp.$message.showToast(
- '您尚未完善信息无法绑定')
- setTimeout(() => {
- uni.reLaunch({
- url: '/pages/home/home'
- })
+ '您尚未完善信息无法绑定')
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '/pages/home/home'
+ })
}, 500)
return
} else {
if (tmp.currentInfo.customerDTO
.partnerId) {
tmp.$message.showToast(
- '您已绑定，请联系客服解除绑定')
- setTimeout(() => {
- uni.reLaunch({
- url: '/pages/home/home'
- })
+ '您已绑定，请联系客服解除绑定')
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '/pages/home/home'
+ })
}, 500)
return
} else {
@@ -149,7 +170,8 @@
} = await tmp.$http.request('post',
'/api/customer/bind/partner', {
data: {
- partnerUserId: querydto.partnerUserId
+ partnerUserId: querydto
+ .partnerUserId
}
})
tmp.$message.hideLoading()
@@ -228,8 +250,25 @@
} else {
console.log('to login 3')
//退出登录了，或者失效了
+ // uni.navigateTo({
+ // url: `/sub_pages/customer/customer-info/customer-info?source=step&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: `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}`
+ url: `/pages/login/supplier-reg?partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}`
})
}
} catch (e2) {
@@ -251,11 +290,14 @@
}
}
- console.log('to login 2',
- `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}`
- )
+ // console.log('to login 2',
+ // `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}`
+ // )
+ // uni.navigateTo({
+ // url: `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}`
+ // })
uni.navigateTo({
- url: `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}`
+ url: `/pages/login/supplier-reg?partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}`
})
}
@@ -266,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 {
@@ -277,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 {
@@ -297,6 +337,8 @@
phoneNumber: '',
smsCode: '',
+ source: '', //来源
+ sharePartnerUserId: '', //分享跳转登录的id
checked: false,
loginType: 'pwd', //pwd和code，密码和验证码登录
@@ -381,7 +423,7 @@
}, 1000)
},
toHome() {
- uni.redirectTo({
+ uni.reLaunch({
url: '/pages/home/home'
})
},
@@ -397,15 +439,21 @@
})
// #endif
// #ifdef PUB_SUPPLIER
- uni.redirectTo({
+ uni.reLaunch({
url: '/pages/login/supplier-reg'
})
// #endif
// #ifdef PUB_CUSTOMER
- addstr = '?source=step'
- uni.navigateTo({
- url: '/sub_pages/customer/customer-info/customer-info' + addstr
+ // addstr = '?source=step'
+ // uni.navigateTo({
+ // url: '/sub_pages/customer/customer-info/customer-info' + addstr
+ // })
+ uni.reLaunch({
+ url: '/pages/login/supplier-reg'
})
+ // todo 如果是有分享id的，可能需要提前进行绑定
+
+
// #endif
},
changeAll(e) {
@@ -477,6 +525,8 @@
// uni.navigateBack();
// }, 1000);
+
+
} else {
// uni.showToast({
// title: '登录失败！',
--
Gitblit v1.9.3