-
![]()
+
![]()
-
{{ cookieUserInfo.userName }}
-
{{$t('account.email')}}: {{ cookieUserInfo?.email }}
+
{{ userDetail.userName }}
+
{{$t('account.email')}}: {{ userDetail.email }}
- {{$t('account.Follow')}}：{{ userInfo?.followeeCount }}
+ {{$t('account.Follow')}}：{{ userDetail.followeeCount }}
- {{$t('account.Fans')}}：{{ userInfo?.followerCount }}
+ {{$t('account.Fans')}}：{{ userDetail.followerCount }}
@@ -54,7 +54,6 @@ import { Https } from "@/tool/https";
import { Modal,message } from 'ant-design-vue';
import { useRouter,useRoute } from 'vue-router'
import { useStore } from "vuex";
-import { setCookie, getCookie, WriteCookie } from "@/tool/cookie";
import { useI18n } from 'vue-i18n'
export default defineComponent({
components:{
@@ -63,14 +62,9 @@ export default defineComponent({
const {t} = useI18n()
const store = useStore();
- let userInfo:any= computed(()=>{
- return store.state.UserHabit.userInfo
+ let userDetail= computed(()=>{
+ return store.state.UserHabit.userDetail
})
- let cookieUserInfo = ref(null)
- if(getCookie('userInfo')){
- let userInfo:any = getCookie('userInfo')
- cookieUserInfo.value = JSON.parse(userInfo)
- }
let accountHomeData = reactive({
rootSubmenuKeys:[
{
@@ -96,8 +90,7 @@ export default defineComponent({
router.push({path:event.item.route})
}
return{
- userInfo,
- cookieUserInfo,
+ userDetail,
...toRefs(accountHomeData),
router,
handleClick,
diff --git a/src/component/Account/accountFollowFans.vue b/src/component/Account/accountFollowFans.vue
index f4d09157..25b63584 100644
--- a/src/component/Account/accountFollowFans.vue
+++ b/src/component/Account/accountFollowFans.vue
@@ -43,7 +43,6 @@ import { Https } from "@/tool/https";
import { useRouter,useRoute } from 'vue-router'
import { Modal,message } from 'ant-design-vue';
import { useStore } from "vuex";
-import { setCookie, getCookie, WriteCookie } from "@/tool/cookie";
import follow from '@/component/Account/followFans/follow.vue'
import fans from '@/component/Account/followFans/fans.vue'
import { useI18n } from 'vue-i18n'
@@ -70,9 +69,6 @@ export default defineComponent({
],
activeKey: '',
})
- let userInfo= computed(()=>{
- return store.state.UserHabit.userInfo
- })
let domRefs:any = reactive({
follow:ref(null),
fans:ref(null),
@@ -108,7 +104,6 @@ export default defineComponent({
return{
...toRefs(accountMessage),
...toRefs(domRefs),
- userInfo,
messageSystem,
setReadStatus,
changeTabs,
diff --git a/src/component/Account/accountMessage.vue b/src/component/Account/accountMessage.vue
index a3f807c4..d737651b 100644
--- a/src/component/Account/accountMessage.vue
+++ b/src/component/Account/accountMessage.vue
@@ -39,7 +39,6 @@ import { Https } from "@/tool/https";
import { useRouter,useRoute } from 'vue-router'
import { Modal,message } from 'ant-design-vue';
import { useStore } from "vuex";
-import { setCookie, getCookie, WriteCookie } from "@/tool/cookie";
import system from '@/component/Account/message/system.vue'
import privateChat from '@/component/Account/message/privateChat.vue'
import newFollow from '@/component/Account/message/newFollow.vue'
diff --git a/src/component/Account/followFans/fans.vue b/src/component/Account/followFans/fans.vue
index a5c03d05..2fd56d47 100644
--- a/src/component/Account/followFans/fans.vue
+++ b/src/component/Account/followFans/fans.vue
@@ -39,10 +39,7 @@
import { defineComponent,computed,ref,reactive,nextTick,toRefs,createVNode, onMounted} from 'vue'
import { Https } from "@/tool/https";
import { useRouter,useRoute } from 'vue-router'
-import { Modal,message } from 'ant-design-vue';
import { useStore } from "vuex";
-import { setCookie, getCookie, WriteCookie } from "@/tool/cookie";
-import { useI18n } from 'vue-i18n'
export default defineComponent({
components:{
},
diff --git a/src/component/Account/followFans/follow.vue b/src/component/Account/followFans/follow.vue
index 5277d011..4d5944a0 100644
--- a/src/component/Account/followFans/follow.vue
+++ b/src/component/Account/followFans/follow.vue
@@ -46,10 +46,7 @@
import { defineComponent,computed,ref,reactive,nextTick,toRefs,createVNode, onMounted} from 'vue'
import { Https } from "@/tool/https";
import { useRouter,useRoute } from 'vue-router'
-import { Modal,message } from 'ant-design-vue';
import { useStore } from "vuex";
-import { setCookie, getCookie, WriteCookie } from "@/tool/cookie";
-import { useI18n } from 'vue-i18n'
export default defineComponent({
components:{
},
diff --git a/src/component/Account/frontPage.vue b/src/component/Account/frontPage.vue
index d3e4fdad..3fb8084e 100644
--- a/src/component/Account/frontPage.vue
+++ b/src/component/Account/frontPage.vue
@@ -20,7 +20,6 @@ import { Https } from "@/tool/https";
import { useRouter,useRoute } from 'vue-router'
import { Modal,message } from 'ant-design-vue';
import { useStore } from "vuex";
-import { setCookie, getCookie, WriteCookie } from "@/tool/cookie";
import myInformation from '@/component/Account/frontPage/mylnformation.vue';
import bind from '@/component/Account/frontPage/bindPage.vue';
import cancelRenewal from '@/component/Account/frontPage/cancelRenewal.vue';
@@ -33,7 +32,8 @@ export default defineComponent({
},
setup() {
const {t} = useI18n()
- const router = useRouter()
+ const route = useRoute();
+ const router = useRouter();
const store = useStore();
let accountfrontPage = reactive({
frontPageList:[
@@ -47,8 +47,8 @@ export default defineComponent({
title:t('account.cancel'),
key:'cancelRenewal',
}
-
],
+ loadingShow:false,
activeKey: '',
})
let domRefs:any = reactive({
@@ -77,49 +77,35 @@ export default defineComponent({
reject(err)
})
})
-
}
- let setAllfrontPage = ()=>{
- return new Promise((resolve,reject)=>{
- let data = {
- type:accountfrontPage.activeKey
- }
- Https.axiosPost(Https.httpUrls.oneClickRead,'',{params:data}).then((rv)=>{
- resolve(rv)
- }).catch((err)=>{
- reject(err
- )
- })
- })
- }
- let getHistory = (data:any)=>{
- return new Promise((resolve,reject)=>{
- data.type = accountfrontPage.activeKey
- let url = Https.httpUrls.getHistoryNotification
- // if(data.type == 'follow'){
- // url = Https.httpUrls.porfolioGetFollowerList
- // }
- Https.axiosPost(url,data).then((rv)=>{
- if(rv){
- // domRefs[data.type][0].setfrontPageList(rv,data)
- resolve(rv)
- }
- }).catch((err)=>{
- reject(err)
- })
- })
+ const wechatLogin = (value:any)=> {
+ let data = {
+ code : value.code
+ }
+ accountfrontPage.loadingShow = true
+ Https.axiosGet(Https.httpUrls.bindWeChat, {params:data})
+ .then((rv) => {
+ accountfrontPage.loadingShow = false
+ console.log(rv);
+
+ router.push({ query: {} });
+ })
+ .catch((res) => {accountfrontPage.loadingShow = false});
}
onMounted(()=>{
let key = accountfrontPage.frontPageList[0].key
accountfrontPage.activeKey = key
+ const data = route.query
+ if(data?.state == 'weiXin'){
+ accountfrontPage.activeKey = 'bind'
+ wechatLogin(data)
+ }
})
return{
...toRefs(accountfrontPage),
...toRefs(domRefs),
setReadStatus,
changeTabs,
- setAllfrontPage,
- getHistory,
}
},
data(){
diff --git a/src/component/Account/frontPage/bindPage.vue b/src/component/Account/frontPage/bindPage.vue
index 75b3a5b7..5f936a2c 100644
--- a/src/component/Account/frontPage/bindPage.vue
+++ b/src/component/Account/frontPage/bindPage.vue
@@ -5,43 +5,148 @@
Bind Wechat
-
-
Unbound
+
+
![]()
+
{{ userDetail.accountExtendList?.WeChat?userDetail.accountExtendList?.WeChat.name:'Unbound' }}
-
Bind Now
+
Bind Now
+
Ungroup
+