送达时间

mall/src/pages/order/detail.vue

@@ -59,9 +59,9 @@
               <div class="label">贺卡</div>
               <div class="value">{{ data.needCard == 1 ? "需要" : '不需要' }}</div>
             </div>
-            <div class="msg-list">
-              <div class="label">祝福语</div>
-              <div class="value">{{ data.cardInfo || '--' }}</div>
+            <div class="msg-list" v-show="data.needCard == 1">
+              <div class="label">贺卡内容</div>
+              <div class="value">{{ data.cardInfo}}</div>
             </div>
             <div class="msg-list">
               <div class="label">匿名派送</div>
@@ -281,7 +281,12 @@ export default {
 }
 .page-det {
   width: 94%;
-  margin: 0 auto;
+  /*  #ifdef  MP-WEIXIN  */
+  margin: 0 auto 90rpx auto;
+  /*  #endif  */
+  /*  #ifdef  H5  */
+  margin: 0 auto 25rpx auto;
+  /*  #endif  */
   position: relative;
   top: -40px;
   .order-msg {

shop/src/views/order/components/order-detail.vue

@@ -69,7 +69,17 @@
 						<el-table :data="data">
 							<el-table-column property="bookName" label="昵称"></el-table-column>
 							<el-table-column property="bookMobile" label="手机号"></el-table-column>
-							<el-table-column property="reachDate" label="期望送到时间"></el-table-column>
+							<el-table-column label="要求送达时间">
+								<template slot-scope="scope">
+									<template v-if="scope.row.reachDate != '0000-00-00'">
+									<span>{{ scope.row.reachDate}}</span>&nbsp;&nbsp;
+									<span v-if="scope.row.reachPeriod == 0">上午</span>
+									<span v-else-if="scope.row.reachPeriod == 1">下午</span>
+									<span v-else>晚上</span>
+									<span v-if="scope.row.anonymity == 1">（客户要求匿名）</span>
+									</template>
+								</template>
+							</el-table-column>
 							<el-table-column property="cardInfo" label="祝福语"></el-table-column>
 						</el-table>
 					</div>