qichexitong/car-system-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

5.17(添加租赁期列表

Browse Source
This commit is contained in:
Hong
2024-05-17 18:46:44 +08:00
parent ea3c3f9476
commit 89d7212eb2
10 changed files with 336 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/carShop/order/order.js
View File

@@ -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
})
}
/**
* 获取租车订单详情
*/

8
pages.json
View File

@@ -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" :

15
pages/carShop/mine/car_info_list/car_info_list.vue
View File

@@ -55,7 +55,8 @@
</view>
</view>
</view>
<view class="flex align-center" :class="[actType==1?'justify-end':'justify-between']">
<view v-if="carRentalValue!=2" class="flex align-center"
:class="[actType==1?'justify-end':'justify-between']">
<view v-if="actType==2" class="f-24 c666">已售:{{item.saleNum}}</view>
<view class="flex">
<u-button v-if="!item.isShow" plain shape="circle" @click="isShowCarFn(item,'del')"
@@ -69,6 +70,10 @@
color="#333333">{{item.isShow?'下架':'上架'}}</u-button>
</view>
</view>
<view v-else class="flex align-center justify-end" @click="navHireCarFn(item)">
<view>出租:{{item.sales}}辆 </view>
<image style="width: 14rpx;height: 26rpx;margin-left: 16rpx;" src="@/static/images/icon/arrow-right.png" mode=""></image>
</view>
</view>
</z-paging>
</view>
@@ -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);
})
}

256
pages/carShop/order/car_rental/car_hire_list.vue Normal file
View File

@@ -0,0 +1,256 @@
<template>
<view>
<!-- 租车 -->
<z-paging ref="paging" v-model="dataList" @query="queryList">
<view>
<view class="list-cont" v-for="(item,index) in dataList" :key="index" @click="navParticularFn(item)">
<view class="user-data f-jcsb f-a-i">
<view class="f-a-i">
<view class="user-data-image">
<image :src="item.userAvatar" mode=""></image>
</view>
<view class="user-data-name">{{item.nickname}}</view>
</view>
<view class="user-data-state">
<text v-if="item.status==2">
<text v-if="item.giveStatus==0">租赁期</text>
<text v-if="item.giveStatus==1">司机申请提前还车</text>
<text v-if="item.giveStatus==2">提前还车申请通过</text>
<text v-if="item.giveStatus==3">提前还车申请未通过</text>
</text>
<text v-if="item.status==3">已完成</text>
</view>
</view>
<view :class="['f-a-i','car-rental']">
<image :src="item.image" mode=""></image>
<view class="car-rental-cont">
<view class="car-rental-cont-name">{{item.carNo}}</view>
<view class="car-rental-cont-auto-age">{{item.nickname}} | 租期 {{item.monthRent}}个月</view>
<view class="car-rental-cont-price">{{item.rentalPrice}}<text
class="car-rental-cont-price-tit">元/月</text>
</view>
</view>
</view>
</view>
</view>
</z-paging>
</view>
</template>
<script>
import {
byProductIdOrderList,
} from "@/api/carShop/order/order.js"
import config from '@/config';
export default {
components: {},
data() {
return {
config,
actTab: -1,
dataList: [],
orderId: '',
productId: ''
};
},
onLoad(optios) {
this.productId = optios.id
},
methods: {
//详情
navParticularFn(item) {
uni.navigateTo({
url: `/pages/carShop/order/car_rental/rental_particulars?id=${item.id}`
})
},
//列表
queryList(pageNo, pageSize) {
// 此处请求仅为演示，请替换为自己项目中的请求
let obj = {
page: pageNo,
limit: pageSize,
productId: this.productId
}
byProductIdOrderList(obj).then(res => {
console.log(res.data.list);
this.$refs.paging.complete(res.data.list);
})
},
},
onShow() {
if (this.$refs.paging) {
this.$refs.paging.refresh();
}
}
}
</script>
<style lang="scss">
page {
background: #f5f5f5;
}
.order-list-butt {
width: 100%;
padding: 0 24rpx;
.order-list-butt-go {
width: 120rpx;
font-size: 24rpx;
font-weight: 400;
color: #999999;
image {
width: 48rpx;
height: 48rpx;
}
}
.order-list-butt-refund {
padding: 16rpx 24rpx;
font-size: 24rpx;
font-weight: 400;
color: #111111;
background: #F5F5F5;
}
}
.user-data {
padding: 24rpx 24rpx 0 24rpx;
.user-data-image {
width: 48rpx;
height: 48rpx;
border-radius: 50%;
background: #f5f5f5;
image {
width: 100%;
height: 100%;
border-radius: 50%;
}
}
.user-data-name {
font-size: 28rpx;
font-weight: 400;
color: #000000;
margin-left: 16rpx;
}
.user-data-state {
font-size: 24rpx;
font-weight: 600;
color: #F20808;
}
}
.car-rental {
width: calc(100% - 48rpx);
margin: 24rpx 24rpx 0 24rpx;
padding-bottom: 24rpx;
border-bottom: 1rpx solid #eee;
.car-rental-cont {
height: 150rpx;
width: calc(100% - 218rpx);
margin-left: 16rpx;
display: flex;
flex-direction: column;
justify-content: space-around;
.car-rental-cont-name {
font-size: 32rpx;
font-weight: 400;
color: #111111;
}
.car-rental-cont-price {
font-size: 32rpx;
font-weight: 600;
color: #111111;
}
.car-rental-cont-total-payment {
font-size: 24rpx;
font-weight: 400;
color: #666666;
}
}
image {
width: 202rpx;
height: 150rpx;
}
}
.list-cont {
width: calc(100% - 48rpx);
margin: 24rpx;
background: #fff;
border-radius: 8rpx;
padding-bottom: 24rpx;
.order-price {
font-size: 24rpx;
font-weight: 400;
color: #999999;
margin: 16rpx 24rpx 38rpx 0;
text {
font-size: 40rpx;
font-weight: 600;
color: #000000;
}
}
}
.tab-list {
background: #fff;
view {
width: 88rpx;
padding-bottom: 12rpx;
border-bottom: 6rpx solid transparent;
font-size: 29rpx;
font-weight: 600;
color: #555555;
text-align: center;
}
.act-tab {
border-bottom: 6rpx solid #000;
font-size: 29rpx;
font-weight: 600;
color: #222222;
}
}
.act-flaf {
width: calc(100% - 56rpx);
margin-left: 24rpx;
}
.circle {
width: 30rpx;
height: 30rpx;
border-radius: 50%;
border: 2rpx solid #D7D7D7;
}
.my-evaluate {
background: #fff;
padding: 16rpx 24rpx;
width: calc(100% - 48rpx);
margin: 24rpx;
border-radius: 8rpx;
}
.butt-list {
width: 160rpx;
height: 56rpx;
margin-left: 16rpx;
}
</style>

