Merge branch 'feature/asyncOrder' of http://git.aseanbusiness.cn/qzyReal/market-app-ui into feature/asyncOrder

# Conflicts:
#	pages/market/order/order.vue

pages/market/one/leader/order.vue

@@ -73,9 +73,9 @@
 						finishStatus: 0,
 					},
 					{
-						name: '未过卡3',
+						name: '已过卡3',
 						finishStatus: 1,
-					
+
 					},
 				],
 				param: {

pages/market/order/order.vue

@@ -33,8 +33,7 @@
 				<view class="op">
 					<view class="date">{{ item.createTime }}</view>
 					<template v-if="item.finishStatus == 1 && item.upStatus != 2">
-						<view  class="an down_btn" style="background-color: #3c9cff;color: white;" @click.stop="resale(item)">上架
-						</view>
+						<view class="an down_btn" style="background-color: #3c9cff;color: white;" @click.stop="resale(item)">上架</view>
 					</template>
 
 					<!-- <template v-if="item.resaleStatus == 0 && item.beingOrder == 0&& item.upStatus == 2"> -->
@@ -249,4 +248,4 @@
 		font-size: 12px;
 		padding: 2px 5px;
 	}
-</style>
+</style>

pages/market/two/leader/resale.vue

@@ -49,8 +49,8 @@
 			<u-divider text="服务费明细"></u-divider>
 			<view v-if="fee.totalFee>0">{{fee.title}}：{{fee.totalFee}}<span style="color: coral;margin-left: 5px;font-size: 16px;">元</span></view>
 			<view class="box">
-				<u-collapse v-for="(item,index) in fee.feeList" :key="index" :is-open="true">
-					<u-collapse-item :title="item.name" class="cell_title" >
+				<u-collapse v-for="(item,index) in fee.feeList" :key="index" :value="['1']">
+					<u-collapse-item :title="item.name" class="cell_title" name="1">
 						<view class="itm">1、系统服务费：{{ item.name }}</view>
 						<view class="itm" v-if="item.feeType ==1">2、收费类型：按交易额收取</view>
 						<view class="itm" v-if="item.feeType ==2">2、收费类型：按次收取</view>