页面调整

src/component/home/design/collection/ColorboardUpload.vue

@@ -1341,7 +1341,7 @@ export default defineComponent({
 							border-radius: 50%;
 							width: 4rem;
 							height: 4rem;
-							border: solid 2px #39215b;
+							border: solid 2px #000;
 							display: flex;
 							align-items: center;
 							justify-content: center;
@@ -1359,7 +1359,7 @@ export default defineComponent({
 								width: 1rem;
 								height: 1rem;
 								border-radius: 50%;
-								background: #39215b;
+								background: #000;
 							}
 						}
 					}

src/component/home/design/collection/PrintboardUpload.vue

@@ -148,11 +148,11 @@
 							<label @click="()=>{if(!item?.pin)item.pin = false;item.pin = !item.pin}">
 								<i v-if="item.pin" class="fi fi-rr-check"></i>
 								<i v-else class="fi noCheck"></i>
-								<span>PIN</span>
+								<span>{{ $t('PrintboardUpload.PIN') }}</span>
 							</label>
 						</div>
 						<div class="moreBox" @click.stop> 
-							<more :moreList="['edit','down','enlargement','delete']" :item="item" :index="index" @deleteFile="deleteFile" @scaleImage="scaleImage"></more>
+							<more level1Type="Printboard" :moreList="['edit','down','enlargement','delete']" :item="item" :index="index" @deleteFile="deleteFile" @scaleImage="scaleImage"></more>
 						</div>
 					</div>
 				</div>
@@ -839,7 +839,8 @@ export default defineComponent({
 			}
 		}
 		.modal_layout{
-			padding-bottom: 4.8rem;
+			padding-bottom: 2.8rem;
+			// padding-bottom: 4.8rem;
 			.modal_img{
 				width: calc(40rem*1.2);
 				height: calc(5rem*1.2);

src/component/home/design/collection/SketchboardUpload.vue

@@ -90,6 +90,7 @@
                                 :data="{
                                     ...upload,
 									gender:workspace.sex,
+									ageGroup:workspace.ageGroup,
                                 }"
 								:multiple="!driver__.driver"
                                 :before-upload="beforeUpload"
@@ -168,11 +169,11 @@
 							<label @click="()=>{if(!item?.pin)item.pin = false;item.pin = !item.pin}">
 								<i v-if="item.pin" class="fi fi-rr-check"></i>
 								<i v-else class="fi noCheck"></i>
-								<span>PIN</span>
+								<span>{{ $t('PrintboardUpload.PIN') }}</span>
 							</label>
 						</div>
 						<div class="moreBox" @click.stop> 
-							<more :moreList="['edit','down','enlargement','delete']" :item="item" :index="index" @deleteFile="deleteFile" @scaleImage="scaleImage"></more>
+							<more level1Type="Sketchboard" :moreList="['edit','down','enlargement','delete']" :item="item" :index="index" @deleteFile="deleteFile" @scaleImage="scaleImage"></more>
 						</div>
 					</div>
 				</div>
@@ -783,7 +784,8 @@ export default defineComponent({
 			}
 		}
 		.modal_layout{
-			padding-bottom: 4.8rem;
+			// padding-bottom: 4.8rem;
+			padding-bottom: 2.8rem;
 			.modal_img{
 				width: calc(40rem*1.2);
 				height: calc(5rem*1.2);

src/component/home/design/collection/more.vue

@@ -20,6 +20,7 @@
 			</div>
 		</div>
     </div>
+	<modalCanvas ref="modalCanvas" @setSloganData="saveBase64Img"></modalCanvas>
 </template>
 <script lang="ts">
 import { defineComponent,computed,ref,provide,nextTick,createVNode,toRefs, reactive} from 'vue'
@@ -29,14 +30,17 @@ import { Https } from "@/tool/https";
 import { useStore } from "vuex";
 import { useI18n } from 'vue-i18n'
 import { downloadIamge } from "@/tool/util";
+import modalCanvas from "@/component/modules/generalModalCanvas.vue";
 
 export default defineComponent({
     components:{
+		modalCanvas,
     },
 	props:{
 		moreList:{type:Array,default:()=>[]},
 		item:{type:Object,default:()=>{}},
 		index:{type:Number,default:0},
+		level1Type:{type:String,default:''},
 	},
 	emits:['deleteFile','scaleImage'],
     setup(props,{emit}) {
@@ -46,6 +50,7 @@ export default defineComponent({
 		})
 		
 		const dataDom = reactive({
+			modalCanvas:null as any
 		})
 		const openList = ()=>{
 			data.show = true
@@ -59,20 +64,25 @@ export default defineComponent({
 			if(str == 'delete'){
 				emit("deleteFile",props.item);
 			}else if(str == 'edit'){
-				emit("scaleImage",props.index);
+				console.log(props.item)
+				dataDom.modalCanvas.init(props.item,'')
 			}else if(str == 'down'){
-				console.log(props.item);
-				downloadIamge(props.item.url)
+				downloadIamge(props.item.url || props.item.imgUrl)
 			}else if(str == 'enlargement'){
 				emit("scaleImage",props.index);
 			}
 			setShow()
 		}
+		const saveBase64Img = (rv)=>{
+			console.log(rv)
+
+		}
         return{
 			...toRefs(dataDom),
 			...toRefs(data),
 			openList,
 			setMore,
+			saveBase64Img,
         }
     },