2
pages/carShop/order/car_rental/car_rental_order.vue
View File

@@ -34,7 +34,7 @@
<image :src="item.image" mode=""></image>
<view class="car-rental-cont">
<view class="car-rental-cont-name">{{item.title}}</view>
<view class="car-rental-cont-auto-age">车龄 {{item.carAge}}年 | 租期 {{item.monthRent}}年</view>
<view class="car-rental-cont-auto-age">车龄 {{item.carAge}}年 | 租期 {{item.monthRent}}个月</view>
<view class="car-rental-cont-price">{{item.rentalPrice}}<text
class="car-rental-cont-price-tit">元/月</text>
</view>

4
pages/carShop/order/car_rental/rental_particulars.vue
View File

@@ -51,6 +51,10 @@
<view class="title">接单信息</view>
<view class="buy-info">
<view class="f-jcsb cont-list">
<view class="c444 f-28">车牌号</view>
<view class="f-28 c111">{{formData.carNo?formData.carNo:'--'}}</view>
</view>
<view class="f-jcsb cont-list cont-ma48">
<view class="c444 f-28">租赁费用</view>
<view class="f-28 c111">¥{{formData.price}}</view>
</view>

5
pages/driver/mine/my_order/rentCars/rent_particulars.vue
View File

@@ -46,6 +46,10 @@
<view class="title">费用及时间</view>
<view class="buy-info">
<view class="f-jcsb cont-list">
<view>车牌号</view>
<view>{{orderData.carNo?orderData.carNo:'--'}}</view>
</view>
<view class="f-jcsb cont-list cont-ma48">
<view>租赁费用</view>
<view>¥{{orderData.price}}</view>
</view>
@@ -198,6 +202,7 @@
},
getInformationOrderDealerFn() {
getInformationOrderDealer(this.orderId).then(res => {
console.log( '详情',res.data);
this.orderData = res.data
})
}

46
pages/driver/serve/repair/re_binding.vue
View File

