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

src/App.vue

@@ -36,6 +36,23 @@ function stteingInit() {
   else if (config.appInfo.appid === "__UNI__F3963F8") {
     plus.screen.lockOrientation("landscape-primary"); //设置屏幕方向（1.竖屏正方向：portrait-primary 2.竖屏反方向：portrait-secondary 3.横屏正方向：landscape-primary 4.横屏反方向：landscape-secondary 5.自然方向：default）
     plus.navigator.hideSystemNavigation(); //隐藏安卓底部虚拟导航键
+
+    console.log(uni.requireNativePlugin("Fvv-AutoStart"));
+
+    var sc = uni.requireNativePlugin("YxDevice");
+    setTimeout(() => {
+      console.log(sc);
+
+      console.log(sc.getDeviceCustom(16));
+      console.log(sc.getSerialno());
+
+      sc.getDeviceCustom(16);
+    }, 2000);
+  }
+  // 智能门禁
+  else if (config.appInfo.appid === "__UNI__8D6E9FD") {
+    plus.screen.lockOrientation("portrait-primary"); //设置屏幕方向（1.竖屏正方向：portrait-primary 2.竖屏反方向：portrait-secondary 3.横屏正方向：landscape-primary 4.横屏反方向：landscape-secondary 5.自然方向：default）
+    plus.navigator.hideSystemNavigation(); //隐藏安卓底部虚拟导航键
   }
 
   proxy.$settingStore.pushListener(); //开启消息推送监听

src/api/business/door.js

@@ -2,21 +2,21 @@ import { request } from "@/utils/request";
 
 /**
  * 门禁接口集合
- * @method doorControl 门禁开门
- * @method doorList 门禁列表
+ * @method control 门禁开门
+ * @method Select 门禁列表
  */
 export function doorApi() {
     return {
-        doorControl: (data) => {
+        control: (data) => {
             return request({
-                url: `/service-iot/deviceHttp/control`,
+                url: `/service-eg/egDevice/control`,
                 method: 'GET',
                 data,
             });
         },
-        doorList: (data) => {
+        Select: (data) => {
             return request({
-                url: `/service-iot/dmpDeviceInfo/pageWhite`,
+                url: `/service-eg/egDevice/page`,
                 method: 'POST',
                 data,
             });

src/api/business/fireIot/deviceManage.js

@@ -56,9 +56,9 @@ export function getList(data) {
 
   
 //设备离线状态更新
-export function doorControl(params) {
+export function deviceStatus(params) {
     return request({
-        url: '/service-iot/deviceHttp/doorControl',
+        url: '/service-iot/deviceHttp/status',
         method: 'get',
         params,
     })

src/manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "综合智慧云",
-    "appid" : "__UNI__36DE3A0",
-    "description" : "综合智慧云APP，是一款助力于企业数字化的应用平台，帮助企业提升办公效率，实现组织数字化和业务数字化。",
-    "versionName" : "2.2.4",
-    "versionCode" : 24,
+    "name" : "智能巡更",
+    "appid" : "__UNI__BF1A1F0",
+    "description" : "智能巡更app，是一款用于监督和记录巡逻人员按照预定路线和时间进行巡逻的系统。",
+    "versionName" : "2.2.9",
+    "versionCode" : 29,
     "transformPx" : false,
     "app-plus" : {
         "compatible" : {
@@ -80,7 +80,7 @@
                     "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
                     "<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>"
                 ],
-                "minSdkVersion" : "",
+                "minSdkVersion" : 21,
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
                 "targetSdkVersion" : 30
             },
@@ -106,9 +106,9 @@
                 "ad" : {},
                 "maps" : {
                     "amap" : {
-                        "appkey_ios" : "fb35d03fbb17cbf7a8743a522da3c7fc",
-                        "appkey_android" : "ffc71dfd4e576596027f8f45a1b8fb2f",
-                        "name" : "amapBOujshtbA"
+                        "appkey_ios" : "4da4abbd317d0b083d6c25dd9b509eed",
+                        "appkey_android" : "63bef5d715bfa5433189e7b65516dfa5",
+                        "name" : "amap_15575941817CWPEQVCyc"
                     }
                 },
                 "geolocation" : {
@@ -117,9 +117,14 @@
                     },
                     "amap" : {
                         "__platform__" : [ "ios", "android" ],
-                        "appkey_ios" : "fb35d03fbb17cbf7a8743a522da3c7fc",
-                        "appkey_android" : "ffc71dfd4e576596027f8f45a1b8fb2f",
-                        "name" : "amapBOujshtbA"
+                        "appkey_ios" : "4da4abbd317d0b083d6c25dd9b509eed",
+                        "appkey_android" : "63bef5d715bfa5433189e7b65516dfa5",
+                        "name" : "amap_15575941817CWPEQVCyc"
+                    },
+                    "tencent" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "apikey_ios" : "EGOBZ-74ZET-ST7XS-VYICT-RBLHZ-KLFEX",
+                        "apikey_android" : "EGOBZ-74ZET-ST7XS-VYICT-RBLHZ-KLFEX"
                     }
                 },
                 "push" : {
@@ -128,11 +133,11 @@
                         "offline" : true,
                         "icons" : {
                             "small" : {
-                                "hdpi" : "unpackage/res/push/36x36.png",
-                                "ldpi" : "unpackage/res/push/18x18.png",
-                                "mdpi" : "unpackage/res/push/24x24.png",
-                                "xhdpi" : "unpackage/res/push/48x48.png",
-                                "xxhdpi" : "unpackage/res/push/72x72.png"
+                                "hdpi" : "unpackage/res/push-xunJian/36x36.png",
+                                "ldpi" : "unpackage/res/push-xunJian/18x18.png",
+                                "mdpi" : "unpackage/res/push-xunJian/24x24.png",
+                                "xhdpi" : "unpackage/res/push-xunJian/48x48.png",
+                                "xxhdpi" : "unpackage/res/push-xunJian/72x72.png"
                             }
                         }
                     }
@@ -140,33 +145,33 @@
             },
             "icons" : {
                 "android" : {
-                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                    "hdpi" : "unpackage/res/icons-xunJian/72x72.png",
+                    "xhdpi" : "unpackage/res/icons-xunJian/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons-xunJian/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons-xunJian/192x192.png"
                 },
                 "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "appstore" : "unpackage/res/icons-xunJian/1024x1024.png",
                     "ipad" : {
-                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                        "app" : "unpackage/res/icons-xunJian/76x76.png",
+                        "app@2x" : "unpackage/res/icons-xunJian/152x152.png",
+                        "notification" : "unpackage/res/icons-xunJian/20x20.png",
+                        "notification@2x" : "unpackage/res/icons-xunJian/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons-xunJian/167x167.png",
+                        "settings" : "unpackage/res/icons-xunJian/29x29.png",
+                        "settings@2x" : "unpackage/res/icons-xunJian/58x58.png",
+                        "spotlight" : "unpackage/res/icons-xunJian/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons-xunJian/80x80.png"
                     },
                     "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                        "app@2x" : "unpackage/res/icons-xunJian/120x120.png",
+                        "app@3x" : "unpackage/res/icons-xunJian/180x180.png",
+                        "notification@2x" : "unpackage/res/icons-xunJian/40x40.png",
+                        "notification@3x" : "unpackage/res/icons-xunJian/60x60.png",
+                        "settings@2x" : "unpackage/res/icons-xunJian/58x58.png",
+                        "settings@3x" : "unpackage/res/icons-xunJian/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons-xunJian/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons-xunJian/120x120.png"
                     }
                 }
             },
@@ -191,7 +196,7 @@
             "checkSiteMap" : false
         },
         "usingComponents" : true,
-        "navigateToMiniProgramAppIdList":["wxf5ad8734295d43f8"]
+        "navigateToMiniProgramAppIdList" : [ "wxf5ad8734295d43f8" ]
     },
     "mp-alipay" : {
         "usingComponents" : true
@@ -207,7 +212,7 @@
     },
     "h5" : {
         "publicPath" : "./",
-        "title" : "综合智慧云",
+        "title" : "智能巡更",
         "router" : {
             "mode" : "hash"
         },

src/pages.json

@@ -32,7 +32,11 @@
             "style": {
                 "navigationBarTitleText": "服务器配置",
                 "navigationStyle": "custom",
-                "navigationBarTextStyle": "black"
+                "enablePullDownRefresh": false,
+                "app-plus": {
+                    "bounce": "none",
+                    "titleNView": false
+                }
             }
         },
         {
@@ -40,7 +44,11 @@
             "style": {
                 "navigationBarTitleText": "服务器配置",
                 "navigationStyle": "custom",
-                "navigationBarTextStyle": "black"
+                "enablePullDownRefresh": false,
+                "app-plus": {
+                    "bounce": "none",
+                    "titleNView": false
+                }
             }
         },
         {
@@ -77,6 +85,18 @@
                     "titleNView": false
                 }
             }
+        },
+        {
+            "path": "pages/door/index",
+            "style": {
+                "navigationBarTitleText": "门禁识别",
+                "enablePullDownRefresh": false,
+                "navigationStyle": "custom",
+                "app-plus": {
+                    "bounce": "none",
+                    "titleNView": false
+                }
+            }
         }
     ],
     "subPackages": [
@@ -87,13 +107,25 @@
                 {
                     "path": "webview/index",
                     "style": {
-                        "navigationBarTitleText": "浏览网页"
+                        "navigationBarTitleText": "浏览网页",
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "textview/index",
                     "style": {
-                        "navigationBarTitleText": "浏览文本"
+                        "navigationBarTitleText": "浏览文本",
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
@@ -130,21 +162,36 @@
                     "path": "appMessage/index",
                     "style": {
                         "navigationBarTitleText": "消息列表",
-                        "enablePullDownRefresh": false
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "appMessage/details",
                     "style": {
                         "navigationBarTitleText": "消息详情",
-                        "enablePullDownRefresh": false
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "alarmMessage/index",
                     "style": {
                         "navigationBarTitleText": "告警通知",
-                        "enablePullDownRefresh": false
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
@@ -158,7 +205,12 @@
                     "path": "nfc/index",
                     "style": {
                         "navigationBarTitleText": "NFC读取",
-                        "enablePullDownRefresh": false
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
@@ -182,26 +234,49 @@
                 {
                     "path": "info/index",
                     "style": {
-                        "navigationBarTitleText": "我的信息"
+                        "navigationBarTitleText": "我的信息",
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "msg/index",
                     "style": {
-                        "navigationBarTitleText": "消息设置"
+                        "navigationBarTitleText": "消息设置",
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "secure/index",
                     "style": {
-                        "navigationBarTitleText": "账号与安全"
+                        "navigationBarTitleText": "账号与安全",
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "secure/loginLog/index",
                     "style": {
                         "navigationBarTitleText": "登录日志",
-                        "enablePullDownRefresh": false
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
@@ -215,7 +290,13 @@
                 {
                     "path": "avatar/index",
                     "style": {
-                        "navigationBarTitleText": "修改头像"
+                        "navigationBarTitleText": "修改头像",
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
@@ -257,49 +338,84 @@
                     "path": "xunJian/xunJian",
                     "style": {
                         "navigationBarTitleText": "巡检",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "xunJian/plan/index",
                     "style": {
                         "navigationBarTitleText": "巡检计划",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "xunJian/plan/components/siteDetails",
                     "style": {
                         "navigationBarTitleText": "站点详情",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "xunJian/plan/components/content",
                     "style": {
                         "navigationBarTitleText": "巡检内容",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "xunJian/plan/components/report",
                     "style": {
                         "navigationBarTitleText": "巡检上报",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "xunJian/record/index",
                     "style": {
                         "navigationBarTitleText": "巡检记录",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "xunJian/record/recordDetail/index",
                     "style": {
                         "navigationBarTitleText": "巡检记录详情",
-                        "enablePullDownRefresh": false
+                        "enablePullDownRefresh": false,
+                        "navigationStyle": "custom",
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
@@ -318,7 +434,12 @@
                     "path": "xunJian/collect/components/collectDetail",
                     "style": {
                         "navigationBarTitleText": "采集上报",
-                        "enablePullDownRefresh": false
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
@@ -337,35 +458,60 @@
                     "path": "xunJian/error/index",
                     "style": {
                         "navigationBarTitleText": "异常上报",
-                        "enablePullDownRefresh": false
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "xunJian/error/errorList",
                     "style": {
                         "navigationBarTitleText": "异常列表",
-                        "enablePullDownRefresh": false
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "xunJian/error/errorListDetail",
                     "style": {
                         "navigationBarTitleText": "事件详情",
-                        "enablePullDownRefresh": false
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "xunJian/error/errorDisposition",
                     "style": {
                         "navigationBarTitleText": "处置内容",
-                        "enablePullDownRefresh": false
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 },
                 {
                     "path": "signIn/index",
                     "style": {
                         "navigationBarTitleText": "人员签到",
-                        "enablePullDownRefresh": false
+                        "navigationStyle": "custom",
+                        "enablePullDownRefresh": false,
+                        "app-plus": {
+                            "bounce": "none",
+                            "titleNView": false
+                        }
                     }
                 }
             ]

src/pages/business/fireIot/deviceManage/components/goAction.vue

@@ -10,26 +10,20 @@
     :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
   >
     <template #default>
-  
       <view class="centerOne">
         <u--form ref="uForm" :model="form" :rules="rules" labelWidth="130">
           <view style="padding: 10px 0">
             <view style="padding: 10px 10px 20px 10px; background: #ffffff">
               <view style="padding-left: 9px">
                 <u-form-item label="命令" prop="commandName" required :borderBottom="true">
-                  <u-input v-model="form.commandName" placeholder="请输入命令名称" border="none">
-                   
-                  </u-input>
+                  <u-input v-model="form.commandName" placeholder="请输入命令名称" border="none"> </u-input>
                 </u-form-item>
-                <u-form-item label="命令属性" v-if="form.dataType==1" prop="commandValue" required :borderBottom="true" @click="handleAction('命令属性')">
+                <u-form-item label="命令属性" v-if="form.dataType == 1" prop="commandValue" required :borderBottom="true" @click="handleAction('命令属性')">
                   <u-input v-model="form.commandName1" placeholder="请选择命令属性" suffixIcon="arrow-right" suffixIconStyle="color: #909399" border="none" disabledColor="transparent" disabled />
                 </u-form-item>
                 <u-form-item v-else label="参数值" prop="commandValue" required :borderBottom="true">
-                  <u-input v-model="form.commandValue" placeholder="请输入参数值" border="none">
-                    
-                  </u-input>
+                  <u-input v-model="form.commandValue" placeholder="请输入参数值" border="none"> </u-input>
                 </u-form-item>
-                
               </view>
             </view>
           </view>
@@ -43,7 +37,6 @@
         </view>
       </view>
 
-     
       <u-picker
         :show="actionShow"
         :columns="actionsList"
@@ -56,8 +49,6 @@
         @cancel="actionShow = false"
         @confirm="selectAction"
       ></u-picker>
-
-
     </template>
   </oa-scroll>
 </template>
@@ -67,7 +58,7 @@
 import { onLoad, onShow } from "@dcloudio/uni-app";
 import { ref, reactive, toRefs, getCurrentInstance } from "vue";
 /*----------------------------------接口引入-----------------------------------*/
-import { getList,doorControl} from "@/api/business/fireIot/deviceManage.js";
+import { getList, deviceStatus } from "@/api/business/fireIot/deviceManage.js";
 /*----------------------------------组件引入-----------------------------------*/
 /*----------------------------------store引入-----------------------------------*/
 /*----------------------------------公共方法引入-----------------------------------*/
@@ -75,7 +66,7 @@ import { getList,doorControl} from "@/api/business/fireIot/deviceManage.js";
 const { proxy } = getCurrentInstance();
 /*----------------------------------变量声明-----------------------------------*/
 
-const deviceId=ref('')
+const deviceId = ref("");
 
 const dataList = reactive({
   form: {
@@ -85,10 +76,7 @@ const dataList = reactive({
   },
   rules: {
     commandName: [{ required: true, message: "请输入命令", trigger: "blur" }],
-    commandValue:[
-            { required: true},
-            { validator: commandValueScale,trigger: 'blur'}
-          ]
+    commandValue: [{ required: true }, { validator: commandValueScale, trigger: "blur" }],
   },
   actionTitle: "",
   actionShow: false,
@@ -96,43 +84,36 @@ const dataList = reactive({
   actionsList: [[]],
 });
 
-const {
-  form,
-  rules,
-  actionTitle,
-  actionsList,
-  actionShow,
-  actionDefaultIndex,
-} = toRefs(dataList);
+const { form, rules, actionTitle, actionsList, actionShow, actionDefaultIndex } = toRefs(dataList);
 
 const scanBool = ref(false);
 
 //参数值校验范围
 function commandValueScale(rule, value, callback) {
-  console.log(form.value.maximum,222)
-  if(form.value.maximum&&form.value.minimum){
-    if (value > form.value.minimum && value <form.value.maximum) {
-        callback();
-      } else {
-        callback(new Error(`输入的参数值必须大于${form.value.minimum}且小于${form.value.maximum}`));
-      }
-  }else{
+  console.log(form.value.maximum, 222);
+  if (form.value.maximum && form.value.minimum) {
+    if (value > form.value.minimum && value < form.value.maximum) {
+      callback();
+    } else {
+      callback(new Error(`输入的参数值必须大于${form.value.minimum}且小于${form.value.maximum}`));
+    }
+  } else {
     callback();
-  }          
+  }
 }
 
 //详情数据
-function getData(){
+function getData() {
   getList({
     current: 1,
     size: 10,
-    productCode:form.value.productCode,
-    commandCode:form.value.commandCode,
+    productCode: form.value.productCode,
+    commandCode: form.value.commandCode,
   }).then((response) => {
-    form.value=response.data.records[0];
-    form.value.commandDict = form.value.commandDict?JSON.parse(form.value.commandDict):'';
-    rules.value.commandValue[0].message=form.value.dataType==1?'请选择命令属性':"请输入参数值"
-    rules.value.commandValue[0].tigger=form.value.dataType==1?'change':"blur";
+    form.value = response.data.records[0];
+    form.value.commandDict = form.value.commandDict ? JSON.parse(form.value.commandDict) : "";
+    rules.value.commandValue[0].message = form.value.dataType == 1 ? "请选择命令属性" : "请输入参数值";
+    rules.value.commandValue[0].tigger = form.value.dataType == 1 ? "change" : "blur";
   });
 }
 
@@ -144,44 +125,40 @@ function getData(){
  */
 function handleSubmit(value) {
   proxy.$refs["uForm"]
-      .validate()
-      .then((res) => {
-        proxy.$modal.msg("校验通过");
-        var params={
-            commandCode:form.value.commandCode,
-            commandValue:form.value.commandValue,
-            productCode:form.value.productCode,
-            deviceId:deviceId.value,
-          }
-        doorControl(params).then((res) => {
-          if (res.status == "SUCCESS") {
-            if (scanBool.value) {
-              proxy.$tab.reLaunch(`/pages/common/success/index?codeName=提交成功&showNow=${false}`);
-            } else {
-              proxy.$modal.msg("提交成功");
-              setTimeout(() => {  
-                proxy.$tab.redirectTo("/pages/business/fireIot/deviceManage/index"); //返回到需要执行方法的页面
-              }, 2000);
-            }
+    .validate()
+    .then((res) => {
+      proxy.$modal.msg("校验通过");
+      var params = {
+        commandCode: form.value.commandCode,
+        commandValue: form.value.commandValue,
+        productCode: form.value.productCode,
+        deviceId: deviceId.value,
+      };
+      deviceStatus(params).then((res) => {
+        if (res.status == "SUCCESS") {
+          if (scanBool.value) {
+            proxy.$tab.reLaunch(`/pages/common/success/index?codeName=提交成功&showNow=${false}`);
+          } else {
+            proxy.$modal.msg("提交成功");
+            setTimeout(() => {
+              proxy.$tab.redirectTo("/pages/business/fireIot/deviceManage/index"); //返回到需要执行方法的页面
+            }, 2000);
           }
-        })
-      })
-      .catch((errors) => {
-        // proxy.$modal.msg("校验失败");
+        }
       });
+    })
+    .catch((errors) => {
+      // proxy.$modal.msg("校验失败");
+    });
 }
 
-
-
 /**
  * @action弹出框点击事件
  */
 function handleAction(value, index, ind) {
   if (value == "命令属性") {
     actionTitle.value = "命令属性";
-    actionsList.value = [
-      form.value.commandDict
-    ];
+    actionsList.value = [form.value.commandDict];
     if (form.value.commandDict) {
       actionsList.value[0].forEach((el, ind) => {
         if (el.value === form.value.commandValue) {
@@ -207,20 +184,17 @@ function selectAction(e) {
   actionShow.value = false;
 }
 
-
 onLoad((options) => {
   if ("commandCode" in options) {
     form.value.commandCode = options.commandCode;
-    
   }
   if ("productCode" in options) {
     form.value.productCode = options.productCode;
   }
   if ("deviceId" in options) {
-   deviceId.value = options.deviceId;
+    deviceId.value = options.deviceId;
   }
-  getData()
-
+  getData();
 });
 
 onShow(() => {

src/pages/business/meeting/index.vue

@@ -309,9 +309,9 @@ function changeSheet(e) {
  */
 function openDoor(e) {
   doorApi()
-    .doorControl({
-      productCode: "502_KAT",
-      deviceId: e.doorId,
+    .control({
+      productCode: "502_USKY",
+      deviceUuid: e.deviceUuid,
       commandCode: "door_onoff",
       commandValue: 1,
     })

src/pages/business/zhaf/signIn/index.vue

@@ -1,6 +1,15 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="人员签到" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :refresherLoad="false"
     :refresherEnabled="false"
     :refresherDefaultStyle="'none'"

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

@@ -1,6 +1,15 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="采集上报" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :isSticky="false"
     :refresherLoad="false"
     :refresherEnabled="false"

src/pages/business/zhaf/xunJian/error/errorDisposition.vue

@@ -1,6 +1,15 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="处置内容" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="errorDisposition-container scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :refresherLoad="false"
     :refresherEnabled="false"
     :refresherEnabledTitle="false"

src/pages/business/zhaf/xunJian/error/errorList.vue

@@ -1,5 +1,13 @@
 <template>
   <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
+    <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="异常列表" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+      <template #left>
+        <view class="u-navbar__content__left__item">
+          <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+        </view>
+      </template>
+    </u-navbar>
+
     <u-tabs
       :list="state.tabsList"
       :current="state.tabsCurrent"
@@ -13,6 +21,7 @@
 
   <oa-scroll
     customClass="fastMail-container scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + 44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :pageSize="state.pageSize"
     :total="state.total"
     :isSticky="true"

src/pages/business/zhaf/xunJian/error/errorListDetail.vue

@@ -1,7 +1,15 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="事件详情" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="invoicing-container scroll-height"
-    :customStyle="{}"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :refresherLoad="false"
     :refresherEnabled="false"
     :refresherDefaultStyle="'none'"

src/pages/business/zhaf/xunJian/error/index.vue

@@ -1,6 +1,15 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="异常上报" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="error-container scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :refresherLoad="false"
     :refresherEnabled="false"
     :refresherEnabledTitle="false"

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

@@ -1,6 +1,15 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="巡检内容" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="xunjian-plan-content scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :refresherLoad="false"
     :refresherEnabled="false"
     :refresherEnabledTitle="false"
@@ -192,7 +201,6 @@ async function buttonClick(type) {
       xunJianStore.planDataList.push(array);
       return false;
     }
-
     updatePlan(array)
       .then((res) => {
         if (res.status == "SUCCESS") {

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

@@ -1,6 +1,15 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="巡检上报" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :refresherLoad="false"
     :refresherEnabled="false"
     :refresherEnabledTitle="false"

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

@@ -1,6 +1,15 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="站点详情" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :refresherLoad="false"
     :refresherEnabled="false"
     :refresherEnabledTitle="false"

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

@@ -1,6 +1,15 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="巡检计划" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="xunjian-plan-container scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :refresherLoad="false"
     :refresherEnabled="false"
     :refresherEnabledTitle="false"

src/pages/business/zhaf/xunJian/record/index.vue

@@ -1,27 +1,47 @@
 <template>
-  <view class="">
-    <view class="cu-list menu-avatar">
-      <view class="cu-item" :class="modalName == 'move-box-' + index ? 'move-cur' : ''" v-for="(item, index) in getData" :key="index" :data-target="'move-box-' + index" @tap="goDetail(item)">
-        <view class="content" style="left: 0; width: 80%">
-          <view class="pro-title">
-            <view class="cut">计划：{{ item.plan_name }}</view>
-          </view>
-          <view class="pro-des">
-            <view class="text-cut"> 点位：{{ item.spot_name }} </view>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="巡检记录" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
+  <oa-scroll
+    customClass="scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
+    :refresherLoad="false"
+    :refresherEnabled="false"
+    :refresherEnabledTitle="false"
+    :refresherDefaultStyle="'none'"
+    :refresherThreshold="44"
+    :refresherBackground="'#f5f6f7'"
+    :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
+  >
+    <template #default>
+      <view class="cu-list menu-avatar">
+        <view class="cu-item" :class="modalName == 'move-box-' + index ? 'move-cur' : ''" v-for="(item, index) in getData" :key="index" :data-target="'move-box-' + index" @tap="goDetail(item)">
+          <view class="content" style="left: 0; width: 80%">
+            <view class="pro-title">
+              <view class="cut">计划：{{ item.plan_name }}</view>
+            </view>
+            <view class="pro-des">
+              <view class="text-cut"> 点位：{{ item.spot_name }} </view>
+            </view>
+            <view class="pro-date">{{ item.wc_time }}</view>
           </view>
-          <view class="pro-date">{{ item.wc_time }}</view>
-        </view>
-        <view class="nav-right num mr10">
-          <view class="text-grey">
-            <button class="cu-btn radius bg-green sm" v-if="item.spot_abnormal == 0">正常</button>
-            <button class="cu-btn radius bg-orange sm" v-if="item.spot_abnormal == 1">异常</button>
-            <button class="cu-btn radius bg-red sm" v-if="item.spot_abnormal == 2">故障</button>
-            <button class="cu-btn radius bg-orange sm" v-if="item.spot_abnormal == 3">其他</button>
+          <view class="nav-right num mr10">
+            <view class="text-grey">
+              <button class="cu-btn radius bg-green sm" v-if="item.spot_abnormal == 0">正常</button>
+              <button class="cu-btn radius bg-orange sm" v-if="item.spot_abnormal == 1">异常</button>
+              <button class="cu-btn radius bg-red sm" v-if="item.spot_abnormal == 2">故障</button>
+              <button class="cu-btn radius bg-orange sm" v-if="item.spot_abnormal == 3">其他</button>
+            </view>
           </view>
         </view>
       </view>
-    </view>
-  </view>
+    </template>
+  </oa-scroll>
 </template>
 
 <script setup>

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

@@ -1,4 +1,12 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="巡检记录详情" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <view>
     <view class="timeBox flex justify-between align-center plr10">
       <view class="time">{{ getData.plan_name }}</view>

src/pages/business/zhaf/xunJian/xunJian.vue

@@ -1,6 +1,15 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="巡检" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :refresherLoad="false"
     :refresherEnabled="false"
     :refresherEnabledTitle="false"

src/pages/common/alarmMessage/index.vue

@@ -1,6 +1,15 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="告警通知" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="alarmMessage-container scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :pageSize="state.pageSize"
     :total="state.total"
     :refresherLoad="true"

src/pages/common/appMessage/details.vue

@@ -1,4 +1,12 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="消息详情" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <view>
     <uni-card class="view-title" :title="data?.infoTitle || ''">
       <view class="uni-body view-content">{{ data?.infoContent || "" }}</view>

src/pages/common/appMessage/index.vue

@@ -1,6 +1,15 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="消息列表" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="appMessage-container scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :pageSize="state.size"
     :total="state.total"
     :refresherLoad="true"
@@ -72,7 +81,6 @@ function goContentDetails(e) {
   if (e.infoType == 4) {
     proxy.$tab.navigateTo(`/pages/business/fireIot/alarmManage/alarmDetails/index?contentId=${e.contentId}`).then(() => {});
   } else if (e.infoType == 5) {
-
     if (e.readFlag != 1) {
       projectApi()
         .ReportRecordReadFlag({ reportId: e.id })
@@ -84,8 +92,8 @@ function goContentDetails(e) {
           }
         });
     } else {
-        proxy.$tab.navigateTo(`/pages/business/common/projectMange/record/details?reportId=${e.moduleId}`);
-      }
+      proxy.$tab.navigateTo(`/pages/business/common/projectMange/record/details?reportId=${e.moduleId}`);
+    }
   } else {
     proxy.$tab.navigateTo(`/pages/common/appMessage/details?contentId=${e.contentId}`).then(() => {});
   }

src/pages/common/nfc/index.vue

@@ -1,4 +1,11 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="NFC读取" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+      <template #left>
+        <view class="u-navbar__content__left__item">
+          <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+        </view>
+      </template>
+    </u-navbar>
   <view class="nfc-container">
     <view class="nfc-container-image">
       <image class="nfc-gif" src="@/static/images/common/nfc-flash.gif" mode="aspectFit" style="width: 230px"></image>

src/pages/common/textview/index.vue

@@ -1,4 +1,12 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" :title="state.title" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <view class="view-text">
     <!-- <u-parse class="uni-body view-content" :content="content"></u-parse> -->
     <h3 style="text-align: center; line-height: 45px">{{ state.contentTitle }}</h3>
@@ -29,9 +37,6 @@ onLoad((options) => {
   state.title = options.title;
   state.content = options.content;
   state.contentTitle = options.contentTitle;
-  uni.setNavigationBarTitle({
-    title: options.title,
-  });
 });
 
 onShow(() => {

src/pages/common/webview/index.vue

@@ -1,4 +1,11 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" :title="params?.title" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
   <view v-if="params.url">
     <web-view :webview-styles="webviewStyles" :src="`${params.url}`" allow></web-view>
   </view>
@@ -38,11 +45,6 @@ const { params, webviewStyles } = toRefs(state);
 
 onLoad((event) => {
   params.value = event;
-  if (event.title) {
-    uni.setNavigationBarTitle({
-      title: event.title,
-    });
-  }
 });
 
 onShow(() => {

src/pages/door/api.js

@@ -0,0 +1,17 @@
+import { request } from "@/utils/request";
+
+/**
+ * 人脸校验接口集合
+ * @method faceVef 人脸验证
+ */
+export function faceApi() {
+    return {
+        faceVef: (data) => {
+            return request({
+                url: '/service-meeting/meetingFace/vef',
+                method: 'POST',
+                data,
+            });
+        },
+    };
+}

src/pages/door/index.vue

@@ -0,0 +1,358 @@
+<template>
+  <web-view v-show="!modal.show" ref="faceView" id="faceView" class="faceView" src="/static/face/door.html" bindmessage="receiveMessage" :webview-styles="webviewStyles" @message="onMessage">
+  </web-view>
+
+  <u-modal
+    :show="modal.show"
+    title="配置服务器"
+    :cancelText="'退出应用'"
+    :zoom="false"
+    :showConfirmButton="true"
+    :showCancelButton="true"
+    :closeOnClickOverlay="true"
+    @confirm="modalConfirm"
+    @cancel="modalCancel"
+    @close="modal.show = false"
+  >
+    <view class="slot-content">
+      <view>
+        <view class="mb10 required">服务器地址</view>
+        <view class="mb20">
+          <u-input v-model="form.linkUrl" placeholder="服务器地址（必填）" border="bottom" style="padding: 6px 0px" />
+        </view>
+      </view>
+      <view>
+        <view class="mb10">服务器端口</view>
+        <view class="mb20">
+          <u-input v-model="form.port" placeholder="服务器端口（非必填）" border="bottom" style="padding: 6px 0px" />
+        </view>
+      </view>
+      <view>
+        <view class="mb10 required">绑定门禁</view>
+        <view>
+          <u-input
+            v-model="form.doorName"
+            placeholder="门禁（必选）"
+            suffixIcon="arrow-right"
+            suffixIconStyle="color: #909399"
+            border="none"
+            disabledColor="transparent"
+            disabled
+            @click="handlePicker('绑定门禁')"
+          />
+        </view>
+      </view>
+    </view>
+  </u-modal>
+
+  <u-picker
+    :show="picker.show"
+    :columns="picker.list"
+    :title="'请选择' + picker.title"
+    keyName="name"
+    visibleItemCount="6"
+    :defaultIndex="[picker.defaultIndex]"
+    :closeOnClickOverlay="true"
+    @close="picker.show = false"
+    @cancel="picker.show = false"
+    @confirm="pickerConfirm"
+  ></u-picker>
+</template>
+<script setup>
+/*----------------------------------依赖引入-----------------------------------*/
+import config from "@/config";
+import { onLoad, onShow, onReady, onHide, onLaunch, onUnload, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
+import { ref, reactive, computed, getCurrentInstance, toRefs, inject, nextTick, watch } from "vue";
+/*----------------------------------接口引入-----------------------------------*/
+import { doorApi } from "@/api/business/door.js";
+import { faceApi } from "./api.js";
+/*----------------------------------组件引入-----------------------------------*/
+/*----------------------------------store引入-----------------------------------*/
+/*----------------------------------公共方法引入-----------------------------------*/
+const { proxy } = getCurrentInstance();
+/*----------------------------------公共变量-----------------------------------*/
+const state = reactive({
+  webviewStyles: {
+    width: "100%",
+    height: "100%",
+  },
+  doooList: [],
+  modal: {
+    show: false,
+  },
+  picker: {
+    show: false,
+    title: "",
+    list: [[]],
+    defaultIndex: 0,
+  },
+  form: {
+    linkUrl: "",
+    port: "",
+    domain: undefined,
+    doorId: undefined,
+    doorName: undefined,
+  },
+});
+const { webviewStyles, doooList, modal, picker, form, inter } = toRefs(state);
+
+// 初始化
+function init() {
+  //#ifdef APP-PLUS
+  proxy.$permission.getPermisson("camera").then((res) => {
+    if (res) {
+      handleChildren({
+        funcName: "开启摄像头",
+        data: {},
+      });
+    }
+  });
+
+  initNfc();
+  //#endif
+
+  var storage = uni.getStorageSync("storage_face");
+  if (storage) {
+    state.form.domain = storage.domain;
+    state.form.linkUrl = storage.linkUrl.indexOf(":") != -1 ? storage.linkUrl.split(":")[0] : storage.linkUrl;
+    state.form.port = storage.port ? storage.port : "";
+    state.form.doorId = storage.doorId || undefined;
+    state.form.doorName = storage.doorName || undefined;
+  }
+}
+
+// 初始化NFC开门
+function initNfc() {
+  proxy.$nfc.initNFC();
+  proxy.$nfc.readNFC().then((e) => {
+    openDoor();
+    initNfc();
+  });
+}
+
+/**
+ * @门禁下拉列表
+ */
+function getdoorList() {
+  doorApi()
+    .Select({
+      current: 1, //页数
+      size: 2000, //条数
+      productCode: "502_USKY", //产品编码
+      deviceStatus: 2, //设备状态;1：在线，2：离线
+      domain: state.form.domain, //域名
+    })
+    .then((requset) => {
+      if (requset.data.records.length > 0) {
+        requset.data.records.forEach((e) => {
+          state.doooList.push({
+            value: e.deviceUuid,
+            name: e.deviceName,
+          });
+        });
+      }
+    });
+}
+
+/**
+ * @人脸验证
+ */
+function faceVerify(imageBase) {
+  faceApi()
+    .faceVef({
+      domain: state.form.domain,
+      imageBase: imageBase,
+    })
+    .then((item) => {
+      if (item.data.code === 200 || item.data.code === 201) {
+        proxy.$modal.msg(item.data.msg);
+        openDoor(item.data);
+      } else {
+        proxy.$modal.msg(item.data.msg);
+      }
+    })
+    .catch((err) => {});
+}
+
+/**
+ * @门禁开门
+ */
+function openDoor(item) {
+  doorApi()
+    .control({
+      domain: state.form.domain, //域名
+      userId: item.userId,
+      userName: item.faceName,
+      productCode: "502_USKY",
+      deviceUuid: "886e02e86a6f4a9b8e8e5fc0797742b2",
+      commandCode: "door_onoff",
+      commandValue: 1,
+    })
+    .then((item2) => {
+      console.log("开门成功");
+    })
+    .catch((err) => {
+      console.log(err);
+    });
+}
+
+/**
+ * @弹窗确定按钮事件
+ */
+function modalConfirm() {
+  if (!state.form.linkUrl) {
+    proxy.$modal.msg("请输入链接地址");
+    return;
+  }
+
+  if (!/^[a-zA-Z0-9][a-zA-Z0-9-]{1,61}(?:\.[a-zA-Z0-9]{2,})+$/.test(state.form.linkUrl)) {
+    proxy.$modal.msg("请输入正确的链接地址");
+    return;
+  }
+
+  if (!state.form.doorName) {
+    proxy.$modal.msg("请选择绑定门禁");
+    return;
+  }
+
+  uni.setStorageSync("storage_face", state.form);
+  state.modal.show = false;
+}
+
+/**
+ * @action弹出框点击事件
+ */
+function handlePicker(value, index, ind) {
+  if (value == "绑定门禁") {
+    state.picker.title = "绑定门禁";
+    state.picker.list = [state.doooList];
+    state.picker.defaultIndex = 0;
+  }
+  state.picker.show = true;
+}
+
+/**
+ * @action弹出框选择事件
+ */
+function pickerConfirm(e) {
+  if (state.picker.title == "绑定门禁") {
+    state.form.doorId = e.value[0].value;
+    state.form.doorName = e.value[0].name;
+  }
+  state.picker.show = false;
+}
+
+/**
+ * @弹窗退出按钮事件
+ */
+function modalCancel() {
+  state.modal.show = false;
+  //#ifdef APP-PLUS
+  proxy.$keyListen.quitApp();
+  //#endif
+}
+
+/**
+ * @解析父页面传回的数据
+ */
+function analysisData(event) {
+  if ("funcName" in event) {
+    if (event.funcName == "打开配置") {
+      state.modal.show = true;
+    } else if (event.funcName == "人脸识别") {
+      faceVerify(event.data.imageBase);
+    }
+  }
+}
+
+/**
+ * @向子页面发送数据
+ */
+function handleChildren(data) {
+  // #ifdef APP-PLUS
+  var pages = getCurrentPages();
+  var currentWebview = pages[pages.length - 1].$getAppWebview();
+  var wv = currentWebview.children()[0];
+  wv.evalJS(`receiveData(${JSON.stringify(data)})`);
+  // #endif
+
+  // #ifdef H5
+  var iframe = document.getElementById("faceView");
+  iframe.contentWindow.postMessage(data, "*");
+  // #endif
+}
+
+/**
+ * @接收子页面传过来的值
+ */
+function onMessage(e) {
+  analysisData(e.detail.data[0]);
+}
+// #ifdef H5
+window.onmessage = function (event) {
+  analysisData(event.data);
+};
+// #endif
+
+onLoad((options) => {
+  setTimeout(() => {
+    init();
+  }, 500);
+});
+
+onShow(() => {});
+
+onUnload(() => {});
+
+watch(
+  () => [state.form.linkUrl, state.form.port],
+  (val) => {
+    if (!state.form.linkUrl) {
+      return;
+    }
+
+    if (!/^[a-zA-Z0-9][a-zA-Z0-9-]{1,61}(?:\.[a-zA-Z0-9]{2,})+$/.test(state.form.linkUrl)) {
+      return;
+    }
+
+    var domain = "";
+    if (state.form.linkUrl) {
+      domain = state.form.linkUrl;
+      if (state.form.port) {
+        domain += ":" + state.form.port;
+      }
+    }
+
+    state.form.domain = domain;
+    config.baseUrl = "http://" + state.form.domain + "/prod-api";
+    getdoorList();
+  }
+);
+</script>
+<style>
+.faceView {
+  width: 100% !important;
+  height: 100% !important;
+}
+
+iframe {
+  width: 100% !important;
+  height: 100% !important;
+  border-width: 0;
+}
+</style>
+<style lang="scss" scoped>
+:deep() {
+  .u-modal {
+    width: 20rem !important;
+
+    &__title {
+      font-size: 18px !important;
+    }
+    .slot-content {
+      font-size: 16px;
+      width: 100%;
+    }
+  }
+}
+</style>

src/pages/face/api.js

@@ -55,28 +55,4 @@ export function signOnOut(data) {
         method: 'POST',
         data
     })
-}
-
-/**
- * 门禁接口集合
- * @method doorControl 门禁开门
- * @method doorList 门禁列表
- */
-export function doorApi() {
-    return {
-        doorControl: (data) => {
-            return request({
-                url: `/service-iot/deviceHttp/control`,
-                method: 'GET',
-                data,
-            });
-        },
-        doorList: (data) => {
-            return request({
-                url: `/service-iot/dmpDeviceInfo/pageWhite`,
-                method: 'POST',
-                data,
-            });
-        },
-    };
 }

src/pages/face/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <web-view v-show="!modal.show" ref="faceView" id="faceView" class="faceView" src="/static/face/index.html" bindmessage="receiveMessage" :webview-styles="webviewStyles" @message="onMessage">
+  <web-view v-show="!modal.show" ref="faceView" id="faceView" class="faceView" src="/static/face/meeting.html" bindmessage="receiveMessage" :webview-styles="webviewStyles" @message="onMessage">
   </web-view>
 
   <u-modal
@@ -80,7 +80,8 @@ import config from "@/config";
 import { onLoad, onShow, onReady, onHide, onLaunch, onUnload, onNavigationBarButtonTap, onPageScroll } from "@dcloudio/uni-app";
 import { ref, reactive, computed, getCurrentInstance, toRefs, inject, nextTick, watch } from "vue";
 /*----------------------------------接口引入-----------------------------------*/
-import { meetingApi, faceApi, signOnOut, doorApi } from "./api.js";
+import { doorApi } from "@/api/business/door.js";
+import { meetingApi, faceApi, signOnOut } from "./api.js";
 /*----------------------------------组件引入-----------------------------------*/
 /*----------------------------------store引入-----------------------------------*/
 /*----------------------------------公共方法引入-----------------------------------*/
@@ -196,10 +197,10 @@ function getMeetingRoomList() {
 function getdoorList() {
   state.meetingDoorList = [];
   doorApi()
-    .doorList({
+    .Select({
       current: 1, //页数
       size: 2000, //条数
-      productCode: "502_KAT", //产品编码
+      productCode: "502_USKY", //产品编码
       deviceStatus: 2, //设备状态;1：在线，2：离线
       domain: state.form.domain, //域名
     })
@@ -207,7 +208,7 @@ function getdoorList() {
       if (requset.data.records.length > 0) {
         requset.data.records.forEach((e) => {
           state.meetingDoorList.push({
-            value: e.deviceId,
+            value: e.deviceUuid,
             name: e.deviceName,
           });
         });
@@ -405,11 +406,11 @@ function meetingVerify(event) {
  */
 function openDoor(item) {
   doorApi()
-    .doorControl({
+    .control({
       domain: state.form.domain,
       userId: item.data.userId || undefined,
       userName: item.data.faceName || undefined,
-      productCode: "502_KAT",
+      productCode: "502_USKY",
       deviceId: state.form.doorId,
       commandCode: "door_onoff",
       commandValue: 1,

src/pages/info.vue

@@ -18,7 +18,7 @@
       <view class="u-navbar__content__right__item">
         <text class="iconfont oaIcon-sousuo" @click="handleIconClick('搜索')"></text>
       </view> -->
-      <view class="u-navbar__content__right__item">
+      <view class="u-navbar__content__right__item" v-if="config.appInfo.appid != '__UNI__BF1A1F0'">
         <text class="iconfont oaIcon-shezhi font20" @click="handleIconClick('设置')"></text>
       </view>
     </template>
@@ -37,13 +37,13 @@
   >
     <template #default>
       <view class="content-area list-cell list-cell-arrow" v-for="item in infoList.infoTypeStatic" :key="item" @tap="goAppMessage(item)">
-        <view class="content-area-avatar">
+        <view class="content-area-avatar" >
           <image class="image-bg" :src="item.img" />
           <view class="uni_top_right font12" style="margin: auto 0">
             <u-badge numberType="overflow" max="99" :value="item.notReadCount"></u-badge>
           </view>
         </view>
-        <view class="content-area-child">
+        <view class="content-area-child" >
           <view class="uni-item mb5 ml10">
             <view class="uni-item-text font14" style="color: #000000">{{ item.label }}</view>
           </view>
@@ -61,13 +61,14 @@
 <script setup>
 /*----------------------------------依赖引入-----------------------------------*/
 import { onLoad, onShow } from "@dcloudio/uni-app";
-import { reactive, getCurrentInstance, toRefs } from "vue";
+import { ref,reactive, getCurrentInstance, toRefs } from "vue";
 /*----------------------------------接口引入-----------------------------------*/
 import { getMceReceiveStatic, updateMceReceiveStatus } from "@/api/mine/info.js";
 /*----------------------------------组件引入-----------------------------------*/
 /*----------------------------------store引入-----------------------------------*/
 /*----------------------------------公共方法引入-----------------------------------*/
 import { storageSystem } from "@/utils/storage";
+import config from "@/config";
 /*----------------------------------公共变量-----------------------------------*/
 const { proxy } = getCurrentInstance();
 const { message_type } = proxy.useDict("message_type");
@@ -77,8 +78,9 @@ const state = reactive({
     infoTypeStatic: [],
     total: 0,
   },
+  BF1A1F0Info:[]
 });
-const { infoList } = toRefs(state);
+const { infoList, BF1A1F0Info } = toRefs(state);
 
 function init() {
   getMceReceiveStatic().then((res) => {
@@ -109,9 +111,19 @@ function init() {
         }
       }
     }
-
+    if(config.appInfo.appid == '__UNI__BF1A1F0'){ //巡检只留公告和巡检
+      state.BF1A1F0Info = []
+      for(let i=0;i<receiveStatic.infoTypeStatic.length;i++){
+        if(receiveStatic.infoTypeStatic[i].infoType == 1 || receiveStatic.infoTypeStatic[i].infoType == 2){
+          state.BF1A1F0Info.push(receiveStatic.infoTypeStatic[i])
+        }
+      }
+    }
     proxy.$setting.setBadge(res.data.notReadCount); // 设置角标值
-    state.infoList = receiveStatic;
+    if(config.appInfo.appid == '__UNI__BF1A1F0'){
+      receiveStatic.infoTypeStatic = state.BF1A1F0Info
+    }
+    state.infoList = receiveStatic
     storageSystem.set("infoList", receiveStatic);
   });
 }

src/pages/login.vue

@@ -1,5 +1,5 @@
 <template>
-  <view id="login-container" class="login-container" v-if="xcxData==null">
+  <view id="login-container" class="login-container">
     <image class="bgImage" :src="useStore.loginBg" v-if="useStore.loginBg" />
 
     <view class="middle">
@@ -40,12 +40,12 @@
       <view class="middle-switch">
         <text class="switch-loginMethod" @click="switchMode(1)">{{ switchText === "验证码登录" ? "账号密码登录" : "验证码登录" }}</text>
         <view style="margin: auto"></view>
-        <text class="switch-register" @click="switchMode(2)">注册账号</text>
+        <text class="switch-register" @click="switchMode(2)" v-if="config.appInfo.appid != '__UNI__BF1A1F0'">注册账号</text>
       </view>
       <!--#endif-->
 
       <!-- #ifdef APP-PLUS || MP-WEIXIN -->
-      <view class="middle-agreed text-center">
+      <view class="middle-agreed text-center" v-if="config.appInfo.appid != '__UNI__BF1A1F0'">
         <u-checkbox shape="circle" inactiveColor="#0081ff" size="13" :usedAlone="true" :checked="uChecked" @change="uCheckedChange"></u-checkbox>
         <!-- <text>登录即已代表阅读并同意</text> -->
         <text>我已阅读并同意</text>
@@ -102,7 +102,6 @@ import { reactive, getCurrentInstance, toRefs, inject, nextTick } from "vue";
 /*----------------------------------store引入-----------------------------------*/
 import { useStores, commonStores, xunJianStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/
-import { decrypt } from "@/utils/jsencrypt";
 import config from "@/config";
 import { storageSystem } from "@/utils/storage";
 /*----------------------------------公共变量-----------------------------------*/
@@ -124,10 +123,9 @@ const state = reactive({
   /** 用户隐私协议数据 */
   uChecked: false,
   modalShow: false,
-  xcxData:null
 });
 
-const { phone, verify, switchText, username, password, isPassword, linkUrl, uChecked, modalShow,xcxData } = toRefs(state);
+const { phone, verify, switchText, username, password, isPassword, linkUrl, uChecked, modalShow } = toRefs(state);
 
 /**
  * @跳转服务器配置
@@ -185,6 +183,8 @@ function init() {
     linkUrl.value = window.location.host;
     // linkUrl.value = "192.168.10.165:13200";
     // linkUrl.value = "localhost:81";
+    // linkUrl.value = "xf.usky.cn:13212";
+    
     useStore.GetMobileTenantConfig({ url: linkUrl.value });
   }
   //#endif
@@ -195,7 +195,11 @@ function init() {
     // linkUrl.value = "localhost:81";
     useStore.GetMobileTenantConfig({ url: linkUrl.value });
   } else {
-    uni.setStorageSync("serveUrl", "manager.usky.cn");
+    if(config.appInfo.appid == '__UNI__BF1A1F0'){
+      uni.setStorageSync("serveUrl", "xf.usky.cn:13212");
+    }else{
+      uni.setStorageSync("serveUrl", "manager.usky.cn");
+    }
     commonStore.setServeList("manager.usky.cn", "");
     linkUrl.value = uni.getStorageSync("serveUrl");
     // linkUrl.value = "localhost:81";
@@ -212,7 +216,7 @@ function submitRes() {
     return;
   }
 
-  if (!uChecked.value) {
+  if (config.appInfo.appid != "__UNI__BF1A1F0" && !uChecked.value) {
     modalShow.value = true;
     return;
   }
@@ -302,22 +306,15 @@ onShow(() => {
 
 onLoad((options) => {
   // console.log(linkUrl.value)
-  console.log('options')
-  console.log(options)
-
-  if(options.dataToken){
-      localStorage.setItem("App-Token", options.dataToken)
-      localStorage.setItem("type", 'innerH5')
-      useStore.GetInfo()
-      proxy.$tab.reLaunch("/pages/index");
-
-      // window.location.href = `${linkUrl.value}pages/index`;
-    }
-
-  // if(options.xcx){
-  //   state.xcxData=decrypt(decodeURIComponent(options.xcx))
-  //   login(state.xcxData)
-  // }
+  console.log("options");
+  console.log(options);
+
+  if (options.dataToken) {
+    localStorage.setItem("App-Token", options.dataToken);
+    localStorage.setItem("type", "innerH5");
+    useStore.GetInfo();
+    proxy.$tab.reLaunch("/pages/index");
+  }
 });
 </script>
 

src/pages/mine.vue

@@ -46,13 +46,13 @@
                 <view>账号与安全</view>
               </view>
             </view>
-            <view class="list-cell list-cell-arrow" @click="proxy.$settingStore.handleToMessage()">
+            <view class="list-cell list-cell-arrow" @click="proxy.$settingStore.handleToMessage()" v-if="config.appInfo.appid != '__UNI__BF1A1F0'">
               <view class="menu-item">
                 <view class="iconfont oaIcon-tongzhi menu-item-icon"></view>
                 <view>新消息通知</view>
               </view>
             </view>
-            <view class="list-cell list-cell-arrow" @click="proxy.$settingStore.handleAbout()">
+            <view class="list-cell list-cell-arrow" @click="proxy.$settingStore.handleAbout()" v-if="config.appInfo.appid != '__UNI__BF1A1F0'">
               <view class="menu-item">
                 <view class="iconfont oaIcon-aixin menu-item-icon"></view>
                 <view>关于我们</view>
@@ -202,6 +202,7 @@ const state = reactive({
   nickName: useStore.nickName,
   phone: useStore.phonenumber,
   version: config.appInfo.version,
+  appid: config.appInfo.appid,
 
   colorModal: false,
   themeList: proxy.$constData.themeList,

src/pages/mine/avatar/index.vue

@@ -1,4 +1,12 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="修改头像" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <view class="avatar-container" :data-theme="'theme-' + proxy.$settingStore.themeColor.name">
     <view class="oa-header-section"></view>
     <view class="oa-content-section page-body">

src/pages/mine/info/index.vue

@@ -1,4 +1,12 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="我的信息" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <view :data-theme="'theme-' + proxy.$settingStore.themeColor.name" class="info-container">
     <u-sticky class="shadow-default" bgColor="#fff" style="top: 0">
       <u-tabs

src/pages/mine/msg/index.vue

@@ -1,4 +1,12 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="消息设置" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <view class="msg-container">
     <view class="oa-header-section">提醒设置：关闭后，仍会接收此消息，但不进行消息接收提示</view>
     <view class="oa-content-section">

src/pages/mine/secure/index.vue

@@ -1,4 +1,12 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="账号与安全" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <view :data-theme="'theme-' + proxy.$settingStore.themeColor.name" class="secure-container">
     <view class="content-section">
       <view class="menu-list mt0 mlr0">

src/pages/mine/secure/loginLog/index.vue

@@ -1,6 +1,15 @@
 <template>
+  <u-navbar :titleStyle="{ color: '#fff' }" :autoBack="true" title="登录日志" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#fff"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
+
   <oa-scroll
     customClass="scroll-height"
+    :customStyle="{ height: `calc(100vh - (44px + ${proxy.$settingStore.StatusBarHeight} + ${proxy.$settingStore.tabBarHeight}))` }"
     :pageSize="state.pageSize"
     :total="state.total"
     :refresherLoad="true"

src/pages/serveConfig.vue

@@ -1,9 +1,13 @@
 <template>
-  <view id="serveConfig-container">
-    <view class="top-area">
-      <u-icon name="arrow-left" size="17px" color="#000" :bold="true" @click="navigateTo"></u-icon>
-    </view>
+  <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" title="" :placeholder="true" :safeAreaInsetTop="true" bgColor="#FFFFFF">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#000"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
 
+  <view id="serveConfig-container">
     <view class="content-area">
       <text class="content-area-title">设置服务器地址</text>
       <u-icon class="content-area-icons" name="scan" color="#2a98ff" size="22"></u-icon>
@@ -156,6 +160,14 @@ onLoad((options) => {
 </script>
 
 <style lang="scss" scoped>
+:deep() {
+  .u-navbar__content__left,
+  .u-navbar__content__right {
+    padding: 0 25px;
+    top: 50px;
+  }
+}
+
 #serveConfig-container {
   position: fixed;
   top: 0;
@@ -166,9 +178,9 @@ onLoad((options) => {
   width: 100%;
   margin: auto;
   padding: 0 30px;
-  padding-top: 20%;
-  //#ifdef MP-WEIXIN
   padding-top: 30%;
+  //#ifdef MP-WEIXIN
+  padding-top: 40%;
   //#endif
   background-color: #ffffff;
 

src/pages/serveConfigSelect.vue

@@ -1,9 +1,13 @@
 <template>
-  <view id="serveConfigSelect-container">
-    <view class="top-area">
-      <u-icon name="arrow-left" size="17px" color="#000" :bold="true" @click="navigateTo()"></u-icon>
-    </view>
+  <u-navbar :titleStyle="{ color: '#000' }" :autoBack="true" title="" :placeholder="true" :safeAreaInsetTop="true" bgColor="#fff">
+    <template #left>
+      <view class="u-navbar__content__left__item">
+        <u-icon name="arrow-left" size="20" color="#000"></u-icon>
+      </view>
+    </template>
+  </u-navbar>
 
+  <view id="serveConfigSelect-container">
     <view class="content-area">
       <text class="content-area-title">选择服务器地址</text>
       <u-icon class="content-area-icons" name="scan" color="#2a98ff" size="22" @tap="serveClick(1)"></u-icon>
@@ -188,6 +192,14 @@ onLoad((options) => {});
 </script>
 
 <style lang="scss" scoped>
+:deep() {
+  .u-navbar__content__left,
+  .u-navbar__content__right {
+    padding: 0 25px;
+    top: 50px;
+  }
+}
+
 #serveConfigSelect-container {
   position: fixed;
   top: 0;
@@ -199,9 +211,9 @@ onLoad((options) => {});
   height: 100vh;
   margin: auto;
   padding: 0 30px;
-  padding-top: 20%;
-  //#ifdef MP-WEIXIN
   padding-top: 30%;
+  //#ifdef MP-WEIXIN
+  padding-top: 40%;
   //#endif
   background-color: #ffffff;
 

src/plugins/keyListen.plugins.js

@@ -19,10 +19,6 @@ export default {
                 // main.stopLockTask()//按返回键恢复
                 // main.startLockTask()//阻止系统home建和近期任务键
                 // main.unregisterReceiver(receiver); //同时停止接收home和recent点击
-                const pages = getCurrentPages(); // 获取当前页面栈
-                const currentPage = pages[pages.length - 1]; // 最后一个元素即为当前页面
-                xunJianStores().modal.show = currentPage.route === 'pages/login' ? true : false
-                console.log('监听返回')
                 e.preventDefault();
             });
         } else {

src/static/face/door.html

@@ -0,0 +1,262 @@
+<!doctype html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title>人脸识别</title>
+    <script type="text/javascript" src="./js/tracking-min.js"></script>
+    <script type="text/javascript" src="./js/face-min.js"></script>
+    <script type="text/javascript" src="./js/jquery-2.2.1.min.js"></script>
+    <!-- VUE3 的 SDK -->
+    <script type="text/javascript" src="./js/vue.global.prod.js"></script>
+    <!-- uni 的 SDK -->
+    <script type="text/javascript" src="./js/uni.webview.1.5.4.js"></script>
+    <style>
+        html,
+        body {
+            width: 100%;
+            height: 100%;
+            margin: 0;
+            /* Safari */
+            -webkit-user-select: none;
+            /* Firefox */
+            -moz-user-select: none;
+            /* IE10+/Edge */
+            -ms-user-select: none;
+            /* Standard syntax */
+            user-select: none;
+
+            ::-webkit-scrollbar {
+                display: none;
+            }
+        }
+
+        video,
+        canvas {
+            position: absolute;
+            left: 0;
+            right: 0;
+            top: 342px;
+            bottom: 0;
+        }
+
+        .home-card-face {
+            position: absolute;
+            left: 0;
+            right: 0;
+            top: 0;
+            bottom: 0;
+        }
+
+        .home-card-one,
+        .home-card-two,
+        .home-card-three {
+            color: #000;
+            width: calc(100%);
+            height: calc(100%);
+            text-align: center;
+            background-color: #fff;
+        }
+    </style>
+</head>
+
+<body>
+    <div id="face-container" class="face-container home-card-two">
+
+        <div class="home-card-face" id="home-card-face">
+            <!-- height="1564" -->
+            <video id="video" width="980" height="880" preload autoplay loop muted></video>
+            <canvas id="canvas" width="980" height="880"></canvas>
+            <!--人脸特效区域-->
+            <!-- <div class="specialEffects1" v-if="state.faceImgState"></div>
+            <div class="specialEffects2" v-else></div> -->
+        </div>
+    </div>
+    <script>
+        // 创建Vue实例
+        Vue.createApp({
+            components: {},
+            emits: [],
+            props: {},
+            data() {
+                return {
+                    tracker: null,
+                    trackerTask: null,
+                    state: {
+                        dataAll: {},
+                        thisVenueData: [],
+                        thisVenueTime: {},
+                        nextSceneData: [],
+                        nextSceneTime: {},
+                        timeList: [],
+                        faceImgState: true,
+                    },
+                    timeOutEvent: 0
+                };
+            },
+            computed: {},
+            methods: {
+                // 初始化数据
+                initData() { },
+                // 初始化摄像头
+                initVido() {
+                    var that = this;
+
+                    var video = document.getElementById("video");//视频dom
+                    video.style.transform = 'scaleX(-1)';//视频翻转(1.水平翻转-scaleX(-1) 2.垂直翻转-scaleY(-1))
+                    var canvas = document.getElementById('canvas');//画布dom
+                    canvas.style.transform = 'scaleX(-1)';//画布翻转(1.水平翻转-scaleX(-1) 2.垂直翻转-scaleY(-1))
+                    var context = canvas.getContext('2d');
+                    var time = 2000;
+                    that.tracker = new tracking.ObjectTracker('face');
+                    that.tracker.setInitialScale(4); //设置识别的放大比例
+                    that.tracker.setStepSize(2);//设置步长
+                    that.tracker.setEdgesDensity(0.1);//边缘密度
+                    //启动摄像头，并且识别视频内容
+                    that.trackerTask = tracking.track('#video', that.tracker, {
+                        camera: true
+                    });
+
+                    var flag = true;
+                    that.tracker.on('track', function (event) {
+                        if (event.data.length === 0) {
+                            // console.log('未检测到人脸')
+                            context.clearRect(0, 0, canvas.width, canvas.height);
+                        } else if (event.data.length > 1) {
+                            // console.log('检测到多张人脸')
+                        } else {
+                            context.clearRect(0, 0, canvas.width, canvas.height);
+                            event.data.forEach(function (rect) {
+                                context.strokeStyle = '#409eff';
+                                context.strokeRect(rect.x, rect.y, rect.width, rect.height);
+                                context.fillStyle = "#409eff";
+                                context.lineWidth = 1.5;
+                            });
+                            if (flag) {
+                                console.log("拍照");
+                                that.state.faceImgState = false;
+                                context.drawImage(video, 0, 0, video.width, video.height);
+                                that.saveAsLocalImage();//调用获取图片bold
+                                context.clearRect(0, 0, canvas.width, canvas.height);
+                                flag = false;
+                                setTimeout(function () {
+                                    flag = true;
+                                    that.state.faceImgState = true;
+                                }, time);
+                            } else {
+                                //console.log("冷却中");
+                            }
+                        }
+                    });
+
+                    $("#home-card-face").on({
+                        touchstart: function (e) {
+                            that.timeOutEvent = setTimeout(() => {
+                                that.longPress()
+                            }, 1000);
+                            e.preventDefault();
+                        },
+                        touchmove: function () {
+                            clearTimeout(that.timeOutEvent);
+                            that.timeOutEvent = 0;
+                        },
+                        touchend: function () {
+                            clearTimeout(that.timeOutEvent);
+                            if (that.timeOutEvent != 0) {
+                                console.log("你这是点击，不是长按");
+                            }
+                            return false;
+                        }
+                    })
+                },
+                // 向父页面推送数据
+                parentMessage(type, data) {
+                    var message = {
+                        funcName: type,
+                        data: data,
+                    };
+
+                    //APP-PLUS
+                    uni.postMessage({
+                        data: message
+                    });
+
+                    //H5
+                    if (window.parent) {
+                        window.parent.postMessage(message, '*');
+                    }
+                },
+                // 获取图片bold
+                saveAsLocalImage() {
+                    var myCanvas = document.getElementById("canvas");
+                    var image = myCanvas.toDataURL("image/png").replace("image/png", "image/octet-stream");
+                    this.parentMessage('人脸识别', { imageBase: image })
+                },
+                // 解析数据
+                analysisData(event) {
+                    console.log(event.funcName)
+                    if ("funcName" in event) {
+                        if (event.funcName == "初始化数据") {
+                            this.state.dataAll = JSON.parse(event.data).dataAll
+                            this.state.thisVenueData = JSON.parse(event.data).thisVenueData
+                            this.state.thisVenueTime = JSON.parse(event.data).thisVenueTime
+                            this.state.nextSceneData = JSON.parse(event.data).nextSceneData
+                            this.state.nextSceneTime = JSON.parse(event.data).nextSceneTime
+                            this.state.timeList = JSON.parse(event.data).timeList
+                            this.initData();
+                        } else if (event.funcName == "开启摄像头") {
+                            this.initVido();//调用初始化摄像头
+                        }
+                    }
+                },
+                // 长按事件
+                longPress() {
+                    this.parentMessage('打开配置')
+                    this.timeOutEvent = 0
+                },
+                // 监听页面是否隐藏
+                handleVisibilityChange() {
+                    if (document.visibilityState === 'visible') {
+                        // 页面变为可见时的处理逻辑
+                        console.log('页面变为可见');
+                        this.initVido();
+                    } else if (document.visibilityState === 'hidden') {
+                        // 页面变为不可见时的处理逻辑
+                        console.log('页面变为不可见');
+                        this.closeFace();
+                    }
+                },
+                closeFace() {
+                    try {
+                        this.tracker = null
+                        // 关闭摄像头
+                        let video = document.getElementById('video')
+                        video.srcObject.getTracks()[0].stop()
+                        // 停止侦测
+                        this.trackerTask.stop()
+                    } catch (error) { }
+                }
+            },
+            created() {
+                var that = this
+                // APP-PLUS || H5（接收父页面传过来的值）
+                window.receiveData = (msg) => {
+                    that.analysisData(msg)
+                }
+                window.addEventListener("message", function (event) {
+                    that.analysisData(event.data)
+                });
+            },
+            mounted() {
+                document.addEventListener('visibilitychange', this.handleVisibilityChange);
+            },
+            beforeDestroy() {
+                // 移除window方法
+                window.receiveData = null;
+            },
+            watch: {},
+        }).mount('#face-container');
+    </script>
+</body>
+
+</html>

src/store/modules/setting.js

@@ -308,6 +308,9 @@ const settingStores = defineStore("storage-setting", {
             // 智能会议
             else if (config.appInfo.appid === "__UNI__F3963F8") {
             }
+            // 智能门禁
+            else if (config.appInfo.appid === "__UNI__8D6E9FD") {
+            }
 
             modal.loading("加载中");
             checkUpdates(data).then((res) => {
@@ -360,20 +363,18 @@ const settingStores = defineStore("storage-setting", {
             const useStore = useStores();
             modal.confirm("确定注销并退出系统吗？").then(() => {
                 useStore.LogOut().then(() => {
-                   
-                    if(localStorage.getItem("type")) {
+                    if (localStorage.getItem("type")) {
                         console.log('内嵌h5')
                         wx.miniProgram.navigateTo({
-                            appId:'wxf5ad8734295d43f8',
-                            url:'/pages/login?type=logout'
-                          })
-                    }  else{
+                            appId: 'wxf5ad8734295d43f8',
+                            url: '/pages/login?type=logout'
+                        })
+                    } else {
                         tab.reLaunch("/pages/index");
-                    }                 
-
+                    }
                 });
             });
-        },     
+        },
         /**
          * @初始化默认主题
          */

unpackage/config/setting.js

@@ -9,6 +9,11 @@ filesToModify.forEach((file) => {
         let state = JSON.parse(cleanedData);// 解析JSON数据
 
         if (file == './src/manifest.json') {
+            var maps = state["app-plus"].distribute.sdkConfigs.maps
+            var geolocation = state["app-plus"].distribute.sdkConfigs.geolocation
+            var icons = state["app-plus"].distribute.icons
+            var push = state["app-plus"].distribute.sdkConfigs.push
+
             if (args === 'zhiHuiYun') {
                 state.name = '综合智慧云'
                 state.appid = '__UNI__36DE3A0'
@@ -16,13 +21,103 @@ filesToModify.forEach((file) => {
                 state.versionName = "2.2.4"
                 state.versionCode = 24
                 state.h5.title = '综合智慧云'
+
+                maps.amap.name = "amapBOujshtbA"
+                maps.amap.appkey_ios = "fb35d03fbb17cbf7a8743a522da3c7fc"
+                maps.amap.appkey_android = "ffc71dfd4e576596027f8f45a1b8fb2f"
+
+                geolocation.amap.name = "amapBOujshtbA"
+                geolocation.amap.appkey_ios = "fb35d03fbb17cbf7a8743a522da3c7fc"
+                geolocation.amap.appkey_android = "ffc71dfd4e576596027f8f45a1b8fb2f"
+                geolocation.tencent.apikey_ios = "EGOBZ-74ZET-ST7XS-VYICT-RBLHZ-KLFEX"
+                geolocation.tencent.apikey_android = "EGOBZ-74ZET-ST7XS-VYICT-RBLHZ-KLFEX"
+                icons.android = {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                }
+                icons.ios.appstore = "unpackage/res/icons/1024x1024.png"
+                icons.ios.ipad = {
+                    "app": "unpackage/res/icons/76x76.png",
+                    "app@2x": "unpackage/res/icons/152x152.png",
+                    "notification": "unpackage/res/icons/20x20.png",
+                    "notification@2x": "unpackage/res/icons/40x40.png",
+                    "proapp@2x": "unpackage/res/icons/167x167.png",
+                    "settings": "unpackage/res/icons/29x29.png",
+                    "settings@2x": "unpackage/res/icons/58x58.png",
+                    "spotlight": "unpackage/res/icons/40x40.png",
+                    "spotlight@2x": "unpackage/res/icons/80x80.png"
+                }
+                icons.ios.iphone = {
+                    "app@2x": "unpackage/res/icons/120x120.png",
+                    "app@3x": "unpackage/res/icons/180x180.png",
+                    "notification@2x": "unpackage/res/icons/40x40.png",
+                    "notification@3x": "unpackage/res/icons/60x60.png",
+                    "settings@2x": "unpackage/res/icons/58x58.png",
+                    "settings@3x": "unpackage/res/icons/87x87.png",
+                    "spotlight@2x": "unpackage/res/icons/80x80.png",
+                    "spotlight@3x": "unpackage/res/icons/120x120.png"
+                }
+                push.unipush.icons.small = {
+                    "hdpi" : "unpackage/res/push/36x36.png",
+                    "ldpi" : "unpackage/res/push/18x18.png",
+                    "mdpi" : "unpackage/res/push/24x24.png",
+                    "xhdpi" : "unpackage/res/push/48x48.png",
+                    "xxhdpi" : "unpackage/res/push/72x72.png"
+                }
             } else if (args === 'xunJian') {
                 state.name = '智能巡更'
                 state.appid = '__UNI__BF1A1F0'
                 state.description = '智能巡更app，是一款用于监督和记录巡逻人员按照预定路线和时间进行巡逻的系统。'
-                state.versionName = "2.2.0"
-                state.versionCode = 20
+                state.versionName = "2.2.7"
+                state.versionCode = 27
                 state.h5.title = '智能巡更'
+
+                maps.amap.name = "amap_15575941817CWPEQVCyc"
+                maps.amap.appkey_ios = "4da4abbd317d0b083d6c25dd9b509eed"
+                maps.amap.appkey_android = "63bef5d715bfa5433189e7b65516dfa5"
+
+                geolocation.amap.name = "amap_15575941817CWPEQVCyc"
+                geolocation.amap.appkey_ios = "4da4abbd317d0b083d6c25dd9b509eed"
+                geolocation.amap.appkey_android = "63bef5d715bfa5433189e7b65516dfa5"
+                geolocation.tencent.apikey_ios = "EGOBZ-74ZET-ST7XS-VYICT-RBLHZ-KLFEX"
+                geolocation.tencent.apikey_android = "EGOBZ-74ZET-ST7XS-VYICT-RBLHZ-KLFEX"
+                icons.android = {
+                    "hdpi" : "unpackage/res/icons-xunJian/72x72.png",
+                    "xhdpi" : "unpackage/res/icons-xunJian/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons-xunJian/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons-xunJian/192x192.png"
+                }
+                icons.ios.appstore = "unpackage/res/icons-xunJian/1024x1024.png"
+                icons.ios.ipad = {
+                    "app": "unpackage/res/icons-xunJian/76x76.png",
+                    "app@2x": "unpackage/res/icons-xunJian/152x152.png",
+                    "notification": "unpackage/res/icons-xunJian/20x20.png",
+                    "notification@2x": "unpackage/res/icons-xunJian/40x40.png",
+                    "proapp@2x": "unpackage/res/icons-xunJian/167x167.png",
+                    "settings": "unpackage/res/icons-xunJian/29x29.png",
+                    "settings@2x": "unpackage/res/icons-xunJian/58x58.png",
+                    "spotlight": "unpackage/res/icons-xunJian/40x40.png",
+                    "spotlight@2x": "unpackage/res/icons-xunJian/80x80.png"
+                }
+                icons.ios.iphone = {
+                    "app@2x": "unpackage/res/icons-xunJian/120x120.png",
+                    "app@3x": "unpackage/res/icons-xunJian/180x180.png",
+                    "notification@2x": "unpackage/res/icons-xunJian/40x40.png",
+                    "notification@3x": "unpackage/res/icons-xunJian/60x60.png",
+                    "settings@2x": "unpackage/res/icons-xunJian/58x58.png",
+                    "settings@3x": "unpackage/res/icons-xunJian/87x87.png",
+                    "spotlight@2x": "unpackage/res/icons-xunJian/80x80.png",
+                    "spotlight@3x": "unpackage/res/icons-xunJian/120x120.png"
+                }
+                push.unipush.icons.small = {
+                    "hdpi" : "unpackage/res/push-xunJian/36x36.png",
+                    "ldpi" : "unpackage/res/push-xunJian/18x18.png",
+                    "mdpi" : "unpackage/res/push-xunJian/24x24.png",
+                    "xhdpi" : "unpackage/res/push-xunJian/48x48.png",
+                    "xxhdpi" : "unpackage/res/push-xunJian/72x72.png"
+                }
             } else if (args === 'huiYi') {
                 state.name = '智能会议'
                 state.appid = '__UNI__F3963F8'
@@ -30,6 +125,103 @@ filesToModify.forEach((file) => {
                 state.versionName = "2.0.5"
                 state.versionCode = 1
                 state.h5.title = '智能会议'
+
+                maps.amap.name = "amapBOujshtbA"
+                maps.amap.appkey_ios = "fb35d03fbb17cbf7a8743a522da3c7fc"
+                maps.amap.appkey_android = "ffc71dfd4e576596027f8f45a1b8fb2f"
+
+                geolocation.amap.name = "amapBOujshtbA"
+                geolocation.amap.appkey_ios = "fb35d03fbb17cbf7a8743a522da3c7fc"
+                geolocation.amap.appkey_android = "ffc71dfd4e576596027f8f45a1b8fb2f"
+                geolocation.tencent.apikey_ios = "EGOBZ-74ZET-ST7XS-VYICT-RBLHZ-KLFEX"
+                geolocation.tencent.apikey_android = "EGOBZ-74ZET-ST7XS-VYICT-RBLHZ-KLFEX"
+                icons.android = {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                }
+                icons.ios.appstore = "unpackage/res/icons/1024x1024.png"
+                icons.ios.ipad = {
+                    "app": "unpackage/res/icons/76x76.png",
+                    "app@2x": "unpackage/res/icons/152x152.png",
+                    "notification": "unpackage/res/icons/20x20.png",
+                    "notification@2x": "unpackage/res/icons/40x40.png",
+                    "proapp@2x": "unpackage/res/icons/167x167.png",
+                    "settings": "unpackage/res/icons/29x29.png",
+                    "settings@2x": "unpackage/res/icons/58x58.png",
+                    "spotlight": "unpackage/res/icons/40x40.png",
+                    "spotlight@2x": "unpackage/res/icons/80x80.png"
+                }
+                icons.ios.iphone = {
+                    "app@2x": "unpackage/res/icons/120x120.png",
+                    "app@3x": "unpackage/res/icons/180x180.png",
+                    "notification@2x": "unpackage/res/icons/40x40.png",
+                    "notification@3x": "unpackage/res/icons/60x60.png",
+                    "settings@2x": "unpackage/res/icons/58x58.png",
+                    "settings@3x": "unpackage/res/icons/87x87.png",
+                    "spotlight@2x": "unpackage/res/icons/80x80.png",
+                    "spotlight@3x": "unpackage/res/icons/120x120.png"
+                }
+                push.unipush.icons.small = {
+                    "hdpi" : "unpackage/res/push/36x36.png",
+                    "ldpi" : "unpackage/res/push/18x18.png",
+                    "mdpi" : "unpackage/res/push/24x24.png",
+                    "xhdpi" : "unpackage/res/push/48x48.png",
+                    "xxhdpi" : "unpackage/res/push/72x72.png"
+                }
+            } else if (args === 'menJin') {
+                state.name = '智能门禁'
+                state.appid = '__UNI__8D6E9FD'
+                state.description = '智能门禁APP，是一款集成了现代信息技术和智能化管理功能的移动应用程序。'
+                state.versionName = "1.0.0"
+                state.versionCode = 1
+                state.h5.title = '智能门禁'
+
+                maps.amap.name = "amapBOujshtbA"
+                maps.amap.appkey_ios = "fb35d03fbb17cbf7a8743a522da3c7fc"
+                maps.amap.appkey_android = "ffc71dfd4e576596027f8f45a1b8fb2f"
+
+                geolocation.amap.name = "amapBOujshtbA"
+                geolocation.amap.appkey_ios = "fb35d03fbb17cbf7a8743a522da3c7fc"
+                geolocation.amap.appkey_android = "ffc71dfd4e576596027f8f45a1b8fb2f"
+                geolocation.tencent.apikey_ios = "EGOBZ-74ZET-ST7XS-VYICT-RBLHZ-KLFEX"
+                geolocation.tencent.apikey_android = "EGOBZ-74ZET-ST7XS-VYICT-RBLHZ-KLFEX"
+                icons.android = {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                }
+                icons.ios.appstore = "unpackage/res/icons/1024x1024.png"
+                icons.ios.ipad = {
+                    "app": "unpackage/res/icons/76x76.png",
+                    "app@2x": "unpackage/res/icons/152x152.png",
+                    "notification": "unpackage/res/icons/20x20.png",
+                    "notification@2x": "unpackage/res/icons/40x40.png",
+                    "proapp@2x": "unpackage/res/icons/167x167.png",
+                    "settings": "unpackage/res/icons/29x29.png",
+                    "settings@2x": "unpackage/res/icons/58x58.png",
+                    "spotlight": "unpackage/res/icons/40x40.png",
+                    "spotlight@2x": "unpackage/res/icons/80x80.png"
+                }
+                icons.ios.iphone = {
+                    "app@2x": "unpackage/res/icons/120x120.png",
+                    "app@3x": "unpackage/res/icons/180x180.png",
+                    "notification@2x": "unpackage/res/icons/40x40.png",
+                    "notification@3x": "unpackage/res/icons/60x60.png",
+                    "settings@2x": "unpackage/res/icons/58x58.png",
+                    "settings@3x": "unpackage/res/icons/87x87.png",
+                    "spotlight@2x": "unpackage/res/icons/80x80.png",
+                    "spotlight@3x": "unpackage/res/icons/120x120.png"
+                }
+                push.unipush.icons.small = {
+                    "hdpi" : "unpackage/res/push/36x36.png",
+                    "ldpi" : "unpackage/res/push/18x18.png",
+                    "mdpi" : "unpackage/res/push/24x24.png",
+                    "xhdpi" : "unpackage/res/push/48x48.png",
+                    "xxhdpi" : "unpackage/res/push/72x72.png"
+                }
             }
         } else if ('./src/pages.json') {
             state.pages.forEach((e, index) => {
@@ -54,6 +246,13 @@ filesToModify.forEach((file) => {
                         }
                     }
                     state.condition.list[0].path = "pages/face/index"
+                } else if (args === 'menJin') {
+                    if (e.style.navigationBarTitleText === "门禁识别") {
+                        if (index != 0) {
+                            state.pages.splice(0, 1, ...state.pages.splice(index, 1, state.pages[0]))
+                        }
+                    }
+                    state.condition.list[0].path = "pages/door/index"
                 }
             })
         }