问题清单修复
This commit is contained in:
parent
01533c4e4c
commit
abec60f57e
|
|
@ -9,7 +9,9 @@
|
|||
}
|
||||
"
|
||||
>
|
||||
{{ props.activeTypeName }}
|
||||
<text>
|
||||
{{ props.activeTypeName }}
|
||||
</text>
|
||||
<van-icon name="arrow-down" />
|
||||
|
||||
<view class="check-item" v-if="isSelectShow">
|
||||
|
|
@ -38,7 +40,11 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<van-field :modelValue="searchModelValue" @update:modelValue="onInputChange" />
|
||||
<van-field
|
||||
:placeholder="`${activeTypeName}搜索`"
|
||||
:modelValue="searchModelValue"
|
||||
@update:modelValue="onInputChange"
|
||||
/>
|
||||
<van-button square type="primary" icon="search" @click="onSearchBtn" />
|
||||
</view>
|
||||
</template>
|
||||
|
|
@ -104,6 +110,7 @@ const onInputChange = (value) => {
|
|||
border-right: none;
|
||||
border-top-left-radius: 18px;
|
||||
border-bottom-left-radius: 18px;
|
||||
font-size: 13px;
|
||||
|
||||
.check-item {
|
||||
position: absolute;
|
||||
|
|
|
|||
|
|
@ -199,8 +199,7 @@
|
|||
"pagePath": "pages/cart/index",
|
||||
"text": "预约车",
|
||||
"iconPath": "static/tab-bar/car.png",
|
||||
"selectedIconPath": "static/tab-bar/car_sel.png",
|
||||
"visible": false
|
||||
"selectedIconPath": "static/tab-bar/car_sel.png"
|
||||
},
|
||||
{
|
||||
"pagePath": "pages/message/index",
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<template>
|
||||
<!-- 分类 -->
|
||||
<view class="h5-container my-setting">
|
||||
<view style="padding: 15px">
|
||||
<van-icon name="arrow-left" @click="onClickLeft" />
|
||||
<text style="color: #000"> 分类 </text>
|
||||
<view class="nav-title">
|
||||
<van-icon name="arrow-left" @click="onClickLeft"> 返回 </van-icon>
|
||||
<text class="nav-title-text"> 分类筛选 </text>
|
||||
</view>
|
||||
|
||||
<scroll-view scroll-y>
|
||||
|
|
@ -108,16 +108,33 @@ onShow(() => {
|
|||
background: linear-gradient(to bottom, #c0e9ce, #e4f2f2, #f9f9f9);
|
||||
}
|
||||
|
||||
// .nav-title {
|
||||
// position: relative;
|
||||
// padding: 15px;
|
||||
// .nav-title-text {
|
||||
// position: absolute;
|
||||
// left: 50%;
|
||||
// top: 50%;
|
||||
// transform: translate(-50%, -50%);
|
||||
// color: #333;
|
||||
// font-size: 16px;
|
||||
// }
|
||||
// }
|
||||
|
||||
:deep(.van-cell-group--inset) {
|
||||
padding: 15px 0;
|
||||
}
|
||||
.companyClass {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
|
||||
view {
|
||||
width: calc((100% - 20px) / 3);
|
||||
margin-right: 10px;
|
||||
margin-top: 10px;
|
||||
// width: calc((100% - 20px) / 3);
|
||||
// margin-right: 10px;
|
||||
// margin-top: 10px;
|
||||
width: 98%;
|
||||
margin-bottom: 10px;
|
||||
padding: 0 6px;
|
||||
height: 32px;
|
||||
line-height: 32px;
|
||||
|
|
@ -126,15 +143,7 @@ onShow(() => {
|
|||
box-sizing: border-box;
|
||||
color: #999999;
|
||||
background-color: #e9e9e9;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
& view:nth-child(3n) {
|
||||
margin-right: 0;
|
||||
}
|
||||
& view:hover {
|
||||
background-color: #22ab9b !important;
|
||||
color: #fff !important;
|
||||
font-size: 13px;
|
||||
}
|
||||
}
|
||||
.deviceClass {
|
||||
|
|
@ -144,7 +153,7 @@ onShow(() => {
|
|||
padding-left: 10px;
|
||||
view {
|
||||
width: 100%;
|
||||
margin-top: 10px;
|
||||
margin-top: 8px;
|
||||
padding: 0 6px;
|
||||
height: 32px;
|
||||
line-height: 32px;
|
||||
|
|
@ -153,7 +162,7 @@ onShow(() => {
|
|||
box-sizing: border-box;
|
||||
color: #999999;
|
||||
background-color: #e9e9e9;
|
||||
font-size: 14px;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
& view:nth-child(2n) {
|
||||
|
|
@ -177,29 +186,19 @@ onShow(() => {
|
|||
display: none;
|
||||
}
|
||||
|
||||
:deep(.van-sidebar-item__text) {
|
||||
white-space: nowrap; /* 防止换行 */
|
||||
overflow: hidden; /* 隐藏溢出的内容 */
|
||||
text-overflow: ellipsis; /* 显示省略号 */
|
||||
max-width: 100%; /* 最大宽度,根据需要设置 */
|
||||
display: block; /* 确保是块级元素 */
|
||||
}
|
||||
:deep(.van-tabs__nav) {
|
||||
background-color: #c5ead3;
|
||||
padding: 0 8px;
|
||||
}
|
||||
:deep(.van-sidebar-item) {
|
||||
padding: 0 8px;
|
||||
background-color: #daefe8;
|
||||
color: #333333;
|
||||
font-size: 14px;
|
||||
height: 32px;
|
||||
line-height: 32px;
|
||||
padding: 2px 8px;
|
||||
font-size: 13px;
|
||||
}
|
||||
:deep(.van-sidebar-item--select, .van-sidebar-item--select:active) {
|
||||
background-color: #22ab9b;
|
||||
color: #fff;
|
||||
border-radius: 16px;
|
||||
font-weight: normal;
|
||||
border-radius: 6px;
|
||||
}
|
||||
:deep(.van-sidebar) {
|
||||
padding: 0 4px;
|
||||
|
|
|
|||
|
|
@ -2,18 +2,9 @@
|
|||
<!-- 需求详情 -->
|
||||
<view class="h5-container demand-details-container">
|
||||
<!-- <Navbar :navTitle="`需求详情`" /> -->
|
||||
<view
|
||||
style="
|
||||
padding: 15px 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
"
|
||||
>
|
||||
<view>
|
||||
<van-icon name="arrow-left" @click="onClickLeft" />
|
||||
<text style="color: #000"> 需求详情 </text>
|
||||
</view>
|
||||
<view class="nav-title">
|
||||
<van-icon name="arrow-left" @click="onClickLeft"> 返回 </van-icon>
|
||||
<text class="nav-title-text"> 需求详情 </text>
|
||||
</view>
|
||||
|
||||
<scroll-view scroll-y :style="{ paddingBottom: actionBarHeight + 'px' }">
|
||||
|
|
@ -242,7 +233,7 @@ onLoad(async (options) => {
|
|||
// box-sizing: border-box;
|
||||
// background: linear-gradient(to bottom, #bfdfdb, #f9f9f9, #fff);
|
||||
|
||||
font-size: 16px;
|
||||
font-size: 14px;
|
||||
|
||||
.card-style {
|
||||
width: 97%;
|
||||
|
|
@ -250,7 +241,7 @@ onLoad(async (options) => {
|
|||
border-radius: 6px;
|
||||
padding: 8px 12px;
|
||||
box-sizing: border-box;
|
||||
font-size: 16px;
|
||||
font-size: 14px;
|
||||
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
.goods-name {
|
||||
|
|
@ -260,7 +251,7 @@ onLoad(async (options) => {
|
|||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
font-size: 18px;
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
letter-spacing: 2px;
|
||||
|
||||
|
|
@ -272,7 +263,7 @@ onLoad(async (options) => {
|
|||
|
||||
.text-right {
|
||||
margin-top: 6px;
|
||||
font-size: 16px;
|
||||
font-size: 14px;
|
||||
text-align: right;
|
||||
}
|
||||
}
|
||||
|
|
@ -282,7 +273,7 @@ onLoad(async (options) => {
|
|||
.goods-details text,
|
||||
.demand-list text {
|
||||
margin-right: 16px;
|
||||
font-size: 16px;
|
||||
font-size: 14px;
|
||||
color: #5c5b5b;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -41,10 +41,6 @@
|
|||
<text> 上架数量:{{ deviceInfo.devUapNum }} </text>
|
||||
<text> 访问量:{{ deviceInfo.companyVisitNum }} </text>
|
||||
</view>
|
||||
<view>
|
||||
<van-icon name="location-o" />
|
||||
<text> 合肥市 </text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="card-style goods-details">
|
||||
|
|
@ -52,32 +48,9 @@
|
|||
<view v-for="item in goodsLabel" :key="item.goods_label">
|
||||
<text> {{ item.goods_label }}{{ deviceInfo[item.label_content] }}</text>
|
||||
</view>
|
||||
<!-- <h4 class="h4-title">装备外观</h4>
|
||||
<van-image
|
||||
style="margin-bottom: 6px"
|
||||
fit="cover"
|
||||
position="center"
|
||||
v-for="item in deviceInfo.detailsFileList"
|
||||
:key="item.id"
|
||||
:src="item.fileUrl"
|
||||
/>
|
||||
<h4 class="h4-title">证书展示</h4>
|
||||
<view>
|
||||
合格证:
|
||||
<view v-for="item in deviceInfo.insurancePdf" :key="item.id" class="prove-container">
|
||||
{{ item.fileName }}
|
||||
</view>
|
||||
</view>
|
||||
<h4 class="h4-title">出租记录</h4>
|
||||
<van-cell-group inset v-for="(item, index) in deviceInfo.leaseList" :key="index">
|
||||
<van-cell title="订单号" :value="item.orderCode" />
|
||||
<van-cell title="租赁方" :value="item.leaseName" />
|
||||
<van-cell title="租赁开始时间" :value="item.leaseStartTime" />
|
||||
<van-cell title="租赁结束时间" :value="item.leaseEndTime" />
|
||||
</van-cell-group> -->
|
||||
</view>
|
||||
|
||||
<van-action-bar v-if="memberStore.userType === 2" :safe-area-inset-bottom="true">
|
||||
<van-action-bar :safe-area-inset-bottom="true">
|
||||
<van-action-bar-icon icon="chat-o" text="在线聊" @click="onLineMessage" />
|
||||
<van-action-bar-icon
|
||||
icon="shop-o"
|
||||
|
|
@ -220,11 +193,6 @@ onLoad(() => {
|
|||
.van-swipe {
|
||||
width: 100%;
|
||||
height: 40vh;
|
||||
|
||||
// .van-image {
|
||||
// width: 100%;
|
||||
// height: 100%;
|
||||
// }
|
||||
}
|
||||
|
||||
.card-style {
|
||||
|
|
|
|||
|
|
@ -4,18 +4,9 @@
|
|||
<!-- <Navbar :navTitle="`装备共享大厅`" /> -->
|
||||
<!-- <van-nav-bar title="装备共享大厅" left-text="返回" left-arrow @click-left="onClickLeft" /> -->
|
||||
|
||||
<view
|
||||
style="
|
||||
padding: 15px 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
"
|
||||
>
|
||||
<view>
|
||||
<van-icon name="arrow-left" @click="onClickLeft" />
|
||||
<text style="color: #000"> 装备共享大厅 </text>
|
||||
</view>
|
||||
<view style="padding: 15px 0" class="nav-title">
|
||||
<van-icon name="arrow-left" @click="onClickLeft" />
|
||||
<text class="nav-title-text"> 装备共享大厅 </text>
|
||||
</view>
|
||||
<view style="padding: 10px">
|
||||
<SearchIpt
|
||||
|
|
@ -27,15 +18,8 @@
|
|||
|
||||
<view class="goods-items">
|
||||
<view class="filter-box">
|
||||
<!-- <view class="filter-items">
|
||||
使用年限
|
||||
<view class="filter-type">
|
||||
<van-icon name="play" size="12" />
|
||||
<van-icon name="play" size="12" />
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="filter-items">
|
||||
租金
|
||||
<text> 租金 </text>
|
||||
<view class="filter-type">
|
||||
<van-icon
|
||||
name="play"
|
||||
|
|
@ -60,7 +44,7 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="filter-items">
|
||||
上架时间
|
||||
<text> 上架时间 </text>
|
||||
<view class="filter-type">
|
||||
<van-icon
|
||||
name="play"
|
||||
|
|
@ -83,7 +67,7 @@
|
|||
</view>
|
||||
|
||||
<view @click="onFilter">
|
||||
筛选
|
||||
<text> 上架时间 </text>
|
||||
<van-icon name="filter-o" />
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -449,9 +433,7 @@ onShow(() => {})
|
|||
display: flex;
|
||||
justify-content: space-between;
|
||||
padding: 10px;
|
||||
box-sizing: border-box;
|
||||
border-top-left-radius: 20px;
|
||||
border-top-right-radius: 20px;
|
||||
font-size: 13px;
|
||||
// background: $uni-bg-color;
|
||||
|
||||
.filter-box {
|
||||
|
|
@ -462,12 +444,16 @@ onShow(() => {})
|
|||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
text {
|
||||
margin-right: 6px;
|
||||
}
|
||||
|
||||
.filter-type {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
padding: 0 6px;
|
||||
// padding: 0 6px;
|
||||
|
||||
& .van-icon:first-child {
|
||||
transform: rotateZ(-90deg);
|
||||
|
|
|
|||
|
|
@ -2,43 +2,6 @@
|
|||
<!-- 首页 -->
|
||||
<view class="index-container">
|
||||
<view class="index-header">
|
||||
<view class="flex-row-start" style="margin-top: 10px">
|
||||
<!-- <van-icon name="manager" style="margin-right: 6px" /> -->
|
||||
<!-- <van-image
|
||||
round
|
||||
fit="cover"
|
||||
width="26px"
|
||||
height="26px"
|
||||
:src="memberStore.userInfo.avatar"
|
||||
/> -->
|
||||
|
||||
<view
|
||||
style="
|
||||
width: 28px;
|
||||
height: 28px;
|
||||
text-align: center;
|
||||
line-height: 28px;
|
||||
border-radius: 14px;
|
||||
margin-right: 6px;
|
||||
background-color: #c5e3df;
|
||||
"
|
||||
>
|
||||
<van-icon name="manager" color="#7e8576" size="18" />
|
||||
</view>
|
||||
<van-popover
|
||||
size="small"
|
||||
:show-arrow="false"
|
||||
:actions="userActions"
|
||||
v-model:show="showPopover"
|
||||
@select="onUserSelect"
|
||||
>
|
||||
<template #reference>
|
||||
<text> {{ activeUser == 1 ? '出租方' : '承租方' }} </text>
|
||||
<van-icon name="arrow-down" />
|
||||
</template>
|
||||
</van-popover>
|
||||
</view>
|
||||
|
||||
<view class="user-name"> 您好!{{ userCompanyName }} </view>
|
||||
<view class="notice-box">
|
||||
<van-image height="0.8rem" width="4rem" :src="noticeImg" />
|
||||
|
|
@ -150,15 +113,7 @@ const noticeListMessage = ref([])
|
|||
|
||||
const orderData = ref([
|
||||
{ order_title: '我的订单', order_count: 0, order_status: 0, order_icon: orderIcon_1 },
|
||||
{
|
||||
order_title: '待出库',
|
||||
order_status: 2,
|
||||
order_count: 0,
|
||||
order_icon: orderIcon_2,
|
||||
},
|
||||
{ order_title: '待收货', order_status: 3, order_count: 0, order_icon: orderIcon_3 },
|
||||
{ order_title: '租赁中', order_status: 4, order_count: 0, order_icon: orderIcon_4 },
|
||||
{ order_title: '已退租', order_status: 5, order_count: 0, order_icon: orderIcon_5 },
|
||||
{ order_title: '已完成', order_status: 20, order_count: 0, order_icon: orderIcon_6 },
|
||||
])
|
||||
const userActions = ref([
|
||||
|
|
@ -244,20 +199,7 @@ onLoad(() => {
|
|||
|
||||
onShow(async () => {
|
||||
activeUser.value = memberStore.userType
|
||||
if (activeUser.value === 2) {
|
||||
uni.setTabBarItem({
|
||||
index: 2,
|
||||
visible: true,
|
||||
})
|
||||
} else {
|
||||
uni.setTabBarItem({
|
||||
index: 2,
|
||||
visible: false,
|
||||
})
|
||||
}
|
||||
|
||||
getOrderStatusCountData()
|
||||
|
||||
const res = await getToDoListAPI()
|
||||
const { data: result } = await getNoticeLListAPI()
|
||||
toDoListMessage.value = res.rows
|
||||
|
|
@ -278,9 +220,9 @@ onShow(async () => {
|
|||
margin-bottom: 10px;
|
||||
text-align: center;
|
||||
padding: 10px 0;
|
||||
font-size: 17px;
|
||||
font-size: 14px;
|
||||
font-weight: bold;
|
||||
letter-spacing: 3px;
|
||||
letter-spacing: 2px;
|
||||
}
|
||||
|
||||
.notice-box {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
|
||||
<view style="padding: 15px 0; display: flex; align-items: center; justify-content: center">
|
||||
<view>
|
||||
<!-- <van-icon name="arrow-left" @click="onClickLeft" /> -->
|
||||
<text style="color: #000"> 需求共享大厅 </text>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -18,11 +17,7 @@
|
|||
/>
|
||||
</view>
|
||||
|
||||
<navigator
|
||||
class="demand-release"
|
||||
url="/pages/demand-release/index"
|
||||
v-if="memberStore.userType === 2"
|
||||
>
|
||||
<navigator class="demand-release" url="/pages/demand-release/index">
|
||||
<view>
|
||||
<van-highlight
|
||||
:keywords="keywords"
|
||||
|
|
@ -37,7 +32,7 @@
|
|||
<view class="goods-items">
|
||||
<view class="filter-box">
|
||||
<view class="filter-items">
|
||||
发布时间
|
||||
<text> 发布时间 </text>
|
||||
<view class="filter-type">
|
||||
<van-icon
|
||||
name="play"
|
||||
|
|
@ -56,7 +51,7 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="filter-items">
|
||||
租期
|
||||
<text> 租期 </text>
|
||||
<view class="filter-type">
|
||||
<van-icon
|
||||
name="play"
|
||||
|
|
@ -73,7 +68,7 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="filter-items">
|
||||
截止时间
|
||||
<text> 截止时间 </text>
|
||||
<view class="filter-type">
|
||||
<van-icon
|
||||
name="play"
|
||||
|
|
@ -90,7 +85,7 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="filter-items">
|
||||
租赁数量
|
||||
<text> 租赁数量 </text>
|
||||
<view class="filter-type">
|
||||
<van-icon
|
||||
name="play"
|
||||
|
|
@ -106,11 +101,11 @@
|
|||
/>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view @click="onFilter">
|
||||
筛选
|
||||
<van-icon name="filter-o" />
|
||||
<view @click="onFilter" class="filter-items">
|
||||
<text> 筛选 </text>
|
||||
<van-icon name="filter-o" />
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
|
@ -170,14 +165,19 @@
|
|||
|
||||
<view class="demand-items">
|
||||
<view style="text-align: right">
|
||||
<van-button type="success" size="small" @click="onDemandDetails(d.id)">
|
||||
<van-button
|
||||
type="success"
|
||||
size="mini"
|
||||
@click="onDemandDetails(d.id)"
|
||||
style="padding: 4px 12px"
|
||||
>
|
||||
需求详情
|
||||
</van-button>
|
||||
<van-button
|
||||
type="primary"
|
||||
size="small"
|
||||
size="mini"
|
||||
class="primary-lease"
|
||||
style="margin-left: 10px"
|
||||
style="margin-left: 10px; padding: 4px 12px"
|
||||
:disabled="userCompanyId == d.publishCompany"
|
||||
@click="onReceivingOrders(d.id)"
|
||||
v-if="memberStore.userType === 1"
|
||||
|
|
@ -516,29 +516,27 @@ onHide(() => {
|
|||
}
|
||||
|
||||
.goods-items {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
padding: 10px;
|
||||
box-sizing: border-box;
|
||||
border-top-left-radius: 20px;
|
||||
border-top-right-radius: 20px;
|
||||
|
||||
// background: $uni-bg-color;
|
||||
|
||||
.filter-box {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
|
||||
.filter-items {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
font-size: 14px;
|
||||
|
||||
font-size: 13px;
|
||||
text {
|
||||
margin-right: 6px;
|
||||
}
|
||||
.filter-type {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
padding: 0 4px;
|
||||
|
||||
& .van-icon:first-child {
|
||||
transform: rotateZ(-90deg);
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<template>
|
||||
<!-- 我的--我的需求-->
|
||||
<view class="h5-container my-setting">
|
||||
<view style="padding: 15px">
|
||||
<view style="padding: 15px" class="nav-title">
|
||||
<van-icon name="arrow-left" @click="onClickLeft" />
|
||||
<text style="color: #000"> 我的需求 </text>
|
||||
<text class="nav-title-text"> 我的需求 </text>
|
||||
</view>
|
||||
|
||||
<scroll-view scroll-y @scrolltolower="onScrollTolower">
|
||||
|
|
|
|||
|
|
@ -29,19 +29,19 @@
|
|||
<h2>我的订单</h2>
|
||||
|
||||
<van-grid clickable :column-num="2" :gutter="10">
|
||||
<van-grid-item v-if="memberStore.userType === 1">
|
||||
<van-grid-item>
|
||||
<view @click="onJumpMyOrder(1)">
|
||||
<van-icon name="cart" />
|
||||
<text>出租订单</text>
|
||||
</view>
|
||||
</van-grid-item>
|
||||
<van-grid-item v-if="memberStore.userType === 1">
|
||||
<van-grid-item>
|
||||
<view @click="onJumpMyDemand">
|
||||
<van-icon name="cart" />
|
||||
<text>我的需求</text>
|
||||
</view>
|
||||
</van-grid-item>
|
||||
<van-grid-item v-if="memberStore.userType === 2" @click="onJumpMyOrder(2)">
|
||||
<van-grid-item @click="onJumpMyOrder(2)">
|
||||
<view>
|
||||
<van-icon name="cart" />
|
||||
<text>承租订单</text>
|
||||
|
|
@ -95,7 +95,7 @@ onLoad(() => {
|
|||
.header-user {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 20px;
|
||||
padding: 20px 0;
|
||||
|
||||
.right-name {
|
||||
padding-left: 15px;
|
||||
|
|
@ -108,7 +108,7 @@ onLoad(() => {
|
|||
}
|
||||
|
||||
.name {
|
||||
font-size: 18px;
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
|
|
@ -120,6 +120,16 @@ onLoad(() => {
|
|||
color: #32b1a2;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.name,
|
||||
.company {
|
||||
display: -webkit-box;
|
||||
-webkit-box-orient: vertical;
|
||||
overflow: hidden;
|
||||
-webkit-line-clamp: 1;
|
||||
text-overflow: ellipsis;
|
||||
word-break: break-all;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<template>
|
||||
<!-- 我的--设置 -->
|
||||
<view class="h5-container order-details">
|
||||
<view style="padding: 15px">
|
||||
<view style="padding: 15px" class="nav-title">
|
||||
<van-icon name="arrow-left" @click="onClickLeft" />
|
||||
<text style="color: #000"> 订单详情 </text>
|
||||
<text class="nav-title-text"> 订单详情 </text>
|
||||
</view>
|
||||
|
||||
<!-- <van-cell-group inset style="flex: 1"> </van-cell-group> -->
|
||||
|
|
@ -71,162 +71,6 @@
|
|||
<van-cell title="承租人电话" :value="orderDetails.phoneNumber" />
|
||||
<van-cell title="收货地址" :value="orderDetails.address" />
|
||||
</van-cell-group>
|
||||
|
||||
<view v-if="orderDetails.orderStatus == 20">
|
||||
<TitleTip :title="`租赁费用明细`" />
|
||||
<view
|
||||
:key="item.id"
|
||||
class="items-container"
|
||||
v-for="(item, index) in orderDetailDtoList"
|
||||
>
|
||||
<view class="count-title">
|
||||
<text></text>
|
||||
<text style="font-weight: bold">设备{{ index + 1 }}</text>
|
||||
</view>
|
||||
<van-cell-group inset>
|
||||
<van-cell title="装备编号" :value="item.code" />
|
||||
<van-cell title="装备名称" :value="item.deviceName" />
|
||||
<van-cell title="装备型号" :value="item.typeName" />
|
||||
<van-cell title="装备数量" :value="item.num" />
|
||||
<van-cell title="租赁单价(元/天)" :value="item.dayLeasePrice" />
|
||||
<van-cell title="租赁天数" :value="item.dateDays" />
|
||||
<van-cell
|
||||
title="租期"
|
||||
:value="`${item.preOutboundTime}至${item.rentOverTime}`"
|
||||
/>
|
||||
<van-cell title="租赁费用" :value="item.costs" />
|
||||
<van-cell title="改价后费用" :value="item.changeCost" />
|
||||
<!-- <van-cell title="操作改价" /> -->
|
||||
<van-field
|
||||
v-model="item.costs"
|
||||
name="密码"
|
||||
label="操作改价"
|
||||
placeholder="请输入改价后费用"
|
||||
/>
|
||||
</van-cell-group>
|
||||
</view>
|
||||
|
||||
<van-empty description="暂无数据" v-if="orderDetailDtoList.length === 0" />
|
||||
|
||||
<TitleTip :title="`维修费用明细`" />
|
||||
|
||||
<view
|
||||
:key="item.id"
|
||||
class="items-container"
|
||||
v-for="(item, index) in repairRecordList"
|
||||
>
|
||||
<view class="count-title">
|
||||
<text></text>
|
||||
<text style="font-weight: bold">设备{{ index + 1 }}</text>
|
||||
</view>
|
||||
<van-cell-group inset>
|
||||
<van-cell title="装备编号" :value="item.code" />
|
||||
<van-cell title="装备名称" :value="item.deviceName" />
|
||||
<van-cell title="装备型号" :value="item.typeName" />
|
||||
<van-cell title="维修数量" :value="item.repairNum" />
|
||||
<van-cell title="维修费用(元)" :value="item.repairPrice" />
|
||||
<van-cell title="改价后费用(元)" :value="item.repairChangePrice" />
|
||||
<van-cell title="附件" center>
|
||||
<template #right-icon>
|
||||
<view
|
||||
class="view-file"
|
||||
v-if="item.fileList[0]?.fileName"
|
||||
@click="onPreviewFile(item.fileList)"
|
||||
>
|
||||
点击查看
|
||||
</view>
|
||||
<view v-else> 暂无附件 </view>
|
||||
</template>
|
||||
</van-cell>
|
||||
<van-field
|
||||
v-model="item.repairPrice"
|
||||
label="操作改价"
|
||||
placeholder="请输入改价后费用"
|
||||
/>
|
||||
</van-cell-group>
|
||||
</view>
|
||||
<van-empty description="暂无数据" v-if="repairRecordList.length === 0" />
|
||||
|
||||
<TitleTip :title="`报废费用明细`" />
|
||||
|
||||
<view
|
||||
:key="item.id"
|
||||
class="items-container"
|
||||
v-for="(item, index) in scrapRecordList"
|
||||
>
|
||||
<view class="count-title">
|
||||
<text></text>
|
||||
<text style="font-weight: bold">设备{{ index + 1 }}</text>
|
||||
</view>
|
||||
<van-cell-group inset>
|
||||
<van-cell title="装备编号" :value="item.code" />
|
||||
<van-cell title="装备名称" :value="item.deviceName" />
|
||||
<van-cell title="装备型号" :value="item.typeName" />
|
||||
<van-cell title="报废数量" :value="item.scrapNum" />
|
||||
<van-cell title="报废原因" :value="item.scrapReason" />
|
||||
<van-cell title="报废费用(元)" :value="item.scrapPrice" />
|
||||
<van-cell title="改价后费用(元)" :value="item.scrapChangePrice" />
|
||||
<van-cell title="附件" center>
|
||||
<template #right-icon>
|
||||
<view
|
||||
class="view-file"
|
||||
v-if="item.fileList[0]?.fileName"
|
||||
@click="onPreviewFile(item.fileList)"
|
||||
>
|
||||
点击查看
|
||||
</view>
|
||||
<view v-else> 暂无附件 </view>
|
||||
</template>
|
||||
</van-cell>
|
||||
<van-field
|
||||
v-model="item.scrapPrice"
|
||||
name="密码"
|
||||
label="操作改价"
|
||||
placeholder="请输入改价后费用"
|
||||
/>
|
||||
</van-cell-group>
|
||||
</view>
|
||||
<van-empty description="暂无数据" v-if="scrapRecordList.length === 0" />
|
||||
|
||||
<TitleTip :title="`丢失费用明细`" />
|
||||
<view
|
||||
:key="item.id"
|
||||
class="items-container"
|
||||
v-for="(item, index) in lossRecordList"
|
||||
>
|
||||
<view class="count-title">
|
||||
<text></text>
|
||||
<text style="font-weight: bold">设备{{ index + 1 }}</text>
|
||||
</view>
|
||||
<van-cell-group inset>
|
||||
<van-cell title="装备编号" :value="item.code" />
|
||||
<van-cell title="装备名称" :value="item.deviceName" />
|
||||
<van-cell title="装备型号" :value="item.typeName" />
|
||||
<van-cell title="丢失数量" :value="item.lossNum" />
|
||||
<van-cell title="丢失费用(元)" :value="item.lossPrice" />
|
||||
<van-cell title="改价后费用(元)" :value="item.lossChangePrice" />
|
||||
<van-cell title="附件" center>
|
||||
<template #right-icon>
|
||||
<view
|
||||
class="view-file"
|
||||
v-if="item.fileList[0]?.fileName"
|
||||
@click="onPreviewFile(item.fileList)"
|
||||
>
|
||||
点击查看
|
||||
</view>
|
||||
<view v-else> 暂无附件 </view>
|
||||
</template>
|
||||
</van-cell>
|
||||
<van-field
|
||||
v-model="item.lossPrice"
|
||||
name="密码"
|
||||
label="操作改价"
|
||||
placeholder="请输入改价后费用"
|
||||
/>
|
||||
</van-cell-group>
|
||||
</view>
|
||||
<van-empty description="暂无数据" v-if="lossRecordList.length === 0" />
|
||||
</view>
|
||||
</scroll-view>
|
||||
</view>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<template>
|
||||
<!-- 订单详情-->
|
||||
<view class="h5-container order-details">
|
||||
<view style="padding: 15px">
|
||||
<view class="nav-title" style="padding: 15px">
|
||||
<van-icon name="arrow-left" @click="onClickLeft" />
|
||||
<text style="color: #000"> 我的订单 </text>
|
||||
<text class="nav-title-text"> 我的订单 </text>
|
||||
</view>
|
||||
|
||||
<van-tabs
|
||||
|
|
@ -154,7 +154,7 @@
|
|||
{{ initLesseeBtnText(item.orderStatus) }}
|
||||
</van-button>
|
||||
|
||||
<van-button
|
||||
<!-- <van-button
|
||||
style="margin-right: 6px"
|
||||
size="small"
|
||||
type="primary"
|
||||
|
|
@ -213,7 +213,7 @@
|
|||
@click.stop="onViewCosts(item)"
|
||||
>
|
||||
费用清单
|
||||
</van-button>
|
||||
</van-button> -->
|
||||
<van-button
|
||||
style="margin-right: 6px"
|
||||
size="small"
|
||||
|
|
@ -245,6 +245,8 @@
|
|||
</view>
|
||||
</van-row>
|
||||
</view>
|
||||
|
||||
<van-empty description="暂无数据" v-if="orderList.length === 0" />
|
||||
</scroll-view>
|
||||
|
||||
<van-popup v-model:show="showBottom" position="bottom" :style="{ height: '60%' }">
|
||||
|
|
@ -598,9 +600,6 @@ const tabList = ref([
|
|||
{ tab_name: '待出库', order_status: 2 },
|
||||
{ tab_name: '待收货', order_status: 3 },
|
||||
{ tab_name: '租赁中', order_status: 4 },
|
||||
{ tab_name: '已退租', order_status: 5 },
|
||||
{ tab_name: '已完成', order_status: 20 },
|
||||
{ tab_name: '已取消', order_status: 99 },
|
||||
])
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -46,6 +46,21 @@
|
|||
.view-file {
|
||||
color: #00a288;
|
||||
}
|
||||
.nav-title {
|
||||
position: relative;
|
||||
padding: 15px 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
.nav-title-text {
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
top: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
color: #333;
|
||||
font-size: 16px;
|
||||
}
|
||||
}
|
||||
|
||||
// :root {
|
||||
// --van-primary-color:#00a288;
|
||||
|
|
|
|||
|
|
@ -33,10 +33,10 @@ export default defineConfig({
|
|||
proxy: {
|
||||
// 在此处编写代理规则
|
||||
'/api': {
|
||||
target: 'http://36.33.26.201:17788/proxyApi',
|
||||
// target: 'http://36.33.26.201:17788/proxyApi',
|
||||
// target: 'http://192.168.2.123:28080',
|
||||
// target: 'http://192.168.2.122:28080',
|
||||
// target: 'http://192.168.0.244:28580', // 测试服务
|
||||
target: 'http://192.168.0.244:28580', // 测试服务
|
||||
changeOrigin: true,
|
||||
rewrite: (path) => {
|
||||
return path.replace(/\/api/, '')
|
||||
|
|
|
|||
Loading…
Reference in New Issue