From b675e78a3ff3c62ef8f83e84a436e2c4cc8b61b7 Mon Sep 17 00:00:00 2001 From: admin <> Date: Wed, 13 Mar 2024 10:41:39 +0800 Subject: [PATCH] =?UTF-8?q?update:=20=20=E5=A2=9E=E5=8A=A0=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 31 +++++---- src/pages/login/index.vue | 2 +- src/pagesApp/receiveCl.vue | 6 +- src/pagesApp/receiveDetail.vue | 84 +++++++++++++++++------ src/pagesApp/receiveSpl.vue | 60 +++++++++------- src/pagesApp/shipmentSpl.vue | 56 ++++++++------- src/{pages/index => pagesHome}/index.vue | 38 +++++----- src/pagesHome/static/01.png | Bin 0 -> 4535 bytes src/pagesHome/static/02.png | Bin 0 -> 4316 bytes src/pagesHome/static/03.png | Bin 0 -> 4419 bytes src/pagesHome/static/04.png | Bin 0 -> 4766 bytes src/pagesHome/static/05.png | Bin 0 -> 6195 bytes src/pagesHome/static/06.png | Bin 0 -> 5863 bytes src/pagesHome/static/07.png | Bin 0 -> 6623 bytes src/pagesHome/static/08.png | Bin 0 -> 6958 bytes src/pagesHome/static/09.png | Bin 0 -> 6357 bytes src/pagesHome/static/10.png | Bin 0 -> 5183 bytes src/pagesHome/static/11.png | Bin 0 -> 6698 bytes src/pagesHome/static/12.png | Bin 0 -> 4965 bytes src/pagesHome/static/13.png | Bin 0 -> 6219 bytes src/pagesHome/static/14.png | Bin 0 -> 4925 bytes src/pagesHome/static/15.png | Bin 0 -> 4469 bytes src/pagesHome/static/16.png | Bin 0 -> 3337 bytes src/pagesReceive/form/pricingForm.vue | 2 +- src/pagesReceive/payReview.vue | 2 +- src/static/img/app1.png | Bin 3323 -> 0 bytes src/static/img/app2.png | Bin 3200 -> 0 bytes src/static/img/app3.png | Bin 3276 -> 0 bytes src/static/img/app4.png | Bin 3622 -> 0 bytes src/static/img/app5.png | Bin 4533 -> 0 bytes src/static/img/app6.png | Bin 3931 -> 0 bytes src/static/img/app7.png | Bin 5724 -> 0 bytes src/static/img/app8.png | Bin 6257 -> 0 bytes src/utils/enum.ts | 2 +- 34 files changed, 173 insertions(+), 110 deletions(-) rename src/{pages/index => pagesHome}/index.vue (93%) create mode 100644 src/pagesHome/static/01.png create mode 100644 src/pagesHome/static/02.png create mode 100644 src/pagesHome/static/03.png create mode 100644 src/pagesHome/static/04.png create mode 100644 src/pagesHome/static/05.png create mode 100644 src/pagesHome/static/06.png create mode 100644 src/pagesHome/static/07.png create mode 100644 src/pagesHome/static/08.png create mode 100644 src/pagesHome/static/09.png create mode 100644 src/pagesHome/static/10.png create mode 100644 src/pagesHome/static/11.png create mode 100644 src/pagesHome/static/12.png create mode 100644 src/pagesHome/static/13.png create mode 100644 src/pagesHome/static/14.png create mode 100644 src/pagesHome/static/15.png create mode 100644 src/pagesHome/static/16.png delete mode 100644 src/static/img/app1.png delete mode 100644 src/static/img/app2.png delete mode 100644 src/static/img/app3.png delete mode 100644 src/static/img/app4.png delete mode 100644 src/static/img/app5.png delete mode 100644 src/static/img/app6.png delete mode 100644 src/static/img/app7.png delete mode 100644 src/static/img/app8.png diff --git a/src/pages.json b/src/pages.json index d247f4b..12ec403 100644 --- a/src/pages.json +++ b/src/pages.json @@ -12,13 +12,6 @@ } }, "pages": [ - { - "path": "pages/index/index", - "style": { - "navigationStyle": "custom", // 控制头部是否显示 - "navigationBarTitleText": "工作台" - } - }, // { // "path": "pages/index/index", // "style": { @@ -26,6 +19,12 @@ // "navigationBarTitleText": "工作台" // } // }, + { + "path": "pages/login/index", + "style": { + "navigationBarTitleText": "登陆" + } + }, { "path": "pages/index/shipmentSettlement", "style": { @@ -38,12 +37,6 @@ "navigationBarTitleText": "待结算" } }, - { - "path": "pages/login/index", - "style": { - "navigationBarTitleText": "登陆" - } - }, { "path": "pages/login/forgetPwd", "style": { @@ -90,6 +83,18 @@ } ] }, + { + "root": "pagesHome", + "pages": [ + { + "path": "index", + "style": { + "navigationStyle": "custom", // 控制头部是否显示 + "navigationBarTitleText": "工作台" + } + } + ] + }, { "root": "pagesReceive", "pages": [ diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 5cec5cc..204acac 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -157,7 +157,7 @@ const submit = () => { if (res.code === 200) { store.setProfile(res.data); uni.navigateTo({ - url: "/pages/index/index", // 要跳转到的页面路径 + url: "/pagesHome/index", // 要跳转到的页面路径 }); } }); diff --git a/src/pagesApp/receiveCl.vue b/src/pagesApp/receiveCl.vue index 7320737..b959fc9 100644 --- a/src/pagesApp/receiveCl.vue +++ b/src/pagesApp/receiveCl.vue @@ -18,7 +18,7 @@ 上海奉贤两网融合(大磅) - 现场照片 + 现场照片 @@ -103,9 +103,9 @@ const gridList1 = reactive([ isCustomStyle: true }, ]); -const handleScenePhoto = () => { +const handleScenePhoto = (imagesId: number) => { uni.navigateTo({ - url: "/pagesScenePhoto/index", // 要跳转到的页面路径 + url: "/pagesScenePhoto/index?orderType=1&id=" + imagesId, // 要跳转到的页面路径 }); }; diff --git a/src/pagesApp/receiveDetail.vue b/src/pagesApp/receiveDetail.vue index 88ff08d..5ca7613 100644 --- a/src/pagesApp/receiveDetail.vue +++ b/src/pagesApp/receiveDetail.vue @@ -20,26 +20,26 @@ 2024-01-01 - + - 收货单号:SHD20230901132333 - 上海奉贤两网融合(大磅) + 收货单号:{{ item.receiptNumber }} + {{ item.deviceName || '-' }} - 现场照片 + 现场照片 - - 吴小勇 未审核 - 轻二 + + {{ item.userName }} {{ getScaleStatus((item as any).scaleStatus) }} + {{ item.productName }} - 定价人:谭兵 - 创建时间:2023-09-01 13:23:33 + 定价人:{{ item.userName }} + 创建时间:{{ item.createTime }} - + {{ item.name }}:{{ item.isBefore ? item.unit : "" }} @@ -52,6 +52,9 @@