wk450097098
/
mrr.sj.front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修改

This commit is contained in:
cjl520cy 2026-04-29 16:41:21 +08:00
parent 83b1a6f1a6
commit 7618492df5
4 changed files with 58 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages/shop/buy-order.vue
View File

@ -15,7 +15,7 @@
<view class="order-item" v-for="(order, index) in orderList" :key="index">
<!-- 顶部：订单编号 + 状态 -->
<view class="order-top">
<text class="order-number">订单编号：{{order.number}}</text>
<text class="order-number">服务时段：{{order.number}}</text>
<view class="order-status-badge" :class="{
'order-status-badge2': order.state > 4 && order.state !== 7,
'order-status-badge3': order.state === 7

30
pages/shop/components/orderCard.vue
View File

@ -14,10 +14,9 @@
</view>
<!-- 服务信息区域 -->
<view class="service-container" @click="$emit('goOrderDetail', dataItem)" :class="{noFotter:(!dataItem.reservation_time && !dataItem.reserve_end_time) || haveButton }">
<image class="service-img"
:src=" dataItem.order_photo ? dataItem.order_photo[0] : JSON.parse(dataItem.photo)[0]
<view class="service-container" @click="$emit('goOrderDetail', dataItem)"
:class="{noFotter:(!dataItem.reservation_time && !dataItem.reserve_end_time) || haveButton }">
<image class="service-img" :src=" dataItem.order_photo ? dataItem.order_photo[0] : JSON.parse(dataItem.photo)[0]
" mode="aspectFill"></image>
<view class="service-info">
<view>
@ -30,7 +29,8 @@
</text>
</view>
<view class="service-time" v-if="dataItem.add_time && dataItem.state!=7">下单时间: {{ dataItem.add_time }}</view>
<view class="service-time" v-if="dataItem.add_time && dataItem.state!=7">下单时间:
{{ dataItem.add_time }}</view>
</view>
<view class="service-price">
<text v-if="dataItem.team_buy_id">{{`团购价: `}}</text>¥<text
@ -238,6 +238,7 @@
background-image: url("/static/images/icons/tabBj2.png");
color: #333;
}
.stateText3 {
background-image: url("/static/images/icons/tabBj2.png");
color: #999999 !important;
@ -286,6 +287,7 @@
line-height: 34rpx;
text-align: left;
font-style: normal;
.service-price-line {
font-weight: 400;
font-size: 24rpx;
@ -351,12 +353,14 @@
margin-top: 28rpx;
display: flex;
align-items: center;
.time-info-img {
width: 40rpx;
height: 40rpx;
margin-right: 10rpx;
border-radius: 50%;
}
.time-info-name {
font-weight: 400;
font-size: 26rpx;
@ -365,7 +369,21 @@
text-align: left;
font-style: normal;
margin-right: 20rpx;
max-width: 110rpx;
overflow: hidden;
word-break: break-all;
/* break-all(允许在单词内换行。) */
text-overflow: ellipsis;
/* 超出部分省略号 */
display: -webkit-box;
/** 对象作为伸缩盒子模型显示 **/
-webkit-box-orient: vertical;
/** 设置或检索伸缩盒对象的子元素的排列方式 **/
-webkit-line-clamp: 1;
/** 显示的行数 **/
}
.time-info-text1 {
font-weight: 400;
font-size: 26rpx;
@ -374,7 +392,9 @@
text-align: left;
font-style: normal;
// margin-right: 20rpx;
white-space: nowrap;
}
.time-info-text2 {
font-weight: 400;
font-size: 26rpx;

8
pages/shop/manHour/saleList.vue
View File

@ -57,10 +57,10 @@ export default {
text: "全部",
},
// {
// id: 1,
// text: "待支付",
// },
{
id: 1,
text: "待支付",
},
{
id: 2,
text: "待接单",

5
pages/shop/userorder-detail.vue
View File

@ -15,12 +15,11 @@
}}</text></text>
</view>
<!-- 到店订单客户信息 -->
<view class="kh-card" v-if=" serviceType == '2' && orderInfo.order_kind==2">
<view class="kh-card" v-if=" (serviceType == '2' ||serviceType == '1') && orderInfo.order_kind==2">
<view class="kh-card-footer flex-row-center-between">
<view class="kh-card-footer-left flex-row-center">
<image class="kh-card-footer-left-img" :src="orderInfo.order_headphoto"></image>
<image class="kh-card-footer-left-img" :src="orderInfo.order_headphoto || orderInfo.user_yh.head_photo"></image>
<view class="kh-card-footer-left-text">
{{ `${orderInfo.order_username} ${orderInfo.phone_user}` }}
</view>