dist

src/component/HomePage/SketchboardUpload.vue

@@ -681,37 +681,57 @@ export default defineComponent({
 				version:1,//为1就是Print
 				gender:this.workspace.sex,
 			}
-			if(generateType == 'image'||generateType == 'text-image'){
+			if(generateType == 'image'){
 				if(generage?.collectionElementid){
+					data.text = ''
 				}else{
 					message.info(
-						this.t('SketchboardUpload.jsContent5')
+						this.t('PrintboardUpload.jsContent4')
 					);
 					return
 				}
 			}else if(generateType == 'text'){
-				// this.beforeUpload(false)
 				data.collectionElementId = ''
 				data.level2Type = ''
+				// this.beforeUpload(false)
 				if(this.captionGeneration){
 					let arr = this.captionGeneration.split(/\s+/).length
 					if(arr > 75){
 						message.info(
-						this.t('SketchboardUpload.jsContent6')
+							this.t('PrintboardUpload.jsContent5')
+						);
+					return
+
+					}
+				}else{
+					message.info(
+						this.t('PrintboardUpload.jsContent6')
+					);
+					return
+				}
+			}else if(generateType == 'text-image'){
+				if(generage?.collectionElementid){
+					if(this.captionGeneration){
+						let arr = this.captionGeneration.split(/\s+/).length
+						if(arr > 75){
+							message.info(
+								this.t('PrintboardUpload.jsContent5')
+							);
+						return
+						}
+					}else{
+						message.info(
+							this.t('PrintboardUpload.jsContent6')
 						);
 						return
 					}
 				}else{
 					message.info(
-						this.t('SketchboardUpload.jsContent7')
-						
+						this.t('PrintboardUpload.jsContent4')
 					);
 					return
 				}
 			}
-			if(generateType == 'image'){
-				data.text = ''
-			}
 			this.loadingShow = true
 			Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then(
                 (rv) => {