2023-10-30-1

src/component/HomePage/ColorboardUpload.vue

@@ -9,6 +9,9 @@
 					<div @click="selectColorItem(index,color)" :class="['upload_color',selectIndex === index ? 'select_upload_color' : '',]" :style="{background:`rgba(${color?.r},${color?.g},${color?.b},${color?.a})`}">
 					</div>
 				</div>
+				<div>
+					<span class="started_btn" @click="clearCurrentColor">Clear</span>
+				</div>
 			</div>
 		</div>
         <div class="colorboard_upload_right">
@@ -45,16 +48,11 @@
 									<div class="rgb_item">{{getSelectRGB(selectColor).b}}</div>
 								</div>
 							</div>
-							
 						</div>
                     </div>
-
                     <!-- <div class="color_review_block">
-                        <div class="color_review_content" :style="{background: reviewColor?.r || reviewColor?.r===0 ?`rgb(${reviewColor?.r},${reviewColor?.g},${reviewColor?.b})` : 'none'}"></div>
-                        <div class="pantong_name" v-show="pantongName">{{pantongName}}</div>
                         <div class="clear_button" @click="clearCurrentColor()">Clear</div>
                     </div> -->
-                   
                 </div>
 
                 <div class="right_content_line right_content_line_upload">
@@ -235,7 +233,7 @@ export default defineComponent({
         //选择不同的色块
         selectColorItem(index,color){
 			let hex
-			if(color.r){
+			if(color?.r){
 				hex = this.rgbaToHex([color.r,color.g,color.b,color.a?color.a:1])
 			}else{
 				hex = '#FFFFFF'
@@ -276,10 +274,10 @@ export default defineComponent({
         //清除当前的颜色
         clearCurrentColor(){
             this.selectColor = {}
-            this.fileList = []
+            // this.fileList = []
 			this.reviewColor={}
             this.pantongName = ''
-            this.pantongNameList = []
+            // this.pantongNameList = []
             this.tcxColor = ''
         },
 
@@ -485,17 +483,19 @@ export default defineComponent({
 			justify-content: space-between;
 		}
 		.modal_img{
-			width: 40rem;
+			width: 45rem;
+			// width: 40rem;
 			height: 5rem;
 			overflow-x: hidden;
 			display: flex;
+			align-items: center;
 			&.modal_img::-webkit-scrollbar {
 				display: none;
 			}
 			.modal_img_item{
 				width: 4rem;
 				height: 4rem;
-				margin: 0 1rem 1rem 0;
+				margin: 0 1rem 0 0;
 				position: relative;
 				cursor: pointer;
 				border: 0.1rem solid #DCDCEC;
@@ -553,39 +553,6 @@ export default defineComponent({
 				.upload_centetn::-webkit-scrollbar {
 					display: none;
 				}
-                .color_review_block{
-                    margin-right: 4rem;
-
-                    .color_review_content{
-                        width: 16.5rem;
-                        height: 16.5rem;
-                        background: #FFFFFF;
-                        border: 0.1rem solid #DCDCEC;
-                    }
-
-                    .pantong_name{
-                        margin-top: 1rem;
-                        font-size: 1.6rem;
-                        font-weight: 400;
-                        color: #030303;
-                        text-align: left;
-                        font-weight: bold;
-                    }
-
-                    .clear_button{
-                        padding:  0 2.8rem;
-                        height: 3.2rem;
-                        line-height: 3.2rem;
-                        background: #EFEEFF;
-                        font-size: 1.2rem;
-                        font-family: Roboto;
-                        color: #343579;
-                        display: inline-block;
-                        margin-top: 1rem;
-                        cursor: pointer;
-                    }
-                }
-
                 .upload_file_item{
                     // margin: 0 2rem 2rem 0;
 					margin: 0;