2023-11-23-1

2023-11-23 11:15:10 +08:00
parent 4baf8f3e3e
commit 25c0a80bb4
8 changed files with 156 additions and 81 deletions
--- a/src/component/Detail/habit.vue
+++ b/src/component/Detail/habit.vue
@@ -39,7 +39,7 @@
 				<a-dropdown @click.stop="setOpenType('sex')">
                    <a-button>
                        <UserOutlined />
-                        {{ workspaceItem.sex }}
+                        {{ workspaceItem?.sexEnum?.value }}
                        <!-- {{ workspaceItem.sex.label }} -->
                        <DownOutlined />
                    </a-button>
@@ -47,7 +47,7 @@
 				<div class="habit_model_show habit_sex_show"  v-fade="openType.sex">
 					<ul class="habit_model_list">
 						<li v-for="item,index in sex">
-							<div @click.stop="setSex(item)">{{ item.label }}</div>
+							<div @click.stop="setSex(item)">{{ item.value }}</div>
 						</li>
 					</ul>
 				</div>
@@ -71,14 +71,14 @@
                <a-dropdown @click.stop="setOpenType('singleton')">
                    <a-button>
                        <UserOutlined />
-                        {{ workspaceItem.position }}
+                        {{ workspaceItem?.positionEnum?.value }}
                        <DownOutlined />
                    </a-button>
                </a-dropdown>
 				<div class="habit_model_show habit_singleton_show"  v-fade="openType.singleton">
 					<ul class="habit_model_list">
 						<li v-for="item,index in singleTypeList">
-							<div @click.stop="setSingle(item.value)">{{ item.label }}</div>
+							<div @click.stop="setSingle(item)">{{ item.value }}</div>
 						</li>
 					</ul>
 				</div>
