From b1633ce7fe777d6e6ef47c653f18a54432238e29 Mon Sep 17 00:00:00 2001
From: zhongwenkai <3478244299@qq.com>
Date: Fri, 12 Jun 2026 09:41:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E4=B8=8A=E4=B8=8B=E6=A8=A1?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=8C=89=E9=92=AE=E4=BA=A4=E4=BA=92=E5=92=8C?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/moldoperate/deviceSelect.vue        | 10 ++++----
 .../pages/moldoperate/dismount.vue            | 25 +++++++++++++++----
 .../pages/moldoperate/index.vue               |  4 +++
 .../pages/moldoperate/moldSelect.vue          | 10 ++++----
 4 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/pages_function/pages/moldoperate/deviceSelect.vue b/src/pages_function/pages/moldoperate/deviceSelect.vue
index a8d5afa..4bbf07c 100644
--- a/src/pages_function/pages/moldoperate/deviceSelect.vue
+++ b/src/pages_function/pages/moldoperate/deviceSelect.vue
@@ -403,7 +403,7 @@ onShow(async () => {
   left: 0;
   right: 0;
   bottom: 0;
-  padding: 16rpx 24rpx calc(16rpx + env(safe-area-inset-bottom));
+  padding: 18rpx 24rpx calc(18rpx + env(safe-area-inset-bottom));
   background: #fff;
   box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.06);
   z-index: 99;
@@ -411,16 +411,16 @@ onShow(async () => {
 
 .bottom-btn {
   width: 100%;
-  height: 88rpx;
-  line-height: 88rpx;
+  height: 84rpx;
+  line-height: 84rpx;
   text-align: center;
-  border-radius: 12rpx;
+  border-radius: 16rpx;
   font-size: 30rpx;
   font-weight: 600;
 }
 
 .confirm-btn {
-  background: #2563eb;
+  background: #1f4b79;
   color: #fff;
 }
 </style>
diff --git a/src/pages_function/pages/moldoperate/dismount.vue b/src/pages_function/pages/moldoperate/dismount.vue
index 7a320c0..787ee17 100644
--- a/src/pages_function/pages/moldoperate/dismount.vue
+++ b/src/pages_function/pages/moldoperate/dismount.vue
@@ -169,6 +169,7 @@
 
     <!-- 底部操作栏 -->
     <view class="bottom-actions">
+      <view class="bottom-btn cancel-btn" @click="handleCancel">{{ t('functionCommon.cancel') }}</view>
       <view class="bottom-btn confirm-btn" @click="handleConfirm">{{ t('moldOperate.confirmDismount') }}</view>
     </view>
 
@@ -600,6 +601,13 @@ async function handleConfirm() {
   }
 }
 
+function handleCancel() {
+  // 返回上一页（管理页面）
+  uni.navigateBack({
+    fail: () => uni.switchTab({ url: '/pages/work' })
+  })
+}
+
 onShow(async () => {
   await Promise.allSettled([loadDevices(), loadLineTree(), loadOperators()])
   // 从 globalData 读取设备选择页回传的设备
@@ -983,18 +991,20 @@ onShow(async () => {
   left: 0;
   right: 0;
   bottom: 0;
-  padding: 16rpx 24rpx calc(16rpx + env(safe-area-inset-bottom));
+  display: flex;
+  gap: 18rpx;
+  padding: 18rpx 24rpx calc(18rpx + env(safe-area-inset-bottom));
   background: #fff;
   box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.06);
   z-index: 99;
 }
 
 .bottom-btn {
-  width: 100%;
-  height: 88rpx;
-  line-height: 88rpx;
+  flex: 1;
+  height: 84rpx;
+  line-height: 84rpx;
   text-align: center;
-  border-radius: 12rpx;
+  border-radius: 16rpx;
   font-size: 30rpx;
   font-weight: 600;
 }
@@ -1004,6 +1014,11 @@ onShow(async () => {
   color: #fff;
 }
 
+.cancel-btn {
+  background: #eef2f7;
+  color: #475569;
+}
+
 /* ====== 弹窗通用 ====== */
 .picker-popup {
   background: #fff;
diff --git a/src/pages_function/pages/moldoperate/index.vue b/src/pages_function/pages/moldoperate/index.vue
index 2b0346f..2bd221a 100644
--- a/src/pages_function/pages/moldoperate/index.vue
+++ b/src/pages_function/pages/moldoperate/index.vue
@@ -452,6 +452,10 @@ function handleCancel() {
   remarkText.value = ''
   selectedOperator.value = null
   operatorIndex.value = -1
+  // 返回上一页（管理页面）
+  uni.navigateBack({
+    fail: () => uni.switchTab({ url: '/pages/work' })
+  })
 }
 
 function goBack() {
diff --git a/src/pages_function/pages/moldoperate/moldSelect.vue b/src/pages_function/pages/moldoperate/moldSelect.vue
index f7692e1..cfe4b3d 100644
--- a/src/pages_function/pages/moldoperate/moldSelect.vue
+++ b/src/pages_function/pages/moldoperate/moldSelect.vue
@@ -328,7 +328,7 @@ onShow(async () => {
   left: 0;
   right: 0;
   bottom: 0;
-  padding: 16rpx 24rpx calc(16rpx + env(safe-area-inset-bottom));
+  padding: 18rpx 24rpx calc(18rpx + env(safe-area-inset-bottom));
   background: #fff;
   box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.06);
   z-index: 99;
@@ -336,16 +336,16 @@ onShow(async () => {
 
 .bottom-btn {
   width: 100%;
-  height: 88rpx;
-  line-height: 88rpx;
+  height: 84rpx;
+  line-height: 84rpx;
   text-align: center;
-  border-radius: 12rpx;
+  border-radius: 16rpx;
   font-size: 30rpx;
   font-weight: 600;
 }
 
 .confirm-btn {
-  background: #2563eb;
+  background: #1f4b79;
   color: #fff;
 }
 </style>

From 57e6b556babb10d81ab4ef057780745dc925b4fa Mon Sep 17 00:00:00 2001
From: zhongwenkai <3478244299@qq.com>
Date: Fri, 12 Jun 2026 11:12:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E4=B8=8A=E4=B8=8B=E6=A8=A1?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=AF=BC=E8=88=AA=E6=A0=8F=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/moldoperate/dismount.vue            | 75 +++++-------------
 .../pages/moldoperate/history.vue             | 49 ++----------
 .../pages/moldoperate/index.vue               | 79 +++++--------------
 3 files changed, 49 insertions(+), 154 deletions(-)

diff --git a/src/pages_function/pages/moldoperate/dismount.vue b/src/pages_function/pages/moldoperate/dismount.vue
index 787ee17..ada878e 100644
--- a/src/pages_function/pages/moldoperate/dismount.vue
+++ b/src/pages_function/pages/moldoperate/dismount.vue
@@ -1,16 +1,14 @@
 <template>
   <view class="page-container">
     <!-- 顶部导航栏 -->
-    <view class="custom-nav">
-      <view class="nav-back" @click="goBack">
-        <u-icon name="arrow-left" color="#ffffff" size="20"></u-icon>
-      </view>
-      <text class="nav-title">{{ t('moldOperate.tabDown') }}</text>
-      <view class="nav-right-btn" @click="goToHistory">
-        <uni-icons type="clock" size="22" color="#1f7cff"></uni-icons>
-        <text class="nav-right-text">{{ t('moldPressureNet.history') }}</text>
-      </view>
-    </view>
+    <NavBar :title="t('moldOperate.tabDown')">
+      <template #right>
+        <view class="nav-right-btn" @click="goToHistory">
+          <uni-icons type="clock" size="22" color="#1f7cff"></uni-icons>
+          <text class="nav-right-text">{{ t('moldPressureNet.history') }}</text>
+        </view>
+      </template>
+    </NavBar>
 
     <!-- 操作按钮区 -->
     <view class="action-row">
@@ -203,6 +201,7 @@
 import { computed, reactive, ref } from 'vue'
 import { onShow } from '@dcloudio/uni-app'
 import { useI18n } from 'vue-i18n'
+import NavBar from '@/components/common/NavBar.vue'
 import { getLowerMoldList, getDeviceLedgerList, createMoldOperate } from '@/api/mes/moldoperate'
 import { getDeviceLineTree } from '@/api/mes/deviceLine'
 import { getSimpleUserList } from '@/api/system/user'
@@ -620,53 +619,21 @@ onShow(async () => {
 </script>
 
 <style lang="scss" scoped>
-/* ====== 自定义导航栏 ====== */
-.custom-nav {
-  position: relative;
+/* ====== 导航栏右侧按钮 ====== */
+.nav-right-btn {
   display: flex;
   align-items: center;
-  justify-content: center;
-  height: 88rpx;
-  padding: 0 24rpx;
-  background: #22486e;
-  color: #fff;
-
-  .nav-back {
-    position: absolute;
-    left: 24rpx;
-    top: 50%;
-    transform: translateY(-50%);
-    height: 60rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-
-  .nav-title {
-    font-size: 34rpx;
-    font-weight: 600;
-    text-align: center;
-  }
-
-  .nav-right-btn {
-    position: absolute;
-    right: 24rpx;
-    top: 50%;
-    transform: translateY(-50%);
-    display: flex;
-    align-items: center;
-    gap: 6rpx;
-    padding: 8rpx 18rpx;
-    background: #ffffff;
-    border-radius: 999rpx;
-    box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.08);
-  }
+  gap: 6rpx;
+  padding: 8rpx 18rpx;
+  background: #ffffff;
+  border-radius: 999rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.08);
+}
 
-  .nav-right-text {
-    font-size: 24rpx;
-    color: #374151;
-    font-weight: 500;
-  }
+.nav-right-text {
+  font-size: 24rpx;
+  color: #374151;
+  font-weight: 500;
 }
 
 .page-container {
diff --git a/src/pages_function/pages/moldoperate/history.vue b/src/pages_function/pages/moldoperate/history.vue
index 53728d7..d89132a 100644
--- a/src/pages_function/pages/moldoperate/history.vue
+++ b/src/pages_function/pages/moldoperate/history.vue
@@ -1,12 +1,7 @@
 <template>
   <view class="page-container">
     <!-- 顶部导航栏 -->
-    <view class="custom-nav">
-      <view class="nav-back" @click="goBack">
-        <u-icon name="arrow-left" color="#ffffff" size="20"></u-icon>
-      </view>
-      <text class="nav-title">{{ pageType ? (pageType === 'up' ? t('moldOperate.tabUp') : t('moldOperate.tabDown')) + t('moldOperate.historySuffix') : t('moldOperate.historyTitle') }}</text>
-    </view>
+    <NavBar :title="pageTitle" />
 
     <!-- Tab 切换（路由指定 type 时隐藏） -->
     <view v-if="!pageType" class="tab-bar">
@@ -143,6 +138,7 @@
 import { ref, computed, watch } from 'vue'
 import { onShow, onLoad } from '@dcloudio/uni-app'
 import { useI18n } from 'vue-i18n'
+import NavBar from '@/components/common/NavBar.vue'
 import { getMoldOperatePage, deleteMoldOperate, getDeviceLedgerList } from '@/api/mes/moldoperate'
 import { getDeviceLineTree } from '@/api/mes/deviceLine'
 
@@ -385,9 +381,11 @@ function handleDelete(item) {
   })
 }
 
-function goBack() {
-  uni.navigateBack({ fail: () => uni.switchTab({ url: '/pages/index/index' }) })
-}
+const pageTitle = computed(() => {
+  if (!pageType.value) return t('moldOperate.historyTitle')
+  const type = pageType.value === 'up' ? t('moldOperate.tabUp') : t('moldOperate.tabDown')
+  return type + t('moldOperate.historySuffix')
+})
 
 function formatDateTime(value) {
   if (!value) return '-'
@@ -424,39 +422,6 @@ onShow(async () => {
   background: #f5f6f8;
 }
 
-/* ====== 自定义导航栏 ====== */
-.custom-nav {
-  position: relative;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 88rpx;
-  padding: 0 24rpx;
-  background: #22486e;
-  color: #fff;
-
-  .nav-back {
-    position: absolute;
-    left: 24rpx;
-    top: 50%;
-    transform: translateY(-50%);
-    height: 60rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-
-  .nav-title {
-    font-size: 34rpx;
-    font-weight: 600;
-    text-align: center;
-    max-width: 60%;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-}
-
 /* ====== Tab 切换 ====== */
 .tab-bar {
   display: flex;
diff --git a/src/pages_function/pages/moldoperate/index.vue b/src/pages_function/pages/moldoperate/index.vue
index 2bd221a..656b25d 100644
--- a/src/pages_function/pages/moldoperate/index.vue
+++ b/src/pages_function/pages/moldoperate/index.vue
@@ -1,16 +1,14 @@
 <template>
   <view class="page-container">
     <!-- 顶部导航栏 -->
-    <view class="custom-nav">
-      <view class="nav-back" @click="goBack">
-        <u-icon name="arrow-left" color="#ffffff" size="20"></u-icon>
-      </view>
-      <text class="nav-title">{{ t('moldOperate.tabUp') }}</text>
-      <view class="nav-right-btn" @click="goToHistory">
-        <uni-icons type="clock" size="22" color="#1f7cff"></uni-icons>
-        <text class="nav-right-text">{{ t('moldPressureNet.history') }}</text>
-      </view>
-    </view>
+    <NavBar :title="t('moldOperate.tabUp')">
+      <template #right>
+        <view class="nav-right-btn" @click="goToHistory">
+          <uni-icons type="clock" size="22" color="#1f7cff"></uni-icons>
+          <text class="nav-right-text">{{ t('moldPressureNet.history') }}</text>
+        </view>
+      </template>
+    </NavBar>
 
     <!-- ========== 上模 ========== -->
     <!-- 操作按钮区 -->
@@ -176,6 +174,7 @@
 import { computed, ref } from 'vue'
 import { onShow } from '@dcloudio/uni-app'
 import { useI18n } from 'vue-i18n'
+import NavBar from '@/components/common/NavBar.vue'
 import { getDeviceLedgerList, createMoldOperate } from '@/api/mes/moldoperate'
 import { getSimpleUserList } from '@/api/system/user'
 
@@ -458,10 +457,6 @@ function handleCancel() {
   })
 }
 
-function goBack() {
-  uni.navigateBack({ fail: () => uni.switchTab({ url: '/pages/index/index' }) })
-}
-
 function goToHistory() {
   uni.navigateTo({ url: '/pages_function/pages/moldoperate/history?type=up' })
 }
@@ -490,53 +485,21 @@ onShow(async () => {
   padding-bottom: 140rpx;
 }
 
-/* ====== 自定义导航栏 ====== */
-.custom-nav {
-  position: relative;
+/* ====== 导航栏右侧按钮 ====== */
+.nav-right-btn {
   display: flex;
   align-items: center;
-  justify-content: center;
-  height: 88rpx;
-  padding: 0 24rpx;
-  background: #22486e;
-  color: #fff;
-
-  .nav-back {
-    position: absolute;
-    left: 24rpx;
-    top: 50%;
-    transform: translateY(-50%);
-    height: 60rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-
-  .nav-title {
-    font-size: 34rpx;
-    font-weight: 600;
-    text-align: center;
-  }
-
-  .nav-right-btn {
-    position: absolute;
-    right: 24rpx;
-    top: 50%;
-    transform: translateY(-50%);
-    display: flex;
-    align-items: center;
-    gap: 6rpx;
-    padding: 8rpx 18rpx;
-    background: #ffffff;
-    border-radius: 999rpx;
-    box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.08);
-  }
+  gap: 6rpx;
+  padding: 8rpx 18rpx;
+  background: #ffffff;
+  border-radius: 999rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.08);
+}
 
-  .nav-right-text {
-    font-size: 24rpx;
-    color: #374151;
-    font-weight: 500;
-  }
+.nav-right-text {
+  font-size: 24rpx;
+  color: #374151;
+  font-weight: 500;
 }
 
 /* ====== 操作按钮区 ====== */