Merge branch 'dev_vite' of ssh://18.167.251.121:10002/aidlab/aida_front into dev_vite

src/component/home/design/editDesignType/index.vue

@@ -399,6 +399,7 @@ import {
   createVNode,
   reactive,
   computed,
+  watch,
   useTemplateRef
 } from 'vue'
 import { Https } from '@/tool/https'
@@ -494,10 +495,12 @@ export default defineComponent({
     })
 
     const showDropdown = computed(() => {
-      if (isPoseTransfer) {
+      if (isPoseTransfer.value) {
         return videoType.value === 1
       } else {
-        return scaleImageList[scaleImageIndex]?.resultType != 'Relight'
+        return (
+          productimg.scaleImageList[productimg.scaleImageIndex]?.resultType !== 'Relight'
+        )
       }
     })
     let speed = reactive({
@@ -546,12 +549,22 @@ export default defineComponent({
         document.removeEventListener('click', openSpeed)
       }
     }
+    const resetSpeedState = () => {
+      if (!speed.speedState) return
+      speed.speedState = false
+      document.removeEventListener('click', openSpeed)
+    }
     const setSpeed = (item: any) => {
       speed.speedData = item
       document.removeEventListener('click', openSpeed)
       speed.speedState = false
     }
     let scaleImage: any = ref(false)
+    watch(scaleImage, value => {
+      if (!value) {
+        resetSpeedState()
+      }
+    })
     let loadingShow = ref(false)
     let isComparison = ref(false) // home/design组件中修改的,当前组件没有修改
     const visible = ref<boolean>(false)
@@ -1290,6 +1303,7 @@ export default defineComponent({
       clearInterval(remPrductimgTime)
       productimg.productimgIsProductimg = false
       productimg.productimgRemProductimg = false
+      resetSpeedState()
     })
     return {
       t,

src/component/home/tools/toProduct/Prompt.vue

@@ -93,7 +93,7 @@ import generatedSketch from '@/assets/images/product/generated_sketch.png'
 import maleSingleGarmentSketch from '@/assets/images/product/male_single_garment_sketch.png'
 import maleSingleGarmentResult from '@/assets/images/product/male_single_garment_result.png'
 import maleSingleModelSketch from '@/assets/images/product/male_single_garment_model_sketch.png'
-import maleSingleModelResult from '@/assets/images/product/male_single_garment_model_sketch.png'
+import maleSingleModelResult from '@/assets/images/product/male_single_garment_model_result.png'
 import femaleChildModelResult from '@/assets/images/product/single_female_child_model_result.png'
 import maleSingleChildSketch from '@/assets/images/product/single_male_child_model_sketch.png'
 import maleSingleChildResult from '@/assets/images/product/single_male_child_model_result.png'