Commit 22e6be98 by jianan

fix(统一身份): index/我的页适配 sso 登录态,游客降级排除票据通道

parent c9e4a6ed
...@@ -493,7 +493,7 @@ ...@@ -493,7 +493,7 @@
return return
} }
let loginType = uni.getStorageSync('loginType') let loginType = uni.getStorageSync('loginType')
if(loginType == 'codelogin'){ if(loginType == 'codelogin' || loginType == 'sso'){
this.querySystemMessage() this.querySystemMessage()
this.queryInfo() this.queryInfo()
this.courseList() this.courseList()
......
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
<view class="headerInfo"> <view class="headerInfo">
<view class="headerTop"> <view class="headerTop">
<view class="" style="margin-right: 15rpx;"> <view class="" style="margin-right: 15rpx;">
<view class="myName" v-if="loginType == 'codelogin'"> <!-- sso(Casdoor 票据会话)与 codelogin 同为已登录态,共用名称/描述展示 -->
<view class="myName" v-if="loginType == 'codelogin' || loginType == 'sso'">
{{showMyName || '点头像完善信息'}} {{showMyName || '点头像完善信息'}}
<text v-if="customerBasicInfo.partnerType" <text v-if="customerBasicInfo.partnerType"
class="typePartner">{{customerBasicInfo.partnerType}}</text> class="typePartner">{{customerBasicInfo.partnerType}}</text>
...@@ -19,7 +20,7 @@ ...@@ -19,7 +20,7 @@
<view class="myName" v-if="loginType == 'visitor'">游客</view> <view class="myName" v-if="loginType == 'visitor'">游客</view>
</view> </view>
<!-- &&customerBasicInfo.parentName 我的上级:{{customerBasicInfo.parentName}} --> <!-- &&customerBasicInfo.parentName 我的上级:{{customerBasicInfo.parentName}} -->
<view class="desBox" v-if="loginType == 'codelogin'"> <view class="desBox" v-if="loginType == 'codelogin' || loginType == 'sso'">
<!-- 上级的显示 --> <!-- 上级的显示 -->
<text class="desTxt" <text class="desTxt"
v-if="customerBasicInfo.parentRealName&&customerBasicInfo.parentNickName">我的上级:{{customerBasicInfo.parentRealName}}({{customerBasicInfo.parentNickName}})</text> v-if="customerBasicInfo.parentRealName&&customerBasicInfo.parentNickName">我的上级:{{customerBasicInfo.parentRealName}}({{customerBasicInfo.parentNickName}})</text>
...@@ -427,7 +428,9 @@ ...@@ -427,7 +428,9 @@
} else { } else {
this.loginornot = true; this.loginornot = true;
} }
if (this.loginType == 'codelogin') { // sso 会话与 codelogin 同样拉取用户数据:queryInfo 无参、服务端读
// CffpUserThreadLocal,过滤器 Casdoor 分支已写入同一 ThreadLocal
if (this.loginType == 'codelogin' || this.loginType == 'sso') {
this.querySystemMessage() this.querySystemMessage()
this.queryInfo(); this.queryInfo();
this.courseList() this.courseList()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment