Merge branch 'StableVersion' of https://e.coding.net/aidlabfashion/aida/aida_front into StableVersion

src/component/HomePage/sketchCategory.vue

@@ -108,6 +108,7 @@ export default defineComponent({
 			for (let item of props.generateList) {
 				item.categoryShow = false;
 			}
+			file.level2Type = cate.value;
 			file.categoryValue = cate.value;
 			file.category = cate.name;
 			if(props.isSetSketchCategory){

src/component/Login/registerModel.vue

@@ -3,7 +3,7 @@
 		class="registerModel_modal generalModel"
 		v-model:visible="registerModel"
 		:footer="null"
-		width="50%"
+		:width="pageWidth"
 		:maskClosable="false"
 		:centered="true"
 		:closable="false"
@@ -248,6 +248,7 @@ export default defineComponent({
 		let register = reactive({
 			registerModel:false,
 			registerModelMask:false,
+			pageWidth:'50%'
 		})
         return{
 			store,
@@ -555,6 +556,27 @@ export default defineComponent({
     },
 });
 </script>
+<style lang="less">
+.registerModel_modal{
+	@media (max-width: 768px) {
+		// box-shadow: none;
+		// height: 100%;
+		margin: 0;
+		max-width: 95%;
+		&.generalModel{
+			.ant-modal-content{
+				// height: 100%;
+			}
+			.ant-modal-body{
+				padding: 6rem 4rem;
+				// height: 100%;
+			}
+		}
+	}
+	
+}
+	
+</style>
 <style lang="less" scoped>
 .login_page {
     width: 100%;
@@ -568,7 +590,7 @@ export default defineComponent({
             left: 50%;
             transform: translate(-50%,-50%);
             // width: 60rem;
-			width: 70%;
+			width: 80%;
             background: #FFFFFF;
             // box-shadow: -0.3rem 2rem 5.9rem 0px rgba(200,200,200,0.3);
             border-radius: 1rem;
@@ -577,7 +599,9 @@ export default defineComponent({
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
-
+			@media (max-width: 768px) {
+				padding: 0;
+			}
 			.login_content_left{
 				width: 100%;
 				.login_form_email{

src/component/WorksPage/newScaleImage.vue

@@ -100,7 +100,8 @@
 								<img v-for="item in scaleImageData?.designPythonOutfitList" v-lazy="item.designUrl">
 							</div>
 						</div>
-						<div v-if="systemUser.value == 1 && scaleImageData.isMine != 1 && scaleImageData.selected != 1" class="started_btn" @click="setChoose" :title="systemUser.value != 1?$t('newScaleImage.jsContent1'): scaleImageData.openSource == 0?$t('newScaleImage.jsContent2'):''" :class="{active:systemUser.value != 1?true:scaleImageData.openSource == 0}">{{$t('newScaleImage.SecondaryCreation')}}</div>
+						<div v-if="systemUser.value == 1 && scaleImageData.isMine != 1 && scaleImageData.selected != 1" class="started_btn" @click="setChoose" >{{$t('newScaleImage.SecondaryCreation')}}</div>
+						<!-- <div v-if="systemUser.value == 1 && scaleImageData.isMine != 1 && scaleImageData.selected != 1" class="started_btn" @click="setChoose" :title="systemUser.value != 1?$t('newScaleImage.jsContent1'): scaleImageData.openSource == 0?$t('newScaleImage.jsContent2'):''" :class="{active:systemUser.value != 1?true:scaleImageData.openSource == 0}">{{$t('newScaleImage.SecondaryCreation')}}</div> -->
 					</div>
 					<div v-else class="newScaleImage_right_content_generate">
 						<div class="scaleImage_chunk_item content_left_generate_item">
@@ -399,7 +400,7 @@ export default defineComponent({
 			if(imgData.scaleImageData.openSource == 0){
 				return message.info(t('newScaleImage.jsContent2'))
 			}
-        	router.push({name:'homePage',params: {id:imgData.scaleImageData.id,type:'Works'}})
+        	router.push({name:'homePage',params: {id:imgData.scaleImageData.id,type:'Works',isDesign:0}})
         	// router.push({name:'homePage',params: {id:imgData.scaleImageData.userLikeGroupSourceId,type:'Works'}})
 		}
 		let setCommentReply = (value:any,str:any)=>{