零售后台修改 307 1、订单详情页面，配送方式、支付方式字段值应显示具体方式，而不是编号/2、“地址”字段值为空；3、商品信息始终显示无数据

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

@@ -26,14 +26,38 @@
 							<el-table-column property="sendCost" label="运费"></el-table-column>
 							<el-table-column property="prePrice" label="合计"></el-table-column>
 							<el-table-column property="actPrice" label="实付款"></el-table-column>
-							<el-table-column property="sourceType" label="订单来源"></el-table-column>
+							<el-table-column property="sourceType" label="订单来源">
+                <template slot-scope="scope">
+                  <span>{{scope.row.sourceType == 0 ? '门店' 
+                    : scope.row.sourceType == 1 ? '商城' 
+                    : scope.row.sourceType == 2 ? '朋友圈'
+                    : scope.row.sourceType == 3 ? '其他': '未知'}}
+                  </span>
+                </template>
+              </el-table-column>
 							<el-table-column property="totalRecharge" label="订单类型"></el-table-column>
 						</el-table>
 						<el-table :data="data">
-							<el-table-column property="sendType" label="配送方式" width="280px"></el-table-column>
-							<el-table-column property="payWay" label="支付方式"></el-table-column>
+							<el-table-column property="sendType" label="配送方式" width="280px">
+                <template slot-scope="scope">
+                  <span>{{scope.row.sendType == 0 ? '未确认配送方式' 
+                    : scope.row.sendType == 1 ? '免配送' 
+                    : scope.row.sendType == 2 ? '自己送'
+                    : scope.row.sendType == 3 ? '快递送': '未知'}}
+                  </span>
+                </template>
+              </el-table-column>
+							<el-table-column property="payWay" label="支付方式">
+                <template slot-scope="scope">
+                  <span>{{scope.row.payWay == 0 ? '微信' 
+                    : scope.row.payWay == 1 ? '支付宝' 
+                    : scope.row.payWay == 2 ? '余额'
+                    : scope.row.payWay == 3 ? '欠款': '未知'}}
+                  </span>
+                </template>
+              </el-table-column>
 							<el-table-column property="grade" label="获得成长值"></el-table-column>
-							<el-table-column property="bookName" label="下单客户"></el-table-column>
+							<el-table-column property="customName" label="下单客户"></el-table-column>
 							<el-table-column label="客户打分">
 								<template slot-scope="scope">
 									<el-rate v-model="scope.row.grade" disabled></el-rate>
@@ -55,10 +79,10 @@
 									<span>{{ scope.row.deadline | formatTime }}</span>
 								</template>
 							</el-table-column>
-							<el-table-column property="receiveFullAddress" label="地址" width="280px">
-								<template slot-scope="scope">
+							<el-table-column property="fullAddress" label="地址" width="280px">
+								<!-- <template slot-scope="scope">
 									<span>{{scope.row.receiveAddress}}{{scope.row.receiveFloor}}（{{ scope.row.receiveFullAddress }}）</span>
-								</template>
+								</template> -->
 							</el-table-column>
 							<el-table-column property="print" label="操作" width="110px">
 								<!-- <el-button type="primary" icon="el-icon-printer"></el-button> -->
@@ -74,7 +98,7 @@
 							<el-table-column property="bookName" label="昵称"></el-table-column>
 							<el-table-column property="bookMobile" label="手机号"></el-table-column>
 							<el-table-column label="要求送达时间">
-								<template slot-scope="scope">
+								<template slot-scope="scope" property="reachDate" >
 									<template v-if="scope.row.reachDate != '0000-00-00'">
 									<span>{{ scope.row.reachDate}}</span>&nbsp;&nbsp;
 									<span v-if="scope.row.reachPeriod == 0">上午</span>
@@ -92,14 +116,13 @@
 				<div class="card-wrap">
 					<div class="card-tit">商品信息</div>
 					<div class="card-body">
-						<el-table :data="data.goodsInfoList" show-summary>
+						<el-table :data="data[0].goodsInfoList" show-summary>
 							<el-table-column label="商品图片">
 								<template slot-scope="scope">
 									<cl-avatar
 										shape="square"
 										:size="40"
-										:src="scope.row.smallCoverUrl | default_avatar"
-										:style="{ margin: 'auto' }"
+										:src="scope.row.coverUrl"
 									></cl-avatar>
 								</template>
 							</el-table-column>
@@ -135,6 +158,7 @@ export default {
 		init() {
 			this.$service.order.info({ id: this.orderOperate.id }).then(res => {
 				this.data = [res];
+        console.log(this.data, this.data.goodsInfoList)
 				this.showOrderDetail = true;
 			});
 		},