From 30601b38c97ba1bbcfdc9addc689aac487e3c272 Mon Sep 17 00:00:00 2001 From: Hong <1470048117@qq.com> Date: Thu, 7 Mar 2024 21:00:00 +0800 Subject: [PATCH] =?UTF-8?q?3.7(=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/myOrder/index.js | 2 +- pages/carShop/order/car_rental/advanced.vue | 5 ++- .../carShop/order/car_sell/car_sell_order.vue | 5 +++ pages/driver/message/message.vue | 2 +- .../mine/every_day_card/previous_list.vue | 3 +- pages/driver/mine/my_order/my_order.vue | 39 +++++++++++-------- .../my_order/rentCars/rent_particulars.vue | 7 ++-- pages/driver/serve/message/m_order_mess.vue | 2 +- pages/driver/serve/repair/repair.vue | 5 ++- .../showroom/confirmOrder/confirmOrder.vue | 4 +- pages/driver/showroom/index.vue | 2 +- utils/index.js | 1 - 12 files changed, 46 insertions(+), 31 deletions(-) diff --git a/api/myOrder/index.js b/api/myOrder/index.js index fa5974b..e067adc 100644 --- a/api/myOrder/index.js +++ b/api/myOrder/index.js @@ -162,7 +162,7 @@ export function getInformationOrderList(data) { //租车订单详情 api/front/car/information/order/info/{id} export function getInformationOrderDealer(id) { return request({ - url: `/api/front/car/information/order/info/${id}`, + url: `/api/front/car/information/user/order/info/${id}`, method: 'get', }) } diff --git a/pages/carShop/order/car_rental/advanced.vue b/pages/carShop/order/car_rental/advanced.vue index 8c99c97..6e48304 100644 --- a/pages/carShop/order/car_rental/advanced.vue +++ b/pages/carShop/order/car_rental/advanced.vue @@ -68,6 +68,7 @@ formData: {} } }, + methods: { //查看 examineFn(arr,index){ @@ -91,13 +92,13 @@ // console.log(options); getProductOrderInfo(options.id).then(res => { this.formData = res.data - console.log(this.formData.giveImage); + // console.log(this.formData.giveImage); if (res.data.giveImage) { this.formData.giveImage = res.data.giveImage.split(',') } else { this.formData.giveImage = [] } - console.log(this.formData.giveImage); + // console.log(this.formData.giveImage); }) } } diff --git a/pages/carShop/order/car_sell/car_sell_order.vue b/pages/carShop/order/car_sell/car_sell_order.vue index a31deeb..d3d0645 100644 --- a/pages/carShop/order/car_sell/car_sell_order.vue +++ b/pages/carShop/order/car_sell/car_sell_order.vue @@ -81,6 +81,11 @@ dataList: [], }; }, + onShow() { + if(this.$refs.paging){ + this.$refs.paging.refresh(); + } + }, methods: { //提车 navCarSubmitFn(item) { diff --git a/pages/driver/message/message.vue b/pages/driver/message/message.vue index b8e6a1a..1882885 100644 --- a/pages/driver/message/message.vue +++ b/pages/driver/message/message.vue @@ -118,7 +118,7 @@ { text: '订单消息', img: 'https://qicheoss.oss-cn-shanghai.aliyuncs.com/static/images/app/serve/m_two.png', - url: '/pages/driver/serve/message/m_order_mess', + url: '/pages/driver/serve/message/m_order_mess?type=1', type: 'likeUnReadNum', unReadCount: 0 }, diff --git a/pages/driver/mine/every_day_card/previous_list.vue b/pages/driver/mine/every_day_card/previous_list.vue index 5f0da49..e1cf31a 100644 --- a/pages/driver/mine/every_day_card/previous_list.vue +++ b/pages/driver/mine/every_day_card/previous_list.vue @@ -9,7 +9,7 @@ 已瓜分现金 - ￥{{item.userDailyCheckIn.number}} + ￥{{item.userDailyCheckIn?item.userDailyCheckIn.number:0}} （已存入余额） @@ -35,6 +35,7 @@ pageSize: pageSize, type: 4 }).then(res => { + console.log(res.data.list); this.$refs.paging.complete(res.data.list); }) } diff --git a/pages/driver/mine/my_order/my_order.vue b/pages/driver/mine/my_order/my_order.vue index 7a2a359..bcb0c5e 100644 --- a/pages/driver/mine/my_order/my_order.vue +++ b/pages/driver/mine/my_order/my_order.vue @@ -45,8 +45,11 @@ {{informationData.title}} - 车龄 {{informationData.carAge}}年 | 租期 {{informationData.monthRent}}个月 - {{informationData.price}}元/月 + 车龄 {{informationData.carAge}}年 | 租期 + {{informationData.monthRent}}个月 + + {{informationData.price}}元/月 @@ -90,13 +93,13 @@ data() { return { cardData: { - title:'' + title: '' }, - informationData:{ - title:"" + informationData: { + title: "" }, - productData:{ - title:'' + productData: { + title: '' } }; }, @@ -107,21 +110,25 @@ onShow() { //租车订单 getInformationOrderList({ - page:1, - limit:1, - type:-1 + page: 1, + limit: 1, + type: -1 }).then(res => { - console.log(res.data); - this.informationData=res.data.list[0] + if (res.data.list.length) { + console.log(res.data); + this.informationData = res.data.list[0] + } }) //买车订单 getProductOrderList({ - page:1, - limit:1, - type:-1 + page: 1, + limit: 1, + type: -1 }).then(res => { console.log(res.data); - this.productData=res.data.list[0] + if (res.data.list.length) { + this.productData = res.data.list[0] + } }) }, methods: { diff --git a/pages/driver/mine/my_order/rentCars/rent_particulars.vue b/pages/driver/mine/my_order/rentCars/rent_particulars.vue index 1ac9b7d..f4be012 100644 --- a/pages/driver/mine/my_order/rentCars/rent_particulars.vue +++ b/pages/driver/mine/my_order/rentCars/rent_particulars.vue @@ -135,9 +135,10 @@ onLoad(options) { console.log(options,'11111'); this.orderId = options.id - getInformationOrderDealer(options.id).then(res => { - this.orderData = res.data - }) + this.getInformationOrderDealerFn() + // getInformationOrderDealer(options.id).then(res => { + // this.orderData = res.data + // }) }, } diff --git a/pages/driver/serve/message/m_order_mess.vue b/pages/driver/serve/message/m_order_mess.vue index 00585ee..7de529f 100644 --- a/pages/driver/serve/message/m_order_mess.vue +++ b/pages/driver/serve/message/m_order_mess.vue @@ -29,7 +29,7 @@ data() { return { orderList: [], - //2:车商 + //2:车商 1:用户 userType: 1 } }, diff --git a/pages/driver/serve/repair/repair.vue b/pages/driver/serve/repair/repair.vue index d3787e2..4cd3ce7 100644 --- a/pages/driver/serve/repair/repair.vue +++ b/pages/driver/serve/repair/repair.vue @@ -153,13 +153,14 @@ sureBtn(){ if(this.whoBtn==1){ uni.navigateTo({ - url: "/pages/serve/repair/realname", + url: "/pages/driver/serve/repair/realname", }); }if(this.whoBtn==2){ uni.navigateTo({ - url: "/pages/serve/repair/re_binding", + url: "/pages/driver/serve/repair/re_binding", }); }if(this.whoBtn==3){ + } }, cancel(){ diff --git a/pages/driver/showroom/confirmOrder/confirmOrder.vue b/pages/driver/showroom/confirmOrder/confirmOrder.vue index cec87c6..d8387ce 100644 --- a/pages/driver/showroom/confirmOrder/confirmOrder.vue +++ b/pages/driver/showroom/confirmOrder/confirmOrder.vue @@ -54,11 +54,11 @@ input-align="right"> - - diff --git a/pages/driver/showroom/index.vue b/pages/driver/showroom/index.vue index cf6f3ed..31b3d02 100644 --- a/pages/driver/showroom/index.vue +++ b/pages/driver/showroom/index.vue @@ -12,7 +12,7 @@ - {{citySave}} + {{citySave?citySave:'地址'}} diff --git a/utils/index.js b/utils/index.js index b475e64..3292e84 100644 --- a/utils/index.js +++ b/utils/index.js @@ -46,7 +46,6 @@ export function getLocationFn() { longitude: res.longitude }, success: res1 => { - console.log(res1.result.address_component.city); store.dispatch('SetCity', res1.result.address_component.city) }, fail: res => {},