@@ -115,10 +115,7 @@
</view>
</u-form-item>
<u-form-item label="解绑日期" prop="dataTime" @click="datetimeShow=true" border-bottom='true'>
<view class="lr" v-if="carInfo.unbindTime">
{{carInfo.unbindTime?carInfo.unbindTime:'--'}}
</view>
<view class="lr" v-else>
<view class="lr">
<u--input v-model="dataTime" placeholder="请选择(必选)" :readonly='true'
suffixIcon="arrow-right" suffixIconStyle="color: #999999"
placeholderStyle=" color: #999999 " border="none" inputAlign='right'></u--input>
@@ -144,12 +141,11 @@
placeholderStyle=" color: #999999 " border='none' inputAlign='right'></u--input>
</view>
</u-form-item>
<u-form-item label="车主姓名" border-bottom='true'
v-if="carInfo.category==2 || formData.category==2">
<view class="lr" v-if="carInfo.ownerName">
<u-form-item label="车主姓名" border-bottom='true'>
<!-- <view class="lr" v-if="carInfo.ownerName">
{{carInfo.ownerName?carInfo.ownerName:'--'}}
</view>
<view class="lr" v-else>
</view> -->
<view class="lr" >
<u--input placeholder="请填写(非必填)" v-model="formData.ownerName"
placeholderStyle=" color: #999999" inputAlign="right" border='none'></u--input>
</view>
@@ -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();
});

12
pages/driver/showroom/carRental/index.vue
View File

@@ -248,7 +248,8 @@
</view>
</view>
<view class="problem-image">
<u-parse :content="problemTypeContent" :tagStyle="parseStyle"></u-parse>
<rich-text :nodes="problemTypeContent" :tagStyle="parseStyle" :preview="false" :image-menu-prevent="false"></rich-text>
<!-- <u-parse :showImgMenu="false" :content="problemTypeContent" :tagStyle="parseStyle" :previewImg="false"></u-parse> -->
</view>
</view>
</view>
@@ -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;
}
}
}

6
uni_modules/uview-ui/components/u-parse/node/node.vue
View File

@@ -5,12 +5,12 @@
<!-- 占位图 -->
<image v-if="n.name=='img'&&((opts[1]&&!ctrl[i])||ctrl[i]<0)" class="_img" :style="n.attrs.style" :src="ctrl[i]<0?opts[2]:opts[1]" mode="widthFix" />
<!-- 显示图片 -->
<!-- #ifndef H5 || APP-PLUS -->
<image v-if="n.name=='img'" :id="n.attrs.id" :class="'_img '+n.attrs.class" :style="(ctrl[i]==-1?'display:none;':'')+'width:'+(ctrl[i]||1)+'px;height:1px;'+n.attrs.style" :src="n.attrs.src" :mode="n.h?'':'widthFix'" :lazy-load="opts[0]" :webp="n.webp" :show-menu-by-longpress="opts[3]&&!n.attrs.ignore" :image-menu-prevent="!opts[3]||n.attrs.ignore" :data-i="i" @load="imgLoad" @error="mediaError" @tap.stop="imgTap" @longpress="imgLongTap" />
<!-- #endif -->
<!-- #ifdef H5 || APP-PLUS -->
<img v-if="n.name=='img'" :id="n.attrs.id" :class="'_img '+n.attrs.class" :style="(ctrl[i]==-1?'display:none;':'')+n.attrs.style" :src="n.attrs.src||(ctrl.load?n.attrs['data-src']:'')" :data-i="i" @load="imgLoad" @error="mediaError" @tap.stop="imgTap" @longpress="imgLongTap"/>
<!-- #endif -->
<!-- #ifndef H5 || APP-PLUS -->
<image v-if="n.name=='img'" :id="n.attrs.id" :class="'_img '+n.attrs.class" :style="(ctrl[i]==-1?'display:none;':'')+'width:'+(ctrl[i]||1)+'px;height:1px;'+n.attrs.style" :src="n.attrs.src" :mode="n.h?'':'widthFix'" :lazy-load="opts[0]" :webp="n.webp" :show-menu-by-longpress="opts[3]&&!n.attrs.ignore" :image-menu-prevent="!opts[3]||n.attrs.ignore" :data-i="i" @load="imgLoad" @error="mediaError" @tap.stop="imgTap" @longpress="imgLongTap" />
<!-- #endif -->
<!-- 文本 -->
<!-- #ifndef MP-BAIDU -->
<text v-else-if="n.type=='text'" decode>{{n.text}}</text>