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:
X1627315083
2024-07-24 11:39:55 +08:00
parent 89f15f3614
commit e2aa64bba5
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env.dev
View File

@@ -4,8 +4,8 @@ NODE_ENV = 'development'
# VUE_APP_BASE_URL = 'http://18.167.251.121:10086'
VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
VUE_APP_BASE_URL = 'https://api.aida.com.hk'
# VUE_APP_BASE_URL = 'https://api.aida.com.hk'
# 佩佩
VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
# VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
# 海波
# VUE_APP_BASE_URL = 'http://192.168.1.9:5567'

2
src/component/Detail/setDesignItem.vue
View File

@@ -154,7 +154,7 @@ export default defineComponent({
v.layersObject[i].style = {
top:v.layersObject[i].position?.[0]*ratio+'px',
left:v.layersObject[i].position?.[1]*ratio+'px',
width:v.layersObject[i].imageSize?.[0]*ratio+'px',
width:v.layersObject[i].imageSize?.[0]*ratio * +'px',
height:v.layersObject[i].imageSize?.[1]*ratio+'px',
// zIndex:zIndex-=1
}

3
src/component/HomePage/MoodboardUpload.vue
View File

@@ -357,10 +357,13 @@ export default defineComponent({
}
},
beforeUpload(file: any) {
console.log(123);
const isJpgOrPng =
file.type === "image/jpeg" ||
file.type === "image/png" ||
file.type === "image/jpg" ||
file.type === "image/JFIF" ||
file.type === "image/bmp";
if (!isJpgOrPng) {
message.info(this.t('MoodboardUpload.jsContent3'));

2
src/main.ts
View File

@@ -26,7 +26,7 @@ flexible()
import { getCookie, setCookie } from "@/tool/cookie";
router.beforeEach((to, from, next) => {
if(to.name == "login" || to.name == 'SquareWorks'){
if((to.name == "login" && !from.name) || (to.name == 'SquareWorks' && !from.name)){
isMurmur()
}
next();