Merge branch 'StableVersion' of https://e.coding.net/aidlabfashion/aida/aida_front into StableVersion

src/views/HomeView/HomeView.vue

@@ -336,6 +336,7 @@ export default defineComponent({
 		let allBoardData:any = computed(()=>{
 			return store.state.UploadFilesModule.allBoardData})
 		let isMannequinShow = ref(false)
+		let chooseIsDesign:any = ref(1)
 		return {
 			store,
 			likeDesignCollectionList,
@@ -355,6 +356,7 @@ export default defineComponent({
 			workspacePosition,
 			allBoardData,
 			isMannequinShow,
+			chooseIsDesign,
 		};
 	},
 	data() {
@@ -471,6 +473,7 @@ export default defineComponent({
 			// this.store.commit("clearAllCollection");
 		}
 		if (this.$route.params.id) {
+			this.chooseIsDesign = this.$route.params.isDesign
 			if(this.$route.params.type == 'History'){
 				this.getHistoryChoose(this.$route.params.id, "normal");
 			}else if(this.$route.params.type == 'Works'){
@@ -604,6 +607,7 @@ export default defineComponent({
 					_this.store.commit("clearAllCollection");
 					_this.store.commit("setAllBoardDataChoose",{});
 					_this.store.commit("clearShowSketchboard",{});
+					_this.chooseIsDesign = 1;
 					_this.isHaveReviewCollection = false
 				}
 			});
@@ -663,6 +667,10 @@ export default defineComponent({
 
 		//设计新的collection
 		designNewCollection() {
+			if(this.chooseIsDesign == 0){
+				message.info(this.t('HomeView.jsContent1'));
+				return
+			}
 			let { colorBoards } =
 				this.store.state.UploadFilesModule.allBoardData;
 			if (!colorBoards || colorBoards?.length < 1) {

src/views/HomeView/Works.vue

@@ -24,6 +24,7 @@
 		</div>
 		
 		<newScaleImage ref="newScaleImage" @deletePorfolio="deletePorfolio"></newScaleImage>
+		<newScaleImageMobile ref="newScaleImageMobile" @deletePorfolio="deletePorfolio"></newScaleImageMobile>
 		<!-- <RobotAssist></RobotAssist> -->
 
     </div>
@@ -40,6 +41,8 @@ import { useStore } from "vuex";
 import { Https } from "@/tool/https";
 import { getCookie } from "@/tool/cookie";
 import newScaleImage from "@/component/WorksPage/newScaleImage.vue";
+import newScaleImageMobile from "@/component/WorksPage/newScaleImageMobile.vue";
+
 import { useI18n } from "vue-i18n";
 import { ElCascader } from 'element-plus'
 import { remove } from "jszip";
@@ -49,6 +52,7 @@ import Falls from "@/component/WorksPage/Falls.vue";
 export default defineComponent({
     components: {
         newScaleImage,
+		newScaleImageMobile,
 		Falls,
 		generalMenu,
     },
@@ -121,6 +125,7 @@ export default defineComponent({
 			value:'all',
 		})
 		let newScaleImage:any = ref()
+		let newScaleImageMobile:any = ref()
 		let fall:any = ref()
 		let setWorksSelect = (val:any) => {
 			filter.worksSelect = val.value
@@ -141,8 +146,16 @@ export default defineComponent({
 		let likeFile = (item:any,type:string) => {
 		}
 		let getImgScale = (item:any)=>{
-			newScaleImage.value.scaleImageMask = true
-			newScaleImage.value.init(item)
+			let newScaleModel = null
+			if(window.innerWidth < 768){
+				newScaleModel = newScaleImageMobile
+			}else{
+				newScaleModel = newScaleImage
+				newScaleModel.value.scaleImageMask = true
+
+			}
+			newScaleModel.value.init(item)
+			
 		}
 		let getPorfolio = ()=>{
 			let data = filter.getListDate
@@ -216,6 +229,7 @@ export default defineComponent({
 			menuList,
 			selectMenu,
 			newScaleImage,
+			newScaleImageMobile,
 			fall,
 			setWorksSelect,
 			likeFile,

src/views/HomeView/history.vue

@@ -333,7 +333,11 @@ export default defineComponent({
         },
 
         retrieveHome(record:any){
-            this.$router.push({name:'homePage',params: {id:record.id,type:'History'}})
+			let num = 1
+			if(record.original == 0){
+				num = 0
+			}
+            this.$router.push({name:'homePage',params: {id:record.id,type:'History',isDesign:num}})
         },
 		removeLabel(){
 			let setLabel:any = this.$refs.setLabel