From 070f1b1d487ee55856a8cb73311793fa320da5cd Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期六, 03 八月 2024 16:27:32 +0800
Subject: [PATCH] 1
---
pages/login/supplier-login.vue | 178 +++++++++++++++++++++++++++++---------------
pages/login/supplier-reg.vue | 8 +
pages/user/supplier-user.vue | 8 +
3 files changed, 127 insertions(+), 67 deletions(-)
diff --git a/pages/login/supplier-login.vue b/pages/login/supplier-login.vue
index 20d49bf..b779053 100644
--- a/pages/login/supplier-login.vue
+++ b/pages/login/supplier-login.vue
@@ -104,19 +104,7 @@
if (querydto.partnerUserId) {
//通过接口获取名称，兼容，url上不能放中文的情况
- if (!querydto.partnerUserName) {
- this.$message.showLoading()
- const resname = await this.$http.request('get', '/api/customer/partner/name', {
- params: {
- id: querydto.partnerUserId
- }
- })
- this.$message.hideLoading()
- if (resname.code == 0) {
- querydto.partnerUserName = resname.data || ''
- }
- }
if (this.$storage.getItem('token')) {
console.log('to login 1')
@@ -127,61 +115,116 @@
try {
tmp.$message.hideLoading()
if (tmp.currentInfo && tmp.currentInfo.id || tmp.$storage.getItem('token')) {
- await this.$store.dispatch('getCurrentInfo');
+ await tmp.$store.dispatch('getCurrentInfo');
+ //已经登录的直接判断，并且绑定
+ tmp.$nextTick(async () => {
+ if (!tmp.currentInfo.customerDTO) {
+ tmp.$message.showToast(
+ '您尚未完善信息无法绑定')
+ 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'
+ })
+ }, 500)
+ return
+ } else {
+ //前往绑定页面
+ //直接绑定
+ //调用接口绑定
+ tmp.$message.showLoading()
+ const {
+ code,
+ data
+ } = await tmp.$http.request('post',
+ '/api/customer/bind/partner', {
+ data: {
+ partnerUserId: querydto.partnerUserId
+ }
+ })
+ tmp.$message.hideLoading()
+ if (code == 0) {
+ tmp.$message.showToast(`绑定合伙人成功`)
+ await tmp.$store.dispatch('getCurrentInfo')
+ //跳转到个人页面
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '/pages/home/home'
+ })
+ }, 500)
+
+ }
+
+ }
+ }
+ })
+
//这种已经登录的
//确定是注册绑定还是重新绑定
- tmp.$nextTick(() => {
- var tt = {
- title: '提示:您已登录,是直接用该账号绑定，还是退出并注册新账号绑定合伙人',
- content: '',
- showCancel: true,
- cancelText: '直接绑定',
- cancelColor: '#000000',
- confirmText: '退出注册',
- confirmColor: '#20613D'
- }
- uni.showModal({
- ...tt,
- success: async (res) => {
+ // tmp.$nextTick(() => {
+ // var tt = {
+ // title: '提示:您已登录,是直接用该账号绑定，还是退出并注册新账号绑定合伙人',
+ // content: '',
+ // showCancel: true,
+ // cancelText: '直接绑定',
+ // cancelColor: '#000000',
+ // confirmText: '退出注册',
+ // confirmColor: '#20613D'
+ // }
+ // uni.showModal({
+ // ...tt,
+ // success: async (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)
- }
- })
+ // 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 {
console.log('to login 3')
//退出登录了，或者失效了
@@ -195,6 +238,19 @@
}, 2000)
} else {
+ if (!querydto.partnerUserName) {
+ this.$message.showLoading()
+ const resname = await this.$http.request('get', '/api/customer/partner/name', {
+ params: {
+ id: querydto.partnerUserId
+ }
+ })
+ this.$message.hideLoading()
+ if (resname.code == 0) {
+ querydto.partnerUserName = resname.data || ''
+ }
+
+ }
console.log('to login 2',
`/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}`
)
diff --git a/pages/login/supplier-reg.vue b/pages/login/supplier-reg.vue
index 4ea03aa..c053514 100644
--- a/pages/login/supplier-reg.vue
+++ b/pages/login/supplier-reg.vue
@@ -164,17 +164,19 @@
console.log('条码内容：' + res.result);
var dto = undefined
try {
- if (res.result && res.result.startsWith('http://') && res.result.indexOf(
+ if (res.result && (res.result.startsWith('http://') || res.result.startsWith(
+ 'https://')) && res.result.indexOf(
'partnerUserId') >= 0) {
var arr = res.result.split("?")[1].split("&")
dto = {}
for (var item of arr) {
var tarr = item.split("=")
if (tarr[1]) {
- dto[tarr[0]] = dto[tarr[1]]
+ dto[tarr[0]] = tarr[1]
+
}
}
- dto['name'] = dto['partnerUserName'] || dto['partnerUserId'] || '佚名'
+ dto['name'] = dto['partnerUserName'] || ''
dto['userId'] = dto['partnerUserId'] || ''
} else {
diff --git a/pages/user/supplier-user.vue b/pages/user/supplier-user.vue
index 93c7b95..cd9eccc 100644
--- a/pages/user/supplier-user.vue
+++ b/pages/user/supplier-user.vue
@@ -431,16 +431,18 @@
try {
if (res.result && (res.result.startsWith('https://')||res.result.startsWith('http://')) && res.result.indexOf(
'partnerUserId') >= 0) {
- var arr = res.result.split("?")[1].split("&")
+ var arr = res.result.split("?")[1].split("&")
dto = {}
for (var item of arr) {
- var tarr = item.split("=")
+ var tarr = item.split("=")
+ // console.log('tarr',tarr)
if (tarr[1]) {
- dto[tarr[0]] = dto[tarr[1]]
+ dto[tarr[0]] = tarr[1]
}
}
dto['name'] = dto['partnerUserName'] || ''
dto['userId'] = dto['partnerUserId'] || ''
+ // console.log('tmp arr',arr,dto)
} else {
dto = JSON.parse(res.result)
--
Gitblit v1.9.3