diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue
index ea1a32d..cc6bf85 100644
--- a/src/pages/order_list/order_list.vue
+++ b/src/pages/order_list/order_list.vue
@@ -165,7 +165,8 @@
orderType == 1 || orderType == 10 ||
orderType == 18 || orderType == 12 ||
orderType == 18 || orderType == 12 ||
- orderType == 15 || orderType == 16
+ orderType == 15 || orderType == 16 ||
+ orderType == 8
)
},
// 分类列表
@@ -240,8 +241,10 @@
this.periodInfo = this.getDefaultTimeLimit(_type);
- this.getStoreList();
- this.$nextTick(this.refreshList);
+ this.$nextTick(()=>{
+ this.refreshList()
+ .then(this.getStoreList)
+ });
this.$nextTick(_=> uni.setNavigationBarTitle({ title: this.titleName }));
},
@@ -273,6 +276,7 @@
// 获取品牌店铺列表
getStoreList(){
let { brandInfo } = this;
+ util.showLoad();
servers.get({
url: API.stadiumList,
data: {
@@ -281,6 +285,7 @@
failMsg: '加载店铺列表失败!',
})
.then(res=>{
+ util.hideLoad();
let _list = res.list || [];
this.storeList = [ ...this.storeList, ..._list ];
})
@@ -353,10 +358,10 @@
// ----->
// 刷新列表
- refreshList(){
+ async refreshList(){
this.orderList = [];
this.page = 1;
- this.getOrderList({ })
+ return this.getOrderList({})
},
// 获取订单列表
getOrderList({
@@ -365,7 +370,7 @@
}){
let { orderType } = this;
util.showLoad();
- servers.post({
+ return servers.post({
url: this.getApiUrl(orderType),
data: { ...this.getQueryForList(), page, page_size },
failMsg: '加载失败!'
@@ -382,7 +387,7 @@
if(_list.length<=0)return util.showNone('没有更多!');
this.page = page;
- this.orderList = [ ...this.orderList, ..._list ];
+ return this.orderList = [ ...this.orderList, ..._list ];
})
.catch(util.hideLoad);
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 a0043ce..3f603a8 100644
--- a/src/subpackage/device/components/order/organize_detail/organize_detail.vue
+++ b/src/subpackage/device/components/order/organize_detail/organize_detail.vue
@@ -46,7 +46,7 @@
订场费用:¥{{ orderInfo.original_order.pay_amount || 0 }}
- 报名费用:{{orderInfo.price_per_person || 0}}
+ 报名费用:¥{{orderInfo.price_per_person || 0}}
diff --git a/src/subpackage/order/pages/mall/detail/detail.vue b/src/subpackage/order/pages/mall/detail/detail.vue
index f2f1a4a..2eb4869 100644
--- a/src/subpackage/order/pages/mall/detail/detail.vue
+++ b/src/subpackage/order/pages/mall/detail/detail.vue
@@ -39,7 +39,7 @@
×{{ e.product_nums || 0 }}
- 实付:¥{{ e.product_price_pay || 0 }}
+ 实付:¥{{ e.real_pay_amount || 0 }}
已退款
diff --git a/src/subpackage/order/pages/rent_and_sale/detail/detail.vue b/src/subpackage/order/pages/rent_and_sale/detail/detail.vue
index d0555e4..9e7da77 100644
--- a/src/subpackage/order/pages/rent_and_sale/detail/detail.vue
+++ b/src/subpackage/order/pages/rent_and_sale/detail/detail.vue
@@ -4,7 +4,7 @@
:logo='orderInfo.extension.stadium_logo'
:source='orderInfo.extension.stadium_name'
:phone='orderInfo.mobile'
- :name='orderInfo.name'
+ :name='orderInfo.extension.nickname'
:status='statusTxt(orderInfo.pay_status)'
>
@@ -35,16 +35,16 @@
收费标准:
-
+
支付押金:
产生费用:
-
-
-
+
+
+
合计支付:¥{{ orderInfo.rent_amount || '0' }}
@@ -79,7 +79,7 @@
-
+
@@ -105,10 +105,10 @@
费用详情
-
-
-
-
+
+
+
+
合计支付:¥{{ orderInfo.pay_amount || '0' }}