From 6e4b859a05e29eb75ff39c340e015265c3be85e9 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期日, 04 八月 2024 11:51:43 +0800
Subject: [PATCH] update 合伙人、花店端
---
pages/login/supplier-login.vue | 80 ++++++++++++++++++++++++++++++----------
1 files changed, 60 insertions(+), 20 deletions(-)
diff --git a/pages/login/supplier-login.vue b/pages/login/supplier-login.vue
index b779053..7bbbf57 100644
--- a/pages/login/supplier-login.vue
+++ b/pages/login/supplier-login.vue
@@ -98,8 +98,25 @@
} catch (e) {
console.error('error', e)
}
+ }
+ 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', querydto)
+
+
+ console.log('options query111', options, querydto)
// this.optionsStr = JSON.stringify(options) || ''
if (querydto.partnerUserId) {
//通过接口获取名称，兼容，url上不能放中文的情况
@@ -120,22 +137,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 +166,8 @@
} = await tmp.$http.request('post',
'/api/customer/bind/partner', {
data: {
- partnerUserId: querydto.partnerUserId
+ partnerUserId: querydto
+ .partnerUserId
}
})
tmp.$message.hideLoading()
@@ -228,8 +246,24 @@
} 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 +285,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}`
})
}
@@ -402,9 +439,12 @@
})
// #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.redirectTo({
+ url: '/pages/login/supplier-reg'
})
// #endif
},
--
Gitblit v1.9.3