Merge branch 'test' into dev

src/pages/order/detail.vue

 <template>
 	<view class="order-wrap">
-		<u-navbar :title="title" title-color="#FFFFFF" title-size="32" back-icon-color="#FFFFFF" :background="background" :border-bottom="false"></u-navbar>
-		<view class="header" v-if="order.currentOverTime && showTimeOut">
+		<u-navbar :title="title" title-color="#FFFFFF" title-size="32" back-icon-color="#FFFFFF" :background="background" :border-bottom="false" title-bold></u-navbar>
+		<view class="header" v-if="order.currentOverTime && showTimeOut || loading">
 			<image class="bottom-tag-view" :src="tagImage"></image>
 			<!-- 倒计时 -->
 			<view class="title">
@@ -167,6 +167,7 @@
 				timeout: false,
 				timestamp: 0,
 				showFile: false, // 显示查看业务文件
+				loading: true
 			}
 		},
 		onLoad(option) {
@@ -344,6 +345,7 @@
 					'orderId': self.orderId
 				};
 				self.$u.api.orderDetail(data, self.orderId).then((res) => {
+					this.loading = false
 					if (res.code == 200) {
 						self.order = res.data
 						this.getCurrentBtn()