bug修改
This commit is contained in:
cjl520cy
parent
aa43bcf4fd
commit
f1e4ee07b0
|
|
@ -5,51 +5,56 @@
|
|||
backgroundColor="transparent"></custom-navbar>
|
||||
<view class="content-part">
|
||||
<!-- 订单状态 -->
|
||||
<!-- <view class="status-section">
|
||||
<text class="status-text">{{orderInfo.state == 1 ? '待支付' : orderInfo.state == 2 ? '待接单' : orderInfo.state == 3 ? '待服务' : orderInfo.state == 4 ? '服务中' : orderInfo.state == 5 ? '已完成' : orderInfo.state == 6 ? '待评价' : orderInfo.state == 7 ? '已取消' : ''}}</text>
|
||||
</view> -->
|
||||
<view class="status-section">
|
||||
<view class="status-section2" v-if="orderInfo.state == '2' || orderInfo.state == '3'">
|
||||
<view class="service-code">
|
||||
<text class="service-code-value">{{ orderInfo.server_code }}</text>
|
||||
<image class="service-code-label" mode="widthFix"
|
||||
src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/e306ce60-c10c-4eec-a8bf-1b064fc21a32.png" />
|
||||
</view>
|
||||
<view class="status-row">
|
||||
<image class="status-section-image" mode="widthFix"
|
||||
src="https://mrrplus.oss-cn-beijing.aliyuncs.com/photo/system/27783709-3bda-472a-ab6a-824ed4b11d2a.png" />
|
||||
<text class="status-text-red">
|
||||
{{ stateItem.text }}
|
||||
<text v-if="orderInfo.team_buy_order_state">{{
|
||||
` (${getGroupType(orderInfo.team_buy_order_state)})`
|
||||
}}</text>
|
||||
<text class="status-text-normal">，请上门/到店后出示服务码</text>
|
||||
</text>
|
||||
</view>
|
||||
</view>
|
||||
<view v-else class="status-section">
|
||||
<image class="status-section-image" mode="widthFix" :src="stateItem.icon" />
|
||||
<text class="status-text">{{ stateItem.text }}</text>
|
||||
<text class="status-text">{{ stateItem.text }}
|
||||
<text v-if="orderInfo.team_buy_order_state">{{
|
||||
` (${getGroupType(orderInfo.team_buy_order_state)})`
|
||||
}}</text>
|
||||
</text>
|
||||
</view>
|
||||
|
||||
<!-- 到家订单 客户以及手艺人信息 -->
|
||||
<view class="service-card">
|
||||
<view class="location-info">
|
||||
<image src="/static/images/gohome_location.png" class="location-icon"></image>
|
||||
<view class="address-info">
|
||||
<view class="name-phone">
|
||||
<text class="name">{{userInfo.name}}</text>
|
||||
<text class="phone">{{userInfo.account}}</text>
|
||||
</view>
|
||||
<text class="address">{{userInfo.dependency}}{{userInfo.address}}</text>
|
||||
</view>
|
||||
<!-- 预约手艺人信息 -->
|
||||
<view class="syr-card">
|
||||
<view class="syr-card-header">
|
||||
预约手艺人信息
|
||||
</view>
|
||||
<image src="/static/images/boder_icon.png" mode="aspectFill" class="divider"></image>
|
||||
<view class="staff-info">
|
||||
<image :src="user_syr.head_photo" mode="aspectFill" class="staff-avatar"></image>
|
||||
<view class="staff-detail">
|
||||
<text class="staff-name">{{user_syr.name}}</text>
|
||||
<view class="rating">
|
||||
<!-- <image
|
||||
v-for="(star, index) in 5"
|
||||
:key="index"
|
||||
src="/static/images/star.png"
|
||||
class="star-icon"
|
||||
></image> -->
|
||||
</view>
|
||||
<view class="syr-card-footer flex-row-center-between">
|
||||
<view class="syr-card-footer-left flex-row-center">
|
||||
<image class="syr-card-footer-left-img" :src="user_syr.head_photo"></image>
|
||||
<view class="syr-card-footer-left-text">{{ `${user_syr.name} ${user_syr.account}` }}</view>
|
||||
</view>
|
||||
<!-- <image src="/static/images/order_phone.png" class="phone-btn" @click="contactService(user_syr.account)"></image> -->
|
||||
<image class="syr-card-footer-right" @click="contactService(user_syr.account)"
|
||||
src="/static/images/icons/phone.png"></image>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
|
||||
<!-- 预约信息 -->
|
||||
<view class="booking-card">
|
||||
<view class="card-header" v-if="orderInfo.order_kind == 1">
|
||||
<text class="card-title">预约信息</text>
|
||||
<view>
|
||||
<text class="update-time">{{orderInfo.reservation_time}}</text>
|
||||
<text class="update-time">{{`服务时间 ${orderInfo.reservation_time}`}}</text>
|
||||
<!-- <text class="update-change">更改时间</text> -->
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -64,7 +69,7 @@
|
|||
<text class="service-count">×1</text>
|
||||
</view>
|
||||
<view class="service-real">
|
||||
<text class="real-lable">实际支付金额：</text>
|
||||
<text class="real-lable">实付金额：</text>
|
||||
<text class="real-price">￥{{orderInfo.pay_money}}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -72,10 +77,6 @@
|
|||
<!-- 订单信息 -->
|
||||
<view class="order-card">
|
||||
<text class="card-title">订单信息</text>
|
||||
<view class="info-item" v-if="orderInfo.state!=7">
|
||||
<text class="label">服务码</text>
|
||||
<text class="value">{{orderInfo.server_code}}</text>
|
||||
</view>
|
||||
<view class="info-item">
|
||||
<text class="label">订单编号</text>
|
||||
<text class="value">{{orderInfo.number}}</text>
|
||||
|
|
@ -228,6 +229,15 @@
|
|||
},
|
||||
},
|
||||
methods: {
|
||||
getGroupType(teamBuyOrderState) {
|
||||
let list = [
|
||||
{ id: 1, text: "拼团中" },
|
||||
{ id: 2, text: "已成团" },
|
||||
{ id: 3, text: "拼团失败" }
|
||||
];
|
||||
let name = list.find((it) => it.id == teamBuyOrderState)?.text;
|
||||
return name;
|
||||
},
|
||||
getOrderDetail() {
|
||||
request.post('/sj/sjorderdetail', {
|
||||
id: this.id,
|
||||
|
|
@ -476,6 +486,20 @@
|
|||
background-color: #fff;
|
||||
}
|
||||
|
||||
/* 辅助类 */
|
||||
.flex-row-center-between {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.flex-row-center {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.detail-page::before {
|
||||
content: '';
|
||||
position: fixed;
|
||||
|
|
@ -559,6 +583,113 @@
|
|||
font-weight: 600;
|
||||
}
|
||||
|
||||
/* 服务码状态区域 */
|
||||
.status-section2 {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding-top: 55rpx;
|
||||
padding-bottom: 20rpx;
|
||||
gap: 20rpx;
|
||||
|
||||
.status-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: auto;
|
||||
}
|
||||
|
||||
.status-section-image {
|
||||
width: 27rpx;
|
||||
height: auto;
|
||||
margin-right: 6rpx;
|
||||
margin-top: -4rpx;
|
||||
}
|
||||
|
||||
.service-code {
|
||||
display: flex;
|
||||
align-items: baseline;
|
||||
justify-content: center;
|
||||
width: auto;
|
||||
padding-bottom: 20rpx;
|
||||
|
||||
.service-code-label {
|
||||
width: 96rpx;
|
||||
height: 41rpx;
|
||||
margin-left: 6rpx;
|
||||
position: relative;
|
||||
top: -45rpx;
|
||||
}
|
||||
|
||||
.service-code-value {
|
||||
font-family: DINPro, DINPro;
|
||||
font-weight: bold;
|
||||
font-size: 80rpx;
|
||||
color: #333333;
|
||||
line-height: 103rpx;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
}
|
||||
}
|
||||
|
||||
.status-text-red {
|
||||
font-weight: 400;
|
||||
font-size: 26rpx;
|
||||
color: #DC232F;
|
||||
line-height: 37rpx;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
.status-text-normal {
|
||||
color: #333333;
|
||||
}
|
||||
}
|
||||
|
||||
/* 预约手艺人信息卡片 */
|
||||
.syr-card {
|
||||
margin: 30rpx;
|
||||
background-color: #ffffff;
|
||||
padding: 30rpx 20rpx;
|
||||
border-radius: 16rpx;
|
||||
box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.5);
|
||||
|
||||
.syr-card-header {
|
||||
font-weight: 500;
|
||||
font-size: 32rpx;
|
||||
color: #333333;
|
||||
line-height: 45rpx;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
margin-bottom: 40rpx;
|
||||
}
|
||||
|
||||
.syr-card-footer {
|
||||
.syr-card-footer-left {
|
||||
.syr-card-footer-left-img {
|
||||
width: 70rpx;
|
||||
height: 70rpx;
|
||||
border-radius: 50%;
|
||||
margin-right: 20rpx;
|
||||
}
|
||||
|
||||
.syr-card-footer-left-text {
|
||||
font-weight: 400;
|
||||
font-size: 28rpx;
|
||||
color: #333333;
|
||||
line-height: 40rpx;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
}
|
||||
}
|
||||
|
||||
.syr-card-footer-right {
|
||||
width: 40rpx;
|
||||
height: 40rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 服务人员卡片 */
|
||||
.service-card {
|
||||
|
|
|
|||
|
|
@ -621,9 +621,9 @@
|
|||
}
|
||||
this.clickType = true
|
||||
request.post(url, data).then(res => {
|
||||
if (res.state == 1) {
|
||||
if (res.state == 1 || res.code == 200) {
|
||||
uni.showToast({
|
||||
title: '取消成功！',
|
||||
title: res.msg,
|
||||
icon: 'none'
|
||||
})
|
||||
this.getOrderDetail();
|
||||
|
|
@ -676,7 +676,7 @@
|
|||
server_code: code,
|
||||
sjid: this.userInfo.id
|
||||
}).then(res => {
|
||||
if (res.state == 1) {
|
||||
if (res.state == 1 || res.code == 200) {
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
icon: 'success'
|
||||
|
|
@ -726,7 +726,7 @@
|
|||
id: order.id,
|
||||
sjid: this.userInfo.id
|
||||
}).then(res => {
|
||||
if (res.state == 1) {
|
||||
if (res.state == 1 || res.code == 200) {
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
icon: 'none'
|
||||
|
|
|
|||
Loading…
Reference in New Issue