diff --git a/src/component/Administrator/SE/designDetailList/index.vue b/src/component/Administrator/SE/designDetailList/index.vue index 4c10f136..89ac71fd 100644 --- a/src/component/Administrator/SE/designDetailList/index.vue +++ b/src/component/Administrator/SE/designDetailList/index.vue @@ -51,7 +51,7 @@
-
{{ $t('adminSeAllUser.search') }}
+
{{ $t('admin.search') }}
diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index e2245e74..5f9bcc6e 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -56,6 +56,7 @@
{ + store.commit('DesignDetail/setDesignDetail',rv) rv.clothes.forEach((item:any)=>{ let a item.designType='Library' @@ -205,9 +208,8 @@ export default defineComponent({ }) detailData.singleOveral.value = rv.singleOverall detailData.designDetailShow = true - store.commit('DesignDetail/setDesignDetail',rv) // this.deleteShow = false - + initialize() setRevocation() detailData.loadingShow = false if(rv.singleOverall == "single"){ @@ -252,16 +254,20 @@ export default defineComponent({ detailData.oppositeRevocationShow = oppositeRevocation.length revocation.splice(revocation.length-1,1) detailData.revocationShow = revocation.length - store.commit("DesignDetail/setDesignDetail", revocation[revocation.length-1]); + // store.commit("DesignDetail/setDesignDetail", revocation[revocation.length-1]); + store.commit('DesignDetail/setDesignDetail',revocation[revocation.length-1]) + store.commit('DesignDetail/setDesignColthes',detailData.selectDetail.id) sessionStorage.setItem('oppositeRevocation', JSON.stringify(oppositeRevocation)); sessionStorage.setItem('revocation', JSON.stringify(revocation)); // clearSelect() + detailData.positionKey++ } const oppositeRevocation = ()=>{//反撤回 let oppositeRevocation = JSON.parse((sessionStorage.getItem("oppositeRevocation") as any)) let revocation = JSON.parse((sessionStorage.getItem("revocation") as any)) if(!oppositeRevocation[oppositeRevocation.length-1])return store.commit("DesignDetail/setDesignDetail", oppositeRevocation[oppositeRevocation.length-1]); + store.commit('DesignDetail/setDesignColthes',detailData.selectDetail.id) revocation.push(oppositeRevocation[oppositeRevocation.length-1]) detailData.revocationShow = revocation.length oppositeRevocation.splice(oppositeRevocation.length-1,1) @@ -269,6 +275,7 @@ export default defineComponent({ sessionStorage.setItem('oppositeRevocation', JSON.stringify(oppositeRevocation)); sessionStorage.setItem('revocation', JSON.stringify(revocation)); // this.clearSelect() + detailData.positionKey++ } const setCurrentDetail = (str:string)=>{ store.commit('DesignDetail/setCurrentDetailType',str) @@ -359,11 +366,13 @@ export default defineComponent({ let value = { currentType : JSON.parse(JSON.stringify(detailData.currentDetailType)), rv:rv, + fun:setRevocation } detailData.designDetail.oldModel = detailData.designDetail.newModel delete detailData.designDetail.newModel store.commit('DesignDetail/setPraeview',value) detailData.loadingShow = false + // setRevocation() }).catch(res=>{ detailData.loadingShow = false }); diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue index f8dda41b..842f3d13 100644 --- a/src/component/Detail/canvas/index.vue +++ b/src/component/Detail/canvas/index.vue @@ -334,41 +334,34 @@ export default defineComponent({ cursor: pointer; } } - .argument-box{ - height: 4rem; - width: 100%; - margin-bottom: 3rem; - margin-left: 4rem; - } - .argument-box, - .content-bottom, - .detail-box{ - - :deep(i){ - font-size: 2.5rem; - cursor: pointer; - width: 3.5rem; - height: 3.5rem; - display: flex; - align-items: center; - justify-content: center; - flex-shrink: 0; - transition: all .3s; - margin-bottom: .5rem; - &.active{ - border: 1px solid; - border-radius: .4rem; - } - &.icon-xiala{ - transform: rotate(-90deg); - } - &.icon-xialaActive{ - transform: rotate(90deg); - } - &.eventNone{ - cursor: no-drop; - border: none; - opacity: .5; + .content-bottom{ + :deep(.tools-sidebar){ + i{ + font-size: 2.5rem; + cursor: pointer; + width: 3.5rem; + height: 3.5rem; + display: flex; + align-items: center; + justify-content: center; + flex-shrink: 0; + transition: all .3s; + margin-bottom: .5rem; + &.active{ + border: 1px solid; + border-radius: .4rem; + } + &.icon-xiala{ + transform: rotate(-90deg); + } + &.icon-xialaActive{ + transform: rotate(90deg); + } + &.eventNone{ + cursor: no-drop; + border: none; + opacity: .5; + } } } } diff --git a/src/component/Detail/detailLeft/module/currentList.vue b/src/component/Detail/detailLeft/module/currentList.vue index dee0e1f9..66c719d5 100644 --- a/src/component/Detail/detailLeft/module/currentList.vue +++ b/src/component/Detail/detailLeft/module/currentList.vue @@ -57,7 +57,7 @@ export default defineComponent({ const selectImgItem = (file:any)=>{ if(props.type != 'models'){ if(!file.resData.minIOPath){ - file.minIOPath = getMinioUrl(file.resData.url) + file.minIOPath = getMinioUrl(file.imgUrl || file.resData.url) } if(!file.designType){ file.designType = file.resData.designType diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index b6111783..b2775a61 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -356,7 +356,7 @@ export default defineComponent({ }) onUnmounted(() => { - instance.appContext.config.globalProperties.$dropdownEvents.delete(removeOpenSpeed) + instance.appContext.config.globalProperties.$dropdownEvents.offClose(removeOpenSpeed) }) return { userDetail, diff --git a/src/component/HomePage/generalMenu.vue b/src/component/HomePage/generalMenu.vue index 7bda25b7..43d7525c 100644 --- a/src/component/HomePage/generalMenu.vue +++ b/src/component/HomePage/generalMenu.vue @@ -217,7 +217,7 @@ import { message, Upload, Modal } from "ant-design-vue"; }) onUnmounted(() => { - instance.appContext.config.globalProperties.$dropdownEvents.delete(removePrintModel) + instance.appContext.config.globalProperties.$dropdownEvents.offClose(removePrintModel) window.removeEventListener('scroll', handleScroll, true) window.removeEventListener('resize', handleResize) }) diff --git a/src/component/LoginPage/login/enterprise.vue b/src/component/LoginPage/login/enterprise.vue index b8d5128d..f490db5e 100644 --- a/src/component/LoginPage/login/enterprise.vue +++ b/src/component/LoginPage/login/enterprise.vue @@ -105,7 +105,7 @@ I agree to the Terms, - Privacy Policy, + Privacy Policy, and Fees. diff --git a/src/component/LoginPage/login/personal.vue b/src/component/LoginPage/login/personal.vue index e26d7b50..8efcd11b 100644 --- a/src/component/LoginPage/login/personal.vue +++ b/src/component/LoginPage/login/personal.vue @@ -88,7 +88,7 @@ I agree to the Terms, - Privacy Policy, + Privacy Policy, and Fees. diff --git a/src/component/LoginPage/login/school.vue b/src/component/LoginPage/login/school.vue index 6160ad9d..60969f0c 100644 --- a/src/component/LoginPage/login/school.vue +++ b/src/component/LoginPage/login/school.vue @@ -105,7 +105,7 @@ I agree to the Terms, - Privacy Policy, + Privacy Policy, and Fees. diff --git a/src/router/index.ts b/src/router/index.ts index e9491f12..7d2c6dcd 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -383,14 +383,6 @@ const routes: Array = [ }, component: () => import("@/views/emailPage/email3-1CN.vue"), }, - { - path: "/privacyPolicy", - name: "privacyPolicy", - meta: { - enter: "all", - }, - component: () => import("@/views/privacyPolicy.vue"), - }, { path: "/404", name: "404", diff --git a/src/store/Detail/designDetail.ts b/src/store/Detail/designDetail.ts index 16b9e6d0..adcd1886 100644 --- a/src/store/Detail/designDetail.ts +++ b/src/store/Detail/designDetail.ts @@ -34,7 +34,7 @@ const DesignDetail : Module = { } let front:any = [] let back:any = [] - console.log(data) + state.designDetail = data // let printZIndex = data.clothes.forEach((v:any,index:any)=>{ // if(!v?.partialDesignDTO){ @@ -72,11 +72,9 @@ const DesignDetail : Module = { }) state.frontBack.front = front state.frontBack.back = back - state.designDetail = data }, updataDetailItem(state,data){ state.designDetail.clothes.forEach((item:any) => { - console.log(state.selectDetail) if(item.id == state.selectDetail.id){ for (const key in data) { item[key] = data[key] @@ -193,10 +191,11 @@ const DesignDetail : Module = { state.selectDetail = data }, async setPraeview(state,value){//preview - let data = value.rv - let currentType = value.currentType + let data = value?.rv || value + console.log(data,'preview') + let currentType = value?.currentType if(state.designDetail.oldModel?.url)state.frontBack.body.path = state.designDetail.oldModel.url - state.designDetail.currentFullBodyView = value.rv.currentFullBodyView + if(value?.rv?.currentFullBodyView)state.designDetail.currentFullBodyView = value.rv.currentFullBodyView for (let j = 0; j < data.clothes.length; j++) { const item = data.clothes[j]; if(!item.id)continue @@ -279,9 +278,10 @@ const DesignDetail : Module = { state.designDetail.clothes.push(state.selectDetail) } state.selectDetail.id = item.id - if(state.selectDetail.newDetail?.[currentType])delete state.selectDetail.newDetail[currentType] + if(currentType)if(state.selectDetail.newDetail?.[currentType])delete state.selectDetail.newDetail[currentType] } } + if(value.fun)value.fun() }, // setDesignItemOthers(state,data){ diff --git a/src/store/userHabit/userHabit.ts b/src/store/userHabit/userHabit.ts index fd6e8705..6a5d744f 100644 --- a/src/store/userHabit/userHabit.ts +++ b/src/store/userHabit/userHabit.ts @@ -267,7 +267,7 @@ const userHabit : Module = { if(data.systemUser != 0)state.userDetail.systemList.push(1) if(data.affiliate)state.userDetail.systemList.push(2) - let adminIdList = [88,6,46,31,73,83,87,4,11482,11630,12201,12592,23534,23705] + let adminIdList = [88,6,46,31,73,83,87,4,11482,11630,12201,12592,23534,23705,23705] // if(data.email == '' || data.email)state.userDetail.systemList.push(3) if(adminIdList.indexOf(data.userId) > -1 || data.systemUser == 6 || data.systemUser == 7){ state.userDetail.systemList.push(3) diff --git a/src/views/Administrator.vue b/src/views/Administrator.vue index 22695384..c9086cfe 100644 --- a/src/views/Administrator.vue +++ b/src/views/Administrator.vue @@ -174,11 +174,13 @@ export default defineComponent({ store.commit('setAllUserList',rv); } }) - Https.axiosGet(Https.httpUrls.getCities,).then((rv: any) => { - if (rv) { - store.commit('setAllCitiesList',rv); - } - }) + if(vuex_systemUser == 3){ + Https.axiosGet(Https.httpUrls.getCities,).then((rv: any) => { + if (rv) { + store.commit('setAllCitiesList',rv); + } + }) + } Https.axiosGet(Https.httpUrls.getAllGenerateFuncName,).then((rv: any) => { if (rv) { store.commit('setAllGenerateType',rv); diff --git a/src/views/privacyPolicy.vue b/src/views/privacyPolicy.vue deleted file mode 100644 index 86a7b695..00000000 --- a/src/views/privacyPolicy.vue +++ /dev/null @@ -1,77 +0,0 @@ - - - \ No newline at end of file