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

pages/index/index.vue

@@ -37,7 +37,7 @@
 						<view class="out">
 							<view class="int">
 								<view class="icon ioc" style="background-color: #f0dcfc; color: #b064d8">&#xe628;</view>
-								<view class="tit">一级订单</view>
+								<view class="tit">一级市场交易</view>
 							</view>
 						</view>
 					</view>
@@ -45,7 +45,7 @@
 						<view class="out">
 							<view class="int">
 								<view class="icon ioc" style="background-color: #f0dcfc; color: #b064d8">&#xe628;</view>
-								<view class="tit">二级订单</view>
+								<view class="tit">二级市场交易</view>
 							</view>
 						</view>
 					</view>

pages/market/two/leader/resale.vue

@@ -46,11 +46,11 @@
 				</view>
 			</view>
 			<u-divider text="费项明细"></u-divider>
-			<view>总费用：{{fee.totalFee}}<span style="color: coral;margin-left: 5px;font-size: 16px;">元</span></view>
+			<view>交易服务费用明细：{{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">
+				<u-collapse v-for="(item,index) in fee.feeList" :key="index" :is-open="true">
 					<u-collapse-item :title="item.name" class="cell_title" >
-						<view class="itm">1、名称：{{ item.name }}</view>
+						<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>
 						<view class="itm" v-if="item.feeType ==3">2、收费类型：按吨收取</view>