Browse Source

布局样式调整

yf_zhb 2 years atrás
parent
commit
aa2700188e

+ 46 - 8
MingGaoApp/components/task-card/task-card.vue

@@ -45,7 +45,11 @@
 					<view class="actions__icon">
 						<image src="@/static/image/task/icon/area.png" mode="aspectFit" class="img"></image>
 					</view>
-					<view class="actions__text">{{dataSource.walk_area | numberFixed}} ㎡ </view>
+					<view class="actions__text">
+						<u-tooltip :zIndex="8" :showCopy="false" :overlay="false" size="12" :color="'#1B76FF'"
+							:text="numberFixed(dataSource.walk_area) + '㎡'"
+							:buttons="[numberFixed(dataSource.walk_area) + '㎡']"></u-tooltip>
+					</view>
 				</view>
 			</view>
 			<template v-if="dataSource.task_status === '处理中'">
@@ -137,11 +141,14 @@
 				return Number(val) ? Number(val).toFixed(2) : val
 			},
 			meter: function(val) {
-				return val/1000>1 ? (val/1000).toFixed(2) +'km' : Number(val).toFixed(2) +'m'
+				return val / 1000 > 1 ? (val / 1000).toFixed(2) + 'km' : Number(val).toFixed(2) + 'm'
 			},
 		},
 		mounted() {},
 		methods: {
+			numberFixed(val) {
+				return Number(val) ? Number(val).toFixed(2) : val
+			},
 			handleClick() {
 				this.$emit('click', this.dataSource.task_id);
 			},
@@ -232,7 +239,6 @@
 
 		&__actions {
 			padding: 0 20rpx;
-			overflow: hidden;
 
 			.start-btn {
 				display: inline-block;
@@ -258,15 +264,44 @@
 					display: flex;
 					align-items: center;
 					@include hairline-right(rgba(0, 0, 0, 0.3));
-					@include line;
+					// @include line;
 
 					&.middle {
 						justify-content: center;
+						padding: 0 40rpx;
+						
+						.actions__text {
+							width: 0;
+							// background-color: #F33E43;
+							flex: 1 1 auto;
+							text-align: right;
+						}
 					}
 
 					&.right {
-						padding-left: 10rpx;
-						justify-content: flex-end;
+						padding-left: 20rpx;
+						padding-right: 2rpx;
+						justify-content: space-between;
+
+						.actions__text {
+							// width: 0;
+							// flex: 1 1 auto;
+							// text-align: right;
+
+							::v-deep {
+								// .u-tooltip__wrapper {
+								// 	width: 100%;
+								// }
+								
+
+								.u-tooltip__wrapper__text {
+									// width: 100%;
+									// font-size: 12px;
+									// text-align: right;
+									// @include line;
+								}
+							}
+						}
 					}
 
 					&:last-child {
@@ -285,9 +320,12 @@
 						height: 100%;
 					}
 				}
-				
+
 				&__text {
-					@include line;
+					font-size: 14px;
+					line-height: 36rpx;
+					color: #1B76FF;
+					// @include line;
 				}
 
 				&__btns {

+ 7 - 7
MingGaoApp/package-lock.json

@@ -7,7 +7,7 @@
       "dependencies": {
         "dayjs": "^1.11.7",
         "lodash-es": "^4.17.21",
-        "uview-ui": "^2.0.27"
+        "uview-ui": "^2.0.35"
       },
       "devDependencies": {
         "sass-loader": "^12.6.0"
@@ -818,9 +818,9 @@
       }
     },
     "node_modules/uview-ui": {
-      "version": "2.0.27",
-      "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-2.0.27.tgz",
-      "integrity": "sha512-fl35rlguNPfXnwNoVv0w4zS1blFFxxSPuGR1+9SbpFGC33aiTBaoFWs/4Fppj0foS/kDCqSWcJiymNmQjPBD4g==",
+      "version": "2.0.35",
+      "resolved": "https://registry.npmmirror.com/uview-ui/-/uview-ui-2.0.35.tgz",
+      "integrity": "sha512-OfMttN3XkHvQosXfd8bjz8ASTvypPoGzBWmQZBJ871bYMCA7t2bDFPlzjbxUj/5ykAjKnZ8zMUapSwSisVt99g==",
       "engines": {
         "HBuilderX": "^3.1.0"
       }
@@ -1536,9 +1536,9 @@
       }
     },
     "uview-ui": {
-      "version": "2.0.27",
-      "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-2.0.27.tgz",
-      "integrity": "sha512-fl35rlguNPfXnwNoVv0w4zS1blFFxxSPuGR1+9SbpFGC33aiTBaoFWs/4Fppj0foS/kDCqSWcJiymNmQjPBD4g=="
+      "version": "2.0.35",
+      "resolved": "https://registry.npmmirror.com/uview-ui/-/uview-ui-2.0.35.tgz",
+      "integrity": "sha512-OfMttN3XkHvQosXfd8bjz8ASTvypPoGzBWmQZBJ871bYMCA7t2bDFPlzjbxUj/5ykAjKnZ8zMUapSwSisVt99g=="
     },
     "watchpack": {
       "version": "2.3.1",

+ 1 - 1
MingGaoApp/package.json

@@ -2,7 +2,7 @@
   "dependencies": {
     "dayjs": "^1.11.7",
     "lodash-es": "^4.17.21",
-    "uview-ui": "^2.0.27"
+    "uview-ui": "^2.0.35"
   },
   "devDependencies": {
     "sass-loader": "^12.6.0"

+ 1 - 1
MingGaoApp/pages/index/components/EntrapmentAdd.vue

@@ -669,7 +669,7 @@
 				line-height: 18px;
 				color: #555555;
 				margin: 0 24rpx;
-				width: 100rpx;
+				width: 160rpx;
 				@include line;
 			}
 

+ 1 - 1
MingGaoApp/pages/index/index.vue

@@ -417,7 +417,7 @@
 				background-color: #F7F8FB;
 				box-shadow: 0px 0px 16rpx 0px rgba(153, 153, 153, 0.2);
 				border-radius: 4rpx;
-				z-index: 1;
+				z-index: 10;
 
 				.search-form {
 					padding: 24rpx;

File diff suppressed because it is too large
+ 5788 - 4767
MingGaoApp/unpackage/dist/dev/app-plus/app-service.js


File diff suppressed because it is too large
+ 2046 - 1676
MingGaoApp/unpackage/dist/dev/app-plus/app-view.js