feat: 修改样式

guzijian
1 parent c2829df0
Showing 3 changed files with 49 additions and 32 deletions
garbage-removal/src/pages/home/clean/index.vue
garbage-removal/src/pages/order/handler-home/transport-detail/index.vue
garbage-removal/src/pages/wode/index.vue
@@ -57,15 +57,6 @@
       <view class="company-clean-container-car-main">
         <view class="company-clean-container-car-main-content">
           <view class="company-clean-container-car-main-content">
-            <!-- <view v-if="paramFrom.carType" class="company-clean-container-car-main-content-type">
-              <view class="company-clean-container-car-main-content-type-price-area">
-                <text style="color: red;">*</text>车辆数量:
-              </view>
-              <view class="company-clean-container-car-main-content-number-button" style="width: 308rpx;">
-                <u-number-box :min="0" :max="9999" integer buttonSize="46" :inputWidth="100"
-                  v-model="garCarInfoList[paramFrom.carType].garOrderCarNumber"></u-number-box>
-              </view>
-            </view> -->
             <view class="company-clean-container-car-popup">
               <!-- 主要内容 -->
               <view class="company-clean-container-car-popup-content">
@@ -911,8 +902,9 @@ $custom-bottom-height: 200rpx;
     .company-clean-container-car-popup-content-title {
       color: $u-info;
       box-sizing: border-box;
-      font-size: 28rpx;
+      font-size: 30rpx !important;
       line-height: 30rpx;
+      margin-bottom: 20rpx;
     }
   }
@@ -46,30 +46,49 @@
           <view class="order-detail-container-header-card-uicon"></view>
           收运清单
         </view>
-        <view v-if="dataGram.transportDetails" v-for="item 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;">
-              <up-image :show-loading="true" :src="item.fillImage" width="80rpx" height="80rpx"></up-image>
-            </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 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;">
+                <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 }}t</view>
                 </view>
-                <view>{{ item.garCarryingWeight }}</view>
               </view>
-            </view>
-            <view style="display: flex;align-items: center;width: 100%;justify-content: center;">
-              <view style=" transform: rotateY(180deg);">
-                <up-icon name="car-fill" size="40" color="#19a97c"></up-icon>
+              <view style="display: flex;align-items: center;width: 50%;justify-content: center; font-size: 25rpx;">
+                <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>
+                  <view>{{ 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>
+                <up-icon name="arrow-right" size="30" color="#19a97c"></up-icon>
               </view>
-              <view style="margin-left:15rpx;font-size: 25rpx;">{{ item.garHandlerCarCode }}</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>
-              <up-icon name="arrow-right" size="30" color="#19a97c"></up-icon>
+          </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>
           </view>
         </view>
@@ -96,11 +115,14 @@ import zStatic from &#39;@/components/z-paging/js/z-paging-static&#39;;
 import { onLoad, onShow } from '@dcloudio/uni-app';
 import { ref } from 'vue';
 const isOnloadIn = ref(false)
-const dataGram = ref();
+const dataGram = ref({
+  transportDetails: []
+});
 const orderId = ref(null)
 const currentImages = ref([])
 const emptyBase64Image = ref(zStatic.base64Empty)
 const spaceStr = ref("")
+const transportWeightCount = ref();
 const goTransportDetail = (val) => {
   uni.$u.route({
     url: `pages/order/handler-home/scan-detail/index`
@@ -119,6 +141,10 @@ const handleOrderDetail = (orderId) =&gt; {
     currentImages.value = dataGram.value.currentImages.map(element => {
       return { url: import.meta.env.VITE_BASE_URL + element }
     });
+    transportWeightCount.value = dataGram.value.transportDetails.reduce((pre, cur) => {
+      console.log(pre, cur);
+      return pre + cur.garCarryingWeight
+    }, 0)
   })
 }
 const handlerJumpOtherApp = (latitude, longitude, garCoordinate) => {
@@ -15,7 +15,6 @@
         </view>
       </view>
     </view>
-
     <view class="u-m-t-20">
       <u-cell-group>
         <u-cell icon="map" iconStyle="font-size:28rpx" @click="handleAddressManager" title="地 址 管 理"></u-cell>