aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

部分页面调整

Browse Source
This commit is contained in:
X1627315083
2024-06-17 11:32:31 +08:00
parent 363b880276
commit 9b8134989d
19 changed files with 192 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env.dev
View File

@@ -7,6 +7,6 @@ VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
# VUE_APP_BASE_URL = 'http://192.168.1.9:17088' # VUE_APP_BASE_URL = 'http://192.168.1.9:17088'
# VUE_APP_BASE_URL = 'http://192.168.1.9:5567' # VUE_APP_BASE_URL = 'http://192.168.1.9:5567'
# 佩佩 # 佩佩
VUE_APP_BASE_URL = 'http://192.168.1.7:5567' # VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
# 海波 # 海波
VUE_APP_BASE_URL = 'http://192.168.1.9:5567' # VUE_APP_BASE_URL = 'http://192.168.1.9:5567'

2
src/component/Administrator/allUser.vue
View File

@@ -109,8 +109,6 @@ export default defineComponent({
renameData, renameData,
userInfo, userInfo,
handleResizeColumn: (w:any, col:any) => { handleResizeColumn: (w:any, col:any) => {
console.log(col,w);
col.width = w; col.width = w;
}, },
}; };

21
src/component/Detail/DesignDetail.vue
View File

@@ -94,11 +94,11 @@
<i class="fi fi-rr-edit" @click.stop="openCurrent(2)"></i> <i class="fi fi-rr-edit" @click.stop="openCurrent(2)"></i>
</div> </div>
<div class="Guide_1_20 clothes_item_icon" :class="[driver__.driver?'showEvents':'']"> <div class="Guide_1_20 clothes_item_icon" :class="[driver__.driver?'showEvents':'']">
<div class="centent_div centent_print" v-if="current?.printObject?.prints?.[0]?.path && current?.printObject?.prints.length > 1" @click="openCurrent(2)"> <div class="centent_div centent_print" v-if="exhibitionList.print && exhibitionList.print.length > 1" @click="openCurrent(2)">
<img v-for="item in current?.printObject?.prints" :key="item.id" :src="item.path" alt=""> <img v-for="item in exhibitionList.print" :key="item.id" :src="item.path" alt="">
</div> </div>
<div v-else-if="current?.printObject?.prints?.[0]?.path && current?.printObject?.prints.length == 1" class="centent_div"> <div v-else-if="exhibitionList.print && exhibitionList.print.length == 1" class="centent_div">
<img :src="current?.printObject?.prints[0]?.path" alt=""> <img :src="exhibitionList.print[0]?.path" alt="">
</div> </div>
<i v-else class="fi fi-rr-picture centent" @click="openCurrent(2)"></i> <i v-else class="fi fi-rr-picture centent" @click="openCurrent(2)"></i>
</div> </div>
@@ -130,7 +130,13 @@
<!-- <div class="centent_div" v-if="current?.printObject?.prints?.[0]?.path" @click="openCurrent(2)"> <!-- <div class="centent_div" v-if="current?.printObject?.prints?.[0]?.path" @click="openCurrent(2)">
<img :src="current?.printObject?.prints[0]?.path" alt=""> <img :src="current?.printObject?.prints[0]?.path" alt="">
</div> --> </div> -->
<i class="fi fi-rr-picture centent" @click="openCurrent(4)"></i> <div class="centent_div centent_print" v-if="exhibitionList.elements && exhibitionList.elements.length > 1" @click="openCurrent(4)">
<img v-for="item in exhibitionList.elements" :key="item.id" :src="item.path" alt="">
</div>
<div v-else-if="exhibitionList.elements && exhibitionList.elements.length == 1" class="centent_div">
<img :src="exhibitionList.elements[0]?.path" alt="">
</div>
<i v-else class="fi fi-rr-picture centent" @click="openCurrent(4)"></i>
</div> </div>
</div> </div>
</div> </div>
@@ -230,7 +236,7 @@ export default defineComponent({
provide('body',body) provide('body',body)
let moible:any = isMoible() let moible:any = isMoible()
provide('moible',moible) provide('moible',moible)
let exhibitionList = ref({ let exhibitionList:any = ref({
print:[], print:[],
elements:[], elements:[],
}) })
@@ -1458,6 +1464,9 @@ export default defineComponent({
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
align-content: space-between; align-content: space-between;
max-height: 10rem;
overflow-y: auto;
&.centent_print::-webkit-scrollbar{display: none;}
img{ img{
width: 30%; width: 30%;
height: 30%; height: 30%;

26
src/component/Detail/DesignDetailAlter.vue
View File

@@ -510,7 +510,7 @@ export default defineComponent({
// console.log(JSON.parse(JSON.stringify(this.colorList)),JSON.parse(JSON.stringify(newVal))); // console.log(JSON.parse(JSON.stringify(this.colorList)),JSON.parse(JSON.stringify(newVal)));
clearInterval(this.getPantongNameTime) clearInterval(this.getPantongNameTime)
this.getPantongNameTime = setTimeout(() => { this.getPantongNameTime = setTimeout(() => {
this.getPantongName(newVal.rgba) this.getPantongName(newVal.rgba,-1)
}, 100); }, 100);
}, },
immediate: true immediate: true
@@ -1021,7 +1021,7 @@ export default defineComponent({
}, },
//查询颜色的潘通值和txc //查询颜色的潘通值和txc
getPantongName(v) { getPantongName(v,index) {
if(v?.r == undefined){ if(v?.r == undefined){
return return
} }
@@ -1036,8 +1036,13 @@ export default defineComponent({
Https.axiosPost(Https.httpUrls.getRgbByHsvBatch, data) Https.axiosPost(Https.httpUrls.getRgbByHsvBatch, data)
.then((rv) => { .then((rv) => {
if (rv) { if (rv) {
this.colorList[this.selectIndex].tcx = rv[0].tcx if(index == -1){
this.colorList[this.selectIndex].name = rv[0].name this.colorList[this.selectIndex].tcx = rv[0].tcx
this.colorList[this.selectIndex].name = rv[0].name
}else{
this.colorList[index].tcx = rv[0].tcx
this.colorList[index].name = rv[0].name
}
resolve(); resolve();
} }
}) })
@@ -1114,7 +1119,18 @@ export default defineComponent({
}); });
this.selectColorList = selectColorList this.selectColorList = selectColorList
// this.getHsvColor(selectColorList) // this.getHsvColor(selectColorList)
this.selectColor = {rgba:{r:color[0],g:color[1],b:color[2],a:1},hex:colorHex} // this.selectColor = {rgba:{r:color[0],g:color[1],b:color[2],a:1},hex:colorHex}
let colorListIndex = []
this.colorList.forEach((item,index)=>{
if(!item.rgba){
colorListIndex.push(index)
}
})
for (let index = 0; index < selectColorList.length; index++) {
this.colorList[colorListIndex[0]] = selectColorList[index]
this.getPantongName(selectColorList[index].rgba,colorListIndex[0])
colorListIndex.splice(0,1)
}
img.remove() img.remove()
}; };

14
src/component/HomePage/ColorboardUpload.vue
View File

@@ -369,7 +369,7 @@ export default defineComponent({
driverObj__.moveNext() driverObj__.moveNext()
} }
if(color?.rgba?.r){ if(color?.rgba?.r){
this.selectColor.rgba = {r:color.r,g:color.g,b:color.b,a:color.a? color.a: 1} this.selectColor = color
this.selectColor.hex = hex this.selectColor.hex = hex
} }
}, },
@@ -481,6 +481,18 @@ export default defineComponent({
this.selectColorList = selectColorList this.selectColorList = selectColorList
this.getHsvColor(selectColorList) this.getHsvColor(selectColorList)
this.selectColor = {rgba:{r:color[0],g:color[1],b:color[2],a:1},hex:colorHex} this.selectColor = {rgba:{r:color[0],g:color[1],b:color[2],a:1},hex:colorHex}
// console.log(this.colorList);
// console.log(selectColorList);
let colorListIndex = []
this.colorList.forEach((item,index)=>{
if(!item.rgba){
colorListIndex.push(index)
}
})
for (let index = 0; index < selectColorList.length; index++) {
this.colorList[colorListIndex[0]] = selectColorList[index]
colorListIndex.splice(0,1)
}
nextTick().then(()=>{ nextTick().then(()=>{
if(this.driver__.driver){ if(this.driver__.driver){
driverObj__.moveNext() driverObj__.moveNext()

1
src/component/HomePage/ExportModel.vue
View File

@@ -642,7 +642,6 @@ export default defineComponent({
let url = data.imgUrl.split('?')[0] let url = data.imgUrl.split('?')[0]
var match = url.match(/:(\d+)\/(.*)/); var match = url.match(/:(\d+)\/(.*)/);
minioUrl = match[2] minioUrl = match[2]
console.log(match[2]);
// data.imgUrl // data.imgUrl
}else{ }else{
minioUrl = data.minIOPath?data.minIOPath:data.resData.minIOPath minioUrl = data.minIOPath?data.minIOPath:data.resData.minIOPath

6
src/component/HomePage/Generate.vue
View File

@@ -39,9 +39,13 @@
</div> </div>
</div> </div>
</div> </div>
<a-popover title="Seed"> <a-popover>
<template #content>
<p>Seed</p>
</template>
<input class="search_seed" v-show="scene?.value == 'Logo'" @input="ifSeedValue" v-model="searchPictureSeed" type="Number" placeholder='Seed' min="0"> <input class="search_seed" v-show="scene?.value == 'Logo'" @input="ifSeedValue" v-model="searchPictureSeed" type="Number" placeholder='Seed' min="0">
</a-popover> </a-popover>
<input <input
class="search_input" class="search_input"
@input="ifMaximumLength" @input="ifMaximumLength"

2
src/component/HomePage/Material.vue
View File

@@ -292,8 +292,6 @@ export default defineComponent({
category:imgData.category, category:imgData.category,
designType:'library' designType:'library'
} }
console.log(obj);
// parent.useGenerate.designType = 'collection' // parent.useGenerate.designType = 'collection'
this.$emit('setLibrary',obj) this.$emit('setLibrary',obj)
}else{ }else{

1
src/component/HomePage/productImg.vue
View File

@@ -412,7 +412,6 @@ export default defineComponent({
if(generateProceedList){ if(generateProceedList){
// let str = generateProceedList.map((obj:any) => obj.taskId).join(','); // let str = generateProceedList.map((obj:any) => obj.taskId).join(',');
let str = generateProceedList.join(',') let str = generateProceedList.join(',')
console.log(str,generateProceedList);
let data = {uniqueId:str,userId:JSON.parse(userInfo).userId,timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone} let data = {uniqueId:str,userId:JSON.parse(userInfo).userId,timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone}
Https.axiosGet(Https.httpUrls.generateStopWaiting, {params:data}).then( Https.axiosGet(Https.httpUrls.generateStopWaiting, {params:data}).then(
(rv) => { (rv) => {

44
src/component/WorksPage/newScaleImage.vue
View File

@@ -53,7 +53,7 @@
<img v-for="item in scaleImageData?.designPythonOutfitList" v-lazy="item.designUrl"> <img v-for="item in scaleImageData?.designPythonOutfitList" v-lazy="item.designUrl">
</div> </div>
</div> </div>
<div class="started_btn" @click="setChoose" :title="scaleImageData.openSource == 0?'发布者不允许二次创作~':''" :class="{active:scaleImageData.openSource == 0}">二创</div> <div class="started_btn" @click="setChoose" :title="systemUser.value != 1?'请先登录或者升级为正式用户': scaleImageData.openSource == 0?'作者不允许二次创作':''" :class="{active:systemUser.value != 1?true:scaleImageData.openSource == 0}">二创</div>
</div> </div>
<div v-else class="newScaleImage_right_content_generate"> <div v-else class="newScaleImage_right_content_generate">
<div class="scaleImage_chunk_item content_left_generate_item"> <div class="scaleImage_chunk_item content_left_generate_item">
@@ -78,13 +78,13 @@
<div class="newScaleImage_right_detail"> <div class="newScaleImage_right_detail">
<div class="scaleImage_chunk_item"> <div class="scaleImage_chunk_item">
<div class="detail_right_user detail_left_right_item"> <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"> --> <img v-lazy="scaleImageData?.imgUrl">
</div> </div> -->
<div class="detail_right_user_content"> <div class="detail_right_user_content">
<div class="scaleImage_chunk_title">名字</div> <div class="scaleImage_chunk_title">名字</div>
<div class="scaleImage_chunk_title_intro">个性签名</div> <!-- <div class="scaleImage_chunk_title_intro">个性签名</div>
<div class="scaleImage_chunk_btn">关注</div> <div class="scaleImage_chunk_btn">关注</div> -->
</div> </div>
</div> </div>
<div class="detail_right_work_detail detail_left_right_item"> <div class="detail_right_work_detail detail_left_right_item">
@@ -113,20 +113,16 @@
<i v-else class="fi fi-rr-social-network"></i> <i v-else class="fi fi-rr-social-network"></i>
<span>{{scaleImageData.likeNum}}</span> <span>{{scaleImageData.likeNum}}</span>
</div> </div>
<div> <!-- <div>
<!-- <svg xmlns="http://www.w3.org/2000/svg" width="2.5rem" height="2.5rem" viewBox="0 0 16 16" fill="none" role="img" style="color: #9e9ea7;fill: currentColor;">
<path d="M8 3C4.36992 3 1.98789 6.21774 1.18763 7.49059C1.09079 7.64462 1.04237 7.72163 1.01527 7.84042C0.99491 7.92964 0.99491 8.07036 1.01527 8.15958C1.04237 8.27837 1.09079 8.35539 1.18763 8.50941C1.98789 9.78226 4.36992 13 8 13C11.6301 13 14.0121 9.78226 14.8124 8.50941L14.8124 8.50939C14.9092 8.35538 14.9576 8.27837 14.9847 8.15958C15.0051 8.07036 15.0051 7.92964 14.9847 7.84042C14.9576 7.72163 14.9092 7.64462 14.8124 7.4906L14.8124 7.49059C14.0121 6.21774 11.6301 3 8 3Z" fill="currentColor"></path>
<path d="M8 10C9.10457 10 10 9.10457 10 8C10 6.89543 9.10457 6 8 6C6.89543 6 6 6.89543 6 8C6 9.10457 6.89543 10 8 10Z" fill="white"></path>
</svg> -->
<i class="fi fi-sr-eye"></i> <i class="fi fi-sr-eye"></i>
<span>{{scaleImageData.likeNum}}</span> <span>{{scaleImageData.likeNum}}</span>
</div> </div> -->
<div> <div>
<i class="fi fi-rr-comment-alt-dots"></i> <i class="fi fi-rr-comment-alt-dots"></i>
<span>{{scaleImageData.likeNum}}</span> <span>{{commentList.length}}</span>
</div> </div>
</div> </div>
<div class="detail_right_auther detail_left_right_item"> <!-- <div class="detail_right_auther detail_left_right_item">
<div class="scaleImage_chunk_title">Auther Other Products</div> <div class="scaleImage_chunk_title">Auther Other Products</div>
<div class="detail_right_auther_img"> <div class="detail_right_auther_img">
<div class="detail_right_auther_img_item"> <div class="detail_right_auther_img_item">
@@ -145,7 +141,7 @@
<span>more +</span> <span>more +</span>
</div> </div>
</div> </div>
</div> </div> -->
</div> </div>
</div> </div>
<div class="newScaleImage_right_comment scaleImage_chunk_item"> <div class="newScaleImage_right_comment scaleImage_chunk_item">
@@ -219,12 +215,15 @@ import { defineComponent,watch,getCurrentInstance, h, ref ,toRefs,computed,react
import { Https } from "@/tool/https"; import { Https } from "@/tool/https";
// import { getCookie } from "@/tool/cookie"; // import { getCookie } from "@/tool/cookie";
// import domTurnImg from '@/tool/domTurnImg' // import domTurnImg from '@/tool/domTurnImg'
import { useStore } from "vuex";
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { downloadIamge,setPubDate } from "@/tool/util"; import { downloadIamge,setPubDate } from "@/tool/util";
import { message } from "ant-design-vue";
export default defineComponent({ export default defineComponent({
setup() { setup() {
//首先在setup中定义 //首先在setup中定义
const store = useStore();
const router = useRouter() const router = useRouter()
let scaleImage: any = ref(false);//弹窗 let scaleImage: any = ref(false);//弹窗
let scaleImageMask:any = ref(false)//弹窗遮罩 let scaleImageMask:any = ref(false)//弹窗遮罩
@@ -249,6 +248,9 @@ export default defineComponent({
commentInput:'',//评论框提示词 commentInput:'',//评论框提示词
commentList:[], commentList:[],
}) })
let systemUser = computed(()=>{
return store.state.UserHabit.systemUser
})
let commentInputFocus:any = ref() let commentInputFocus:any = ref()
let textarea: any = ref(null) let textarea: any = ref(null)
let setCopy = ()=>{ let setCopy = ()=>{
@@ -311,7 +313,12 @@ export default defineComponent({
} }
let setChoose = () =>{ let setChoose = () =>{
if(imgData.scaleImageData.openSource == 0)return if(systemUser.value != 1){
return message.info('请先登录或者升级为正式用户')
}
if(imgData.scaleImageData.openSource == 0){
return message.info('作者不允许二次创作哦')
}
router.push({name:'homePage',params: {id:imgData.scaleImageData.userLikeGroupSourceId,type:'Works'}}) router.push({name:'homePage',params: {id:imgData.scaleImageData.userLikeGroupSourceId,type:'Works'}})
} }
let setCommentReply = (value:any,str:any)=>{ let setCommentReply = (value:any,str:any)=>{
@@ -396,6 +403,7 @@ export default defineComponent({
scaleImage, scaleImage,
scaleImageMask, scaleImageMask,
...toRefs(imgData), ...toRefs(imgData),
systemUser,
commentInputFocus, commentInputFocus,
textarea, textarea,
setCopy, setCopy,
@@ -528,7 +536,7 @@ export default defineComponent({
height: 100%; height: 100%;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
overflow-y: auto; // overflow-y: auto;
.newScaleImage_content_right_img{ .newScaleImage_content_right_img{
height: 100%; height: 100%;
@@ -861,6 +869,7 @@ export default defineComponent({
.detail_right_user_head{ .detail_right_user_head{
border-radius: 50%; border-radius: 50%;
overflow: hidden; overflow: hidden;
margin-right: var(--margin);
img{ img{
width: 10rem; width: 10rem;
height: 10rem; height: 10rem;
@@ -876,7 +885,6 @@ export default defineComponent({
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: flex-start; align-items: flex-start;
margin-left: var(--margin);
.detail_right_user_content_intro,.detail_right_user_content_btn{ .detail_right_user_content_intro,.detail_right_user_content_btn{
font-size: 1.6rem; font-size: 1.6rem;

1
src/component/WorksPage/publish.vue
View File

@@ -218,7 +218,6 @@ export default defineComponent({
publishData.isShowMark = true publishData.isShowMark = true
Https.axiosPost(Https.httpUrls.publish, param,config) Https.axiosPost(Https.httpUrls.publish, param,config)
.then((rv) => { .then((rv) => {
console.log(rv);
cleardata() cleardata()
publishData.isShowMark = false publishData.isShowMark = false
message.success('Release success! You can find it in my work') message.success('Release success! You can find it in my work')

2
src/router/index.ts
View File

@@ -187,8 +187,6 @@ router.beforeEach((to, from, next) => {
return false return false
} }
}); });
console.log(systemUser);
if(systemUser.value == 0){ if(systemUser.value == 0){
if(isSystemUserRouteList.indexOf(to.path) > -1){ if(isSystemUserRouteList.indexOf(to.path) > -1){
next(); next();

2
src/store/uploadFile/uploadFile.ts
View File

@@ -182,8 +182,6 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
}, },
setPrintboardMaterialFiles(state,files){ setPrintboardMaterialFiles(state,files){
state.printMaterialFiles = files state.printMaterialFiles = files
console.log(files);
state.printboard = [...state.printboardFiles,...state.printGenerateFiles,...state.printMaterialFiles] state.printboard = [...state.printboardFiles,...state.printGenerateFiles,...state.printMaterialFiles]
}, },

112
src/store/userHabit/userHabit.ts
View File

@@ -70,6 +70,9 @@ const userHabit : Module<UserHabit,RootState> = {
setSystemUser(state,data){ setSystemUser(state,data){
state.systemUser.value = data state.systemUser.value = data
}, },
clearSystemUser(state){
state.systemUser.value = -1
},
}, },
actions:{ actions:{
@@ -101,47 +104,74 @@ const userHabit : Module<UserHabit,RootState> = {
}) })
}, },
getLangType(context){ getLangType(context){
Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'DesignElementsEnum'}}).then((rv: any) => { let allPromise = [];
if (rv) { let getList = ['DesignElementsEnum','PrintboardLevel2TypeEnum','FemalePosition','MalePosition']
rv.forEach((item:any) => { let axiosGet = (item:any)=>{
let name = item.name return new Promise((resolve) => {
item.name = item.value Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:item}}).then((rv: any) => {
item.value = name if (rv) {
}); rv.forEach((item:any) => {
context.commit('setDesignElementsType',rv) let name = item.name
} item.name = item.value
}) item.value = name
Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'PrintboardLevel2TypeEnum'}}).then((rv: any) => { });
if (rv) { if(item == 'DesignElementsEnum'){
rv.forEach((item:any) => { context.commit('setDesignElementsType',rv)
let name = item.name }else if(item == 'PrintboardLevel2TypeEnum'){
item.name = item.value context.commit('setPrintType',rv)
item.value = name }else if(item == 'FemalePosition'){
}); context.commit('setFemalePosition',rv)
context.commit('setPrintType',rv) }else if(item == 'MalePosition'){
} context.commit('setMalePosition',rv)
}) context.commit('setPosition','MalePosition')
Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'FemalePosition'}}).then((rv: any) => { }
if (rv) { resolve('')
rv.forEach((item:any) => { }
let name = item.name })
item.name = item.value })
item.value = name }
}); return Promise.all(getList.map(item => axiosGet(item)))
context.commit('setFemalePosition',rv) // Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'DesignElementsEnum'}}).then((rv: any) => {
} // if (rv) {
}) // rv.forEach((item:any) => {
Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'MalePosition'}}).then((rv: any) => { // let name = item.name
if (rv) { // item.name = item.value
rv.forEach((item:any) => { // item.value = name
let name = item.name // });
item.name = item.value // context.commit('setDesignElementsType',rv)
item.value = name // }
}); // })
context.commit('setMalePosition',rv) // Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'PrintboardLevel2TypeEnum'}}).then((rv: any) => {
context.commit('setPosition','MalePosition') // if (rv) {
} // rv.forEach((item:any) => {
}) // let name = item.name
// item.name = item.value
// item.value = name
// });
// context.commit('setPrintType',rv)
// }
// })
// Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'FemalePosition'}}).then((rv: any) => {
// if (rv) {
// rv.forEach((item:any) => {
// let name = item.name
// item.name = item.value
// item.value = name
// });
// context.commit('setFemalePosition',rv)
// }
// })
// Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'MalePosition'}}).then((rv: any) => {
// if (rv) {
// rv.forEach((item:any) => {
// let name = item.name
// item.name = item.value
// item.value = name
// });
// context.commit('setMalePosition',rv)
// context.commit('setPosition','MalePosition')
// }
// })
} }
} }
} }

10
src/views/HomeMain.vue
View File

@@ -102,7 +102,7 @@
</keep-alive> </keep-alive>
<component :key="$route.name" :is="Component" v-if="!$route.meta.keepAlive"/> <component :key="$route.name" :is="Component" v-if="!$route.meta.keepAlive"/>
</router-view> --> </router-view> -->
<router-view @setTask = "setTask"></router-view> <router-view @setTask = "setTask" :getLangIsShowMark="getLangIsShowMark"></router-view>
</div> </div>
<RobotAssist></RobotAssist> <RobotAssist></RobotAssist>
</div> </div>
@@ -143,6 +143,7 @@ export default defineComponent({
return store.state.UserHabit.credits.value return store.state.UserHabit.credits.value
}) })
let activeCredits = ref(false) let activeCredits = ref(false)
let getLangIsShowMark = ref(true)
let AdministratorUserIdList = [88,6,46,31,73,83,87] let AdministratorUserIdList = [88,6,46,31,73,83,87]
return { return {
store, store,
@@ -152,6 +153,7 @@ export default defineComponent({
isMurmur, isMurmur,
credits, credits,
activeCredits, activeCredits,
getLangIsShowMark,
AdministratorUserIdList, AdministratorUserIdList,
} }
}, },
@@ -209,7 +211,9 @@ export default defineComponent({
this.getCredits() this.getCredits()
this.getLang('') this.getLang('')
//语言适配 //语言适配
this.store.dispatch('getLangType') this.store.dispatch('getLangType').then(()=>{
this.getLangIsShowMark = false
})
}, },
methods: { methods: {
setTask(data){ setTask(data){
@@ -298,6 +302,8 @@ export default defineComponent({
}); });
this.$router.replace("/"); this.$router.replace("/");
} }
this.store.commit('clearSystemUser')
// WriteCookie("token"); // WriteCookie("token");
// window.location.reload() // window.location.reload()

22
src/views/HomeRecommend.vue
View File

@@ -10,11 +10,14 @@
/> />
</div> </div>
</div> </div>
<div class="homeRecommend_right"> <div class="homeRecommend_right" v-if="systemUser.value == 0">
<a class="started_btn" href="https://code-create.com.hk/aida/" target="_blank">升级成为正式用户</a>
<div class="started_btn started_btn2" @click="logout">退出登录</div>
</div>
<div class="homeRecommend_right" v-else-if="systemUser.value == -1">
<div class="started_btn" @click="setLogin">登录</div> <div class="started_btn" @click="setLogin">登录</div>
<div class="started_btn started_btn2" @click="setRegister">注册</div> <div class="started_btn started_btn2" @click="setRegister">注册</div>
</div> </div>
</header> </header>
<div class="homeRecommend_content_body"> <div class="homeRecommend_content_body">
<div class="homeRecommend_content_body_recommend" id="aaaa"> <div class="homeRecommend_content_body_recommend" id="aaaa">
@@ -91,11 +94,24 @@ export default defineComponent({
behavior: 'smooth' // 平滑滚动到顶部 behavior: 'smooth' // 平滑滚动到顶部
}); });
} }
let logout = ()=>{
let userInfo = JSON.parse(getCookie("userInfo"));
let data = {
userId: userInfo.userId,
};
let isTest = getCookie('isTest')
// console.log(getCookie("token"));
Https.axiosPost(Https.httpUrls.accountLogout, data).then((rv) => {
// WriteCookie("token");
});
store.commit('clearSystemUser')
}
return { return {
systemUser, systemUser,
setLogin, setLogin,
setRegister, setRegister,
setAdminUp, setAdminUp,
logout,
} }
}, },
data() { data() {
@@ -324,7 +340,7 @@ export default defineComponent({
height: 20rem; height: 20rem;
object-fit: cover; object-fit: cover;
top: calc(10rem + var(--margin)); top: calc(10rem + var(--margin));
left: calc(0 + var(--margin)); // left: calc(0 + var(--margin));
} }
.content_body_img4{ .content_body_img4{
width: 30rem; width: 30rem;

13
src/views/HomeView/HomeView.vue
View File

@@ -199,7 +199,7 @@
<DesignDetail ref="designDetail" @finishRedesign="finishRedesign"></DesignDetail> <DesignDetail ref="designDetail" @finishRedesign="finishRedesign"></DesignDetail>
<ExportNewCoolection id="exportNewCoolection"></ExportNewCoolection> <ExportNewCoolection id="exportNewCoolection"></ExportNewCoolection>
<!-- 导出缩略图的蒙层 start--> <!-- 导出缩略图的蒙层 start-->
<div class="mark_loading" v-show="isShowMark"> <div class="mark_loading" v-show="isShowMark || getLangIsShowMark">
<a-spin size="large" /> <a-spin size="large" />
</div> </div>
<!-- 导出缩略图的蒙层 end--> <!-- 导出缩略图的蒙层 end-->
@@ -258,6 +258,11 @@ export default defineComponent({
draggable, draggable,
productImg productImg
}, },
props:{
getLangIsShowMark:{
type:Boolean,
}
},
setup(props,{emit}) { setup(props,{emit}) {
const store = useStore(); const store = useStore();
let likeDesignCollectionList: any = computed(() => { let likeDesignCollectionList: any = computed(() => {
@@ -948,8 +953,6 @@ export default defineComponent({
this.isShowMark = true; this.isShowMark = true;
Https.axiosPost(Https.httpUrls.setPorfolioChoose, data).then( Https.axiosPost(Https.httpUrls.setPorfolioChoose, data).then(
(rv: any) => { (rv: any) => {
console.log(rv);
this.dealHistoryChooseData(rv, type); this.dealHistoryChooseData(rv, type);
this.isShowMark = false; this.isShowMark = false;
} }
@@ -959,8 +962,6 @@ export default defineComponent({
}, },
//处理选择组的数据 //处理选择组的数据
dealHistoryChooseData(data: any, type: any) { dealHistoryChooseData(data: any, type: any) {
console.log(data);
let collectionData = { let collectionData = {
disposeMoodboard: data.collection.moodTemplateId?[{ disposeMoodboard: data.collection.moodTemplateId?[{
id:data.collection.moodTemplateId, id:data.collection.moodTemplateId,
@@ -987,8 +988,6 @@ export default defineComponent({
), ),
}; };
console.log(collectionData);
// console.log(data); // console.log(data);
this.store.commit("setAllBoardDataChoose", collectionData); this.store.commit("setAllBoardDataChoose", collectionData);
// this.store.commit('clearShowSketchboard') // this.store.commit('clearShowSketchboard')

2
src/views/HomeView/Works.vue
View File

@@ -257,8 +257,6 @@ export default defineComponent({
} }
let getPorfolio = ()=>{ let getPorfolio = ()=>{
let data = filter.getListDate let data = filter.getListDate
console.log(123123);
if(filter.isShowMark && !filter.isNoData)return if(filter.isShowMark && !filter.isNoData)return
filter.isShowMark = true filter.isShowMark = true
Https.axiosPost(Https.httpUrls.getPorfolio, data) Https.axiosPost(Https.httpUrls.getPorfolio, data)

13
src/views/HomeView/library.vue
View File

@@ -225,8 +225,12 @@
</div> </div>
</div> </div>
</div> </div>
<input class="search_seed" v-show="selectCode == 'Printboard' && scene?.value == 'Logo'" @input="ifSeedValue" v-model="searchPictureSeed" type="Number" placeholder='Seed' min="0"> <a-popover>
<template #content>
<p>Seed</p>
</template>
<input class="search_seed" v-show="selectCode == 'Printboard' && scene?.value == 'Logo'" @input="ifSeedValue" v-model="searchPictureSeed" type="Number" placeholder='Seed' min="0">
</a-popover>
<input <input
class="search_input " class="search_input "
@input="ifMaximumLength" @input="ifMaximumLength"
@@ -644,8 +648,6 @@ export default defineComponent({
}, },
likeFile(item:any,str:string){ likeFile(item:any,str:string){
let designType = '' let designType = ''
console.log(this.designType);
if(this.selectCode == 'Sketchboard' || this.selectCode == 'DesignElements' || this.selectCode == 'Printboard'){ if(this.selectCode == 'Sketchboard' || this.selectCode == 'DesignElements' || this.selectCode == 'Printboard'){
designType = this.designType designType = this.designType
} }
@@ -1196,10 +1198,7 @@ export default defineComponent({
base64 = this.selectGenerateList[0].imgUrl base64 = this.selectGenerateList[0].imgUrl
} }
} }
console.log(this.scene);
if(this.selectCode == "Sketchboard"){ if(this.selectCode == "Sketchboard"){
console.log(this.selectGenerateList);
}else if(this.selectCode == "Printboard"){ }else if(this.selectCode == "Printboard"){
level2Type = this.scene?.value level2Type = this.scene?.value
} }