fix

2025-04-09 14:09:19 +08:00
parent b6e5f05f06
commit 37f1b36e54
76 changed files with 1969 additions and 970 deletions
--- a/src/component/HomePage/index/model/patternMaking3D/download.vue
+++ b/src/component/HomePage/index/model/patternMaking3D/download.vue
@@ -1,12 +1,13 @@
 <template>
 	<div class="threeDownPage" ref="threeDownPage">
+		<!-- height="65rem" -->
 		<a-modal class="generalModel" 
            v-model:visible="threeDown" 
            :footer="null" 
            width="77rem"
-			height="65rem"
+			height="35rem"
            :maskClosable="false"
-			:mask="false"
+			:mask="true"
            :centered="true"
 			:closable="false"
 			:get-container="() => $refs.threeDownPage"
@@ -24,7 +25,7 @@
 			</div>
 			<div style="display: flex; flex-direction: column; height: 100%;">
 				<div class="modal_title_text" style="text-align: center;">
-					<div>Please select the image size</div>
+					<div>Please select the size of the clothing</div>
 				</div>
 				<div class="content">
 					<div class="downItem" v-for="item,key in loadList">
@@ -37,7 +38,7 @@
 					</div>
 				</div>
 				<div style="width: 100%; display: flex; margin-top: auto;">
-					<div class="gallery_btn" @click="setDown" style="width: 13rem; margin-left: auto;">Download</div>
+					<div class="gallery_btn" :class="{btnActive:!select.sizeType}" @click="setDown" style="width: 13rem; margin-left: auto;">Download</div>
 				</div>
 			</div>
 			
