bug修改

pages/shop/buy-order.vue

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

pages/shop/components/orderCard.vue

@@ -6,18 +6,17 @@
 			<view class="stateText" :class="{
 			stateText2: dataItem.state > 4 && dataItem.state !== 7,  // 排除已取消
 			stateText3: dataItem.state === 7  // 已取消状态单独处理
-			}"  v-if="showState">
+			}" v-if="showState">
-		{{ stateText }}
+				{{ stateText }}
-		</view>
+			</view>
 			<image class="rightArrow" src="/static/images/shop/pintuan/rightArrow.png" v-else
 				@click="$emit('goOrderDetail', dataItem)"></image>
 		</view>
 
 		<!-- 服务信息区域 -->
-		<view class="service-container" @click="$emit('goOrderDetail', dataItem)" :class="{noFotter:(!dataItem.reservation_time && !dataItem.reserve_end_time) || haveButton }">
+		<view class="service-container" @click="$emit('goOrderDetail', dataItem)"
-			<image class="service-img" 
+			: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]
-			:src=" dataItem.order_photo ? dataItem.order_photo[0] : JSON.parse(dataItem.photo)[0]
         " mode="aspectFill"></image>
 			<view class="service-info">
 				<view>
@@ -30,12 +29,13 @@
 						</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" >
+				<view class="service-price">
 					<text v-if="dataItem.team_buy_id">{{`团购价: `}}</text>¥<text
 						style="font-size: 34rpx;">{{ dataItem.order_money }}</text>
-						<text  class="service-price-line">{{ dataItem.line_money }}</text>
+					<text class="service-price-line">{{ dataItem.line_money }}</text>
 				</view>
 
 			</view>
@@ -123,8 +123,8 @@
 
 					// 4. 判断是否同一天
 					const isSameDay = startTime.getFullYear() === endTime.getFullYear() &&
-									  startTime.getMonth() === endTime.getMonth() &&
+						startTime.getMonth() === endTime.getMonth() &&
-									  startTime.getDate() === endTime.getDate();
+						startTime.getDate() === endTime.getDate();
 
 					// 5. 拼接最终格式
 					if (isSameDay) {
@@ -234,11 +234,12 @@
 			justify-content: center;
 		}
 
-		.stateText2{
+		.stateText2 {
 			background-image: url("/static/images/icons/tabBj2.png");
 			color: #333;
 		}
-		.stateText3{
+
+		.stateText3 {
 			background-image: url("/static/images/icons/tabBj2.png");
 			color: #999999 !important;
 		}
@@ -257,7 +258,7 @@
 		border-bottom: 1px solid #f6f5f5;
 	}
 
-	.noFotter{
+	.noFotter {
 		border-bottom: none;
 		padding-bottom: 0rpx;
 	}
@@ -286,6 +287,7 @@
 		line-height: 34rpx;
 		text-align: left;
 		font-style: normal;
+
 		.service-price-line {
 			font-weight: 400;
 			font-size: 24rpx;
@@ -351,13 +353,15 @@
 		margin-top: 28rpx;
 		display: flex;
 		align-items: center;
-		.time-info-img{
+
+		.time-info-img {
 			width: 40rpx;
 			height: 40rpx;
 			margin-right: 10rpx;
 			border-radius: 50%;
 		}
-		.time-info-name{
+
+		.time-info-name {
 			font-weight: 400;
 			font-size: 26rpx;
 			color: #333333;
@@ -365,8 +369,22 @@
 			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{
+
+		.time-info-text1 {
 			font-weight: 400;
 			font-size: 26rpx;
 			color: #999999;
@@ -374,8 +392,10 @@
 			text-align: left;
 			font-style: normal;
 			// margin-right: 20rpx;
+			white-space: nowrap;
 		}
-		.time-info-text2{
+
+		.time-info-text2 {
 			font-weight: 400;
 			font-size: 26rpx;
 			color: #333333;

pages/shop/manHour/saleList.vue

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

pages/shop/userorder-detail.vue

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