Merge remote-tracking branch 'origin/StableVersion' into develop

src/component/HomePage/scaleImage.vue

@@ -102,15 +102,14 @@
 			</div>
 			<div class="scaleImage_content_imgBox" :class="{active:isComparison}">
 				<img v-if="isComparison" :src="scaleImageList[scaleImageIndex]?.sourceUrl">
-				<img :src="scaleImageList[scaleImageIndex]?.imgUrl">
+				<generalMiniCanvas v-if="isCanvas" :imgUrl="scaleImageList[scaleImageIndex]?.imgUrl" @submitBase64Data="submitBase64Data"></generalMiniCanvas>
+				<img v-else :src="scaleImageList[scaleImageIndex]?.imgUrl">
 				<div class="img_operate_block" v-if="isLike">
 					<i v-if="!scaleImageList[scaleImageIndex]?.like" class="fi fi-rr-heart operate_icon" @click.stop="LikeFile(scaleImageList[scaleImageIndex],'like')"></i>
 					<i v-else class="fi fi-sr-heart operate_icon" :adminLike="!!scaleImageList[scaleImageIndex]?.like" @click.stop="LikeFile(scaleImageList[scaleImageIndex],'noLike')"></i>
 				</div>
 			</div>
-			
 		</div>
-		
 		<div class="scaleImage_nav" @keydown="handleKeyDown">
 			<div class="nav_left">
 				<i class="fi fi-rr-arrow-small-left" @click="lastStep()"></i>
@@ -124,18 +123,9 @@
 				<i class="fi fi-rr-arrow-small-right" @click.stop="nextStep()"></i>
 			</div>
 		</div>
-	<!-- <div>
-		<a-button type="primary" @click="() => setVisible(true)">show image preview</a-button>
-			<a-image
-			:width="200"
-			:style="{ display: 'none' }"
-			:preview="{
-				visible,
-				onVisibleChange: setVisible,
-			}"
-			src="https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png"
-			/>
-		</div> -->
+		<div class="mark_loading" v-show="loadingShow">
+				<a-spin size="large" />
+			</div>
 	</a-modal>
 </template>
 
@@ -147,7 +137,9 @@ import { useStore } from "vuex";
 import { downloadIamge } from "@/tool/util";
 import { getCookie,setCookie } from "@/tool/cookie";
 
+import generalMiniCanvas from "@/component/modules/generalMiniCanvas.vue";
 export default defineComponent({
+	components:{generalMiniCanvas},
 	props:{
 		productData:{
             type:Object,
@@ -156,7 +148,16 @@ export default defineComponent({
 				brightenValue:1,
 				upload:'',
 			},
-		}
+		},
+		isCanvas:{
+			type:Boolean,
+			default:false,
+		},
+		workspace:{
+			type:Object,
+			default:{
+			}
+		},
 	},
     setup(props:any,{emit}) {
 		const store = useStore();
@@ -298,6 +299,27 @@ export default defineComponent({
 				});
 			}
 		}
+		let submitBase64Data = (rv:any)=>{
+			loadingShow.value = true
+			let data = {
+				"base64": rv,
+				"category": scaleImageList.value[scaleImageIndex.value]?.categoryValue,
+				"gender": props.workspace.sexEnum.value,
+			}
+			Https.axiosPost(Https.httpUrls.modifySketch, data).then(
+				(rv) => {
+					rv.imgUrl = rv.url
+					rv.status = 'Success'
+					rv.category = scaleImageList.value[scaleImageIndex.value]?.category
+					rv.categoryValue = scaleImageList.value[scaleImageIndex.value]?.categoryValue
+					delete rv.url
+					scaleImageList.value.unshift(rv)
+					loadingShow.value = false
+				}
+			).catch(res=>{
+				loadingShow.value = false
+			});
+		}
         return {
 			...toRefs(productimg),
             scaleImage,
@@ -313,6 +335,7 @@ export default defineComponent({
 			robotAssits,
 			getPrductimg,
 			removeProductimg,
+			submitBase64Data,
         };
     },
     data() {
@@ -447,6 +470,7 @@ export default defineComponent({
 				display: flex;
 				align-items: center;
 				justify-content: center;
+				z-index: 2;
 				.operate_icon{
 					font-size: 1.8rem;
 					color: #fff;
@@ -464,7 +488,7 @@ export default defineComponent({
 		
 		
 	}
-	.scaleImage_content:hover{
+	.scaleImage_content_imgBox:hover{
 		.img_operate_block{
 			opacity: 1;
 		}