fix
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
import {Module} from 'vuex'
|
||||
import {RootState} from '../index'
|
||||
import { Https } from "@/tool/https";
|
||||
import { setLang } from "@/tool/guide";
|
||||
import store from '../index'
|
||||
interface UserHabit{
|
||||
clothingType:any,
|
||||
@@ -58,15 +59,24 @@ const userHabit : Module<UserHabit,RootState> = {
|
||||
sex:{
|
||||
},
|
||||
userDetail:{
|
||||
email: "X1627315083@163.com",
|
||||
userName: "wxd",
|
||||
userId: 83,
|
||||
isTrial: 0,
|
||||
isBeginner: 0,
|
||||
systemUser: 1,
|
||||
email:'-------------',
|
||||
userName: "---",
|
||||
userId: -1,
|
||||
isBeginner: false,
|
||||
systemUser: -1,
|
||||
avatar: "https://www.minio.aida.com.hk:12024/aida-users/87/avatar/default.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=admin%2F20241209%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20241209T055108Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=04bb98c0a264b91f3c30173f7ab9e91de7bf31bd48440f4595fdd91f05629b80",
|
||||
followeeCount: 3,
|
||||
followerCount: 3
|
||||
followeeCount: '-',
|
||||
followerCount: '-',
|
||||
accountExtendList:null,
|
||||
systemList:[],
|
||||
expireTime:null,
|
||||
language:'',
|
||||
timeData:{
|
||||
isExpiration:false,
|
||||
text:''
|
||||
},
|
||||
subscriptionType:null,
|
||||
subscriptionId:null,
|
||||
}
|
||||
},
|
||||
mutations:{
|
||||
@@ -101,32 +111,23 @@ const userHabit : Module<UserHabit,RootState> = {
|
||||
state.Position = state.MalePosition
|
||||
}
|
||||
},
|
||||
setSystemUser(state,data){
|
||||
state.systemUser.value = data
|
||||
},
|
||||
setUserInfo(state,data){
|
||||
upUserDetail(state,data){
|
||||
if(!data)return
|
||||
for (const key in data) {
|
||||
state.userInfo[key] = data[key]
|
||||
if(data.affiliate){
|
||||
if(state.userDetail.systemList.indexOf(data.affiliate) == -1)state.userDetail.systemList.push(2)
|
||||
}
|
||||
for (const key in data) {
|
||||
state.userDetail[key] = data[key]
|
||||
}
|
||||
},
|
||||
clearSystemUser(state){
|
||||
state.systemUser.value = -1
|
||||
state.userInfo = {}
|
||||
},
|
||||
setMessageSystem(state,data){
|
||||
let num = 0
|
||||
// let userInfo = ['-1']
|
||||
let userInfo = ['followeeCount','followerCount']
|
||||
let obj:any = {}
|
||||
console.log(data);
|
||||
data.forEach((item:any) => {
|
||||
for (const iterator in item) {
|
||||
if(userInfo.indexOf(iterator) > -1){
|
||||
obj[iterator] = item[iterator]
|
||||
store.commit('setUserInfo', obj)
|
||||
}else{
|
||||
// if(iterator != 'newPosted')num+=item[iterator]
|
||||
state.messageSystem.messageType[iterator] = item[iterator]
|
||||
}
|
||||
}
|
||||
@@ -151,15 +152,96 @@ const userHabit : Module<UserHabit,RootState> = {
|
||||
setSex(state,data){
|
||||
state.sex.value = data
|
||||
},
|
||||
createDetail(state,data){
|
||||
state.userDetail = {
|
||||
email:'-------------',
|
||||
userName: "---",
|
||||
userId: -1,
|
||||
isBeginner: false,
|
||||
systemUser: -1,
|
||||
avatar: "https://www.minio.aida.com.hk:12024/aida-users/87/avatar/default.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=admin%2F20241209%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20241209T055108Z&X-Amz-Expires=86400&X-Amz-SignedHeaders=host&X-Amz-Signature=04bb98c0a264b91f3c30173f7ab9e91de7bf31bd48440f4595fdd91f05629b80",
|
||||
followeeCount: '-',
|
||||
followerCount: '-',
|
||||
accountExtendList:null,
|
||||
systemList:[],
|
||||
expireTime:null,
|
||||
language:'',
|
||||
timeData:{
|
||||
isExpiration:false,
|
||||
text:''
|
||||
},
|
||||
subscriptionType:null,
|
||||
subscriptionId:null,
|
||||
//是否是affiliate用户
|
||||
affiliate:false,
|
||||
}
|
||||
},
|
||||
setUserDetail(state,data){
|
||||
// state.userDetail = data
|
||||
console.log(data);
|
||||
data.email = data.email?data.email:'------'
|
||||
data.userName = data.userName
|
||||
data.userId = data.userId
|
||||
data.avatar = data.avatar
|
||||
data.followeeCount = data.followeeCount
|
||||
data.followerCount = data.followerCount
|
||||
|
||||
// state.userDetail = data
|
||||
state.userDetail.email = data.email?data.email:'------'
|
||||
state.userDetail.userName = data.userName//用户名
|
||||
state.userDetail.userId = data.userId//用户id
|
||||
state.userDetail.avatar = data.avatar//头像
|
||||
state.userDetail.isBeginner = data.isBeginner == 1 ? true : false;//是否完成新手指引
|
||||
/**
|
||||
* 用于区分游客与系统用户
|
||||
* 0 : 游客
|
||||
* 1 : 年付用户
|
||||
* 2 : 月付用户
|
||||
* 3 : 试用用户
|
||||
* 4 : 参加活动获取30天有效期和6000个积分的用户
|
||||
* 5 : 企业管理员账号
|
||||
* 6 : 企业子账号
|
||||
* 7 : 学校管理员
|
||||
* 8 : 学校子账号
|
||||
*/
|
||||
state.userDetail.affiliate = data.affiliate
|
||||
state.userDetail.systemUser = data.systemUser
|
||||
// 身份列表1:可以使用aida系统,2:可以使用affiliate页面,3:系统管理员用户
|
||||
state.userDetail.systemList = []
|
||||
if(data.systemUser != 0)state.userDetail.systemList.push(1)
|
||||
if(data.affiliate)state.userDetail.systemList.push(2)
|
||||
let adminIdList = [88,6,46,31,73,83,87,4]
|
||||
if(adminIdList.indexOf(data.userId) > -1)state.userDetail.systemList.push(3)
|
||||
|
||||
state.userDetail.followeeCount = data.followeeCount//粉丝数量
|
||||
state.userDetail.followerCount = data.followerCount//关注数量
|
||||
state.userDetail.accountExtendList = {}
|
||||
if(data.accountExtendList){
|
||||
if(!Array.isArray(data.accountExtendList)){
|
||||
state.userDetail.accountExtendList = data.accountExtendList
|
||||
}else{
|
||||
let WeChat = data.accountExtendList.filter((item:any) => item.authType == 'WeChat')[0]
|
||||
let Google = data.accountExtendList.filter((item:any) => item.authType == 'Google')[0]
|
||||
let obj = {
|
||||
WeChat,Google
|
||||
}
|
||||
state.userDetail.accountExtendList = obj//绑定相关内容
|
||||
}
|
||||
}
|
||||
state.userDetail.email = data.email?data.email:'------'
|
||||
let current = Math.floor(Date.now() / 1000);
|
||||
let timeData
|
||||
if(data.expireTime){
|
||||
timeData = {
|
||||
isExpiration:current<data.expireTime,
|
||||
text:new Date(parseInt(String(data.expireTime*1000))).toLocaleDateString()
|
||||
}
|
||||
}else{
|
||||
timeData = {
|
||||
isExpiration:true,
|
||||
text:'- - - - / - - / - -'
|
||||
}
|
||||
}
|
||||
state.userDetail.timeData = timeData//有效期
|
||||
state.userDetail.language = data.language//当前语言
|
||||
setLang(data.language)
|
||||
state.userDetail.expireTime = data.expireTime//有效期
|
||||
state.userDetail.subscriptionType = data.subscriptionType//当前订阅类型
|
||||
state.userDetail.status = data.status//当前订阅类型
|
||||
state.userDetail.subscriptionId = data.subscriptionId//最新订阅id
|
||||
}
|
||||
},
|
||||
|
||||
@@ -195,7 +277,7 @@ const userHabit : Module<UserHabit,RootState> = {
|
||||
let allPromise = [];
|
||||
let getList = ['DesignElementsEnum','PrintboardLevel2TypeEnum','FemalePosition','MalePosition','SketchStyle','SketchGenerateType','Sex']
|
||||
let axiosGet = (item:any)=>{
|
||||
return new Promise((resolve) => {
|
||||
return new Promise((resolve,reject) => {
|
||||
Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:item}}).then((rv: any) => {
|
||||
if (rv) {
|
||||
rv.forEach((item:any) => {
|
||||
@@ -222,14 +304,18 @@ const userHabit : Module<UserHabit,RootState> = {
|
||||
}
|
||||
resolve('')
|
||||
}
|
||||
}).catch(()=>{
|
||||
reject('')
|
||||
})
|
||||
})
|
||||
}
|
||||
let getUserDetail = ()=>{
|
||||
return new Promise((resolve) => {
|
||||
return new Promise((resolve,reject) => {
|
||||
Https.axiosPost(Https.httpUrls.accountDetail).then((rv: any) => {
|
||||
context.commit('setUserDetail',rv)
|
||||
resolve('')
|
||||
}).catch(()=>{
|
||||
reject('')
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user