+ {{ modelType }}
{{ $t('ModelPlacement.System') }}
@@ -584,7 +585,7 @@ export default defineComponent({
// })
let cropper:any = this.$refs.cropper,
that = this
- if((this.modelType == 'System' && this.userInfo.userId == 88) || (this.modelType == 'System' &&this.userInfo.userId == 833)){
+ if((this.modelType == 'System' && this.userInfo.userId == 88) || (this.modelType == 'System' &&this.userInfo.userId == 83)){
if(this.printObject.templateId){
this.printObject.id = this.printObject.relationId
this.confrimSubmit()
@@ -625,18 +626,19 @@ export default defineComponent({
cropper.changeScale(num);
},
async confrimSubmit(){
+ let modelType = 'Library'
+ if(this.userInfo.userId == 88 || this.userInfo.userId == 83){
+ modelType = this.modelType
+ }
let param = {
libraryId:this.printObject.id,
templateId:this.printObject.templateId || null,
- modelType:'Library',
+ modelType:modelType,
modelSex:this.sex,
checkMd5:1,
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
...await this.getPrintLocation()
}
- if(this.userInfo.userId == 88 || this.userInfo.userId == 833){
- param.modelType = this.modelType
- }
this.isShowMark = true
Https.axiosPost(Https.httpUrls.saveOrEditTemplatePoint, param).then(
@@ -652,19 +654,19 @@ export default defineComponent({
},
customRequest(){
+ let modelType = 'Library'
+ if(this.userInfo.userId == 88 || this.userInfo.userId == 83){
+ modelType = this.modelType
+ }
let new_data = {
file:this.printObject.file,
level1Type:'Models',
level2Type:'',
checkMd5:1,
sex:this.sex,
- modelType:'Library',
+ modelType:modelType,
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
}
- if(this.userInfo.userId == 88 || this.userInfo.userId == 833){
- new_data.modelType = this.modelType
- // new_data.sex = this.sex
- }
this.isShowMark = true
return new Promise((resolve,reject)=>{
Https.axiosPost(Https.httpUrls.libraryUpload, new_data,{headers:{'Content-Type': 'multipart/form-data'}}).then(
@@ -710,20 +712,22 @@ export default defineComponent({
},
async getPrintLocation(){
let {width , height} = this.imgBox
- if(this.modelType == 'System'){
- await new Promise((resolve, reject) => {
- let img = new Image()
- img.src = this.option.img
- img.onload = () => {
- width = img.width
- height = img.height
- resolve(true)
- }
- })
- }
+ // if(this.modelType == 'System'){
+ // await new Promise((resolve, reject) => {
+ // let img = new Image()
+ // img.src = this.option.img
+ // img.onload = () => {
+ // width = img.width
+ // height = img.height
+ // resolve(true)
+ // }
+ // })
+ // }
+
let locationData:any = {}
let returnData:any = {}
let newLocationList = JSON.parse(JSON.stringify(this.locationList))
+
//进行字段归类
for(let item of newLocationList){
locationData[item.field] = locationData[item.field] || []
diff --git a/src/lang/en.ts b/src/lang/en.ts
index 27ad73ce..055e69e5 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -595,6 +595,16 @@ export default {
hisWorks:'His works',
works:'Works',
},
+ createSlogan:{
+ title:'Create Slogan',
+ Color:'Color',
+ FontAlign:'Font Align',
+ FontStyle:'Font Style',
+ FontFamily:'Font Family',
+ add:'Add',
+ delete:'Delete',
+ submit:'Submit',
+ },
guide:{
guide1:"You can personalize your design settings right here in the Workspace, including choosing to design for men's or women's wear, as well as selecting the mannequin to use for your creations.",
guide2:"Select the apparel type you'd like to work on.",
diff --git a/src/store/userHabit/userHabit.ts b/src/store/userHabit/userHabit.ts
index 6c416250..794204ea 100644
--- a/src/store/userHabit/userHabit.ts
+++ b/src/store/userHabit/userHabit.ts
@@ -104,6 +104,7 @@ const userHabit : Module = {
},
setMessageSystem(state,data){
let num = 0
+ // let userInfo = ['-1']
let userInfo = ['followeeCount','followerCount']
let obj:any = {}
for (const iterator in data) {
@@ -112,8 +113,6 @@ const userHabit : Module = {
store.commit('setUserInfo', obj)
}else{
if(iterator != 'newPosted')num+=data[iterator]
- console.log(iterator);
-
state.messageSystem.messageType[iterator] = data[iterator]
}
}
diff --git a/src/tool/webSocket.js b/src/tool/webSocket.js
index 2ddaa61f..df460689 100644
--- a/src/tool/webSocket.js
+++ b/src/tool/webSocket.js
@@ -21,10 +21,10 @@ class MyWs {
}
}
this.ws.onclose = (e)=>{
- reconnection()
+ this.reconnection()
}
this.ws.onerror = (e)=>{
- reconnection()
+ this.reconnection()
}
}
reconnection(){