文本样式调整

lichao
1 parent 42248e0a
Showing 5 changed files with 103 additions and 64 deletions
garbage-removal/src/components/my-piker/index.vue
garbage-removal/src/pages/home-info/clean/index.vue
garbage-removal/src/pages/order-info/order-disposal/scan-detail/index.vue
garbage-removal/src/pages/order-info/order-disposal/transport-detail/index.vue
garbage-removal/src/pages/order/order-disposal/index.vue
@@ -42,7 +42,12 @@ const closeUnit = () =&gt; {
   visible.value = false
 }
 const openUnit = () => {
-  visible.value = true
+  const currentIndex = props.array.findIndex(item => item === props.parentValue);
+  if (currentIndex !== -1) {
+    index.value = currentIndex;
+    unitValue.value = [currentIndex];
+  }
+  visible.value = true;
 }
 const bindPickerChange = (e) => {
   index.value = e.detail.value
@@ -108,10 +108,10 @@
 								</view>
 							</view>
-							<!-- 添加是否需要搬运上车选项 -->
+							<!-- 添加是否需要装车选项 -->
 							<view class="company-clean-container-car-main-content-type">
 								<view class="company-clean-container-car-main-content-type-price-area">
-									<text style="color: red;">*</text>是否需要搬运上车:
+									<text style="color: red;">*</text>是否需要装车:
 								</view>
 								<view
 									style="width:100%;display: flex;justify-content: flex-start;align-items: center; ">
@@ -266,7 +266,7 @@
 	const scrollTop = ref(0)
 	// 车辆数量
 	const garCarNumberCount = ref()
-	const garbageTypeList = ref(["装修垃圾", "建筑垃圾"])
+	const garbageTypeList = ref(["装修垃圾","工程渣土","工程垃圾","拆除垃圾"])
 	const paramFrom = ref({
 		carNumber: 0,
 		remark: "",
@@ -55,7 +55,6 @@
 				<view class="scan-car-num-content">
 					<up-input :disabled="!isDeletable" placeholder="请输入数字,单位吨" border="surround"
 						v-model="details.garCarryingWeight" @change="handlerInputChange"></up-input>
-						<text>吨</text>
 				</view>
 			</view>
@@ -245,15 +244,31 @@
 			await askTransport(params).then((res) => {
 				console.log(res);
 				if (res.data.code == 200) {
-					uni.$u.toast("当前趟次记录完毕！")
+					// 修改提示框，添加跳转到订单页面的选项
+					uni.showModal({
+						title: '提示',
+						content: '当前趟次记录完毕！需要进入订单详情页面点击"完成订单"按钮才是最终完成订单。',
+						showCancel: true,
+						cancelText: '稍后处理',
+						confirmText: '立即前往',
+						success: function (res) {
+							if (res.confirm) {
+								// 跳转到订单页面
+								uni.redirectTo({
+									url: '/pages/order-info/order-disposal/transport-detail/index?garOrderId=' + params.garOrderId
+								});
+							} else if (res.cancel) {
+								// 返回上级页面
+								uni.navigateBack({
+									delta: 1
+								});
+							}
+						}
+					});
 				}
 			}).catch((err) => {
 				uni.$u.toast("当前趟次记录失败")
 			})
-			// 返回上级
-			uni.navigateBack({
-				delta: 1
-			});
 		}
 	}
@@ -48,47 +48,47 @@
         </view>
         <view v-if="dataGram.transportDetails" style="width: 100%;">
           <view v-for="(item, index) in dataGram.transportDetails" style="width: 100%; box-sizing: border-box;">
-            <view class="transport-process-item" style="display: flex;width: 100%; margin: 20rpx 0 ;">
-              <view style="width: 150rpx;">
+            <view class="transport-process-item" style="display: flex; width: 100%; margin: 20rpx 0; flex-wrap: nowrap; align-items: center;">
+              <view style="width: 80rpx; flex-shrink: 0; margin-right: 10rpx;">
                 <up-image :show-loading="true" :src="item.fillImage" width="80rpx" height="80rpx"></up-image>
               </view>
-              <view style="display: flex;align-items: center;width: 70%;justify-content: center;">
-                <view style="display: flex;justify-content: center;align-items: center;font-size: 25rpx;">
-                  <view style="margin-right: 4rpx;">
-                    载重:
-                  </view>
-                  <view>{{ item.garCarryingWeight }}吨</view>
+              <view style="width: 120rpx; display: flex; align-items: center; justify-content: center; flex-shrink: 0; margin-right: 10rpx;">
+                <view style="font-size: 25rpx; white-space: nowrap;">
+                  载重: {{ item.garCarryingWeight }}吨
                 </view>
               </view>
-              <view style="display: flex;align-items: center;width: 50%;justify-content: center; font-size: 25rpx;">
-                <view style=" transform: rotateY(180deg);">
+              <view style="width: 80rpx; display: flex; align-items: center; justify-content: center; font-size: 25rpx; margin-right: 10rpx;">
+                <view style="transform: rotateY(180deg);">
                   <up-icon name="car-fill" size="40" color="#19a97c"></up-icon>
                 </view>
-                <view style="display: flex;justify-content: center;align-items: center;font-size: 25rpx;">
-                  <view>{{ (index + 1) + '/' + dataGram.garRealCarCount }}</view>
-                </view>
               </view>
-              <view style="display: flex;align-items: center;width: 160%; margin-left: 15rpx;overflow: hidden;">
-                <view style="display: flex;justify-content: center;align-items: center;font-size: 25rpx;">
-                  <view style="margin-right: 4rpx;">
+              <view style="width: 80rpx; display: flex; justify-content: center; align-items: center; font-size: 25rpx; margin-right: 10rpx;">
+                <view>{{ (index + 1) + '/' + dataGram.garRealCarCount }}</view>
+              </view>
+              <view style="flex: 1; display: flex; align-items: center; margin-right: 10rpx; overflow: hidden;">
+                <view style="display: flex; justify-content: flex-start; align-items: center; font-size: 25rpx; overflow: hidden;">
+                  <view style="margin-right: 4rpx; flex-shrink: 0;">
                     车牌:
                   </view>
-                  <view>{{ item.garHandlerCarCode }}</view>
+                  <view style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
+                    {{ item.garHandlerCarCode }}
+                  </view>
                 </view>
               </view>
-              <view style="display: flex; align-items: center;width: 150rpx; justify-content: flex-end;"
-                @click="goTransportDetail(item)">
-                <text style="font-size: 30rpx;white-space: nowrap;margin-right: 15rpx;color: #19a97c;">详情</text>
+              <view style="width: 100rpx; display: flex; align-items: center; justify-content: flex-end;"
+                    @click="goTransportDetail(item)">
+                <text style="font-size: 30rpx; white-space: nowrap; margin-right: 15rpx; color: #19a97c;">详情</text>
                 <up-icon name="arrow-right" size="30" color="#19a97c"></up-icon>
               </view>
             </view>
+
           </view>
           <view style="display: flex;align-items: center;width: 100%;justify-content: center;">
             <view style="display: flex;justify-content: center;align-items: center;font-size: 25rpx;">
               <view style="margin-right: 4rpx;">
                 载重共计:
               </view>
-              <view>{{ transportWeightCount }}t</view>
+              <view>{{ transportWeightCount }}吨</view>
             </view>
           </view>
         </view>
@@ -180,7 +180,8 @@ const handleOrderDetail = (orderId) =&gt; {
     });
     transportWeightCount.value = dataGram.value.transportDetails.reduce((pre, cur) => {
       console.log(pre, cur);
-      return pre + cur.garCarryingWeight
+      const weight = parseFloat(cur.garCarryingWeight) || 0;
+      return pre + weight;
     }, 0)
   })
 }
