做一些小调整

api/erp/order.js

@@ -12,6 +12,18 @@ export function listOrder(query) {
   })
 }
 
+/**
+ * 查询我的订单列表（小程序端，按当前用户过滤，每页5条）
+ * @Author: Antigravity
+ */
+export function listMyOrder(query) {
+  return request({
+    url: '/erp/order/myList',
+    method: 'get',
+    params: query
+  })
+}
+
 /**
  * 查询订单详情
  * @Author: Antigravity

pages/order/list/index.vue

@@ -80,7 +80,7 @@
 		</scroll-view>
 
 		<!-- 底部菜单栏 -->
-		<erp-tab-bar active="order"></erp-tab-bar>
+		<!-- <erp-tab-bar active="order"></erp-tab-bar> -->
 
 		<!-- 审核记录弹窗 -->
 		<view class="overlay" v-if="auditHistoryVisible" @click="auditHistoryVisible = false">
@@ -114,7 +114,7 @@
 <script>
 import ErpTabBar from '@/components/erp-tab-bar.vue';
 import ErpNavBar from '@/components/erp-nav-bar.vue';
-import { listOrder, cancelOrder, getAuditHistory } from '@/api/erp/order.js';
+import { listMyOrder, cancelOrder, getAuditHistory } from '@/api/erp/order.js';
 export default {
 	components: { ErpTabBar, ErpNavBar },
 	data() {
@@ -125,6 +125,7 @@ export default {
 			currentTab: 0,
 			loading: false,
 			noMore: false,
+			pageNum: 1,
 			tabs: ['全部', '已撤销', '待审核', '已驳回', '待签批', '生产中', '已完成'],
 			allOrders: [],
 			displayList: [],
@@ -150,26 +151,24 @@ export default {
 	methods: {
 		goBack() { uni.navigateBack(); },
 		switchTab(i) { this.currentTab = i; this.refresh(); },
-		refresh() { this.displayList = []; this.noMore = false; this.loadData(); },
+		refresh() { this.displayList = []; this.noMore = false; this.pageNum = 1; this.loadData(); },
 		onReachEnd() { if (!this.loading && !this.noMore) this.loadData(); },
 		async loadData() {
 			if (this.loading || this.noMore) return;
 			this.loading = true;
 			try {
 				const params = {
-					pageNum: 1, // 简易处理，先加载第一页
-					pageSize: 50
+					pageNum: this.pageNum,
+					pageSize: 5
 				};
-				// 状态映射
 				if (this.currentTab > 0) {
 					const tabToStatus = [undefined, -1, 0, 1, 2, 3, 4];
 					params.status = tabToStatus[this.currentTab];
 				}
-				const res = await listOrder(params);
+				const res = await listMyOrder(params);
 				const rows = res.rows || [];
 
 				const formattedRows = rows.map(item => {
-					// 状态展示映射（与 ErpOrderStatus 枚举对齐）
 					const statusMap = {
 						'-1': { name: '已撤销', type: 'cancelled' },
 						0: { name: '待审核', type: 'pending' },
@@ -198,7 +197,8 @@ export default {
 				});
 
 				this.displayList = [...this.displayList, ...formattedRows];
-				this.noMore = this.displayList.length >= (res.total || 0);
+				this.pageNum++;
+				this.noMore = rows.length === 0 || this.displayList.length >= (res.total || 0);
 			} catch (e) {
 				console.error('加载订单列表失败', e);
 				uni.showToast({ title: e || '加载订单列表失败', icon: 'none' });

unpackage/dist/dev/.sourcemap/mp-weixin/api/erp/order.js.map

@@ -1 +1 @@
-{"version":3,"file":"order.js","sources":["api/erp/order.js"],"sourcesContent":["import request from '@/utils/request'\n\n/**\n * 查询订单列表\n * @Author: Antigravity\n */\nexport function listOrder(query) {\n  return request({\n    url: '/erp/order/list',\n    method: 'get',\n    params: query\n  })\n}\n\n/**\n * 查询订单详情\n * @Author: Antigravity\n */\nexport function getOrderDetail(rowId) {\n  return request({\n    url: '/erp/order/' + rowId,\n    method: 'get'\n  })\n}\n\n/**\n * 提交订单\n * @Author: Antigravity\n */\nexport function addOrder(data) {\n  return request({\n    url: '/erp/order/add',\n    method: 'post',\n    data: data\n  })\n}\n\n/**\n * 撤销订单\n * @Author: Antigravity\n */\nexport function cancelOrder(rowId) {\n  return request({\n    url: '/erp/order/cancel/' + rowId,\n    method: 'post'\n  })\n}\n\n/**\n * 查询审核记录\n * @Author: Antigravity\n */\nexport function getAuditHistory(orderId) {\n  return request({\n    url: '/erp/orderAudit/history/' + orderId,\n    method: 'get'\n  })\n}\n"],"names":["request"],"mappings":";;AAMO,SAAS,UAAU,OAAO;AAC/B,SAAOA,sBAAQ;AAAA,IACb,KAAK;AAAA,IACL,QAAQ;AAAA,IACR,QAAQ;AAAA,EACZ,CAAG;AACH;AAMO,SAAS,eAAe,OAAO;AACpC,SAAOA,sBAAQ;AAAA,IACb,KAAK,gBAAgB;AAAA,IACrB,QAAQ;AAAA,EACZ,CAAG;AACH;AAMO,SAAS,SAAS,MAAM;AAC7B,SAAOA,sBAAQ;AAAA,IACb,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACJ,CAAG;AACH;AAMO,SAAS,YAAY,OAAO;AACjC,SAAOA,sBAAQ;AAAA,IACb,KAAK,uBAAuB;AAAA,IAC5B,QAAQ;AAAA,EACZ,CAAG;AACH;AAMO,SAAS,gBAAgB,SAAS;AACvC,SAAOA,sBAAQ;AAAA,IACb,KAAK,6BAA6B;AAAA,IAClC,QAAQ;AAAA,EACZ,CAAG;AACH;;;;;;"}
+{"version":3,"file":"order.js","sources":["api/erp/order.js"],"sourcesContent":["import request from '@/utils/request'\n\n/**\n * 查询订单列表\n * @Author: Antigravity\n */\nexport function listOrder(query) {\n  return request({\n    url: '/erp/order/list',\n    method: 'get',\n    params: query\n  })\n}\n\n/**\n * 查询我的订单列表（小程序端，按当前用户过滤，每页5条）\n * @Author: Antigravity\n */\nexport function listMyOrder(query) {\n  return request({\n    url: '/erp/order/myList',\n    method: 'get',\n    params: query\n  })\n}\n\n/**\n * 查询订单详情\n * @Author: Antigravity\n */\nexport function getOrderDetail(rowId) {\n  return request({\n    url: '/erp/order/' + rowId,\n    method: 'get'\n  })\n}\n\n/**\n * 提交订单\n * @Author: Antigravity\n */\nexport function addOrder(data) {\n  return request({\n    url: '/erp/order/add',\n    method: 'post',\n    data: data\n  })\n}\n\n/**\n * 撤销订单\n * @Author: Antigravity\n */\nexport function cancelOrder(rowId) {\n  return request({\n    url: '/erp/order/cancel/' + rowId,\n    method: 'post'\n  })\n}\n\n/**\n * 查询审核记录\n * @Author: Antigravity\n */\nexport function getAuditHistory(orderId) {\n  return request({\n    url: '/erp/orderAudit/history/' + orderId,\n    method: 'get'\n  })\n}\n"],"names":["request"],"mappings":";;AAkBO,SAAS,YAAY,OAAO;AACjC,SAAOA,sBAAQ;AAAA,IACb,KAAK;AAAA,IACL,QAAQ;AAAA,IACR,QAAQ;AAAA,EACZ,CAAG;AACH;AAMO,SAAS,eAAe,OAAO;AACpC,SAAOA,sBAAQ;AAAA,IACb,KAAK,gBAAgB;AAAA,IACrB,QAAQ;AAAA,EACZ,CAAG;AACH;AAMO,SAAS,SAAS,MAAM;AAC7B,SAAOA,sBAAQ;AAAA,IACb,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACJ,CAAG;AACH;AAMO,SAAS,YAAY,OAAO;AACjC,SAAOA,sBAAQ;AAAA,IACb,KAAK,uBAAuB;AAAA,IAC5B,QAAQ;AAAA,EACZ,CAAG;AACH;AAMO,SAAS,gBAAgB,SAAS;AACvC,SAAOA,sBAAQ;AAAA,IACb,KAAK,6BAA6B;AAAA,IAClC,QAAQ;AAAA,EACZ,CAAG;AACH;;;;;;"}

