Merge branch 'dev-1.5.3' into test

src/pages/mine/warehouse/index.vue

@@ -35,8 +35,8 @@
 						<AppliedCell @operate="handleOperate" :info="item" @action="handleClickCell" @express="handleClickExpress"></AppliedCell>
 					</view>
 					<!-- 底部加载状态 -->
-					<view class="load-more-view">
-						<u-loadmore v-show="(pageNumber == 1 && loaded) || pageNumber > 1" :status="loadStatus"
+					<view class="load-more-view" v-if="(pageNumber == 1 && loaded) || pageNumber > 1">
+						<u-loadmore :status="loadStatus"
 							bgColor="#F4F5F7"></u-loadmore>
 					</view>
 				</template>

src/pages/order/detail.vue

@@ -439,7 +439,7 @@ export default {
       this.type = option.type
     }
 
-    this.loadOrderDetail()
+    // this.loadOrderDetail() // onShow里面刷新
     this.getLocation()
     if (this.isOther) {
       // 获取结算信息
@@ -454,13 +454,13 @@ export default {
     if (this.uploadTask.length > 0) {
       upload.uploadImageTask(this)
     }
+    this.loadOrderDetail()
 
     // 从过程反馈回来，需要刷新数据
     let pages = getCurrentPages()
     let page = pages[pages.length - 1]
     if (page.needFresh) {
       page.needFresh = null
-      this.loadOrderDetail()
       this.loadOrderRecord()
     }
     if (page.needRefresh) {