diff --git a/src/components/organize_order/organize_order.vue b/src/components/organize_order/organize_order.vue
index dea1bb6..87b6984 100644
--- a/src/components/organize_order/organize_order.vue
+++ b/src/components/organize_order/organize_order.vue
@@ -85,11 +85,14 @@ export default {
methods:{
toOrderDetails(){
let { orderInfo } = this
- let _query = {}
- _query["stadium_id"] = orderInfo.stadium_id
- _query["order_no"] = orderInfo.order_no
- _query["order_type"] = 10
- util.routeTo(`/subpackage/device/pages/order_details/order_details?query=${util.jsonStr(_query)}`,'nT');
+ // let _query = {}
+ // _query["stadium_id"] = orderInfo.stadium_id
+ // _query["order_no"] = orderInfo.order_no
+ // _query["order_type"] = 10
+
+ // util.routeTo(`/subpackage/device/pages/order_details/order_details?query=${util.jsonStr(_query)}`,'nT');
+
+ util.routeTo(`/subpackage/order/pages/organize/detail/detail?stadium_id=${orderInfo.stadium_id}&order_no=${orderInfo.order_no}`,'nT');
// this.$emit('orderDetailChange');
},
clickSendAmount(){
diff --git a/src/subpackage/device/pages/order_details/order_details.vue b/src/subpackage/device/pages/order_details/order_details.vue
index d7e2bc8..1ec88ae 100644
--- a/src/subpackage/device/pages/order_details/order_details.vue
+++ b/src/subpackage/device/pages/order_details/order_details.vue
@@ -6,7 +6,7 @@
-
+
@@ -54,7 +54,7 @@
if(optionsQuery.order_type == 3)return '预约订单详情'; //PM: 2021/4/19 已做
if(optionsQuery.order_type == 4)return '储值卡订单详情';
if(optionsQuery.order_type == 5)return '积分商城订单详情';
- if(optionsQuery.order_type == 10)return '约玩订单详情';
+ // if(optionsQuery.order_type == 10)return '约玩订单详情';
return '订单详情'
},
...mapState(['brandInfo']),
@@ -136,10 +136,10 @@
stadium_id,
order_no
}
- if(orderType == 10){
- // postData['stadium_id'] = "151"
- // postData['order_no'] = "JS20210506171239462527"
- }
+ // if(orderType == 10){
+ // // postData['stadium_id'] = "151"
+ // // postData['order_no'] = "JS20210506171239462527"
+ // }
deviceServer.get({
url: this.getApiUrl(orderType),
data: postData,
diff --git a/src/subpackage/order/pages/organize/detail/detail.vue b/src/subpackage/order/pages/organize/detail/detail.vue
index 65119b8..3c112d9 100644
--- a/src/subpackage/order/pages/organize/detail/detail.vue
+++ b/src/subpackage/order/pages/organize/detail/detail.vue
@@ -3,23 +3,23 @@
-
- 欧轩智能场馆(羽毛球永泰店)
+
+ {{ orderLabel.BrandAndStadiumName || '-' }}
订单编号：
- 2352534645764747
+ {{ orderInfo.order_no || '-' }}
- 已完成
+ {{ orderStatus(originalOrder.pay_status) }}
创建时间：
- 2019-06-06 12:00:06
+ {{ orderInfo.created_at || '-' }}
@@ -27,7 +27,7 @@
用户昵称：
- 你的小甜心
+ {{ orderInfo.user_nickname|| '-' }}
@@ -35,7 +35,7 @@
约玩类型：
- 参与约玩
+ {{ organizeType(orderInfo.type || '') }}
@@ -48,7 +48,7 @@
姓名：
- 小李广中
+ {{ orderInfo.actual_name || '-' }}
@@ -56,38 +56,26 @@
身份证号码：
- 522424200004071234
+ {{ orderInfo.id_card || '-' }}
-
-
- 约玩报名信息
-
-
-
- 永爱倒特永爱倒特…
-
-
-
-
-
-
+
约玩信息
个人
- 欧轩网络科技有限公司神秘大雁山环岛骑行游玩户外露营活动
+ {{ orderInfo.theme || '-' }}
约玩项目：
- 篮球
+ {{ originalOrder.venue_type_name || '-' }}
@@ -95,7 +83,7 @@
报名费用：
- ¥50.00
+ ¥{{orderInfo.price_per_person || 0}}
@@ -103,7 +91,7 @@
约玩时间：
- 2022年5月17日(周五)
+ {{ originalOrder.date || '-' }} {{ originalOrder.duration || '-' }}
@@ -112,16 +100,32 @@
预定场次：
- 1号场 10:00-13:00
- 1号场 10:00-13:00
- 1号场 10:00-13:00
- 1号场 10:00-13:00
+
+ {{ e.venue_name || '-' }} {{ e.duration || '-' }}
+
+
+
+ 约玩报名信息
+
+
+
+
+ {{ e.user_nickname || '-' }}
+
+
+
+
+
+
+
+
+
@@ -144,34 +148,33 @@
-
+
金额小计
- ¥6
+ ¥{{ originalOrder.amount || 0 }}
积分抵扣
- ¥6
+ ¥{{ originalOrder.deduction_amount || 0 }}
折扣金额
- ¥6
+ ¥{{ originalOrder.discount_amount || 0 }}
优惠券优惠
- ¥6
+ ¥{{ originalOrder.coupons_amount || 0 }}
- 合计支付：￥5
+ 合计支付：￥{{ originalOrder.pay_amount || 0 }}
-
+
支付信息
-
支付方式：
- 微信支付
+ {{ zh_pay_type(originalOrder.pay_type) || '-' }}
@@ -179,7 +182,7 @@
支付时间：
- 2019年6月18日 10:30:40
+ {{ originalOrder.pay_time || '-' }}
@@ -187,7 +190,44 @@
微信交易号：
- 424736746998493847989434
+ {{ originalOrder.trade_no || '-' }}
+
+
+
+
+
+
+
+ 退款信息
+
+
+ 退款时间：
+
+ {{ originalOrder.refund_time || '-' }}
+
+
+
+
+
+ 退款编号：
+
+ {{ originalOrder.refund_no || '-' }}
+
+
+
+
+
+ 退款金额：
+
+ {{ originalOrder.refund_amount || '-' }}
+
+
+
+
+
+ 退款说明：
+
+ {{ originalOrder.refund_reason || '-' }}
@@ -200,6 +240,18 @@ import { ORDER_API } from '../../../js/api';
import server from '../../../js/server';
import util from '../../../../../utils/util';
export default {
+ computed: {
+ orderLabel(){
+ let { orderInfo } = this;
+ if(orderInfo&&orderInfo.label)return orderInfo.label || {};
+ return {}
+ },
+ originalOrder(){
+ let { orderInfo } = this;
+ if(orderInfo&&orderInfo.original_order)return orderInfo.original_order || {};
+ return {}
+ }
+ },
data(){
return {
isExpand: false,
@@ -213,6 +265,24 @@ export default {
})
},
methods: {
+ // 支付类型
+ zh_pay_type: util.order_pay_type_txt,
+ organizeType(type = ''){
+ // 约玩类型 type Main/Sub 发起、参与
+ const _obj = {
+ 'Main': '发起的约玩',
+ 'Sub': '参与的约玩',
+ }
+ return _obj[`${type}`] || '-'
+ },
+ orderStatus(status = ''){
+ const _obj = {/* */
+ '1': '已付款',
+ '2': '已完成',
+ '4': '已退款',
+ }
+ return _obj[`${status}`] || '-';
+ },
getOrderInfo({
order_no = '',
stadium_id = '',
@@ -298,6 +368,9 @@ export default {
margin-left: 12upx;
font-size: 28upx;
color: #9A9A9D;
+ &.ol-active{
+ color: $themeColor;
+ }
}
}
}
@@ -313,7 +386,6 @@ export default {
margin-right: 14upx;
width: 40upx;
height: 40upx;
- background-color: skyblue;
}
>view{
line-height: 40upx;
@@ -431,7 +503,6 @@ export default {
width: 100upx;
height: 100upx;
border-radius: 50%;
- background-color: purple;
}
>view{
@include textHide(1);