@@ -84,6 +85,8 @@ export default defineComponent({
 		})
 		const cancelDsign = ()=>{
 			data.threeDown = false;
+			data.select.sizeType = ''
+			data.select.size = ''
 		}
 		const getDowList = (id:any)=>{
 			data.isShowMark = true
@@ -104,11 +107,13 @@ export default defineComponent({
 			let value = {
 				...data.select,
 			}
-			Https.axiosGet(Https.httpUrls.downloadZip,{params:value,env:{binary:true,binaryType:'application/octet-stream'}}).then((res:any)=>{
-				console.log(res)
-				//anchor 标签下载
+			let config = {
+				params:value
+			}
+
+			Https.axiosGet(Https.httpUrls.downloadZip,config).then((res:any)=>{
 				let a = document.createElement('a');
-				a.href = res.url;
+				a.href = res;
 				a.download = 'model.zip'; // 设置下载的文件名
 				a.click(); // 触发下载
 				URL.revokeObjectURL(a.href); // 释放 URL 对象
@@ -126,6 +131,7 @@ export default defineComponent({
 			data.select.sizeType = key
 			data.select.size = DSizeItem
 		}
+
 		return{
 			...toRefs(dataDom),
 			...toRefs(data),
@@ -142,21 +148,36 @@ export default defineComponent({
 })
 </script>
 <style lang="less" scoped>
+	:deep(.ant-modal-mask){
+		background: rgba(0,0,0,0.3);
+	}
 	.threeDownPage{
 		width: 100%;
 		height: 100%;
 		position: relative;
 		:deep(.generalModel){
+			.gallery_btn{
+				&.btnActive{
+					pointer-events: none;
+					background: rgba(0, 0, 0, .4);
+					border: none;
+				}
+			}
 			.content{
 				display: flex;
 				flex-direction: column;
 				flex: 1;
+				padding-left: 6rem;
+				// width: 55rem;
+				// margin: 0 auto;
+				
 				> .downItem{
 					display: flex;
 					font-size: 2rem;
 					font-weight: 600;
 					margin-bottom: 1rem;
 					text-align: center;
+					align-items:center;
 					> .title{
 						margin-right: 1.5rem;
 						width: 3.5rem;
--- a/src/component/HomePage/index/model/patternMaking3D/index.vue
+++ b/src/component/HomePage/index/model/patternMaking3D/index.vue
@@ -2,7 +2,7 @@
 	<div class="patternMaking3D">
 		<div class="selectModel">
 			<div class="heard">Clothing</div>
-			<div class="list">
+			<div class="list" v-if="maskShow">
 				<div v-for="item in modelList" class="modelItem" :class="{active:item.id == selectModel.id}" @click="setSelectModel(item)">
 					<img :src="item.url" alt="">
 				</div>
@@ -28,7 +28,7 @@
 					<img v-show="isFront" :src="selectModel.threeDLayoutList?.[0]?.url" alt="">
 					<img v-show="!isFront" :src="selectModel.threeDLayoutList?.[1]?.url" alt="">
 				</div>
-				<threeBox v-show="imgOrThree" ref="threeBox"></threeBox>
+				<threeBox v-if="imgOrThree" ref="threeBox"></threeBox>
 			</div>
 			<div class="gallery_btn" v-show="!imgOrThree" @click="setImgOrThree(true)">3D view</div>			
 			<div class="gallery_btn" v-show="imgOrThree" @click="setImgOrThree(false)">Img view</div>			
@@ -76,6 +76,7 @@ export default defineComponent({
 			pageSize:10,
 			imgOrThree:false,
 			isFront:false,
+			maskShow:false,
 		})
 		const setSelectModel = (item:any)=>{
 			data.isShowMark = true
@@ -104,6 +105,9 @@ export default defineComponent({
 				let id =  store.state.HomeStoreModule.patternMaking3D
 				if(id && data.selectModel.id == -1)setSelectModel({id})
 			})	
+			setTimeout(()=>{
+				data.maskShow = true	
+			},500)
 		}
 		const getModelList = ()=>{
 			if(data.isShowMark && !data.isNoData)return
@@ -219,6 +223,7 @@ export default defineComponent({
 					width: calc(100% / 4 - 1rem);
 					margin: .5rem;
 					aspect-ratio: 1 / 1.2;	
+					// height: 10rem;
 					border-radius: 2rem;
 					border: 2px solid #D4D4D4;
 					cursor: pointer;
--- a/src/component/HomePage/index/model/patternMaking3D/three.vue
+++ b/src/component/HomePage/index/model/patternMaking3D/three.vue
@@ -125,10 +125,10 @@ export default defineComponent({
 			floorMesh.rotation.x = -0.5 * Math.PI;
 			floorMesh.receiveShadow = true;
 			floorMesh.position.y = -0.001;
-			data.scene.add(floorMesh);
+			// data.scene.add(floorMesh);
 			const textureLoader = new THREE.TextureLoader();
 			// const texture = textureLoader.load('/3dModel/sketch-thick.jpg');
-			data.scene.background = new THREE.Color("#eee");
+			data.scene.background = new THREE.Color("#fff");
 			// data.scene.background = texture;

 			let openModel = (event:any)=>{
@@ -213,7 +213,7 @@ export default defineComponent({
 			//添加图片材质
 			data.load.state = true
 			let textureLoader = new THREE.TextureLoader()
-			textureLoader.load('/3dModel/texture0.webp', // 图片放在public/textures目录下
+			textureLoader.load('https://image.baidu.com/search/detail?ct=503316480&z=0&ipn=d&word=%E7%99%BD%E8%89%B2%E5%9B%BE%E7%89%87&hs=0&pn=8&spn=0&di=7466852183703552001&pi=0&rn=1&tn=baiduimagedetail&is=0%2C0&ie=utf-8&oe=utf-8&cl=2&lm=-1&cs=1061489690%2C1376605706&os=2709213815%2C2487532130&simid=3551480199%2C346831275&adpicid=0&lpn=0&ln=0&fm=&sme=&cg=&bdtype=0&oriquery=&objurl=https%3A%2F%2Fwx2.sinaimg.cn%2Fmw690%2F941fd00fgy1hrx01tvys1j20zk1bet8s.jpg&fromurl=ippr_z2C%24qAzdH3FAzdH3Fojtk5_z%26e3Bv54AzdH3Fd9bc88db90AzdH3FO5LdNyykj&gsm=&islist=&querylist=', // 图片放在public/textures目录下
 				(texture:any) => {
 				// 3. 配置纹理参数
 				texture.wrapS = THREE.RepeatWrapping;
@@ -226,7 +226,7 @@ export default defineComponent({
 						const newMaterial = new THREE.MeshStandardMaterial({
 							map: texture,        // 基础颜色贴图
 							roughness: 0.7,      // 表面粗糙度 (0-1)
-							metalness: 0.2,      // 金属质感 (0-1)
+							metalness: .2,      // 金属质感 (0-1)
 							side: THREE.DoubleSide // 双面渲染
 						});
 						console.log(child)