fix
This commit is contained in:
@@ -60,10 +60,10 @@
|
||||
|
||||
</div>
|
||||
<div class="detail_right_user_content">
|
||||
<div>
|
||||
<div style="text-align: center;">
|
||||
<div class="scaleImage_chunk_title_intro">@{{scaleImageData.userName}}</div>
|
||||
<div v-if="scaleImageData.isFollow == 0 && userInfo?.userId != scaleImageData?.accountId" style="margin-bottom: 0;" class="started_btn" @click="setFollow()" >{{$t('newScaleImage.Follow')}}</div>
|
||||
<div v-else-if="userInfo?.userId != scaleImageData?.accountId" class="started_btn" style="margin-bottom: 0;" @click="setFollow()" >{{$t('newScaleImage.Unfollow')}}</div>
|
||||
<div v-if="scaleImageData.isFollow == 0 && userDetail?.userId != scaleImageData?.accountId" style="margin-bottom: 0;" class="started_btn" @click="setFollow()" >{{$t('newScaleImage.Follow')}}</div>
|
||||
<div v-else-if="userDetail?.userId != scaleImageData?.accountId" class="started_btn" style="margin-bottom: 0;" @click="setFollow()" >{{$t('newScaleImage.Unfollow')}}</div>
|
||||
</div>
|
||||
<div v-if="scaleImageData.original == 1" class="scaleImage_chunk_title_intro scaleImage_chunk_title_Original">{{$t('newScaleImage.Original')}}</div>
|
||||
<div v-else @click="originalGetDetail()" class="scaleImage_chunk_title_intro">{{$t('newScaleImage.from')}}<span :class="{active:scaleImageData.jumpable == 1}"> @{{ scaleImageData.originalUserName }}/{{ scaleImageData.portfolioName }}</span></div>
|
||||
@@ -99,7 +99,7 @@
|
||||
<i class="fi fi-rr-comment-alt-dots"></i>
|
||||
<span>{{commentList.length}}</span>
|
||||
</div>
|
||||
<div v-if="userInfo?.userName === scaleImageData.userName" @click="deletePortfolio" class="detail_left_right_item_click">
|
||||
<div v-if="userDetail?.userName === scaleImageData.userName" @click="deletePortfolio" class="detail_left_right_item_click">
|
||||
<i class="icon iconfont icon-shanchu operate_icon"></i>
|
||||
<!-- <span>{{$t('newScaleImage.Delete')}}</span> -->
|
||||
</div>
|
||||
@@ -111,7 +111,7 @@
|
||||
<img v-for="item in scaleImageData?.designPythonOutfitList" v-lazy="item.designUrl">
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="systemUser.value == 1 && scaleImageData.isMine != 1 && scaleImageData.selected != 1" class="started_btn" @click="setChoose" >{{$t('newScaleImage.SecondaryCreation')}}</div>
|
||||
<div v-if="userDetail.systemUser == 1 && scaleImageData.isMine != 1 && scaleImageData.selected != 1" class="started_btn" @click="setChoose" >{{$t('newScaleImage.SecondaryCreation')}}</div>
|
||||
<!-- <div v-if="systemUser.value == 1 && scaleImageData.isMine != 1 && scaleImageData.selected != 1" class="started_btn" @click="setChoose" :title="systemUser.value != 1?$t('newScaleImage.jsContent1'): scaleImageData.openSource == 0?$t('newScaleImage.jsContent2'):''" :class="{active:systemUser.value != 1?true:scaleImageData.openSource == 0}">{{$t('newScaleImage.SecondaryCreation')}}</div> -->
|
||||
</div>
|
||||
<div v-else class="newScaleImage_right_content_generate">
|
||||
@@ -206,7 +206,7 @@
|
||||
<span>123</span>
|
||||
</div> -->
|
||||
<div class="left_content_item_btn">
|
||||
<div class="left_content_item_delete" v-if="userInfo?.userName === item.userName" @click="setDeleteComment(item,index,'')">{{$t('newScaleImage.Delete')}}</div>
|
||||
<div class="left_content_item_delete" v-if="userDetail?.userName === item.userName" @click="setDeleteComment(item,index,'')">{{$t('newScaleImage.Delete')}}</div>
|
||||
<div class="left_content_item_unfold" @click="()=>item.detailUnfold = !item.detailUnfold">{{item.detailUnfold?$t('newScaleImage.Collapse'):$t('newScaleImage.unfold')}}</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -231,7 +231,7 @@
|
||||
<span>123</span>
|
||||
</div> -->
|
||||
<div class="left_content_item_btn">
|
||||
<div class="left_content_item_delete" v-if="userInfo?.userName === children.userName" @click="setDeleteComment(children,index,childrenIndex)">{{$t('newScaleImage.Delete')}}</div>
|
||||
<div class="left_content_item_delete" v-if="userDetail?.userName === children.userName" @click="setDeleteComment(children,index,childrenIndex)">{{$t('newScaleImage.Delete')}}</div>
|
||||
<div class="left_content_item_unfold" @click="()=>children.detailUnfold = !children.detailUnfold">{{children.detailUnfold?$t('newScaleImage.Collapse'):$t('newScaleImage.unfold')}}</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -266,7 +266,6 @@
|
||||
<script lang="ts">
|
||||
import { defineComponent,watch,getCurrentInstance, createVNode, ref ,toRefs,computed,reactive,triggerRef, nextTick, onMounted} from "vue";
|
||||
import { Https } from "@/tool/https";
|
||||
import { getCookie } from "@/tool/cookie";
|
||||
// import domTurnImg from '@/tool/domTurnImg'
|
||||
import { useStore } from "vuex";
|
||||
import { useRouter } from 'vue-router'
|
||||
@@ -282,8 +281,10 @@ export default defineComponent({
|
||||
setup(props:any,{emit}) {
|
||||
let {t} = useI18n()
|
||||
//首先在setup中定义
|
||||
let userInfo = ref({});
|
||||
const store = useStore();
|
||||
let userDetail:any= computed(()=>{
|
||||
return store.state.UserHabit.userDetail
|
||||
})
|
||||
const router = useRouter()
|
||||
let scaleImage: any = ref(false);//弹窗
|
||||
let scaleImageMask:any = ref(false)//弹窗遮罩
|
||||
@@ -310,9 +311,6 @@ export default defineComponent({
|
||||
isNoData:false,
|
||||
isShowMark:false,
|
||||
})
|
||||
let systemUser = computed(()=>{
|
||||
return store.state.UserHabit.systemUser
|
||||
})
|
||||
let commentInputFocus:any = ref()
|
||||
let textarea: any = ref(null)
|
||||
let setCopy = ()=>{
|
||||
@@ -370,6 +368,8 @@ export default defineComponent({
|
||||
Https.axiosPost(Https.httpUrls.getPorfolioDetail,data).then(
|
||||
(rv: any) => {
|
||||
imgData.loadingShow = false
|
||||
|
||||
if(rv.portfolioDes)rv.portfolioDes = rv.portfolioDes.replace(/#/g, ' ');
|
||||
imgData.scaleImageData = rv
|
||||
let canvasUrl = [rv.canvasUrl]
|
||||
var findUrl = []
|
||||
@@ -406,7 +406,7 @@ export default defineComponent({
|
||||
}
|
||||
|
||||
let setChoose = () =>{
|
||||
if(systemUser.value.value !== 1){
|
||||
if(userDetail.value.systemUser !== 1){
|
||||
return message.info(t('newScaleImage.jsContent1'))
|
||||
}
|
||||
if(imgData.scaleImageData.openSource == 0){
|
||||
@@ -593,15 +593,12 @@ export default defineComponent({
|
||||
}
|
||||
)
|
||||
onMounted(()=>{
|
||||
let user:any = getCookie('userInfo')
|
||||
userInfo.value = JSON.parse(user)
|
||||
})
|
||||
return {
|
||||
userInfo,
|
||||
userDetail,
|
||||
scaleImage,
|
||||
scaleImageMask,
|
||||
...toRefs(imgData),
|
||||
systemUser,
|
||||
commentInputFocus,
|
||||
textarea,
|
||||
setCopy,
|
||||
@@ -801,6 +798,7 @@ export default defineComponent({
|
||||
justify-content: space-between;
|
||||
width: 100%;
|
||||
align-items: flex-start;
|
||||
|
||||
.scaleImage_chunk_title_Original{
|
||||
color: #39215b;
|
||||
background: #c9a2ff;
|
||||
|
||||
Reference in New Issue
Block a user