From 7e3f97f1af9369b771cc693de4c9aca26d8e1813 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Fri, 13 Sep 2024 14:38:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E6=B3=A8=E7=B2=89=E4=B8=9D=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/style/style.css                    |  5 ++-
 src/assets/style/style.less                   |  7 +++-
 src/component/Account/followFans/fans.vue     | 26 ++++++++++++--
 src/component/Account/followFans/follow.vue   | 32 ++++++++++++++---
 src/component/Account/otherUsers.vue          | 34 ++++++++++++++-----
 .../Administrator/allUserPoerations.vue       | 13 +++----
 src/component/HomePage/newPosted.vue          |  2 +-
 src/component/WorksPage/Falls.vue             | 12 +++++--
 src/lang/cn.ts                                |  2 ++
 src/lang/en.ts                                |  2 ++
 10 files changed, 107 insertions(+), 28 deletions(-)

diff --git a/src/assets/style/style.css b/src/assets/style/style.css
index d422b2e8..966a3625 100644
--- a/src/assets/style/style.css
+++ b/src/assets/style/style.css
@@ -1094,6 +1094,9 @@ li {
   display: flex;
   align-items: center;
 }
+.admin_page .admin_state_item > span > span {
+  color: red;
+}
 .admin_page .admin_state_item > span:nth-child(1) {
   font-size: 1.6rem;
   font-weight: 400;
@@ -1101,7 +1104,7 @@ li {
   margin-right: 15px;
   flex-shrink: 0;
   display: block;
-  width: 10rem;
+  width: 10.5rem;
   text-align: right;
 }
 .admin_page .admin_state_item > input {
diff --git a/src/assets/style/style.less b/src/assets/style/style.less
index dd0a21a5..39b788f3 100644
--- a/src/assets/style/style.less
+++ b/src/assets/style/style.less
@@ -1215,6 +1215,11 @@ input:focus{
 		margin-bottom: 2rem;
 		display: flex;
 		align-items: center;
+		>span{
+			>span{
+				color: red;
+			}
+		}
 		>span:nth-child(1){
 			font-size: 1.6rem;
 			font-weight: 400;
@@ -1224,7 +1229,7 @@ input:focus{
 			display: block;
 			// min-width: 20%;
 			// width: 100px;
-			width: 10rem;
+			width: 10.5rem;
 			text-align: right;
 		}
 		>input{
diff --git a/src/component/Account/followFans/fans.vue b/src/component/Account/followFans/fans.vue
index 83e241b5..d786ee2b 100644
--- a/src/component/Account/followFans/fans.vue
+++ b/src/component/Account/followFans/fans.vue
@@ -11,7 +11,7 @@
 		<div class="account_generalMessage_center modal_title_text">
 			<div class="account_generalMessage_item" v-for="item in dataList" :key="item.id">
 				<div class="account_generalMessage_item_right">
-					<div class="account_generalMessage_item_right_img">
+					<div class="account_generalMessage_item_right_img" @click.stop="openOtherUsers(item)">
 						<img :src="item.avatar" alt="">
 					</div>
 					<div class="account_generalMessage_item_right_title">
@@ -86,7 +86,27 @@ export default defineComponent({
 				accountFollofFans.getListData.isNoData = true
 			})
 		}
-		
+		let setFollow = (item:any) =>{
+			let url = Https.httpUrls.porfolioFollow
+			if(item.isFollow == 1)url = Https.httpUrls.porfolioCancelFollow
+			Https.axiosGet(url, {params:{followeeId:item.senderId}})
+			.then((rv) => {
+				if(item.isFollow == 1){
+					item.isFollow = 0
+				}else{
+					item.isFollow = 1
+				}
+			})
+		}
+		let openOtherUsers = (item:any)=>{
+			const routeUrl = router.resolve({
+				path:'/home/otherUsers',
+				query:{
+					userId:item.senderId
+				}
+			})
+			window.open(routeUrl.href,'_blank')
+		}
 		onMounted (()=>{
 			accountFollofFans.getListData.isNoData = false
 			accountFollofFans.getListData.page = 0
@@ -106,6 +126,8 @@ export default defineComponent({
 		   searchFollowFansList,
 		   getFollowFansList,
 		   loadingDom,
+		   setFollow,
+		   openOtherUsers,
         }
     },
     data(){
diff --git a/src/component/Account/followFans/follow.vue b/src/component/Account/followFans/follow.vue
index c9ebd3b4..7e00003e 100644
--- a/src/component/Account/followFans/follow.vue
+++ b/src/component/Account/followFans/follow.vue
@@ -12,12 +12,12 @@
 			<div class="account_generalMessage_item" v-for="item in dataList" :key="item.id">
 				<a-badge :dot="item.isRead == 0"></a-badge>
 				<div class="account_generalMessage_item_right">
-					<div class="account_generalMessage_item_right_img">
-						<img :src="item.senderUserAvatar" alt="">
+					<div class="account_generalMessage_item_right_img" @click.stop="openOtherUsers(item)">
+						<img :src="item.avatar" alt="">
 					</div>
 					<div class="account_generalMessage_item_right_title">
 						<div class="">{{ item.senderUserName }}</div>
-						<div class="modal_title_text_intro">{{ item.createTime }} 关注了你</div>
+						<div class="modal_title_text_intro">{{ item.createTime }} </div>
 					</div>
 				</div>
 				<div class="account_generalMessage_item_left">
@@ -26,7 +26,7 @@
 				</div>
 			</div>
 			<div class="account_generalMessage_item" style="justify-content: center;" v-if="dataList.length == 0 && getListData.isNoData">
-				没有任何信息~
+				{{$t('account.dataNull')}}
 			</div>
 			<div class="page_loading_box" v-show="!getListData.isNoData">
 				<span class="page_loading" ref="loadingDom" v-show="!getListData.isShowMark"></span>
@@ -87,7 +87,27 @@ export default defineComponent({
 				accountFollofFans.getListData.isNoData = true
 			})
 		}
-		
+		let setFollow = (item:any) =>{
+			let url = Https.httpUrls.porfolioFollow
+			if(item.isFollow == 1)url = Https.httpUrls.porfolioCancelFollow
+			Https.axiosGet(url, {params:{followeeId:item.senderId}})
+			.then((rv) => {
+				if(item.isFollow == 1){
+					item.isFollow = 0
+				}else{
+					item.isFollow = 1
+				}
+			})
+		}
+		let openOtherUsers = (item:any)=>{
+			const routeUrl = router.resolve({
+				path:'/home/otherUsers',
+				query:{
+					userId:item.senderId
+				}
+			})
+			window.open(routeUrl.href,'_blank')
+		}
 		onMounted (()=>{
 			accountFollofFans.getListData.isNoData = false
 			accountFollofFans.getListData.page = 0
@@ -107,6 +127,8 @@ export default defineComponent({
 		   searchFollowFansList,
 		   getFollowFansList,
 		   loadingDom,
+		   setFollow,
+		   openOtherUsers,
         }
     },
     data(){
diff --git a/src/component/Account/otherUsers.vue b/src/component/Account/otherUsers.vue
index cc3c3dd8..35ad71dd 100644
--- a/src/component/Account/otherUsers.vue
+++ b/src/component/Account/otherUsers.vue
@@ -10,24 +10,26 @@
 			<div class="otherUsers_userDetail_center">
 				<div class="otherUsers_userDetail_center_name modal_title_text">
 					<div>{{ userContent.userName }}</div>
-					<div class="userDetail_center_name_left">关注</div>
+					<div v-if="userContent?.isFollow == 0" @click.stop="setFollow(userContent)" class="userDetail_center_name_left">{{$t('newScaleImage.Follow')}}</div>
+					<div v-else @click.stop="setFollow(userContent)" class="userDetail_center_name_left">{{$t('newScaleImage.Unfollow')}}</div>
+
 				</div>
 				<div class="otherUsers_userDetail_center_data">
-					<div class="userDetail_center_data_item modal_title_text">
+					<!-- <div class="userDetail_center_data_item modal_title_text">
 						<div>{{ userContent.homepageViewCount }}</div>
 						<span class="modal_title_text_intro">访问量</span>
-					</div>
+					</div> -->
 					<div class="userDetail_center_data_item modal_title_text">
 						<div>{{ userContent.portfolioCount }}</div>
-						<span class="modal_title_text_intro">作品</span>
+						<span class="modal_title_text_intro">{{$t('account.works')}}</span>
 					</div>
 					<div class="userDetail_center_data_item modal_title_text">
 						<div>{{ userContent.followerCount }}</div>
-						<span class="modal_title_text_intro">粉丝</span>
+						<span class="modal_title_text_intro">{{$t('account.Fans')}}</span>
 					</div>
 					<div class="userDetail_center_data_item modal_title_text">
 						<div>{{ userContent.followeeCount }}</div>
-						<span class="modal_title_text_intro">关注</span>
+						<span class="modal_title_text_intro">{{$t('account.Follow')}}</span>
 					</div>
 				</div>
 				<div class="otherUsers_userDetail_center_signature">
@@ -39,7 +41,7 @@
 		</div>
 		<div class="otherUser_works">
 			<div class="otherUser_works_title modal_title_text">
-				<div>他的作品</div>
+				<div>{{$t('account.hisWorks')}}</div>
 			</div>
 			<Works :isScroll="false" :otherUsers="true" :userId=userId></Works>
 		</div>
@@ -76,15 +78,29 @@ export default defineComponent({
 			})
 			
 		}
-
+		let setFollow = (item:any) =>{
+			let url = Https.httpUrls.porfolioFollow
+			if(item.isFollow == 1)url = Https.httpUrls.porfolioCancelFollow
+			Https.axiosGet(url, {params:{followeeId:otherUsers.userId}})
+			.then((rv) => {
+				if(item.isFollow == 1){
+					item.isFollow = 0
+				}else{
+					item.isFollow = 1
+				}
+			})
+		}
 		onMounted (()=>{
 			otherUsers.userId = router.currentRoute.value.query?.userId
 			// alert()
-			getUserDetail(otherUsers.userId)
+			setTimeout(() => {
+				getUserDetail(otherUsers.userId)
+			}, 2000);
 
 		})
         return{
            ...toRefs(otherUsers),
+		   setFollow,
         }
     },
     data(){
diff --git a/src/component/Administrator/allUserPoerations.vue b/src/component/Administrator/allUserPoerations.vue
index c610b4c4..01e2f067 100644
--- a/src/component/Administrator/allUserPoerations.vue
+++ b/src/component/Administrator/allUserPoerations.vue
@@ -21,7 +21,7 @@
 		</div>
 		<div class="allUserPoeration_center admin_page">
 			<div class="admin_state_item">
-				<span>User Name:</span>
+				<span>User Name: <span>*</span></span>
 				<input
 					:readonly="title != 'Add'"
 					:class="{active:title != 'Add'}"
@@ -32,7 +32,7 @@
 				/>
 			</div>
 			<div class="admin_state_item">
-				<span>User Email:</span>
+				<span>User Email: <span>*</span></span>
 				<input
 					:readonly="title != 'Add'"
 					:class="{active:title != 'Add'}"
@@ -43,7 +43,7 @@
 				/>
 			</div>
 			<div class="admin_state_item">
-				<span>Create Time:</span>
+				<span>Create Time: <span>*</span></span>
 				<a-date-picker :disabled="title != 'Add'" style="width: 250px" valueFormat="YYYY-MM-DDTHH:mm:ss" class="range_picker" show-time placeholder="Create Time" v-model:value="validStartTime">
 					<template #suffixIcon>
 						<span
@@ -53,7 +53,7 @@
 				</a-date-picker>
 			</div>
 			<div class="admin_state_item">
-				<span>End Time:</span>
+				<span>End Time: <span>*</span></span>
 				<a-date-picker style="width: 250px" valueFormat="YYYY-MM-DDTHH:mm:ss" class="range_picker" show-time placeholder="End Time" v-model:value="validEndTime">
 					<template #suffixIcon>
 						<span
@@ -63,7 +63,7 @@
 				</a-date-picker>
 			</div>
 			<div class="admin_state_item">
-				<span>User Type:</span>
+				<span>User Type:<span>*</span></span>
 				<a-select
 					v-model:value="systemUser"
 					size="large"
@@ -200,7 +200,6 @@ export default defineComponent({
 			
 		}
 		let setAddData = ()=>{
-			setTime(operationsData.validStartTime)
 			return {
 				"country": operationsData.country,
 				"credits": operationsData.credits,
@@ -234,6 +233,7 @@ export default defineComponent({
 			let data 
 			if(operations.title == 'Add'){
 				data = setAddData()
+				if(!data.userName || !data.userEmail || !data.validStartTime || !data.validEndTime || !data.systemUser)return message.warning('Please check the input box marked with *')
 				Https.axiosPost(Https.httpUrls.adminAddUser, data).then(
 				(rv) => {
 					if (rv) {
@@ -244,6 +244,7 @@ export default defineComponent({
 			);
 			}else{
 				data = setEditData()
+				if(!data.userName || !data.userEmail || !data.validStartTime || !data.validEndTime || !data.systemUser)return message.warning('Please check the input box marked with *')
 				Https.axiosPost(Https.httpUrls.modifyUser,{},{params:data}).then(
 				(rv) => {
 					if (rv) {
diff --git a/src/component/HomePage/newPosted.vue b/src/component/HomePage/newPosted.vue
index dac1aeb1..1f62cf0d 100644
--- a/src/component/HomePage/newPosted.vue
+++ b/src/component/HomePage/newPosted.vue
@@ -24,7 +24,7 @@
 			</div>
 		</div>
 		<div class="newPosted_generalMessage_item" style="justify-content: center;" v-if="dataList.length == 0 && isNoData">
-			没有任何信息~
+			{{$t('account.dataNull')}}
 		</div>
 		<div class="page_loading_box" v-show="!isNoData">
 			<span class="page_loading" ref="loadingDom" v-show="!isShowMark"></span>
diff --git a/src/component/WorksPage/Falls.vue b/src/component/WorksPage/Falls.vue
index c529d6a4..0416f22b 100644
--- a/src/component/WorksPage/Falls.vue
+++ b/src/component/WorksPage/Falls.vue
@@ -343,6 +343,8 @@ export default defineComponent({
 						width: 50%;
 						display: flex;
 						align-items: center;
+						flex: 1;
+						overflow: hidden;
 						img{
 							width: 25px;
 							height: 25px;
@@ -373,11 +375,15 @@ export default defineComponent({
 					}
 					.falls_item_detail{
 						display: flex;
-						width: 40%;
-						width: 20%;
+						// width: 40%;
+						// width: 20%;
 						// width: 7rem;
-						width: 70px;
+						// width: 70px;
+						width: auto;
 						justify-content: space-between;
+						>label:nth-child(1){
+							margin-right: 2rem;
+						}
 						>label{
 							// cursor: pointer;
 						}
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index 504bae87..82e8ebbe 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -583,6 +583,8 @@ export default {
 		likedYourWork:'赞了你的作品',
 		//互动
 		Interact:'互动',
+		hisWorks:'他的作品',
+		works:'作品',
 	},
 	guide:{
 		guide1:"在<strong>工作空间</strong>中，您可以个性化您的设计设置，包括选择适用于男装或女装的设计，以及选择用于创作的人体模型。",
diff --git a/src/lang/en.ts b/src/lang/en.ts
index 1b9b6f75..5c441203 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -583,6 +583,8 @@ export default {
 		likedYourWork:'liked your work',
 		//互动
 		Interact:'interact',
+		hisWorks:'His works',
+		works:'Works',
 	},
 	guide:{
 		guide1:"You can personalize your design settings right here in the <strong>Workspace</strong>, including choosing to design for men's or women's wear, as well as selecting the mannequin to use for your creations.",