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

修复detail bug和取消教育版管理员获取用户使用的地区接口

Browse Source
This commit is contained in:
X1627315083
2025-09-10 09:41:00 +08:00
parent 9590a53e15
commit 584f711f1c
14 changed files with 62 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/component/Administrator/SE/designDetailList/index.vue
View File

@@ -51,7 +51,7 @@
</div>
</div>
<div class="admin_search">
<div class="admin_search_item" @click="searchHistoryList">{{ $t('adminSeAllUser.search') }}</div>
<div class="admin_search_item" @click="searchHistoryList">{{ $t('admin.search') }}</div>
</div>
</div>

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

@@ -56,6 +56,7 @@
<div class="item model" >
<model
ref="model"
:key="positionKey"
@canvasReload="canvasReload"
@detailEdit="detailEdit"
@addSketch="()=>isEditPattern.value=false"
@@ -152,6 +153,7 @@ export default defineComponent({
getCanvasIfEdit:{
fun:null,
},
positionKey:0,
})
provide('getCanvasIfEdit',detailData.getCanvasIfEdit)
@@ -170,6 +172,7 @@ export default defineComponent({
detailData.loadingShow = true
Https.axiosGet(url).then(
async (rv: any) => {
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
});

63
src/component/Detail/canvas/index.vue
View File

@@ -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;
}
}
}
}

2
src/component/Detail/detailLeft/module/currentList.vue
View File

@@ -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

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

@@ -356,7 +356,7 @@ export default defineComponent({
})
onUnmounted(() => {
instance.appContext.config.globalProperties.$dropdownEvents.delete(removeOpenSpeed)
instance.appContext.config.globalProperties.$dropdownEvents.offClose(removeOpenSpeed)
})
return {
userDetail,

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

@@ -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)
})

2
src/component/LoginPage/login/enterprise.vue
View File

@@ -105,7 +105,7 @@
<span>
I agree to the
<a href="https://code-create.com.hk/aida-terms-and-conditions/" style="text-decoration: underline;color: #000;">Terms</a>,
<router-link to="privacyPolicy" target="_blank" style="text-decoration: underline;color: #000;">Privacy Policy</router-link>,
<a href="aida.com.hk/privacy-policy.html" target="_blank" style="text-decoration: underline;color: #000;">Privacy Policy</a>,
and Fees.
</span>
</label>

2
src/component/LoginPage/login/personal.vue
View File

@@ -88,7 +88,7 @@
<span>
I agree to the
<a href="https://code-create.com.hk/aida-terms-and-conditions/" style="text-decoration: underline;color: #000;">Terms</a>,
<router-link to="privacyPolicy" target="_blank" style="text-decoration: underline;color: #000;">Privacy Policy</router-link>,
<a href="aida.com.hk/privacy-policy.html" target="_blank" style="text-decoration: underline;color: #000;">Privacy Policy</a>,
and Fees.
</span>
</label>

2
src/component/LoginPage/login/school.vue
View File

@@ -105,7 +105,7 @@
<span>
I agree to the
<a href="https://code-create.com.hk/aida-terms-and-conditions/" style="text-decoration: underline;color: #000;">Terms</a>,
<router-link to="privacyPolicy" target="_blank" style="text-decoration: underline;color: #000;">Privacy Policy</router-link>,
<a href="aida.com.hk/privacy-policy.html" target="_blank" style="text-decoration: underline;color: #000;">Privacy Policy</a>,
and Fees.
</span>
</label>

8
src/router/index.ts
View File

