合并代码
This commit is contained in:
@@ -27,22 +27,16 @@
|
||||
<img src="../../assets/images/homePage/alipay.svg" alt="">
|
||||
</div>
|
||||
<div class="accountEdit_page_body">
|
||||
<div class="accountEdit_page_body_item">
|
||||
<div class="accountEdit_page_body_item_name">昵称:</div>
|
||||
<div class="accountEdit_page_body_item_inut">
|
||||
<input type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="accountEdit_page_body_item">
|
||||
<div class="accountEdit_page_body_item_name">用户名:</div>
|
||||
<div class="accountEdit_page_body_item_inut">
|
||||
<textarea style="max-height: 200px; min-height: 90px;"></textarea>
|
||||
<input type="text" disabled value="123">
|
||||
</div>
|
||||
</div>
|
||||
<div class="accountEdit_page_body_item">
|
||||
<div class="accountEdit_page_body_item_name">我的签名:</div>
|
||||
<div class="accountEdit_page_body_item_name">邮箱:</div>
|
||||
<div class="accountEdit_page_body_item_inut">
|
||||
<input type="text">
|
||||
<input type="text" disabled value="123">
|
||||
</div>
|
||||
</div>
|
||||
<div class="accountEdit_page_body_item">
|
||||
@@ -77,7 +71,9 @@ export default defineComponent({
|
||||
let Cropper = ref()
|
||||
// provide('exhibitionList',exhibitionList)
|
||||
let handleCropperSuccess = (event:any)=>{
|
||||
let {file, fileData} =event
|
||||
console.log(event);
|
||||
|
||||
let {file, fileData,base64} =event
|
||||
console.log(file,fileData);
|
||||
Cropper.value.closeCropper()
|
||||
}
|
||||
@@ -157,8 +153,8 @@ export default defineComponent({
|
||||
margin: 0 auto;
|
||||
position: relative;
|
||||
img{
|
||||
width: 20rem;
|
||||
height: 20rem;
|
||||
width: 15rem;
|
||||
height: 15rem;
|
||||
border-radius: 50%;
|
||||
}
|
||||
.accountEdit_page_head_upload{
|
||||
|
||||
@@ -9,8 +9,7 @@
|
||||
<div class="content_item_user_left_detail">
|
||||
<div class="modal_title_text">
|
||||
<div>用户名</div>
|
||||
<div class="modal_title_text_intro">个性签名</div>
|
||||
<div class="modal_title_text_assistant">Credits: 2222</div>
|
||||
<div class="modal_title_text_assistant">邮箱: 2222</div>
|
||||
</div>
|
||||
<div class="content_item_user_left_detail_bottom">
|
||||
<div>
|
||||
|
||||
@@ -6,13 +6,26 @@
|
||||
</div>
|
||||
<div class="account_message_title_setting">设置</div>
|
||||
</div>
|
||||
<a-tabs class="account_message_body" v-model:activeKey="activeKey">
|
||||
<a-tabs class="account_message_body" v-model:activeKey="activeKey" @change="changeTabs">
|
||||
<a-tab-pane v-for="item in messageList" :key="item.key">
|
||||
<system v-if="item.key == 'system'" :ref="item.key" @setReadStatus="setReadStatus" @setAllmessage="setAllmessage"></system>
|
||||
<privateChat v-if="item.key == 'privateChat'" :ref="item.key" @setReadStatus="setReadStatus" @setAllmessage="setAllmessage"></privateChat>
|
||||
<comment v-if="item.key == 'comment'" :ref="item.key" @setReadStatus="setReadStatus" @setAllmessage="setAllmessage"></comment>
|
||||
<likeMessage v-if="item.key == 'like'" :ref="item.key" @setReadStatus="setReadStatus" @setAllmessage="setAllmessage"></likeMessage>
|
||||
<newFollow v-if="item.key == 'follow'" :ref="item.key" @setReadStatus="setReadStatus" @setAllmessage="setAllmessage"></newFollow>
|
||||
<!-- <newFollow v-if="item.key == 'service'" :ref="item.key"></newFollow> -->
|
||||
<template #tab>
|
||||
<a-badge :count="messageSystem.messageType[item.key]" >
|
||||
<span>{{item.title}}</span>
|
||||
</a-badge>
|
||||
</template>
|
||||
</a-tab-pane>
|
||||
|
||||
<!--
|
||||
<a-tab-pane key="1" tab="系统消息">
|
||||
<system ref="system"></system>
|
||||
</a-tab-pane>
|
||||
<!-- <a-tab-pane key="2" tab="私信" force-render>
|
||||
<privateChat ref="privateChat"></privateChat>
|
||||
</a-tab-pane> -->
|
||||
|
||||
<a-tab-pane key="3" tab="评论">
|
||||
<comment></comment>
|
||||
</a-tab-pane>
|
||||
@@ -22,12 +35,12 @@
|
||||
<a-tab-pane key="6" tab="新增粉丝">
|
||||
<newFollow ref="newFollow"></newFollow>
|
||||
</a-tab-pane>
|
||||
<a-tab-pane key="5" tab="客服">Content of Tab Pane 3</a-tab-pane>
|
||||
<a-tab-pane key="5" tab="客服">Content of Tab Pane 3</a-tab-pane> -->
|
||||
</a-tabs>
|
||||
</div>
|
||||
</template>
|
||||
<script lang="ts">
|
||||
import { defineComponent,computed,ref,reactive,nextTick,toRefs,createVNode} from 'vue'
|
||||
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';
|
||||
@@ -51,15 +64,106 @@ export default defineComponent({
|
||||
const router = useRouter()
|
||||
const store = useStore();
|
||||
let accountMessage = reactive({
|
||||
activeKey: ref('1'),
|
||||
messageList:[
|
||||
{
|
||||
title:'系统消息',
|
||||
key:'system',
|
||||
},
|
||||
// {
|
||||
// title:'私信',
|
||||
// key:'privateChat',
|
||||
// },
|
||||
{
|
||||
title:'评论',
|
||||
key:'comment',
|
||||
},{
|
||||
title:'点赞',
|
||||
key:'like',
|
||||
},{
|
||||
title:'新增粉丝',
|
||||
key:'follow',
|
||||
},{
|
||||
title:'客服',
|
||||
key:'service',
|
||||
},
|
||||
],
|
||||
activeKey: '',
|
||||
})
|
||||
let domRefs:any = reactive({
|
||||
system:ref(null),
|
||||
comment:ref(null),
|
||||
like:ref(null),
|
||||
follow:ref(null),
|
||||
service:ref(null)
|
||||
})
|
||||
let messageSystem = computed(()=>{
|
||||
return store.state.UserHabit.messageSystem
|
||||
})
|
||||
// provide('exhibitionList',exhibitionList)
|
||||
let setUserData = ()=>{
|
||||
router.push({path:'/home/account/accountEdit'})
|
||||
}
|
||||
let changeTabs = (key:any)=>{
|
||||
let data = {
|
||||
page:1,
|
||||
size:10,
|
||||
type:key
|
||||
}
|
||||
getHistory(data)
|
||||
}
|
||||
let setReadStatus = (value:any)=>{
|
||||
if(value.isRead == 1)return
|
||||
let data = {
|
||||
type:accountMessage.activeKey,
|
||||
notificationIdList:value.id
|
||||
}
|
||||
Https.axiosPost(Https.httpUrls.setReadStatus,'',{params:data}).then((rv)=>{
|
||||
if(rv){
|
||||
console.log(rv);
|
||||
|
||||
// store.commit('setMessageSystem',rv)
|
||||
}
|
||||
})
|
||||
}
|
||||
let setAllmessage = ()=>{
|
||||
let data = {
|
||||
type:accountMessage.activeKey
|
||||
}
|
||||
Https.axiosPost(Https.httpUrls.oneClickRead,'',{params:data}).then((rv)=>{
|
||||
|
||||
})
|
||||
}
|
||||
let getHistory = (data:any)=>{
|
||||
nextTick(()=>{
|
||||
let dom = domRefs[data.type][0]
|
||||
if(dom.dataList && dom.dataList.length > 0)return
|
||||
Https.axiosPost(Https.httpUrls.getHistoryNotification,data).then((rv)=>{
|
||||
if(rv){
|
||||
console.log(domRefs[data.type][0],rv);
|
||||
domRefs[data.type][0].setmessageList(rv)
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
}
|
||||
onMounted(()=>{
|
||||
let key = accountMessage.messageList[0].key
|
||||
accountMessage.activeKey = key
|
||||
let data = {
|
||||
page:1,
|
||||
size:10,
|
||||
type:key
|
||||
}
|
||||
getHistory(data)
|
||||
})
|
||||
return{
|
||||
...toRefs(accountMessage),
|
||||
...toRefs(domRefs),
|
||||
messageSystem,
|
||||
setUserData,
|
||||
setReadStatus,
|
||||
changeTabs,
|
||||
setAllmessage,
|
||||
}
|
||||
},
|
||||
data(){
|
||||
@@ -83,8 +187,9 @@ export default defineComponent({
|
||||
}
|
||||
}
|
||||
.account_message_body{
|
||||
padding: 0rem 5rem;
|
||||
padding-bottom: 3rem;
|
||||
:deep(.ant-tabs-nav){
|
||||
padding: 0rem 5rem;
|
||||
.ant-tabs-nav-wrap{
|
||||
.ant-tabs-tab-btn{
|
||||
font-size: 2.4rem;
|
||||
@@ -107,9 +212,77 @@ export default defineComponent({
|
||||
}
|
||||
}
|
||||
:deep(.ant-tabs-content){
|
||||
min-height: 80rem;
|
||||
padding-bottom: 3rem;
|
||||
height: 80rem;
|
||||
// min-height: 80rem;
|
||||
overflow-y: auto;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<style lang="less">
|
||||
.account_generalMessage_title{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 2rem 5rem;
|
||||
border-bottom: 1px solid #e9eaec;
|
||||
box-shadow: 0 0px 10px 1px rgba(0, 0, 0, 0.12);
|
||||
border: 1px solid #e9eaec;
|
||||
border-radius: 5px;
|
||||
position: sticky;
|
||||
top: 0;
|
||||
background: #fff;
|
||||
margin-right: 5rem;
|
||||
margin-left: 5rem;
|
||||
.account_generalMessage_title_setting{
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
.account_generalMessage_center{
|
||||
box-shadow: 0 0px 10px 1px rgba(0, 0, 0, 0.12);
|
||||
border: 1px solid #e9eaec;
|
||||
border-radius: 5px;
|
||||
padding: 2rem 0;
|
||||
margin-right: 5rem;
|
||||
margin-left: 5rem;
|
||||
.account_generalMessage_item{
|
||||
margin-right: 0;
|
||||
margin-left: 0;
|
||||
display: flex;
|
||||
border-radius: 0px;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 2rem 5rem;
|
||||
border: none;
|
||||
border-bottom: 1px solid #e9eaec;
|
||||
box-shadow: none;
|
||||
}
|
||||
}
|
||||
.account_generalMessage_item{
|
||||
box-shadow: 0 0px 10px 1px rgba(0, 0, 0, 0.12);
|
||||
border: 1px solid #e9eaec;
|
||||
border-radius: 5px;
|
||||
padding: 5rem 5rem;
|
||||
margin-right: 5rem;
|
||||
margin-left: 5rem;
|
||||
position: relative;
|
||||
cursor: pointer;
|
||||
.ant-badge{
|
||||
position: absolute;
|
||||
transform: translate(-100%, 100%);
|
||||
top: 0;
|
||||
right: 0;
|
||||
}
|
||||
.account_generalMessage_item_link{
|
||||
color: #39215b;
|
||||
cursor: pointer;
|
||||
font-weight: 600;
|
||||
}
|
||||
.account_generalMessage_item_link:hover{
|
||||
text-decoration: underline;
|
||||
}
|
||||
}
|
||||
.account_generalMessage_item:hover{
|
||||
background: #efefef;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,40 +1,42 @@
|
||||
<template>
|
||||
<div class="account_comment">
|
||||
<div class="account_comment_title modal_title_text">
|
||||
收到的评论
|
||||
<div class="account_generalMessage_title modal_title_text">
|
||||
<span>收到的评论</span>
|
||||
<div class="account_generalMessage_title_setting" @click="allRead">全部已读</div>
|
||||
</div>
|
||||
<div class="account_comment_center modal_title_text">
|
||||
<div class="account_comment_item">
|
||||
<div class="account_comment_item_right">
|
||||
<div class="account_comment_item_right_img" @click="openOtherUsers">
|
||||
<div class="account_generalMessage_center modal_title_text">
|
||||
|
||||
<div class="account_generalMessage_item">
|
||||
<div class="account_generalMessage_item_right">
|
||||
<div class="account_generalMessage_item_right_img" @click="openOtherUsers">
|
||||
<img src="https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png" alt="">
|
||||
</div>
|
||||
<div class="account_comment_item_right_title">
|
||||
<div class="account_comment_item_right_title_name">名字 <span>回复你的作品</span></div>
|
||||
<div class="account_comment_item_right_title_center modal_title_text_assistant">回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容</div>
|
||||
<div class="account_comment_item_right_works modal_title_text_intro">回复作品名</div>
|
||||
<div class="account_generalMessage_item_right_title">
|
||||
<div class="account_generalMessage_item_right_title_name">名字 <span>回复你的作品</span></div>
|
||||
<div class="account_generalMessage_item_right_title_center modal_title_text_assistant">回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容</div>
|
||||
<div class="account_generalMessage_item_right_works modal_title_text_intro">回复作品名</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="account_comment_item_left">
|
||||
<div class="account_comment_item_left_delete modal_title_text_intro">
|
||||
<div class="account_generalMessage_item_left">
|
||||
<div class="account_generalMessage_item_left_delete modal_title_text_intro">
|
||||
<span class="icon iconfont icon-shanchu operate_icon"></span>
|
||||
</div>
|
||||
<div class="modal_title_text_intro">2024-06-05</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="account_comment_item">
|
||||
<div class="account_comment_item_right">
|
||||
<div class="account_comment_item_right_img">
|
||||
<div class="account_generalMessage_item">
|
||||
<div class="account_generalMessage_item_right">
|
||||
<div class="account_generalMessage_item_right_img">
|
||||
<img src="https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png" alt="">
|
||||
</div>
|
||||
<div class="account_comment_item_right_title">
|
||||
<div class="account_comment_item_right_title_name">名字 <span>回复你的作品</span></div>
|
||||
<div class="account_comment_item_right_title_center modal_title_text_assistant">回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容</div>
|
||||
<div class="account_comment_item_right_works modal_title_text_intro">回复作品名</div>
|
||||
<div class="account_generalMessage_item_right_title">
|
||||
<div class="account_generalMessage_item_right_title_name">名字 <span>回复你的作品</span></div>
|
||||
<div class="account_generalMessage_item_right_title_center modal_title_text_assistant">回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容回复内容</div>
|
||||
<div class="account_generalMessage_item_right_works modal_title_text_intro">回复作品名</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="account_comment_item_left">
|
||||
<div class="account_comment_item_left_delete modal_title_text_intro">
|
||||
<div class="account_generalMessage_item_left">
|
||||
<div class="account_generalMessage_item_left_delete modal_title_text_intro">
|
||||
<span class="icon iconfont icon-shanchu operate_icon"></span>
|
||||
</div>
|
||||
<div class="modal_title_text_intro">2024-06-05</div>
|
||||
@@ -59,7 +61,7 @@ export default defineComponent({
|
||||
const store = useStore();
|
||||
let accountMessage = reactive({
|
||||
activeKey: ref('1'),
|
||||
followList:ref([
|
||||
dataList:ref([
|
||||
{
|
||||
name:'张三',
|
||||
avatar:'https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png',
|
||||
@@ -116,92 +118,67 @@ export default defineComponent({
|
||||
<style lang="less" scoped>
|
||||
.account_comment{
|
||||
width: 100%;
|
||||
.account_comment_title{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 2rem 5rem;
|
||||
border-bottom: 1px solid #e9eaec;
|
||||
box-shadow: 0 0px 10px 1px rgba(0, 0, 0, 0.12);
|
||||
border: 1px solid #e9eaec;
|
||||
border-radius: 5px;
|
||||
.account_comment_title_setting{
|
||||
cursor: pointer;
|
||||
.account_generalMessage_item{
|
||||
.account_generalMessage_item_right{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-right: 1rem;
|
||||
.account_generalMessage_item_right_works{
|
||||
cursor: pointer;
|
||||
}
|
||||
.account_generalMessage_item_right_works:hover{
|
||||
text-decoration: underline;
|
||||
}
|
||||
.account_generalMessage_item_right_img{
|
||||
width: 8rem;
|
||||
height: 8rem;
|
||||
margin-right: 2rem;
|
||||
flex-shrink: 0;
|
||||
cursor: pointer;
|
||||
img{
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
border-radius: 50%;
|
||||
}
|
||||
}
|
||||
.account_generalMessage_item_right_title{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: flex-start;
|
||||
.account_generalMessage_item_right_title_center{
|
||||
display: -webkit-box;
|
||||
-webkit-box-orient: vertical;
|
||||
-webkit-line-clamp: 2;
|
||||
overflow: hidden;
|
||||
}
|
||||
.account_generalMessage_item_right_title_name{
|
||||
font-weight: 600;
|
||||
font-weight: 500;
|
||||
color: #000;
|
||||
span{
|
||||
font-weight: 500;
|
||||
color: #9999aa;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.account_generalMessage_item_left{
|
||||
text-align: right;
|
||||
flex-shrink: 0;
|
||||
.account_generalMessage_item_left_delete{
|
||||
span{
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
div{
|
||||
padding: .5rem 2rem;
|
||||
border-radius: 4rem;
|
||||
}
|
||||
}
|
||||
}
|
||||
.account_comment_center{
|
||||
box-shadow: 0 0px 10px 1px rgba(0, 0, 0, 0.12);
|
||||
border: 1px solid #e9eaec;
|
||||
border-radius: 5px;
|
||||
padding: 2rem 5rem;
|
||||
.account_comment_item{
|
||||
display: flex;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 2rem 0;
|
||||
border-bottom: 1px solid #e9eaec;
|
||||
.account_comment_item_right{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-right: 1rem;
|
||||
.account_comment_item_right_works{
|
||||
cursor: pointer;
|
||||
}
|
||||
.account_comment_item_right_works:hover{
|
||||
text-decoration: underline;
|
||||
}
|
||||
.account_comment_item_right_img{
|
||||
width: 8rem;
|
||||
height: 8rem;
|
||||
margin-right: 2rem;
|
||||
flex-shrink: 0;
|
||||
cursor: pointer;
|
||||
img{
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
border-radius: 50%;
|
||||
}
|
||||
}
|
||||
.account_comment_item_right_title{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: flex-start;
|
||||
.account_comment_item_right_title_center{
|
||||
display: -webkit-box;
|
||||
-webkit-box-orient: vertical;
|
||||
-webkit-line-clamp: 2;
|
||||
overflow: hidden;
|
||||
}
|
||||
.account_comment_item_right_title_name{
|
||||
font-weight: 600;
|
||||
font-weight: 500;
|
||||
color: #000;
|
||||
span{
|
||||
font-weight: 500;
|
||||
color: #9999aa;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.account_comment_item_left{
|
||||
text-align: right;
|
||||
flex-shrink: 0;
|
||||
.account_comment_item_left_delete{
|
||||
span{
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
div{
|
||||
padding: .5rem 2rem;
|
||||
border-radius: 4rem;
|
||||
}
|
||||
}
|
||||
}
|
||||
.account_comment_item:last-child{
|
||||
margin-bottom: 0;
|
||||
border-bottom: none;
|
||||
}
|
||||
.account_generalMessage_item:last-child{
|
||||
margin-bottom: 0;
|
||||
border-bottom: none;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,41 +1,26 @@
|
||||
<template>
|
||||
<div class="account_like">
|
||||
<div class="account_like_title modal_title_text">
|
||||
点赞
|
||||
<div class="account_generalMessage_title modal_title_text">
|
||||
<span>点赞</span>
|
||||
<div class="account_generalMessage_title_setting" @click="allRead">全部已读</div>
|
||||
</div>
|
||||
<div class="account_like_center modal_title_text">
|
||||
<div class="account_like_item">
|
||||
<div class="account_like_item_right">
|
||||
<div class="account_like_item_right_img">
|
||||
<div class="account_generalMessage_center modal_title_text">
|
||||
<div class="account_generalMessage_item" v-for="item in dataList" :key="item.id" @click="setRead(item)">
|
||||
<a-badge :dot="item.isRead == 0"></a-badge>
|
||||
<div class="account_generalMessage_item_right">
|
||||
<div class="account_generalMessage_item_right_img">
|
||||
<img src="https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png" alt="">
|
||||
</div>
|
||||
<div class="account_like_item_right_title">
|
||||
<div class="account_like_item_right_title_name">名字 <span>等人攒了你的作品</span></div>
|
||||
<div>作品名字</div>
|
||||
<div class="account_generalMessage_item_right_title">
|
||||
<div class="account_generalMessage_item_right_title_name">{{ item.senderUserName }} <span>攒了你的作品</span></div>
|
||||
<div>{{ item.portfolioName }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="account_like_item_left">
|
||||
<div class="account_like_item_left_delete modal_title_text_intro">
|
||||
<div class="account_generalMessage_item_left">
|
||||
<div class="account_generalMessage_item_left_delete modal_title_text_intro">
|
||||
<span class="icon iconfont icon-shanchu operate_icon"></span>
|
||||
</div>
|
||||
<div class="modal_title_text_intro">2024-06-05</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="account_like_item">
|
||||
<div class="account_like_item_right">
|
||||
<div class="account_like_item_right_img">
|
||||
<img src="https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png" alt="">
|
||||
</div>
|
||||
<div class="account_like_item_right_title">
|
||||
<div class="account_like_item_right_title_name">名字 <span>等人攒了你的作品</span></div>
|
||||
<div>作品名字</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="account_like_item_left">
|
||||
<div class="account_like_item_left_delete modal_title_text_intro">
|
||||
<span class="icon iconfont icon-shanchu operate_icon"></span>
|
||||
</div>
|
||||
<div class="modal_title_text_intro">2024-06-05</div>
|
||||
<div class="modal_title_text_intro">{{ item.createTime }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -52,25 +37,25 @@ import { useI18n } from 'vue-i18n'
|
||||
export default defineComponent({
|
||||
components:{
|
||||
},
|
||||
setup() {
|
||||
emits:['setReadStatus','setAllmessage'],
|
||||
setup(prop,{emit}) {
|
||||
const router = useRouter()
|
||||
const store = useStore();
|
||||
let accountMessage = reactive({
|
||||
activeKey: ref('1'),
|
||||
followList:ref([
|
||||
{
|
||||
name:'张三',
|
||||
avatar:'https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png',
|
||||
time:'2024-01-01 12:00:00',
|
||||
content:'关注了你',
|
||||
isRead:false
|
||||
},
|
||||
{
|
||||
name:'李四',
|
||||
avatar:'https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png',
|
||||
}
|
||||
])
|
||||
dataList:[
|
||||
]
|
||||
})
|
||||
let setmessageList = (data:any)=>{
|
||||
accountMessage.dataList = data.content
|
||||
}
|
||||
let setRead = (item:any)=>{
|
||||
emit('setReadStatus',item)
|
||||
item.isRead = 1
|
||||
}
|
||||
let allRead = ()=>{
|
||||
emit('setAllmessage')
|
||||
}
|
||||
// let ws = new WebSocket('ws://127.0.0.1:3000')
|
||||
// console.log(ws);
|
||||
|
||||
@@ -93,6 +78,9 @@ export default defineComponent({
|
||||
})
|
||||
return{
|
||||
...toRefs(accountMessage),
|
||||
setmessageList,
|
||||
setRead,
|
||||
allRead
|
||||
}
|
||||
},
|
||||
data(){
|
||||
@@ -105,36 +93,15 @@ export default defineComponent({
|
||||
<style lang="less" scoped>
|
||||
.account_like{
|
||||
width: 100%;
|
||||
.account_like_title{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 2rem 5rem;
|
||||
border-bottom: 1px solid #e9eaec;
|
||||
box-shadow: 0 0px 10px 1px rgba(0, 0, 0, 0.12);
|
||||
border: 1px solid #e9eaec;
|
||||
border-radius: 5px;
|
||||
.account_like_title_setting{
|
||||
cursor: pointer;
|
||||
}
|
||||
.account_generalMessage_title{
|
||||
}
|
||||
.account_like_center{
|
||||
box-shadow: 0 0px 10px 1px rgba(0, 0, 0, 0.12);
|
||||
border: 1px solid #e9eaec;
|
||||
border-radius: 5px;
|
||||
padding: 2rem 5rem;
|
||||
.account_like_item{
|
||||
display: flex;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 2rem 0;
|
||||
border-bottom: 1px solid #e9eaec;
|
||||
.account_like_item_right{
|
||||
.account_generalMessage_center{
|
||||
.account_generalMessage_item{
|
||||
.account_generalMessage_item_right{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-right: 1rem;
|
||||
.account_like_item_right_img{
|
||||
.account_generalMessage_item_right_img{
|
||||
width: 8rem;
|
||||
height: 8rem;
|
||||
margin-right: 2rem;
|
||||
@@ -146,8 +113,8 @@ export default defineComponent({
|
||||
border-radius: 50%;
|
||||
}
|
||||
}
|
||||
.account_like_item_right_title{
|
||||
.account_like_item_right_title_name{
|
||||
.account_generalMessage_item_right_title{
|
||||
.account_generalMessage_item_right_title_name{
|
||||
font-weight: 600;
|
||||
font-weight: 500;
|
||||
color: #000;
|
||||
@@ -158,10 +125,10 @@ export default defineComponent({
|
||||
}
|
||||
}
|
||||
}
|
||||
.account_like_item_left{
|
||||
.account_generalMessage_item_left{
|
||||
text-align: right;
|
||||
flex-shrink: 0;
|
||||
.account_like_item_left_delete{
|
||||
.account_generalMessage_item_left_delete{
|
||||
span{
|
||||
cursor: pointer;
|
||||
}
|
||||
@@ -172,7 +139,7 @@ export default defineComponent({
|
||||
}
|
||||
}
|
||||
}
|
||||
.account_like_item:last-child{
|
||||
.account_generalMessage_item:last-child{
|
||||
margin-bottom: 0;
|
||||
border-bottom: none;
|
||||
}
|
||||
|
||||
@@ -1,34 +1,22 @@
|
||||
<template>
|
||||
<div class="account_newFollow">
|
||||
<div class="account_newFollow_title modal_title_text">
|
||||
新增粉丝
|
||||
<div class="account_generalMessage_title modal_title_text">
|
||||
<span>新增粉丝</span>
|
||||
<div class="account_generalMessage_title_setting" @click="allRead">全部已读</div>
|
||||
</div>
|
||||
<div class="account_newFollow_center modal_title_text">
|
||||
<div class="account_newFollow_item">
|
||||
<div class="account_newFollow_item_right">
|
||||
<div class="account_newFollow_item_right_img">
|
||||
<div class="account_generalMessage_center modal_title_text">
|
||||
<div class="account_generalMessage_item" v-for="item in dataList" :key="item.id" @click="setRead(item)">
|
||||
<a-badge :dot="item.isRead == 0"></a-badge>
|
||||
<div class="account_generalMessage_item_right">
|
||||
<div class="account_generalMessage_item_right_img">
|
||||
<img src="https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png" alt="">
|
||||
</div>
|
||||
<div class="account_newFollow_item_right_title">
|
||||
<div class="">名字</div>
|
||||
<div class="modal_title_text_intro">2024-01-01 12:00:00 关注了你</div>
|
||||
<div class="account_generalMessage_item_right_title">
|
||||
<div class="">{{ item.senderUserName }}</div>
|
||||
<div class="modal_title_text_intro">{{ item.createTime }} 关注了你</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="account_newFollow_item_left">
|
||||
<div>回关</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="account_newFollow_item">
|
||||
<div class="account_newFollow_item_right">
|
||||
<div class="account_newFollow_item_right_img">
|
||||
<img src="https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png" alt="">
|
||||
</div>
|
||||
<div class="account_newFollow_item_right_title">
|
||||
<div class="">名字</div>
|
||||
<div class="modal_title_text_intro">2024-01-01 12:00:00 关注了你</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="account_newFollow_item_left">
|
||||
<div class="account_generalMessage_item_left">
|
||||
<div>回关</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -46,47 +34,33 @@ import { useI18n } from 'vue-i18n'
|
||||
export default defineComponent({
|
||||
components:{
|
||||
},
|
||||
setup() {
|
||||
emits:['setReadStatus','setAllmessage'],
|
||||
setup(prop,{emit}) {
|
||||
const router = useRouter()
|
||||
const store = useStore();
|
||||
let accountMessage = reactive({
|
||||
activeKey: ref('1'),
|
||||
followList:ref([
|
||||
{
|
||||
name:'张三',
|
||||
avatar:'https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png',
|
||||
time:'2024-01-01 12:00:00',
|
||||
content:'关注了你',
|
||||
isRead:false
|
||||
},
|
||||
{
|
||||
name:'李四',
|
||||
avatar:'https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png',
|
||||
}
|
||||
dataList:ref([
|
||||
|
||||
])
|
||||
})
|
||||
// let ws = new WebSocket('ws://127.0.0.1:3000')
|
||||
// console.log(ws);
|
||||
|
||||
// ws.onopen = ()=>{
|
||||
// console.log(222);
|
||||
// let data = {
|
||||
// cmd:4,
|
||||
// data:{
|
||||
// msg:'222'
|
||||
// }
|
||||
// }
|
||||
// ws.send(JSON.stringify(data))
|
||||
// // ws.onmessage = (data)=>{
|
||||
// // console.log(data);
|
||||
// // }
|
||||
// }
|
||||
// provide('exhibitionList',exhibitionList)
|
||||
|
||||
let setmessageList = (data:any)=>{
|
||||
accountMessage.dataList = data.content
|
||||
}
|
||||
let setRead = (item:any)=>{
|
||||
emit('setReadStatus',item)
|
||||
item.isRead = 1
|
||||
}
|
||||
let allRead = ()=>{
|
||||
emit('setAllmessage')
|
||||
}
|
||||
onMounted (()=>{
|
||||
})
|
||||
return{
|
||||
...toRefs(accountMessage),
|
||||
setmessageList,
|
||||
setRead,
|
||||
allRead
|
||||
}
|
||||
},
|
||||
data(){
|
||||
@@ -99,35 +73,12 @@ export default defineComponent({
|
||||
<style lang="less" scoped>
|
||||
.account_newFollow{
|
||||
width: 100%;
|
||||
.account_newFollow_title{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 2rem 5rem;
|
||||
border-bottom: 1px solid #e9eaec;
|
||||
box-shadow: 0 0px 10px 1px rgba(0, 0, 0, 0.12);
|
||||
border: 1px solid #e9eaec;
|
||||
border-radius: 5px;
|
||||
.account_newFollow_title_setting{
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
.account_newFollow_center{
|
||||
box-shadow: 0 0px 10px 1px rgba(0, 0, 0, 0.12);
|
||||
border: 1px solid #e9eaec;
|
||||
border-radius: 5px;
|
||||
padding: 2rem 5rem;
|
||||
.account_newFollow_item{
|
||||
display: flex;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 2rem 0;
|
||||
border-bottom: 1px solid #e9eaec;
|
||||
.account_newFollow_item_right{
|
||||
.account_generalMessage_center{
|
||||
.account_generalMessage_item{
|
||||
.account_generalMessage_item_right{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
.account_newFollow_item_right_img{
|
||||
.account_generalMessage_item_right_img{
|
||||
width: 8rem;
|
||||
height: 8rem;
|
||||
margin-right: 2rem;
|
||||
@@ -139,7 +90,7 @@ export default defineComponent({
|
||||
}
|
||||
}
|
||||
}
|
||||
.account_newFollow_item_left{
|
||||
.account_generalMessage_item_left{
|
||||
div{
|
||||
padding: .5rem 2rem;
|
||||
border-radius: 4rem;
|
||||
@@ -148,7 +99,7 @@ export default defineComponent({
|
||||
}
|
||||
}
|
||||
}
|
||||
.account_newFollow_item:last-child{
|
||||
.account_generalMessage_item:last-child{
|
||||
margin-bottom: 0;
|
||||
border-bottom: none;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
<template>
|
||||
<div class="account_privateChatMessage">
|
||||
<div class="account_privateChatMessage_title modal_title_text">
|
||||
私信
|
||||
<div class="account_generalMessage_title modal_title_text">
|
||||
<span>私信</span>
|
||||
<div class="account_generalMessage_title_setting">全部已读</div>
|
||||
</div>
|
||||
<div class="account_privateChatMessage_content">
|
||||
<div class="content_left">
|
||||
@@ -243,25 +244,14 @@ export default defineComponent({
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
.account_privateChatMessage_title{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 2rem 5rem;
|
||||
border-bottom: 1px solid #e9eaec;
|
||||
box-shadow: 0 0px 10px 1px rgba(0, 0, 0, 0.12);
|
||||
border: 1px solid #e9eaec;
|
||||
border-radius: 5px;
|
||||
.account_privateChatMessage_title_setting{
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
.account_privateChatMessage_content{
|
||||
flex: 1;
|
||||
box-shadow: 0 0px 10px 1px rgba(0, 0, 0, 0.12);
|
||||
border: 1px solid #e9eaec;
|
||||
border-radius: 5px;
|
||||
display: flex;
|
||||
margin-right: 5rem;
|
||||
margin-left: 5rem;
|
||||
.content_left{
|
||||
width: 20%;
|
||||
border-right: 1px solid #e9eaec;
|
||||
@@ -277,7 +267,6 @@ export default defineComponent({
|
||||
&.active{
|
||||
background: #e4e5e6;
|
||||
}
|
||||
|
||||
img{
|
||||
width: 6rem;
|
||||
height: 6rem;
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
<template>
|
||||
<div class="account_systemMessage">
|
||||
<div class="account_systemMessage_title modal_title_text">
|
||||
系统消息
|
||||
<div class="account_generalMessage_title modal_title_text">
|
||||
<span>系统消息</span>
|
||||
<div class="account_generalMessage_title_setting" @click="allRead">全部已读</div>
|
||||
</div>
|
||||
<div class="account_systemMessage_item modal_title_text">
|
||||
<div class="account_systemMessage_item_title">
|
||||
<div>Open Call for International Young Fashion Talent</div>
|
||||
<div class="modal_title_text_intro">31 Aug 2024</div>
|
||||
<div class="account_generalMessage_item modal_title_text" v-for="item in dataList" :key="item.id" @click="setRead(item)">
|
||||
<a-badge dot></a-badge>
|
||||
<div class="account_generalMessage_item_title">
|
||||
<div class="account_generalMessage_item_title_text" :title="item.content">{{ item.content.title }}</div>
|
||||
<div class="modal_title_text_intro">{{ item.createTime }}</div>
|
||||
</div>
|
||||
<div class="modal_title_text_intro">
|
||||
10 selected young fashion talent will be mentored by the AiDA development team to learn and explore the possibilities of AiDA. Each selected young fashion talent will create a 4-outfit collection themed “Culture” with AiDA. They will receive full technical support and subsidies for the associated production fee. Selected International/ Mainland young talent will also be able to attend the Culture X AI Internation Fashion Show in Hong Kong that is scheduled on 11 March 2025.
|
||||
<span class="account_systemMessage_item_link">网页链接</span>
|
||||
{{ item.content.content }}
|
||||
<span v-if="item.content.link" class="account_generalMessage_item_link">{{ item.content.link }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div></div>
|
||||
<div></div>
|
||||
</div>
|
||||
</template>
|
||||
<script lang="ts">
|
||||
@@ -28,34 +28,38 @@ import { useI18n } from 'vue-i18n'
|
||||
export default defineComponent({
|
||||
components:{
|
||||
},
|
||||
setup() {
|
||||
emits:['setReadStatus','setAllmessage'],
|
||||
props:{
|
||||
},
|
||||
setup(prop,{emit}) {
|
||||
const router = useRouter()
|
||||
const store = useStore();
|
||||
let accountMessage = reactive({
|
||||
activeKey: ref('1'),
|
||||
dataList: [],
|
||||
})
|
||||
// let ws = new WebSocket('ws://127.0.0.1:3000')
|
||||
// console.log(ws);
|
||||
|
||||
// ws.onopen = ()=>{
|
||||
// console.log(222);
|
||||
// let data = {
|
||||
// cmd:4,
|
||||
// data:{
|
||||
// msg:'222'
|
||||
// }
|
||||
// }
|
||||
// ws.send(JSON.stringify(data))
|
||||
// // ws.onmessage = (data)=>{
|
||||
// // console.log(data);
|
||||
// // }
|
||||
// }
|
||||
let setmessageList = (data:any)=>{
|
||||
console.log(data);
|
||||
|
||||
data.content.forEach((item:any) => {
|
||||
item.content = JSON.parse(item.content)
|
||||
});
|
||||
accountMessage.dataList = data.content
|
||||
}
|
||||
let setRead = (item:any)=>{
|
||||
emit('setReadStatus',item)
|
||||
}
|
||||
let allRead = ()=>{
|
||||
emit('setAllmessage')
|
||||
}
|
||||
// provide('exhibitionList',exhibitionList)
|
||||
|
||||
onMounted (()=>{
|
||||
})
|
||||
return{
|
||||
...toRefs(accountMessage),
|
||||
setmessageList,
|
||||
setRead,
|
||||
allRead
|
||||
}
|
||||
},
|
||||
data(){
|
||||
@@ -68,37 +72,21 @@ export default defineComponent({
|
||||
<style lang="less" scoped>
|
||||
.account_systemMessage{
|
||||
width: 100%;
|
||||
.account_systemMessage_title{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 2rem 5rem;
|
||||
border-bottom: 1px solid #e9eaec;
|
||||
box-shadow: 0 0px 10px 1px rgba(0, 0, 0, 0.12);
|
||||
border: 1px solid #e9eaec;
|
||||
border-radius: 5px;
|
||||
.account_systemMessage_title_setting{
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
.account_systemMessage_item{
|
||||
box-shadow: 0 0px 10px 1px rgba(0, 0, 0, 0.12);
|
||||
border: 1px solid #e9eaec;
|
||||
border-radius: 5px;
|
||||
padding: 5rem 5rem;
|
||||
.account_systemMessage_item_title{
|
||||
.account_generalMessage_item{
|
||||
.account_generalMessage_item_title{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-bottom: 2rem;
|
||||
.account_generalMessage_item_title_text{
|
||||
max-width: 80%;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
.modal_title_text_intro{
|
||||
margin-left: 4rem;
|
||||
}
|
||||
}
|
||||
.account_systemMessage_item_link{
|
||||
color: #39215b;
|
||||
cursor: pointer;
|
||||
font-weight: 600;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -230,7 +230,7 @@
|
||||
<div class="upload_color_item_bg" :style="{'background-color':`rgba(${color.rgba.r},${color.rgba.g},${color.rgba.b},${color.rgba.a})`}">
|
||||
</div>
|
||||
<!-- <div class="upload_color_item_text">{{ pantongNameList[index] }}</div> -->
|
||||
<img src="#" :title="pantongNameList[index]">
|
||||
<img :title="pantongNameList[index]">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -128,7 +128,7 @@
|
||||
<div class="upload_color_item_bg" :style="{'background-color':`rgba(${color.rgba.r},${color.rgba.g},${color.rgba.b},${color.rgba.a})`}">
|
||||
</div>
|
||||
<!-- <div class="upload_color_item_text">{{ pantongNameList[index] }}</div> -->
|
||||
<img src="#" :title="pantongNameList[index]">
|
||||
<img :title="pantongNameList[index]">
|
||||
</div>
|
||||
</div>
|
||||
<div class="upload_color_btn" :title="isSelectSuccessively?$t('ColorboardUpload.SelectSuccessivelyOnTitle'):$t('ColorboardUpload.SelectSuccessivelyOffTitle')" v-show="selectColorList.length>0">
|
||||
@@ -150,7 +150,7 @@
|
||||
<span class="get_color_des">{{ $t('ColorboardUpload.ExtractColor') }}</span>
|
||||
</div>
|
||||
<div v-show="getColorBg" class="get_color_bg" @click="setUplpadColor(reviewColor)" :style="{'background-color':`rgba(${getSelectRGB(reviewColor).r},${getSelectRGB(reviewColor).g},${getSelectRGB(reviewColor).b},${getSelectRGB(reviewColor).a})`}">
|
||||
<img src="#" :title="pantongName">
|
||||
<img :title="pantongName">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -148,7 +148,7 @@ export default defineComponent({
|
||||
cropper.getCropData((data:any) => {
|
||||
// 转换为File对象
|
||||
let file = base64toFile(data,this.cropperFileData.name);
|
||||
this.$emit('handleCropperSuccess',{file:file, fileData:this.cropperFileData})
|
||||
this.$emit('handleCropperSuccess',{file:file, fileData:this.cropperFileData,base64:data})
|
||||
})
|
||||
|
||||
},
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
:centered="true"
|
||||
:closable="false"
|
||||
:keyboard="false"
|
||||
:destroyOnClose="true"
|
||||
>
|
||||
<div class="UpgradePlan_closeIcon generalModelOperate_closeIcon ">
|
||||
<i class="fi fi-rr-cross-small" @click.stop="cancelDsign()"></i>
|
||||
@@ -362,8 +363,13 @@ export default defineComponent({
|
||||
let normalCanvasState = ref([])//存放canvas操作
|
||||
let isLoadCanvas = false//撤回或者反撤回false为撤回
|
||||
let userlikeGroupId = 0
|
||||
|
||||
let submitCanvasContent = null
|
||||
let init = (productData) => {
|
||||
userlikeGroupId = productData.userlikeGroupId
|
||||
|
||||
clearTimeout(submitCanvasContent)
|
||||
|
||||
canvasWH.value.height = 100
|
||||
normalCanvasState.value = []
|
||||
reverseCanvasState.value = []
|
||||
@@ -446,16 +452,42 @@ export default defineComponent({
|
||||
userLikeGroupId:userlikeGroupId
|
||||
}
|
||||
isShowMark.value = true
|
||||
let oldExportCanvas = await new Promise((resolve, reject) => {
|
||||
Https.axiosPost(Https.httpUrls.exportSearch, data)
|
||||
.then((rv) => {
|
||||
resolve(rv)
|
||||
})
|
||||
.catch((rv) => {
|
||||
let oldExportCanvas
|
||||
let localCanvas = localStorage.getItem('canvasContent')
|
||||
let localUserlikeGroupId = localStorage.getItem('userlikeGroupId')
|
||||
oldExportCanvas = await new Promise((resolve, reject) => {
|
||||
if(localUserlikeGroupId == userlikeGroupId){
|
||||
Modal.confirm({
|
||||
title: useI18.t('exportModel.jsContent8'),
|
||||
okText: 'Yes',
|
||||
cancelText: 'No',
|
||||
mask:false,
|
||||
centered:true,
|
||||
onOk() {
|
||||
localCanvas = localCanvas?JSON.parse(localCanvas):null
|
||||
resolve(localCanvas)
|
||||
},
|
||||
onCancel(){
|
||||
resolve(null)
|
||||
}
|
||||
});
|
||||
}else{
|
||||
resolve(null)
|
||||
});
|
||||
}
|
||||
})
|
||||
if(!oldExportCanvas){
|
||||
oldExportCanvas = await new Promise((resolve, reject) => {
|
||||
Https.axiosPost(Https.httpUrls.exportSearch, data)
|
||||
.then((rv) => {
|
||||
resolve(rv)
|
||||
})
|
||||
.catch((rv) => {
|
||||
resolve(null)
|
||||
});
|
||||
})
|
||||
}
|
||||
|
||||
console.log(oldExportCanvas);
|
||||
// arr.forEach((item,index)=>{
|
||||
if(oldExportCanvas){
|
||||
canvasWH.value.height = oldExportCanvas.canvasHeight
|
||||
@@ -579,6 +611,16 @@ export default defineComponent({
|
||||
updateCanvasState('')//加载完成后记录一下
|
||||
setOperation('move')
|
||||
closeNav.value.tool = true
|
||||
submitCanvasContent = setInterval(()=>{
|
||||
let data = setCanvasContent(true)
|
||||
if(data.objects.length == 0){
|
||||
clearTimeout(submitCanvasContent)
|
||||
return
|
||||
}
|
||||
data.canvasHeight = canvasWH.value.height
|
||||
localStorage.setItem('canvasContent',JSON.stringify(data))
|
||||
localStorage.setItem('userlikeGroupId',userlikeGroupId)
|
||||
},3000)
|
||||
if(driver__.value.driver){
|
||||
driverObj__.moveNext()
|
||||
}
|
||||
@@ -1864,7 +1906,7 @@ export default defineComponent({
|
||||
publishModal.init(data)
|
||||
}
|
||||
let setSubmit = ()=>{
|
||||
let data = setCanvasContent()
|
||||
let data = setCanvasContent(false)
|
||||
data.canvasHeight = canvasWH.value.height
|
||||
let blob = new Blob([JSON.stringify(data)], { type: "application/json" });
|
||||
let formData = new FormData();
|
||||
@@ -1875,14 +1917,16 @@ export default defineComponent({
|
||||
message.success(t('exportModel.jsContent7'))
|
||||
})
|
||||
}
|
||||
let setCanvasContent = ()=>{
|
||||
let setCanvasContent = (isSaveImg)=>{
|
||||
var json = canvas.toJSON(['imgId','minioUrl']);
|
||||
// console.log(JSON.stringify(json));
|
||||
json.objects.forEach(item=>{
|
||||
if(item.type == 'image'){
|
||||
delete item.src
|
||||
}
|
||||
})
|
||||
if(!isSaveImg){
|
||||
json.objects.forEach(item=>{
|
||||
if(item.type == 'image'){
|
||||
delete item.src
|
||||
}
|
||||
})
|
||||
}
|
||||
return json
|
||||
}
|
||||
let textDataShow = ref(false)
|
||||
@@ -1921,6 +1965,7 @@ export default defineComponent({
|
||||
]
|
||||
textFontFamilyList.value = arr
|
||||
fontFamily.value = arr[0].value
|
||||
|
||||
});
|
||||
return {
|
||||
toSvg,
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
</div> -->
|
||||
</div>
|
||||
<div class="input_border" >
|
||||
<div class="input_box Guide_1_5" :class="[inputShow?'active':'',]">
|
||||
<div class="input_box Guide_1_5" :class="[inputShow?'active':'',driver__.driver?'showEvents':'']" >
|
||||
<div class="input_box_btnBox">
|
||||
<div class="upload_item">
|
||||
<div
|
||||
@@ -87,7 +87,7 @@
|
||||
v-model="searchPictureName"
|
||||
></textarea>
|
||||
<!-- <div class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('Generate.Generate') }}</div> -->
|
||||
<div v-show="!isGenerate" class="generage_btn started_btn" @click.stop="getgenerate">
|
||||
<div v-show="!isGenerate" class="generage_btn started_btn " @click.stop="getgenerate">
|
||||
{{ $t('Generate.Generate') }}
|
||||
<!-- <div v-show="isGenerate"><a-spin size="large" /></div> -->
|
||||
</div>
|
||||
@@ -139,7 +139,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
<div class="generage_img Guide_1_6" :style="[isGenerate?'overflow:hidden':'']">
|
||||
<div class="generage_img Guide_1_6" :style="[isGenerate?'overflow:hidden':'']" :class="[driver__.driver?'showEvents':'']">
|
||||
<div
|
||||
class="generage_img_item"
|
||||
v-for="(item, index) in fileList"
|
||||
|
||||
@@ -444,6 +444,7 @@ export default defineComponent({
|
||||
|
||||
},
|
||||
async layout(){
|
||||
|
||||
if(this.loadingShow)return
|
||||
this.loadingShow = true
|
||||
this.store.commit("setDisposeMoodboard", []);
|
||||
@@ -469,7 +470,6 @@ export default defineComponent({
|
||||
}else{
|
||||
this.moodb_className = this.moodb_[arr.length-1][random]
|
||||
}
|
||||
|
||||
this.layoutOpen = true
|
||||
//提交模板
|
||||
// this.loadingShow = true
|
||||
@@ -493,6 +493,19 @@ export default defineComponent({
|
||||
img.imgUrl = rv.url
|
||||
img.resData = JSON.parse(JSON.stringify(img))
|
||||
this.store.commit("setDisposeMoodboard", img);
|
||||
let obj = {
|
||||
imgStyle:[],
|
||||
domStyle:[],
|
||||
borStyle:[],
|
||||
rototeStyle:[],
|
||||
translateStyle:[],
|
||||
angleTRStyle:[],
|
||||
angleTLStyle:[],
|
||||
angleBRStyle:[],
|
||||
angleBLStyle:[],
|
||||
class:this.moodb_className,
|
||||
}
|
||||
this.store.commit("setDisposeMoodboardPosition", obj);
|
||||
this.loadingShow = false
|
||||
}
|
||||
).catch(rv=>{
|
||||
|
||||
@@ -125,13 +125,21 @@ export default defineComponent({
|
||||
draggable
|
||||
},
|
||||
setup(prop) {
|
||||
let store = useStore()
|
||||
let layout: any = ref(false);
|
||||
let templateFileList: any = ref([]);
|
||||
let openClick: any = ref(1);
|
||||
let drag = false;
|
||||
let layoutList:any = ref([])
|
||||
const content = ref<HTMLElement | null>(null);
|
||||
const content:any = ref<HTMLElement | null>(null);
|
||||
let loadingShow = ref(false)
|
||||
let styleObj = computed(()=>{
|
||||
return store.state.UploadFilesModule.disposeMoodboardPostition
|
||||
})
|
||||
let domObj = {
|
||||
dom:['img','ul','.layout_rotote','.layout_translate','.layout_angle_tr','.layout_angle_tl','.layout_angle_br','.layout_angle_bl'],
|
||||
domStyle:['imgStyle','borStyle','rototeStyle','translateStyle','angleTRStyle','angleTLStyle','angleBRStyle','angleBLStyle'],
|
||||
}
|
||||
return {
|
||||
layout,
|
||||
templateFileList,
|
||||
@@ -139,7 +147,9 @@ export default defineComponent({
|
||||
drag,
|
||||
layoutList,
|
||||
content,
|
||||
loadingShow
|
||||
loadingShow,
|
||||
styleObj,
|
||||
domObj,
|
||||
};
|
||||
},
|
||||
data() {
|
||||
@@ -348,6 +358,20 @@ export default defineComponent({
|
||||
el.parentNode.addEventListener('mousemove', (e:MouseEvent) => {
|
||||
el.parentNode.addEventListener('mousewheel',(e:MouseEvent) => {
|
||||
if(timeSwitch){
|
||||
if(angle == 0){
|
||||
function getRotationAngle(transformDom:any) {
|
||||
if (!transformDom || transformDom === 'none') return null;
|
||||
let transform = window.getComputedStyle(transformDom).transform;
|
||||
const values = transform?.match(/matrix\(([^)]+)\)/);
|
||||
if (values) {
|
||||
const matrix = values[1].split(',').map(Number);
|
||||
const angle = Math.atan2(matrix[1], matrix[0]) * (180 / Math.PI);
|
||||
return angle >= 0 ? angle : angle + 360; // 确保角度为正值
|
||||
}
|
||||
return null;
|
||||
}
|
||||
angle = getRotationAngle(elParent.firstElementChild);
|
||||
}
|
||||
timeSwitch = false
|
||||
if((e as WheelEvent).deltaY > 0){
|
||||
if(num <= 1){
|
||||
@@ -571,7 +595,9 @@ export default defineComponent({
|
||||
this.layoutList = parentList
|
||||
|
||||
this.moodbList = this.moodb[parentList.length-1]
|
||||
this.moodbClassName = this.moodb_className
|
||||
this.moodbClassName = this.styleObj.class
|
||||
this.initDomStyle()
|
||||
|
||||
},
|
||||
cancelDsign(){
|
||||
this.layout = false
|
||||
@@ -604,6 +630,65 @@ export default defineComponent({
|
||||
changeTemplateModal(){
|
||||
this.layout = !this.layout
|
||||
},
|
||||
setIndex(arr:any){
|
||||
const nums = arr.map((obj:any) => obj.num);
|
||||
const sortedNums = [...nums].sort((a, b) => a - b);
|
||||
GO.zIndex = sortedNums[sortedNums.length - 1] + 1
|
||||
const numToNewValue = new Map();
|
||||
sortedNums.forEach((num, index) => numToNewValue.set(num, index + 1));
|
||||
arr.forEach((obj:any) => {
|
||||
obj.num = numToNewValue.get(obj.num);
|
||||
});
|
||||
return arr
|
||||
},
|
||||
initDomStyle(){
|
||||
nextTick(()=>{
|
||||
this.content.forEach((item:any,index:any) => {
|
||||
if(this.styleObj.domStyle[index]){
|
||||
item.classList.add('active')
|
||||
this.initStyle(item,this.styleObj.domStyle[index])
|
||||
}
|
||||
this.domObj.dom.forEach((domName:any,domStyle:any) => {
|
||||
let dom,style
|
||||
if(this.styleObj[this.domObj.domStyle[index]]){
|
||||
style = this.styleObj[this.domObj.domStyle[domStyle]][index]
|
||||
dom = item.querySelector(domName)
|
||||
this.initStyle(dom,style)
|
||||
}
|
||||
})
|
||||
});
|
||||
})
|
||||
},
|
||||
clearStyleObj(){
|
||||
this.styleObj.domStyle = []
|
||||
this.domObj.domStyle.forEach((item:any)=>{
|
||||
if(this.styleObj[item])this.styleObj[item] = []
|
||||
})
|
||||
},
|
||||
initStyle(dom:any,style:any){
|
||||
if(!style)return
|
||||
for (const [property, value] of Object.entries(style)) {
|
||||
dom.style.setProperty(property, value);
|
||||
}
|
||||
},
|
||||
setDomStyle(){
|
||||
this.clearStyleObj()
|
||||
this.content.forEach((item:any) => {
|
||||
this.styleObj.domStyle.push(this.setStyle(item.style))
|
||||
this.domObj.dom.forEach((domName:any,index:any) => {
|
||||
let style = this.domObj.domStyle[index]
|
||||
let dom = item.querySelector(domName)
|
||||
this.styleObj[style].push(this.setStyle(dom.style))
|
||||
})
|
||||
});
|
||||
},
|
||||
setStyle(domStyle:any){
|
||||
let style:any = {}
|
||||
for (let property of domStyle) {
|
||||
style[property] = domStyle.getPropertyValue(property);
|
||||
}
|
||||
return style
|
||||
},
|
||||
//提交模板
|
||||
submitTemplate() {
|
||||
this.loadingShow = true
|
||||
@@ -628,6 +713,11 @@ export default defineComponent({
|
||||
this.layout = false
|
||||
this.loadingShow = false
|
||||
this.store.commit("setDisposeMoodboard", rv);
|
||||
|
||||
this.setDomStyle()
|
||||
this.setIndex(this.styleObj.domStyle)//index统一排序设置值
|
||||
this.store.commit("setDisposeMoodboardPosition", this.styleObj);
|
||||
|
||||
}
|
||||
).catch(rv=>{
|
||||
this.loadingShow = false
|
||||
|
||||
@@ -132,14 +132,22 @@ export default defineComponent({
|
||||
draggable
|
||||
},
|
||||
setup(prop) {
|
||||
let store = useStore()
|
||||
let layout: any = ref(false);
|
||||
let templateFileList: any = ref([]);
|
||||
let openClick: any = ref(1);
|
||||
let drag = false;
|
||||
let layoutList:any = ref([])
|
||||
const content = ref<HTMLElement | null>(null);
|
||||
const content:any = ref<HTMLElement | null>(null);
|
||||
let loadingShow = ref(false)
|
||||
let styleObj = computed(()=>{
|
||||
return store.state.UploadFilesModule.disposeMoodboardPostition
|
||||
})
|
||||
let moodItemScale = ref(0)
|
||||
let domObj = {
|
||||
dom:['img','ul','.layoutMobile_rotote','.layoutMobile_translate','.layoutMobile_angle_tr','.layoutMobile_angle_tl','.layoutMobile_angle_br','.layoutMobile_angle_bl'],
|
||||
domStyle:['imgStyle','borStyle','rototeStyle','translateStyle','angleTRStyle','angleTLStyle','angleBRStyle','angleBLStyle'],
|
||||
}
|
||||
return {
|
||||
layout,
|
||||
templateFileList,
|
||||
@@ -148,7 +156,9 @@ export default defineComponent({
|
||||
layoutList,
|
||||
content,
|
||||
loadingShow,
|
||||
moodItemScale
|
||||
moodItemScale,
|
||||
styleObj,
|
||||
domObj,
|
||||
};
|
||||
},
|
||||
data() {
|
||||
@@ -582,7 +592,9 @@ export default defineComponent({
|
||||
this.moodIndex = 0
|
||||
|
||||
this.moodbList = this.moodb[parentList.length-1]
|
||||
this.moodbClassName = this.moodb_className
|
||||
this.moodbClassName = this.styleObj.class
|
||||
this.initDomStyle()
|
||||
|
||||
},
|
||||
cancelDsign(){
|
||||
this.layout = false
|
||||
@@ -635,6 +647,65 @@ export default defineComponent({
|
||||
changeTemplateModal(){
|
||||
this.layout = !this.layout
|
||||
},
|
||||
setIndex(arr:any){
|
||||
const nums = arr.map((obj:any) => obj.num);
|
||||
const sortedNums = [...nums].sort((a, b) => a - b);
|
||||
GO.zIndex = sortedNums[sortedNums.length - 1] + 1
|
||||
const numToNewValue = new Map();
|
||||
sortedNums.forEach((num, index) => numToNewValue.set(num, index + 1));
|
||||
arr.forEach((obj:any) => {
|
||||
obj.num = numToNewValue.get(obj.num);
|
||||
});
|
||||
return arr
|
||||
},
|
||||
initDomStyle(){
|
||||
nextTick(()=>{
|
||||
this.content.forEach((item:any,index:any) => {
|
||||
if(this.styleObj.domStyle[index]){
|
||||
item.classList.add('active')
|
||||
this.initStyle(item,this.styleObj.domStyle[index])
|
||||
}
|
||||
this.domObj.dom.forEach((domName:any,domStyle:any) => {
|
||||
let dom,style
|
||||
if(this.styleObj[this.domObj.domStyle[index]]){
|
||||
style = this.styleObj[this.domObj.domStyle[domStyle]][index]
|
||||
dom = item.querySelector(domName)
|
||||
this.initStyle(dom,style)
|
||||
}
|
||||
})
|
||||
});
|
||||
})
|
||||
},
|
||||
clearStyleObj(){
|
||||
this.styleObj.domStyle = []
|
||||
this.domObj.domStyle.forEach((item:any)=>{
|
||||
if(this.styleObj[item])this.styleObj[item] = []
|
||||
})
|
||||
},
|
||||
initStyle(dom:any,style:any){
|
||||
if(!style)return
|
||||
for (const [property, value] of Object.entries(style)) {
|
||||
dom.style.setProperty(property, value);
|
||||
}
|
||||
},
|
||||
setDomStyle(){
|
||||
this.clearStyleObj()
|
||||
this.content.forEach((item:any) => {
|
||||
this.styleObj.domStyle.push(this.setStyle(item.style))
|
||||
this.domObj.dom.forEach((domName:any,index:any) => {
|
||||
let style = this.domObj.domStyle[index]
|
||||
let dom = item.querySelector(domName)
|
||||
this.styleObj[style].push(this.setStyle(dom.style))
|
||||
})
|
||||
});
|
||||
},
|
||||
setStyle(domStyle:any){
|
||||
let style:any = {}
|
||||
for (let property of domStyle) {
|
||||
style[property] = domStyle.getPropertyValue(property);
|
||||
}
|
||||
return style
|
||||
},
|
||||
//提交模板
|
||||
submitTemplate() {
|
||||
this.loadingShow = true
|
||||
@@ -659,6 +730,10 @@ export default defineComponent({
|
||||
this.layout = false
|
||||
this.loadingShow = false
|
||||
this.store.commit("setDisposeMoodboard", rv);
|
||||
|
||||
this.setDomStyle()
|
||||
this.setIndex(this.styleObj.domStyle)//index统一排序设置值
|
||||
this.store.commit("setDisposeMoodboardPosition", this.styleObj);
|
||||
}
|
||||
).catch(rv=>{
|
||||
this.loadingShow = false
|
||||
|
||||
@@ -49,11 +49,16 @@
|
||||
</div> -->
|
||||
<!-- <div class="scaleImage_chunk_title_intro">zhh</div> -->
|
||||
<div class="detail_right_user detail_left_right_item">
|
||||
<!-- <div class="detail_right_user_head">
|
||||
<div class="detail_right_user_head">
|
||||
<img v-lazy="scaleImageData?.imgUrl">
|
||||
</div> -->
|
||||
|
||||
</div>
|
||||
<div class="detail_right_user_content">
|
||||
<div class="scaleImage_chunk_title_intro">@{{scaleImageData.userName}}</div>
|
||||
<div>
|
||||
<div class="scaleImage_chunk_title_intro">@{{scaleImageData.userName}}</div>
|
||||
<div v-if="scaleImageData.isFollow == 0" class="started_btn" @click="setFollow()" >{{$t('newScaleImage.Follow')}}</div>
|
||||
<div v-else class="started_btn" @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>
|
||||
<!-- <div class="scaleImage_chunk_title_intro">个性签名</div>
|
||||
@@ -551,6 +556,18 @@ export default defineComponent({
|
||||
}
|
||||
});
|
||||
}
|
||||
let setFollow = () =>{
|
||||
let url = Https.httpUrls.porfolioFollow
|
||||
if(imgData.scaleImageData.isFollow == 1)url = Https.httpUrls.porfolioCancelFollow
|
||||
Https.axiosGet(url, {params:{followeeId:imgData.scaleImageData.accountId}})
|
||||
.then((rv) => {
|
||||
if(imgData.scaleImageData.isFollow == 1){
|
||||
imgData.scaleImageData.isFollow = 0
|
||||
}else{
|
||||
imgData.scaleImageData.isFollow = 1
|
||||
}
|
||||
})
|
||||
}
|
||||
watch(()=>imgData.scaleImageIndex,
|
||||
(newVal,oldVal)=>{
|
||||
let dom:any = document.querySelector('.newScaleImage_left .nav_centent')
|
||||
@@ -584,6 +601,7 @@ export default defineComponent({
|
||||
setComment,
|
||||
setPortfolioLike,
|
||||
setDeleteComment,
|
||||
setFollow,
|
||||
};
|
||||
},
|
||||
directives:{
|
||||
@@ -759,6 +777,7 @@ export default defineComponent({
|
||||
flex-direction: row;
|
||||
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