guzijian / garbage-removal · Commits

Commit 20917ce184b49e82846a5744afece0dfb560e5d5

Authored by guzijian
1 parent c2829df0

feat: 修改样式

Inline Side-by-side
Showing 3 changed files with 49 additions and 32 deletions
garbage-removal/src/pages/home/clean/index.vue
  View file @20917ce
... ... @@ -57,15 +57,6 @@
57 57 <view class="company-clean-container-car-main">
58 58 <view class="company-clean-container-car-main-content">
59 59 <view class="company-clean-container-car-main-content">
60   - <!-- <view v-if="paramFrom.carType" class="company-clean-container-car-main-content-type">
61   - <view class="company-clean-container-car-main-content-type-price-area">
62   - <text style="color: red;">*</text>车辆数量:
63   - </view>
64   - <view class="company-clean-container-car-main-content-number-button" style="width: 308rpx;">
65   - <u-number-box :min="0" :max="9999" integer buttonSize="46" :inputWidth="100"
66   - v-model="garCarInfoList[paramFrom.carType].garOrderCarNumber"></u-number-box>
67   - </view>
68   - </view> -->
69 60 <view class="company-clean-container-car-popup">
70 61 <!-- 主要内容 -->
71 62 <view class="company-clean-container-car-popup-content">
... ... @@ -911,8 +902,9 @@ $custom-bottom-height: 200rpx;
911 902 .company-clean-container-car-popup-content-title {
912 903 color: $u-info;
913 904 box-sizing: border-box;
914   - font-size: 28rpx;
  905 + font-size: 30rpx !important;
915 906 line-height: 30rpx;
  907 + margin-bottom: 20rpx;
916 908 }
917 909 }
918 910  
... ...
garbage-removal/src/pages/order/handler-home/transport-detail/index.vue
  View file @20917ce
... ... @@ -46,30 +46,49 @@
46 46 <view class="order-detail-container-header-card-uicon"></view>
47 47 收运清单
48 48 </view>
49   - <view v-if="dataGram.transportDetails" v-for="item in dataGram.transportDetails"
50   - style="width: 100%; box-sizing: border-box;">
51   - <view class="transport-process-item" style="display: flex;width: 100%; margin: 20rpx 0 ;">
52   - <view style="width: 150rpx;">
53   - <up-image :show-loading="true" :src="item.fillImage" width="80rpx" height="80rpx"></up-image>
54   - </view>
55   - <view style="display: flex;align-items: center;width: 100%;justify-content: center;">
56   - <view style="display: flex;justify-content: center;align-items: center;font-size: 25rpx;">
57   - <view style="margin-right: 4rpx;">
58   - 载重
  49 + <view v-if="dataGram.transportDetails" style="width: 100%;">
  50 + <view v-for="(item, index) in dataGram.transportDetails" style="width: 100%; box-sizing: border-box;">
  51 + <view class="transport-process-item" style="display: flex;width: 100%; margin: 20rpx 0 ;">
  52 + <view style="width: 150rpx;">
  53 + <up-image :show-loading="true" :src="item.fillImage" width="80rpx" height="80rpx"></up-image>
  54 + </view>
  55 + <view style="display: flex;align-items: center;width: 70%;justify-content: center;">
  56 + <view style="display: flex;justify-content: center;align-items: center;font-size: 25rpx;">
  57 + <view style="margin-right: 4rpx;">
  58 + 载重:
  59 + </view>
  60 + <view>{{ item.garCarryingWeight }}t</view>
