diff --git a/src/components/order_list/mall/mall.vue b/src/components/order_list/mall/mall.vue
index 783bd75..59f0c93 100644
--- a/src/components/order_list/mall/mall.vue
+++ b/src/components/order_list/mall/mall.vue
@@ -23,7 +23,7 @@
商品金额合计：¥{{ orderInfo.pay_amount || 0 }}
配送方式：{{ orderInfo.product_order_self_pickup == 1 ? '自提' : '快递' }}
- 发货
+ 发货
@@ -43,6 +43,10 @@ export default {
toOrderInfo(){
let { orderInfo } = this;
util.routeTo(`/subpackage/order/pages/mall/detail/detail?order_no=${orderInfo.order_no}`, 'nT');
+ },
+ toSendOut(){
+ let { orderInfo } = this;
+ util.routeTo(`/subpackage/order/pages/mall/send_out/send_out?order_no=${orderInfo.order_no}&brand_id=${orderInfo.brand_id}`, 'nT');
}
}
}
diff --git a/src/components/organize_order/organize_order.vue b/src/components/organize_order/organize_order.vue
index 5a00402..b57dfd6 100644
--- a/src/components/organize_order/organize_order.vue
+++ b/src/components/organize_order/organize_order.vue
@@ -1,7 +1,7 @@
diff --git a/src/subpackage/device/components/order/organize_detail/organize_detail.vue b/src/subpackage/device/components/order/organize_detail/organize_detail.vue
index 297f662..a0043ce 100644
--- a/src/subpackage/device/components/order/organize_detail/organize_detail.vue
+++ b/src/subpackage/device/components/order/organize_detail/organize_detail.vue
@@ -2,15 +2,17 @@
-
- {{orderInfo.original_order.extension.stadium_name || '-'}}
+
+ {{orderInfo.label.BrandAndStadiumName || '-'}}
订单编号：{{orderInfo.order_no || '-'}}
- {{yw_order_status(orderInfo.original_order.pay_status)}}
+
+ {{yw_order_status(orderInfo.original_order.pay_status)}}
+
- 创建时间：{{orderInfo.original_order.created_at || '-'}}
+ 创建时间：{{orderInfo.created_at || '-'}}
用户昵称：{{orderInfo.user_nickname || '-'}}
@@ -31,29 +33,33 @@
约玩信息
- 约玩主题：{{(orderInfo.theme)}}
-
- 预定场地：
-
-
- {{y_item.venue_name}} {{y_item.duration}} ( ￥{{y_item.price}} )
+ 约玩主题：{{ orderInfo.theme || '-' }}
+
+
+ 预定场地：
+
+
+ {{ (y_item.date).replace(/\-/g, '/') || '-' }} {{ y_item.duration.replace(/\-/g, '~') || '-' }} {{ y_item.venue_name || '-' }}
+
-
-
-
+ 订场费用：￥{{ orderInfo.original_order.pay_amount || 0 }}
+
+
+ 报名费用：{{orderInfo.price_per_person || 0}}
-
+
报名信息
-
-
- {{item.user_nickname}}
-
-
+
+
+
+ {{item.user_nickname}}
+
+
@@ -72,7 +78,7 @@
-
+
金额小计
¥{{orderInfo.original_order.amount || 0}}
@@ -96,7 +102,7 @@
-
+
支付信息
支付方式：{{zh_pay_type(orderInfo.original_order.pay_type)}}
@@ -153,39 +159,6 @@ export default {
},
computed: {
...mapState(['brandInfo']),
- yw_order_status(){
- return status =>{
- const _obj = {/* */
- '1': '已付款',
- '2': '已完成',
- '4': '已退款',
- }
- return _obj[`${status}`] || '-'
- }
- },
- zh_pay_type(){
- // 支付类型 0微信支付1支付宝支付2储值卡支付
- return status =>{
- const _obj = {
- '0': '微信支付',
- '1': '支付宝支付',
- '2': '储值卡支付',
- '3': '商家主动结束计费',
- }
- return _obj[`${status}`] || '-'
- }
- },
- yw_order_type(){
- // 约玩类型 type Main/Sub 发起、参与
- return status =>{
- const _obj = {
- 'Main': '发起的约玩',
- 'Sub': '参与的约玩',
- }
- return _obj[`${status}`] || '-'
- }
- },
-
},
data() {
return {
@@ -197,6 +170,25 @@ export default {
},
methods: {
+ yw_order_status(status = ''){
+ const _obj = {/* */
+ '1': '已付款',
+ '2': '已完成',
+ '4': '已退款',
+ }
+ return _obj[`${status}`] || '-';
+ },
+ // 约玩类型
+ yw_order_type(status = ''){
+ // 约玩类型 type Main/Sub 发起、参与
+ const _obj = {
+ 'Main': '发起的约玩',
+ 'Sub': '参与的约玩',
+ }
+ return _obj[`${status}`] || '-'
+ },
+ // 支付类型
+ zh_pay_type: util.order_pay_type_txt,
confirmChange(){
let { brandInfo, orderInfo, input_amount } = this
if(input_amount == '')return util.showNone('请输入金额！');
@@ -231,7 +223,6 @@ export default {
confirmColor:"#469576",
success: function (res) {
if (res.confirm) {
- console.log('用户点击确定');
servers.get({
url: API.amountIssued,
data: {
@@ -240,7 +231,6 @@ export default {
failMsg: '加载失败！'
})
.then(res=>{
- console.log(888,res);
util.showNone("发放成功")
setTimeout(()=>uni.navigateBack(),1200);
}).catch(e=>{
diff --git a/src/subpackage/order/pages/curriculum/detail/detail.vue b/src/subpackage/order/pages/curriculum/detail/detail.vue
index e76da22..f4a1c34 100644
--- a/src/subpackage/order/pages/curriculum/detail/detail.vue
+++ b/src/subpackage/order/pages/curriculum/detail/detail.vue
@@ -25,8 +25,10 @@
购买课时：
-
- 赠送课时：
+
+
+ {{ orderInfo.course_period_nums_give >= 0 ? '赠送课时：':'扣减课时：'}}
+
有效期至：
@@ -108,6 +110,13 @@ import util from '../../../../../utils/util';
import { ORDER_API } from '../../../js/api';
import server from '../../../js/server';
export default {
+ computed: {
+ course_period_nums_give(){
+ let { orderInfo } = this;
+ let _num = orderInfo.course_period_nums_give || 0;
+ return (_num + '').replace('-', '')
+ }
+ },
// ('订单状态 0-待付款 1-进行中 2-已结束 3-已退款 4-已取消')
components: {
'a-line': a_line,
diff --git a/src/subpackage/order/pages/mall/detail/detail.vue b/src/subpackage/order/pages/mall/detail/detail.vue
index b3d420a..f2f1a4a 100644
--- a/src/subpackage/order/pages/mall/detail/detail.vue
+++ b/src/subpackage/order/pages/mall/detail/detail.vue
@@ -41,7 +41,7 @@
实付：¥{{ e.product_price_pay || 0 }}
-
+ 已退款
diff --git a/src/subpackage/order/pages/mall/refund_operate/refund_operate.vue b/src/subpackage/order/pages/mall/refund_operate/refund_operate.vue
index 4153d5c..3303e04 100644
--- a/src/subpackage/order/pages/mall/refund_operate/refund_operate.vue
+++ b/src/subpackage/order/pages/mall/refund_operate/refund_operate.vue
@@ -1,6 +1,6 @@
- 订单编号 {{ orderInfo.order_no || '-' }}
+ 订单编号 {{ orderInfo.order_no || '-' }}
@@ -29,8 +29,8 @@
*回退积分
-
- -->
+ -->
+
确定
diff --git a/src/subpackage/order/pages/mall/send_out/send_out.vue b/src/subpackage/order/pages/mall/send_out/send_out.vue
index e1b3c4c..5c45aaa 100644
--- a/src/subpackage/order/pages/mall/send_out/send_out.vue
+++ b/src/subpackage/order/pages/mall/send_out/send_out.vue
@@ -34,7 +34,7 @@
*请选择商品发货
全选
-
+
diff --git a/src/subpackage/order/pages/spectacular_monent/detail/detail.vue b/src/subpackage/order/pages/spectacular_monent/detail/detail.vue
index 3d84219..031f41d 100644
--- a/src/subpackage/order/pages/spectacular_monent/detail/detail.vue
+++ b/src/subpackage/order/pages/spectacular_monent/detail/detail.vue
@@ -15,7 +15,7 @@
高光时刻信息
-
+
产品名称：
diff --git a/src/utils/util.js b/src/utils/util.js
index 9d6a89a..a2af361 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -364,7 +364,7 @@ function getFilterJson(obj){
return obj
}
-function order_pay_type_txt(status){
+function order_pay_type_txt(status = ''){
let _obj = {
0: '微信支付',
1: '支付宝支付',