From 7a68f7e13913f8d4f86962979fd1e79c18f57fb6 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期六, 03 八月 2024 10:44:25 +0800
Subject: [PATCH] update 登录和其他部分信息
---
pages/login/supplier-login.vue | 132 ++++++++++++++++++++++++++++----------------
1 files changed, 84 insertions(+), 48 deletions(-)
diff --git a/pages/login/supplier-login.vue b/pages/login/supplier-login.vue
index 6e36103..ed2e6b5 100644
--- a/pages/login/supplier-login.vue
+++ b/pages/login/supplier-login.vue
@@ -76,6 +76,9 @@
</form>
</view>
+ <!-- <view v-if="optionsStr">
+ {{optionsStr}}
+ </view> -->
</view>
</view>
</template>
@@ -83,67 +86,99 @@
export default {
onLoad(options) {
// #ifdef PUB_CUSTOMER
- if (options.partnerUserId) {
+ var query = options.q && decodeURIComponent(options.q) || ''
+ var querydto = {}
+ if (query) {
+ try {
+ var keyvalues = query.split("?")[1].split("&")
+ for (var item of keyvalues) {
+ var tarr = item.split("=")
+ querydto[tarr[0]] = tarr[1]
+ }
+ } catch (e) {
+ console.error('error', e)
+ }
+ }
+ console.log('options query111', querydto)
+ // this.optionsStr = JSON.stringify(options) || ''
+ if (querydto.partnerUserId) {
if (this.$storage.getItem('token')) {
+ console.log('to login 1')
this.$message.showLoading()
//稍微等一会，避免currentInfo还在同步
let tmp = this
- setTimeout(() => {
- tmp.$message.hideLoading()
- if (tmp.currentInfo.id || tmp.$storage.getItem('token')) {
- //这种已经登录的
- //确定是注册绑定还是重新绑定
- var t = {
- title: '提示,您已登录,是否退出并注册绑定合伙人',
- content: '',
- showCancel: true,
- cancelText: '使用当前账号绑定合伙人',
- cancelColor: '#000000',
- confirmText: '退出当前账号并注册、绑定',
- confirmColor: '#20613D'
- }
- uni.showModal({
- ...t,
- success: (res) => {
- if (res.confirm) {
- //清空登录信息，
- this.$store.commit('updateLogin', false)
- setTimeout(() => {
- uni.navigateTo({
- url: `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${options.partnerUserId}&partnerUserName=${options.partnerUserName}`
- })
- }, 200)
+ setTimeout(async () => {
+ try {
+ tmp.$message.hideLoading()
+ if (tmp.currentInfo && tmp.currentInfo.id || tmp.$storage.getItem('token')) {
+ await this.$store.dispatch('getCurrentInfo');
+ //这种已经登录的
+ //确定是注册绑定还是重新绑定
+ tmp.$nextTick(() => {
+ var tt = {
+ title: '提示:您已登录,是直接用该账号绑定，还是退出并注册新账号绑定合伙人',
+ content: '',
+ showCancel: true,
+ cancelText: '直接绑定',
+ cancelColor: '#000000',
+ confirmText: '退出注册',
+ confirmColor: '#20613D'
}
- if (res.cancel) {
- if (!tmp.currentInfo.customer) {
- tmp.$message.showToast('您尚未完善信息无法绑定')
- return
- } else {
- if (tmp.currentInfo.customer.partnerId) {
- tmp.$message.showToast('您已绑定，请联系客服解除绑定')
- return
- } else {
- //前往绑定页面
- uni.reLaunch({
- url: `/pages/user/supplier-user?partnerUserId=${options.partnerUserId}&partnerUserName=${options.partnerUserName}`
- })
+ uni.showModal({
+ ...tt,
+ success: (res) => {
+ if (res.confirm) {
+ //清空登录信息，
+ this.$store.commit('updateLogin', false)
+ setTimeout(() => {
+ uni.navigateTo({
+ url: `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}`
+ })
+ }, 200)
}
+ if (res.cancel) {
+ if (!tmp.currentInfo.customerDTO) {
+ tmp.$message.showToast('您尚未完善信息无法绑定')
+ return
+ } else {
+ if (tmp.currentInfo.customerDTO
+ .partnerId) {
+ tmp.$message.showToast(
+ '您已绑定，请联系客服解除绑定')
+ return
+ } else {
+ //前往绑定页面
+ uni.reLaunch({
+ url: `/pages/user/supplier-user?partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}`
+ })
+ }
+ }
+ }
+ },
+ fail(res) {
+ console.log('res uni model', res)
}
- }
- }
- })
+ })
- } else {
- //退出登录了，或者失效了
- uni.navigateTo({
- url: `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${options.partnerUserId}&partnerUserName=${options.partnerUserName}`
- })
+ })
+ } else {
+ console.log('to login 3')
+ //退出登录了，或者失效了
+ uni.navigateTo({
+ url: `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}`
+ })
+ }
+ } catch (e2) {
+ console.log('to login error', e2)
}
}, 2000)
} else {
+ 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=${options.partnerUserId}&partnerUserName=${options.partnerUserName}`
+ url: `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}`
})
}
@@ -154,6 +189,7 @@
},
data() {
return {
+ optionsStr: '',
openId: '-1',
userName: '',
password: '',
--
Gitblit v1.9.3