Merge branch '165' of uskycloud/usky-web-mobile into master

README.md

@@ -1,10 +1,4 @@
 # sass移动端
-### 文档（吉超博、詹叶俊）
-### https://docs.apipost.cn/preview/61b2861af42252f6/a453b7fa01ec4c0f?target_id=2c54712b-9b38-4642-b3a9-7205d58072ca
-
-
-### 坐标系（GCJ02坐标系:即火星坐标系,是由中国国家测绘局制订的地理信息系统的坐标系统、
-
 
 ### 账号：fire_admin
 ### 密码：FIRE_admin123

package.json

@@ -48,13 +48,11 @@
         "@dcloudio/uni-mp-toutiao": "3.0.0-alpha-3050320220729001",
         "@dcloudio/uni-mp-weixin": "3.0.0-alpha-3050320220729001",
         "@dcloudio/uni-quickapp-webview": "3.0.0-alpha-3050320220729001",
-        "@element-plus/icons-vue": "^2.0.9",
         "echarts": "^5.3.3",
-        "element-plus": "^2.2.12",
         "node-sass": "^7.0.1",
         "pinia": "^2.0.17",
         "pinia-plugin-persistedstate": "^2.1.1",
-        "vue": "^3.2.37",
+        "vue": "^3.2.47",
         "vue-echarts": "^6.2.3",
         "vue-i18n": "^9.1.9",
         "vue-json-excel": "^0.3.0",

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, onMounted, watchEffect } from "vue";
-import { onLoad, onShow, onHide, onLaunch } from "@dcloudio/uni-app";
+import { defineComponent, getCurrentInstance, inject, nextTick, onMounted, watchEffect } from "vue";
+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,28 +39,41 @@ watchEffect(() => {
   //#endif
 });
 
-onShow(() => {
-  console.log("App Show");
-});
-
-onHide(() => {
-  console.log("App Hide");
-});
-
 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.eyIiOjEwMzIsInVzZXJfaWQiOjYzLCJ1c2VyX2tleSI6IjU3ODkxOTMxNDRiMjRhMTI4MzUyZjk3YTM1MjhlYjkyIiwidXNlcm5hbWUiOiJmaHMxIn0.VOaV8pB_yDn1sYxiYK3NlyzsD_65fjEaQrIhD1QitRFCmASnEOuVgKz_msGiQXtperasBfRTzyJDwE9T9Sw2Zw"
+  // );
+  // proxy.$tab.reLaunch("/pages/mine/index");
+  // proxy.$tab.reLaunch("/pages/index");
+
   initApp();
 });
+
+onReady(() => {});
+
+onShow(() => {
+  console.log("App Show");
+});
+
+onHide(() => {
+  console.log("App Hide");
+});
 </script>
 
 <style lang="scss">
 @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">
@@ -67,4 +83,21 @@ uni-page-body,
 uni-page-refresh {
   height: 100%;
 }
+
+//默认返回按钮样式
+:deep(.uni-page-head-btn) {
+  background-color: rgba(0, 0, 0, 0) !important;
+}
+
+//默认头部导航title样式
+:deep(.uni-page-head__title) {
+  font-size: 16px;
+  font-weight: bold;
+}
+
+//uview-plus导航栏title样式
+:deep(.u-navbar__content__title) {
+  font-size: 16px;
+  font-weight: bold;
+}
 </style>

src/api/system/user.js

@@ -34,8 +34,8 @@ export function updateUserProfile(data) {
 // 用户头像上传
 export function uploadAvatar(data) {
   return upload({
-    url: '/system/user/profile/avatar',
+    url: "/service-file/upload",
     name: data.name,
-    filePath: data.filePath
-  })
-}
+    filePath: data.filePath,
+  });
+}

src/components/oa-calendar/calendar.js

