fix

src/views/HomeView.vue

@@ -41,8 +41,13 @@
 
 									</div>
 								</div>
+								<div v-show="isMannequinShow" class="left_info_hint">
+									<span class="icon iconfont icon-zhuyi"></span>
+									<span>{{ $t('HomeView.masnnequinHint') }}</span>
+								</div>
 							</div>
 							<!-- 有图状态 end-->
+							
 						</div>
 					</div>
 					<div class="home_page_right">
@@ -223,7 +228,7 @@ import { rgbToHsv, dataURLtoBlob } from "@/tool/util";
 import { openGuide,driverObj__ } from "@/tool/guide";
 import { LoadingOutlined } from "@ant-design/icons-vue";
 import draggable from 'vuedraggable'
-import JSZip from "jszip";
+import JSZip, { forEach } from "jszip";
 import { setCookie, getCookie, WriteCookie } from "@/tool/cookie";
 import i18n from "@/lang";
 import { useI18n } from "vue-i18n";
@@ -300,6 +305,12 @@ export default defineComponent({
 			return store.state.Guide.guide
 		})
 		let likeDesignItemIdList = ref([])
+		let workspacePosition:any = computed(()=>{
+			return store.state.Workspace.workspacePosition
+		})
+		let allBoardData:any = computed(()=>{
+			return store.state.UploadFilesModule.allBoardData})
+		let isMannequinShow = ref(false)
 		return {
 			store,
 			likeDesignCollectionList,
@@ -314,7 +325,10 @@ export default defineComponent({
 			userInfo,
 			t,
 			driver__,
-			likeDesignItemIdList
+			likeDesignItemIdList,
+			workspacePosition,
+			allBoardData,
+			isMannequinShow,
 		};
 	},
 	data() {
@@ -339,6 +353,18 @@ export default defineComponent({
 			designRandom:'',
 		};
 	},
+	watch: {
+		workspacePosition:{
+			handler(newVal:any,oldVal:any){
+				this.isMannequin()
+			},
+		},
+		allBoardData:{
+			handler(newVal:any,oldVal:any){
+				this.isMannequin()
+			},
+		},
+	},
 	mounted() {
 		// if(JSON.parse( getCookie('isFirst') as any)){
 			openGuide()
@@ -411,10 +437,23 @@ export default defineComponent({
 		_teams.splice(this.dragIdx, 1)      //删除被拖拽的那条数据
 		_teams.splice(index, 0, _dragitem)  //将被拖拽的那条数据放到数组中指定的位置
 		},
-
-
-
-
+		
+		//判断模特和当前start的sketch是否匹配
+		isMannequin(){
+			this.isMannequinShow = false
+			let isSketchItem:any
+			this.allBoardData?.sketchboardFiles?.forEach((sketchItem:any) => {
+				isSketchItem = true
+				this.workspacePosition.forEach((positionItem:any) => {
+					if(positionItem.name == sketchItem.category){
+						isSketchItem = false
+					}
+				});
+				if(isSketchItem){
+					this.isMannequinShow = true
+				}
+			});
+		},
 		formatter(value: number) {
 			return `${value}%`;
 		},
@@ -1187,7 +1226,8 @@ export default defineComponent({
 
 						.home_left_info {
 							height: 100%;
-
+							display: flex;
+							flex-direction: column;
 							.left_info_top {
 								padding: 0 0 1.3rem 0;
 								display: flex;
@@ -1210,6 +1250,13 @@ export default defineComponent({
 									width: 100%;
 								}
 							}
+							.left_info_hint{
+								display: flex;
+								span{
+									font-size: 1.3rem;
+									display: inline-block;
+								}
+							}
 						}
 					}
 				}

src/views/LibraryPage.vue

@@ -565,6 +565,7 @@ export default defineComponent({
 							label:item.value,
 						})
 					});
+					
 					this.sex = arr[0]
 					this.sexList = arr
 					this.getPosition()
@@ -735,8 +736,6 @@ export default defineComponent({
 				// }
 				labelArr.push(item[item.length-1]?item[item.length-1]:item)
 			})
-			console.log(this.value);
-			
 			let data2 = {
 				"classificationIdList": labelArr,
 				"classificationName": "",

src/views/LoginPage.vue

@@ -407,7 +407,6 @@ export default defineComponent({
 					ip:"",
 				};
 				// this.loginType = 'email'
-				this.emailStap = 2;
 				if(this.loginTime){
 					this.loginTime = false
 					Https.axiosPost(Https.httpUrls.preLogin, data).then(
@@ -415,6 +414,7 @@ export default defineComponent({
 						// if (rv) {
 						//     this.loginType = 'email'
 						// }
+						this.emailStap = 2;
 						if (rv) {
 							this.userId = rv.userId
 							this.loginType = 'email'
@@ -426,7 +426,6 @@ export default defineComponent({
 					).catch(res=>{
 						this.emailStap = 1;
 					});
-					
 					setTimeout(() => {
 						this.loginTime = true
 					}, 2000);

src/views/trialApproval.vue

@@ -265,7 +265,7 @@ export default defineComponent({
         this.gettrialList();
         this.userInfo = JSON.parse(getCookie("userInfo") as any);
 
-        if (this.userInfo.userId == 83) {
+        if (this.userInfo.userId == 83 || this.userInfo.userId == 88) {
         } else {
             router.replace("/home");
 			return