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

src/views/HomeView/HomeView.vue

@@ -1,6 +1,8 @@
 <template>
 	<div class="home_page">
 		<!-- <HeaderComponent></HeaderComponent> -->
+		<!-- <generalCanvas></generalCanvas> -->
+
 		<div class="page_content">
 			<!-- <img class="page_content_bg" src="@/assets/images/homePage/bg.png" /> -->
 			<div class="page_content_body">
@@ -216,7 +218,6 @@
 		<!-- design collection的进度蒙层  end-->
 		<affiche ref="affiche"></affiche>
 		<!-- <RobotAssist></RobotAssist> -->
-
 	</div>
 
 </template>
@@ -229,6 +230,7 @@ import CollectionModal from "@/component/HomePage/collectionModal.vue";
 import NewCollectionReview from "@/component/HomePage/NewCollectionReview.vue";
 import ExportNewCoolection from "@/component/HomePage/ExportNewCoolection.vue";
 import productImg from "@/component/HomePage/productImg.vue";
+import generalCanvas from "@/component/modules/generalCanvas.vue";
 import affiche from "@/component/HomePage/affiche.vue";
 import DesignDetail from "@/component/Detail/DesignDetail.vue";
 // import RobotAssist from "@/component/HomePage/RobotAssist.vue";
@@ -256,7 +258,8 @@ export default defineComponent({
 		affiche,
 		// RobotAssist,
 		draggable,
-		productImg
+		productImg,
+		generalCanvas
 	},
 	props:{
 		getLangIsShowMark:{