1.优化页面表现

src/views/assets/myOrder.vue

@@ -3,7 +3,7 @@
     <BackBar title="我的订单-资产" lefttext="返回" />
     <van-search v-model="listQuery.keyWord" placeholder="请输入搜索关键词" @search="onSearch()" />
     <van-pull-refresh v-model="loading" @refresh="onRefresh()">
-      <van-list v-model:loading="loading" :finished="finished" finished-text="还没有订单" @load="getMyOrder()">
+      <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="getMyOrder()">
         <div class="card" v-for="item in listData" :key="item.id" @click="toDetail(item)">
           <div class="businessTitle">
             <van-icon name="link-o" />

src/views/assets/pendingOrder.vue

@@ -3,7 +3,7 @@
     <BackBar title="正在进行-资产" lefttext="返回" />
     <van-search v-model="listQuery.keyWord" placeholder="请输入搜索关键词" @search="onSearch()" />
     <van-pull-refresh v-model="loading" @refresh="onRefresh()">
-      <van-list v-model:loading="loading" :finished="finished" finished-text="还没有订单" @load="getPendingOrder()">
+      <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="getPendingOrder()">
         <div class="card" v-for="item in listData" :key="item.id">
           <div class="businessTitle">
             <van-icon name="link-o" />

src/views/home/components/NavBar.vue

@@ -52,9 +52,9 @@ export default {
       this.$router.push('/index/login');
     },
     watchScroll() {
-      // 当滚动超过 120px 时，实现吸顶效果(滚动条高度当前设置为：120px)
+      // 当滚动超过 60px 时，实现吸顶效果
       var scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;
-      if (scrollTop > 120) {
+      if (scrollTop > 60) {
         this.navBarFixed = true;
       } else {
         this.navBarFixed = false;

src/views/home/components/Tabbar.vue

@@ -1,5 +1,5 @@
 <template>
-  <div >
+  <div style="margin-top:50px">
     <van-tabbar v-model="active" @change="onChange()" >
       <van-tabbar-item name="home" icon="home-o" class="tabbar-meun">首页</van-tabbar-item>
       <van-tabbar-item name="todo" icon="edit" class="tabbar-meun">待办</van-tabbar-item>

src/views/home/todo.vue

@@ -216,6 +216,7 @@ export default {
             // 服务端返回的总页数大于当前页数, 将当前页数+1
             this.majorListQuery.current++;
           } else {
+            console.log(this.majorFinished)
             // 反之停止加载
             this.majorFinished = true;
           }

src/views/land/myOrder.vue

@@ -3,7 +3,7 @@
     <BackBar title="我的项目-土地规划" lefttext="返回" />
     <van-search v-model="listQuery.name" placeholder="请输入项目名称" @search="onSearch()" />
     <van-pull-refresh v-model="loading" @refresh="onRefresh()">
-      <van-list v-model:loading="loading" :finished="finished" finished-text="还没有订单" @load="getMyOrder()">
+      <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="getMyOrder()">
         <div class="card" v-for="item in listData" :key="item.id" @click="toDetail(item)">
           <div class="businessTitle">
             <van-icon name="link-o" />

src/views/land/pendingOrder.vue

@@ -3,7 +3,7 @@
     <BackBar title="正在进行-土地规划" lefttext="返回" />
     <van-search v-model="listQuery.name" placeholder="请输入搜索关键词" @search="onSearch()" />
     <van-pull-refresh v-model="loading" @refresh="onRefresh()">
-      <van-list v-model:loading="loading" :finished="finished" finished-text="还没有订单" @load="getPendingOrder()">
+      <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="getPendingOrder()">
         <div class="card" v-for="item in listData" :key="item.id">
           <div class="businessTitle">
             <van-icon name="link-o" />

src/views/major/myOrder.vue

@@ -3,7 +3,7 @@
     <BackBar title="我的订单-大中型" lefttext="返回" />
     <van-search v-model="listQuery.keyword" placeholder="请输入搜索关键词" @search="onSearch()" />
     <van-pull-refresh v-model="loading" @refresh="onRefresh()">
-      <van-list v-model:loading="loading" :finished="finished" finished-text="还没有订单" @load="getMyOrder()">
+      <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="getMyOrder()">
         <div class="card" v-for="item in listData" :key="item.id" @click="toDetail(item)">
           <div class="businessTitle">
             <van-icon name="link-o" />

src/views/major/pendingOrder.vue

@@ -3,7 +3,7 @@
     <BackBar title="正在进行-大中型" lefttext="返回" />
     <van-search v-model="listQuery.keyword" placeholder="请输入搜索关键词" @search="onSearch()" />
     <van-pull-refresh v-model="loading" @refresh="onRefresh()">
-      <van-list v-model:loading="loading" :finished="finished" finished-text="还没有订单" @load="getPendingOrder()">
+      <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="getPendingOrder()">
         <div class="card" v-for="item in listData" :key="item.id">
           <div class="businessTitle">
             <van-icon name="link-o" />

src/views/personal/myOrder.vue

@@ -3,7 +3,7 @@
     <BackBar title="我的订单-个贷" lefttext="返回" />
     <van-search v-model="listQuery.keyword" placeholder="请输入搜索关键词" @search="onSearch()" />
     <van-pull-refresh v-model="loading" @refresh="onRefresh()">
-      <van-list v-model:loading="loading" :finished="finished" finished-text="还没有订单" @load="getMyOrder()">
+      <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="getMyOrder()">
         <div class="card" v-for="item in listData" :key="item.id" @click="toDetail(item)">
           <div class="businessTitle">
             <van-icon name="link-o" />

src/views/personal/pendingOrder.vue

@@ -3,7 +3,7 @@
     <BackBar title="正在进行-个贷" lefttext="返回" />
     <van-search v-model="listQuery.keyword" placeholder="请输入搜索关键词" @search="onSearch()" />
     <van-pull-refresh v-model="loading" @refresh="onRefresh()">
-      <van-list v-model:loading="loading" :finished="finished" finished-text="还没有订单" @load="getPendingOrder()">
+      <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="getPendingOrder()">
         <div class="card" v-for="item in listData" :key="item.id">
           <div class="businessTitle">
             <van-icon name="link-o" />