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 @@