unpackage/dist/dev/mp-weixin/api/erp/order.js

@@ -1,8 +1,8 @@
 "use strict";
 const utils_request = require("../../utils/request.js");
-function listOrder(query) {
+function listMyOrder(query) {
   return utils_request.request({
-    url: "/erp/order/list",
+    url: "/erp/order/myList",
     method: "get",
     params: query
   });
@@ -36,5 +36,5 @@ exports.addOrder = addOrder;
 exports.cancelOrder = cancelOrder;
 exports.getAuditHistory = getAuditHistory;
 exports.getOrderDetail = getOrderDetail;
-exports.listOrder = listOrder;
+exports.listMyOrder = listMyOrder;
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/api/erp/order.js.map

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -7086,7 +7086,7 @@ function isConsoleWritable() {
 function initRuntimeSocketService() {
   const hosts = "192.168.1.205,10.0.0.254,127.0.0.1";
   const port = "8090";
-  const id = "mp-weixin_JsfeqX";
+  const id = "mp-weixin_ehJL69";
   const lazy = typeof swan !== "undefined";
   let restoreError = lazy ? () => {
   } : initOnError();

unpackage/dist/dev/mp-weixin/pages/order/list/index.js

@@ -14,6 +14,7 @@ const _sfc_main = {
       currentTab: 0,
       loading: false,
       noMore: false,
+      pageNum: 1,
       tabs: ["全部", "已撤销", "待审核", "已驳回", "待签批", "生产中", "已完成"],
       allOrders: [],
       displayList: [],
@@ -45,6 +46,7 @@ const _sfc_main = {
     refresh() {
       this.displayList = [];
       this.noMore = false;
+      this.pageNum = 1;
       this.loadData();
     },
     onReachEnd() {
@@ -57,15 +59,14 @@ const _sfc_main = {
       this.loading = true;
       try {
         const params = {
-          pageNum: 1,
-          // 简易处理，先加载第一页
-          pageSize: 50
+          pageNum: this.pageNum,
+          pageSize: 5
         };
         if (this.currentTab > 0) {
           const tabToStatus = [void 0, -1, 0, 1, 2, 3, 4];
           params.status = tabToStatus[this.currentTab];
         }
-        const res = await api_erp_order.listOrder(params);
+        const res = await api_erp_order.listMyOrder(params);
         const rows = res.rows || [];
         const formattedRows = rows.map((item) => {
           const statusMap = {
@@ -94,7 +95,8 @@ const _sfc_main = {
           };
         });
         this.displayList = [...this.displayList, ...formattedRows];
-        this.noMore = this.displayList.length >= (res.total || 0);
+        this.pageNum++;
+        this.noMore = rows.length === 0 || this.displayList.length >= (res.total || 0);
       } catch (e) {
         common_vendor.index.__f__("error", "at pages/order/list/index.vue:203", "加载订单列表失败", e);
         common_vendor.index.showToast({ title: e || "加载订单列表失败", icon: "none" });
@@ -145,8 +147,7 @@ const _sfc_main = {
 };
 if (!Array) {
   const _component_erp_nav_bar = common_vendor.resolveComponent("erp-nav-bar");
-  const _component_erp_tab_bar = common_vendor.resolveComponent("erp-tab-bar");
-  (_component_erp_nav_bar + _component_erp_tab_bar)();
+  _component_erp_nav_bar();
 }
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return common_vendor.e({
@@ -206,13 +207,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   }, $data.displayList.length === 0 && !$data.loading ? {} : {}, {
     i: $options.scrollHeight,
     j: common_vendor.o((...args) => $options.onReachEnd && $options.onReachEnd(...args), "57"),
-    k: common_vendor.p({
-      active: "order"
-    }),
-    l: $data.auditHistoryVisible
+    k: $data.auditHistoryVisible
   }, $data.auditHistoryVisible ? common_vendor.e({
-    m: common_vendor.o(($event) => $data.auditHistoryVisible = false, "51"),
-    n: common_vendor.f($data.auditHistoryList, (item, idx, i0) => {
+    l: common_vendor.o(($event) => $data.auditHistoryVisible = false, "6e"),
+    m: common_vendor.f($data.auditHistoryList, (item, idx, i0) => {
       return common_vendor.e({
         a: common_vendor.n(item.auditResult === 1 ? "pass" : "reject"),
         b: common_vendor.t(item.auditResult === 1 ? "通过" : "驳回"),
@@ -226,11 +224,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         h: idx
       });
     }),
-    o: $data.auditHistoryList.length === 0
+    n: $data.auditHistoryList.length === 0
   }, $data.auditHistoryList.length === 0 ? {} : {}, {
-    p: common_vendor.o(() => {
-    }, "db"),
-    q: common_vendor.o(($event) => $data.auditHistoryVisible = false, "0a")
+    o: common_vendor.o(() => {
+    }, "5a"),
+    p: common_vendor.o(($event) => $data.auditHistoryVisible = false, "e0")
   }) : {});
 }
 const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-8504eca3"]]);

unpackage/dist/dev/mp-weixin/pages/order/list/index.json

@@ -2,7 +2,6 @@
   "navigationStyle": "custom",
   "enablePullDownRefresh": false,
   "usingComponents": {
-    "erp-tab-bar": "../../../components/erp-tab-bar",
     "erp-nav-bar": "../../../components/erp-nav-bar"
   }
 }