From ba8ce4451b48b5902a307df075442bf016b5e4ae Mon Sep 17 00:00:00 2001
From: queenwuli <942534046@qq.com>
Date: Mon, 11 Jan 2021 17:06:21 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app into master
---
hive-app/pages/workbench/orderDetail.vue | 90 +++++++++++++++++++++++---------------------
1 files changed, 47 insertions(+), 43 deletions(-)
diff --git a/hive-app/pages/workbench/orderDetail.vue b/hive-app/pages/workbench/orderDetail.vue
index 689f654..32e0e45 100644
--- a/hive-app/pages/workbench/orderDetail.vue
+++ b/hive-app/pages/workbench/orderDetail.vue
@@ -7,23 +7,23 @@
<view class="list-content">
<view class="flex justify-between">
<text>会员姓名</text>
- <text class="gray">李某某</text>
+ <text class="gray">{{orderInfo.vipName}}</text>
</view>
<view class="flex justify-between">
<text>联系方式</text>
- <text class="gray">15588881231</text>
+ <text class="gray">{{orderInfo.phone}}</text>
</view>
<view class="flex justify-between">
<text>订单号</text>
- <text class="gray">N12371237123173</text>
+ <text class="gray">{{orderInfo.orderNo}}</text>
</view>
<view class="flex justify-between">
<text>下单顾问</text>
- <text class="gray">广哥</text>
+ <text class="gray">{{orderInfo.staffName}}</text>
</view>
<view class="flex justify-between">
<text>下单时间</text>
- <text class="gray">2020-12-12 19:06:08</text>
+ <text class="gray">{{orderInfo.orderTime}}</text>
</view>
</view>
</view>
@@ -32,34 +32,24 @@
<text>订单明细</text>
</view>
<view class="list-content">
- <view class="list-content-row" v-for="item in 2">
+ <view class="list-content-row" v-for="item in orderList">
<view class="flex justify-between align-center">
- <view>
- <text class="font-15 mr-20">富脂肽原液(单支)</text>
- <text>x1</text>
+ <view class="name">
+ <text class="font-14 mr-15">{{item.goodsName}}</text>
+ <text class="gray">x{{item.count}}</text>
</view>
<view>
- <text class="gray font-through">￥0.99</text>
- <text class="ml-10">￥0.99</text>
+ <text class="gray font-through">￥{{item.price}}</text>
+ <text class="ml-10">￥{{item.zkPrice}}</text>
</view>
</view>
<view class="gray font-13">
<text>现金支付：</text>
- <text>￥0</text>
+ <text>￥{{item.cashPay | formatNum}}</text>
</view>
<view class="gray font-13">
<text>储蓄卡支付：</text>
- <text>￥0</text>
- </view>
- <view class="gray font-13">
- <text>
- <text>业绩：</text>
- <text>￥0</text>
- </text>
- <text class="ml-20">
- <text>员工：</text>
- <text>￥0</text>
- </text>
+ <text>￥{{item.cardPay | formatNum}}</text>
</view>
</view>
</view>
@@ -71,23 +61,23 @@
<view class="list-content">
<view class="flex justify-between">
<text>现金支付</text>
- <text class="gray">￥5000.00</text>
+ <text class="gray">￥{{orderInfo.cashPay | formatNum}}</text>
</view>
<view class="flex justify-between">
<text>储蓄卡支付</text>
- <text class="gray">￥352.00</text>
+ <text class="gray">￥{{orderInfo.cardPay | formatNum}}</text>
</view>
<view class="flex justify-between">
<text>应付总额</text>
- <text class="gray">￥485.00</text>
+ <text class="gray">￥{{orderInfo.needPay | formatNum}}</text>
</view>
<view class="flex justify-between">
<text>实付总额</text>
- <text class="gray">￥6934.00</text>
+ <text class="gray">￥{{orderInfo.realPay | formatNum}}</text>
</view>
<view class="flex justify-between">
<text>优惠总额</text>
- <text class="gray">￥40.00</text>
+ <text class="gray">￥{{orderInfo.discount | formatNum}}</text>
</view>
</view>
</view>
@@ -96,21 +86,17 @@
<text>业绩提成</text>
</view>
<view class="list-content">
- <view class="list-content-row" v-for="item in 2">
+ <view class="list-content-row" v-for="item in orderList">
<view class="flex justify-between align-center gray font-13">
- <view>
- <text class="mr-20">富脂肽原液(单支)</text>
- <text>x1</text>
+ <view class="name">
+ <text class="mr-15">{{item.goodsName}}</text>
+ <text>x{{item.count}}</text>
</view>
- <text>￥0.99</text>
+ <text>￥{{item.price}}</text>
</view>
- <view class="flex justify-between">
- <text>广哥</text>
- <text>业绩：233</text>
- </view>
- <view class="flex justify-between">
- <text>永哥</text>
- <text>业绩：233</text>
+ <view class="flex justify-between" v-for="op in item.achieves">
+ <text>{{op.name}}</text>
+ <text>业绩：{{op.achieve}}</text>
</view>
</view>
</view>
@@ -121,9 +107,24 @@
<script>
export default {
data() {
- return {
-
- }
+ return {
+ orderInfo: {},
+ orderList: []
+ }
+ },
+ onLoad(options) {
+ this.loadOrderDetail(options.orderId);
+ },
+ methods:{
+ loadOrderDetail(id){
+ this.$httpUtils.request('/api/order/findOrderDetail/'+id).then((res) => {
+ if(res.status == 200){
+ let result = res.mapInfo.orderDetail;
+ this.orderInfo = result;
+ this.orderList = result.items;
+ }
+ })
+ }
}
}
</script>
@@ -162,4 +163,7 @@
.font-through{
text-decoration: line-through;
}
+ .name{
+ line-height: 20px;
+ }
</style>
--
Gitblit v1.9.1