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

fix

Browse Source
This commit is contained in:
wxd
2024-10-02 11:33:14 +08:00
parent 708028c02f
commit 0a273a24dc
10 changed files with 60 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/component/Account/accountFollowFans.vue
View File

@@ -68,6 +68,9 @@ export default defineComponent({
],
activeKey: '',
})
let userInfo= computed(()=>{
return store.state.UserHabit.userInfo
})
let domRefs:any = reactive({
follow:ref(null),
fans:ref(null),
@@ -103,6 +106,7 @@ export default defineComponent({
return{
...toRefs(accountMessage),
...toRefs(domRefs),
userInfo,
messageSystem,
setReadStatus,
changeTabs,

9
src/component/Account/accountMessage.vue
View File

@@ -111,9 +111,10 @@ export default defineComponent({
let setReadStatus = (value:any)=>{
return new Promise((resolve,reject)=>{
if(value.isRead == 1)return reject('')
let id = value.senderId?value.senderId:value.id
let data = {
type:accountMessage.activeKey,
notificationIdList:value.id
notificationIdList:id
}
Https.axiosPost(Https.httpUrls.setReadStatus,'',{params:data}).then((rv)=>{
if(rv){
@@ -143,9 +144,9 @@ export default defineComponent({
return new Promise((resolve,reject)=>{
data.type = accountMessage.activeKey
let url = Https.httpUrls.getHistoryNotification
if(data.type == 'follow'){
url = Https.httpUrls.porfolioGetFollowerList
}
// if(data.type == 'follow'){
// url = Https.httpUrls.porfolioGetFollowerList
// }
Https.axiosPost(url,data).then((rv)=>{
if(rv){
// domRefs[data.type][0].setmessageList(rv,data)

2
src/component/Account/message/comment.vue
View File

@@ -20,7 +20,7 @@
</div>
<div class="account_generalMessage_item_left">
<div class="account_generalMessage_item_left_delete modal_title_text_intro">
<span class="icon iconfont icon-shanchu operate_icon"></span>
<!-- <span class="icon iconfont icon-shanchu operate_icon"></span> -->
</div>
<div class="modal_title_text_intro">{{ item.createTime }}</div>
</div>

2
src/component/Account/message/likeMessage.vue
View File

@@ -18,7 +18,7 @@
</div>
<div class="account_generalMessage_item_left">
<div class="account_generalMessage_item_left_delete modal_title_text_intro">
<span class="icon iconfont icon-shanchu operate_icon"></span>
<!-- <span class="icon iconfont icon-shanchu operate_icon"></span> -->
</div>
<div class="modal_title_text_intro">{{ item.createTime }}</div>
</div>

4
src/component/Account/message/newFollow.vue
View File

@@ -68,11 +68,11 @@ export default defineComponent({
}
prop.getHistory(data).then((rv:any)=>{
accountMessage.isShowMark = false
if(rv.length == 0) {
if(rv.content.length == 0) {
accountMessage.isNoData = true
return
}
accountMessage.dataList = rv
accountMessage.dataList = rv.content
}).catch(() => {
accountMessage.isShowMark = false
accountMessage.isNoData = true

16
src/component/HomePage/createSlogan.vue
View File

@@ -18,13 +18,13 @@
<div class="clearSlogan_center">
<div class="modal_title_text">
<div>Create Slogan</div>
<div>{{ $t('createSlogan.title') }}</div>
<div class="modal_title_text_intro"></div>
</div>
<div class="exportCanvasBox_center">
<div v-show="textBtnShow" class="clearSlogan_center_item clearSlogan_center_btn_move">
<div class="clearSlogan_center_btn_item">
<div>Color</div>
<div>{{ $t('createSlogan.Color') }}</div>
<input type="color" v-model="fill">
</div>
<!-- <div class="clearSlogan_center_btn_item">
@@ -32,7 +32,7 @@
<input type="Number" v-model="fontSize">
</div> -->
<div class="clearSlogan_center_btn_item">
<div>Font Align</div>
<div>{{ $t('createSlogan.FontAlign') }}</div>
<ul>
<i class="fi fi-br-align-left" @click="setTextData('textAlign','left')" :class="{active:textAlign === 'left'}"></i>
<i class="fi fi-br-align-center" @click="setTextData('textAlign','center')" :class="{active:textAlign === 'center'}"></i>
@@ -40,7 +40,7 @@
</ul>
</div>
<div class="clearSlogan_center_btn_item">
<div>Font Style</div>
<div>{{ $t('createSlogan.FontStyle') }}</div>
<ul>
<i class="fi fi-br-border-top" @click="setTextData('overline','')" :class="{active:overline}"></i>
<i class="fi fi-br-border-center-h" @click="setTextData('linethrough','')" :class="{active:linethrough}"></i>
@@ -49,7 +49,7 @@
</div>
<div class="clearSlogan_center_btn_item">
<div>Font Family</div>
<div>{{ $t('createSlogan.FontFamily') }}</div>
<select v-model="fontFamily" :style="{'font-family':fontFamily}">
<option v-for="item in textFontFamilyList" :style="{'font-family':item.value}" :value="item.value">{{item.name}}</option>
</select>
@@ -57,16 +57,16 @@
</div>
<div class="clearSlogan_center_btn clearSlogan_center_item">
<div @click="setTextFun('')" class="clearSlogan_center_btn_item">
<div>新增</div>
<div>{{ $t('createSlogan.add') }}</div>
</div>
<div @click="removeTextFun()" class="clearSlogan_center_btn_item">
<div>删除</div>
<div>{{ $t('createSlogan.delete') }}</div>
</div>
</div>
</div>
<div class="exportCanvasBox_submit" @click="setSubmit">
<div class="started_btn">
submit
{{ $t('createSlogan.submit') }}
</div>
</div>

48
src/component/LibraryPage/ModelPlacement.vue
View File

@@ -33,10 +33,11 @@
</div>
</div>
</div>
<div class="plcaement_point_content" v-if="userInfo.userId == 88 || userInfo.userId == 833">
<div class="plcaement_point_content" v-if="userInfo.userId == 88 || userInfo.userId == 83">
<div style="display: flex; align-items: center;">
<div style="display: flex; align-items: center;">
<input type="checkbox" model="false" @click="()=>{modelType = 'System'}">
{{ modelType }}
{{ $t('ModelPlacement.System') }}
</div>
<div style="display: flex; align-items: center;">
@@ -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] || []

10
src/lang/en.ts
View File

@@ -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 <strong>Workspace</strong>, 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.",

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

@@ -104,6 +104,7 @@ const userHabit : Module<UserHabit,RootState> = {
},
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<UserHabit,RootState> = {
store.commit('setUserInfo', obj)
}else{
if(iterator != 'newPosted')num+=data[iterator]
console.log(iterator);
state.messageSystem.messageType[iterator] = data[iterator]
}
}

4
src/tool/webSocket.js
View File

@@ -21,10 +21,10 @@ class MyWs {
}
}
this.ws.onclose = (e)=>{
reconnection()
this.reconnection()
}
this.ws.onerror = (e)=>{
reconnection()
this.reconnection()
}
}
reconnection(){