From df29941de595caebba2d7a7c6baae2cf13a7ae68 Mon Sep 17 00:00:00 2001 From: wangzhuo Date: Mon, 18 Aug 2025 21:43:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=A2=E6=88=B7=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6=20style:?= =?UTF-8?q?=20=E5=AF=B9page.json=E4=BB=A3=E7=A0=81=E7=BC=A9=E8=BF=9B?= =?UTF-8?q?=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 945 +++++++++--------- .../customer/components/customerUserEdit.vue | 683 +++++++++++++ .../CRM/customer/customerUserBelong.vue | 27 +- 3 files changed, 1196 insertions(+), 459 deletions(-) create mode 100644 src/pages/business/CRM/customer/components/customerUserEdit.vue diff --git a/src/pages.json b/src/pages.json index 19be647..edfcc8a 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1,453 +1,496 @@ { - - "easycom": { - "autoscan": true, - "custom": { - "^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue" - } - }, - "pages": [ - { - "path": "pages/loading/loading", - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/login/login", - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/home/home", - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/business", - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/visitorReport",//市场信息管理 - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/visitorReportAdd",//走访报告添加 - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/visitorReportDetail",//走访报告详情 - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/visitorReportEnter",//走访报告内容录入 - "style": { - "navigationBarTitleText": "" - } - }, - //市场信息管理(已更新) - { - "path": "pages/business/CRM/marketInformation/marketInformation", - "style": { - "navigationBarTitleText": "市场信息管理" - } - }, - //市场机会录入(已更新) - { - "path": "pages/business/CRM/marketInformation/marketOpportunities", - "style": { - "navigationBarTitleText": "市场机会录入" - } - }, - //市场机会修改(已更新) - { - "path": "pages/business/CRM/marketInformation/marketOpportunitiesDetail", - "style": { - "navigationBarTitleText": "市场机会修改" - } - }, - //重大事项录入(已更新) - { - "path": "pages/business/CRM/marketInformation/majorMatter", - "style": { - "navigationBarTitleText": "重大事项录入" - } - }, - //重大事项更改(已更新) - { - "path": "pages/business/CRM/marketInformation/majorMatterDetail", - "style": { - "navigationBarTitleText": "重大事项更改" - } - }, - //竞争对手信息录入(已更新) - { - "path": "pages/business/CRM/marketInformation/competitor", - "style": { - "navigationBarTitleText": "竞争对手信息录入" - } - }, - //竞争对手信息更改(已更新) - { - "path": "pages/business/CRM/marketInformation/competitorDetail", - "style": { - "navigationBarTitleText": "竞争对手信息更改" - } - }, - //人员变化信息录入(已更新) - { - "path": "pages/business/CRM/marketInformation/personnelChanges", - "style": { - "navigationBarTitleText": "人员变化信息录入" - } - }, - //人员变化信息更改(已更新) - { - "path": "pages/business/CRM/marketInformation/personnelChangesDetail", - "style": { - "navigationBarTitleText": "人员变化信息更改" - } - }, - //重点型号任务信息录入(已更新) - { - "path": "pages/business/CRM/marketInformation/keyModelTasks", - "style": { - "navigationBarTitleText": "重点型号任务信息录入" - } - }, - //重点型号任务信息更新(已更新) - { - "path": "pages/business/CRM/marketInformation/keyModelTasksDetail", - "style": { - "navigationBarTitleText": "重点型号任务信息更新" - } - }, - //通用信息录入(已更新) - { - "path": "pages/business/CRM/marketInformation/beCurrent", - "style": { - "navigationBarTitleText": "通用信息录入" - } - }, - //通用信息更新(已更新) - { - "path": "pages/business/CRM/marketInformation/beCurrentDetail", - "style": { - "navigationBarTitleText": "通用信息更新" - } - }, - //选择客户(已更新) - { - "path": "pages/business/CRM/chooseCus", - "style": { - "navigationBarTitleText": "客户选择" - } - }, - //选择客户人员(已更新) - { - "path": "pages/business/CRM/customerUserList", - "style": { - "navigationBarTitleText": "客户人员选择" - } - }, - //市场信息查看(已更新) - { - "path": "pages/business/CRM/marketInformation/infomationView", - "style": { - "navigationBarTitleText": "市场信息查看" - } - }, - //市场信息详情(已更新) - { - "path": "pages/business/CRM/marketInformation/informationDetail", - "style": { - "navigationBarTitleText": "市场信息详情" - } - }, - //市场信息审核(已更新) - { - "path": "pages/business/CRM/marketInformation/marketInformationReview", - "style": { - "navigationBarTitleText": "市场信息审核" - } - }, - //市场信息审核详情(已更新) - { - "path": "pages/business/CRM/marketInformation/marketInformationReviewDetail", - "style": { - "navigationBarTitleText": "市场信息审核" - } - }, - - - //回款首页查看(已更新) - { - "path": "pages/business/CRM/paymentCollection/index", - "style": { - "navigationBarTitleText": "回款首页查看" - } - }, - //回款新增(已更新) - { - "path": "pages/business/CRM/paymentCollection/addPaymentCollection", - "style": { - "navigationBarTitleText": "回款新增" - } - }, - //回款更新(已更新) - { - "path": "pages/business/CRM/paymentCollection/paymentDetail", - "style": { - "navigationBarTitleText": "回款新增" - } - }, - //回款查看公用页面(已更新) - { - "path": "pages/business/CRM/paymentCollection/paymentCollectionCheck", - "style": { - "navigationBarTitleText": "回款查看" - } - }, - //回款查看全员统计查看(已更新) - { - "path": "pages/business/CRM/paymentCollection/fullStaffStatisticsViewingTable", - "style": { - "navigationBarTitleText": "全员统计查看" - } - }, - //回款查看个人详情查看(已更新) - { - "path": "pages/business/CRM/paymentCollection/personalPaymentCollectionTable", - "style": { - "navigationBarTitleText": "个人详情查看" - } - }, - { - "path": "pages/business/CRM/weekPlanUpdate",//修改周计划 - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/plan/index", - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/plan/myPlan",//我的计划列表 - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/plan/planEdit",//计划修改 - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/plan/planView",//周计划查看 - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/customer/customerAdd",//客户人员新增 - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/customer/selectCustomer",//选择客户 - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/vistorCheckin",//签到打卡 - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/checkinStatistics",//打卡统计 - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/paymentCollection",//回款查看 - "style": { - "navigationBarTitleText": "" - } - }, - - //===================================活动报告==================== - { - "path": "pages/business/CRM/marketActivity/visitReport",//市场信息管理 - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/marketActivity/visitorReportAdd",//走访报告添加 - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/marketActivity/visitReportView",//走访报告查看 - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/marketActivity/visitReportDetail",//走访报告查看具体明细 - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/marketActivity/auditReport",//走访报告审批列表查看 - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/marketActivity/detailForApproval",//走访报告明细审批 - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/marketActivity/visitorReportEnter",//走访报告内容录入 - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/marketActivity/auditReject",//走访报告驳回输入原因 - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/marketActivity/customerUserList",//客户公司人员信息 - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/marketActivity/myUserList",//我公司人员信息 - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/marketActivity/activityTypeList",//活动类型 - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/marketActivity/chooseCus",//选择客户单位 - "style": { - "navigationBarTitleText": "" - } - }, - //====================地图====== - { - "path": "pages/business/CRM/map/vistorCheckin",//签到打卡 - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/map/addRearkSignIn",//签到备注 - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/map/checkInView",//打卡信息(考勤查看) - "style": { - "navigationBarTitleText": "" - } - }, - { - "path": "pages/business/CRM/map/checkinStatistics",//打卡统计 - "style": { - "navigationBarTitleText": "" - } - }, - //===================================活动报告==================== - { - "path": "pages/notice/notice", - "style": { - "navigationBarTitleText": "", - "app-plus" : { - "bounce" : "none" // 取消APP端iOS回弹,避免与下拉刷新冲突 (可统一配在 'globalStyle') - }, - "mp-alipay":{"allowsBounceVertical":"NO"} // 取消支付宝和钉钉小程序的iOS回弹,避免与下拉刷新冲突 (可统一配在 'globalStyle') - } - }, - { - "path": "pages/userinfo/userinfo", - "style": { - "navigationBarTitleText": "" - } - } - ], - "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "718友晟", - "navigationBarBackgroundColor": "#F8F8F8", - "backgroundColor": "#F8F8F8", - "navigationStyle": "custom" - }, - "tabBar": { - "color": "#919191", - "selectedColor": "#ffffff", - "borderStyle": "#ffffff", - "backgroundColor": "#000000", - "fontSize": "12px", - "iconWidth": "24px", - "list": [ - { - "pagePath": "pages/home/home", - "iconPath": "static/images/tabs/menu-home.png", - "selectedIconPath": "static/images/tabs/menu-home-on.png", - "text": "首页" - }, - { - "pagePath": "pages/business/business", - "iconPath": "static/images/tabs/menu-business.png", - "selectedIconPath": "static/images/tabs/menu-business-on.png", - "text": "业务中心" - }, - { - "pagePath": "pages/notice/notice", - "iconPath": "static/images/tabs/menu-info.png", - "selectedIconPath": "static/images/tabs/menu-info-on.png", - "text": "消息" - }, - { - "pagePath": "pages/userinfo/userinfo", - "iconPath": "static/images/tabs/menu-me.png", - "selectedIconPath": "static/images/tabs/menu-me-on.png", - "text": "我的" - } - ] - } + "easycom": { + "autoscan": true, + "custom": { + "^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue" + } + }, + "pages": [ + { + "path": "pages/loading/loading", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/login/login", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/home/home", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/business", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/visitorReport", + //市场信息管理 + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/visitorReportAdd", + //走访报告添加 + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/visitorReportDetail", + //走访报告详情 + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/visitorReportEnter", + //走访报告内容录入 + "style": { + "navigationBarTitleText": "" + } + }, + //市场信息管理(已更新) + { + "path": "pages/business/CRM/marketInformation/marketInformation", + "style": { + "navigationBarTitleText": "市场信息管理" + } + }, + //市场机会录入(已更新) + { + "path": "pages/business/CRM/marketInformation/marketOpportunities", + "style": { + "navigationBarTitleText": "市场机会录入" + } + }, + //市场机会修改(已更新) + { + "path": "pages/business/CRM/marketInformation/marketOpportunitiesDetail", + "style": { + "navigationBarTitleText": "市场机会修改" + } + }, + //重大事项录入(已更新) + { + "path": "pages/business/CRM/marketInformation/majorMatter", + "style": { + "navigationBarTitleText": "重大事项录入" + } + }, + //重大事项更改(已更新) + { + "path": "pages/business/CRM/marketInformation/majorMatterDetail", + "style": { + "navigationBarTitleText": "重大事项更改" + } + }, + //竞争对手信息录入(已更新) + { + "path": "pages/business/CRM/marketInformation/competitor", + "style": { + "navigationBarTitleText": "竞争对手信息录入" + } + }, + //竞争对手信息更改(已更新) + { + "path": "pages/business/CRM/marketInformation/competitorDetail", + "style": { + "navigationBarTitleText": "竞争对手信息更改" + } + }, + //人员变化信息录入(已更新) + { + "path": "pages/business/CRM/marketInformation/personnelChanges", + "style": { + "navigationBarTitleText": "人员变化信息录入" + } + }, + //人员变化信息更改(已更新) + { + "path": "pages/business/CRM/marketInformation/personnelChangesDetail", + "style": { + "navigationBarTitleText": "人员变化信息更改" + } + }, + //重点型号任务信息录入(已更新) + { + "path": "pages/business/CRM/marketInformation/keyModelTasks", + "style": { + "navigationBarTitleText": "重点型号任务信息录入" + } + }, + //重点型号任务信息更新(已更新) + { + "path": "pages/business/CRM/marketInformation/keyModelTasksDetail", + "style": { + "navigationBarTitleText": "重点型号任务信息更新" + } + }, + //通用信息录入(已更新) + { + "path": "pages/business/CRM/marketInformation/beCurrent", + "style": { + "navigationBarTitleText": "通用信息录入" + } + }, + //通用信息更新(已更新) + { + "path": "pages/business/CRM/marketInformation/beCurrentDetail", + "style": { + "navigationBarTitleText": "通用信息更新" + } + }, + //选择客户(已更新) + { + "path": "pages/business/CRM/chooseCus", + "style": { + "navigationBarTitleText": "客户选择" + } + }, + //选择客户人员(已更新) + { + "path": "pages/business/CRM/customerUserList", + "style": { + "navigationBarTitleText": "客户人员选择" + } + }, + //市场信息查看(已更新) + { + "path": "pages/business/CRM/marketInformation/infomationView", + "style": { + "navigationBarTitleText": "市场信息查看" + } + }, + //市场信息详情(已更新) + { + "path": "pages/business/CRM/marketInformation/informationDetail", + "style": { + "navigationBarTitleText": "市场信息详情" + } + }, + //市场信息审核(已更新) + { + "path": "pages/business/CRM/marketInformation/marketInformationReview", + "style": { + "navigationBarTitleText": "市场信息审核" + } + }, + //市场信息审核详情(已更新) + { + "path": "pages/business/CRM/marketInformation/marketInformationReviewDetail", + "style": { + "navigationBarTitleText": "市场信息审核" + } + }, + //回款首页查看(已更新) + { + "path": "pages/business/CRM/paymentCollection/index", + "style": { + "navigationBarTitleText": "回款首页查看" + } + }, + //回款新增(已更新) + { + "path": "pages/business/CRM/paymentCollection/addPaymentCollection", + "style": { + "navigationBarTitleText": "回款新增" + } + }, + //回款更新(已更新) + { + "path": "pages/business/CRM/paymentCollection/paymentDetail", + "style": { + "navigationBarTitleText": "回款新增" + } + }, + //回款查看公用页面(已更新) + { + "path": "pages/business/CRM/paymentCollection/paymentCollectionCheck", + "style": { + "navigationBarTitleText": "回款查看" + } + }, + //回款查看全员统计查看(已更新) + { + "path": "pages/business/CRM/paymentCollection/fullStaffStatisticsViewingTable", + "style": { + "navigationBarTitleText": "全员统计查看" + } + }, + //回款查看个人详情查看(已更新) + { + "path": "pages/business/CRM/paymentCollection/personalPaymentCollectionTable", + "style": { + "navigationBarTitleText": "个人详情查看" + } + }, + { + "path": "pages/business/CRM/weekPlanUpdate", + //修改周计划 + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/plan/index", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/plan/myPlan", + //我的计划列表 + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/plan/planEdit", + //计划修改 + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/plan/planView", + //周计划查看 + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/customer/customerAdd", + //客户人员新增 + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/customer/customerUserBelong", + //客户人员归属 + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/customer/components/customerUserEdit", + //客户人员详情编辑 + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/customer/selectCustomer", + //选择客户 + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/vistorCheckin", + //签到打卡 + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/checkinStatistics", + //打卡统计 + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/paymentCollection", + //回款查看 + "style": { + "navigationBarTitleText": "" + } + }, + //===================================活动报告==================== + { + "path": "pages/business/CRM/marketActivity/visitReport", + //市场信息管理 + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/marketActivity/visitorReportAdd", + //走访报告添加 + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/marketActivity/visitReportView", + //走访报告查看 + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/marketActivity/visitReportDetail", + //走访报告查看具体明细 + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/marketActivity/auditReport", + //走访报告审批列表查看 + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/marketActivity/detailForApproval", + //走访报告明细审批 + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/marketActivity/visitorReportEnter", + //走访报告内容录入 + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/marketActivity/auditReject", + //走访报告驳回输入原因 + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/marketActivity/customerUserList", + //客户公司人员信息 + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/marketActivity/myUserList", + //我公司人员信息 + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/marketActivity/activityTypeList", + //活动类型 + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/marketActivity/chooseCus", + //选择客户单位 + "style": { + "navigationBarTitleText": "" + } + }, + //====================地图====== + { + "path": "pages/business/CRM/map/vistorCheckin", + //签到打卡 + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/map/addRearkSignIn", + //签到备注 + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/map/checkInView", + //打卡信息(考勤查看) + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/business/CRM/map/checkinStatistics", + //打卡统计 + "style": { + "navigationBarTitleText": "" + } + }, + //===================================活动报告==================== + { + "path": "pages/notice/notice", + "style": { + "navigationBarTitleText": "", + "app-plus": { + "bounce": "none" + // 取消APP端iOS回弹,避免与下拉刷新冲突 (可统一配在 'globalStyle') + }, + "mp-alipay": { + "allowsBounceVertical": "NO" + } + // 取消支付宝和钉钉小程序的iOS回弹,避免与下拉刷新冲突 (可统一配在 'globalStyle') + } + }, + { + "path": "pages/userinfo/userinfo", + "style": { + "navigationBarTitleText": "" + } + } + ], + "globalStyle": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "718友晟", + "navigationBarBackgroundColor": "#F8F8F8", + "backgroundColor": "#F8F8F8", + "navigationStyle": "custom" + }, + "tabBar": { + "color": "#919191", + "selectedColor": "#ffffff", + "borderStyle": "#ffffff", + "backgroundColor": "#000000", + "fontSize": "12px", + "iconWidth": "24px", + "list": [ + { + "pagePath": "pages/home/home", + "iconPath": "static/images/tabs/menu-home.png", + "selectedIconPath": "static/images/tabs/menu-home-on.png", + "text": "首页" + }, + { + "pagePath": "pages/business/business", + "iconPath": "static/images/tabs/menu-business.png", + "selectedIconPath": "static/images/tabs/menu-business-on.png", + "text": "业务中心" + }, + { + "pagePath": "pages/notice/notice", + "iconPath": "static/images/tabs/menu-info.png", + "selectedIconPath": "static/images/tabs/menu-info-on.png", + "text": "消息" + }, + { + "pagePath": "pages/userinfo/userinfo", + "iconPath": "static/images/tabs/menu-me.png", + "selectedIconPath": "static/images/tabs/menu-me-on.png", + "text": "我的" + } + ] + } } diff --git a/src/pages/business/CRM/customer/components/customerUserEdit.vue b/src/pages/business/CRM/customer/components/customerUserEdit.vue new file mode 100644 index 0000000..b57b6e6 --- /dev/null +++ b/src/pages/business/CRM/customer/components/customerUserEdit.vue @@ -0,0 +1,683 @@ + + + + + \ No newline at end of file diff --git a/src/pages/business/CRM/customer/customerUserBelong.vue b/src/pages/business/CRM/customer/customerUserBelong.vue index 71450fb..25ff5df 100644 --- a/src/pages/business/CRM/customer/customerUserBelong.vue +++ b/src/pages/business/CRM/customer/customerUserBelong.vue @@ -145,10 +145,12 @@ const mescrollInit = (mescroll) => { const downCallback = async (mescroll) => { try { setTimeout(async () => { - const res = await getList(1, upOption.value.page.size); + // 重置页码为第一页 + const res = await getList(1, mescroll.size || upOption.page.size); cssFlag.value = false; list.value = res.list; - mescroll.endSuccess(res.list.length, res.total >= upOption.value.page.size); + // 正确传递 total 参数 + mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size)); }, 500); } catch (error) { console.log(error) @@ -159,13 +161,15 @@ const downCallback = async (mescroll) => { const upCallback = async (mescroll) => { try { setTimeout(async () => { + // 使用 mescroll 提供的页码和大小参数 const res = await getList(mescroll.num, mescroll.size); if (mescroll.num === 1) { list.value = res.list; } else { list.value.push(...res.list); } - mescroll.endSuccess(res.list.length, res.total >= mescroll.size); + // 正确判断是否还有更多数据 + mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size); }, 500); } catch (error) { console.log(error) @@ -188,7 +192,6 @@ const getList = (pageIndex, pageSize) => { total: res.total }); }); - } // 跳转到详情 @@ -298,20 +301,28 @@ let handleDelete = async (item)=>{ .white-bg { padding-bottom: 10rpx; + .w-b-title{ + align-items: flex-start; + } } .btn-edit{ + white-space: nowrap; &.wancheng-deal { - background: #00aa7f; + border:solid 1rpx #00aa7f; + background-color: #00aa7f; } &.daishenhe-un-deal { - background: #ffaa7f; + border:solid 1rpx #ffaa7f; + background-color: #ffaa7f; } &.chaoqi-deal { - background: #ff0000; + border:1rpx solid #ff0000; + background-color: #ff0000; } &.tijiao-deal { - background: #00aaff; + border:1rpx solid #00aaff; + background-color: #00aaff; } } \ No newline at end of file