|
|
@@ -18,24 +18,17 @@
|
|
|
</div>
|
|
|
<div class="info-list">
|
|
|
<div class="label">下单客户</div>
|
|
|
- <div class="val">{{ orderData.bookName }}</div>
|
|
|
+ <div class="val">{{ orderData.customName }}</div>
|
|
|
</div>
|
|
|
<div class="info-list">
|
|
|
<div class="label">下单时间</div>
|
|
|
- <div class="val">{{ orderData.addTime | formatTime }}</div>
|
|
|
- </div>
|
|
|
- <div class="info-list" v-if="!$util.isEmpty(orderData.goodsInfoList)">
|
|
|
- <div class="label">商品名称</div>
|
|
|
- <div class="val">{{ orderData.goodsInfoList[0].title }}</div>
|
|
|
+ <div class="val">{{ orderData.addTime}}</div>
|
|
|
</div>
|
|
|
<div class="info-list">
|
|
|
<div class="label">金额</div>
|
|
|
<div class="val">{{ orderData.actPrice }}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="order-info-right" v-if="!$util.isEmpty(orderData.goodsInfoList)">
|
|
|
- <img style="max-height:100px;" :src="orderData.goodsInfoList[0].smallCoverUrl" alt="商品图" />
|
|
|
- </div>
|
|
|
</div>
|
|
|
<!-- 时间线 -->
|
|
|
<el-timeline>
|
|
|
@@ -44,7 +37,7 @@
|
|
|
<!-- title -->
|
|
|
<div class="title-wrap">
|
|
|
<div class="title">{{ item.actionName }}</div>
|
|
|
- <div class="time" v-if="item.finishTime != 0">{{ item.finishTime | formatTime }}</div>
|
|
|
+ <div class="time" v-if="item.finishTime != 0">{{ item.finishTime }}</div>
|
|
|
</div>
|
|
|
<!-- content -->
|
|
|
<div class="content-wrap">
|
|
|
@@ -522,7 +515,6 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
addressFn(item) {
|
|
|
- console.log('江总', item);
|
|
|
this.orderForm.latitude = item.location.lat;
|
|
|
this.orderForm.longitude = item.location.lng;
|
|
|
this.orderForm.receiveAddress = item.title;
|
|
|
@@ -559,12 +551,9 @@ export default {
|
|
|
this.categoryDialog = false;
|
|
|
this.orderDialog = false;
|
|
|
},
|
|
|
- // draw
|
|
|
closeFn() {
|
|
|
this.showShipManage = false;
|
|
|
},
|
|
|
- // =========================
|
|
|
- //有配送单
|
|
|
hasDeliver() {
|
|
|
this.$service.single.printOrder({ id: this.id, option: 1 }).then(res => {
|
|
|
this.getDet();
|
|
|
@@ -726,7 +715,6 @@ export default {
|
|
|
height: 88px;
|
|
|
}
|
|
|
}
|
|
|
- // ==================
|
|
|
.title-wrap {
|
|
|
@include disFlex(center, flex-start);
|
|
|
.title {
|
|
|
@@ -750,13 +738,11 @@ export default {
|
|
|
font-size: 12px;
|
|
|
margin: 4px 0;
|
|
|
}
|
|
|
- // dialog
|
|
|
.category-dialog-wrap {
|
|
|
.el-radio {
|
|
|
margin-bottom: 6px;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
.order-modal-content {
|
|
|
.form-wrap {
|
|
|
@include disFlex(flex-start, space-between);
|
|
|
@@ -770,7 +756,6 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
</style>
|
|
|
-
|
|
|
<style lang="scss">
|
|
|
.ship-draw-wrap {
|
|
|
.el-drawer__header {
|
|
|
@@ -780,7 +765,6 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
.print-html {
|
|
|
position: absolute;
|
|
|
left: 0;
|
shish