Merge branch 'master' of https://e.coding.net/boss-01/yxx/app

src/pages/orderHall/orderHall.vue

@@ -106,7 +106,7 @@
 										item.enclosure = fileArr[0]
 									}
 									else if (gs == 'pdf') {
-										item.enclosure = '../../static/fileImg/pdfS.png'
+										item.enclosure = '../../static/fileImg/pdfB.png'
 									} 
 								}
 								_this.mainList.push(item)

src/pages/orderHall/orderHallDetails.vue

@@ -63,6 +63,7 @@
 					<view class="right">{{data.activityTime}}</view>
 				</view>
 			</view>
+			
 			<view v-if="isCheck == 0">
 				<view class="orderBtn" v-if="data.isBaoming">
 					<view class="btnQ" @click="baoQ">取消接单</view>
@@ -332,6 +333,9 @@
 		.orderBtn {
 			width: 100%;
 			background-color: #FFF;
+			position: fixed;
+			bottom: 0rpx;
+			padding-bottom: 20rpx;
 			
 
 			.btn {