001优化调整

pages/home/components/orderCard2.vue

@@ -39,7 +39,7 @@
 				<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>

pages/shop/components/orderCard.vue

@@ -30,7 +30,7 @@
 						</text>
 
 					</view>
-					<view class="service-time" v-if="dataItem.add_time">下单时间: {{ 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
@@ -145,7 +145,7 @@
 					"待支付",
 					"待接单",
 					"待开始",
-					"进行中",
+					"待完成",
 					"已完成",
 					"已评价",
 					"已取消",

pages/shop/manHour/components/orderCard.vue

@@ -51,10 +51,10 @@
 			<view class="btn accept-btn" v-if="dataItem.state == 2 || dataItem.state == 3" @click.stop="emitRefund">申请退款</view>
 			
 			<!-- 已完成状态：再来一单 -->
-			<view class="btn accept-btn" v-if="dataItem.state == 5" @click.stop="emitReOrder">再来一单</view>
+			<view class="btn accept-btn" v-if="dataItem.state == 5 || dataItem.state == 7" @click.stop="emitReOrder">再来一单</view>
 			
 			<!-- 已取消状态：重新预订 -->
-			<view class="btn accept-btn" v-if="dataItem.state == 7" @click.stop="emitReOrder">重新预订</view>
+			<!-- <view class="btn accept-btn" v-if="dataItem.state == 7" @click.stop="emitReOrder">重新预订</view> -->
 		</view>
 	</view>
 </template>

pages/shop/manHourDetail.vue

@@ -92,7 +92,7 @@
 					<text class="label">订单编号</text>
 					<text class="value">{{ orderInfo.number }}</text>
 				</view>
-				<view class="info-item" v-if="orderInfo.server_code">
+				<view class="info-item" v-if="orderInfo.server_code && orderInfo.state !=7">
 					<text class="label">服务码</text>
 					<text class="value">{{ orderInfo.server_code }}</text>
 				</view>

pages/shop/userorder-detail.vue

@@ -93,7 +93,7 @@
 			</view> -->
 
 			<!-- 用户信息 -->
-			<view class="shop_card" v-if="orderInfo.order_kind==2">
+		<!-- 	<view class="shop_card" v-if="orderInfo.order_kind==2">
 				<view class="userinfo">
 					<view class="" v-if="orderInfo.user_yh.head_photo">
 						<image :src="orderInfo.user_yh.head_photo" mode="widthFix"
@@ -107,7 +107,7 @@
 							mode="widthFix" style="width: 40rpx;margin-top: 15rpx;"></image>
 					</view>
 				</view>
-			</view>
+			</view> -->
 			<!-- 服务时段 -->
 			<view class="time_card" v-if="orderInfo.order_kind == 3">
 				<view class="card_title">服务时段</view>
@@ -123,7 +123,7 @@
 
 			<!-- 预约信息 -->
 			<view class="booking-card">
-				<view class="card_title">预约服务信息</view>
+				<view class="card_title">预约信息</view>
 				<view class="service-item">
 					<image :src="orderInfo.server_photo[0]"
 						v-if="orderInfo.server_photo && orderInfo.server_photo.length != 0" mode="aspectFill"
@@ -148,8 +148,8 @@
 						<view class="serverinfo-l">服务售价</view>
 						<view class="serverinfo-r">
 							<view class="serverinfo-r-o" v-if="orderInfo.cost_money!=orderInfo.line_money">
-								￥{{orderInfo.cost_money}}</view>
+								￥{{orderInfo.line_money}}</view>
-							<view class="serverinfo-r-t">￥{{orderInfo.line_money}}</view>
+							<view class="serverinfo-r-t">￥{{orderInfo.cost_money}}</view>
 						</view>
 					</view>
 				</view>
@@ -159,7 +159,7 @@
 						<view class="payinfo-r">￥{{orderInfo.pay_money}}</view>
 					</view>
 				</view>
-				<view class="service-item1" v-if="orderInfo.butie_zonge!=0">
+				<view class="service-item1" v-if="orderInfo.butie_zonge && orderInfo.butie_zonge!=0">
 					<view class="btinfo">
 						<view class="btinfo-l">平台补贴</view>
 						<view class="btinfo-r">￥{{orderInfo.butie_zonge}}</view>
@@ -263,7 +263,7 @@
 						<text class="value">{{orderInfo.coupon_info.code_num}}</text>
 					</view>
 					<view class="info-item">
-						<text class="label">优惠券金额</text>
+						<text class="label">优惠金额</text>
 						<text class="value">{{orderInfo.coupon_info.reduce_money}}元</text>
 					</view>
 				</view>
@@ -412,12 +412,12 @@
 						state: "2",
 					},
 					{
-						text: "待服务",
+						text: "待开始",
-						icon: "/static/images/icons/pendingService.png",
+						icon: "/static/images/icons/daikaishi.png",
 						state: "3",
 					},
 					{
-						text: "服务中",
+						text: "待完成",
 						icon: "/static/images/icons/pendingService.png",
 						state: "4",
 					},

pages/shop/userorders.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="orders-page">
 		<!-- 顶部导航栏 -->
-		<custom-navbar title="全部订单" :show-back="true" backgroundColor="#fff"></custom-navbar>
+		<custom-navbar title="订单列表" :show-back="true" backgroundColor="#fff"></custom-navbar>
 		<!-- <serviecFirstTab :tabs="tabs" :activeId="activeId" @tab-click="tabClick" bgColor="#FAFAFA">
 		</serviecFirstTab> -->
 		<view class="status">
@@ -125,7 +125,7 @@
 					},
 					{
 						id: 4,
-						title: "进行中",
+						title: "待完成",
 					},
 					{
 						id: 5,

pages/shop/workSpace/saleList.vue

@@ -60,7 +60,7 @@
 					},
 					{
 						id: 4,
-						text: "进行中",
+						text: "待完成",
 					},
 					{
 						id: 5,