commit

src/component/HomePage/collectionModal.vue

@@ -3,7 +3,7 @@
          <a-modal class="modal_component collection_modal" 
             v-model:visible="showCollectionModal" 
             :footer="null" 
-            width="80%"
+            width="65%"
             :maskClosable="false"
             :centered="true"
 			:closable="false"
@@ -61,6 +61,7 @@ import MarketingSketchUpload from '@/component/HomePage/MarketingSketchUpload.vu
 import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 import { Modal,message } from 'ant-design-vue';
 import {useStore} from 'vuex'
+import GO from "@/tool/GO";
 export default defineComponent({
     components:{
         Generate,
@@ -79,6 +80,17 @@ export default defineComponent({
     },
     methods:{
         nextStep(){
+			if(this.collectionStep == 1){
+				let disposeMoodboard = this.store.state.UploadFilesModule.disposeMoodboard
+				let moodboard = this.store.state.UploadFilesModule.moodboard
+				if(moodboard.length > 1){
+					if (!disposeMoodboard || disposeMoodboard.length == 0) {
+						message.warning('You must select the image and then use the layout.')
+						return
+					}
+				}
+				
+			}
             this.collectionStep = this.collectionStep + 1
         },
 
@@ -113,6 +125,7 @@ export default defineComponent({
 				mask:false,
                 // centered:true,
                 onOk() {
+					GO.id = 0
                     _this.showCollectionModal = false
                     _this.store.commit('clearAllData')
                     _this.collectionStep = 1
@@ -123,10 +136,13 @@ export default defineComponent({
         //完成
         finishCollection(){
             let colorBoards = this.store.state.UploadFilesModule.colorBoards
+			
             if(!colorBoards  ||  colorBoards?.length < 1){
-                message.error('You must choose one or more colors for further process.')
+                message.warning('You must choose one or more colors for further process.')
                 return
             }
+			this.store.commit('clearAllId')
+			GO.id = 0
             this.showCollectionModal =false
             this.collectionStep = 1
             this.$emit('finishCollection')
@@ -155,6 +171,7 @@ export default defineComponent({
 			font-weight: 400;
 			color: rgba(0,0,0,.45);
 		}
+		
 	}
 	.collection_closeIcon{
 		top: 2rem;
@@ -245,7 +262,7 @@ export default defineComponent({
 <style lang="less">
 .collection_modal,.layout_modal{
 	// max-width: 1200px ;
-	max-width: 1150px ;
+	// max-width: 1150px ;
 	.ant-modal-content{
 		border-radius: 10px;
 		overflow: hidden;
@@ -258,6 +275,14 @@ export default defineComponent({
 			// height: calc(65vh - 6.4rem);
 			height: 65rem;
 		}
+		//进度完成字体颜色
+		
+		.ant-progress-circle.ant-progress-status-success .ant-progress-text{
+			color: #000;
+		}
+		.ant-progress-circle .ant-progress-text{
+			color:rgba(0, 0, 0, 0.55);
+		}
 	}
 }
 </style>