diff --git a/.env.dev b/.env.dev
index 57d3c252..7cb5aaab 100644
--- a/.env.dev
+++ b/.env.dev
@@ -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'
diff --git a/src/component/Detail/setDesignItem.vue b/src/component/Detail/setDesignItem.vue
index 38d76f12..dd1f77a0 100644
--- a/src/component/Detail/setDesignItem.vue
+++ b/src/component/Detail/setDesignItem.vue
@@ -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
 					}
diff --git a/src/component/HomePage/MoodboardUpload.vue b/src/component/HomePage/MoodboardUpload.vue
index f22204fc..592d1d7b 100644
--- a/src/component/HomePage/MoodboardUpload.vue
+++ b/src/component/HomePage/MoodboardUpload.vue
@@ -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'));
diff --git a/src/main.ts b/src/main.ts
index 298ee658..45ac62c0 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -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();