From 838d6e86bdc89cebaf247f5037ad2562a3fd8ad7 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Wed, 10 Jan 2024 16:13:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=A8=E6=88=B7=E6=8C=87?=
 =?UTF-8?q?=E5=BC=95mood=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/style/style.css                   | 16 ++++++++++++++++
 src/assets/style/style.less                  | 16 ++++++++++++++++
 src/component/Detail/habit.vue               |  4 ++--
 src/component/HomePage/Generate.vue          |  2 +-
 src/component/HomePage/Material.vue          | 14 ++++++++++++--
 src/component/HomePage/MoodboardUpload.vue   |  5 +++++
 src/component/HomePage/SketchboardUpload.vue |  2 +-
 src/lang/cn.ts                               |  4 ++--
 src/tool/guide.js                            |  3 ++-
 9 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/src/assets/style/style.css b/src/assets/style/style.css
index 4480a4f2..decd4e67 100644
--- a/src/assets/style/style.css
+++ b/src/assets/style/style.css
@@ -195,6 +195,22 @@ li {
     box-shadow: none;
   }
 }
+.Guide_ .Guide_img {
+  filter: drop-shadow(0px 0px 2px #ff5f5f) drop-shadow(0px 0px 1px #ff5f5f);
+  animation: identifier_img 1s infinite linear;
+  display: block !important;
+}
+@keyframes identifier_img {
+  0% {
+    filter: none;
+  }
+  50% {
+    filter: drop-shadow(0px 0px 2px #ff5f5f) drop-shadow(0px 0px 1px #ff5f5f);
+  }
+  100% {
+    filter: none;
+  }
+}
 :not(body):has(>.driver-active-element) {
   overflow: initial !important;
 }
diff --git a/src/assets/style/style.less b/src/assets/style/style.less
index 838ee147..398b1cc0 100644
--- a/src/assets/style/style.less
+++ b/src/assets/style/style.less
@@ -215,6 +215,22 @@ ul,li{
 			}
 		}
 	}
