Commit cde89a3ea7cd3fd85324a788a4b4618d2c3fe2f4
1 parent
2bf0f8cf
update
Showing
2 changed files
with
29 additions
and
10 deletions
garbage-removal/src/pages/home-info/clean/index.vue
| @@ -40,7 +40,7 @@ | @@ -40,7 +40,7 @@ | ||
| 40 | </view> | 40 | </view> |
| 41 | 41 | ||
| 42 | <view> | 42 | <view> |
| 43 | - <swiper style="height: 588rpx;" @change="onChangeSwiper" indicator-dots circular > | 43 | + <swiper :class="swiperClass" @change="onChangeSwiper" indicator-dots circular="true" easing-function="linear" duration="2000"> |
| 44 | <swiper-item v-for="(car,index) in garCarInfoList" :key="index" > | 44 | <swiper-item v-for="(car,index) in garCarInfoList" :key="index" > |
| 45 | <view><image :src="combinationImagePath(car)" mode ="widthFix"></image></view> | 45 | <view><image :src="combinationImagePath(car)" mode ="widthFix"></image></view> |
| 46 | <view><text style="color:#909399;font-size: 14px;">{{car.remark}}</text></view> | 46 | <view><text style="color:#909399;font-size: 14px;">{{car.remark}}</text></view> |
| @@ -182,6 +182,7 @@ const carTypeShowFlag = ref(false) | @@ -182,6 +182,7 @@ const carTypeShowFlag = ref(false) | ||
| 182 | const garbageTypeShowFlag = ref(false) | 182 | const garbageTypeShowFlag = ref(false) |
| 183 | const carPopupShowFlag = ref(false) | 183 | const carPopupShowFlag = ref(false) |
| 184 | const addressPopupRef = ref(null); | 184 | const addressPopupRef = ref(null); |
| 185 | +const swiperClass=ref("swiperHeight1") | ||
| 185 | const userAddress = ref({ | 186 | const userAddress = ref({ |
| 186 | garUserContactName: "", | 187 | garUserContactName: "", |
| 187 | garUserContactTel: "", | 188 | garUserContactTel: "", |
| @@ -235,9 +236,21 @@ const onChange = (e) => { | @@ -235,9 +236,21 @@ const onChange = (e) => { | ||
| 235 | } | 236 | } |
| 236 | 237 | ||
| 237 | const onChangeSwiper=(e)=>{ | 238 | const onChangeSwiper=(e)=>{ |
| 238 | - carName.value=garCarInfoList.value[e.detail.current].carType; | ||
| 239 | - swiperIndex.value = e.detail.current; | ||
| 240 | - containerVolume.value = garCarInfoList.value[e.detail.current].containerVolume; | 239 | + if(garCarInfoList.value){ |
| 240 | + carName.value=garCarInfoList.value[e.detail.current].carType; | ||
| 241 | + swiperIndex.value = e.detail.current; | ||
| 242 | + containerVolume.value = garCarInfoList.value[e.detail.current].containerVolume; | ||
| 243 | + if(garCarInfoList.value[e.detail.current].containerVolume=="4"){ | ||
| 244 | + swiperClass.value = "swiperHeight1"; | ||
| 245 | + }else if(garCarInfoList.value[e.detail.current].containerVolume=="6"){ | ||
| 246 | + swiperClass.value = "swiperHeight2"; | ||
| 247 | + }else{ | ||
| 248 | + swiperClass.value = "swiperHeight3"; | ||
| 249 | + } | ||
| 250 | + | ||
| 251 | + | ||
| 252 | + } | ||
| 253 | + | ||
| 241 | } | 254 | } |
| 242 | 255 | ||
| 243 | const numberBoxChange=(value)=>{ | 256 | const numberBoxChange=(value)=>{ |
| @@ -314,11 +327,6 @@ const handleContactClick = (val) => { | @@ -314,11 +327,6 @@ const handleContactClick = (val) => { | ||
| 314 | } | 327 | } |
| 315 | } | 328 | } |
| 316 | 329 | ||
| 317 | -const handleContactClick111 = (val) => { | ||
| 318 | - console.log("点击了电话---->handleContactClick111"); | ||
| 319 | - | ||
| 320 | -} | ||
| 321 | - | ||
| 322 | // 删除图片 | 330 | // 删除图片 |
| 323 | const deletePic = (event) => { | 331 | const deletePic = (event) => { |
| 324 | fileList.value.splice(event.index, 1); | 332 | fileList.value.splice(event.index, 1); |
| @@ -580,6 +588,15 @@ $custom-border-radio: 20rpx; | @@ -580,6 +588,15 @@ $custom-border-radio: 20rpx; | ||
| 580 | $custom-bottom-height: 200rpx; | 588 | $custom-bottom-height: 200rpx; |
| 581 | 589 | ||
| 582 | 590 | ||
| 591 | +.swiperHeight1{ | ||
| 592 | + height: 488rpx; | ||
| 593 | +} | ||
| 594 | +.swiperHeight2{ | ||
| 595 | + height: 538rpx; | ||
| 596 | +} | ||
| 597 | +.swiperHeight3{ | ||
| 598 | + height: 588rpx; | ||
| 599 | +} | ||
| 583 | .company-clean-container { | 600 | .company-clean-container { |
| 584 | height: 100%; | 601 | height: 100%; |
| 585 | width: 100%; | 602 | width: 100%; |
garbage-removal/src/pages/order-info/order-other/detail/index.vue
| @@ -577,7 +577,9 @@ const handlerUpdateOrderClick = () => { | @@ -577,7 +577,9 @@ const handlerUpdateOrderClick = () => { | ||
| 577 | candidates.value[0].forEach((item, index) => { | 577 | candidates.value[0].forEach((item, index) => { |
| 578 | garCarInfoList.value[item] = { | 578 | garCarInfoList.value[item] = { |
| 579 | garOrderCarNumber: 0, | 579 | garOrderCarNumber: 0, |
| 580 | - garOrderCarType: item | 580 | + garOrderCarType: item, |
| 581 | + id: garCarLabelInfoList.value[item].id, | ||
| 582 | + containerVolume: garCarLabelInfoList.value[item].containerVolume | ||
| 581 | } | 583 | } |
| 582 | }) | 584 | }) |
| 583 | // 设置默认车辆 | 585 | // 设置默认车辆 |