@@ -383,14 +383,6 @@ const routes: Array<RouteRecordRaw> = [
},
component: () => import("@/views/emailPage/email3-1CN.vue"),
},
{
path: "/privacyPolicy",
name: "privacyPolicy",
meta: {
enter: "all",
},
component: () => import("@/views/privacyPolicy.vue"),
},
{
path: "/404",
name: "404",

14
src/store/Detail/designDetail.ts
View File

@@ -34,7 +34,7 @@ const DesignDetail : Module<DesignDetail,RootState> = {
}
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<DesignDetail,RootState> = {
})
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<DesignDetail,RootState> = {
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<DesignDetail,RootState> = {
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){

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

@@ -267,7 +267,7 @@ const userHabit : Module<UserHabit,RootState> = {
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)

12
src/views/Administrator.vue
View File

@@ -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);

77
src/views/privacyPolicy.vue
View File

@@ -1,77 +0,0 @@
<script setup lang="ts">
import { ref, onMounted, onUnmounted, reactive, toRefs } from "vue";
//const props = defineProps({
//})
//const emit = defineEmits([
//])
let data = reactive({
})
onMounted(()=>{
})
onUnmounted(()=>{
})
defineExpose({})
const {} = toRefs(data);
</script>
<template>
<div class="privacyPolicy">
<div class="title">
Privacy Policy
</div>
<div class="content">
<p class="title">
Please read this Privacy Policy Statement (“PPS”) to understand our policy and practices on the collection, use, transfer, storage and processing of your personal data. By accessing this Website, you are consenting to this PPS.
</p>
<ol>
<li>Code Create Limited (“we”, “us” or “our”) pledges to comply with the requirements of the Personal Data (Privacy) Ordinance. In doing so, we will ensure compliance by our staff with the highest security and confidentiality standards.</li>
<li>We protect the privacy of users of our website. Any personal data collected from you will only be used for the specific purposes mentioned at the time of collection or for purposes directly related to those specific purposes and/or that mentioned in the relevant Personal Information Collection Statement.</li>
<li>We will retain your personal data only for so long as necessary to folfill the purpose of collection; and will erase your personal data thereafter. We will ensure the security of your personal data and protect them from unauthorised access.</li>
<li>We will keep your personal data confidential. Your personal data will be used (and disclosed) to third parties for the purposes for which they were collected, and where we are required to do so by law and as specified in the relevant Personal Information Collection Statement.</li>
<li>We may keep an activity log that does not identify you individually and cannot be used to determine the particular user in order to measure traffic, gauge the popularity of different parts of our websites, gain general knowledge about the users, and facilitate the enhancement of our websites. This information may include the IP address, operating system and version, the type of network, the type and configuration of your browser, the geo-location information and identifiers of the device you used.</li>
<li>We use cookies to enhance your experience on this website (<strong>code-create.com.hk</strong>). Cookies are small pieces of data stored on your computer or other devices when websites are loaded in a browser. We use cookies to analyse website traffic, personalise website content and to make targeted advertisements on third party websites. We use Google Analytics to analyze usage trends at its website. We also use cookies at this website and cookies set by Google Analytics to collect information on how visitors use our website. Third parties such as YouTube and Google may set cookies, for example, relating to the use of YouTube video players and targeted advertising respectively. For further information, users should refer to the relevant third parties’ cookies policy which may be amended from time to time. By continuing to use this website, you agree to the use of these cookies. If you do not accept the cookies or withdraw your consent, you will not able to use some of the functions on this website.</li>
<li>This PPS is subject to change. Any changes will be posted on this page. Your continued use of our website after the posting of such changes indicates your acceptance to the same. In case of any inconsistency between the English and Chinese versions, the English version shall prevail. If you have any enquiries, please send an email to <strong>info@code-create.com.hk</strong>.</li>
</ol>
</div>
</div>
</template>
<style lang="less" scoped>
.privacyPolicy{
width: 100%;
height: 100%;
position: relative;
display: flex;
flex-direction: column;
> .title{
text-align: center;
padding: 10rem 0 5rem;
font-size: 4.4rem;
color: #000;
margin-bottom: 20px;
@media (max-width: 768px) {
font-size: 3.2rem;
padding: 5rem 0 2rem;
}
}
> .content{
flex: 1;
overflow-y: auto;
max-width: 140rem;
padding: 0 10rem;
font-size: #333333;
margin: 0 auto;
@media (max-width: 768px) {
padding: 0 4rem;
font-size: 1.2rem;
}
ol{
padding-left: 3rem;
@media (max-width: 768px) {
padding-left: 2rem;
}
}
ol, ol li {
list-style-type: decimal !important;
}
}
}
</style>