From 89d7212eb23d1cb64be2eb536d677f430c4364f9 Mon Sep 17 00:00:00 2001 From: Hong <1470048117@qq.com> Date: Fri, 17 May 2024 18:46:44 +0800 Subject: [PATCH] =?UTF-8?q?5.17(=E6=B7=BB=E5=8A=A0=E7=A7=9F=E8=B5=81?= =?UTF-8?q?=E6=9C=9F=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/carShop/order/order.js | 9 + pages.json | 8 + .../mine/car_info_list/car_info_list.vue | 15 +- .../order/car_rental/car_hire_list.vue | 256 ++++++++++++++++++ .../order/car_rental/car_rental_order.vue | 2 +- .../order/car_rental/rental_particulars.vue | 4 + .../my_order/rentCars/rent_particulars.vue | 5 + pages/driver/serve/repair/re_binding.vue | 46 ++-- pages/driver/showroom/carRental/index.vue | 12 +- .../uview-ui/components/u-parse/node/node.vue | 6 +- 10 files changed, 336 insertions(+), 27 deletions(-) create mode 100644 pages/carShop/order/car_rental/car_hire_list.vue diff --git a/api/carShop/order/order.js b/api/carShop/order/order.js index 5781a2a..ec17f30 100644 --- a/api/carShop/order/order.js +++ b/api/carShop/order/order.js @@ -10,6 +10,15 @@ export function getInformationOrderList(params) { params }) } +//获取已经租出去的车辆列表 +export function byProductIdOrderList(params) { + return request({ + url: `/api/front/car/information/orderByProductId/list/${params.productId}`, + method: 'get', + params + }) +} + /** * 获取租车订单详情 */ diff --git a/pages.json b/pages.json index ccf49ec..c5d20e2 100644 --- a/pages.json +++ b/pages.json @@ -312,6 +312,14 @@ "navigationStyle": "custom" } }, + { + "path" : "pages/carShop/order/car_rental/car_hire_list", + "style" : + { + "navigationBarTitleText" : "出租详情", + "enablePullDownRefresh" : false + } + }, { "path" : "pages/carShop/order/car_rental/advanced", "style" : diff --git a/pages/carShop/mine/car_info_list/car_info_list.vue b/pages/carShop/mine/car_info_list/car_info_list.vue index ee59a22..5d6ac5d 100644 --- a/pages/carShop/mine/car_info_list/car_info_list.vue +++ b/pages/carShop/mine/car_info_list/car_info_list.vue @@ -55,7 +55,8 @@ - + 已售:{{item.saleNum}} {{item.isShow?'下架':'上架'}} + + 出租:{{item.sales}}辆 + + @@ -120,6 +125,13 @@ }; }, methods: { + //查看出租数量列表 + navHireCarFn(item){ + console.log(item); + uni.navigateTo({ + url:'/pages/carShop/order/car_rental/car_hire_list?id='+item.id + }) + }, //去编辑 navEditFn(item) { uni.navigateTo({ @@ -229,6 +241,7 @@ } else { obj.activityType = this.carRentalValue getInformationList(obj).then(res => { + console.log(res.data); this.$refs.paging.complete(res.data.list); }) } diff --git a/pages/carShop/order/car_rental/car_hire_list.vue b/pages/carShop/order/car_rental/car_hire_list.vue new file mode 100644 index 0000000..6dd194a --- /dev/null +++ b/pages/carShop/order/car_rental/car_hire_list.vue @@ -0,0 +1,256 @@ + + + + + \ No newline at end of file diff --git a/pages/carShop/order/car_rental/car_rental_order.vue b/pages/carShop/order/car_rental/car_rental_order.vue index 54b1378..800c527 100644 --- a/pages/carShop/order/car_rental/car_rental_order.vue +++ b/pages/carShop/order/car_rental/car_rental_order.vue @@ -34,7 +34,7 @@ {{item.title}} - 车龄 {{item.carAge}}年 | 租期 {{item.monthRent}}年 + 车龄 {{item.carAge}}年 | 租期 {{item.monthRent}}个月 {{item.rentalPrice}}元/月 diff --git a/pages/carShop/order/car_rental/rental_particulars.vue b/pages/carShop/order/car_rental/rental_particulars.vue index e6679a8..8958bca 100644 --- a/pages/carShop/order/car_rental/rental_particulars.vue +++ b/pages/carShop/order/car_rental/rental_particulars.vue @@ -51,6 +51,10 @@ 接单信息 + 车牌号 + {{formData.carNo?formData.carNo:'--'}} + + 租赁费用 ¥{{formData.price}} diff --git a/pages/driver/mine/my_order/rentCars/rent_particulars.vue b/pages/driver/mine/my_order/rentCars/rent_particulars.vue index c09ba2f..3ea0f58 100644 --- a/pages/driver/mine/my_order/rentCars/rent_particulars.vue +++ b/pages/driver/mine/my_order/rentCars/rent_particulars.vue @@ -46,6 +46,10 @@ 费用及时间 + 车牌号 + {{orderData.carNo?orderData.carNo:'--'}} + + 租赁费用 ¥{{orderData.price}} @@ -198,6 +202,7 @@ }, getInformationOrderDealerFn() { getInformationOrderDealer(this.orderId).then(res => { + console.log( '详情',res.data); this.orderData = res.data }) } diff --git a/pages/driver/serve/repair/re_binding.vue b/pages/driver/serve/repair/re_binding.vue index fb3096b..2190192 100644 --- a/pages/driver/serve/repair/re_binding.vue +++ b/pages/driver/serve/repair/re_binding.vue @@ -115,10 +115,7 @@ - - {{carInfo.unbindTime?carInfo.unbindTime:'--'}} - - + @@ -144,12 +141,11 @@ placeholderStyle=" color: #999999 " border='none' inputAlign='right'> - - + + + @@ -439,25 +435,34 @@ if (!this.carInfo.company) { this.carInfo.company = this.formData.company } - if (!this.carInfo.ownerName) { - this.carInfo.ownerName = this.formData.ownerName - } + this.carInfo.ownerName = this.formData.ownerName // 未实名 isCertification => true已实名 if (this.mineInfo.isCertification) { if (this.noneInfo) { + console.log(this.formData.unbindTime); + //carInfo.unbindTime this.carInfo.unbindTime = this.formData.unbindTime - console.log(this.carInfo); + console.log(11111,this.carInfo); userBindAPI(this.carInfo).then(res => { - uni.redirectTo({ - url: '/pages/driver/serve/repair/bind_result' - }) + console.log(11111,res); + if(res.data=='申请中'){ + this.$toast('已提交换绑申请,请等待~') + }else{ + uni.redirectTo({ + url: '/pages/driver/serve/repair/bind_result' + }) + } }) } else { - console.log(this.formData); userBindAPI(this.formData).then(res => { - uni.redirectTo({ - url: '/pages/driver/serve/repair/bind_result' - }) + console.log(2222,res); + if(res.data=='申请中'){ + this.$toast('已提交换绑申请,请等待~') + }else{ + uni.redirectTo({ + url: '/pages/driver/serve/repair/bind_result' + }) + } }) } } else { @@ -612,6 +617,7 @@ dir: 'crmebimage/public/product/' }, null, res => { this.formData[key] = res.data + this.carInfo[key] = res.data this.videoOrImage = false uni.hideLoading(); }); diff --git a/pages/driver/showroom/carRental/index.vue b/pages/driver/showroom/carRental/index.vue index bd2035d..aabe6b8 100644 --- a/pages/driver/showroom/carRental/index.vue +++ b/pages/driver/showroom/carRental/index.vue @@ -248,7 +248,8 @@ - + + @@ -352,7 +353,8 @@ //常见问题详情 problemTypeContent: '', parseStyle: { - img: 'width:654rpx;' + img: 'width:654rpx;', + image:'width:654rpx;' }, }; }, @@ -858,6 +860,12 @@ width: 654rpx; border-radius: 8rpx; } + .problem-image img { + display: block; + margin: 0 auto; + max-width: 100%; + height: auto; + } } } diff --git a/uni_modules/uview-ui/components/u-parse/node/node.vue b/uni_modules/uview-ui/components/u-parse/node/node.vue index 73e30fd..1da1e94 100644 --- a/uni_modules/uview-ui/components/u-parse/node/node.vue +++ b/uni_modules/uview-ui/components/u-parse/node/node.vue @@ -5,12 +5,12 @@ + + + - - - {{n.text}}