From d5d3021cd327fe7c5945e4c55eb25d4653fb0b4e Mon Sep 17 00:00:00 2001
From: zq <136432190602163.com>
Date: Tue, 15 Jul 2025 18:33:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E7=9A=84=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Page.vue            | 385 ++++++++++++++++++++-----------------
 src/views/agent/checkOrderList.vue |  29 ++-
 2 files changed, 238 insertions(+), 176 deletions(-)

diff --git a/src/components/Page.vue b/src/components/Page.vue
index 2f93a8b..9cedf6f 100644
--- a/src/components/Page.vue
+++ b/src/components/Page.vue
@@ -1,238 +1,279 @@
 <template>
-  <div class="pagination">
+  <div class="pagination flex gap10">
     <!-- 首页按钮 -->
-    <button 
-      v-if="showHome" 
-      @click="goToFirstPage"
-      class="pagination-button"
-    >
+    <GuipButton size="form" v-if="showFirstPage" @click="goToFirstPage" :disabled="page === 1">
       首页
-    </button>
-    
+    </GuipButton>
+
     <!-- 上一页按钮 -->
-    <button 
-      v-if="showPrev" 
-      @click="goToPrevPage"
-      class="pagination-button"
-    >
+    <GuipButton size="form" v-if="showPrevPage" @click="goToPrevPage" :disabled="page === 1">
       上一页
-    </button>
-    
-    <!-- 当前页码显示 -->
-    <span v-if="showCurrent" class="current-page">第{{ currentPage }}页</span>
-    
+    </GuipButton>
+
+    <!-- 当前页码 -->
+    <span v-if="showCurrentPage">第{{ page }}页</span>
+
     <!-- 下一页按钮 -->
-    <button 
-      v-if="showNext" 
-      @click="goToNextPage"
-      class="pagination-button"
-    >
+    <GuipButton size="form" v-if="showNextPage" @click="goToNextPage" :disabled="!hasNextPage ">
       下一页
-    </button>
-    
-    <!-- 尾页按钮/状态 -->
-    <button 
-      v-if="showLastButton"
-      @click="goToLastPage"
-      class="pagination-button"
-    >
+    </GuipButton>
+
+    <!-- 尾页按钮 -->
+    <GuipButton size="form" v-if="showLastPage" @click="goToLastPage">
       尾页
-    </button>
-    <span v-if="showLastText" class="last-page">尾页</span>
-    
-    <!-- 尾页时的页码显示 -->
-    <span v-if="endPageFlag" class="last-page-number">第{{ totalPages }}页</span>
-    
-    <!-- 跳转控件 -->
-    <div class="page-jump">
-      <input 
-        type="number" 
-        v-model="jumpPage" 
-        min="1" 
-        class="jump-input"
-      >
-      <button @click="handleJump" class="jump-button">跳转</button>
+    </GuipButton>
+
+    <!-- 跳转输入 -->
+    <div class="page-jump flex gap10" v-if="showJump">
+      <input type="number" v-model.number="jumpPage" min="1" :max="totalPages">
+      <GuipButton size="form" @click="handleJump">跳转</GuipButton>
     </div>
-    
-    <!-- 尾页时的总记录数 -->
-    <span v-if="endPageFlag" class="total-records">共{{ totalRecords }}条记录</span>
+
+    <!-- 总记录数 -->
+    <span v-if="showTotalRecords" class="total-records">共{{ totalRecords }}条记录</span>
   </div>
 </template>
 
 <script>