@@ -0,0 +1,546 @@
+/**
+* @1900-2100区间内的公历、农历互转
+* @charset UTF-8
+* @github  https://github.com/jjonline/calendar.js
+* @Author  Jea杨(JJonline@JJonline.Cn)
+* @Time    2014-7-21
+* @Time    2016-8-13 Fixed 2033hex、Attribution Annals
+* @Time    2016-9-25 Fixed lunar LeapMonth Param Bug
+* @Time    2017-7-24 Fixed use getTerm Func Param Error.use solar year,NOT lunar year
+* @Version 1.0.3
+* @公历转农历：calendar.solar2lunar(1987,11,01); //[you can ignore params of prefix 0]
+* @农历转公历：calendar.lunar2solar(1987,09,10); //[you can ignore params of prefix 0]
+*/
+/* eslint-disable */
+var calendar = {
+
+  /**
+      * 农历1900-2100的润大小信息表
+      * @Array Of Property
+      * @return Hex
+      */
+  lunarInfo: [0x04bd8, 0x04ae0, 0x0a570, 0x054d5, 0x0d260, 0x0d950, 0x16554, 0x056a0, 0x09ad0, 0x055d2, // 1900-1909
+    0x04ae0, 0x0a5b6, 0x0a4d0, 0x0d250, 0x1d255, 0x0b540, 0x0d6a0, 0x0ada2, 0x095b0, 0x14977, // 1910-1919
+    0x04970, 0x0a4b0, 0x0b4b5, 0x06a50, 0x06d40, 0x1ab54, 0x02b60, 0x09570, 0x052f2, 0x04970, // 1920-1929
+    0x06566, 0x0d4a0, 0x0ea50, 0x06e95, 0x05ad0, 0x02b60, 0x186e3, 0x092e0, 0x1c8d7, 0x0c950, // 1930-1939
+    0x0d4a0, 0x1d8a6, 0x0b550, 0x056a0, 0x1a5b4, 0x025d0, 0x092d0, 0x0d2b2, 0x0a950, 0x0b557, // 1940-1949
+    0x06ca0, 0x0b550, 0x15355, 0x04da0, 0x0a5b0, 0x14573, 0x052b0, 0x0a9a8, 0x0e950, 0x06aa0, // 1950-1959
+    0x0aea6, 0x0ab50, 0x04b60, 0x0aae4, 0x0a570, 0x05260, 0x0f263, 0x0d950, 0x05b57, 0x056a0, // 1960-1969
+    0x096d0, 0x04dd5, 0x04ad0, 0x0a4d0, 0x0d4d4, 0x0d250, 0x0d558, 0x0b540, 0x0b6a0, 0x195a6, // 1970-1979
+    0x095b0, 0x049b0, 0x0a974, 0x0a4b0, 0x0b27a, 0x06a50, 0x06d40, 0x0af46, 0x0ab60, 0x09570, // 1980-1989
+    0x04af5, 0x04970, 0x064b0, 0x074a3, 0x0ea50, 0x06b58, 0x05ac0, 0x0ab60, 0x096d5, 0x092e0, // 1990-1999
+    0x0c960, 0x0d954, 0x0d4a0, 0x0da50, 0x07552, 0x056a0, 0x0abb7, 0x025d0, 0x092d0, 0x0cab5, // 2000-2009
+    0x0a950, 0x0b4a0, 0x0baa4, 0x0ad50, 0x055d9, 0x04ba0, 0x0a5b0, 0x15176, 0x052b0, 0x0a930, // 2010-2019
+    0x07954, 0x06aa0, 0x0ad50, 0x05b52, 0x04b60, 0x0a6e6, 0x0a4e0, 0x0d260, 0x0ea65, 0x0d530, // 2020-2029
+    0x05aa0, 0x076a3, 0x096d0, 0x04afb, 0x04ad0, 0x0a4d0, 0x1d0b6, 0x0d250, 0x0d520, 0x0dd45, // 2030-2039
+    0x0b5a0, 0x056d0, 0x055b2, 0x049b0, 0x0a577, 0x0a4b0, 0x0aa50, 0x1b255, 0x06d20, 0x0ada0, // 2040-2049
+    /** Add By JJonline@JJonline.Cn**/
+    0x14b63, 0x09370, 0x049f8, 0x04970, 0x064b0, 0x168a6, 0x0ea50, 0x06b20, 0x1a6c4, 0x0aae0, // 2050-2059
+    0x0a2e0, 0x0d2e3, 0x0c960, 0x0d557, 0x0d4a0, 0x0da50, 0x05d55, 0x056a0, 0x0a6d0, 0x055d4, // 2060-2069
+    0x052d0, 0x0a9b8, 0x0a950, 0x0b4a0, 0x0b6a6, 0x0ad50, 0x055a0, 0x0aba4, 0x0a5b0, 0x052b0, // 2070-2079
+    0x0b273, 0x06930, 0x07337, 0x06aa0, 0x0ad50, 0x14b55, 0x04b60, 0x0a570, 0x054e4, 0x0d160, // 2080-2089
+    0x0e968, 0x0d520, 0x0daa0, 0x16aa6, 0x056d0, 0x04ae0, 0x0a9d4, 0x0a2d0, 0x0d150, 0x0f252, // 2090-2099
+    0x0d520], // 2100
+
+  /**
+      * 公历每个月份的天数普通表
+      * @Array Of Property
+      * @return Number
+      */
+  solarMonth: [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31],
+
+  /**
+      * 天干地支之天干速查表
+      * @Array Of Property trans["甲","乙","丙","丁","戊","己","庚","辛","壬","癸"]
+      * @return Cn string
+      */
+  Gan: ['\u7532', '\u4e59', '\u4e19', '\u4e01', '\u620a', '\u5df1', '\u5e9a', '\u8f9b', '\u58ec', '\u7678'],
+
+  /**
+      * 天干地支之地支速查表
+      * @Array Of Property
+      * @trans["子","丑","寅","卯","辰","巳","午","未","申","酉","戌","亥"]
+      * @return Cn string
+      */
+  Zhi: ['\u5b50', '\u4e11', '\u5bc5', '\u536f', '\u8fb0', '\u5df3', '\u5348', '\u672a', '\u7533', '\u9149', '\u620c', '\u4ea5'],
+
+  /**
+      * 天干地支之地支速查表<=>生肖
+      * @Array Of Property
+      * @trans["鼠","牛","虎","兔","龙","蛇","马","羊","猴","鸡","狗","猪"]
+      * @return Cn string
+      */
+  Animals: ['\u9f20', '\u725b', '\u864e', '\u5154', '\u9f99', '\u86c7', '\u9a6c', '\u7f8a', '\u7334', '\u9e21', '\u72d7', '\u732a'],
+
+  /**
+      * 24节气速查表
+      * @Array Of Property
+      * @trans["小寒","大寒","立春","雨水","惊蛰","春分","清明","谷雨","立夏","小满","芒种","夏至","小暑","大暑","立秋","处暑","白露","秋分","寒露","霜降","立冬","小雪","大雪","冬至"]
+      * @return Cn string
+      */
+  solarTerm: ['\u5c0f\u5bd2', '\u5927\u5bd2', '\u7acb\u6625', '\u96e8\u6c34', '\u60ca\u86f0', '\u6625\u5206', '\u6e05\u660e', '\u8c37\u96e8', '\u7acb\u590f', '\u5c0f\u6ee1', '\u8292\u79cd', '\u590f\u81f3', '\u5c0f\u6691', '\u5927\u6691', '\u7acb\u79cb', '\u5904\u6691', '\u767d\u9732', '\u79cb\u5206', '\u5bd2\u9732', '\u971c\u964d', '\u7acb\u51ac', '\u5c0f\u96ea', '\u5927\u96ea', '\u51ac\u81f3'],
+
+  /**
+      * 1900-2100各年的24节气日期速查表
+      * @Array Of Property
+      * @return 0x string For splice
+      */
+  sTermInfo: ['9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f',
+    '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f',
+    'b027097bd097c36b0b6fc9274c91aa', '9778397bd19801ec9210c965cc920e', '97b6b97bd19801ec95f8c965cc920f',
+    '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd197c36c9210c9274c91aa',
+    '97b6b97bd19801ec95f8c965cc920e', '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec95f8c965cc920e', '97bcf97c3598082c95f8e1cfcc920f',
+    '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f',
+    '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf97c359801ec95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd097bd07f595b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9210c8dc2', '9778397bd19801ec9210c9274c920e', '97b6b97bd19801ec95f8c965cc920f',
+    '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+    '97b6b97bd19801ec95f8c965cc920f', '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bd07f1487f595b0b0bc920fb0722',
+    '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+    '97bcf7f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b97bd19801ec9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9210c91aa', '97b6b97bd197c36c9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+    '97b6b7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+    '9778397bd097c36b0b70c9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+    '97b6b7f0e47f531b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '9778397bd097c36b0b6fc9210c91aa', '97b6b7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '977837f0e37f149b0723b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c35b0b6fc9210c8dc2',
+    '977837f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+    '7f0e397bd097c35b0b6fc9210c8dc2', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+    '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+    '977837f0e37f14998082b0723b06bd', '7f07e7f0e37f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f595b0b0bb0b6fb0722', '7f0e37f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e37f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35',
+    '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+    '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f149b0723b0787b0721',
+    '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0723b06bd',
+    '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722', '7f0e37f0e366aa89801eb072297c35',
+    '7ec967f0e37f14998082b0723b06bd', '7f07e7f0e37f14998083b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+    '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14898082b0723b02d5', '7f07e7f0e37f14998082b0787b0721',
+    '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66aa89801e9808297c35', '665f67f0e37f14898082b0723b02d5',
+    '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66a449801e9808297c35',
+    '665f67f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+    '7f0e36665b66a449801e9808297c35', '665f67f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+    '7f07e7f0e47f531b0723b0b6fb0721', '7f0e26665b66a449801e9808297c35', '665f67f0e37f1489801eb072297c35',
+    '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722'],
+
+  /**
+      * 数字转中文速查表
+      * @Array Of Property
+      * @trans ['日','一','二','三','四','五','六','七','八','九','十']
+      * @return Cn string
+      */
+  nStr1: ['\u65e5', '\u4e00', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341'],
+
+  /**
+      * 日期转农历称呼速查表
+      * @Array Of Property
+      * @trans ['初','十','廿','卅']
+      * @return Cn string
+      */
+  nStr2: ['\u521d', '\u5341', '\u5eff', '\u5345'],
+
+  /**
+      * 月份转农历称呼速查表
+      * @Array Of Property
+      * @trans ['正','一','二','三','四','五','六','七','八','九','十','冬','腊']
+      * @return Cn string
+      */
+  nStr3: ['\u6b63', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341', '\u51ac', '\u814a'],
+
+  /**
+      * 返回农历y年一整年的总天数
+      * @param lunar Year
+      * @return Number
+      * @eg:var count = calendar.lYearDays(1987) ;//count=387
+      */
+  lYearDays: function (y) {
+    var i; var sum = 348
+    for (i = 0x8000; i > 0x8; i >>= 1) { sum += (this.lunarInfo[y - 1900] & i) ? 1 : 0 }
+    return (sum + this.leapDays(y))
+  },
+
+  /**
+      * 返回农历y年闰月是哪个月；若y年没有闰月 则返回0
+      * @param lunar Year
+      * @return Number (0-12)
+      * @eg:var leapMonth = calendar.leapMonth(1987) ;//leapMonth=6
+      */
+  leapMonth: function (y) { // 闰字编码 \u95f0
+    return (this.lunarInfo[y - 1900] & 0xf)
+  },
+
+  /**
+      * 返回农历y年闰月的天数 若该年没有闰月则返回0
+      * @param lunar Year
+      * @return Number (0、29、30)
+      * @eg:var leapMonthDay = calendar.leapDays(1987) ;//leapMonthDay=29
+      */
+  leapDays: function (y) {
+    if (this.leapMonth(y)) {
+      return ((this.lunarInfo[y - 1900] & 0x10000) ? 30 : 29)
+    }
+    return (0)
+  },
+
+  /**
+      * 返回农历y年m月（非闰月）的总天数，计算m为闰月时的天数请使用leapDays方法
+      * @param lunar Year
+      * @return Number (-1、29、30)
+      * @eg:var MonthDay = calendar.monthDays(1987,9) ;//MonthDay=29
+      */
+  monthDays: function (y, m) {
+    if (m > 12 || m < 1) { return -1 }// 月份参数从1至12，参数错误返回-1
+    return ((this.lunarInfo[y - 1900] & (0x10000 >> m)) ? 30 : 29)
+  },
+
+  /**
+      * 返回公历(!)y年m月的天数
+      * @param solar Year
+      * @return Number (-1、28、29、30、31)
+      * @eg:var solarMonthDay = calendar.leapDays(1987) ;//solarMonthDay=30
+      */
+  solarDays: function (y, m) {
+    if (m > 12 || m < 1) { return -1 } // 若参数错误 返回-1
+    var ms = m - 1
+    if (ms == 1) { // 2月份的闰平规律测算后确认返回28或29
+      return (((y % 4 == 0) && (y % 100 != 0) || (y % 400 == 0)) ? 29 : 28)
+    } else {
+      return (this.solarMonth[ms])
+    }
+  },
+
+  /**
+     * 农历年份转换为干支纪年
+     * @param  lYear 农历年的年份数
+     * @return Cn string
+     */
+  toGanZhiYear: function (lYear) {
+    var ganKey = (lYear - 3) % 10
+    var zhiKey = (lYear - 3) % 12
+    if (ganKey == 0) ganKey = 10// 如果余数为0则为最后一个天干
+    if (zhiKey == 0) zhiKey = 12// 如果余数为0则为最后一个地支
+    return this.Gan[ganKey - 1] + this.Zhi[zhiKey - 1]
+  },
+
+  /**
+     * 公历月、日判断所属星座
+     * @param  cMonth [description]
+     * @param  cDay [description]
+     * @return Cn string
+     */
+  toAstro: function (cMonth, cDay) {
+    var s = '\u9b54\u7faf\u6c34\u74f6\u53cc\u9c7c\u767d\u7f8a\u91d1\u725b\u53cc\u5b50\u5de8\u87f9\u72ee\u5b50\u5904\u5973\u5929\u79e4\u5929\u874e\u5c04\u624b\u9b54\u7faf'
+    var arr = [20, 19, 21, 21, 21, 22, 23, 23, 23, 23, 22, 22]
+    return s.substr(cMonth * 2 - (cDay < arr[cMonth - 1] ? 2 : 0), 2) + '\u5ea7'// 座
+  },
+
+  /**
+      * 传入offset偏移量返回干支
+      * @param offset 相对甲子的偏移量
+      * @return Cn string
+      */
+  toGanZhi: function (offset) {
+    return this.Gan[offset % 10] + this.Zhi[offset % 12]
+  },
+
+  /**
+      * 传入公历(!)y年获得该年第n个节气的公历日期
+      * @param y公历年(1900-2100)；n二十四节气中的第几个节气(1~24)；从n=1(小寒)算起
+      * @return day Number
+      * @eg:var _24 = calendar.getTerm(1987,3) ;//_24=4;意即1987年2月4日立春
+      */
+  getTerm: function (y, n) {
+    if (y < 1900 || y > 2100) { return -1 }
+    if (n < 1 || n > 24) { return -1 }
+    var _table = this.sTermInfo[y - 1900]
+    var _info = [
+      parseInt('0x' + _table.substr(0, 5)).toString(),
+      parseInt('0x' + _table.substr(5, 5)).toString(),
+      parseInt('0x' + _table.substr(10, 5)).toString(),
+      parseInt('0x' + _table.substr(15, 5)).toString(),
+      parseInt('0x' + _table.substr(20, 5)).toString(),
+      parseInt('0x' + _table.substr(25, 5)).toString()
+    ]
+    var _calday = [
+      _info[0].substr(0, 1),
+      _info[0].substr(1, 2),
+      _info[0].substr(3, 1),
+      _info[0].substr(4, 2),
+
+      _info[1].substr(0, 1),
+      _info[1].substr(1, 2),
+      _info[1].substr(3, 1),
+      _info[1].substr(4, 2),
+
+      _info[2].substr(0, 1),
+      _info[2].substr(1, 2),
+      _info[2].substr(3, 1),
+      _info[2].substr(4, 2),
+
+      _info[3].substr(0, 1),
+      _info[3].substr(1, 2),
+      _info[3].substr(3, 1),
+      _info[3].substr(4, 2),
+
+      _info[4].substr(0, 1),
+      _info[4].substr(1, 2),
+      _info[4].substr(3, 1),
+      _info[4].substr(4, 2),
+
+      _info[5].substr(0, 1),
+      _info[5].substr(1, 2),
+      _info[5].substr(3, 1),
+      _info[5].substr(4, 2)
+    ]
+    return parseInt(_calday[n - 1])
+  },
+
+  /**
+      * 传入农历数字月份返回汉语通俗表示法
+      * @param lunar month
+      * @return Cn string
+      * @eg:var cnMonth = calendar.toChinaMonth(12) ;//cnMonth='腊月'
+      */
+  toChinaMonth: function (m) { // 月 => \u6708
+    if (m > 12 || m < 1) { return -1 } // 若参数错误 返回-1
+    var s = this.nStr3[m - 1]
+    s += '\u6708'// 加上月字
+    return s
+  },
+
+  /**
+      * 传入农历日期数字返回汉字表示法
+      * @param lunar day
+      * @return Cn string
+      * @eg:var cnDay = calendar.toChinaDay(21) ;//cnMonth='廿一'
+      */
+  toChinaDay: function (d) { // 日 => \u65e5
+    var s
+    switch (d) {
+      case 10:
+        s = '\u521d\u5341'; break
+      case 20:
+        s = '\u4e8c\u5341'; break
+        break
+      case 30:
+        s = '\u4e09\u5341'; break
+        break
+      default :
+        s = this.nStr2[Math.floor(d / 10)]
+        s += this.nStr1[d % 10]
+    }
+    return (s)
+  },
+
+  /**
+      * 年份转生肖[!仅能大致转换] => 精确划分生肖分界线是“立春”
+      * @param y year
+      * @return Cn string
+      * @eg:var animal = calendar.getAnimal(1987) ;//animal='兔'
+      */
+  getAnimal: function (y) {
+    return this.Animals[(y - 4) % 12]
+  },
+
+  /**
+      * 传入阳历年月日获得详细的公历、农历object信息 <=>JSON
+      * @param y  solar year
+      * @param m  solar month
+      * @param d  solar day
+      * @return JSON object
+      * @eg:console.log(calendar.solar2lunar(1987,11,01));
+      */
+  solar2lunar: function (y, m, d) { // 参数区间1900.1.31~2100.12.31
+    // 年份限定、上限
+    if (y < 1900 || y > 2100) {
+      return -1// undefined转换为数字变为NaN
+    }
+    // 公历传参最下限
+    if (y == 1900 && m == 1 && d < 31) {
+      return -1
+    }
+    // 未传参  获得当天
+    if (!y) {
+      var objDate = new Date()
+    } else {
+      var objDate = new Date(y, parseInt(m) - 1, d)
+    }
+    var i; var leap = 0; var temp = 0
+    // 修正ymd参数
+    var y = objDate.getFullYear()
+    var m = objDate.getMonth() + 1
+    var d = objDate.getDate()
+    var offset = (Date.UTC(objDate.getFullYear(), objDate.getMonth(), objDate.getDate()) - Date.UTC(1900, 0, 31)) / 86400000
+    for (i = 1900; i < 2101 && offset > 0; i++) {
+      temp = this.lYearDays(i)
+      offset -= temp
+    }
+    if (offset < 0) {
+      offset += temp; i--
+    }
+
+    // 是否今天
+    var isTodayObj = new Date()
+    var isToday = false
+    if (isTodayObj.getFullYear() == y && isTodayObj.getMonth() + 1 == m && isTodayObj.getDate() == d) {
+      isToday = true
+    }
+    // 星期几
+    var nWeek = objDate.getDay()
+    var cWeek = this.nStr1[nWeek]
+    // 数字表示周几顺应天朝周一开始的惯例
+    if (nWeek == 0) {
+      nWeek = 7
+    }
+    // 农历年
+    var year = i
+    var leap = this.leapMonth(i) // 闰哪个月
+    var isLeap = false
+
+    // 效验闰月
+    for (i = 1; i < 13 && offset > 0; i++) {
+      // 闰月
+      if (leap > 0 && i == (leap + 1) && isLeap == false) {
+        --i
+        isLeap = true; temp = this.leapDays(year) // 计算农历闰月天数
+      } else {
+        temp = this.monthDays(year, i)// 计算农历普通月天数
+      }
+      // 解除闰月
+      if (isLeap == true && i == (leap + 1)) { isLeap = false }
+      offset -= temp
+    }
+    // 闰月导致数组下标重叠取反
+    if (offset == 0 && leap > 0 && i == leap + 1) {
+      if (isLeap) {
+        isLeap = false
+      } else {
+        isLeap = true; --i
+      }
+    }
+    if (offset < 0) {
+      offset += temp; --i
+    }
+    // 农历月
+    var month = i
+    // 农历日
+    var day = offset + 1
+    // 天干地支处理
+    var sm = m - 1
+    var gzY = this.toGanZhiYear(year)
+
+    // 当月的两个节气
+    // bugfix-2017-7-24 11:03:38 use lunar Year Param `y` Not `year`
+    var firstNode = this.getTerm(y, (m * 2 - 1))// 返回当月「节」为几日开始
+    var secondNode = this.getTerm(y, (m * 2))// 返回当月「节」为几日开始
+
+    // 依据12节气修正干支月
+    var gzM = this.toGanZhi((y - 1900) * 12 + m + 11)
+    if (d >= firstNode) {
+      gzM = this.toGanZhi((y - 1900) * 12 + m + 12)
+    }
+
+    // 传入的日期的节气与否
+    var isTerm = false
+    var Term = null
+    if (firstNode == d) {
+      isTerm = true
+      Term = this.solarTerm[m * 2 - 2]
+    }
+    if (secondNode == d) {
+      isTerm = true
+      Term = this.solarTerm[m * 2 - 1]
+    }
+    // 日柱 当月一日与 1900/1/1 相差天数
+    var dayCyclical = Date.UTC(y, sm, 1, 0, 0, 0, 0) / 86400000 + 25567 + 10
+    var gzD = this.toGanZhi(dayCyclical + d - 1)
+    // 该日期所属的星座
+    var astro = this.toAstro(m, d)
+
+    return { 'lYear': year, 'lMonth': month, 'lDay': day, 'Animal': this.getAnimal(year), 'IMonthCn': (isLeap ? '\u95f0' : '') + this.toChinaMonth(month), 'IDayCn': this.toChinaDay(day), 'cYear': y, 'cMonth': m, 'cDay': d, 'gzYear': gzY, 'gzMonth': gzM, 'gzDay': gzD, 'isToday': isToday, 'isLeap': isLeap, 'nWeek': nWeek, 'ncWeek': '\u661f\u671f' + cWeek, 'isTerm': isTerm, 'Term': Term, 'astro': astro }
+  },
+
+  /**
+      * 传入农历年月日以及传入的月份是否闰月获得详细的公历、农历object信息 <=>JSON
+      * @param y  lunar year
+      * @param m  lunar month
+      * @param d  lunar day
+      * @param isLeapMonth  lunar month is leap or not.[如果是农历闰月第四个参数赋值true即可]
+      * @return JSON object
+      * @eg:console.log(calendar.lunar2solar(1987,9,10));
+      */
+  lunar2solar: function (y, m, d, isLeapMonth) { // 参数区间1900.1.31~2100.12.1
+    var isLeapMonth = !!isLeapMonth
+    var leapOffset = 0
+    var leapMonth = this.leapMonth(y)
+    var leapDay = this.leapDays(y)
+    if (isLeapMonth && (leapMonth != m)) { return -1 }// 传参要求计算该闰月公历 但该年得出的闰月与传参的月份并不同
+    if (y == 2100 && m == 12 && d > 1 || y == 1900 && m == 1 && d < 31) { return -1 }// 超出了最大极限值
+    var day = this.monthDays(y, m)
+    var _day = day
+    // bugFix 2016-9-25
+    // if month is leap, _day use leapDays method
+    if (isLeapMonth) {
+      _day = this.leapDays(y, m)
+    }
+    if (y < 1900 || y > 2100 || d > _day) { return -1 }// 参数合法性效验
+
+    // 计算农历的时间差
+    var offset = 0
+    for (var i = 1900; i < y; i++) {
+      offset += this.lYearDays(i)
+    }
+    var leap = 0; var isAdd = false
+    for (var i = 1; i < m; i++) {
+      leap = this.leapMonth(y)
+      if (!isAdd) { // 处理闰月
+        if (leap <= i && leap > 0) {
+          offset += this.leapDays(y); isAdd = true
+        }
+      }
+      offset += this.monthDays(y, i)
+    }
+    // 转换闰月农历 需补充该年闰月的前一个月的时差
+    if (isLeapMonth) { offset += day }
+    // 1900年农历正月一日的公历时间为1900年1月30日0时0分0秒(该时间也是本农历的最开始起始点)
+    var stmap = Date.UTC(1900, 1, 30, 0, 0, 0)
+    var calObj = new Date((offset + d - 31) * 86400000 + stmap)
+    var cY = calObj.getUTCFullYear()
+    var cM = calObj.getUTCMonth() + 1
+    var cD = calObj.getUTCDate()
+
+    return this.solar2lunar(cY, cM, cD)
+  }
+}
+
+export default calendar

src/components/oa-calendar/i18n/en.json

@@ -0,0 +1,12 @@
+{
+	"uni-calender.ok": "ok",
+	"uni-calender.cancel": "cancel",
+	"uni-calender.today": "today",
+	"uni-calender.MON": "MON",
+	"uni-calender.TUE": "TUE",
+	"uni-calender.WED": "WED",
+	"uni-calender.THU": "THU",
+	"uni-calender.FRI": "FRI",
+	"uni-calender.SAT": "SAT",
+	"uni-calender.SUN": "SUN"
+}

src/components/oa-calendar/i18n/index.js

@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}

src/components/oa-calendar/i18n/zh-Hans.json

@@ -0,0 +1,12 @@
+{
+	"uni-calender.ok": "确定",
+	"uni-calender.cancel": "取消",
+	"uni-calender.today": "今日",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六"
+}

src/components/oa-calendar/i18n/zh-Hant.json

@@ -0,0 +1,12 @@
+{
+	"uni-calender.ok": "確定",
+	"uni-calender.cancel": "取消",
+	"uni-calender.today": "今日",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六"
+}

src/components/oa-calendar/uni-calendar-item.vue

@@ -0,0 +1,188 @@
+<template>
+	<view class="uni-calendar-item__weeks-box" :class="{
+		'uni-calendar-item--disable':weeks.disable,
+		'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+		'uni-calendar-item--checked':(calendar.fullDate === weeks.fullDate && !weeks.isDay) ,
+		'uni-calendar-item--before-checked':weeks.beforeMultiple,
+		'uni-calendar-item--multiple': weeks.multiple,
+		'uni-calendar-item--after-checked':weeks.afterMultiple,
+		}"
+	 @click="choiceDate(weeks)">
+		<view class="uni-calendar-item__weeks-box-item">
+			<text v-if="selected&&weeks.extraInfo" class="uni-calendar-item__weeks-box-circle"></text>
+			<text class="uni-calendar-item__weeks-box-text" :class="{
+				'uni-calendar-item--isDay-text': weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">{{weeks.date}}</text>
+			<text v-if="!lunar&&!weeks.extraInfo && weeks.isDay" class="uni-calendar-item__weeks-lunar-text" :class="{
+				'uni-calendar-item--isDay-text':weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				}">{{todayText}}</text>
+			<text v-if="lunar&&!weeks.extraInfo" class="uni-calendar-item__weeks-lunar-text" :class="{
+				'uni-calendar-item--isDay-text':weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">{{weeks.isDay ? todayText : (weeks.lunar.IDayCn === '初一'?weeks.lunar.IMonthCn:weeks.lunar.IDayCn)}}</text>
+			<text v-if="weeks.extraInfo&&weeks.extraInfo.info" class="uni-calendar-item__weeks-lunar-text" :class="{
+				'uni-calendar-item--extra':weeks.extraInfo.info,
+				'uni-calendar-item--isDay-text':weeks.isDay,
+				'uni-calendar-item--isDay':calendar.fullDate === weeks.fullDate && weeks.isDay,
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && !weeks.isDay,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">{{weeks.extraInfo.info}}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+	export default {
+		emits:['change'],
+		props: {
+			weeks: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			calendar: {
+				type: Object,
+				default: () => {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			lunar: {
+				type: Boolean,
+				default: false
+			}
+		},
+		computed: {
+			todayText() {
+				return t("uni-calender.today")
+			},
+		},
+		methods: {
+			choiceDate(weeks) {
+				this.$emit('change', weeks)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	$uni-font-size-base:14px;
+	$uni-text-color:#333;
+	$uni-font-size-sm:12px;
+	$uni-color-error: #e43d33;
+	$uni-opacity-disabled: 0.3;
+	$uni-text-color-disable:#c0c0c0;
+	$uni-primary: #2979ff !default;
+	.uni-calendar-item__weeks-box {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.uni-calendar-item__weeks-box-text {
+		font-size: $uni-font-size-base;
+		color: $uni-text-color;
+	}
+
+	.uni-calendar-item__weeks-lunar-text {
+		font-size: $uni-font-size-sm;
+		color: $uni-text-color;
+	}
+
+	.uni-calendar-item__weeks-box-item {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		width: 100rpx;
+		height: 100rpx;
+	}
+
+	.uni-calendar-item__weeks-box-circle {
+		position: absolute;
+		top: 5px;
+		right: 5px;
+		width: 8px;
+		height: 8px;
+		border-radius: 8px;
+		background-color: $uni-color-error;
+
+	}
+
+	.uni-calendar-item--disable {
+		background-color: rgba(249, 249, 249, $uni-opacity-disabled);
+		color: $uni-text-color-disable;
+	}
+
+	.uni-calendar-item--isDay-text {
+		color: $uni-primary;
+	}
+
+	.uni-calendar-item--isDay {
+		background-color: $uni-primary;
+		opacity: 0.8;
+		color: #fff;
+	}
+
+	.uni-calendar-item--extra {
+		color: $uni-color-error;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item--checked {
+		background-color: $uni-primary;
+		color: #fff;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item--multiple {
+		background-color: $uni-primary;
+		color: #fff;
+		opacity: 0.8;
+	}
+	.uni-calendar-item--before-checked {
+		background-color: #ff5a5f;
+		color: #fff;
+	}
+	.uni-calendar-item--after-checked {
+		background-color: #ff5a5f;
+		color: #fff;
+	}
+</style>

src/components/oa-calendar/uni-calendar.vue

@@ -0,0 +1,610 @@
+<template>
+  <view class="uni-calendar">
+    <view v-if="!insert && show" class="uni-calendar__mask" :class="{ 'uni-calendar--mask-show': aniMaskShow }" @click="clean"></view>
+    <view v-if="insert || show" class="uni-calendar__content" :class="{ 'uni-calendar--fixed': !insert, 'uni-calendar--ani-show': aniMaskShow }" @touchstart="touchStart" @touchend="touchEnd">
+      <view v-if="!insert" class="uni-calendar__header uni-calendar--fixed-top">
+        <view class="uni-calendar__header-btn-box" @click="close">
+          <text class="uni-calendar__header-text uni-calendar--fixed-width">{{ cancelText }}</text>
+        </view>
+        <view class="uni-calendar__header-btn-box" @click="confirm">
+          <text class="uni-calendar__header-text uni-calendar--fixed-width">{{ okText }}</text>
+        </view>
+      </view>
+      <view class="uni-calendar__header">
+        <!-- <view class="uni-calendar__header-btn-box" @click.stop="pre">
+					<view class="uni-calendar__header-btn uni-calendar--left"></view>
+				</view> -->
+        <picker mode="date" :value="date" fields="month" @change="bindDateChange">
+          <text class="uni-calendar__header-text">{{ (nowDate.year || "") + " 年 " + (nowDate.month || "") + " 月" }}</text>
+        </picker>
+        <!-- <view class="uni-calendar__header-btn-box" @click.stop="next">
+					<view class="uni-calendar__header-btn uni-calendar--right"></view>
+				</view> -->
+        <!-- <text class="uni-calendar__backtoday" @click="backtoday">{{todayText}}</text> -->
+
+        <view style="margin: auto"></view>
+
+        <view style="display: flex">
+          <view style="margin: 0px 10px">
+            <span style="margin-right: 5px">合格</span>
+            <span style="color: #00cdac">{{ JSON.stringify(currentDateList) === "{}" ? 0 : currentDateList.patrolledCount }}</span>
+          </view>
+          <view class="margin-left-xs">
+            <span style="margin-right: 5px">漏检</span>
+            <span style="color: #f07d28">{{ JSON.stringify(currentDateList) === "{}" ? 0 : currentDateList.undetectedCount }}</span>
+          </view>
+        </view>
+      </view>
+      <view class="uni-calendar__box">
+        <view v-if="showMonth" class="uni-calendar__box-bg">
+          <text class="uni-calendar__box-bg-text">{{ nowDate.month }}</text>
+        </view>
+        <view class="uni-calendar__weeks">
+          <view class="uni-calendar__weeks-day">
+            <text class="uni-calendar__weeks-day-text">{{ SUNText }}</text>
+          </view>
+          <view class="uni-calendar__weeks-day">
+            <text class="uni-calendar__weeks-day-text">{{ monText }}</text>
+          </view>
+          <view class="uni-calendar__weeks-day">
+            <text class="uni-calendar__weeks-day-text">{{ TUEText }}</text>
+          </view>
+          <view class="uni-calendar__weeks-day">
+            <text class="uni-calendar__weeks-day-text">{{ WEDText }}</text>
+          </view>
+          <view class="uni-calendar__weeks-day">
+            <text class="uni-calendar__weeks-day-text">{{ THUText }}</text>
+          </view>
+          <view class="uni-calendar__weeks-day">
+            <text class="uni-calendar__weeks-day-text">{{ FRIText }}</text>
+          </view>
+          <view class="uni-calendar__weeks-day">
+            <text class="uni-calendar__weeks-day-text">{{ SATText }}</text>
+          </view>
+        </view>
+        <view class="uni-calendar__weeks" v-for="(item, weekIndex) in weeks" :key="weekIndex">
+          <view class="uni-calendar__weeks-item" v-for="(weeks, weeksIndex) in item" :key="weeksIndex">
+            <calendar-item class="uni-calendar-item--hook" :weeks="weeks" :calendar="calendar" :selected="selected" :lunar="lunar" @change="choiceDate"></calendar-item>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import Calendar from "./util.js";
+import calendarItem from "./uni-calendar-item.vue";
+import { initVueI18n } from "@dcloudio/uni-i18n";
+import messages from "./i18n/index.js";
+const { t } = initVueI18n(messages);
+/**
+ * Calendar 日历
+ * @description 日历组件可以查看日期，选择任意范围内的日期，打点操作。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=56
+ * @property {String} date 自定义当前时间，默认为今天
+ * @property {Boolean} lunar 显示农历
+ * @property {String} startDate 日期选择范围-开始日期
+ * @property {String} endDate 日期选择范围-结束日期
+ * @property {Boolean} range 范围选择
+ * @property {Boolean} insert = [true|false] 插入模式,默认为false
+ * 	@value true 弹窗模式
+ * 	@value false 插入模式
+ * @property {Boolean} clearDate = [true|false] 弹窗模式是否清空上次选择内容
+ * @property {Array} selected 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]
+ * @property {Boolean} showMonth 是否选择月份为背景
+ * @event {Function} change 日期改变，`insert :ture` 时生效
+ * @event {Function} confirm 确认选择`insert :false` 时生效
+ * @event {Function} monthSwitch 切换月份时触发
+ * @example <uni-calendar :insert="true":lunar="true" :start-date="'2019-3-2'":end-date="'2019-5-20'"@change="change" />
+ */
+
+let touchStartX = 0; // 触屏起始点x
+let touchStartY = 0; // 触屏起始点y
+export default {
+  components: {
+    calendarItem,
+  },
+  emits: ["close", "confirm", "change", "monthSwitch"],
+  props: {
+    date: {
+      type: String,
+      default: "",
+    },
+    selected: {
+      type: Array,
+      default() {
+        return [];
+      },
+    },
+    lunar: {
+      type: Boolean,
+      default: false,
+    },
+    startDate: {
+      type: String,
+      default: "",
+    },
+    endDate: {
+      type: String,
+      default: "",
+    },
+    range: {
+      type: Boolean,
+      default: false,
+    },
+    insert: {
+      type: Boolean,
+      default: true,
+    },
+    showMonth: {
+      type: Boolean,
+      default: true,
+    },
+    clearDate: {
+      type: Boolean,
+      default: true,
+    },
+    currentDate: {
+      type: Object,
+      default: {},
+    },
+  },
+  data() {
+    return {
+      show: false,
+      weeks: [],
+      calendar: {},
+      nowDate: "",
+      aniMaskShow: false,
+      currentDateList: {},
+    };
+  },
+  computed: {
+    /**
+     * for i18n
+     */
+
+    okText() {
+      return t("uni-calender.ok");
+    },
+    cancelText() {
+      return t("uni-calender.cancel");
+    },
+    todayText() {
+      return t("uni-calender.today");
+    },
+    monText() {
+      return t("uni-calender.MON");
+    },
+    TUEText() {
+      return t("uni-calender.TUE");
+    },
+    WEDText() {
+      return t("uni-calender.WED");
+    },
+    THUText() {
+      return t("uni-calender.THU");
+    },
+    FRIText() {
+      return t("uni-calender.FRI");
+    },
+    SATText() {
+      return t("uni-calender.SAT");
+    },
+    SUNText() {
+      return t("uni-calender.SUN");
+    },
+  },
+  watch: {
+    date(newVal) {
+      // this.cale.setDate(newVal)
+      this.init(newVal);
+    },
+    startDate(val) {
+      this.cale.resetSatrtDate(val);
+      this.cale.setDate(this.nowDate.fullDate);
+      this.weeks = this.cale.weeks;
+    },
+    endDate(val) {
+      this.cale.resetEndDate(val);
+      this.cale.setDate(this.nowDate.fullDate);
+      this.weeks = this.cale.weeks;
+    },
+    selected(newVal) {
+      this.cale.setSelectInfo(this.nowDate.fullDate, newVal);
+      this.weeks = this.cale.weeks;
+    },
+    currentDate(obj) {
+      this.currentDateList = obj;
+    },
+  },
+  created() {
+    // 获取日历方法实例
+    this.cale = new Calendar({
+      // date: new Date(),
+      selected: this.selected,
+      startDate: this.startDate,
+      endDate: this.endDate,
+      range: this.range,
+    });
+    // 选中某一天
+    // this.cale.setDate(this.date)
+    this.init(this.date);
+    // this.setDay
+  },
+  methods: {
+    // 取消穿透
+    clean() {},
+    bindDateChange(e) {
+      const value = e.detail.value + "-1";
+      console.log(this.cale.getDate(value));
+      this.setDate(value);
+    },
+    /**
+     * 初始化日期显示
+     * @param {Object} date
+     */
+    init(date) {
+      this.cale.setDate(date);
+      this.weeks = this.cale.weeks;
+      this.nowDate = this.calendar = this.cale.getInfo(date);
+    },
+    /**
+     * 打开日历弹窗
+     */
+    open() {
+      // 弹窗模式并且清理数据
+      if (this.clearDate && !this.insert) {
+        this.cale.cleanMultipleStatus();
+        // this.cale.setDate(this.date)
+        this.init(this.date);
+      }
+      this.show = true;
+      this.$nextTick(() => {
+        setTimeout(() => {
+          this.aniMaskShow = true;
+        }, 50);
+      });
+    },
+    /**
+     * 关闭日历弹窗
+     */
+    close() {
+      this.aniMaskShow = false;
+      this.$nextTick(() => {
+        setTimeout(() => {
+          this.show = false;
+          this.$emit("close");
+        }, 300);
+      });
+    },
+    /**
+     * 确认按钮
+     */
+    confirm() {
+      this.setEmit("confirm");
+      this.close();
+    },
+    /**
+     * 变化触发
+     */
+    change() {
+      if (!this.insert) return;
+      this.setEmit("change");
+    },
+    /**
+     * 选择月份触发
+     */
+    monthSwitch() {
+      let { year, month } = this.nowDate;
+      this.$emit("monthSwitch", {
+        year,
+        month: Number(month),
+      });
+    },
+    /**
+     * 派发事件
+     * @param {Object} name
+     */
+    setEmit(name) {
+      let { year, month, date, fullDate, lunar, extraInfo } = this.calendar;
+      this.$emit(name, {
+        range: this.cale.multipleStatus,
+        year,
+        month,
+        date,
+        fulldate: fullDate,
+        lunar,
+        extraInfo: extraInfo || {},
+      });
+    },
+    /**
+     * 选择天触发
+     * @param {Object} weeks
+     */
+    choiceDate(weeks) {
+      if (weeks.disable) return;
+      this.calendar = weeks;
+      // 设置多选
+      this.cale.setMultiple(this.calendar.fullDate);
+      this.weeks = this.cale.weeks;
+      this.change();
+    },
+    /**
+     * 回到今天
+     */
+    backtoday() {
+      console.log(this.cale.getDate(new Date()).fullDate);
+      let date = this.cale.getDate(new Date()).fullDate;
+      // this.cale.setDate(date)
+      this.init(date);
+      this.change();
+    },
+    /**
+     * 上个月
+     */
+    pre() {
+      const preDate = this.cale.getDate(this.nowDate.fullDate, -1, "month").fullDate;
+      this.setDate(preDate);
+      this.monthSwitch();
+    },
+    /**
+     * 下个月
+     */
+    next() {
+      const nextDate = this.cale.getDate(this.nowDate.fullDate, +1, "month").fullDate;
+      this.setDate(nextDate);
+      this.monthSwitch();
+    },
+    /**
+     * 设置日期
+     * @param {Object} date
+     */
+    setDate(date) {
+      this.cale.setDate(date);
+      this.weeks = this.cale.weeks;
+      this.nowDate = this.cale.getInfo(date);
+    },
+    /**
+     * @触摸开始
+     **/
+    touchStart(e) {
+      console.log("触摸开始");
+      touchStartX = e.touches[0].clientX;
+      touchStartY = e.touches[0].clientY;
+    },
+    /**
+     * @触摸结束
+     **/
+    touchEnd(e) {
+      console.log("触摸结束");
+      let deltaX = e.changedTouches[0].clientX - touchStartX;
+      let deltaY = e.changedTouches[0].clientY - touchStartY;
+      if (Math.abs(deltaX) > 50 && Math.abs(deltaX) > Math.abs(deltaY)) {
+        if (deltaX >= 0) {
+          console.log("左滑");
+          this.pre();
+          // calendar.value.selectDate("prev-month");
+        } else {
+          console.log("右滑");
+          this.next();
+          // calendar.value.selectDate("next-month");
+        }
+      } else if (Math.abs(deltaY) > 50 && Math.abs(deltaX) < Math.abs(deltaY)) {
+        if (deltaY < 0) {
+          console.log("上滑");
+        } else {
+          console.log("下滑");
+        }
+      } else {
+        console.log("可能是误触！");
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+$uni-bg-color-mask: rgba(
+  $color: #000000,
+  $alpha: 0.4,
+);
+$uni-border-color: #ededed;
+$uni-text-color: #333;
+$uni-bg-color-hover: #f1f1f1;
+$uni-font-size-base: 14px;
+$uni-text-color-placeholder: #808080;
+$uni-color-subtitle: #555555;
+$uni-text-color-grey: #999;
+.uni-calendar {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: column;
+}
+
+.uni-calendar__mask {
+  position: fixed;
+  bottom: 0;
+  top: 0;
+  left: 0;
+  right: 0;
+  background-color: $uni-bg-color-mask;
+  transition-property: opacity;
+  transition-duration: 0.3s;
+  opacity: 0;
+  /* #ifndef APP-NVUE */
+  z-index: 99;
+  /* #endif */
+}
+
+.uni-calendar--mask-show {
+  opacity: 1;
+}
+
+.uni-calendar--fixed {
+  position: fixed;
+  /* #ifdef APP-NVUE */
+  bottom: 0;
+  /* #endif */
+  left: 0;
+  right: 0;
+  transition-property: transform;
+  transition-duration: 0.3s;
+  transform: translateY(460px);
+  /* #ifndef APP-NVUE */
+  bottom: calc(var(--window-bottom));
+  z-index: 99;
+  /* #endif */
+}
+
+.uni-calendar--ani-show {
+  transform: translateY(0);
+}
+
+.uni-calendar__content {
+  background-color: #fff;
+}
+
+.uni-calendar__header {
+  position: relative;
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+  // justify-content: center;
+  align-items: center;
+  height: 50px;
+  padding: 0 15px;
+  border-bottom-color: $uni-border-color;
+  border-bottom-style: solid;
+  border-bottom-width: 1px;
+}
+
+.uni-calendar--fixed-top {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+  justify-content: space-between;
+  border-top-color: $uni-border-color;
+  border-top-style: solid;
+  border-top-width: 1px;
+}
+
+.uni-calendar--fixed-width {
+  width: 50px;
+  // padding: 0 15px;
+}
+
+.uni-calendar__backtoday {
+  position: absolute;
+  right: 0;
+  top: 25rpx;
+  padding: 0 5px;
+  padding-left: 10px;
+  height: 25px;
+  line-height: 25px;
+  font-size: 12px;
+  border-top-left-radius: 25px;
+  border-bottom-left-radius: 25px;
+  color: $uni-text-color;
+  background-color: $uni-bg-color-hover;
+}
+
+.uni-calendar__header-text {
+  text-align: center;
+  width: 100px;
+  font-size: $uni-font-size-base;
+  color: $uni-text-color;
+}
+
+.uni-calendar__header-btn-box {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  width: 50px;
+  height: 50px;
+}
+
+.uni-calendar__header-btn {
+  width: 10px;
+  height: 10px;
+  border-left-color: $uni-text-color-placeholder;
+  border-left-style: solid;
+  border-left-width: 2px;
+  border-top-color: $uni-color-subtitle;
+  border-top-style: solid;
+  border-top-width: 2px;
+}
+
+.uni-calendar--left {
+  transform: rotate(-45deg);
+}
+
+.uni-calendar--right {
+  transform: rotate(135deg);
+}
+
+.uni-calendar__weeks {
+  position: relative;
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+}
+
+.uni-calendar__weeks-item {
+  flex: 1;
+}
+
+.uni-calendar__weeks-day {
+  flex: 1;
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  height: 45px;
+  border-bottom-color: #f5f5f5;
+  border-bottom-style: solid;
+  border-bottom-width: 1px;
+}
+
+.uni-calendar__weeks-day-text {
+  font-size: 14px;
+}
+
+.uni-calendar__box {
+  position: relative;
+}
+
+.uni-calendar__box-bg {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  justify-content: center;
+  align-items: center;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+
+.uni-calendar__box-bg-text {
+  font-size: 200px;
+  font-weight: bold;
+  color: $uni-text-color-grey;
+  opacity: 0.1;
+  text-align: center;
+  /* #ifndef APP-NVUE */
+  line-height: 1;
+  /* #endif */
+}
+</style>

src/components/oa-calendar/util.js

@@ -0,0 +1,350 @@
+import CALENDAR from './calendar.js'
+
+class Calendar {
+	constructor({
+		date,
+		selected,
+		startDate,
+		endDate,
+		range
+	} = {}) {
+		// 当前日期
+		this.date = this.getDate(new Date()) // 当前初入日期
+		// 打点信息
+		this.selected = selected || [];
+		// 范围开始
+		this.startDate = startDate
+		// 范围结束
+		this.endDate = endDate
+		this.range = range
+		// 多选状态
+		this.cleanMultipleStatus()
+		// 每周日期
+		this.weeks = {}
+		// this._getWeek(this.date.fullDate)
+	}
+	/**
+	 * 设置日期
+	 * @param {Object} date
+	 */
+	setDate(date) {
+		this.selectDate = this.getDate(date)
+		this._getWeek(this.selectDate.fullDate)
+	}
+
+	/**
+	 * 清理多选状态
+	 */
+	cleanMultipleStatus() {
+		this.multipleStatus = {
+			before: '',
+			after: '',
+			data: []
+		}
+	}
+
+	/**
+	 * 重置开始日期
+	 */
+	resetSatrtDate(startDate) {
+		// 范围开始
+		this.startDate = startDate
+
+	}
+
+	/**
+	 * 重置结束日期
+	 */
+	resetEndDate(endDate) {
+		// 范围结束
+		this.endDate = endDate
+	}
+
+	/**
+	 * 获取任意时间
+	 */
+	getDate(date, AddDayCount = 0, str = 'day') {
+		if (!date) {
+			date = new Date()
+		}
+		if (typeof date !== 'object') {
+			date = date.replace(/-/g, '/')
+		}
+		const dd = new Date(date)
+		switch (str) {
+			case 'day':
+				dd.setDate(dd.getDate() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+			case 'month':
+				if (dd.getDate() === 31) {
+					dd.setDate(dd.getDate() + AddDayCount)
+				} else {
+					dd.setMonth(dd.getMonth() + AddDayCount) // 获取AddDayCount天后的日期
+				}
+				break
+			case 'year':
+				dd.setFullYear(dd.getFullYear() + AddDayCount) // 获取AddDayCount天后的日期
+				break
+		}
+		const y = dd.getFullYear()
+		const m = dd.getMonth() + 1 < 10 ? '0' + (dd.getMonth() + 1) : dd.getMonth() + 1 // 获取当前月份的日期，不足10补0
+		const d = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate() // 获取当前几号，不足10补0
+		return {
+			fullDate: y + '-' + m + '-' + d,
+			year: y,
+			month: m,
+			date: d,
+			day: dd.getDay()
+		}
+	}
+
+
+	/**
+	 * 获取上月剩余天数
+	 */
+	_getLastMonthDays(firstDay, full) {
+		let dateArr = []
+		for (let i = firstDay; i > 0; i--) {
+			const beforeDate = new Date(full.year, full.month - 1, -i + 1).getDate()
+			dateArr.push({
+				date: beforeDate,
+				month: full.month - 1,
+				lunar: this.getlunar(full.year, full.month - 1, beforeDate),
+				disable: true
+			})
+		}
+		return dateArr
+	}
+	/**
+	 * 获取本月天数
+	 */
+	_currentMonthDys(dateData, full) {
+		let dateArr = []
+		let fullDate = this.date.fullDate
+		for (let i = 1; i <= dateData; i++) {
+			let nowDate = full.year + '-' + (full.month < 10 ?
+				full.month : full.month) + '-' + (i < 10 ?
+				'0' + i : i)
+			// 是否今天
+			let isDay = fullDate === nowDate
+			// 获取打点信息
+			let info = this.selected && this.selected.find((item) => {
+				if (this.dateEqual(nowDate, item.date)) {
+					return item
+				}
+			})
+
+			// 日期禁用
+			let disableBefore = true
+			let disableAfter = true
+			if (this.startDate) {
+				// let dateCompBefore = this.dateCompare(this.startDate, fullDate)
+				// disableBefore = this.dateCompare(dateCompBefore ? this.startDate : fullDate, nowDate)
+				disableBefore = this.dateCompare(this.startDate, nowDate)
+			}
+
+			if (this.endDate) {
+				// let dateCompAfter = this.dateCompare(fullDate, this.endDate)
+				// disableAfter = this.dateCompare(nowDate, dateCompAfter ? this.endDate : fullDate)
+				disableAfter = this.dateCompare(nowDate, this.endDate)
+			}
+			let multiples = this.multipleStatus.data
+			let checked = false
+			let multiplesStatus = -1
+			if (this.range) {
+				if (multiples) {
+					multiplesStatus = multiples.findIndex((item) => {
+						return this.dateEqual(item, nowDate)
+					})
+				}
+				if (multiplesStatus !== -1) {
+					checked = true
+				}
+			}
+			let data = {
+				fullDate: nowDate,
+				year: full.year,
+				date: i,
+				multiple: this.range ? checked : false,
+				beforeMultiple: this.dateEqual(this.multipleStatus.before, nowDate),
+				afterMultiple: this.dateEqual(this.multipleStatus.after, nowDate),
+				month: full.month,
+				lunar: this.getlunar(full.year, full.month, i),
+				disable: !(disableBefore && disableAfter),
+				isDay
+			}
+			if (info) {
+				data.extraInfo = info
+			}
+
+			dateArr.push(data)
+		}
+		return dateArr
+	}
+	/**
+	 * 获取下月天数
+	 */
+	_getNextMonthDays(surplus, full) {
+		let dateArr = []
+		for (let i = 1; i < surplus + 1; i++) {
+			dateArr.push({
+				date: i,
+				month: Number(full.month) + 1,
+				lunar: this.getlunar(full.year, Number(full.month) + 1, i),
+				disable: true
+			})
+		}
+		return dateArr
+	}
+
+	/**
+	 * 获取当前日期详情
+	 * @param {Object} date
+	 */
+	getInfo(date) {
+		if (!date) {
+			date = new Date()
+		}
+		const dateInfo = this.canlender.find(item => item.fullDate === this.getDate(date).fullDate)
+		return dateInfo
+	}
+
+	/**
+	 * 比较时间大小
+	 */
+	dateCompare(startDate, endDate) {
+		// 计算截止时间
+		startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+		if (startDate <= endDate) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+	/**
+	 * 比较时间是否相等
+	 */
+	dateEqual(before, after) {
+		// 计算截止时间
+		before = new Date(before.replace('-', '/').replace('-', '/'))
+		// 计算详细项的截止时间
+		after = new Date(after.replace('-', '/').replace('-', '/'))
+		if (before.getTime() - after.getTime() === 0) {
+			return true
+		} else {
+			return false
+		}
+	}
+
+
+	/**
+	 * 获取日期范围内所有日期
+	 * @param {Object} begin
+	 * @param {Object} end
+	 */
+	geDateAll(begin, end) {
+		var arr = []
+		var ab = begin.split('-')
+		var ae = end.split('-')
+		var db = new Date()
+		db.setFullYear(ab[0], ab[1] - 1, ab[2])
+		var de = new Date()
+		de.setFullYear(ae[0], ae[1] - 1, ae[2])
+		var unixDb = db.getTime() - 24 * 60 * 60 * 1000
+		var unixDe = de.getTime() - 24 * 60 * 60 * 1000
+		for (var k = unixDb; k <= unixDe;) {
+			k = k + 24 * 60 * 60 * 1000
+			arr.push(this.getDate(new Date(parseInt(k))).fullDate)
+		}
+		return arr
+	}
+	/**
+	 * 计算阴历日期显示
+	 */
+	getlunar(year, month, date) {
+		return CALENDAR.solar2lunar(year, month, date)
+	}
+	/**
+	 * 设置打点
+	 */
+	setSelectInfo(data, value) {
+		this.selected = value
+		this._getWeek(data)
+	}
+
+	/**
+	 *  获取多选状态
+	 */
+	setMultiple(fullDate) {
+		let {
+			before,
+			after
+		} = this.multipleStatus
+
+		if (!this.range) return
+		if (before && after) {
+			this.multipleStatus.before = ''
+			this.multipleStatus.after = ''
+			this.multipleStatus.data = []
+		} else {
+			if (!before) {
+				this.multipleStatus.before = fullDate
+			} else {
+				this.multipleStatus.after = fullDate
+				if (this.dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus.after);
+				} else {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus.before);
+				}
+			}
+		}
+		this._getWeek(fullDate)
+	}
+
+	/**
+	 * 获取每周数据
+	 * @param {Object} dateData
+	 */
+	_getWeek(dateData) {
+		const {
+			year,
+			month
+		} = this.getDate(dateData)
+		let firstDay = new Date(year, month - 1, 1).getDay()
+		let currentDay = new Date(year, month, 0).getDate()
+		let dates = {
+			lastMonthDays: this._getLastMonthDays(firstDay, this.getDate(dateData)), // 上个月末尾几天
+			currentMonthDys: this._currentMonthDys(currentDay, this.getDate(dateData)), // 本月天数
+			nextMonthDays: [], // 下个月开始几天
+			weeks: []
+		}
+		let canlender = []
+		const surplus = 42 - (dates.lastMonthDays.length + dates.currentMonthDys.length)
+		dates.nextMonthDays = this._getNextMonthDays(surplus, this.getDate(dateData))
+		canlender = canlender.concat(dates.lastMonthDays, dates.currentMonthDys, dates.nextMonthDays)
+		let weeks = {}
+		// 拼接数组  上个月开始几天 + 本月天数+ 下个月开始几天
+		for (let i = 0; i < canlender.length; i++) {
+			if (i % 7 === 0) {
+				weeks[parseInt(i / 7)] = new Array(7)
+			}
+			weeks[parseInt(i / 7)][i % 7] = canlender[i]
+		}
+		this.canlender = canlender
+		this.weeks = weeks
+	}
+
+	//静态方法
+	// static init(date) {
+	// 	if (!this.instance) {
+	// 		this.instance = new Calendar(date);
+	// 	}
+	// 	return this.instance;
+	// }
+}
+
+
+export default Calendar

src/main.js

@@ -3,8 +3,7 @@ import App from "./App";
 import store from "./store"; // store
 import plugins from "./plugins"; // plugins
 import "./permission"; // permission
-
-import config from "@/config";
+import config from "@/config"; // config
 
 // 引入json导出组件
 import JsonExcel from "vue-json-excel";
@@ -14,23 +13,18 @@ import JsonExcel from "vue-json-excel";
 
 // 引入UI组件
 import uviewPlus from "@/uni_modules/uview-plus";
+import oaCalendar from "@/components/oa-calendar/uni-calendar";
 
-// 引入ElementPlus
-import ElementPlus from "element-plus";
-import locale from "element-plus/lib/locale/lang/zh-cn"; // 中文语言
-import "element-plus/theme-chalk/index.css";
-import * as Elicons from "@element-plus/icons-vue";
 
 export function createApp() {
   const app = createSSRApp(App);
 
-  // 挂载json导出
+  //挂载全局组件
+  app.component('oa-calendar', oaCalendar)
+
+  // 挂载全局json导出
   app.component("downloadExcel", JsonExcel);
 
-  // 挂宅icons-vue组件icon
-  for (const name in Elicons) {
-    app.component(name, Elicons[name]);
-  }
 
   // 添加全局变量
   app.provide("$store", store);
@@ -43,9 +37,6 @@ export function createApp() {
   app.config.globalProperties.$websiteUrl = config.websiteUrl;
 
   app
-    .use(ElementPlus, {
-      locale: locale,
-    })
     .use(uviewPlus)
     .use(store)
     .use(plugins);

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特有相关 */
@@ -36,46 +36,73 @@
                 "permissions" : [
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.BIND_NFC_SERVICE\"/>",
+                    "<uses-permission android:name=\"android.permission.BIND_DREAM_SERVICE\"/>",
                     "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
                     "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.NFC\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
                     "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
                     "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
                 ],
-                "minSdkVersion" : 21
+                "minSdkVersion" : ""
             },
             /* ios打包配置 */
             "ios" : {
-                "dSYMs" : false
+                "dSYMs" : false,
+                "privacyDescription" : {
+                    "NSPhotoLibraryUsageDescription" : "该应用需要读取你的相册，以便为你上传头像",
+                    "NSPhotoLibraryAddUsageDescription" : "该应用需要读取你的相册，以便拍照保存图片",
+                    "NSCameraUsageDescription" : "该应用需要你的相机，以便你拍摄上传头像信息",
+                    "NSMicrophoneUsageDescription" : "该应用需要使用你的麦克风，以便语音播放",
+                    "NSLocationWhenInUseUsageDescription" : "该应用需要你的地理位置，以便为你提供当前位置信息",
+                    "NSLocationAlwaysUsageDescription" : "该应用需要持续获取用户地理位置，以便为你进行导航",
+                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "该应用需要你的地理位置，以便为你提供当前位置信息",
+                    "NSCalendarsUsageDescription" : "该应用需要获取你的日历，以便更好的体验",
+                    "NSContactsUsageDescription" : "该应用需要读取你的通讯录，以便联系同事",
+                    "NSBluetoothPeripheralUsageDescription" : "该应用需要你的蓝牙，以便读取相关蓝牙设备",
+                    "NFCReaderUsageDescription" : "",
+                    "NSBluetoothAlwaysUsageDescription" : "该应用需要你的蓝牙，以便读取相关蓝牙设备"
+                }
             },
             /* SDK配置 */
             "sdkConfigs" : {
                 "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,11 @@
     {
       "path": "pages/index",
       "style": {
+        "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 +23,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,354 +46,410 @@
             "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)"
               }
             ]
           }
         }
       }
     },
+    //分析 开始
     {
-      "path": "pages/mine/avatar/index",
-      "style": {
-        "navigationBarTitleText": "修改头像"
-      }
-    },
-    {
-      "path": "pages/mine/info/index",
-      "style": {
-        "navigationBarTitleText": "个人资料"
-      }
-    },
-    {
-      "path": "pages/mine/pwd/index",
-      "style": {
-        "navigationBarTitleText": "修改密码"
-      }
-    },
-    {
-      "path": "pages/mine/setting/index",
-      "style": {
-        "navigationBarTitleText": "设置"
-      }
-    },
-    {
-      "path": "pages/mine/help/index",
-      "style": {
-        "navigationBarTitleText": "常见问题"
-      }
-    },
-    {
-      "path": "pages/mine/about/index",
-      "style": {
-        "navigationBarTitleText": "关于我们"
-      }
-    },
-    {
-      "path": "pages/common/webview/index",
-      "style": {
-        "navigationBarTitleText": "浏览网页"
-      }
-    },
-    {
-      "path": "pages/common/textview/index",
-      "style": {
-        "navigationBarTitleText": "浏览文本"
-      }
-    },
-    {
-      "path": "pages/common/textview/index1",
-      "style": {
-        "navigationBarTitleText": "浏览文本"
-      }
-    },
-    {
-      "path": "pages/export/export",
-      "style": {
-        "navigationBarTitleText": "导出",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "components/square/square",
-      "style": {
-        "navigationBarTitleText": "",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/authority/authority",
-      "style": {
-        "navigationBarTitleText": "授权",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/test/test",
-      "style": {
-        "navigationBarTitleText": "",
-        "enablePullDownRefresh": false
-      }
-    },
-    //消防督察单模块 开始
-    //消防督察单模块 结束
-    //巡检模块 开始
-    {
-      "path": "pages/business/mhxf/xunJian/xunJian",
-      "style": {
-        "navigationBarTitleText": "巡检",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/business/mhxf/xunJian/plan/index",
-      "style": {
-        "navigationBarTitleText": "巡检计划",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/business/mhxf/xunJian/plan/components/siteDetails",
-      "style": {
-        "navigationBarTitleText": "站点详情",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/business/mhxf/xunJian/plan/components/content",
-      "style": {
-        "navigationBarTitleText": "巡检内容",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/business/mhxf/xunJian/plan/components/report",
-      "style": {
-        "navigationBarTitleText": "巡检上报",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/business/mhxf/xunJian/record/record",
-      "style": {
-        "navigationBarTitleText": "巡检记录",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/business/mhxf/xunJian/record/recordDetail/index",
+      "path": "pages/business/analyse/index",
       "style": {
-        "navigationBarTitleText": "巡检记录详情",
-        "enablePullDownRefresh": false
+        "navigationBarTitleText": "分析"
       }
+    }
+    //分析 结束
+  ],
+  "subPackages": [
+    // 公共
+    {
+      "root": "pages/common",
+      "pages": [
+        {
+          "path": "/webview/index",
+          "style": {
+            "navigationBarTitleText": "浏览网页"
+          }
+        },
+        {
+          "path": "/textview/index",
+          "style": {
+            "navigationBarTitleText": "浏览文本"
+          }
+        },
+        {
+          "path": "/textview/index1",
+          "style": {
+            "navigationBarTitleText": "浏览文本"
+          }
+        },
+        {
+          "path": "/export/index",
+          "style": {
+            "navigationBarTitleText": "导出",
+            "enablePullDownRefresh": false
+          }
+        },
+        {
+          "path": "/square/index",
+          "style": {
+            "navigationBarTitleText": "",
+            "enablePullDownRefresh": false
+          }
+        },
+        {
+          "path": "/authority/index",
+          "style": {
+            "navigationBarTitleText": "授权",
+            "enablePullDownRefresh": false
+          }
+        },
+        {
+          "path": "/test/index",
+          "style": {
+            "navigationBarTitleText": "",
+            "enablePullDownRefresh": false
+          }
+        }
+      ]
     },
+    // 我的
     {
-      "path": "pages/business/mhxf/xunJian/collect/index",
-      "style": {
-        "navigationBarTitleText": "点位采集",
-        "enablePullDownRefresh": false,
-        "app-plus": {
-          "titleNView": {
-            "buttons": [
-              {
-                "text": "采集记录",
-                "fontSize": "12px",
-                // "redDot": true,
-                "float": "right",
-                "fontSrc": "/static/iconfont/iconfont.ttf",
-                "width": "auto"
+      "root": "pages/mine",
+      "pages": [
+        {
+          "path": "/setting/index",
+          "style": {
+            "navigationBarTitleText": "设置"
+          }
+        },
+        {
+          "path": "/info/index",
+          "style": {
+            "navigationBarTitleText": "个人资料",
+            "app-plus": {
+              "bounce": "none",
+              "titleNView": {
+                "type": "transparent",
+                "autoBackButton": true,
+                "backButton": { //自定义 backButton
+                  "background": "rgba(0,0,0,0)"
+                }
               }
-            ]
+            }
+          }
+        },
+        {
+          "path": "/avatar/index",
+          "style": {
+            "navigationBarTitleText": "修改头像",
+            "navigationStyle": "custom",
+            "app-plus": {
+              "bounce": "none",
+              "titleNView": false
+            }
+          }
+        },
+        {
+          "path": "/help/index",
+          "style": {
+            "navigationBarTitleText": "常见问题",
+            "navigationStyle": "custom",
+            "app-plus": {
+              "bounce": "none",
+              "titleNView": false
+            }
+          }
+        },
+        {
+          "path": "/about/index",
+          "style": {
+            "navigationBarTitleText": "关于我们",
+            "navigationStyle": "custom",
+            "app-plus": {
+              "bounce": "none",
+              "titleNView": false
+            }
+          }
+        },
+        {
+          "path": "/pwd/index",
+          "style": {
+            "navigationBarTitleText": "修改密码",
+            "navigationStyle": "custom",
+            "app-plus": {
+              "bounce": "none",
+              "titleNView": false
+            }
+          }
+        },
+        {
+          "path": "/setting/messagePush/messagePush",
+          "style": {
+            "navigationBarTitleText": "消息推送设置",
+            "enablePullDownRefresh": false
+          }
+        },
+        {
+          "path": "/setting/building/building",
+          "style": {
+            "navigationBarTitleText": "建筑管理",
+            "enablePullDownRefresh": false
+          }
+        },
+        {
+          "path": "/setting/funReport/funReport",
+          "style": {
+            "navigationBarTitleText": "功能报备",
+            "enablePullDownRefresh": false,
+            "onReachBottomDistance": 100 //距离底部多远时触发 单位px
           }
         }
-      }
-    },
-    {
-      "path": "pages/business/mhxf/xunJian/collect/components/collectDetail",
-      "style": {
-        "navigationBarTitleText": "采集上报",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/business/mhxf/xunJian/collect/components/collectRecord",
-      "style": {
-        "navigationBarTitleText": "采集记录",
-        "enablePullDownRefresh": false,
-        "app-plus": {
-          "titleNView": {
-            "buttons": [
-              {
-                "text": "\ue7c7",
-                "fontSize": "18px",
-                // "redDot": true,
-                "float": "right",
-                "fontSrc": "/static/iconfont/uciconfont/iconfont.ttf",
-                "width": "auto"
+        // {
+        //   "path": "pages/setting/funReport/funcAdd/funcAdd",
+        //   "style": {
+        //     "navigationBarTitleText": "功能报备新增",
+        //     "enablePullDownRefresh": false
+        //   }
+        // },
+      ]
+    },
+    // 消息
+    {
+      "root": "pages/info",
+      "pages": [
+        {
+          "path": "/info",
+          "style": {
+            "navigationBarTitleText": "消息",
+            "navigationStyle": "custom",
+            "enablePullDownRefresh": false,
+            "app-plus": {
+              "bounce": "none",
+              "titleNView": false
+            }
+          }
+        },
+        {
+          "path": "/fireBase/fireBase",
+          "style": {
+            "navigationBarTitleText": "消防知识库",
+            "enablePullDownRefresh": false
+          }
+        },
+        {
+          "path": "/pushList/pushList",
+          "style": {
+            "navigationBarTitleText": "消息推送",
+            "enablePullDownRefresh": false
+          }
+        },
+        {
+          "path": "/fireBashDetail/fireBashDetail",
+          "style": {
+            "navigationBarTitleText": "火灾逃生十大要诀",
+            "enablePullDownRefresh": false
+          }
+        }
+      ]
+    },
+    // 闵行消防
+    {
+      "root": "pages/business/mhxf",
+      "pages": [
+        //消防督察单模块 开始
+        //消防督察单模块 结束
+        //巡检模块 开始
+        {
+          "path": "/xunJian/xunJian",
+          "style": {
+            "navigationBarTitleText": "巡检",
+            "enablePullDownRefresh": false
+          }
+        },
+        {
+          "path": "/xunJian/plan/index",
+          "style": {
+            "navigationBarTitleText": "巡检计划",
+            "enablePullDownRefresh": false
+          }
+        },
+        {
+          "path": "/xunJian/plan/components/siteDetails",
+          "style": {
+            "navigationBarTitleText": "站点详情",
+            "enablePullDownRefresh": false
+          }
+        },
+        {
+          "path": "/xunJian/plan/components/content",
+          "style": {
+            "navigationBarTitleText": "巡检内容",
+            "enablePullDownRefresh": false
+          }
+        },
+        {
+          "path": "/xunJian/plan/components/report",
+          "style": {
+            "navigationBarTitleText": "巡检上报",
+            "enablePullDownRefresh": false
+          }
+        },
+        {
+          "path": "/xunJian/record/record",
+          "style": {
+            "navigationBarTitleText": "巡检记录",
+            "enablePullDownRefresh": false
+          }
+        },
+        {
+          "path": "/xunJian/record/recordDetail/index",
+          "style": {
+            "navigationBarTitleText": "巡检记录详情",
+            "enablePullDownRefresh": false
+          }
+        },
+        {
+          "path": "/xunJian/collect/index",
+          "style": {
+            "navigationBarTitleText": "点位采集",
+            "enablePullDownRefresh": false,
+            "app-plus": {
+              "titleNView": {
+                "buttons": [
+                  {
+                    "text": "采集记录",
+                    "fontSize": "12px",
+                    // "redDot": true,
+                    "float": "right",
+                    "fontSrc": "/static/iconfont/iconfont.ttf",
+                    "width": "auto"
+                  }
+                ]
               }
-            ]
+            }
+          }
+        },
+        {
+          "path": "/xunJian/collect/components/collectDetail",
+          "style": {
+            "navigationBarTitleText": "采集上报",
+            "enablePullDownRefresh": false
+          }
+        },
+        {
+          "path": "/xunJian/collect/components/collectRecord",
+          "style": {
+            "navigationBarTitleText": "采集记录",
+            "enablePullDownRefresh": false,
+            "app-plus": {
+              "titleNView": {
+                "buttons": [
+                  {
+                    "text": "\ue7c7",
+                    "fontSize": "18px",
+                    // "redDot": true,
+                    "float": "right",
+                    "fontSrc": "/static/iconfont/iconfont.ttf",
+                    "width": "auto"
+                  }
+                ]
+              }
+            }
+          }
+        },
+        //巡检模块 结束
+        //信息查询 开始
+        {
+          "path": "/informationSelect/index",
+          "style": {
+            "navigationBarTitleText": "信息查询",
+            "enablePullDownRefresh": false
+          }
+        },
+        {
+          "path": "/informationSelect-test/index",
+          "style": {
+            "navigationBarTitleText": "信息查询",
+            "enablePullDownRefresh": false
+          }
+        },
+        //信息查询 结束
+        //设备管理 开始
+        {
+          "path": "/deviceManage/index",
+          "style": {
+            "navigationBarTitleText": "设备管理",
+            "enablePullDownRefresh": false
+          }
+        },
+        //设备管理 结束
+        //协同作战地图 开始
+        {
+          "path": "/coordination/index",
+          "style": {
+            "navigationBarTitleText": "协同作战地图",
+            "enablePullDownRefresh": false
+          }
+        },
+        //协同作战地图 结束
+        //单位信息采集 开始
+        {
+          "path": "/unitInfoCollection/index",
+          "style": {
+            "navigationBarTitleText": "单位信息采集",
+            "enablePullDownRefresh": false
+          }
+        },
+        //单位信息采集 结束
+        //消防报告 开始
+        {
+          "path": "/fireReport/index",
+          "style": {
+            "navigationBarTitleText": "消防报告",
+            "enablePullDownRefresh": false
+          }
+        },
+        {
+          "path": "/fireReport/components/detailed",
+          "style": {
+            "navigationBarTitleText": "消防报告",
+            "enablePullDownRefresh": false
+          }
+        },
+        {
+          "path": "/fireReport/components/detailedPath",
+          "style": {
+            "navigationBarTitleText": "消防报告",
+            "enablePullDownRefresh": false
+          }
+        },
+        //消防报告 结束
+        //待办事项 开始
+        {
+          "path": "/needMatter/index",
+          "style": {
+            "navigationBarTitleText": "待办事项",
+            "enablePullDownRefresh": false
           }
         }
-      }
-    },
-    //巡检模块 结束
-    //信息查询 开始
-    {
-      "path": "pages/business/mhxf/informationSelect/index",
-      "style": {
-        "navigationBarTitleText": "信息查询",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/business/mhxf/informationSelect-test/index",
-      "style": {
-        "navigationBarTitleText": "信息查询",
-        "enablePullDownRefresh": false
-      }
-    },
-    //信息查询 结束
-    //设备管理 开始
-    {
-      "path": "pages/business/mhxf/deviceManage/index",
-      "style": {
-        "navigationBarTitleText": "设备管理",
-        "enablePullDownRefresh": false
-      }
-    },
-    //设备管理 结束
-    //协同作战地图 开始
-    {
-      "path": "pages/business/mhxf/coordination/index",
-      "style": {
-        "navigationBarTitleText": "协同作战地图",
-        "enablePullDownRefresh": false
-      }
-    },
-    //协同作战地图 结束
-    //单位信息采集 开始
-    {
-      "path": "pages/business/mhxf/unitInfoCollection/index",
-      "style": {
-        "navigationBarTitleText": "单位信息采集",
-        "enablePullDownRefresh": false
-      }
-    },
-    //单位信息采集 结束
-    //消防报告 开始
-    {
-      "path": "pages/business/mhxf/fireReport/index",
-      "style": {
-        "navigationBarTitleText": "消防报告",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/business/mhxf/fireReport/components/detailed",
-      "style": {
-        "navigationBarTitleText": "消防报告",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/business/mhxf/fireReport/components/detailedPath",
-      "style": {
-        "navigationBarTitleText": "消防报告",
-        "enablePullDownRefresh": false
-      }
-    },
-    //消防报告 结束
-    //待办事项 开始
-    {
-      "path": "pages/business/mhxf/needMatter/index",
-      "style": {
-        "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",
@@ -415,8 +458,8 @@
     "list": [
       {
         "pagePath": "pages/index",
-        "iconPath": "/static/images/tabBar/home.png",
-        "selectedIconPath": "/static/images/tabBar/home-selected.png",
+        "iconPath": "/static/images/tabBar/tab-home.png",
+        "selectedIconPath": "/static/images/tabBar/tab-home-blue.png",
         "text": "工作台"
       },
       // {
@@ -427,25 +470,18 @@
       // },
       {
         "pagePath": "pages/info/info",
-        "iconPath": "/static/images/tabBar/info.png",
-        "selectedIconPath": "/static/images/tabBar/info-selected.png",
+        "iconPath": "/static/images/tabBar/tab-info.png",
+        "selectedIconPath": "/static/images/tabBar/tab-info-blue.png",
         "text": "消息"
       },
       {
         "pagePath": "pages/mine/index",
-        "iconPath": "/static/images/tabBar/setting.png",
-        "selectedIconPath": "/static/images/tabBar/setting-selected.png",
+        "iconPath": "/static/images/tabBar/tab-my.png",
+        "selectedIconPath": "/static/images/tabBar/tab-my-blue.png",
         "text": "我的"
       }
     ]
   },
-  "globalStyle": {
-    "navigationBarTextStyle": "white",
-    "navigationBarTitleText": "uni-app",
-    "navigationBarBackgroundColor": "#149EFF",
-    "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

@@ -192,7 +192,7 @@
                   <u-checkbox :customStyle="{ marginBottom: '8px' }" label="自动喷水灭火系统" :name="1"> </u-checkbox>
                   <u-checkbox :customStyle="{ marginBottom: '8px' }" label="火灾自动报警系统" :name="2"> </u-checkbox>
                   <u-checkbox :customStyle="{ marginBottom: '8px' }" label="防排烟与排烟系统" :name="3"> </u-checkbox>
-                  <u-checkbox :customStyle="{ marginBottom: '8px' }" label="是否接入物联网" :name="4"> </u-checkbox>
+                  <u-checkbox :customStyle="{ marginBottom: '8px' }" label="消防物联网系统" :name="4"> </u-checkbox>
                 </u-checkbox-group>
               </u-form-item>
 
@@ -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

@@ -26,12 +26,11 @@
 </template>
 
 <script setup>
-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 +52,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(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+
 onMounted(() => {});
 </script>
 
@@ -218,12 +225,6 @@ onMounted(() => {});
   padding: 10px;
 }
 
-.reportRight .rightChild .el-icon {
-  font-size: 20px;
-  margin: auto;
-  font-weight: 600;
-}
-
 .reportRight .rightChild view {
   font-size: 12px;
   margin: auto;

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>
 
@@ -221,8 +228,7 @@ onMounted(() => {});
   cursor: pointer;
 }
 
-.uploadViewClose .u-icon,
-.uploadViewClose .el-icon {
+.uploadViewClose .u-icon {
   font-size: 12px;
   margin-top: 4px;
   margin-left: 10px;

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

@@ -1,61 +0,0 @@
-<template>
-  <scroll-view scroll-y>
-    <el-upload
-      v-model:file-list="siteList.recordPictureList"
-      :class="settingsStore.inspectionStatus == 2 ? 'avatar-uploader uploadDisabled' : 'avatar-uploader'"
-      :headers="{ Authorization: Authorization }"
-      :action="uploadUrl"
-      :on-success="uploadSuccess"
-      list-type="picture-card"
-    >
-      <el-icon class="avatar-uploader-icon"><Plus /></el-icon>
-      <template #file="{ file }">
-        <div :id="file.url">
-          <img class="el-upload-list__item-thumbnail" :src="file.url" alt="" />
-          <span class="el-upload-list__item-actions">
-            <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
-              <el-icon><Delete /></el-icon>
-            </span>
-          </span>
-        </div>
-      </template>
-    </el-upload>
-  </scroll-view>
-</template>
-
-<script setup>
-import { onLoad, onShow } from "@dcloudio/uni-app";
-import { ref, onMounted, inject, shallowRef } from "vue";
-import useXunJianStore from "@/store/modules/xunJian";
-
-const BASE_URL = inject("$BASE_URL");
-const settingsStore = useXunJianStore(); //全局变量值Store
-
-const siteList = ref({ recordPictureList: [] });
-
-const uploadUrl = ref(BASE_URL + "/service-file/upload");
-const Authorization = uni.getStorageSync("Authorization");
-const disabled = ref(false);
-function handleRemove(file) {
-  document.getElementById(file.url).parentNode.remove();
-  siteList.value.recordPictureList.splice(siteList.value.recordPictureList.indexOf(file), 1);
-}
-/**
- * @upload图片上传
- * @图片上传成功回调
- */
-function uploadSuccess(el, UploadFile) {
-  UploadFile.name = el.data.name;
-  UploadFile.url = el.data.url;
-}
-
-onLoad((options) => {});
-
-onMounted(() => {});
-</script>
-
-<style scoped>
-:deep(.uploadDisabled .el-upload--picture-card) {
-  display: none;
-}
-</style>

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

@@ -2,32 +2,7 @@
   <scroll-view scroll-y>
     <view>
       <view>
-        <el-calendar id="calendar" ref="calendar" v-model="currentDatevalue" @touchstart="touchStart" @touchend="touchEnd">
-          <template #header="{ date }">
-            <view style="display: flex; width: 100%">
-              <view>{{ date }}</view>
-              <view style="margin: auto"></view>
-              <view style="display: flex">
-                <view style="margin: 0px 10px">
-                  <span style="margin-right: 5px">合格</span>
-                  <span style="color: #00cdac">{{ JSON.stringify(currentDateList) === "{}" ? 0 : currentDateList.patrolledCount }}</span>
-                </view>
-                <view class="margin-left-xs">
-                  <span style="margin-right: 5px">漏检</span>
-                  <span style="color: #f07d28">{{ JSON.stringify(currentDateList) === "{}" ? 0 : currentDateList.undetectedCount }}</span>
-                </view>
-              </view>
-            </view>
-          </template>
-          <template #date-cell="{ data }">
-            <view @click="calendarClick(data)">
-              <p :class="data.isSelected ? 'is-selected' : ''">
-                {{ data.day.split("-").slice(2).join("-") }}
-              </p>
-              <view v-if="data.isSelected" class="filter"></view>
-            </view>
-          </template>
-        </el-calendar>
+        <oa-calendar class="uni-calendar--hook" :selected="info.selected" :showMonth="false" @change="change" @monthSwitch="monthSwitch" :currentDate="currentDateList" />
       </view>
       <view>
         <view class="padding-sm" style="display: flex; margin: 10px; padding: 10px 5rem">
@@ -65,7 +40,9 @@
                     </view>
                     <view style="margin: auto"></view>
                     <view style="display: flex">
-                      <el-progress style="margin: auto" type="circle" :percentage="activity.completion" :width="50" />
+                      <gb-progress originalColor="#f5f7fa" processColor="#20a0ff" innerbgColor="#fff" :process="activity.completion" :startPosDegree="60" :radius="50" :barWidth="10">
+                        {{ activity.completion + "%" }}
+                      </gb-progress>
                     </view>
                   </view>
                   <view style="display: flex" v-if="activity.planStatus == 1">
@@ -76,7 +53,9 @@
                     </view>
                     <view style="margin: auto"></view>
                     <view style="display: flex">
-                      <el-progress style="margin: auto" type="circle" :percentage="activity.completion" :width="50" />
+                      <gb-progress originalColor="#f5f7fa" processColor="#20a0ff" innerbgColor="#fff" :process="activity.completion" :startPosDegree="60" :radius="50" :barWidth="10">
+                        {{ activity.completion + "%" }}
+                      </gb-progress>
                     </view>
                   </view>
                   <view style="display: flex" v-if="activity.planStatus == 3">
@@ -100,7 +79,9 @@
                     </view>
                     <view style="margin: auto"></view>
                     <view style="display: flex">
-                      <el-progress style="margin: auto" type="circle" :percentage="activity.completion" :width="50" />
+                      <gb-progress originalColor="#f5f7fa" processColor="#20a0ff" innerbgColor="#fff" :process="activity.completion" :startPosDegree="60" :radius="50" :barWidth="10">
+                        {{ activity.completion + "%" }}
+                      </gb-progress>
                     </view>
                   </view>
                 </view>
@@ -163,14 +144,41 @@
 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();
+
+const info = ref({
+  lunar: true,
+  range: true,
+  insert: false,
+  selected: [],
+});
+
+/**
+ * @日期change事件
+ */
+function change(e) {
+  // console.log("change 返回:", e);
+  currentDate.value = e.fulldate;
+  currentApi();
+  activitiesApi();
+}
+
+/**
+ * @月份切换事件
+ */
+function monthSwitch(e) {
+  // console.log("monthSwitchs 返回:", e);
+}
 
 /**
  * @点击巡检
@@ -178,7 +186,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 +204,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 +235,7 @@ function scanClick() {
         title: "扫码成功",
         icon: "none",
       });
-      settingsStore.inspectionStatus = 1;
+      xunjianStore.inspectionStatus = 1;
 
       planList({
         siteNubmber: e.result,
@@ -358,60 +366,12 @@ function activitiesSortClick() {
  * @tabs切换change事件
  */
 const list = ref(["巡检任务", "巡检记录"]);
-const tabPosition = ref(settingsStore.planTabs);
+const tabPosition = ref(xunjianStore.planTabs);
 function tabPositionChange(index) {
   tabPosition.value = index;
   activitiesApi();
 }
 
-/**
- * @日期click事件
- */
-const calendar = ref(); //获取日期refs元素
-function calendarClick(data) {
-  currentDate.value = data.day;
-  currentApi();
-  activitiesApi();
-}
-
-/**
- * @触摸开始
- **/
-let touchStartX = 0; // 触屏起始点x
-let touchStartY = 0; // 触屏起始点y
-function touchStart(e) {
-  console.log("触摸开始");
-  touchStartX = e.touches[0].clientX;
-  touchStartY = e.touches[0].clientY;
-}
-
-/**
- * @触摸结束
- **/
-function touchEnd(e) {
-  console.log("触摸结束");
-  let deltaX = e.changedTouches[0].clientX - touchStartX;
-  let deltaY = e.changedTouches[0].clientY - touchStartY;
-  if (Math.abs(deltaX) > 50 && Math.abs(deltaX) > Math.abs(deltaY)) {
-    if (deltaX >= 0) {
-      console.log("左滑");
-
-      calendar.value.selectDate("prev-month");
-    } else {
-      console.log("右滑");
-      calendar.value.selectDate("next-month");
-    }
-  } else if (Math.abs(deltaY) > 50 && Math.abs(deltaX) < Math.abs(deltaY)) {
-    if (deltaY < 0) {
-      console.log("上滑");
-    } else {
-      console.log("下滑");
-    }
-  } else {
-    console.log("可能是误触！");
-  }
-}
-
 onLoad((options) => {
   currentApi();
   activitiesApi();
@@ -423,6 +383,11 @@ onLoad((options) => {
   });
 });
 
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+
 onMounted(() => {});
 </script>
 
@@ -430,4 +395,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) => {
@@ -51,13 +52,18 @@ function goDetail(item) {
 onNavigationBarButtonTap((e) => {
   console.log(e);
   uni.navigateTo({
-    url: "/pages/export/export",
+    url: "/pages/common/export/index",
   });
 });
 
 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/business/mhxf/xunJian/xunJian.vue

@@ -43,18 +43,19 @@
 
 <script setup>
 import { onLoad, onShow, onHide, onLaunch } from "@dcloudio/uni-app";
-import { ref, onMounted, inject } from "vue";
+import { ref, reactive, computed, onMounted, getCurrentInstance, toRefs, inject } from "vue";
 
 import chart from "./components/echarts/chart.vue";
 import json from "@/static/js/json.js";
 
-import publicStore from "@/store/modules/public";
-import useXunJianStore from "@/store/modules/xunJian";
-
 import { appPlanStatistics } from "@/api/business/mhxf/xunJian/index.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();
 
 const inspectList = json.xunJianList; //九宫格json数据
 
@@ -64,9 +65,9 @@ const currentDateList = ref([]);
 function navItemClick(url, id) {
   if (url) {
     if (id == 1) {
-      settingsStore.planTabs = 0;
+      xunjianStore.planTabs = 0;
     } else if (id == 2) {
-      settingsStore.planTabs = 1;
+      xunjianStore.planTabs = 1;
     }
 
     uni.navigateTo({
@@ -104,6 +105,11 @@ async function echartsApi() {
 onLoad(() => {
   echartsApi();
 });
+
+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,117 +1,48 @@
 <template>
   <!-- <u-sticky bgColor="#fff"> </u-sticky> -->
 
-  <!-- <pagesHarder></pagesHarder> -->
+  <u-navbar
+    :titleStyle="{ color: '#fff' }"
+    :autoBack="false"
+    :title="useStore.$state.loginTitle"
+    :placeholder="true"
+    :safeAreaInsetTop="true"
+    :bgColor="proxy.$settingStore.themeColor.color"
+    @rightClick="rightButtonClick()"
+  >
+    <template #left>
+      <view class="u-nav-slot">
+        <u-icon name="arrow-left" size="19" color="#fff" style="display: none"></u-icon>
+      </view>
+    </template>
+    <template #right>
+      <view class="u-nav-slot">
+        <u-icon name="plus" size="19" color="#fff"></u-icon>
+      </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
-          "
-        >
-          <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>
+  <!-- <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">
+      <!-- 下拉列表 开始 -->
+      <u-transition :show="arrayList.dialogFlag" :duration="200" mode="fade">
+        <view class="transition" @click="rightButtonClick()">
+          <view class="transition-section" :style="{ top: proxy.$settingStore.barHightTop }">
+            <view class="transition-section-content" @click="scanCode()">
+              <text class="transition-section-content-icon iconfont ucicon-saoyisao"></text>
+              <view class="transition-section-content-text"> 扫一扫 </view>
+            </view>
+            <!-- <div class="transition-section-divider"></div>
+            <view class="transition-section-content">
+              <text class="transition-section-content-icon iconfont ucicon-saoyisao"></text>
+              <view class="transition-section-content-text">发起群聊 </view>
+            </view> -->
           </view>
         </view>
-      </view> -->
-      <!-- 图表 end-->
+      </u-transition>
+      <!-- 下拉列表 结束 -->
 
       <!-- 轮播图 开始 -->
       <u-swiper
@@ -159,7 +90,7 @@
       </view>
       <!-- 宫格列表 end -->
     </view>
-  </scroll-view>
+  </view>
 </template>
 
 <script setup>
@@ -169,7 +100,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";
@@ -183,18 +114,7 @@ const BASE_URL = inject("$BASE_URL");
 const { proxy } = getCurrentInstance();
 
 const arrayList = reactive({
-  InputBottom: 0,
-  staticData: "",
-  indicator: [],
-  datavalue: [],
-  dataname: [],
-  Inv: 0,
-  flag: false,
-  searchList: [],
-  searchList2: [],
-  searchInput: "",
-  selectedCode: 10012,
-  codeResult: "",
+  dialogFlag: false,
 
   swiperBool: false,
   swiperIndex: 0,
@@ -293,31 +213,32 @@ onLoad((option) => {
     arrayList.recentlyUsed = uni.getStorageSync(useStore.$state.name + useStore.$state.tenantId);
   }
 
-  // var res = uni.getStorageSync("selectedCode");
-  // var res2 = uni.getStorageSync("selectedName");
-  // if (res) {
-  //   uni.setNavigationBarTitle({
-  //     title: res2,
-  //   });
-  // }
-
-  // // 图表切换渲染
-  // hackReset.value = false;
-  // nextTick(() => {
-  //   hackReset.value = true;
-  // });
-
   getAppRoutersData();
 
   getMobileBannerApi();
 });
 
-async function init() {
-  window.location.href = BASE_URL + "Com/getPageAuthorization1";
-}
-
-//APP扫码
+/**
+ * @扫码功能
+ */
 function scanCode() {
+  //#ifdef H5
+  jwx.configWeiXin((jweixin) => {
+    jweixin.scanQRCode({
+      needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+      scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是一维码，默认二者都有
+      success: function (res) {
+        setTimeout(function () {
+          getCodeResult({
+            ercode: res.resultStr,
+          });
+        }, 1000);
+      },
+    });
+  });
+  //#endif
+
+  //#ifdef APP-PLUS
   uni.scanCode({
     scanType: ["qrCode"],
     success: (res) => {
@@ -339,23 +260,7 @@ function scanCode() {
       console.log("扫码结束");
     },
   });
-}
-
-//微信扫码
-function scanQRCode() {
-  jwx.configWeiXin((jweixin) => {
-    jweixin.scanQRCode({
-      needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
-      scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是一维码，默认二者都有
-      success: function (res) {
-        setTimeout(function () {
-          getCodeResult({
-            ercode: res.resultStr,
-          });
-        }, 1000);
-      },
-    });
-  });
+  //#endif
 }
 
 //微信扫码成功后请求
@@ -423,43 +328,18 @@ function navItemClick(item) {
   }
 }
 
-function showTag() {
-  arrayList.flag = !arrayList.flag;
-}
-// 下拉选择
-function clickSelectItem(item, index) {
-  arrayList.staticData = "";
-  arrayList.selectedCode = item.owner_code;
-  uni.setStorageSync("selectedCode", item.owner_code);
-  uni.setStorageSync("selectedName", item.owner_name);
-  arrayList.searchInput = item.owner_name;
-  uni.setNavigationBarTitle({
-    title: arrayList.searchInput,
-  });
-
-  getHomeData({
-    company_code: uni.getStorageSync("selectedCode"),
-  });
-  getHandleData({
-    company_code: uni.getStorageSync("selectedCode"),
-  });
-
-  arrayList.flag = false;
-}
-
-function handleInput() {
-  var newlist = arrayList.searchList2.filter((item) => item.owner_name.indexOf(arrayList.searchInput) > -1);
-  arrayList.searchList = newlist;
-}
-
-function InputFocus(e) {
-  arrayList.InputBottom = e.detail.height;
-}
-
-function InputBlur(e) {
-  arrayList.InputBottom = 0;
+/**
+ * @右侧按钮点击事件
+ */
+function rightButtonClick() {
+  console.log(1);
+  arrayList.dialogFlag = !arrayList.dialogFlag;
 }
 
+/**
+ * @获取路由信息
+ * @api接口请求
+ */
 function getAppRoutersData() {
   getAppRouters({
     // domain: window.location.host.indexOf("localhost") != -1 ? "localhost:81" : window.location.host,
@@ -476,146 +356,84 @@ function getAppRoutersData() {
   });
 }
 
-//echarts图表请求
-function getHomeData(param = {}) {
-  getHomePageData(param).then((res) => {
-    // console.log('首页请求staticData')
-    // console.log(res.data.data[0])
-    arrayList.staticData = res.data.data[0];
-
-    // var data = res.data.data[0]
-
-    var datavalue = [
-      arrayList.staticData.fire_water_count,
-      arrayList.staticData.alarm_host_count,
-      arrayList.staticData.electrical_fire_count,
-      arrayList.staticData.other_count,
-      arrayList.staticData.video_monitoring_count,
-    ];
-    var dataname = ["消防水系统", "报警主机", "电气火灾", "其他", "监控视频"];
-    var color = ["#3C8BF0", "#06CDF8", "#0ECB70", "#6744EF", "#FFD803"];
-
-    var aa = [
-      arrayList.staticData.fire_water_count,
-      arrayList.staticData.alarm_host_count,
-      arrayList.staticData.electrical_fire_count,
-      arrayList.staticData.other_count,
-      arrayList.staticData.video_monitoring_count,
-    ];
-    aa.sort(function (a, b) {
-      return a - b;
-    });
-    aa = aa.pop();
-    var datamax = [aa, aa, aa, aa, aa];
-
-    arrayList.datavalue = datavalue;
-    arrayList.dataname = dataname;
-
-    dataname.map((val, ind) => {
-      arrayList.indicator.push({
-        name: val,
-        max: datamax[ind],
-        color: color[ind],
-      });
-    });
-    arrayList.indicator = arrayList.indicator.slice(-5);
-  });
-}
-
-// 未处理告警请求
-function getHandleData(param = {}) {
-  getFunctionalModuleStatistics(param).then((res) => {
-    arrayList.cuIconList[0].badge = res.data.data[0].comprehensive_alarm_count;
-    arrayList.cuIconList[2].badge = res.data.data[0].fire_brigade_inspector_count;
-  });
-}
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1, 2]);
+});
 
 // 自定义导航事件
 onNavigationBarButtonTap((e) => {
   if (e.float == "right") {
     // alert("你点击了扫一扫");
-
-    //#ifdef H5
-    scanQRCode();
-    //#endif
-
-    //#ifdef APP-PLUS
     scanCode();
-    //#endif
   } else {
-    // alert("你点击了获取位置");
-    // getLocation()
-    showTag();
+    rightButtonClick();
   }
 });
 </script>
 
-<style lang="scss">
-.select-items {
-  overflow: auto;
-  height: 80vh;
-}
+<style lang="scss" scoped>
+.home-container {
+  height: 100vh;
+
+  .uni-content-body {
+    // #ifdef H5
+    padding-bottom: 50px;
+    // #endif
+
+    .transition {
+      position: fixed;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      z-index: 1100;
+
+      .transition-section {
+        position: absolute;
+        top: 10px;
+        right: 15px;
+        background-color: #fff;
+        border-radius: 10px;
+        box-shadow: 0px 0px 15px 0 rgba(0, 0, 0, 0.2);
+
+        .transition-section-divider {
+          border-bottom: 0.5px rgba(0, 0, 0, 0.1) solid;
+          margin: 0 20px;
+        }
 
-.static-tabs {
-  border-radius: 50rpx;
-  border: 1rpx solid #4074e7;
+        .transition-section-content {
+          display: flex;
+          padding: 15px 20px;
 
-  > view {
-    color: #4074e7;
-    font-size: 30rpx;
-  }
+          .transition-section-content-icon {
+            font-size: 18px;
+            color: #000;
+          }
 
-  > view.active {
-    color: #fff;
-    background: #4074e7;
-  }
+          .transition-section-content-text {
+            margin: 0 20px;
+          }
+        }
 
-  > view:first-child {
-    border-top-left-radius: 50rpx;
-    border-bottom-left-radius: 50rpx;
-  }
+        .transition-section-content:first-child {
+          padding-top: 15px;
+          border-radius: 10px 10px 0 0;
+        }
 
-  > view:nth-child(2) {
-    border-left: 1px solid #4074e7;
-    border-right: 1px solid #4074e7;
-  }
+        .transition-section-content:last-child {
+          padding-bottom: 15px;
+          border-radius: 0 0 10px 10px;
+        }
 
-  > view:last-child {
-    border-top-right-radius: 50rpx;
-    border-bottom-right-radius: 50rpx;
+        .transition-section-content:hover {
+          // transform: 3s;
+          // transition: all 600ms cubic-bezier(0.3, 1, 0.2, 1);
+          transition: all 3s cubic-bezier(0.7, -0.5, 0.2, 2);
+          background-color: rgba(0, 0, 0, 0.1);
+        }
+      }
+    }
   }
 }
-
-/* 检测时间 */
-.time {
-  border-radius: 50rpx;
-  background: #fafcff;
-  border: 1px solid #e8f1ff;
-  padding: 20rpx;
-  color: #666666;
-  font-size: 30rpx;
-}
-
-.chart3-box {
-  position: relative;
-}
-
-.chart3-icon {
-  width: 90%;
-  position: absolute;
-  top: 60rpx;
-  left: 30rpx;
-  z-index: 1;
-}
-
-.chart3-icon li {
-  padding-top: 25rpx;
-}
-
-ul,
-li {
-  padding: 0;
-  margin: 0;
-  list-style: none;
-}
 </style>

src/pages/info/info.vue

@@ -1,25 +1,48 @@
 <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>
+    <u-navbar
+      :titleStyle="{ color: '#fff' }"
+      :autoBack="false"
+      title="消息"
+      :placeholder="true"
+      :safeAreaInsetTop="true"
+      :bgColor="proxy.$settingStore.themeColor.color"
+      @rightClick="rightButtonClick()"
+    >
+      <template #left>
+        <view class="u-nav-slot">
+          <u-icon name="arrow-left" size="19" color="#fff" style="display: none"></u-icon>
+        </view>
+      </template>
+      <template #right>
+        <view class="u-nav-slot">
+          <u-icon name="plus" size="19" color="#fff" style="display: none"></u-icon>
+        </view>
+      </template>
+    </u-navbar>
 
-    <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 class="uni-content-header"></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>
+              </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 +53,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 +90,11 @@ function goPushList() {
     complete: () => {},
   });
 }
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1, 2]);
+});
 </script>
 
 <style lang="scss">

src/pages/login.vue

@@ -292,27 +292,19 @@ function handlePrivacy() {
 onLoad(() => {
   env();
 });
-
-// onReady(() => {
-//   //动态修改状态栏的颜色
-//   uni.setNavigationBarColor({
-//     frontColor: "#000000",
-//     backgroundColor: "#ff0000",
-//   });
-// });
 </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,14 @@
 <template>
   <view class="about-container">
+    <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="关于我们" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+      <template #left>
+        <view class="u-nav-slot">
+          <u-icon name="arrow-left" size="19" color="#fff"></u-icon>
+        </view>
+      </template>
+    </u-navbar>
+
+    <view class="uni-content-header"></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 +53,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 +63,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,17 @@
 <template>
-  <view class="container">
+  <view class="avatar-container">
+    <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="修改头像" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+      <template #left>
+        <view class="u-nav-slot">
+          <u-icon name="arrow-left" size="19" color="#fff"></u-icon>
+        </view>
+      </template>
+    </u-navbar>
+
+    <view class="uni-content-header"></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 +32,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 +44,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,568 +84,603 @@ 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;
-      }
-      this.setData({
-        cutL: this.cutL - dragLengthX,
-        cutT: this.cutT - dragLengthY,
-        cutR: this.cutR + dragLengthX,
-        cutB: this.cutB + dragLengthY,
-      });
-
-      PAGE_X = e.touches[0].pageX;
-      PAGE_Y = e.touches[0].pageY;
-    },
-
-    contentTouchEnd() {},
-
-    // 获取图片
-    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();
-            });
-          },
+        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,
         });
-      });
-    },
-    // 设置大小的时候触发的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;
-    },
-
-    // 设置大小的时候触发的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;
       }
+      setData({
+        isShowImg: true,
+      });
+      uni.hideLoading();
     },
-  },
-};
-</script>
-
-<style>
-/* 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; */
-}
-
-.cropper-config {
-  padding: 20rpx 40rpx;
-}
-
-.cropper-content {
-  min-height: 750rpx;
-  width: 100%;
+  });
 }
 
-.uni-corpper {
-  position: relative;
-  overflow: hidden;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-  -webkit-tap-highlight-color: transparent;
-  -webkit-touch-callout: none;
-  box-sizing: border-box;
-}
-
-.uni-corpper-content {
-  position: relative;
-}
-
-.uni-corpper-content image {
-  display: block;
-  width: 100%;
-  min-width: 0 !important;
-  max-width: none !important;
-  height: 100%;
-  min-height: 0 !important;
-  max-height: none !important;
-  image-orientation: 0deg !important;
-  margin: 0 auto;
-}
-/* 移动图片效果 */
-
-.uni-cropper-drag-box {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  cursor: move;
-  background: rgba(0, 0, 0, 0.6);
-  z-index: 1;
+/**
+ * @拖动时候触发的touchStart事件
+ */
+function contentStartMove(e) {
+  PAGE_X = e.touches[0].pageX;
+  PAGE_Y = e.touches[0].pageY;
 }
-/* 内部的信息 */
 
-.uni-corpper-crop-box {
-  position: absolute;
-  background: rgba(255, 255, 255, 0.3);
-  z-index: 2;
+/**
+ * @拖动时候触发的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;
 }
 
-.uni-corpper-crop-box .uni-cropper-view-box {
-  position: relative;
-  display: block;
-  width: 100%;
-  height: 100%;
-  overflow: visible;
-  outline: 1rpx solid #69f;
-  outline-color: rgba(102, 153, 255, 0.75);
-}
-/* 横向虚线 */
-
-.uni-cropper-dashed-h {
-  position: absolute;
-  top: 33.33333333%;
-  left: 0;
-  width: 100%;
-  height: 33.33333333%;
-  border-top: 1rpx dashed rgba(255, 255, 255, 0.5);
-  border-bottom: 1rpx dashed rgba(255, 255, 255, 0.5);
-}
-/* 纵向虚线 */
-
-.uni-cropper-dashed-v {
-  position: absolute;
-  left: 33.33333333%;
-  top: 0;
-  width: 33.33333333%;
-  height: 100%;
-  border-left: 1rpx dashed rgba(255, 255, 255, 0.5);
-  border-right: 1rpx dashed rgba(255, 255, 255, 0.5);
-}
-/* 四个方向的线  为了之后的拖动事件*/
-
-.uni-cropper-line-t {
-  position: absolute;
-  display: block;
-  width: 100%;
-  background-color: #69f;
-  top: 0;
-  left: 0;
-  height: 1rpx;
-  opacity: 0.1;
-  cursor: n-resize;
-}
-
-.uni-cropper-line-t::before {
-  content: "";
-  position: absolute;
-  top: 50%;
-  right: 0rpx;
-  width: 100%;
-  -webkit-transform: translate3d(0, -50%, 0);
-  transform: translate3d(0, -50%, 0);
-  bottom: 0;
-  height: 41rpx;
-  background: transparent;
-  z-index: 11;
-}
-
-.uni-cropper-line-r {
-  position: absolute;
-  display: block;
-  background-color: #69f;
-  top: 0;
-  right: 0rpx;
-  width: 1rpx;
-  opacity: 0.1;
-  height: 100%;
-  cursor: e-resize;
-}
-
-.uni-cropper-line-r::before {
-  content: "";
-  position: absolute;
-  top: 0;
-  left: 50%;
-  width: 41rpx;
-  -webkit-transform: translate3d(-50%, 0, 0);
-  transform: translate3d(-50%, 0, 0);
-  bottom: 0;
-  height: 100%;
-  background: transparent;
-  z-index: 11;
-}
-
-.uni-cropper-line-b {
-  position: absolute;
-  display: block;
-  width: 100%;
-  background-color: #69f;
-  bottom: 0;
-  left: 0;
-  height: 1rpx;
-  opacity: 0.1;
-  cursor: s-resize;
-}
-
-.uni-cropper-line-b::before {
-  content: "";
-  position: absolute;
-  top: 50%;
-  right: 0rpx;
-  width: 100%;
-  -webkit-transform: translate3d(0, -50%, 0);
-  transform: translate3d(0, -50%, 0);
-  bottom: 0;
-  height: 41rpx;
-  background: transparent;
-  z-index: 11;
-}
-
-.uni-cropper-line-l {
-  position: absolute;
-  display: block;
-  background-color: #69f;
-  top: 0;
-  left: 0;
-  width: 1rpx;
-  opacity: 0.1;
-  height: 100%;
-  cursor: w-resize;
-}
-
-.uni-cropper-line-l::before {
-  content: "";
-  position: absolute;
-  top: 0;
-  left: 50%;
-  width: 41rpx;
-  -webkit-transform: translate3d(-50%, 0, 0);
-  transform: translate3d(-50%, 0, 0);
-  bottom: 0;
-  height: 100%;
-  background: transparent;
-  z-index: 11;
-}
-
-.uni-cropper-point {
-  width: 5rpx;
-  height: 5rpx;
-  background-color: #69f;
-  opacity: 0.75;
-  position: absolute;
-  z-index: 3;
-}
-
-.point-t {
-  top: -3rpx;
-  left: 50%;
-  margin-left: -3rpx;
-  cursor: n-resize;
-}
-
-.point-tr {
-  top: -3rpx;
-  left: 100%;
-  margin-left: -3rpx;
-  cursor: n-resize;
-}
-
-.point-r {
-  top: 50%;
-  left: 100%;
-  margin-left: -3rpx;
-  margin-top: -3rpx;
-  cursor: n-resize;
-}
-
-.point-rb {
-  left: 100%;
-  top: 100%;
-  -webkit-transform: translate3d(-50%, -50%, 0);
-  transform: translate3d(-50%, -50%, 0);
-  cursor: n-resize;
-  width: 36rpx;
-  height: 36rpx;
-  background-color: #69f;
-  position: absolute;
-  z-index: 1112;
-  opacity: 1;
-}
-
-.point-b {
-  left: 50%;
-  top: 100%;
-  margin-left: -3rpx;
-  margin-top: -3rpx;
-  cursor: n-resize;
+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();
+        });
+      },
+    });
+  });
 }
 
-.point-bl {
-  left: 0%;
-  top: 100%;
-  margin-left: -3rpx;
-  margin-top: -3rpx;
-  cursor: n-resize;
+/**
+ * @设置大小的时候触发的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;
 }
 
-.point-l {
-  left: 0%;
-  top: 50%;
-  margin-left: -3rpx;
-  margin-top: -3rpx;
-  cursor: n-resize;
+/**
+ * @设置大小的时候触发的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,
+      });
+      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;
+  }
 }
 
-.point-lt {
-  left: 0%;
-  top: 0%;
-  margin-left: -3rpx;
-  margin-top: -3rpx;
-  cursor: n-resize;
-}
-/* 裁剪框预览内容 */
+/**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+onReady(() => {
+  loadImage();
+});
+
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+</script>
 
-.uni-cropper-viewer {
-  position: relative;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-}
+<style lang="scss">
+/* pages/uni-cropper/index.wxss */
 
-.uni-cropper-viewer image {
-  position: absolute;
-  z-index: 2;
+.avatar-container {
+  .cropper-config {
+    padding: 20rpx 40rpx;
+  }
+
+  .cropper-content {
+    min-height: 750rpx;
+    width: 100%;
+  }
+
+  .uni-corpper {
+    position: relative;
+    overflow: hidden;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    -webkit-tap-highlight-color: transparent;
+    -webkit-touch-callout: none;
+    box-sizing: border-box;
+  }
+
+  .uni-corpper-content {
+    position: relative;
+  }
+
+  .uni-corpper-content image {
+    display: block;
+    width: 100%;
+    min-width: 0 !important;
+    max-width: none !important;
+    height: 100%;
+    min-height: 0 !important;
+    max-height: none !important;
+    image-orientation: 0deg !important;
+    margin: 0 auto;
+  }
+  /* 移动图片效果 */
+
+  .uni-cropper-drag-box {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    cursor: move;
+    background: rgba(0, 0, 0, 0.6);
+    z-index: 1;
+  }
+  /* 内部的信息 */
+
+  .uni-corpper-crop-box {
+    position: absolute;
+    background: rgba(255, 255, 255, 0.3);
+    z-index: 2;
+  }
+
+  .uni-corpper-crop-box .uni-cropper-view-box {
+    position: relative;
+    display: block;
+    width: 100%;
+    height: 100%;
+    overflow: visible;
+    outline: 1rpx solid #69f;
+    outline-color: rgba(102, 153, 255, 0.75);
+  }
+  /* 横向虚线 */
+
+  .uni-cropper-dashed-h {
+    position: absolute;
+    top: 33.33333333%;
+    left: 0;
+    width: 100%;
+    height: 33.33333333%;
+    border-top: 1rpx dashed rgba(255, 255, 255, 0.5);
+    border-bottom: 1rpx dashed rgba(255, 255, 255, 0.5);
+  }
+  /* 纵向虚线 */
+
+  .uni-cropper-dashed-v {
+    position: absolute;
+    left: 33.33333333%;
+    top: 0;
+    width: 33.33333333%;
+    height: 100%;
+    border-left: 1rpx dashed rgba(255, 255, 255, 0.5);
+    border-right: 1rpx dashed rgba(255, 255, 255, 0.5);
+  }
+  /* 四个方向的线  为了之后的拖动事件*/
+
+  .uni-cropper-line-t {
+    position: absolute;
+    display: block;
+    width: 100%;
+    background-color: #69f;
+    top: 0;
+    left: 0;
+    height: 1rpx;
+    opacity: 0.1;
+    cursor: n-resize;
+  }
+
+  .uni-cropper-line-t::before {
+    content: "";
+    position: absolute;
+    top: 50%;
+    right: 0rpx;
+    width: 100%;
+    -webkit-transform: translate3d(0, -50%, 0);
+    transform: translate3d(0, -50%, 0);
+    bottom: 0;
+    height: 41rpx;
+    background: transparent;
+    z-index: 11;
+  }
+
+  .uni-cropper-line-r {
+    position: absolute;
+    display: block;
+    background-color: #69f;
+    top: 0;
+    right: 0rpx;
+    width: 1rpx;
+    opacity: 0.1;
+    height: 100%;
+    cursor: e-resize;
+  }
+
+  .uni-cropper-line-r::before {
+    content: "";
+    position: absolute;
+    top: 0;
+    left: 50%;
+    width: 41rpx;
+    -webkit-transform: translate3d(-50%, 0, 0);
+    transform: translate3d(-50%, 0, 0);
+    bottom: 0;
+    height: 100%;
+    background: transparent;
+    z-index: 11;
+  }
+
+  .uni-cropper-line-b {
+    position: absolute;
+    display: block;
+    width: 100%;
+    background-color: #69f;
+    bottom: 0;
+    left: 0;
+    height: 1rpx;
+    opacity: 0.1;
+    cursor: s-resize;
+  }
+
+  .uni-cropper-line-b::before {
+    content: "";
+    position: absolute;
+    top: 50%;
+    right: 0rpx;
+    width: 100%;
+    -webkit-transform: translate3d(0, -50%, 0);
+    transform: translate3d(0, -50%, 0);
+    bottom: 0;
+    height: 41rpx;
+    background: transparent;
+    z-index: 11;
+  }
+
+  .uni-cropper-line-l {
+    position: absolute;
+    display: block;
+    background-color: #69f;
+    top: 0;
+    left: 0;
+    width: 1rpx;
+    opacity: 0.1;
+    height: 100%;
+    cursor: w-resize;
+  }
+
+  .uni-cropper-line-l::before {
+    content: "";
+    position: absolute;
+    top: 0;
+    left: 50%;
+    width: 41rpx;
+    -webkit-transform: translate3d(-50%, 0, 0);
+    transform: translate3d(-50%, 0, 0);
+    bottom: 0;
+    height: 100%;
+    background: transparent;
+    z-index: 11;
+  }
+
+  .uni-cropper-point {
+    width: 5rpx;
+    height: 5rpx;
+    background-color: #69f;
+    opacity: 0.75;
+    position: absolute;
+    z-index: 3;
+  }
+
+  .point-t {
+    top: -3rpx;
+    left: 50%;
+    margin-left: -3rpx;
+    cursor: n-resize;
+  }
+
+  .point-tr {
+    top: -3rpx;
+    left: 100%;
+    margin-left: -3rpx;
+    cursor: n-resize;
+  }
+
+  .point-r {
+    top: 50%;
+    left: 100%;
+    margin-left: -3rpx;
+    margin-top: -3rpx;
+    cursor: n-resize;
+  }
+
+  .point-rb {
+    left: 100%;
+    top: 100%;
+    -webkit-transform: translate3d(-50%, -50%, 0);
+    transform: translate3d(-50%, -50%, 0);
+    cursor: n-resize;
+    width: 36rpx;
+    height: 36rpx;
+    background-color: #69f;
+    position: absolute;
+    z-index: 1112;
+    opacity: 1;
+  }
+
+  .point-b {
+    left: 50%;
+    top: 100%;
+    margin-left: -3rpx;
+    margin-top: -3rpx;
+    cursor: n-resize;
+  }
+
+  .point-bl {
+    left: 0%;
+    top: 100%;
+    margin-left: -3rpx;
+    margin-top: -3rpx;
+    cursor: n-resize;
+  }
+
+  .point-l {
+    left: 0%;
+    top: 50%;
+    margin-left: -3rpx;
+    margin-top: -3rpx;
+    cursor: n-resize;
+  }
+
+  .point-lt {
+    left: 0%;
+    top: 0%;
+    margin-left: -3rpx;
+    margin-top: -3rpx;
+    cursor: n-resize;
+  }
+  /* 裁剪框预览内容 */
+
+  .uni-cropper-viewer {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+  }
+
+  .uni-cropper-viewer image {
+    position: absolute;
+    z-index: 2;
+  }
 }
 </style>

src/pages/mine/help/index.vue

@@ -1,11 +1,22 @@
 <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>
+    <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="常见问题" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+      <template #left>
+        <view class="u-nav-slot">
+          <u-icon name="arrow-left" size="19" color="#fff"></u-icon>
+        </view>
+      </template>
+    </u-navbar>
+
+    <view class="uni-content-header"></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 +25,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 +77,56 @@ 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;
-}
+  .uni-content-body {
+    padding: 30rpx;
 
-.list-title {
-  margin-bottom: 30rpx;
-}
+    .list-title {
+      margin-bottom: 30rpx;
+    }
 
-.childList {
-  background: #ffffff;
-  box-shadow: 0px 0px 10rpx rgba(193, 193, 193, 0.2);
-  border-radius: 16rpx;
-  margin-top: 10rpx;
-}
+    .childList {
+      background: #ffffff;
+      box-shadow: 0px 0px 10rpx rgba(193, 193, 193, 0.2);
+      border-radius: 16rpx;
+      margin-top: 10rpx;
+    }
 
-.line {
-  width: 100%;
-  height: 1rpx;
-  background-color: #f5f5f5;
-}
+    .line {
+      width: 100%;
+      height: 1rpx;
+      background-color: #f5f5f5;
+    }
 
-.text-title {
-  color: #303133;
-  font-size: 32rpx;
-  font-weight: bold;
-  margin-left: 10rpx;
+    .text-title {
+      color: #303133;
+      font-size: 32rpx;
+      font-weight: bold;
+      margin-left: 10rpx;
 
-  .iconfont {
-    font-size: 16px;
-    margin-right: 10rpx;
-  }
-}
+      .iconfont {
+        font-size: 16px;
+        margin-right: 10rpx;
+      }
+    }
 
-.text-item {
-  font-size: 28rpx;
-  padding: 24rpx;
-}
+    .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">
@@ -96,27 +77,112 @@
         </view>
       </view>
 
+      <view class="menu-list">
+        <!-- <view class="list-cell list-cell-arrow" @click="goMessagePush()">
+          <view class="menu-item-box">
+            <view class="iconfont icon-aixin menu-icon"></view>
+            <view>推送设置</view>
+          </view>
+        </view>
+        <view class="list-cell list-cell-arrow" @click="goBuilding()">
+          <view class="menu-item-box">
+            <view class="iconfont icon-help menu-icon"></view>
+            <view>建筑管理</view>
+          </view>
+        </view>
+        <view class="list-cell list-cell-arrow" @click="goFunReport()">
+          <view class="menu-item-box">
+            <view class="iconfont icon-clean menu-icon"></view>
+            <view>功能报备</view>
+          </view>
+        </view> -->
+      </view>
+
+      <view class="cu-list menu">
+        <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 item-box">
+        <view class="cu-item">
           <view class="content text-center" @click="handleLogout">
             <text class="text-black">退出登录</text>
           </view>
         </view>
       </view>
     </view>
+
+    <view class="cu-list menu-avatar padding-lr-sm padding-top-sm">
+      <!-- <view class="cu-item" @tap="goSiteManage" v-if="permissionLabel == 1">
+        <view class="cu-avatar" style="background-image: url(@/static/images/setting/setting-icon2.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 class="cu-item" @tap="goAuthManage" v-if="permissionLabel == 1">
+        <view class="cu-avatar" style="background-image: url(@/static/images/setting/setting-icon4.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-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 { getAuthorization } from "@/api/setting/index.js";
+
 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 +202,54 @@ 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);
+
+const permissionLabel = ref(0);
+
+function getAuthorizationApi(params) {
+  getAuthorization(params).then((res) => {
+    permissionLabel.value = res.data.permissionLabel;
+  });
+}
+
+function goMessagePush() {
+  uni.navigateTo({
+    url: "/pages/setting/messagePush/messagePush",
+    success: (res) => {},
+    fail: () => {},
+    complete: () => {},
+  });
+}
+function goBuilding() {
+  uni.navigateTo({
+    url: "/pages/setting/building/building",
+    success: (res) => {},
+    fail: () => {},
+    complete: () => {},
+  });
+}
+function goFunReport() {
+  uni.navigateTo({
+    url: "/pages/setting/funReport/funReport",
+    success: (res) => {},
+    fail: () => {},
+    complete: () => {},
+  });
+}
+
+/**
+ * @主题颜色选择
+ */
+function SetColor(item) {
+  colorModal.value = false;
+  proxy.$settingStore.SET_THEMECOLOR(item);
+  proxy.$settingStore.systemThemeColor([1, 2]);
+}
 
 /**
  * @点击登录
@@ -147,11 +258,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 +353,9 @@ let startY = 0,
   moveY = 0,
   pageAtTop = true;
 
+/**
+ * @触摸开始
+ */
 function coverTouchstart(e) {
   if (pageAtTop === false) {
     return;
@@ -224,6 +363,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 +382,10 @@ function coverTouchmove(e) {
     coverTransform.value = `translateY(${moveDistance}px)`;
   }
 }
+
+/**
+ * @触摸结束
+ */
 function coverTouchend() {
   if (moving.value === false) {
     return;
@@ -248,25 +395,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 +461,9 @@ onNavigationBarButtonTap((e) => {
   .content-section {
     position: relative;
     margin-top: -85px;
+    // #ifdef H5
+    padding-bottom: 50px;
+    // #endif
     background-color: #f8f8f8;
 
     .mine-image {
@@ -337,10 +493,23 @@ onNavigationBarButtonTap((e) => {
       }
     }
   }
+
+  .cu-list.menu-avatar .cu-item {
+    border-radius: 5px;
+    padding: 30rpx 0;
+    box-shadow: 1px 1px 4px rgb(26 26 26 / 10%);
+    .cu-avatar {
+      background-color: rgba(0, 0, 0, 0);
+      background-size: 100% 100%;
+      left: 26rpx;
+    }
+    .content {
+      left: 130rpx;
+      font-size: 32rpx;
+    }
+  }
 }
-</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">
@@ -133,38 +183,70 @@ page {
 }
 </style>
 
-<style lang="scss">
-.example {
-  padding: 15px;
-  background-color: #fff;
+<style lang="scss" scoped>
+:deep(.uni-page-head__title) {
+  opacity: 1 !important;
+}
 
-  .edtiButtom {
-    font-size: 15px;
-    border-radius: 100px;
+.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;
+    }
   }
-}
 
-.segmented-control {
-  margin-bottom: 15px;
-}
+  .example {
+    padding: 15px;
+    background-color: #fff;
 
-.button-group {
-  margin-top: 15px;
-  display: flex;
-  justify-content: space-around;
-}
+    .edtiButtom {
+      font-size: 15px;
+      border-radius: 100px;
+    }
+  }
 
-.form-item {
-  display: flex;
-  align-items: center;
-  flex: 1;
-}
+  .segmented-control {
+    margin-bottom: 15px;
+  }
+
+  .button-group {
+    margin-top: 15px;
+    display: flex;
+    justify-content: space-around;
+  }
 
-.button {
-  display: flex;
-  align-items: center;
-  height: 35px;
-  line-height: 35px;
-  margin-left: 10px;
+  .form-item {
+    display: flex;
+    align-items: center;
+    flex: 1;
+  }
+
+  .button {
+    display: flex;
+    align-items: center;
+    height: 35px;
+    line-height: 35px;
+    margin-left: 10px;
+  }
 }
 </style>

src/pages/mine/pwd/index.vue

@@ -1,17 +1,28 @@
 <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>
+    <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="修改密码" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+      <template #left>
+        <view class="u-nav-slot">
+          <u-icon name="arrow-left" size="19" color="#fff"></u-icon>
+        </view>
+      </template>
+    </u-navbar>
+
+    <view class="uni-content-header"></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 +32,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 +79,8 @@ const data = reactive({
     },
   },
 });
-
 const { user, rules } = toRefs(data);
 
-const { proxy } = getCurrentInstance();
-
 const form = ref(null);
 
 function submit() {
@@ -78,6 +91,11 @@ function submit() {
   });
 }
 
+onShow(() => {
+  //调用系统主题颜色
+  proxy.$settingStore.systemThemeColor([1]);
+});
+
 onReady(() => {
   form.value.setRules(rules.value);
 });
@@ -90,7 +108,7 @@ page {
 </style>
 
 <style lang="scss">
-.pwd-retrieve-container {
+.uni-content-body {
   padding-top: 36rpx;
   padding: 15px;
 }

src/pages/setting/funReport/funReport.vue → src/pages/mine/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";
 
@@ -229,7 +229,7 @@ onReachBottom(() => {
 onNavigationBarButtonTap((e) => {
   console.log(e);
   uni.navigateTo({
-    url: "./export/export?dwtype=" + dwtype.value,
+    url: "./common/export/index?dwtype=" + dwtype.value,
   });
 });
 </script>

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/setting/messagePush/messagePush.vue → src/pages/mine/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/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/funcAdd/funcAdd.vue

@@ -1,380 +0,0 @@
-<template>
-  <view class="appWrapper padding-top" style="height: calc(100vh - 250rpx); overflow: scroll">
-    <form action="" class="funcAdd">
-      <view class="form-item selectBox">
-        <view class="title"><text class="necessary">*</text>报备类型:</view>
-        <el-select v-model="report_type" name="" id="" placeholder="" clearable>
-          <el-option value="">请选择</el-option>
-          <el-option value="1">单位</el-option>
-          <el-option value="2">类型</el-option>
-          <el-option value="3">设备</el-option>
-        </el-select>
-        <text class="icon iconfont margin-right-sm margin-left">&#xe63d;</text>
-      </view>
-      <view class="form-item selectBox" v-if="report_type == 2 || report_type == 3">
-        <view class="title"><text class="necessary">*</text>设备类型:</view>
-        <el-select v-model="device_type" name="" id="" placeholder="" clearable>
-          <el-option value="">请选择</el-option>
-          <el-option value="1">火系统</el-option>
-          <el-option value="2">水系统</el-option>
-          <el-option value="3">烟感系统</el-option>
-          <el-option value="4">消防栓</el-option>
-          <el-option value="5">液位</el-option>
-          <el-option value="6">RTU</el-option>
-          <el-option value="7">电气火灾</el-option>
-          <el-option value="16">视频监控</el-option>
-          <el-option value="128">井盖</el-option>
-          <el-option value="131">可燃气体</el-option>
-          <el-option value="130">门禁监测</el-option>
-          <el-option value="129">地磁监测</el-option>
-          <el-option value="17">电梯监测</el-option>
-        </el-select>
-        <text class="icon iconfont margin-right-sm margin-left">&#xe63d;</text>
-      </view>
-
-      <view class="form-item" v-if="report_type">
-        <view class="title">
-          <text class="necessary">*</text>
-          开始时间:
-        </view>
-        <view class="example-body">
-          <uni-datetime-picker v-model="start_time" :start="id ? '' : now" />
-        </view>
-      </view>
-      <view class="form-item" v-if="report_type">
-        <view class="title">
-          <text class="necessary">*</text>
-          结束时间:
-        </view>
-        <view class="example-body">
-          <uni-datetime-picker v-model="end_time" :start="start_time" />
-        </view>
-      </view>
-
-      <view class="form-item" v-if="report_type == 3 && device_type == 6">
-        <view class="title"><text class="necessary">*</text>端口号:</view>
-        <input name="input" v-model="device_port" />
-      </view>
-
-      <view class="form-item selectBox" v-if="report_type == 3 && device_type == 6">
-        <view class="title"><text class="necessary">*</text>端口类型:</view>
-        <el-select v-model="port_type" name="" id="" placeholder="" clearable>
-          <el-option value="">请选择</el-option>
-          <el-option value="1">数字量</el-option>
-          <el-option value="2">模拟量</el-option>
-        </el-select>
-        <text class="icon iconfont margin-right-sm margin-left">&#xe63d;</text>
-      </view>
-
-      <view class="form-item selectBox" v-if="report_type == 3 && device_type">
-        <view class="title"><text class="necessary">*</text>报备设备:</view>
-        <el-select v-model="device_code" name="" id="" placeholder="" clearable>
-          <el-option value="">请选择</el-option>
-          <el-option :value="item.owner_code" v-for="(item, index) in deviceListData" :key="index">
-            {{ item.owner_name }}
-          </el-option>
-        </el-select>
-        <text class="icon iconfont margin-right-sm margin-left">&#xe63d;</text>
-      </view>
-
-      <view class="form-item" v-if="report_type">
-        <view class="title"><text class="necessary"></text>备注:</view>
-        <input name="input" v-model="remarks" />
-      </view>
-
-      <view class="btn-area submitBottomBtn padding-lr-sm">
-        <button class="bg-blue round margin-top" @tap="submit()">提 交</button>
-      </view>
-    </form>
-  </view>
-</template>
-
-<script setup>
-import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
-import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, watch, toRefs } from "vue";
-
-const data = reactive({
-  id: "",
-
-  report_type: "",
-  device_type: "",
-  start_time: "",
-  end_time: "",
-  remarks: "",
-  device_port: "",
-  port_type: "",
-  device_code: "",
-  now: "",
-
-  deviceListData: [],
-  detailsData: "",
-});
-
-const {
-  id,
-  report_type,
-  device_type,
-  start_time,
-  end_time,
-  remarks,
-  device_port,
-  port_type,
-  device_code,
-  now,
-
-  deviceListData,
-  detailsData,
-} = toRefs;
-
-// 回显信息请求
-async function getDetailsData(params = {}) {
-  const res = await this.$myRequest({
-    url: "AlarmReport/editData",
-    data: params,
-    showLoading: true,
-  });
-
-  detailsData.value = res.data.data[0];
-  console.log(detailsData.value);
-  report_type.value = detailsData.value.report_type;
-  device_type.value = detailsData.value.device_type;
-  start_time.value = detailsData.value.start_time;
-  end_time.value = detailsData.value.end_time;
-  remarks.value = detailsData.value.remarks;
-  port_type.value = detailsData.value.port_type;
-  device_port.value = detailsData.value.device_port;
-  device_code.value = detailsData.value.device_code;
-}
-
-async function submit() {
-  //提交验证
-
-  if (!report_type.value) {
-    uni.showToast({
-      title: "请输入报备类型",
-      icon: "none",
-    });
-    return;
-  }
-  if (report_type.value == 1) {
-    if (!start_time.value.replace(/^\s*/g, "")) {
-      uni.showToast({
-        title: "请选择开始时间",
-        icon: "none",
-      });
-      return;
-    }
-    if (!end_time.value.replace(/^\s*/g, "")) {
-      uni.showToast({
-        title: "请选择结束时间",
-        icon: "none",
-      });
-      return;
-    }
-  }
-  if (report_type.value == 2 || report_type.value == 3) {
-    if (!device_type.value) {
-      uni.showToast({
-        title: "请选择设备类型",
-        icon: "none",
-      });
-      return;
-    }
-    if (!start_time.value.replace(/^\s*/g, "")) {
-      uni.showToast({
-        title: "请输入开始时间",
-        icon: "none",
-      });
-      return;
-    }
-    if (!end_time.value.replace(/^\s*/g, "")) {
-      uni.showToast({
-        title: "请输入结束时间",
-        icon: "none",
-      });
-      return;
-    }
-  }
-
-  if (report_type.value == 3 && device_type.value) {
-    if (device_type.value == 6) {
-      if (!device_port.value.replace(/^\s*/g, "")) {
-        uni.showToast({
-          title: "请输入端口号",
-          icon: "none",
-        });
-        return;
-      }
-      if (!port_type.value) {
-        uni.showToast({
-          title: "请选择端口类型",
-          icon: "none",
-        });
-        return;
-      }
-      if (!device_code.value) {
-        uni.showToast({
-          title: "请选择报备设备",
-          icon: "none",
-        });
-        return;
-      }
-    }
-    if (!device_code.value) {
-      uni.showToast({
-        title: "请选择报备设备",
-        icon: "none",
-      });
-      return;
-    }
-  }
-
-  let queryParam = {};
-  if (id.value) {
-    queryParam.id = id.value;
-  }
-  queryParam.report_type = report_type.value;
-  queryParam.company_code = uni.getStorageSync("selectedCode");
-  queryParam.remarks = remarks.value;
-  queryParam.start_time = start_time.value;
-  queryParam.end_time = end_time.value;
-
-  if (id.value) {
-    queryParam.id = id.value;
-  }
-
-  if (report_type.value == 1) {
-    addDevice(queryParam);
-    return;
-  }
-  if (report_type.value == 2) {
-    queryParam.device_type = device_type.value;
-    addDevice(queryParam);
-    return;
-  }
-  if (report_type.value == 3) {
-    queryParam.device_type = device_type.value;
-    if (device_type.value == 6) {
-      queryParam.port_type = port_type.value;
-      queryParam.device_port = device_port.value;
-    }
-    queryParam.device_code = device_code.value;
-    addDevice(queryParam);
-    return;
-  }
-
-  addDevice(queryParam);
-}
-
-async function addDevice(params = {}) {
-  const res = await this.$myRequest({
-    url: id.value ? "AlarmReport/edit" : "AlarmReport/add",
-    data: params,
-  });
-
-  if (!res.data.flag) {
-    uni.showToast({
-      title: "提交失败",
-      icon: "none",
-    });
-  } else {
-    uni.showToast({
-      title: "提交成功",
-    });
-  }
-  setTimeout(() => {
-    uni.redirectTo({
-      url: "/pages/setting/funReport/funReport",
-    });
-  }, 1000);
-}
-
-function radioChange(e) {
-  console.log("type:" + e.detail.value);
-  radioOne.value = e.detail.value;
-}
-
-//报备设备下拉请求数据
-async function deviceList(params = {}) {
-  const res = await this.$myRequest({
-    url: "AlarmReport/deviceList",
-    data: params,
-  });
-  deviceListData.value = res.data.data;
-
-  var arr = [];
-  deviceListData.value.forEach(function (item) {
-    arr.push(item.owner_code);
-  });
-  if (arr.indexOf(device_code.value) == -1) {
-    device_code.value = "";
-  }
-}
-
-onLoad((option) => {
-  id.value = option.id;
-  uni.setNavigationBarTitle({
-    title: option.id ? "编辑" : "新增",
-  });
-
-  var nowTemp = new Date();
-  now.value = new Date(nowTemp.getFullYear(), nowTemp.getMonth(), nowTemp.getDate(), 0, 0, 0, 0);
-
-  if (option.id) {
-    getDetailsData({ id: option.id });
-  }
-});
-
-watch(() => {
-  function start_time() {
-    // alert(start_time.value)
-  }
-  function report_type(newVal) {
-    if (newVal) {
-      var array123 = ["", "1", "2", "3", "4", "5", "6", "7", "16", "128", "131", "130", "129", "17"];
-      if (array123.indexOf(device_type.value) == -1) {
-        device_type.value = "";
-      }
-    }
-  }
-  function device_type(newVal) {
-    if (newVal) {
-      deviceList({
-        company_code: uni.getStorageSync("selectedCode"),
-        device_type: device_type.value,
-      });
-    }
-  }
-});
-</script>
-
-<style scoped>
-::v-deep .funcAdd .uni-date-x--border,
-.uni-date-x {
-  border-radius: 0 !important;
-}
-.funcAdd .example-body {
-  margin: 0;
-  width: calc(100% - 200rpx);
-}
-</style>
-
-<style lang="scss">
-input,
-select,
-option {
-  line-height: 70rpx;
-  padding: 0 20rpx;
-  height: 70rpx;
-  border: 1px solid #ededed;
-  // width:500rpx!important;
-  background-color: #fff;
-  box-sizing: border-box;
-  appearance: none;
-  -moz-appearance: none;
-  -webkit-appearance: none;
-  color: #999;
-}
-
-/* 站点多选下拉样式end */
-</style>

src/pages/setting/setting.vue

@@ -1,185 +0,0 @@
-<template>
-  <view class="setting-wrapper">
-    <view class="top-banner justify-center align-center text-center">
-      <view>
-        <image width="130" src="@/static/images/setting/personal-head.png"></image>
-        <view class="userName">{{ useStores.$state.name }}</view>
-        <!-- <view>上海永天科技股份有限公司</view> -->
-      </view>
-    </view>
-    <view class="cu-list menu-avatar padding-lr-sm padding-top-sm">
-      <!-- <view class="cu-item margin-bottom-sm" @tap="goMessagePush()">
-        <view class="cu-avatar">
-          <image class="image-bg" src="@/static/images/setting/push-icon.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 class="cu-item margin-bottom-sm" @tap="goBuilding()">
-        <view class="cu-avatar">
-          <image class="image-bg" src="@/static/images/setting/building-icon.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 class="cu-item margin-bottom-sm" @tap="goFunReport()">
-        <view class="cu-avatar">
-          <image class="image-bg" src="@/static/images/setting/funcReport.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 class="margin-bottom-sm">
-        <u-button @click="loginOut()" text="退出登录"></u-button>
-      </view>
-
-      <!-- <view class="cu-item" @tap="goSiteManage" v-if="permissionLabel==1">
-				<view class="cu-avatar " style="background-image:url(@/static/images/setting/setting-icon2.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 class="cu-item" @tap="goAuthManage" v-if="permissionLabel==1">
-				<view class="cu-avatar " style="background-image:url(@/static/images/setting/setting-icon4.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>
-</template>
-
-<script setup>
-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 publicStore from "@/store/modules/public";
-
-import { getAuthorization } from "@/api/setting/index.js";
-
-const useStores = useStore(); //全局用户信息Store
-const publicStores = publicStore(); //全局公共Store
-
-const permissionLabel = ref(0);
-
-function getAuthorizationApi(params) {
-  getAuthorization(params).then((res) => {
-    permissionLabel.value = res.data.permissionLabel;
-  });
-}
-
-function goMessagePush() {
-  uni.navigateTo({
-    url: "/pages/setting/messagePush/messagePush",
-    success: (res) => {},
-    fail: () => {},
-    complete: () => {},
-  });
-}
-function goBuilding() {
-  uni.navigateTo({
-    url: "/pages/setting/building/building",
-    success: (res) => {},
-    fail: () => {},
-    complete: () => {},
-  });
-}
-function goFunReport() {
-  uni.navigateTo({
-    url: "/pages/setting/funReport/funReport",
-    success: (res) => {},
-    fail: () => {},
-    complete: () => {},
-  });
-}
-
-/**
- * @退出登录
- */
-function loginOut() {
-  //销毁存储的token
-  uni.clearStorage();
-  //关闭当前页面 返回指定页面
-  uni.redirectTo({
-    url: "/pages/login/login",
-  });
-}
-
-onLoad(() => {});
-</script>
-
-<style>
-page {
-  background-color: #ffffff;
-}
-</style>
-
-<style lang="scss">
-.setting-wrapper {
-  .top-banner {
-    width: 100%;
-    height: 380rpx;
-    background: url(@/static/images/setting/setting-bg.png) no-repeat;
-    background-size: cover;
-    color: #fff;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    image {
-      width: 130rpx;
-      height: 130rpx;
-    }
-    .userName {
-      margin-top: 30rpx;
-      margin-bottom: 10rpx;
-    }
-  }
-
-  .cu-list.menu-avatar .cu-item {
-    border-radius: 5px;
-    padding: 30rpx 0;
-    box-shadow: 1px 1px 4px rgb(26 26 26 / 10%);
-    .cu-avatar {
-      background-color: rgba(0, 0, 0, 0);
-      background-size: 100% 100%;
-      left: 26rpx;
-    }
-    .content {
-      left: 130rpx;
-      font-size: 32rpx;
-    }
-  }
-}
-</style>

src/permission.js

@@ -1,5 +1,5 @@
 import { getToken } from "@/utils/auth";
-import setting from "@/plugins/setting";
+import setting from "@/plugins/setting.plugins";
 
 // 登录页面
 const loginPage = "/pages/login";

src/plugins/constData.plugins.js

@@ -0,0 +1,158 @@
+export default {
+	// app应用名称
+	appName: '通用办公',
+
+	// 主题列表
+	themeList: [{
+		title: '官方',
+		name: 'rf',
+		color: '#149eff',
+		tabList: [
+			'/static/images/tabBar/tab-home-blue.png',
+			'/static/images/tabBar/tab-info-blue.png',
+			'/static/images/tabBar/tab-my-blue.png'
+		]
+	},
+	{
+		title: '嫣红',
+		name: 'red',
+		color: '#e54d42',
+		tabList: [
+			'/static/images/tabBar/tab-home-red.png',
+			'/static/images/tabBar/tab-info-red.png',
+			'/static/images/tabBar/tab-my-red.png'
+		]
+	},
+	{
+		title: '桔橙',
+		name: 'orange',
+		color: '#f37b1d',
+		tabList: [
+			'/static/images/tabBar/tab-home-orange.png',
+			'/static/images/tabBar/tab-info-orange.png',
+			'/static/images/tabBar/tab-my-orange.png'
+		]
+	},
+	{
+		title: '明黄',
+		name: 'yellow',
+		color: '#fbbd08',
+		tabList: [
+			'/static/images/tabBar/tab-home-yellow.png',
+			'/static/images/tabBar/tab-info-yellow.png',
+			'/static/images/tabBar/tab-my-yellow.png'
+		]
+	},
+	{
+		title: '橄榄',
+		name: 'olive',
+		color: '#8dc63f',
+		tabList: [
+			'/static/images/tabBar/tab-home-olive.png',
+			'/static/images/tabBar/tab-info-olive.png',
+			'/static/images/tabBar/tab-my-olive.png'
+		]
+	},
+	{
+		title: '森绿',
+		name: 'green',
+		color: '#39b54a',
+		tabList: [
+			'/static/images/tabBar/tab-home-green.png',
+			'/static/images/tabBar/tab-info-green.png',
+			'/static/images/tabBar/tab-my-green.png'
+		]
+	},
+	{
+		title: '天青',
+		name: 'cyan',
+		color: '#1cbbb4',
+		tabList: [
+			'/static/images/tabBar/tab-home-cyan.png',
+			'/static/images/tabBar/tab-info-cyan.png',
+			'/static/images/tabBar/tab-my-cyan.png'
+		]
+	},
+	{
+		title: '海蓝',
+		name: 'blue',
+		color: '#0081ff',
+		tabList: [
+			'/static/images/tabBar/tab-home-blue.png',
+			'/static/images/tabBar/tab-info-blue.png',
+			'/static/images/tabBar/tab-my-blue.png'
+		]
+	},
+	{
+		title: '姹紫',
+		name: 'purple',
+		color: '#6739b6',
+		tabList: [
+			'/static/images/tabBar/tab-home-purple.png',
+			'/static/images/tabBar/tab-info-purple.png',
+			'/static/images/tabBar/tab-my-purple.png'
+		]
+	},
+	{
+		title: '木槿',
+		name: 'mauve',
+		color: '#9c26b0',
+		tabList: [
+			'/static/images/tabBar/tab-home-mauve.png',
+			'/static/images/tabBar/tab-info-mauve.png',
+			'/static/images/tabBar/tab-my-mauve.png'
+		]
+	},
+	{
+		title: '桃粉',
+		name: 'pink',
+		color: '#e03997',
+		tabList: [
+			'/static/images/tabBar/tab-home-pink.png',
+			'/static/images/tabBar/tab-info-pink.png',
+			'/static/images/tabBar/tab-my-pink.png'
+		]
+	},
+	{
+		title: '棕褐',
+		name: 'brown',
+		color: '#a5673f',
+		tabList: [
+			'/static/images/tabBar/tab-home-brown.png',
+			'/static/images/tabBar/tab-info-brown.png',
+			'/static/images/tabBar/tab-my-brown.png'
+		]
+	},
+	{
+		title: '玄灰',
+		name: 'grey',
+		color: '#8799a3',
+		tabList: [
+			'/static/images/tabBar/tab-home-grey.png',
+			'/static/images/tabBar/tab-info-grey.png',
+			'/static/images/tabBar/tab-my-grey.png'
+		]
+	},
+	{
+		title: '草灰',
+		name: 'gray',
+		color: '#aaaaaa',
+		tabList: [
+			'/static/images/tabBar/tab-home-gray.png',
+			'/static/images/tabBar/tab-info-gray.png',
+			'/static/images/tabBar/tab-my-gray.png'
+		]
+	},
+	{
+		title: '墨黑',
+		name: 'black',
+		color: '#333333',
+		tabList: [
+			'/static/images/tabBar/tab-home-black.png',
+			'/static/images/tabBar/tab-info-black.png',
+			'/static/images/tabBar/tab-my-black.png'
+		]
+	}
+	],
+
+};

src/plugins/index.js

@@ -1,8 +1,10 @@
-import tab from "./tab";
-import auth from "./auth";
-import modal from "./modal";
-import common from "./common";
-import setting from "./setting";
+import tab from "./tab.plugins";
+import auth from "./auth.plugins";
+import modal from "./modal.plugins";
+import common from "./common.plugins";
+import setting from "./setting.plugins";
+import constData from "./constData.plugins.js";
+import settingStore from "@/store/modules/setting.js";
 
 export default {
   install(app) {
@@ -21,5 +23,11 @@ export default {
     // 公共设置方法
     app.provide("$setting", setting);
     app.config.globalProperties.$setting = setting;
+    // 公共默认数据存储
+    app.provide("$constData", constData);
+    app.config.globalProperties.$constData = constData;
+    // 公共设置stroe
+    app.provide("$settingStore", settingStore());
+    app.config.globalProperties.$settingStore = settingStore();
   },
 };

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,43 +0,0 @@
-@font-face {
-  font-family: "iconfont"; /* Project id 3620854 */
-  src: url('iconfont.woff2?t=1681973516727') format('woff2'),
-       url('iconfont.woff?t=1681973516727') format('woff'),
-       url('iconfont.ttf?t=1681973516727') format('truetype');
-}
-
-.iconfont {
-  font-family: "iconfont" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.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";
-}
-