fix order

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);

src/subpackage/device/components/order/organize_detail/organize_detail.vue

@@ -46,7 +46,7 @@
 					<view>订场费用：<text>￥{{ orderInfo.original_order.pay_amount || 0 }}</text></view>
 				</block>
 				
-				<view v-if="orderInfo.type == 'Sub'">报名费用：<text>{{orderInfo.price_per_person || 0}}</text></view>
+				<view v-if="orderInfo.type == 'Sub'">报名费用：<text>￥{{orderInfo.price_per_person || 0}}</text></view>
 			</view>
 		</view>
 		<!-- 报名信息 -->

src/subpackage/order/pages/mall/detail/detail.vue

@@ -39,7 +39,7 @@
                                     <view>×{{ e.product_nums || 0 }}</view>
                                 </view>
                                 <view class="mi-amount">
-                                    <view>实付：¥<text>{{ e.product_price_pay || 0 }}</text></view>
+                                    <view>实付：¥<text>{{ e.real_pay_amount || 0 }}</text></view>
                                     
                                     <view v-if="e.product_refund_utype == 1">已退款</view>
                                 </view>

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)'
         ></o-header>
         <!-- 出租 -->
@@ -35,16 +35,16 @@
                 <a-line :value="orderInfo.extension.cost_standard || '-'">
                     <block slot="name">收费标准：</block> 
                 </a-line>
-                <a-line :value="orderInfo.extension.deposit_text  || '0'">
+                <a-line :value="'￥'+(orderInfo.extension.deposit_text  || '0')">
                     <block slot="name">支付押金：</block> 
                 </a-line>
                 <a-line :value="'￥' + (orderInfo.extension.rent_generate_fee || '0')">
                     <block slot="name">产生费用：</block> 
                 </a-line>
                 <block v-if="orderInfo.pay_status == 2">
-                    <s-line :keyname="'积分抵扣'" :value="orderInfo.deduction_amount || '0'"></s-line>
-                    <s-line :keyname="'折扣金额'" :value="orderInfo.discount_amount || '0'"></s-line>
-                    <s-line :keyname="'优惠券优惠'" :value="orderInfo.coupons_amount || '0'"></s-line>
+                    <s-line :keyname="'积分抵扣'" :value="'￥' + (orderInfo.deduction_amount || '0')"></s-line>
+                    <s-line :keyname="'折扣金额'" :value="'￥' + (orderInfo.discount_amount || '0')"></s-line>
+                    <s-line :keyname="'优惠券优惠'" :value="'￥'+ (orderInfo.coupons_amount || '0')"></s-line>
                     <view class="rpi-total"><text>合计支付：</text>￥{{ orderInfo.rent_amount || '0' }}</view>
                     <view class="ras-border"></view>
                     <view class="rpi-refund-info">
@@ -79,7 +79,7 @@
                 <p-line :keyname="'退款编号'" :value="orderInfo.refund_no || '-'" isbtn></p-line>
                 <p-line :keyname="'退款方式'" :value="orderInfo.extension.refund_type_text || '-'"></p-line>
                 <p-line :keyname="'退款状态'" :value="orderInfo.extension.refund_status_text || '-'"></p-line>
-                <p-line :keyname="'退款金额'" :value="orderInfo.refund_amount || '0'"></p-line>
+                <p-line :keyname="'退款金额'" :value="'￥'+(orderInfo.refund_amount || '0')"></p-line>
                 <p-line :keyname="'退款时间'" :value="orderInfo.refund_time || '-'"></p-line>
             </view>
             <view class="ras-fixd-bar" v-if="orderInfo.pay_status == 1">
@@ -105,10 +105,10 @@
             </view>
             <view class="ras-box ras-price-info">
                 <view class="ras-tit">费用详情</view>
-                <s-line :keyname="'金额小计'" :value="orderInfo.amount || '0'"></s-line>
-                <s-line :keyname="'积分抵扣'" :value="orderInfo.deduction_amount || '0'"></s-line>
-                <s-line :keyname="'折扣金额'" :value="orderInfo.discount_amount || '0'"></s-line>
-                <s-line :keyname="'优惠券优惠'" :value="orderInfo.coupons_amount || '0'"></s-line>
+                <s-line :keyname="'金额小计'" :value="'￥'+ (orderInfo.amount || '0')"></s-line>
+                <s-line :keyname="'积分抵扣'" :value="'￥'+ (orderInfo.deduction_amount || '0')"></s-line>
+                <s-line :keyname="'折扣金额'" :value="'￥'+ (orderInfo.discount_amount || '0')"></s-line>
+                <s-line :keyname="'优惠券优惠'" :value="'￥' + (orderInfo.coupons_amount || '0')"></s-line>
                 <view class="rpi-total"><text>合计支付：</text>￥{{ orderInfo.pay_amount || '0' }}</view>
             </view>
             <view class="ras-box">