项目分包处理/文件整理-规范命名/组件替换

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

@@ -51,8 +51,9 @@ onLaunch(() => {
   }
 
   // setToken(
-  //   "eyJhbGciOiJIUzUxMiJ9.eyIiOjEwMzIsInVzZXJfaWQiOjYzLCJ1c2VyX2tleSI6IjQ5Nzg3YTVhOWE4NTQ4Yjg5OTc0ZWZmMDdkYjYwNmNiIiwidXNlcm5hbWUiOiJmaHMxIn0.HFMhFg5Yn5S3bQTCvfgWd89NM_AI8rkFelVRMAmDejjT7yqH4zl4C7T8FYXnyUNCzM4MNbXWqulsE4QYNErXDw"
+  //   "eyJhbGciOiJIUzUxMiJ9.eyIiOjEwMzIsInVzZXJfaWQiOjYzLCJ1c2VyX2tleSI6IjU3ODkxOTMxNDRiMjRhMTI4MzUyZjk3YTM1MjhlYjkyIiwidXNlcm5hbWUiOiJmaHMxIn0.VOaV8pB_yDn1sYxiYK3NlyzsD_65fjEaQrIhD1QitRFCmASnEOuVgKz_msGiQXtperasBfRTzyJDwE9T9Sw2Zw"
   // );
+  // proxy.$tab.reLaunch("/pages/mine/index");
   // proxy.$tab.reLaunch("/pages/index");
 
   initApp();
@@ -87,4 +88,10 @@ uni-page-refresh {
 :deep(.uni-page-head-btn) {
   background-color: rgba(0, 0, 0, 0) !important;
 }
+
+//uview-plus导航栏title样式
+:deep(.u-navbar__content__title) {
+  font-size: 16px;
+  font-weight: bold;
+}
 </style>

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

@@ -36,21 +36,34 @@
                 "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\"/>"
                 ],
@@ -58,7 +71,21 @@
             },
             /* ios打包配置 */
             "ios" : {
-                "dSYMs" : false
+                "dSYMs" : false,
+                "privacyDescription" : {
+                    "NSPhotoLibraryUsageDescription" : "该应用需要读取你的相册，以便为你上传头像",
+                    "NSPhotoLibraryAddUsageDescription" : "该应用需要读取你的相册，以便拍照保存图片",
+                    "NSCameraUsageDescription" : "该应用需要你的相机，以便你拍摄上传头像信息",
+                    "NSMicrophoneUsageDescription" : "该应用需要使用你的麦克风，以便语音播放",
+                    "NSLocationWhenInUseUsageDescription" : "该应用需要你的地理位置，以便为你提供当前位置信息",
+                    "NSLocationAlwaysUsageDescription" : "该应用需要持续获取用户地理位置，以便为你进行导航",
+                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "该应用需要你的地理位置，以便为你提供当前位置信息",
+                    "NSCalendarsUsageDescription" : "该应用需要获取你的日历，以便更好的体验",
+                    "NSContactsUsageDescription" : "该应用需要读取你的通讯录，以便联系同事",
+                    "NSBluetoothPeripheralUsageDescription" : "该应用需要你的蓝牙，以便读取相关蓝牙设备",
+                    "NFCReaderUsageDescription" : "",
+                    "NSBluetoothAlwaysUsageDescription" : "该应用需要你的蓝牙，以便读取相关蓝牙设备"
+                }
             },
             /* SDK配置 */
             "sdkConfigs" : {

src/pages.json

@@ -3,7 +3,6 @@
     {
       "path": "pages/index",
       "style": {
-        "disableScroll": true,
         "navigationStyle": "custom",
         "navigationBarTitleText": "",
         "app-plus": {
@@ -59,397 +58,391 @@
         }
       }
     },
+    //分析 开始
     {
-      "path": "pages/mine/avatar/index",
+      "path": "pages/business/analyse/index",
       "style": {
-        "navigationBarTitleText": "修改头像",
-        "app-plus": {
-          "bounce": "none",
-          "titleNView": {
-            "type": "transparent",
-            "autoBackButton": true,
-            "backButton": { //自定义 backButton
-              "background": "rgba(0,0,0,0)"
-            }
+        "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/mine/info/index",
-      "style": {
-        "navigationBarTitleText": "个人资料",
-        "app-plus": {
-          "bounce": "none",
-          "titleNView": {
-            "type": "transparent",
-            "autoBackButton": true,
-            "backButton": { //自定义 backButton
-              "background": "rgba(0,0,0,0)"
+      "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": "pages/mine/pwd/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": "pages/mine/setting/index",
-      "style": {
-        "navigationBarTitleText": "设置"
-      }
-    },
-    {
-      "path": "pages/mine/help/index",
-      "style": {
-        "navigationBarTitleText": "常见问题",
-        "app-plus": {
-          "bounce": "none",
-          "titleNView": {
-            "type": "transparent",
-            "autoBackButton": true,
-            "backButton": { //自定义 backButton
-              "background": "rgba(0,0,0,0)"
+        },
+        {
+          "path": "/help/index",
+          "style": {
+            "navigationBarTitleText": "常见问题",
+            "navigationStyle": "custom",
+            "app-plus": {
+              "bounce": "none",
+              "titleNView": false
             }
           }
-        }
-      }
-    },
-    {
-      "path": "pages/mine/about/index",
-      "style": {
-        "navigationBarTitleText": "关于我们",
-        "app-plus": {
-          "bounce": "none",
-          "titleNView": {
-            "type": "transparent",
-            "autoBackButton": true,
-            "backButton": { //自定义 backButton
-              "background": "rgba(0,0,0,0)"
+        },
+        {
+          "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/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/info/info",
-      "style": {
-        "navigationBarTitleText": "消息",
-        // "navigationStyle": "custom",
-        "enablePullDownRefresh": false,
-        "app-plus": {
-          "bounce": "none",
-          "titleNView": {
-            "type": "transparent"
+        // {
+        //   "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
           }
         }
-      }
-    },
-    {
-      "path": "pages/info/fireBase/fireBase",
-      "style": {
-        "navigationBarTitleText": "消防知识库",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/info/pushList/pushList",
-      "style": {
-        "navigationBarTitleText": "消息推送",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/info/fireBashDetail/fireBashDetail",
-      "style": {
-        "navigationBarTitleText": "火灾逃生十大要诀",
-        "enablePullDownRefresh": false
-      }
-    },
-    //消息 结束
-    //设置 开始
-    {
-      "path": "pages/setting/setting",
-      "style": {
-        "navigationBarTitleText": "设置"
-      }
-    },
-    {
-      "path": "pages/setting/messagePush/messagePush",
-      "style": {
-        "navigationBarTitleText": "消息推送设置",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/setting/building/building",
-      "style": {
-        "navigationBarTitleText": "建筑管理",
-        "enablePullDownRefresh": false
-      }
-    },
-    {
-      "path": "pages/setting/funReport/funReport",
-      "style": {
-        "navigationBarTitleText": "功能报备",
-        "enablePullDownRefresh": false,
-        "onReachBottomDistance": 100 //距离底部多远时触发 单位px
-      }
-    },
-    {
-      "path": "pages/setting/funReport/funcAdd/funcAdd",
-      "style": {
-        "navigationBarTitleText": "功能报备新增",
-        "enablePullDownRefresh": false
-      }
-    },
-    //设置 结束
-    //消防督察单模块 开始
-    //消防督察单模块 结束
-    //分析 开始
-    {
-      "path": "pages/business/analyse/index",
-      "style": {
-        "navigationBarTitleText": "分析"
-      }
-    },
-    //分析 结束
-    //巡检模块 开始
-    {
-      "path": "pages/business/mhxf/xunJian/xunJian",
-      "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",
-      "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/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": "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/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
-      }
+        //待办事项 结束
+      ]
     }
-    //待办事项 结束
   ],
   "globalStyle": {
     "navigationBarTextStyle": "white",

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

@@ -26,7 +26,6 @@
 </template>
 
 <script setup>
-import { ElMessageBox } from "element-plus";
 import { onLoad, onShow } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, watchEffect } from "vue";
 

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

@@ -184,7 +184,7 @@ onLoad((options) => {
 
 onShow(() => {
   //调用系统主题颜色
-  ([1]);
+  proxy.$settingStore.systemThemeColor([1]);
 });
 
 onMounted(() => {});
@@ -225,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

@@ -228,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,62 +0,0 @@
-<template>
-  <scroll-view scroll-y>
-    <el-upload
-      v-model:file-list="siteList.recordPictureList"
-      :class="xunjianStore.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 xunJianStore from "@/store/modules/xunJian";
-
-const BASE_URL = inject("$BASE_URL");
-const xunjianStore = xunJianStore(); //全局变量值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>
@@ -175,6 +156,30 @@ 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);
+}
+
 /**
  * @点击巡检
  * @点击事件
@@ -367,54 +372,6 @@ function tabPositionChange(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();

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

@@ -52,7 +52,7 @@ function goDetail(item) {
 onNavigationBarButtonTap((e) => {
   console.log(e);
   uni.navigateTo({
-    url: "/pages/export/export",
+    url: "/pages/common/export/index",
   });
 });
 

src/pages/index.vue

@@ -2,23 +2,22 @@
   <!-- <u-sticky bgColor="#fff"> </u-sticky> -->
 
   <u-navbar
-    leftText="返回"
-    leftIconColor="#fff"
     :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" style="display: none"></u-icon>
+        <u-icon name="arrow-left" size="19" color="#fff" style="display: none"></u-icon>
       </view>
     </template>
     <template #right>
       <view class="u-nav-slot">
-        <text class="iconfont ucicon-saoyisao" style="font-size: 18px" :style="{ color: '#fff' }"></text>
+        <u-icon name="plus" size="19" color="#fff"></u-icon>
       </view>
     </template>
   </u-navbar>
@@ -27,161 +26,69 @@
   <view class="home-container" :style="{ height: `calc(100vh - ${proxy.$settingStore.barHightTop})` }">
     <!-- <u-loadmore :status="arrayList.loadStatus" loadingText="" loadmoreText="" :icon="true" /> -->
     <view class="uni-content-body">
-      <view>
-        <!-- 下拉选择 -->
-        <!-- <view class="searchSelect shadow" v-if="flag">
-            <view class="cu-bar search bg-white">
-              <view class="search-form round" style="margin-top: 0">
-                <input
-                  @focus="InputFocus"
-                  @blur="InputBlur"
-                  @input="handleInput()"
-                  v-model="searchInput"
-                  :adjust-position="false"
-                  type="text"
-                  placeholder=""
-                  confirm-type="search"
-                  style="border: none !important"
-                />
-                <text class="cuIcon-search"></text>
-              </view>
+      <!-- 下拉列表 开始 -->
+      <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>
-            <view class="select-items">
-              <view
-                class="site-item"
-                v-if="!searchList.length"
-                style="text-align: center"
-                >暂无结果</view
-              >
-              <view
-                class="select-item"
-                v-for="(item, index) in searchList"
-                @click="clickSelectItem(item, index)"
-                :key="index"
-                >{{ item.owner_name }}</view
-              >
-            </view>
-          </view> -->
-        <!-- 下拉选择 end -->
-
-        <!-- 图表 -->
-        <!-- <view class="section1 section bg-white padding-xs">
-            <view
-              class="
-                static-tabs
-                grid
-                margin-bottom
-                text-center
-                col-3
-                margin-top-sm margin-bottom-sm
-              "
-            >
-              <view
-                :class="['padding-sm ', Inv == 0 ? 'active' : '']"
-                @click="Inv = 0"
-                >报警信息统计</view
-              >
-              <view
-                :class="['padding-sm ', Inv == 1 ? 'active' : '']"
-                @click="Inv = 1"
-                >数据等级统计</view
-              >
-              <view
-                :class="['padding-sm ', Inv == 2 ? 'active' : '']"
-                @click="Inv = 2"
-                >设备运行状态</view
-              >
-            </view>
-            <view class="time text-center"
-              >统计时段：{{ staticData.statisticalPeriod }}
-            </view>
-            <view style="height: 570rpx">
-              <view v-if="Inv == 0"> </view>
-              <view v-if="Inv == 1"> </view>
-              <view v-if="Inv == 2" class="chart3-box">
-                <ul class="chart3-icon">
-                  <li>
-                    <image
-                      src="@/static/images/index/chart3-1.png"
-                      style="width: 64rpx; height: 64rpx"
-                    ></image>
-                  </li>
-                  <li>
-                    <image
-                      src="@/static/images/index/chart3-2.png"
-                      style="width: 64rpx; height: 64rpx"
-                    ></image>
-                  </li>
-                  <li>
-                    <image
-                      src="@/static/images/index/chart3-3.png"
-                      style="width: 64rpx; height: 64rpx"
-                    ></image>
-                  </li>
-                  <li>
-                    <image
-                      src="@/static/images/index/chart3-4.png"
-                      style="width: 64rpx; height: 64rpx"
-                    ></image>
-                  </li>
-                  <li>
-                    <image
-                      src="@/static/images/index/chart3-5.png"
-                      style="width: 64rpx; height: 64rpx"
-                    ></image>
-                  </li>
-                </ul>
-              </view>
-            </view>
-          </view> -->
-        <!-- 图表 end-->
-
-        <!-- 轮播图 开始 -->
-        <u-swiper
-          v-if="arrayList.swiperBool"
-          :list="arrayList.swiperList"
-          :interval="arrayList.swiperTime"
-          indicator
-          indicatorMode="line"
-          radius="0"
-          height="160"
-          circular
-          @click="swiperClick"
-          @change="swiperChange"
-        >
-        </u-swiper>
-        <!-- 轮播图 结束 -->
-
-        <!-- 宫格列表 -->
-        <view class="section2 section bg-white" style="margin-bottom: 10px" v-if="arrayList.recentlyUsed.length > 0">
-          <view style="color: #000000; font-size: 14px; padding: 10px 10px 5px 10px">最近使用</view>
-          <view class="cu-list grid col-5 no-border">
-            <view class="cu-item justify-center align-center" @tap="navItemClick(item)" v-for="(item, index) in arrayList.recentlyUsed.slice(0, 5)" :key="index">
-              <image :src="item.meta.icon" style="width: 40px; height: 40px"></image>
-              <!-- <view class="cu-tag badge" v-if="item.badge != 0">
+            <!-- <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>
+      </u-transition>
+      <!-- 下拉列表 结束 -->
+
+      <!-- 轮播图 开始 -->
+      <u-swiper
+        v-if="arrayList.swiperBool"
+        :list="arrayList.swiperList"
+        :interval="arrayList.swiperTime"
+        indicator
+        indicatorMode="line"
+        radius="0"
+        height="160"
+        circular
+        @click="swiperClick"
+        @change="swiperChange"
+      >
+      </u-swiper>
+      <!-- 轮播图 结束 -->
+
+      <!-- 宫格列表 -->
+      <view class="section2 section bg-white" style="margin-bottom: 10px" v-if="arrayList.recentlyUsed.length > 0">
+        <view style="color: #000000; font-size: 14px; padding: 10px 10px 5px 10px">最近使用</view>
+        <view class="cu-list grid col-5 no-border">
+          <view class="cu-item justify-center align-center" @tap="navItemClick(item)" v-for="(item, index) in arrayList.recentlyUsed.slice(0, 5)" :key="index">
+            <image :src="item.meta.icon" style="width: 40px; height: 40px"></image>
+            <!-- <view class="cu-tag badge" v-if="item.badge != 0">
               <block v-if="item.badge != 0">{{ item.badge > 99 ? "99+" : item.badge }}</block>
             </view> -->
-              <text style="font-size: 12px">{{ item.meta.title }}</text>
-            </view>
+            <text style="font-size: 12px">{{ item.meta.title }}</text>
           </view>
         </view>
-        <!-- 宫格列表 end -->
-
-        <!-- 宫格列表 -->
-        <view class="section2 section bg-white">
-          <view style="color: #000000; font-size: 14px; padding: 10px 10px 5px 10px">常用功能</view>
-          <view class="cu-list grid col-5 no-border">
-            <view class="cu-item justify-center align-center" @tap="navItemClick(item)" v-for="(item, index) in arrayList.cuIconList" :key="index">
-              <image :src="item.meta.icon" style="width: 40px; height: 40px"></image>
-              <!-- <view class="cu-tag badge" v-if="item.badge != 0">
+      </view>
+      <!-- 宫格列表 end -->
+
+      <!-- 宫格列表 -->
+      <view class="section2 section bg-white">
+        <view style="color: #000000; font-size: 14px; padding: 10px 10px 5px 10px">常用功能</view>
+        <view class="cu-list grid col-5 no-border">
+          <view class="cu-item justify-center align-center" @tap="navItemClick(item)" v-for="(item, index) in arrayList.cuIconList" :key="index">
+            <image :src="item.meta.icon" style="width: 40px; height: 40px"></image>
+            <!-- <view class="cu-tag badge" v-if="item.badge != 0">
               <block v-if="item.badge != 0">{{ item.badge > 99 ? "99+" : item.badge }}</block>
             </view> -->
-              <text style="font-size: 12px">{{ item.meta.title }}</text>
-            </view>
+            <text style="font-size: 12px">{{ item.meta.title }}</text>
           </view>
         </view>
-        <!-- 宫格列表 end -->
       </view>
+      <!-- 宫格列表 end -->
     </view>
   </view>
 </template>
@@ -207,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,
@@ -317,27 +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();
 });
 
-//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) => {
@@ -359,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
 }
 
 //微信扫码成功后请求
@@ -443,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,
@@ -496,60 +356,6 @@ 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]);
@@ -559,18 +365,9 @@ onShow(() => {
 onNavigationBarButtonTap((e) => {
   if (e.float == "right") {
     // alert("你点击了扫一扫");
-
-    //#ifdef H5
-    scanQRCode();
-    //#endif
-
-    //#ifdef APP-PLUS
     scanCode();
-    //#endif
   } else {
-    // alert("你点击了获取位置");
-    // getLocation()
-    showTag();
+    rightButtonClick();
   }
 });
 </script>
@@ -583,74 +380,60 @@ onNavigationBarButtonTap((e) => {
     // #ifdef H5
     padding-bottom: 50px;
     // #endif
-  }
-}
 
-.select-items {
-  overflow: auto;
-  height: 80vh;
-}
+    .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,6 +1,27 @@
 <template>
   <view class="info-wrapper" style="height: 100%">
-    <view class="uni-content-header" :class="'bg-' + proxy.$settingStore.themeColor.name" :style="{ height: proxy.$settingStore.barHightTop }"></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>
+
+    <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>

src/pages/mine/about/index.vue

@@ -1,6 +1,14 @@
 <template>
   <view class="about-container">
-    <view class="uni-content-header" :class="'bg-' + proxy.$settingStore.themeColor.name" :style="{ height: proxy.$settingStore.barHightTop }"></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="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 />

src/pages/mine/avatar/index.vue

@@ -1,6 +1,14 @@
 <template>
   <view class="avatar-container">
-    <view class="uni-content-header" :class="'bg-' + proxy.$settingStore.themeColor.name" :style="{ height: proxy.$settingStore.barHightTop }"></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="page-body uni-content-info">
       <view class="cropper-content">
         <view ref="uniCorpper" v-if="isShowImg" class="uni-corpper" :style="'width:' + cropperInitW + 'px;height:' + cropperInitH + 'px;background:#000'">
@@ -392,291 +400,287 @@ onShow(() => {
 /* pages/uni-cropper/index.wxss */
 
 .avatar-container {
-  .uni-content-header {
-    height: 44px;
+  .cropper-config {
+    padding: 20rpx 40rpx;
   }
-}
-
-.cropper-config {
-  padding: 20rpx 40rpx;
-}
 
-.cropper-content {
-  min-height: 750rpx;
-  width: 100%;
-}
+  .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 {
+    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 {
+    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-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 {
+    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-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-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 {
+    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-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 {
+    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-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 {
+    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-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;
-}
+  .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-t {
+    top: -3rpx;
+    left: 50%;
+    margin-left: -3rpx;
+    cursor: n-resize;
+  }
 
-.point-tr {
-  top: -3rpx;
-  left: 100%;
-  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-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-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-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-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-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;
-}
-/* 裁剪框预览内容 */
+  .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 {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+  }
 
-.uni-cropper-viewer image {
-  position: absolute;
-  z-index: 2;
+  .uni-cropper-viewer image {
+    position: absolute;
+    z-index: 2;
+  }
 }
 </style>

src/pages/mine/help/index.vue

@@ -1,6 +1,14 @@
 <template>
   <view class="help-container">
-    <view class="uni-content-header" :class="'bg-' + proxy.$settingStore.themeColor.name" :style="{ height: proxy.$settingStore.barHightTop }"></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>
@@ -78,8 +86,6 @@ onShow(() => {
 
 <style lang="scss" scoped>
 .help-container {
-  margin-bottom: 100rpx;
-
   .uni-content-body {
     padding: 30rpx;
 

src/pages/mine/index.vue

@@ -77,6 +77,27 @@
         </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">
@@ -104,6 +125,31 @@
       </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">
@@ -133,6 +179,7 @@ import { onLoad, onShow, onReady, onHide, onLaunch, onNavigationBarButtonTap, on
 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";
 const useStore = useStores();
@@ -162,6 +209,39 @@ const data = reactive({
 
 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: () => {},
+  });
+}
+
 /**
  * @主题颜色选择
  */
@@ -413,6 +493,21 @@ 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;
+    }
+  }
 }
 
 .item-box {

src/pages/mine/info/index.vue

@@ -183,7 +183,11 @@ page {
 }
 </style>
 
-<style lang="scss">
+<style lang="scss" scoped>
+:deep(.uni-page-head__title) {
+  opacity: 1 !important;
+}
+
 .info-container {
   .user-section {
     display: flex;

src/pages/mine/pwd/index.vue

@@ -1,6 +1,14 @@
 <template>
   <view class="pwd-retrieve-container">
-    <view class="uni-content-header" :class="'bg-' + proxy.$settingStore.themeColor.name" :style="{ height: proxy.$settingStore.barHightTop }"></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">
       <uni-forms ref="form" :value="user" labelWidth="80px">
         <uni-forms-item name="oldPassword" label="旧密码">

src/pages/setting/funReport/funReport.vue → src/pages/mine/setting/funReport/funReport.vue

@@ -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/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/index.js

@@ -1,8 +1,8 @@
-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";
 
@@ -29,6 +29,5 @@ export default {
     // 公共设置stroe
     app.provide("$settingStore", settingStore());
     app.config.globalProperties.$settingStore = settingStore();
-
   },
 };

src/store/modules/user.js

@@ -3,7 +3,7 @@ import constant from "@/utils/constant";
 import { login, logout, getInfo, getMobileTenantConfig } from "@/api/login";
 import { getToken, setToken, removeToken } from "@/utils/auth";
 import { defineStore } from "pinia";
-import modal from "@/plugins/modal.js";
+import modal from "@/plugins/modal.plugins.js";
 
 const useStores = defineStore("useStores", {
   state: () => ({

src/uni_modules/gb-progress/changelog.md

@@ -0,0 +1,2 @@
+## 1.0.0（2023-04-16）
+首次上传，助力快速开发

src/uni_modules/gb-progress/components/gb-progress/gb-progress.vue

@@ -0,0 +1,157 @@
+<template> 
+    <view class="gb_parent" :style="parentCss">
+        <view class="gb_process" :style="processCss"></view>
+        <view class="gb_left_part" :style="leftCss"></view>
+        <view class="gb_right_part" :style="rightCss"></view> 
+        <view class="gb_inner_circle" :style="innerCircleCss">
+		   <slot></slot> 
+        </view>
+    </view> 
+</template>
+
+<script>  
+export default {
+    data () {
+        return{ 
+			
+        }
+    },
+    props: {
+		// 圈底色
+        processColor: {
+            type: String,
+            default: '#42b983'  
+        },
+		// 进度色
+        originalColor: {
+            type: String,
+            default: '#EEEEEE'
+        },
+		// 圈内色
+		innerbgColor:{
+			type: String,
+			default: '#FFFFFF'
+		}, 
+		// 进度
+        process: {
+            type: Number,
+            default: 0
+        },
+		// 半径 单位rpx
+        radius: {
+            type: Number,
+            default: 100
+        },
+		// 进度条宽 单位rpx
+        barWidth: {
+            type: Number,
+            default: 3
+        },
+		// 起始弧度从顶开始顺时钟
+		startPosDegree:{
+			type:Number,
+			default:0
+		}
+    },
+    computed: {
+	  processCss() {
+	   const { radius, processColor } = this;
+	   return { 
+	 	   borderRadius: `${radius}rpx`,
+	       height: `${radius * 2}rpx`,
+	       width: `${radius * 2}rpx`,
+	       backgroundColor: processColor,
+	   }
+	  },
+      parentCss() {
+        const { radius,startPosDegree } = this;
+        return { 
+			borderRadius: `${radius}rpx`,
+            height: `${radius * 2}rpx`,
+            width: `${radius * 2}rpx`,
+			transform: 'rotate('+ startPosDegree +'deg )',
+        }
+      }, 
+      leftCss() {
+        let { radius, originalColor,process  } = this;
+		let leftTransformerDegree = (process>50? ((process>100?100:process) - 50) * 3.6:0)+ 'deg';
+        return {
+            height: `${radius * 2}rpx`,
+            width: `${radius}rpx`,
+			backgroundColor: originalColor,
+			transform: 'rotate('+ leftTransformerDegree +')',
+			transformOrigin: 'right center', 
+            borderTopLeftRadius: `${radius}rpx`,
+            borderBottomLeftRadius: `${radius}rpx`,
+			left:0,
+			top:0
+        }
+      },
+      rightCss() {
+        let { radius, processColor,originalColor,process } = this;
+		let rightTransformerDegree = ((process > 50 ? 0 : process) * 3.6) + 'deg';
+		
+        return {
+            height: `${radius * 2}rpx`,
+            width: `${radius}rpx`,
+            backgroundColor: process > 50 ?processColor:originalColor,
+			transform: 'rotate('+rightTransformerDegree+')',
+			transformOrigin: 'left center',
+            borderTopRightRadius: `${radius}rpx`,
+            borderBottomRightRadius: `${radius}rpx`,
+			left:`${radius}rpx`,
+			top:0
+        }
+	  },
+	  innerCircleCss() {
+	    const { radius, innerbgColor,barWidth ,startPosDegree} = this;
+	    return { 
+	  		borderRadius: `${radius - barWidth}rpx`,
+	        height: `${(radius - barWidth) * 2}rpx`,
+	        width: `${(radius - barWidth) * 2}rpx`,
+			transform: 'rotate('+ (0-startPosDegree) +'deg )',
+	        backgroundColor: innerbgColor,
+			left:`${barWidth}rpx`,
+			top:`${barWidth}rpx`,
+	    }
+	  }, 
+    },
+    mounted() {
+        
+    }, 
+    methods: {
+    }
+}
+</script>
+
+<style scoped>
+  .gb_component {
+    justify-content: center;
+    align-items: center;
+  }
+  .gb_parent {
+    justify-content: center;
+    align-items: center;
+    overflow: hidden;
+  }
+  .gb_process {
+    justify-content: center;
+    align-items: center;
+    overflow: hidden;
+  }
+  .gb_inner_circle {
+    justify-content: center;
+    align-items: center;
+    overflow: hidden;
+    position: absolute; 
+	display: flex;
+  }
+  .gb_left_part {
+    overflow: hidden;
+    position: absolute; 
+  }
+  .gb_right_part {
+    overflow: hidden;
+    position: absolute; 
+  }
+</style>

src/uni_modules/gb-progress/package.json

@@ -0,0 +1,85 @@
+{
+  "id": "gb-progress",
+  "displayName": "支持nvue的环形进度条圆形进度条非常简单粗暴",
+  "version": "1.0.0",
+  "description": "非常简单粗暴，支持vue和nvue，没有任何bug，导入就能用，简单粗暴为主",
+  "keywords": [
+    "进度条",
+    "nvue",
+    "vue",
+    "环形进度条",
+    "组件"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.3.13"
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "y"
+        },
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y",
+          "钉钉": "y",
+          "快手": "y",
+          "飞书": "y",
+          "京东": "y"
+        },
+        "快应用": {
+          "华为": "y",
+          "联盟": "y"
+        }
+      }
+    }
+  }
+}

src/uni_modules/gb-progress/readme.md

@@ -0,0 +1,111 @@
+##简单粗暴的纯css实现环形的倒计时，适合兼容vue和nvue,主要用途用于uniad的短视频联盟倒计时发放奖励的机制，
+
+##步骤
+
+1.导入
+
+2.使用示例
+```html
+<template>
+	<view>
+		<view class="zcolor-while wh-w750" style="position:sticky;">
+			<view style="height: 80rpx;"></view>
+			<view class="flex-row justify-space-between align-center wh-w750" style="height: 100rpx;">
+				<view class="flex-row align-center pa-20-0">
+					<text class="fs-40 f-w mar-l30">视频</text>
+				</view>
+			</view>
+		</view>
+		<view>
+			<ad-content-page :style="{height:swiperheight+'px'}" ref="adContentPage" @load="onadload" @error="onaderror"
+				adpid="1111111112"></ad-content-page>
+		</view>
+
+		<view style="position: fixed; top: 200rpx; left: 20rpx; background-color: rgba(0, 0, 0, 0.4);"
+			class=" justify-center align-center bor-r50" v-if="!iserr">
+			<gb-progress originalColor="#222222" processColor="#FF672D" innerbgColor="#222222" :process="process"
+				:startPosDegree="60" :radius="50" :barWidth="5">
+				<image src="../../static/hbbs.png" mode="widthFix" class="wh-80"></image>
+			</gb-progress>
+		</view>
+	</view>
+</template>
+
+<script>
+	
+	export default {
+		
+		data() {
+			return {
+				swiperheight: 0,
+				countdown: 0,
+				isback: true,
+				noClick: true,
+				interval: '',
+				iserr: false,
+				timer: '',
+				process: 0,
+				finishing: false,
+				p: 0
+			}
+		},
+		onLoad() {
+	
+			let res = uni.getSystemInfoSync()
+			console.log(res.screenHeight)
+			this.swiperheight = res.windowHeight - uni.upx2px(182)
+			
+		},
+		onShow() {
+			this.$nextTick(() => {
+				this.$refs.adContentPage.show();
+				this.isback = true
+			})
+		},
+		onHide() {
+			this.$refs.adContentPage.hide();
+			this.isback = false
+		},
+		
+		methods: {
+	
+			// 加载
+			onadload(e) {
+				console.log("onload");
+				this.getBrowse()
+			},
+			onaderror(e) {
+				this.iserr = true
+				clearInterval(this.interval);
+				console.log(e);
+			},
+			// 倒计时
+			getBrowse() {
+				this.interval = setInterval(() => {
+					if (this.process < 100) {
+						if (this.isback) {
+							this.process = this.process + 2;
+						}
+					} else {
+						clearInterval(this.interval);
+						// 页面返回后停止，往下执行
+						if (this.isback) {
+							this.process = 0
+							this.getBrowse()
+						}
+					}
+				}, 1000)
+			}
+	
+		}
+	}
+</script>
+
+<style>
+
+</style>
+
+
+
+
+```

src/utils/request.js

@@ -1,8 +1,8 @@
 import useStores from "@/store/modules/user.js";
 import configs from "@/config";
 import { getToken } from "@/utils/auth";
-import modal from "@/plugins/modal";
-import common from "@/plugins/common";
+import modal from "@/plugins/modal.plugins";
+import common from "@/plugins/common.plugins";
 
 let timeout = 10000;
 

src/utils/upload.js

@@ -1,8 +1,8 @@
 import useStores from "@/store/modules/user.js";
 import configs from "@/config";
 import { getToken } from "@/utils/auth";
-import modal from "@/plugins/modal";
-import common from "@/plugins/common";
+import modal from "@/plugins/modal.plugins";
+import common from "@/plugins/common.plugins";
 
 let timeout = 10000;