@@ -584,7 +584,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 == 83)){
+ if((this.modelType == 'System' && this.userInfo.userId == 88) || (this.modelType == 'System' &&this.userInfo.userId == 833)){
if(this.printObject.templateId){
this.printObject.id = this.printObject.relationId
this.confrimSubmit()
@@ -634,7 +634,7 @@ export default defineComponent({
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
...await this.getPrintLocation()
}
- if(this.userInfo.userId == 88 || this.userInfo.userId == 83){
+ if(this.userInfo.userId == 88 || this.userInfo.userId == 833){
param.modelType = this.modelType
}
@@ -661,7 +661,7 @@ export default defineComponent({
modelType:'Library',
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
}
- if(this.userInfo.userId == 88 || this.userInfo.userId == 83){
+ if(this.userInfo.userId == 88 || this.userInfo.userId == 833){
new_data.modelType = this.modelType
// new_data.sex = this.sex
}
diff --git a/src/component/modules/generalMiniCanvas.vue b/src/component/modules/generalMiniCanvas.vue
index ba4b80f6..00f59dbe 100644
--- a/src/component/modules/generalMiniCanvas.vue
+++ b/src/component/modules/generalMiniCanvas.vue
@@ -83,8 +83,8 @@ export default defineComponent({
let canvasBtn = reactive({
canvasState:'move',
canvasPencilWidth:{
- pencil:4,
- eraser:4,
+ pencil:20,
+ eraser:20,
},
spreadState:false,
})
diff --git a/src/store/userHabit/userHabit.ts b/src/store/userHabit/userHabit.ts
index 8ecf3847..53cb6e7e 100644
--- a/src/store/userHabit/userHabit.ts
+++ b/src/store/userHabit/userHabit.ts
@@ -1,6 +1,7 @@
import {Module} from 'vuex'
import {RootState} from '../index'
import { Https } from "@/tool/https";
+import store from '../index'
interface UserHabit{
clothingType:any,
credits:any,
@@ -103,21 +104,17 @@ const userHabit : Module = {
},
setMessageSystem(state,data){
let num = 0
+ let userInfo = ['followeeCount','followerCount']
+ let obj:any = {}
for (const iterator in data) {
- if(iterator != 'newPosted'){
- num+=data[iterator]
+ if(userInfo.indexOf(iterator) > 0){
+ obj[iterator] = data[iterator]
+ store.commit('setUserInfo', obj)
+ }else{
+ if(iterator != 'newPosted')num+=data[iterator]
+ state.messageSystem.messageType[iterator] = data[iterator]
+
}
- state.messageSystem.messageType[iterator] = data[iterator]
- // if(!state.messageSystem.messageType[iterator]){
- // state.messageSystem.messageType[iterator] = data[iterator]
- // }else{
- // for (const key in state.messageSystem.messageType) {
- // if(key == iterator){
- // state.messageSystem.messageType[key] = data[iterator]
- // break
- // }
- // }
- // }
}
state.messageSystem.messageNum = num
},
diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue
index 46b99014..ee5021f6 100644
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -260,9 +260,20 @@ export default defineComponent({
}
})
}
-
- MyWs.linkWs("wss://"+MyWs.messageUrl,'message')
+ MyWs.linkWs("ws://"+MyWs.messageUrl+`/${JSON.parse(getCookie("userInfo")).userId}`,'message')
let getWsMessage = (data)=>{
+ let userInfo = ['followeeCount','followerCount']
+ let obj = {}
+ let isObj = false
+ data.forEach(element => {
+ const keys = Object.keys(element)[0]
+ if(userInfo.indexOf(keys) > 0){
+ obj[keys] = element[keys]
+ isObj = true
+ }
+ });
+ if(isObj)store.commit('setUserInfo',obj)
+
store.commit('setMessageSystem',...data)
}
MyEvent.add('getMessage',getWsMessage)
diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue
index 11d0ea3f..9afe0719 100644
--- a/src/views/HomeView/HomeView.vue
+++ b/src/views/HomeView/HomeView.vue
@@ -535,8 +535,10 @@ export default defineComponent({
// this.likeDesignCollectionList.push(team)
// },
affiche(text:any){
- let affiche:any = this.$refs.affiche
- affiche.init(text)
+ nextTick(()=>{
+ let affiche:any = this.$refs.affiche
+ affiche.init(text)
+ })
// affiche.afficheMask = true
},
dragstart (e:any, index:any) {
@@ -716,7 +718,7 @@ export default defineComponent({
colorBoards,
sketchboardFiles,
marketingSketchFiles,
- moodTemplateId,
+ moodboardPosition,
} = this.store.state.UploadFilesModule.allBoardData;
this.randomNum()
let workspace = this.store.state.Workspace.workspace
@@ -726,6 +728,7 @@ export default defineComponent({
moodBoards: this.getBoardId(moodboardFiles),
printBoards: this.getPrintId(printboardFiles),
sketchBoards: this.getSkecthBoard(sketchboardFiles),
+ moodboardPosition: moodboardPosition,
switchCategory: !workspace.overallSingle ?"": workspace.position,
singleOverall: !workspace.overallSingle ? "overall" : "single",
systemScale: workspace.systemDesignerPercentage?workspace.systemDesignerPercentage*.01:.3,
@@ -737,6 +740,7 @@ export default defineComponent({
timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
processId:this.designRandom
};
+ // data.moodboardPosition = JSON.stringify(this.store.state.UploadFilesModule.moodboardPosition)
let isLoad = false
if(designCollectionId == -1){
isLoad = true
@@ -954,6 +958,8 @@ export default defineComponent({
},
//处理选择组的数据
dealHistoryChooseData(data: any, type: any) {
+ console.log(data.collection.moodboardPosition);
+
let collectionData = {
disposeMoodboard: data.collection.moodTemplateId?[{
id:data.collection.moodTemplateId,