From 9b437ea9c86253c2a505a79fc31bd7046e6b6c93 Mon Sep 17 00:00:00 2001 From: binbin_pan Date: Fri, 3 Jan 2025 12:15:58 +0800 Subject: [PATCH] navbar --- pages.json | 66 --- pages/advanceOrder/index.vue | 122 +++- pages/arrivalConfirmation/index.vue | 241 -------- pages/components/Navbar.vue | 4 +- pages/inspectionEntry/index.vue | 414 ------------- pages/inspectionEntry/inspectionRecord.vue | 277 --------- pages/inventory/index.vue | 122 ---- pages/remainingSum/index.vue | 2 +- pages/returnInventory/details.vue | 223 ------- pages/returnInventory/index.vue | 552 ------------------ .../returnInventory/returnInventoryRecord.vue | 130 ----- .../sendACarSystem/components/AuditRecord.vue | 128 ---- .../components/PlanAuditDetails.vue | 345 ----------- .../sendACarSystem/components/PlanDetails.vue | 237 -------- pages/sendACarSystem/details.vue | 85 --- pages/sendACarSystem/index.vue | 417 ------------- pages/stockTaking/index.vue | 440 -------------- pages/stockTaking/takingRecord.vue | 273 --------- 18 files changed, 93 insertions(+), 3985 deletions(-) delete mode 100644 pages/arrivalConfirmation/index.vue delete mode 100644 pages/inspectionEntry/index.vue delete mode 100644 pages/inspectionEntry/inspectionRecord.vue delete mode 100644 pages/inventory/index.vue delete mode 100644 pages/returnInventory/details.vue delete mode 100644 pages/returnInventory/index.vue delete mode 100644 pages/returnInventory/returnInventoryRecord.vue delete mode 100644 pages/sendACarSystem/components/AuditRecord.vue delete mode 100644 pages/sendACarSystem/components/PlanAuditDetails.vue delete mode 100644 pages/sendACarSystem/components/PlanDetails.vue delete mode 100644 pages/sendACarSystem/details.vue delete mode 100644 pages/sendACarSystem/index.vue delete mode 100644 pages/stockTaking/index.vue delete mode 100644 pages/stockTaking/takingRecord.vue diff --git a/pages.json b/pages.json index fe1a482..90d0800 100644 --- a/pages.json +++ b/pages.json @@ -101,72 +101,6 @@ "navigationBarTitleText": "浏览文本" } }, - { - "path": "pages/inventory/index", - "style": { - "navigationBarTitleText": "库存查询" - } - }, - { - "path": "pages/returnInventory/index", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "pages/returnInventory/returnInventoryRecord", - "style": { - "navigationBarTitleText": "退料清点记录" - } - }, - { - "path": "pages/returnInventory/details", - "style": { - "navigationBarTitleText": "退料清点详情" - } - }, - { - "path": "pages/inspectionEntry/index", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "pages/inspectionEntry/inspectionRecord", - "style": { - "navigationBarTitleText": "检验记录" - } - }, - { - "path": "pages/stockTaking/index", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "pages/stockTaking/takingRecord", - "style": { - "navigationBarTitleText": "盘点记录" - } - }, - { - "path": "pages/arrivalConfirmation/index", - "style": { - "navigationBarTitleText": "到货确认单上传" - } - }, - { - "path": "pages/sendACarSystem/index", - "style": { - "navigationBarTitleText": "派车管理" - } - }, - { - "path": "pages/sendACarSystem/details", - "style": { - "navigationStyle": "custom" - } - }, { "path": "pages/amendPassword", "style": { diff --git a/pages/advanceOrder/index.vue b/pages/advanceOrder/index.vue index 616288a..0d7badb 100644 --- a/pages/advanceOrder/index.vue +++ b/pages/advanceOrder/index.vue @@ -10,28 +10,47 @@ 外卖 - -
-
- {{ handleRecipeType(book.recipeType) }} -
-
-
{{ item.intervalName }}
-
- {{ food.mealName }} -
-
+ + + + +
+
+ {{ handleRecipeType(book.recipeType) }} +
+
+
+ +
+ +
+
{{ item.intervalName }}
+
+
+ +
+
+
+
+
+
@@ -216,9 +260,11 @@ export default { page { /* padding-top: env(safe-area-inset-top); */ background: #f9fbff; + position: relative; } .top-cont { - padding: 0 16px 16px; + height: 55px; + padding: 0 16px; background: #fff; .top-right-cont { background: rgba(15, 39, 75, 0.05); @@ -238,9 +284,16 @@ page { } } } -.balance-area { - display: flex; +.footer-cont { + height: calc(100vh - 115px); + overflow: auto; +} +.left-wrap { + position: fixed; + top: 55px; + height: calc(100vh - 115px); + overflow: auto; .left-balance { width: 88px; height: 44px; @@ -250,16 +303,16 @@ page { font-weight: 500; font-size: 14px; color: #0f274b; - &.active { background: #fff; } } - +} +.right-wrap { + margin-left: 88px; + width: calc(100vw - 88px); + overflow: auto; .right-balance { - width: calc(100vw - 88px); - /* min-height: 90vh; */ - overflow: auto; padding: 0 8px; background-color: #fff; .top-name { @@ -270,6 +323,11 @@ page { display: flex; align-items: center; } + .cont-list { + display: flex; + padding: 8px; + /* border-bottom: 1px solid #f0f0f0; */ + } } } diff --git a/pages/arrivalConfirmation/index.vue b/pages/arrivalConfirmation/index.vue deleted file mode 100644 index accbc14..0000000 --- a/pages/arrivalConfirmation/index.vue +++ /dev/null @@ -1,241 +0,0 @@ - - - - - diff --git a/pages/components/Navbar.vue b/pages/components/Navbar.vue index b764a0c..8c1e916 100644 --- a/pages/components/Navbar.vue +++ b/pages/components/Navbar.vue @@ -3,7 +3,7 @@ - - -
- - - -
- - -
{{ item.name }}
-
- -
{{ item.model }}
-
-
- -
- 退 回 量: - {{ item.backNum }} -
-
- - - - - -
- - - -
-
检验鉴定
-
- - -
{{ pop.name }}
-
- -
{{ pop.model }}
-
-
-
- 退 回 量: - {{ pop.backNum }} -
-
- - - - - - - - - - - - - - - - - - - - - - - -
-
- - -
-
-
- - - - - -
- - - - - diff --git a/pages/inspectionEntry/inspectionRecord.vue b/pages/inspectionEntry/inspectionRecord.vue deleted file mode 100644 index 64c018f..0000000 --- a/pages/inspectionEntry/inspectionRecord.vue +++ /dev/null @@ -1,277 +0,0 @@ - - - - - diff --git a/pages/inventory/index.vue b/pages/inventory/index.vue deleted file mode 100644 index 59e0c8b..0000000 --- a/pages/inventory/index.vue +++ /dev/null @@ -1,122 +0,0 @@ - - - - - diff --git a/pages/remainingSum/index.vue b/pages/remainingSum/index.vue index f7d0052..5dca5dc 100644 --- a/pages/remainingSum/index.vue +++ b/pages/remainingSum/index.vue @@ -1,6 +1,6 @@