shish 6 лет назад
Родитель
Сommit
a6bf90dfd3
1 измененных файлов с 8 добавлено и 4 удалено
  1. 8 4
      shop/src/views/order/components/order-detail.vue

+ 8 - 4
shop/src/views/order/components/order-detail.vue

@@ -45,7 +45,7 @@
 				</div>
 				<!-- 收花人信息 -->
 				<div class="card-wrap">
-					<div class="card-tit">收花人信息</div>
+					<div class="card-tit">收花人</div>
 					<div class="card-body">
 						<el-table :data="data">
 							<el-table-column property="receiveUserName" label="昵称"></el-table-column>
@@ -55,16 +55,20 @@
 									<span>{{ scope.row.deadline | formatTime }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column property="receiveFullAddress" label="地址" width="280px"></el-table-column>
+							<el-table-column property="receiveFullAddress" label="地址" width="280px">
+								<template slot-scope="scope">
+									<span>{{scope.row.receiveAddress}}{{scope.row.receiveFloor}}({{ scope.row.receiveFullAddress }})</span>
+								</template>
+							</el-table-column>
 							<el-table-column property="print" label="操作" width="110px">
-								<el-button type="primary" icon="el-icon-printer"></el-button>
+								<!-- <el-button type="primary" icon="el-icon-printer"></el-button> -->
 							</el-table-column>
 						</el-table>
 					</div>
 				</div>
 				<!-- 订花人信息 -->
 				<div class="card-wrap">
-					<div class="card-tit">订花人信息</div>
+					<div class="card-tit">订花人</div>
 					<div class="card-body">
 						<el-table :data="data">
 							<el-table-column property="bookName" label="昵称"></el-table-column>