fix

2024-08-23 10:19:02 +08:00
parent eff35d8a79
commit eb54023940
35 changed files with 1709 additions and 452 deletions
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -4,20 +4,20 @@
            <div class="homeMain_right_content">
                <div class="homeMain_user">
 					<div class="homeMain_user_icon" @click="openAccount">
-
+						<img :src="userInfo?.avatar" alt="">
 					</div>
 					<div class="homeMain_user_detail">
 						<div v-if="isTest" class="username">{{$t('Header.hello')}}@{{ $t('isTest.userName') }}</div>
-						<div v-else class="username">{{$t('Header.hello')}}@{{ userInfo?.userName }}</div>
+						<div v-else class="username">{{$t('Header.hello')}}@{{ cookieUserInfo?.userName }}</div>
 						<div class="homeMain_user_detail_item homeMain_user_detail_attention">
 							<div class="attention_item">
 							<!-- 点击事件就用下面的div -->
 							<!-- <div class="attention_item attention_item_active"> -->
-								<div>123</div>
+								<div>{{ userInfo?.followeeCount }}</div>
 								<span>关注</span>
 							</div>
 							<div class="attention_item">
-								<div>321</div>
+								<div>{{ userInfo?.followerCount }}</div>
 								<span>粉丝</span>
 							</div>
 							<div class="attention_item">
@@ -34,7 +34,7 @@
 				</div>
                <div class="homeMain_user_content">
                    <div v-if="isTest" class="username"><span>/</span> {{$t('Header.hello')}}@{{ $t('isTest.userName') }}</div>
-                    <div v-else class="username"><span>/</span> {{$t('Header.hello')}}@{{ userInfo?.userName }}</div>
+                    <div v-else class="username"><span>/</span> {{$t('Header.hello')}}@{{ cookieUserInfo?.userName }}</div>
                    <div
 						v-if="!isMurmur"

@@ -110,7 +110,7 @@
 					<i class="fi fi-rs-notebook"></i>
 					<span class="select_item_des">{{$t('Header.ViewOrders')}}</span>
 				</div>
-				<router-link class="select_item" v-if="AdministratorUserIdList.indexOf(userInfo?.userId) >= 0"  :to="`/administrator`">
+				<router-link class="select_item" v-if="AdministratorUserIdList.indexOf(cookieUserInfo?.userId) >= 0"  :to="`/administrator`">
 					<span class="icon iconfont icon-yonghu"></span>
 					<span class="select_item_des">Administrator</span>
 				</router-link>
