From 7f693ebe71d34fd84b3618ff0d5a66f004e46db5 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期日, 11 八月 2024 22:33:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
pages/login/supplier-reg.vue | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/pages/login/supplier-reg.vue b/pages/login/supplier-reg.vue
index 5b5be15..e8d03b4 100644
--- a/pages/login/supplier-reg.vue
+++ b/pages/login/supplier-reg.vue
@@ -36,7 +36,7 @@
<view class="title-1">HELLO</view>
<view class="title-2">欢迎入驻<span class="title-3">花满芫</span></view>
<!-- #ifdef PUB_CUSTOMER -->
- <view class="title-2">{{!partnerId?'未绑定合伙人':`已绑定${partnerName}`}}</view>
+ <view class="title-2">{{!partnerId?'未绑定合伙人':`已绑定合伙人-${partnerName}`}}</view>
<!-- #endif -->
</view>
@@ -78,9 +78,9 @@
<view class="topic-font m-l-0 m-r-a" @click="backInfoPage" v-if="source==='step'">返回上一步
</view>
<!-- #ifdef PUB_CUSTOMER -->
- <!-- v-if="source==='step'" -->
- <view class="topic-font m-l-0 m-r-a" @click="scanPartnerCode">扫码绑定合伙人
- </view>
+ <!-- v-if="source==='step'" -->
+ <!-- <view class="topic-font m-l-0 m-r-a" @click="scanPartnerCode">扫码绑定合伙人
+ </view> -->
<!-- #endif -->
<view class="topic-font m-l-a m-r-0" @click="toLogin">前往登录</view>
@@ -154,6 +154,8 @@
if (options.partnerUserName) {
this.partnerName = options.partnerUserName || '佚名'
}
+ //扫码过来的，自然要清除分享商品的id
+ this.$storage.removeItem('cache_sharePartnerUserId')
}
// #endif
@@ -166,6 +168,10 @@
uni.scanCode({
success: async function(res) {
console.log('条码内容：' + res.result);
+ if (!res.result) {
+ that.$message.showToast('未识别出信息，如果是微信小程序二维码，请微信扫码打开')
+ return
+ }
var dto = undefined
try {
if (res.result && (res.result.startsWith('http://') || res.result.startsWith(
@@ -282,7 +288,7 @@
}, 1000)
},
toLogin() {
- uni.redirectTo({
+ uni.reLaunch({
url: '/pages/login/supplier-login'
})
@@ -391,6 +397,20 @@
// #ifdef PUB_CUSTOMER
var dto = {}
dto.partnerUserId = this.partnerId || undefined
+ //如果没有绑定，有商品详情的分享合伙人id的话缓存的话，尝试用这个
+ if(!dto.partnerUserId){
+ try {
+ var sharePartnerUserId = this.$storage.getItem('cache_sharePartnerUserId')
+ if (sharePartnerUserId) {
+ //试图绑定
+ this.$storage.removeItem('cache_sharePartnerUserId')
+ dto.partnerUserId = sharePartnerUserId
+ }
+ } catch (e) {
+ console.error('reg bind ', e)
+ }
+ }
+
dto.name = this.regCustomerName || ''
post.dto = dto
// #endif
@@ -398,7 +418,7 @@
post.wxcode = wxcode
-
+ console.log('reg dto', post)
// const {
// code
// } = await this.$http.request('get', '/api/login/admin')
--
Gitblit v1.9.3