2023-11-9-2
This commit is contained in:
@@ -552,6 +552,7 @@ export default defineComponent({
|
||||
file.resData = res.data;
|
||||
file.designType = res.data.designType
|
||||
file.category = this.current;
|
||||
file.minIOPath = file.resData.minIOPath
|
||||
let fileList = this.uploadList.filter(
|
||||
(v) => v.status === "done"
|
||||
);
|
||||
|
||||
@@ -748,6 +748,7 @@ export default defineComponent({
|
||||
padding: 2rem 0;
|
||||
width: 16rem;
|
||||
border-radius: 1rem;
|
||||
height: 40rem;
|
||||
.habit_Overal_Single {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@@ -793,7 +794,13 @@ export default defineComponent({
|
||||
}
|
||||
}
|
||||
.button_second{
|
||||
margin-top: 1rem;
|
||||
margin: 1rem 0;
|
||||
width: 10rem;
|
||||
text-align: center;
|
||||
position: initial;
|
||||
transform: none;
|
||||
height: 3rem;
|
||||
line-height: 3rem;
|
||||
}
|
||||
.print_input{
|
||||
margin-top: 1rem;
|
||||
|
||||
@@ -114,27 +114,29 @@ export default defineComponent({
|
||||
sketch1.num = 0
|
||||
sketch2.num = 1
|
||||
sketch3.num = 2
|
||||
console.log(this.sketchList);
|
||||
for (let i = 0; i < this.sketchList.length; i++) {
|
||||
let arr = [sketch1,sketch2,sketch3]
|
||||
arr.sort((a,b)=>{
|
||||
var a_num = a["height"];
|
||||
var b_num = b["height"];
|
||||
return a_num - b_num;
|
||||
})
|
||||
this.sketch[arr[0].num]?.push(this.sketchList[i])
|
||||
await new Promise((resolve:any)=>{
|
||||
nextTick().then(()=>{
|
||||
sketch1 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect()
|
||||
sketch2 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item1')[0]?.getBoundingClientRect()
|
||||
sketch3 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item2')[0]?.getBoundingClientRect()
|
||||
sketch1.num = 0
|
||||
sketch2.num = 1
|
||||
sketch3.num = 2
|
||||
resolve()
|
||||
if(this.sketchList){
|
||||
for (let i = 0; i < this.sketchList.length; i++) {
|
||||
let arr = [sketch1,sketch2,sketch3]
|
||||
arr.sort((a,b)=>{
|
||||
var a_num = a["height"];
|
||||
var b_num = b["height"];
|
||||
return a_num - b_num;
|
||||
})
|
||||
})
|
||||
this.sketch[arr[0].num]?.push(this.sketchList[i])
|
||||
await new Promise((resolve:any)=>{
|
||||
nextTick().then(()=>{
|
||||
sketch1 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect()
|
||||
sketch2 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item1')[0]?.getBoundingClientRect()
|
||||
sketch3 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item2')[0]?.getBoundingClientRect()
|
||||
sketch1.num = 0
|
||||
sketch2.num = 1
|
||||
sketch3.num = 2
|
||||
resolve()
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -418,7 +418,8 @@ export default defineComponent({
|
||||
rv.generatedCollectionItems.forEach((v:any,index:number)=>{
|
||||
arr = {
|
||||
id:rv.generatedCollectionItems[index].generateItemId,
|
||||
imgUrl:rv.generatedCollectionItems[index].generateItemUrl
|
||||
imgUrl:rv.generatedCollectionItems[index].generateItemUrl,
|
||||
like:rv.generatedCollectionItems[index].isLiked
|
||||
}
|
||||
this.fileList.push(arr)
|
||||
this.loadingShow = false
|
||||
|
||||
@@ -189,13 +189,13 @@ export default defineComponent({
|
||||
isLanguage: false,
|
||||
language:[
|
||||
{name:'English',value:'en'},
|
||||
{name:'中文',value:'cn'},
|
||||
{name:'한국인',value:'kr'},
|
||||
{name:'中文',value:'zh'},
|
||||
{name:'한국인',value:'ko'},
|
||||
{name:'にほんご',value:'ja'},
|
||||
{name:'Русский',value:'ru'},
|
||||
{name:'Français',value:'fr'},
|
||||
{name:'แบบไทย',value:'th'},
|
||||
{name:'Tiếng Việt',value:'vn'},
|
||||
{name:'Tiếng Việt',value:'vi'},
|
||||
{name:'Italiano',value:'it'},
|
||||
]
|
||||
};
|
||||
@@ -208,7 +208,7 @@ export default defineComponent({
|
||||
this.accountIsLogin(this.userInfo);
|
||||
}
|
||||
this.isHaveBindEmail = this.userInfo?.email ? true : false;
|
||||
|
||||
this.getLang()
|
||||
this.operateClick();
|
||||
document.addEventListener("click", this.operateClick);
|
||||
},
|
||||
@@ -372,12 +372,38 @@ export default defineComponent({
|
||||
}
|
||||
}, 1000);
|
||||
},
|
||||
//获取当前语言
|
||||
getLang(){
|
||||
let data = {}
|
||||
Https.axiosPost(Https.httpUrls.getUserLanguage, data).then(
|
||||
(rv) => {
|
||||
if (rv) {
|
||||
this.locale = rv
|
||||
}
|
||||
}
|
||||
);
|
||||
},
|
||||
setLang(v){
|
||||
let data = {
|
||||
language:v
|
||||
}
|
||||
Https.axiosPost(Https.httpUrls.changeUserLanguage, data).then(
|
||||
(rv) => {
|
||||
if (rv) {
|
||||
console.log(rv);
|
||||
// this.getLang()
|
||||
}
|
||||
}
|
||||
);
|
||||
},
|
||||
|
||||
setLocale(v){
|
||||
// window.location.reload();
|
||||
let name = 'home'
|
||||
let noRefresh = true;
|
||||
this.$router.push({ name: name, params: { noRefresh: noRefresh } });
|
||||
// let name = 'home'
|
||||
// let noRefresh = true;
|
||||
// this.$router.push({ name: name, params: { noRefresh: noRefresh } });
|
||||
this.locale = v
|
||||
this.setLang(v)
|
||||
// this.locale == 'zh-cn'?this.locale = 'en':this.locale = 'zh-cn'
|
||||
}
|
||||
},
|
||||
|
||||
@@ -118,25 +118,27 @@ export default defineComponent({
|
||||
sketch1.num = 0
|
||||
sketch2.num = 1
|
||||
sketch3.num = 2
|
||||
for (let i = 0; i < this.sketchList.length; i++) {
|
||||
let arr = [sketch1,sketch2,sketch3]
|
||||
arr.sort((a,b)=>{
|
||||
var a_num = a["height"];
|
||||
var b_num = b["height"];
|
||||
return a_num - b_num;
|
||||
})
|
||||
this.sketch[arr[0].num]?.push(this.sketchList[i])
|
||||
await new Promise((resolve:any)=>{
|
||||
nextTick().then(()=>{
|
||||
sketch1 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect()
|
||||
sketch2 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item1')[0]?.getBoundingClientRect()
|
||||
sketch3 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item2')[0]?.getBoundingClientRect()
|
||||
sketch1.num = 0
|
||||
sketch2.num = 1
|
||||
sketch3.num = 2
|
||||
resolve()
|
||||
if(this.sketchList){
|
||||
for (let i = 0; i < this.sketchList.length; i++) {
|
||||
let arr = [sketch1,sketch2,sketch3]
|
||||
arr.sort((a,b)=>{
|
||||
var a_num = a["height"];
|
||||
var b_num = b["height"];
|
||||
return a_num - b_num;
|
||||
})
|
||||
})
|
||||
this.sketch[arr[0].num]?.push(this.sketchList[i])
|
||||
await new Promise((resolve:any)=>{
|
||||
nextTick().then(()=>{
|
||||
sketch1 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect()
|
||||
sketch2 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item1')[0]?.getBoundingClientRect()
|
||||
sketch3 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item2')[0]?.getBoundingClientRect()
|
||||
sketch1.num = 0
|
||||
sketch2.num = 1
|
||||
sketch3.num = 2
|
||||
resolve()
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -551,7 +551,9 @@ export default defineComponent({
|
||||
arr = {
|
||||
id:v.generateItemId,
|
||||
imgUrl:v.generateItemUrl,
|
||||
id_:GO.id++
|
||||
id_:GO.id++,
|
||||
like:rv.generatedCollectionItems[index].isLiked
|
||||
|
||||
}
|
||||
this.generateList.push(arr)
|
||||
this.loadingShow = false
|
||||
|
||||
@@ -621,7 +621,8 @@ export default defineComponent({
|
||||
id:v.generateItemId,
|
||||
imgUrl:v.generateItemUrl,
|
||||
category:generage.level2Type?generage.level2Type:this.sketchCatecoryList[0].label,
|
||||
id_:GO.id++
|
||||
id_:GO.id++,
|
||||
like:rv.generatedCollectionItems[index].isLiked
|
||||
}
|
||||
this.generateList.push(arr)
|
||||
this.loadingShow = false
|
||||
|
||||
@@ -6,10 +6,10 @@
|
||||
width="65%"
|
||||
:maskClosable="false"
|
||||
:centered="true"
|
||||
@onCancel="clearSetLabel"
|
||||
@cancel="clearSetLabel"
|
||||
>
|
||||
<div class="setLabel_centent">
|
||||
<div @click="removeLabel(options)">删除</div>
|
||||
<div class="started_btn" @click="removeLabel(options)">删除</div>
|
||||
<ul class="optionsItem">
|
||||
<li class="optionsItem_title" v-for="optionsItem,optionsIndex in options" :key="optionsItem.id">
|
||||
<div class="setLabel_text">
|
||||
@@ -28,17 +28,17 @@
|
||||
<i v-show="childrenItem.openType" @click.stop="putName(index,'affirm',childrenItem)" class="fi fi-br-check"></i>
|
||||
<i v-show="!childrenItem.openType" @click.stop="putName(childrenIndex,'put',childrenItem)" class="fi fi-rr-edit"></i>
|
||||
</li>
|
||||
<li @click="newLabel(optionsItem,optionsItem.id)" class="newLabel setLabel_text">
|
||||
<li class="newLabel setLabel_text">
|
||||
<input v-show="optionsItem.addOpenType" type="text" v-model="itemName">
|
||||
<i @click.stop="putName(-1,'affirm',optionsItem)" v-show="optionsItem.addOpenType" class="fi fi-br-check"></i>
|
||||
<div v-show="!optionsItem.addOpenType">+</div>
|
||||
<div v-show="!optionsItem.addOpenType" @click="newLabel(optionsItem,optionsItem.id)">+</div>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li @click="newLabel('')" class="newLabel setLabel_text optionsItem_title">
|
||||
<li class="newLabel setLabel_text optionsItem_title">
|
||||
<input v-show="openType" type="text" v-model="itemName">
|
||||
<i @click.stop="putName(-1,'affirm','')" v-show="openType" class="fi fi-br-check"></i>
|
||||
<div v-show="!openType">+</div>
|
||||
<div v-show="!openType" @click="newLabel('')">+</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
@@ -94,25 +94,21 @@ export default defineComponent({
|
||||
directives:{
|
||||
mousewheel:{
|
||||
mounted (el) {
|
||||
let bodyDom:any = document.getElementsByClassName('optionsItem')[0]
|
||||
let bodyDom:any = document.getElementsByClassName('setLabel_centent')[0]
|
||||
nextTick().then(()=>{
|
||||
let dom:any = document.getElementsByClassName('childrenItem')
|
||||
let domParent:any = document.getElementsByClassName('optionsItem_title')
|
||||
let mouseover = ()=>{
|
||||
let domParent:any = document.getElementsByClassName('childrenItem')
|
||||
let mouseover = (event:any)=>{
|
||||
event.stopPropagation()
|
||||
bodyDom.classList.add('active')
|
||||
}
|
||||
let mouseleave = ()=>{
|
||||
let mouseleave = (event:any)=>{
|
||||
event.stopPropagation()
|
||||
bodyDom.classList.remove('active')
|
||||
}
|
||||
// domParent?.forEach((item:any) => {
|
||||
// item.addEventListener('mouseover',mouseover)
|
||||
// item.addEventListener('mouseleave',mouseleave)
|
||||
// });
|
||||
for (let index = 0; index < domParent.length; index++) {
|
||||
domParent[index].addEventListener('mouseover',mouseover)
|
||||
domParent[index].addEventListener('mouseover',mouseleave)
|
||||
domParent[index].addEventListener('mouseover',mouseover,false)
|
||||
domParent[index].addEventListener('mouseleave',mouseleave,false)
|
||||
}
|
||||
|
||||
el.addEventListener('wheel',(e:WheelEvent)=>{
|
||||
let num = 0
|
||||
if(e.deltaY > 0){
|
||||
@@ -139,8 +135,9 @@ export default defineComponent({
|
||||
this.options = data
|
||||
},
|
||||
clearSetLabel(){
|
||||
this.setLabelShow = false
|
||||
this.clearOpenType()
|
||||
let parent:any = this.$parent
|
||||
parent.getClass()
|
||||
},
|
||||
onCheckAllChange(value:any){
|
||||
if(value?.childList){
|
||||
@@ -219,28 +216,26 @@ export default defineComponent({
|
||||
}
|
||||
},
|
||||
removeLabel(val:any){
|
||||
let data:any = []
|
||||
let data = {
|
||||
"classificationIdList": [],
|
||||
"deleteConfirm": 0,
|
||||
}
|
||||
let classificationIdList:any = []
|
||||
this.clearOpenType()
|
||||
val.forEach((optionsItem:any) => {
|
||||
if(optionsItem.checkAll){
|
||||
data.push(optionsItem)
|
||||
classificationIdList.push(optionsItem.id)
|
||||
}else{
|
||||
if(optionsItem.childList){
|
||||
let boor = false
|
||||
let dataChild:any = []
|
||||
optionsItem.childList.forEach((childrenItem:any) => {
|
||||
if(childrenItem.checkAll){
|
||||
boor = true
|
||||
dataChild.push(childrenItem)
|
||||
classificationIdList.push(childrenItem.id)
|
||||
}
|
||||
});
|
||||
if(boor){
|
||||
optionsItem.childList = dataChild
|
||||
data.push(optionsItem)
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
data.classificationIdList = classificationIdList
|
||||
this.deleteClass(data)
|
||||
},
|
||||
addLabel(val:any){
|
||||
@@ -255,7 +250,6 @@ export default defineComponent({
|
||||
|
||||
Https.axiosPost(Https.httpUrls.saveOrUpdate, data).then(
|
||||
(rv: any) => {
|
||||
console.log(rv);
|
||||
this.getClass()
|
||||
}
|
||||
).catch((res)=>{
|
||||
@@ -264,7 +258,7 @@ export default defineComponent({
|
||||
deleteClass(data:any){
|
||||
Https.axiosPost(Https.httpUrls.classificationDelete, data).then(
|
||||
(rv: any) => {
|
||||
console.log(rv);
|
||||
this.getClass()
|
||||
}
|
||||
).catch((res)=>{
|
||||
});
|
||||
@@ -273,8 +267,6 @@ export default defineComponent({
|
||||
let data = this.setLabelData()
|
||||
Https.axiosPost(Https.httpUrls.queryClassification, data).then(
|
||||
(rv: any) => {
|
||||
console.log(rv);
|
||||
|
||||
this.options = rv
|
||||
}
|
||||
).catch((res)=>{
|
||||
@@ -307,6 +299,17 @@ export default defineComponent({
|
||||
max-height: 65rem;
|
||||
overflow-y: auto;
|
||||
// border-radius: ;
|
||||
&.active{
|
||||
overflow: hidden;
|
||||
}
|
||||
.started_btn{
|
||||
position: absolute;
|
||||
width: auto;
|
||||
position: sticky;
|
||||
top: 0;
|
||||
z-index: 999;
|
||||
margin-right: auto;
|
||||
}
|
||||
ul{
|
||||
display: flex;
|
||||
li{
|
||||
@@ -328,21 +331,27 @@ export default defineComponent({
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
margin: 0 2rem;
|
||||
width: 12rem;
|
||||
padding: .5rem 1rem;
|
||||
width: 16rem;
|
||||
margin: 1rem 1rem;
|
||||
border-radius: 1rem;
|
||||
justify-content: space-between;
|
||||
flex-shrink: 0;
|
||||
i{
|
||||
display: flex;
|
||||
}
|
||||
}
|
||||
.setLabel_text:hover{
|
||||
background: #efefef;
|
||||
}
|
||||
}
|
||||
.optionsItem{
|
||||
flex-direction: column;
|
||||
&.active{
|
||||
overflow: hidden;
|
||||
}
|
||||
>li{
|
||||
|
||||
.optionsItem_title{
|
||||
margin-bottom: 1rem;
|
||||
border-radius: 1rem;
|
||||
// border-bottom: 2px solid rgba(0,0,0,.2);
|
||||
>label{
|
||||
align-items: center;
|
||||
}
|
||||
@@ -350,8 +359,7 @@ export default defineComponent({
|
||||
max-width: 100%;
|
||||
overflow: hidden;
|
||||
overflow-x: auto;
|
||||
height: 7rem;
|
||||
margin: 2rem 0;
|
||||
padding-bottom: 2rem;
|
||||
&.active::-webkit-scrollbar-button:single-button{
|
||||
display: none;
|
||||
}
|
||||
@@ -388,8 +396,10 @@ export default defineComponent({
|
||||
.newLabel{
|
||||
text-align: center;
|
||||
justify-content: center;
|
||||
cursor: pointer;
|
||||
|
||||
&.optionsItem_title{
|
||||
width: 100%;
|
||||
margin: 0;
|
||||
}
|
||||
div{
|
||||
border-radius: 50%;
|
||||
border: 1px solid #000;
|
||||
@@ -398,6 +408,7 @@ export default defineComponent({
|
||||
height: 2rem;
|
||||
line-height: 2rem;
|
||||
text-align: center;
|
||||
cursor: pointer;
|
||||
}
|
||||
i{
|
||||
cursor: pointer;
|
||||
|
||||
@@ -37,11 +37,11 @@ const messages = {
|
||||
...enLocale,
|
||||
...elementEnLocale
|
||||
},
|
||||
'cn':{
|
||||
'zh':{
|
||||
...zhLocale,
|
||||
...elementZhLocale
|
||||
},
|
||||
'kr':{
|
||||
'ko':{
|
||||
...krLocale,
|
||||
...elementKrLocale
|
||||
},
|
||||
@@ -61,7 +61,7 @@ const messages = {
|
||||
...thLocale,
|
||||
...elementThLocale
|
||||
},
|
||||
'vn':{
|
||||
'vi':{
|
||||
...vnLocale,
|
||||
...elementVnLocale
|
||||
},
|
||||
|
||||
@@ -81,6 +81,9 @@ export const Https = {
|
||||
interfaceUrl: '',
|
||||
accountIsLogin:'/api/account/isLogin', //判断用户是否登录
|
||||
accountLogin:`/api/account/login`, //账号密码登录接口
|
||||
getUserLanguage:`/api/account/getUserLanguage`, //账号密码登录接口
|
||||
changeUserLanguage:`/api/account/changeUserLanguage`, //账号密码登录接口
|
||||
|
||||
preLogin:'/api/account/preLogin',//预先登入
|
||||
accountSendEmail:`/api/account/sendEmail`, //发送邮件
|
||||
accountResetPwd:'/api/account/resetPwd', //忘记密码修改
|
||||
|
||||
@@ -234,6 +234,7 @@ import { isEmail } from "@/tool/util";
|
||||
import { setCookie } from "@/tool/cookie";
|
||||
import { message } from "ant-design-vue";
|
||||
import VerificationCodeInput from "@/component/LoginPage/verificationCodeInput.vue";
|
||||
import { useI18n } from "vue-i18n";
|
||||
|
||||
const md5 = require("md5");
|
||||
export default defineComponent({
|
||||
@@ -242,9 +243,11 @@ export default defineComponent({
|
||||
},
|
||||
setup(){
|
||||
let timer:any = 0;
|
||||
const {locale} = useI18n()
|
||||
|
||||
return{
|
||||
timer
|
||||
timer,
|
||||
locale
|
||||
}
|
||||
},
|
||||
|
||||
@@ -495,9 +498,20 @@ export default defineComponent({
|
||||
|
||||
//跳转到首页
|
||||
turnToHomePage() {
|
||||
this.getLang()
|
||||
this.$router.push("/home");
|
||||
},
|
||||
|
||||
//获取当前语言
|
||||
getLang(){
|
||||
let data = {}
|
||||
Https.axiosPost(Https.httpUrls.getUserLanguage, data).then(
|
||||
(rv: any) => {
|
||||
if (rv) {
|
||||
this.locale = rv
|
||||
}
|
||||
}
|
||||
);
|
||||
},
|
||||
turnToWindow(url: any) {
|
||||
window.open(url);
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user