Merge branch 'localDevelop' into develop

src/component/HomePage/PrintboardUpload.vue

@@ -104,7 +104,7 @@
 			</div>
 			<div v-show="openClick == 3" class="modal_accomplish">
 				<div class="input_border">
-					<div class="Guide_1_2_8 input_box" :class="[inputShow || inputShowEffectPoor?'active':'',driver__.driver?'showEvents':'']">
+					<div class="Guide_1_2_8 input_box" :class="[inputShow?'active':'',driver__.driver?'showEvents':'']">
 						<input class="search_input" @input="ifMaximumLength" @keydown.enter="getgenerate" :maxlength='inputShow?0:9999' :class="{forbidden:generateCheckbox}" :readonly="generateCheckbox" :placeholder="$t('PrintboardUpload.inputContent1')" v-model="captionGeneration">
 						<div class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('PrintboardUpload.Generate') }}</div>
 						<span ref="inputShowText"></span>
@@ -186,7 +186,6 @@ export default defineComponent({
 		])
 		let loadingShow = ref(false)
 		let inputShow = ref(false)
-		let inputShowEffectPoor = ref(false)//表示是否出现红框
 		let inputTime = ref()
 		let driver__:any = inject('driver__')
 		let {t} = useI18n()
@@ -213,7 +212,6 @@ export default defineComponent({
 			generateList,
 			loadingShow,
 			inputShow,
-			inputShowEffectPoor,
 			inputTime,
 			driver__,
 			t,
@@ -634,7 +632,6 @@ export default defineComponent({
 					(this.$refs.inputShowText as any).innerHTML = this.t('PrintboardUpload.maximumLength')
 					this.inputShow = true
 				}else{
-					this.inputShowEffectPoor = false
 					this.inputShow = false
 				}
 			},500)
@@ -662,7 +659,8 @@ export default defineComponent({
 			
 			let data = {
 				generateType:generateType,
-				designType:this.useGenerate.designType,
+				// designType:this.useGenerate.designType,
+				designType:'collection',
 				collectionElementId:this.useGenerate.imgId,
 				// collectionElementId:generage?.collectionElementid,
 				level1Type:this.upload.level1Type,
@@ -773,9 +771,10 @@ export default defineComponent({
 								});
 							});
 							// this.generateList = rv;
-							if(rv.filter((item:any)=>item.status == 'Invalid').length == 4) {
-								(this.$refs.inputShowText as any).innerHTML = this.t('Generate.effectPoor')
-								this.inputShowEffectPoor = true
+							if(rv.length == 4 && rv.filter((item:any)=>item.status == 'Invalid').length == 4) {
+								message.info(this.t('Generate.effectPoor'));
+
+								// (this.$refs.inputShowText as any).innerHTML = this.t('Generate.effectPoor')
 							}
 							if(arr.length == 0){
 								nextTick().then(()=>{