Merge branch 'dev_vite' into StableVersion

src/component/Administrator/affiliate/affiliateAudit/editAudit.vue

@@ -57,7 +57,7 @@
           style="width: 250px"
         />
       </div>
-	  {{ currentState }}
+	  <!-- {{ currentState }} -->
 	  <div class="admin_state_item">
 		<span>State:</span>
 		<a-select v-model:value="currentState" style="width:250px" optionFilterProp="label" :options="state" placeholder="Please select" allowClear show-search></a-select>

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

@@ -287,7 +287,7 @@
               ></i>
               <div
                 class="icon iconfont icon-xiala"
-                v-show="scaleImageList[scaleImageIndex]?.resultType != 'Relight'"
+                v-show="showDropdown"
                 :class="{ active: speedState }"
                 @click.stop="openSpeed"
               ></div>
@@ -492,6 +492,14 @@ export default defineComponent({
       scaleImageList: [],
       generateCourse: null as any
     })
+
+    const showDropdown = computed(() => {
+      if (isPoseTransfer) {
+        return videoType.value === 1
+      } else {
+        return scaleImageList[scaleImageIndex]?.resultType != 'Relight'
+      }
+    })
     let speed = reactive({
       speedList: [] as any,
       speedTypeList: {
@@ -683,11 +691,11 @@ export default defineComponent({
       if (videoType.value !== 1) {
         const prompt = promptInputRef.value.getFullText()
         params.prompt = prompt
+        params.modelName = ''
       }
       return params
     }
     let getPrductimg = async () => {
-
       let obj = getData()
       // let imageStrength = productimg.productimgSimilarity == 100? 95 :productimg.productimgSimilarity
       let imageStrength = (70 / 100) * productimg.productimgSimilarity
@@ -1337,7 +1345,8 @@ export default defineComponent({
       newVideoList,
       setNewVideoRef,
       handlePlayNewVideo,
-      isNewVideoPlaying
+      isNewVideoPlaying,
+      showDropdown
     }
   },
   data() {

src/lang/cn.ts

@@ -652,7 +652,7 @@ export default {
     GoldSunflower: '金色向日葵',
     EmrldJungle: '翠绿丛林天幕',
     PinkSakura: '粉色樱花绽放',
-    generateLoading: '正在识别文字图片信息请稍等几秒后在试',
+    generateLoading: '正在识别文字图片信息请稍等几秒后再试',
     jsContent1: '您只能上传图片文件！',
     jsContent2: '图片必须小于5MB',
     jsContent3: '请输入内容~',