@@ -34,10 +34,9 @@
 	</view>
 	<view class="scan-box">
+    <view class="scan-tip">在此处扫码</view>
 		<view class="scan-btn">
 			<view class="scan-icon">
-
-
 				<!-- #ifdef H5 -->
 				<u-icon @click="handleScanH5" name="scan" :size="180" color="#fff"></u-icon>
 				<!-- #endif -->
@@ -299,36 +298,55 @@ onMounted(() =&gt; {
 	}
-	.scan-box {
-		position: fixed;
-		bottom: 200rpx;
-		right: 50rpx;
-		width: 90rpx;
-		height: 90rpx;
-		border-radius: 15rpx;
-		box-shadow: 0 0 10rpx rgba(0, 0, 0, .1);
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		padding: 2rpx;
-		box-sizing: border-box;
-		background-color: #ffffff71;
-		.scan-btn {
-			width: 80rpx;
-			height: 80rpx;
-			border-radius: 50%;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			background-color: #19a97c;
-			@include handleClick;
-			.scan-icon {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-			}
-		}
-	}
+
+  .scan-box {
+    position: fixed;
+    bottom: 200rpx;
+    right: 50rpx;
+    width: 90rpx;
+    height: 160rpx;
+    border-radius: 15rpx;
+    box-shadow: 0 0 10rpx rgba(0, 0, 0, .1);
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between; /* 重新分配空间 */
+    align-items: center;
+    padding: 10rpx 2rpx 5rpx; /* 调整内边距 */
+    box-sizing: border-box;
+    background-color: #ffffff71;
+    z-index: 999;
+
+    .scan-tip {
+      color: #19a97c;
+      font-size: 16rpx;
+      text-align: center;
+      font-weight: bold;
+      line-height: 3.4; /* 适当调整行高 */
+      width: 100%;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      margin-bottom: 0; /* 移除底部边距 */
+    }
+
+    .scan-btn {
+      width: 80rpx;
+      height: 80rpx;
+      border-radius: 50%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      background-color: #19a97c;
+      @include handleClick;
+      flex-shrink: 0; /* 防止按钮被压缩 */
+
+      .scan-icon {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+    }
+  }
 </style>