修改订单页面问题

This commit is contained in:
TOP糯米 2023-03-27 00:02:10 +08:00
parent 35b49332e3
commit ae9099cd2e
3 changed files with 123 additions and 53 deletions

View File

@ -213,7 +213,9 @@ export default {
auth: true,
},
t3: {
url: ""
url: "/user/workerorder/getcarorderinfobyid",
showLoading: true,
auth: true,
},
},
finish: {

View File

@ -98,7 +98,7 @@ export default {
listType: options.listType,
id: item.id,
orderId: item.order,
cate: "待返数据",
cate: item.cate_name,
content: item.desc,
createTime: item.time,
serviceTime: item.times,
@ -188,7 +188,7 @@ export default {
order = {
id: data.id,
orderId: data.order,
cate: "待返数据",
cate: data.cate_name,
content: data.desc,
createTime: data.time,
serviceTime: data.times,
@ -244,7 +244,26 @@ export default {
});
}
} else if (options.listType == 't3') {
order = {
id: data.id,
orderId: data.order,
createTime: data.times,
serviceTime: data.starttime,
pickupAddress: data.address,
unloadAddress: data.addressb,
state: data.status,
price: data.money,
worker: {},
};
// 师傅
if (prototype.$utils.isType(data.worker, "object")) {
order.worker = {
id: data.worker.id,
uid: data.worker.uid,
name: data.worker.name,
avatar: data.worker.avatar,
}
}
}
return resolve(order);
}

View File

@ -6,7 +6,7 @@
</view>
<view class="order-detail-header">
<view class="select-group">
<view class="select-item" :class="{ active: tabIndex == 0 }" @click="switchTab(0)">
<view class="select-item" :class="{ active: tabIndex == 0 }" @click="showWorker">
<text class="text">服务师傅</text>
</view>
<view class="select-item" :class="{ active: tabIndex == 1 }" @click="switchTab(1)">
@ -40,7 +40,12 @@
</view>
</block>
<!-- 购买订单一口价订单展示暂无师傅 -->
<view v-if="(order.listType == 't1' || order.listType == 't2') && order.orderType == 1" class="desc-text">
<view
v-if="
((order.listType == 't1' || order.listType == 't2') && order.orderType == 1) || order.listType == 't3'
"
class="desc-text"
>
当前暂无师傅接单
</view>
</block>
@ -58,58 +63,92 @@
<text class="text">{{ order.orderId }}</text>
<text class="copy" @click.stop="copyOrderId(order.orderId)">复制</text>
</view>
<view class="info-row">
<text class="title">服务分类</text>
<text class="text">{{ order.cate }}</text>
</view>
<view class="info-row limit-line clamp-1">
<text class="title">需求内容</text>
<text class="text">{{ order.content }}</text>
</view>
<view class="info-row">
<text class="title">下单时间</text>
<text class="text">{{ order.createTime }}</text>
</view>
<view class="info-row">
<text class="title">服务时间</text>
<text class="text">{{ order.serviceTime }}</text>
</view>
</view>
<view class="section insurance">
<service-insurance :showSwitch="false" />
</view>
<view class="section address">
<view class="section-title">服务信息</view>
<view class="address-box">
<text class="iconfont icon-dingwei"></text>
<view>
<view class="contact limit-line clamp-1">
<text class="name">
{{ order.address.name }}({{ order.address.gender == 1 ? "先生" : "女士" }})
</text>
<text class="mobile">{{ order.address.mobile }}</text>
</view>
<view class="detail">
<text>{{ order.address.address }}{{ order.address.detail }}</text>
</view>
<block v-if="listType == 't1' || listType == 't2'">
<view class="info-row">
<text class="title">服务分类</text>
<text class="text">{{ order.cate }}</text>
</view>
</view>
</view>
<view class="section demand">
<view class="section-title">需求信息</view>
<view class="demand-box">
<view class="textarea-box">
<text class="textarea">{{ order.content }}</text>
<view class="info-row limit-line clamp-1">
<text class="title">需求内容</text>
<text class="text">{{ order.content }}</text>
</view>
<view class="common-form-container">
<view class="upload-item">
<view class="image-box" v-for="(item, index) in order.images" :key="index">
<image class="image" :src="item" mode="aspectFill" @click="previewImage(index)" />
<view class="info-row">
<text class="title">下单时间</text>
<text class="text">{{ order.createTime }}</text>
</view>
<view class="info-row">
<text class="title">服务时间</text>
<text class="text">{{ order.serviceTime }}</text>
</view>
</block>
<block v-if="listType == 't3'">
<view class="info-row">
<text class="title">上门时间</text>
<text class="text">{{ order.serviceTime }}</text>
</view>
</block>
</view>
<block v-if="listType == 't1' || listType == 't2'">
<view class="section insurance">
<service-insurance :showSwitch="false" />
</view>
<view class="section address">
<view class="section-title">服务信息</view>
<view class="address-box">
<text class="iconfont icon-dingwei"></text>
<view>
<view class="contact limit-line clamp-1">
<text class="name">
{{ order.address.name }}({{ order.address.gender == 1 ? "先生" : "女士" }})
</text>
<text class="mobile">{{ order.address.mobile }}</text>
</view>
<view class="detail">
<text>{{ order.address.address }}{{ order.address.detail }}</text>
</view>
</view>
</view>
</view>
</view>
<view class="section demand">
<view class="section-title">需求信息</view>
<view class="demand-box">
<view class="textarea-box">
<text class="textarea">{{ order.content }}</text>
</view>
<view class="common-form-container">
<view class="upload-item">
<view class="image-box" v-for="(item, index) in order.images" :key="index">
<image class="image" :src="item" mode="aspectFill" @click="previewImage(index)" />
</view>
</view>
</view>
</view>
</view>
</block>
<block v-if="listType == 't3'">
<view class="section address">
<view class="section-title">取货地址</view>
<view class="address-box">
<text class="iconfont icon-dingwei"></text>
<view>
<view class="detail">
<text>{{ order.pickupAddress }}</text>
</view>
</view>
</view>
</view>
<view class="section address">
<view class="section-title">卸货地址</view>
<view class="address-box">
<text class="iconfont icon-dingwei"></text>
<view>
<view class="detail">
<text>{{ order.unloadAddress }}</text>
</view>
</view>
</view>
</view>
</block>
</view>
</view>
</view>
@ -186,6 +225,16 @@ export default {
onReachBottom() {},
onPullDownRefresh() {},
methods: {
/**
* 展示师傅
*/
showWorker() {
if (this.$utils.isType(this.order.worker, "object") && this.$utils.isType(this.order.worker.id, "number")) {
console.log("跳转师傅" + this.order.worker.id);
} else {
this.switchTab(0);
}
},
/**
* 切换Tab
*/
@ -457,11 +506,11 @@ export default {
.contact {
color: #000000;
line-height: 26rpx;
margin-bottom: 16rpx;
}
.detail {
color: #2d2d2d;
line-height: 36rpx;
margin-top: 16rpx;
}
}
.demand-box {