diff --git a/src/component/Administrator/Transaction/TransactionTable.vue b/src/component/Administrator/Transaction/TransactionTable.vue index 54315337..d8b09c93 100644 --- a/src/component/Administrator/Transaction/TransactionTable.vue +++ b/src/component/Administrator/Transaction/TransactionTable.vue @@ -97,7 +97,7 @@ >
- Total Amount: + Total Amount: {{ totalPayer }}
+ @@ -19,12 +20,13 @@ import sketch from './sketch.vue' import print from './print.vue' import color from './colorBox/index.vue' import element from './element.vue' +import accessory from './accessory.vue' import models from './models.vue' import addDetails from '@/component/Detail/addDetails.vue' export default defineComponent({ components:{ - sketch,print,color,addDetails,element,models + sketch,print,color,addDetails,element,models,accessory }, setup(props,{emit}) { const store = useStore(); diff --git a/src/component/home/newProject/workspace.vue b/src/component/home/newProject/workspace.vue index 528d6659..738e129d 100644 --- a/src/component/home/newProject/workspace.vue +++ b/src/component/home/newProject/workspace.vue @@ -164,7 +164,9 @@ export default defineComponent({ // data.selectObject = JSON.parse(JSON.stringify(newVal)) // }) const init = (storeData:any)=>{ - data.selectObject = JSON.parse(JSON.stringify(storeData)) + // if(props.status == 'edit'){ + data.selectObject = JSON.parse(JSON.stringify(storeData)) + // } } const dataDom = reactive({ habitSetStyle:null as any, @@ -215,7 +217,7 @@ export default defineComponent({ sex:data.selectObject.sex, // sex:data.show.gender?data.selectObject.sex:null, systemDesignerPercentage:data.show.systemDesigner?data.selectObject.systemDesignerPercentage:null, - position:data.show.position?data.selectObject.position.value:'Overall', + position:data.show.position?data.selectObject.position?.value:'Overall', ageGroup:data.show.style?data.selectObject.ageGroup:null, userBrandDna:data.selectObject.userBrandDna, brandPercentage:data.selectObject.brandPercentage, @@ -280,8 +282,34 @@ export default defineComponent({ onMounted(()=>{ if(props.status != 'edit'){ store.commit('createProbject') + data.selectObject = { + name: '', + id: '', + type: '', + httpType: '', + styleName: '', //项目风格 + styleId: null, //项目风格 + style: '', + sex: 'Female', + ageGroup: 'Adult', //年龄组 + positionList: [], + position: {}, //衣服位置 + userBrandDna: '', //用户品牌 + userBrandDnaImg: '', //用户品牌图片 + userBrandDnaName: '', //用户品牌名字 + workspaceId: -1, //worspaceId + publishData: { + id: '', + portfolioDes: '', + portfolioName: '', + tagsDTO: [] + }, //发布的作品数据 + systemDesignerPercentage: 30, + model: [] //模特 + } + }else{ + data.selectObject = JSON.parse(JSON.stringify(data.selectObject_)) } - data.selectObject = JSON.parse(JSON.stringify(data.selectObject_)) data.selectObject.style = store.state.UserHabit?.mannequinStyle?.[0]?.value data.selectObject.styleName = store.state.UserHabit?.mannequinStyle?.[0]?.name data.selectObject.styleId = store.state.UserHabit?.mannequinStyle?.[0]?.id diff --git a/src/lang/cn.ts b/src/lang/cn.ts index e0b5bc98..d9b66e3e 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -657,6 +657,7 @@ export default { Print: "印花", Color: "颜色", Elements: "元素", + Accessory: "装饰", Model: "模特", CurrentSketch: "设计服装", CurrentPrint: "设计印花", @@ -666,6 +667,7 @@ export default { ColorCode: "颜色代码", ExtractColor: "提取颜色", CurrentElement: "设计元素", + CurrentAccessory: "设计装饰", CurrentModel: "设计模特", NewApparel: "新服装", NewPrint: "新印花", diff --git a/src/lang/en.ts b/src/lang/en.ts index 97ed82ac..43515604 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -657,6 +657,7 @@ export default { Print: "Print", Color: "Color", Elements: "Elements", + Accessory: "Accessory", Model: "Model", CurrentSketch: "Current Sketch", CurrentPrint: "Current Print", @@ -666,6 +667,7 @@ export default { ColorCode: "Color Code", ExtractColor: "Extract Color", CurrentElement: "Current Element", + CurrentAccessory: "Current Accessory", CurrentModel: "Current Model", NewApparel: "New Apparel", NewPrint: "New Print",