59 61 </view>
60   - <view>{{ item.garCarryingWeight }}</view>
61 62 </view>
62   - </view>
63   - <view style="display: flex;align-items: center;width: 100%;justify-content: center;">
64   - <view style=" transform: rotateY(180deg);">
65   - <up-icon name="car-fill" size="40" color="#19a97c"></up-icon>
  63 + <view style="display: flex;align-items: center;width: 50%;justify-content: center; font-size: 25rpx;">
  64 + <view style=" transform: rotateY(180deg);">
  65 + <up-icon name="car-fill" size="40" color="#19a97c"></up-icon>
  66 + </view>
  67 + <view style="display: flex;justify-content: center;align-items: center;font-size: 25rpx;">
  68 + <view>{{ (index + 1) + '/' + dataGram.garRealCarCount }}</view>
  69 + </view>
  70 + </view>
  71 + <view style="display: flex;align-items: center;width: 160%; margin-left: 15rpx;overflow: hidden;">
  72 + <view style="display: flex;justify-content: center;align-items: center;font-size: 25rpx;">
  73 + <view style="margin-right: 4rpx;">
  74 + 车牌:
  75 + </view>
  76 + <view>{{ item.garHandlerCarCode }}</view>
  77 + </view>
  78 + </view>
  79 + <view style="display: flex; align-items: center;width: 150rpx; justify-content: flex-end;"
  80 + @click="goTransportDetail(item)">
  81 + <text style="font-size: 30rpx;white-space: nowrap;margin-right: 15rpx;color: #19a97c;">详情</text>
  82 + <up-icon name="arrow-right" size="30" color="#19a97c"></up-icon>
66 83 </view>
67   - <view style="margin-left:15rpx;font-size: 25rpx;">{{ item.garHandlerCarCode }}</view>
68 84 </view>
69   - <view style="display: flex; align-items: center;width: 150rpx; justify-content: flex-end;"
70   - @click="goTransportDetail(item)">
71   - <text style="font-size: 30rpx;white-space: nowrap;margin-right: 15rpx;color: #19a97c;">详情</text>
72   - <up-icon name="arrow-right" size="30" color="#19a97c"></up-icon>
  85 + </view>
  86 + <view style="display: flex;align-items: center;width: 100%;justify-content: center;">
  87 + <view style="display: flex;justify-content: center;align-items: center;font-size: 25rpx;">
  88 + <view style="margin-right: 4rpx;">
  89 + 载重共计:
  90 + </view>
  91 + <view>{{ transportWeightCount }}t</view>
73 92 </view>
74 93 </view>
75 94 </view>
... ... @@ -96,11 +115,14 @@ import zStatic from &#39;@/components/z-paging/js/z-paging-static&#39;;
96 115 import { onLoad, onShow } from '@dcloudio/uni-app';
97 116 import { ref } from 'vue';
98 117 const isOnloadIn = ref(false)
99   -const dataGram = ref();
  118 +const dataGram = ref({
  119 + transportDetails: []
  120 +});
100 121 const orderId = ref(null)
101 122 const currentImages = ref([])
102 123 const emptyBase64Image = ref(zStatic.base64Empty)
103 124 const spaceStr = ref("")
  125 +const transportWeightCount = ref();
104 126 const goTransportDetail = (val) => {
105 127 uni.$u.route({
106 128 url: `pages/order/handler-home/scan-detail/index`
... ... @@ -119,6 +141,10 @@ const handleOrderDetail = (orderId) =&gt; {
119 141 currentImages.value = dataGram.value.currentImages.map(element => {
120 142 return { url: import.meta.env.VITE_BASE_URL + element }
121 143 });
  144 + transportWeightCount.value = dataGram.value.transportDetails.reduce((pre, cur) => {
  145 + console.log(pre, cur);
  146 + return pre + cur.garCarryingWeight
  147 + }, 0)
122 148 })
123 149 }
124 150 const handlerJumpOtherApp = (latitude, longitude, garCoordinate) => {
... ...
garbage-removal/src/pages/wode/index.vue
  View file @20917ce
... ... @@ -15,7 +15,6 @@
15 15 </view>
16 16 </view>
17 17 </view>
18   -
19 18 <view class="u-m-t-20">
20 19 <u-cell-group>
21 20 <u-cell icon="map" iconStyle="font-size:28rpx" @click="handleAddressManager" title="地 址 管 理"></u-cell>
... ...