zjs_project 1 year ago
parent
commit
073cfcf100

+ 4 - 1
src/assets/common.css

@@ -13,7 +13,10 @@ body {
 div {
     box-sizing: border-box;
 }
-
+@font-face {
+	font-family: 'DINCondensed-Bold';
+	src: url('https://dm.static.elab-plus.com/miniprogram/DINAlternateBold.ttf') format('truetype');
+}
 .rows {
     display: flex;
     flex-direction: row;

+ 1 - 1
src/components/newBottomCom/viewCareful/viewCareful.html

@@ -8,7 +8,7 @@
 					<div class="item-top rows rows-between" :class="{active:selectIndex==index}">
 						<div class="rows">
 							<div class="index-view rows justify-center">{{carefulItem.index+1}}</div>
-							<div class="name-view">{{carefulItem.name}}</div>
+							<div class="name-view eslipe" >{{carefulItem.name}}</div>
 							<div class="percent-view">{{carefulItem.percent}}%</div>
 						</div>
 						<div class="rows">

+ 6 - 6
src/components/newBottomCom/viewCareful/viewCareful.scss

@@ -27,24 +27,24 @@
 	font-size: 28rem;
 	color: #585858;
 	.index-view{
-		// width: 40rem;
-		// height: 40rem;
-		// background: #f0f0f0;
+		font-family: "DINCondensed-Bold";
 		margin-right:10rem;
 	}
 	.name-view{
+		max-width:150rem;
 		margin-right:15rem;
 	}
 	.percent-view{
-		font-family: "DIN Alternate Bold";
+		font-family: "DINCondensed-Bold";
 		opacity: 0.3;
+		font-size:24rem;
 	}
 	
 	.area-view{
-		font-family: "DIN Alternate Bold";
+		font-family: "DINCondensed-Bold";
 		font-weight: 700;
-		font-size: 30rem;
 		color: #8D8D8D;
+		font-size:26rem;
 	}
 }
 .item-top.active {

+ 3 - 0
src/pages/webgl_rxdz_customize/webgl_rxdz_customize.vue

@@ -105,6 +105,9 @@ export default {
 		},
 		tabDataHandle(expand){
 			let tmp = expand;
+			if(!tmp || !tmp.landImg || !tmp.baseImg){
+				return false
+			}
 			let data = {
 				name : "我的地块",
 				imgUrl : tmp.landImg,