@@ -186,7 +186,9 @@ export default defineComponent({
        const store = useStore();
 		const {t} = useI18n()
 		const {locale} = useI18n()
-		
+		let userInfo= computed(()=>{
+			return store.state.UserHabit.userInfo
+		})
 		let isTest = ref()
 		let isMurmur = ref()
 		let credits = computed(()=>{
@@ -245,6 +247,7 @@ export default defineComponent({
 		})
 		return {
 			store,
+			userInfo,
 			t,
 			locale,
 			isTest,
@@ -267,7 +270,7 @@ export default defineComponent({
            emailCode: ["", "", "", "", "", ""], //邮箱验证码
            time: 60, //60秒倒计时
            timer: 0,
-            userInfo: {},
+            cookieUserInfo: {},
            timerOperate: null,
            numTime: 30,
            timerSec: null,
@@ -303,13 +306,13 @@ export default defineComponent({
        this.isTest =JSON.parse(isTest)
        let isMurmur = getCookie('isMurmur')//获取是否是试用用户
        this.isMurmur =JSON.parse(isMurmur)
-        this.userInfo = JSON.parse(getCookie("userInfo"));
-        if (!this.userInfo) {
+        this.cookieUserInfo = JSON.parse(getCookie("userInfo"));
+        if (!this.cookieUserInfo) {
            this.$router.replace("/");
        } else {
-            this.accountIsLogin(this.userInfo);
+            this.accountIsLogin(this.cookieUserInfo);
        }
-        this.isHaveBindEmail = this.userInfo?.email ? true : false;
+        this.isHaveBindEmail = this.cookieUserInfo?.email ? true : false;
 		if(!this.isMurmur){
 			this.operateClick();
 			document.addEventListener("click", this.operateClick);
@@ -447,7 +450,7 @@ export default defineComponent({
        //登出
        async logout() {
            let data = {
-                userId: this.userInfo.userId,
+                userId: this.cookieUserInfo.userId,
            };
 			let isTest = getCookie('isTest')
 			// console.log(getCookie("token"));
@@ -636,6 +639,11 @@ export default defineComponent({
 				background-color: #000;
 				border-radius: 50%;
 				cursor: pointer;
+				img{
+					width: 100%;
+					height: 100%;
+					object-fit: contain;
+				}
 				// transition: all .3s;
 			}
 			.homeMain_user_detail{
--- a/src/views/HomeRecommend.vue
+++ b/src/views/HomeRecommend.vue
@@ -123,7 +123,10 @@ export default defineComponent({
 			// console.log(getCookie("token"));
 			Https.axiosPost(Https.httpUrls.accountLogout, data).then((rv) => {
 				clonAllCookie();
-			});
+			}).catch((err) => {
+				clonAllCookie();
+			})
+			;
 		}
 		let goHome = ()=>{
 			router.push('/home');
--- a/src/views/HomeView/Works.vue
+++ b/src/views/HomeView/Works.vue
@@ -39,7 +39,7 @@ import newScaleImage from "@/component/WorksPage/newScaleImage.vue";
 import newScaleImageMobile from "@/component/WorksPage/newScaleImageMobile.vue";
 import { useI18n } from "vue-i18n";
 import generalMenu from "@/component/HomePage/generalMenu.vue";
-
+import { useRouter,useRoute } from 'vue-router'
 import Falls from "@/component/WorksPage/Falls.vue";
 export default defineComponent({
    components: {
@@ -63,6 +63,7 @@ export default defineComponent({
 		 },
 	},
    setup(prop) {
+		const router = useRouter()
 		let filter:any = reactive({
 			worksSelect: 'all',
 			isNull:true,
@@ -161,9 +162,9 @@ export default defineComponent({
 			let data = filter.getListDate
 			if(filter.isShowMark && !filter.isNoData)return
 			filter.isShowMark = true
-			// if(prop.otherUsers){
-			// 	console.log(prop.userId);
-			// }
+			if(prop.otherUsers){
+				data.accountId = prop.userId
+			}
 			Https.axiosPost(Https.httpUrls.getPorfolio, data)
                .then((rv) => {
 					if(data.page == 1 && rv.content.length == 0){
@@ -230,6 +231,12 @@ export default defineComponent({
 			nextTick(()=>{
 				setPorfolioDom()
 			})
+			let data = {
+				id:router.currentRoute.value.query?.workId
+			}
+			if(data.id){
+				getImgScale(data)
+			}
 		})
        return {
 			...toRefs(filter),
@@ -302,15 +309,7 @@ export default defineComponent({
 		@media (max-width: 768px) {
 			background: #fff;
 		}
-		.page_loading_box{
-			text-align: center;
-			height: 50px;
-			.page_loading{
-				display: block;
-				width: 50px;
-				height: 50px;
-			}
-		}
+		
 		>img{
 			position: relative;
 			left: 50%;
--- a/src/views/LoginPage.vue
+++ b/src/views/LoginPage.vue
@@ -478,6 +478,13 @@ export default defineComponent({
                        setCookie("isBeginnerNum", 0);//从第一步开始，机器人开始的话就是从第二部开始
                        setCookie("userInfo", JSON.stringify(rv));
 						this.store.commit("setSystemUser", rv.systemUser)
+						let obj:any = {
+							avatar : rv.avatar,
+							followeeCount : rv.followeeCount,
+							followerCount : rv.followerCount,
+						}
+						
+						this.store.commit("setUserInfo", obj)
 						if(rv.systemUser == 0){
 							this.turnToHomePage('/Square');
 						}else{