From 20d62438af79411e4504a5128cf2ba27eb9b25e0 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Fri, 6 Jun 2025 10:35:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/order/offline.js                 | 6 +++++-
 src/components/ThemePicker/index.vue     | 4 ++--
 src/layout/components/Settings/index.vue | 4 ++--
 src/settings.js                          | 2 +-
 src/store/modules/settings.js            | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/api/order/offline.js b/src/api/order/offline.js
index b5d26de1..a6c777f1 100644
--- a/src/api/order/offline.js
+++ b/src/api/order/offline.js
@@ -11,7 +11,11 @@ export function orderPageListApi(data) {
       headers: {
           "merchant-id":"378915229716713472",
       },
-      data: data
+      data: data,
+      params:{
+        pageNum:data.pageNum,
+        pageSize:data.pageSize
+      }
     })
 }
 // 订单详情
diff --git a/src/components/ThemePicker/index.vue b/src/components/ThemePicker/index.vue
index 7184b91e..edf9b624 100644
--- a/src/components/ThemePicker/index.vue
+++ b/src/components/ThemePicker/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-color-picker
     v-model="theme"
-    :predefine="['#11a983','#1890ff', '#304156','#212121','#409EFF','#13c2c2','#6959CD','#f5222d']"
+    :predefine="['#1890FF','#11A983', '#304156','#212121','#409EFF','#13c2c2','#6959CD','#f5222d']"
     class="theme-picker"
     popper-class="theme-picker-dropdown"
   />
@@ -9,7 +9,7 @@
 
 <script>
 const version = require('element-ui/package.json').version // element-ui version from node_modules
-const ORIGINAL_THEME = '#11a983' // default color
+const ORIGINAL_THEME = '#1890FF' // default color
 
 export default {
   data() {
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index bb3c9ce9..03b65e55 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -49,7 +49,7 @@
           <el-switch v-model="tagsView" class="drawer-switch" />
         </div>
 
-        <div class="drawer-item">
+        <!-- <div class="drawer-item">
           <span>固定 Header</span>
           <el-switch v-model="fixedHeader" class="drawer-switch" />
         </div>
@@ -57,7 +57,7 @@
         <div class="drawer-item">
           <span>显示 Logo</span>
           <el-switch v-model="sidebarLogo" class="drawer-switch" />
-        </div>
+        </div> -->
 
         <div class="drawer-item">
           <span>动态标题</span>
diff --git a/src/settings.js b/src/settings.js
index 53537c7d..7293dca5 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -32,7 +32,7 @@ module.exports = {
   /**
    * 是否显示动态标题
    */
-  dynamicTitle: false,
+  dynamicTitle: true,
 
   /**
    * @type {string | array} 'production' | ['production', 'development']
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index 8a36f7e4..79851f22 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -5,7 +5,7 @@ const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dyn
 const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
 const state = {
   title: '',
-  theme: storageSetting.theme || '#11a983',
+  theme: storageSetting.theme || '#1890FF',//11A983
   sideTheme: storageSetting.sideTheme || sideTheme,
   showSettings: showSettings,
   topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav,