From 55f5543d41569f7c42f50799b2200393ffd5b31a Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期日, 04 八月 2024 10:55:29 +0800
Subject: [PATCH] addd 支持特殊二维码
---
pages/login/supplier-login.vue | 36 ++++++++++++++++-
pages/login/supplier-reg.vue | 6 +-
App.vue | 22 ++++++++++-
3 files changed, 56 insertions(+), 8 deletions(-)
diff --git a/App.vue b/App.vue
index f858281..796812d 100644
--- a/App.vue
+++ b/App.vue
@@ -19,7 +19,23 @@
console.error('error', e)
}
}
- console.log('app query222',options, query,'\n@@\n ', 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('app query222', options, query, '\n@@\n ', querydto)
console.warn('当前组件仅支持 uni_modules 目录结构 ，请升级 HBuilderX 到 3.1.0 版本以上！')
@@ -70,7 +86,9 @@
// 需要处理一下，判断是跳转登录还是原封不动
if (!!querydto.partnerUserId) {
//需要去注册页面
- console.log('options', options)
+ console.log('options', options)
+ //说明走的是特殊微信小程序，那么就要专门处理了
+
} else {
// uni.reLaunch({
diff --git a/pages/login/supplier-login.vue b/pages/login/supplier-login.vue
index eab8c07..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上不能放中文的情况
@@ -232,8 +249,21 @@
// uni.navigateTo({
// url: `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}`
// })
- uni.navigateTo({
- url: `/pages/login/supplier-reg?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: `/pages/login/supplier-reg?partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}`
})
}
} catch (e2) {
diff --git a/pages/login/supplier-reg.vue b/pages/login/supplier-reg.vue
index 5b5be15..135ff49 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,7 +78,7 @@
<view class="topic-font m-l-0 m-r-a" @click="backInfoPage" v-if="source==='step'">返回上一步
</view>
<!-- #ifdef PUB_CUSTOMER -->
- <!-- v-if="source==='step'" -->
+ <!-- v-if="source==='step'" -->
<view class="topic-font m-l-0 m-r-a" @click="scanPartnerCode">扫码绑定合伙人
</view>
<!-- #endif -->
@@ -398,7 +398,7 @@
post.wxcode = wxcode
-
+ console.log('reg dto', post)
// const {
// code
// } = await this.$http.request('get', '/api/login/admin')
--
Gitblit v1.9.3