+import GuipButton from '@/components/GuipButton.vue';
+
 export default {
   name: 'Pagination',
+  components:{GuipButton},
   props: {
-    // 总记录数
-    totalRecords: {
-      type: [Number,String],
-      required: true,
-      default: 0
-    },
-    // 总页数
-    totalPages: {
-      type: [Number,String],
-      required: true,
-      default: 1
-    },
-    // 当前页码
-    currentPage: {
-      type: [Number,String],
-      required: true,
-      default: 1
-    },
-    // 用于下一页的minid
-    nextMinId: {
-      type: [Number,String],
-      default: null
-    },
-    // 用于上一页的maxid
-    prevMaxId: {
-      type: [Number,String],
-      default: null
+    // 接口URL
+    apiUrl: {
+      type: String,
+      required: true
+    },
+    // 每页条数
+    pageSize: {
+      type: Number,
+      default: 10
+    },
+    // 其他请求参数
+    extraParams: {
+      type: Object,
+      default: () => ({})
     }
   },
   data() {
     return {
-      endPageFlag: false, // 尾页标识
-      jumpPage: null      // 跳转页码
-    };
+      page: 1,
+      jumpPage: 1,
+      end_page:0,
+      hasNextPage: false,
+      minId: null,
+      maxId: null,
+      totalRecords: 0,
+      buttonType:'',
+      totalPages: 1,
+      isLoading: false,
+      token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE3NTAwNTM3MjQsIm5iZiI6MTc1MDA1MzcyNCwiZXhwIjoxNzUyNjQ1NzI0LCJ1c2VyIjoic3VidXNlciIsImxvZ2luX3R5cGUiOjAsImFpZCI6IjEifQ.xyIqBLelB-k6jCifgRevBJTyg_Qrm6m1e4OcHhOpepU',
+    }
   },
   computed: {
     // 是否显示首页按钮
-    showHome() {
-      return this.currentPage > 1;
+    showFirstPage() {
+      return this.page > 2
     },
     // 是否显示上一页按钮
-    showPrev() {
-      return this.currentPage > 1;
+    showPrevPage() {
+      return this.page > 1
     },
     // 是否显示当前页码
-    showCurrent() {
-      return !this.endPageFlag;
+    showCurrentPage() {
+      return true
     },
     // 是否显示下一页按钮
-    showNext() {
-      return !this.endPageFlag;
+    showNextPage() {
+      return this.hasNextPage 
     },
     // 是否显示尾页按钮
-    showLastButton() {
-      return !this.endPageFlag;
+    showLastPage() {
+      return !(this.end_page > 0) || this.hasNextPage 
+    },
+    // 是否显示跳转
+    showJump() {
+      return true
     },
-    // 是否显示尾页文本
-    showLastText() {
-      return this.endPageFlag;
+    // 是否显示总记录数
+    showTotalRecords() {
+      return this.totalRecords > 0
     }
   },
+  created() {
+    this.fetchData()
+  },
   methods: {
+    // 构建请求参数
+    buildParams() {
+      const params = {
+        pagesize: this.pageSize,
+        page:this.page,
+        ...this.extraParams
+      }
+   
+      // 如果不是第一页，添加maxid或minid
+      if (this.page > 1) {
+        if (this.page === this.totalPages) {
+          // 从尾页往前翻
+          params.maxid = this.maxId
+        } else {
+          // 正常翻页
+          if (this.buttonType == 'prev') {
+            params.maxid = this.maxId
+          } else {
+            params.minid = this.minId
+          }
+        }
+      }
+      if(this.end_page > 0){
+       delete params.page
+       delete params.maxid
+       delete params.minid
+       params.end_page = this.end_page
+      }else{
+        delete params.end_page
+      }
+
+      console.log(params,'params======');
+      return params
+    },
+
+    // 获取数据
+    async fetchData() {
+      console.log('-----执行了');
+      this.isLoading = true
+      this.$emit('changeLoad',true)
+      try {
+        this.$http('POST', this.apiUrl, this.buildParams(), {
+          headers: {
+            'Auth': this.token
+          }
+        }).then(response => {
+          const data = response.data
+          this.hasNextPage = data.is_has_next_page
+          this.minId = data.minid || null
+          this.maxId = data.maxid || null
+          this.totalRecords = data.total_records || 0
+          if(this.totalRecords > 0){
+            // 计算总页数
+            this.totalPages = Math.ceil(this.totalRecords / this.pageSize)
+            this.page = this.totalPages || 1
+            this.jumpPage = this.page 
+          }
+          // 通知父组件数据更新
+          this.$emit('update', data)
+          this.$emit('changeLoad',false)
+        })
+      } catch (error) {
+        console.error('分页请求失败:', error)
+        this.$emit('error', error)
+        this.$emit('changeLoad',false)
+      } finally {
+        this.isLoading = false
+        this.$emit('changeLoad',false)
+      }
+    },
+
     // 跳转到首页
     goToFirstPage() {
-      this.endPageFlag = false;
-      this.$emit('page-change', {
-        page: 1,
-        isFirst: true
-      });
+      if (this.page === 1) return
+      this.page = 1
+      this.jumpPage = 1
+      this.end_page = 0;
+      this.buttonType = ''
+      this.fetchData()
     },
-    
+
     // 跳转到上一页
     goToPrevPage() {
-      this.endPageFlag = false;
-      this.$emit('page-change', {
-        page: this.currentPage - 1,
-        maxid: this.prevMaxId,
-        isPrev: true
-      });
-    },
-    
+      if (this.page <= 1) return
+      this.page--
+      this.jumpPage = this.page
+      this.end_page = 0;
+      this.buttonType = 'prev'
+      this.fetchData()
+    },
+
     // 跳转到下一页
     goToNextPage() {
-      this.endPageFlag = false;
-      this.$emit('page-change', {
-        page: this.currentPage + 1,
-        minid: this.nextMinId,
-        isNext: true
-      });
-    },
-    
+      if (!this.hasNextPage)return
+      this.page++
+      this.end_page = 0;
+      this.jumpPage = this.page
+      this.buttonType = 'next'
+      this.fetchData()
+    },
+
     // 跳转到尾页
     goToLastPage() {
-      this.endPageFlag = true;
-      this.$emit('page-change', {
-        page: this.totalPages,
-        isLast: true
-      });
+      // if (this.page === this.totalPages) return
+      // this.page = this.totalPages
+      // this.jumpPage = this.totalPages
+      this.end_page = 1;
+      this.buttonType = ''
+      this.fetchData()
     },
-    
+
     // 处理跳转
     handleJump() {
-      if (!this.jumpPage || this.jumpPage < 1) {
-        return;
+      let page = parseInt(this.jumpPage)
+
+      if (isNaN(page) || page < 1) {
+        page = 1
       }
-      if (this.totalPages > 0 && this.jumpPage > this.totalPages) {
-        return;
+      //  else if (page > this.totalPages) {
+      //   page = this.totalPages
+      // }
+
+      if (page === this.page) return
+
+      this.page = page
+      this.jumpPage = page
+      this.fetchData()
+    }
+  },
+  watch: {
+    apiUrl() {
+      this.page = 1
+      this.fetchData()
+    },
+    pageSize() {
+      this.page = 1
+      this.fetchData()
+    },
+    extraParams: {
+      deep: true,
+      handler() {
+        this.page = 1
+        this.fetchData()
       }
-      
-      this.endPageFlag = this.jumpPage === this.totalPages;
-      
-      this.$emit('page-change', {
-        page: this.jumpPage,
-        isJump: true
-      });
-      
-      this.jumpPage = null;
     }
   }
-};
+}
 </script>
 
 <style scoped>
 .pagination {
   display: flex;
   align-items: center;
-  gap: 8px;
-  margin-top: 20px;
-  flex-wrap: wrap;
-}
-
-.pagination-button {
-  padding: 6px 12px;
-  border: 1px solid #ddd;
-  background: #f8f8f8;
-  border-radius: 4px;
-  cursor: pointer;
-}
-
-.pagination-button:hover {
-  background: #e8e8e8;
-}
-
-.current-page, .last-page, .last-page-number, .total-records {
-  padding: 0 8px;
-  font-size: 14px;
+  justify-content: flex-end;
+  margin: 20px 0;
+  gap: 10px;
 }
 
-.page-jump {
-  display: flex;
-  gap: 4px;
-}
-
-.jump-input {
+.page-jump input {
   width: 50px;
-  padding: 4px;
+  padding: 5px;
   border: 1px solid #ddd;
-  border-radius: 4px;
+  border-radius: 3px;
   text-align: center;
 }
 
-.jump-button {
-  padding: 4px 8px;
-  border: 1px solid #ddd;
-  background: #f0f0f0;
-  border-radius: 4px;
-  cursor: pointer;
-}
-
-.jump-button:hover {
-  background: #e0e0e0;
+.total-records {
+  margin-left: 10px;
+  color: #666;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/agent/checkOrderList.vue b/src/views/agent/checkOrderList.vue
index c77294d..5afe886 100644
--- a/src/views/agent/checkOrderList.vue
+++ b/src/views/agent/checkOrderList.vue
@@ -36,7 +36,7 @@
 
                     <PromptText class="my-32" text='订单提示：电商订单，提交检测后会自动发货，请勿手动发货、代收款订单，退款须由平台操作，不可私自退款' :type="2" />
 
-                    <GuipTable :tableData="orderList" ref="multipleTable" autoColumn="true" :loading="tableLoading">
+                    <GuipTable :tableData="orderList" ref="multipleTable" autoColumn="true" :loading="tableLoading" max-height="400px">
                         <el-table-column prop="sitename" label="站点" fixed="left" min-width="60px">
                             <template slot-scope="scope">
                                 <div class="flex">
@@ -159,6 +159,13 @@
                     :next-min-id="orderListNextMinId"
                     :prev-max-id="orderListPrevMaxId"
                     @page-change="handlePageChange"></Page> -->
+                    <Page
+                        :api-url="'/agentnew/ajax_get_check_order_list'" 
+                        :page-size="10"
+                        @update="handleUpdate"
+                        @error="handleError"
+                        @changeLoad="changeLoad"
+                    />
                 </el-form>
             </div>
             <GuipDialog :dialogVisible="dialogVisibleDelReport" title="删除报告" confirmText="删除" cancelText="取消" :show-close-button="false"
@@ -178,7 +185,7 @@ import GuipSelect from '@/components/GuipSelect.vue';
 import GuipInput from '@/components/GuipInput.vue';
 import GuipToolTip from '@/components/GuipToolTip.vue';
 import GuipDialog from '@/components/GuipDialog.vue';
-// import Page from '@/components/Page.vue';
+import Page from '@/components/Page.vue';
 import PromptText from '@/components/PromptText.vue';
 
 export default {
@@ -189,7 +196,7 @@ export default {
         GuipInput,
         GuipToolTip,
         GuipDialog,
-        // Page,
+        Page,
         PromptText,
     },
     data() {
@@ -220,12 +227,26 @@ export default {
 
             dialogVisibleDelReport: false,
             delReportId: '',
+
         }
     },
     mounted() {
-        this.getOrderList()
+        // this.getOrderList()
     },
     methods: {
+        changeLoad(load){
+            this.tableLoading = load
+        },
+        handleUpdate(data) {
+            this.orderList = data.list;
+            this.searchStatusList = data.search_check_status
+            this.orderListTotalRecords = data.total_records
+
+        },
+        handleError(error) {
+            console.error('分页错误:', error)
+            // 可以在这里显示错误提示
+        },
         getOrderList() {
             var params = {
                 page: this.orderListCurrentPage,