1

pages/reserve/goodsDetails.vue

@@ -15,7 +15,7 @@
 			</swiper-item>
 		  </block>
 		</swiper>
-        <view class="is_share" v-if="g.share > 0" style="top:240px;">
+        <view class="is_share" v-if="g.share > 0" style="top:80px;">
           <image
             src="@/static/images/icon/WechatIMG424.png"
             style="width: 20px; margin-left: 12px; opacity: 1;height: auto;"
@@ -737,7 +737,7 @@ export default {
   flex-direction: row;
   align-items: center;
   position: absolute;
-  top: 300px;
+  top: 120px;
   right: 0;
 }
 .goods .Logo {

pages/reserve/personal/orderDetails.vue

@@ -14,7 +14,9 @@
 				<view class="title" v-if="scrollTop > 50">订单详情</view>
 			</view>
 			<view class="status" :style="[headStyle]">
-				<view class="status-title">{{ orders.OrderStatusName }}</view>
+				<view class="status-title" v-if='orders.OrderStatus!=3&&orders.OrderStatus!=4'>{{ orders.OrderStatusName }}</view>
+				<view class="status-title" v-if='orders.OrderStatus==3'>待使用</view>
+				<view class="status-title" v-if='orders.OrderStatus==4'>已使用</view>
 				<view class="sub-title" v-if='orders.OrderStatus==1 || orders.OrderStatus==2 ||orders.OrderStatus==3||orders.OrderStatus==4 '>
 					<u-icon style="display: inline-block; vertical-align: middle;" name="warning-o" color="#FFF" size="28"></u-icon>
 					
@@ -45,7 +47,7 @@
 						<view class="good-info">
 							<view class="good-name" @click="redirectGoods(x.GoodsId)">{{x.GoodsName}}</view>
 							<view class="good-attr">
-								<text>人数/时间：{{x.Number}}人/{{x.ServiceDate+' '+x.ServiceTime}}</text>
+								<text>人数/时间：{{x.Number}}人/{{x.ServiceDate+' '+(cx.ServiceTime?cx.ServiceTime:'')}}</text>
 								<text>服务人员：{{x.ServicepersonalName}}</text>
 							</view>
 							<view style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;margin-top: 2px;" @click.native.stop="goUrl(x.FreeShippingUrl)"

pages/reserve/personal/orderlist.vue

@@ -14,7 +14,9 @@
 					<view class="listBox" v-for="(item, index) in g" :key="index">
 						<view class="listBox_t" @click="redirectToDetail(item.OrderId)">
 							<Text class='listBox_t_store'>{{item.StoreName}}</Text>
-							<Text style="color: gray;width: 50px;text-align: right;">{{ item.OrderStatusName }}</Text>
+							<Text style="color: gray;width: 50px;text-align: right;" v-if='item.OrderStatus!=3&&item.OrderStatus!=4'>{{item.OrderStatusName }}</Text>
+							<Text style="color: gray;width: 50px;text-align: right;" v-if='item.OrderStatus==3'>待使用</Text>
+							<Text style="color: gray;width: 50px;text-align: right;" v-if='item.OrderStatus==4'>已使用</Text>
 						</view>
 						<view class="listBox_c">
 							<template >
@@ -22,7 +24,7 @@
 									<image :src="cx.CoverImagePath" style="width: 80px; height: 80px; border-radius: 2px;" mode="aspectFill" @click=""/>
 									<view style="margin-left: 15px; flex: 1;min-height: 80px;">
 										<Text class="topic_cont_text">商品:{{cx.GoodsName}}</Text>
-										<Text class="topic_cont_text">时间:{{cx.ServiceDate+' '+cx.ServiceTime}}</Text>
+										<Text class="topic_cont_text">时间:{{cx.ServiceDate+' '+(cx.ServiceTime?cx.ServiceTime:'')}}</Text>
 										<Text class="topic_cont_text">服务人员:{{cx.ServicepersonalName}}</Text>
 									</view>
 									<view style="margin-left: 15px;">