2023-10-31-2-dist

src/component/HomePage/PrintboardUpload.vue

@@ -117,12 +117,13 @@
 							<a-checkbox v-model:checked="item.pin">{{ $t('PrintboardUpload.PIN') }}</a-checkbox>
 						</div>
 					</div>
+					<div class="mark_loading" v-show="loadingShow">
+						<a-spin size="large" />
+					</div>
 				</div>
 			</div>
 		</div>
-		<div class="mark_loading" v-show="loadingShow">
-			<a-spin size="large" />
-		</div>
+		
         <Cropper ref="Cropper" @handleCropperSuccess="handleCropperSuccess" @closeCropper="deletUploadFile()" :cropperFileData="cropperFileData" :isUpload="isUpload"></Cropper>
     </div>
 </template>
@@ -277,6 +278,7 @@ export default defineComponent({
             // this.fileList.splice(item, 1)
             // this.store.commit('setPrintboardFile',this.fileList)
 			if(item.type_.type1 == 'generate' || item.type_.type1 == 'material'){
+				item.jsContent1 = this.t('uploadFile.jsContent1')
 				this.store.commit("addGenerateMaterialFils", item);
 			}else{
 				this.fileList = this.store.state.UploadFilesModule.printboardFiles
@@ -498,7 +500,7 @@ export default defineComponent({
 			let data = {
 				generateType:generateType,
 				designType:'',
-				collectionElementId:generage.collectionElementid,
+				collectionElementId:generage?.collectionElementid,
 				level1Type:generage.upload.level1Type,
 				level2Type:'',
 				text:this.captionGeneration,
@@ -507,7 +509,7 @@ export default defineComponent({
 				gender:'',
 			}
 			if(generateType == 'image'||generateType == 'text-image'){
-				if(generage.collectionElementid){
+				if(generage?.collectionElementid){
 					
 				}else{
 					message.warning(
@@ -543,8 +545,8 @@ export default defineComponent({
 						let arr
 						rv.generatedCollectionItems.forEach((v:any,index:number)=>{
 							arr = {
-								id:rv.generatedCollectionItems[index].generateItemId,
-								imgUrl:rv.generatedCollectionItems[index].generateItemUrl,
+								id:v.generateItemId,
+								imgUrl:v.generateItemUrl,
 								id_:GO.id++
 							}
 						this.generateList.push(arr)
@@ -562,6 +564,7 @@ export default defineComponent({
                 type2: 'Printboard',
             },
 			item.resData = JSON.parse(JSON.stringify(item))
+			item.jsContent1 = this.t('uploadFile.jsContent1')
             this.store.commit("addGenerateMaterialFils", item);
 		}
      }
@@ -834,6 +837,15 @@ export default defineComponent({
 				display: flex;
 				flex-wrap: wrap;
 				justify-content: flex-start;
+				position: relative;
+				align-content: flex-start;
+
+				.mark_loading{
+					position: absolute;
+					width: 100%;
+					height: 100%;
+					z-index: 99;
+				}
 				.modal_imgItem{
 					margin: 0 2rem 5rem 0;
 					display: inline-block;