+	.Guide_img{
+		filter: drop-shadow(0px 0px 2px rgb(255, 95, 95))drop-shadow(0px 0px 1px rgb(255, 95, 95));
+		animation: identifier_img 1s infinite linear;
+		display: block !important;
+		@keyframes identifier_img {
+			0% {
+				filter: none;
+			}
+			50% {
+				filter: drop-shadow(0px 0px 2px rgb(255, 95, 95))drop-shadow(0px 0px 1px rgb(255, 95, 95));
+			}
+			100% {
+				filter: none;
+			}
+		}
+	}
 }
 
 :not(body):has(>.driver-active-element){
diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue
index 2823b8ea..50dda54a 100644
--- a/src/component/Detail/habit.vue
+++ b/src/component/Detail/habit.vue
@@ -137,14 +137,14 @@
 					<div class="model_img" v-show="systemSeleves" v-mousewheel>
 						<div class="model_img_item">
 							<div v-for="(item,index) in mannequins?.[0]?.modelList" :key="item.id">
-								<img :src="item?.presignedUrl" alt="" @click="setMannequins(item,'Library')">
+								<img :src="item?.presignedUrl" alt="" @click="setMannequins(item,'Library')" :class="[driver__.index == 4?driver__.driver?'Guide_img':'':'']">
 							</div>
 						</div>
 					</div>
 					<div class="model_img" v-show="!systemSeleves" v-mousewheel>
 						<div class="model_img_item">
 							<div v-for="(item,index) in mannequins?.[1]?.modelList" :key="item.id">
-								<img :src="item?.presignedUrl" alt="" @click="setMannequins(item,'System')">
+								<img :src="item?.presignedUrl" alt="" @click="setMannequins(item,'System')" :class="[driver__.index == 4?driver__.driver?'Guide_img':'':'']">
 							</div>
 						</div>
 					</div>
diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue
index dbdf846a..5bcbaa74 100644
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -398,7 +398,7 @@ export default defineComponent({
 			data.jsContent1 = this.t('uploadFile.jsContent1',{maxImg:maxImg})
             this.store.commit("addGenerateMaterialFils", data);
 			// console.log(this.fileList);
-			let moodboard = this.store.state.UploadFilesModule.moodboard
+			let moodboard = this.store.state.UploadFilesModule.moodboardGenerateFiles
 			if(moodboard.length >= 2 && this.driver__.driver){
 				driverObj__.moveNext()
 			}
diff --git a/src/component/HomePage/Material.vue b/src/component/HomePage/Material.vue
index 49fdb85a..982c683c 100644
--- a/src/component/HomePage/Material.vue
+++ b/src/component/HomePage/Material.vue
@@ -79,12 +79,13 @@
     
 </template>
 <script lang="ts">
-import { defineComponent, computed, ref} from 'vue'
+import { defineComponent, computed,inject, ref} from 'vue'
 import { Https } from "@/tool/https";
 import { message } from 'ant-design-vue';
 import { useStore } from "vuex";
 import GO from '@/tool/GO';
 import { useI18n } from 'vue-i18n';
+import { openGuide,driverObj__ } from "@/tool/guide";
 
 export default defineComponent({
     props: ["msg",'disignTypeList'],
@@ -101,6 +102,7 @@ export default defineComponent({
         let searcMaterialhName:any = ref('') //搜索名字
         let designType:any = ref(null)
         // let disignTypeList:any = ref([
+		let driver__:any = inject('driver__')
 				
         //     ])
 		let workspace:any = ref({})
@@ -120,7 +122,8 @@ export default defineComponent({
             designType,
             // disignTypeList,
 			workspace,
-			t
+			t,
+			driver__,
         }
     },
 	data (prop) {
@@ -268,6 +271,13 @@ export default defineComponent({
 			}
 			imgData.jsContent1 = this.t('uploadFile.jsContent1',{maxImg:maxImg})
 			this.store.commit("addGenerateMaterialFils", imgData);
+			let arr =  this.store.state.UploadFilesModule.moodboardMaterialFiles
+			console.log(arr);
+			if(arr.length >=2 && this.selectCode == 'Moodboard'){
+				if(this.driver__.driver){
+					driverObj__.moveNext()
+				}
+			}
         },
         //选择所有的图片
         async getLibraryList(str:any){
diff --git a/src/component/HomePage/MoodboardUpload.vue b/src/component/HomePage/MoodboardUpload.vue
index 7be6e537..8e2411f8 100644
--- a/src/component/HomePage/MoodboardUpload.vue
+++ b/src/component/HomePage/MoodboardUpload.vue
@@ -328,6 +328,11 @@ export default defineComponent({
 					}else{
 						this.store.commit("setMoodboardFile", fileList);
 					}
+					if(fileList.length >=2){
+						if(this.driver__.driver){
+							driverObj__.moveNext()
+						}
+					}
 				}else{
 					bor = false
 				}
diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue
index 7a9e851b..67b90f17 100644
--- a/src/component/HomePage/SketchboardUpload.vue
+++ b/src/component/HomePage/SketchboardUpload.vue
@@ -186,7 +186,7 @@
 				<div class="modal_img">
 					<div v-for="item,index in generateList" class="modal_imgItem Guide_1_13_2" :class="[driver__.driver?'showEvents':'',item?.checked?'active':'']">
 						<img :src="item.imgUrl" @click="generageAdd(item)">
-						<div class="operate_file_block">
+						<div class="operate_file_block" :class="[driver__.driver?'hideEvents':'']">
 							<div class="select_img_type">
 								<div
 									class="select_category Guide_1_13"
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index dc178ce5..0cdb3d13 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -356,7 +356,7 @@ export default {
 		guide4:'您目前可以从我们的系统库中选择人体模型。稍后，您还可以在注册自己的人体模型后从用户库中进行选择。',
 		guide5:'在这里开始您的创意之旅。 ',
 		guide6:'对于情绪板、印花或服装，我们提供三种不同的图片添加方法。第一种选择是<strong>上传</strong>，允许您直接从本地设备上传。',
-		guide7:"第二种方法是从您的<strong>我的</strong>中选择。<br> 您可能会注意到您的库页面目前是空的；不必担心。您上传的所有图像都将自动添加到您的库中。将来，您无需每次上传，只需从您的库中选择即可。",
+		guide7:"第二种方法是从您的<strong>收藏</strong>中选择。<br> 您可能会注意到您的库页面目前是空的；不必担心。您上传的所有图像都将自动添加到您的库中。将来，您无需每次上传，只需从您的库中选择即可。",
 		guide8:'第三种方法是使用最新的图像生成技术<strong>生成</strong>图像。',
 		guide9:"输入捕捉您希望表达的情绪的关键词，然后单击“生成”按钮。",
 		guide10:'为您的心情板选择两个图像。',
@@ -392,7 +392,7 @@ export default {
 		guide40:"点击您感兴趣的任何设计图片以修改细节。",
 		guide41:"点击衣服以修改其细节。",
 		guide42:"点击此处添加或更改印花。",
-		guide43:"您可以在我的中找到您之前上传的印花。",
+		guide43:"您可以在收藏中找到您之前上传的印花。",
 		guide44:"为此草图选择一个印花。",
 		guide45:"点击此处布局所选印花。",
 		guide46:"在此处预览印刷设计。",
diff --git a/src/tool/guide.js b/src/tool/guide.js
index 7bf2805a..2056322d 100644
--- a/src/tool/guide.js
+++ b/src/tool/guide.js
@@ -118,7 +118,7 @@ function createDriver(){
 		showButtons:false,
 		stagePadding:10,//切口到元素的距离
 		stageRadius:5,//切口圆弧度
-		allowKeyboardControl:false,//控制是否可以键盘控制下一步
+		allowKeyboardControl:true,//控制是否可以键盘控制下一步
 		disableActiveInteraction:false,//是否禁用显示元素的交互
 		overlayOpacity:.4,
 		overlay: true,
@@ -126,6 +126,7 @@ function createDriver(){
 		// prevBtnText: '‹—',
 		doneBtnText: '✕',
 		onPopoverRender: (popover, options) => {//每个步骤的元素和所有信息
+			// console.log(popover,options);
 			stepsLenth = options.config.steps.length
 			addClose()
 			popover.previousButton.style.display = 'none'