@@ -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 @@
{{ userContent.userName }}
-
关注
+
{{$t('newScaleImage.Follow')}}
+
{{$t('newScaleImage.Unfollow')}}
+
-
+
{{ userContent.portfolioCount }}
-
作品
+
{{$t('account.works')}}
{{ userContent.followerCount }}
-
粉丝
+
{{$t('account.Fans')}}
{{ userContent.followeeCount }}
-
关注
+
{{$t('account.Follow')}}
@@ -39,7 +41,7 @@
-
他的作品
+
{{$t('account.hisWorks')}}
@@ -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 @@
- User Name:
+ User Name: *
- User Email:
+ User Email: *
-
Create Time:
+
Create Time: *
-
End Time:
+
End Time: *
-
User Type:
+
User Type:*
{
- 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 @@
- 没有任何信息~
+ {{$t('account.dataNull')}}
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:"在工作空间中,您可以个性化您的设计设置,包括选择适用于男装或女装的设计,以及选择用于创作的人体模型。",
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 Workspace, including choosing to design for men's or women's wear, as well as selecting the mannequin to use for your creations.",