新增主题模块/添加-修改配置文件

src/App.vue

@@ -1,10 +1,10 @@
 <script setup>
 import config from "./config";
 import store from "@/store";
-import { getToken } from "@/utils/auth";
+import { getToken, setToken, removeToken } from "@/utils/auth";
 
 import { defineComponent, getCurrentInstance, inject, nextTick, onMounted, watchEffect } from "vue";
-import { onLoad, onShow, onHide, onLaunch } from "@dcloudio/uni-app";
+import { onLoad, onShow, onHide, onLaunch, onReady } from "@dcloudio/uni-app";
 
 let tab = inject("$tab");
 const { proxy } = getCurrentInstance();
@@ -16,6 +16,9 @@ function initApp() {
   //#ifdef H5
   // checkLogin();
   //#endif
+
+  //初始化获取安全区高度
+  proxy.$settingStore.systemHeightTop();
 }
 
 function initConfig() {
@@ -36,25 +39,33 @@ watchEffect(() => {
   //#endif
 });
 
-onShow(() => {
-  console.log("App Show");
+onLaunch(() => {
+  console.log("App Launch");
+  // #ifdef APP-PLUS
+  plus.screen.lockOrientation("portrait-primary"); //设置不可横屏
+  // #endif
 
   //初始化默认主题
   if (!proxy.$settingStore.$state.themeColor) {
     proxy.$settingStore.SET_THEMECOLOR(proxy.$constData.themeList[0]);
   }
+
+  // setToken(
+  //   "eyJhbGciOiJIUzUxMiJ9.eyIiOjEwMzIsInVzZXJfaWQiOjYzLCJ1c2VyX2tleSI6IjQ5Nzg3YTVhOWE4NTQ4Yjg5OTc0ZWZmMDdkYjYwNmNiIiwidXNlcm5hbWUiOiJmaHMxIn0.HFMhFg5Yn5S3bQTCvfgWd89NM_AI8rkFelVRMAmDejjT7yqH4zl4C7T8FYXnyUNCzM4MNbXWqulsE4QYNErXDw"
+  // );
+  // proxy.$tab.reLaunch("/pages/index");
+
+  initApp();
 });
 
-onHide(() => {
-  console.log("App Hide");
+onReady(() => {});
+
+onShow(() => {
+  console.log("App Show");
 });
 
-onLaunch(() => {
-  console.log("App Launch");
-  // #ifdef APP-PLUS
-  plus.screen.lockOrientation("portrait-primary"); //设置不可横屏
-  // #endif
-  initApp();
+onHide(() => {
+  console.log("App Hide");
 });
 </script>
 
@@ -62,7 +73,6 @@ onLaunch(() => {
 @import "@/static/scss/index.scss";
 @import "@/static/scss/public.scss";
 @import "static/iconfont/iconfont.css";
-@import "static/iconfont/uciconfont/iconfont.css";
 </style>
 
 <style lang="scss">
@@ -72,4 +82,9 @@ uni-page-body,
 uni-page-refresh {
   height: 100%;
 }
+
+//默认返回按钮背景颜色
+:deep(.uni-page-head-btn) {
+  background-color: rgba(0, 0, 0, 0) !important;
+}
 </style>

src/manifest.json

@@ -2,7 +2,7 @@
     "name" : "综合智慧云",
     "appid" : "__UNI__36DE3A0",
     "description" : "综合智慧云",
-    "versionName" : "2.0",
+    "versionName" : "2.0.0",
     "versionCode" : 2,
     "transformPx" : false,
     /* 5+App特有相关 */
@@ -54,7 +54,7 @@
                     "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
                     "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
                 ],
-                "minSdkVersion" : 21
+                "minSdkVersion" : ""
             },
             /* ios打包配置 */
             "ios" : {
@@ -65,17 +65,17 @@
                 "ad" : {},
                 "maps" : {
                     "amap" : {
-                        "appkey_ios" : "",
+                        "appkey_ios" : "ffc71dfd4e576596027f8f45a1b8fb2f",
                         "appkey_android" : "ffc71dfd4e576596027f8f45a1b8fb2f"
                     }
                 },
                 "geolocation" : {
                     "system" : {
-                        "__platform__" : [ "android" ]
+                        "__platform__" : [ "ios", "android" ]
                     },
                     "amap" : {
-                        "__platform__" : [ "android" ],
-                        "appkey_ios" : "",
+                        "__platform__" : [ "ios", "android" ],
+                        "appkey_ios" : "ffc71dfd4e576596027f8f45a1b8fb2f",
                         "appkey_android" : "ffc71dfd4e576596027f8f45a1b8fb2f"
                     }
                 }

src/pages.json

@@ -3,27 +3,12 @@
     {
       "path": "pages/index",
       "style": {
+        "disableScroll": true,
+        "navigationStyle": "custom",
         "navigationBarTitleText": "",
         "app-plus": {
-          "titleNView": {
-            "buttons": [
-              {
-                "text": "\ue607",
-                "fontSize": "18px",
-                // "redDot": true,
-                "float": "right",
-                "fontSrc": "/static/iconfont/iconfont.ttf",
-                "width": "auto"
-              }
-              // {
-              //     "text": "\ue63d",
-              //     "fontSize": "18px",
-              //     "float": "left",
-              //     "fontSrc": "/static/iconfont/iconfont.ttf",
-              //     "width": "auto"
-              // }
-            ]
-          }
+          "bounce": "none",
+          "titleNView": false
         }
       }
     },
@@ -39,19 +24,22 @@
       "path": "pages/serveConfigSelect",
       "style": {
         "navigationBarTitleText": "服务器配置",
-        "navigationStyle": "custom"
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "black" // 仅支持 black/white
       }
     },
     {
       "path": "pages/serveConfig",
       "style": {
         "navigationBarTitleText": "服务器配置",
-        "navigationStyle": "custom"
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "black" // 仅支持 black/white
       }
     },
     {
       "path": "pages/mine/index",
       "style": {
+        // "disableScroll": true,
         "navigationBarTitleText": "我的",
         "app-plus": {
           "bounce": "none",
@@ -59,13 +47,12 @@
             "type": "transparent",
             "buttons": [
               {
-                "fontSrc": "/static/iconfont/uciconfont/iconfont.ttf",
+                "fontSrc": "/static/iconfont/iconfont.ttf",
                 "text": "\ue70f",
-                "fontSize": "28",
-                "color": "#303133",
-                "width": "42px",
-                "background": "rgba(0,0,0,0)",
-                "float": "right"
+                "fontSize": "24px",
+                "color": "#ffffff",
+                "float": "right",
+                "background": "rgba(0,0,0,0)"
               }
             ]
           }
@@ -75,19 +62,49 @@
     {
       "path": "pages/mine/avatar/index",
       "style": {
-        "navigationBarTitleText": "修改头像"
+        "navigationBarTitleText": "修改头像",
+        "app-plus": {
+          "bounce": "none",
+          "titleNView": {
+            "type": "transparent",
+            "autoBackButton": true,
+            "backButton": { //自定义 backButton
+              "background": "rgba(0,0,0,0)"
+            }
+          }
+        }
       }
     },
     {
       "path": "pages/mine/info/index",
       "style": {
-        "navigationBarTitleText": "个人资料"
+        "navigationBarTitleText": "个人资料",
+        "app-plus": {
+          "bounce": "none",
+          "titleNView": {
+            "type": "transparent",
+            "autoBackButton": true,
+            "backButton": { //自定义 backButton
+              "background": "rgba(0,0,0,0)"
+            }
+          }
+        }
       }
     },
     {
       "path": "pages/mine/pwd/index",
       "style": {
-        "navigationBarTitleText": "修改密码"
+        "navigationBarTitleText": "修改密码",
+        "app-plus": {
+          "bounce": "none",
+          "titleNView": {
+            "type": "transparent",
+            "autoBackButton": true,
+            "backButton": { //自定义 backButton
+              "background": "rgba(0,0,0,0)"
+            }
+          }
+        }
       }
     },
     {
@@ -99,13 +116,33 @@
     {
       "path": "pages/mine/help/index",
       "style": {
-        "navigationBarTitleText": "常见问题"
+        "navigationBarTitleText": "常见问题",
+        "app-plus": {
+          "bounce": "none",
+          "titleNView": {
+            "type": "transparent",
+            "autoBackButton": true,
+            "backButton": { //自定义 backButton
+              "background": "rgba(0,0,0,0)"
+            }
+          }
+        }
       }
     },
     {
       "path": "pages/mine/about/index",
       "style": {
-        "navigationBarTitleText": "关于我们"
+        "navigationBarTitleText": "关于我们",
+        "app-plus": {
+          "bounce": "none",
+          "titleNView": {
+            "type": "transparent",
+            "autoBackButton": true,
+            "backButton": { //自定义 backButton
+              "background": "rgba(0,0,0,0)"
+            }
+          }
+        }
       }
     },
     {
@@ -154,8 +191,90 @@
         "enablePullDownRefresh": false
       }
     },
+    //消息 开始
+    {
+      "path": "pages/info/info",
+      "style": {
+        "navigationBarTitleText": "消息",
+        // "navigationStyle": "custom",
+        "enablePullDownRefresh": false,
+        "app-plus": {
+          "bounce": "none",
+          "titleNView": {
+            "type": "transparent"
+          }
+        }
+      }
+    },
+    {
+      "path": "pages/info/fireBase/fireBase",
+      "style": {
+        "navigationBarTitleText": "消防知识库",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/info/pushList/pushList",
+      "style": {
+        "navigationBarTitleText": "消息推送",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/info/fireBashDetail/fireBashDetail",
+      "style": {
+        "navigationBarTitleText": "火灾逃生十大要诀",
+        "enablePullDownRefresh": false
+      }
+    },
+    //消息 结束
+    //设置 开始
+    {
+      "path": "pages/setting/setting",
+      "style": {
+        "navigationBarTitleText": "设置"
+      }
+    },
+    {
+      "path": "pages/setting/messagePush/messagePush",
+      "style": {
+        "navigationBarTitleText": "消息推送设置",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/setting/building/building",
+      "style": {
+        "navigationBarTitleText": "建筑管理",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/setting/funReport/funReport",
+      "style": {
+        "navigationBarTitleText": "功能报备",
+        "enablePullDownRefresh": false,
+        "onReachBottomDistance": 100 //距离底部多远时触发 单位px
+      }
+    },
+    {
+      "path": "pages/setting/funReport/funcAdd/funcAdd",
+      "style": {
+        "navigationBarTitleText": "功能报备新增",
+        "enablePullDownRefresh": false
+      }
+    },
+    //设置 结束
     //消防督察单模块 开始
     //消防督察单模块 结束
+    //分析 开始
+    {
+      "path": "pages/business/analyse/index",
+      "style": {
+        "navigationBarTitleText": "分析"
+      }
+    },
+    //分析 结束
     //巡检模块 开始
     {
       "path": "pages/business/mhxf/xunJian/xunJian",
@@ -247,7 +366,7 @@
                 "fontSize": "18px",
                 // "redDot": true,
                 "float": "right",
-                "fontSrc": "/static/iconfont/uciconfont/iconfont.ttf",
+                "fontSrc": "/static/iconfont/iconfont.ttf",
                 "width": "auto"
               }
             ]
@@ -329,84 +448,15 @@
         "navigationBarTitleText": "待办事项",
         "enablePullDownRefresh": false
       }
-    },
-    //待办事项 结束
-    //消息 开始
-    {
-      "path": "pages/info/info",
-      "style": {
-        "navigationBarTitleText": "消息",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/info/fireBase/fireBase",
-      "style": {
-        "navigationBarTitleText": "消防知识库",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/info/pushList/pushList",
-      "style": {
-        "navigationBarTitleText": "消息推送",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/info/fireBashDetail/fireBashDetail",
-      "style": {
-        "navigationBarTitleText": "火灾逃生十大要诀",
-        "enablePullDownRefresh": false
-      }
-    },
-    //消息 结束
-    //分析 开始
-    {
-      "path": "pages/analyse/analyse",
-      "style": {
-        "navigationBarTitleText": "分析"
-      }
-    },
-    //分析 结束
-    //设置 开始
-    {
-      "path": "pages/setting/setting",
-      "style": {
-        "navigationBarTitleText": "设置"
-      }
-    },
-    {
-      "path": "pages/setting/messagePush/messagePush",
-      "style": {
-        "navigationBarTitleText": "消息推送设置",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/setting/building/building",
-      "style": {
-        "navigationBarTitleText": "建筑管理",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/setting/funReport/funReport",
-      "style": {
-        "navigationBarTitleText": "功能报备",
-        "enablePullDownRefresh": false,
-        "onReachBottomDistance": 100 //距离底部多远时触发 单位px
-      }
-    },
-    {
-      "path": "pages/setting/funReport/funcAdd/funcAdd",
-      "style": {
-        "navigationBarTitleText": "功能报备新增",
-        "enablePullDownRefresh": false
-      }
     }
-    //设置 结束
+    //待办事项 结束
   ],
+  "globalStyle": {
+    "navigationBarTextStyle": "white",
+    "navigationBarTitleText": "uni-app",
+    // "navigationBarBackgroundColor": "#000000",
+    "backgroundColor": "#F8F8F8"
+  },
   "tabBar": {
     "color": "#a9a9a9",
     "selectedColor": "#000000",
@@ -439,13 +489,6 @@
       }
     ]
   },
-  "globalStyle": {
-    "navigationBarTextStyle": "white",
-    "navigationBarTitleText": "uni-app",
-    "navigationBarBackgroundColor": "#fff",
-    "backgroundColor": "#F8F8F8"
-    // "enablePullDownRefresh": true
-  },
   "condition": {
     //模式配置，仅开发期间生效
     "current": 0, //当前激活的模式(list 的索引项)

src/pages/business/mhxf/coordination/index.vue

@@ -4,11 +4,13 @@
 
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
-import { getCurrentInstance, ref, onMounted, inject, shallowRef, reactive, nextTick } from "vue";
-import publicStore from "@/store/modules/public";
+import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs, nextTick } from "vue";
 
+import publicStore from "@/store/modules/public";
 const publicStores = publicStore(); //全局公共Store
 
+const { proxy } = getCurrentInstance();
+
 // 自定义导航事件
 onNavigationBarButtonTap((e) => {
   if (e.float == "right") {
@@ -21,6 +23,11 @@ onNavigationBarButtonTap((e) => {
 
 onLoad((options) => {});
 
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+
 onReady(() => {});
 
 onMounted(() => {});

src/pages/business/mhxf/deviceManage/index.vue

@@ -76,13 +76,15 @@
 
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
-import { ref, onMounted, inject, shallowRef, reactive, watchEffect } from "vue";
-import publicStore from "@/store/modules/public";
+import { ref, onMounted, inject, shallowRef, reactive, watchEffect, getCurrentInstance, toRefs } from "vue";
 
 import { dataRtList } from "@/api/business/mhxf/deviceManage";
 
+import publicStore from "@/store/modules/public";
 const publicStores = publicStore(); //全局公共Store
 
+const { proxy } = getCurrentInstance();
+
 const dataInput = ref("");
 
 const dataRes = ref(0);
@@ -264,6 +266,11 @@ onLoad((options) => {
   // classifySearch({systemType:5,deviceCode:dataInput.value})
 });
 
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+
 onReady(() => {});
 
 onMounted(() => {});
@@ -310,8 +317,4 @@ uni-page-refresh,
 .grayBackgroundColor {
   background: rgb(241, 241, 241);
 }
-.whiteBackgroundColor {
-  background-color: #ffffff;
-  height: 100%;
-}
 </style>

src/pages/business/mhxf/fireReport/components/detailed.vue

@@ -498,6 +498,11 @@ onNavigationBarButtonTap((e) => {
 
 onLoad((options) => {});
 
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+
 onReady(() => {});
 
 onMounted(() => {});
@@ -545,4 +550,4 @@ onMounted(() => {});
     }
   }
 }
-</style>
+</style>

src/pages/business/mhxf/fireReport/components/detailedPath.vue

@@ -45,6 +45,11 @@ onLoad((options) => {
   }
 });
 
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+
 onReady(() => {});
 
 onMounted(() => {});
@@ -56,4 +61,4 @@ onMounted(() => {});
   .detailedContent {
   }
 }
-</style>
+</style>

src/pages/business/mhxf/fireReport/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="fireReport" style="background-color: #f7f7f7">
+  <view class="fireReport">
     <u-empty v-if="dataList.length <= 0" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
     <view class="reportContent" v-else>
       <view class="contentDom" v-for="(li, index) in dataList" :key="index">
@@ -167,6 +167,11 @@ onLoad((options) => {
   reportInfoListApi();
 });
 
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+
 onReady(() => {});
 
 onMounted(() => {});
@@ -175,7 +180,7 @@ onMounted(() => {});
 <style lang="scss">
 .fireReport {
   height: calc(100vh - 44px);
-  background-color: #ffffff;
+  background-color: #f7f7f7;
   .reportContent {
     .contentDom {
       display: flex;
@@ -216,9 +221,3 @@ onMounted(() => {});
   }
 }
 </style>
-
-<style>
-/* page {
-  background-color: #ffffff;
-} */
-</style>

src/pages/business/mhxf/informationSelect/index.vue

@@ -658,6 +658,11 @@ onLoad((options) => {
   }, 1000);
 });
 
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+
 onReady(() => {});
 
 onMounted(() => {});

src/pages/business/mhxf/needMatter/index.vue

@@ -474,6 +474,11 @@ onNavigationBarButtonTap((e) => {
 
 onLoad((options) => {});
 
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+
 onReady(() => {});
 
 onMounted(() => {});

src/pages/business/mhxf/unitInfoCollection/index copy.vue

@@ -891,12 +891,6 @@ onLoad((options) => {
 });
 </script>
 
-<style>
-/* page {
-  background-color: #ffffff;
-} */
-</style>
-
 <style lang="scss">
 #unitInfoCollection {
   .centerOne,

src/pages/business/mhxf/unitInfoCollection/index.vue

@@ -1265,6 +1265,11 @@ onLoad((options) => {
     }
   }
 });
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
 </script>
 
 <style lang="scss">

src/pages/business/mhxf/xunJian/collect/components/collectDetail.vue

@@ -27,13 +27,15 @@ import {
   onReachBottom, // 上拉加载
   onNavigationBarButtonTap,
 } from "@dcloudio/uni-app";
-import { reactive, ref, onMounted, inject, shallowRef } from "vue";
+import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs } from "vue";
 
 import publicStore from "@/store/modules/public";
-import useXunJianStore from "@/store/modules/xunJian";
+import xunJianStore from "@/store/modules/xunJian";
 
 const publicStores = publicStore(); //全局公共Store
-const settingsStore = useXunJianStore(); //全局变量值Store
+const xunjianStore = xunJianStore(); //全局变量值Store
+
+const { proxy } = getCurrentInstance();
 
 const form = ref(null); //表单refs获取
 const model = reactive({
@@ -67,7 +69,7 @@ function handleInsert() {
       let endTime = new Date();
       model.siteTime = publicStores.formatterDate(endTime, "yyyy-MM-dd hh:mm:ss");
 
-      settingsStore.collectDataList.push(model);
+      xunjianStore.collectDataList.push(model);
 
       //   uni.navigateTo({
       //     url: "/pages/business/mhxf/xunJian/collect/index",
@@ -85,6 +87,11 @@ onLoad((options) => {
   model.siteNubmber = options.siteNubmber;
 });
 
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+
 onMounted(() => {});
 </script>
 
@@ -94,12 +101,6 @@ onMounted(() => {});
 }
 </style>
 
-<style>
-/* page {
-  background-color: #ffffff;
-} */
-</style>
-
 <style scoped>
 .whiteBackgroundColor {
   background-color: #ffffff;

src/pages/business/mhxf/xunJian/collect/components/collectRecord.vue

@@ -32,12 +32,14 @@
 
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
-import { reactive, ref, onMounted, inject, shallowRef } from "vue";
-import useXunJianStore from "@/store/modules/xunJian";
+import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs } from "vue";
+import xunJianStore from "@/store/modules/xunJian";
 
 import { siteList } from "@/api/business/mhxf/xunJian/collect.js";
 
-const settingsStore = useXunJianStore(); //全局变量值Store
+const xunjianStore = xunJianStore(); //全局变量值Store
+
+const { proxy } = getCurrentInstance();
 
 const show = ref(false);
 const datetimerange = ref("");
@@ -82,6 +84,11 @@ onNavigationBarButtonTap((e) => {
 
 onLoad((options) => {});
 
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+
 onReady(() => {});
 
 onMounted(() => {
@@ -95,12 +102,6 @@ onMounted(() => {
 }
 </style>
 
-<style>
-/* page {
-  background-color: #f5f6f7;
-} */
-</style>
-
 <style scoped>
 .whiteBackgroundColor {
   background-color: #ffffff;

src/pages/business/mhxf/xunJian/collect/index.vue

@@ -3,7 +3,7 @@
     <!-- 按组使用 -->
     <uni-swipe-action>
       <uni-swipe-action-item
-        v-for="(cu, index) in settingsStore.collectDataList"
+        v-for="(cu, index) in xunjianStore.collectDataList"
         :key="index"
         :right-options="options"
         @click="bindClick($event, index)"
@@ -51,18 +51,20 @@
       ></uni-popup-message>
     </uni-popup>
 
-    <u-empty marginTop="20%" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" v-if="settingsStore.collectDataList.length <= 0"> </u-empty>
+    <u-empty marginTop="20%" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" v-if="xunjianStore.collectDataList.length <= 0"> </u-empty>
   </scroll-view>
 </template>
 
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
-import { ref, onMounted, inject, shallowRef, reactive } from "vue";
-import useXunJianStore from "@/store/modules/xunJian";
+import { ref, onMounted, reactive, computed, getCurrentInstance, toRefs, inject, shallowRef } from "vue";
 
 import { addSite } from "@/api/business/mhxf/xunJian/collect.js";
 
-const settingsStore = useXunJianStore(); //全局变量值Store
+import xunJianStore from "@/store/modules/xunJian";
+const xunjianStore = xunJianStore(); //全局变量值Store
+
+const { proxy } = getCurrentInstance();
 
 /**
  * @扫一扫
@@ -141,7 +143,7 @@ function handleInsert(e) {
         messageList.color = "#09bb07";
         message.value.open();
 
-        settingsStore.collectDataList.splice(settingsStore.collectDataList.indexOf(e), 1);
+        xunjianStore.collectDataList.splice(xunjianStore.collectDataList.indexOf(e), 1);
       } else {
       }
     });
@@ -161,7 +163,7 @@ const options = ref([
  * @左滑删除点击事件
  */
 function bindClick(e, index) {
-  settingsStore.collectDataList.splice(index, 1);
+  xunjianStore.collectDataList.splice(index, 1);
 }
 
 /**
@@ -169,9 +171,9 @@ function bindClick(e, index) {
  */
 function swipeChange(e, index) {
   if (e == "right") {
-    settingsStore.collectDataList[index].swipeBool = true;
+    xunjianStore.collectDataList[index].swipeBool = true;
   } else {
-    settingsStore.collectDataList[index].swipeBool = false;
+    xunjianStore.collectDataList[index].swipeBool = false;
   }
 }
 
@@ -187,6 +189,11 @@ onNavigationBarButtonTap((e) => {
 
 onLoad((options) => {});
 
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+
 onReady(() => {});
 
 onMounted(() => {});

src/pages/business/mhxf/xunJian/plan/components/content.vue

@@ -18,7 +18,7 @@
                   checkboxChange(val, index);
                 }
               "
-              :disabled="settingsStore.contentArray.siteList.inspectionStatus == 2"
+              :disabled="xunjianStore.contentArray.siteList.inspectionStatus == 2"
             >
               <u-row style="width: 100%; flex-wrap: wrap">
                 <u-col v-for="option in con.contentOptionList" :key="option" span="6" style="margin-bottom: 15px">
@@ -30,29 +30,29 @@
 
             <view v-if="con.remarksBool == true" style="display: flex; height: 32px; line-height: 32px; white-space: nowrap">
               <span style="">备注：</span>
-              <u-input v-model="con.remarks" placeholder="请输入备注" :disabled="settingsStore.contentArray.siteList.inspectionStatus == 2"></u-input>
+              <u-input v-model="con.remarks" placeholder="请输入备注" :disabled="xunjianStore.contentArray.siteList.inspectionStatus == 2"></u-input>
             </view>
           </view>
           <view v-if="con.submissionMethod == 2" style="margin-top: 15px">
             <u-radio-group placement="row" v-model="con.contentOptionListValue">
               <u-row style="width: 100%; flex-wrap: wrap">
                 <u-col v-for="option in con.contentOptionList" :key="option" :span="6" style="margin-bottom: 15px">
-                  <u-radio :disabled="settingsStore.contentArray.siteList.inspectionStatus == 2" :label="option.optionName" :name="option.id"> </u-radio>
+                  <u-radio :disabled="xunjianStore.contentArray.siteList.inspectionStatus == 2" :label="option.optionName" :name="option.id"> </u-radio>
                 </u-col>
               </u-row>
             </u-radio-group>
 
             <view v-if="con.remarksBool == true" style="display: flex; height: 32px; line-height: 32px; white-space: nowrap">
               <span style="">备注：</span>
-              <u-input v-model="con.remarks" placeholder="请输入备注" :disabled="settingsStore.contentArray.siteList.inspectionStatus == 2"></u-input>
+              <u-input v-model="con.remarks" placeholder="请输入备注" :disabled="xunjianStore.contentArray.siteList.inspectionStatus == 2"></u-input>
             </view>
           </view>
           <view v-if="con.submissionMethod == 3" style="margin-top: 15px">
-            <u-textarea v-model="con.contentOptionListValue" placeholder="请输入" maxlength="30" :disabled="settingsStore.contentArray.siteList.inspectionStatus == 2"></u-textarea>
+            <u-textarea v-model="con.contentOptionListValue" placeholder="请输入" maxlength="30" :disabled="xunjianStore.contentArray.siteList.inspectionStatus == 2"></u-textarea>
 
             <view v-if="con.remarksBool == true" style="display: flex; margin-top: 15px; height: 32px; line-height: 32px; white-space: nowrap">
               <span style="">备注：</span>
-              <u-input v-model="con.remarks" placeholder="请输入备注" :disabled="settingsStore.contentArray.siteList.inspectionStatus == 2"></u-input>
+              <u-input v-model="con.remarks" placeholder="请输入备注" :disabled="xunjianStore.contentArray.siteList.inspectionStatus == 2"></u-input>
             </view>
           </view>
         </view>
@@ -63,7 +63,7 @@
     <view style="position: fixed; left: 0; right: 0; bottom: 0; padding: 15px">
       <view>
         <u-button
-          v-if="settingsStore.contentArray.siteList.inspectionStatus == 1"
+          v-if="xunjianStore.contentArray.siteList.inspectionStatus == 1"
           type="primary"
           style="width: 100%; height: 40px; font-size: 14px; margin-bottom: 15px"
           shape="circle"
@@ -73,7 +73,7 @@
         </u-button>
       </view>
       <view>
-        <u-button v-if="settingsStore.contentArray.siteList.inspectionStatus == 1" type="primary" style="width: 100%; height: 40px; font-size: 14px" shape="circle" @click="buttonClick(2)">
+        <u-button v-if="xunjianStore.contentArray.siteList.inspectionStatus == 1" type="primary" style="width: 100%; height: 40px; font-size: 14px" shape="circle" @click="buttonClick(2)">
           提交
         </u-button>
       </view>
@@ -85,13 +85,16 @@
 
 <script setup>
 import { onLoad, onShow } from "@dcloudio/uni-app";
-import { ref, onMounted, inject, shallowRef } from "vue";
+import { ref, onMounted, reactive, computed, getCurrentInstance, toRefs, inject, shallowRef } from "vue";
 
-import useXunJianStore from "@/store/modules/xunJian";
 import { updatePlan } from "@/api/business/mhxf/xunJian/plan.js";
 
+import xunJianStore from "@/store/modules/xunJian";
+
 const BASE_URL = inject("$BASE_URL");
-const settingsStore = useXunJianStore(); //全局变量值Store
+const xunjianStore = xunJianStore(); //全局变量值Store
+
+const { proxy } = getCurrentInstance();
 
 const contentList = ref([]);
 function checkboxChange(value, index) {
@@ -103,7 +106,7 @@ function checkboxChange(value, index) {
  * @备注显示事件
  */
 function remarksClick(index) {
-  settingsStore.contentArray.contentList[index].remarksBool = true;
+  xunjianStore.contentArray.contentList[index].remarksBool = true;
 }
 
 /**
@@ -167,15 +170,15 @@ async function buttonClick(type) {
     }
 
     const array = {
-      siteType: settingsStore.contentArray.siteList.siteType,
-      siteNubmber: settingsStore.contentArray.siteList.siteNubmber,
-      siteName: settingsStore.contentArray.siteList.siteName,
+      siteType: xunjianStore.contentArray.siteList.siteType,
+      siteNubmber: xunjianStore.contentArray.siteList.siteNubmber,
+      siteName: xunjianStore.contentArray.siteList.siteName,
       siteStatus: 1, //定位 （0：未定位 1：已定位）
-      longitude: settingsStore.contentArray.siteList.longitude,
-      latitude: settingsStore.contentArray.siteList.latitude,
-      planSonId: settingsStore.contentArray.siteList.planSonId,
-      siteId: settingsStore.contentArray.siteList.id,
-      recordPictureList: settingsStore.contentArray.siteList.recordPictureList,
+      longitude: xunjianStore.contentArray.siteList.longitude,
+      latitude: xunjianStore.contentArray.siteList.latitude,
+      planSonId: xunjianStore.contentArray.siteList.planSonId,
+      siteId: xunjianStore.contentArray.siteList.id,
+      recordPictureList: xunjianStore.contentArray.siteList.recordPictureList,
       recordOptionList: recordOptionList,
     };
 
@@ -191,9 +194,9 @@ async function buttonClick(type) {
 }
 
 onLoad((options) => {
-  contentList.value = settingsStore.contentArray.contentList;
+  contentList.value = xunjianStore.contentArray.contentList;
 
-  if (settingsStore.contentArray.siteList.inspectionStatus == 2) {
+  if (xunjianStore.contentArray.siteList.inspectionStatus == 2) {
     if (contentList.value.length > 0) {
       contentList.value.forEach((el) => {
         el.contentOptionListValue1 = [];
@@ -225,6 +228,11 @@ onLoad((options) => {
   }
 });
 
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+
 onMounted(() => {});
 </script>
 

src/pages/business/mhxf/xunJian/plan/components/drawer.vue

@@ -30,8 +30,8 @@ import { ElMessageBox } from "element-plus";
 import { onLoad, onShow } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, watchEffect } from "vue";
 
-import useXunJianStore from "@/store/modules/xunJian";
-const settingsStore = useXunJianStore(); //全局变量值Store
+import xunJianStore from "@/store/modules/xunJian";
+const xunjianStore = xunJianStore(); //全局变量值Store
 
 const props = defineProps({
   scanArray: {
@@ -53,10 +53,10 @@ const scanBool = ref(false);
  * @按钮点击事件
  */
 function reportClick(siteId, planSonId) {
-  settingsStore.contentArray = {};
-  settingsStore.siteNubmber = undefined;
-  settingsStore.siteId = siteId;
-  settingsStore.planSonId = planSonId;
+  xunjianStore.contentArray = {};
+  xunjianStore.siteNubmber = undefined;
+  xunjianStore.siteId = siteId;
+  xunjianStore.planSonId = planSonId;
 
   uni.navigateTo({
     url: "/pages/business/mhxf/xunJian/plan/components/siteDetails",

src/pages/business/mhxf/xunJian/plan/components/report.vue

@@ -62,18 +62,20 @@
 
 <script setup>
 import { onLoad, onShow } from "@dcloudio/uni-app";
-import { ref, onMounted, inject, shallowRef } from "vue";
-import useXunJianStore from "@/store/modules/xunJian";
+import { ref, onMounted, reactive, computed, getCurrentInstance, toRefs, inject, shallowRef } from "vue";
 
 import { recordList, recordOption, siteDetails, planSonSiteDetails } from "@/api/business/mhxf/xunJian/plan.js";
 
-const settingsStore = useXunJianStore(); //全局变量值Store
+import xunJianStore from "@/store/modules/xunJian";
+const xunjianStore = xunJianStore(); //全局变量值Store
+
+const { proxy } = getCurrentInstance();
 
 function pulicClick(obj) {
   if (obj.inspectionStatus == 2) {
     recordList({
       siteId: obj.id,
-      planSonId: settingsStore.planSonId,
+      planSonId: xunjianStore.planSonId,
     }).then((res) => {
       if (res.status == "SUCCESS") {
         if (res.data.length > 0) {
@@ -84,21 +86,21 @@ function pulicClick(obj) {
             res.data[0].inspectionStatus = 2;
             res.data[0].pictureUrl = obj.pictureUrl;
 
-            settingsStore.contentArray = {
+            xunjianStore.contentArray = {
               contentList: [res1.data.contentList],
               siteList: res.data[0],
             };
-            settingsStore.siteId = undefined;
-            settingsStore.siteNubmber = undefined;
+            xunjianStore.siteId = undefined;
+            xunjianStore.siteNubmber = undefined;
           });
         }
       } else {
       }
     });
   } else {
-    settingsStore.contentArray = {};
-    settingsStore.siteId = obj.id;
-    settingsStore.siteNubmber = undefined;
+    xunjianStore.contentArray = {};
+    xunjianStore.siteId = obj.id;
+    xunjianStore.siteNubmber = undefined;
   }
 
   uni.navigateTo({
@@ -120,14 +122,14 @@ async function scanClick() {
         icon: "none",
       });
 
-      settingsStore.contentArray = {};
-      settingsStore.siteId = undefined;
-      settingsStore.siteNubmber = e.result;
+      xunjianStore.contentArray = {};
+      xunjianStore.siteId = undefined;
+      xunjianStore.siteNubmber = e.result;
 
       siteDetails({
-        siteId: settingsStore.siteId,
-        siteNubmber: settingsStore.siteNubmber,
-        planSonId: settingsStore.planSonId,
+        siteId: xunjianStore.siteId,
+        siteNubmber: xunjianStore.siteNubmber,
+        planSonId: xunjianStore.planSonId,
       }).then((res) => {
         if (res.status == "SUCCESS") {
           currentDateList.value.forEach((e) => {
@@ -161,7 +163,7 @@ async function scanClick() {
 const currentDateList = ref([]); //地点列表list数据存储
 function currentApi() {
   planSonSiteDetails({
-    planSonId: settingsStore.planSonId,
+    planSonId: xunjianStore.planSonId,
   }).then((res) => {
     if (res.status == "SUCCESS") {
       currentDateList.value = res.data;
@@ -180,6 +182,11 @@ onLoad((options) => {
   currentApi();
 });
 
+onShow(() => {
+  //调用系统主题颜色
+  ([1]);
+});
+
 onMounted(() => {});
 </script>
 

src/pages/business/mhxf/xunJian/plan/components/siteDetails.vue

@@ -77,12 +77,14 @@
 
 <script setup>
 import { onLoad, onShow } from "@dcloudio/uni-app";
-import { ref, onMounted, inject, shallowRef, reactive } from "vue";
-import useXunJianStore from "@/store/modules/xunJian";
+import { ref, onMounted, reactive, computed, getCurrentInstance, toRefs, inject, shallowRef } from "vue";
 
 import { uploadAvatar, siteDetails } from "@/api/business/mhxf/xunJian/plan.js";
 
-const settingsStore = useXunJianStore(); //全局变量值Store
+import xunJianStore from "@/store/modules/xunJian";
+const xunjianStore = xunJianStore(); //全局变量值Store
+
+const { proxy } = getCurrentInstance();
 
 /**
  * @站点详情
@@ -94,9 +96,9 @@ const siteList = ref([]);
 const contentList = ref([]);
 function selectAPI() {
   siteDetails({
-    siteId: settingsStore.siteId,
-    siteNubmber: settingsStore.siteNubmber,
-    planSonId: settingsStore.planSonId,
+    siteId: xunjianStore.siteId,
+    siteNubmber: xunjianStore.siteNubmber,
+    planSonId: xunjianStore.planSonId,
   }).then((res) => {
     if (res.status == "SUCCESS") {
       contentList.value = res.data.contentList;
@@ -119,7 +121,7 @@ function selectAPI() {
  * @查看巡检项
  */
 function buttonClick() {
-  settingsStore.contentArray = {
+  xunjianStore.contentArray = {
     contentList: contentList.value,
     siteList: siteList.value,
   };
@@ -147,7 +149,7 @@ function uploadClick() {
  * @upload图片上传
  * @api接口请求
  */
-async function uploadApi(res) {
+function uploadApi(res) {
   let data = { name: "file", filePath: res.tempFilePaths[0] };
 
   uploadAvatar(data).then((response) => {
@@ -168,14 +170,19 @@ function uploadViewClose(el) {
 }
 
 onLoad((options) => {
-  if (JSON.stringify(settingsStore.contentArray) == "{}") {
+  if (JSON.stringify(xunjianStore.contentArray) == "{}") {
     selectAPI();
   } else {
-    contentList.value = settingsStore.contentArray.contentList[0];
-    siteList.value = settingsStore.contentArray.siteList;
+    contentList.value = xunjianStore.contentArray.contentList[0];
+    siteList.value = xunjianStore.contentArray.siteList;
   }
 });
 
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+
 onMounted(() => {});
 </script>
 

src/pages/business/mhxf/xunJian/plan/components/upload.vue

@@ -2,7 +2,7 @@
   <scroll-view scroll-y>
     <el-upload
       v-model:file-list="siteList.recordPictureList"
-      :class="settingsStore.inspectionStatus == 2 ? 'avatar-uploader uploadDisabled' : 'avatar-uploader'"
+      :class="xunjianStore.inspectionStatus == 2 ? 'avatar-uploader uploadDisabled' : 'avatar-uploader'"
       :headers="{ Authorization: Authorization }"
       :action="uploadUrl"
       :on-success="uploadSuccess"
@@ -26,10 +26,11 @@
 <script setup>
 import { onLoad, onShow } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef } from "vue";
-import useXunJianStore from "@/store/modules/xunJian";
+
+import xunJianStore from "@/store/modules/xunJian";
 
 const BASE_URL = inject("$BASE_URL");
-const settingsStore = useXunJianStore(); //全局变量值Store
+const xunjianStore = xunJianStore(); //全局变量值Store
 
 const siteList = ref({ recordPictureList: [] });
 

src/pages/business/mhxf/xunJian/plan/index.vue

@@ -163,14 +163,17 @@
 import drawer from "./components/drawer.vue";
 
 import { onLoad, onShow, onLaunch } from "@dcloudio/uni-app";
-import { ref, onMounted, inject, shallowRef } from "vue";
-import publicStore from "@/store/modules/public";
-import useXunJianStore from "@/store/modules/xunJian";
+import { ref, onMounted, reactive, computed, getCurrentInstance, toRefs, inject, shallowRef } from "vue";
 
 import { recordList, recordOption, planList, patrolInspectionPlan, appPlanStatistics } from "@/api/business/mhxf/xunJian/plan.js";
 
+import publicStore from "@/store/modules/public";
+import xunJianStore from "@/store/modules/xunJian";
+
 const publicStores = publicStore(); //全局公共Store
-const settingsStore = useXunJianStore(); //全局变量值Store
+const xunjianStore = xunJianStore(); //全局变量值Store
+
+const { proxy } = getCurrentInstance();
 
 /**
  * @点击巡检
@@ -178,7 +181,7 @@ const settingsStore = useXunJianStore(); //全局变量值Store
  */
 function reportClick(obj) {
   if (tabPosition.value == 0) {
-    settingsStore.planSonId = obj.id;
+    xunjianStore.planSonId = obj.id;
     uni.navigateTo({
       url: "/pages/business/mhxf/xunJian/plan/components/report",
     });
@@ -196,12 +199,12 @@ function reportClick(obj) {
             res.data[0].inspectionStatus = 2;
             res.data[0].pictureUrl = obj.pictureUrl;
 
-            settingsStore.contentArray = {
+            xunjianStore.contentArray = {
               contentList: [res1.data.contentList],
               siteList: res.data[0],
             };
-            settingsStore.siteId = undefined;
-            settingsStore.siteNubmber = undefined;
+            xunjianStore.siteId = undefined;
+            xunjianStore.siteNubmber = undefined;
 
             uni.navigateTo({
               url: "/pages/business/mhxf/xunJian/plan/components/siteDetails",
@@ -227,7 +230,7 @@ function scanClick() {
         title: "扫码成功",
         icon: "none",
       });
-      settingsStore.inspectionStatus = 1;
+      xunjianStore.inspectionStatus = 1;
 
       planList({
         siteNubmber: e.result,
@@ -358,7 +361,7 @@ function activitiesSortClick() {
  * @tabs切换change事件
  */
 const list = ref(["巡检任务", "巡检记录"]);
-const tabPosition = ref(settingsStore.planTabs);
+const tabPosition = ref(xunjianStore.planTabs);
 function tabPositionChange(index) {
   tabPosition.value = index;
   activitiesApi();
@@ -423,6 +426,11 @@ onLoad((options) => {
   });
 });
 
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+
 onMounted(() => {});
 </script>
 
@@ -430,4 +438,4 @@ onMounted(() => {});
 .is-selected {
   color: #1989fa;
 }
-</style>
+</style>

src/pages/business/mhxf/xunJian/record/record.vue

@@ -26,15 +26,16 @@
 
 <script setup>
 import json from "@/static/js/json.js";
-
+import { ref, onMounted, reactive, computed, getCurrentInstance, toRefs, inject, shallowRef } from "vue";
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
-import { ref, onMounted, inject, shallowRef, reactive } from "vue";
 
 import { getInspectionRecordList } from "@/api/business/mhxf/xunJian/record.js";
 
 const modalName = ref(null);
 const getData = ref([]);
 
+const { proxy } = getCurrentInstance();
+
 // 巡检记录列表数据请求
 function goRecordList(params = {}) {
   getInspectionRecordList(params).then((res) => {
@@ -58,6 +59,11 @@ onNavigationBarButtonTap((e) => {
 onLoad((option) => {
   goRecordList({ company_code: uni.getStorageSync("selectedCode") });
 });
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
 </script>
 
 <style lang="scss">

src/pages/business/mhxf/xunJian/record/recordDetail/index.vue

@@ -86,11 +86,14 @@
 
 <script setup>
 import { onLoad, onShow, onLaunch } from "@dcloudio/uni-app";
-import { ref, onMounted, inject, shallowRef, toRefs, reactive } from "vue";
-import useXunJianStore from "@/store/modules/xunJian";
+import { ref, onMounted, reactive, computed, getCurrentInstance, toRefs, inject, shallowRef } from "vue";
+
+import xunJianStore from "@/store/modules/xunJian";
 
 import { getInspectionRecordDetails } from "@/api/business/mhxf/xunJian/record.js";
 
+const { proxy } = getCurrentInstance();
+
 const websiteUrl = inject("$websiteUrl");
 
 const arrayList = reactive({
@@ -125,6 +128,11 @@ onLoad((option) => {
     id: option.id,
   });
 });
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
 </script>
 
 <style lang="scss"></style>

src/pages/common/textview/index.vue

@@ -10,6 +10,11 @@
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs } from "vue";
 
+import useStores from "@/store/modules/user.js";
+const useStore = useStores();
+
+const { proxy } = getCurrentInstance();
+
 const data = reactive({
   title: "",
   content: "",
@@ -24,6 +29,11 @@ onLoad((options) => {
     title: options.title,
   });
 });
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
 </script>
 
 <style>

src/pages/common/textview/index1.vue

@@ -8,6 +8,11 @@
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs } from "vue";
 
+import useStores from "@/store/modules/user.js";
+const useStore = useStores();
+
+const { proxy } = getCurrentInstance();
+
 const data = reactive({
   title: "",
   content: "",
@@ -22,6 +27,11 @@ onLoad((options) => {
     title: options.title,
   });
 });
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
 </script>
 
 <style>

src/pages/common/webview/index.vue

@@ -8,6 +8,11 @@
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs } from "vue";
 
+import useStores from "@/store/modules/user.js";
+const useStore = useStores();
+
+const { proxy } = getCurrentInstance();
+
 const props = defineProps({
   // 数据
   src: {
@@ -35,4 +40,9 @@ onLoad((event) => {
     });
   }
 });
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
 </script>

src/pages/index.vue

@@ -1,165 +1,189 @@
 <template>
   <!-- <u-sticky bgColor="#fff"> </u-sticky> -->
 
-  <!-- <pagesHarder></pagesHarder> -->
+  <u-navbar
+    leftText="返回"
+    leftIconColor="#fff"
+    :titleStyle="{ color: '#fff' }"
+    :autoBack="false"
+    :title="useStore.$state.loginTitle"
+    :placeholder="true"
+    :safeAreaInsetTop="true"
+    :bgColor="proxy.$settingStore.themeColor.color"
+  >
+    <template #left>
+      <view class="u-nav-slot">
+        <u-icon name="arrow-left" size="19" style="display: none"></u-icon>
+      </view>
+    </template>
+    <template #right>
+      <view class="u-nav-slot">
+        <text class="iconfont ucicon-saoyisao" style="font-size: 18px" :style="{ color: '#fff' }"></text>
+      </view>
+    </template>
+  </u-navbar>
 
-  <scroll-view scroll-x>
-    <view style="margin-bottom: 50px">
-      <!-- 下拉选择 -->
-      <!-- <view class="searchSelect shadow" v-if="flag">
-        <view class="cu-bar search bg-white">
-          <view class="search-form round" style="margin-top: 0">
-            <input
-              @focus="InputFocus"
-              @blur="InputBlur"
-              @input="handleInput()"
-              v-model="searchInput"
-              :adjust-position="false"
-              type="text"
-              placeholder=""
-              confirm-type="search"
-              style="border: none !important"
-            />
-            <text class="cuIcon-search"></text>
-          </view>
-        </view>
-        <view class="select-items">
-          <view
-            class="site-item"
-            v-if="!searchList.length"
-            style="text-align: center"
-            >暂无结果</view
-          >
-          <view
-            class="select-item"
-            v-for="(item, index) in searchList"
-            @click="clickSelectItem(item, index)"
-            :key="index"
-            >{{ item.owner_name }}</view
-          >
-        </view>
-      </view> -->
-      <!-- 下拉选择 end -->
-
-      <!-- 图表 -->
-      <!-- <view class="section1 section bg-white padding-xs">
-        <view
-          class="
-            static-tabs
-            grid
-            margin-bottom
-            text-center
-            col-3
-            margin-top-sm margin-bottom-sm
-          "
+  <!-- <pagesHarder></pagesHarder> -->
+  <view class="home-container" :style="{ height: `calc(100vh - ${proxy.$settingStore.barHightTop})` }">
+    <!-- <u-loadmore :status="arrayList.loadStatus" loadingText="" loadmoreText="" :icon="true" /> -->
+    <view class="uni-content-body">
+      <view>
+        <!-- 下拉选择 -->
+        <!-- <view class="searchSelect shadow" v-if="flag">
+            <view class="cu-bar search bg-white">
+              <view class="search-form round" style="margin-top: 0">
+                <input
+                  @focus="InputFocus"
+                  @blur="InputBlur"
+                  @input="handleInput()"
+                  v-model="searchInput"
+                  :adjust-position="false"
+                  type="text"
+                  placeholder=""
+                  confirm-type="search"
+                  style="border: none !important"
+                />
+                <text class="cuIcon-search"></text>
+              </view>
+            </view>
+            <view class="select-items">
+              <view
+                class="site-item"
+                v-if="!searchList.length"
+                style="text-align: center"
+                >暂无结果</view
+              >
+              <view
+                class="select-item"
+                v-for="(item, index) in searchList"
+                @click="clickSelectItem(item, index)"
+                :key="index"
+                >{{ item.owner_name }}</view
+              >
+            </view>
+          </view> -->
+        <!-- 下拉选择 end -->
+
+        <!-- 图表 -->
+        <!-- <view class="section1 section bg-white padding-xs">
+            <view
+              class="
+                static-tabs
+                grid
+                margin-bottom
+                text-center
+                col-3
+                margin-top-sm margin-bottom-sm
+              "
+            >
+              <view
+                :class="['padding-sm ', Inv == 0 ? 'active' : '']"
+                @click="Inv = 0"
+                >报警信息统计</view
+              >
+              <view
+                :class="['padding-sm ', Inv == 1 ? 'active' : '']"
+                @click="Inv = 1"
+                >数据等级统计</view
+              >
+              <view
+                :class="['padding-sm ', Inv == 2 ? 'active' : '']"
+                @click="Inv = 2"
+                >设备运行状态</view
+              >
+            </view>
+            <view class="time text-center"
+              >统计时段：{{ staticData.statisticalPeriod }}
+            </view>
+            <view style="height: 570rpx">
+              <view v-if="Inv == 0"> </view>
+              <view v-if="Inv == 1"> </view>
+              <view v-if="Inv == 2" class="chart3-box">
+                <ul class="chart3-icon">
+                  <li>
+                    <image
+                      src="@/static/images/index/chart3-1.png"
+                      style="width: 64rpx; height: 64rpx"
+                    ></image>
+                  </li>
+                  <li>
+                    <image
+                      src="@/static/images/index/chart3-2.png"
+                      style="width: 64rpx; height: 64rpx"
+                    ></image>
+                  </li>
+                  <li>
+                    <image
+                      src="@/static/images/index/chart3-3.png"
+                      style="width: 64rpx; height: 64rpx"
+                    ></image>
+                  </li>
+                  <li>
+                    <image
+                      src="@/static/images/index/chart3-4.png"
+                      style="width: 64rpx; height: 64rpx"
+                    ></image>
+                  </li>
+                  <li>
+                    <image
+                      src="@/static/images/index/chart3-5.png"
+                      style="width: 64rpx; height: 64rpx"
+                    ></image>
+                  </li>
+                </ul>
+              </view>
+            </view>
+          </view> -->
+        <!-- 图表 end-->
+
+        <!-- 轮播图 开始 -->
+        <u-swiper
+          v-if="arrayList.swiperBool"
+          :list="arrayList.swiperList"
+          :interval="arrayList.swiperTime"
+          indicator
+          indicatorMode="line"
+          radius="0"
+          height="160"
+          circular
+          @click="swiperClick"
+          @change="swiperChange"
         >
-          <view
-            :class="['padding-sm ', Inv == 0 ? 'active' : '']"
-            @click="Inv = 0"
-            >报警信息统计</view
-          >
-          <view
-            :class="['padding-sm ', Inv == 1 ? 'active' : '']"
-            @click="Inv = 1"
-            >数据等级统计</view
-          >
-          <view
-            :class="['padding-sm ', Inv == 2 ? 'active' : '']"
-            @click="Inv = 2"
-            >设备运行状态</view
-          >
-        </view>
-        <view class="time text-center"
-          >统计时段：{{ staticData.statisticalPeriod }}
-        </view>
-        <view style="height: 570rpx">
-          <view v-if="Inv == 0"> </view>
-          <view v-if="Inv == 1"> </view>
-          <view v-if="Inv == 2" class="chart3-box">
-            <ul class="chart3-icon">
-              <li>
-                <image
-                  src="@/static/images/index/chart3-1.png"
-                  style="width: 64rpx; height: 64rpx"
-                ></image>
-              </li>
-              <li>
-                <image
-                  src="@/static/images/index/chart3-2.png"
-                  style="width: 64rpx; height: 64rpx"
-                ></image>
-              </li>
-              <li>
-                <image
-                  src="@/static/images/index/chart3-3.png"
-                  style="width: 64rpx; height: 64rpx"
-                ></image>
-              </li>
-              <li>
-                <image
-                  src="@/static/images/index/chart3-4.png"
-                  style="width: 64rpx; height: 64rpx"
-                ></image>
-              </li>
-              <li>
-                <image
-                  src="@/static/images/index/chart3-5.png"
-                  style="width: 64rpx; height: 64rpx"
-                ></image>
-              </li>
-            </ul>
-          </view>
-        </view>
-      </view> -->
-      <!-- 图表 end-->
-
-      <!-- 轮播图 开始 -->
-      <u-swiper
-        v-if="arrayList.swiperBool"
-        :list="arrayList.swiperList"
-        :interval="arrayList.swiperTime"
-        indicator
-        indicatorMode="line"
-        radius="0"
-        height="160"
-        circular
-        @click="swiperClick"
-        @change="swiperChange"
-      >
-      </u-swiper>
-      <!-- 轮播图 结束 -->
-
-      <!-- 宫格列表 -->
-      <view class="section2 section bg-white" style="margin-bottom: 10px" v-if="arrayList.recentlyUsed.length > 0">
-        <view style="color: #000000; font-size: 14px; padding: 10px 10px 5px 10px">最近使用</view>
-        <view class="cu-list grid col-5 no-border">
-          <view class="cu-item justify-center align-center" @tap="navItemClick(item)" v-for="(item, index) in arrayList.recentlyUsed.slice(0, 5)" :key="index">
-            <image :src="item.meta.icon" style="width: 40px; height: 40px"></image>
-            <!-- <view class="cu-tag badge" v-if="item.badge != 0">
+        </u-swiper>
+        <!-- 轮播图 结束 -->
+
+        <!-- 宫格列表 -->
+        <view class="section2 section bg-white" style="margin-bottom: 10px" v-if="arrayList.recentlyUsed.length > 0">
+          <view style="color: #000000; font-size: 14px; padding: 10px 10px 5px 10px">最近使用</view>
+          <view class="cu-list grid col-5 no-border">
+            <view class="cu-item justify-center align-center" @tap="navItemClick(item)" v-for="(item, index) in arrayList.recentlyUsed.slice(0, 5)" :key="index">
+              <image :src="item.meta.icon" style="width: 40px; height: 40px"></image>
+              <!-- <view class="cu-tag badge" v-if="item.badge != 0">
               <block v-if="item.badge != 0">{{ item.badge > 99 ? "99+" : item.badge }}</block>
             </view> -->
-            <text style="font-size: 12px">{{ item.meta.title }}</text>
+              <text style="font-size: 12px">{{ item.meta.title }}</text>
+            </view>
           </view>
         </view>
-      </view>
-      <!-- 宫格列表 end -->
-
-      <!-- 宫格列表 -->
-      <view class="section2 section bg-white">
-        <view style="color: #000000; font-size: 14px; padding: 10px 10px 5px 10px">常用功能</view>
-        <view class="cu-list grid col-5 no-border">
-          <view class="cu-item justify-center align-center" @tap="navItemClick(item)" v-for="(item, index) in arrayList.cuIconList" :key="index">
-            <image :src="item.meta.icon" style="width: 40px; height: 40px"></image>
-            <!-- <view class="cu-tag badge" v-if="item.badge != 0">
+        <!-- 宫格列表 end -->
+
+        <!-- 宫格列表 -->
+        <view class="section2 section bg-white">
+          <view style="color: #000000; font-size: 14px; padding: 10px 10px 5px 10px">常用功能</view>
+          <view class="cu-list grid col-5 no-border">
+            <view class="cu-item justify-center align-center" @tap="navItemClick(item)" v-for="(item, index) in arrayList.cuIconList" :key="index">
+              <image :src="item.meta.icon" style="width: 40px; height: 40px"></image>
+              <!-- <view class="cu-tag badge" v-if="item.badge != 0">
               <block v-if="item.badge != 0">{{ item.badge > 99 ? "99+" : item.badge }}</block>
             </view> -->
-            <text style="font-size: 12px">{{ item.meta.title }}</text>
+              <text style="font-size: 12px">{{ item.meta.title }}</text>
+            </view>
           </view>
         </view>
+        <!-- 宫格列表 end -->
       </view>
-      <!-- 宫格列表 end -->
     </view>
-  </scroll-view>
+  </view>
 </template>
 
 <script setup>
@@ -169,7 +193,7 @@ import pagesHarder from "@/components/pages-harder/index.vue";
 import json from "@/static/js/json.js"; //引入api请求封装方法
 import * as jwx from "@/utils/jssdk.js"; //引入js sdk的封装
 
-import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
+import { onReady, onLoad, onShow, onNavigationBarButtonTap, onPullDownRefresh, onReachBottom } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance } from "vue";
 import { getToken } from "@/utils/auth";
 import useStores from "@/store/modules/user.js";
@@ -528,7 +552,7 @@ function getHandleData(param = {}) {
 
 onShow(() => {
   //调用系统主题颜色
-   proxy.$settingStore.systemThemeColor([1, 2]);
+  proxy.$settingStore.systemThemeColor([1, 2]);
 });
 
 // 自定义导航事件
@@ -551,7 +575,17 @@ onNavigationBarButtonTap((e) => {
 });
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
+.home-container {
+  height: 100vh;
+
+  .uni-content-body {
+    // #ifdef H5
+    padding-bottom: 50px;
+    // #endif
+  }
+}
+
 .select-items {
   overflow: auto;
   height: 80vh;

src/pages/info/info.vue

@@ -1,25 +1,27 @@
 <template>
   <view class="info-wrapper" style="height: 100%">
-    <view class="justify-center align-center text-center">
-      <u-image src="@/static/images/info/info-bg.png" width="100%" height="292rpx" :showLoading="false" :fade="false"></u-image>
-    </view>
+    <view class="uni-content-header" :class="'bg-' + proxy.$settingStore.themeColor.name" :style="{ height: proxy.$settingStore.barHightTop }"></view>
+    <view class="uni-content-body">
+      <view class="justify-center align-center text-center">
+        <u-image src="@/static/images/info/info-bg.png" width="100%" height="292rpx" :showLoading="false" :fade="false"></u-image>
+      </view>
 
-    <scroll-view scroll-y style="height: calc(100% - 292rpx)">
-      <view class="cu-list menu-avatar padding-lr-sm padding-top-sm">
-        <view class="cu-item margin-bottom-sm" @tap="goFireBase()">
-          <view class="cu-avatar">
-            <image class="image-bg" src="@/static/images/info/fireBase.png" />
-          </view>
-          <view class="content">
-            <view class="">消防知识库</view>
-          </view>
-          <view class="nav-right">
-            <view class="text-grey">
-              <text class="icon iconfont margin-right-xs margin-left-lg"> &#xe629; </text>
+      <scroll-view scroll-y style="height: calc(100% - 292rpx)">
+        <view class="cu-list menu-avatar padding-lr-sm padding-top-sm">
+          <view class="cu-item margin-bottom-sm" @tap="goFireBase()">
+            <view class="cu-avatar">
+              <image class="image-bg" src="@/static/images/info/fireBase.png" />
+            </view>
+            <view class="content">
+              <view class="">消防知识库</view>
+            </view>
+            <view class="nav-right">
+              <view class="text-grey">
+                <text class="icon iconfont margin-right-xs margin-left-lg"> &#xe629; </text>
+              </view>
             </view>
           </view>
-        </view>
-        <!-- <view class="cu-item " @tap="goPushList()">
+          <!-- <view class="cu-item " @tap="goPushList()">
 				<view class="cu-avatar " style="background-image:url(@/static/images/info/pushList.png)"></view>
 				<view class="content">
 					<view class="">消息推送</view>
@@ -30,18 +32,21 @@
 					</view>
 				</view>
 			</view> -->
-      </view>
-    </scroll-view>
+        </view>
+      </scroll-view>
+    </view>
   </view>
 </template>
 
 <script setup>
 import fireBase from "@/static/images/info/fireBase.png";
 import { onLoad, onShow, onHide, onLaunch } from "@dcloudio/uni-app";
-import { ref, onMounted, inject, shallowRef, reactive, toRefs } from "vue";
+import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs } from "vue";
 
 import {} from "@/api/mine/info.js";
 
+const { proxy } = getCurrentInstance();
+
 const data = reactive({
   indexBackgroundImage: fireBase,
 });
@@ -64,6 +69,11 @@ function goPushList() {
     complete: () => {},
   });
 }
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1, 2]);
+});
 </script>
 
 <style lang="scss">

src/pages/login.vue

@@ -294,17 +294,17 @@ onLoad(() => {
 });
 </script>
 
-<style>
-page {
-  background-color: #ffffff;
-}
-</style>
-
 <style lang="scss" scoped>
 .section {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
   display: flex;
   width: 100%;
-  height: 100%;
+  height: 100vh;
+  background-color: $uni-bg-color;
 
   .bg {
     width: 100%;

src/pages/mine/about/index.vue

@@ -1,5 +1,6 @@
 <template>
   <view class="about-container">
+    <view class="uni-content-header" :class="'bg-' + proxy.$settingStore.themeColor.name" :style="{ height: proxy.$settingStore.barHightTop }"></view>
     <view class="header-section text-center">
       <image style="width: 150rpx; height: 150rpx" mode="heightFix" :src="useStore.$state.loginLogo" v-if="useStore.$state.loginLogo" />
       <image style="width: 150rpx; height: 150rpx" mode="heightFix" src="@/static/logo200.png" v-else />
@@ -44,6 +45,7 @@
 </template>
 
 <script setup>
+import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
 
 import useStores from "@/store/modules/user.js";
@@ -53,20 +55,27 @@ const { proxy } = getCurrentInstance();
 
 const url = ref(getApp().globalData.config.appInfo.site_url);
 const version = ref(getApp().globalData.config.appInfo.version);
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
 </script>
 
-<style lang="scss">
-.copyright {
-  margin-top: 50rpx;
-  text-align: center;
-  line-height: 60rpx;
-  color: #999;
-}
+<style lang="scss" scoped>
+.about-container {
+  .copyright {
+    margin-top: 50rpx;
+    text-align: center;
+    line-height: 60rpx;
+    color: #999;
+  }
 
-.header-section {
-  display: flex;
-  padding: 30rpx 0 0;
-  flex-direction: column;
-  align-items: center;
+  .header-section {
+    display: flex;
+    padding: 30rpx 0 0;
+    flex-direction: column;
+    align-items: center;
+  }
 }
 </style>

src/pages/mine/avatar/index.vue

@@ -1,8 +1,9 @@
 <template>
-  <view class="container">
+  <view class="avatar-container">
+    <view class="uni-content-header" :class="'bg-' + proxy.$settingStore.themeColor.name" :style="{ height: proxy.$settingStore.barHightTop }"></view>
     <view class="page-body uni-content-info">
       <view class="cropper-content">
-        <view v-if="isShowImg" class="uni-corpper" :style="'width:' + cropperInitW + 'px;height:' + cropperInitH + 'px;background:#000'">
+        <view ref="uniCorpper" v-if="isShowImg" class="uni-corpper" :style="'width:' + cropperInitW + 'px;height:' + cropperInitH + 'px;background:#000'">
           <view class="uni-corpper-content" :style="'width:' + cropperW + 'px;height:' + cropperH + 'px;left:' + cropperL + 'px;top:' + cropperT + 'px'">
             <image :src="imageSrc" :style="'width:' + cropperW + 'px;height:' + cropperH + 'px'"></image>
             <view
@@ -23,7 +24,8 @@
                 <view class="uni-cropper-point point-tr" data-drag="topTight"></view>
                 <view class="uni-cropper-point point-r" data-drag="right" @touchstart.stop="dragStart" @touchmove.stop="dragMove"></view>
                 <view class="uni-cropper-point point-rb" data-drag="rightBottom" @touchstart.stop="dragStart" @touchmove.stop="dragMove"></view>
-                <view class="uni-cropper-point point-b" data-drag="bottom" @touchstart.stop="dragStart" @touchmove.stop="dragMove" @touchend.stop="dragEnd"></view>
+                <!-- @touchend.stop="dragEnd" -->
+                <view class="uni-cropper-point point-b" data-drag="bottom" @touchstart.stop="dragStart" @touchmove.stop="dragMove"></view>
                 <view class="uni-cropper-point point-bl" data-drag="bottomLeft"></view>
                 <view class="uni-cropper-point point-l" data-drag="left" @touchstart.stop="dragStart" @touchmove.stop="dragMove"></view>
                 <view class="uni-cropper-point point-lt" data-drag="leftTop"></view>
@@ -34,17 +36,24 @@
       </view>
       <view class="cropper-config">
         <button type="primary reverse" @click="getImage" style="margin-top: 30rpx">选择头像</button>
-        <button type="warn" @click="getImageInfo" style="margin-top: 30rpx">提交</button>
+        <button type="primary" @click="getImageInfo" style="margin-top: 30rpx">提交</button>
       </view>
       <canvas canvas-id="myCanvas" :style="'position:absolute;border: 1px solid red; width:' + imageW + 'px;height:' + imageH + 'px;top:-9999px;left:-9999px;'"></canvas>
     </view>
   </view>
 </template>
 
-<script>
+<script setup>
 import config from "@/config";
-import store from "@/store";
-import { uploadAvatar } from "@/api/system/user";
+import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
+import { onReady, onShow } from "@dcloudio/uni-app";
+
+import { uploadAvatar, updateUserProfile } from "@/api/system/user";
+
+import useStores from "@/store/modules/user.js";
+const useStore = useStores();
+
+const { proxy } = getCurrentInstance();
 
 const baseUrl = config.baseUrl;
 let sysInfo = uni.getSystemInfoSync();
@@ -67,286 +76,325 @@ let PAGE_X, // 手按下的x位置
   INIT_DRAG_POSITION = 100, // 初始化屏幕宽度和裁剪区域的宽度之差，用于设置初始化裁剪的宽度
   DRAW_IMAGE_W = sysInfo.screenWidth; // 设置生成的图片宽度
 
-export default {
-  /**
-   * 页面的初始数据
-   */
-  data() {
-    return {
-      imageSrc: store.getters.avatar,
-      isShowImg: false,
-      // 初始化的宽高
-      cropperInitW: SCREEN_WIDTH,
-      cropperInitH: SCREEN_WIDTH,
-      // 动态的宽高
-      cropperW: SCREEN_WIDTH,
-      cropperH: SCREEN_WIDTH,
-      // 动态的left top值
-      cropperL: 0,
-      cropperT: 0,
-
-      transL: 0,
-      transT: 0,
-
-      // 图片缩放值
-      scaleP: 0,
-      imageW: 0,
-      imageH: 0,
-
-      // 裁剪框 宽高
-      cutL: 0,
-      cutT: 0,
-      cutB: SCREEN_WIDTH,
-      cutR: "100%",
-      qualityWidth: DRAW_IMAGE_W,
-      innerAspectRadio: DRAFG_MOVE_RATIO,
-    };
-  },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-    this.loadImage();
-  },
-  methods: {
-    setData: function (obj) {
-      let that = this;
-      Object.keys(obj).forEach(function (key) {
-        that.$set(that.$data, key, obj[key]);
-      });
-    },
-    getImage: function () {
-      var _this = this;
-      uni.chooseImage({
-        success: function (res) {
-          _this.setData({
-            imageSrc: res.tempFilePaths[0],
-          });
-          _this.loadImage();
-        },
-      });
-    },
-    loadImage: function () {
-      var _this = this;
-
-      uni.getImageInfo({
-        src: _this.imageSrc,
-        success: function success(res) {
-          IMG_RATIO = 1 / 1;
-          if (IMG_RATIO >= 1) {
-            IMG_REAL_W = SCREEN_WIDTH;
-            IMG_REAL_H = SCREEN_WIDTH / IMG_RATIO;
-          } else {
-            IMG_REAL_W = SCREEN_WIDTH * IMG_RATIO;
-            IMG_REAL_H = SCREEN_WIDTH;
-          }
-          let minRange = IMG_REAL_W > IMG_REAL_H ? IMG_REAL_W : IMG_REAL_H;
-          INIT_DRAG_POSITION = minRange > INIT_DRAG_POSITION ? INIT_DRAG_POSITION : minRange;
-          // 根据图片的宽高显示不同的效果   保证图片可以正常显示
-          if (IMG_RATIO >= 1) {
-            let cutT = Math.ceil((SCREEN_WIDTH / IMG_RATIO - (SCREEN_WIDTH / IMG_RATIO - INIT_DRAG_POSITION)) / 2);
-            let cutB = cutT;
-            let cutL = Math.ceil((SCREEN_WIDTH - SCREEN_WIDTH + INIT_DRAG_POSITION) / 2);
-            let cutR = cutL;
-            _this.setData({
-              cropperW: SCREEN_WIDTH,
-              cropperH: SCREEN_WIDTH / IMG_RATIO,
-              // 初始化left right
-              cropperL: Math.ceil((SCREEN_WIDTH - SCREEN_WIDTH) / 2),
-              cropperT: Math.ceil((SCREEN_WIDTH - SCREEN_WIDTH / IMG_RATIO) / 2),
-              cutL: cutL,
-              cutT: cutT,
-              cutR: cutR,
-              cutB: cutB,
-              // 图片缩放值
-              imageW: IMG_REAL_W,
-              imageH: IMG_REAL_H,
-              scaleP: IMG_REAL_W / SCREEN_WIDTH,
-              qualityWidth: DRAW_IMAGE_W,
-              innerAspectRadio: IMG_RATIO,
-            });
-          } else {
-            let cutL = Math.ceil((SCREEN_WIDTH * IMG_RATIO - SCREEN_WIDTH * IMG_RATIO) / 2);
-            let cutR = cutL;
-            let cutT = Math.ceil((SCREEN_WIDTH - INIT_DRAG_POSITION) / 2);
-            let cutB = cutT;
-            _this.setData({
-              cropperW: SCREEN_WIDTH * IMG_RATIO,
-              cropperH: SCREEN_WIDTH,
-              // 初始化left right
-              cropperL: Math.ceil((SCREEN_WIDTH - SCREEN_WIDTH * IMG_RATIO) / 2),
-              cropperT: Math.ceil((SCREEN_WIDTH - SCREEN_WIDTH) / 2),
-
-              cutL: cutL,
-              cutT: cutT,
-              cutR: cutR,
-              cutB: cutB,
-              // 图片缩放值
-              imageW: IMG_REAL_W,
-              imageH: IMG_REAL_H,
-              scaleP: IMG_REAL_W / SCREEN_WIDTH,
-              qualityWidth: DRAW_IMAGE_W,
-              innerAspectRadio: IMG_RATIO,
-            });
-          }
-          _this.setData({
-            isShowImg: true,
-          });
-          uni.hideLoading();
-        },
+/**
+ * 页面的初始数据
+ */
+const array = reactive({
+  imageSrc: useStore.$state.avatar,
+  isShowImg: false,
+  // 初始化的宽高
+  cropperInitW: SCREEN_WIDTH,
+  cropperInitH: SCREEN_WIDTH,
+  // 动态的宽高
+  cropperW: SCREEN_WIDTH,
+  cropperH: SCREEN_WIDTH,
+  // 动态的left top值
+  cropperL: 0,
+  cropperT: 0,
+
+  transL: 0,
+  transT: 0,
+
+  // 图片缩放值
+  scaleP: 0,
+  imageW: 0,
+  imageH: 0,
+
+  // 裁剪框 宽高
+  cutL: 0,
+  cutT: 0,
+  cutB: SCREEN_WIDTH,
+  cutR: "100%",
+  qualityWidth: DRAW_IMAGE_W,
+  innerAspectRadio: DRAFG_MOVE_RATIO,
+});
+
+const {
+  imageSrc,
+  isShowImg,
+  cropperInitW,
+  cropperInitH,
+  cropperW,
+  cropperH,
+
+  cropperL,
+  cropperT,
+
+  transL,
+  transT,
+
+  scaleP,
+  imageW,
+  imageH,
+
+  cutL,
+  cutT,
+  cutB,
+  cutR,
+  qualityWidth,
+  innerAspectRadio,
+} = toRefs(array);
+
+/**
+ * @更新图片数据
+ */
+function setData(obj) {
+  Object.keys(obj).forEach(function (key) {
+    array[key] = obj[key];
+  });
+}
+
+/**
+ * @选择图片
+ */
+function getImage() {
+  uni.chooseImage({
+    success: function (res) {
+      setData({
+        imageSrc: res.tempFilePaths[0],
       });
+      loadImage();
     },
-    // 拖动时候触发的touchStart事件
-    contentStartMove(e) {
-      PAGE_X = e.touches[0].pageX;
-      PAGE_Y = e.touches[0].pageY;
-    },
+  });
+}
 
-    // 拖动时候触发的touchMove事件
-    contentMoveing(e) {
-      var _this = this;
-      var dragLengthX = (PAGE_X - e.touches[0].pageX) * DRAFG_MOVE_RATIO;
-      var dragLengthY = (PAGE_Y - e.touches[0].pageY) * DRAFG_MOVE_RATIO;
-      // 左移
-      if (dragLengthX > 0) {
-        if (this.cutL - dragLengthX < 0) dragLengthX = this.cutL;
+function loadImage() {
+  uni.getImageInfo({
+    src: imageSrc.value,
+    success: function success(res) {
+      IMG_RATIO = 1 / 1;
+      if (IMG_RATIO >= 1) {
+        IMG_REAL_W = SCREEN_WIDTH;
+        IMG_REAL_H = SCREEN_WIDTH / IMG_RATIO;
       } else {
-        if (this.cutR + dragLengthX < 0) dragLengthX = -this.cutR;
+        IMG_REAL_W = SCREEN_WIDTH * IMG_RATIO;
+        IMG_REAL_H = SCREEN_WIDTH;
       }
-
-      if (dragLengthY > 0) {
-        if (this.cutT - dragLengthY < 0) dragLengthY = this.cutT;
+      let minRange = IMG_REAL_W > IMG_REAL_H ? IMG_REAL_W : IMG_REAL_H;
+      INIT_DRAG_POSITION = minRange > INIT_DRAG_POSITION ? INIT_DRAG_POSITION : minRange;
+      // 根据图片的宽高显示不同的效果   保证图片可以正常显示
+      if (IMG_RATIO >= 1) {
+        let cutT = Math.ceil((SCREEN_WIDTH / IMG_RATIO - (SCREEN_WIDTH / IMG_RATIO - INIT_DRAG_POSITION)) / 2);
+        let cutB = cutT;
+        let cutL = Math.ceil((SCREEN_WIDTH - SCREEN_WIDTH + INIT_DRAG_POSITION) / 2);
+        let cutR = cutL;
+        setData({
+          cropperW: SCREEN_WIDTH,
+          cropperH: SCREEN_WIDTH / IMG_RATIO,
+          // 初始化left right
+          cropperL: Math.ceil((SCREEN_WIDTH - SCREEN_WIDTH) / 2),
+          cropperT: Math.ceil((SCREEN_WIDTH - SCREEN_WIDTH / IMG_RATIO) / 2),
+          cutL: cutL,
+          cutT: cutT,
+          cutR: cutR,
+          cutB: cutB,
+          // 图片缩放值
+          imageW: IMG_REAL_W,
+          imageH: IMG_REAL_H,
+          scaleP: IMG_REAL_W / SCREEN_WIDTH,
+          qualityWidth: DRAW_IMAGE_W,
+          innerAspectRadio: IMG_RATIO,
+        });
       } else {
-        if (this.cutB + dragLengthY < 0) dragLengthY = -this.cutB;
+        let cutL = Math.ceil((SCREEN_WIDTH * IMG_RATIO - SCREEN_WIDTH * IMG_RATIO) / 2);
+        let cutR = cutL;
+        let cutT = Math.ceil((SCREEN_WIDTH - INIT_DRAG_POSITION) / 2);
+        let cutB = cutT;
+        setData({
+          cropperW: SCREEN_WIDTH * IMG_RATIO,
+          cropperH: SCREEN_WIDTH,
+          // 初始化left right
+          cropperL: Math.ceil((SCREEN_WIDTH - SCREEN_WIDTH * IMG_RATIO) / 2),
+          cropperT: Math.ceil((SCREEN_WIDTH - SCREEN_WIDTH) / 2),
+
+          cutL: cutL,
+          cutT: cutT,
+          cutR: cutR,
+          cutB: cutB,
+          // 图片缩放值
+          imageW: IMG_REAL_W,
+          imageH: IMG_REAL_H,
+          scaleP: IMG_REAL_W / SCREEN_WIDTH,
+          qualityWidth: DRAW_IMAGE_W,
+          innerAspectRadio: IMG_RATIO,
+        });
       }
-      this.setData({
-        cutL: this.cutL - dragLengthX,
-        cutT: this.cutT - dragLengthY,
-        cutR: this.cutR + dragLengthX,
-        cutB: this.cutB + dragLengthY,
+      setData({
+        isShowImg: true,
       });
-
-      PAGE_X = e.touches[0].pageX;
-      PAGE_Y = e.touches[0].pageY;
+      uni.hideLoading();
     },
+  });
+}
 
-    contentTouchEnd() {},
+/**
+ * @拖动时候触发的touchStart事件
+ */
+function contentStartMove(e) {
+  PAGE_X = e.touches[0].pageX;
+  PAGE_Y = e.touches[0].pageY;
+}
 
-    // 获取图片
-    getImageInfo() {
-      var _this = this;
-      uni.showLoading({
-        title: "图片生成中...",
-      });
-      // 将图片写入画布
-      const ctx = uni.createCanvasContext("myCanvas");
-      ctx.drawImage(_this.imageSrc, 0, 0, IMG_REAL_W, IMG_REAL_H);
-      ctx.draw(true, () => {
-        // 获取画布要裁剪的位置和宽度   均为百分比 * 画布中图片的宽度    保证了在微信小程序中裁剪的图片模糊  位置不对的问题 canvasT = (_this.cutT / _this.cropperH) * (_this.imageH / pixelRatio)
-        var canvasW = ((_this.cropperW - _this.cutL - _this.cutR) / _this.cropperW) * IMG_REAL_W;
-        var canvasH = ((_this.cropperH - _this.cutT - _this.cutB) / _this.cropperH) * IMG_REAL_H;
-        var canvasL = (_this.cutL / _this.cropperW) * IMG_REAL_W;
-        var canvasT = (_this.cutT / _this.cropperH) * IMG_REAL_H;
-        uni.canvasToTempFilePath({
-          x: canvasL,
-          y: canvasT,
-          width: canvasW,
-          height: canvasH,
-          destWidth: canvasW,
-          destHeight: canvasH,
-          quality: 0.5,
-          canvasId: "myCanvas",
-          success: function (res) {
-            uni.hideLoading();
-            let data = { name: "avatarfile", filePath: res.tempFilePath };
-            uploadAvatar(data).then((response) => {
-              store.commit("SET_AVATAR", baseUrl + response.imgUrl);
-              uni.showToast({ title: "修改成功", icon: "success" });
-              uni.navigateBack();
-            });
-          },
+/**
+ * @拖动时候触发的touchMove事件
+ */
+function contentMoveing(e) {
+  var _this = this;
+  var dragLengthX = (PAGE_X - e.touches[0].pageX) * DRAFG_MOVE_RATIO;
+  var dragLengthY = (PAGE_Y - e.touches[0].pageY) * DRAFG_MOVE_RATIO;
+  // 左移
+  if (dragLengthX > 0) {
+    if (cutL.value - dragLengthX < 0) dragLengthX = cutL.value;
+  } else {
+    if (cutR.value + dragLengthX < 0) dragLengthX = -cutR.value;
+  }
+
+  if (dragLengthY > 0) {
+    if (cutT.value - dragLengthY < 0) dragLengthY = cutT.value;
+  } else {
+    if (cutB.value + dragLengthY < 0) dragLengthY = -cutB.value;
+  }
+  setData({
+    cutL: cutL.value - dragLengthX,
+    cutT: cutT.value - dragLengthY,
+    cutR: cutR.value + dragLengthX,
+    cutB: cutB.value + dragLengthY,
+  });
+
+  PAGE_X = e.touches[0].pageX;
+  PAGE_Y = e.touches[0].pageY;
+}
+
+function contentTouchEnd() {}
+
+/**
+ * @获取图片
+ */
+function getImageInfo() {
+  uni.showLoading({
+    title: "图片生成中...",
+  });
+  // 将图片写入画布
+  const ctx = uni.createCanvasContext("myCanvas");
+  ctx.drawImage(imageSrc.value, 0, 0, IMG_REAL_W, IMG_REAL_H);
+  ctx.draw(true, () => {
+    // 获取画布要裁剪的位置和宽度   均为百分比 * 画布中图片的宽度    保证了在微信小程序中裁剪的图片模糊  位置不对的问题 canvasT = (_this.cutT / _this.cropperH) * (_this.imageH / pixelRatio)
+    var canvasW = ((cropperW.value - cutL.value - cutR.value) / cropperW.value) * IMG_REAL_W;
+    var canvasH = ((cropperH.value - cutT.value - cutB.value) / cropperH.value) * IMG_REAL_H;
+    var canvasL = (cutL.value / cropperW.value) * IMG_REAL_W;
+    var canvasT = (cutT.value / cropperH.value) * IMG_REAL_H;
+    uni.canvasToTempFilePath({
+      x: canvasL,
+      y: canvasT,
+      width: canvasW,
+      height: canvasH,
+      destWidth: canvasW,
+      destHeight: canvasH,
+      quality: 0.5,
+      canvasId: "myCanvas",
+      success: function (res) {
+        uni.hideLoading();
+        let data = { name: "file", filePath: res.tempFilePath };
+        uploadAvatar(data).then((response) => {
+          useStore.$state.avatar = response.data.url;
+          updateUserProfile({
+            avatar: response.data.url,
+          }).then(() => {});
+          uni.showToast({ title: "修改成功", icon: "success" });
+          uni.navigateBack();
         });
+      },
+    });
+  });
+}
+
+/**
+ * @设置大小的时候触发的touchStart事件
+ */
+function dragStart(e) {
+  T_PAGE_X = e.touches[0].pageX;
+  T_PAGE_Y = e.touches[0].pageY;
+  CUT_L = cutL.value;
+  CUT_R = cutR.value;
+  CUT_B = cutB.value;
+  CUT_T = cutT.value;
+}
+
+/**
+ * @设置大小的时候触发的touchMove事件
+ */
+function dragMove(e) {
+  var dragType = e.target.dataset.drag;
+  switch (dragType) {
+    case "right":
+      var dragLength = (T_PAGE_X - e.touches[0].pageX) * DRAFG_MOVE_RATIO;
+      if (CUT_R + dragLength < 0) dragLength = -CUT_R;
+      setData({
+        cutR: CUT_R + dragLength,
       });
-    },
-    // 设置大小的时候触发的touchStart事件
-    dragStart(e) {
-      T_PAGE_X = e.touches[0].pageX;
-      T_PAGE_Y = e.touches[0].pageY;
-      CUT_L = this.cutL;
-      CUT_R = this.cutR;
-      CUT_B = this.cutB;
-      CUT_T = this.cutT;
-    },
+      break;
+    case "left":
+      var dragLength = (T_PAGE_X - e.touches[0].pageX) * DRAFG_MOVE_RATIO;
+      if (CUT_L - dragLength < 0) dragLength = CUT_L;
+      if (CUT_L - dragLength > cropperW.value - cutR.value) dragLength = CUT_L - (cropperW.value - cutR.value);
+      setData({
+        cutL: CUT_L - dragLength,
+      });
+      break;
+    case "top":
+      var dragLength = (T_PAGE_Y - e.touches[0].pageY) * DRAFG_MOVE_RATIO;
+      if (CUT_T - dragLength < 0) dragLength = CUT_T;
+      if (CUT_T - dragLength > cropperH.value - cutB.value) dragLength = CUT_T - (cropperH.value - cutB.value);
+      setData({
+        cutT: CUT_T - dragLength,
+      });
+      break;
+    case "bottom":
+      var dragLength = (T_PAGE_Y - e.touches[0].pageY) * DRAFG_MOVE_RATIO;
+      if (CUT_B + dragLength < 0) dragLength = -CUT_B;
+      setData({
+        cutB: CUT_B + dragLength,
+      });
+      break;
+    case "rightBottom":
+      var dragLengthX = (T_PAGE_X - e.touches[0].pageX) * DRAFG_MOVE_RATIO;
+      var dragLengthY = (T_PAGE_Y - e.touches[0].pageY) * DRAFG_MOVE_RATIO;
+
+      if (CUT_B + dragLengthY < 0) dragLengthY = -CUT_B;
+      if (CUT_R + dragLengthX < 0) dragLengthX = -CUT_R;
+      let cutB = CUT_B + dragLengthY;
+      let cutR = CUT_R + dragLengthX;
+
+      setData({
+        cutB: cutB,
+        cutR: cutR,
+      });
+      break;
+    default:
+      break;
+  }
+}
 
-    // 设置大小的时候触发的touchMove事件
-    dragMove(e) {
-      var _this = this;
-      var dragType = e.target.dataset.drag;
-      switch (dragType) {
-        case "right":
-          var dragLength = (T_PAGE_X - e.touches[0].pageX) * DRAFG_MOVE_RATIO;
-          if (CUT_R + dragLength < 0) dragLength = -CUT_R;
-          this.setData({
-            cutR: CUT_R + dragLength,
-          });
-          break;
-        case "left":
-          var dragLength = (T_PAGE_X - e.touches[0].pageX) * DRAFG_MOVE_RATIO;
-          if (CUT_L - dragLength < 0) dragLength = CUT_L;
-          if (CUT_L - dragLength > this.cropperW - this.cutR) dragLength = CUT_L - (this.cropperW - this.cutR);
-          this.setData({
-            cutL: CUT_L - dragLength,
-          });
-          break;
-        case "top":
-          var dragLength = (T_PAGE_Y - e.touches[0].pageY) * DRAFG_MOVE_RATIO;
-          if (CUT_T - dragLength < 0) dragLength = CUT_T;
-          if (CUT_T - dragLength > this.cropperH - this.cutB) dragLength = CUT_T - (this.cropperH - this.cutB);
-          this.setData({
-            cutT: CUT_T - dragLength,
-          });
-          break;
-        case "bottom":
-          var dragLength = (T_PAGE_Y - e.touches[0].pageY) * DRAFG_MOVE_RATIO;
-          if (CUT_B + dragLength < 0) dragLength = -CUT_B;
-          this.setData({
-            cutB: CUT_B + dragLength,
-          });
-          break;
-        case "rightBottom":
-          var dragLengthX = (T_PAGE_X - e.touches[0].pageX) * DRAFG_MOVE_RATIO;
-          var dragLengthY = (T_PAGE_Y - e.touches[0].pageY) * DRAFG_MOVE_RATIO;
-
-          if (CUT_B + dragLengthY < 0) dragLengthY = -CUT_B;
-          if (CUT_R + dragLengthX < 0) dragLengthX = -CUT_R;
-          let cutB = CUT_B + dragLengthY;
-          let cutR = CUT_R + dragLengthX;
-
-          this.setData({
-            cutB: cutB,
-            cutR: cutR,
-          });
-          break;
-        default:
-          break;
-      }
-    },
-  },
-};
+/**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+onReady(() => {
+  loadImage();
+});
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
 </script>
 
-<style>
+<style lang="scss">
 /* pages/uni-cropper/index.wxss */
 
-.uni-content-info {
-  /* position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		display: block;
-		align-items: center;
-		flex-direction: column; */
+.avatar-container {
+  .uni-content-header {
+    height: 44px;
+  }
 }
 
 .cropper-config {

src/pages/mine/help/index.vue

@@ -1,11 +1,14 @@
 <template>
   <view class="help-container">
-    <view v-for="(item, findex) in list" :key="findex" :title="item.title" class="list-title">
-      <view class="text-title"> <view :class="item.icon"></view>{{ item.title }} </view>
-      <view class="childList">
-        <view v-for="(child, zindex) in item.childList" :key="zindex" class="question" hover-class="hover" @click="handleText(child)">
-          <view class="text-item">{{ child.title }}</view>
-          <view class="line" v-if="zindex !== item.childList.length - 1"></view>
+    <view class="uni-content-header" :class="'bg-' + proxy.$settingStore.themeColor.name" :style="{ height: proxy.$settingStore.barHightTop }"></view>
+    <view class="uni-content-body">
+      <view class="list-title" v-for="(item, findex) in list" :key="findex" :title="item.title">
+        <view class="text-title"> <view :class="item.icon"></view>{{ item.title }} </view>
+        <view class="childList">
+          <view v-for="(child, zindex) in item.childList" :key="zindex" class="question" hover-class="hover" @click="handleText(child)">
+            <view class="text-item">{{ child.title }}</view>
+            <view class="line" v-if="zindex !== item.childList.length - 1"></view>
+          </view>
         </view>
       </view>
     </view>
@@ -14,7 +17,10 @@
 
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
-import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs } from "vue";
+import { ref, onMounted, inject, computed, shallowRef, reactive, getCurrentInstance, toRefs } from "vue";
+
+import useStores from "@/store/modules/user.js";
+const useStore = useStores();
 
 const { proxy } = getCurrentInstance();
 
@@ -63,50 +69,58 @@ const { list } = toRefs(data);
 function handleText(item) {
   proxy.$tab.navigateTo(`/pages/common/textview/index?title=${item.title}&content=${item.content}`);
 }
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
 </script>
 
 <style lang="scss" scoped>
 .help-container {
   margin-bottom: 100rpx;
-  padding: 30rpx;
-}
 
-.list-title {
-  margin-bottom: 30rpx;
-}
+  .uni-content-body {
+    padding: 30rpx;
 
-.childList {
-  background: #ffffff;
-  box-shadow: 0px 0px 10rpx rgba(193, 193, 193, 0.2);
-  border-radius: 16rpx;
-  margin-top: 10rpx;
-}
+    .list-title {
+      margin-bottom: 30rpx;
+    }
 
-.line {
-  width: 100%;
-  height: 1rpx;
-  background-color: #f5f5f5;
-}
+    .childList {
+      background: #ffffff;
+      box-shadow: 0px 0px 10rpx rgba(193, 193, 193, 0.2);
+      border-radius: 16rpx;
+      margin-top: 10rpx;
+    }
 
-.text-title {
-  color: #303133;
-  font-size: 32rpx;
-  font-weight: bold;
-  margin-left: 10rpx;
+    .line {
+      width: 100%;
+      height: 1rpx;
+      background-color: #f5f5f5;
+    }
 
-  .iconfont {
-    font-size: 16px;
-    margin-right: 10rpx;
-  }
-}
+    .text-title {
+      color: #303133;
+      font-size: 32rpx;
+      font-weight: bold;
+      margin-left: 10rpx;
 
-.text-item {
-  font-size: 28rpx;
-  padding: 24rpx;
-}
+      .iconfont {
+        font-size: 16px;
+        margin-right: 10rpx;
+      }
+    }
+
+    .text-item {
+      font-size: 28rpx;
+      padding: 24rpx;
+    }
 
-.question {
-  color: #606266;
-  font-size: 28rpx;
+    .question {
+      color: #606266;
+      font-size: 28rpx;
+    }
+  }
 }
 </style>

src/pages/mine/index.vue

@@ -1,13 +1,13 @@
 <template>
-  <view class="mine-container" :style="{ height: `${windowHeight}px` }">
+  <view class="mine-container">
     <!--顶部个人信息栏-->
-    <view class="header-section">
+    <view class="header-section" :class="'bg-' + proxy.$settingStore.themeColor.name" :style="{ paddingTop: proxy.$settingStore.StatusBar ? proxy.$settingStore.StatusBar + 44 + 'px' : '55px' }">
       <view class="flex padding justify-between">
         <view class="flex align-center">
-          <view v-if="!avatar" class="cu-avatar xl round bg-white">
+          <view v-if="!avatar" class="cu-avatar xl round bg-white" @click="handleToAvatar(1)">
             <view class="iconfont icon-people text-gray icon"></view>
           </view>
-          <image v-if="avatar" @click="handleToAvatar" :src="avatar" class="cu-avatar xl round" mode="widthFix"> </image>
+          <image v-if="avatar" @click="handleToAvatar(2)" :src="avatar" class="cu-avatar xl round"> </image>
           <view v-if="!data.name" @click="handleToLogin" class="login-tip"> 点击登录 </view>
           <view v-if="data.name" class="user-info">
             <view class="u_title"> {{ data.name }} </view>
@@ -34,25 +34,6 @@
     >
       <image class="mine-image" src="@/static/images/mine/arc.png"></image>
 
-      <!-- <view class="mine-actions grid col-4 text-center">
-        <view class="action-item" @click="handleJiaoLiuQun">
-          <view class="iconfont icon-friendfill text-pink icon"></view>
-          <text class="text">客服QQ</text>
-        </view>
-        <view class="action-item" @click="handleBuilding">
-          <view class="iconfont icon-service text-blue icon"></view>
-          <text class="text">在线客服</text>
-        </view>
-        <view class="action-item" @click="handleBuilding">
-          <view class="iconfont icon-community text-mauve icon"></view>
-          <text class="text">反馈社区</text>
-        </view>
-        <view class="action-item" @click="handleBuilding">
-          <view class="iconfont icon-dianzan text-green icon"></view>
-          <text class="text">点赞我们</text>
-        </view>
-      </view> -->
-
       <view class="menu-list">
         <view class="list-cell list-cell-arrow" @click="handleToEditInfo">
           <view class="menu-item-box">
@@ -85,7 +66,7 @@
           <view class="menu-item-box">
             <view class="iconfont icon-clean menu-icon"></view>
             <view>清理缓存</view>
-            <view style="margin: 0 15px 0 auto; font-size: 14px; color: #909399">{{ settings.$state.currentSize }}</view>
+            <view style="margin: 0 15px 0 auto; font-size: 14px; color: #909399">{{ proxy.$settingStore.currentSize }}</view>
           </view>
         </view>
         <view class="list-cell list-cell-arrow" @click="handleToUpgrade">
@@ -97,26 +78,64 @@
       </view>
 
       <view class="cu-list menu">
-        <view class="cu-item item-box">
+        <view class="cu-item" style="margin-top: 0; margin-bottom: 0">
+          <view class="content flex align-center">
+            <text class="iconfont ucicon-colorlens" :class="'text-' + proxy.$settingStore.themeColor.name"></text>
+            <view class="padding solid radius shadow-blur" :class="'bg-' + proxy.$settingStore.themeColor.name" style="margin-left: 10px"></view>
+            <view class="title" style="margin-left: 10px">
+              主题色：<text :class="'text-' + proxy.$settingStore.themeColor.name">{{ proxy.$settingStore.themeColor.title }}</text>
+            </view>
+          </view>
+          <view class="action">
+            <button class="cu-btn round shadow" @click="colorModal = true" :class="'bg-' + proxy.$settingStore.themeColor.name">
+              <text class="iconfont ucicon-colorlens"></text>
+              选择主题
+            </button>
+          </view>
+        </view>
+      </view>
+
+      <view class="cu-list menu">
+        <view class="cu-item">
           <view class="content text-center" @click="handleLogout">
             <text class="text-black">退出登录</text>
           </view>
         </view>
       </view>
     </view>
+
+    <!-- 选择颜色模态框 -->
+    <view class="cu-modal" :class="{ show: colorModal }">
+      <view class="cu-dialog">
+        <view class="cu-bar justify-end solid-bottom">
+          <view class="content">选择颜色</view>
+          <view class="action" @tap="colorModal = false">
+            <u-icon name="close" size="14"></u-icon>
+            <text class="cuIcon-close text-red"></text>
+          </view>
+        </view>
+        <view class="grid col-5 padding">
+          <view class="padding-xs" v-for="(item, index) in themeList" :key="index" @tap="SetColor(item)" :data-color="item.name">
+            <view class="padding-tb radius" :class="'bg-' + item.name">
+              {{ item.title }}
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
   </view>
 </template>
 
 <script setup>
 import config from "@/config";
 import storage from "@/utils/storage";
-import { onLoad, onShow, onHide, onLaunch, onNavigationBarButtonTap } from "@dcloudio/uni-app";
+import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
 
+import { uploadAvatar, updateUserProfile } from "@/api/system/user";
+
 import useStores from "@/store/modules/user.js";
-import settingStore from "@/store/modules/setting.js";
 const useStore = useStores();
-const settings = settingStore();
 
 const { proxy } = getCurrentInstance();
 
@@ -136,9 +155,21 @@ const data = reactive({
   coverTransform: "translateY(0px)",
   coverTransition: "0s",
   moving: false,
+
+  colorModal: false,
+  themeList: proxy.$constData.themeList,
 });
 
-const { coverTransform, coverTransition, moving } = toRefs(data);
+const { coverTransform, coverTransition, moving, colorModal, themeList } = toRefs(data);
+
+/**
+ * @主题颜色选择
+ */
+function SetColor(item) {
+  colorModal.value = false;
+  proxy.$settingStore.SET_THEMECOLOR(item);
+  proxy.$settingStore.systemThemeColor([1, 2]);
+}
 
 /**
  * @点击登录
@@ -147,11 +178,36 @@ function handleToLogin() {
   proxy.$tab.reLaunch("/pages/login");
 }
 
+/**
+ * @upload上传头像
+ * @api接口请求
+ */
+function uploadApi(res) {
+  let data = { name: "file", filePath: res.tempFilePaths[0] };
+  uploadAvatar(data).then((response) => {
+    useStore.$state.avatar = response.data.url;
+    updateUserProfile({
+      avatar: response.data.url,
+    }).then(() => {});
+  });
+}
+
 /**
  * @点击头像
  */
-function handleToAvatar() {
-  proxy.$tab.navigateTo("/pages/mine/avatar/index");
+function handleToAvatar(type) {
+  if (type == 1) {
+    uni.chooseImage({
+      count: 1, //默认9
+      sizeType: ["original", "compressed"], //可以指定是原图还是压缩图，默认二者都有
+      sourceType: ["album", "camera"], //从相册选择、摄像头
+      success: function (res) {
+        uploadApi(res);
+      },
+    });
+  } else if (type == 2) {
+    proxy.$tab.navigateTo("/pages/mine/avatar/index");
+  }
 }
 
 /**
@@ -217,6 +273,9 @@ let startY = 0,
   moveY = 0,
   pageAtTop = true;
 
+/**
+ * @触摸开始
+ */
 function coverTouchstart(e) {
   if (pageAtTop === false) {
     return;
@@ -224,6 +283,10 @@ function coverTouchstart(e) {
   coverTransition.value = "transform .1s linear";
   startY = e.touches[0].clientY;
 }
+
+/**
+ * @触摸移动
+ */
 function coverTouchmove(e) {
   moveY = e.touches[0].clientY;
   let moveDistance = moveY - startY;
@@ -239,6 +302,10 @@ function coverTouchmove(e) {
     coverTransform.value = `translateY(${moveDistance}px)`;
   }
 }
+
+/**
+ * @触摸结束
+ */
 function coverTouchend() {
   if (moving.value === false) {
     return;
@@ -248,25 +315,31 @@ function coverTouchend() {
   coverTransform.value = "translateY(0px)";
 }
 
+onShow(() => {});
+
+onReady(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1, 2]);
+});
+
 onLoad((options) => {});
 
 // 自定义导航事件
 onNavigationBarButtonTap((e) => {
-  console.log(e);
   if (e.float == "right") {
     proxy.$tab.navigateTo("/pages/mine/setting/index");
   }
 });
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .mine-container {
   width: 100%;
-  height: 100%;
+  height: 100vh;
+  background-color: #f8f8f8;
 
   .header-section {
     padding: 55px 15px 0 15px;
-    background-color: #149eff;
     color: white;
 
     .login-tip {
@@ -308,6 +381,9 @@ onNavigationBarButtonTap((e) => {
   .content-section {
     position: relative;
     margin-top: -85px;
+    // #ifdef H5
+    padding-bottom: 50px;
+    // #endif
     background-color: #f8f8f8;
 
     .mine-image {
@@ -338,9 +414,7 @@ onNavigationBarButtonTap((e) => {
     }
   }
 }
-</style>
 
-<style lang="scss" scoped>
 .item-box {
   background-color: #ffffff;
   margin: 30rpx;

src/pages/mine/info/index.vue

@@ -1,5 +1,13 @@
 <template>
-  <view class="container">
+  <view class="info-container">
+    <!--头像 + 背景-->
+    <view class="user-section" :class="'bg-' + proxy.$settingStore.themeColor.name" :style="{ paddingTop: proxy.$settingStore.barHightTop }">
+      <image class="bg" src="@/static/images/mine/user-bg.png"></image>
+      <view class="portrait-box">
+        <image v-if="!avatar" @click="handleToAvatar(1)" class="portrait" src="@/static/images/mine/missing-face.png"></image>
+        <image v-if="avatar" @click="handleToAvatar(2)" :src="avatar" class="portrait cu-avatar xl round"> </image>
+      </view>
+    </view>
     <!-- <uni-list>
       <uni-list-item showExtraIcon="true" :extraIcon="{ type: 'person-filled' }" title="昵称" :rightText="user.nickName" />
       <uni-list-item showExtraIcon="true" :extraIcon="{ type: 'phone-filled' }" title="手机号码" :rightText="user.phonenumber" />
@@ -30,15 +38,20 @@
 </template>
 
 <script setup>
-import { getUserProfile, updateUserProfile } from "@/api/system/user";
 import { onLoad, onShow, onHide, onReady, onLaunch, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, shallowRef, reactive, computed, getCurrentInstance, toRefs, onMounted, inject } from "vue";
 
+import { getUserProfile, uploadAvatar, updateUserProfile } from "@/api/system/user";
+
 import useStores from "@/store/modules/user.js";
 const useStore = useStores();
 
 const { proxy } = getCurrentInstance();
 
+const avatar = computed(() => {
+  return useStore.$state.avatar;
+});
+
 const data = reactive({
   name: useStore.$state.name,
   version: getApp().globalData.config.appInfo.version,
@@ -101,6 +114,38 @@ const roleGroup = ref("");
 const postGroup = ref("");
 const form = ref(null);
 
+/**
+ * @点击头像
+ */
+function handleToAvatar(type) {
+  if (type == 1) {
+    uni.chooseImage({
+      count: 1, //默认9
+      sizeType: ["original", "compressed"], //可以指定是原图还是压缩图，默认二者都有
+      sourceType: ["album", "camera"], //从相册选择、摄像头
+      success: function (res) {
+        uploadApi(res);
+      },
+    });
+  } else if (type == 2) {
+    proxy.$tab.navigateTo("/pages/mine/avatar/index");
+  }
+}
+
+/**
+ * @upload上传头像
+ * @api接口请求
+ */
+function uploadApi(res) {
+  let data = { name: "file", filePath: res.tempFilePaths[0] };
+  uploadAvatar(data).then((response) => {
+    useStore.$state.avatar = response.data.url;
+    updateUserProfile({
+      avatar: response.data.url,
+    }).then(() => {});
+  });
+}
+
 function getUser() {
   getUserProfile().then((response) => {
     user.value = response.data.user;
@@ -125,6 +170,11 @@ onLoad((options) => {
 onReady(() => {
   form.value.setRules(rules.value);
 });
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
 </script>
 
 <style lang="scss">
@@ -134,37 +184,65 @@ page {
 </style>
 
 <style lang="scss">
-.example {
-  padding: 15px;
-  background-color: #fff;
+.info-container {
+  .user-section {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 240px;
+    padding-top: 44px;
+    overflow: hidden;
+    position: relative;
+
+    .bg {
+      position: absolute;
+      left: 0;
+      top: 0;
+      width: 100vw;
+      opacity: 0.84;
+    }
+
+    .portrait {
+      position: relative;
+      width: 104px;
+      height: 104px;
+      border-radius: 50%;
+      border: 3px solid #fff;
+    }
+  }
+
+  .example {
+    padding: 15px;
+    background-color: #fff;
 
-  .edtiButtom {
-    font-size: 15px;
-    border-radius: 100px;
+    .edtiButtom {
+      font-size: 15px;
+      border-radius: 100px;
+    }
   }
-}
 
-.segmented-control {
-  margin-bottom: 15px;
-}
+  .segmented-control {
+    margin-bottom: 15px;
+  }
 
-.button-group {
-  margin-top: 15px;
-  display: flex;
-  justify-content: space-around;
-}
+  .button-group {
+    margin-top: 15px;
+    display: flex;
+    justify-content: space-around;
+  }
 
-.form-item {
-  display: flex;
-  align-items: center;
-  flex: 1;
-}
+  .form-item {
+    display: flex;
+    align-items: center;
+    flex: 1;
+  }
 
-.button {
-  display: flex;
-  align-items: center;
-  height: 35px;
-  line-height: 35px;
-  margin-left: 10px;
+  .button {
+    display: flex;
+    align-items: center;
+    height: 35px;
+    line-height: 35px;
+    margin-left: 10px;
+  }
 }
 </style>

src/pages/mine/pwd/index.vue

@@ -1,17 +1,20 @@
 <template>
   <view class="pwd-retrieve-container">
-    <uni-forms ref="form" :value="user" labelWidth="80px">
-      <uni-forms-item name="oldPassword" label="旧密码">
-        <uni-easyinput type="password" v-model="user.oldPassword" placeholder="请输入旧密码" />
-      </uni-forms-item>
-      <uni-forms-item name="newPassword" label="新密码">
-        <uni-easyinput type="password" v-model="user.newPassword" placeholder="请输入新密码" />
-      </uni-forms-item>
-      <uni-forms-item name="confirmPassword" label="确认密码">
-        <uni-easyinput type="password" v-model="user.confirmPassword" placeholder="请确认新密码" />
-      </uni-forms-item>
-      <button type="primary" @click="submit">提交</button>
-    </uni-forms>
+    <view class="uni-content-header" :class="'bg-' + proxy.$settingStore.themeColor.name" :style="{ height: proxy.$settingStore.barHightTop }"></view>
+    <view class="uni-content-body">
+      <uni-forms ref="form" :value="user" labelWidth="80px">
+        <uni-forms-item name="oldPassword" label="旧密码">
+          <uni-easyinput type="password" v-model="user.oldPassword" placeholder="请输入旧密码" />
+        </uni-forms-item>
+        <uni-forms-item name="newPassword" label="新密码">
+          <uni-easyinput type="password" v-model="user.newPassword" placeholder="请输入新密码" />
+        </uni-forms-item>
+        <uni-forms-item name="confirmPassword" label="确认密码">
+          <uni-easyinput type="password" v-model="user.confirmPassword" placeholder="请确认新密码" />
+        </uni-forms-item>
+        <button type="primary" @click="submit">提交</button>
+      </uni-forms>
+    </view>
   </view>
 </template>
 
@@ -21,6 +24,11 @@ import { updateUserPwd } from "@/api/system/user";
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs } from "vue";
 
+import useStores from "@/store/modules/user.js";
+const useStore = useStores();
+
+const { proxy } = getCurrentInstance();
+
 const data = reactive({
   user: {
     oldPassword: undefined,
@@ -63,11 +71,8 @@ const data = reactive({
     },
   },
 });
-
 const { user, rules } = toRefs(data);
 
-const { proxy } = getCurrentInstance();
-
 const form = ref(null);
 
 function submit() {
@@ -78,6 +83,11 @@ function submit() {
   });
 }
 
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+
 onReady(() => {
   form.value.setRules(rules.value);
 });
@@ -90,7 +100,7 @@ page {
 </style>
 
 <style lang="scss">
-.pwd-retrieve-container {
+.uni-content-body {
   padding-top: 36rpx;
   padding: 15px;
 }

src/pages/mine/setting/index.vue

@@ -32,7 +32,7 @@
         <view class="menu-item-box">
           <view class="iconfont icon-clean menu-icon"></view>
           <view>清理缓存</view>
-          <view style="margin: 0 15px 0 auto; font-size: 14px; color: #909399">{{ settings.$state.currentSize }}</view>
+          <view style="margin: 0 15px 0 auto; font-size: 14px; color: #909399">{{ proxy.$settingStore.currentSize }}</view>
         </view>
       </view>
       <view class="list-cell list-cell-arrow" @click="handleToUpgrade">
@@ -50,9 +50,7 @@ import { onLoad, onShow, onHide, onLaunch, onNavigationBarButtonTap } from "@dcl
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject } from "vue";
 
 import useStores from "@/store/modules/user.js";
-import settingStore from "@/store/modules/setting.js";
 const useStore = useStores();
-const settings = settingStore();
 
 const { proxy } = getCurrentInstance();
 
@@ -124,4 +122,9 @@ function handleLogout() {
 }
 
 onLoad((options) => {});
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
 </script>

src/pages/serveConfig.vue

@@ -117,20 +117,19 @@ function navigateTo() {
 onLoad((options) => {});
 </script>
 
-<style>
-page {
-  background-color: #ffffff;
-}
-</style>
-
 <style lang="scss" scoped>
 #serveConfig {
-  position: relative;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
   z-index: 1;
   width: 100%;
   padding: 0 40px;
   margin: auto;
   padding-top: 20%;
+  background-color: #ffffff;
 
   .top {
   }

src/pages/serveConfigSelect.vue

@@ -55,7 +55,6 @@ const { radiolist, radiovalue } = toRefs(dataList);
  * @获取serveList
  */
 
-
 /**
  * @切换单选
  * @按钮点击事件
@@ -158,20 +157,20 @@ onLoad((options) => {
 });
 </script>
 
-<style>
-page {
-  background-color: #ffffff;
-}
-</style>
-
 <style lang="scss" scoped>
 #serveConfig {
-  position: relative;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
   z-index: 1;
   width: 100%;
+  height: 100vh;
   padding: 0 40px;
   margin: auto;
   padding-top: 20%;
+  background-color: #ffffff;
 
   .top {
   }

src/pages/setting/funReport/funReport.vue

@@ -79,7 +79,7 @@ import { onLoad, onShow, onHide, onLaunch, onReachBottom, onNavigationBarButtonT
 import { ref, onMounted, inject, shallowRef, reactive, toRefs, watchEffect } from "vue";
 
 import useStore from "@/store/modules/user";
-import useXunJianStore from "@/store/modules/xunJian";
+import xunJianStore from "@/store/modules/xunJian";
 
 import { del, index } from "@/api/setting/funReport.js";
 

src/pages/setting/messagePush/messagePush.vue

@@ -22,7 +22,7 @@ import { onLoad, onShow, onHide, onLaunch } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, toRefs } from "vue";
 
 import useStore from "@/store/modules/user";
-import useXunJianStore from "@/store/modules/xunJian";
+import xunJianStore from "@/store/modules/xunJian";
 
 import { setperm } from "@/api/setting/index.js";
 

src/static/iconfont/iconfont.css

@@ -1,23 +1,10 @@
-/* @font-face {
-  font-family: 'iconfont'; 
-  src: url('https://at.alicdn.com/t/font_2394829_cpwu6e12c4.eot');
-  src: url('https://at.alicdn.com/t/font_2394829_cpwu6e12c4.eot?#iefix') format('embedded-opentype'),
-  url('https://at.alicdn.com/t/font_2394829_cpwu6e12c4.woff2') format('woff2'),
-  url('https://at.alicdn.com/t/font_2394829_cpwu6e12c4.woff') format('woff'),
-  url('https://at.alicdn.com/t/font_2394829_cpwu6e12c4.ttf') format('truetype'),
-  url('https://at.alicdn.com/t/font_2394829_cpwu6e12c4.svg#iconfont') format('svg');
-} */
-
-
 @font-face {
-  font-family: 'iconfont';
-  /* Project id 2394829 */
-  src: url('https://at.alicdn.com/t/font_2394829_ken0vmyss6a.woff2?t=1623131965202') format('woff2'),
-    url('https://at.alicdn.com/t/font_2394829_ken0vmyss6a.woff?t=1623131965202') format('woff'),
-    url('https://at.alicdn.com/t/font_2394829_ken0vmyss6a.ttf?t=1623131965202') format('truetype'),
+  font-family: "iconfont"; /* Project id 3620854 */
+  src: url('https://at.alicdn.com/t/c/font_3620854_br3ktl1o908.woff2?t=1683275654551') format('woff2'),
+       url('https://at.alicdn.com/t/c/font_3620854_br3ktl1o908.woff?t=1683275654551') format('woff'),
+       url('https://at.alicdn.com/t/c/font_3620854_br3ktl1o908.ttf?t=1683275654551') format('truetype');
 }
 
-
 .iconfont {
   font-family: "iconfont" !important;
   font-size: 16px;
@@ -26,59 +13,115 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.ucicon-shezhi:before {
+  content: "\e70f";
+}
 
-.icon-xingzhuang8:before {
-  content: "\e66b";
+.ucicon-yanzheng:before {
+  content: "\e86a";
 }
 
-.icon-daochu:before {
-  content: "\e613";
+.ucicon-phone:before {
+  content: "\e64f";
 }
 
-.icon-xiajiantou_huaban:before {
-  content: "\e63d";
+.ucicon-guanbi:before {
+  content: "\e610";
 }
 
-.icon-saoyisao:before {
-  content: "\e607";
+.ucicon-zhuye:before {
+  content: "\e64e";
 }
 
-.icon-dianhua1:before {
-  content: "\e61d";
+.ucicon-shezhi1:before {
+  content: "\e611";
 }
 
-.icon-daohang:before {
-  content: "\e612";
+.ucicon-xiaoxi:before {
+  content: "\e606";
+}
+
+.ucicon-circulation-full:before {
+  content: "\e858";
 }
 
-.icon-youjiantou:before {
+.ucicon-youjiantou:before {
   content: "\e629";
 }
 
-.icon-zhuye:before {
-  content: "\e64e";
+.ucicon-daohang:before {
+  content: "\e612";
 }
 
-.icon-shezhi:before {
-  content: "\e611";
+.ucicon-dianhua1:before {
+  content: "\e61d";
 }
 
-.icon-xiaoxi:before {
-  content: "\e606";
+.ucicon-saoyisao:before {
+  content: "\e607";
 }
 
-.icon-circulation-full:before {
-  content: "\e858";
+.ucicon-xiajiantou_huaban:before {
+  content: "\e63d";
 }
 
-.icon-yanzheng:before {
-  content: "\e86a";
+.ucicon-daochu:before {
+  content: "\e613";
 }
 
-.icon-phone:before {
-  content: "\e64f";
+.ucicon-xingzhuang8:before {
+  content: "\e66b";
+}
+
+.ucicon-dianzan:before {
+  content: "\e600";
+}
+
+.ucicon-fenxiang:before {
+  content: "\e60c";
+}
+
+.ucicon-shoucang1:before {
+  content: "\e62a";
+}
+
+.ucicon-xingzhuang13:before {
+  content: "\e66c";
+}
+
+.ucicon-xingzhuang12:before {
+  content: "\e66d";
+}
+
+.ucicon-xingzhuang14kaobei2:before {
+  content: "\e66e";
+}
+
+.ucicon-colorlens:before {
+  content: "\e64b";
+}
+
+.ucicon-filter:before {
+  content: "\e7c7";
+}
+
+.ucicon-appstore:before {
+  content: "\e792";
+}
+
+.ucicon-map:before {
+  content: "\e719";
+}
+
+.ucicon-info-circle-fill:before {
+  content: "\e844";
+}
+
+.ucicon-eye:before {
+  content: "\e78f";
+}
+
+.ucicon-eye-close:before {
+  content: "\e8ff";
 }
 
-.icon-guanbi:before {
-  content: "\e610";
-}

src/static/iconfont/uciconfont/iconfont.css

@@ -1,47 +0,0 @@
-@font-face {
-  font-family: "iconfont"; /* Project id 3620854 */
-  src: url('iconfont.woff2?t=1682565584492') format('woff2'),
-       url('iconfont.woff?t=1682565584492') format('woff'),
-       url('iconfont.ttf?t=1682565584492') format('truetype');
-}
-
-.iconfont {
-  font-family: "iconfont" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.ucicon-colorlens:before {
-  content: "\e64b";
-}
-
-.ucicon-shezhi:before {
-  content: "\e70f";
-}
-
-.ucicon-filter:before {
-  content: "\e7c7";
-}
-
-.ucicon-appstore:before {
-  content: "\e792";
-}
-
-.ucicon-map:before {
-  content: "\e719";
-}
-
-.ucicon-info-circle-fill:before {
-  content: "\e844";
-}
-
-.ucicon-eye:before {
-  content: "\e78f";
-}
-
-.ucicon-eye-close:before {
-  content: "\e8ff";
-}
-

src/static/scss/colorui.css

@@ -10,6 +10,9 @@
 /* ==================
         初始化
  ==================== */
+* {
+  touch-action: pan-y;
+}
 body {
   background-color: #f5f6f7;
   font-size: 28upx;

src/static/scss/public.scss

@@ -24,7 +24,7 @@ th {
   height: auto !important;
 }
 
-.el-calendar-table thead > th {
+.el-calendar-table thead>th {
   text-align: center;
 }
 
@@ -199,7 +199,7 @@ uni-input {
 //自写table表格样式-普通
 .tableType1 {
   .u-row:nth-child(1) {
-    > .u-col {
+    >.u-col {
       background-color: #f7f7f7;
     }
   }
@@ -210,11 +210,11 @@ uni-input {
     border: 1px #e5e5e5 solid;
     border-bottom: 0px;
 
-    > .u-col {
+    >.u-col {
       border-right: 1px #e5e5e5 solid;
     }
 
-    > .u-col:last-child {
+    >.u-col:last-child {
       border-right: 0px #e5e5e5 solid;
     }
   }
@@ -225,6 +225,7 @@ uni-input {
     }
   }
 }
+
 //自写table表格样式-横向
 .tableType2 {
   .u-row {
@@ -234,15 +235,15 @@ uni-input {
     border-bottom: 0px;
     background-color: #f7f7f7;
 
-    > .u-col {
+    >.u-col {
       border-right: 1px #e5e5e5 solid;
     }
 
-    > .u-col:nth-child(even) {
+    >.u-col:nth-child(even) {
       background-color: #ffffff;
     }
 
-    > .u-col:last-child {
+    >.u-col:last-child {
       border-right: 0px;
     }
   }
@@ -250,4 +251,4 @@ uni-input {
   .u-row:last-child {
     border-bottom: 1px #e5e5e5 solid;
   }
-}
+}

src/store/modules/setting.js

@@ -8,6 +8,11 @@ const settingStore = defineStore("setting", {
         currentSize: "",//APP缓存
 
         themeColor: storage.get(constant.themeColor),//主题
+
+        barHeight: 0,
+        StatusBar: 0,
+        barHightTop: "",
+
     }),
     persist: {
         // 自定义数据持久化方式
@@ -26,17 +31,6 @@ const settingStore = defineStore("setting", {
          * @系统主题颜色
          */
         systemThemeColor(type) {
-            if (type.includes(1)) {
-                uni.setNavigationBarColor({
-                    frontColor: "#ffffff",
-                    backgroundColor: this.themeColor.color,
-                    animation: {
-                        duration: 400,
-                        timingFunc: "easeIn",
-                    },
-                });
-            }
-
             if (type.includes(2)) {
                 uni.setTabBarStyle({
                     selectedColor: this.themeColor.color,
@@ -50,6 +44,33 @@ const settingStore = defineStore("setting", {
                     });
                 });
             }
+
+            if (type.includes(1)) {
+                uni.setNavigationBarColor({
+                    frontColor: "#ffffff",
+                    backgroundColor: this.themeColor.color,
+                    animation: {
+                        duration: 400,
+                        timingFunc: "easeIn",
+                    },
+                });
+            }
+        },
+
+        /**
+         * @动态获取屏幕头部高度
+         */
+        systemHeightTop() {
+            let systemInfo = uni.getSystemInfoSync();
+            var statusBarHeight = systemInfo.statusBarHeight
+            this.StatusBar = statusBarHeight
+            this.barHightTop = this.StatusBar ? this.StatusBar + 44 + 'px' : '44px'
+
+            //#ifdef MP
+            let custom = wx.getMenuButtonBoundingClientRect();
+            let CustomBar = custom.bottom + custom.top - systemInfo.statusBarHeight;
+            this.barHeight = CustomBar || 0
+            //#endif
         },
 
         SET_THEMECOLOR(themeColor) {