From 9b8134989d0307578f9607990ff3b896d99361c6 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 17 Jun 2024 11:32:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 4 +- src/component/Administrator/allUser.vue | 2 - src/component/Detail/DesignDetail.vue | 21 ++-- src/component/Detail/DesignDetailAlter.vue | 26 ++++- src/component/HomePage/ColorboardUpload.vue | 14 ++- src/component/HomePage/ExportModel.vue | 1 - src/component/HomePage/Generate.vue | 6 +- src/component/HomePage/Material.vue | 2 - src/component/HomePage/productImg.vue | 1 - src/component/WorksPage/newScaleImage.vue | 44 ++++---- src/component/WorksPage/publish.vue | 1 - src/router/index.ts | 2 - src/store/uploadFile/uploadFile.ts | 2 - src/store/userHabit/userHabit.ts | 112 +++++++++++++------- src/views/HomeMain.vue | 10 +- src/views/HomeRecommend.vue | 22 +++- src/views/HomeView/HomeView.vue | 13 ++- src/views/HomeView/Works.vue | 2 - src/views/HomeView/library.vue | 13 ++- 19 files changed, 192 insertions(+), 106 deletions(-) diff --git a/.env.dev b/.env.dev index d5889047..d5d9d7c0 100644 --- a/.env.dev +++ b/.env.dev @@ -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: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' diff --git a/src/component/Administrator/allUser.vue b/src/component/Administrator/allUser.vue index 2f2ae3a6..fa8ae472 100644 --- a/src/component/Administrator/allUser.vue +++ b/src/component/Administrator/allUser.vue @@ -109,8 +109,6 @@ export default defineComponent({ renameData, userInfo, handleResizeColumn: (w:any, col:any) => { - console.log(col,w); - col.width = w; }, }; diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index bd2fa180..3468ffe4 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -94,11 +94,11 @@
-
- +
+
-
- +
+
@@ -130,7 +130,13 @@ - +
+ +
+
+ +
+
@@ -230,7 +236,7 @@ export default defineComponent({ provide('body',body) let moible:any = isMoible() provide('moible',moible) - let exhibitionList = ref({ + let exhibitionList:any = ref({ print:[], elements:[], }) @@ -1458,6 +1464,9 @@ export default defineComponent({ flex-wrap: wrap; justify-content: space-between; align-content: space-between; + max-height: 10rem; + overflow-y: auto; + &.centent_print::-webkit-scrollbar{display: none;} img{ width: 30%; height: 30%; diff --git a/src/component/Detail/DesignDetailAlter.vue b/src/component/Detail/DesignDetailAlter.vue index b66baf3f..42b98342 100644 --- a/src/component/Detail/DesignDetailAlter.vue +++ b/src/component/Detail/DesignDetailAlter.vue @@ -510,7 +510,7 @@ export default defineComponent({ // console.log(JSON.parse(JSON.stringify(this.colorList)),JSON.parse(JSON.stringify(newVal))); clearInterval(this.getPantongNameTime) this.getPantongNameTime = setTimeout(() => { - this.getPantongName(newVal.rgba) + this.getPantongName(newVal.rgba,-1) }, 100); }, immediate: true @@ -1021,7 +1021,7 @@ export default defineComponent({ }, //查询颜色的潘通值和txc - getPantongName(v) { + getPantongName(v,index) { if(v?.r == undefined){ return } @@ -1036,8 +1036,13 @@ export default defineComponent({ Https.axiosPost(Https.httpUrls.getRgbByHsvBatch, data) .then((rv) => { if (rv) { - this.colorList[this.selectIndex].tcx = rv[0].tcx - this.colorList[this.selectIndex].name = rv[0].name + if(index == -1){ + 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(); } }) @@ -1114,7 +1119,18 @@ export default defineComponent({ }); this.selectColorList = 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() }; diff --git a/src/component/HomePage/ColorboardUpload.vue b/src/component/HomePage/ColorboardUpload.vue index e0712a96..50979657 100644 --- a/src/component/HomePage/ColorboardUpload.vue +++ b/src/component/HomePage/ColorboardUpload.vue @@ -369,7 +369,7 @@ export default defineComponent({ driverObj__.moveNext() } 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 } }, @@ -481,6 +481,18 @@ export default defineComponent({ this.selectColorList = selectColorList this.getHsvColor(selectColorList) 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(()=>{ if(this.driver__.driver){ driverObj__.moveNext() diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index 3d7a0b14..298f5a47 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -642,7 +642,6 @@ export default defineComponent({ let url = data.imgUrl.split('?')[0] var match = url.match(/:(\d+)\/(.*)/); minioUrl = match[2] - console.log(match[2]); // data.imgUrl }else{ minioUrl = data.minIOPath?data.minIOPath:data.resData.minIOPath diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 8be226bb..9bfbf82e 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -39,9 +39,13 @@ - + + + obj.taskId).join(','); let str = generateProceedList.join(',') - console.log(str,generateProceedList); let data = {uniqueId:str,userId:JSON.parse(userInfo).userId,timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone} Https.axiosGet(Https.httpUrls.generateStopWaiting, {params:data}).then( (rv) => { diff --git a/src/component/WorksPage/newScaleImage.vue b/src/component/WorksPage/newScaleImage.vue index 754372df..bf1e94bf 100644 --- a/src/component/WorksPage/newScaleImage.vue +++ b/src/component/WorksPage/newScaleImage.vue @@ -53,7 +53,7 @@ -
二创
+
二创
@@ -78,13 +78,13 @@
-
- -
+
名字
-
个性签名
-
关注
+
@@ -113,20 +113,16 @@ {{scaleImageData.likeNum}}
-
- +
- {{scaleImageData.likeNum}} + {{commentList.length}}
-
+
@@ -219,12 +215,15 @@ import { defineComponent,watch,getCurrentInstance, h, ref ,toRefs,computed,react import { Https } from "@/tool/https"; // import { getCookie } from "@/tool/cookie"; // import domTurnImg from '@/tool/domTurnImg' +import { useStore } from "vuex"; import { useRouter } from 'vue-router' import { downloadIamge,setPubDate } from "@/tool/util"; +import { message } from "ant-design-vue"; export default defineComponent({ setup() { //首先在setup中定义 + const store = useStore(); const router = useRouter() let scaleImage: any = ref(false);//弹窗 let scaleImageMask:any = ref(false)//弹窗遮罩 @@ -249,6 +248,9 @@ export default defineComponent({ commentInput:'',//评论框提示词 commentList:[], }) + let systemUser = computed(()=>{ + return store.state.UserHabit.systemUser + }) let commentInputFocus:any = ref() let textarea: any = ref(null) let setCopy = ()=>{ @@ -311,7 +313,12 @@ export default defineComponent({ } 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'}}) } let setCommentReply = (value:any,str:any)=>{ @@ -396,6 +403,7 @@ export default defineComponent({ scaleImage, scaleImageMask, ...toRefs(imgData), + systemUser, commentInputFocus, textarea, setCopy, @@ -528,7 +536,7 @@ export default defineComponent({ height: 100%; position: relative; overflow: hidden; - overflow-y: auto; + // overflow-y: auto; .newScaleImage_content_right_img{ height: 100%; @@ -861,6 +869,7 @@ export default defineComponent({ .detail_right_user_head{ border-radius: 50%; overflow: hidden; + margin-right: var(--margin); img{ width: 10rem; height: 10rem; @@ -876,7 +885,6 @@ export default defineComponent({ flex-direction: column; justify-content: center; align-items: flex-start; - margin-left: var(--margin); .detail_right_user_content_intro,.detail_right_user_content_btn{ font-size: 1.6rem; diff --git a/src/component/WorksPage/publish.vue b/src/component/WorksPage/publish.vue index 5e100db3..e345764d 100644 --- a/src/component/WorksPage/publish.vue +++ b/src/component/WorksPage/publish.vue @@ -218,7 +218,6 @@ export default defineComponent({ publishData.isShowMark = true Https.axiosPost(Https.httpUrls.publish, param,config) .then((rv) => { - console.log(rv); cleardata() publishData.isShowMark = false message.success('Release success! You can find it in my work') diff --git a/src/router/index.ts b/src/router/index.ts index 59c0b2a0..e3c80d68 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -187,8 +187,6 @@ router.beforeEach((to, from, next) => { return false } }); - console.log(systemUser); - if(systemUser.value == 0){ if(isSystemUserRouteList.indexOf(to.path) > -1){ next(); diff --git a/src/store/uploadFile/uploadFile.ts b/src/store/uploadFile/uploadFile.ts index 3c9657bb..993e5d8f 100644 --- a/src/store/uploadFile/uploadFile.ts +++ b/src/store/uploadFile/uploadFile.ts @@ -182,8 +182,6 @@ const UploadFilesModule : Module = { }, setPrintboardMaterialFiles(state,files){ state.printMaterialFiles = files - console.log(files); - state.printboard = [...state.printboardFiles,...state.printGenerateFiles,...state.printMaterialFiles] }, diff --git a/src/store/userHabit/userHabit.ts b/src/store/userHabit/userHabit.ts index 54e221ec..984e3ff1 100644 --- a/src/store/userHabit/userHabit.ts +++ b/src/store/userHabit/userHabit.ts @@ -70,6 +70,9 @@ const userHabit : Module = { setSystemUser(state,data){ state.systemUser.value = data }, + clearSystemUser(state){ + state.systemUser.value = -1 + }, }, actions:{ @@ -101,47 +104,74 @@ const userHabit : Module = { }) }, getLangType(context){ - Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'DesignElementsEnum'}}).then((rv: any) => { - if (rv) { - rv.forEach((item:any) => { - let name = item.name - item.name = item.value - item.value = name - }); - context.commit('setDesignElementsType',rv) - } - }) - Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'PrintboardLevel2TypeEnum'}}).then((rv: any) => { - 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') - } - }) + let allPromise = []; + let getList = ['DesignElementsEnum','PrintboardLevel2TypeEnum','FemalePosition','MalePosition'] + let axiosGet = (item:any)=>{ + return new Promise((resolve) => { + Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:item}}).then((rv: any) => { + if (rv) { + rv.forEach((item:any) => { + let name = item.name + item.name = item.value + item.value = name + }); + if(item == 'DesignElementsEnum'){ + context.commit('setDesignElementsType',rv) + }else if(item == 'PrintboardLevel2TypeEnum'){ + context.commit('setPrintType',rv) + }else if(item == 'FemalePosition'){ + context.commit('setFemalePosition',rv) + }else if(item == 'MalePosition'){ + context.commit('setMalePosition',rv) + context.commit('setPosition','MalePosition') + } + resolve('') + } + }) + }) + } + return Promise.all(getList.map(item => axiosGet(item))) + // Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'DesignElementsEnum'}}).then((rv: any) => { + // if (rv) { + // rv.forEach((item:any) => { + // let name = item.name + // item.name = item.value + // item.value = name + // }); + // context.commit('setDesignElementsType',rv) + // } + // }) + // Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'PrintboardLevel2TypeEnum'}}).then((rv: any) => { + // 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') + // } + // }) } } } diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue index 97f501b4..7ff08349 100644 --- a/src/views/HomeMain.vue +++ b/src/views/HomeMain.vue @@ -102,7 +102,7 @@ --> - +
@@ -143,6 +143,7 @@ export default defineComponent({ return store.state.UserHabit.credits.value }) let activeCredits = ref(false) + let getLangIsShowMark = ref(true) let AdministratorUserIdList = [88,6,46,31,73,83,87] return { store, @@ -152,6 +153,7 @@ export default defineComponent({ isMurmur, credits, activeCredits, + getLangIsShowMark, AdministratorUserIdList, } }, @@ -209,7 +211,9 @@ export default defineComponent({ this.getCredits() this.getLang('') //语言适配 - this.store.dispatch('getLangType') + this.store.dispatch('getLangType').then(()=>{ + this.getLangIsShowMark = false + }) }, methods: { setTask(data){ @@ -298,6 +302,8 @@ export default defineComponent({ }); this.$router.replace("/"); } + this.store.commit('clearSystemUser') + // WriteCookie("token"); // window.location.reload() diff --git a/src/views/HomeRecommend.vue b/src/views/HomeRecommend.vue index 72f11f42..dd4e66bc 100644 --- a/src/views/HomeRecommend.vue +++ b/src/views/HomeRecommend.vue @@ -10,11 +10,14 @@ />
-
+
+ 升级成为正式用户 +
退出登录
+
+
登录
注册
-
@@ -91,11 +94,24 @@ export default defineComponent({ 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 { systemUser, setLogin, setRegister, setAdminUp, + logout, } }, data() { @@ -324,7 +340,7 @@ export default defineComponent({ height: 20rem; object-fit: cover; top: calc(10rem + var(--margin)); - left: calc(0 + var(--margin)); + // left: calc(0 + var(--margin)); } .content_body_img4{ width: 30rem; diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue index 75356714..8bb403b2 100644 --- a/src/views/HomeView/HomeView.vue +++ b/src/views/HomeView/HomeView.vue @@ -199,7 +199,7 @@ -
+
@@ -258,6 +258,11 @@ export default defineComponent({ draggable, productImg }, + props:{ + getLangIsShowMark:{ + type:Boolean, + } + }, setup(props,{emit}) { const store = useStore(); let likeDesignCollectionList: any = computed(() => { @@ -948,8 +953,6 @@ export default defineComponent({ this.isShowMark = true; Https.axiosPost(Https.httpUrls.setPorfolioChoose, data).then( (rv: any) => { - console.log(rv); - this.dealHistoryChooseData(rv, type); this.isShowMark = false; } @@ -959,8 +962,6 @@ export default defineComponent({ }, //处理选择组的数据 dealHistoryChooseData(data: any, type: any) { - console.log(data); - let collectionData = { disposeMoodboard: data.collection.moodTemplateId?[{ id:data.collection.moodTemplateId, @@ -987,8 +988,6 @@ export default defineComponent({ ), }; - console.log(collectionData); - // console.log(data); this.store.commit("setAllBoardDataChoose", collectionData); // this.store.commit('clearShowSketchboard') diff --git a/src/views/HomeView/Works.vue b/src/views/HomeView/Works.vue index 228d3828..311f5c15 100644 --- a/src/views/HomeView/Works.vue +++ b/src/views/HomeView/Works.vue @@ -257,8 +257,6 @@ export default defineComponent({ } let getPorfolio = ()=>{ let data = filter.getListDate - console.log(123123); - if(filter.isShowMark && !filter.isNoData)return filter.isShowMark = true Https.axiosPost(Https.httpUrls.getPorfolio, data) diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue index b9b7066e..57fa392e 100644 --- a/src/views/HomeView/library.vue +++ b/src/views/HomeView/library.vue @@ -225,8 +225,12 @@
- - + + + +