@@ -335,8 +335,9 @@ export default defineComponent({
 					let arr:any = []
 					rv.forEach((item:any) => {
 						let obj = {
-							value:item.key,
-							label:item.name,
+							value:item.value,
+							name:item.name,
+							key:item.key,
 						}
 						arr.push(obj)						
 					});
@@ -357,20 +358,23 @@ export default defineComponent({
 					let arr:any = []
 					rv.forEach((item:any) => {
 						let obj = {
-							value:item.name,
-							label:item.name,
+							value:item.value,
+							name:item.name,
+							key:item.key,
 						}
 						arr.push(obj)						
 					});
 					this.singleTypeList = arr
 					if(str == 'sex'){
-						this.workspaceItem.position = this.singleTypeList[0].label
+						this.workspaceItem.position = this.singleTypeList[0].name
+						this.workspaceItem.positionEnum = this.singleTypeList[0]
 					}
 				}
 			})
 		},
 		setPosition(){
-			this.workspaceItem.position = this.singleTypeList[0].label
+			this.workspaceItem.position = this.singleTypeList[0].name
+			this.workspaceItem.positionEnum = this.singleTypeList[0]
 		},
 		getworkspace(){
 			// Https.axiosGet(Https.httpUrls.workspaceDetail,{params:{id:3}}).then((rv: any) => {
@@ -452,8 +456,8 @@ export default defineComponent({
 		//
 		setOverallSingle(){
 			if(this.workspaceItem.overallSingle){
-				this.workspaceItem.position = this.singleTypeList[0].label
-				
+				this.workspaceItem.position = this.singleTypeList[0].name
+				this.workspaceItem.positionEnum = this.singleTypeList[0]
 			}else{
 				this.workspaceItem.position = 'Overall'
 			}
@@ -548,28 +552,30 @@ export default defineComponent({
 			});
 		},
 		setSex(v:any){
+			this.workspaceItem.sexEnum = v
 			this.openType.sex = false
-			this.workspaceItem.sex.value = v.value
-			this.workspaceItem.sex.label = v.label
+			this.workspaceItem.sex = v.name
 			this.getMannequins()
 			this.setMannequinsSex()
 			this.getPosition('sex')
 			
 		},
 		//设置single & overall
-		setSingle(v:string){
+		setSingle(v:any){
 			this.openType.singleton = false
-			this.workspaceItem.position = v
+			this.workspaceItem.position = v.name
+			this.workspaceItem.positionEnum = v
+
 		},
 		setMannequins(item:any,str:string){//设置模特
 			// this.workspaceItem.mannequinId = item.id
 			// this.workspaceItem.mannequinType = str
 			// this.workspaceItem.mannequinUrl = item.presignedUrl
-			if(this.workspaceItem.sex == 'Female'){
+			if(this.workspaceItem.sexEnum.name == 'Female'){
 				this.workspaceItem.femalePresignedUrl = item.presignedUrl
 				this.workspaceItem.mannequinFemaleType  = str
 				this.workspaceItem.mannequinFemaleId = item.id
-			}else if(this.workspaceItem.sex == 'Male'){
+			}else if(this.workspaceItem.sexEnum.name == 'Male'){
 				this.workspaceItem.malePresignedUrl = item.presignedUrl
 				this.workspaceItem.mannequinMaleType  = str
 				this.workspaceItem.mannequinMaleId = item.id
@@ -580,11 +586,11 @@ export default defineComponent({
 		},
 		// FEMALE     MALE
 		setMannequinsSex(){
-			if(this.workspaceItem.sex == 'Female'){
+			if(this.workspaceItem.sexEnum.name == 'Female'){
 				this.workspaceItem.mannequinUrl = this.workspaceItem.femalePresignedUrl
 				this.workspaceItem.mannequinType = this.workspaceItem.mannequinFemaleType
 				this.workspaceItem.mannequinId = this.workspaceItem.mannequinFemaleId
-			}else if(this.workspaceItem.sex == 'Male'){
+			}else if(this.workspaceItem.sexEnum.name == 'Male'){
 				this.workspaceItem.mannequinUrl = this.workspaceItem.malePresignedUrl
 				this.workspaceItem.mannequinType = this.workspaceItem.mannequinMaleType
 				this.workspaceItem.mannequinId = this.workspaceItem.mannequinMaleId
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="generate Guide_1_6">
+    <div class="generate Guide_ Guide_1_6">
        <div v-if="type_.type2 == 'Sketchboard'|| type_.type2 == 'Printboard'"  class="generate_checkbox">
            <div>
                <label>
@@ -40,7 +40,7 @@
 				</ul>
 			</div>
        </div>
-        <div v-else class="input_box Guide_1_5" :class="[inputShow?'active':'',]">
+        <div v-else class="input_box Guide_ Guide_1_5" :class="[inputShow?'active':'',]">
            <input
                class="search_input"
 				@input="ifMaximumLength"
@@ -157,7 +157,7 @@
                v-for="(item, index) in fileList"
                :key="item.imgUrl"
                @click="generageAdd(item)"
-                :class="{ active: item?.checked }"
+                :class="[item?.checked?'active':'',driver__.driver?'hideEvents':'']"
            >
                <img v-lazy="item.imgUrl" alt="" />

@@ -183,7 +183,7 @@
 <script lang="ts">
 import { LoadingOutlined } from "@ant-design/icons-vue";
 import { message, Upload } from "ant-design-vue";
-import { defineComponent, computed, h, ref, nextTick } from "vue";
+import { defineComponent, computed, h, ref, nextTick, inject } from "vue";
 import { Https } from "@/tool/https";
 import { useStore } from "vuex";
 import GO from "@/tool/GO";
@@ -245,7 +245,7 @@ export default defineComponent({
 		let loadingShow = ref(false)
 		let inputShow = ref(false)
 		let inputTime = ref()
-
+		let driver__:any = inject('driver__')
 		let {t} = useI18n()

 		let isTest = ref()
@@ -275,6 +275,7 @@ export default defineComponent({
 			workspace,
 			inputShow,
 			inputTime,
+			driver__,
 			t,
 			isTest,
        };
@@ -335,6 +336,11 @@ export default defineComponent({
            data.type_ = this.type_;
 			data.resData = JSON.parse(JSON.stringify(data))
            this.store.commit("addGenerateMaterialFils", data);
+			console.log(this.fileList);
+			let moodboard = this.store.state.UploadFilesModule.moodboard
+			if(moodboard.length >= 2 && this.driver__.driver){
+				driverObj__.moveNext()
+			}
        },
 		
        beforeUpload(file: any) {
@@ -447,7 +453,12 @@ export default defineComponent({
 						this.fileList.push(arr)
 						this.loadingShow = false
 						})
-						driverObj__.moveNext()
+						if(this.driver__.driver){
+							driverObj__.moveTo(5)
+						}
+						// if(){
+						// 	// driverObj__.moveNext()
+						// }
 					}
                }
            ).catch(res=>{
@@ -702,17 +713,8 @@ export default defineComponent({
                height: 10rem;
            }
 			.delete_like_file_block{
-				display: none;
-				width: 3.2rem;
-				height: 3.2rem;
-				background: rgba(0,0,0,0.6);
-				border-radius: 0.4rem;
-				position: absolute;
 				top: 0.9rem;
 				right: 0.9rem;
-				text-align: center;
-				line-height: 3.2rem;
-				left: auto;
 				&.left{
 					left: .9rem;
 				}
--- a/src/component/HomePage/MoodboardUpload.vue
+++ b/src/component/HomePage/MoodboardUpload.vue
@@ -18,7 +18,7 @@
                </div>
                <div
                    @click.stop="open(3)"
-                    class="switch_type_item Guide_1_4"
+                    class="switch_type_item Guide_ Guide_1_4"
                    :class="[openClick == 3 ? 'select_swtich' : '']"
                >
                    <span>{{ $t('MoodboardUpload.Generate') }}</span>
@@ -109,14 +109,14 @@
            ></Generate>
        </div>
        <div v-show="moodboarList.length" class="modal_right">
-			<div class="modal_layout">
+			<div class="modal_layout Guide_ Guide_1_7">
 				<div class="modal_text">
 					<div>
 						{{ $t('MoodboardUpload.Thumbnail') }}
 					</div>
 					<div class="modal_btn started_btn" @click="layout()">{{ $t('MoodboardUpload.layout') }}</div>
 				</div>
-				<div class="modal_img">
+				<div class="modal_img" :class="[driver__.driver?'hideEvents':'']">
 					<div class="modal_img_item" v-for="item,index in moodboarList" :key="item" @click="deleteFile(item)">
 						<img v-lazy="item.imgUrl">
 						<div class="checked" >
@@ -152,7 +152,7 @@
    </div>
 </template>
 <script lang="ts">
-import { defineComponent, h, ref ,computed,nextTick} from "vue";
+import { defineComponent, h, ref ,computed,nextTick,inject} from "vue";
 import { LoadingOutlined } from "@ant-design/icons-vue";
 import { getCookie } from "@/tool/cookie";
 import { getUploadUrl } from "@/tool/util";
@@ -167,7 +167,8 @@ import domTurnImg from '@/tool/domTurnImg'
 import GO from "@/tool/GO";
 import moodb from "@/tool/moodb";
 import { useI18n } from "vue-i18n";
-import { openGuide,driverObj__,driverIndex__ } from "@/tool/guide";
+import { openGuide,driverObj__ } from "@/tool/guide";
+import { driver } from "driver.js";
 export default defineComponent({
    components: { Material, MoodTemplate, Generate,layout },
    setup() {
@@ -186,9 +187,11 @@ export default defineComponent({
 		let modalImg:any= computed(()=>{
 			return store.state.UploadFilesModule.disposeMoodboard
 		})
-		let driverIndex:any = computed(()=>{
-			return store.state.Guide.guide
-		})
+		// let driver__:any = computed(()=>{
+		// 	return store.state.Guide.guide
+		// })
+		let driver__:any = inject('driver__')
+
 		let uploading:any = ref([])
 		let edieShow:any = ref()
 		let {t} = useI18n()
@@ -206,7 +209,7 @@ export default defineComponent({
 			layoutOpen,
 			loadingShow,
 			modalImg,
-			driverIndex,
+			driver__,
 			uploading,
 			edieShow,
 			t,
@@ -261,7 +264,7 @@ export default defineComponent({
 				// }
 			}
 		},
-		driverIndex:{
+		driver__:{
 			handler(newVal,oldVal){
 				if(newVal.index >= 1 && newVal.index <= 2){
 					this.open(newVal.index)
@@ -301,7 +304,10 @@ export default defineComponent({
 				let material:any = this.$refs.Material
 				material.init('Moodboard')
 			}else if (num == 3){
-				driverObj__.moveNext()
+				// let driver = this.store.state.Guide.guide.driver
+				if(this.driver__.driver){
+					driverObj__.moveNext()
+				}
 				// let Generate:any = this.$refs.Generate
 				// Generate.init('generate')
 			}
@@ -455,6 +461,7 @@ export default defineComponent({
 				v.setPitch = false
 			})

+
 			nextTick().then(async ()=>{
 				let layoutCentent = document.getElementById('modal_img')
 				let file = await domTurnImg(layoutCentent)
@@ -475,7 +482,7 @@ export default defineComponent({
 				).catch(rv=>{
 					this.loadingShow = false
 				})
-
+				driverObj__.moveNext()
 			})
 			
 			
--- a/src/component/HomePage/RobotAssist.vue
+++ b/src/component/HomePage/RobotAssist.vue
@@ -43,12 +43,11 @@
 	</div>
 </template>
 <script lang="ts">
-import { defineComponent, createVNode, ref,Ref} from "vue";
+import { defineComponent, createVNode,computed, ref,Ref} from "vue";
 import { UserOutlined, DownOutlined } from "@ant-design/icons-vue";
 import { Https } from "@/tool/https";
 import { getCookie } from "@/tool/cookie";
-import axios from 'axios'
-
+import { useStore } from "vuex";
 import { message } from "ant-design-vue";
 import { useI18n } from "vue-i18n";
 export default defineComponent({
@@ -71,6 +70,8 @@ export default defineComponent({
 		let bloodBars:any = ref(0)
 		let {t} = useI18n()
 		let isTest = ref()
+		let store = useStore()
+		let workspace:any = ref({})
 		return {
 		robotTop,
 		robotInput,
@@ -84,6 +85,8 @@ export default defineComponent({
 		bloodBars,
 		t,
 		isTest,
+		store,
+		workspace
 		};
 	},
    data() {
@@ -102,6 +105,9 @@ export default defineComponent({
 			this.record = JSON.parse(sessionStorage.getItem("record") as string)
 		}
 		this.getBloodBars()
+		this.workspace = computed(()=>{
+			return  this.store?.state?.Workspace?.workspace
+		})

 	},
 	directives:{
@@ -186,6 +192,7 @@ export default defineComponent({
 				"user_id" : this.userInfo?.userId,
 				"session_id":sessionId,
 				"message" : this.chatCentent,
+				gender:this.workspace.sexEnum.name,
 			}
 			let interaction = {onDownloadProgress: (progressEvent:any) => {
 					this.clearTimer()
@@ -325,30 +332,6 @@ export default defineComponent({
 					overflow: hidden;
 					margin: 0 5%;
 					margin-bottom: 5%;
-					.delete_like_file_block{
-						display: none;
-						width: 3.2rem;
-						height: 3.2rem;
-						background: rgba(0,0,0,0.6);
-						border-radius: 0.4rem;
-						position: absolute;
-						top: 0rem;
-						right: 0rem;
-						text-align: center;
-						line-height: 3.2rem;
-						left: auto;
-						cursor: pointer;
-						i{
-							font-size: 1.6rem;
-							color: #fff;
-							&.fi-rr-heart{
-
-							}
-							&.fi-sr-heart{
-								color: red;
-							}
-						}
-					}
 					&:hover .delete_like_file_block{
 						display: block;
 					}
--- a/src/component/HomePage/collectionModal.vue
+++ b/src/component/HomePage/collectionModal.vue
@@ -1,6 +1,6 @@
 <template>
    <div v-if="showCollectionModal">
-         <a-modal class="modal_component collection_modal Guide_1_2" 
+         <a-modal class="modal_component collection_modal Guide_ Guide_1_2" 
            v-model:visible="showCollectionModal" 
            :footer="null" 
            width="65%"
@@ -32,11 +32,11 @@
 				</div> -->
 				<i class="fi fi-rr-cross-small"></i>
 			</div>
-			<div class="collection_page">
+			<div class="collection_page" :class="[driver__.driver?'hideEvents':'']">
 				<!-- <div v-if="collectionStep < 5" class="next_step_button" @click.stop="nextStep()">Next Step</div> -->
 				<!-- <div v-else class="next_step_button" @click.stop="finishCollection()">Finish</div> -->
 				<i v-show="collectionStep > 1" class="fi fi-rr-arrow-small-left" @click="lastStep()"></i>
-				<i v-if="collectionStep < 4" class="fi fi-rr-arrow-small-right" @click.stop="nextStep()"></i>
+				<i v-if="collectionStep < 4" class="fi fi-rr-arrow-small-right Guide_ Guide_1_8" @click.stop="nextStep()"></i>
 				<!-- <i v-else  class="fi fi-rr-arrow-small-right" @click.stop="finishCollection()"></i> -->
 				<i v-else class="fi fi-rr-check" @click.stop="finishCollection()"></i>
 				<!-- <span  class="icon iconfont icon-fanhui header_icon_fanhui" @click="lastStep()"></span> -->
@@ -54,7 +54,7 @@
   
 </template>
 <script lang="ts">
-import { defineComponent ,createVNode, ref, computed } from 'vue'
+import { defineComponent ,createVNode, ref, computed,provide } from 'vue'

 import Generate from '@/component/HomePage/Generate.vue'
 import MoodboardUpload from '@/component/HomePage/MoodboardUpload.vue'
@@ -65,6 +65,7 @@ import MarketingSketchUpload from '@/component/HomePage/MarketingSketchUpload.vu
 import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 import { Modal,message } from 'ant-design-vue';
 import {useStore} from 'vuex'
+import { openGuide,driverObj__ } from "@/tool/guide";
 import GO from "@/tool/GO";
 import { useI18n } from 'vue-i18n'
 export default defineComponent({
@@ -79,7 +80,12 @@ export default defineComponent({
 	setup(){
 		const store = useStore()
 		let {t} = useI18n()
+		let driver__:any = computed(()=>{
+			return store.state.Guide.guide
+		})
+		provide('driver__',driver__)
 		return {
+			driver__,
 			t,
 		}
 	},
@@ -114,6 +120,7 @@ export default defineComponent({
 					return
 				}
 			}
+			driverObj__.moveNext()
 			this.collectionStep = this.collectionStep + 1
        },

@@ -235,11 +242,15 @@ export default defineComponent({
 		left: 50%;
 		transform: translateX(-50%);
 		bottom: 3rem;
+		height: 3.2rem;
+		display: flex;
 		.fi-rr-arrow-small-left{
 			margin-right: 10rem;
 		}
 		.fi{
 			cursor: pointer;
+			display: flex;
+			height: 100%;
 		}
 		.fi::before{
 			padding: 5px;