From bff563b444426726037e018aabdb7a079b7d924d Mon Sep 17 00:00:00 2001 From: HongxuanG <1359774872@qq.com> Date: Thu, 24 Sep 2026 21:54:17 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=BE=E5=A4=A7=E5=B0=8F=E5=B1=8F?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=B9=B6=E8=AE=A9=E5=BE=85=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=8D=95=E7=9B=B4=E8=BE=BE=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/storefabric/OrderStatusBar.vue | 4 +- src/pages.json | 18 ------- .../storeFabricBusinessOutList.vue | 6 ++- .../storeFabricBusinessOutPage.scss | 35 +++++++++---- src/pages/sys/login/index.vue | 41 +++++++++++++-- src/pages/sys/workbench/index.vue | 52 +++++++++++++++++-- src/store/index.js | 4 -- 7 files changed, 116 insertions(+), 44 deletions(-) diff --git a/src/components/storefabric/OrderStatusBar.vue b/src/components/storefabric/OrderStatusBar.vue index 7ca07cc..44bf11e 100644 --- a/src/components/storefabric/OrderStatusBar.vue +++ b/src/components/storefabric/OrderStatusBar.vue @@ -32,11 +32,11 @@ export default { border-bottom: 1rpx solid #f5f5f5; } .statusLabel { - font-size: 28rpx; + font-size: 40rpx; color: #333; } .statusTag { - font-size: 24rpx; + font-size: 34rpx; padding: 4rpx 12rpx; border-radius: 6rpx; font-weight: normal; diff --git a/src/pages.json b/src/pages.json index 5d2fd41..402f4e0 100644 --- a/src/pages.json +++ b/src/pages.json @@ -800,30 +800,12 @@ "backgroundColor": "#ffffff", "borderStyle": "white", "list": [ - { - "pagePath": "pages/sys/msg/index", - "iconPath": "static/aidex/tabbar/msg_1.png", - "selectedIconPath": "static/aidex/tabbar/msg_2.png", - "text": "消息" - }, - // { - // "pagePath": "pages/sys/home/index", - // "iconPath": "static/aidex/tabbar/home_1.png", - // "selectedIconPath": "static/aidex/tabbar/home_2.png", - // "text": "首页" - // }, { "pagePath": "pages/sys/workbench/index", "iconPath": "static/aidex/tabbar/apply_1.png", "selectedIconPath": "static/aidex/tabbar/apply_2.png", "text": "工作台" }, - { - "pagePath": "pages/sys/book/index", - "iconPath": "static/aidex/tabbar/book_1.png", - "selectedIconPath": "static/aidex/tabbar/book_2.png", - "text": "通讯录" - }, { "pagePath": "pages/sys/user/index", "iconPath": "static/aidex/tabbar/my_1.png", diff --git a/src/pages/storefabric/storeFabricBusinessOutList.vue b/src/pages/storefabric/storeFabricBusinessOutList.vue index ec16b04..3399447 100644 --- a/src/pages/storefabric/storeFabricBusinessOutList.vue +++ b/src/pages/storefabric/storeFabricBusinessOutList.vue @@ -76,6 +76,7 @@ import FabricOutItem from '@/components/card/storeFabricBusinessOutItem.vue'; import SearchSelectPopup from '@/components/storefabric/SearchSelectPopup.vue'; import { getStatusOptions, + AUDIT_STATUS, AUDIT_STATUS_MAP, BILL_TYPES, BUSINESS_UNIT_TYPE_DYEING_FACTORY, @@ -273,7 +274,10 @@ export default { this.loadList(); }, goView(item) { - uni.navigateTo({ url: `./storeFabricBusinessOutView?id=${item.id}` }); + const page = Number(item.audit_status) === AUDIT_STATUS.PENDING + ? 'storeFabricBusinessOutEdit' + : 'storeFabricBusinessOutView'; + uni.navigateTo({ url: `./${page}?id=${item.id}` }); }, openStatusSelect() { this.statusSelectShow = true; }, onStatusConfirm(e) { this.filters.audit_status = e[0].value; }, diff --git a/src/pages/storefabric/storeFabricBusinessOutPage.scss b/src/pages/storefabric/storeFabricBusinessOutPage.scss index 9c35fe7..2071f27 100644 --- a/src/pages/storefabric/storeFabricBusinessOutPage.scss +++ b/src/pages/storefabric/storeFabricBusinessOutPage.scss @@ -6,8 +6,25 @@ .fabric-out-mt32 { margin-top: 32rpx; } +.fabric-out-page .flex-white-plr26, +.fabric-out-page .flex-white-plr26-column, +.fabric-out-page .flex-white-plr26 text, +.fabric-out-page .flex-white-plr26 view, +.fabric-out-page .u-input__input, +.fabric-out-page .uni-input-input, +.fabric-out-page .uni-textarea-textarea { + font-size: 40rpx; +} +.fabric-out-page .redXingh { + font-size: 40rpx; +} +.fabric-out-page .u-btn { + font-size: 36rpx !important; + height: 88rpx; + line-height: 88rpx; +} .fabric-out-sectionTitle { - font-size: 30rpx; + font-size: 42rpx; font-weight: bold; padding: 24rpx 26rpx 12rpx; border-left: 6rpx solid #007AFF; @@ -16,7 +33,7 @@ .fabric-out-scanTip { padding: 20rpx 26rpx; color: #fa8c16; - font-size: 26rpx; + font-size: 36rpx; background: #fff7e6; margin: 16rpx 26rpx; border-radius: 8rpx; @@ -24,7 +41,7 @@ .fabric-out-msgTip { padding: 12rpx 26rpx; color: #52c41a; - font-size: 26rpx; + font-size: 36rpx; } .fabric-out-detailList { padding: 0 26rpx; @@ -39,7 +56,7 @@ display: flex; justify-content: space-between; align-items: center; - font-size: 28rpx; + font-size: 38rpx; font-weight: bold; padding-bottom: 12rpx; border-bottom: 1rpx solid #f0f0f0; @@ -49,7 +66,7 @@ align-items: center; gap: 20rpx; padding-top: 12rpx; - font-size: 26rpx; + font-size: 36rpx; color: #666; } .fabric-out-scanRow { @@ -66,7 +83,7 @@ .fabric-out-delCheck { display: flex; align-items: center; - font-size: 26rpx; + font-size: 36rpx; color: #666; white-space: nowrap; } @@ -82,7 +99,7 @@ flex-wrap: wrap; padding: 16rpx 20rpx; border-bottom: 1rpx solid #f0f0f0; - font-size: 26rpx; + font-size: 36rpx; color: #333; } .fabric-out-scanDetailRow--2col { @@ -124,7 +141,7 @@ } .fabric-out-scanDetailTableCell { padding: 14rpx 8rpx; - font-size: 24rpx; + font-size: 32rpx; color: #333; text-align: center; box-sizing: border-box; @@ -133,7 +150,7 @@ .fabric-out-scanDetailEmpty { padding: 24rpx; text-align: center; - font-size: 26rpx; + font-size: 36rpx; color: #999; } .fabric-out-submitView { diff --git a/src/pages/sys/login/index.vue b/src/pages/sys/login/index.vue index 9bf39a9..43a5599 100644 --- a/src/pages/sys/login/index.vue +++ b/src/pages/sys/login/index.vue @@ -8,12 +8,12 @@ - - + + {{ getApiUrlLabel() }} - + @@ -103,7 +103,7 @@ - @@ -450,14 +450,25 @@ export default { + diff --git a/src/pages/sys/workbench/index.vue b/src/pages/sys/workbench/index.vue index eba6a2e..b1c171b 100644 --- a/src/pages/sys/workbench/index.vue +++ b/src/pages/sys/workbench/index.vue @@ -79,7 +79,7 @@ 坯布管理 - + @@ -87,16 +87,16 @@ - + + 坯布出库 - 坯布出库 - + + 坯布库存 - 坯布库存 @@ -295,4 +295,46 @@ export default { .home-icon i.icon-tongzhi { font-size: 22px; } + +.wrap .toolbar .workbench-tile { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + box-sizing: border-box; + width: 88%; + height: 300rpx; + margin: 8rpx auto 28rpx; + padding: 40rpx 28rpx 36rpx; + border-radius: 8rpx; + background-image: none; +} + +.wrap .toolbar .tile-out { + background: #14343f; +} + +.wrap .toolbar .tile-stock { + background: #7a2e24; +} + +.wrap .toolbar .workbench-tile i { + position: static; + margin: 0 0 28rpx; + font-size: 88rpx; + line-height: 1; + color: #f4efe6; + opacity: 1; +} + +.wrap .toolbar .tile-label { + font-size: 36rpx; + font-weight: 700; + line-height: 1.2; + color: #f4efe6; +} + +.wrap .toolbar .tile-pressed { + opacity: 0.82; +} diff --git a/src/store/index.js b/src/store/index.js index 0243670..c5b7493 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -209,10 +209,6 @@ const store = new Vuex.Store({ name: 'vuex_messageList', value: newList }); - uni.setTabBarBadge({ - index: 0, - text: `${newList.length}` - }); } // 使用 $uStore 方式更新状态 commit('$uStore', {