Merge branch 'dev-1.4.6'

src/pages/mine/history/index.vue

@@ -16,39 +16,41 @@
       />
     </view>
     <template v-else>
-      <view class="head-view">
-        <image
-          :src="chakanjiluImage"
-          class="back-image"
-          mode="widthFix"
-        ></image>
-        <view class="head-info">
-          <view>最近查看记录</view>
-          <view class="head-message">最近查看或操作过的5条订单</view>
-        </view>
-      </view>
       <view class="loading-view" v-if="!loaded">
         <u-loading mode="flower"></u-loading>
       </view>
-      <view class="content-view" v-else>
-        <view v-for="item in orderList" :key="item.orderId">
-          <OrderCell
-            :orderData="item"
-            :location="[]"
-            model="simple"
-            @click="handleClickCell"
-            @action="handleClickButton"
-          >
-          </OrderCell>
+      <template v-else>
+        <view class="head-view">
+          <image
+            :src="chakanjiluImage"
+            class="back-image"
+            mode="widthFix"
+          ></image>
+          <view class="head-info">
+            <view>最近查看记录</view>
+            <view class="head-message">最近查看或操作过的5条订单</view>
+          </view>
         </view>
-        <view class="bottom-tip">
-          <u-loadmore
-            :status="nomore"
-            font-size="26"
-            color="#999999"
-          ></u-loadmore>
+        <view class="content-view">
+          <view v-for="item in orderList" :key="item.orderId">
+            <OrderCell
+              :orderData="item"
+              :location="[]"
+              model="simple"
+              @click="handleClickCell"
+              @action="handleClickButton"
+            >
+            </OrderCell>
+          </view>
+          <view class="bottom-tip">
+            <u-loadmore
+              :status="nomore"
+              font-size="26"
+              color="#999999"
+            ></u-loadmore>
+          </view>
         </view>
-      </view>
+      </template>
     </template>
   </view>
 </template>
@@ -155,6 +157,9 @@ export default {
   display: flex;
   flex-direction: column;
   height: 100vh;
+  .none-view {
+    margin-top: 140rpx;
+  }
   .head-view {
     display: relative;
     .back-image {